fix(go): make all type conversion shape public and delegate type conversion to dependent shape (#776)

rishav-karanjit · web-flow · commit e29b8ca450d1 · 2025-03-12T12:17:34.000-07:00
diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java
@@ -498,8 +498,7 @@ private void renderListShape(
     ) {
       final String funcName = Constants.funcNameGenerator(
         memberShape,
-        "Validate",
-        context.model()
+        "Validate"
       );
       final String funcInput = dataSource.startsWith("input") ? "" : dataSource;
       if (!funcInput.isEmpty()) {
@@ -593,11 +592,7 @@ private void renderMapShape(
       !validationFuncMap.containsKey(memberShape) &&
       (!keyValidation.isEmpty() || !valueValidation.isEmpty())
     ) {
-      final var funcName = Constants.funcNameGenerator(
-        memberShape,
-        "Validate",
-        context.model()
-      );
+      final var funcName = Constants.funcNameGenerator(memberShape, "Validate");
       final var funcInput = dataSource.startsWith("input") ? "" : dataSource;
       if (!funcInput.isEmpty()) {
         final var currServiceShapeNamespace = SmithyNameResolver.shapeNamespace(
@@ -664,11 +659,7 @@ private void renderUnionShape(
     final StringBuilder validationCode,
     final String dataSource
   ) {
-    final var funcName = Constants.funcNameGenerator(
-      memberShape,
-      "Validate",
-      context.model()
-    );
+    final var funcName = Constants.funcNameGenerator(memberShape, "Validate");
     final var funcInput = dataSource.startsWith("input") ? "" : dataSource;
     var dataSourceForUnion = dataSource;
     final var currServiceShapeNamespace =
diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceGenerator.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceGenerator.java
@@ -257,8 +257,7 @@ func NewClient(clientConfig $L) (*$T, error) {
             toDafnyMethod =
               Constants.funcNameGenerator(
                 inputMemberShapeForPositional,
-                "ToDafny",
-                model
+                "ToDafny"
               );
             inputType =
               ", params %s".formatted(
@@ -313,11 +312,7 @@ func NewClient(clientConfig $L) (*$T, error) {
                 outputShape,
                 ""
               )
-              : Constants.funcNameGenerator(
-                postionalMemShape,
-                "FromDafny",
-                model
-              );
+              : Constants.funcNameGenerator(postionalMemShape, "FromDafny");
             outputType =
               SmithyNameResolver
                 .getSmithyType(
@@ -534,11 +529,7 @@ void generateShim() {
                     .shapeNamespace(postionalMemShape)
                     .concat(".")
                     .concat(
-                      Constants.funcNameGenerator(
-                        postionalMemShape,
-                        "ToDafny",
-                        model
-                      )
+                      Constants.funcNameGenerator(postionalMemShape, "ToDafny")
                     );
             }
             // this is maybe because positional trait can change this
@@ -604,11 +595,7 @@ void generateShim() {
                   .shapeNamespace(postionalMemShape)
                   .concat(".")
                   .concat(
-                    Constants.funcNameGenerator(
-                      postionalMemShape,
-                      "FromDafny",
-                      model
-                    )
+                    Constants.funcNameGenerator(postionalMemShape, "FromDafny")
                   );
               final Symbol symbolForPositional = symbolProvider.toSymbol(
                 inputShape
@@ -967,8 +954,7 @@ void generateReferencedResources(final GenerationContext context) {
                         )
                         : Constants.funcNameGenerator(
                           postionalMemShape,
-                          "FromDafny",
-                          model
+                          "FromDafny"
                         );
 
                     outputType =
@@ -1143,11 +1129,7 @@ void generateNativeResourceWrapper(
                     inputShape,
                     ""
                   )
-                  : Constants.funcNameGenerator(
-                    postionalMemShape,
-                    "FromDafny",
-                    model
-                  );
+                  : Constants.funcNameGenerator(postionalMemShape, "FromDafny");
             }
             final var inputType = inputShape.hasTrait(UnitTypeTrait.class)
               ? ""
@@ -1217,11 +1199,7 @@ void generateNativeResourceWrapper(
                       outputShape,
                       ""
                     )
-                    : Constants.funcNameGenerator(
-                      postionalMemShape,
-                      "ToDafny",
-                      model
-                    );
+                    : Constants.funcNameGenerator(postionalMemShape, "ToDafny");
                 deReferenceRequired = false;
               }
               clientResponse = "var native_response, native_error";
diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java
@@ -1997,11 +1997,7 @@ private void generateSerializerFunctions(
                 return $L
             }
             """,
-            Constants.funcNameGenerator(
-              visitingMemberShape,
-              "ToDafny",
-              context.model()
-            ),
+            Constants.funcNameGenerator(visitingMemberShape, "ToDafny"),
             inputType,
             outputType,
             SmithyToDafnyShapeVisitor.getConversionFunc(visitingMemberShape)
@@ -2091,11 +2087,7 @@ private void generateDeserializerFunctions(
             func $L(input interface{})($L) {
                 $L
             }""",
-            Constants.funcNameGenerator(
-              visitingMemberShape,
-              "FromDafny",
-              context.model()
-            ),
+            Constants.funcNameGenerator(visitingMemberShape, "FromDafny"),
             outputType,
             DafnyToSmithyShapeVisitor.getConversionFunc(visitingMemberShape)
           );
diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/ShapeVisitorHelper.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/ShapeVisitorHelper.java
@@ -5,10 +5,12 @@
 import software.amazon.polymorph.smithygo.codegen.GenerationContext;
 import software.amazon.polymorph.smithygo.codegen.GoWriter;
 import software.amazon.polymorph.smithygo.localservice.nameresolver.DafnyNameResolver;
+import software.amazon.polymorph.smithygo.localservice.nameresolver.SmithyNameResolver;
 import software.amazon.polymorph.smithygo.utils.Constants;
 import software.amazon.polymorph.traits.ReferenceTrait;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.Shape;
 
 /**
@@ -89,6 +91,29 @@ public static String toNativeShapeVisitorWriter(
         );
       }
     }
+    final String funcName = Constants.funcNameGenerator(
+      memberShape,
+      "FromDafny"
+    );
+    final var serviceShape = context
+      .model()
+      .expectShape(context.settings().getService(), ServiceShape.class);
+    // if the memberShape is an external shape, delegate to the type conversion in that namespace
+    if (
+      !serviceShape
+        .getId()
+        .getNamespace()
+        .equals(memberShape.getId().getNamespace())
+    ) {
+      var memberShapeNameSpace = SmithyNameResolver.shapeNamespace(memberShape);
+      return (
+        memberShapeNameSpace
+          .concat(".")
+          .concat(funcName.concat("("))
+          .concat(dataSource)
+          .concat(")")
+      );
+    }
     final String funcDataSource = "input";
     if (
       !DafnyToSmithyShapeVisitor
@@ -109,11 +134,6 @@ public static String toNativeShapeVisitorWriter(
         )
       );
     }
-    final String funcName = Constants.funcNameGenerator(
-      memberShape,
-      "FromDafny",
-      context.model()
-    );
     return (funcName.concat("(").concat(dataSource).concat(")"));
   }
 
@@ -161,6 +181,25 @@ public static String toDafnyShapeVisitorWriter(
         );
       }
     }
+    final String funcName = Constants.funcNameGenerator(memberShape, "ToDafny");
+    final var serviceShape = context
+      .model()
+      .expectShape(context.settings().getService(), ServiceShape.class);
+    if (
+      !serviceShape
+        .getId()
+        .getNamespace()
+        .equals(memberShape.getId().getNamespace())
+    ) {
+      var memberShapeNameSpace = SmithyNameResolver.shapeNamespace(memberShape);
+      return (
+        memberShapeNameSpace
+          .concat(".")
+          .concat(funcName.concat("("))
+          .concat(dataSource)
+          .concat(")")
+      );
+    }
     final String funcDataSource = "input";
     if (
       !SmithyToDafnyShapeVisitor
@@ -183,11 +222,6 @@ public static String toDafnyShapeVisitorWriter(
         )
       );
     }
-    final String funcName = Constants.funcNameGenerator(
-      memberShape,
-      "ToDafny",
-      context.model()
-    );
     return (funcName.concat("(").concat(dataSource).concat(")"));
   }
 }
diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java
@@ -15,31 +15,8 @@ public class Constants {
 
   // TODO: Is it possible to make this function name shorter and in camelCase?
   /**
-   * Generates a function name for memberShapes.
-   * Generates private function for all shape excepts memberShape whose containerShape has positional trait
-   *
-   * @param memberShape The visiting MemberShape
-   * @param suffix A string to be appended at the end of the generated function name
-   * @param model The smithy model being used
-   * @return A string representing the generated function name
-   */
-  public static String funcNameGenerator(
-    final MemberShape memberShape,
-    final String suffix,
-    final Model model
-  ) {
-    String funcName = funcNameGenerator(memberShape, suffix);
-    final Shape containerShape = model.expectShape(memberShape.getContainer());
-    // membershape inside a container shape with positional trait has to be exposed.
-    if (containerShape.hasTrait(PositionalTrait.class)) {
-      funcName = StringUtils.capitalize(funcName);
-    }
-    return funcName;
-  }
-
-  /**
-   * Generates a function name for memberShapes.
-   * Always generates private function for all shape
+   * Generates a function name used for type conversion of memberShapes.
+   * Always generates public (exported) function for all shape
    *
    * @param memberShape The visiting MemberShape
    * @param suffix A string to be appended at the end of the generated function name
@@ -49,11 +26,13 @@ public static String funcNameGenerator(
     final MemberShape memberShape,
     final String suffix
   ) {
-    return memberShape
-      .getId()
-      .toString()
-      .replaceAll("[.$#]", "_")
-      .concat("_")
-      .concat(suffix);
+    return StringUtils.capitalize(
+      memberShape
+        .getId()
+        .toString()
+        .replaceAll("[.$#]", "_")
+        .concat("_")
+        .concat(suffix)
+    );
   }
 }
