@mergeapi/merge-node-client 2.1.0 → 2.1.1

package/dist/core/fetcher/getResponseBody.js

@@ -10,45 +10,47 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResponseBody = getResponseBody;
+const BinaryResponse_1 = require("./BinaryResponse");
+const ResponseWithBody_1 = require("./ResponseWithBody");
+const json_1 = require("../json");
 const chooseStreamWrapper_1 = require("./stream-wrappers/chooseStreamWrapper");
 function getResponseBody(response, responseType) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (response.body != null && responseType === "blob") {
-            return yield response.blob();
+        if (!(0, ResponseWithBody_1.isResponseWithBody)(response)) {
+            return undefined;
         }
-        else if (response.body != null && responseType === "arrayBuffer") {
-            return yield response.arrayBuffer();
+        switch (responseType) {
+            case "binary-response":
+                return (0, BinaryResponse_1.getBinaryResponse)(response);
+            case "blob":
+                return yield response.blob();
+            case "arrayBuffer":
+                return yield response.arrayBuffer();
+            case "sse":
+                return response.body;
+            case "streaming":
+                return (0, chooseStreamWrapper_1.chooseStreamWrapper)(response.body);
+            case "text":
+                return yield response.text();
         }
-        else if (response.body != null && responseType === "sse") {
-            return response.body;
-        }
-        else if (response.body != null && responseType === "streaming") {
-            return (0, chooseStreamWrapper_1.chooseStreamWrapper)(response.body);
-        }
-        else if (response.body != null && responseType === "text") {
-            return yield response.text();
-        }
-        else {
-            const text = yield response.text();
-            if (text.length > 0) {
-                try {
-                    let responseBody = JSON.parse(text);
-                    return responseBody;
-                }
-                catch (err) {
-                    return {
-                        ok: false,
-                        error: {
-                            reason: "non-json",
-                            statusCode: response.status,
-                            rawBody: text,
-                        },
-                    };
-                }
+        // if responseType is "json" or not specified, try to parse as JSON
+        const text = yield response.text();
+        if (text.length > 0) {
+            try {
+                let responseBody = (0, json_1.fromJson)(text);
+                return responseBody;
             }
-            else {
-                return undefined;
+            catch (err) {
+                return {
+                    ok: false,
+                    error: {
+                        reason: "non-json",
+                        statusCode: response.status,
+                        rawBody: text,
+                    },
+                };
             }
         }
+        return undefined;
     });
 }

package/dist/core/fetcher/index.d.ts

@@ -6,3 +6,4 @@ export { Supplier } from "./Supplier";
 export { abortRawResponse, toRawResponse, unknownRawResponse } from "./RawResponse";
 export type { RawResponse, WithRawResponse } from "./RawResponse";
 export { HttpResponsePromise } from "./HttpResponsePromise";
+export { BinaryResponse } from "./BinaryResponse";

package/dist/core/headers.d.ts

@@ -1,3 +1,3 @@
-import * as core from "./index.js";
+import * as core from "./index";
 export declare function mergeHeaders(...headersArray: (Record<string, string | core.Supplier<string | undefined> | undefined> | undefined)[]): Record<string, string | core.Supplier<string | undefined>>;
 export declare function mergeOnlyDefinedHeaders(...headersArray: (Record<string, string | core.Supplier<string | undefined> | undefined> | undefined)[]): Record<string, string | core.Supplier<string | undefined>>;

package/dist/core/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./fetcher";
 export * from "./runtime";
+export * as url from "./url";
 export * from "./auth";
+export * from "./base64";
 export * as serialization from "./schemas";

package/dist/core/index.js

@@ -36,8 +36,10 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serialization = void 0;
+exports.serialization = exports.url = void 0;
 __exportStar(require("./fetcher"), exports);
 __exportStar(require("./runtime"), exports);
+exports.url = __importStar(require("./url"));
 __exportStar(require("./auth"), exports);
+__exportStar(require("./base64"), exports);
 exports.serialization = __importStar(require("./schemas"));

package/dist/core/runtime/runtime.js

@@ -41,7 +41,6 @@ function evaluateRuntime() {
      * A constant that indicates whether the environment the code is running is a Web Worker.
      */
     const isWebWorker = typeof self === "object" &&
-        // @ts-ignore
         typeof (self === null || self === void 0 ? void 0 : self.importScripts) === "function" &&
         (((_b = self.constructor) === null || _b === void 0 ? void 0 : _b.name) === "DedicatedWorkerGlobalScope" ||
             ((_c = self.constructor) === null || _c === void 0 ? void 0 : _c.name) === "ServiceWorkerGlobalScope" ||

package/dist/core/schemas/utils/maybeSkipValidation.js

@@ -9,7 +9,7 @@ function transformAndMaybeSkipValidation(transform) {
         const transformed = transform(value, opts);
         const { skipValidation = false } = opts !== null && opts !== void 0 ? opts : {};
         if (!transformed.ok && skipValidation) {
-            // eslint-disable-next-line no-console
+            // biome-ignore lint/suspicious/noConsole: allow console
             console.warn([
                 "Failed to validate.",
                 ...transformed.errors.map((error) => "  - " +

package/dist/core/url/index.d.ts

@@ -0,0 +1,2 @@
+export { join } from "./join";
+export { toQueryString } from "./qs";

package/dist/core/url/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toQueryString = exports.join = void 0;
+var join_1 = require("./join");
+Object.defineProperty(exports, "join", { enumerable: true, get: function () { return join_1.join; } });
+var qs_1 = require("./qs");
+Object.defineProperty(exports, "toQueryString", { enumerable: true, get: function () { return qs_1.toQueryString; } });

package/dist/core/url/join.d.ts

@@ -0,0 +1 @@
+export declare function join(base: string, ...segments: string[]): string;

package/dist/core/url/join.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.join = join;
+function join(base, ...segments) {
+    if (!base) {
+        return "";
+    }
+    if (segments.length === 0) {
+        return base;
+    }
+    if (base.includes("://")) {
+        let url;
+        try {
+            url = new URL(base);
+        }
+        catch (_a) {
+            // Fallback to path joining if URL is malformed
+            return joinPath(base, ...segments);
+        }
+        const lastSegment = segments[segments.length - 1];
+        const shouldPreserveTrailingSlash = lastSegment && lastSegment.endsWith("/");
+        for (const segment of segments) {
+            const cleanSegment = trimSlashes(segment);
+            if (cleanSegment) {
+                url.pathname = joinPathSegments(url.pathname, cleanSegment);
+            }
+        }
+        if (shouldPreserveTrailingSlash && !url.pathname.endsWith("/")) {
+            url.pathname += "/";
+        }
+        return url.toString();
+    }
+    return joinPath(base, ...segments);
+}
+function joinPath(base, ...segments) {
+    if (segments.length === 0) {
+        return base;
+    }
+    let result = base;
+    const lastSegment = segments[segments.length - 1];
+    const shouldPreserveTrailingSlash = lastSegment && lastSegment.endsWith("/");
+    for (const segment of segments) {
+        const cleanSegment = trimSlashes(segment);
+        if (cleanSegment) {
+            result = joinPathSegments(result, cleanSegment);
+        }
+    }
+    if (shouldPreserveTrailingSlash && !result.endsWith("/")) {
+        result += "/";
+    }
+    return result;
+}
+function joinPathSegments(left, right) {
+    if (left.endsWith("/")) {
+        return left + right;
+    }
+    return left + "/" + right;
+}
+function trimSlashes(str) {
+    if (!str)
+        return str;
+    let start = 0;
+    let end = str.length;
+    if (str.startsWith("/"))
+        start = 1;
+    if (str.endsWith("/"))
+        end = str.length - 1;
+    return start === 0 && end === str.length ? str : str.slice(start, end);
+}

package/dist/core/url/qs.d.ts

@@ -0,0 +1,6 @@
+interface QueryStringOptions {
+    arrayFormat?: "indices" | "repeat";
+    encode?: boolean;
+}
+export declare function toQueryString(obj: unknown, options?: QueryStringOptions): string;
+export {};

package/dist/core/url/qs.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toQueryString = toQueryString;
+const defaultQsOptions = {
+    arrayFormat: "indices",
+    encode: true,
+};
+function encodeValue(value, shouldEncode) {
+    if (value === undefined) {
+        return "";
+    }
+    if (value === null) {
+        return "";
+    }
+    const stringValue = String(value);
+    return shouldEncode ? encodeURIComponent(stringValue) : stringValue;
+}
+function stringifyObject(obj, prefix = "", options) {
+    const parts = [];
+    for (const [key, value] of Object.entries(obj)) {
+        const fullKey = prefix ? `${prefix}[${key}]` : key;
+        if (value === undefined) {
+            continue;
+        }
+        if (Array.isArray(value)) {
+            if (value.length === 0) {
+                continue;
+            }
+            for (let i = 0; i < value.length; i++) {
+                const item = value[i];
+                if (item === undefined) {
+                    continue;
+                }
+                if (typeof item === "object" && !Array.isArray(item) && item !== null) {
+                    const arrayKey = options.arrayFormat === "indices" ? `${fullKey}[${i}]` : fullKey;
+                    parts.push(...stringifyObject(item, arrayKey, options));
+                }
+                else {
+                    const arrayKey = options.arrayFormat === "indices" ? `${fullKey}[${i}]` : fullKey;
+                    const encodedKey = options.encode ? encodeURIComponent(arrayKey) : arrayKey;
+                    parts.push(`${encodedKey}=${encodeValue(item, options.encode)}`);
+                }
+            }
+        }
+        else if (typeof value === "object" && value !== null) {
+            if (Object.keys(value).length === 0) {
+                continue;
+            }
+            parts.push(...stringifyObject(value, fullKey, options));
+        }
+        else {
+            const encodedKey = options.encode ? encodeURIComponent(fullKey) : fullKey;
+            parts.push(`${encodedKey}=${encodeValue(value, options.encode)}`);
+        }
+    }
+    return parts;
+}
+function toQueryString(obj, options) {
+    if (obj == null || typeof obj !== "object") {
+        return "";
+    }
+    const parts = stringifyObject(obj, "", Object.assign(Object.assign({}, defaultQsOptions), options));
+    return parts.join("&");
+}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * as Merge from "./api";
-export { MergeClient } from "./Client";
-export { MergeEnvironment } from "./environments";
 export { MergeError, MergeTimeoutError } from "./errors";
 export * as serialization from "./serialization";
+export { MergeClient } from "./Client";
+export { MergeEnvironment } from "./environments";

package/dist/index.js

@@ -33,13 +33,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serialization = exports.MergeTimeoutError = exports.MergeError = exports.MergeEnvironment = exports.MergeClient = exports.Merge = void 0;
+exports.MergeEnvironment = exports.MergeClient = exports.serialization = exports.MergeTimeoutError = exports.MergeError = exports.Merge = void 0;
 exports.Merge = __importStar(require("./api"));
-var Client_1 = require("./Client");
-Object.defineProperty(exports, "MergeClient", { enumerable: true, get: function () { return Client_1.MergeClient; } });
-var environments_1 = require("./environments");
-Object.defineProperty(exports, "MergeEnvironment", { enumerable: true, get: function () { return environments_1.MergeEnvironment; } });
 var errors_1 = require("./errors");
 Object.defineProperty(exports, "MergeError", { enumerable: true, get: function () { return errors_1.MergeError; } });
 Object.defineProperty(exports, "MergeTimeoutError", { enumerable: true, get: function () { return errors_1.MergeTimeoutError; } });
 exports.serialization = __importStar(require("./serialization"));
+var Client_1 = require("./Client");
+Object.defineProperty(exports, "MergeClient", { enumerable: true, get: function () { return Client_1.MergeClient; } });
+var environments_1 = require("./environments");
+Object.defineProperty(exports, "MergeEnvironment", { enumerable: true, get: function () { return environments_1.MergeEnvironment; } });

package/dist/serialization/resources/index.d.ts

@@ -1,6 +1,6 @@
+export * as crm from "./crm";
 export * as filestorage from "./filestorage";
+export * as ats from "./ats";
 export * as hris from "./hris";
 export * as ticketing from "./ticketing";
-export * as ats from "./ats";
-export * as crm from "./crm";
 export * as accounting from "./accounting";

package/dist/serialization/resources/index.js

@@ -33,10 +33,10 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.accounting = exports.crm = exports.ats = exports.ticketing = exports.hris = exports.filestorage = void 0;
+exports.accounting = exports.ticketing = exports.hris = exports.ats = exports.filestorage = exports.crm = void 0;
+exports.crm = __importStar(require("./crm"));
 exports.filestorage = __importStar(require("./filestorage"));
+exports.ats = __importStar(require("./ats"));
 exports.hris = __importStar(require("./hris"));
 exports.ticketing = __importStar(require("./ticketing"));
-exports.ats = __importStar(require("./ats"));
-exports.crm = __importStar(require("./crm"));
 exports.accounting = __importStar(require("./accounting"));

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.1.0";
+export declare const SDK_VERSION = "2.1.1";

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = "2.1.0";
+exports.SDK_VERSION = "2.1.1";

package/index.d.ts

@@ -1,5 +1,5 @@
 export * as Merge from "./api";
-export { MergeClient } from "./Client";
-export { MergeEnvironment } from "./environments";
 export { MergeError, MergeTimeoutError } from "./errors";
 export * as serialization from "./serialization";
+export { MergeClient } from "./Client";
+export { MergeEnvironment } from "./environments";

package/index.js

@@ -33,13 +33,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serialization = exports.MergeTimeoutError = exports.MergeError = exports.MergeEnvironment = exports.MergeClient = exports.Merge = void 0;
+exports.MergeEnvironment = exports.MergeClient = exports.serialization = exports.MergeTimeoutError = exports.MergeError = exports.Merge = void 0;
 exports.Merge = __importStar(require("./api"));
-var Client_1 = require("./Client");
-Object.defineProperty(exports, "MergeClient", { enumerable: true, get: function () { return Client_1.MergeClient; } });
-var environments_1 = require("./environments");
-Object.defineProperty(exports, "MergeEnvironment", { enumerable: true, get: function () { return environments_1.MergeEnvironment; } });
 var errors_1 = require("./errors");
 Object.defineProperty(exports, "MergeError", { enumerable: true, get: function () { return errors_1.MergeError; } });
 Object.defineProperty(exports, "MergeTimeoutError", { enumerable: true, get: function () { return errors_1.MergeTimeoutError; } });
 exports.serialization = __importStar(require("./serialization"));
+var Client_1 = require("./Client");
+Object.defineProperty(exports, "MergeClient", { enumerable: true, get: function () { return Client_1.MergeClient; } });
+var environments_1 = require("./environments");
+Object.defineProperty(exports, "MergeEnvironment", { enumerable: true, get: function () { return environments_1.MergeEnvironment; } });

package/jest.config.mjs

@@ -2,8 +2,41 @@
 export default {
     preset: "ts-jest",
     testEnvironment: "node",
-    moduleNameMapper: {
-        "(.+)\.js$": "$1",
-    },
-    setupFilesAfterEnv: ["<rootDir>/tests/mock-server/setup.ts"],
+    projects: [
+        {
+            displayName: "unit",
+            preset: "ts-jest",
+            testEnvironment: "node",
+            moduleNameMapper: {
+                "^(\.{1,2}/.*)\.js$": "$1",
+            },
+            roots: ["<rootDir>/tests"],
+            testPathIgnorePatterns: ["\.browser\.(spec|test)\.[jt]sx?$", "/tests/wire/"],
+            setupFilesAfterEnv: [],
+        },
+        {
+            displayName: "browser",
+            preset: "ts-jest",
+            testEnvironment: "<rootDir>/tests/BrowserTestEnvironment.ts",
+            moduleNameMapper: {
+                "^(\.{1,2}/.*)\.js$": "$1",
+            },
+            roots: ["<rootDir>/tests"],
+            testMatch: ["<rootDir>/tests/unit/**/?(*.)+(browser).(spec|test).[jt]s?(x)"],
+            setupFilesAfterEnv: [],
+        },
+        ,
+        {
+            displayName: "wire",
+            preset: "ts-jest",
+            testEnvironment: "node",
+            moduleNameMapper: {
+                "^(\.{1,2}/.*)\.js$": "$1",
+            },
+            roots: ["<rootDir>/tests/wire"],
+            setupFilesAfterEnv: ["<rootDir>/tests/mock-server/setup.ts"],
+        },
+    ],
+    workerThreads: false,
+    passWithNoTests: true,
 };

package/package.json

@@ -1,30 +1,26 @@
 {
     "name": "@mergeapi/merge-node-client",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "private": false,
-    "repository": "https://github.com/merge-api/merge-node-client",
+    "repository": "github:merge-api/merge-node-client",
     "main": "./index.js",
     "types": "./index.d.ts",
     "scripts": {
         "format": "prettier . --write --ignore-unknown",
         "build": "tsc",
         "prepack": "cp -rv dist/. .",
-        "test": "jest tests/unit --passWithNoTests",
-        "test:wire": "jest tests/wire --passWithNoTests",
-        "wire:test": "yarn test:wire"
+        "test": "jest --config jest.config.mjs",
+        "test:unit": "jest --selectProjects unit",
+        "test:browser": "jest --selectProjects browser",
+        "test:wire": "jest --selectProjects wire"
     },
     "dependencies": {
-        "url-join": "4.0.1",
-        "form-data": "^4.0.0",
+        "form-data": "^4.0.4",
         "formdata-node": "^6.0.3",
         "node-fetch": "^2.7.0",
-        "qs": "^6.13.1",
-        "readable-stream": "^4.5.2",
-        "js-base64": "3.7.7"
+        "readable-stream": "^4.5.2"
     },
     "devDependencies": {
-        "@types/url-join": "4.0.1",
-        "@types/qs": "^6.9.17",
         "@types/node-fetch": "^2.6.12",
         "@types/readable-stream": "^4.0.18",
         "webpack": "^5.97.1",
@@ -42,7 +38,12 @@
     "browser": {
         "fs": false,
         "os": false,
-        "path": false
+        "path": false,
+        "stream": false
     },
-    "packageManager": "yarn@1.22.22"
+    "packageManager": "yarn@1.22.22",
+    "engines": {
+        "node": ">=18.0.0"
+    },
+    "sideEffects": false
 }