Centralize dependencies into a single file

Author: mtdowling

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/ApplicationProtocol.java

@@ -74,17 +74,15 @@ public static ApplicationProtocol createDefaultHttpApplicationProtocol() {
                         .symbol(Symbol.builder()
                                         .namespace("@aws-sdk/protocol-http", "/")
                                         .name("HttpRequest")
-                                        .addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY,
-                                                       "@aws-sdk/protocol-http", HTTP_PROTOCOL_VERSION)
+                                        .addDependency(TypeScriptDependencies.HTTP_PROTOCOL)
                                         .build())
                         .alias("__HttpRequest")
                         .build(),
                 SymbolReference.builder()
                         .symbol(Symbol.builder()
                                         .namespace("@aws-sdk/protocol-http", "/")
                                         .name("HttpResponse")
-                                        .addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY,
-                                                       "@aws-sdk/protocol-http", HTTP_PROTOCOL_VERSION)
+                                        .addDependency(TypeScriptDependencies.HTTP_PROTOCOL)
                                         .build())
                         .alias("__HttpResponse")
                         .build()

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CommandGenerator.java

@@ -36,8 +36,6 @@ final class CommandGenerator implements Runnable {
     static final String COMMAND_BODY_EXTRA_SECTION = "command_body_extra";
     static final String COMMAND_CONSTRUCTOR_SECTION = "command_constructor";
 
-    private static final String MIDDLEWARE_SERDE_VERSION = "^0.1.0-preview.1";
-
     private final TypeScriptSettings settings;
     private final Model model;
     private final ServiceShape service;
@@ -133,9 +131,7 @@ private void generateCommandMiddlewareResolver(String configType) {
         Symbol serde = Symbol.builder()
                 .name("serdePlugin")
                 .namespace("@aws-sdk/middleware-serde", "/")
-                .addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY,
-                               "@aws-sdk/middleware-serde",
-                               MIDDLEWARE_SERDE_VERSION)
+                .addDependency(TypeScriptDependencies.MIDDLEWARE_SERDE)
                 .build();
 
         writer.write("resolveMiddleware(")

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java

@@ -26,13 +26,7 @@
 /**
  * Private class used to generates a package.json file for the project.
  */
-public final class PackageJsonGenerator {
-
-    public static final String NORMAL_DEPENDENCY = "dependencies";
-    public static final String DEV_DEPENDENCY = "devDependencies";
-    public static final String PEER_DEPENDENCY = "peerDependencies";
-    public static final String BUNDLED_DEPENDENCY = "bundledDependencies";
-    public static final String OPTIONAL_DEPENDENCY = "optionalDependencies";
+final class PackageJsonGenerator {
 
     private PackageJsonGenerator() {}
 

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/SymbolVisitor.java

@@ -69,11 +69,6 @@
 final class SymbolVisitor implements SymbolProvider, ShapeVisitor<Symbol> {
 
     private static final Logger LOGGER = Logger.getLogger(SymbolVisitor.class.getName());
-    private static final String TYPES_NODE_VERSION = "^12.7.5";
-    private static final String TYPES_BIG_JS_VERSION = "^4.0.5";
-    private static final String BIG_JS_VERSION = "^5.2.2";
-    private static final String AWS_SDK_TYPES_VERSION = "^0.1.0-preview.5";
-    private static final String AWS_SDK_SMITHY_CLIENT_VERSION = "^0.1.0-preview.5";
 
     private final Model model;
     private final ReservedWordSymbolProvider.Escaper escaper;
@@ -122,7 +117,7 @@ public Symbol blobShape(BlobShape shape) {
         // Note: `Readable` needs an import and a dependency.
         return createSymbolBuilder(shape, "ArrayBuffer | ArrayBufferView | string | Readable | Blob", null)
                 .addReference(Symbol.builder().name("Readable").namespace("stream", "/").build())
-                .addDependency(PackageJsonGenerator.DEV_DEPENDENCY, "@types/node", TYPES_NODE_VERSION)
+                .addDependency(TypeScriptDependencies.TYPES_NODE)
                 .build();
     }
 
@@ -210,8 +205,8 @@ public Symbol bigIntegerShape(BigIntegerShape shape) {
     @Override
     public Symbol bigDecimalShape(BigDecimalShape shape) {
         return createSymbolBuilder(shape, "Big", "@types/big.js")
-                .addDependency(PackageJsonGenerator.DEV_DEPENDENCY, "@types/big.js", TYPES_BIG_JS_VERSION)
-                .addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY, "big.js", BIG_JS_VERSION)
+                .addDependency(TypeScriptDependencies.TYPES_BIG_JS)
+                .addDependency(TypeScriptDependencies.BIG_JS)
                 .build();
     }
 
@@ -249,8 +244,7 @@ public Symbol resourceShape(ResourceShape shape) {
     @Override
     public Symbol serviceShape(ServiceShape shape) {
         return createObjectSymbolBuilder(shape)
-                .addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY, "@aws-sdk/smithy-client",
-                               AWS_SDK_SMITHY_CLIENT_VERSION)
+                .addDependency(TypeScriptDependencies.AWS_SMITHY_CLIENT)
                 .build();
     }
 
@@ -260,7 +254,7 @@ public Symbol structureShape(StructureShape shape) {
         addSmithyImport(builder);
 
         if (outputShapes.contains(shape)) {
-            builder.addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY, "@aws-sdk/types", AWS_SDK_TYPES_VERSION);
+            builder.addDependency(TypeScriptDependencies.AWS_SDK_TYPES);
             SymbolReference reference = SymbolReference.builder()
                     .options(SymbolReference.ContextOption.DECLARE)
                     .alias("$MetadataBearer")

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependencies.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.smithy.typescript.codegen;
+
+import software.amazon.smithy.codegen.core.SymbolDependency;
+
+public final class TypeScriptDependencies {
+    public static final String NORMAL_DEPENDENCY = "dependencies";
+    public static final String DEV_DEPENDENCY = "devDependencies";
+    public static final String PEER_DEPENDENCY = "peerDependencies";
+    public static final String BUNDLED_DEPENDENCY = "bundledDependencies";
+    public static final String OPTIONAL_DEPENDENCY = "optionalDependencies";
+
+    public static final SymbolDependency HTTP_PROTOCOL = SymbolDependency.builder()
+            .dependencyType(NORMAL_DEPENDENCY)
+            .packageName("@aws-sdk/protocol-http")
+            .version("^0.1.0-preview.1")
+            .build();
+
+    public static final SymbolDependency MIDDLEWARE_SERDE = SymbolDependency.builder()
+            .dependencyType(NORMAL_DEPENDENCY)
+            .packageName("@aws-sdk/middleware-serde")
+            .version("^0.1.0-preview.1")
+            .build();
+
+    public static final SymbolDependency TYPES_NODE = SymbolDependency.builder()
+            .dependencyType(DEV_DEPENDENCY)
+            .packageName("@types/node")
+            .version("^12.7.5")
+            .build();
+
+    public static final SymbolDependency TYPES_BIG_JS = SymbolDependency.builder()
+            .dependencyType(DEV_DEPENDENCY)
+            .packageName("@types/big.js")
+            .version("^4.0.5")
+            .build();
+
+    public static final SymbolDependency BIG_JS = SymbolDependency.builder()
+            .dependencyType(NORMAL_DEPENDENCY)
+            .packageName("big.js")
+            .version("^5.2.2")
+            .build();
+
+    public static final SymbolDependency AWS_SDK_TYPES = SymbolDependency.builder()
+            .dependencyType(NORMAL_DEPENDENCY)
+            .packageName("@aws-sdk/types")
+            .version("^0.1.0-preview.5")
+            .build();
+
+    public static final SymbolDependency AWS_SMITHY_CLIENT = SymbolDependency.builder()
+            .dependencyType(NORMAL_DEPENDENCY)
+            .packageName("@aws-sdk/smithy-client")
+            .version("^0.1.0-preview.5")
+            .build();
+
+    private TypeScriptDependencies() {}
+}

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/RuntimeClientPlugin.java

@@ -24,7 +24,7 @@
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
-import software.amazon.smithy.typescript.codegen.PackageJsonGenerator;
+import software.amazon.smithy.typescript.codegen.TypeScriptDependencies;
 import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.StringUtils;
 import software.amazon.smithy.utils.ToSmithyBuilder;
@@ -614,7 +614,7 @@ private static Symbol createSymbol(String packageName, String version, String na
             return Symbol.builder()
                     .namespace(packageName, "/")
                     .name(name)
-                    .addDependency(PackageJsonGenerator.NORMAL_DEPENDENCY, packageName, version)
+                    .addDependency(TypeScriptDependencies.NORMAL_DEPENDENCY, packageName, version)
                     .build();
         }
     }