bkper-js 2.43.1 → 2.43.2

package/lib/index.d.ts

@@ -1821,19 +1821,14 @@ export declare class Book extends ResourceProperty<bkper.Book> {
      */
     batchUntrashTransactions(transactions: Transaction[]): Promise<void>;
     /**
-     * Merge two [[Transactions]] into a single new canonical transaction.
-     *
-     * The merged transaction is created synchronously. Cleanup of the two
-     * originals is scheduled asynchronously by the backend.
-     *
-     * @param transaction1 - The first transaction to merge. Accepts a wrapped
-     *     [[Transaction]], a plain `bkper.Transaction` payload, or a transaction id.
-     * @param transaction2 - The second transaction to merge. Accepts a wrapped
-     *     [[Transaction]], a plain `bkper.Transaction` payload, or a transaction id.
+     * Merge a primary and secondary [[Transaction]]. Submitted primary fields
+     * have highest precedence; an id string sends no field overrides.
      *
+     * @param primary - Primary Transaction, payload, or id.
+     * @param secondary - Secondary Transaction, payload, or id.
      * @returns The merged Transaction
      */
-    mergeTransactions(transaction1: Transaction | bkper.Transaction | string, transaction2: Transaction | bkper.Transaction | string): Promise<Transaction>;
+    mergeTransactions(primary: Transaction | bkper.Transaction | string, secondary: Transaction | bkper.Transaction | string): Promise<Transaction>;
     /**
      * Replay [[Events]] on the Book, in batch.
      *

package/lib/model/Book.js

@@ -544,38 +544,33 @@ export class Book extends ResourceProperty {
         });
     }
     /**
-     * Merge two [[Transactions]] into a single new canonical transaction.
-     *
-     * The merged transaction is created synchronously. Cleanup of the two
-     * originals is scheduled asynchronously by the backend.
-     *
-     * @param transaction1 - The first transaction to merge. Accepts a wrapped
-     *     [[Transaction]], a plain `bkper.Transaction` payload, or a transaction id.
-     * @param transaction2 - The second transaction to merge. Accepts a wrapped
-     *     [[Transaction]], a plain `bkper.Transaction` payload, or a transaction id.
+     * Merge a primary and secondary [[Transaction]]. Submitted primary fields
+     * have highest precedence; an id string sends no field overrides.
      *
+     * @param primary - Primary Transaction, payload, or id.
+     * @param secondary - Secondary Transaction, payload, or id.
      * @returns The merged Transaction
      */
-    mergeTransactions(transaction1, transaction2) {
+    mergeTransactions(primary, secondary) {
         return __awaiter(this, void 0, void 0, function* () {
-            const transactionId1 = typeof transaction1 === 'string'
-                ? transaction1
-                : transaction1 instanceof Transaction
-                    ? transaction1.getId()
-                    : transaction1.id;
-            if (transactionId1 == null || transactionId1.trim() === '') {
-                throw new Error('The first transaction must provide an id for merge.');
+            const primaryPayload = typeof primary === 'string'
+                ? { id: primary }
+                : primary instanceof Transaction
+                    ? primary.json()
+                    : primary;
+            if (primaryPayload.id == null || primaryPayload.id.trim() === '') {
+                throw new Error('The primary transaction must provide an id for merge.');
             }
-            const transactionId2 = typeof transaction2 === 'string'
-                ? transaction2
-                : transaction2 instanceof Transaction
-                    ? transaction2.getId()
-                    : transaction2.id;
-            if (transactionId2 == null || transactionId2.trim() === '') {
-                throw new Error('The second transaction must provide an id for merge.');
+            const secondaryPayload = typeof secondary === 'string'
+                ? { id: secondary }
+                : secondary instanceof Transaction
+                    ? secondary.json()
+                    : secondary;
+            if (secondaryPayload.id == null || secondaryPayload.id.trim() === '') {
+                throw new Error('The secondary transaction must provide an id for merge.');
             }
             const payload = {
-                items: [{ id: transactionId1 }, { id: transactionId2 }],
+                items: [primaryPayload, secondaryPayload],
             };
             let operation = yield TransactionService.mergeTransactions(this.getId(), payload, this.getConfig());
             return new Transaction(this, operation.transaction || {});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bkper-js",
-    "version": "2.43.1",
+    "version": "2.43.2",
     "description": "Javascript client for Bkper REST API",
     "main": "./lib/index.js",
     "module": "./lib/index.js",