bkper-js 2.34.1 → 2.35.0

package/lib/index.d.ts

@@ -1818,12 +1818,14 @@ export declare class Book extends ResourceProperty<bkper.Book> {
      * The merged transaction is created synchronously. Cleanup of the two
      * originals is scheduled asynchronously by the backend.
      *
-     * @param transaction1 - The first transaction to merge
-     * @param transaction2 - The second transaction to merge
+     * @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.
      *
      * @returns The merged Transaction
      */
-    mergeTransactions(transaction1: Transaction, transaction2: Transaction): Promise<Transaction>;
+    mergeTransactions(transaction1: Transaction | bkper.Transaction | string, transaction2: Transaction | bkper.Transaction | string): Promise<Transaction>;
     /**
      * Replay [[Events]] on the Book, in batch.
      *
@@ -2745,6 +2747,8 @@ export declare enum EventType {
     INTEGRATION_CREATED = "INTEGRATION_CREATED",
     INTEGRATION_UPDATED = "INTEGRATION_UPDATED",
     INTEGRATION_DELETED = "INTEGRATION_DELETED",
+    BOOK_AUDITED = "BOOK_AUDITED",
+    BOOK_CREATED = "BOOK_CREATED",
     BOOK_UPDATED = "BOOK_UPDATED",
     BOOK_DELETED = "BOOK_DELETED"
 }

package/lib/model/Book.js

@@ -548,15 +548,29 @@ export class Book extends ResourceProperty {
      * The merged transaction is created synchronously. Cleanup of the two
      * originals is scheduled asynchronously by the backend.
      *
-     * @param transaction1 - The first transaction to merge
-     * @param transaction2 - The second transaction to merge
+     * @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.
      *
      * @returns The merged Transaction
      */
     mergeTransactions(transaction1, transaction2) {
         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 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 payload = {
-                items: [transaction1.json(), transaction2.json()],
+                items: [{ id: transactionId1 }, { id: transactionId2 }],
             };
             let operation = yield TransactionService.mergeTransactions(this.getId(), payload, this.getConfig());
             return new Transaction(this, operation.transaction || {});

package/lib/model/Enums.js

@@ -263,6 +263,8 @@ export var EventType;
     EventType["INTEGRATION_CREATED"] = "INTEGRATION_CREATED";
     EventType["INTEGRATION_UPDATED"] = "INTEGRATION_UPDATED";
     EventType["INTEGRATION_DELETED"] = "INTEGRATION_DELETED";
+    EventType["BOOK_AUDITED"] = "BOOK_AUDITED";
+    EventType["BOOK_CREATED"] = "BOOK_CREATED";
     EventType["BOOK_UPDATED"] = "BOOK_UPDATED";
     EventType["BOOK_DELETED"] = "BOOK_DELETED";
 })(EventType || (EventType = {}));

package/package.json

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