bkper-js 1.46.0 → 1.46.1

package/lib/index.d.ts

@@ -745,6 +745,8 @@ export declare class Book {
 
 
 
+
+
     constructor(payload?: bkper.Book);
     /**
      * @returns An immutable copy of the json payload
@@ -1094,6 +1096,10 @@ export declare class Book {
 
 
 
+
+
+
+
     /**
      * Gets a [[Group]] object
      *

package/lib/model/Book.js

@@ -643,36 +643,75 @@ export class Book {
             if (!idOrName || idOrName.trim() == '') {
                 return undefined;
             }
+            let account;
+            // Try to get account by id
             if (this.idAccountMap) {
-                return this.idAccountMap.get(idOrName);
+                account = this.idAccountMap.get(idOrName);
             }
-            else {
+            // Try to get account by name
+            if (!account && this.nameAccountMap) {
+                account = this.nameAccountMap.get(idOrName);
+            }
+            // Try to fetch account from server
+            if (!account) {
                 const accountPayload = yield AccountService.getAccount(this.getId(), idOrName);
                 if (accountPayload) {
-                    return new Account(this, accountPayload);
+                    account = new Account(this, accountPayload);
                 }
             }
-            return undefined;
+            return account;
         });
     }
     /** @internal */
     updateGroupCache(group) {
+        this.updateGroupIdMap(group);
+        this.updateGroupNameMap(group);
+        if (this.idGroupMap) {
+            group.buildGroupTree(this.idGroupMap);
+        }
+    }
+    /** @internal */
+    updateGroupIdMap(group) {
         if (this.idGroupMap) {
             const id = group.getId();
             if (id) {
                 this.idGroupMap.set(id, group);
             }
-            group.buildGroupTree(this.idGroupMap);
+        }
+    }
+    /** @internal */
+    updateGroupNameMap(group) {
+        if (this.nameGroupMap) {
+            const normalizedName = group.getNormalizedName();
+            if (normalizedName) {
+                this.nameGroupMap.set(normalizedName, group);
+            }
         }
     }
     /** @internal */
     updateAccountCache(account) {
+        this.updateAccountIdMap(account);
+        this.updateAccountNameMap(account);
+        if (this.idAccountMap || this.nameAccountMap) {
+            this.linkAccountsAndGroups(account);
+        }
+    }
+    /** @internal */
+    updateAccountIdMap(account) {
         if (this.idAccountMap) {
             const id = account.getId();
             if (id) {
                 this.idAccountMap.set(id, account);
             }
-            this.linkAccountsAndGroups(account);
+        }
+    }
+    /** @internal */
+    updateAccountNameMap(account) {
+        if (this.nameAccountMap) {
+            const normalizedName = account.getNormalizedName();
+            if (normalizedName) {
+                this.nameAccountMap.set(normalizedName, account);
+            }
         }
     }
     /** @internal */
@@ -718,16 +757,23 @@ export class Book {
             if (!idOrName || idOrName.trim() == '') {
                 return undefined;
             }
+            let group;
+            // Try to get group by id
             if (this.idGroupMap) {
-                return this.idGroupMap.get(idOrName);
+                group = this.idGroupMap.get(idOrName);
             }
-            else {
+            // Try to get group by name
+            if (!group && this.nameGroupMap) {
+                group = this.nameGroupMap.get(idOrName);
+            }
+            // Try to fetch group from server
+            if (!group) {
                 const groupPayload = yield GroupService.getGroup(this.getId(), idOrName);
                 if (groupPayload) {
-                    return new Group(this, groupPayload);
+                    group = new Group(this, groupPayload);
                 }
             }
-            return undefined;
+            return group;
         });
     }
     /**
@@ -751,6 +797,7 @@ export class Book {
         }
         let groupsObj = groups.map(group => new Group(this, group));
         this.idGroupMap = new Map();
+        this.nameGroupMap = new Map();
         for (const group of groupsObj) {
             this.updateGroupCache(group);
         }
@@ -780,6 +827,7 @@ export class Book {
         }
         let accountsObj = accounts.map(account => new Account(this, account));
         this.idAccountMap = new Map();
+        this.nameAccountMap = new Map();
         for (const account of accountsObj) {
             this.updateAccountCache(account);
         }
@@ -804,10 +852,12 @@ export class Book {
     /** @internal */
     clearGroupCache() {
         this.idGroupMap = undefined;
+        this.nameGroupMap = undefined;
     }
     /** @internal */
     clearAccountCache() {
         this.idAccountMap = undefined;
+        this.nameAccountMap = undefined;
     }
     /** @internal */
     setAccount(account, remove) {

package/lib/model/Group.js

@@ -343,12 +343,12 @@ export class Group {
         }
     }
     /** @internal */
-    buildGroupTree(groupsMap) {
+    buildGroupTree(idGroupMap) {
         this.parent = undefined;
         this.depth = undefined;
         this.root = undefined;
         if (this.payload.parent) {
-            const parentGroup = groupsMap.get(this.payload.parent.id || "");
+            const parentGroup = idGroupMap.get(this.payload.parent.id || "");
             if (parentGroup) {
                 this.parent = parentGroup;
                 parentGroup.addChild(this);

package/package.json

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