cloudstructs 0.12.6 → 0.12.8

package/node_modules/@aws-sdk/client-lambda/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-lambda",
   "description": "AWS SDK for JavaScript Lambda Client for Node.js, Browser and React Native",
-  "version": "3.966.0",
+  "version": "3.972.0",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline client-lambda",
@@ -9,7 +9,7 @@
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
     "extract:docs": "api-extractor run --local",
     "generate:client": "node ../../scripts/generate-clients/single-service --solo lambda",
     "test:e2e": "yarn g:vitest run -c vitest.config.e2e.mts --mode development",
@@ -23,59 +23,59 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.966.0",
-    "@aws-sdk/credential-provider-node": "3.966.0",
-    "@aws-sdk/middleware-host-header": "3.965.0",
-    "@aws-sdk/middleware-logger": "3.965.0",
-    "@aws-sdk/middleware-recursion-detection": "3.965.0",
-    "@aws-sdk/middleware-user-agent": "3.966.0",
-    "@aws-sdk/region-config-resolver": "3.965.0",
-    "@aws-sdk/types": "3.965.0",
-    "@aws-sdk/util-endpoints": "3.965.0",
-    "@aws-sdk/util-user-agent-browser": "3.965.0",
-    "@aws-sdk/util-user-agent-node": "3.966.0",
-    "@smithy/config-resolver": "^4.4.5",
-    "@smithy/core": "^3.20.1",
-    "@smithy/eventstream-serde-browser": "^4.2.7",
-    "@smithy/eventstream-serde-config-resolver": "^4.3.7",
-    "@smithy/eventstream-serde-node": "^4.2.7",
-    "@smithy/fetch-http-handler": "^5.3.8",
-    "@smithy/hash-node": "^4.2.7",
-    "@smithy/invalid-dependency": "^4.2.7",
-    "@smithy/middleware-content-length": "^4.2.7",
-    "@smithy/middleware-endpoint": "^4.4.2",
-    "@smithy/middleware-retry": "^4.4.18",
-    "@smithy/middleware-serde": "^4.2.8",
-    "@smithy/middleware-stack": "^4.2.7",
-    "@smithy/node-config-provider": "^4.3.7",
-    "@smithy/node-http-handler": "^4.4.7",
-    "@smithy/protocol-http": "^5.3.7",
-    "@smithy/smithy-client": "^4.10.3",
-    "@smithy/types": "^4.11.0",
-    "@smithy/url-parser": "^4.2.7",
+    "@aws-sdk/core": "3.972.0",
+    "@aws-sdk/credential-provider-node": "3.972.0",
+    "@aws-sdk/middleware-host-header": "3.972.0",
+    "@aws-sdk/middleware-logger": "3.972.0",
+    "@aws-sdk/middleware-recursion-detection": "3.972.0",
+    "@aws-sdk/middleware-user-agent": "3.972.0",
+    "@aws-sdk/region-config-resolver": "3.972.0",
+    "@aws-sdk/types": "3.972.0",
+    "@aws-sdk/util-endpoints": "3.972.0",
+    "@aws-sdk/util-user-agent-browser": "3.972.0",
+    "@aws-sdk/util-user-agent-node": "3.972.0",
+    "@smithy/config-resolver": "^4.4.6",
+    "@smithy/core": "^3.20.6",
+    "@smithy/eventstream-serde-browser": "^4.2.8",
+    "@smithy/eventstream-serde-config-resolver": "^4.3.8",
+    "@smithy/eventstream-serde-node": "^4.2.8",
+    "@smithy/fetch-http-handler": "^5.3.9",
+    "@smithy/hash-node": "^4.2.8",
+    "@smithy/invalid-dependency": "^4.2.8",
+    "@smithy/middleware-content-length": "^4.2.8",
+    "@smithy/middleware-endpoint": "^4.4.7",
+    "@smithy/middleware-retry": "^4.4.23",
+    "@smithy/middleware-serde": "^4.2.9",
+    "@smithy/middleware-stack": "^4.2.8",
+    "@smithy/node-config-provider": "^4.3.8",
+    "@smithy/node-http-handler": "^4.4.8",
+    "@smithy/protocol-http": "^5.3.8",
+    "@smithy/smithy-client": "^4.10.8",
+    "@smithy/types": "^4.12.0",
+    "@smithy/url-parser": "^4.2.8",
     "@smithy/util-base64": "^4.3.0",
     "@smithy/util-body-length-browser": "^4.2.0",
     "@smithy/util-body-length-node": "^4.2.1",
-    "@smithy/util-defaults-mode-browser": "^4.3.17",
-    "@smithy/util-defaults-mode-node": "^4.2.20",
-    "@smithy/util-endpoints": "^3.2.7",
-    "@smithy/util-middleware": "^4.2.7",
-    "@smithy/util-retry": "^4.2.7",
-    "@smithy/util-stream": "^4.5.8",
+    "@smithy/util-defaults-mode-browser": "^4.3.22",
+    "@smithy/util-defaults-mode-node": "^4.2.25",
+    "@smithy/util-endpoints": "^3.2.8",
+    "@smithy/util-middleware": "^4.2.8",
+    "@smithy/util-retry": "^4.2.8",
+    "@smithy/util-stream": "^4.5.10",
     "@smithy/util-utf8": "^4.2.0",
-    "@smithy/util-waiter": "^4.2.7",
+    "@smithy/util-waiter": "^4.2.8",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@tsconfig/node18": "18.2.4",
-    "@types/node": "^18.19.69",
+    "@tsconfig/node20": "20.1.8",
+    "@types/node": "^20.14.8",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "rimraf": "5.0.10",
+    "premove": "4.0.0",
     "typescript": "~5.8.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "typesVersions": {
     "<4.0": {

package/node_modules/@aws-sdk/client-sso/dist-cjs/index.js

@@ -228,7 +228,7 @@ var AccountInfo$ = [3, n0, _AI,
 var GetRoleCredentialsRequest$ = [3, n0, _GRCR,
     0,
     [_rN, _aI, _aT],
-    [[0, { [_hQ]: _rn }], [0, { [_hQ]: _ai }], [() => AccessTokenType, { [_hH]: _xasbt }]]
+    [[0, { [_hQ]: _rn }], [0, { [_hQ]: _ai }], [() => AccessTokenType, { [_hH]: _xasbt }]], 3
 ];
 var GetRoleCredentialsResponse$ = [3, n0, _GRCRe,
     0,
@@ -243,8 +243,8 @@ var InvalidRequestException$ = [-3, n0, _IRE,
 schema.TypeRegistry.for(n0).registerError(InvalidRequestException$, InvalidRequestException);
 var ListAccountRolesRequest$ = [3, n0, _LARR,
     0,
-    [_nT, _mR, _aT, _aI],
-    [[0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }], [() => AccessTokenType, { [_hH]: _xasbt }], [0, { [_hQ]: _ai }]]
+    [_aT, _aI, _nT, _mR],
+    [[() => AccessTokenType, { [_hH]: _xasbt }], [0, { [_hQ]: _ai }], [0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }]], 2
 ];
 var ListAccountRolesResponse$ = [3, n0, _LARRi,
     0,
@@ -253,8 +253,8 @@ var ListAccountRolesResponse$ = [3, n0, _LARRi,
 ];
 var ListAccountsRequest$ = [3, n0, _LAR,
     0,
-    [_nT, _mR, _aT],
-    [[0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }], [() => AccessTokenType, { [_hH]: _xasbt }]]
+    [_aT, _nT, _mR],
+    [[() => AccessTokenType, { [_hH]: _xasbt }], [0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }]], 1
 ];
 var ListAccountsResponse$ = [3, n0, _LARi,
     0,
@@ -264,7 +264,7 @@ var ListAccountsResponse$ = [3, n0, _LARi,
 var LogoutRequest$ = [3, n0, _LR,
     0,
     [_aT],
-    [[() => AccessTokenType, { [_hH]: _xasbt }]]
+    [[() => AccessTokenType, { [_hH]: _xasbt }]], 1
 ];
 var ResourceNotFoundException$ = [-3, n0, _RNFE,
     { [_e]: _c, [_hE]: 404 },

package/node_modules/@aws-sdk/client-sso/dist-es/schemas/schemas_0.js

@@ -63,7 +63,7 @@ export var AccountInfo$ = [3, n0, _AI,
 export var GetRoleCredentialsRequest$ = [3, n0, _GRCR,
     0,
     [_rN, _aI, _aT],
-    [[0, { [_hQ]: _rn }], [0, { [_hQ]: _ai }], [() => AccessTokenType, { [_hH]: _xasbt }]]
+    [[0, { [_hQ]: _rn }], [0, { [_hQ]: _ai }], [() => AccessTokenType, { [_hH]: _xasbt }]], 3
 ];
 export var GetRoleCredentialsResponse$ = [3, n0, _GRCRe,
     0,
@@ -78,8 +78,8 @@ export var InvalidRequestException$ = [-3, n0, _IRE,
 TypeRegistry.for(n0).registerError(InvalidRequestException$, InvalidRequestException);
 export var ListAccountRolesRequest$ = [3, n0, _LARR,
     0,
-    [_nT, _mR, _aT, _aI],
-    [[0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }], [() => AccessTokenType, { [_hH]: _xasbt }], [0, { [_hQ]: _ai }]]
+    [_aT, _aI, _nT, _mR],
+    [[() => AccessTokenType, { [_hH]: _xasbt }], [0, { [_hQ]: _ai }], [0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }]], 2
 ];
 export var ListAccountRolesResponse$ = [3, n0, _LARRi,
     0,
@@ -88,8 +88,8 @@ export var ListAccountRolesResponse$ = [3, n0, _LARRi,
 ];
 export var ListAccountsRequest$ = [3, n0, _LAR,
     0,
-    [_nT, _mR, _aT],
-    [[0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }], [() => AccessTokenType, { [_hH]: _xasbt }]]
+    [_aT, _nT, _mR],
+    [[() => AccessTokenType, { [_hH]: _xasbt }], [0, { [_hQ]: _nt }], [1, { [_hQ]: _mr }]], 1
 ];
 export var ListAccountsResponse$ = [3, n0, _LARi,
     0,
@@ -99,7 +99,7 @@ export var ListAccountsResponse$ = [3, n0, _LARi,
 export var LogoutRequest$ = [3, n0, _LR,
     0,
     [_aT],
-    [[() => AccessTokenType, { [_hH]: _xasbt }]]
+    [[() => AccessTokenType, { [_hH]: _xasbt }]], 1
 ];
 export var ResourceNotFoundException$ = [-3, n0, _RNFE,
     { [_e]: _c, [_hE]: 404 },

package/node_modules/@aws-sdk/client-sso/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-sso",
   "description": "AWS SDK for JavaScript Sso Client for Node.js, Browser and React Native",
-  "version": "3.966.0",
+  "version": "3.972.0",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline client-sso",
@@ -9,7 +9,7 @@
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
     "extract:docs": "api-extractor run --local",
     "generate:client": "node ../../scripts/generate-clients/single-service --solo sso",
     "test:index": "tsc --noEmit ./test/index-types.ts && node ./test/index-objects.spec.mjs"
@@ -21,53 +21,53 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.966.0",
-    "@aws-sdk/middleware-host-header": "3.965.0",
-    "@aws-sdk/middleware-logger": "3.965.0",
-    "@aws-sdk/middleware-recursion-detection": "3.965.0",
-    "@aws-sdk/middleware-user-agent": "3.966.0",
-    "@aws-sdk/region-config-resolver": "3.965.0",
-    "@aws-sdk/types": "3.965.0",
-    "@aws-sdk/util-endpoints": "3.965.0",
-    "@aws-sdk/util-user-agent-browser": "3.965.0",
-    "@aws-sdk/util-user-agent-node": "3.966.0",
-    "@smithy/config-resolver": "^4.4.5",
-    "@smithy/core": "^3.20.1",
-    "@smithy/fetch-http-handler": "^5.3.8",
-    "@smithy/hash-node": "^4.2.7",
-    "@smithy/invalid-dependency": "^4.2.7",
-    "@smithy/middleware-content-length": "^4.2.7",
-    "@smithy/middleware-endpoint": "^4.4.2",
-    "@smithy/middleware-retry": "^4.4.18",
-    "@smithy/middleware-serde": "^4.2.8",
-    "@smithy/middleware-stack": "^4.2.7",
-    "@smithy/node-config-provider": "^4.3.7",
-    "@smithy/node-http-handler": "^4.4.7",
-    "@smithy/protocol-http": "^5.3.7",
-    "@smithy/smithy-client": "^4.10.3",
-    "@smithy/types": "^4.11.0",
-    "@smithy/url-parser": "^4.2.7",
+    "@aws-sdk/core": "3.972.0",
+    "@aws-sdk/middleware-host-header": "3.972.0",
+    "@aws-sdk/middleware-logger": "3.972.0",
+    "@aws-sdk/middleware-recursion-detection": "3.972.0",
+    "@aws-sdk/middleware-user-agent": "3.972.0",
+    "@aws-sdk/region-config-resolver": "3.972.0",
+    "@aws-sdk/types": "3.972.0",
+    "@aws-sdk/util-endpoints": "3.972.0",
+    "@aws-sdk/util-user-agent-browser": "3.972.0",
+    "@aws-sdk/util-user-agent-node": "3.972.0",
+    "@smithy/config-resolver": "^4.4.6",
+    "@smithy/core": "^3.20.6",
+    "@smithy/fetch-http-handler": "^5.3.9",
+    "@smithy/hash-node": "^4.2.8",
+    "@smithy/invalid-dependency": "^4.2.8",
+    "@smithy/middleware-content-length": "^4.2.8",
+    "@smithy/middleware-endpoint": "^4.4.7",
+    "@smithy/middleware-retry": "^4.4.23",
+    "@smithy/middleware-serde": "^4.2.9",
+    "@smithy/middleware-stack": "^4.2.8",
+    "@smithy/node-config-provider": "^4.3.8",
+    "@smithy/node-http-handler": "^4.4.8",
+    "@smithy/protocol-http": "^5.3.8",
+    "@smithy/smithy-client": "^4.10.8",
+    "@smithy/types": "^4.12.0",
+    "@smithy/url-parser": "^4.2.8",
     "@smithy/util-base64": "^4.3.0",
     "@smithy/util-body-length-browser": "^4.2.0",
     "@smithy/util-body-length-node": "^4.2.1",
-    "@smithy/util-defaults-mode-browser": "^4.3.17",
-    "@smithy/util-defaults-mode-node": "^4.2.20",
-    "@smithy/util-endpoints": "^3.2.7",
-    "@smithy/util-middleware": "^4.2.7",
-    "@smithy/util-retry": "^4.2.7",
+    "@smithy/util-defaults-mode-browser": "^4.3.22",
+    "@smithy/util-defaults-mode-node": "^4.2.25",
+    "@smithy/util-endpoints": "^3.2.8",
+    "@smithy/util-middleware": "^4.2.8",
+    "@smithy/util-retry": "^4.2.8",
     "@smithy/util-utf8": "^4.2.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@tsconfig/node18": "18.2.4",
-    "@types/node": "^18.19.69",
+    "@tsconfig/node20": "20.1.8",
+    "@types/node": "^20.14.8",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "rimraf": "5.0.10",
+    "premove": "4.0.0",
     "typescript": "~5.8.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "typesVersions": {
     "<4.0": {

package/node_modules/@aws-sdk/core/dist-cjs/index.js

@@ -727,24 +727,42 @@ class JsonShapeDeserializer extends SerdeContextConfig {
         const ns = schema.NormalizedSchema.of(schema$1);
         if (isObject) {
             if (ns.isStructSchema()) {
+                const record = value;
                 const union = ns.isUnionSchema();
                 const out = {};
+                let nameMap = void 0;
+                const { jsonName } = this.settings;
+                if (jsonName) {
+                    nameMap = {};
+                }
                 let unionSerde;
                 if (union) {
-                    unionSerde = new UnionSerde(value, out);
+                    unionSerde = new UnionSerde(record, out);
                 }
-                for (const [memberName, memberSchema] of deserializingStructIterator(ns, value, this.settings.jsonName ? "jsonName" : false)) {
-                    const fromKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
+                for (const [memberName, memberSchema] of deserializingStructIterator(ns, record, jsonName ? "jsonName" : false)) {
+                    let fromKey = memberName;
+                    if (jsonName) {
+                        fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
+                        nameMap[fromKey] = memberName;
+                    }
                     if (union) {
                         unionSerde.mark(fromKey);
                     }
-                    if (value[fromKey] != null) {
-                        out[memberName] = this._read(memberSchema, value[fromKey]);
+                    if (record[fromKey] != null) {
+                        out[memberName] = this._read(memberSchema, record[fromKey]);
                     }
                 }
                 if (union) {
                     unionSerde.writeUnknown();
                 }
+                else if (typeof record.__type === "string") {
+                    for (const [k, v] of Object.entries(record)) {
+                        const t = jsonName ? nameMap[k] ?? k : k;
+                        if (!(t in out)) {
+                            out[t] = v;
+                        }
+                    }
+                }
                 return out;
             }
             if (Array.isArray(value) && ns.isListSchema()) {
@@ -923,22 +941,39 @@ class JsonShapeSerializer extends SerdeContextConfig {
         const ns = schema.NormalizedSchema.of(schema$1);
         if (isObject) {
             if (ns.isStructSchema()) {
+                const record = value;
                 const out = {};
-                for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
-                    const serializableValue = this._write(memberSchema, value[memberName], ns);
+                const { jsonName } = this.settings;
+                let nameMap = void 0;
+                if (jsonName) {
+                    nameMap = {};
+                }
+                for (const [memberName, memberSchema] of serializingStructIterator(ns, record)) {
+                    const serializableValue = this._write(memberSchema, record[memberName], ns);
                     if (serializableValue !== undefined) {
-                        const jsonName = memberSchema.getMergedTraits().jsonName;
-                        const targetKey = this.settings.jsonName ? jsonName ?? memberName : memberName;
+                        let targetKey = memberName;
+                        if (jsonName) {
+                            targetKey = memberSchema.getMergedTraits().jsonName ?? memberName;
+                            nameMap[memberName] = targetKey;
+                        }
                         out[targetKey] = serializableValue;
                     }
                 }
                 if (ns.isUnionSchema() && Object.keys(out).length === 0) {
-                    const { $unknown } = value;
+                    const { $unknown } = record;
                     if (Array.isArray($unknown)) {
                         const [k, v] = $unknown;
                         out[k] = this._write(15, v);
                     }
                 }
+                else if (typeof record.__type === "string") {
+                    for (const [k, v] of Object.entries(record)) {
+                        const targetKey = jsonName ? nameMap[k] ?? k : k;
+                        if (!(targetKey in out)) {
+                            out[targetKey] = this._write(15, v);
+                        }
+                    }
+                }
                 return out;
             }
             if (Array.isArray(value) && ns.isListSchema()) {

package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js

@@ -389,24 +389,42 @@ class JsonShapeDeserializer extends SerdeContextConfig {
         const ns = schema.NormalizedSchema.of(schema$1);
         if (isObject) {
             if (ns.isStructSchema()) {
+                const record = value;
                 const union = ns.isUnionSchema();
                 const out = {};
+                let nameMap = void 0;
+                const { jsonName } = this.settings;
+                if (jsonName) {
+                    nameMap = {};
+                }
                 let unionSerde;
                 if (union) {
-                    unionSerde = new UnionSerde(value, out);
+                    unionSerde = new UnionSerde(record, out);
                 }
-                for (const [memberName, memberSchema] of deserializingStructIterator(ns, value, this.settings.jsonName ? "jsonName" : false)) {
-                    const fromKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
+                for (const [memberName, memberSchema] of deserializingStructIterator(ns, record, jsonName ? "jsonName" : false)) {
+                    let fromKey = memberName;
+                    if (jsonName) {
+                        fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
+                        nameMap[fromKey] = memberName;
+                    }
                     if (union) {
                         unionSerde.mark(fromKey);
                     }
-                    if (value[fromKey] != null) {
-                        out[memberName] = this._read(memberSchema, value[fromKey]);
+                    if (record[fromKey] != null) {
+                        out[memberName] = this._read(memberSchema, record[fromKey]);
                     }
                 }
                 if (union) {
                     unionSerde.writeUnknown();
                 }
+                else if (typeof record.__type === "string") {
+                    for (const [k, v] of Object.entries(record)) {
+                        const t = jsonName ? nameMap[k] ?? k : k;
+                        if (!(t in out)) {
+                            out[t] = v;
+                        }
+                    }
+                }
                 return out;
             }
             if (Array.isArray(value) && ns.isListSchema()) {
@@ -585,22 +603,39 @@ class JsonShapeSerializer extends SerdeContextConfig {
         const ns = schema.NormalizedSchema.of(schema$1);
         if (isObject) {
             if (ns.isStructSchema()) {
+                const record = value;
                 const out = {};
-                for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
-                    const serializableValue = this._write(memberSchema, value[memberName], ns);
+                const { jsonName } = this.settings;
+                let nameMap = void 0;
+                if (jsonName) {
+                    nameMap = {};
+                }
+                for (const [memberName, memberSchema] of serializingStructIterator(ns, record)) {
+                    const serializableValue = this._write(memberSchema, record[memberName], ns);
                     if (serializableValue !== undefined) {
-                        const jsonName = memberSchema.getMergedTraits().jsonName;
-                        const targetKey = this.settings.jsonName ? jsonName ?? memberName : memberName;
+                        let targetKey = memberName;
+                        if (jsonName) {
+                            targetKey = memberSchema.getMergedTraits().jsonName ?? memberName;
+                            nameMap[memberName] = targetKey;
+                        }
                         out[targetKey] = serializableValue;
                     }
                 }
                 if (ns.isUnionSchema() && Object.keys(out).length === 0) {
-                    const { $unknown } = value;
+                    const { $unknown } = record;
                     if (Array.isArray($unknown)) {
                         const [k, v] = $unknown;
                         out[k] = this._write(15, v);
                     }
                 }
+                else if (typeof record.__type === "string") {
+                    for (const [k, v] of Object.entries(record)) {
+                        const targetKey = jsonName ? nameMap[k] ?? k : k;
+                        if (!(targetKey in out)) {
+                            out[targetKey] = this._write(15, v);
+                        }
+                    }
+                }
                 return out;
             }
             if (Array.isArray(value) && ns.isListSchema()) {

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/JsonShapeDeserializer.js

@@ -24,24 +24,42 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
         const ns = NormalizedSchema.of(schema);
         if (isObject) {
             if (ns.isStructSchema()) {
+                const record = value;
                 const union = ns.isUnionSchema();
                 const out = {};
+                let nameMap = void 0;
+                const { jsonName } = this.settings;
+                if (jsonName) {
+                    nameMap = {};
+                }
                 let unionSerde;
                 if (union) {
-                    unionSerde = new UnionSerde(value, out);
+                    unionSerde = new UnionSerde(record, out);
                 }
-                for (const [memberName, memberSchema] of deserializingStructIterator(ns, value, this.settings.jsonName ? "jsonName" : false)) {
-                    const fromKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
+                for (const [memberName, memberSchema] of deserializingStructIterator(ns, record, jsonName ? "jsonName" : false)) {
+                    let fromKey = memberName;
+                    if (jsonName) {
+                        fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
+                        nameMap[fromKey] = memberName;
+                    }
                     if (union) {
                         unionSerde.mark(fromKey);
                     }
-                    if (value[fromKey] != null) {
-                        out[memberName] = this._read(memberSchema, value[fromKey]);
+                    if (record[fromKey] != null) {
+                        out[memberName] = this._read(memberSchema, record[fromKey]);
                     }
                 }
                 if (union) {
                     unionSerde.writeUnknown();
                 }
+                else if (typeof record.__type === "string") {
+                    for (const [k, v] of Object.entries(record)) {
+                        const t = jsonName ? nameMap[k] ?? k : k;
+                        if (!(t in out)) {
+                            out[t] = v;
+                        }
+                    }
+                }
                 return out;
             }
             if (Array.isArray(value) && ns.isListSchema()) {

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/JsonShapeSerializer.js

@@ -42,22 +42,39 @@ export class JsonShapeSerializer extends SerdeContextConfig {
         const ns = NormalizedSchema.of(schema);
         if (isObject) {
             if (ns.isStructSchema()) {
+                const record = value;
                 const out = {};
-                for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
-                    const serializableValue = this._write(memberSchema, value[memberName], ns);
+                const { jsonName } = this.settings;
+                let nameMap = void 0;
+                if (jsonName) {
+                    nameMap = {};
+                }
+                for (const [memberName, memberSchema] of serializingStructIterator(ns, record)) {
+                    const serializableValue = this._write(memberSchema, record[memberName], ns);
                     if (serializableValue !== undefined) {
-                        const jsonName = memberSchema.getMergedTraits().jsonName;
-                        const targetKey = this.settings.jsonName ? jsonName ?? memberName : memberName;
+                        let targetKey = memberName;
+                        if (jsonName) {
+                            targetKey = memberSchema.getMergedTraits().jsonName ?? memberName;
+                            nameMap[memberName] = targetKey;
+                        }
                         out[targetKey] = serializableValue;
                     }
                 }
                 if (ns.isUnionSchema() && Object.keys(out).length === 0) {
-                    const { $unknown } = value;
+                    const { $unknown } = record;
                     if (Array.isArray($unknown)) {
                         const [k, v] = $unknown;
                         out[k] = this._write(15, v);
                     }
                 }
+                else if (typeof record.__type === "string") {
+                    for (const [k, v] of Object.entries(record)) {
+                        const targetKey = jsonName ? nameMap[k] ?? k : k;
+                        if (!(targetKey in out)) {
+                            out[targetKey] = this._write(15, v);
+                        }
+                    }
+                }
                 return out;
             }
             if (Array.isArray(value) && ns.isListSchema()) {