npm - @aws-sdk/client-cloudsearch - Versions diffs - 3.50.0 → 3.53.0 - Mend

@aws-sdk/client-cloudsearch 3.50.0 → 3.53.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

package/dist-cjs/protocols/Aws_query.js CHANGED Viewed

@@ -6,6 +6,8 @@ const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
 const entities_1 = require("entities");
 const fast_xml_parser_1 = require("fast-xml-parser");
+const CloudSearchServiceException_1 = require("../models/CloudSearchServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_queryBuildSuggestersCommand = async (input, context) => {
     const headers = {
         "content-type": "application/x-www-form-urlencoded",
@@ -367,51 +369,25 @@ const deserializeAws_queryBuildSuggestersCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryCreateDomainCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -438,59 +414,28 @@ const deserializeAws_queryCreateDomainCommandError = async (output, context) =>
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceAlreadyExistsException":
         case "com.amazonaws.cloudsearch#ResourceAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_queryResourceAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDefineAnalysisSchemeCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -517,67 +462,31 @@ const deserializeAws_queryDefineAnalysisSchemeCommandError = async (output, cont
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDefineExpressionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -604,67 +513,31 @@ const deserializeAws_queryDefineExpressionCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDefineIndexFieldCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -691,67 +564,31 @@ const deserializeAws_queryDefineIndexFieldCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDefineSuggesterCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -778,67 +615,31 @@ const deserializeAws_queryDefineSuggesterCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDeleteAnalysisSchemeCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -865,59 +666,28 @@ const deserializeAws_queryDeleteAnalysisSchemeCommandError = async (output, cont
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDeleteDomainCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -944,35 +714,19 @@ const deserializeAws_queryDeleteDomainCommandError = async (output, context) =>
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDeleteExpressionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -999,59 +753,28 @@ const deserializeAws_queryDeleteExpressionCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDeleteIndexFieldCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1078,59 +801,28 @@ const deserializeAws_queryDeleteIndexFieldCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDeleteSuggesterCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1157,59 +849,28 @@ const deserializeAws_queryDeleteSuggesterCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeAnalysisSchemesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1236,43 +897,22 @@ const deserializeAws_queryDescribeAnalysisSchemesCommandError = async (output, c
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeAvailabilityOptionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1299,67 +939,31 @@ const deserializeAws_queryDescribeAvailabilityOptionsCommandError = async (outpu
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.cloudsearch#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeDomainEndpointOptionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1386,59 +990,28 @@ const deserializeAws_queryDescribeDomainEndpointOptionsCommandError = async (out
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.cloudsearch#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeDomainsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1465,35 +1038,19 @@ const deserializeAws_queryDescribeDomainsCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeExpressionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1520,43 +1077,22 @@ const deserializeAws_queryDescribeExpressionsCommandError = async (output, conte
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeIndexFieldsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1583,43 +1119,22 @@ const deserializeAws_queryDescribeIndexFieldsCommandError = async (output, conte
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeScalingParametersCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1646,43 +1161,22 @@ const deserializeAws_queryDescribeScalingParametersCommandError = async (output,
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeServiceAccessPoliciesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1709,43 +1203,22 @@ const deserializeAws_queryDescribeServiceAccessPoliciesCommandError = async (out
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryDescribeSuggestersCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1772,43 +1245,22 @@ const deserializeAws_queryDescribeSuggestersCommandError = async (output, contex
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryIndexDocumentsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1835,51 +1287,25 @@ const deserializeAws_queryIndexDocumentsCommandError = async (output, context) =
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryListDomainNamesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1906,27 +1332,16 @@ const deserializeAws_queryListDomainNamesCommandError = async (output, context)
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryUpdateAvailabilityOptionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1953,75 +1368,34 @@ const deserializeAws_queryUpdateAvailabilityOptionsCommandError = async (output,
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.cloudsearch#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryUpdateDomainEndpointOptionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2048,75 +1422,34 @@ const deserializeAws_queryUpdateDomainEndpointOptionsCommandError = async (outpu
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.cloudsearch#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryDisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryUpdateScalingParametersCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2143,67 +1476,31 @@ const deserializeAws_queryUpdateScalingParametersCommandError = async (output, c
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryUpdateServiceAccessPoliciesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2230,155 +1527,103 @@ const deserializeAws_queryUpdateServiceAccessPoliciesCommandError = async (outpu
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.cloudsearch#BaseException":
-            response = {
-                ...(await deserializeAws_queryBaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryBaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.cloudsearch#InternalException":
-            response = {
-                ...(await deserializeAws_queryInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.cloudsearch#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryInvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.cloudsearch#LimitExceededException":
-            response = {
-                ...(await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryLimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudsearch#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.cloudsearch#ValidationException":
-            response = {
-                ...(await deserializeAws_queryValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_queryValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-            response = {
-                ...parsedBody.Error,
-                name: `${errorCode}`,
-                message: parsedBody.Error.message || parsedBody.Error.Message || errorCode,
+            response = new CloudSearchServiceException_1.CloudSearchServiceException({
+                name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody.Error);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_queryBaseExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryBaseException(body.Error, context);
-    const contents = {
-        name: "BaseException",
-        $fault: "client",
+    const exception = new models_0_1.BaseException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryDisabledOperationExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryDisabledOperationException(body.Error, context);
-    const contents = {
-        name: "DisabledOperationException",
-        $fault: "client",
+    const exception = new models_0_1.DisabledOperationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryInternalExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryInternalException(body.Error, context);
-    const contents = {
-        name: "InternalException",
-        $fault: "server",
+    const exception = new models_0_1.InternalException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryInvalidTypeExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryInvalidTypeException(body.Error, context);
-    const contents = {
-        name: "InvalidTypeException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidTypeException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryLimitExceededExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryLimitExceededException(body.Error, context);
-    const contents = {
-        name: "LimitExceededException",
-        $fault: "client",
+    const exception = new models_0_1.LimitExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryResourceAlreadyExistsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryResourceAlreadyExistsException(body.Error, context);
-    const contents = {
-        name: "ResourceAlreadyExistsException",
-        $fault: "client",
+    const exception = new models_0_1.ResourceAlreadyExistsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryResourceNotFoundException(body.Error, context);
-    const contents = {
-        name: "ResourceNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_queryValidationExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_queryValidationException(body.Error, context);
-    const contents = {
-        name: "ValidationException",
-        $fault: "client",
+    const exception = new models_0_1.ValidationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const serializeAws_queryAnalysisOptions = (input, context) => {
     const entries = {};