@aws-sdk/client-finspace-data 3.312.0 → 3.316.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,5 +1,5 @@
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, map as __map, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
+import { _json, decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, map, resolvedPath as __resolvedPath, take, withBaseException, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { FinspaceDataServiceException as __BaseException } from "../models/FinspaceDataServiceException";
 import { AccessDeniedException, ConflictException, InternalServerException, LimitExceededException, ResourceNotFoundException, ThrottlingException, ValidationException, } from "../models/models_0";
@@ -13,9 +13,9 @@ export const se_AssociateUserToPermissionGroupCommand = async (input, context) =
     resolvedPath = __resolvedPath(resolvedPath, input, "permissionGroupId", () => input.permissionGroupId, "{permissionGroupId}", false);
     resolvedPath = __resolvedPath(resolvedPath, input, "userId", () => input.userId, "{userId}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -34,12 +34,12 @@ export const se_CreateChangesetCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/datasets/{datasetId}/changesetsv2";
     resolvedPath = __resolvedPath(resolvedPath, input, "datasetId", () => input.datasetId, "{datasetId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.changeType != null && { changeType: input.changeType }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.formatParams != null && { formatParams: se_FormatParams(input.formatParams, context) }),
-        ...(input.sourceParams != null && { sourceParams: se_SourceParams(input.sourceParams, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        changeType: [],
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        formatParams: (_) => _json(_),
+        sourceParams: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -57,18 +57,16 @@ export const se_CreateDatasetCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/datasetsv2";
     let body;
-    body = JSON.stringify({
-        ...(input.alias != null && { alias: input.alias }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.datasetDescription != null && { datasetDescription: input.datasetDescription }),
-        ...(input.datasetTitle != null && { datasetTitle: input.datasetTitle }),
-        ...(input.kind != null && { kind: input.kind }),
-        ...(input.ownerInfo != null && { ownerInfo: se_DatasetOwnerInfo(input.ownerInfo, context) }),
-        ...(input.permissionGroupParams != null && {
-            permissionGroupParams: se_PermissionGroupParams(input.permissionGroupParams, context),
-        }),
-        ...(input.schemaDefinition != null && { schemaDefinition: se_SchemaUnion(input.schemaDefinition, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        alias: [],
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        datasetDescription: [],
+        datasetTitle: [],
+        kind: [],
+        ownerInfo: (_) => _json(_),
+        permissionGroupParams: (_) => _json(_),
+        schemaDefinition: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -87,18 +85,14 @@ export const se_CreateDataViewCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/datasets/{datasetId}/dataviewsv2";
     resolvedPath = __resolvedPath(resolvedPath, input, "datasetId", () => input.datasetId, "{datasetId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.asOfTimestamp != null && { asOfTimestamp: input.asOfTimestamp }),
-        ...(input.autoUpdate != null && { autoUpdate: input.autoUpdate }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.destinationTypeParams != null && {
-            destinationTypeParams: se_DataViewDestinationTypeParams(input.destinationTypeParams, context),
-        }),
-        ...(input.partitionColumns != null && {
-            partitionColumns: se_PartitionColumnList(input.partitionColumns, context),
-        }),
-        ...(input.sortColumns != null && { sortColumns: se_SortColumnList(input.sortColumns, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        asOfTimestamp: [],
+        autoUpdate: [],
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        destinationTypeParams: (_) => _json(_),
+        partitionColumns: (_) => _json(_),
+        sortColumns: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -116,14 +110,12 @@ export const se_CreatePermissionGroupCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/permission-group";
     let body;
-    body = JSON.stringify({
-        ...(input.applicationPermissions != null && {
-            applicationPermissions: se_ApplicationPermissionList(input.applicationPermissions, context),
-        }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.description != null && { description: input.description }),
-        ...(input.name != null && { name: input.name }),
-    });
+    body = JSON.stringify(take(input, {
+        applicationPermissions: (_) => _json(_),
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        description: [],
+        name: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -141,15 +133,15 @@ export const se_CreateUserCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/user";
     let body;
-    body = JSON.stringify({
-        ...(input.ApiAccess != null && { ApiAccess: input.ApiAccess }),
-        ...(input.apiAccessPrincipalArn != null && { apiAccessPrincipalArn: input.apiAccessPrincipalArn }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.emailAddress != null && { emailAddress: input.emailAddress }),
-        ...(input.firstName != null && { firstName: input.firstName }),
-        ...(input.lastName != null && { lastName: input.lastName }),
-        ...(input.type != null && { type: input.type }),
-    });
+    body = JSON.stringify(take(input, {
+        ApiAccess: [],
+        apiAccessPrincipalArn: [],
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        emailAddress: [],
+        firstName: [],
+        lastName: [],
+        type: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -208,9 +200,9 @@ export const se_DisableUserCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/user/{userId}/disable";
     resolvedPath = __resolvedPath(resolvedPath, input, "userId", () => input.userId, "{userId}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -251,9 +243,9 @@ export const se_EnableUserCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/user/{userId}/enable";
     resolvedPath = __resolvedPath(resolvedPath, input, "userId", () => input.userId, "{userId}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -393,9 +385,9 @@ export const se_GetWorkingLocationCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/workingLocationV1";
     let body;
-    body = JSON.stringify({
-        ...(input.locationType != null && { locationType: input.locationType }),
-    });
+    body = JSON.stringify(take(input, {
+        locationType: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -559,9 +551,9 @@ export const se_ResetUserPasswordCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/user/{userId}/password";
     resolvedPath = __resolvedPath(resolvedPath, input, "userId", () => input.userId, "{userId}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -582,11 +574,11 @@ export const se_UpdateChangesetCommand = async (input, context) => {
     resolvedPath = __resolvedPath(resolvedPath, input, "datasetId", () => input.datasetId, "{datasetId}", false);
     resolvedPath = __resolvedPath(resolvedPath, input, "changesetId", () => input.changesetId, "{changesetId}", false);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.formatParams != null && { formatParams: se_FormatParams(input.formatParams, context) }),
-        ...(input.sourceParams != null && { sourceParams: se_SourceParams(input.sourceParams, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        formatParams: (_) => _json(_),
+        sourceParams: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -605,14 +597,14 @@ export const se_UpdateDatasetCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/datasetsv2/{datasetId}";
     resolvedPath = __resolvedPath(resolvedPath, input, "datasetId", () => input.datasetId, "{datasetId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.alias != null && { alias: input.alias }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.datasetDescription != null && { datasetDescription: input.datasetDescription }),
-        ...(input.datasetTitle != null && { datasetTitle: input.datasetTitle }),
-        ...(input.kind != null && { kind: input.kind }),
-        ...(input.schemaDefinition != null && { schemaDefinition: se_SchemaUnion(input.schemaDefinition, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        alias: [],
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        datasetDescription: [],
+        datasetTitle: [],
+        kind: [],
+        schemaDefinition: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -631,14 +623,12 @@ export const se_UpdatePermissionGroupCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/permission-group/{permissionGroupId}";
     resolvedPath = __resolvedPath(resolvedPath, input, "permissionGroupId", () => input.permissionGroupId, "{permissionGroupId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.applicationPermissions != null && {
-            applicationPermissions: se_ApplicationPermissionList(input.applicationPermissions, context),
-        }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.description != null && { description: input.description }),
-        ...(input.name != null && { name: input.name }),
-    });
+    body = JSON.stringify(take(input, {
+        applicationPermissions: (_) => _json(_),
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        description: [],
+        name: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -657,14 +647,14 @@ export const se_UpdateUserCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/user/{userId}";
     resolvedPath = __resolvedPath(resolvedPath, input, "userId", () => input.userId, "{userId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.apiAccess != null && { apiAccess: input.apiAccess }),
-        ...(input.apiAccessPrincipalArn != null && { apiAccessPrincipalArn: input.apiAccessPrincipalArn }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.firstName != null && { firstName: input.firstName }),
-        ...(input.lastName != null && { lastName: input.lastName }),
-        ...(input.type != null && { type: input.type }),
-    });
+    body = JSON.stringify(take(input, {
+        apiAccess: [],
+        apiAccessPrincipalArn: [],
+        clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+        firstName: [],
+        lastName: [],
+        type: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -715,10 +705,9 @@ const de_AssociateUserToPermissionGroupCommandError = async (output, context) =>
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -731,12 +720,11 @@ export const de_CreateChangesetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.changesetId != null) {
-        contents.changesetId = __expectString(data.changesetId);
-    }
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
+    const doc = take(data, {
+        changesetId: __expectString,
+        datasetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateChangesetCommandError = async (output, context) => {
@@ -769,10 +757,9 @@ const de_CreateChangesetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -785,9 +772,10 @@ export const de_CreateDatasetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
+    const doc = take(data, {
+        datasetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateDatasetCommandError = async (output, context) => {
@@ -820,10 +808,9 @@ const de_CreateDatasetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -836,12 +823,11 @@ export const de_CreateDataViewCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.dataViewId != null) {
-        contents.dataViewId = __expectString(data.dataViewId);
-    }
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
+    const doc = take(data, {
+        dataViewId: __expectString,
+        datasetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateDataViewCommandError = async (output, context) => {
@@ -871,10 +857,9 @@ const de_CreateDataViewCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -887,9 +872,10 @@ export const de_CreatePermissionGroupCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.permissionGroupId != null) {
-        contents.permissionGroupId = __expectString(data.permissionGroupId);
-    }
+    const doc = take(data, {
+        permissionGroupId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreatePermissionGroupCommandError = async (output, context) => {
@@ -919,10 +905,9 @@ const de_CreatePermissionGroupCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -935,9 +920,10 @@ export const de_CreateUserCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userId != null) {
-        contents.userId = __expectString(data.userId);
-    }
+    const doc = take(data, {
+        userId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateUserCommandError = async (output, context) => {
@@ -967,10 +953,9 @@ const de_CreateUserCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -983,9 +968,10 @@ export const de_DeleteDatasetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
+    const doc = take(data, {
+        datasetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DeleteDatasetCommandError = async (output, context) => {
@@ -1018,10 +1004,9 @@ const de_DeleteDatasetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1034,9 +1019,10 @@ export const de_DeletePermissionGroupCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.permissionGroupId != null) {
-        contents.permissionGroupId = __expectString(data.permissionGroupId);
-    }
+    const doc = take(data, {
+        permissionGroupId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DeletePermissionGroupCommandError = async (output, context) => {
@@ -1069,10 +1055,9 @@ const de_DeletePermissionGroupCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1085,9 +1070,10 @@ export const de_DisableUserCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userId != null) {
-        contents.userId = __expectString(data.userId);
-    }
+    const doc = take(data, {
+        userId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_DisableUserCommandError = async (output, context) => {
@@ -1117,10 +1103,9 @@ const de_DisableUserCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1165,10 +1150,9 @@ const de_DisassociateUserFromPermissionGroupCommandError = async (output, contex
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1181,9 +1165,10 @@ export const de_EnableUserCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userId != null) {
-        contents.userId = __expectString(data.userId);
-    }
+    const doc = take(data, {
+        userId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_EnableUserCommandError = async (output, context) => {
@@ -1216,10 +1201,9 @@ const de_EnableUserCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1232,45 +1216,22 @@ export const de_GetChangesetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.activeFromTimestamp != null) {
-        contents.activeFromTimestamp = __expectLong(data.activeFromTimestamp);
-    }
-    if (data.activeUntilTimestamp != null) {
-        contents.activeUntilTimestamp = __expectLong(data.activeUntilTimestamp);
-    }
-    if (data.changeType != null) {
-        contents.changeType = __expectString(data.changeType);
-    }
-    if (data.changesetArn != null) {
-        contents.changesetArn = __expectString(data.changesetArn);
-    }
-    if (data.changesetId != null) {
-        contents.changesetId = __expectString(data.changesetId);
-    }
-    if (data.createTime != null) {
-        contents.createTime = __expectLong(data.createTime);
-    }
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
-    if (data.errorInfo != null) {
-        contents.errorInfo = de_ChangesetErrorInfo(data.errorInfo, context);
-    }
-    if (data.formatParams != null) {
-        contents.formatParams = de_FormatParams(data.formatParams, context);
-    }
-    if (data.sourceParams != null) {
-        contents.sourceParams = de_SourceParams(data.sourceParams, context);
-    }
-    if (data.status != null) {
-        contents.status = __expectString(data.status);
-    }
-    if (data.updatedByChangesetId != null) {
-        contents.updatedByChangesetId = __expectString(data.updatedByChangesetId);
-    }
-    if (data.updatesChangesetId != null) {
-        contents.updatesChangesetId = __expectString(data.updatesChangesetId);
-    }
+    const doc = take(data, {
+        activeFromTimestamp: __expectLong,
+        activeUntilTimestamp: __expectLong,
+        changeType: __expectString,
+        changesetArn: __expectString,
+        changesetId: __expectString,
+        createTime: __expectLong,
+        datasetId: __expectString,
+        errorInfo: _json,
+        formatParams: _json,
+        sourceParams: _json,
+        status: __expectString,
+        updatedByChangesetId: __expectString,
+        updatesChangesetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetChangesetCommandError = async (output, context) => {
@@ -1300,10 +1261,9 @@ const de_GetChangesetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1316,36 +1276,19 @@ export const de_GetDatasetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.alias != null) {
-        contents.alias = __expectString(data.alias);
-    }
-    if (data.createTime != null) {
-        contents.createTime = __expectLong(data.createTime);
-    }
-    if (data.datasetArn != null) {
-        contents.datasetArn = __expectString(data.datasetArn);
-    }
-    if (data.datasetDescription != null) {
-        contents.datasetDescription = __expectString(data.datasetDescription);
-    }
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
-    if (data.datasetTitle != null) {
-        contents.datasetTitle = __expectString(data.datasetTitle);
-    }
-    if (data.kind != null) {
-        contents.kind = __expectString(data.kind);
-    }
-    if (data.lastModifiedTime != null) {
-        contents.lastModifiedTime = __expectLong(data.lastModifiedTime);
-    }
-    if (data.schemaDefinition != null) {
-        contents.schemaDefinition = de_SchemaUnion(data.schemaDefinition, context);
-    }
-    if (data.status != null) {
-        contents.status = __expectString(data.status);
-    }
+    const doc = take(data, {
+        alias: __expectString,
+        createTime: __expectLong,
+        datasetArn: __expectString,
+        datasetDescription: __expectString,
+        datasetId: __expectString,
+        datasetTitle: __expectString,
+        kind: __expectString,
+        lastModifiedTime: __expectLong,
+        schemaDefinition: _json,
+        status: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetDatasetCommandError = async (output, context) => {
@@ -1375,10 +1318,9 @@ const de_GetDatasetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1391,42 +1333,21 @@ export const de_GetDataViewCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.asOfTimestamp != null) {
-        contents.asOfTimestamp = __expectLong(data.asOfTimestamp);
-    }
-    if (data.autoUpdate != null) {
-        contents.autoUpdate = __expectBoolean(data.autoUpdate);
-    }
-    if (data.createTime != null) {
-        contents.createTime = __expectLong(data.createTime);
-    }
-    if (data.dataViewArn != null) {
-        contents.dataViewArn = __expectString(data.dataViewArn);
-    }
-    if (data.dataViewId != null) {
-        contents.dataViewId = __expectString(data.dataViewId);
-    }
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
-    if (data.destinationTypeParams != null) {
-        contents.destinationTypeParams = de_DataViewDestinationTypeParams(data.destinationTypeParams, context);
-    }
-    if (data.errorInfo != null) {
-        contents.errorInfo = de_DataViewErrorInfo(data.errorInfo, context);
-    }
-    if (data.lastModifiedTime != null) {
-        contents.lastModifiedTime = __expectLong(data.lastModifiedTime);
-    }
-    if (data.partitionColumns != null) {
-        contents.partitionColumns = de_PartitionColumnList(data.partitionColumns, context);
-    }
-    if (data.sortColumns != null) {
-        contents.sortColumns = de_SortColumnList(data.sortColumns, context);
-    }
-    if (data.status != null) {
-        contents.status = __expectString(data.status);
-    }
+    const doc = take(data, {
+        asOfTimestamp: __expectLong,
+        autoUpdate: __expectBoolean,
+        createTime: __expectLong,
+        dataViewArn: __expectString,
+        dataViewId: __expectString,
+        datasetId: __expectString,
+        destinationTypeParams: _json,
+        errorInfo: _json,
+        lastModifiedTime: __expectLong,
+        partitionColumns: _json,
+        sortColumns: _json,
+        status: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetDataViewCommandError = async (output, context) => {
@@ -1453,10 +1374,9 @@ const de_GetDataViewCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1469,12 +1389,11 @@ export const de_GetExternalDataViewAccessDetailsCommand = async (output, context
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.credentials != null) {
-        contents.credentials = de_AwsCredentials(data.credentials, context);
-    }
-    if (data.s3Location != null) {
-        contents.s3Location = de_S3Location(data.s3Location, context);
-    }
+    const doc = take(data, {
+        credentials: _json,
+        s3Location: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetExternalDataViewAccessDetailsCommandError = async (output, context) => {
@@ -1501,10 +1420,9 @@ const de_GetExternalDataViewAccessDetailsCommandError = async (output, context)
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1517,9 +1435,10 @@ export const de_GetPermissionGroupCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.permissionGroup != null) {
-        contents.permissionGroup = de_PermissionGroup(data.permissionGroup, context);
-    }
+    const doc = take(data, {
+        permissionGroup: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetPermissionGroupCommandError = async (output, context) => {
@@ -1546,10 +1465,9 @@ const de_GetPermissionGroupCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1562,12 +1480,11 @@ export const de_GetProgrammaticAccessCredentialsCommand = async (output, context
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.credentials != null) {
-        contents.credentials = de_Credentials(data.credentials, context);
-    }
-    if (data.durationInMinutes != null) {
-        contents.durationInMinutes = __expectLong(data.durationInMinutes);
-    }
+    const doc = take(data, {
+        credentials: _json,
+        durationInMinutes: __expectLong,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetProgrammaticAccessCredentialsCommandError = async (output, context) => {
@@ -1591,10 +1508,9 @@ const de_GetProgrammaticAccessCredentialsCommandError = async (output, context)
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1607,45 +1523,22 @@ export const de_GetUserCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.apiAccess != null) {
-        contents.apiAccess = __expectString(data.apiAccess);
-    }
-    if (data.apiAccessPrincipalArn != null) {
-        contents.apiAccessPrincipalArn = __expectString(data.apiAccessPrincipalArn);
-    }
-    if (data.createTime != null) {
-        contents.createTime = __expectLong(data.createTime);
-    }
-    if (data.emailAddress != null) {
-        contents.emailAddress = __expectString(data.emailAddress);
-    }
-    if (data.firstName != null) {
-        contents.firstName = __expectString(data.firstName);
-    }
-    if (data.lastDisabledTime != null) {
-        contents.lastDisabledTime = __expectLong(data.lastDisabledTime);
-    }
-    if (data.lastEnabledTime != null) {
-        contents.lastEnabledTime = __expectLong(data.lastEnabledTime);
-    }
-    if (data.lastLoginTime != null) {
-        contents.lastLoginTime = __expectLong(data.lastLoginTime);
-    }
-    if (data.lastModifiedTime != null) {
-        contents.lastModifiedTime = __expectLong(data.lastModifiedTime);
-    }
-    if (data.lastName != null) {
-        contents.lastName = __expectString(data.lastName);
-    }
-    if (data.status != null) {
-        contents.status = __expectString(data.status);
-    }
-    if (data.type != null) {
-        contents.type = __expectString(data.type);
-    }
-    if (data.userId != null) {
-        contents.userId = __expectString(data.userId);
-    }
+    const doc = take(data, {
+        apiAccess: __expectString,
+        apiAccessPrincipalArn: __expectString,
+        createTime: __expectLong,
+        emailAddress: __expectString,
+        firstName: __expectString,
+        lastDisabledTime: __expectLong,
+        lastEnabledTime: __expectLong,
+        lastLoginTime: __expectLong,
+        lastModifiedTime: __expectLong,
+        lastName: __expectString,
+        status: __expectString,
+        type: __expectString,
+        userId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetUserCommandError = async (output, context) => {
@@ -1672,10 +1565,9 @@ const de_GetUserCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1688,15 +1580,12 @@ export const de_GetWorkingLocationCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.s3Bucket != null) {
-        contents.s3Bucket = __expectString(data.s3Bucket);
-    }
-    if (data.s3Path != null) {
-        contents.s3Path = __expectString(data.s3Path);
-    }
-    if (data.s3Uri != null) {
-        contents.s3Uri = __expectString(data.s3Uri);
-    }
+    const doc = take(data, {
+        s3Bucket: __expectString,
+        s3Path: __expectString,
+        s3Uri: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetWorkingLocationCommandError = async (output, context) => {
@@ -1720,10 +1609,9 @@ const de_GetWorkingLocationCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1736,12 +1624,11 @@ export const de_ListChangesetsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.changesets != null) {
-        contents.changesets = de_ChangesetList(data.changesets, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        changesets: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListChangesetsCommandError = async (output, context) => {
@@ -1771,10 +1658,9 @@ const de_ListChangesetsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1787,12 +1673,11 @@ export const de_ListDatasetsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.datasets != null) {
-        contents.datasets = de_DatasetList(data.datasets, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        datasets: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListDatasetsCommandError = async (output, context) => {
@@ -1819,10 +1704,9 @@ const de_ListDatasetsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1835,12 +1719,11 @@ export const de_ListDataViewsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.dataViews != null) {
-        contents.dataViews = de_DataViewList(data.dataViews, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        dataViews: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListDataViewsCommandError = async (output, context) => {
@@ -1867,10 +1750,9 @@ const de_ListDataViewsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1883,12 +1765,11 @@ export const de_ListPermissionGroupsCommand = 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.permissionGroups != null) {
-        contents.permissionGroups = de_PermissionGroupList(data.permissionGroups, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        permissionGroups: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListPermissionGroupsCommandError = async (output, context) => {
@@ -1912,10 +1793,9 @@ const de_ListPermissionGroupsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1928,12 +1808,11 @@ export const de_ListPermissionGroupsByUserCommand = 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.permissionGroups != null) {
-        contents.permissionGroups = de_PermissionGroupByUserList(data.permissionGroups, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        permissionGroups: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListPermissionGroupsByUserCommandError = async (output, context) => {
@@ -1960,10 +1839,9 @@ const de_ListPermissionGroupsByUserCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1976,12 +1854,11 @@ export const de_ListUsersCommand = 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.users != null) {
-        contents.users = de_UserList(data.users, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        users: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListUsersCommandError = async (output, context) => {
@@ -2005,10 +1882,9 @@ const de_ListUsersCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2021,12 +1897,11 @@ export const de_ListUsersByPermissionGroupCommand = 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.users != null) {
-        contents.users = de_UserByPermissionGroupList(data.users, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        users: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListUsersByPermissionGroupCommandError = async (output, context) => {
@@ -2053,10 +1928,9 @@ const de_ListUsersByPermissionGroupCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2069,12 +1943,11 @@ export const de_ResetUserPasswordCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.temporaryPassword != null) {
-        contents.temporaryPassword = __expectString(data.temporaryPassword);
-    }
-    if (data.userId != null) {
-        contents.userId = __expectString(data.userId);
-    }
+    const doc = take(data, {
+        temporaryPassword: __expectString,
+        userId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ResetUserPasswordCommandError = async (output, context) => {
@@ -2104,10 +1977,9 @@ const de_ResetUserPasswordCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2120,12 +1992,11 @@ export const de_UpdateChangesetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.changesetId != null) {
-        contents.changesetId = __expectString(data.changesetId);
-    }
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
+    const doc = take(data, {
+        changesetId: __expectString,
+        datasetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateChangesetCommandError = async (output, context) => {
@@ -2155,10 +2026,9 @@ const de_UpdateChangesetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2171,9 +2041,10 @@ export const de_UpdateDatasetCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.datasetId != null) {
-        contents.datasetId = __expectString(data.datasetId);
-    }
+    const doc = take(data, {
+        datasetId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateDatasetCommandError = async (output, context) => {
@@ -2203,10 +2074,9 @@ const de_UpdateDatasetCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2219,9 +2089,10 @@ export const de_UpdatePermissionGroupCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.permissionGroupId != null) {
-        contents.permissionGroupId = __expectString(data.permissionGroupId);
-    }
+    const doc = take(data, {
+        permissionGroupId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdatePermissionGroupCommandError = async (output, context) => {
@@ -2251,10 +2122,9 @@ const de_UpdatePermissionGroupCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2267,9 +2137,10 @@ export const de_UpdateUserCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userId != null) {
-        contents.userId = __expectString(data.userId);
-    }
+    const doc = take(data, {
+        userId: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateUserCommandError = async (output, context) => {
@@ -2299,21 +2170,21 @@ const de_UpdateUserCommandError = 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,
@@ -2323,12 +2194,11 @@ const de_AccessDeniedExceptionRes = 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.reason != null) {
-        contents.reason = __expectString(data.reason);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        reason: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ConflictException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2338,9 +2208,10 @@ const de_ConflictExceptionRes = async (parsedOutput, context) => {
 const de_InternalServerExceptionRes = 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 InternalServerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2350,9 +2221,10 @@ const de_InternalServerExceptionRes = async (parsedOutput, context) => {
 const de_LimitExceededExceptionRes = 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 LimitExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2362,12 +2234,11 @@ const de_LimitExceededExceptionRes = 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);
-    }
-    if (data.reason != null) {
-        contents.reason = __expectString(data.reason);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        reason: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2377,6 +2248,8 @@ const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
 const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
+    const doc = take(data, {});
+    Object.assign(contents, doc);
     const exception = new ThrottlingException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2386,463 +2259,17 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
 const de_ValidationExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.reason != null) {
-        contents.reason = __expectString(data.reason);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        reason: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ValidationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
     });
     return __decorateServiceException(exception, parsedOutput.body);
 };
-const se_ApplicationPermissionList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_ColumnDefinition = (input, context) => {
-    return {
-        ...(input.columnDescription != null && { columnDescription: input.columnDescription }),
-        ...(input.columnName != null && { columnName: input.columnName }),
-        ...(input.dataType != null && { dataType: input.dataType }),
-    };
-};
-const se_ColumnList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_ColumnDefinition(entry, context);
-    });
-};
-const se_ColumnNameList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_DatasetOwnerInfo = (input, context) => {
-    return {
-        ...(input.email != null && { email: input.email }),
-        ...(input.name != null && { name: input.name }),
-        ...(input.phoneNumber != null && { phoneNumber: input.phoneNumber }),
-    };
-};
-const se_DataViewDestinationTypeParams = (input, context) => {
-    return {
-        ...(input.destinationType != null && { destinationType: input.destinationType }),
-        ...(input.s3DestinationExportFileFormat != null && {
-            s3DestinationExportFileFormat: input.s3DestinationExportFileFormat,
-        }),
-        ...(input.s3DestinationExportFileFormatOptions != null && {
-            s3DestinationExportFileFormatOptions: se_S3DestinationFormatOptions(input.s3DestinationExportFileFormatOptions, context),
-        }),
-    };
-};
-const se_FormatParams = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_PartitionColumnList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_PermissionGroupParams = (input, context) => {
-    return {
-        ...(input.datasetPermissions != null && {
-            datasetPermissions: se_ResourcePermissionsList(input.datasetPermissions, context),
-        }),
-        ...(input.permissionGroupId != null && { permissionGroupId: input.permissionGroupId }),
-    };
-};
-const se_ResourcePermission = (input, context) => {
-    return {
-        ...(input.permission != null && { permission: input.permission }),
-    };
-};
-const se_ResourcePermissionsList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_ResourcePermission(entry, context);
-    });
-};
-const se_S3DestinationFormatOptions = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_SchemaDefinition = (input, context) => {
-    return {
-        ...(input.columns != null && { columns: se_ColumnList(input.columns, context) }),
-        ...(input.primaryKeyColumns != null && { primaryKeyColumns: se_ColumnNameList(input.primaryKeyColumns, context) }),
-    };
-};
-const se_SchemaUnion = (input, context) => {
-    return {
-        ...(input.tabularSchemaConfig != null && {
-            tabularSchemaConfig: se_SchemaDefinition(input.tabularSchemaConfig, context),
-        }),
-    };
-};
-const se_SortColumnList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_SourceParams = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const de_ApplicationPermissionList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_AwsCredentials = (output, context) => {
-    return {
-        accessKeyId: __expectString(output.accessKeyId),
-        expiration: __expectLong(output.expiration),
-        secretAccessKey: __expectString(output.secretAccessKey),
-        sessionToken: __expectString(output.sessionToken),
-    };
-};
-const de_ChangesetErrorInfo = (output, context) => {
-    return {
-        errorCategory: __expectString(output.errorCategory),
-        errorMessage: __expectString(output.errorMessage),
-    };
-};
-const de_ChangesetList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_ChangesetSummary(entry, context);
-    });
-    return retVal;
-};
-const de_ChangesetSummary = (output, context) => {
-    return {
-        activeFromTimestamp: __expectLong(output.activeFromTimestamp),
-        activeUntilTimestamp: __expectLong(output.activeUntilTimestamp),
-        changeType: __expectString(output.changeType),
-        changesetArn: __expectString(output.changesetArn),
-        changesetId: __expectString(output.changesetId),
-        createTime: __expectLong(output.createTime),
-        datasetId: __expectString(output.datasetId),
-        errorInfo: output.errorInfo != null ? de_ChangesetErrorInfo(output.errorInfo, context) : undefined,
-        formatParams: output.formatParams != null ? de_FormatParams(output.formatParams, context) : undefined,
-        sourceParams: output.sourceParams != null ? de_SourceParams(output.sourceParams, context) : undefined,
-        status: __expectString(output.status),
-        updatedByChangesetId: __expectString(output.updatedByChangesetId),
-        updatesChangesetId: __expectString(output.updatesChangesetId),
-    };
-};
-const de_ColumnDefinition = (output, context) => {
-    return {
-        columnDescription: __expectString(output.columnDescription),
-        columnName: __expectString(output.columnName),
-        dataType: __expectString(output.dataType),
-    };
-};
-const de_ColumnList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_ColumnDefinition(entry, context);
-    });
-    return retVal;
-};
-const de_ColumnNameList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_Credentials = (output, context) => {
-    return {
-        accessKeyId: __expectString(output.accessKeyId),
-        secretAccessKey: __expectString(output.secretAccessKey),
-        sessionToken: __expectString(output.sessionToken),
-    };
-};
-const de_Dataset = (output, context) => {
-    return {
-        alias: __expectString(output.alias),
-        createTime: __expectLong(output.createTime),
-        datasetArn: __expectString(output.datasetArn),
-        datasetDescription: __expectString(output.datasetDescription),
-        datasetId: __expectString(output.datasetId),
-        datasetTitle: __expectString(output.datasetTitle),
-        kind: __expectString(output.kind),
-        lastModifiedTime: __expectLong(output.lastModifiedTime),
-        ownerInfo: output.ownerInfo != null ? de_DatasetOwnerInfo(output.ownerInfo, context) : undefined,
-        schemaDefinition: output.schemaDefinition != null ? de_SchemaUnion(output.schemaDefinition, context) : undefined,
-    };
-};
-const de_DatasetList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Dataset(entry, context);
-    });
-    return retVal;
-};
-const de_DatasetOwnerInfo = (output, context) => {
-    return {
-        email: __expectString(output.email),
-        name: __expectString(output.name),
-        phoneNumber: __expectString(output.phoneNumber),
-    };
-};
-const de_DataViewDestinationTypeParams = (output, context) => {
-    return {
-        destinationType: __expectString(output.destinationType),
-        s3DestinationExportFileFormat: __expectString(output.s3DestinationExportFileFormat),
-        s3DestinationExportFileFormatOptions: output.s3DestinationExportFileFormatOptions != null
-            ? de_S3DestinationFormatOptions(output.s3DestinationExportFileFormatOptions, context)
-            : undefined,
-    };
-};
-const de_DataViewErrorInfo = (output, context) => {
-    return {
-        errorCategory: __expectString(output.errorCategory),
-        errorMessage: __expectString(output.errorMessage),
-    };
-};
-const de_DataViewList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_DataViewSummary(entry, context);
-    });
-    return retVal;
-};
-const de_DataViewSummary = (output, context) => {
-    return {
-        asOfTimestamp: __expectLong(output.asOfTimestamp),
-        autoUpdate: __expectBoolean(output.autoUpdate),
-        createTime: __expectLong(output.createTime),
-        dataViewArn: __expectString(output.dataViewArn),
-        dataViewId: __expectString(output.dataViewId),
-        datasetId: __expectString(output.datasetId),
-        destinationTypeProperties: output.destinationTypeProperties != null
-            ? de_DataViewDestinationTypeParams(output.destinationTypeProperties, context)
-            : undefined,
-        errorInfo: output.errorInfo != null ? de_DataViewErrorInfo(output.errorInfo, context) : undefined,
-        lastModifiedTime: __expectLong(output.lastModifiedTime),
-        partitionColumns: output.partitionColumns != null ? de_PartitionColumnList(output.partitionColumns, context) : undefined,
-        sortColumns: output.sortColumns != null ? de_SortColumnList(output.sortColumns, context) : undefined,
-        status: __expectString(output.status),
-    };
-};
-const de_FormatParams = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_PartitionColumnList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_PermissionGroup = (output, context) => {
-    return {
-        applicationPermissions: output.applicationPermissions != null
-            ? de_ApplicationPermissionList(output.applicationPermissions, context)
-            : undefined,
-        createTime: __expectLong(output.createTime),
-        description: __expectString(output.description),
-        lastModifiedTime: __expectLong(output.lastModifiedTime),
-        membershipStatus: __expectString(output.membershipStatus),
-        name: __expectString(output.name),
-        permissionGroupId: __expectString(output.permissionGroupId),
-    };
-};
-const de_PermissionGroupByUser = (output, context) => {
-    return {
-        membershipStatus: __expectString(output.membershipStatus),
-        name: __expectString(output.name),
-        permissionGroupId: __expectString(output.permissionGroupId),
-    };
-};
-const de_PermissionGroupByUserList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_PermissionGroupByUser(entry, context);
-    });
-    return retVal;
-};
-const de_PermissionGroupList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_PermissionGroup(entry, context);
-    });
-    return retVal;
-};
-const de_S3DestinationFormatOptions = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_S3Location = (output, context) => {
-    return {
-        bucket: __expectString(output.bucket),
-        key: __expectString(output.key),
-    };
-};
-const de_SchemaDefinition = (output, context) => {
-    return {
-        columns: output.columns != null ? de_ColumnList(output.columns, context) : undefined,
-        primaryKeyColumns: output.primaryKeyColumns != null ? de_ColumnNameList(output.primaryKeyColumns, context) : undefined,
-    };
-};
-const de_SchemaUnion = (output, context) => {
-    return {
-        tabularSchemaConfig: output.tabularSchemaConfig != null ? de_SchemaDefinition(output.tabularSchemaConfig, context) : undefined,
-    };
-};
-const de_SortColumnList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_SourceParams = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_User = (output, context) => {
-    return {
-        apiAccess: __expectString(output.apiAccess),
-        apiAccessPrincipalArn: __expectString(output.apiAccessPrincipalArn),
-        createTime: __expectLong(output.createTime),
-        emailAddress: __expectString(output.emailAddress),
-        firstName: __expectString(output.firstName),
-        lastDisabledTime: __expectLong(output.lastDisabledTime),
-        lastEnabledTime: __expectLong(output.lastEnabledTime),
-        lastLoginTime: __expectLong(output.lastLoginTime),
-        lastModifiedTime: __expectLong(output.lastModifiedTime),
-        lastName: __expectString(output.lastName),
-        status: __expectString(output.status),
-        type: __expectString(output.type),
-        userId: __expectString(output.userId),
-    };
-};
-const de_UserByPermissionGroup = (output, context) => {
-    return {
-        apiAccess: __expectString(output.apiAccess),
-        apiAccessPrincipalArn: __expectString(output.apiAccessPrincipalArn),
-        emailAddress: __expectString(output.emailAddress),
-        firstName: __expectString(output.firstName),
-        lastName: __expectString(output.lastName),
-        membershipStatus: __expectString(output.membershipStatus),
-        status: __expectString(output.status),
-        type: __expectString(output.type),
-        userId: __expectString(output.userId),
-    };
-};
-const de_UserByPermissionGroupList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_UserByPermissionGroup(entry, context);
-    });
-    return retVal;
-};
-const de_UserList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_User(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"],