add SDKStreamSerdeContext interface

Author: AllanZhengYP

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

@@ -28,6 +28,7 @@
 import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.traits.StreamingTrait;
+import software.amazon.smithy.typescript.codegen.integration.AddSdkStreamMixinDependency;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 /**
@@ -75,12 +76,14 @@ public static String getOperationSerializerContextType(
 
     /**
      * Get context type for command deserializer function.
+     * @param settings The TypeScript settings
      * @param writer The code writer.
      * @param model The model for the service containing the given command.
      * @param operation The operation shape for given command.
      * @return The TypeScript type for the deserializer context
      */
     public static String getOperationDeserializerContextType(
+            TypeScriptSettings settings,
             TypeScriptWriter writer,
             Model model,
             OperationShape operation
@@ -90,9 +93,15 @@ public static String getOperationDeserializerContextType(
         // If event stream trait exists, add corresponding serde context type to the intersection type.
         EventStreamIndex eventStreamIndex = EventStreamIndex.of(model);
         if (eventStreamIndex.getOutputInfo(operation).isPresent()) {
-            writer.addImport("EventStreamSerdeContext", "__EventStreamSerdeContext", "@aws-sdk/types");
+            writer.addImport("EventStreamSerdeContext", "__EventStreamSerdeContext",
+                    TypeScriptDependency.AWS_SDK_TYPES.packageName);
             contextInterfaceList.add("__EventStreamSerdeContext");
         }
+        if (AddSdkStreamMixinDependency.hasStreamingBlobDeser(settings, model, operation)) {
+            writer.addImport("SdkStreamSerdeContext", "__SdkStreamSerdeContext",
+                    TypeScriptDependency.AWS_SDK_TYPES.packageName);
+            contextInterfaceList.add("__SdkStreamSerdeContext");
+        }
         return String.join(" & ", contextInterfaceList);
     }
 

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

@@ -285,7 +285,8 @@ private void writeSerde() {
                 .write("private deserialize(")
                 .indent()
                     .write("output: $T,", applicationProtocol.getResponseType())
-                    .write("context: $L", CodegenUtils.getOperationDeserializerContextType(writer, model, operation))
+                    .write("context: $L",
+                            CodegenUtils.getOperationDeserializerContextType(settings, writer, model, operation))
                 .dedent()
                 .openBlock("): Promise<$T> {", "}", outputType, () -> writeSerdeDispatcher(false))
                 .write("");

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/SdkStreamUtilsMixin.java renamed to smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/AddSdkStreamMixinDependency.java

@@ -41,7 +41,7 @@
  * runtime-specific stream implementations.
  */
 @SmithyInternalApi
-public final class SdkStreamUtilsMixin implements TypeScriptIntegration {
+public final class AddSdkStreamMixinDependency implements TypeScriptIntegration {
 
     @Override
     public void addConfigInterfaceFields(
@@ -50,7 +50,7 @@ public void addConfigInterfaceFields(
         SymbolProvider symbolProvider,
         TypeScriptWriter writer
     ) {
-        if (!hasStreamingBlobResponse(model, settings.getService(model))) {
+        if (!hasStreamingBlobDeser(settings, model)) {
             return;
         }
 
@@ -68,7 +68,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
         SymbolProvider symbolProvider,
         LanguageTarget target
     ) {
-        if (!hasStreamingBlobResponse(model, settings.getService(model))) {
+        if (!hasStreamingBlobDeser(settings, model)) {
             return Collections.emptyMap();
         }
         switch (target) {
@@ -91,16 +91,29 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
         }
     }
 
-    private static boolean hasStreamingBlobResponse(Model model, ServiceShape serviceShape) {
+    private static boolean hasStreamingBlobDeser(TypeScriptSettings settings, Model model) {
+        ServiceShape serviceShape = settings.getService(model);
         TopDownIndex topDownIndex = TopDownIndex.of(model);
         Set<OperationShape> operations = topDownIndex.getContainedOperations(serviceShape);
         for (OperationShape operation : operations) {
-            StructureShape outputShape = model.expectShape(operation.getOutputShape()).asStructureShape().get();
-            for (MemberShape member : outputShape.members()) {
-                Shape shape = model.expectShape(member.getTarget());
-                if (shape instanceof BlobShape && shape.hasTrait(StreamingTrait.class)) {
-                    return true;
-                }
+            if (hasStreamingBlobDeser(settings, model, operation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean hasStreamingBlobDeser(TypeScriptSettings settings, Model model, OperationShape operation) {
+        StructureShape ioShapeToDeser;
+        if (settings.generateServerSdk()) {
+            ioShapeToDeser = model.expectShape(operation.getInputShape()).asStructureShape().get();
+        } else {
+            ioShapeToDeser = model.expectShape(operation.getOutputShape()).asStructureShape().get();
+        }
+        for (MemberShape member : ioShapeToDeser.members()) {
+            Shape shape = model.expectShape(member.getTarget());
+            if (shape instanceof BlobShape && shape.hasTrait(StreamingTrait.class)) {
+                return true;
             }
         }
         return false;

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

@@ -2059,7 +2059,8 @@ private void generateOperationResponseDeserializer(
         String errorMethodName = methodName + "Error";
         // Add the normalized output type.
         Symbol outputType = symbol.expectProperty("outputType", Symbol.class);
-        String contextType = CodegenUtils.getOperationDeserializerContextType(writer, context.getModel(), operation);
+        String contextType = CodegenUtils.getOperationDeserializerContextType(context.getSettings(), writer,
+                context.getModel(), operation);
 
         // Handle the general response.
         writer.openBlock("export const $L = async(\n"

smithy-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration

@@ -3,4 +3,4 @@ software.amazon.smithy.typescript.codegen.integration.AddChecksumRequiredDepende
 software.amazon.smithy.typescript.codegen.integration.AddDefaultsModeDependency
 software.amazon.smithy.typescript.codegen.integration.AddHttpApiKeyAuthPlugin
 software.amazon.smithy.typescript.codegen.integration.AddBaseServiceExceptionClass
-software.amazon.smithy.typescript.codegen.integration.SdkStreamUtilsMixin
+software.amazon.smithy.typescript.codegen.integration.AddSdkStreamMixinDependency