use command input/output shape for public typing instead of shapes in protocol

Author: AllanZhengYP

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

@@ -26,11 +26,9 @@
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.codegen.core.SymbolReference;
 import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.knowledge.OperationIndex;
 import software.amazon.smithy.model.knowledge.TopDownIndex;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
-import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
 import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
 import software.amazon.smithy.utils.OptionalUtils;
@@ -90,18 +88,19 @@ static String getResolvedConfigTypeName(Symbol symbol) {
 
     @Override
     public void run() {
-        OperationIndex operationIndex = model.getKnowledge(OperationIndex.class);
         writer.addImport("Client", "__Client", "@aws-sdk/smithy-client");
         writer.addImport("ClientDefaultValues", "__ClientDefaultValues", "./runtimeConfig");
 
         // Normalize the input and output types of the command to account for
         // things like an operation adding input where there once wasn't any
         // input, adding output, naming differences between services, etc.
-        writeInputOutputTypeUnion("ServiceInputTypes", writer, operationIndex::getInput, writer -> {
+        writeInputOutputTypeUnion("ServiceInputTypes", writer,
+                operationSymbol -> operationSymbol.getProperty("inputType", Symbol.class), writer -> {
             // Use an empty object if an operation doesn't define input.
             writer.write("| {}");
         });
-        writeInputOutputTypeUnion("ServiceOutputTypes", writer, operationIndex::getOutput, writer -> {
+        writeInputOutputTypeUnion("ServiceOutputTypes", writer,
+                operationSymbol -> operationSymbol.getProperty("outputType", Symbol.class), writer -> {
             // Use a MetadataBearer if an operation doesn't define output.
             writer.addImport("MetadataBearer", "__MetadataBearer", TypeScriptDependency.AWS_SDK_TYPES.packageName);
             writer.write("| __MetadataBearer");
@@ -115,14 +114,15 @@ public void run() {
     private void writeInputOutputTypeUnion(
             String typeName,
             TypeScriptWriter writer,
-            Function<OperationShape, Optional<StructureShape>> mapper,
+            Function<Symbol, Optional<Symbol>> mapper,
             Consumer<TypeScriptWriter> defaultTypeGenerator
     ) {
         TopDownIndex topDownIndex = model.getKnowledge(TopDownIndex.class);
         Set<OperationShape> containedOperations = topDownIndex.getContainedOperations(service);
+
         List<Symbol> symbols = containedOperations.stream()
-                .flatMap(operation -> OptionalUtils.stream(mapper.apply(operation)))
                 .map(symbolProvider::toSymbol)
+                .flatMap(operation -> OptionalUtils.stream(mapper.apply(operation)))
                 .sorted(Comparator.comparing(Symbol::getName))
                 .collect(Collectors.toList());