Default import package.json for spec compatibility

Co-authored-by: Raphael Varonos <r.varonos@gmail.com>
smithy-lang · Sep 8, 2020 · 58f768a · 58f768a
1 parent 0dd8c14
commit 58f768a
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/...degen/src/main/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGenerator.java b/...degen/src/main/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGenerator.java
@@ -99,9 +99,8 @@ final class RuntimeConfigGenerator {
                 writer.addDependency(TypeScriptDependency.AWS_SDK_UTIL_USER_AGENT_NODE);
                 writer.addImport("defaultUserAgent", "defaultUserAgent",
                         TypeScriptDependency.AWS_SDK_UTIL_USER_AGENT_NODE.packageName);
-                writer.addImport("name", "name", "./package.json");
-                writer.addImport("version", "version", "./package.json");
-                writer.write("defaultUserAgent: defaultUserAgent(name, version),");
+                writer.addImport("*", "packageInfo", "./package.json");
+                writer.write("defaultUserAgent: defaultUserAgent(packageInfo.name, packageInfo.version),");
             }
     );
     private final Map<String, Consumer<TypeScriptWriter>> browserRuntimeConfigDefaults = MapUtils.of(
@@ -163,9 +162,8 @@ final class RuntimeConfigGenerator {
                 writer.addDependency(TypeScriptDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER);
                 writer.addImport("defaultUserAgent", "defaultUserAgent",
                         TypeScriptDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER.packageName);
-                writer.addImport("name", "name", "./package.json");
-                writer.addImport("version", "version", "./package.json");
-                writer.write("defaultUserAgent: defaultUserAgent(name, version),");
+                writer.addImport("*", "packageInfo", "./package.json");
+                writer.write("defaultUserAgent: defaultUserAgent(packageInfo.name, packageInfo.version),");
             }
     );
     private final Map<String, Consumer<TypeScriptWriter>> reactNativeRuntimeConfigDefaults = MapUtils.of(
@@ -182,9 +180,9 @@ final class RuntimeConfigGenerator {
                 writer.write("urlParser: parseUrl,");
             },
             "defaultUserAgent", writer -> {
-                writer.addImport("name", "name", "./package.json");
-                writer.addImport("version", "version", "./package.json");
-                writer.write("defaultUserAgent: `aws-sdk-js-v3-react-native-$${name}/$${version}`,");
+                writer.addImport("*", "packageInfo", "./package.json");
+                writer.write("defaultUserAgent: "
+                    + "`aws-sdk-js-v3-react-native-$${packageInfo.name}/$${packageInfo.version}`,");
             }
     );
     private final Map<String, Consumer<TypeScriptWriter>> sharedRuntimeConfigDefaults = MapUtils.of(