@aws-sdk/client-appsync 3.141.0 → 3.150.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,10 +1,10 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, map as __map, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { AppSyncServiceException as __BaseException } from "../models/AppSyncServiceException";
 import { AccessDeniedException, ApiKeyLimitExceededException, ApiKeyValidityOutOfBoundsException, ApiLimitExceededException, BadRequestException, ConcurrentModificationException, GraphQLSchemaException, InternalFailureException, LimitExceededException, NotFoundException, UnauthorizedException, } from "../models/models_0";
 export var serializeAws_restJson1AssociateApiCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -15,16 +15,7 @@ export var serializeAws_restJson1AssociateApiCommand = function (input, context)
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/domainnames/{domainName}/apiassociation";
-                if (input.domainName !== undefined) {
-                    labelValue = input.domainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: domainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{domainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: domainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "domainName", function () { return input.domainName; }, "{domainName}", false);
                 body = JSON.stringify(__assign({}, (input.apiId != null && { apiId: input.apiId })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -39,7 +30,7 @@ export var serializeAws_restJson1AssociateApiCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1CreateApiCacheCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -49,16 +40,7 @@ export var serializeAws_restJson1CreateApiCacheCommand = function (input, contex
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/ApiCaches";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign({}, (input.apiCachingBehavior != null && { apiCachingBehavior: input.apiCachingBehavior })), (input.atRestEncryptionEnabled != null && { atRestEncryptionEnabled: input.atRestEncryptionEnabled })), (input.transitEncryptionEnabled != null && { transitEncryptionEnabled: input.transitEncryptionEnabled })), (input.ttl != null && { ttl: input.ttl })), (input.type != null && { type: input.type })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -73,7 +55,7 @@ export var serializeAws_restJson1CreateApiCacheCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1CreateApiKeyCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -83,16 +65,7 @@ export var serializeAws_restJson1CreateApiKeyCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/apikeys";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.description != null && { description: input.description })), (input.expires != null && { expires: input.expires })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -107,7 +80,7 @@ export var serializeAws_restJson1CreateApiKeyCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1CreateDataSourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -117,16 +90,7 @@ export var serializeAws_restJson1CreateDataSourceCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/datasources";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.description != null && { description: input.description })), (input.dynamodbConfig != null && {
                     dynamodbConfig: serializeAws_restJson1DynamodbDataSourceConfig(input.dynamodbConfig, context),
                 })), (input.elasticsearchConfig != null && {
@@ -177,7 +141,7 @@ export var serializeAws_restJson1CreateDomainNameCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1CreateFunctionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -187,16 +151,7 @@ export var serializeAws_restJson1CreateFunctionCommand = function (input, contex
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/functions";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.dataSourceName != null && { dataSourceName: input.dataSourceName })), (input.description != null && { description: input.description })), (input.functionVersion != null && { functionVersion: input.functionVersion })), (input.maxBatchSize != null && { maxBatchSize: input.maxBatchSize })), (input.name != null && { name: input.name })), (input.requestMappingTemplate != null && { requestMappingTemplate: input.requestMappingTemplate })), (input.responseMappingTemplate != null && { responseMappingTemplate: input.responseMappingTemplate })), (input.syncConfig != null && { syncConfig: serializeAws_restJson1SyncConfig(input.syncConfig, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -243,7 +198,7 @@ export var serializeAws_restJson1CreateGraphqlApiCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1CreateResolverCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -254,26 +209,8 @@ export var serializeAws_restJson1CreateResolverCommand = function (input, contex
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/apis/{apiId}/types/{typeName}/resolvers";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.cachingConfig != null && {
                     cachingConfig: serializeAws_restJson1CachingConfig(input.cachingConfig, context),
                 })), (input.dataSourceName != null && { dataSourceName: input.dataSourceName })), (input.fieldName != null && { fieldName: input.fieldName })), (input.kind != null && { kind: input.kind })), (input.maxBatchSize != null && { maxBatchSize: input.maxBatchSize })), (input.pipelineConfig != null && {
@@ -292,7 +229,7 @@ export var serializeAws_restJson1CreateResolverCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1CreateTypeCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -302,16 +239,7 @@ export var serializeAws_restJson1CreateTypeCommand = function (input, context) {
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/types";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.definition != null && { definition: input.definition })), (input.format != null && { format: input.format })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -326,7 +254,7 @@ export var serializeAws_restJson1CreateTypeCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1DeleteApiCacheCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -334,16 +262,7 @@ export var serializeAws_restJson1DeleteApiCacheCommand = function (input, contex
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/ApiCaches";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -357,7 +276,7 @@ export var serializeAws_restJson1DeleteApiCacheCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1DeleteApiKeyCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -365,26 +284,8 @@ export var serializeAws_restJson1DeleteApiKeyCommand = function (input, context)
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/apikeys/{id}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -398,7 +299,7 @@ export var serializeAws_restJson1DeleteApiKeyCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1DeleteDataSourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -406,26 +307,8 @@ export var serializeAws_restJson1DeleteDataSourceCommand = function (input, cont
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/datasources/{name}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.name !== undefined) {
-                    labelValue = input.name;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: name.");
-                    }
-                    resolvedPath = resolvedPath.replace("{name}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: name.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "name", function () { return input.name; }, "{name}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -439,7 +322,7 @@ export var serializeAws_restJson1DeleteDataSourceCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1DeleteDomainNameCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -447,16 +330,7 @@ export var serializeAws_restJson1DeleteDomainNameCommand = function (input, cont
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/domainnames/{domainName}";
-                if (input.domainName !== undefined) {
-                    labelValue = input.domainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: domainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{domainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: domainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "domainName", function () { return input.domainName; }, "{domainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -470,7 +344,7 @@ export var serializeAws_restJson1DeleteDomainNameCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1DeleteFunctionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -478,26 +352,8 @@ export var serializeAws_restJson1DeleteFunctionCommand = function (input, contex
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/functions/{functionId}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.functionId !== undefined) {
-                    labelValue = input.functionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: functionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{functionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: functionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "functionId", function () { return input.functionId; }, "{functionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -511,7 +367,7 @@ export var serializeAws_restJson1DeleteFunctionCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1DeleteGraphqlApiCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -519,16 +375,7 @@ export var serializeAws_restJson1DeleteGraphqlApiCommand = function (input, cont
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -542,7 +389,7 @@ export var serializeAws_restJson1DeleteGraphqlApiCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1DeleteResolverCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -551,36 +398,9 @@ export var serializeAws_restJson1DeleteResolverCommand = function (input, contex
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/apis/{apiId}/types/{typeName}/resolvers/{fieldName}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
-                if (input.fieldName !== undefined) {
-                    labelValue = input.fieldName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: fieldName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{fieldName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: fieldName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "fieldName", function () { return input.fieldName; }, "{fieldName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -594,7 +414,7 @@ export var serializeAws_restJson1DeleteResolverCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1DeleteTypeCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -602,26 +422,8 @@ export var serializeAws_restJson1DeleteTypeCommand = function (input, context) {
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/types/{typeName}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -635,7 +437,7 @@ export var serializeAws_restJson1DeleteTypeCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1DisassociateApiCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -644,16 +446,7 @@ export var serializeAws_restJson1DisassociateApiCommand = function (input, conte
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/domainnames/{domainName}/apiassociation";
-                if (input.domainName !== undefined) {
-                    labelValue = input.domainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: domainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{domainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: domainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "domainName", function () { return input.domainName; }, "{domainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -691,7 +484,7 @@ export var serializeAws_restJson1EvaluateMappingTemplateCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1FlushApiCacheCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -699,16 +492,7 @@ export var serializeAws_restJson1FlushApiCacheCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/FlushCache";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -722,7 +506,7 @@ export var serializeAws_restJson1FlushApiCacheCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetApiAssociationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -731,16 +515,7 @@ export var serializeAws_restJson1GetApiAssociationCommand = function (input, con
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/domainnames/{domainName}/apiassociation";
-                if (input.domainName !== undefined) {
-                    labelValue = input.domainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: domainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{domainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: domainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "domainName", function () { return input.domainName; }, "{domainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -754,7 +529,7 @@ export var serializeAws_restJson1GetApiAssociationCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1GetApiCacheCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -762,16 +537,7 @@ export var serializeAws_restJson1GetApiCacheCommand = function (input, context)
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/ApiCaches";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -785,7 +551,7 @@ export var serializeAws_restJson1GetApiCacheCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1GetDataSourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -793,26 +559,8 @@ export var serializeAws_restJson1GetDataSourceCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/datasources/{name}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.name !== undefined) {
-                    labelValue = input.name;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: name.");
-                    }
-                    resolvedPath = resolvedPath.replace("{name}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: name.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "name", function () { return input.name; }, "{name}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -826,7 +574,7 @@ export var serializeAws_restJson1GetDataSourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetDomainNameCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -834,16 +582,7 @@ export var serializeAws_restJson1GetDomainNameCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/domainnames/{domainName}";
-                if (input.domainName !== undefined) {
-                    labelValue = input.domainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: domainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{domainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: domainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "domainName", function () { return input.domainName; }, "{domainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -857,7 +596,7 @@ export var serializeAws_restJson1GetDomainNameCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetFunctionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -865,26 +604,8 @@ export var serializeAws_restJson1GetFunctionCommand = function (input, context)
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/functions/{functionId}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.functionId !== undefined) {
-                    labelValue = input.functionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: functionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{functionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: functionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "functionId", function () { return input.functionId; }, "{functionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -898,7 +619,7 @@ export var serializeAws_restJson1GetFunctionCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1GetGraphqlApiCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -906,16 +627,7 @@ export var serializeAws_restJson1GetGraphqlApiCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -929,7 +641,7 @@ export var serializeAws_restJson1GetGraphqlApiCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetIntrospectionSchemaCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -937,17 +649,11 @@ export var serializeAws_restJson1GetIntrospectionSchemaCommand = function (input
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/schema";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                query = __assign(__assign({}, (input.format !== undefined && { format: input.format })), (input.includeDirectives !== undefined && { includeDirectives: input.includeDirectives.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                query = map({
+                    format: [, input.format],
+                    includeDirectives: [function () { return input.includeDirectives !== void 0; }, function () { return input.includeDirectives.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -962,7 +668,7 @@ export var serializeAws_restJson1GetIntrospectionSchemaCommand = function (input
     });
 }); };
 export var serializeAws_restJson1GetResolverCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -971,36 +677,9 @@ export var serializeAws_restJson1GetResolverCommand = function (input, context)
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/apis/{apiId}/types/{typeName}/resolvers/{fieldName}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
-                if (input.fieldName !== undefined) {
-                    labelValue = input.fieldName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: fieldName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{fieldName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: fieldName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "fieldName", function () { return input.fieldName; }, "{fieldName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1014,7 +693,7 @@ export var serializeAws_restJson1GetResolverCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1GetSchemaCreationStatusCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1022,16 +701,7 @@ export var serializeAws_restJson1GetSchemaCreationStatusCommand = function (inpu
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/schemacreation";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1045,7 +715,7 @@ export var serializeAws_restJson1GetSchemaCreationStatusCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1GetTypeCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1053,27 +723,11 @@ export var serializeAws_restJson1GetTypeCommand = function (input, context) { re
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/types/{typeName}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
-                query = __assign({}, (input.format !== undefined && { format: input.format }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
+                query = map({
+                    format: [, input.format],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1088,7 +742,7 @@ export var serializeAws_restJson1GetTypeCommand = function (input, context) { re
     });
 }); };
 export var serializeAws_restJson1ListApiKeysCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1096,17 +750,11 @@ export var serializeAws_restJson1ListApiKeysCommand = function (input, context)
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/apikeys";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1121,7 +769,7 @@ export var serializeAws_restJson1ListApiKeysCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1ListDataSourcesCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1129,17 +777,11 @@ export var serializeAws_restJson1ListDataSourcesCommand = function (input, conte
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/datasources";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1162,7 +804,10 @@ export var serializeAws_restJson1ListDomainNamesCommand = function (input, conte
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/domainnames";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1177,7 +822,7 @@ export var serializeAws_restJson1ListDomainNamesCommand = function (input, conte
     });
 }); };
 export var serializeAws_restJson1ListFunctionsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1185,17 +830,11 @@ export var serializeAws_restJson1ListFunctionsCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/functions";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1218,7 +857,10 @@ export var serializeAws_restJson1ListGraphqlApisCommand = function (input, conte
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1233,7 +875,7 @@ export var serializeAws_restJson1ListGraphqlApisCommand = function (input, conte
     });
 }); };
 export var serializeAws_restJson1ListResolversCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1242,27 +884,12 @@ export var serializeAws_restJson1ListResolversCommand = function (input, context
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/apis/{apiId}/types/{typeName}/resolvers";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1277,7 +904,7 @@ export var serializeAws_restJson1ListResolversCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1ListResolversByFunctionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1286,27 +913,12 @@ export var serializeAws_restJson1ListResolversByFunctionCommand = function (inpu
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/apis/{apiId}/functions/{functionId}/resolvers";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.functionId !== undefined) {
-                    labelValue = input.functionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: functionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{functionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: functionId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "functionId", function () { return input.functionId; }, "{functionId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1321,7 +933,7 @@ export var serializeAws_restJson1ListResolversByFunctionCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1ListTagsForResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1329,16 +941,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/tags/{resourceArn}";
-                if (input.resourceArn !== undefined) {
-                    labelValue = input.resourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: resourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{resourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1352,7 +955,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1ListTypesCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1360,17 +963,12 @@ export var serializeAws_restJson1ListTypesCommand = function (input, context) {
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/types";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                query = __assign(__assign(__assign({}, (input.format !== undefined && { format: input.format })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                query = map({
+                    format: [, input.format],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1385,7 +983,7 @@ export var serializeAws_restJson1ListTypesCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1StartSchemaCreationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1395,16 +993,7 @@ export var serializeAws_restJson1StartSchemaCreationCommand = function (input, c
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/schemacreation";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign({}, (input.definition != null && { definition: context.base64Encoder(input.definition) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1419,7 +1008,7 @@ export var serializeAws_restJson1StartSchemaCreationCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1TagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1429,16 +1018,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/tags/{resourceArn}";
-                if (input.resourceArn !== undefined) {
-                    labelValue = input.resourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: resourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{resourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn}", false);
                 body = JSON.stringify(__assign({}, (input.tags != null && { tags: serializeAws_restJson1TagMap(input.tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1453,7 +1033,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UntagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1461,17 +1041,10 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/tags/{resourceArn}";
-                if (input.resourceArn !== undefined) {
-                    labelValue = input.resourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: resourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{resourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
-                query = __assign({}, (input.tagKeys !== undefined && { tagKeys: (input.tagKeys || []).map(function (_entry) { return _entry; }) }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn}", false);
+                query = map({
+                    tagKeys: [function () { return input.tagKeys !== void 0; }, function () { return (input.tagKeys || []).map(function (_entry) { return _entry; }); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1486,7 +1059,7 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateApiCacheCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1496,16 +1069,7 @@ export var serializeAws_restJson1UpdateApiCacheCommand = function (input, contex
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/ApiCaches/update";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign(__assign({}, (input.apiCachingBehavior != null && { apiCachingBehavior: input.apiCachingBehavior })), (input.ttl != null && { ttl: input.ttl })), (input.type != null && { type: input.type })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1520,7 +1084,7 @@ export var serializeAws_restJson1UpdateApiCacheCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1UpdateApiKeyCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1530,26 +1094,8 @@ export var serializeAws_restJson1UpdateApiKeyCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/apikeys/{id}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.description != null && { description: input.description })), (input.expires != null && { expires: input.expires })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1564,7 +1110,7 @@ export var serializeAws_restJson1UpdateApiKeyCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UpdateDataSourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1574,26 +1120,8 @@ export var serializeAws_restJson1UpdateDataSourceCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/datasources/{name}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.name !== undefined) {
-                    labelValue = input.name;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: name.");
-                    }
-                    resolvedPath = resolvedPath.replace("{name}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: name.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "name", function () { return input.name; }, "{name}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.description != null && { description: input.description })), (input.dynamodbConfig != null && {
                     dynamodbConfig: serializeAws_restJson1DynamodbDataSourceConfig(input.dynamodbConfig, context),
                 })), (input.elasticsearchConfig != null && {
@@ -1620,7 +1148,7 @@ export var serializeAws_restJson1UpdateDataSourceCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateDomainNameCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1630,16 +1158,7 @@ export var serializeAws_restJson1UpdateDomainNameCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/domainnames/{domainName}";
-                if (input.domainName !== undefined) {
-                    labelValue = input.domainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: domainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{domainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: domainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "domainName", function () { return input.domainName; }, "{domainName}", false);
                 body = JSON.stringify(__assign({}, (input.description != null && { description: input.description })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1654,7 +1173,7 @@ export var serializeAws_restJson1UpdateDomainNameCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateFunctionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1664,26 +1183,8 @@ export var serializeAws_restJson1UpdateFunctionCommand = function (input, contex
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/functions/{functionId}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.functionId !== undefined) {
-                    labelValue = input.functionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: functionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{functionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: functionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "functionId", function () { return input.functionId; }, "{functionId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.dataSourceName != null && { dataSourceName: input.dataSourceName })), (input.description != null && { description: input.description })), (input.functionVersion != null && { functionVersion: input.functionVersion })), (input.maxBatchSize != null && { maxBatchSize: input.maxBatchSize })), (input.name != null && { name: input.name })), (input.requestMappingTemplate != null && { requestMappingTemplate: input.requestMappingTemplate })), (input.responseMappingTemplate != null && { responseMappingTemplate: input.responseMappingTemplate })), (input.syncConfig != null && { syncConfig: serializeAws_restJson1SyncConfig(input.syncConfig, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1698,7 +1199,7 @@ export var serializeAws_restJson1UpdateFunctionCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1UpdateGraphqlApiCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1708,16 +1209,7 @@ export var serializeAws_restJson1UpdateGraphqlApiCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.additionalAuthenticationProviders != null && {
                     additionalAuthenticationProviders: serializeAws_restJson1AdditionalAuthenticationProviders(input.additionalAuthenticationProviders, context),
                 })), (input.authenticationType != null && { authenticationType: input.authenticationType })), (input.lambdaAuthorizerConfig != null && {
@@ -1740,7 +1232,7 @@ export var serializeAws_restJson1UpdateGraphqlApiCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateResolverCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1751,36 +1243,9 @@ export var serializeAws_restJson1UpdateResolverCommand = function (input, contex
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/apis/{apiId}/types/{typeName}/resolvers/{fieldName}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
-                if (input.fieldName !== undefined) {
-                    labelValue = input.fieldName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: fieldName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{fieldName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: fieldName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "fieldName", function () { return input.fieldName; }, "{fieldName}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.cachingConfig != null && {
                     cachingConfig: serializeAws_restJson1CachingConfig(input.cachingConfig, context),
                 })), (input.dataSourceName != null && { dataSourceName: input.dataSourceName })), (input.kind != null && { kind: input.kind })), (input.maxBatchSize != null && { maxBatchSize: input.maxBatchSize })), (input.pipelineConfig != null && {
@@ -1799,7 +1264,7 @@ export var serializeAws_restJson1UpdateResolverCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1UpdateTypeCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1809,26 +1274,8 @@ export var serializeAws_restJson1UpdateTypeCommand = function (input, context) {
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/apis/{apiId}/types/{typeName}";
-                if (input.apiId !== undefined) {
-                    labelValue = input.apiId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: apiId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{apiId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: apiId.");
-                }
-                if (input.typeName !== undefined) {
-                    labelValue = input.typeName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: typeName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{typeName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: typeName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "apiId", function () { return input.apiId; }, "{apiId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "typeName", function () { return input.typeName; }, "{typeName}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.definition != null && { definition: input.definition })), (input.format != null && { format: input.format })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1850,24 +1297,23 @@ export var deserializeAws_restJson1AssociateApiCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateApiCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiAssociation: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiAssociation !== undefined && data.apiAssociation !== null) {
+                if (data.apiAssociation != null) {
                     contents.apiAssociation = deserializeAws_restJson1ApiAssociation(data.apiAssociation, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociateApiCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1900,14 +1346,14 @@ var deserializeAws_restJson1AssociateApiCommandError = function (output, context
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1919,24 +1365,23 @@ export var deserializeAws_restJson1CreateApiCacheCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateApiCacheCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiCache: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiCache !== undefined && data.apiCache !== null) {
+                if (data.apiCache != null) {
                     contents.apiCache = deserializeAws_restJson1ApiCache(data.apiCache, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateApiCacheCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1973,14 +1418,14 @@ var deserializeAws_restJson1CreateApiCacheCommandError = function (output, conte
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1992,24 +1437,23 @@ export var deserializeAws_restJson1CreateApiKeyCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateApiKeyCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiKey: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiKey !== undefined && data.apiKey !== null) {
+                if (data.apiKey != null) {
                     contents.apiKey = deserializeAws_restJson1ApiKey(data.apiKey, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateApiKeyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2054,14 +1498,14 @@ var deserializeAws_restJson1CreateApiKeyCommandError = function (output, context
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2073,24 +1517,23 @@ export var deserializeAws_restJson1CreateDataSourceCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateDataSourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    dataSource: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.dataSource !== undefined && data.dataSource !== null) {
+                if (data.dataSource != null) {
                     contents.dataSource = deserializeAws_restJson1DataSource(data.dataSource, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateDataSourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2127,14 +1570,14 @@ var deserializeAws_restJson1CreateDataSourceCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2146,24 +1589,23 @@ export var deserializeAws_restJson1CreateDomainNameCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateDomainNameCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    domainNameConfig: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.domainNameConfig !== undefined && data.domainNameConfig !== null) {
+                if (data.domainNameConfig != null) {
                     contents.domainNameConfig = deserializeAws_restJson1DomainNameConfig(data.domainNameConfig, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateDomainNameCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2192,14 +1634,14 @@ var deserializeAws_restJson1CreateDomainNameCommandError = function (output, con
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2211,24 +1653,23 @@ export var deserializeAws_restJson1CreateFunctionCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateFunctionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    functionConfiguration: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.functionConfiguration !== undefined && data.functionConfiguration !== null) {
+                if (data.functionConfiguration != null) {
                     contents.functionConfiguration = deserializeAws_restJson1FunctionConfiguration(data.functionConfiguration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateFunctionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2261,14 +1702,14 @@ var deserializeAws_restJson1CreateFunctionCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2280,24 +1721,23 @@ export var deserializeAws_restJson1CreateGraphqlApiCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateGraphqlApiCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    graphqlApi: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.graphqlApi !== undefined && data.graphqlApi !== null) {
+                if (data.graphqlApi != null) {
                     contents.graphqlApi = deserializeAws_restJson1GraphqlApi(data.graphqlApi, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateGraphqlApiCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2338,14 +1778,14 @@ var deserializeAws_restJson1CreateGraphqlApiCommandError = function (output, con
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2357,24 +1797,23 @@ export var deserializeAws_restJson1CreateResolverCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateResolverCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    resolver: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.resolver !== undefined && data.resolver !== null) {
+                if (data.resolver != null) {
                     contents.resolver = deserializeAws_restJson1Resolver(data.resolver, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateResolverCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2407,14 +1846,14 @@ var deserializeAws_restJson1CreateResolverCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2426,24 +1865,23 @@ export var deserializeAws_restJson1CreateTypeCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateTypeCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    type: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.type !== undefined && data.type !== null) {
+                if (data.type != null) {
                     contents.type = deserializeAws_restJson1Type(data.type, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateTypeCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2480,14 +1918,14 @@ var deserializeAws_restJson1CreateTypeCommandError = function (output, context)
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2499,18 +1937,18 @@ export var deserializeAws_restJson1DeleteApiCacheCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteApiCacheCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteApiCacheCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2547,14 +1985,14 @@ var deserializeAws_restJson1DeleteApiCacheCommandError = function (output, conte
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2566,18 +2004,18 @@ export var deserializeAws_restJson1DeleteApiKeyCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteApiKeyCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteApiKeyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2610,14 +2048,14 @@ var deserializeAws_restJson1DeleteApiKeyCommandError = function (output, context
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2629,18 +2067,18 @@ export var deserializeAws_restJson1DeleteDataSourceCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteDataSourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteDataSourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2677,14 +2115,14 @@ var deserializeAws_restJson1DeleteDataSourceCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2696,18 +2134,18 @@ export var deserializeAws_restJson1DeleteDomainNameCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteDomainNameCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteDomainNameCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2744,14 +2182,14 @@ var deserializeAws_restJson1DeleteDomainNameCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2763,18 +2201,18 @@ export var deserializeAws_restJson1DeleteFunctionCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteFunctionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteFunctionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2807,14 +2245,14 @@ var deserializeAws_restJson1DeleteFunctionCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2826,18 +2264,18 @@ export var deserializeAws_restJson1DeleteGraphqlApiCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteGraphqlApiCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteGraphqlApiCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2878,14 +2316,14 @@ var deserializeAws_restJson1DeleteGraphqlApiCommandError = function (output, con
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2897,18 +2335,18 @@ export var deserializeAws_restJson1DeleteResolverCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteResolverCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteResolverCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2941,14 +2379,14 @@ var deserializeAws_restJson1DeleteResolverCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2960,18 +2398,18 @@ export var deserializeAws_restJson1DeleteTypeCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteTypeCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteTypeCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3008,14 +2446,14 @@ var deserializeAws_restJson1DeleteTypeCommandError = function (output, context)
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3027,18 +2465,18 @@ export var deserializeAws_restJson1DisassociateApiCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateApiCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DisassociateApiCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3075,14 +2513,14 @@ var deserializeAws_restJson1DisassociateApiCommandError = function (output, cont
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3094,28 +2532,26 @@ export var deserializeAws_restJson1EvaluateMappingTemplateCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1EvaluateMappingTemplateCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    error: undefined,
-                    evaluationResult: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.error !== undefined && data.error !== null) {
+                if (data.error != null) {
                     contents.error = deserializeAws_restJson1ErrorDetail(data.error, context);
                 }
-                if (data.evaluationResult !== undefined && data.evaluationResult !== null) {
+                if (data.evaluationResult != null) {
                     contents.evaluationResult = __expectString(data.evaluationResult);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1EvaluateMappingTemplateCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3144,14 +2580,14 @@ var deserializeAws_restJson1EvaluateMappingTemplateCommandError = function (outp
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3163,18 +2599,18 @@ export var deserializeAws_restJson1FlushApiCacheCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1FlushApiCacheCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1FlushApiCacheCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3211,14 +2647,14 @@ var deserializeAws_restJson1FlushApiCacheCommandError = function (output, contex
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3230,24 +2666,23 @@ export var deserializeAws_restJson1GetApiAssociationCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetApiAssociationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiAssociation: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiAssociation !== undefined && data.apiAssociation !== null) {
+                if (data.apiAssociation != null) {
                     contents.apiAssociation = deserializeAws_restJson1ApiAssociation(data.apiAssociation, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetApiAssociationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3280,14 +2715,14 @@ var deserializeAws_restJson1GetApiAssociationCommandError = function (output, co
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -3299,24 +2734,23 @@ export var deserializeAws_restJson1GetApiCacheCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetApiCacheCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiCache: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiCache !== undefined && data.apiCache !== null) {
+                if (data.apiCache != null) {
                     contents.apiCache = deserializeAws_restJson1ApiCache(data.apiCache, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetApiCacheCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3353,14 +2787,14 @@ var deserializeAws_restJson1GetApiCacheCommandError = function (output, context)
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3372,24 +2806,23 @@ export var deserializeAws_restJson1GetDataSourceCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetDataSourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    dataSource: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.dataSource !== undefined && data.dataSource !== null) {
+                if (data.dataSource != null) {
                     contents.dataSource = deserializeAws_restJson1DataSource(data.dataSource, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetDataSourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3426,14 +2859,14 @@ var deserializeAws_restJson1GetDataSourceCommandError = function (output, contex
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3445,24 +2878,23 @@ export var deserializeAws_restJson1GetDomainNameCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetDomainNameCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    domainNameConfig: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.domainNameConfig !== undefined && data.domainNameConfig !== null) {
+                if (data.domainNameConfig != null) {
                     contents.domainNameConfig = deserializeAws_restJson1DomainNameConfig(data.domainNameConfig, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetDomainNameCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3495,14 +2927,14 @@ var deserializeAws_restJson1GetDomainNameCommandError = function (output, contex
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -3514,24 +2946,23 @@ export var deserializeAws_restJson1GetFunctionCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetFunctionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    functionConfiguration: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.functionConfiguration !== undefined && data.functionConfiguration !== null) {
+                if (data.functionConfiguration != null) {
                     contents.functionConfiguration = deserializeAws_restJson1FunctionConfiguration(data.functionConfiguration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetFunctionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3560,14 +2991,14 @@ var deserializeAws_restJson1GetFunctionCommandError = function (output, context)
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3579,24 +3010,23 @@ export var deserializeAws_restJson1GetGraphqlApiCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetGraphqlApiCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    graphqlApi: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.graphqlApi !== undefined && data.graphqlApi !== null) {
+                if (data.graphqlApi != null) {
                     contents.graphqlApi = deserializeAws_restJson1GraphqlApi(data.graphqlApi, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetGraphqlApiCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3633,14 +3063,14 @@ var deserializeAws_restJson1GetGraphqlApiCommandError = function (output, contex
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3652,20 +3082,19 @@ export var deserializeAws_restJson1GetIntrospectionSchemaCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetIntrospectionSchemaCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    schema: undefined,
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 data = _a.sent();
                 contents.schema = data;
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetIntrospectionSchemaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3698,14 +3127,14 @@ var deserializeAws_restJson1GetIntrospectionSchemaCommandError = function (outpu
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -3717,24 +3146,23 @@ export var deserializeAws_restJson1GetResolverCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetResolverCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    resolver: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.resolver !== undefined && data.resolver !== null) {
+                if (data.resolver != null) {
                     contents.resolver = deserializeAws_restJson1Resolver(data.resolver, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetResolverCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3763,14 +3191,14 @@ var deserializeAws_restJson1GetResolverCommandError = function (output, context)
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3782,28 +3210,26 @@ export var deserializeAws_restJson1GetSchemaCreationStatusCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetSchemaCreationStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    details: undefined,
-                    status: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.details !== undefined && data.details !== null) {
+                if (data.details != null) {
                     contents.details = __expectString(data.details);
                 }
-                if (data.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetSchemaCreationStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3836,14 +3262,14 @@ var deserializeAws_restJson1GetSchemaCreationStatusCommandError = function (outp
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -3855,24 +3281,23 @@ export var deserializeAws_restJson1GetTypeCommand = function (output, context) {
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetTypeCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    type: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.type !== undefined && data.type !== null) {
+                if (data.type != null) {
                     contents.type = deserializeAws_restJson1Type(data.type, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetTypeCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3909,14 +3334,14 @@ var deserializeAws_restJson1GetTypeCommandError = function (output, context) { r
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3928,28 +3353,26 @@ export var deserializeAws_restJson1ListApiKeysCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListApiKeysCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiKeys: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiKeys !== undefined && data.apiKeys !== null) {
+                if (data.apiKeys != null) {
                     contents.apiKeys = deserializeAws_restJson1ApiKeys(data.apiKeys, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListApiKeysCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3982,14 +3405,14 @@ var deserializeAws_restJson1ListApiKeysCommandError = function (output, context)
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -4001,28 +3424,26 @@ export var deserializeAws_restJson1ListDataSourcesCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDataSourcesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    dataSources: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.dataSources !== undefined && data.dataSources !== null) {
+                if (data.dataSources != null) {
                     contents.dataSources = deserializeAws_restJson1DataSources(data.dataSources, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListDataSourcesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4055,14 +3476,14 @@ var deserializeAws_restJson1ListDataSourcesCommandError = function (output, cont
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -4074,28 +3495,26 @@ export var deserializeAws_restJson1ListDomainNamesCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDomainNamesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    domainNameConfigs: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.domainNameConfigs !== undefined && data.domainNameConfigs !== null) {
+                if (data.domainNameConfigs != null) {
                     contents.domainNameConfigs = deserializeAws_restJson1DomainNameConfigs(data.domainNameConfigs, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListDomainNamesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4124,14 +3543,14 @@ var deserializeAws_restJson1ListDomainNamesCommandError = function (output, cont
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4143,28 +3562,26 @@ export var deserializeAws_restJson1ListFunctionsCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListFunctionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    functions: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.functions !== undefined && data.functions !== null) {
+                if (data.functions != null) {
                     contents.functions = deserializeAws_restJson1Functions(data.functions, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListFunctionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4197,14 +3614,14 @@ var deserializeAws_restJson1ListFunctionsCommandError = function (output, contex
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -4216,28 +3633,26 @@ export var deserializeAws_restJson1ListGraphqlApisCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListGraphqlApisCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    graphqlApis: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.graphqlApis !== undefined && data.graphqlApis !== null) {
+                if (data.graphqlApis != null) {
                     contents.graphqlApis = deserializeAws_restJson1GraphqlApis(data.graphqlApis, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListGraphqlApisCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4266,14 +3681,14 @@ var deserializeAws_restJson1ListGraphqlApisCommandError = function (output, cont
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4285,28 +3700,26 @@ export var deserializeAws_restJson1ListResolversCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListResolversCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    resolvers: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.resolvers !== undefined && data.resolvers !== null) {
+                if (data.resolvers != null) {
                     contents.resolvers = deserializeAws_restJson1Resolvers(data.resolvers, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListResolversCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4339,14 +3752,14 @@ var deserializeAws_restJson1ListResolversCommandError = function (output, contex
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -4358,28 +3771,26 @@ export var deserializeAws_restJson1ListResolversByFunctionCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListResolversByFunctionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    resolvers: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.resolvers !== undefined && data.resolvers !== null) {
+                if (data.resolvers != null) {
                     contents.resolvers = deserializeAws_restJson1Resolvers(data.resolvers, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListResolversByFunctionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4412,14 +3823,14 @@ var deserializeAws_restJson1ListResolversByFunctionCommandError = function (outp
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -4431,24 +3842,23 @@ export var deserializeAws_restJson1ListTagsForResourceCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTagsForResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    tags: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.tags !== undefined && data.tags !== null) {
+                if (data.tags != null) {
                     contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4489,14 +3899,14 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -4508,28 +3918,26 @@ export var deserializeAws_restJson1ListTypesCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTypesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    types: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.types !== undefined && data.types !== null) {
+                if (data.types != null) {
                     contents.types = deserializeAws_restJson1TypeList(data.types, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTypesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4566,14 +3974,14 @@ var deserializeAws_restJson1ListTypesCommandError = function (output, context) {
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -4585,24 +3993,23 @@ export var deserializeAws_restJson1StartSchemaCreationCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartSchemaCreationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    status: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartSchemaCreationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4639,14 +4046,14 @@ var deserializeAws_restJson1StartSchemaCreationCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -4658,18 +4065,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1TagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4710,14 +4117,14 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -4729,18 +4136,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UntagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4781,14 +4188,14 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -4800,24 +4207,23 @@ export var deserializeAws_restJson1UpdateApiCacheCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateApiCacheCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiCache: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiCache !== undefined && data.apiCache !== null) {
+                if (data.apiCache != null) {
                     contents.apiCache = deserializeAws_restJson1ApiCache(data.apiCache, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateApiCacheCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4854,14 +4260,14 @@ var deserializeAws_restJson1UpdateApiCacheCommandError = function (output, conte
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -4873,24 +4279,23 @@ export var deserializeAws_restJson1UpdateApiKeyCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateApiKeyCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    apiKey: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.apiKey !== undefined && data.apiKey !== null) {
+                if (data.apiKey != null) {
                     contents.apiKey = deserializeAws_restJson1ApiKey(data.apiKey, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateApiKeyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -4931,14 +4336,14 @@ var deserializeAws_restJson1UpdateApiKeyCommandError = function (output, context
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -4950,24 +4355,23 @@ export var deserializeAws_restJson1UpdateDataSourceCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateDataSourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    dataSource: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.dataSource !== undefined && data.dataSource !== null) {
+                if (data.dataSource != null) {
                     contents.dataSource = deserializeAws_restJson1DataSource(data.dataSource, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateDataSourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5004,14 +4408,14 @@ var deserializeAws_restJson1UpdateDataSourceCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -5023,24 +4427,23 @@ export var deserializeAws_restJson1UpdateDomainNameCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateDomainNameCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    domainNameConfig: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.domainNameConfig !== undefined && data.domainNameConfig !== null) {
+                if (data.domainNameConfig != null) {
                     contents.domainNameConfig = deserializeAws_restJson1DomainNameConfig(data.domainNameConfig, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateDomainNameCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5077,14 +4480,14 @@ var deserializeAws_restJson1UpdateDomainNameCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -5096,24 +4499,23 @@ export var deserializeAws_restJson1UpdateFunctionCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateFunctionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    functionConfiguration: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.functionConfiguration !== undefined && data.functionConfiguration !== null) {
+                if (data.functionConfiguration != null) {
                     contents.functionConfiguration = deserializeAws_restJson1FunctionConfiguration(data.functionConfiguration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateFunctionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5146,14 +4548,14 @@ var deserializeAws_restJson1UpdateFunctionCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -5165,24 +4567,23 @@ export var deserializeAws_restJson1UpdateGraphqlApiCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateGraphqlApiCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    graphqlApi: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.graphqlApi !== undefined && data.graphqlApi !== null) {
+                if (data.graphqlApi != null) {
                     contents.graphqlApi = deserializeAws_restJson1GraphqlApi(data.graphqlApi, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateGraphqlApiCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5223,14 +4624,14 @@ var deserializeAws_restJson1UpdateGraphqlApiCommandError = function (output, con
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -5242,24 +4643,23 @@ export var deserializeAws_restJson1UpdateResolverCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateResolverCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    resolver: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.resolver !== undefined && data.resolver !== null) {
+                if (data.resolver != null) {
                     contents.resolver = deserializeAws_restJson1Resolver(data.resolver, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateResolverCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5292,14 +4692,14 @@ var deserializeAws_restJson1UpdateResolverCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -5311,24 +4711,23 @@ export var deserializeAws_restJson1UpdateTypeCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateTypeCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    type: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.type !== undefined && data.type !== null) {
+                if (data.type != null) {
                     contents.type = deserializeAws_restJson1Type(data.type, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateTypeCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5365,23 +4764,24 @@ var deserializeAws_restJson1UpdateTypeCommandError = function (output, context)
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
+var map = __map;
 var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new AccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5391,9 +4791,9 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 var deserializeAws_restJson1ApiKeyLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ApiKeyLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5403,9 +4803,9 @@ var deserializeAws_restJson1ApiKeyLimitExceededExceptionResponse = function (par
 var deserializeAws_restJson1ApiKeyValidityOutOfBoundsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ApiKeyValidityOutOfBoundsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5415,9 +4815,9 @@ var deserializeAws_restJson1ApiKeyValidityOutOfBoundsExceptionResponse = functio
 var deserializeAws_restJson1ApiLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ApiLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5427,9 +4827,9 @@ var deserializeAws_restJson1ApiLimitExceededExceptionResponse = function (parsed
 var deserializeAws_restJson1BadRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new BadRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5439,9 +4839,9 @@ var deserializeAws_restJson1BadRequestExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1ConcurrentModificationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ConcurrentModificationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5451,9 +4851,9 @@ var deserializeAws_restJson1ConcurrentModificationExceptionResponse = function (
 var deserializeAws_restJson1GraphQLSchemaExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new GraphQLSchemaException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5463,9 +4863,9 @@ var deserializeAws_restJson1GraphQLSchemaExceptionResponse = function (parsedOut
 var deserializeAws_restJson1InternalFailureExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new InternalFailureException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5475,9 +4875,9 @@ var deserializeAws_restJson1InternalFailureExceptionResponse = function (parsedO
 var deserializeAws_restJson1LimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new LimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5487,9 +4887,9 @@ var deserializeAws_restJson1LimitExceededExceptionResponse = function (parsedOut
 var deserializeAws_restJson1NotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new NotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5499,9 +4899,9 @@ var deserializeAws_restJson1NotFoundExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1UnauthorizedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new UnauthorizedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -5521,9 +4921,6 @@ var serializeAws_restJson1AdditionalAuthenticationProviders = function (input, c
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AdditionalAuthenticationProvider(entry, context);
     });
 };
@@ -5542,9 +4939,6 @@ var serializeAws_restJson1CachingKeys = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -5566,9 +4960,6 @@ var serializeAws_restJson1FunctionsIds = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };