move types from smithy-client package to types package (smithy-lang#373)

* move types from smithy-client package to types package

* smithy exception import from types package

* revert change in ssdk lib and ping dependencies

Author: AllanZhengYP

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

@@ -610,7 +610,7 @@ private void writeServerResponseTest(OperationShape operation, HttpResponseTestC
         writer.write("const request = new HttpRequest({method: 'POST', hostname: 'example.com'});");
 
         // Create a new serializer factory that always returns our test serializer.
-        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
+        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
         writer.addImport("OperationSerializer", "__OperationSerializer", "@aws-smithy/server-common");
         writer.openBlock("const serFn: (op: $1T) => __OperationSerializer<$2T<{}>, $1T, __SmithyException> = (op) =>"
                         + " { return new TestSerializer(); };", serviceOperationsSymbol, serviceSymbol);

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

@@ -209,7 +209,7 @@ private static void addCommonHandlerImports(TypeScriptWriter writer) {
         writer.addImport("SmithyFrameworkException", "__SmithyFrameworkException", "@aws-smithy/server-common");
         writer.addImport("HttpRequest", "__HttpRequest", "@aws-sdk/protocol-http");
         writer.addImport("HttpResponse", "__HttpResponse", "@aws-sdk/protocol-http");
-        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
+        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
         writer.addImport("ValidationCustomizer", "__ValidationCustomizer", "@aws-smithy/server-common");
     }
 

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

@@ -161,7 +161,7 @@ private void renderNonErrorStructure() {
      * <pre>{@code
      * import {
      *     SmithyException as __SmithyException
-     * } from "@aws-sdk/smithy-client";
+     * } from "@aws-sdk/types";
      *
      * export interface NoSuchResource extends __SmithyException, $MetadataBearer {
      *   name: "NoSuchResource";
@@ -180,7 +180,7 @@ private void renderErrorStructure() {
         writer.writeShapeDocs(shape);
 
         // Find symbol references with the "extends" property, and add SmithyException.
-        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
+        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
         String extendsFrom = Stream.concat(
                 Stream.of("__SmithyException"),
                 symbol.getReferences().stream()

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

@@ -241,8 +241,17 @@ private Symbol createBigJsSymbol(Shape shape) {
 
     @Override
     public Symbol documentShape(DocumentShape shape) {
-        Symbol.Builder builder = createSymbolBuilder(shape, "__DocumentType.Value");
-        return addSmithyUseImport(builder, "DocumentType", "__DocumentType").build();
+        Symbol.Builder builder = createSymbolBuilder(shape, "__DocumentType");
+        Symbol importSymbol = Symbol.builder()
+                .name("DocumentType")
+                .namespace(TypeScriptDependency.AWS_SDK_TYPES.packageName, "/")
+                .build();
+        SymbolReference reference = SymbolReference.builder()
+                .symbol(importSymbol)
+                .alias("__DocumentType")
+                .options(SymbolReference.ContextOption.USE)
+                .build();
+        return builder.addReference(reference).build();
     }
 
     @Override

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

@@ -358,7 +358,7 @@ public void generateServiceHandlerFactory(GenerationContext context) {
         writer.indent();
 
         generateServiceMux(context);
-        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
+        writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
         writer.openBlock("const serFn: (op: $1T) => __OperationSerializer<$2T<Context>, $1T, __SmithyException> = "
                         + "(op) => {", "};", operationsSymbol, serviceSymbol, () -> {
             writer.openBlock("switch (op) {", "}", () -> {

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

@@ -334,7 +334,7 @@ static Set<StructureShape> generateErrorDispatcher(
 
             // Error responses must be at least SmithyException and MetadataBearer implementations.
             writer.addImport("SmithyException", "__SmithyException",
-                    TypeScriptDependency.AWS_SMITHY_CLIENT.packageName);
+                    TypeScriptDependency.AWS_SDK_TYPES.packageName);
             writer.addImport("MetadataBearer", "__MetadataBearer",
                     TypeScriptDependency.AWS_SDK_TYPES.packageName);
             // These responses will also have additional properties, so enable that on the interface.

smithy-typescript-ssdk-libs/server-apigateway/package.json

@@ -20,7 +20,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-sdk/protocol-http": "^3.5.0",
-    "@aws-sdk/types": "^3.4.1",
+    "@aws-sdk/types": "3.20.0",
     "@types/aws-lambda": "^8.10.72",
     "tslib": "^1.8.0"
   },

smithy-typescript-ssdk-libs/server-common/package.json

@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-sdk/protocol-http": "^3.5.0",
     "@aws-sdk/smithy-client": "3.6.1",
-    "@aws-sdk/types": "^3.4.1",
+    "@aws-sdk/types": "3.20.0",
     "tslib": "^1.8.0"
   },
   "devDependencies": {

smithy-typescript-ssdk-libs/yarn.lock

@@ -26,11 +26,16 @@
     "@aws-sdk/types" "3.6.1"
     tslib "^1.8.0"
 
-"@aws-sdk/[email protected]", "@aws-sdk/types@^3.4.1":
+"@aws-sdk/[email protected]":
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.13.1.tgz#f69efe2053b0fa5dfd4046cb80dc176ad645c016"
   integrity sha512-4eHboRz3I8f0C85Ta1dJ1v1Y9T1zH9xpC4/DufSIfQcD1Imc2U2LM22Qgbz8/PoP4kyhp2nJpQpW0APD91ILfw==
 
+"@aws-sdk/[email protected]":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.20.0.tgz#f14a13970ffc9096ec28fb60c5b40b5ddaaecea9"
+  integrity sha512-ztrHBTJM0wU4rrt51Kff8DjGT5ReoEdY1IUu6T0lN7aH9113235WnBE44y+z/Y+nMC+t5+r74CkldkLf/vngNg==
+
 "@aws-sdk/[email protected]":
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.6.1.tgz#00686db69e998b521fcd4a5f81ef0960980f80c4"