@aws-sdk/client-accessanalyzer 3.310.0 → 3.315.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -14,11 +14,11 @@ const se_ApplyArchiveRuleCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/archive-rule";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.ruleName != null && { ruleName: input.ruleName }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        ruleName: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -54,11 +54,11 @@ const se_CreateAccessPreviewCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/access-preview";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.configurations != null && { configurations: se_ConfigurationsMap(input.configurations, context) }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        configurations: (_) => (0, smithy_client_1._json)(_),
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -77,13 +77,13 @@ const se_CreateAnalyzerCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzer";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerName != null && { analyzerName: input.analyzerName }),
-        ...(input.archiveRules != null && { archiveRules: se_InlineArchiveRulesList(input.archiveRules, context) }),
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.tags != null && { tags: se_TagsMap(input.tags, context) }),
-        ...(input.type != null && { type: input.type }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerName: [],
+        archiveRules: (_) => (0, smithy_client_1._json)(_),
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        tags: (_) => (0, smithy_client_1._json)(_),
+        type: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -103,11 +103,11 @@ const se_CreateArchiveRuleCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzer/{analyzerName}/archive-rule";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "analyzerName", () => input.analyzerName, "{analyzerName}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.filter != null && { filter: se_FilterCriteriaMap(input.filter, context) }),
-        ...(input.ruleName != null && { ruleName: input.ruleName }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        filter: (_) => (0, smithy_client_1._json)(_),
+        ruleName: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -124,7 +124,7 @@ const se_DeleteAnalyzerCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzer/{analyzerName}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "analyzerName", () => input.analyzerName, "{analyzerName}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         clientToken: [, input.clientToken ?? (0, uuid_1.v4)()],
     });
     let body;
@@ -147,7 +147,7 @@ const se_DeleteArchiveRuleCommand = async (input, context) => {
         "/analyzer/{analyzerName}/archive-rule/{ruleName}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "analyzerName", () => input.analyzerName, "{analyzerName}", false);
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ruleName", () => input.ruleName, "{ruleName}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         clientToken: [, input.clientToken ?? (0, uuid_1.v4)()],
     });
     let body;
@@ -168,7 +168,7 @@ const se_GetAccessPreviewCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/access-preview/{accessPreviewId}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "accessPreviewId", () => input.accessPreviewId, "{accessPreviewId}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         analyzerArn: [, (0, smithy_client_1.expectNonNull)(input.analyzerArn, `analyzerArn`)],
     });
     let body;
@@ -188,7 +188,7 @@ const se_GetAnalyzedResourceCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzed-resource";
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         analyzerArn: [, (0, smithy_client_1.expectNonNull)(input.analyzerArn, `analyzerArn`)],
         resourceArn: [, (0, smithy_client_1.expectNonNull)(input.resourceArn, `resourceArn`)],
     });
@@ -246,7 +246,7 @@ const se_GetFindingCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/finding/{id}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         analyzerArn: [, (0, smithy_client_1.expectNonNull)(input.analyzerArn, `analyzerArn`)],
     });
     let body;
@@ -267,7 +267,7 @@ const se_GetGeneratedPolicyCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/policy/generation/{jobId}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "jobId", () => input.jobId, "{jobId}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         includeResourcePlaceholders: [
             () => input.includeResourcePlaceholders !== void 0,
             () => input.includeResourcePlaceholders.toString(),
@@ -298,12 +298,12 @@ const se_ListAccessPreviewFindingsCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/access-preview/{accessPreviewId}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "accessPreviewId", () => input.accessPreviewId, "{accessPreviewId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        ...(input.filter != null && { filter: se_FilterCriteriaMap(input.filter, context) }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        filter: (_) => (0, smithy_client_1._json)(_),
+        maxResults: [],
+        nextToken: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -319,7 +319,7 @@ const se_ListAccessPreviewsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/access-preview";
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         analyzerArn: [, (0, smithy_client_1.expectNonNull)(input.analyzerArn, `analyzerArn`)],
         nextToken: [, input.nextToken],
         maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
@@ -344,12 +344,12 @@ const se_ListAnalyzedResourcesCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzed-resource";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-        ...(input.resourceType != null && { resourceType: input.resourceType }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        maxResults: [],
+        nextToken: [],
+        resourceType: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -365,7 +365,7 @@ const se_ListAnalyzersCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzer";
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         nextToken: [, input.nextToken],
         maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
         type: [, input.type],
@@ -388,7 +388,7 @@ const se_ListArchiveRulesCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/analyzer/{analyzerName}/archive-rule";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "analyzerName", () => input.analyzerName, "{analyzerName}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         nextToken: [, input.nextToken],
         maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
     });
@@ -412,13 +412,13 @@ const se_ListFindingsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/finding";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        ...(input.filter != null && { filter: se_FilterCriteriaMap(input.filter, context) }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-        ...(input.sort != null && { sort: se_SortCriteria(input.sort, context) }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        filter: (_) => (0, smithy_client_1._json)(_),
+        maxResults: [],
+        nextToken: [],
+        sort: (_) => (0, smithy_client_1._json)(_),
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -434,7 +434,7 @@ const se_ListPolicyGenerationsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/policy/generation";
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         principalArn: [, input.principalArn],
         maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
         nextToken: [, input.nextToken],
@@ -476,15 +476,11 @@ const se_StartPolicyGenerationCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/policy/generation";
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.cloudTrailDetails != null && {
-            cloudTrailDetails: se_CloudTrailDetails(input.cloudTrailDetails, context),
-        }),
-        ...(input.policyGenerationDetails != null && {
-            policyGenerationDetails: se_PolicyGenerationDetails(input.policyGenerationDetails, context),
-        }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        cloudTrailDetails: (_) => se_CloudTrailDetails(_, context),
+        policyGenerationDetails: (_) => (0, smithy_client_1._json)(_),
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -503,11 +499,11 @@ const se_StartResourceScanCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/resource/scan";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        ...(input.resourceArn != null && { resourceArn: input.resourceArn }),
-        ...(input.resourceOwnerAccount != null && { resourceOwnerAccount: input.resourceOwnerAccount }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        resourceArn: [],
+        resourceOwnerAccount: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -527,9 +523,9 @@ const se_TagResourceCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.tags != null && { tags: se_TagsMap(input.tags, context) }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        tags: (_) => (0, smithy_client_1._json)(_),
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -546,7 +542,7 @@ const se_UntagResourceCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn}";
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn}", false);
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         tagKeys: [
             (0, smithy_client_1.expectNonNull)(input.tagKeys, `tagKeys`) != null,
             () => (input.tagKeys || []).map((_entry) => _entry),
@@ -575,10 +571,10 @@ const se_UpdateArchiveRuleCommand = async (input, context) => {
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "analyzerName", () => input.analyzerName, "{analyzerName}", false);
     resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ruleName", () => input.ruleName, "{ruleName}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.filter != null && { filter: se_FilterCriteriaMap(input.filter, context) }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        filter: (_) => (0, smithy_client_1._json)(_),
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -597,13 +593,13 @@ const se_UpdateFindingsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/finding";
     let body;
-    body = JSON.stringify({
-        ...(input.analyzerArn != null && { analyzerArn: input.analyzerArn }),
-        clientToken: input.clientToken ?? (0, uuid_1.v4)(),
-        ...(input.ids != null && { ids: se_FindingIdList(input.ids, context) }),
-        ...(input.resourceArn != null && { resourceArn: input.resourceArn }),
-        ...(input.status != null && { status: input.status }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        analyzerArn: [],
+        clientToken: (_) => _ ?? (0, uuid_1.v4)(),
+        ids: (_) => (0, smithy_client_1._json)(_),
+        resourceArn: [],
+        status: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -621,17 +617,17 @@ const se_ValidatePolicyCommand = async (input, context) => {
         "content-type": "application/json",
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/policy/validation";
-    const query = map({
+    const query = (0, smithy_client_1.map)({
         maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
         nextToken: [, input.nextToken],
     });
     let body;
-    body = JSON.stringify({
-        ...(input.locale != null && { locale: input.locale }),
-        ...(input.policyDocument != null && { policyDocument: input.policyDocument }),
-        ...(input.policyType != null && { policyType: input.policyType }),
-        ...(input.validatePolicyResourceType != null && { validatePolicyResourceType: input.validatePolicyResourceType }),
-    });
+    body = JSON.stringify((0, smithy_client_1.take)(input, {
+        locale: [],
+        policyDocument: [],
+        policyType: [],
+        validatePolicyResourceType: [],
+    }));
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -648,7 +644,7 @@ const de_ApplyArchiveRuleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ApplyArchiveRuleCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -679,10 +675,9 @@ const de_ApplyArchiveRuleCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -691,7 +686,7 @@ const de_CancelPolicyGenerationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_CancelPolicyGenerationCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -719,10 +714,9 @@ const de_CancelPolicyGenerationCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -731,13 +725,14 @@ const de_CreateAccessPreviewCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_CreateAccessPreviewCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.id != null) {
-        contents.id = (0, smithy_client_1.expectString)(data.id);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        id: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_CreateAccessPreviewCommand = de_CreateAccessPreviewCommand;
@@ -771,10 +766,9 @@ const de_CreateAccessPreviewCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -783,13 +777,14 @@ const de_CreateAnalyzerCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_CreateAnalyzerCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = (0, smithy_client_1.expectString)(data.arn);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        arn: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_CreateAnalyzerCommand = de_CreateAnalyzerCommand;
@@ -820,10 +815,9 @@ const de_CreateAnalyzerCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -832,7 +826,7 @@ const de_CreateArchiveRuleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_CreateArchiveRuleCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -869,10 +863,9 @@ const de_CreateArchiveRuleCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -881,7 +874,7 @@ const de_DeleteAnalyzerCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_DeleteAnalyzerCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -912,10 +905,9 @@ const de_DeleteAnalyzerCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -924,7 +916,7 @@ const de_DeleteArchiveRuleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_DeleteArchiveRuleCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -955,10 +947,9 @@ const de_DeleteArchiveRuleCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -967,13 +958,14 @@ const de_GetAccessPreviewCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_GetAccessPreviewCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.accessPreview != null) {
-        contents.accessPreview = de_AccessPreview(data.accessPreview, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        accessPreview: (_) => de_AccessPreview(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_GetAccessPreviewCommand = de_GetAccessPreviewCommand;
@@ -1001,10 +993,9 @@ const de_GetAccessPreviewCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1013,13 +1004,14 @@ const de_GetAnalyzedResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_GetAnalyzedResourceCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.resource != null) {
-        contents.resource = de_AnalyzedResource(data.resource, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        resource: (_) => de_AnalyzedResource(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_GetAnalyzedResourceCommand = de_GetAnalyzedResourceCommand;
@@ -1047,10 +1039,9 @@ const de_GetAnalyzedResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1059,13 +1050,14 @@ const de_GetAnalyzerCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_GetAnalyzerCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.analyzer != null) {
-        contents.analyzer = de_AnalyzerSummary(data.analyzer, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        analyzer: (_) => de_AnalyzerSummary(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_GetAnalyzerCommand = de_GetAnalyzerCommand;
@@ -1093,10 +1085,9 @@ const de_GetAnalyzerCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1105,13 +1096,14 @@ const de_GetArchiveRuleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_GetArchiveRuleCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.archiveRule != null) {
-        contents.archiveRule = de_ArchiveRuleSummary(data.archiveRule, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        archiveRule: (_) => de_ArchiveRuleSummary(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_GetArchiveRuleCommand = de_GetArchiveRuleCommand;
@@ -1139,10 +1131,9 @@ const de_GetArchiveRuleCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1151,13 +1142,14 @@ const de_GetFindingCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_GetFindingCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.finding != null) {
-        contents.finding = de_Finding(data.finding, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        finding: (_) => de_Finding(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_GetFindingCommand = de_GetFindingCommand;
@@ -1185,10 +1177,9 @@ const de_GetFindingCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1197,16 +1188,15 @@ const de_GetGeneratedPolicyCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_GetGeneratedPolicyCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.generatedPolicyResult != null) {
-        contents.generatedPolicyResult = de_GeneratedPolicyResult(data.generatedPolicyResult, context);
-    }
-    if (data.jobDetails != null) {
-        contents.jobDetails = de_JobDetails(data.jobDetails, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        generatedPolicyResult: (_) => de_GeneratedPolicyResult(_, context),
+        jobDetails: (_) => de_JobDetails(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_GetGeneratedPolicyCommand = de_GetGeneratedPolicyCommand;
@@ -1231,10 +1221,9 @@ const de_GetGeneratedPolicyCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1243,16 +1232,15 @@ const de_ListAccessPreviewFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListAccessPreviewFindingsCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.findings != null) {
-        contents.findings = de_AccessPreviewFindingsList(data.findings, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        findings: (_) => de_AccessPreviewFindingsList(_, context),
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListAccessPreviewFindingsCommand = de_ListAccessPreviewFindingsCommand;
@@ -1283,10 +1271,9 @@ const de_ListAccessPreviewFindingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1295,16 +1282,15 @@ const de_ListAccessPreviewsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListAccessPreviewsCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.accessPreviews != null) {
-        contents.accessPreviews = de_AccessPreviewsList(data.accessPreviews, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        accessPreviews: (_) => de_AccessPreviewsList(_, context),
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListAccessPreviewsCommand = de_ListAccessPreviewsCommand;
@@ -1332,10 +1318,9 @@ const de_ListAccessPreviewsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1344,16 +1329,15 @@ const de_ListAnalyzedResourcesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListAnalyzedResourcesCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.analyzedResources != null) {
-        contents.analyzedResources = de_AnalyzedResourcesList(data.analyzedResources, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        analyzedResources: smithy_client_1._json,
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListAnalyzedResourcesCommand = de_ListAnalyzedResourcesCommand;
@@ -1381,10 +1365,9 @@ const de_ListAnalyzedResourcesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1393,16 +1376,15 @@ const de_ListAnalyzersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListAnalyzersCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.analyzers != null) {
-        contents.analyzers = de_AnalyzersList(data.analyzers, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        analyzers: (_) => de_AnalyzersList(_, context),
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListAnalyzersCommand = de_ListAnalyzersCommand;
@@ -1427,10 +1409,9 @@ const de_ListAnalyzersCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1439,16 +1420,15 @@ const de_ListArchiveRulesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListArchiveRulesCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.archiveRules != null) {
-        contents.archiveRules = de_ArchiveRulesList(data.archiveRules, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        archiveRules: (_) => de_ArchiveRulesList(_, context),
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListArchiveRulesCommand = de_ListArchiveRulesCommand;
@@ -1473,10 +1453,9 @@ const de_ListArchiveRulesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1485,16 +1464,15 @@ const de_ListFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListFindingsCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.findings != null) {
-        contents.findings = de_FindingsList(data.findings, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        findings: (_) => de_FindingsList(_, context),
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListFindingsCommand = de_ListFindingsCommand;
@@ -1522,10 +1500,9 @@ const de_ListFindingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1534,16 +1511,15 @@ const de_ListPolicyGenerationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListPolicyGenerationsCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
-    if (data.policyGenerations != null) {
-        contents.policyGenerations = de_PolicyGenerationList(data.policyGenerations, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        nextToken: smithy_client_1.expectString,
+        policyGenerations: (_) => de_PolicyGenerationList(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListPolicyGenerationsCommand = de_ListPolicyGenerationsCommand;
@@ -1568,10 +1544,9 @@ const de_ListPolicyGenerationsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1580,13 +1555,14 @@ const de_ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ListTagsForResourceCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.tags != null) {
-        contents.tags = de_TagsMap(data.tags, context);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        tags: smithy_client_1._json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ListTagsForResourceCommand = de_ListTagsForResourceCommand;
@@ -1614,10 +1590,9 @@ const de_ListTagsForResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1626,13 +1601,14 @@ const de_StartPolicyGenerationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_StartPolicyGenerationCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.jobId != null) {
-        contents.jobId = (0, smithy_client_1.expectString)(data.jobId);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        jobId: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_StartPolicyGenerationCommand = de_StartPolicyGenerationCommand;
@@ -1663,10 +1639,9 @@ const de_StartPolicyGenerationCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1675,7 +1650,7 @@ const de_StartResourceScanCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_StartResourceScanCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -1706,10 +1681,9 @@ const de_StartResourceScanCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1718,7 +1692,7 @@ const de_TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_TagResourceCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -1749,10 +1723,9 @@ const de_TagResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1761,7 +1734,7 @@ const de_UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_UntagResourceCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -1792,10 +1765,9 @@ const de_UntagResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1804,7 +1776,7 @@ const de_UpdateArchiveRuleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_UpdateArchiveRuleCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -1835,10 +1807,9 @@ const de_UpdateArchiveRuleCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1847,7 +1818,7 @@ const de_UpdateFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_UpdateFindingsCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     await collectBody(output.body, context);
@@ -1878,10 +1849,9 @@ const de_UpdateFindingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
@@ -1890,16 +1860,15 @@ const de_ValidatePolicyCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return de_ValidatePolicyCommandError(output, context);
     }
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         $metadata: deserializeMetadata(output),
     });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.findings != null) {
-        contents.findings = de_ValidatePolicyFindingList(data.findings, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        findings: smithy_client_1._json,
+        nextToken: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 exports.de_ValidatePolicyCommand = de_ValidatePolicyCommand;
@@ -1924,21 +1893,21 @@ const de_ValidatePolicyCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            (0, smithy_client_1.throwDefaultError)({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: AccessAnalyzerServiceException_1.AccessAnalyzerServiceException,
                 errorCode,
             });
     }
 };
-const map = smithy_client_1.map;
+const throwDefaultError = (0, smithy_client_1.withBaseException)(AccessAnalyzerServiceException_1.AccessAnalyzerServiceException);
 const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
-    const contents = map({});
+    const contents = (0, smithy_client_1.map)({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        message: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.AccessDeniedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -1946,17 +1915,14 @@ const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const de_ConflictExceptionRes = async (parsedOutput, context) => {
-    const contents = map({});
+    const contents = (0, smithy_client_1.map)({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = (0, smithy_client_1.expectString)(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = (0, smithy_client_1.expectString)(data.resourceType);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        message: smithy_client_1.expectString,
+        resourceId: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.ConflictException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -1964,16 +1930,17 @@ const de_ConflictExceptionRes = async (parsedOutput, context) => {
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const de_InternalServerExceptionRes = async (parsedOutput, context) => {
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         retryAfterSeconds: [
             () => void 0 !== parsedOutput.headers["retry-after"],
             () => (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]),
         ],
     });
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        message: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.InternalServerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -1981,17 +1948,14 @@ const de_InternalServerExceptionRes = async (parsedOutput, context) => {
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
-    const contents = map({});
+    const contents = (0, smithy_client_1.map)({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = (0, smithy_client_1.expectString)(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = (0, smithy_client_1.expectString)(data.resourceType);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        message: smithy_client_1.expectString,
+        resourceId: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -1999,17 +1963,14 @@ const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const de_ServiceQuotaExceededExceptionRes = async (parsedOutput, context) => {
-    const contents = map({});
+    const contents = (0, smithy_client_1.map)({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = (0, smithy_client_1.expectString)(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = (0, smithy_client_1.expectString)(data.resourceType);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        message: smithy_client_1.expectString,
+        resourceId: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.ServiceQuotaExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2017,16 +1978,17 @@ const de_ServiceQuotaExceededExceptionRes = async (parsedOutput, context) => {
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
-    const contents = map({
+    const contents = (0, smithy_client_1.map)({
         retryAfterSeconds: [
             () => void 0 !== parsedOutput.headers["retry-after"],
             () => (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]),
         ],
     });
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        message: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.ThrottlingException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2034,413 +1996,61 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const de_ValidationExceptionRes = async (parsedOutput, context) => {
-    const contents = map({});
+    const contents = (0, smithy_client_1.map)({});
     const data = parsedOutput.body;
-    if (data.fieldList != null) {
-        contents.fieldList = de_ValidationExceptionFieldList(data.fieldList, context);
-    }
-    if (data.message != null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
-    }
-    if (data.reason != null) {
-        contents.reason = (0, smithy_client_1.expectString)(data.reason);
-    }
+    const doc = (0, smithy_client_1.take)(data, {
+        fieldList: smithy_client_1._json,
+        message: smithy_client_1.expectString,
+        reason: smithy_client_1.expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new models_0_1.ValidationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
     });
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
-const se_AclGrantee = (input, context) => {
-    return models_0_1.AclGrantee.visit(input, {
-        id: (value) => ({ id: value }),
-        uri: (value) => ({ uri: value }),
-        _: (name, value) => ({ name: value }),
-    });
-};
 const se_CloudTrailDetails = (input, context) => {
-    return {
-        ...(input.accessRole != null && { accessRole: input.accessRole }),
-        ...(input.endTime != null && { endTime: input.endTime.toISOString().split(".")[0] + "Z" }),
-        ...(input.startTime != null && { startTime: input.startTime.toISOString().split(".")[0] + "Z" }),
-        ...(input.trails != null && { trails: se_TrailList(input.trails, context) }),
-    };
-};
-const se_Configuration = (input, context) => {
-    return models_0_1.Configuration.visit(input, {
-        ebsSnapshot: (value) => ({ ebsSnapshot: se_EbsSnapshotConfiguration(value, context) }),
-        ecrRepository: (value) => ({ ecrRepository: se_EcrRepositoryConfiguration(value, context) }),
-        efsFileSystem: (value) => ({ efsFileSystem: se_EfsFileSystemConfiguration(value, context) }),
-        iamRole: (value) => ({ iamRole: se_IamRoleConfiguration(value, context) }),
-        kmsKey: (value) => ({ kmsKey: se_KmsKeyConfiguration(value, context) }),
-        rdsDbClusterSnapshot: (value) => ({ rdsDbClusterSnapshot: se_RdsDbClusterSnapshotConfiguration(value, context) }),
-        rdsDbSnapshot: (value) => ({ rdsDbSnapshot: se_RdsDbSnapshotConfiguration(value, context) }),
-        s3Bucket: (value) => ({ s3Bucket: se_S3BucketConfiguration(value, context) }),
-        secretsManagerSecret: (value) => ({ secretsManagerSecret: se_SecretsManagerSecretConfiguration(value, context) }),
-        snsTopic: (value) => ({ snsTopic: se_SnsTopicConfiguration(value, context) }),
-        sqsQueue: (value) => ({ sqsQueue: se_SqsQueueConfiguration(value, context) }),
-        _: (name, value) => ({ name: value }),
-    });
-};
-const se_ConfigurationsMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = se_Configuration(value, context);
-        return acc;
-    }, {});
-};
-const se_Criterion = (input, context) => {
-    return {
-        ...(input.contains != null && { contains: se_ValueList(input.contains, context) }),
-        ...(input.eq != null && { eq: se_ValueList(input.eq, context) }),
-        ...(input.exists != null && { exists: input.exists }),
-        ...(input.neq != null && { neq: se_ValueList(input.neq, context) }),
-    };
-};
-const se_EbsGroupList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_EbsSnapshotConfiguration = (input, context) => {
-    return {
-        ...(input.groups != null && { groups: se_EbsGroupList(input.groups, context) }),
-        ...(input.kmsKeyId != null && { kmsKeyId: input.kmsKeyId }),
-        ...(input.userIds != null && { userIds: se_EbsUserIdList(input.userIds, context) }),
-    };
-};
-const se_EbsUserIdList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_EcrRepositoryConfiguration = (input, context) => {
-    return {
-        ...(input.repositoryPolicy != null && { repositoryPolicy: input.repositoryPolicy }),
-    };
-};
-const se_EfsFileSystemConfiguration = (input, context) => {
-    return {
-        ...(input.fileSystemPolicy != null && { fileSystemPolicy: input.fileSystemPolicy }),
-    };
-};
-const se_FilterCriteriaMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = se_Criterion(value, context);
-        return acc;
-    }, {});
-};
-const se_FindingIdList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_IamRoleConfiguration = (input, context) => {
-    return {
-        ...(input.trustPolicy != null && { trustPolicy: input.trustPolicy }),
-    };
-};
-const se_InlineArchiveRule = (input, context) => {
-    return {
-        ...(input.filter != null && { filter: se_FilterCriteriaMap(input.filter, context) }),
-        ...(input.ruleName != null && { ruleName: input.ruleName }),
-    };
-};
-const se_InlineArchiveRulesList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_InlineArchiveRule(entry, context);
+    return (0, smithy_client_1.take)(input, {
+        accessRole: [],
+        endTime: (_) => _.toISOString().split(".")[0] + "Z",
+        startTime: (_) => _.toISOString().split(".")[0] + "Z",
+        trails: smithy_client_1._json,
     });
 };
-const se_InternetConfiguration = (input, context) => {
-    return {};
-};
-const se_KmsConstraintsMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_KmsGrantConfiguration = (input, context) => {
-    return {
-        ...(input.constraints != null && { constraints: se_KmsGrantConstraints(input.constraints, context) }),
-        ...(input.granteePrincipal != null && { granteePrincipal: input.granteePrincipal }),
-        ...(input.issuingAccount != null && { issuingAccount: input.issuingAccount }),
-        ...(input.operations != null && { operations: se_KmsGrantOperationsList(input.operations, context) }),
-        ...(input.retiringPrincipal != null && { retiringPrincipal: input.retiringPrincipal }),
-    };
-};
-const se_KmsGrantConfigurationsList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_KmsGrantConfiguration(entry, context);
-    });
-};
-const se_KmsGrantConstraints = (input, context) => {
-    return {
-        ...(input.encryptionContextEquals != null && {
-            encryptionContextEquals: se_KmsConstraintsMap(input.encryptionContextEquals, context),
-        }),
-        ...(input.encryptionContextSubset != null && {
-            encryptionContextSubset: se_KmsConstraintsMap(input.encryptionContextSubset, context),
-        }),
-    };
-};
-const se_KmsGrantOperationsList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_KmsKeyConfiguration = (input, context) => {
-    return {
-        ...(input.grants != null && { grants: se_KmsGrantConfigurationsList(input.grants, context) }),
-        ...(input.keyPolicies != null && { keyPolicies: se_KmsKeyPoliciesMap(input.keyPolicies, context) }),
-    };
-};
-const se_KmsKeyPoliciesMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_NetworkOriginConfiguration = (input, context) => {
-    return models_0_1.NetworkOriginConfiguration.visit(input, {
-        internetConfiguration: (value) => ({ internetConfiguration: se_InternetConfiguration(value, context) }),
-        vpcConfiguration: (value) => ({ vpcConfiguration: se_VpcConfiguration(value, context) }),
-        _: (name, value) => ({ name: value }),
-    });
-};
-const se_PolicyGenerationDetails = (input, context) => {
-    return {
-        ...(input.principalArn != null && { principalArn: input.principalArn }),
-    };
-};
-const se_RdsDbClusterSnapshotAccountIdsList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_RdsDbClusterSnapshotAttributesMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = se_RdsDbClusterSnapshotAttributeValue(value, context);
-        return acc;
-    }, {});
-};
-const se_RdsDbClusterSnapshotAttributeValue = (input, context) => {
-    return models_0_1.RdsDbClusterSnapshotAttributeValue.visit(input, {
-        accountIds: (value) => ({ accountIds: se_RdsDbClusterSnapshotAccountIdsList(value, context) }),
-        _: (name, value) => ({ name: value }),
-    });
-};
-const se_RdsDbClusterSnapshotConfiguration = (input, context) => {
-    return {
-        ...(input.attributes != null && { attributes: se_RdsDbClusterSnapshotAttributesMap(input.attributes, context) }),
-        ...(input.kmsKeyId != null && { kmsKeyId: input.kmsKeyId }),
-    };
-};
-const se_RdsDbSnapshotAccountIdsList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_RdsDbSnapshotAttributesMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = se_RdsDbSnapshotAttributeValue(value, context);
-        return acc;
-    }, {});
-};
-const se_RdsDbSnapshotAttributeValue = (input, context) => {
-    return models_0_1.RdsDbSnapshotAttributeValue.visit(input, {
-        accountIds: (value) => ({ accountIds: se_RdsDbSnapshotAccountIdsList(value, context) }),
-        _: (name, value) => ({ name: value }),
-    });
-};
-const se_RdsDbSnapshotConfiguration = (input, context) => {
-    return {
-        ...(input.attributes != null && { attributes: se_RdsDbSnapshotAttributesMap(input.attributes, context) }),
-        ...(input.kmsKeyId != null && { kmsKeyId: input.kmsKeyId }),
-    };
-};
-const se_RegionList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_S3AccessPointConfiguration = (input, context) => {
-    return {
-        ...(input.accessPointPolicy != null && { accessPointPolicy: input.accessPointPolicy }),
-        ...(input.networkOrigin != null && { networkOrigin: se_NetworkOriginConfiguration(input.networkOrigin, context) }),
-        ...(input.publicAccessBlock != null && {
-            publicAccessBlock: se_S3PublicAccessBlockConfiguration(input.publicAccessBlock, context),
-        }),
-    };
-};
-const se_S3AccessPointConfigurationsMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = se_S3AccessPointConfiguration(value, context);
-        return acc;
-    }, {});
-};
-const se_S3BucketAclGrantConfiguration = (input, context) => {
-    return {
-        ...(input.grantee != null && { grantee: se_AclGrantee(input.grantee, context) }),
-        ...(input.permission != null && { permission: input.permission }),
-    };
-};
-const se_S3BucketAclGrantConfigurationsList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_S3BucketAclGrantConfiguration(entry, context);
-    });
-};
-const se_S3BucketConfiguration = (input, context) => {
-    return {
-        ...(input.accessPoints != null && { accessPoints: se_S3AccessPointConfigurationsMap(input.accessPoints, context) }),
-        ...(input.bucketAclGrants != null && {
-            bucketAclGrants: se_S3BucketAclGrantConfigurationsList(input.bucketAclGrants, context),
-        }),
-        ...(input.bucketPolicy != null && { bucketPolicy: input.bucketPolicy }),
-        ...(input.bucketPublicAccessBlock != null && {
-            bucketPublicAccessBlock: se_S3PublicAccessBlockConfiguration(input.bucketPublicAccessBlock, context),
-        }),
-    };
-};
-const se_S3PublicAccessBlockConfiguration = (input, context) => {
-    return {
-        ...(input.ignorePublicAcls != null && { ignorePublicAcls: input.ignorePublicAcls }),
-        ...(input.restrictPublicBuckets != null && { restrictPublicBuckets: input.restrictPublicBuckets }),
-    };
-};
-const se_SecretsManagerSecretConfiguration = (input, context) => {
-    return {
-        ...(input.kmsKeyId != null && { kmsKeyId: input.kmsKeyId }),
-        ...(input.secretPolicy != null && { secretPolicy: input.secretPolicy }),
-    };
-};
-const se_SnsTopicConfiguration = (input, context) => {
-    return {
-        ...(input.topicPolicy != null && { topicPolicy: input.topicPolicy }),
-    };
-};
-const se_SortCriteria = (input, context) => {
-    return {
-        ...(input.attributeName != null && { attributeName: input.attributeName }),
-        ...(input.orderBy != null && { orderBy: input.orderBy }),
-    };
-};
-const se_SqsQueueConfiguration = (input, context) => {
-    return {
-        ...(input.queuePolicy != null && { queuePolicy: input.queuePolicy }),
-    };
-};
-const se_TagsMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_Trail = (input, context) => {
-    return {
-        ...(input.allRegions != null && { allRegions: input.allRegions }),
-        ...(input.cloudTrailArn != null && { cloudTrailArn: input.cloudTrailArn }),
-        ...(input.regions != null && { regions: se_RegionList(input.regions, context) }),
-    };
-};
-const se_TrailList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_Trail(entry, context);
-    });
-};
-const se_ValueList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_VpcConfiguration = (input, context) => {
-    return {
-        ...(input.vpcId != null && { vpcId: input.vpcId }),
-    };
-};
 const de_AccessPreview = (output, context) => {
-    return {
-        analyzerArn: (0, smithy_client_1.expectString)(output.analyzerArn),
-        configurations: output.configurations != null ? de_ConfigurationsMap(output.configurations, context) : undefined,
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        id: (0, smithy_client_1.expectString)(output.id),
-        status: (0, smithy_client_1.expectString)(output.status),
-        statusReason: output.statusReason != null ? de_AccessPreviewStatusReason(output.statusReason, context) : undefined,
-    };
+    return (0, smithy_client_1.take)(output, {
+        analyzerArn: smithy_client_1.expectString,
+        configurations: smithy_client_1._json,
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        id: smithy_client_1.expectString,
+        status: smithy_client_1.expectString,
+        statusReason: smithy_client_1._json,
+    });
 };
 const de_AccessPreviewFinding = (output, context) => {
-    return {
-        action: output.action != null ? de_ActionList(output.action, context) : undefined,
-        changeType: (0, smithy_client_1.expectString)(output.changeType),
-        condition: output.condition != null ? de_ConditionKeyMap(output.condition, context) : undefined,
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        error: (0, smithy_client_1.expectString)(output.error),
-        existingFindingId: (0, smithy_client_1.expectString)(output.existingFindingId),
-        existingFindingStatus: (0, smithy_client_1.expectString)(output.existingFindingStatus),
-        id: (0, smithy_client_1.expectString)(output.id),
-        isPublic: (0, smithy_client_1.expectBoolean)(output.isPublic),
-        principal: output.principal != null ? de_PrincipalMap(output.principal, context) : undefined,
-        resource: (0, smithy_client_1.expectString)(output.resource),
-        resourceOwnerAccount: (0, smithy_client_1.expectString)(output.resourceOwnerAccount),
-        resourceType: (0, smithy_client_1.expectString)(output.resourceType),
-        sources: output.sources != null ? de_FindingSourceList(output.sources, context) : undefined,
-        status: (0, smithy_client_1.expectString)(output.status),
-    };
+    return (0, smithy_client_1.take)(output, {
+        action: smithy_client_1._json,
+        changeType: smithy_client_1.expectString,
+        condition: smithy_client_1._json,
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        error: smithy_client_1.expectString,
+        existingFindingId: smithy_client_1.expectString,
+        existingFindingStatus: smithy_client_1.expectString,
+        id: smithy_client_1.expectString,
+        isPublic: smithy_client_1.expectBoolean,
+        principal: smithy_client_1._json,
+        resource: smithy_client_1.expectString,
+        resourceOwnerAccount: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+        sources: smithy_client_1._json,
+        status: smithy_client_1.expectString,
+    });
 };
 const de_AccessPreviewFindingsList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_AccessPreviewFinding(entry, context);
     });
     return retVal;
@@ -2449,803 +2059,161 @@ const de_AccessPreviewsList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_AccessPreviewSummary(entry, context);
     });
     return retVal;
 };
-const de_AccessPreviewStatusReason = (output, context) => {
-    return {
-        code: (0, smithy_client_1.expectString)(output.code),
-    };
-};
 const de_AccessPreviewSummary = (output, context) => {
-    return {
-        analyzerArn: (0, smithy_client_1.expectString)(output.analyzerArn),
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        id: (0, smithy_client_1.expectString)(output.id),
-        status: (0, smithy_client_1.expectString)(output.status),
-        statusReason: output.statusReason != null ? de_AccessPreviewStatusReason(output.statusReason, context) : undefined,
-    };
-};
-const de_AclGrantee = (output, context) => {
-    if ((0, smithy_client_1.expectString)(output.id) !== undefined) {
-        return { id: (0, smithy_client_1.expectString)(output.id) };
-    }
-    if ((0, smithy_client_1.expectString)(output.uri) !== undefined) {
-        return { uri: (0, smithy_client_1.expectString)(output.uri) };
-    }
-    return { $unknown: Object.entries(output)[0] };
-};
-const de_ActionList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
+    return (0, smithy_client_1.take)(output, {
+        analyzerArn: smithy_client_1.expectString,
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        id: smithy_client_1.expectString,
+        status: smithy_client_1.expectString,
+        statusReason: smithy_client_1._json,
     });
-    return retVal;
 };
 const de_AnalyzedResource = (output, context) => {
-    return {
-        actions: output.actions != null ? de_ActionList(output.actions, context) : undefined,
-        analyzedAt: output.analyzedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.analyzedAt)) : undefined,
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        error: (0, smithy_client_1.expectString)(output.error),
-        isPublic: (0, smithy_client_1.expectBoolean)(output.isPublic),
-        resourceArn: (0, smithy_client_1.expectString)(output.resourceArn),
-        resourceOwnerAccount: (0, smithy_client_1.expectString)(output.resourceOwnerAccount),
-        resourceType: (0, smithy_client_1.expectString)(output.resourceType),
-        sharedVia: output.sharedVia != null ? de_SharedViaList(output.sharedVia, context) : undefined,
-        status: (0, smithy_client_1.expectString)(output.status),
-        updatedAt: output.updatedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.updatedAt)) : undefined,
-    };
-};
-const de_AnalyzedResourcesList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_AnalyzedResourceSummary(entry, context);
+    return (0, smithy_client_1.take)(output, {
+        actions: smithy_client_1._json,
+        analyzedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        error: smithy_client_1.expectString,
+        isPublic: smithy_client_1.expectBoolean,
+        resourceArn: smithy_client_1.expectString,
+        resourceOwnerAccount: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+        sharedVia: smithy_client_1._json,
+        status: smithy_client_1.expectString,
+        updatedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
     });
-    return retVal;
-};
-const de_AnalyzedResourceSummary = (output, context) => {
-    return {
-        resourceArn: (0, smithy_client_1.expectString)(output.resourceArn),
-        resourceOwnerAccount: (0, smithy_client_1.expectString)(output.resourceOwnerAccount),
-        resourceType: (0, smithy_client_1.expectString)(output.resourceType),
-    };
 };
 const de_AnalyzersList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_AnalyzerSummary(entry, context);
     });
     return retVal;
 };
 const de_AnalyzerSummary = (output, context) => {
-    return {
-        arn: (0, smithy_client_1.expectString)(output.arn),
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        lastResourceAnalyzed: (0, smithy_client_1.expectString)(output.lastResourceAnalyzed),
-        lastResourceAnalyzedAt: output.lastResourceAnalyzedAt != null
-            ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.lastResourceAnalyzedAt))
-            : undefined,
-        name: (0, smithy_client_1.expectString)(output.name),
-        status: (0, smithy_client_1.expectString)(output.status),
-        statusReason: output.statusReason != null ? de_StatusReason(output.statusReason, context) : undefined,
-        tags: output.tags != null ? de_TagsMap(output.tags, context) : undefined,
-        type: (0, smithy_client_1.expectString)(output.type),
-    };
+    return (0, smithy_client_1.take)(output, {
+        arn: smithy_client_1.expectString,
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        lastResourceAnalyzed: smithy_client_1.expectString,
+        lastResourceAnalyzedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        name: smithy_client_1.expectString,
+        status: smithy_client_1.expectString,
+        statusReason: smithy_client_1._json,
+        tags: smithy_client_1._json,
+        type: smithy_client_1.expectString,
+    });
 };
 const de_ArchiveRulesList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_ArchiveRuleSummary(entry, context);
     });
     return retVal;
 };
 const de_ArchiveRuleSummary = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        filter: output.filter != null ? de_FilterCriteriaMap(output.filter, context) : undefined,
-        ruleName: (0, smithy_client_1.expectString)(output.ruleName),
-        updatedAt: output.updatedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.updatedAt)) : undefined,
-    };
-};
-const de_CloudTrailProperties = (output, context) => {
-    return {
-        endTime: output.endTime != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.endTime)) : undefined,
-        startTime: output.startTime != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.startTime)) : undefined,
-        trailProperties: output.trailProperties != null ? de_TrailPropertiesList(output.trailProperties, context) : undefined,
-    };
-};
-const de_ConditionKeyMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = (0, smithy_client_1.expectString)(value);
-        return acc;
-    }, {});
-};
-const de_Configuration = (output, context) => {
-    if (output.ebsSnapshot != null) {
-        return {
-            ebsSnapshot: de_EbsSnapshotConfiguration(output.ebsSnapshot, context),
-        };
-    }
-    if (output.ecrRepository != null) {
-        return {
-            ecrRepository: de_EcrRepositoryConfiguration(output.ecrRepository, context),
-        };
-    }
-    if (output.efsFileSystem != null) {
-        return {
-            efsFileSystem: de_EfsFileSystemConfiguration(output.efsFileSystem, context),
-        };
-    }
-    if (output.iamRole != null) {
-        return {
-            iamRole: de_IamRoleConfiguration(output.iamRole, context),
-        };
-    }
-    if (output.kmsKey != null) {
-        return {
-            kmsKey: de_KmsKeyConfiguration(output.kmsKey, context),
-        };
-    }
-    if (output.rdsDbClusterSnapshot != null) {
-        return {
-            rdsDbClusterSnapshot: de_RdsDbClusterSnapshotConfiguration(output.rdsDbClusterSnapshot, context),
-        };
-    }
-    if (output.rdsDbSnapshot != null) {
-        return {
-            rdsDbSnapshot: de_RdsDbSnapshotConfiguration(output.rdsDbSnapshot, context),
-        };
-    }
-    if (output.s3Bucket != null) {
-        return {
-            s3Bucket: de_S3BucketConfiguration(output.s3Bucket, context),
-        };
-    }
-    if (output.secretsManagerSecret != null) {
-        return {
-            secretsManagerSecret: de_SecretsManagerSecretConfiguration(output.secretsManagerSecret, context),
-        };
-    }
-    if (output.snsTopic != null) {
-        return {
-            snsTopic: de_SnsTopicConfiguration(output.snsTopic, context),
-        };
-    }
-    if (output.sqsQueue != null) {
-        return {
-            sqsQueue: de_SqsQueueConfiguration(output.sqsQueue, context),
-        };
-    }
-    return { $unknown: Object.entries(output)[0] };
-};
-const de_ConfigurationsMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = de_Configuration((0, smithy_client_1.expectUnion)(value), context);
-        return acc;
-    }, {});
-};
-const de_Criterion = (output, context) => {
-    return {
-        contains: output.contains != null ? de_ValueList(output.contains, context) : undefined,
-        eq: output.eq != null ? de_ValueList(output.eq, context) : undefined,
-        exists: (0, smithy_client_1.expectBoolean)(output.exists),
-        neq: output.neq != null ? de_ValueList(output.neq, context) : undefined,
-    };
-};
-const de_EbsGroupList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
+    return (0, smithy_client_1.take)(output, {
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        filter: smithy_client_1._json,
+        ruleName: smithy_client_1.expectString,
+        updatedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
     });
-    return retVal;
-};
-const de_EbsSnapshotConfiguration = (output, context) => {
-    return {
-        groups: output.groups != null ? de_EbsGroupList(output.groups, context) : undefined,
-        kmsKeyId: (0, smithy_client_1.expectString)(output.kmsKeyId),
-        userIds: output.userIds != null ? de_EbsUserIdList(output.userIds, context) : undefined,
-    };
 };
-const de_EbsUserIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
+const de_CloudTrailProperties = (output, context) => {
+    return (0, smithy_client_1.take)(output, {
+        endTime: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        startTime: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        trailProperties: smithy_client_1._json,
     });
-    return retVal;
-};
-const de_EcrRepositoryConfiguration = (output, context) => {
-    return {
-        repositoryPolicy: (0, smithy_client_1.expectString)(output.repositoryPolicy),
-    };
-};
-const de_EfsFileSystemConfiguration = (output, context) => {
-    return {
-        fileSystemPolicy: (0, smithy_client_1.expectString)(output.fileSystemPolicy),
-    };
-};
-const de_FilterCriteriaMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = de_Criterion(value, context);
-        return acc;
-    }, {});
 };
 const de_Finding = (output, context) => {
-    return {
-        action: output.action != null ? de_ActionList(output.action, context) : undefined,
-        analyzedAt: output.analyzedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.analyzedAt)) : undefined,
-        condition: output.condition != null ? de_ConditionKeyMap(output.condition, context) : undefined,
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        error: (0, smithy_client_1.expectString)(output.error),
-        id: (0, smithy_client_1.expectString)(output.id),
-        isPublic: (0, smithy_client_1.expectBoolean)(output.isPublic),
-        principal: output.principal != null ? de_PrincipalMap(output.principal, context) : undefined,
-        resource: (0, smithy_client_1.expectString)(output.resource),
-        resourceOwnerAccount: (0, smithy_client_1.expectString)(output.resourceOwnerAccount),
-        resourceType: (0, smithy_client_1.expectString)(output.resourceType),
-        sources: output.sources != null ? de_FindingSourceList(output.sources, context) : undefined,
-        status: (0, smithy_client_1.expectString)(output.status),
-        updatedAt: output.updatedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.updatedAt)) : undefined,
-    };
+    return (0, smithy_client_1.take)(output, {
+        action: smithy_client_1._json,
+        analyzedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        condition: smithy_client_1._json,
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        error: smithy_client_1.expectString,
+        id: smithy_client_1.expectString,
+        isPublic: smithy_client_1.expectBoolean,
+        principal: smithy_client_1._json,
+        resource: smithy_client_1.expectString,
+        resourceOwnerAccount: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+        sources: smithy_client_1._json,
+        status: smithy_client_1.expectString,
+        updatedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+    });
 };
 const de_FindingsList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_FindingSummary(entry, context);
     });
     return retVal;
 };
-const de_FindingSource = (output, context) => {
-    return {
-        detail: output.detail != null ? de_FindingSourceDetail(output.detail, context) : undefined,
-        type: (0, smithy_client_1.expectString)(output.type),
-    };
-};
-const de_FindingSourceDetail = (output, context) => {
-    return {
-        accessPointAccount: (0, smithy_client_1.expectString)(output.accessPointAccount),
-        accessPointArn: (0, smithy_client_1.expectString)(output.accessPointArn),
-    };
-};
-const de_FindingSourceList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_FindingSource(entry, context);
-    });
-    return retVal;
-};
 const de_FindingSummary = (output, context) => {
-    return {
-        action: output.action != null ? de_ActionList(output.action, context) : undefined,
-        analyzedAt: output.analyzedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.analyzedAt)) : undefined,
-        condition: output.condition != null ? de_ConditionKeyMap(output.condition, context) : undefined,
-        createdAt: output.createdAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.createdAt)) : undefined,
-        error: (0, smithy_client_1.expectString)(output.error),
-        id: (0, smithy_client_1.expectString)(output.id),
-        isPublic: (0, smithy_client_1.expectBoolean)(output.isPublic),
-        principal: output.principal != null ? de_PrincipalMap(output.principal, context) : undefined,
-        resource: (0, smithy_client_1.expectString)(output.resource),
-        resourceOwnerAccount: (0, smithy_client_1.expectString)(output.resourceOwnerAccount),
-        resourceType: (0, smithy_client_1.expectString)(output.resourceType),
-        sources: output.sources != null ? de_FindingSourceList(output.sources, context) : undefined,
-        status: (0, smithy_client_1.expectString)(output.status),
-        updatedAt: output.updatedAt != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.updatedAt)) : undefined,
-    };
-};
-const de_GeneratedPolicy = (output, context) => {
-    return {
-        policy: (0, smithy_client_1.expectString)(output.policy),
-    };
-};
-const de_GeneratedPolicyList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_GeneratedPolicy(entry, context);
+    return (0, smithy_client_1.take)(output, {
+        action: smithy_client_1._json,
+        analyzedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        condition: smithy_client_1._json,
+        createdAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        error: smithy_client_1.expectString,
+        id: smithy_client_1.expectString,
+        isPublic: smithy_client_1.expectBoolean,
+        principal: smithy_client_1._json,
+        resource: smithy_client_1.expectString,
+        resourceOwnerAccount: smithy_client_1.expectString,
+        resourceType: smithy_client_1.expectString,
+        sources: smithy_client_1._json,
+        status: smithy_client_1.expectString,
+        updatedAt: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
     });
-    return retVal;
 };
 const de_GeneratedPolicyProperties = (output, context) => {
-    return {
-        cloudTrailProperties: output.cloudTrailProperties != null ? de_CloudTrailProperties(output.cloudTrailProperties, context) : undefined,
-        isComplete: (0, smithy_client_1.expectBoolean)(output.isComplete),
-        principalArn: (0, smithy_client_1.expectString)(output.principalArn),
-    };
-};
-const de_GeneratedPolicyResult = (output, context) => {
-    return {
-        generatedPolicies: output.generatedPolicies != null ? de_GeneratedPolicyList(output.generatedPolicies, context) : undefined,
-        properties: output.properties != null ? de_GeneratedPolicyProperties(output.properties, context) : undefined,
-    };
-};
-const de_IamRoleConfiguration = (output, context) => {
-    return {
-        trustPolicy: (0, smithy_client_1.expectString)(output.trustPolicy),
-    };
-};
-const de_InternetConfiguration = (output, context) => {
-    return {};
-};
-const de_JobDetails = (output, context) => {
-    return {
-        completedOn: output.completedOn != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.completedOn)) : undefined,
-        jobError: output.jobError != null ? de_JobError(output.jobError, context) : undefined,
-        jobId: (0, smithy_client_1.expectString)(output.jobId),
-        startedOn: output.startedOn != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.startedOn)) : undefined,
-        status: (0, smithy_client_1.expectString)(output.status),
-    };
-};
-const de_JobError = (output, context) => {
-    return {
-        code: (0, smithy_client_1.expectString)(output.code),
-        message: (0, smithy_client_1.expectString)(output.message),
-    };
-};
-const de_KmsConstraintsMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = (0, smithy_client_1.expectString)(value);
-        return acc;
-    }, {});
-};
-const de_KmsGrantConfiguration = (output, context) => {
-    return {
-        constraints: output.constraints != null ? de_KmsGrantConstraints(output.constraints, context) : undefined,
-        granteePrincipal: (0, smithy_client_1.expectString)(output.granteePrincipal),
-        issuingAccount: (0, smithy_client_1.expectString)(output.issuingAccount),
-        operations: output.operations != null ? de_KmsGrantOperationsList(output.operations, context) : undefined,
-        retiringPrincipal: (0, smithy_client_1.expectString)(output.retiringPrincipal),
-    };
-};
-const de_KmsGrantConfigurationsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_KmsGrantConfiguration(entry, context);
-    });
-    return retVal;
-};
-const de_KmsGrantConstraints = (output, context) => {
-    return {
-        encryptionContextEquals: output.encryptionContextEquals != null
-            ? de_KmsConstraintsMap(output.encryptionContextEquals, context)
-            : undefined,
-        encryptionContextSubset: output.encryptionContextSubset != null
-            ? de_KmsConstraintsMap(output.encryptionContextSubset, context)
-            : undefined,
-    };
-};
-const de_KmsGrantOperationsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
+    return (0, smithy_client_1.take)(output, {
+        cloudTrailProperties: (_) => de_CloudTrailProperties(_, context),
+        isComplete: smithy_client_1.expectBoolean,
+        principalArn: smithy_client_1.expectString,
     });
-    return retVal;
-};
-const de_KmsKeyConfiguration = (output, context) => {
-    return {
-        grants: output.grants != null ? de_KmsGrantConfigurationsList(output.grants, context) : undefined,
-        keyPolicies: output.keyPolicies != null ? de_KmsKeyPoliciesMap(output.keyPolicies, context) : undefined,
-    };
-};
-const de_KmsKeyPoliciesMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = (0, smithy_client_1.expectString)(value);
-        return acc;
-    }, {});
-};
-const de_Location = (output, context) => {
-    return {
-        path: output.path != null ? de_PathElementList(output.path, context) : undefined,
-        span: output.span != null ? de_Span(output.span, context) : undefined,
-    };
 };
-const de_LocationList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Location(entry, context);
+const de_GeneratedPolicyResult = (output, context) => {
+    return (0, smithy_client_1.take)(output, {
+        generatedPolicies: smithy_client_1._json,
+        properties: (_) => de_GeneratedPolicyProperties(_, context),
     });
-    return retVal;
-};
-const de_NetworkOriginConfiguration = (output, context) => {
-    if (output.internetConfiguration != null) {
-        return {
-            internetConfiguration: de_InternetConfiguration(output.internetConfiguration, context),
-        };
-    }
-    if (output.vpcConfiguration != null) {
-        return {
-            vpcConfiguration: de_VpcConfiguration(output.vpcConfiguration, context),
-        };
-    }
-    return { $unknown: Object.entries(output)[0] };
-};
-const de_PathElement = (output, context) => {
-    if ((0, smithy_client_1.expectInt32)(output.index) !== undefined) {
-        return { index: (0, smithy_client_1.expectInt32)(output.index) };
-    }
-    if ((0, smithy_client_1.expectString)(output.key) !== undefined) {
-        return { key: (0, smithy_client_1.expectString)(output.key) };
-    }
-    if (output.substring != null) {
-        return {
-            substring: de_Substring(output.substring, context),
-        };
-    }
-    if ((0, smithy_client_1.expectString)(output.value) !== undefined) {
-        return { value: (0, smithy_client_1.expectString)(output.value) };
-    }
-    return { $unknown: Object.entries(output)[0] };
 };
-const de_PathElementList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_PathElement((0, smithy_client_1.expectUnion)(entry), context);
+const de_JobDetails = (output, context) => {
+    return (0, smithy_client_1.take)(output, {
+        completedOn: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        jobError: smithy_client_1._json,
+        jobId: smithy_client_1.expectString,
+        startedOn: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        status: smithy_client_1.expectString,
     });
-    return retVal;
 };
 const de_PolicyGeneration = (output, context) => {
-    return {
-        completedOn: output.completedOn != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.completedOn)) : undefined,
-        jobId: (0, smithy_client_1.expectString)(output.jobId),
-        principalArn: (0, smithy_client_1.expectString)(output.principalArn),
-        startedOn: output.startedOn != null ? (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(output.startedOn)) : undefined,
-        status: (0, smithy_client_1.expectString)(output.status),
-    };
+    return (0, smithy_client_1.take)(output, {
+        completedOn: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        jobId: smithy_client_1.expectString,
+        principalArn: smithy_client_1.expectString,
+        startedOn: (_) => (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTimeWithOffset)(_)),
+        status: smithy_client_1.expectString,
+    });
 };
 const de_PolicyGenerationList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_PolicyGeneration(entry, context);
     });
     return retVal;
 };
-const de_Position = (output, context) => {
-    return {
-        column: (0, smithy_client_1.expectInt32)(output.column),
-        line: (0, smithy_client_1.expectInt32)(output.line),
-        offset: (0, smithy_client_1.expectInt32)(output.offset),
-    };
-};
-const de_PrincipalMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = (0, smithy_client_1.expectString)(value);
-        return acc;
-    }, {});
-};
-const de_RdsDbClusterSnapshotAccountIdsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
-    });
-    return retVal;
-};
-const de_RdsDbClusterSnapshotAttributesMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = de_RdsDbClusterSnapshotAttributeValue((0, smithy_client_1.expectUnion)(value), context);
-        return acc;
-    }, {});
-};
-const de_RdsDbClusterSnapshotAttributeValue = (output, context) => {
-    if (output.accountIds != null) {
-        return {
-            accountIds: de_RdsDbClusterSnapshotAccountIdsList(output.accountIds, context),
-        };
-    }
-    return { $unknown: Object.entries(output)[0] };
-};
-const de_RdsDbClusterSnapshotConfiguration = (output, context) => {
-    return {
-        attributes: output.attributes != null ? de_RdsDbClusterSnapshotAttributesMap(output.attributes, context) : undefined,
-        kmsKeyId: (0, smithy_client_1.expectString)(output.kmsKeyId),
-    };
-};
-const de_RdsDbSnapshotAccountIdsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
-    });
-    return retVal;
-};
-const de_RdsDbSnapshotAttributesMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = de_RdsDbSnapshotAttributeValue((0, smithy_client_1.expectUnion)(value), context);
-        return acc;
-    }, {});
-};
-const de_RdsDbSnapshotAttributeValue = (output, context) => {
-    if (output.accountIds != null) {
-        return {
-            accountIds: de_RdsDbSnapshotAccountIdsList(output.accountIds, context),
-        };
-    }
-    return { $unknown: Object.entries(output)[0] };
-};
-const de_RdsDbSnapshotConfiguration = (output, context) => {
-    return {
-        attributes: output.attributes != null ? de_RdsDbSnapshotAttributesMap(output.attributes, context) : undefined,
-        kmsKeyId: (0, smithy_client_1.expectString)(output.kmsKeyId),
-    };
-};
-const de_RegionList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
-    });
-    return retVal;
-};
-const de_S3AccessPointConfiguration = (output, context) => {
-    return {
-        accessPointPolicy: (0, smithy_client_1.expectString)(output.accessPointPolicy),
-        networkOrigin: output.networkOrigin != null
-            ? de_NetworkOriginConfiguration((0, smithy_client_1.expectUnion)(output.networkOrigin), context)
-            : undefined,
-        publicAccessBlock: output.publicAccessBlock != null
-            ? de_S3PublicAccessBlockConfiguration(output.publicAccessBlock, context)
-            : undefined,
-    };
-};
-const de_S3AccessPointConfigurationsMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = de_S3AccessPointConfiguration(value, context);
-        return acc;
-    }, {});
-};
-const de_S3BucketAclGrantConfiguration = (output, context) => {
-    return {
-        grantee: output.grantee != null ? de_AclGrantee((0, smithy_client_1.expectUnion)(output.grantee), context) : undefined,
-        permission: (0, smithy_client_1.expectString)(output.permission),
-    };
-};
-const de_S3BucketAclGrantConfigurationsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_S3BucketAclGrantConfiguration(entry, context);
-    });
-    return retVal;
-};
-const de_S3BucketConfiguration = (output, context) => {
-    return {
-        accessPoints: output.accessPoints != null ? de_S3AccessPointConfigurationsMap(output.accessPoints, context) : undefined,
-        bucketAclGrants: output.bucketAclGrants != null
-            ? de_S3BucketAclGrantConfigurationsList(output.bucketAclGrants, context)
-            : undefined,
-        bucketPolicy: (0, smithy_client_1.expectString)(output.bucketPolicy),
-        bucketPublicAccessBlock: output.bucketPublicAccessBlock != null
-            ? de_S3PublicAccessBlockConfiguration(output.bucketPublicAccessBlock, context)
-            : undefined,
-    };
-};
-const de_S3PublicAccessBlockConfiguration = (output, context) => {
-    return {
-        ignorePublicAcls: (0, smithy_client_1.expectBoolean)(output.ignorePublicAcls),
-        restrictPublicBuckets: (0, smithy_client_1.expectBoolean)(output.restrictPublicBuckets),
-    };
-};
-const de_SecretsManagerSecretConfiguration = (output, context) => {
-    return {
-        kmsKeyId: (0, smithy_client_1.expectString)(output.kmsKeyId),
-        secretPolicy: (0, smithy_client_1.expectString)(output.secretPolicy),
-    };
-};
-const de_SharedViaList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
-    });
-    return retVal;
-};
-const de_SnsTopicConfiguration = (output, context) => {
-    return {
-        topicPolicy: (0, smithy_client_1.expectString)(output.topicPolicy),
-    };
-};
-const de_Span = (output, context) => {
-    return {
-        end: output.end != null ? de_Position(output.end, context) : undefined,
-        start: output.start != null ? de_Position(output.start, context) : undefined,
-    };
-};
-const de_SqsQueueConfiguration = (output, context) => {
-    return {
-        queuePolicy: (0, smithy_client_1.expectString)(output.queuePolicy),
-    };
-};
-const de_StatusReason = (output, context) => {
-    return {
-        code: (0, smithy_client_1.expectString)(output.code),
-    };
-};
-const de_Substring = (output, context) => {
-    return {
-        length: (0, smithy_client_1.expectInt32)(output.length),
-        start: (0, smithy_client_1.expectInt32)(output.start),
-    };
-};
-const de_TagsMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = (0, smithy_client_1.expectString)(value);
-        return acc;
-    }, {});
-};
-const de_TrailProperties = (output, context) => {
-    return {
-        allRegions: (0, smithy_client_1.expectBoolean)(output.allRegions),
-        cloudTrailArn: (0, smithy_client_1.expectString)(output.cloudTrailArn),
-        regions: output.regions != null ? de_RegionList(output.regions, context) : undefined,
-    };
-};
-const de_TrailPropertiesList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_TrailProperties(entry, context);
-    });
-    return retVal;
-};
-const de_ValidatePolicyFinding = (output, context) => {
-    return {
-        findingDetails: (0, smithy_client_1.expectString)(output.findingDetails),
-        findingType: (0, smithy_client_1.expectString)(output.findingType),
-        issueCode: (0, smithy_client_1.expectString)(output.issueCode),
-        learnMoreLink: (0, smithy_client_1.expectString)(output.learnMoreLink),
-        locations: output.locations != null ? de_LocationList(output.locations, context) : undefined,
-    };
-};
-const de_ValidatePolicyFindingList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_ValidatePolicyFinding(entry, context);
-    });
-    return retVal;
-};
-const de_ValidationExceptionField = (output, context) => {
-    return {
-        message: (0, smithy_client_1.expectString)(output.message),
-        name: (0, smithy_client_1.expectString)(output.name),
-    };
-};
-const de_ValidationExceptionFieldList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_ValidationExceptionField(entry, context);
-    });
-    return retVal;
-};
-const de_ValueList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return (0, smithy_client_1.expectString)(entry);
-    });
-    return retVal;
-};
-const de_VpcConfiguration = (output, context) => {
-    return {
-        vpcId: (0, smithy_client_1.expectString)(output.vpcId),
-    };
-};
 const deserializeMetadata = (output) => ({
     httpStatusCode: output.statusCode,
     requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"] ?? output.headers["x-amz-request-id"],