bkper-js 1.35.5 → 1.36.0

package/lib/index.d.ts

@@ -194,6 +194,7 @@ export declare class Account {
      * Perform delete account.
      */
     remove(): Promise<Account>;
+
 }
 
 /**
@@ -723,7 +724,6 @@ export declare class Book {
 
 
 
-
     constructor(payload?: bkper.Book);
     /**
      * @returns An immutable copy of the json payload
@@ -1025,10 +1025,6 @@ export declare class Book {
 
 
 
-
-
-
-
     /**
      * Gets a [[Group]] object
      *
@@ -1043,14 +1039,19 @@ export declare class Book {
      * @returns The retrieved Group objects
      */
     getGroups(): Promise<Group[]>;
-    private mapGroups;
+
     /**
      * Gets all [[Accounts]] of this Book
      *
      * @returns The retrieved Account objects
      */
     getAccounts(): Promise<Account[]>;
-    private mapAccounts;
+
+
+
+
+
+
 
     /**
      * Lists transactions in the Book based on the provided query, limit, and cursor, for pagination.
@@ -1855,8 +1856,6 @@ export declare class Group {
      */
     getChildren(): Group[];
 
-
-
     /**
      * Retrieves all descendant Groups of the current Group.
      *
@@ -1908,8 +1907,6 @@ export declare class Group {
 
 
 
-
-
     /**
      * @returns True if this group has any account in it
      */
@@ -1926,6 +1923,7 @@ export declare class Group {
      * Perform delete group.
      */
     remove(): Promise<Group>;
+
 }
 
 /**

package/lib/model/Account.js

@@ -291,7 +291,7 @@ export class Account {
                 }
                 if (groupObject) {
                     for (let i = 0; i < this.payload.groups.length; i++) {
-                        const groupId = this.payload.groups[i];
+                        const groupId = this.payload.groups[i].id;
                         if (groupId == groupObject.getId()) {
                             this.payload.groups.splice(i, 1);
                         }
@@ -341,7 +341,7 @@ export class Account {
     create() {
         return __awaiter(this, void 0, void 0, function* () {
             this.payload = yield AccountService.createAccount(this.book.getId(), this.payload);
-            this.book.updateAccountCache(this);
+            this.updateAccountCache();
             return this;
         });
     }
@@ -350,9 +350,8 @@ export class Account {
      */
     update() {
         return __awaiter(this, void 0, void 0, function* () {
-            const previousGroupIds = [...(this.payload.groups || [])].map(g => g.id || "");
             this.payload = yield AccountService.updateAccount(this.book.getId(), this.payload);
-            this.book.updateAccountCache(this, previousGroupIds);
+            this.updateAccountCache();
             return this;
         });
     }
@@ -362,9 +361,14 @@ export class Account {
     remove() {
         return __awaiter(this, void 0, void 0, function* () {
             this.payload = yield AccountService.deleteAccount(this.book.getId(), this.payload);
-            this.book.removeAccountCache(this);
+            this.updateAccountCache(true);
             return this;
         });
     }
+    /** @internal */
+    updateAccountCache(remove) {
+        this.book.setAccount(this.payload, remove);
+        this.book.clearCache();
+    }
 }
 //# sourceMappingURL=Account.js.map

package/lib/model/Book.js

@@ -450,8 +450,9 @@ export class Book {
                 for (const payload of payloads) {
                     const account = new Account(this, payload);
                     createdAccounts.push(account);
-                    this.updateAccountCache(account);
+                    this.setAccount(payload);
                 }
+                this.clearCache();
                 return createdAccounts;
             }
             return [];
@@ -471,11 +472,9 @@ export class Book {
                 for (const payload of payloads) {
                     const group = new Group(this, payload);
                     createdGroups.push(group);
-                    this.updateGroupCache(group);
-                    if (this.idGroupMap) {
-                        group.buildGroupTree(this.idGroupMap);
-                    }
+                    this.setGroup(payload);
                 }
+                this.clearCache();
                 return createdGroups;
             }
             return [];
@@ -575,41 +574,22 @@ export class Book {
         });
     }
     /** @internal */
-    getGroupsMap() {
-        return this.idGroupMap;
-    }
-    /** @internal */
-    updateGroupCache(group, previousParentId) {
-        var _a;
+    updateGroupCache(group) {
         if (this.idGroupMap) {
             const id = group.getId();
             if (id) {
                 this.idGroupMap.set(id, group);
             }
-            const parentId = (_a = group.payload.parent) === null || _a === void 0 ? void 0 : _a.id;
-            if ((previousParentId || '') !== (parentId || '')) {
-                group.destroyGroupTree(this.idGroupMap, previousParentId);
-            }
             group.buildGroupTree(this.idGroupMap);
         }
     }
     /** @internal */
-    removeGroupCache(group) {
-        if (this.idGroupMap) {
-            this.idGroupMap.delete(group.getId() || '');
-            group.destroyGroupTree(this.idGroupMap);
-        }
-    }
-    /** @internal */
-    updateAccountCache(account, previousGroupIds) {
+    updateAccountCache(account) {
         if (this.idAccountMap) {
             const id = account.getId();
             if (id) {
                 this.idAccountMap.set(id, account);
             }
-            if (previousGroupIds && previousGroupIds.length > 0) {
-                this.unlinkAccountsAndGroups(account, previousGroupIds);
-            }
             this.linkAccountsAndGroups(account);
         }
     }
@@ -621,31 +601,10 @@ export class Book {
             const group = (_a = this.idGroupMap) === null || _a === void 0 ? void 0 : _a.get(groupPayload.id || "");
             if (group != null) {
                 group.addAccount(account);
-                // TODO add known group to account
-            }
-        }
-    }
-    /** @internal */
-    unlinkAccountsAndGroups(account, groupIds) {
-        var _a, _b;
-        if (!groupIds) {
-            groupIds = ((_a = account.payload.groups) === null || _a === void 0 ? void 0 : _a.map(g => g.id || "")) || [];
-        }
-        for (const groupId of groupIds) {
-            const group = (_b = this.idGroupMap) === null || _b === void 0 ? void 0 : _b.get(groupId || "");
-            if (group != null) {
-                group.removeAccount(account);
             }
         }
     }
     /** @internal */
-    removeAccountCache(account) {
-        if (this.idAccountMap) {
-            this.idAccountMap.delete(account.getId() || '');
-        }
-        this.unlinkAccountsAndGroups(account);
-    }
-    /** @internal */
     getMostRecentLockDate_() {
         const closingDate = this.getClosingDate();
         const lockDate = this.getLockDate();
@@ -703,13 +662,13 @@ export class Book {
             return this.mapGroups(groups);
         });
     }
+    /** @internal */
     mapGroups(groups) {
         if (!groups) {
             return [];
         }
         let groupsObj = groups.map(group => new Group(this, group));
         this.idGroupMap = new Map();
-        this.parentIdGroupsMap = new Map();
         for (const group of groupsObj) {
             this.updateGroupCache(group);
         }
@@ -732,6 +691,7 @@ export class Book {
             return this.mapAccounts(accounts);
         });
     }
+    /** @internal */
     mapAccounts(accounts) {
         if (!accounts) {
             return [];
@@ -754,6 +714,51 @@ export class Book {
             }
         }
     }
+    /** @internal */
+    clearCache() {
+        this.clearGroupCache();
+        this.clearAccountCache();
+    }
+    /** @internal */
+    clearGroupCache() {
+        this.idGroupMap = undefined;
+    }
+    /** @internal */
+    clearAccountCache() {
+        this.idAccountMap = undefined;
+    }
+    /** @internal */
+    setAccount(account, remove) {
+        const accountPayloads = this.payload.accounts || [];
+        if (remove) {
+            this.payload.accounts = accountPayloads.filter(a => a.id !== account.id);
+        }
+        else {
+            const existingAccount = accountPayloads.find(a => a.id === account.id);
+            if (existingAccount) {
+                this.payload.accounts = accountPayloads.map(a => a.id === account.id ? account : a);
+            }
+            else {
+                this.payload.accounts = [...accountPayloads, account];
+            }
+        }
+    }
+    /** @internal */
+    setGroup(group, remove) {
+        const groupPayloads = this.payload.groups || [];
+        if (remove) {
+            this.payload.groups = groupPayloads.filter(g => g.id !== group.id);
+        }
+        else {
+            const existingGroup = groupPayloads.find(g => g.id === group.id);
+            if (existingGroup) {
+                this.payload.groups = groupPayloads.map(g => g.id === group.id ? group : g);
+            }
+            else {
+                this.payload.groups = [...groupPayloads, group];
+            }
+        }
+    }
     /**
      * Lists transactions in the Book based on the provided query, limit, and cursor, for pagination.
      *
@@ -831,23 +836,23 @@ export class Book {
         });
     }
     /**
-   *
-   * Create a [[BalancesReport]] based on query
-   *
-   * @param query The balances report query
-   *
-   * @return The balances report
-   *
-   * Example:
-   *
-   * ```js
-   * var book = BkperApp.getBook("agtzfmJrcGVyLWhyZHITCxIGTGVkZ2VyGICAgPXjx7oKDA");
-   *
-   * var balancesReport = book.getBalancesReport("group:'Equity' after:7/2018 before:8/2018");
-   *
-   * var accountBalance = balancesReport.getBalancesContainer("Bank Account").getCumulativeBalance();
-   * ```
-   */
+     *
+     * Create a [[BalancesReport]] based on query
+     *
+     * @param query The balances report query
+     *
+     * @return The balances report
+     *
+     * Example:
+     *
+     * ```js
+     * var book = BkperApp.getBook("agtzfmJrcGVyLWhyZHITCxIGTGVkZ2VyGICAgPXjx7oKDA");
+     *
+     * var balancesReport = book.getBalancesReport("group:'Equity' after:7/2018 before:8/2018");
+     *
+     * var accountBalance = balancesReport.getBalancesContainer("Bank Account").getCumulativeBalance();
+     * ```
+     */
     getBalancesReport(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const balances = yield BalancesService.getBalances(this.getId(), query);

package/lib/model/Group.js

@@ -222,23 +222,6 @@ export class Group {
         const id = child.getId();
         if (id) {
             this.children.set(id, child);
-            this.updateBookParentIdGroupsMap();
-        }
-    }
-    /** @internal */
-    removeChild(child) {
-        const id = child.getId();
-        if (id) {
-            this.children.delete(id);
-            this.updateBookParentIdGroupsMap();
-        }
-    }
-    /** @internal */
-    updateBookParentIdGroupsMap() {
-        var _a;
-        const id = this.getId();
-        if (id) {
-            (_a = this.book.parentIdGroupsMap) === null || _a === void 0 ? void 0 : _a.set(id, this.children);
         }
     }
     /**
@@ -351,19 +334,6 @@ export class Group {
         }
     }
     /** @internal */
-    destroyGroupTree(groupsMap, parentId) {
-        var _a;
-        if (!parentId) {
-            parentId = (_a = this.payload.parent) === null || _a === void 0 ? void 0 : _a.id;
-        }
-        if (parentId) {
-            const parentGroup = groupsMap.get(parentId);
-            if (parentGroup) {
-                parentGroup.removeChild(this);
-            }
-        }
-    }
-    /** @internal */
     addAccount(account) {
         const id = account === null || account === void 0 ? void 0 : account.getId();
         if (id) {
@@ -373,14 +343,6 @@ export class Group {
             this.accounts.set(id, account);
         }
     }
-    /** @internal */
-    removeAccount(account) {
-        var _a;
-        const id = account === null || account === void 0 ? void 0 : account.getId();
-        if (id) {
-            (_a = this.accounts) === null || _a === void 0 ? void 0 : _a.delete(id);
-        }
-    }
     /**
      * @returns True if this group has any account in it
      */
@@ -393,7 +355,7 @@ export class Group {
     create() {
         return __awaiter(this, void 0, void 0, function* () {
             this.payload = yield GroupService.createGroup(this.book.getId(), this.payload);
-            this.book.updateGroupCache(this);
+            this.updateGroupCache();
             return this;
         });
     }
@@ -402,10 +364,8 @@ export class Group {
      */
     update() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const previousParentId = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getId();
             this.payload = yield GroupService.updateGroup(this.book.getId(), this.payload);
-            this.book.updateGroupCache(this, previousParentId);
+            this.updateGroupCache();
             return this;
         });
     }
@@ -415,9 +375,14 @@ export class Group {
     remove() {
         return __awaiter(this, void 0, void 0, function* () {
             this.payload = yield GroupService.deleteGroup(this.book.getId(), this.payload);
-            this.book.removeGroupCache(this);
+            this.updateGroupCache(true);
             return this;
         });
     }
+    /** @internal */
+    updateGroupCache(remove) {
+        this.book.setGroup(this.payload, remove);
+        this.book.clearCache();
+    }
 }
 //# sourceMappingURL=Group.js.map

package/package.json

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