Updates for HTTP serde correctness and safety

smithy-typescript-codegen-test/model/main.smithy

@@ -175,9 +175,9 @@ structure GetCityImageInput {
 }
 
 structure GetCityImageOutput {
+    @streaming
     @httpPayload
     image: CityImageData,
 }
 
-@streaming
 blob CityImageData

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

@@ -36,7 +36,6 @@
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.Shape;
-import software.amazon.smithy.model.shapes.ShapeIndex;
 import software.amazon.smithy.model.shapes.ShapeVisitor;
 import software.amazon.smithy.model.shapes.StringShape;
 import software.amazon.smithy.model.shapes.StructureShape;
@@ -64,7 +63,7 @@ class CodegenVisitor extends ShapeVisitor.Default<Void> {
     private final ServiceShape service;
     private final FileManifest fileManifest;
     private final SymbolProvider symbolProvider;
-    private final ShapeIndex nonTraits;
+    private final Model nonTraits;
     private final TypeScriptDelegator writers;
     private final List<TypeScriptIntegration> integrations = new ArrayList<>();
     private final List<RuntimeClientPlugin> runtimePlugins = new ArrayList<>();
@@ -73,7 +72,7 @@ class CodegenVisitor extends ShapeVisitor.Default<Void> {
 
     CodegenVisitor(PluginContext context) {
         settings = TypeScriptSettings.from(context.getModel(), context.getSettings());
-        nonTraits = context.getNonTraitShapes();
+        nonTraits = context.getModelWithoutTraitShapes();
         model = context.getModel();
         service = settings.getService(model);
         fileManifest = context.getFileManifest();

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

@@ -91,7 +91,7 @@ final class SymbolVisitor implements SymbolProvider, ShapeVisitor<Symbol> {
 
         // Get each structure that's used as output or errors.
         OperationIndex operationIndex = model.getKnowledge(OperationIndex.class);
-        model.getShapeIndex().shapes(OperationShape.class).forEach(operationShape -> {
+        model.shapes(OperationShape.class).forEach(operationShape -> {
             operationIndex.getOutput(operationShape).ifPresent(outputShapes::add);
             outputShapes.addAll(operationIndex.getErrors(operationShape));
         });
@@ -297,7 +297,7 @@ public Symbol unionShape(UnionShape shape) {
 
     @Override
     public Symbol memberShape(MemberShape shape) {
-        Shape targetShape = model.getShapeIndex().getShape(shape.getTarget())
+        Shape targetShape = model.getShape(shape.getTarget())
                 .orElseThrow(() -> new CodegenException("Shape not found: " + shape.getTarget()));
         Symbol targetSymbol = targetShape.accept(this);
 

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

@@ -84,7 +84,7 @@ public static TypeScriptSettings from(Model model, ObjectNode config) {
 
     // TODO: this seems reusable across generators.
     private static ShapeId inferService(Model model) {
-        List<ShapeId> services = model.getShapeIndex()
+        List<ShapeId> services = model
                 .shapes(ServiceShape.class)
                 .map(Shape::getId)
                 .sorted()
@@ -205,7 +205,7 @@ public void setPluginSettings(ObjectNode pluginSettings) {
      * @throws CodegenException if the service is invalid or not found.
      */
     public ServiceShape getService(Model model) {
-        return model.getShapeIndex()
+        return model
                 .getShape(getService())
                 .orElseThrow(() -> new CodegenException("Service shape not found: " + getService()))
                 .asServiceShape()

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

@@ -210,7 +210,7 @@ boolean writeShapeDocs(Shape shape) {
      * @return Returns true if docs were written.
      */
     boolean writeMemberDocs(Model model, MemberShape member) {
-        return member.getMemberTrait(model.getShapeIndex(), DocumentationTrait.class)
+        return member.getMemberTrait(model, DocumentationTrait.class)
                 .map(DocumentationTrait::getValue)
                 .map(docs -> {
                     writeDocs(docs);

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

@@ -48,7 +48,7 @@
  * more complex deserialization strategies for those types.
  *
  * This class reduces the effort necessary to build protocol implementations, specifically when
- * implementing {@link HttpBindingProtocolGenerator#generateDocumentShapeDeserializers(GenerationContext, Set)}.
+ * implementing {@link HttpBindingProtocolGenerator#generateDocumentBodyShapeDeserializers(GenerationContext, Set)}.
  *
  * Implementations of this class independent of protocol documents are also possible.
  *
@@ -305,7 +305,7 @@ protected final void generateDeserFunction(
         writer.addImport(symbol, symbol.getName());
         writer.openBlock("const $L = (\n"
                        + "  output: any,\n"
-                       + "  context: SerdeContext\n"
+                       + "  context: __SerdeContext\n"
                        + "): $T => {", "}", methodName, symbol, () -> functionBody.accept(context, shape));
         writer.write("");
     }

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

@@ -48,7 +48,7 @@
  * complex serialization strategies for those types.
  *
  * This class reduces the effort necessary to build protocol implementations, specifically when
- * implementing {@link HttpBindingProtocolGenerator#generateDocumentShapeSerializers(GenerationContext, Set)}.
+ * implementing {@link HttpBindingProtocolGenerator#generateDocumentBodyShapeSerializers(GenerationContext, Set)}.
  *
  * Implementations of this class independent of protocol documents are also possible.
  *
@@ -300,7 +300,7 @@ private void generateSerFunction(
         writer.addImport(symbol, symbol.getName());
         writer.openBlock("const $L = (\n"
                        + "  input: $T,\n"
-                       + "  context: SerdeContext\n"
+                       + "  context: __SerdeContext\n"
                        + "): any => {", "}", methodName, symbol, () -> functionBody.accept(context, shape));
         writer.write("");
     }