@mergeapi/merge-node-client 2.0.1 → 2.1.1

package/dist/serialization/resources/accounting/types/ItemType.js

@@ -0,0 +1,42 @@
+"use strict";
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ItemType = void 0;
+const core = __importStar(require("../../../../core"));
+const Type2BbEnum_1 = require("./Type2BbEnum");
+exports.ItemType = core.serialization.undiscriminatedUnion([Type2BbEnum_1.Type2BbEnum, core.serialization.string()]);

package/dist/serialization/resources/accounting/types/PaginatedExpenseReportLineList.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+import * as serializers from "../../../index";
+import * as Merge from "../../../../api/index";
+import * as core from "../../../../core";
+import { ExpenseReportLine } from "./ExpenseReportLine";
+export declare const PaginatedExpenseReportLineList: core.serialization.ObjectSchema<serializers.accounting.PaginatedExpenseReportLineList.Raw, Merge.accounting.PaginatedExpenseReportLineList>;
+export declare namespace PaginatedExpenseReportLineList {
+    interface Raw {
+        next?: string | null;
+        previous?: string | null;
+        results?: ExpenseReportLine.Raw[] | null;
+    }
+}

package/dist/serialization/resources/accounting/types/PaginatedExpenseReportLineList.js

@@ -0,0 +1,46 @@
+"use strict";
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginatedExpenseReportLineList = void 0;
+const core = __importStar(require("../../../../core"));
+const ExpenseReportLine_1 = require("./ExpenseReportLine");
+exports.PaginatedExpenseReportLineList = core.serialization.object({
+    next: core.serialization.string().optional(),
+    previous: core.serialization.string().optional(),
+    results: core.serialization.list(ExpenseReportLine_1.ExpenseReportLine).optional(),
+});

package/dist/serialization/resources/accounting/types/PaginatedExpenseReportList.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+import * as serializers from "../../../index";
+import * as Merge from "../../../../api/index";
+import * as core from "../../../../core";
+import { ExpenseReport } from "./ExpenseReport";
+export declare const PaginatedExpenseReportList: core.serialization.ObjectSchema<serializers.accounting.PaginatedExpenseReportList.Raw, Merge.accounting.PaginatedExpenseReportList>;
+export declare namespace PaginatedExpenseReportList {
+    interface Raw {
+        next?: string | null;
+        previous?: string | null;
+        results?: ExpenseReport.Raw[] | null;
+    }
+}

package/dist/serialization/resources/accounting/types/PaginatedExpenseReportList.js

@@ -0,0 +1,46 @@
+"use strict";
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginatedExpenseReportList = void 0;
+const core = __importStar(require("../../../../core"));
+const ExpenseReport_1 = require("./ExpenseReport");
+exports.PaginatedExpenseReportList = core.serialization.object({
+    next: core.serialization.string().optional(),
+    previous: core.serialization.string().optional(),
+    results: core.serialization.list(ExpenseReport_1.ExpenseReport).optional(),
+});

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

@@ -159,6 +159,29 @@ export * from "./ExpenseLineRequestAccount";
 export * from "./ExpenseLineRequestContact";
 export * from "./ExpenseLineRequestProject";
 export * from "./ExpenseLineRequest";
+export * from "./ExpenseReportStatus";
+export * from "./ExpenseReportCompany";
+export * from "./ExpenseReport";
+export * from "./ExpenseReportLineAccount";
+export * from "./ExpenseReportLineEmployee";
+export * from "./ExpenseReportLineProject";
+export * from "./ExpenseReportLineCompany";
+export * from "./ExpenseReportLineContact";
+export * from "./ExpenseReportLineTaxRate";
+export * from "./ExpenseReportLine";
+export * from "./ExpenseReportLineRequestAccount";
+export * from "./ExpenseReportLineRequestEmployee";
+export * from "./ExpenseReportLineRequestProject";
+export * from "./ExpenseReportLineRequestCompany";
+export * from "./ExpenseReportLineRequestContact";
+export * from "./ExpenseReportLineRequestTaxRate";
+export * from "./ExpenseReportLineRequest";
+export * from "./ExpenseReportRequestEmployee";
+export * from "./ExpenseReportRequestAccountingPeriod";
+export * from "./ExpenseReportRequestCompany";
+export * from "./ExpenseReportRequest";
+export * from "./ExpenseReportResponse";
+export * from "./ExpenseReportStatusEnum";
 export * from "./ExpenseRequestAccount";
 export * from "./ExpenseRequestContact";
 export * from "./ExpenseRequestCurrency";
@@ -253,6 +276,7 @@ export * from "./IssueStatus";
 export * from "./Issue";
 export * from "./IssueStatusEnum";
 export * from "./ItemStatus";
+export * from "./ItemType";
 export * from "./ItemPurchaseAccount";
 export * from "./ItemSalesAccount";
 export * from "./ItemCompany";
@@ -324,6 +348,8 @@ export * from "./PaginatedContactList";
 export * from "./PaginatedCreditNoteList";
 export * from "./PaginatedEmployeeList";
 export * from "./PaginatedExpenseList";
+export * from "./PaginatedExpenseReportLineList";
+export * from "./PaginatedExpenseReportList";
 export * from "./PaginatedGeneralLedgerTransactionList";
 export * from "./PaginatedIncomeStatementList";
 export * from "./PaginatedInvoiceList";

package/dist/serialization/resources/accounting/types/index.js

@@ -175,6 +175,29 @@ __exportStar(require("./ExpenseLineRequestAccount"), exports);
 __exportStar(require("./ExpenseLineRequestContact"), exports);
 __exportStar(require("./ExpenseLineRequestProject"), exports);
 __exportStar(require("./ExpenseLineRequest"), exports);
+__exportStar(require("./ExpenseReportStatus"), exports);
+__exportStar(require("./ExpenseReportCompany"), exports);
+__exportStar(require("./ExpenseReport"), exports);
+__exportStar(require("./ExpenseReportLineAccount"), exports);
+__exportStar(require("./ExpenseReportLineEmployee"), exports);
+__exportStar(require("./ExpenseReportLineProject"), exports);
+__exportStar(require("./ExpenseReportLineCompany"), exports);
+__exportStar(require("./ExpenseReportLineContact"), exports);
+__exportStar(require("./ExpenseReportLineTaxRate"), exports);
+__exportStar(require("./ExpenseReportLine"), exports);
+__exportStar(require("./ExpenseReportLineRequestAccount"), exports);
+__exportStar(require("./ExpenseReportLineRequestEmployee"), exports);
+__exportStar(require("./ExpenseReportLineRequestProject"), exports);
+__exportStar(require("./ExpenseReportLineRequestCompany"), exports);
+__exportStar(require("./ExpenseReportLineRequestContact"), exports);
+__exportStar(require("./ExpenseReportLineRequestTaxRate"), exports);
+__exportStar(require("./ExpenseReportLineRequest"), exports);
+__exportStar(require("./ExpenseReportRequestEmployee"), exports);
+__exportStar(require("./ExpenseReportRequestAccountingPeriod"), exports);
+__exportStar(require("./ExpenseReportRequestCompany"), exports);
+__exportStar(require("./ExpenseReportRequest"), exports);
+__exportStar(require("./ExpenseReportResponse"), exports);
+__exportStar(require("./ExpenseReportStatusEnum"), exports);
 __exportStar(require("./ExpenseRequestAccount"), exports);
 __exportStar(require("./ExpenseRequestContact"), exports);
 __exportStar(require("./ExpenseRequestCurrency"), exports);
@@ -269,6 +292,7 @@ __exportStar(require("./IssueStatus"), exports);
 __exportStar(require("./Issue"), exports);
 __exportStar(require("./IssueStatusEnum"), exports);
 __exportStar(require("./ItemStatus"), exports);
+__exportStar(require("./ItemType"), exports);
 __exportStar(require("./ItemPurchaseAccount"), exports);
 __exportStar(require("./ItemSalesAccount"), exports);
 __exportStar(require("./ItemCompany"), exports);
@@ -340,6 +364,8 @@ __exportStar(require("./PaginatedContactList"), exports);
 __exportStar(require("./PaginatedCreditNoteList"), exports);
 __exportStar(require("./PaginatedEmployeeList"), exports);
 __exportStar(require("./PaginatedExpenseList"), exports);
+__exportStar(require("./PaginatedExpenseReportLineList"), exports);
+__exportStar(require("./PaginatedExpenseReportList"), exports);
 __exportStar(require("./PaginatedGeneralLedgerTransactionList"), exports);
 __exportStar(require("./PaginatedIncomeStatementList"), exports);
 __exportStar(require("./PaginatedInvoiceList"), exports);

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 crm from "./crm";
-export * as ats from "./ats";
 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.ats = exports.crm = 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.crm = __importStar(require("./crm"));
-exports.ats = __importStar(require("./ats"));
 exports.accounting = __importStar(require("./accounting"));

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.0.1";
+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.0.1";
+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.0.1",
+    "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
 }