@rio-cloud/cdk-v2-constructs 7.13.6 → 7.13.7

package/node_modules/@aws-sdk/client-sso/dist-types/ts3.4/SSO.d.ts

@@ -1,4 +1,8 @@
-import { HttpHandlerOptions as __HttpHandlerOptions } from "@smithy/types";
+import {
+  HttpHandlerOptions as __HttpHandlerOptions,
+  PaginationConfiguration,
+  Paginator,
+} from "@smithy/types";
 import {
   GetRoleCredentialsCommandInput,
   GetRoleCredentialsCommandOutput,
@@ -69,5 +73,19 @@ export interface SSO {
     options: __HttpHandlerOptions,
     cb: (err: any, data?: LogoutCommandOutput) => void
   ): void;
+  paginateListAccountRoles(
+    args: ListAccountRolesCommandInput,
+    paginationConfig?: Pick<
+      PaginationConfiguration,
+      Exclude<keyof PaginationConfiguration, "client">
+    >
+  ): Paginator<ListAccountRolesCommandOutput>;
+  paginateListAccounts(
+    args: ListAccountsCommandInput,
+    paginationConfig?: Pick<
+      PaginationConfiguration,
+      Exclude<keyof PaginationConfiguration, "client">
+    >
+  ): Paginator<ListAccountsCommandOutput>;
 }
 export declare class SSO extends SSOClient implements SSO {}

package/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-retry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/util-retry",
-  "version": "4.2.7",
+  "version": "4.2.8",
   "description": "Shared retry utilities to be used in middleware packages.",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -31,15 +31,15 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/service-error-classification": "^4.2.7",
-    "@smithy/types": "^4.11.0",
+    "@smithy/service-error-classification": "^4.2.8",
+    "@smithy/types": "^4.12.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.10",
     "typedoc": "0.23.23"
   },
   "types": "./dist-types/index.d.ts",

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.967.0",
+  "version": "3.980.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.967.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.967.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.967.0",
-    "@smithy/config-resolver": "^4.4.5",
-    "@smithy/core": "^3.20.2",
-    "@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.3",
-    "@smithy/middleware-retry": "^4.4.19",
-    "@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.4",
-    "@smithy/types": "^4.11.0",
-    "@smithy/url-parser": "^4.2.7",
+    "@aws-sdk/core": "^3.973.5",
+    "@aws-sdk/middleware-host-header": "^3.972.3",
+    "@aws-sdk/middleware-logger": "^3.972.3",
+    "@aws-sdk/middleware-recursion-detection": "^3.972.3",
+    "@aws-sdk/middleware-user-agent": "^3.972.5",
+    "@aws-sdk/region-config-resolver": "^3.972.3",
+    "@aws-sdk/types": "^3.973.1",
+    "@aws-sdk/util-endpoints": "3.980.0",
+    "@aws-sdk/util-user-agent-browser": "^3.972.3",
+    "@aws-sdk/util-user-agent-node": "^3.972.3",
+    "@smithy/config-resolver": "^4.4.6",
+    "@smithy/core": "^3.22.0",
+    "@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.12",
+    "@smithy/middleware-retry": "^4.4.29",
+    "@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.11.1",
+    "@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.18",
-    "@smithy/util-defaults-mode-node": "^4.2.21",
-    "@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.28",
+    "@smithy/util-defaults-mode-node": "^4.2.31",
+    "@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/account-id-endpoint.js

@@ -1,4 +1,3 @@
-
 /**
  * Do not edit:
  * This is a compatibility redirect for contexts that do not understand package.json exports field.

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

@@ -572,46 +572,6 @@ class SerdeContextConfig {
     }
 }
 
-function* serializingStructIterator(ns, sourceObject) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    for (let i = 0; i < struct[4].length; ++i) {
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        if (!(key in sourceObject) && !memberNs.isIdempotencyToken()) {
-            continue;
-        }
-        yield [key, memberNs];
-    }
-}
-function* deserializingStructIterator(ns, sourceObject, nameTrait) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    let keysRemaining = Object.keys(sourceObject).filter((k) => k !== "__type").length;
-    for (let i = 0; i < struct[4].length; ++i) {
-        if (keysRemaining === 0) {
-            break;
-        }
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        let serializationKey = key;
-        if (nameTrait) {
-            serializationKey = memberNs.getMergedTraits()[nameTrait] ?? key;
-        }
-        if (!(serializationKey in sourceObject)) {
-            continue;
-        }
-        yield [key, memberNs];
-        keysRemaining -= 1;
-    }
-}
-
 class UnionSerde {
     from;
     to;
@@ -727,24 +687,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 ns.structIterator()) {
+                    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 +901,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 ns.structIterator()) {
+                    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()) {
@@ -1532,7 +1527,7 @@ class QueryShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             if (value && typeof value === "object") {
                 let didWriteMember = false;
-                for (const [memberName, member] of serializingStructIterator(ns, value)) {
+                for (const [memberName, member] of ns.structIterator()) {
                     if (value[memberName] == null && !member.isIdempotencyToken()) {
                         continue;
                     }
@@ -1833,7 +1828,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
         }
         const structXmlNode = xmlBuilder.XmlNode.of(name);
         const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
-        for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
+        for (const [memberName, memberSchema] of ns.structIterator()) {
             const val = value[memberName];
             if (val != null || memberSchema.isIdempotencyToken()) {
                 if (memberSchema.getMergedTraits().xmlAttribute) {

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

@@ -234,46 +234,6 @@ class SerdeContextConfig {
     }
 }
 
-function* serializingStructIterator(ns, sourceObject) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    for (let i = 0; i < struct[4].length; ++i) {
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        if (!(key in sourceObject) && !memberNs.isIdempotencyToken()) {
-            continue;
-        }
-        yield [key, memberNs];
-    }
-}
-function* deserializingStructIterator(ns, sourceObject, nameTrait) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    let keysRemaining = Object.keys(sourceObject).filter((k) => k !== "__type").length;
-    for (let i = 0; i < struct[4].length; ++i) {
-        if (keysRemaining === 0) {
-            break;
-        }
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new schema.NormalizedSchema([memberSchema, 0], key);
-        let serializationKey = key;
-        if (nameTrait) {
-            serializationKey = memberNs.getMergedTraits()[nameTrait] ?? key;
-        }
-        if (!(serializationKey in sourceObject)) {
-            continue;
-        }
-        yield [key, memberNs];
-        keysRemaining -= 1;
-    }
-}
-
 class UnionSerde {
     from;
     to;
@@ -389,24 +349,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 ns.structIterator()) {
+                    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 +563,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 ns.structIterator()) {
+                    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()) {
@@ -1194,7 +1189,7 @@ class QueryShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             if (value && typeof value === "object") {
                 let didWriteMember = false;
-                for (const [memberName, member] of serializingStructIterator(ns, value)) {
+                for (const [memberName, member] of ns.structIterator()) {
                     if (value[memberName] == null && !member.isIdempotencyToken()) {
                         continue;
                     }
@@ -1495,7 +1490,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
         }
         const structXmlNode = xmlBuilder.XmlNode.of(name);
         const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
-        for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
+        for (const [memberName, memberSchema] of ns.structIterator()) {
             const val = value[memberName];
             if (val != null || memberSchema.isIdempotencyToken()) {
                 if (memberSchema.getMergedTraits().xmlAttribute) {

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

@@ -3,7 +3,6 @@ import { NormalizedSchema } from "@smithy/core/schema";
 import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
 import { fromBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { deserializingStructIterator } from "../structIterator";
 import { UnionSerde } from "../UnionSerde";
 import { jsonReviver } from "./jsonReviver";
 import { parseJsonBody } from "./parseJsonBody";
@@ -24,24 +23,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 ns.structIterator()) {
+                    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

@@ -3,7 +3,6 @@ import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
 import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../structIterator";
 import { JsonReplacer } from "./jsonReplacer";
 export class JsonShapeSerializer extends SerdeContextConfig {
     settings;
@@ -42,22 +41,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 ns.structIterator()) {
+                    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/experimental/SinglePassJsonShapeSerializer.js

@@ -3,7 +3,6 @@ import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
 import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../../structIterator";
 export class SinglePassJsonShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
@@ -46,7 +45,7 @@ export class SinglePassJsonShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             b += "{";
             let didWriteMember = false;
-            for (const [name, member] of serializingStructIterator(ns, value)) {
+            for (const [name, member] of ns.structIterator()) {
                 const item = value[name];
                 const targetKey = this.settings.jsonName ? member.getMergedTraits().jsonName ?? name : name;
                 const serializableValue = this.writeValue(member, item);

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/query/QueryShapeSerializer.js

@@ -4,7 +4,6 @@ import { generateIdempotencyToken, NumericValue } from "@smithy/core/serde";
 import { dateToUtcString } from "@smithy/smithy-client";
 import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../structIterator";
 export class QueryShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
@@ -130,7 +129,7 @@ export class QueryShapeSerializer extends SerdeContextConfig {
         else if (ns.isStructSchema()) {
             if (value && typeof value === "object") {
                 let didWriteMember = false;
-                for (const [memberName, member] of serializingStructIterator(ns, value)) {
+                for (const [memberName, member] of ns.structIterator()) {
                     if (value[memberName] == null && !member.isIdempotencyToken()) {
                         continue;
                     }

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/xml/XmlShapeSerializer.js

@@ -5,7 +5,6 @@ import { generateIdempotencyToken, NumericValue } from "@smithy/core/serde";
 import { dateToUtcString } from "@smithy/smithy-client";
 import { fromBase64, toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { serializingStructIterator } from "../structIterator";
 export class XmlShapeSerializer extends SerdeContextConfig {
     settings;
     stringBuffer;
@@ -64,7 +63,7 @@ export class XmlShapeSerializer extends SerdeContextConfig {
         }
         const structXmlNode = XmlNode.of(name);
         const [xmlnsAttr, xmlns] = this.getXmlnsAttribute(ns, parentXmlns);
-        for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
+        for (const [memberName, memberSchema] of ns.structIterator()) {
             const val = value[memberName];
             if (val != null || memberSchema.isIdempotencyToken()) {
                 if (memberSchema.getMergedTraits().xmlAttribute) {