@mergeapi/merge-node-client 2.0.1 → 2.1.1

package/core/fetcher/ResponseWithBody.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isResponseWithBody = isResponseWithBody;
+function isResponseWithBody(response) {
+    return response.body != null;
+}

package/core/fetcher/createRequestUrl.d.ts

@@ -1 +1 @@
-export declare function createRequestUrl(baseUrl: string, queryParameters?: Record<string, string | string[] | object | object[] | null>): string;
+export declare function createRequestUrl(baseUrl: string, queryParameters?: Record<string, unknown>): string;

package/core/fetcher/createRequestUrl.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRequestUrl = createRequestUrl;
-const qs_1 = __importDefault(require("qs"));
+const qs_1 = require("../url/qs");
 function createRequestUrl(baseUrl, queryParameters) {
-    return Object.keys(queryParameters !== null && queryParameters !== void 0 ? queryParameters : {}).length > 0
-        ? `${baseUrl}?${qs_1.default.stringify(queryParameters, { arrayFormat: "repeat" })}`
-        : baseUrl;
+    const queryString = (0, qs_1.toQueryString)(queryParameters, { arrayFormat: "repeat" });
+    return queryString ? `${baseUrl}?${queryString}` : baseUrl;
 }

package/core/fetcher/getErrorResponseBody.d.ts

@@ -0,0 +1 @@
+export declare function getErrorResponseBody(response: Response): Promise<unknown>;

package/core/fetcher/getErrorResponseBody.js

@@ -0,0 +1,44 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getErrorResponseBody = getErrorResponseBody;
+const json_1 = require("../json");
+const getResponseBody_1 = require("./getResponseBody");
+function getErrorResponseBody(response) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        let contentType = (_a = response.headers.get("Content-Type")) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        if (contentType == null || contentType.length === 0) {
+            return (0, getResponseBody_1.getResponseBody)(response);
+        }
+        if (contentType.indexOf(";") !== -1) {
+            contentType = (_c = (_b = contentType.split(";")[0]) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : "";
+        }
+        switch (contentType) {
+            case "application/hal+json":
+            case "application/json":
+            case "application/ld+json":
+            case "application/problem+json":
+            case "application/vnd.api+json":
+            case "text/json":
+                const text = yield response.text();
+                return text.length > 0 ? (0, json_1.fromJson)(text) : undefined;
+            default:
+                if (contentType.startsWith("application/vnd.") && contentType.endsWith("+json")) {
+                    const text = yield response.text();
+                    return text.length > 0 ? (0, json_1.fromJson)(text) : undefined;
+                }
+                // Fallback to plain text if content type is not recognized
+                // Even if no body is present, the response will be an empty string
+                return yield response.text();
+        }
+    });
+}

package/core/fetcher/getFetchFn.js

@@ -43,18 +43,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFetchFn = getFetchFn;
-const runtime_1 = require("../runtime");
+const index_1 = require("../runtime/index");
 /**
  * Returns a fetch function based on the runtime
  */
 function getFetchFn() {
     return __awaiter(this, void 0, void 0, function* () {
         // In Node.js 18+ environments, use native fetch
-        if (runtime_1.RUNTIME.type === "node" && runtime_1.RUNTIME.parsedVersion != null && runtime_1.RUNTIME.parsedVersion >= 18) {
+        if (index_1.RUNTIME.type === "node" && index_1.RUNTIME.parsedVersion != null && index_1.RUNTIME.parsedVersion >= 18) {
             return fetch;
         }
         // In Node.js 18 or lower environments, the SDK always uses`node-fetch`.
-        if (runtime_1.RUNTIME.type === "node") {
+        if (index_1.RUNTIME.type === "node") {
             return (yield Promise.resolve().then(() => __importStar(require("node-fetch")))).default;
         }
         // Otherwise the SDK uses global fetch if available,

package/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/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/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/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/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/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/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/core/url/index.d.ts

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

package/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/core/url/join.d.ts

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

package/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/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/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/Client.d.ts

@@ -3,11 +3,11 @@
  */
 import * as environments from "./environments";
 import * as core from "./core";
+import { Crm } from "./api/resources/crm/client/Client";
 import { Filestorage } from "./api/resources/filestorage/client/Client";
+import { Ats } from "./api/resources/ats/client/Client";
 import { Hris } from "./api/resources/hris/client/Client";
 import { Ticketing } from "./api/resources/ticketing/client/Client";
-import { Crm } from "./api/resources/crm/client/Client";
-import { Ats } from "./api/resources/ats/client/Client";
 import { Accounting } from "./api/resources/accounting/client/Client";
 export declare namespace MergeClient {
     interface Options {
@@ -30,23 +30,25 @@ export declare namespace MergeClient {
         abortSignal?: AbortSignal;
         /** Override the X-Account-Token header */
         accountToken?: string | undefined;
+        /** Additional query string parameters to include in the request. */
+        queryParams?: Record<string, unknown>;
         /** Additional headers to include in the request. */
         headers?: Record<string, string | core.Supplier<string | undefined> | undefined>;
     }
 }
 export declare class MergeClient {
     protected readonly _options: MergeClient.Options;
+    protected _crm: Crm | undefined;
     protected _filestorage: Filestorage | undefined;
+    protected _ats: Ats | undefined;
     protected _hris: Hris | undefined;
     protected _ticketing: Ticketing | undefined;
-    protected _crm: Crm | undefined;
-    protected _ats: Ats | undefined;
     protected _accounting: Accounting | undefined;
     constructor(_options: MergeClient.Options);
+    get crm(): Crm;
     get filestorage(): Filestorage;
+    get ats(): Ats;
     get hris(): Hris;
     get ticketing(): Ticketing;
-    get crm(): Crm;
-    get ats(): Ats;
     get accounting(): Accounting;
 }

package/dist/Client.js

@@ -38,44 +38,44 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MergeClient = void 0;
 const core = __importStar(require("./core"));
-const headers_js_1 = require("./core/headers.js");
-const Client_1 = require("./api/resources/filestorage/client/Client");
-const Client_2 = require("./api/resources/hris/client/Client");
-const Client_3 = require("./api/resources/ticketing/client/Client");
-const Client_4 = require("./api/resources/crm/client/Client");
-const Client_5 = require("./api/resources/ats/client/Client");
+const headers_1 = require("./core/headers");
+const Client_1 = require("./api/resources/crm/client/Client");
+const Client_2 = require("./api/resources/filestorage/client/Client");
+const Client_3 = require("./api/resources/ats/client/Client");
+const Client_4 = require("./api/resources/hris/client/Client");
+const Client_5 = require("./api/resources/ticketing/client/Client");
 const Client_6 = require("./api/resources/accounting/client/Client");
 class MergeClient {
     constructor(_options) {
-        this._options = Object.assign(Object.assign({}, _options), { headers: (0, headers_js_1.mergeHeaders)({
+        this._options = Object.assign(Object.assign({}, _options), { headers: (0, headers_1.mergeHeaders)({
                 "X-Account-Token": _options === null || _options === void 0 ? void 0 : _options.accountToken,
                 "X-Fern-Language": "JavaScript",
                 "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                "X-Fern-SDK-Version": "2.0.1",
-                "User-Agent": "@mergeapi/merge-node-client/2.0.1",
+                "X-Fern-SDK-Version": "2.1.1",
+                "User-Agent": "@mergeapi/merge-node-client/2.1.1",
                 "X-Fern-Runtime": core.RUNTIME.type,
                 "X-Fern-Runtime-Version": core.RUNTIME.version,
             }, _options === null || _options === void 0 ? void 0 : _options.headers) });
     }
-    get filestorage() {
+    get crm() {
         var _a;
-        return ((_a = this._filestorage) !== null && _a !== void 0 ? _a : (this._filestorage = new Client_1.Filestorage(this._options)));
+        return ((_a = this._crm) !== null && _a !== void 0 ? _a : (this._crm = new Client_1.Crm(this._options)));
     }
-    get hris() {
+    get filestorage() {
         var _a;
-        return ((_a = this._hris) !== null && _a !== void 0 ? _a : (this._hris = new Client_2.Hris(this._options)));
+        return ((_a = this._filestorage) !== null && _a !== void 0 ? _a : (this._filestorage = new Client_2.Filestorage(this._options)));
     }
-    get ticketing() {
+    get ats() {
         var _a;
-        return ((_a = this._ticketing) !== null && _a !== void 0 ? _a : (this._ticketing = new Client_3.Ticketing(this._options)));
+        return ((_a = this._ats) !== null && _a !== void 0 ? _a : (this._ats = new Client_3.Ats(this._options)));
     }
-    get crm() {
+    get hris() {
         var _a;
-        return ((_a = this._crm) !== null && _a !== void 0 ? _a : (this._crm = new Client_4.Crm(this._options)));
+        return ((_a = this._hris) !== null && _a !== void 0 ? _a : (this._hris = new Client_4.Hris(this._options)));
     }
-    get ats() {
+    get ticketing() {
         var _a;
-        return ((_a = this._ats) !== null && _a !== void 0 ? _a : (this._ats = new Client_5.Ats(this._options)));
+        return ((_a = this._ticketing) !== null && _a !== void 0 ? _a : (this._ticketing = new Client_5.Ticketing(this._options)));
     }
     get accounting() {
         var _a;

package/dist/api/resources/accounting/client/Client.d.ts

@@ -23,6 +23,7 @@ import { CreditNotes } from "../resources/creditNotes/client/Client";
 import { Scopes } from "../resources/scopes/client/Client";
 import { DeleteAccount } from "../resources/deleteAccount/client/Client";
 import { Employees } from "../resources/employees/client/Client";
+import { ExpenseReports } from "../resources/expenseReports/client/Client";
 import { Expenses } from "../resources/expenses/client/Client";
 import { FieldMapping } from "../resources/fieldMapping/client/Client";
 import { GeneralLedgerTransactions } from "../resources/generalLedgerTransactions/client/Client";
@@ -84,6 +85,7 @@ export declare class Accounting {
     protected _scopes: Scopes | undefined;
     protected _deleteAccount: DeleteAccount | undefined;
     protected _employees: Employees | undefined;
+    protected _expenseReports: ExpenseReports | undefined;
     protected _expenses: Expenses | undefined;
     protected _fieldMapping: FieldMapping | undefined;
     protected _generalLedgerTransactions: GeneralLedgerTransactions | undefined;
@@ -131,6 +133,7 @@ export declare class Accounting {
     get scopes(): Scopes;
     get deleteAccount(): DeleteAccount;
     get employees(): Employees;
+    get expenseReports(): ExpenseReports;
     get expenses(): Expenses;
     get fieldMapping(): FieldMapping;
     get generalLedgerTransactions(): GeneralLedgerTransactions;