handle RPC error deser when body does not contain error code

Author: AllanZhengYP

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

@@ -926,9 +926,9 @@ private String getNumberOutputParam(Location bindingType, String dataSource, Sha
      *
      * <p>Two variables will be in scope:
      *   <ul>
-     *       <li>{@code errorOutput} or {@code parsedOutput}: a value of the HttpResponse type.
+     *       <li>{@code output} or {@code parsedOutput}: a value of the HttpResponse type.
      *          <ul>
-     *              <li>{@code errorOutput} is a raw HttpResponse, available when {@code isErrorCodeInBody} is set to
+     *              <li>{@code output} is a raw HttpResponse, available when {@code isErrorCodeInBody} is set to
      *              {@code false}</li>
      *              <li>{@code parsedOutput} is a HttpResponse type with body parsed to JavaScript object, available
      *              when {@code isErrorCodeInBody} is set to {@code true}</li>

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

@@ -129,7 +129,7 @@ static void generateCollectBody(GenerationContext context) {
 
     /**
      * Writes a function converting the low-level response body stream to utf-8 encoded string. It depends on
-     * response body stream collector{@link #generateCollectBody(GenerationContext)}.
+     * response body stream collector {@link #generateCollectBody(GenerationContext)}.
      *
      * @param context The generation context
      */
@@ -180,14 +180,14 @@ static Set<StructureShape> generateErrorDispatcher(
                        + "): Promise<$T> {", "}", errorMethodName, responseType, outputType, () -> {
             // Prepare error response for parsing error code. If error code needs to be parsed from response body
             // then we collect body and parse it to JS object, otherwise leave the response body as is.
-            String outputReference = shouldParseErrorBody ? "parsedOutput" : "errorOutput";
-            writer.openBlock(
-                    "const $L: any = {", "};", outputReference,
-                    () -> {
-                        writer.write("...output,");
-                        writer.write("body: $L,",
-                                shouldParseErrorBody ? "await parseBody(output.body, context)" : "output.body");
-                    });
+            if (shouldParseErrorBody) {
+                writer.openBlock(
+                        "const parsedOutput: any = {", "};",
+                        () -> {
+                            writer.write("...output,");
+                            writer.write("body: await parseBody(output.body, context)");
+                        });
+            }
 
             // Error responses must be at least SmithyException and MetadataBearer implementations.
             writer.addImport("SmithyException", "__SmithyException",
@@ -209,7 +209,7 @@ static Set<StructureShape> generateErrorDispatcher(
                     writer.openBlock("case $S:\ncase $S:", "  break;", errorId.getName(), errorId.toString(), () -> {
                         // Dispatch to the error deserialization function.
                         writer.write("response = await $L($L, context);",
-                                errorDeserMethodName, outputReference);
+                                errorDeserMethodName, shouldParseErrorBody ? "parsedOutput" : "output");
                     });
                 });
 

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

@@ -291,7 +291,7 @@ private void generateErrorDeserializer(GenerationContext context, StructureShape
                 writer.write("const body = $L.body", outputReference);
             } else {
                 // If error node not in body, error body is not parsed in dispatcher.
-                writer.write("const body = parsedBody($L.body, context);", outputReference);
+                writer.write("const body = parseBody($L.body, context);", outputReference);
             }
             writer.write("const deserialized: any = $L(body, context);",
                     ProtocolGenerator.getDeserFunctionName(errorSymbol, context.getProtocolName()));
@@ -333,9 +333,9 @@ private void readResponseBody(GenerationContext context, OperationShape operatio
      *
      * <p>Two variables will be in scope:
      *   <ul>
-     *       <li>{@code errorOutput} or {@code parsedOutput}: a value of the HttpResponse type.
+     *       <li>{@code output} or {@code parsedOutput}: a value of the HttpResponse type.
      *          <ul>
-     *              <li>{@code errorOutput} is a raw HttpResponse, available when {@code isErrorCodeInBody} is set to
+     *              <li>{@code output} is a raw HttpResponse, available when {@code isErrorCodeInBody} is set to
      *              {@code false}</li>
      *              <li>{@code parsedOutput} is a HttpResponse type with body parsed to JavaScript object, available
      *              when {@code isErrorCodeInBody} is set to {@code true}</li>