@aws-sdk/client-ecr 3.51.0 → 3.54.0

package/dist-es/protocols/Aws_json1_1.js

@@ -1,6 +1,8 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectString as __expectString, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectString as __expectString, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
+import { ECRServiceException as __BaseException } from "../models/ECRServiceException";
+import { EmptyUploadException, ImageAlreadyExistsException, ImageDigestDoesNotMatchException, ImageNotFoundException, ImageTagAlreadyExistsException, InvalidLayerException, InvalidLayerPartException, InvalidParameterException, InvalidTagParameterException, KmsException, LayerAlreadyExistsException, LayerInaccessibleException, LayerPartTooSmallException, LayersNotFoundException, LifecyclePolicyNotFoundException, LifecyclePolicyPreviewInProgressException, LifecyclePolicyPreviewNotFoundException, LimitExceededException, PullThroughCacheRuleAlreadyExistsException, PullThroughCacheRuleNotFoundException, ReferencedImagesNotFoundException, RegistryPolicyNotFoundException, RepositoryAlreadyExistsException, RepositoryNotEmptyException, RepositoryNotFoundException, RepositoryPolicyNotFoundException, ScanNotFoundException, ServerException, TooManyTagsException, UnsupportedImageTypeException, UnsupportedUpstreamRegistryException, UploadNotFoundException, ValidationException, } from "../models/models_0";
 export var serializeAws_json1_1BatchCheckLayerAvailabilityCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var headers, body;
     return __generator(this, function (_a) {
@@ -471,16 +473,16 @@ export var deserializeAws_json1_1BatchCheckLayerAvailabilityCommand = function (
     });
 }); };
 var deserializeAws_json1_1BatchCheckLayerAvailabilityCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -493,34 +495,20 @@ var deserializeAws_json1_1BatchCheckLayerAvailabilityCommandError = function (ou
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -543,16 +531,16 @@ export var deserializeAws_json1_1BatchDeleteImageCommand = function (output, con
     });
 }); };
 var deserializeAws_json1_1BatchDeleteImageCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -565,34 +553,20 @@ var deserializeAws_json1_1BatchDeleteImageCommandError = function (output, conte
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -615,16 +589,16 @@ export var deserializeAws_json1_1BatchGetImageCommand = function (output, contex
     });
 }); };
 var deserializeAws_json1_1BatchGetImageCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -637,34 +611,20 @@ var deserializeAws_json1_1BatchGetImageCommandError = function (output, context)
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -687,16 +647,16 @@ export var deserializeAws_json1_1BatchGetRepositoryScanningConfigurationCommand
     });
 }); };
 var deserializeAws_json1_1BatchGetRepositoryScanningConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -711,40 +671,22 @@ var deserializeAws_json1_1BatchGetRepositoryScanningConfigurationCommandError =
                     case "com.amazonaws.ecr#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -767,16 +709,16 @@ export var deserializeAws_json1_1CompleteLayerUploadCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1CompleteLayerUploadCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, parsedBody, message;
-    var _m;
-    return __generator(this, function (_o) {
-        switch (_o.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _m = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_m.body = _o.sent(), _m)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -801,70 +743,32 @@ var deserializeAws_json1_1CompleteLayerUploadCommandError = function (output, co
                     case "com.amazonaws.ecr#UploadNotFoundException": return [3, 18];
                 }
                 return [3, 20];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EmptyUploadExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidLayerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1LayerAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1LayerPartTooSmallExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1UploadNotFoundExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
+            case 2: return [4, deserializeAws_json1_1EmptyUploadExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidLayerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1LayerAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1LayerPartTooSmallExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1UploadNotFoundExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
             case 20:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _o.label = 21;
-            case 21:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -887,16 +791,16 @@ export var deserializeAws_json1_1CreatePullThroughCacheRuleCommand = function (o
     });
 }); };
 var deserializeAws_json1_1CreatePullThroughCacheRuleCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -915,52 +819,26 @@ var deserializeAws_json1_1CreatePullThroughCacheRuleCommandError = function (out
                     case "com.amazonaws.ecr#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1PullThroughCacheRuleAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1UnsupportedUpstreamRegistryExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1PullThroughCacheRuleAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1UnsupportedUpstreamRegistryExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -983,16 +861,16 @@ export var deserializeAws_json1_1CreateRepositoryCommand = function (output, con
     });
 }); };
 var deserializeAws_json1_1CreateRepositoryCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1013,58 +891,28 @@ var deserializeAws_json1_1CreateRepositoryCommandError = function (output, conte
                     case "com.amazonaws.ecr#TooManyTagsException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1RepositoryAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1TooManyTagsExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1RepositoryAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1TooManyTagsExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _l.label = 17;
-            case 17:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1087,16 +935,16 @@ export var deserializeAws_json1_1DeleteLifecyclePolicyCommand = function (output
     });
 }); };
 var deserializeAws_json1_1DeleteLifecyclePolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1111,40 +959,22 @@ var deserializeAws_json1_1DeleteLifecyclePolicyCommandError = function (output,
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1167,16 +997,16 @@ export var deserializeAws_json1_1DeletePullThroughCacheRuleCommand = function (o
     });
 }); };
 var deserializeAws_json1_1DeletePullThroughCacheRuleCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1191,40 +1021,22 @@ var deserializeAws_json1_1DeletePullThroughCacheRuleCommandError = function (out
                     case "com.amazonaws.ecr#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1PullThroughCacheRuleNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1PullThroughCacheRuleNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1247,16 +1059,16 @@ export var deserializeAws_json1_1DeleteRegistryPolicyCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1DeleteRegistryPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1271,40 +1083,22 @@ var deserializeAws_json1_1DeleteRegistryPolicyCommandError = function (output, c
                     case "com.amazonaws.ecr#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RegistryPolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RegistryPolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1327,16 +1121,16 @@ export var deserializeAws_json1_1DeleteRepositoryCommand = function (output, con
     });
 }); };
 var deserializeAws_json1_1DeleteRepositoryCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1353,46 +1147,24 @@ var deserializeAws_json1_1DeleteRepositoryCommandError = function (output, conte
                     case "com.amazonaws.ecr#ServerException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotEmptyExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotEmptyExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1415,16 +1187,16 @@ export var deserializeAws_json1_1DeleteRepositoryPolicyCommand = function (outpu
     });
 }); };
 var deserializeAws_json1_1DeleteRepositoryPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1439,40 +1211,22 @@ var deserializeAws_json1_1DeleteRepositoryPolicyCommandError = function (output,
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryPolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryPolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1495,16 +1249,16 @@ export var deserializeAws_json1_1DescribeImageReplicationStatusCommand = functio
     });
 }); };
 var deserializeAws_json1_1DescribeImageReplicationStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1521,46 +1275,24 @@ var deserializeAws_json1_1DescribeImageReplicationStatusCommandError = function
                     case "com.amazonaws.ecr#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1583,16 +1315,16 @@ export var deserializeAws_json1_1DescribeImagesCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1DescribeImagesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1607,40 +1339,22 @@ var deserializeAws_json1_1DescribeImagesCommandError = function (output, context
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1663,16 +1377,16 @@ export var deserializeAws_json1_1DescribeImageScanFindingsCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1DescribeImageScanFindingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1691,52 +1405,26 @@ var deserializeAws_json1_1DescribeImageScanFindingsCommandError = function (outp
                     case "com.amazonaws.ecr#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ScanNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ScanNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1759,16 +1447,16 @@ export var deserializeAws_json1_1DescribePullThroughCacheRulesCommand = function
     });
 }); };
 var deserializeAws_json1_1DescribePullThroughCacheRulesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1783,40 +1471,22 @@ var deserializeAws_json1_1DescribePullThroughCacheRulesCommandError = function (
                     case "com.amazonaws.ecr#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1PullThroughCacheRuleNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1PullThroughCacheRuleNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1839,16 +1509,16 @@ export var deserializeAws_json1_1DescribeRegistryCommand = function (output, con
     });
 }); };
 var deserializeAws_json1_1DescribeRegistryCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1861,34 +1531,20 @@ var deserializeAws_json1_1DescribeRegistryCommandError = function (output, conte
                     case "com.amazonaws.ecr#ValidationException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1911,16 +1567,16 @@ export var deserializeAws_json1_1DescribeRepositoriesCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1DescribeRepositoriesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1933,34 +1589,20 @@ var deserializeAws_json1_1DescribeRepositoriesCommandError = function (output, c
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1983,16 +1625,16 @@ export var deserializeAws_json1_1GetAuthorizationTokenCommand = function (output
     });
 }); };
 var deserializeAws_json1_1GetAuthorizationTokenCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, parsedBody, message;
-    var _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _e = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_e.body = _f.sent(), _e)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2003,28 +1645,18 @@ var deserializeAws_json1_1GetAuthorizationTokenCommandError = function (output,
                     case "com.amazonaws.ecr#ServerException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2047,16 +1679,16 @@ export var deserializeAws_json1_1GetDownloadUrlForLayerCommand = function (outpu
     });
 }); };
 var deserializeAws_json1_1GetDownloadUrlForLayerCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2073,46 +1705,24 @@ var deserializeAws_json1_1GetDownloadUrlForLayerCommandError = function (output,
                     case "com.amazonaws.ecr#ServerException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1LayerInaccessibleExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1LayersNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1LayerInaccessibleExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1LayersNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2135,16 +1745,16 @@ export var deserializeAws_json1_1GetLifecyclePolicyCommand = function (output, c
     });
 }); };
 var deserializeAws_json1_1GetLifecyclePolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2159,40 +1769,22 @@ var deserializeAws_json1_1GetLifecyclePolicyCommandError = function (output, con
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2215,16 +1807,16 @@ export var deserializeAws_json1_1GetLifecyclePolicyPreviewCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1GetLifecyclePolicyPreviewCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2239,40 +1831,22 @@ var deserializeAws_json1_1GetLifecyclePolicyPreviewCommandError = function (outp
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1LifecyclePolicyPreviewNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1LifecyclePolicyPreviewNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2295,16 +1869,16 @@ export var deserializeAws_json1_1GetRegistryPolicyCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1GetRegistryPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2319,40 +1893,22 @@ var deserializeAws_json1_1GetRegistryPolicyCommandError = function (output, cont
                     case "com.amazonaws.ecr#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RegistryPolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RegistryPolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2375,16 +1931,16 @@ export var deserializeAws_json1_1GetRegistryScanningConfigurationCommand = funct
     });
 }); };
 var deserializeAws_json1_1GetRegistryScanningConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2397,34 +1953,20 @@ var deserializeAws_json1_1GetRegistryScanningConfigurationCommandError = functio
                     case "com.amazonaws.ecr#ValidationException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2447,16 +1989,16 @@ export var deserializeAws_json1_1GetRepositoryPolicyCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1GetRepositoryPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2471,40 +2013,22 @@ var deserializeAws_json1_1GetRepositoryPolicyCommandError = function (output, co
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryPolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryPolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2527,16 +2051,16 @@ export var deserializeAws_json1_1InitiateLayerUploadCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1InitiateLayerUploadCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2551,40 +2075,22 @@ var deserializeAws_json1_1InitiateLayerUploadCommandError = function (output, co
                     case "com.amazonaws.ecr#ServerException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2607,16 +2113,16 @@ export var deserializeAws_json1_1ListImagesCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1ListImagesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2629,34 +2135,20 @@ var deserializeAws_json1_1ListImagesCommandError = function (output, context) {
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2679,16 +2171,16 @@ export var deserializeAws_json1_1ListTagsForResourceCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2701,34 +2193,20 @@ var deserializeAws_json1_1ListTagsForResourceCommandError = function (output, co
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2751,16 +2229,16 @@ export var deserializeAws_json1_1PutImageCommand = function (output, context) {
     });
 }); };
 var deserializeAws_json1_1PutImageCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, parsedBody, message;
-    var _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _o = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_o.body = _p.sent(), _o)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2787,76 +2265,34 @@ var deserializeAws_json1_1PutImageCommandError = function (output, context) { re
                     case "com.amazonaws.ecr#ServerException": return [3, 20];
                 }
                 return [3, 22];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ImageAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ImageDigestDoesNotMatchExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ImageTagAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1LayersNotFoundExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1ReferencedImagesNotFoundExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
+            case 2: return [4, deserializeAws_json1_1ImageAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ImageDigestDoesNotMatchExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ImageTagAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1LayersNotFoundExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1ReferencedImagesNotFoundExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
             case 22:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _p.label = 23;
-            case 23:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2879,16 +2315,16 @@ export var deserializeAws_json1_1PutImageScanningConfigurationCommand = function
     });
 }); };
 var deserializeAws_json1_1PutImageScanningConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2903,40 +2339,22 @@ var deserializeAws_json1_1PutImageScanningConfigurationCommandError = function (
                     case "com.amazonaws.ecr#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2959,16 +2377,16 @@ export var deserializeAws_json1_1PutImageTagMutabilityCommand = function (output
     });
 }); };
 var deserializeAws_json1_1PutImageTagMutabilityCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2981,34 +2399,20 @@ var deserializeAws_json1_1PutImageTagMutabilityCommandError = function (output,
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3031,16 +2435,16 @@ export var deserializeAws_json1_1PutLifecyclePolicyCommand = function (output, c
     });
 }); };
 var deserializeAws_json1_1PutLifecyclePolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3053,34 +2457,20 @@ var deserializeAws_json1_1PutLifecyclePolicyCommandError = function (output, con
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3103,16 +2493,16 @@ export var deserializeAws_json1_1PutRegistryPolicyCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1PutRegistryPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3125,34 +2515,20 @@ var deserializeAws_json1_1PutRegistryPolicyCommandError = function (output, cont
                     case "com.amazonaws.ecr#ValidationException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3175,16 +2551,16 @@ export var deserializeAws_json1_1PutRegistryScanningConfigurationCommand = funct
     });
 }); };
 var deserializeAws_json1_1PutRegistryScanningConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3197,34 +2573,20 @@ var deserializeAws_json1_1PutRegistryScanningConfigurationCommandError = functio
                     case "com.amazonaws.ecr#ValidationException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3247,16 +2609,16 @@ export var deserializeAws_json1_1PutReplicationConfigurationCommand = function (
     });
 }); };
 var deserializeAws_json1_1PutReplicationConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3269,34 +2631,20 @@ var deserializeAws_json1_1PutReplicationConfigurationCommandError = function (ou
                     case "com.amazonaws.ecr#ValidationException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3319,16 +2667,16 @@ export var deserializeAws_json1_1SetRepositoryPolicyCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1SetRepositoryPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3341,34 +2689,20 @@ var deserializeAws_json1_1SetRepositoryPolicyCommandError = function (output, co
                     case "com.amazonaws.ecr#ServerException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3391,16 +2725,16 @@ export var deserializeAws_json1_1StartImageScanCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1StartImageScanCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3421,58 +2755,28 @@ var deserializeAws_json1_1StartImageScanCommandError = function (output, context
                     case "com.amazonaws.ecr#ValidationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1UnsupportedImageTypeExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_json1_1ImageNotFoundExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1UnsupportedImageTypeExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1ValidationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _l.label = 17;
-            case 17:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3495,16 +2799,16 @@ export var deserializeAws_json1_1StartLifecyclePolicyPreviewCommand = function (
     });
 }); };
 var deserializeAws_json1_1StartLifecyclePolicyPreviewCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3521,46 +2825,24 @@ var deserializeAws_json1_1StartLifecyclePolicyPreviewCommandError = function (ou
                     case "com.amazonaws.ecr#ServerException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1LifecyclePolicyPreviewInProgressExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1LifecyclePolicyPreviewInProgressExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3583,16 +2865,16 @@ export var deserializeAws_json1_1TagResourceCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3609,46 +2891,24 @@ var deserializeAws_json1_1TagResourceCommandError = function (output, context) {
                     case "com.amazonaws.ecr#TooManyTagsException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1TooManyTagsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1TooManyTagsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3671,16 +2931,16 @@ export var deserializeAws_json1_1UntagResourceCommand = function (output, contex
     });
 }); };
 var deserializeAws_json1_1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3697,46 +2957,24 @@ var deserializeAws_json1_1UntagResourceCommandError = function (output, context)
                     case "com.amazonaws.ecr#TooManyTagsException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1TooManyTagsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1TooManyTagsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3759,16 +2997,16 @@ export var deserializeAws_json1_1UploadLayerPartCommand = function (output, cont
     });
 }); };
 var deserializeAws_json1_1UploadLayerPartCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3789,356 +3027,326 @@ var deserializeAws_json1_1UploadLayerPartCommandError = function (output, contex
                     case "com.amazonaws.ecr#UploadNotFoundException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidLayerPartExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1UploadNotFoundExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_json1_1InvalidLayerPartExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1RepositoryNotFoundExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ServerExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1UploadNotFoundExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _l.label = 17;
-            case 17:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
 var deserializeAws_json1_1EmptyUploadExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1EmptyUploadException(body, context);
-        contents = __assign({ name: "EmptyUploadException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EmptyUploadException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ImageAlreadyExistsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ImageAlreadyExistsException(body, context);
-        contents = __assign({ name: "ImageAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ImageAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ImageDigestDoesNotMatchExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ImageDigestDoesNotMatchException(body, context);
-        contents = __assign({ name: "ImageDigestDoesNotMatchException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ImageDigestDoesNotMatchException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ImageNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ImageNotFoundException(body, context);
-        contents = __assign({ name: "ImageNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ImageNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ImageTagAlreadyExistsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ImageTagAlreadyExistsException(body, context);
-        contents = __assign({ name: "ImageTagAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ImageTagAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidLayerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1InvalidLayerException(body, context);
-        contents = __assign({ name: "InvalidLayerException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidLayerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidLayerPartExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1InvalidLayerPartException(body, context);
-        contents = __assign({ name: "InvalidLayerPartException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidLayerPartException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidParameterExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1InvalidParameterException(body, context);
-        contents = __assign({ name: "InvalidParameterException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidParameterException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidTagParameterExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1InvalidTagParameterException(body, context);
-        contents = __assign({ name: "InvalidTagParameterException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidTagParameterException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KmsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1KmsException(body, context);
-        contents = __assign({ name: "KmsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KmsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LayerAlreadyExistsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LayerAlreadyExistsException(body, context);
-        contents = __assign({ name: "LayerAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LayerAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LayerInaccessibleExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LayerInaccessibleException(body, context);
-        contents = __assign({ name: "LayerInaccessibleException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LayerInaccessibleException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LayerPartTooSmallExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LayerPartTooSmallException(body, context);
-        contents = __assign({ name: "LayerPartTooSmallException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LayerPartTooSmallException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LayersNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LayersNotFoundException(body, context);
-        contents = __assign({ name: "LayersNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LayersNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LifecyclePolicyNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LifecyclePolicyNotFoundException(body, context);
-        contents = __assign({ name: "LifecyclePolicyNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LifecyclePolicyNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LifecyclePolicyPreviewInProgressExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LifecyclePolicyPreviewInProgressException(body, context);
-        contents = __assign({ name: "LifecyclePolicyPreviewInProgressException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LifecyclePolicyPreviewInProgressException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LifecyclePolicyPreviewNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LifecyclePolicyPreviewNotFoundException(body, context);
-        contents = __assign({ name: "LifecyclePolicyPreviewNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LifecyclePolicyPreviewNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1LimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1LimitExceededException(body, context);
-        contents = __assign({ name: "LimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new LimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1PullThroughCacheRuleAlreadyExistsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1PullThroughCacheRuleAlreadyExistsException(body, context);
-        contents = __assign({ name: "PullThroughCacheRuleAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new PullThroughCacheRuleAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1PullThroughCacheRuleNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1PullThroughCacheRuleNotFoundException(body, context);
-        contents = __assign({ name: "PullThroughCacheRuleNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new PullThroughCacheRuleNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ReferencedImagesNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ReferencedImagesNotFoundException(body, context);
-        contents = __assign({ name: "ReferencedImagesNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ReferencedImagesNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1RegistryPolicyNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1RegistryPolicyNotFoundException(body, context);
-        contents = __assign({ name: "RegistryPolicyNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new RegistryPolicyNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1RepositoryAlreadyExistsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1RepositoryAlreadyExistsException(body, context);
-        contents = __assign({ name: "RepositoryAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new RepositoryAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1RepositoryNotEmptyExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1RepositoryNotEmptyException(body, context);
-        contents = __assign({ name: "RepositoryNotEmptyException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new RepositoryNotEmptyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1RepositoryNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1RepositoryNotFoundException(body, context);
-        contents = __assign({ name: "RepositoryNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new RepositoryNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1RepositoryPolicyNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1RepositoryPolicyNotFoundException(body, context);
-        contents = __assign({ name: "RepositoryPolicyNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new RepositoryPolicyNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ScanNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ScanNotFoundException(body, context);
-        contents = __assign({ name: "ScanNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ScanNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ServerException(body, context);
-        contents = __assign({ name: "ServerException", $fault: "server", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1TooManyTagsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1TooManyTagsException(body, context);
-        contents = __assign({ name: "TooManyTagsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyTagsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1UnsupportedImageTypeExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1UnsupportedImageTypeException(body, context);
-        contents = __assign({ name: "UnsupportedImageTypeException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new UnsupportedImageTypeException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1UnsupportedUpstreamRegistryExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1UnsupportedUpstreamRegistryException(body, context);
-        contents = __assign({ name: "UnsupportedUpstreamRegistryException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new UnsupportedUpstreamRegistryException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1UploadNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1UploadNotFoundException(body, context);
-        contents = __assign({ name: "UploadNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new UploadNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_json1_1ValidationException(body, context);
-        contents = __assign({ name: "ValidationException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var serializeAws_json1_1BatchCheckLayerAvailabilityRequest = function (input, context) {
@@ -4550,7 +3758,7 @@ var deserializeAws_json1_1Attribute = function (output, context) {
     };
 };
 var deserializeAws_json1_1AttributeList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4558,6 +3766,7 @@ var deserializeAws_json1_1AttributeList = function (output, context) {
         }
         return deserializeAws_json1_1Attribute(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1AuthorizationData = function (output, context) {
     return {
@@ -4569,7 +3778,7 @@ var deserializeAws_json1_1AuthorizationData = function (output, context) {
     };
 };
 var deserializeAws_json1_1AuthorizationDataList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4577,6 +3786,7 @@ var deserializeAws_json1_1AuthorizationDataList = function (output, context) {
         }
         return deserializeAws_json1_1AuthorizationData(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1AwsEcrContainerImageDetails = function (output, context) {
     return {
@@ -4674,7 +3884,7 @@ var deserializeAws_json1_1CvssScoreAdjustment = function (output, context) {
     };
 };
 var deserializeAws_json1_1CvssScoreAdjustmentList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4682,6 +3892,7 @@ var deserializeAws_json1_1CvssScoreAdjustmentList = function (output, context) {
         }
         return deserializeAws_json1_1CvssScoreAdjustment(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1CvssScoreDetails = function (output, context) {
     return {
@@ -4695,7 +3906,7 @@ var deserializeAws_json1_1CvssScoreDetails = function (output, context) {
     };
 };
 var deserializeAws_json1_1CvssScoreList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4703,6 +3914,7 @@ var deserializeAws_json1_1CvssScoreList = function (output, context) {
         }
         return deserializeAws_json1_1CvssScore(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1DeleteLifecyclePolicyResponse = function (output, context) {
     return {
@@ -4848,7 +4060,7 @@ var deserializeAws_json1_1EnhancedImageScanFinding = function (output, context)
     };
 };
 var deserializeAws_json1_1EnhancedImageScanFindingList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4856,6 +4068,7 @@ var deserializeAws_json1_1EnhancedImageScanFindingList = function (output, conte
         }
         return deserializeAws_json1_1EnhancedImageScanFinding(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1FindingSeverityCounts = function (output, context) {
     return Object.entries(output).reduce(function (acc, _a) {
@@ -4960,12 +4173,15 @@ var deserializeAws_json1_1ImageDetail = function (output, context) {
         imageTags: output.imageTags !== undefined && output.imageTags !== null
             ? deserializeAws_json1_1ImageTagList(output.imageTags, context)
             : undefined,
+        lastRecordedPullTime: output.lastRecordedPullTime !== undefined && output.lastRecordedPullTime !== null
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.lastRecordedPullTime)))
+            : undefined,
         registryId: __expectString(output.registryId),
         repositoryName: __expectString(output.repositoryName),
     };
 };
 var deserializeAws_json1_1ImageDetailList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4973,6 +4189,7 @@ var deserializeAws_json1_1ImageDetailList = function (output, context) {
         }
         return deserializeAws_json1_1ImageDetail(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageDigestDoesNotMatchException = function (output, context) {
     return {
@@ -4989,7 +4206,7 @@ var deserializeAws_json1_1ImageFailure = function (output, context) {
     };
 };
 var deserializeAws_json1_1ImageFailureList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4997,6 +4214,7 @@ var deserializeAws_json1_1ImageFailureList = function (output, context) {
         }
         return deserializeAws_json1_1ImageFailure(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageIdentifier = function (output, context) {
     return {
@@ -5005,7 +4223,7 @@ var deserializeAws_json1_1ImageIdentifier = function (output, context) {
     };
 };
 var deserializeAws_json1_1ImageIdentifierList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5013,9 +4231,10 @@ var deserializeAws_json1_1ImageIdentifierList = function (output, context) {
         }
         return deserializeAws_json1_1ImageIdentifier(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5023,6 +4242,7 @@ var deserializeAws_json1_1ImageList = function (output, context) {
         }
         return deserializeAws_json1_1Image(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageNotFoundException = function (output, context) {
     return {
@@ -5038,7 +4258,7 @@ var deserializeAws_json1_1ImageReplicationStatus = function (output, context) {
     };
 };
 var deserializeAws_json1_1ImageReplicationStatusList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5046,6 +4266,7 @@ var deserializeAws_json1_1ImageReplicationStatusList = function (output, context
         }
         return deserializeAws_json1_1ImageReplicationStatus(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageScanFinding = function (output, context) {
     return {
@@ -5059,7 +4280,7 @@ var deserializeAws_json1_1ImageScanFinding = function (output, context) {
     };
 };
 var deserializeAws_json1_1ImageScanFindingList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5067,6 +4288,7 @@ var deserializeAws_json1_1ImageScanFindingList = function (output, context) {
         }
         return deserializeAws_json1_1ImageScanFinding(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageScanFindings = function (output, context) {
     return {
@@ -5117,7 +4339,7 @@ var deserializeAws_json1_1ImageTagAlreadyExistsException = function (output, con
     };
 };
 var deserializeAws_json1_1ImageTagList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5125,9 +4347,10 @@ var deserializeAws_json1_1ImageTagList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ImageTagsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5135,6 +4358,7 @@ var deserializeAws_json1_1ImageTagsList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1InitiateLayerUploadResponse = function (output, context) {
     return {
@@ -5193,7 +4417,7 @@ var deserializeAws_json1_1LayerFailure = function (output, context) {
     };
 };
 var deserializeAws_json1_1LayerFailureList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5201,6 +4425,7 @@ var deserializeAws_json1_1LayerFailureList = function (output, context) {
         }
         return deserializeAws_json1_1LayerFailure(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1LayerInaccessibleException = function (output, context) {
     return {
@@ -5208,7 +4433,7 @@ var deserializeAws_json1_1LayerInaccessibleException = function (output, context
     };
 };
 var deserializeAws_json1_1LayerList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5216,6 +4441,7 @@ var deserializeAws_json1_1LayerList = function (output, context) {
         }
         return deserializeAws_json1_1Layer(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1LayerPartTooSmallException = function (output, context) {
     return {
@@ -5258,7 +4484,7 @@ var deserializeAws_json1_1LifecyclePolicyPreviewResult = function (output, conte
     };
 };
 var deserializeAws_json1_1LifecyclePolicyPreviewResultList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5266,6 +4492,7 @@ var deserializeAws_json1_1LifecyclePolicyPreviewResultList = function (output, c
         }
         return deserializeAws_json1_1LifecyclePolicyPreviewResult(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1LifecyclePolicyPreviewSummary = function (output, context) {
     return {
@@ -5339,7 +4566,7 @@ var deserializeAws_json1_1PullThroughCacheRuleAlreadyExistsException = function
     };
 };
 var deserializeAws_json1_1PullThroughCacheRuleList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5347,6 +4574,7 @@ var deserializeAws_json1_1PullThroughCacheRuleList = function (output, context)
         }
         return deserializeAws_json1_1PullThroughCacheRule(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1PullThroughCacheRuleNotFoundException = function (output, context) {
     return {
@@ -5415,7 +4643,7 @@ var deserializeAws_json1_1ReferencedImagesNotFoundException = function (output,
     };
 };
 var deserializeAws_json1_1ReferenceUrlsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5423,6 +4651,7 @@ var deserializeAws_json1_1ReferenceUrlsList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1RegistryPolicyNotFoundException = function (output, context) {
     return {
@@ -5446,7 +4675,7 @@ var deserializeAws_json1_1RegistryScanningRule = function (output, context) {
     };
 };
 var deserializeAws_json1_1RegistryScanningRuleList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5454,9 +4683,10 @@ var deserializeAws_json1_1RegistryScanningRuleList = function (output, context)
         }
         return deserializeAws_json1_1RegistryScanningRule(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1RelatedVulnerabilitiesList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5464,6 +4694,7 @@ var deserializeAws_json1_1RelatedVulnerabilitiesList = function (output, context
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Remediation = function (output, context) {
     return {
@@ -5486,7 +4717,7 @@ var deserializeAws_json1_1ReplicationDestination = function (output, context) {
     };
 };
 var deserializeAws_json1_1ReplicationDestinationList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5494,6 +4725,7 @@ var deserializeAws_json1_1ReplicationDestinationList = function (output, context
         }
         return deserializeAws_json1_1ReplicationDestination(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationRule = function (output, context) {
     return {
@@ -5506,7 +4738,7 @@ var deserializeAws_json1_1ReplicationRule = function (output, context) {
     };
 };
 var deserializeAws_json1_1ReplicationRuleList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5514,6 +4746,7 @@ var deserializeAws_json1_1ReplicationRuleList = function (output, context) {
         }
         return deserializeAws_json1_1ReplicationRule(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Repository = function (output, context) {
     return {
@@ -5545,7 +4778,7 @@ var deserializeAws_json1_1RepositoryFilter = function (output, context) {
     };
 };
 var deserializeAws_json1_1RepositoryFilterList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5553,9 +4786,10 @@ var deserializeAws_json1_1RepositoryFilterList = function (output, context) {
         }
         return deserializeAws_json1_1RepositoryFilter(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1RepositoryList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5563,6 +4797,7 @@ var deserializeAws_json1_1RepositoryList = function (output, context) {
         }
         return deserializeAws_json1_1Repository(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1RepositoryNotEmptyException = function (output, context) {
     return {
@@ -5598,7 +4833,7 @@ var deserializeAws_json1_1RepositoryScanningConfigurationFailure = function (out
     };
 };
 var deserializeAws_json1_1RepositoryScanningConfigurationFailureList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5606,9 +4841,10 @@ var deserializeAws_json1_1RepositoryScanningConfigurationFailureList = function
         }
         return deserializeAws_json1_1RepositoryScanningConfigurationFailure(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1RepositoryScanningConfigurationList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5616,6 +4852,7 @@ var deserializeAws_json1_1RepositoryScanningConfigurationList = function (output
         }
         return deserializeAws_json1_1RepositoryScanningConfiguration(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Resource = function (output, context) {
     return {
@@ -5635,7 +4872,7 @@ var deserializeAws_json1_1ResourceDetails = function (output, context) {
     };
 };
 var deserializeAws_json1_1ResourceList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5643,6 +4880,7 @@ var deserializeAws_json1_1ResourceList = function (output, context) {
         }
         return deserializeAws_json1_1Resource(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ScanningRepositoryFilter = function (output, context) {
     return {
@@ -5651,7 +4889,7 @@ var deserializeAws_json1_1ScanningRepositoryFilter = function (output, context)
     };
 };
 var deserializeAws_json1_1ScanningRepositoryFilterList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5659,6 +4897,7 @@ var deserializeAws_json1_1ScanningRepositoryFilterList = function (output, conte
         }
         return deserializeAws_json1_1ScanningRepositoryFilter(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ScanNotFoundException = function (output, context) {
     return {
@@ -5711,7 +4950,7 @@ var deserializeAws_json1_1Tag = function (output, context) {
     };
 };
 var deserializeAws_json1_1TagList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5719,6 +4958,7 @@ var deserializeAws_json1_1TagList = function (output, context) {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1TagResourceResponse = function (output, context) {
     return {};
@@ -5782,7 +5022,7 @@ var deserializeAws_json1_1VulnerablePackage = function (output, context) {
     };
 };
 var deserializeAws_json1_1VulnerablePackagesList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5790,6 +5030,7 @@ var deserializeAws_json1_1VulnerablePackagesList = function (output, context) {
         }
         return deserializeAws_json1_1VulnerablePackage(entry, context);
     });
+    return retVal;
 };
 var deserializeMetadata = function (output) {
     var _a;