@superblocksteam/sdk-api 2.0.165-next.0 → 2.0.166-next.0

package/dist/integrations/base/request-body.test.js

@@ -0,0 +1,466 @@
+import { describe, expect, it, vi } from "vitest";
+import { RestApiValidationError } from "../../errors.js";
+import { encodeRequestBody } from "./request-body.js";
+const PNG_BYTES = [137, 80, 78, 71];
+const PNG_BASE64 = Buffer.from(PNG_BYTES).toString("base64");
+function arrayBufferFrom(bytes) {
+    const buffer = new ArrayBuffer(bytes.length);
+    new Uint8Array(buffer).set(bytes);
+    return buffer;
+}
+describe("encodeRequestBody", () => {
+    it("preserves default and explicit JSON wire behavior", () => {
+        expect(encodeRequestBody({ body: undefined })).toEqual({ wire: {} });
+        expect(encodeRequestBody({ body: undefined, bodyType: "json" })).toEqual({
+            wire: {},
+        });
+        expect(encodeRequestBody({ body: { amount: 42 } })).toEqual({
+            wire: { body: JSON.stringify({ amount: 42 }), bodyType: "jsonBody" },
+        });
+        expect(encodeRequestBody({ body: { amount: 42 }, bodyType: "json" })).toEqual({
+            wire: { body: JSON.stringify({ amount: 42 }), bodyType: "jsonBody" },
+        });
+        expect(encodeRequestBody({ body: "plain text" })).toEqual({
+            wire: { body: '"plain text"', bodyType: "jsonBody" },
+        });
+        expect(encodeRequestBody({ body: null })).toEqual({
+            wire: { body: "null", bodyType: "jsonBody" },
+        });
+    });
+    it("rejects invalid JSON and bodyType inputs", () => {
+        expect(() => encodeRequestBody({ body: Uint8Array.from(PNG_BYTES) })).toThrow(/bodyType: "binary"/);
+        const circular = {};
+        circular.self = circular;
+        expect(() => encodeRequestBody({ body: circular })).toThrow(/the body contains a circular reference/);
+        expect(() => encodeRequestBody({ body: 1n })).toThrow(/not JSON-serializable/);
+        for (const body of [() => undefined, Symbol("token")]) {
+            expect(() => encodeRequestBody({ body })).toThrow(RestApiValidationError);
+            expect(() => encodeRequestBody({ body })).toThrow(/cannot serialize a/);
+        }
+        for (const bodyType of [
+            "jsonBody",
+            "rawBody",
+            "formData",
+            "fileForm",
+            "binaryBody",
+            "formDataBase64",
+        ]) {
+            expect(() => encodeRequestBody({ body: {}, bodyType })).toThrow(new RegExp(`Unsupported bodyType ${JSON.stringify(bodyType)}`));
+        }
+        // Only an omitted bodyType defaults to "json"; an explicit null is an
+        // invalid value like any other, not a synonym for omission.
+        expect(() => encodeRequestBody({ body: {}, bodyType: null })).toThrow(/Unsupported bodyType null/);
+    });
+    it("classifies a circular body under both V8's and QuickJS's JSON.stringify wording", () => {
+        // Node/V8 throws "Converting circular structure to JSON"; the QuickJS
+        // sandbox sdk-api actually runs in throws "circular reference"
+        // (workers/javascript/packages/quickjs-emscripten vendored quickjs.c).
+        // Both must classify as the same bounded message.
+        for (const message of [
+            "Converting circular structure to JSON",
+            "circular reference",
+        ]) {
+            const stringifySpy = vi
+                .spyOn(JSON, "stringify")
+                .mockImplementationOnce(() => {
+                throw new TypeError(message);
+            });
+            expect(() => encodeRequestBody({ body: {} })).toThrow(/the body contains a circular reference/);
+            stringifySpy.mockRestore();
+        }
+    });
+    it("rejects binary nested inside a JSON body (APPS-2739)", () => {
+        expect(() => encodeRequestBody({
+            body: { attributes: "{}", file: Uint8Array.from(PNG_BYTES) },
+        })).toThrow(/contains binary data at "file"; send file parts with bodyType: "multipartForm"/);
+        expect(() => encodeRequestBody({
+            body: {
+                attachments: [{ name: "a" }, { bytes: arrayBufferFrom(PNG_BYTES) }],
+            },
+        })).toThrow(/contains binary data at "attachments\.1\.bytes"/);
+    });
+    it("rejects binary nested inside a Map or Set value in a JSON body", () => {
+        expect(() => encodeRequestBody({
+            body: { file: new Map([["bytes", Uint8Array.from(PNG_BYTES)]]) },
+        })).toThrow(/contains binary data/);
+        expect(() => encodeRequestBody({
+            body: { file: new Set([Uint8Array.from(PNG_BYTES)]) },
+        })).toThrow(/contains binary data/);
+    });
+    it("fails closed instead of silently serializing binary past the scan depth cap", () => {
+        let body = Uint8Array.from(PNG_BYTES);
+        for (let depth = 0; depth < 105; depth++) {
+            body = { child: body };
+        }
+        expect(() => encodeRequestBody({ body })).toThrow(/contains binary data/);
+    });
+    it("bounds the message when a nested getter throws during JSON serialization", () => {
+        const throwingGetter = {
+            get secret() {
+                throw new Error("getter boom");
+            },
+        };
+        expect(() => encodeRequestBody({ body: throwingGetter })).toThrow(/not JSON-serializable: a nested value's toJSON, toString, or getter threw/);
+        let message = "";
+        try {
+            encodeRequestBody({ body: throwingGetter });
+        }
+        catch (error) {
+            message = error instanceof Error ? error.message : "";
+        }
+        expect(message).not.toContain("getter boom");
+    });
+    it("keeps caller keys in validation messages bounded and escaped", () => {
+        const longKey = "k".repeat(500);
+        const surrogateKey = "bad\uD800key";
+        const cases = [
+            {
+                body: { [longKey]: { nested: true } },
+                bodyType: "formUrlencoded",
+                expected: /is nested/,
+            },
+            {
+                body: { [surrogateKey]: "v" },
+                bodyType: "formUrlencoded",
+                expected: /lone surrogate/,
+            },
+            {
+                body: { [longKey]: Uint8Array.from(PNG_BYTES) },
+                bodyType: "multipartForm",
+                expected: /wrapped as/,
+            },
+            {
+                body: { [surrogateKey]: { value: "x", filename: "f", [longKey]: 1 } },
+                bodyType: "multipartForm",
+                expected: /unexpected key/,
+            },
+        ];
+        for (const { body, bodyType, expected } of cases) {
+            let message = "";
+            try {
+                encodeRequestBody({ body, bodyType });
+            }
+            catch (error) {
+                expect(error).toBeInstanceOf(RestApiValidationError);
+                message = error instanceof Error ? error.message : "";
+            }
+            expect(message).toMatch(expected);
+            expect(message).not.toContain("k".repeat(65));
+            expect(message).not.toContain("\uD800");
+            expect(message.length).toBeLessThan(400);
+        }
+    });
+    it("keeps unsupported bodyType messages bounded and free of caller data", () => {
+        expect(() => encodeRequestBody({ body: {}, bodyType: "x".repeat(500) })).toThrow(`"${"x".repeat(64)}..."`);
+        for (const bodyType of [
+            new Uint8Array(50_000),
+            { secret: "s".repeat(1000) },
+        ]) {
+            let caught;
+            try {
+                encodeRequestBody({ body: {}, bodyType });
+            }
+            catch (error) {
+                caught = error;
+            }
+            if (!(caught instanceof RestApiValidationError))
+                throw caught;
+            const message = caught.message;
+            expect(message).toMatch(/^Unsupported bodyType (binary data \(50000 bytes\)|object with keys \[secret\])/);
+            expect(message).not.toContain("s".repeat(10));
+            expect(message.length).toBeLessThan(200);
+            // The mismatch branch must not bypass the module's bounded-error
+            // convention: details.data stays undefined and details.zodError
+            // carries only the already-bounded message, never the raw caller value.
+            expect(caught.details.data).toBeUndefined();
+            const detailMessage = caught.details.zodError.issues[0].message;
+            expect(detailMessage).toBe(message);
+            expect(JSON.stringify(caught.details)).not.toContain("s".repeat(10));
+        }
+    });
+    it("bounds caller keys embedded in the zod issue path, not just the message", () => {
+        const longKey = "k".repeat(500);
+        let caught;
+        try {
+            encodeRequestBody({
+                body: { [longKey]: { nested: true } },
+                bodyType: "formUrlencoded",
+            });
+        }
+        catch (error) {
+            caught = error;
+        }
+        if (!(caught instanceof RestApiValidationError))
+            throw caught;
+        const path = caught.details.zodError.issues[0].path;
+        expect(JSON.stringify(path)).not.toContain("k".repeat(65));
+        expect(path).toEqual(["body", `${"k".repeat(64)}...`]);
+    });
+    it("bounds long keys inside describeOptionValue's object description", () => {
+        const longKey = "k".repeat(10_000);
+        let message = "";
+        try {
+            encodeRequestBody({ body: {}, bodyType: { [longKey]: 1 } });
+        }
+        catch (error) {
+            expect(error).toBeInstanceOf(RestApiValidationError);
+            message = error instanceof Error ? error.message : "";
+        }
+        expect(message).toMatch(/^Unsupported bodyType object with keys/);
+        expect(message).not.toContain("k".repeat(65));
+        expect(message.length).toBeLessThan(200);
+    });
+    it("bounds the unexpected-keys list in multipart file-part errors", () => {
+        const extraKeys = Object.fromEntries(Array.from({ length: 50 }, (_, i) => [`extra${i}`, i]));
+        let message = "";
+        try {
+            encodeRequestBody({
+                body: { file: { value: "hello", filename: "f.txt", ...extraKeys } },
+                bodyType: "multipartForm",
+            });
+        }
+        catch (error) {
+            expect(error).toBeInstanceOf(RestApiValidationError);
+            message = error instanceof Error ? error.message : "";
+        }
+        expect(message).toMatch(/unexpected keys/);
+        expect(message).toContain(", ...");
+        expect(message.length).toBeLessThan(400);
+    });
+    it("passes raw non-empty string bodies through unchanged", () => {
+        expect(encodeRequestBody({ body: "<note>hello</note>", bodyType: "raw" })).toEqual({
+            wire: { body: "<note>hello</note>", bodyType: "rawBody" },
+        });
+        expect(() => encodeRequestBody({ body: "", bodyType: "raw" })).toThrow(RestApiValidationError);
+        expect(() => encodeRequestBody({ body: { value: "hello" }, bodyType: "raw" })).toThrow(RestApiValidationError);
+    });
+    it("encodes form-urlencoded bodies and injects Content-Type only when absent", () => {
+        expect(encodeRequestBody({
+            body: {
+                amount: 2000,
+                currency: "usd",
+                empty: [],
+                enabled: true,
+                optional: undefined,
+                "metadata[order_id]": "6735",
+                tag: ["vip", "repeat"],
+            },
+            bodyType: "formUrlencoded",
+        })).toEqual({
+            wire: {
+                body: "amount=2000&currency=usd&enabled=true&metadata%5Border_id%5D=6735&tag=vip&tag=repeat",
+                bodyType: "rawBody",
+            },
+            contentType: "application/x-www-form-urlencoded",
+        });
+        expect(encodeRequestBody({
+            body: { amount: 2000 },
+            bodyType: "formUrlencoded",
+            headers: { "content-type": "application/custom-form" },
+        })).toEqual({
+            wire: { body: "amount=2000", bodyType: "rawBody" },
+        });
+    });
+    it("drops undefined items from form-urlencoded array values, matching multipart semantics", () => {
+        expect(encodeRequestBody({
+            body: { tags: ["a", undefined, "b"] },
+            bodyType: "formUrlencoded",
+        }).wire.body).toBe("tags=a&tags=b");
+        // An array of only undefined items leaves no pairs, same as an empty array.
+        expect(() => encodeRequestBody({
+            body: { tags: [undefined, undefined] },
+            bodyType: "formUrlencoded",
+        })).toThrow(/must encode at least one field/);
+    });
+    it("percent-encodes form-urlencoded keys and values with + for spaces", () => {
+        expect(encodeRequestBody({
+            body: {
+                "odd key": "a+b=c&d",
+                scope: "read:orders write:orders",
+                unicode: "caf\u00e9 \u{1F600}",
+            },
+            bodyType: "formUrlencoded",
+        }).wire.body).toBe("odd+key=a%2Bb%3Dc%26d&scope=read%3Aorders+write%3Aorders&unicode=caf%C3%A9+%F0%9F%98%80");
+    });
+    it("percent-encodes characters encodeURIComponent leaves literal but URLSearchParams escapes", () => {
+        expect(encodeRequestBody({
+            body: { "a!b'c(d)e~f*g": "h!i'j(k)l~m*n" },
+            bodyType: "formUrlencoded",
+        }).wire.body).toBe("a%21b%27c%28d%29e%7Ef*g=h%21i%27j%28k%29l%7Em*n");
+    });
+    it("rejects invalid form-urlencoded bodies", () => {
+        const invalidBodies = [
+            undefined,
+            [],
+            { "": "missing" },
+            { amount: Number.NaN },
+            { metadata: { orderId: "6735" } },
+            { empty: [] },
+            { message: "truncated mid-emoji \uD83D" },
+            { "\uDC00": "lone low surrogate key" },
+        ];
+        for (const body of invalidBodies) {
+            expect(() => encodeRequestBody({ body, bodyType: "formUrlencoded" })).toThrow(RestApiValidationError);
+        }
+        expect(() => encodeRequestBody({
+            body: { metadata: { orderId: "6735" } },
+            bodyType: "formUrlencoded",
+        })).toThrow(/metadata\[order_id\]/);
+        expect(() => encodeRequestBody({
+            body: { message: "truncated mid-emoji \uD83D" },
+            bodyType: "formUrlencoded",
+        })).toThrow(/field "message" contains a lone surrogate/);
+    });
+    it.each([
+        ["Uint8Array", Uint8Array.from(PNG_BYTES)],
+        ["ArrayBuffer", arrayBufferFrom(PNG_BYTES)],
+        ["DataView", new DataView(arrayBufferFrom([0, ...PNG_BYTES, 1]), 1, 4)],
+        ["subarray view", Uint8Array.from([0, ...PNG_BYTES, 1]).subarray(1, 5)],
+        ["Buffer", Buffer.from(PNG_BYTES)],
+    ])("base64-encodes exact bytes from %s", (_name, body) => {
+        expect(encodeRequestBody({ body, bodyType: "binary" })).toEqual({
+            wire: { body: PNG_BASE64, bodyType: "binaryBody" },
+            contentType: "application/octet-stream",
+        });
+    });
+    it("rejects invalid binary bodies and preserves caller Content-Type", () => {
+        expect(encodeRequestBody({
+            body: Uint8Array.from(PNG_BYTES),
+            bodyType: "binary",
+            headers: { "CONTENT-TYPE": "image/png" },
+        })).toEqual({
+            wire: { body: PNG_BASE64, bodyType: "binaryBody" },
+        });
+        for (const body of [new ArrayBuffer(0), "not bytes"]) {
+            expect(() => encodeRequestBody({ body, bodyType: "binary" })).toThrow(RestApiValidationError);
+        }
+    });
+    it("encodes multipart parts as formDataBase64 with base64 file parts", () => {
+        const primitives = encodeRequestBody({
+            body: { active: true, amount: 42, note: "hello" },
+            bodyType: "multipartForm",
+        });
+        expect(primitives).toEqual({
+            wire: {
+                bodyType: "formDataBase64",
+                formData: [
+                    { key: "active", value: "true" },
+                    { key: "amount", value: "42" },
+                    { key: "note", value: "hello" },
+                ],
+            },
+        });
+        expect(primitives.wire).not.toHaveProperty("body");
+        expect(encodeRequestBody({
+            body: {
+                empty: { value: "", filename: "empty.txt" },
+                file: {
+                    value: "hello",
+                    filename: "hello.txt",
+                    contentType: undefined,
+                },
+            },
+            bodyType: "multipartForm",
+        })).toEqual({
+            wire: {
+                bodyType: "formDataBase64",
+                formData: [
+                    { key: "empty", value: "", file: { filename: "empty.txt" } },
+                    {
+                        key: "file",
+                        value: Buffer.from("hello", "utf8").toString("base64"),
+                        file: { filename: "hello.txt" },
+                    },
+                ],
+            },
+        });
+        expect(encodeRequestBody({
+            body: {
+                image: { value: Uint8Array.from(PNG_BYTES), filename: "b.png" },
+                note: "mixed",
+                textFile: { value: "cafe \u00e9", filename: "note.txt" },
+            },
+            bodyType: "multipartForm",
+        })).toEqual({
+            wire: {
+                bodyType: "formDataBase64",
+                formData: [
+                    { key: "image", value: PNG_BASE64, file: { filename: "b.png" } },
+                    { key: "note", value: "mixed" },
+                    {
+                        key: "textFile",
+                        value: Buffer.from("cafe \u00e9", "utf8").toString("base64"),
+                        file: { filename: "note.txt" },
+                    },
+                ],
+            },
+        });
+    });
+    it("repeats the key for multipart array values", () => {
+        expect(encodeRequestBody({
+            body: {
+                files: [
+                    { value: Uint8Array.from(PNG_BYTES), filename: "a.png" },
+                    undefined,
+                    { value: "hello", filename: "b.txt" },
+                ],
+                tags: ["x", 2],
+            },
+            bodyType: "multipartForm",
+        })).toEqual({
+            wire: {
+                bodyType: "formDataBase64",
+                formData: [
+                    { key: "files", value: PNG_BASE64, file: { filename: "a.png" } },
+                    {
+                        key: "files",
+                        value: Buffer.from("hello", "utf8").toString("base64"),
+                        file: { filename: "b.txt" },
+                    },
+                    { key: "tags", value: "x" },
+                    { key: "tags", value: "2" },
+                ],
+            },
+        });
+        expect(() => encodeRequestBody({ body: { files: [] }, bodyType: "multipartForm" })).toThrow(/at least one field/);
+    });
+    it("rejects malformed multipart bodies", () => {
+        expect(() => encodeRequestBody({
+            body: { file: "hello" },
+            bodyType: "multipartForm",
+            headers: { "Content-Type": "multipart/form-data" },
+        })).toThrow(/boundary/);
+        const invalidBodies = [
+            {},
+            { "": "missing" },
+            { n: Number.NaN },
+            { file: Uint8Array.from(PNG_BYTES) },
+            {
+                file: {
+                    contentType: "image/png",
+                    filename: "b.png",
+                    value: Uint8Array.from(PNG_BYTES),
+                },
+            },
+            { file: { value: "hello", filename: "" } },
+        ];
+        for (const body of invalidBodies) {
+            expect(() => encodeRequestBody({ body, bodyType: "multipartForm" })).toThrow(RestApiValidationError);
+        }
+        expect(() => encodeRequestBody({
+            body: { file: { value: "contents" } },
+            bodyType: "multipartForm",
+        })).toThrow(/missing required key: filename/);
+        expect(() => encodeRequestBody({
+            body: {
+                file: {
+                    value: "contents",
+                    filename: "contents.txt",
+                    contentType: "text/plain",
+                },
+            },
+            bodyType: "multipartForm",
+        })).toThrow(/unexpected key: "contentType"/);
+    });
+});
+//# sourceMappingURL=request-body.test.js.map

package/dist/integrations/base/request-body.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-body.test.js","sourceRoot":"","sources":["../../../src/integrations/base/request-body.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACpC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAE7D,SAAS,eAAe,CAAC,KAAwB;IAC/C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACvE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QACH,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAC1D,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE;SACrE,CAAC,CAAC;QACH,MAAM,CACJ,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAC9D,CAAC,OAAO,CAAC;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE;SACrE,CAAC,CAAC;QACH,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACxD,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE;SACrD,CAAC,CAAC;QACH,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAChD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE;SAC7C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CACxD,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAChC,MAAM,QAAQ,GAA4B,EAAE,CAAC;QAC7C,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;QACzB,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CACzD,wCAAwC,CACzC,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CACnD,uBAAuB,CACxB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACtD,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;YAC1E,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC1E,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI;YACrB,UAAU;YACV,SAAS;YACT,UAAU;YACV,UAAU;YACV,YAAY;YACZ,gBAAgB;SACjB,EAAE,CAAC;YACF,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAC7D,IAAI,MAAM,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAC/D,CAAC;QACJ,CAAC;QACD,sEAAsE;QACtE,4DAA4D;QAC5D,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CACnE,2BAA2B,CAC5B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;QACzF,sEAAsE;QACtE,+DAA+D;QAC/D,uEAAuE;QACvE,kDAAkD;QAClD,KAAK,MAAM,OAAO,IAAI;YACpB,uCAAuC;YACvC,oBAAoB;SACrB,EAAE,CAAC;YACF,MAAM,YAAY,GAAG,EAAE;iBACpB,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC;iBACxB,sBAAsB,CAAC,GAAG,EAAE;gBAC3B,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YACL,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CACnD,wCAAwC,CACzC,CAAC;YACF,YAAY,CAAC,WAAW,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;SAC7D,CAAC,CACH,CAAC,OAAO,CACP,gFAAgF,CACjF,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;aACpE;SACF,CAAC,CACH,CAAC,OAAO,CAAC,iDAAiD,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;SACjE,CAAC,CACH,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;SACtD,CAAC,CACH,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,IAAI,IAAI,GAAY,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;YACzC,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACzB,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,MAAM,cAAc,GAAG;YACrB,IAAI,MAAM;gBACR,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;YACjC,CAAC;SACF,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,OAAO,CAC/D,2EAA2E,CAC5E,CAAC;QACF,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,iBAAiB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,cAAc,CAAC;QACpC,MAAM,KAAK,GAIL;YACJ;gBACE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;gBACrC,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE,WAAW;aACtB;YACD;gBACE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE;gBAC7B,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE,gBAAgB;aAC3B;YACD;gBACE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;gBAC/C,QAAQ,EAAE,eAAe;gBACzB,QAAQ,EAAE,YAAY;aACvB;YACD;gBACE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE;gBACrE,QAAQ,EAAE,eAAe;gBACzB,QAAQ,EAAE,gBAAgB;aAC3B;SACF,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAK,EAAE,CAAC;YACjD,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,CAAC;gBACH,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;gBACrD,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAClC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAC3D,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,MAAM,QAAQ,IAAI;YACrB,IAAI,UAAU,CAAC,MAAM,CAAC;YACtB,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;SAC7B,EAAE,CAAC;YACF,IAAI,MAAe,CAAC;YACpB,IAAI,CAAC;gBACH,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,KAAK,CAAC;YACjB,CAAC;YACD,IAAI,CAAC,CAAC,MAAM,YAAY,sBAAsB,CAAC;gBAAE,MAAM,MAAM,CAAC;YAC9D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CACrB,iFAAiF,CAClF,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACzC,iEAAiE;YACjE,gEAAgE;YAChE,wEAAwE;YACxE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAChE,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACvE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,iBAAiB,CAAC;gBAChB,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;gBACrC,QAAQ,EAAE,gBAAgB;aAC3B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,YAAY,sBAAsB,CAAC;YAAE,MAAM,MAAM,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;YACrD,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QAClE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAClC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CACvD,CAAC;QACF,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,iBAAiB,CAAC;gBAChB,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,EAAE;gBACnE,QAAQ,EAAE,eAAe;aAC1B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;YACrD,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,CACJ,iBAAiB,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CACnE,CAAC,OAAO,CAAC;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,SAAS,EAAE;SAC1D,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CACpE,sBAAsB,CACvB,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CACjE,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,EAAE;gBACT,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,SAAS;gBACnB,oBAAoB,EAAE,MAAM;gBAC5B,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;aACvB;YACD,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE;gBACJ,IAAI,EAAE,sFAAsF;gBAC5F,QAAQ,EAAE,SAAS;aACpB;YACD,WAAW,EAAE,mCAAmC;SACjD,CAAC,CAAC;QACH,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACtB,QAAQ,EAAE,gBAAgB;YAC1B,OAAO,EAAE,EAAE,cAAc,EAAE,yBAAyB,EAAE;SACvD,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE;SACnD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uFAAuF,EAAE,GAAG,EAAE;QAC/F,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE;YACrC,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CACb,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACxB,4EAA4E;QAC5E,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE;YACtC,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CACH,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,0BAA0B;gBACjC,OAAO,EAAE,qBAAqB;aAC/B;YACD,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CACb,CAAC,IAAI,CACJ,yFAAyF,CAC1F,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0FAA0F,EAAE,GAAG,EAAE;QAClG,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE;YAC1C,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CACb,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,aAAa,GAAG;YACpB,SAAS;YACT,EAAE;YACF,EAAE,EAAE,EAAE,SAAS,EAAE;YACjB,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE;YACtB,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACjC,EAAE,KAAK,EAAE,EAAE,EAAE;YACb,EAAE,OAAO,EAAE,4BAA4B,EAAE;YACzC,EAAE,QAAQ,EAAE,wBAAwB,EAAE;SACvC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CACxD,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACvC,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CACH,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE;YAC/C,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CACH,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,UAAU,EAAE,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvE,CAAC,eAAe,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvE,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACnC,CAAC,CAAC,oCAAoC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvD,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9D,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE;YAClD,WAAW,EAAE,0BAA0B;SACxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE;SACzC,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE;SACnD,CAAC,CAAC;QACH,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CACnE,sBAAsB,CACvB,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,UAAU,GAAG,iBAAiB,CAAC;YACnC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;YACjD,QAAQ,EAAE,eAAe;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE;gBACJ,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE;oBACR,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE;oBAChC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;oBAC9B,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE;iBAChC;aACF;SACF,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;gBAC3C,IAAI,EAAE;oBACJ,KAAK,EAAE,OAAO;oBACd,QAAQ,EAAE,WAAW;oBACrB,WAAW,EAAE,SAAS;iBACvB;aACF;YACD,QAAQ,EAAE,eAAe;SAC1B,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE;oBACR,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE;oBAC5D;wBACE,GAAG,EAAE,MAAM;wBACX,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBACtD,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;qBAChC;iBACF;aACF;SACF,CAAC,CAAC;QACH,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;gBAC/D,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE;aACzD;YACD,QAAQ,EAAE,eAAe;SAC1B,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE;oBACR,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;oBAChE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE;oBAC/B;wBACE,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBAC5D,IAAI,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;qBAC/B;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CACJ,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;oBACxD,SAAS;oBACT,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE;iBACtC;gBACD,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aACf;YACD,QAAQ,EAAE,eAAe;SAC1B,CAAC,CACH,CAAC,OAAO,CAAC;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE;oBACR,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;oBAChE;wBACE,GAAG,EAAE,OAAO;wBACZ,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBACtD,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE;qBAC5B;oBACD,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE;oBAC3B,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE;iBAC5B;aACF;SACF,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CACtE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;YACvB,QAAQ,EAAE,eAAe;YACzB,OAAO,EAAE,EAAE,cAAc,EAAE,qBAAqB,EAAE;SACnD,CAAC,CACH,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtB,MAAM,aAAa,GAAG;YACpB,EAAE;YACF,EAAE,EAAE,EAAE,SAAS,EAAE;YACjB,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE;YACjB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACpC;gBACE,IAAI,EAAE;oBACJ,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAE,OAAO;oBACjB,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;iBAClC;aACF;YACD,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;SAC3C,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CACvD,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YACrC,QAAQ,EAAE,eAAe;SAC1B,CAAC,CACH,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,EAAE,CACV,iBAAiB,CAAC;YAChB,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,KAAK,EAAE,UAAU;oBACjB,QAAQ,EAAE,cAAc;oBACxB,WAAW,EAAE,YAAY;iBAC1B;aACF;YACD,QAAQ,EAAE,eAAe;SAC1B,CAAC,CACH,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/integrations/base/rest-api-client-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rest-api-client-base.d.ts","sourceRoot":"","sources":["../../../src/integrations/base/rest-api-client-base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qDAAqD,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,IAAI,wBAAwB,EAAE,MAAM,yEAAyE,CAAC;AAGlI,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAG5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,wBAAwB,CAAC,CAAC;AAEtE,8BAAsB,iBAAkB,YAAW,qBAAqB;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;gBAEnC,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa;IAOlE;;OAEG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC;cAO5D,iBAAiB,CAAC,KAAK,EACrC,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,EACjC,UAAU,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,EAC/B,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,OAAO,CAAC;CAsFpB"}
+{"version":3,"file":"rest-api-client-base.d.ts","sourceRoot":"","sources":["../../../src/integrations/base/rest-api-client-base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qDAAqD,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,IAAI,wBAAwB,EAAE,MAAM,yEAAyE,CAAC;AAMlI,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAK5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,wBAAwB,CAAC,CAAC;AAEtE,8BAAsB,iBAAkB,YAAW,qBAAqB;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;gBAEnC,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa;IAOlE;;OAEG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC;cAO5D,iBAAiB,CAAC,KAAK,EACrC,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,EACjC,UAAU,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,EAC/B,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,OAAO,CAAC;CAsFpB"}

package/dist/integrations/base/rest-api-client-base.js

@@ -1,6 +1,8 @@
 import { z } from "zod";
-import { RestApiValidationError } from "../../errors.js";
+import { RestApiValidationError, restApiValidationErrorFromZodError, } from "../../errors.js";
+import { describeOptionValue, validationError } from "../utils.js";
 import { decodeWorkerBinaryResponse } from "./decode-worker-binary-response.js";
+import { encodeRequestBody } from "./request-body.js";
 import { REST_API_RESPONSE_TYPES } from "./types.js";
 export class RestApiClientBase {
     name;
@@ -26,10 +28,7 @@ export class RestApiClientBase {
         if (options.body !== undefined && bodySchema) {
             const bodyParseResult = bodySchema.safeParse(options.body);
             if (!bodyParseResult.success) {
-                throw new RestApiValidationError(`Request body validation failed: ${bodyParseResult.error.message}`, {
-                    zodError: bodyParseResult.error,
-                    data: options.body,
-                });
+                throw restApiValidationErrorFromZodError("Request body validation failed", bodyParseResult.error, options.body);
             }
         }
         const headers = [];
@@ -48,12 +47,17 @@ export class RestApiClientBase {
             .enum(REST_API_RESPONSE_TYPES)
             .safeParse(options.responseType ?? "json");
         if (!responseTypeResult.success) {
-            throw new RestApiValidationError(`Unsupported responseType ${JSON.stringify(options.responseType)} - expected one of: ${REST_API_RESPONSE_TYPES.join(", ")}`, {
-                zodError: responseTypeResult.error,
-                data: options.responseType,
-            });
+            throw validationError(`Unsupported responseType ${describeOptionValue(options.responseType)} - expected one of: ${REST_API_RESPONSE_TYPES.join(", ")}`, ["responseType"]);
         }
         const responseType = responseTypeResult.data;
+        const { wire: bodyWire, contentType } = encodeRequestBody({
+            body: options.body,
+            bodyType: options.bodyType,
+            headers: options.headers,
+        });
+        if (contentType !== undefined) {
+            headers.push(this.createParam("Content-Type", contentType));
+        }
         const request = {
             openApiAction: "genericHttpRequest",
             httpMethod: options.method.toUpperCase(),
@@ -61,12 +65,9 @@ export class RestApiClientBase {
             headers,
             params,
             responseType,
+            ...bodyWire,
         };
-        if (options.body !== undefined) {
-            request.body = JSON.stringify(options.body);
-            request.bodyType = "jsonBody";
-        }
-        const result = await this.executeQuery({ ...request }, undefined, metadata);
+        const result = await this.executeQuery(request, undefined, metadata);
         if (result === null || result === undefined) {
             throw new RestApiValidationError(`Integration query returned ${String(result)} for responseType "${responseType}" - expected a response value`, {
                 zodError: new z.ZodError([

package/dist/integrations/base/rest-api-client-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest-api-client-base.js","sourceRoot":"","sources":["../../../src/integrations/base/rest-api-client-base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rest-api-client-base.js","sourceRoot":"","sources":["../../../src/integrations/base/rest-api-client-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EACL,sBAAsB,EACtB,kCAAkC,GACnC,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAKrD,MAAM,OAAgB,iBAAiB;IAC5B,IAAI,CAAS;IACb,QAAQ,CAAS;IACjB,MAAM,CAAoB;IAEhB,YAAY,CAAgB;IAE/C,YAAY,MAAyB,EAAE,YAA2B;QAChE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED;;OAEG;IACO,WAAW,CAAC,GAAW,EAAE,KAAc;QAC/C,OAAO;YACL,GAAG;YACH,KAAK,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;SACjE,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC/B,OAAiC,EACjC,UAA+B,EAC/B,QAAwB;QAExB,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,EAAE,CAAC;YAC7C,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;gBAC7B,MAAM,kCAAkC,CACtC,gCAAgC,EAChC,eAAe,CAAC,KAAK,EACrB,OAAO,CAAC,IAAI,CACb,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAA+B,EAAE,CAAC;QAC/C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,MAAM,kBAAkB,GAAG,CAAC;aACzB,IAAI,CAAC,uBAAuB,CAAC;aAC7B,SAAS,CAAC,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,eAAe,CACnB,4BAA4B,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,uBAAuB,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAChI,CAAC,cAAc,CAAC,CACjB,CAAC;QACJ,CAAC;QACD,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC;QAE7C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,iBAAiB,CAAC;YACxD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC;QACH,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,OAAO,GAAmB;YAC9B,aAAa,EAAE,oBAAoB;YACnC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,OAAO;YACP,MAAM;YACN,YAAY;YACZ,GAAG,QAAQ;SACZ,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAErE,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5C,MAAM,IAAI,sBAAsB,CAC9B,8BAA8B,MAAM,CAAC,MAAM,CAAC,sBAAsB,YAAY,+BAA+B,EAC7G;gBACE,QAAQ,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC;oBACvB;wBACE,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;wBAC3B,OAAO,EAAE,4BAA4B;wBACrC,IAAI,EAAE,EAAE;qBACT;iBACF,CAAC;gBACF,IAAI,EAAE,MAAM;aACb,CACF,CAAC;QACJ,CAAC;QAED,QAAQ,YAAY,EAAE,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAC5C,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM;gBACT,OAAO,MAAM,CAAC;YAChB,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,WAAW,GAAU,YAAY,CAAC;gBACxC,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

package/dist/integrations/base/rest-api-integration-client.d.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import type { TraceMetadata } from "../registry.js";
 import { RestApiClientBase } from "./rest-api-client-base.js";
-import type { ApiRequestOptions, ApiRequestSchema, RestApiResponseType, SupportsApiRequest } from "./types.js";
+import type { ApiRequestOptions, ApiRequestSchema, BinaryApiRequestSchema, RestApiResponseType, SupportsApiRequest } from "./types.js";
 export declare abstract class RestApiIntegrationClient extends RestApiClientBase implements SupportsApiRequest {
     apiRequest<TBody, TResponse>(options: ApiRequestOptions<TBody> & {
         responseType?: Exclude<RestApiResponseType, "binary">;
@@ -10,7 +10,7 @@ export declare abstract class RestApiIntegrationClient extends RestApiClientBase
     }, metadata?: TraceMetadata): Promise<TResponse>;
     apiRequest<TBody>(options: ApiRequestOptions<TBody> & {
         responseType: "binary";
-    }, schema?: ApiRequestSchema<TBody, Uint8Array>, metadata?: TraceMetadata): Promise<Uint8Array>;
+    }, schema?: BinaryApiRequestSchema<TBody>, metadata?: TraceMetadata): Promise<Uint8Array>;
     apiRequest<TBody>(options: ApiRequestOptions<TBody> & {
         responseType: "text";
     }, schema?: ApiRequestSchema<TBody, unknown>, metadata?: TraceMetadata): Promise<unknown>;

package/dist/integrations/base/rest-api-integration-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rest-api-integration-client.d.ts","sourceRoot":"","sources":["../../../src/integrations/base/rest-api-integration-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,8BAAsB,wBACpB,SAAQ,iBACR,YAAW,kBAAkB;IAEvB,UAAU,CAAC,KAAK,EAAE,SAAS,EAC/B,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG;QAClC,YAAY,CAAC,EAAE,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;KACvD,EACD,MAAM,EAAE,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG;QAC3C,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;KAClC,EACD,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,SAAS,CAAC;IACf,UAAU,CAAC,KAAK,EACpB,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG;QAClC,YAAY,EAAE,QAAQ,CAAC;KACxB,EACD,MAAM,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,EAC5C,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,UAAU,CAAC;IAChB,UAAU,CAAC,KAAK,EACpB,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG;QAClC,YAAY,EAAE,MAAM,CAAC;KACtB,EACD,MAAM,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,EACzC,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,OAAO,CAAC;CA8CpB"}
+{"version":3,"file":"rest-api-integration-client.d.ts","sourceRoot":"","sources":["../../../src/integrations/base/rest-api-integration-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,8BAAsB,wBACpB,SAAQ,iBACR,YAAW,kBAAkB;IAEvB,UAAU,CAAC,KAAK,EAAE,SAAS,EAC/B,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG;QAClC,YAAY,CAAC,EAAE,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;KACvD,EACD,MAAM,EAAE,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG;QAC3C,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;KAClC,EACD,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,SAAS,CAAC;IACf,UAAU,CAAC,KAAK,EACpB,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG;QAClC,YAAY,EAAE,QAAQ,CAAC;KACxB,EACD,MAAM,CAAC,EAAE,sBAAsB,CAAC,KAAK,CAAC,EACtC,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,UAAU,CAAC;IAChB,UAAU,CAAC,KAAK,EACpB,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG;QAClC,YAAY,EAAE,MAAM,CAAC;KACtB,EACD,MAAM,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,EACzC,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,OAAO,CAAC;CA8CpB"}

package/dist/integrations/base/rest-api-integration-client.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { RestApiValidationError } from "../../errors.js";
+import { RestApiValidationError, restApiValidationErrorFromZodError, } from "../../errors.js";
 import { RestApiClientBase } from "./rest-api-client-base.js";
 export class RestApiIntegrationClient extends RestApiClientBase {
     async apiRequest(options, schema, metadata) {
@@ -16,15 +16,14 @@ export class RestApiIntegrationClient extends RestApiClientBase {
             });
         }
         const result = await this.executeApiRequest(options, schema?.body, metadata);
-        if (!schema?.response) {
+        // Binary bodies are validated while decoding. A caller's schema cannot
+        // check them: the sandbox's Uint8Array is not the SDK's constructor.
+        if (options.responseType === "binary" || !schema?.response) {
             return result;
         }
         const responseParseResult = schema.response.safeParse(result);
         if (!responseParseResult.success) {
-            throw new RestApiValidationError(`Response validation failed: ${responseParseResult.error.message}`, {
-                data: result,
-                zodError: responseParseResult.error,
-            });
+            throw restApiValidationErrorFromZodError("Response validation failed", responseParseResult.error, result);
         }
         return responseParseResult.data;
     }