@aws-sdk/client-inspector2 3.312.0 → 3.315.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,8 +1,8 @@
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, limitedParseDouble as __limitedParseDouble, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, serializeFloat as __serializeFloat, strictParseInt32 as __strictParseInt32, throwDefaultError, } from "@aws-sdk/smithy-client";
+import { _json, decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, limitedParseDouble as __limitedParseDouble, map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, serializeFloat as __serializeFloat, strictParseInt32 as __strictParseInt32, take, withBaseException, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { Inspector2ServiceException as __BaseException } from "../models/Inspector2ServiceException";
-import { AccessDeniedException, AggregationRequest, BadRequestException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
+import { AccessDeniedException, BadRequestException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
 export const se_AssociateMemberCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {
@@ -10,9 +10,9 @@ export const se_AssociateMemberCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/members/associate";
     let body;
-    body = JSON.stringify({
-        ...(input.accountId != null && { accountId: input.accountId }),
-    });
+    body = JSON.stringify(take(input, {
+        accountId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -30,9 +30,9 @@ export const se_BatchGetAccountStatusCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/status/batch/get";
     let body;
-    body = JSON.stringify({
-        ...(input.accountIds != null && { accountIds: se_AccountIdSet(input.accountIds, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        accountIds: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -50,9 +50,9 @@ export const se_BatchGetFreeTrialInfoCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/freetrialinfo/batchget";
     let body;
-    body = JSON.stringify({
-        ...(input.accountIds != null && { accountIds: se_MeteringAccountIdList(input.accountIds, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        accountIds: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -70,9 +70,9 @@ export const se_CancelFindingsReportCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/reporting/cancel";
     let body;
-    body = JSON.stringify({
-        ...(input.reportId != null && { reportId: input.reportId }),
-    });
+    body = JSON.stringify(take(input, {
+        reportId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -90,14 +90,14 @@ export const se_CreateFilterCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/filters/create";
     let body;
-    body = JSON.stringify({
-        ...(input.action != null && { action: input.action }),
-        ...(input.description != null && { description: input.description }),
-        ...(input.filterCriteria != null && { filterCriteria: se_FilterCriteria(input.filterCriteria, context) }),
-        ...(input.name != null && { name: input.name }),
-        ...(input.reason != null && { reason: input.reason }),
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        action: [],
+        description: [],
+        filterCriteria: (_) => se_FilterCriteria(_, context),
+        name: [],
+        reason: [],
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -115,11 +115,11 @@ export const se_CreateFindingsReportCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/reporting/create";
     let body;
-    body = JSON.stringify({
-        ...(input.filterCriteria != null && { filterCriteria: se_FilterCriteria(input.filterCriteria, context) }),
-        ...(input.reportFormat != null && { reportFormat: input.reportFormat }),
-        ...(input.s3Destination != null && { s3Destination: se_Destination(input.s3Destination, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        filterCriteria: (_) => se_FilterCriteria(_, context),
+        reportFormat: [],
+        s3Destination: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -137,9 +137,9 @@ export const se_DeleteFilterCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/filters/delete";
     let body;
-    body = JSON.stringify({
-        ...(input.arn != null && { arn: input.arn }),
-    });
+    body = JSON.stringify(take(input, {
+        arn: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -175,10 +175,10 @@ export const se_DisableCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/disable";
     let body;
-    body = JSON.stringify({
-        ...(input.accountIds != null && { accountIds: se_AccountIdSet(input.accountIds, context) }),
-        ...(input.resourceTypes != null && { resourceTypes: se_DisableResourceTypeList(input.resourceTypes, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        accountIds: (_) => _json(_),
+        resourceTypes: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -196,9 +196,9 @@ export const se_DisableDelegatedAdminAccountCommand = async (input, context) =>
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/delegatedadminaccounts/disable";
     let body;
-    body = JSON.stringify({
-        ...(input.delegatedAdminAccountId != null && { delegatedAdminAccountId: input.delegatedAdminAccountId }),
-    });
+    body = JSON.stringify(take(input, {
+        delegatedAdminAccountId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -216,9 +216,9 @@ export const se_DisassociateMemberCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/members/disassociate";
     let body;
-    body = JSON.stringify({
-        ...(input.accountId != null && { accountId: input.accountId }),
-    });
+    body = JSON.stringify(take(input, {
+        accountId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -236,11 +236,11 @@ export const se_EnableCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/enable";
     let body;
-    body = JSON.stringify({
-        ...(input.accountIds != null && { accountIds: se_AccountIdSet(input.accountIds, context) }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.resourceTypes != null && { resourceTypes: se_EnableResourceTypeList(input.resourceTypes, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        accountIds: (_) => _json(_),
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        resourceTypes: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -258,10 +258,10 @@ export const se_EnableDelegatedAdminAccountCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/delegatedadminaccounts/enable";
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.delegatedAdminAccountId != null && { delegatedAdminAccountId: input.delegatedAdminAccountId }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        delegatedAdminAccountId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -315,9 +315,9 @@ export const se_GetFindingsReportStatusCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/reporting/status/get";
     let body;
-    body = JSON.stringify({
-        ...(input.reportId != null && { reportId: input.reportId }),
-    });
+    body = JSON.stringify(take(input, {
+        reportId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -335,9 +335,9 @@ export const se_GetMemberCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/members/get";
     let body;
-    body = JSON.stringify({
-        ...(input.accountId != null && { accountId: input.accountId }),
-    });
+    body = JSON.stringify(take(input, {
+        accountId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -355,11 +355,11 @@ export const se_ListAccountPermissionsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/accountpermissions/list";
     let body;
-    body = JSON.stringify({
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-        ...(input.service != null && { service: input.service }),
-    });
+    body = JSON.stringify(take(input, {
+        maxResults: [],
+        nextToken: [],
+        service: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -377,11 +377,11 @@ export const se_ListCoverageCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/coverage/list";
     let body;
-    body = JSON.stringify({
-        ...(input.filterCriteria != null && { filterCriteria: se_CoverageFilterCriteria(input.filterCriteria, context) }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify(take(input, {
+        filterCriteria: (_) => _json(_),
+        maxResults: [],
+        nextToken: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -399,11 +399,11 @@ export const se_ListCoverageStatisticsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/coverage/statistics/list";
     let body;
-    body = JSON.stringify({
-        ...(input.filterCriteria != null && { filterCriteria: se_CoverageFilterCriteria(input.filterCriteria, context) }),
-        ...(input.groupBy != null && { groupBy: input.groupBy }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify(take(input, {
+        filterCriteria: (_) => _json(_),
+        groupBy: [],
+        nextToken: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -421,10 +421,10 @@ export const se_ListDelegatedAdminAccountsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/delegatedadminaccounts/list";
     let body;
-    body = JSON.stringify({
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify(take(input, {
+        maxResults: [],
+        nextToken: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -442,12 +442,12 @@ export const se_ListFiltersCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/filters/list";
     let body;
-    body = JSON.stringify({
-        ...(input.action != null && { action: input.action }),
-        ...(input.arns != null && { arns: se_FilterArnList(input.arns, context) }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify(take(input, {
+        action: [],
+        arns: (_) => _json(_),
+        maxResults: [],
+        nextToken: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -465,15 +465,13 @@ export const se_ListFindingAggregationsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/findings/aggregation/list";
     let body;
-    body = JSON.stringify({
-        ...(input.accountIds != null && { accountIds: se_StringFilterList(input.accountIds, context) }),
-        ...(input.aggregationRequest != null && {
-            aggregationRequest: se_AggregationRequest(input.aggregationRequest, context),
-        }),
-        ...(input.aggregationType != null && { aggregationType: input.aggregationType }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify(take(input, {
+        accountIds: (_) => _json(_),
+        aggregationRequest: (_) => _json(_),
+        aggregationType: [],
+        maxResults: [],
+        nextToken: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -491,12 +489,12 @@ export const se_ListFindingsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/findings/list";
     let body;
-    body = JSON.stringify({
-        ...(input.filterCriteria != null && { filterCriteria: se_FilterCriteria(input.filterCriteria, context) }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-        ...(input.sortCriteria != null && { sortCriteria: se_SortCriteria(input.sortCriteria, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        filterCriteria: (_) => se_FilterCriteria(_, context),
+        maxResults: [],
+        nextToken: [],
+        sortCriteria: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -514,11 +512,11 @@ export const se_ListMembersCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/members/list";
     let body;
-    body = JSON.stringify({
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-        ...(input.onlyAssociated != null && { onlyAssociated: input.onlyAssociated }),
-    });
+    body = JSON.stringify(take(input, {
+        maxResults: [],
+        nextToken: [],
+        onlyAssociated: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -552,11 +550,11 @@ export const se_ListUsageTotalsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/usage/list";
     let body;
-    body = JSON.stringify({
-        ...(input.accountIds != null && { accountIds: se_UsageAccountIdList(input.accountIds, context) }),
-        ...(input.maxResults != null && { maxResults: input.maxResults }),
-        ...(input.nextToken != null && { nextToken: input.nextToken }),
-    });
+    body = JSON.stringify(take(input, {
+        accountIds: (_) => _json(_),
+        maxResults: [],
+        nextToken: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -575,9 +573,9 @@ export const se_TagResourceCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn}";
     resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -618,9 +616,9 @@ export const se_UpdateConfigurationCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/configuration/update";
     let body;
-    body = JSON.stringify({
-        ...(input.ecrConfiguration != null && { ecrConfiguration: se_EcrConfiguration(input.ecrConfiguration, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        ecrConfiguration: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -638,14 +636,14 @@ export const se_UpdateFilterCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/filters/update";
     let body;
-    body = JSON.stringify({
-        ...(input.action != null && { action: input.action }),
-        ...(input.description != null && { description: input.description }),
-        ...(input.filterArn != null && { filterArn: input.filterArn }),
-        ...(input.filterCriteria != null && { filterCriteria: se_FilterCriteria(input.filterCriteria, context) }),
-        ...(input.name != null && { name: input.name }),
-        ...(input.reason != null && { reason: input.reason }),
-    });
+    body = JSON.stringify(take(input, {
+        action: [],
+        description: [],
+        filterArn: [],
+        filterCriteria: (_) => se_FilterCriteria(_, context),
+        name: [],
+        reason: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -663,9 +661,9 @@ export const se_UpdateOrganizationConfigurationCommand = async (input, context)
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/organizationconfiguration/update";
     let body;
-    body = JSON.stringify({
-        ...(input.autoEnable != null && { autoEnable: se_AutoEnable(input.autoEnable, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        autoEnable: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -684,9 +682,10 @@ export const de_AssociateMemberCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.accountId != null) {
-        contents.accountId = __expectString(data.accountId);
-    }
+    const doc = take(data, {
+        accountId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_AssociateMemberCommandError = async (output, context) => {
@@ -710,10 +709,9 @@ const de_AssociateMemberCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -726,12 +724,11 @@ export const de_BatchGetAccountStatusCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.accounts != null) {
-        contents.accounts = de_AccountStateList(data.accounts, context);
-    }
-    if (data.failedAccounts != null) {
-        contents.failedAccounts = de_FailedAccountList(data.failedAccounts, context);
-    }
+    const doc = take(data, {
+        accounts: _json,
+        failedAccounts: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_BatchGetAccountStatusCommandError = async (output, context) => {
@@ -758,10 +755,9 @@ const de_BatchGetAccountStatusCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -774,12 +770,11 @@ export const de_BatchGetFreeTrialInfoCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.accounts != null) {
-        contents.accounts = de_FreeTrialAccountInfoList(data.accounts, context);
-    }
-    if (data.failedAccounts != null) {
-        contents.failedAccounts = de_FreeTrialInfoErrorList(data.failedAccounts, context);
-    }
+    const doc = take(data, {
+        accounts: (_) => de_FreeTrialAccountInfoList(_, context),
+        failedAccounts: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_BatchGetFreeTrialInfoCommandError = async (output, context) => {
@@ -803,10 +798,9 @@ const de_BatchGetFreeTrialInfoCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -819,9 +813,10 @@ export const de_CancelFindingsReportCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.reportId != null) {
-        contents.reportId = __expectString(data.reportId);
-    }
+    const doc = take(data, {
+        reportId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CancelFindingsReportCommandError = async (output, context) => {
@@ -848,10 +843,9 @@ const de_CancelFindingsReportCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -864,9 +858,10 @@ export const de_CreateFilterCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateFilterCommandError = async (output, context) => {
@@ -896,10 +891,9 @@ const de_CreateFilterCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -912,9 +906,10 @@ export const de_CreateFindingsReportCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.reportId != null) {
-        contents.reportId = __expectString(data.reportId);
-    }
+    const doc = take(data, {
+        reportId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateFindingsReportCommandError = async (output, context) => {
@@ -941,10 +936,9 @@ const de_CreateFindingsReportCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -957,9 +951,10 @@ export const de_DeleteFilterCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DeleteFilterCommandError = async (output, context) => {
@@ -986,10 +981,9 @@ const de_DeleteFilterCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1002,12 +996,11 @@ export const de_DescribeOrganizationConfigurationCommand = async (output, contex
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.autoEnable != null) {
-        contents.autoEnable = de_AutoEnable(data.autoEnable, context);
-    }
-    if (data.maxAccountLimitReached != null) {
-        contents.maxAccountLimitReached = __expectBoolean(data.maxAccountLimitReached);
-    }
+    const doc = take(data, {
+        autoEnable: _json,
+        maxAccountLimitReached: __expectBoolean,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DescribeOrganizationConfigurationCommandError = async (output, context) => {
@@ -1031,10 +1024,9 @@ const de_DescribeOrganizationConfigurationCommandError = async (output, context)
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1047,12 +1039,11 @@ export const de_DisableCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.accounts != null) {
-        contents.accounts = de_AccountList(data.accounts, context);
-    }
-    if (data.failedAccounts != null) {
-        contents.failedAccounts = de_FailedAccountList(data.failedAccounts, context);
-    }
+    const doc = take(data, {
+        accounts: _json,
+        failedAccounts: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DisableCommandError = async (output, context) => {
@@ -1079,10 +1070,9 @@ const de_DisableCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1095,9 +1085,10 @@ export const de_DisableDelegatedAdminAccountCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdminAccountId != null) {
-        contents.delegatedAdminAccountId = __expectString(data.delegatedAdminAccountId);
-    }
+    const doc = take(data, {
+        delegatedAdminAccountId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DisableDelegatedAdminAccountCommandError = async (output, context) => {
@@ -1127,10 +1118,9 @@ const de_DisableDelegatedAdminAccountCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1143,9 +1133,10 @@ export const de_DisassociateMemberCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.accountId != null) {
-        contents.accountId = __expectString(data.accountId);
-    }
+    const doc = take(data, {
+        accountId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DisassociateMemberCommandError = async (output, context) => {
@@ -1169,10 +1160,9 @@ const de_DisassociateMemberCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1185,12 +1175,11 @@ export const de_EnableCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.accounts != null) {
-        contents.accounts = de_AccountList(data.accounts, context);
-    }
-    if (data.failedAccounts != null) {
-        contents.failedAccounts = de_FailedAccountList(data.failedAccounts, context);
-    }
+    const doc = take(data, {
+        accounts: _json,
+        failedAccounts: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_EnableCommandError = async (output, context) => {
@@ -1217,10 +1206,9 @@ const de_EnableCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1233,9 +1221,10 @@ export const de_EnableDelegatedAdminAccountCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdminAccountId != null) {
-        contents.delegatedAdminAccountId = __expectString(data.delegatedAdminAccountId);
-    }
+    const doc = take(data, {
+        delegatedAdminAccountId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_EnableDelegatedAdminAccountCommandError = async (output, context) => {
@@ -1265,10 +1254,9 @@ const de_EnableDelegatedAdminAccountCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1281,9 +1269,10 @@ export const de_GetConfigurationCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.ecrConfiguration != null) {
-        contents.ecrConfiguration = de_EcrConfigurationState(data.ecrConfiguration, context);
-    }
+    const doc = take(data, {
+        ecrConfiguration: (_) => de_EcrConfigurationState(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetConfigurationCommandError = async (output, context) => {
@@ -1304,10 +1293,9 @@ const de_GetConfigurationCommandError = async (output, context) => {
             throw await de_ThrottlingExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1320,9 +1308,10 @@ export const de_GetDelegatedAdminAccountCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdmin != null) {
-        contents.delegatedAdmin = de_DelegatedAdmin(data.delegatedAdmin, context);
-    }
+    const doc = take(data, {
+        delegatedAdmin: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetDelegatedAdminAccountCommandError = async (output, context) => {
@@ -1349,10 +1338,9 @@ const de_GetDelegatedAdminAccountCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1365,24 +1353,15 @@ export const de_GetFindingsReportStatusCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.destination != null) {
-        contents.destination = de_Destination(data.destination, context);
-    }
-    if (data.errorCode != null) {
-        contents.errorCode = __expectString(data.errorCode);
-    }
-    if (data.errorMessage != null) {
-        contents.errorMessage = __expectString(data.errorMessage);
-    }
-    if (data.filterCriteria != null) {
-        contents.filterCriteria = de_FilterCriteria(data.filterCriteria, context);
-    }
-    if (data.reportId != null) {
-        contents.reportId = __expectString(data.reportId);
-    }
-    if (data.status != null) {
-        contents.status = __expectString(data.status);
-    }
+    const doc = take(data, {
+        destination: _json,
+        errorCode: __expectString,
+        errorMessage: __expectString,
+        filterCriteria: (_) => de_FilterCriteria(_, context),
+        reportId: __expectString,
+        status: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetFindingsReportStatusCommandError = async (output, context) => {
@@ -1409,10 +1388,9 @@ const de_GetFindingsReportStatusCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1425,9 +1403,10 @@ export const de_GetMemberCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.member != null) {
-        contents.member = de_Member(data.member, context);
-    }
+    const doc = take(data, {
+        member: (_) => de_Member(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetMemberCommandError = async (output, context) => {
@@ -1454,10 +1433,9 @@ const de_GetMemberCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1470,12 +1448,11 @@ export const de_ListAccountPermissionsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.permissions != null) {
-        contents.permissions = de_Permissions(data.permissions, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        permissions: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListAccountPermissionsCommandError = async (output, context) => {
@@ -1499,10 +1476,9 @@ const de_ListAccountPermissionsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1515,12 +1491,11 @@ export const de_ListCoverageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.coveredResources != null) {
-        contents.coveredResources = de_CoveredResources(data.coveredResources, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        coveredResources: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListCoverageCommandError = async (output, context) => {
@@ -1541,10 +1516,9 @@ const de_ListCoverageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1557,15 +1531,12 @@ export const de_ListCoverageStatisticsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.countsByGroup != null) {
-        contents.countsByGroup = de_CountsList(data.countsByGroup, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.totalCounts != null) {
-        contents.totalCounts = __expectLong(data.totalCounts);
-    }
+    const doc = take(data, {
+        countsByGroup: _json,
+        nextToken: __expectString,
+        totalCounts: __expectLong,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListCoverageStatisticsCommandError = async (output, context) => {
@@ -1586,10 +1557,9 @@ const de_ListCoverageStatisticsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1602,12 +1572,11 @@ export const de_ListDelegatedAdminAccountsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdminAccounts != null) {
-        contents.delegatedAdminAccounts = de_DelegatedAdminAccountList(data.delegatedAdminAccounts, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        delegatedAdminAccounts: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListDelegatedAdminAccountsCommandError = async (output, context) => {
@@ -1631,10 +1600,9 @@ const de_ListDelegatedAdminAccountsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1647,12 +1615,11 @@ export const de_ListFiltersCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.filters != null) {
-        contents.filters = de_FilterList(data.filters, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        filters: (_) => de_FilterList(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListFiltersCommandError = async (output, context) => {
@@ -1676,10 +1643,9 @@ const de_ListFiltersCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1692,15 +1658,12 @@ export const de_ListFindingAggregationsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.aggregationType != null) {
-        contents.aggregationType = __expectString(data.aggregationType);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.responses != null) {
-        contents.responses = de_AggregationResponseList(data.responses, context);
-    }
+    const doc = take(data, {
+        aggregationType: __expectString,
+        nextToken: __expectString,
+        responses: (_) => de_AggregationResponseList(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListFindingAggregationsCommandError = async (output, context) => {
@@ -1721,10 +1684,9 @@ const de_ListFindingAggregationsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1737,12 +1699,11 @@ export const de_ListFindingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.findings != null) {
-        contents.findings = de_FindingList(data.findings, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        findings: (_) => de_FindingList(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListFindingsCommandError = async (output, context) => {
@@ -1763,10 +1724,9 @@ const de_ListFindingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1779,12 +1739,11 @@ export const de_ListMembersCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.members != null) {
-        contents.members = de_MemberList(data.members, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        members: (_) => de_MemberList(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListMembersCommandError = async (output, context) => {
@@ -1808,10 +1767,9 @@ const de_ListMembersCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1824,9 +1782,10 @@ export const de_ListTagsForResourceCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListTagsForResourceCommandError = async (output, context) => {
@@ -1850,10 +1809,9 @@ const de_ListTagsForResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1866,12 +1824,11 @@ export const de_ListUsageTotalsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.totals != null) {
-        contents.totals = de_UsageTotalList(data.totals, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        totals: (_) => de_UsageTotalList(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListUsageTotalsCommandError = async (output, context) => {
@@ -1895,10 +1852,9 @@ const de_ListUsageTotalsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1937,10 +1893,9 @@ const de_TagResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1976,10 +1931,9 @@ const de_UntagResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2015,10 +1969,9 @@ const de_UpdateConfigurationCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2031,9 +1984,10 @@ export const de_UpdateFilterCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateFilterCommandError = async (output, context) => {
@@ -2060,10 +2014,9 @@ const de_UpdateFilterCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2076,9 +2029,10 @@ export const de_UpdateOrganizationConfigurationCommand = async (output, context)
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.autoEnable != null) {
-        contents.autoEnable = de_AutoEnable(data.autoEnable, context);
-    }
+    const doc = take(data, {
+        autoEnable: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateOrganizationConfigurationCommandError = async (output, context) => {
@@ -2102,21 +2056,21 @@ const de_UpdateOrganizationConfigurationCommandError = async (output, context) =
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
 };
-const map = __map;
+const throwDefaultError = withBaseException(__BaseException);
 const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new AccessDeniedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2126,9 +2080,10 @@ const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
 const de_BadRequestExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new BadRequestException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2138,15 +2093,12 @@ const de_BadRequestExceptionRes = async (parsedOutput, context) => {
 const de_ConflictExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = __expectString(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = __expectString(data.resourceType);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        resourceId: __expectString,
+        resourceType: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ConflictException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2161,9 +2113,10 @@ const de_InternalServerExceptionRes = async (parsedOutput, context) => {
         ],
     });
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new InternalServerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2173,9 +2126,10 @@ const de_InternalServerExceptionRes = async (parsedOutput, context) => {
 const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2185,12 +2139,11 @@ const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
 const de_ServiceQuotaExceededExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = __expectString(data.resourceId);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        resourceId: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ServiceQuotaExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2205,9 +2158,10 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
         ],
     });
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ThrottlingException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2217,137 +2171,23 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
 const de_ValidationExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.fields != null) {
-        contents.fields = de_ValidationExceptionFields(data.fields, context);
-    }
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.reason != null) {
-        contents.reason = __expectString(data.reason);
-    }
+    const doc = take(data, {
+        fields: _json,
+        message: __expectString,
+        reason: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ValidationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
     });
     return __decorateServiceException(exception, parsedOutput.body);
 };
-const se_AccountAggregation = (input, context) => {
-    return {
-        ...(input.findingType != null && { findingType: input.findingType }),
-        ...(input.resourceType != null && { resourceType: input.resourceType }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_AccountIdSet = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_AggregationRequest = (input, context) => {
-    return AggregationRequest.visit(input, {
-        accountAggregation: (value) => ({ accountAggregation: se_AccountAggregation(value, context) }),
-        amiAggregation: (value) => ({ amiAggregation: se_AmiAggregation(value, context) }),
-        awsEcrContainerAggregation: (value) => ({
-            awsEcrContainerAggregation: se_AwsEcrContainerAggregation(value, context),
-        }),
-        ec2InstanceAggregation: (value) => ({ ec2InstanceAggregation: se_Ec2InstanceAggregation(value, context) }),
-        findingTypeAggregation: (value) => ({ findingTypeAggregation: se_FindingTypeAggregation(value, context) }),
-        imageLayerAggregation: (value) => ({ imageLayerAggregation: se_ImageLayerAggregation(value, context) }),
-        lambdaFunctionAggregation: (value) => ({ lambdaFunctionAggregation: se_LambdaFunctionAggregation(value, context) }),
-        lambdaLayerAggregation: (value) => ({ lambdaLayerAggregation: se_LambdaLayerAggregation(value, context) }),
-        packageAggregation: (value) => ({ packageAggregation: se_PackageAggregation(value, context) }),
-        repositoryAggregation: (value) => ({ repositoryAggregation: se_RepositoryAggregation(value, context) }),
-        titleAggregation: (value) => ({ titleAggregation: se_TitleAggregation(value, context) }),
-        _: (name, value) => ({ name: value }),
-    });
-};
-const se_AmiAggregation = (input, context) => {
-    return {
-        ...(input.amis != null && { amis: se_StringFilterList(input.amis, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_AutoEnable = (input, context) => {
-    return {
-        ...(input.ec2 != null && { ec2: input.ec2 }),
-        ...(input.ecr != null && { ecr: input.ecr }),
-        ...(input.lambda != null && { lambda: input.lambda }),
-    };
-};
-const se_AwsEcrContainerAggregation = (input, context) => {
-    return {
-        ...(input.architectures != null && { architectures: se_StringFilterList(input.architectures, context) }),
-        ...(input.imageShas != null && { imageShas: se_StringFilterList(input.imageShas, context) }),
-        ...(input.imageTags != null && { imageTags: se_StringFilterList(input.imageTags, context) }),
-        ...(input.repositories != null && { repositories: se_StringFilterList(input.repositories, context) }),
-        ...(input.resourceIds != null && { resourceIds: se_StringFilterList(input.resourceIds, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_CoverageFilterCriteria = (input, context) => {
-    return {
-        ...(input.accountId != null && { accountId: se_CoverageStringFilterList(input.accountId, context) }),
-        ...(input.ec2InstanceTags != null && { ec2InstanceTags: se_CoverageMapFilterList(input.ec2InstanceTags, context) }),
-        ...(input.ecrImageTags != null && { ecrImageTags: se_CoverageStringFilterList(input.ecrImageTags, context) }),
-        ...(input.ecrRepositoryName != null && {
-            ecrRepositoryName: se_CoverageStringFilterList(input.ecrRepositoryName, context),
-        }),
-        ...(input.lambdaFunctionName != null && {
-            lambdaFunctionName: se_CoverageStringFilterList(input.lambdaFunctionName, context),
-        }),
-        ...(input.lambdaFunctionRuntime != null && {
-            lambdaFunctionRuntime: se_CoverageStringFilterList(input.lambdaFunctionRuntime, context),
-        }),
-        ...(input.lambdaFunctionTags != null && {
-            lambdaFunctionTags: se_CoverageMapFilterList(input.lambdaFunctionTags, context),
-        }),
-        ...(input.resourceId != null && { resourceId: se_CoverageStringFilterList(input.resourceId, context) }),
-        ...(input.resourceType != null && { resourceType: se_CoverageStringFilterList(input.resourceType, context) }),
-        ...(input.scanStatusCode != null && { scanStatusCode: se_CoverageStringFilterList(input.scanStatusCode, context) }),
-        ...(input.scanStatusReason != null && {
-            scanStatusReason: se_CoverageStringFilterList(input.scanStatusReason, context),
-        }),
-        ...(input.scanType != null && { scanType: se_CoverageStringFilterList(input.scanType, context) }),
-    };
-};
-const se_CoverageMapFilter = (input, context) => {
-    return {
-        ...(input.comparison != null && { comparison: input.comparison }),
-        ...(input.key != null && { key: input.key }),
-        ...(input.value != null && { value: input.value }),
-    };
-};
-const se_CoverageMapFilterList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_CoverageMapFilter(entry, context);
-    });
-};
-const se_CoverageStringFilter = (input, context) => {
-    return {
-        ...(input.comparison != null && { comparison: input.comparison }),
-        ...(input.value != null && { value: input.value }),
-    };
-};
-const se_CoverageStringFilterList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_CoverageStringFilter(entry, context);
-    });
-};
 const se_DateFilter = (input, context) => {
-    return {
-        ...(input.endInclusive != null && { endInclusive: Math.round(input.endInclusive.getTime() / 1000) }),
-        ...(input.startInclusive != null && { startInclusive: Math.round(input.startInclusive.getTime() / 1000) }),
-    };
+    return take(input, {
+        endInclusive: (_) => Math.round(_.getTime() / 1000),
+        startInclusive: (_) => Math.round(_.getTime() / 1000),
+    });
 };
 const se_DateFilterList = (input, context) => {
     return input
@@ -2356,177 +2196,53 @@ const se_DateFilterList = (input, context) => {
         return se_DateFilter(entry, context);
     });
 };
-const se_Destination = (input, context) => {
-    return {
-        ...(input.bucketName != null && { bucketName: input.bucketName }),
-        ...(input.keyPrefix != null && { keyPrefix: input.keyPrefix }),
-        ...(input.kmsKeyArn != null && { kmsKeyArn: input.kmsKeyArn }),
-    };
-};
-const se_DisableResourceTypeList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_Ec2InstanceAggregation = (input, context) => {
-    return {
-        ...(input.amis != null && { amis: se_StringFilterList(input.amis, context) }),
-        ...(input.instanceIds != null && { instanceIds: se_StringFilterList(input.instanceIds, context) }),
-        ...(input.instanceTags != null && { instanceTags: se_MapFilterList(input.instanceTags, context) }),
-        ...(input.operatingSystems != null && { operatingSystems: se_StringFilterList(input.operatingSystems, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_EcrConfiguration = (input, context) => {
-    return {
-        ...(input.rescanDuration != null && { rescanDuration: input.rescanDuration }),
-    };
-};
-const se_EnableResourceTypeList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_FilterArnList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
 const se_FilterCriteria = (input, context) => {
-    return {
-        ...(input.awsAccountId != null && { awsAccountId: se_StringFilterList(input.awsAccountId, context) }),
-        ...(input.componentId != null && { componentId: se_StringFilterList(input.componentId, context) }),
-        ...(input.componentType != null && { componentType: se_StringFilterList(input.componentType, context) }),
-        ...(input.ec2InstanceImageId != null && {
-            ec2InstanceImageId: se_StringFilterList(input.ec2InstanceImageId, context),
-        }),
-        ...(input.ec2InstanceSubnetId != null && {
-            ec2InstanceSubnetId: se_StringFilterList(input.ec2InstanceSubnetId, context),
-        }),
-        ...(input.ec2InstanceVpcId != null && { ec2InstanceVpcId: se_StringFilterList(input.ec2InstanceVpcId, context) }),
-        ...(input.ecrImageArchitecture != null && {
-            ecrImageArchitecture: se_StringFilterList(input.ecrImageArchitecture, context),
-        }),
-        ...(input.ecrImageHash != null && { ecrImageHash: se_StringFilterList(input.ecrImageHash, context) }),
-        ...(input.ecrImagePushedAt != null && { ecrImagePushedAt: se_DateFilterList(input.ecrImagePushedAt, context) }),
-        ...(input.ecrImageRegistry != null && { ecrImageRegistry: se_StringFilterList(input.ecrImageRegistry, context) }),
-        ...(input.ecrImageRepositoryName != null && {
-            ecrImageRepositoryName: se_StringFilterList(input.ecrImageRepositoryName, context),
-        }),
-        ...(input.ecrImageTags != null && { ecrImageTags: se_StringFilterList(input.ecrImageTags, context) }),
-        ...(input.exploitAvailable != null && { exploitAvailable: se_StringFilterList(input.exploitAvailable, context) }),
-        ...(input.findingArn != null && { findingArn: se_StringFilterList(input.findingArn, context) }),
-        ...(input.findingStatus != null && { findingStatus: se_StringFilterList(input.findingStatus, context) }),
-        ...(input.findingType != null && { findingType: se_StringFilterList(input.findingType, context) }),
-        ...(input.firstObservedAt != null && { firstObservedAt: se_DateFilterList(input.firstObservedAt, context) }),
-        ...(input.fixAvailable != null && { fixAvailable: se_StringFilterList(input.fixAvailable, context) }),
-        ...(input.inspectorScore != null && { inspectorScore: se_NumberFilterList(input.inspectorScore, context) }),
-        ...(input.lambdaFunctionExecutionRoleArn != null && {
-            lambdaFunctionExecutionRoleArn: se_StringFilterList(input.lambdaFunctionExecutionRoleArn, context),
-        }),
-        ...(input.lambdaFunctionLastModifiedAt != null && {
-            lambdaFunctionLastModifiedAt: se_DateFilterList(input.lambdaFunctionLastModifiedAt, context),
-        }),
-        ...(input.lambdaFunctionLayers != null && {
-            lambdaFunctionLayers: se_StringFilterList(input.lambdaFunctionLayers, context),
-        }),
-        ...(input.lambdaFunctionName != null && {
-            lambdaFunctionName: se_StringFilterList(input.lambdaFunctionName, context),
-        }),
-        ...(input.lambdaFunctionRuntime != null && {
-            lambdaFunctionRuntime: se_StringFilterList(input.lambdaFunctionRuntime, context),
-        }),
-        ...(input.lastObservedAt != null && { lastObservedAt: se_DateFilterList(input.lastObservedAt, context) }),
-        ...(input.networkProtocol != null && { networkProtocol: se_StringFilterList(input.networkProtocol, context) }),
-        ...(input.portRange != null && { portRange: se_PortRangeFilterList(input.portRange, context) }),
-        ...(input.relatedVulnerabilities != null && {
-            relatedVulnerabilities: se_StringFilterList(input.relatedVulnerabilities, context),
-        }),
-        ...(input.resourceId != null && { resourceId: se_StringFilterList(input.resourceId, context) }),
-        ...(input.resourceTags != null && { resourceTags: se_MapFilterList(input.resourceTags, context) }),
-        ...(input.resourceType != null && { resourceType: se_StringFilterList(input.resourceType, context) }),
-        ...(input.severity != null && { severity: se_StringFilterList(input.severity, context) }),
-        ...(input.title != null && { title: se_StringFilterList(input.title, context) }),
-        ...(input.updatedAt != null && { updatedAt: se_DateFilterList(input.updatedAt, context) }),
-        ...(input.vendorSeverity != null && { vendorSeverity: se_StringFilterList(input.vendorSeverity, context) }),
-        ...(input.vulnerabilityId != null && { vulnerabilityId: se_StringFilterList(input.vulnerabilityId, context) }),
-        ...(input.vulnerabilitySource != null && {
-            vulnerabilitySource: se_StringFilterList(input.vulnerabilitySource, context),
-        }),
-        ...(input.vulnerablePackages != null && {
-            vulnerablePackages: se_PackageFilterList(input.vulnerablePackages, context),
-        }),
-    };
-};
-const se_FindingTypeAggregation = (input, context) => {
-    return {
-        ...(input.findingType != null && { findingType: input.findingType }),
-        ...(input.resourceType != null && { resourceType: input.resourceType }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_ImageLayerAggregation = (input, context) => {
-    return {
-        ...(input.layerHashes != null && { layerHashes: se_StringFilterList(input.layerHashes, context) }),
-        ...(input.repositories != null && { repositories: se_StringFilterList(input.repositories, context) }),
-        ...(input.resourceIds != null && { resourceIds: se_StringFilterList(input.resourceIds, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_LambdaFunctionAggregation = (input, context) => {
-    return {
-        ...(input.functionNames != null && { functionNames: se_StringFilterList(input.functionNames, context) }),
-        ...(input.functionTags != null && { functionTags: se_MapFilterList(input.functionTags, context) }),
-        ...(input.resourceIds != null && { resourceIds: se_StringFilterList(input.resourceIds, context) }),
-        ...(input.runtimes != null && { runtimes: se_StringFilterList(input.runtimes, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_LambdaLayerAggregation = (input, context) => {
-    return {
-        ...(input.functionNames != null && { functionNames: se_StringFilterList(input.functionNames, context) }),
-        ...(input.layerArns != null && { layerArns: se_StringFilterList(input.layerArns, context) }),
-        ...(input.resourceIds != null && { resourceIds: se_StringFilterList(input.resourceIds, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_MapFilter = (input, context) => {
-    return {
-        ...(input.comparison != null && { comparison: input.comparison }),
-        ...(input.key != null && { key: input.key }),
-        ...(input.value != null && { value: input.value }),
-    };
-};
-const se_MapFilterList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_MapFilter(entry, context);
-    });
-};
-const se_MeteringAccountIdList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
+    return take(input, {
+        awsAccountId: _json,
+        componentId: _json,
+        componentType: _json,
+        ec2InstanceImageId: _json,
+        ec2InstanceSubnetId: _json,
+        ec2InstanceVpcId: _json,
+        ecrImageArchitecture: _json,
+        ecrImageHash: _json,
+        ecrImagePushedAt: (_) => se_DateFilterList(_, context),
+        ecrImageRegistry: _json,
+        ecrImageRepositoryName: _json,
+        ecrImageTags: _json,
+        exploitAvailable: _json,
+        findingArn: _json,
+        findingStatus: _json,
+        findingType: _json,
+        firstObservedAt: (_) => se_DateFilterList(_, context),
+        fixAvailable: _json,
+        inspectorScore: (_) => se_NumberFilterList(_, context),
+        lambdaFunctionExecutionRoleArn: _json,
+        lambdaFunctionLastModifiedAt: (_) => se_DateFilterList(_, context),
+        lambdaFunctionLayers: _json,
+        lambdaFunctionName: _json,
+        lambdaFunctionRuntime: _json,
+        lastObservedAt: (_) => se_DateFilterList(_, context),
+        networkProtocol: _json,
+        portRange: _json,
+        relatedVulnerabilities: _json,
+        resourceId: _json,
+        resourceTags: _json,
+        resourceType: _json,
+        severity: _json,
+        title: _json,
+        updatedAt: (_) => se_DateFilterList(_, context),
+        vendorSeverity: _json,
+        vulnerabilityId: _json,
+        vulnerabilitySource: _json,
+        vulnerablePackages: (_) => se_PackageFilterList(_, context),
     });
 };
 const se_NumberFilter = (input, context) => {
-    return {
-        ...(input.lowerInclusive != null && { lowerInclusive: __serializeFloat(input.lowerInclusive) }),
-        ...(input.upperInclusive != null && { upperInclusive: __serializeFloat(input.upperInclusive) }),
-    };
+    return take(input, {
+        lowerInclusive: __serializeFloat,
+        upperInclusive: __serializeFloat,
+    });
 };
 const se_NumberFilterList = (input, context) => {
     return input
@@ -2535,25 +2251,16 @@ const se_NumberFilterList = (input, context) => {
         return se_NumberFilter(entry, context);
     });
 };
-const se_PackageAggregation = (input, context) => {
-    return {
-        ...(input.packageNames != null && { packageNames: se_StringFilterList(input.packageNames, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
 const se_PackageFilter = (input, context) => {
-    return {
-        ...(input.architecture != null && { architecture: se_StringFilter(input.architecture, context) }),
-        ...(input.epoch != null && { epoch: se_NumberFilter(input.epoch, context) }),
-        ...(input.name != null && { name: se_StringFilter(input.name, context) }),
-        ...(input.release != null && { release: se_StringFilter(input.release, context) }),
-        ...(input.sourceLambdaLayerArn != null && {
-            sourceLambdaLayerArn: se_StringFilter(input.sourceLambdaLayerArn, context),
-        }),
-        ...(input.sourceLayerHash != null && { sourceLayerHash: se_StringFilter(input.sourceLayerHash, context) }),
-        ...(input.version != null && { version: se_StringFilter(input.version, context) }),
-    };
+    return take(input, {
+        architecture: _json,
+        epoch: (_) => se_NumberFilter(_, context),
+        name: _json,
+        release: _json,
+        sourceLambdaLayerArn: _json,
+        sourceLayerHash: _json,
+        version: _json,
+    });
 };
 const se_PackageFilterList = (input, context) => {
     return input
@@ -2562,141 +2269,35 @@ const se_PackageFilterList = (input, context) => {
         return se_PackageFilter(entry, context);
     });
 };
-const se_PortRangeFilter = (input, context) => {
-    return {
-        ...(input.beginInclusive != null && { beginInclusive: input.beginInclusive }),
-        ...(input.endInclusive != null && { endInclusive: input.endInclusive }),
-    };
-};
-const se_PortRangeFilterList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_PortRangeFilter(entry, context);
-    });
-};
-const se_RepositoryAggregation = (input, context) => {
-    return {
-        ...(input.repositories != null && { repositories: se_StringFilterList(input.repositories, context) }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_SortCriteria = (input, context) => {
-    return {
-        ...(input.field != null && { field: input.field }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-    };
-};
-const se_StringFilter = (input, context) => {
-    return {
-        ...(input.comparison != null && { comparison: input.comparison }),
-        ...(input.value != null && { value: input.value }),
-    };
-};
-const se_StringFilterList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_StringFilter(entry, context);
-    });
-};
-const se_TagMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_TitleAggregation = (input, context) => {
-    return {
-        ...(input.resourceType != null && { resourceType: input.resourceType }),
-        ...(input.sortBy != null && { sortBy: input.sortBy }),
-        ...(input.sortOrder != null && { sortOrder: input.sortOrder }),
-        ...(input.titles != null && { titles: se_StringFilterList(input.titles, context) }),
-        ...(input.vulnerabilityIds != null && { vulnerabilityIds: se_StringFilterList(input.vulnerabilityIds, context) }),
-    };
-};
-const se_UsageAccountIdList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const de_Account = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        resourceStatus: output.resourceStatus != null ? de_ResourceStatus(output.resourceStatus, context) : undefined,
-        status: __expectString(output.status),
-    };
-};
-const de_AccountAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
-const de_AccountList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Account(entry, context);
-    });
-    return retVal;
-};
-const de_AccountState = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        resourceState: output.resourceState != null ? de_ResourceState(output.resourceState, context) : undefined,
-        state: output.state != null ? de_State(output.state, context) : undefined,
-    };
-};
-const de_AccountStateList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_AccountState(entry, context);
-    });
-    return retVal;
-};
 const de_AggregationResponse = (output, context) => {
     if (output.accountAggregation != null) {
         return {
-            accountAggregation: de_AccountAggregationResponse(output.accountAggregation, context),
+            accountAggregation: _json(output.accountAggregation),
         };
     }
     if (output.amiAggregation != null) {
         return {
-            amiAggregation: de_AmiAggregationResponse(output.amiAggregation, context),
+            amiAggregation: _json(output.amiAggregation),
         };
     }
     if (output.awsEcrContainerAggregation != null) {
         return {
-            awsEcrContainerAggregation: de_AwsEcrContainerAggregationResponse(output.awsEcrContainerAggregation, context),
+            awsEcrContainerAggregation: _json(output.awsEcrContainerAggregation),
         };
     }
     if (output.ec2InstanceAggregation != null) {
         return {
-            ec2InstanceAggregation: de_Ec2InstanceAggregationResponse(output.ec2InstanceAggregation, context),
+            ec2InstanceAggregation: _json(output.ec2InstanceAggregation),
         };
     }
     if (output.findingTypeAggregation != null) {
         return {
-            findingTypeAggregation: de_FindingTypeAggregationResponse(output.findingTypeAggregation, context),
+            findingTypeAggregation: _json(output.findingTypeAggregation),
         };
     }
     if (output.imageLayerAggregation != null) {
         return {
-            imageLayerAggregation: de_ImageLayerAggregationResponse(output.imageLayerAggregation, context),
+            imageLayerAggregation: _json(output.imageLayerAggregation),
         };
     }
     if (output.lambdaFunctionAggregation != null) {
@@ -2706,22 +2307,22 @@ const de_AggregationResponse = (output, context) => {
     }
     if (output.lambdaLayerAggregation != null) {
         return {
-            lambdaLayerAggregation: de_LambdaLayerAggregationResponse(output.lambdaLayerAggregation, context),
+            lambdaLayerAggregation: _json(output.lambdaLayerAggregation),
         };
     }
     if (output.packageAggregation != null) {
         return {
-            packageAggregation: de_PackageAggregationResponse(output.packageAggregation, context),
+            packageAggregation: _json(output.packageAggregation),
         };
     }
     if (output.repositoryAggregation != null) {
         return {
-            repositoryAggregation: de_RepositoryAggregationResponse(output.repositoryAggregation, context),
+            repositoryAggregation: _json(output.repositoryAggregation),
         };
     }
     if (output.titleAggregation != null) {
         return {
-            titleAggregation: de_TitleAggregationResponse(output.titleAggregation, context),
+            titleAggregation: _json(output.titleAggregation),
         };
     }
     return { $unknown: Object.entries(output)[0] };
@@ -2730,1021 +2331,366 @@ const de_AggregationResponseList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_AggregationResponse(__expectUnion(entry), context);
     });
     return retVal;
 };
-const de_AmiAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        affectedInstances: __expectLong(output.affectedInstances),
-        ami: __expectString(output.ami),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
-const de_ArchitectureList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
+const de_AwsEc2InstanceDetails = (output, context) => {
+    return take(output, {
+        iamInstanceProfileArn: __expectString,
+        imageId: __expectString,
+        ipV4Addresses: _json,
+        ipV6Addresses: _json,
+        keyName: __expectString,
+        launchedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        platform: __expectString,
+        subnetId: __expectString,
+        type: __expectString,
+        vpcId: __expectString,
     });
-    return retVal;
-};
-const de_AutoEnable = (output, context) => {
-    return {
-        ec2: __expectBoolean(output.ec2),
-        ecr: __expectBoolean(output.ecr),
-        lambda: __expectBoolean(output.lambda),
-    };
-};
-const de_AwsEc2InstanceDetails = (output, context) => {
-    return {
-        iamInstanceProfileArn: __expectString(output.iamInstanceProfileArn),
-        imageId: __expectString(output.imageId),
-        ipV4Addresses: output.ipV4Addresses != null ? de_IpV4AddressList(output.ipV4Addresses, context) : undefined,
-        ipV6Addresses: output.ipV6Addresses != null ? de_IpV6AddressList(output.ipV6Addresses, context) : undefined,
-        keyName: __expectString(output.keyName),
-        launchedAt: output.launchedAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.launchedAt))) : undefined,
-        platform: __expectString(output.platform),
-        subnetId: __expectString(output.subnetId),
-        type: __expectString(output.type),
-        vpcId: __expectString(output.vpcId),
-    };
-};
-const de_AwsEcrContainerAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        architecture: __expectString(output.architecture),
-        imageSha: __expectString(output.imageSha),
-        imageTags: output.imageTags != null ? de_StringList(output.imageTags, context) : undefined,
-        repository: __expectString(output.repository),
-        resourceId: __expectString(output.resourceId),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
 };
 const de_AwsEcrContainerImageDetails = (output, context) => {
-    return {
-        architecture: __expectString(output.architecture),
-        author: __expectString(output.author),
-        imageHash: __expectString(output.imageHash),
-        imageTags: output.imageTags != null ? de_ImageTagList(output.imageTags, context) : undefined,
-        platform: __expectString(output.platform),
-        pushedAt: output.pushedAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.pushedAt))) : undefined,
-        registry: __expectString(output.registry),
-        repositoryName: __expectString(output.repositoryName),
-    };
-};
-const de_AwsLambdaFunctionDetails = (output, context) => {
-    return {
-        architectures: output.architectures != null ? de_ArchitectureList(output.architectures, context) : undefined,
-        codeSha256: __expectString(output.codeSha256),
-        executionRoleArn: __expectString(output.executionRoleArn),
-        functionName: __expectString(output.functionName),
-        lastModifiedAt: output.lastModifiedAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.lastModifiedAt)))
-            : undefined,
-        layers: output.layers != null ? de_LayerList(output.layers, context) : undefined,
-        packageType: __expectString(output.packageType),
-        runtime: __expectString(output.runtime),
-        version: __expectString(output.version),
-        vpcConfig: output.vpcConfig != null ? de_LambdaVpcConfig(output.vpcConfig, context) : undefined,
-    };
-};
-const de_Counts = (output, context) => {
-    return {
-        count: __expectLong(output.count),
-        groupKey: __expectString(output.groupKey),
-    };
-};
-const de_CountsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Counts(entry, context);
+    return take(output, {
+        architecture: __expectString,
+        author: __expectString,
+        imageHash: __expectString,
+        imageTags: _json,
+        platform: __expectString,
+        pushedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        registry: __expectString,
+        repositoryName: __expectString,
     });
-    return retVal;
-};
-const de_CoveredResource = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        resourceId: __expectString(output.resourceId),
-        resourceMetadata: output.resourceMetadata != null ? de_ResourceScanMetadata(output.resourceMetadata, context) : undefined,
-        resourceType: __expectString(output.resourceType),
-        scanStatus: output.scanStatus != null ? de_ScanStatus(output.scanStatus, context) : undefined,
-        scanType: __expectString(output.scanType),
-    };
 };
-const de_CoveredResources = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_CoveredResource(entry, context);
+const de_AwsLambdaFunctionDetails = (output, context) => {
+    return take(output, {
+        architectures: _json,
+        codeSha256: __expectString,
+        executionRoleArn: __expectString,
+        functionName: __expectString,
+        lastModifiedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        layers: _json,
+        packageType: __expectString,
+        runtime: __expectString,
+        version: __expectString,
+        vpcConfig: _json,
     });
-    return retVal;
 };
 const de_CvssScore = (output, context) => {
-    return {
-        baseScore: __limitedParseDouble(output.baseScore),
-        scoringVector: __expectString(output.scoringVector),
-        source: __expectString(output.source),
-        version: __expectString(output.version),
-    };
-};
-const de_CvssScoreAdjustment = (output, context) => {
-    return {
-        metric: __expectString(output.metric),
-        reason: __expectString(output.reason),
-    };
-};
-const de_CvssScoreAdjustmentList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_CvssScoreAdjustment(entry, context);
+    return take(output, {
+        baseScore: __limitedParseDouble,
+        scoringVector: __expectString,
+        source: __expectString,
+        version: __expectString,
     });
-    return retVal;
 };
 const de_CvssScoreDetails = (output, context) => {
-    return {
-        adjustments: output.adjustments != null ? de_CvssScoreAdjustmentList(output.adjustments, context) : undefined,
-        cvssSource: __expectString(output.cvssSource),
-        score: __limitedParseDouble(output.score),
-        scoreSource: __expectString(output.scoreSource),
-        scoringVector: __expectString(output.scoringVector),
-        version: __expectString(output.version),
-    };
+    return take(output, {
+        adjustments: _json,
+        cvssSource: __expectString,
+        score: __limitedParseDouble,
+        scoreSource: __expectString,
+        scoringVector: __expectString,
+        version: __expectString,
+    });
 };
 const de_CvssScoreList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_CvssScore(entry, context);
     });
     return retVal;
 };
 const de_DateFilter = (output, context) => {
-    return {
-        endInclusive: output.endInclusive != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.endInclusive)))
-            : undefined,
-        startInclusive: output.startInclusive != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.startInclusive)))
-            : undefined,
-    };
+    return take(output, {
+        endInclusive: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        startInclusive: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+    });
 };
 const de_DateFilterList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_DateFilter(entry, context);
     });
     return retVal;
 };
-const de_DelegatedAdmin = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        relationshipStatus: __expectString(output.relationshipStatus),
-    };
-};
-const de_DelegatedAdminAccount = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        status: __expectString(output.status),
-    };
-};
-const de_DelegatedAdminAccountList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_DelegatedAdminAccount(entry, context);
-    });
-    return retVal;
-};
-const de_Destination = (output, context) => {
-    return {
-        bucketName: __expectString(output.bucketName),
-        keyPrefix: __expectString(output.keyPrefix),
-        kmsKeyArn: __expectString(output.kmsKeyArn),
-    };
-};
-const de_Ec2InstanceAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        ami: __expectString(output.ami),
-        instanceId: __expectString(output.instanceId),
-        instanceTags: output.instanceTags != null ? de_TagMap(output.instanceTags, context) : undefined,
-        networkFindings: __expectLong(output.networkFindings),
-        operatingSystem: __expectString(output.operatingSystem),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
-const de_Ec2Metadata = (output, context) => {
-    return {
-        amiId: __expectString(output.amiId),
-        platform: __expectString(output.platform),
-        tags: output.tags != null ? de_TagMap(output.tags, context) : undefined,
-    };
-};
 const de_EcrConfigurationState = (output, context) => {
-    return {
-        rescanDurationState: output.rescanDurationState != null ? de_EcrRescanDurationState(output.rescanDurationState, context) : undefined,
-    };
-};
-const de_EcrContainerImageMetadata = (output, context) => {
-    return {
-        tags: output.tags != null ? de_TagList(output.tags, context) : undefined,
-    };
-};
-const de_EcrRepositoryMetadata = (output, context) => {
-    return {
-        name: __expectString(output.name),
-        scanFrequency: __expectString(output.scanFrequency),
-    };
+    return take(output, {
+        rescanDurationState: (_) => de_EcrRescanDurationState(_, context),
+    });
 };
 const de_EcrRescanDurationState = (output, context) => {
-    return {
-        rescanDuration: __expectString(output.rescanDuration),
-        status: __expectString(output.status),
-        updatedAt: output.updatedAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.updatedAt))) : undefined,
-    };
+    return take(output, {
+        rescanDuration: __expectString,
+        status: __expectString,
+        updatedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+    });
 };
 const de_ExploitabilityDetails = (output, context) => {
-    return {
-        lastKnownExploitAt: output.lastKnownExploitAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.lastKnownExploitAt)))
-            : undefined,
-    };
-};
-const de_FailedAccount = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        errorCode: __expectString(output.errorCode),
-        errorMessage: __expectString(output.errorMessage),
-        resourceStatus: output.resourceStatus != null ? de_ResourceStatus(output.resourceStatus, context) : undefined,
-        status: __expectString(output.status),
-    };
-};
-const de_FailedAccountList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_FailedAccount(entry, context);
+    return take(output, {
+        lastKnownExploitAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
     });
-    return retVal;
 };
 const de_Filter = (output, context) => {
-    return {
-        action: __expectString(output.action),
-        arn: __expectString(output.arn),
-        createdAt: output.createdAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.createdAt))) : undefined,
-        criteria: output.criteria != null ? de_FilterCriteria(output.criteria, context) : undefined,
-        description: __expectString(output.description),
-        name: __expectString(output.name),
-        ownerId: __expectString(output.ownerId),
-        reason: __expectString(output.reason),
-        tags: output.tags != null ? de_TagMap(output.tags, context) : undefined,
-        updatedAt: output.updatedAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.updatedAt))) : undefined,
-    };
+    return take(output, {
+        action: __expectString,
+        arn: __expectString,
+        createdAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        criteria: (_) => de_FilterCriteria(_, context),
+        description: __expectString,
+        name: __expectString,
+        ownerId: __expectString,
+        reason: __expectString,
+        tags: _json,
+        updatedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+    });
 };
 const de_FilterCriteria = (output, context) => {
-    return {
-        awsAccountId: output.awsAccountId != null ? de_StringFilterList(output.awsAccountId, context) : undefined,
-        componentId: output.componentId != null ? de_StringFilterList(output.componentId, context) : undefined,
-        componentType: output.componentType != null ? de_StringFilterList(output.componentType, context) : undefined,
-        ec2InstanceImageId: output.ec2InstanceImageId != null ? de_StringFilterList(output.ec2InstanceImageId, context) : undefined,
-        ec2InstanceSubnetId: output.ec2InstanceSubnetId != null ? de_StringFilterList(output.ec2InstanceSubnetId, context) : undefined,
-        ec2InstanceVpcId: output.ec2InstanceVpcId != null ? de_StringFilterList(output.ec2InstanceVpcId, context) : undefined,
-        ecrImageArchitecture: output.ecrImageArchitecture != null ? de_StringFilterList(output.ecrImageArchitecture, context) : undefined,
-        ecrImageHash: output.ecrImageHash != null ? de_StringFilterList(output.ecrImageHash, context) : undefined,
-        ecrImagePushedAt: output.ecrImagePushedAt != null ? de_DateFilterList(output.ecrImagePushedAt, context) : undefined,
-        ecrImageRegistry: output.ecrImageRegistry != null ? de_StringFilterList(output.ecrImageRegistry, context) : undefined,
-        ecrImageRepositoryName: output.ecrImageRepositoryName != null ? de_StringFilterList(output.ecrImageRepositoryName, context) : undefined,
-        ecrImageTags: output.ecrImageTags != null ? de_StringFilterList(output.ecrImageTags, context) : undefined,
-        exploitAvailable: output.exploitAvailable != null ? de_StringFilterList(output.exploitAvailable, context) : undefined,
-        findingArn: output.findingArn != null ? de_StringFilterList(output.findingArn, context) : undefined,
-        findingStatus: output.findingStatus != null ? de_StringFilterList(output.findingStatus, context) : undefined,
-        findingType: output.findingType != null ? de_StringFilterList(output.findingType, context) : undefined,
-        firstObservedAt: output.firstObservedAt != null ? de_DateFilterList(output.firstObservedAt, context) : undefined,
-        fixAvailable: output.fixAvailable != null ? de_StringFilterList(output.fixAvailable, context) : undefined,
-        inspectorScore: output.inspectorScore != null ? de_NumberFilterList(output.inspectorScore, context) : undefined,
-        lambdaFunctionExecutionRoleArn: output.lambdaFunctionExecutionRoleArn != null
-            ? de_StringFilterList(output.lambdaFunctionExecutionRoleArn, context)
-            : undefined,
-        lambdaFunctionLastModifiedAt: output.lambdaFunctionLastModifiedAt != null
-            ? de_DateFilterList(output.lambdaFunctionLastModifiedAt, context)
-            : undefined,
-        lambdaFunctionLayers: output.lambdaFunctionLayers != null ? de_StringFilterList(output.lambdaFunctionLayers, context) : undefined,
-        lambdaFunctionName: output.lambdaFunctionName != null ? de_StringFilterList(output.lambdaFunctionName, context) : undefined,
-        lambdaFunctionRuntime: output.lambdaFunctionRuntime != null ? de_StringFilterList(output.lambdaFunctionRuntime, context) : undefined,
-        lastObservedAt: output.lastObservedAt != null ? de_DateFilterList(output.lastObservedAt, context) : undefined,
-        networkProtocol: output.networkProtocol != null ? de_StringFilterList(output.networkProtocol, context) : undefined,
-        portRange: output.portRange != null ? de_PortRangeFilterList(output.portRange, context) : undefined,
-        relatedVulnerabilities: output.relatedVulnerabilities != null ? de_StringFilterList(output.relatedVulnerabilities, context) : undefined,
-        resourceId: output.resourceId != null ? de_StringFilterList(output.resourceId, context) : undefined,
-        resourceTags: output.resourceTags != null ? de_MapFilterList(output.resourceTags, context) : undefined,
-        resourceType: output.resourceType != null ? de_StringFilterList(output.resourceType, context) : undefined,
-        severity: output.severity != null ? de_StringFilterList(output.severity, context) : undefined,
-        title: output.title != null ? de_StringFilterList(output.title, context) : undefined,
-        updatedAt: output.updatedAt != null ? de_DateFilterList(output.updatedAt, context) : undefined,
-        vendorSeverity: output.vendorSeverity != null ? de_StringFilterList(output.vendorSeverity, context) : undefined,
-        vulnerabilityId: output.vulnerabilityId != null ? de_StringFilterList(output.vulnerabilityId, context) : undefined,
-        vulnerabilitySource: output.vulnerabilitySource != null ? de_StringFilterList(output.vulnerabilitySource, context) : undefined,
-        vulnerablePackages: output.vulnerablePackages != null ? de_PackageFilterList(output.vulnerablePackages, context) : undefined,
-    };
+    return take(output, {
+        awsAccountId: _json,
+        componentId: _json,
+        componentType: _json,
+        ec2InstanceImageId: _json,
+        ec2InstanceSubnetId: _json,
+        ec2InstanceVpcId: _json,
+        ecrImageArchitecture: _json,
+        ecrImageHash: _json,
+        ecrImagePushedAt: (_) => de_DateFilterList(_, context),
+        ecrImageRegistry: _json,
+        ecrImageRepositoryName: _json,
+        ecrImageTags: _json,
+        exploitAvailable: _json,
+        findingArn: _json,
+        findingStatus: _json,
+        findingType: _json,
+        firstObservedAt: (_) => de_DateFilterList(_, context),
+        fixAvailable: _json,
+        inspectorScore: (_) => de_NumberFilterList(_, context),
+        lambdaFunctionExecutionRoleArn: _json,
+        lambdaFunctionLastModifiedAt: (_) => de_DateFilterList(_, context),
+        lambdaFunctionLayers: _json,
+        lambdaFunctionName: _json,
+        lambdaFunctionRuntime: _json,
+        lastObservedAt: (_) => de_DateFilterList(_, context),
+        networkProtocol: _json,
+        portRange: _json,
+        relatedVulnerabilities: _json,
+        resourceId: _json,
+        resourceTags: _json,
+        resourceType: _json,
+        severity: _json,
+        title: _json,
+        updatedAt: (_) => de_DateFilterList(_, context),
+        vendorSeverity: _json,
+        vulnerabilityId: _json,
+        vulnerabilitySource: _json,
+        vulnerablePackages: (_) => de_PackageFilterList(_, context),
+    });
 };
 const de_FilterList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_Filter(entry, context);
     });
     return retVal;
 };
 const de_Finding = (output, context) => {
-    return {
-        awsAccountId: __expectString(output.awsAccountId),
-        description: __expectString(output.description),
-        exploitAvailable: __expectString(output.exploitAvailable),
-        exploitabilityDetails: output.exploitabilityDetails != null
-            ? de_ExploitabilityDetails(output.exploitabilityDetails, context)
-            : undefined,
-        findingArn: __expectString(output.findingArn),
-        firstObservedAt: output.firstObservedAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.firstObservedAt)))
-            : undefined,
-        fixAvailable: __expectString(output.fixAvailable),
-        inspectorScore: __limitedParseDouble(output.inspectorScore),
-        inspectorScoreDetails: output.inspectorScoreDetails != null
-            ? de_InspectorScoreDetails(output.inspectorScoreDetails, context)
-            : undefined,
-        lastObservedAt: output.lastObservedAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.lastObservedAt)))
-            : undefined,
-        networkReachabilityDetails: output.networkReachabilityDetails != null
-            ? de_NetworkReachabilityDetails(output.networkReachabilityDetails, context)
-            : undefined,
-        packageVulnerabilityDetails: output.packageVulnerabilityDetails != null
-            ? de_PackageVulnerabilityDetails(output.packageVulnerabilityDetails, context)
-            : undefined,
-        remediation: output.remediation != null ? de_Remediation(output.remediation, context) : undefined,
-        resources: output.resources != null ? de_ResourceList(output.resources, context) : undefined,
-        severity: __expectString(output.severity),
-        status: __expectString(output.status),
-        title: __expectString(output.title),
-        type: __expectString(output.type),
-        updatedAt: output.updatedAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.updatedAt))) : undefined,
-    };
+    return take(output, {
+        awsAccountId: __expectString,
+        description: __expectString,
+        exploitAvailable: __expectString,
+        exploitabilityDetails: (_) => de_ExploitabilityDetails(_, context),
+        findingArn: __expectString,
+        firstObservedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        fixAvailable: __expectString,
+        inspectorScore: __limitedParseDouble,
+        inspectorScoreDetails: (_) => de_InspectorScoreDetails(_, context),
+        lastObservedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        networkReachabilityDetails: _json,
+        packageVulnerabilityDetails: (_) => de_PackageVulnerabilityDetails(_, context),
+        remediation: _json,
+        resources: (_) => de_ResourceList(_, context),
+        severity: __expectString,
+        status: __expectString,
+        title: __expectString,
+        type: __expectString,
+        updatedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+    });
 };
 const de_FindingList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_Finding(entry, context);
     });
     return retVal;
 };
-const de_FindingTypeAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
 const de_FreeTrialAccountInfo = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        freeTrialInfo: output.freeTrialInfo != null ? de_FreeTrialInfoList(output.freeTrialInfo, context) : undefined,
-    };
+    return take(output, {
+        accountId: __expectString,
+        freeTrialInfo: (_) => de_FreeTrialInfoList(_, context),
+    });
 };
 const de_FreeTrialAccountInfoList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_FreeTrialAccountInfo(entry, context);
     });
     return retVal;
 };
 const de_FreeTrialInfo = (output, context) => {
-    return {
-        end: output.end != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.end))) : undefined,
-        start: output.start != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.start))) : undefined,
-        status: __expectString(output.status),
-        type: __expectString(output.type),
-    };
-};
-const de_FreeTrialInfoError = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        code: __expectString(output.code),
-        message: __expectString(output.message),
-    };
-};
-const de_FreeTrialInfoErrorList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_FreeTrialInfoError(entry, context);
+    return take(output, {
+        end: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        start: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        status: __expectString,
+        type: __expectString,
     });
-    return retVal;
 };
 const de_FreeTrialInfoList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_FreeTrialInfo(entry, context);
     });
     return retVal;
 };
-const de_ImageLayerAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        layerHash: __expectString(output.layerHash),
-        repository: __expectString(output.repository),
-        resourceId: __expectString(output.resourceId),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
-const de_ImageTagList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
 const de_InspectorScoreDetails = (output, context) => {
-    return {
-        adjustedCvss: output.adjustedCvss != null ? de_CvssScoreDetails(output.adjustedCvss, context) : undefined,
-    };
-};
-const de_IpV4AddressList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
+    return take(output, {
+        adjustedCvss: (_) => de_CvssScoreDetails(_, context),
     });
-    return retVal;
-};
-const de_IpV6AddressList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
 };
 const de_LambdaFunctionAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        functionName: __expectString(output.functionName),
-        lambdaTags: output.lambdaTags != null ? de_TagMap(output.lambdaTags, context) : undefined,
-        lastModifiedAt: output.lastModifiedAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.lastModifiedAt)))
-            : undefined,
-        resourceId: __expectString(output.resourceId),
-        runtime: __expectString(output.runtime),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
-const de_LambdaFunctionMetadata = (output, context) => {
-    return {
-        functionName: __expectString(output.functionName),
-        functionTags: output.functionTags != null ? de_TagMap(output.functionTags, context) : undefined,
-        layers: output.layers != null ? de_LambdaLayerList(output.layers, context) : undefined,
-        runtime: __expectString(output.runtime),
-    };
-};
-const de_LambdaLayerAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        functionName: __expectString(output.functionName),
-        layerArn: __expectString(output.layerArn),
-        resourceId: __expectString(output.resourceId),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
-const de_LambdaLayerList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_LambdaVpcConfig = (output, context) => {
-    return {
-        securityGroupIds: output.securityGroupIds != null ? de_SecurityGroupIdList(output.securityGroupIds, context) : undefined,
-        subnetIds: output.subnetIds != null ? de_SubnetIdList(output.subnetIds, context) : undefined,
-        vpcId: __expectString(output.vpcId),
-    };
-};
-const de_LayerList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
+    return take(output, {
+        accountId: __expectString,
+        functionName: __expectString,
+        lambdaTags: _json,
+        lastModifiedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        resourceId: __expectString,
+        runtime: __expectString,
+        severityCounts: _json,
     });
-    return retVal;
-};
-const de_MapFilter = (output, context) => {
-    return {
-        comparison: __expectString(output.comparison),
-        key: __expectString(output.key),
-        value: __expectString(output.value),
-    };
-};
-const de_MapFilterList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_MapFilter(entry, context);
-    });
-    return retVal;
 };
 const de_Member = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        delegatedAdminAccountId: __expectString(output.delegatedAdminAccountId),
-        relationshipStatus: __expectString(output.relationshipStatus),
-        updatedAt: output.updatedAt != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.updatedAt))) : undefined,
-    };
+    return take(output, {
+        accountId: __expectString,
+        delegatedAdminAccountId: __expectString,
+        relationshipStatus: __expectString,
+        updatedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+    });
 };
 const de_MemberList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_Member(entry, context);
     });
     return retVal;
 };
-const de_NetworkPath = (output, context) => {
-    return {
-        steps: output.steps != null ? de_StepList(output.steps, context) : undefined,
-    };
-};
-const de_NetworkReachabilityDetails = (output, context) => {
-    return {
-        networkPath: output.networkPath != null ? de_NetworkPath(output.networkPath, context) : undefined,
-        openPortRange: output.openPortRange != null ? de_PortRange(output.openPortRange, context) : undefined,
-        protocol: __expectString(output.protocol),
-    };
-};
-const de_NonEmptyStringList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
 const de_NumberFilter = (output, context) => {
-    return {
-        lowerInclusive: __limitedParseDouble(output.lowerInclusive),
-        upperInclusive: __limitedParseDouble(output.upperInclusive),
-    };
+    return take(output, {
+        lowerInclusive: __limitedParseDouble,
+        upperInclusive: __limitedParseDouble,
+    });
 };
 const de_NumberFilterList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_NumberFilter(entry, context);
     });
     return retVal;
 };
-const de_PackageAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        packageName: __expectString(output.packageName),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
-};
 const de_PackageFilter = (output, context) => {
-    return {
-        architecture: output.architecture != null ? de_StringFilter(output.architecture, context) : undefined,
-        epoch: output.epoch != null ? de_NumberFilter(output.epoch, context) : undefined,
-        name: output.name != null ? de_StringFilter(output.name, context) : undefined,
-        release: output.release != null ? de_StringFilter(output.release, context) : undefined,
-        sourceLambdaLayerArn: output.sourceLambdaLayerArn != null ? de_StringFilter(output.sourceLambdaLayerArn, context) : undefined,
-        sourceLayerHash: output.sourceLayerHash != null ? de_StringFilter(output.sourceLayerHash, context) : undefined,
-        version: output.version != null ? de_StringFilter(output.version, context) : undefined,
-    };
+    return take(output, {
+        architecture: _json,
+        epoch: (_) => de_NumberFilter(_, context),
+        name: _json,
+        release: _json,
+        sourceLambdaLayerArn: _json,
+        sourceLayerHash: _json,
+        version: _json,
+    });
 };
 const de_PackageFilterList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_PackageFilter(entry, context);
     });
     return retVal;
 };
 const de_PackageVulnerabilityDetails = (output, context) => {
-    return {
-        cvss: output.cvss != null ? de_CvssScoreList(output.cvss, context) : undefined,
-        referenceUrls: output.referenceUrls != null ? de_NonEmptyStringList(output.referenceUrls, context) : undefined,
-        relatedVulnerabilities: output.relatedVulnerabilities != null
-            ? de_VulnerabilityIdList(output.relatedVulnerabilities, context)
-            : undefined,
-        source: __expectString(output.source),
-        sourceUrl: __expectString(output.sourceUrl),
-        vendorCreatedAt: output.vendorCreatedAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.vendorCreatedAt)))
-            : undefined,
-        vendorSeverity: __expectString(output.vendorSeverity),
-        vendorUpdatedAt: output.vendorUpdatedAt != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.vendorUpdatedAt)))
-            : undefined,
-        vulnerabilityId: __expectString(output.vulnerabilityId),
-        vulnerablePackages: output.vulnerablePackages != null ? de_VulnerablePackageList(output.vulnerablePackages, context) : undefined,
-    };
-};
-const de_Permission = (output, context) => {
-    return {
-        operation: __expectString(output.operation),
-        service: __expectString(output.service),
-    };
-};
-const de_Permissions = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Permission(entry, context);
-    });
-    return retVal;
-};
-const de_PortRange = (output, context) => {
-    return {
-        begin: __expectInt32(output.begin),
-        end: __expectInt32(output.end),
-    };
-};
-const de_PortRangeFilter = (output, context) => {
-    return {
-        beginInclusive: __expectInt32(output.beginInclusive),
-        endInclusive: __expectInt32(output.endInclusive),
-    };
-};
-const de_PortRangeFilterList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_PortRangeFilter(entry, context);
+    return take(output, {
+        cvss: (_) => de_CvssScoreList(_, context),
+        referenceUrls: _json,
+        relatedVulnerabilities: _json,
+        source: __expectString,
+        sourceUrl: __expectString,
+        vendorCreatedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        vendorSeverity: __expectString,
+        vendorUpdatedAt: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        vulnerabilityId: __expectString,
+        vulnerablePackages: _json,
     });
-    return retVal;
-};
-const de_Recommendation = (output, context) => {
-    return {
-        Url: __expectString(output.Url),
-        text: __expectString(output.text),
-    };
-};
-const de_Remediation = (output, context) => {
-    return {
-        recommendation: output.recommendation != null ? de_Recommendation(output.recommendation, context) : undefined,
-    };
-};
-const de_RepositoryAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        affectedImages: __expectLong(output.affectedImages),
-        repository: __expectString(output.repository),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-    };
 };
 const de_Resource = (output, context) => {
-    return {
-        details: output.details != null ? de_ResourceDetails(output.details, context) : undefined,
-        id: __expectString(output.id),
-        partition: __expectString(output.partition),
-        region: __expectString(output.region),
-        tags: output.tags != null ? de_TagMap(output.tags, context) : undefined,
-        type: __expectString(output.type),
-    };
+    return take(output, {
+        details: (_) => de_ResourceDetails(_, context),
+        id: __expectString,
+        partition: __expectString,
+        region: __expectString,
+        tags: _json,
+        type: __expectString,
+    });
 };
 const de_ResourceDetails = (output, context) => {
-    return {
-        awsEc2Instance: output.awsEc2Instance != null ? de_AwsEc2InstanceDetails(output.awsEc2Instance, context) : undefined,
-        awsEcrContainerImage: output.awsEcrContainerImage != null
-            ? de_AwsEcrContainerImageDetails(output.awsEcrContainerImage, context)
-            : undefined,
-        awsLambdaFunction: output.awsLambdaFunction != null ? de_AwsLambdaFunctionDetails(output.awsLambdaFunction, context) : undefined,
-    };
+    return take(output, {
+        awsEc2Instance: (_) => de_AwsEc2InstanceDetails(_, context),
+        awsEcrContainerImage: (_) => de_AwsEcrContainerImageDetails(_, context),
+        awsLambdaFunction: (_) => de_AwsLambdaFunctionDetails(_, context),
+    });
 };
 const de_ResourceList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_Resource(entry, context);
     });
     return retVal;
 };
-const de_ResourceScanMetadata = (output, context) => {
-    return {
-        ec2: output.ec2 != null ? de_Ec2Metadata(output.ec2, context) : undefined,
-        ecrImage: output.ecrImage != null ? de_EcrContainerImageMetadata(output.ecrImage, context) : undefined,
-        ecrRepository: output.ecrRepository != null ? de_EcrRepositoryMetadata(output.ecrRepository, context) : undefined,
-        lambdaFunction: output.lambdaFunction != null ? de_LambdaFunctionMetadata(output.lambdaFunction, context) : undefined,
-    };
-};
-const de_ResourceState = (output, context) => {
-    return {
-        ec2: output.ec2 != null ? de_State(output.ec2, context) : undefined,
-        ecr: output.ecr != null ? de_State(output.ecr, context) : undefined,
-        lambda: output.lambda != null ? de_State(output.lambda, context) : undefined,
-    };
-};
-const de_ResourceStatus = (output, context) => {
-    return {
-        ec2: __expectString(output.ec2),
-        ecr: __expectString(output.ecr),
-        lambda: __expectString(output.lambda),
-    };
-};
-const de_ScanStatus = (output, context) => {
-    return {
-        reason: __expectString(output.reason),
-        statusCode: __expectString(output.statusCode),
-    };
-};
-const de_SecurityGroupIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_SeverityCounts = (output, context) => {
-    return {
-        all: __expectLong(output.all),
-        critical: __expectLong(output.critical),
-        high: __expectLong(output.high),
-        medium: __expectLong(output.medium),
-    };
-};
-const de_State = (output, context) => {
-    return {
-        errorCode: __expectString(output.errorCode),
-        errorMessage: __expectString(output.errorMessage),
-        status: __expectString(output.status),
-    };
-};
-const de_Step = (output, context) => {
-    return {
-        componentId: __expectString(output.componentId),
-        componentType: __expectString(output.componentType),
-    };
-};
-const de_StepList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Step(entry, context);
-    });
-    return retVal;
-};
-const de_StringFilter = (output, context) => {
-    return {
-        comparison: __expectString(output.comparison),
-        value: __expectString(output.value),
-    };
-};
-const de_StringFilterList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_StringFilter(entry, context);
-    });
-    return retVal;
-};
-const de_StringList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_SubnetIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_TagList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_TagMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_TitleAggregationResponse = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        severityCounts: output.severityCounts != null ? de_SeverityCounts(output.severityCounts, context) : undefined,
-        title: __expectString(output.title),
-        vulnerabilityId: __expectString(output.vulnerabilityId),
-    };
-};
 const de_Usage = (output, context) => {
-    return {
-        currency: __expectString(output.currency),
-        estimatedMonthlyCost: __limitedParseDouble(output.estimatedMonthlyCost),
-        total: __limitedParseDouble(output.total),
-        type: __expectString(output.type),
-    };
+    return take(output, {
+        currency: __expectString,
+        estimatedMonthlyCost: __limitedParseDouble,
+        total: __limitedParseDouble,
+        type: __expectString,
+    });
 };
 const de_UsageList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_Usage(entry, context);
     });
     return retVal;
 };
 const de_UsageTotal = (output, context) => {
-    return {
-        accountId: __expectString(output.accountId),
-        usage: output.usage != null ? de_UsageList(output.usage, context) : undefined,
-    };
+    return take(output, {
+        accountId: __expectString,
+        usage: (_) => de_UsageList(_, context),
+    });
 };
 const de_UsageTotalList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_UsageTotal(entry, context);
     });
     return retVal;
 };
-const de_ValidationExceptionField = (output, context) => {
-    return {
-        message: __expectString(output.message),
-        name: __expectString(output.name),
-    };
-};
-const de_ValidationExceptionFields = (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_VulnerabilityIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_VulnerablePackage = (output, context) => {
-    return {
-        arch: __expectString(output.arch),
-        epoch: __expectInt32(output.epoch),
-        filePath: __expectString(output.filePath),
-        fixedInVersion: __expectString(output.fixedInVersion),
-        name: __expectString(output.name),
-        packageManager: __expectString(output.packageManager),
-        release: __expectString(output.release),
-        remediation: __expectString(output.remediation),
-        sourceLambdaLayerArn: __expectString(output.sourceLambdaLayerArn),
-        sourceLayerHash: __expectString(output.sourceLayerHash),
-        version: __expectString(output.version),
-    };
-};
-const de_VulnerablePackageList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_VulnerablePackage(entry, context);
-    });
-    return retVal;
-};
 const deserializeMetadata = (output) => ({
     httpStatusCode: output.statusCode,
     requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"] ?? output.headers["x-amz-request-id"],