@cdklabs/cdk-construct-connect-datalake 0.0.20 → 0.0.22

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

@@ -1,13 +1,14 @@
 export { AwsSmithyRpcV2CborProtocol } from "./cbor/AwsSmithyRpcV2CborProtocol";
-export { _toStr, _toBool, _toNum } from "./coercing-serializers";
 export { AwsJson1_0Protocol } from "./json/AwsJson1_0Protocol";
 export { AwsJson1_1Protocol } from "./json/AwsJson1_1Protocol";
 export { AwsJsonRpcProtocol } from "./json/AwsJsonRpcProtocol";
 export { AwsRestJsonProtocol } from "./json/AwsRestJsonProtocol";
-export { JsonCodec } from "./json/JsonCodec";
-export { JsonShapeDeserializer } from "./json/JsonShapeDeserializer";
-export { JsonShapeSerializer } from "./json/JsonShapeSerializer";
-export { awsExpectUnion } from "./json/awsExpectUnion";
+export { JsonCodec } from "./json/codec-v1/JsonCodec";
+export { JsonShapeDeserializer } from "./json/codec-v1/JsonShapeDeserializer";
+export { JsonShapeSerializer } from "./json/codec-v1/JsonShapeSerializer";
+export { JsonCodec2 } from "./json/codec-v2/JsonCodec2";
+export { JsonShapeDeserializer2 } from "./json/codec-v2/JsonShapeDeserializer2";
+export { JsonShapeSerializer2 } from "./json/codec-v2/JsonShapeSerializer2";
 export { parseJsonBody, parseJsonErrorBody, loadRestJsonErrorCode, loadJsonRpcErrorCode } from "./json/parseJsonBody";
 export { AwsEc2QueryProtocol } from "./query/AwsEc2QueryProtocol";
 export { AwsQueryProtocol } from "./query/AwsQueryProtocol";
@@ -17,3 +18,5 @@ export { XmlCodec } from "./xml/XmlCodec";
 export { XmlShapeDeserializer } from "./xml/XmlShapeDeserializer";
 export { XmlShapeSerializer } from "./xml/XmlShapeSerializer";
 export { parseXmlBody, parseXmlErrorBody, loadRestXmlErrorCode } from "./xml/parseXmlBody";
+export { awsExpectUnion } from "./json/awsExpectUnion";
+export { _toStr, _toBool, _toNum } from "./coercing-serializers";

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

@@ -1,7 +1,7 @@
 import { RpcProtocol } from "@smithy/core/protocols";
 import { deref, NormalizedSchema } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
-import { JsonCodec } from "./JsonCodec";
+import { JsonCodec2 } from "./codec-v2/JsonCodec2";
 import { loadJsonRpcErrorCode } from "./parseJsonBody";
 export class AwsJsonRpcProtocol extends RpcProtocol {
     serializer;
@@ -18,7 +18,7 @@ export class AwsJsonRpcProtocol extends RpcProtocol {
         this.serviceTarget = serviceTarget;
         this.codec =
             jsonCodec ??
-                new JsonCodec({
+                new JsonCodec2({
                     timestampFormat: {
                         useTrait: true,
                         default: 7,

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

@@ -1,14 +1,14 @@
 import { HttpBindingProtocol, HttpInterceptingShapeDeserializer, HttpInterceptingShapeSerializer, } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
-import { JsonCodec } from "./JsonCodec";
+import { JsonCodec2 } from "./codec-v2/JsonCodec2";
 import { loadRestJsonErrorCode } from "./parseJsonBody";
 export class AwsRestJsonProtocol extends HttpBindingProtocol {
     serializer;
     deserializer;
     codec;
     mixin = new ProtocolLib();
-    constructor({ defaultNamespace, errorTypeRegistries, }) {
+    constructor({ defaultNamespace, errorTypeRegistries, jsonCodec, }) {
         super({
             defaultNamespace,
             errorTypeRegistries,
@@ -21,7 +21,7 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
             httpBindings: true,
             jsonName: true,
         };
-        this.codec = new JsonCodec(settings);
+        this.codec = jsonCodec ?? new JsonCodec2(settings);
         this.serializer = new HttpInterceptingShapeSerializer(this.codec.createSerializer(), settings);
         this.deserializer = new HttpInterceptingShapeDeserializer(this.codec.createDeserializer(), settings);
     }

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

@@ -0,0 +1 @@
+export {};

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{JsonCodec.js → codec-v1/JsonCodec.js}

@@ -1,4 +1,4 @@
-import { SerdeContextConfig } from "../ConfigurableSerdeContext";
+import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
 import { JsonShapeDeserializer } from "./JsonShapeDeserializer";
 import { JsonShapeSerializer } from "./JsonShapeSerializer";
 export class JsonCodec extends SerdeContextConfig {

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonSettings.js

@@ -0,0 +1 @@
+export {};

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{JsonShapeDeserializer.js → codec-v1/JsonShapeDeserializer.js}

@@ -2,12 +2,12 @@ import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
 import { fromBase64 } from "@smithy/core/serde";
-import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { UnionSerde } from "../UnionSerde";
-import { jsonReviver } from "./jsonReviver";
-import { needsReviver } from "./needsReviver";
-import { parseJsonBody } from "./parseJsonBody";
-import { writeKey } from "../writeKey";
+import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
+import { UnionSerde } from "../../UnionSerde";
+import { jsonReviver } from "../jsonReviver";
+import { needsReviver } from "../needsReviver";
+import { parseJsonBody } from "../parseJsonBody";
+import { writeKey } from "../../writeKey";
 export class JsonShapeDeserializer extends SerdeContextConfig {
     settings;
     constructor(settings) {

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{JsonShapeSerializer.js → codec-v1/JsonShapeSerializer.js}

@@ -1,9 +1,9 @@
 import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue, toBase64 } from "@smithy/core/serde";
-import { SerdeContextConfig } from "../ConfigurableSerdeContext";
-import { JsonReplacer } from "./jsonReplacer";
-import { writeKey } from "../writeKey";
+import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
+import { JsonReplacer } from "../jsonReplacer";
+import { writeKey } from "../../writeKey";
 export class JsonShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
@@ -108,7 +108,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
                 }
                 return out;
             }
-            if (value instanceof Uint8Array && (ns.isBlobSchema() || ns.isDocumentSchema())) {
+            if (value instanceof Uint8Array && ns.isBlobSchema()) {
                 if (ns === this.rootSchema) {
                     return value;
                 }
@@ -148,7 +148,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
             }
             return value;
         }
-        if (typeof value === "number" && ns.isNumericSchema()) {
+        if (typeof value === "number") {
             if (Math.abs(value) === Infinity || isNaN(value)) {
                 return String(value);
             }
@@ -165,6 +165,9 @@ export class JsonShapeSerializer extends SerdeContextConfig {
         }
         if (ns.isDocumentSchema()) {
             if (isObject) {
+                if (value instanceof Uint8Array) {
+                    return (this.serdeContext?.base64Encoder ?? toBase64)(value);
+                }
                 const out = Array.isArray(value) ? [] : {};
                 for (const k in value) {
                     const v = value[k];

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonBytesStringAdapter.js

@@ -0,0 +1,103 @@
+import { toUtf8 } from "@smithy/core/serde";
+export class JsonBytesStringAdapter extends Uint8Array {
+    string = null;
+    static allocUnsafe(bytes) {
+        if (typeof Buffer === "function") {
+            const buffer = Buffer.allocUnsafe(bytes);
+            return new JsonBytesStringAdapter(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+        }
+        return new JsonBytesStringAdapter(bytes);
+    }
+    toString() {
+        return this.s();
+    }
+    valueOf() {
+        return this.s();
+    }
+    includes(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().includes(searchString, position);
+        }
+        return Uint8Array.prototype.includes.call(this, searchString, position);
+    }
+    indexOf(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().indexOf(searchString, position);
+        }
+        return Uint8Array.prototype.indexOf.call(this, searchString, position);
+    }
+    lastIndexOf(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().lastIndexOf(searchString, position);
+        }
+        const fn = Uint8Array.prototype.lastIndexOf;
+        if (position !== undefined) {
+            return fn.call(this, searchString, position);
+        }
+        return fn.call(this, searchString);
+    }
+    startsWith(searchString, position) {
+        return this.s().startsWith(searchString, position);
+    }
+    endsWith(searchString, endPosition) {
+        return this.s().endsWith(searchString, endPosition);
+    }
+    match(regexp) {
+        return this.s().match(regexp);
+    }
+    replace(searchValue, replaceValue) {
+        return this.s().replace(searchValue, replaceValue);
+    }
+    search(regexp) {
+        return this.s().search(regexp);
+    }
+    split(separator, limit) {
+        return this.s().split(separator, limit);
+    }
+    substring(start, end) {
+        return this.s().substring(start, end);
+    }
+    trim() {
+        return this.s().trim();
+    }
+    trimStart() {
+        return this.s().trimStart();
+    }
+    trimEnd() {
+        return this.s().trimEnd();
+    }
+    charAt(pos) {
+        return this.s().charAt(pos);
+    }
+    charCodeAt(index) {
+        return this.s().charCodeAt(index);
+    }
+    padStart(maxLength, fillString) {
+        return this.s().padStart(maxLength, fillString);
+    }
+    padEnd(maxLength, fillString) {
+        return this.s().padEnd(maxLength, fillString);
+    }
+    repeat(count) {
+        return this.s().repeat(count);
+    }
+    toUpperCase() {
+        return this.s().toUpperCase();
+    }
+    toLowerCase() {
+        return this.s().toLowerCase();
+    }
+    s() {
+        if (this.string == null) {
+            const n = Date.now();
+            if (n > warned + 60_000) {
+                console.warn("@aws-sdk/core/protocols - WARN - JsonCodec2: you have called a string method on a Uint8Array request body. " +
+                    "It has been automatically converted to string. In a future version this will throw an error.");
+                warned = n;
+            }
+            this.string = toUtf8(this);
+        }
+        return this.string;
+    }
+}
+var warned = 0;

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonCodec2.js

@@ -0,0 +1,20 @@
+import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
+import { JsonShapeDeserializer2 } from "./JsonShapeDeserializer2";
+import { JsonShapeSerializer2 } from "./JsonShapeSerializer2";
+export class JsonCodec2 extends SerdeContextConfig {
+    settings;
+    constructor(settings) {
+        super();
+        this.settings = settings;
+    }
+    createSerializer() {
+        const serializer = new JsonShapeSerializer2(this.settings);
+        serializer.setSerdeContext(this.serdeContext);
+        return serializer;
+    }
+    createDeserializer() {
+        const deserializer = new JsonShapeDeserializer2(this.settings);
+        deserializer.setSerdeContext(this.serdeContext);
+        return deserializer;
+    }
+}

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{experimental/BufferJsonShapeDeserializer.js → codec-v2/JsonShapeDeserializer2.js}

@@ -1,7 +1,6 @@
 import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
-import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
-import { fromBase64 } from "@smithy/core/serde";
+import { fromBase64, LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
 import { UnionSerde } from "../../UnionSerde";
 import { detectBufferParsing } from "../detectBufferParsing";
@@ -9,7 +8,7 @@ import { jsonReviver } from "../jsonReviver";
 import { needsReviver } from "../needsReviver";
 import { parseJsonBody } from "../parseJsonBody";
 import { writeKey } from "../../writeKey";
-export class BufferJsonShapeDeserializer extends SerdeContextConfig {
+export class JsonShapeDeserializer2 extends SerdeContextConfig {
     settings;
     constructor(settings) {
         super();
@@ -19,14 +18,20 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
         const reviver = needsReviver(schema) ? jsonReviver : undefined;
         let parsed;
         if (typeof data === "string") {
+            if (data.length === 0) {
+                return {};
+            }
             parsed = JSON.parse(data, reviver);
         }
         else if (data instanceof Uint8Array && detectBufferParsing()) {
+            if (data.byteLength === 0) {
+                return {};
+            }
             const buf = Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
             parsed = JSON.parse(buf, reviver);
         }
         else {
-            parsed = await parseJsonBody(data, this.serdeContext);
+            parsed = await parseJsonBody(data, this.serdeContext, schema);
         }
         return this._read(schema, parsed);
     }
@@ -42,19 +47,23 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
             }
             if (Array.isArray(value) && ns.isListSchema()) {
                 const listMember = ns.getValueSchema();
-                for (let i = 0; i < value.length; ++i) {
-                    value[i] = this._read(listMember, value[i]);
+                if (this.needsTransform(listMember)) {
+                    for (let i = 0; i < value.length; ++i) {
+                        value[i] = this._read(listMember, value[i]);
+                    }
                 }
                 return value;
             }
             if (ns.isMapSchema()) {
                 const mapMember = ns.getValueSchema();
                 const map = value;
-                for (const k in map) {
-                    if (k === "__proto__") {
-                        writeKey(map);
+                if (this.needsTransform(mapMember)) {
+                    for (const k in map) {
+                        if (k === "__proto__") {
+                            writeKey(map);
+                        }
+                        map[k] = this._read(mapMember, map[k]);
                     }
-                    map[k] = this._read(mapMember, map[k]);
                 }
                 return map;
             }
@@ -130,10 +139,6 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
                         }
                     }
                 }
-                return value;
-            }
-            else {
-                return value;
             }
         }
         return value;
@@ -141,9 +146,10 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
     _readStruct(ns, record) {
         const union = ns.isUnionSchema();
         const out = {};
-        let nameMap = void 0;
+        let nameMap;
+        const hasType = typeof record.__type === "string";
         const { jsonName } = this.settings;
-        if (jsonName) {
+        if (jsonName && hasType) {
             nameMap = {};
         }
         let unionSerde;
@@ -154,7 +160,9 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
             let fromKey = memberName;
             if (jsonName) {
                 fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
-                nameMap[fromKey] = memberName;
+                if (hasType) {
+                    nameMap[fromKey] = memberName;
+                }
             }
             if (union) {
                 unionSerde.mark(fromKey);
@@ -166,7 +174,7 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
         if (union) {
             unionSerde.writeUnknown();
         }
-        else if (typeof record.__type === "string") {
+        else if (hasType) {
             for (const k in record) {
                 const v = record[k];
                 const t = jsonName ? (nameMap[k] ?? k) : k;
@@ -177,4 +185,16 @@ export class BufferJsonShapeDeserializer extends SerdeContextConfig {
         }
         return out;
     }
+    needsTransform(ns) {
+        if (ns.isBlobSchema() || ns.isTimestampSchema() || ns.isBigIntegerSchema() || ns.isBigDecimalSchema()) {
+            return true;
+        }
+        if (ns.isDocumentSchema() || ns.isStructSchema() || ns.isListSchema() || ns.isMapSchema()) {
+            return true;
+        }
+        if (ns.isStringSchema() && ns.getMergedTraits().mediaType) {
+            return true;
+        }
+        return false;
+    }
 }