@katlux/providers 0.1.1-alpha.123 → 0.1.1-alpha.125

package/dist/index.cjs

@@ -4020,7 +4020,8 @@ async function encryptRows(rows, encryption, apiUrl, idKey) {
       if (item && typeof item === "object") {
         for (let f = 0; f < fields.length; f++) {
           const val = item[fields[f]];
-          if (val !== void 0 && val !== null && !cipherProvider.isEncrypted(val)) {
+          const isEnc = cipherProvider.isEncrypted?.(val) ?? CWebCryptoEncryptionProvider.isEncrypted(val);
+          if (val !== void 0 && val !== null && !isEnc) {
             allEncrypted = false;
             break;
           }
@@ -4056,7 +4057,8 @@ async function encryptRowsChunked(rows, encryption, options, apiUrl, idKey, onCh
       if (item && typeof item === "object") {
         for (let f = 0; f < fields.length; f++) {
           const val = item[fields[f]];
-          if (val !== void 0 && val !== null && !cipherProvider.isEncrypted(val)) {
+          const isEnc = cipherProvider.isEncrypted?.(val) ?? CWebCryptoEncryptionProvider.isEncrypted(val);
+          if (val !== void 0 && val !== null && !isEnc) {
             allEncrypted = false;
             break;
           }
@@ -4831,7 +4833,7 @@ class CFlatClientDataProvider extends AEncryptedClientProvider {
     }
     if (this.pageSize <= 0) {
       this.pageData = this._rowMap;
-    } else {
+    } else if (!this.isEncryptionEnabled) {
       const startIndex = (this.currentPage - 1) * this.pageSize;
       const endIndex = startIndex + this.pageSize;
       this.pageData = this._rowMap.slice(startIndex, endIndex);
@@ -6913,13 +6915,15 @@ class CAPIFlatClientDataProvider extends CFlatClientDataProvider {
     try {
       if (this.apiUrl) {
         const nextPage = this.currentPage + 1;
+        const shouldSkipDecryption = Boolean(this.encryption?.lazy ?? (this.encryption?.fields && this.encryption.fields.length > 0));
         await this.requestProvider.registerRequest(this.apiUrl, {
           query: {
             pageNumber: nextPage,
             pageSize: this.pageSize
           },
           deduplicate: this.deduplicate,
-          context: this.context
+          context: this.context,
+          skipDecryption: shouldSkipDecryption
         });
         if (this._lastDataReceivedPromise) {
           await this._lastDataReceivedPromise;
@@ -7853,7 +7857,33 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
       const filteredNodes = this._filteredNodesCache;
       this.filteredData = filteredNodes;
       const paginated = this.paginateNodes(filteredNodes);
-      this.pageData = paginated.map((node) => {
+      if (this.pageSize <= 0) {
+        this.pageData = paginated.map((node) => {
+          const decrypted = this.isEncryptionEnabled ? this._decryptedNodeMap.get(node.id) : void 0;
+          const nodeData = decrypted ? { ...node.data, ...decrypted } : node.data;
+          return {
+            ...nodeData,
+            ...node,
+            __treeNode: node
+          };
+        });
+      } else if (!this.isEncryptionEnabled) {
+        this.pageData = paginated.map((node) => {
+          return {
+            ...node.data,
+            ...node,
+            __treeNode: node
+          };
+        });
+      }
+      if (this.allData.length > 0) {
+        this.initialLoad = false;
+      }
+      return;
+    }
+    const visible = this.visibleRows;
+    if (this.pageSize <= 0) {
+      this.pageData = visible.map((node) => {
         const decrypted = this.isEncryptionEnabled ? this._decryptedNodeMap.get(node.id) : void 0;
         const nodeData = decrypted ? { ...node.data, ...decrypted } : node.data;
         return {
@@ -7862,21 +7892,15 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
           __treeNode: node
         };
       });
-      if (this.allData.length > 0) {
-        this.initialLoad = false;
-      }
-      return;
+    } else if (!this.isEncryptionEnabled) {
+      this.pageData = visible.map((node) => {
+        return {
+          ...node.data,
+          ...node,
+          __treeNode: node
+        };
+      });
     }
-    const visible = this.visibleRows;
-    this.pageData = visible.map((node) => {
-      const decrypted = this.isEncryptionEnabled ? this._decryptedNodeMap.get(node.id) : void 0;
-      const nodeData = decrypted ? { ...node.data, ...decrypted } : node.data;
-      return {
-        ...nodeData,
-        ...node,
-        __treeNode: node
-      };
-    });
     if (this.allData.length > 0) {
       this.initialLoad = false;
     }
@@ -7936,7 +7960,7 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
           } else {
             this._allVisibleRowsCache = [];
           }
-          this.pageData = [...this._allVisibleRowsCache];
+          this.pageData = [...this._allVisibleRowsCache ?? []];
         } else {
           this._allVisibleRowsCache = null;
           const startIndex = (this.currentPage - 1) * this.pageSize;
@@ -8049,8 +8073,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
       this.expandedNodes.add(nodeId);
     }
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8061,8 +8086,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     this._allVisibleRowsCache = null;
     this.expandedNodes.add(nodeId);
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8073,8 +8099,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     this._allVisibleRowsCache = null;
     this.expandedNodes.delete(nodeId);
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8092,8 +8119,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     const allIds = this._staticNodes.filter((n) => n.hasChildren).map((n) => n.id);
     this.expandedNodes = new Set(allIds);
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8104,8 +8132,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     this._allVisibleRowsCache = null;
     this.expandedNodes = /* @__PURE__ */ new Set();
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }

package/dist/index.mjs

@@ -4003,7 +4003,8 @@ async function encryptRows(rows, encryption, apiUrl, idKey) {
       if (item && typeof item === "object") {
         for (let f = 0; f < fields.length; f++) {
           const val = item[fields[f]];
-          if (val !== void 0 && val !== null && !cipherProvider.isEncrypted(val)) {
+          const isEnc = cipherProvider.isEncrypted?.(val) ?? CWebCryptoEncryptionProvider.isEncrypted(val);
+          if (val !== void 0 && val !== null && !isEnc) {
             allEncrypted = false;
             break;
           }
@@ -4039,7 +4040,8 @@ async function encryptRowsChunked(rows, encryption, options, apiUrl, idKey, onCh
       if (item && typeof item === "object") {
         for (let f = 0; f < fields.length; f++) {
           const val = item[fields[f]];
-          if (val !== void 0 && val !== null && !cipherProvider.isEncrypted(val)) {
+          const isEnc = cipherProvider.isEncrypted?.(val) ?? CWebCryptoEncryptionProvider.isEncrypted(val);
+          if (val !== void 0 && val !== null && !isEnc) {
             allEncrypted = false;
             break;
           }
@@ -4814,7 +4816,7 @@ class CFlatClientDataProvider extends AEncryptedClientProvider {
     }
     if (this.pageSize <= 0) {
       this.pageData = this._rowMap;
-    } else {
+    } else if (!this.isEncryptionEnabled) {
       const startIndex = (this.currentPage - 1) * this.pageSize;
       const endIndex = startIndex + this.pageSize;
       this.pageData = this._rowMap.slice(startIndex, endIndex);
@@ -6896,13 +6898,15 @@ class CAPIFlatClientDataProvider extends CFlatClientDataProvider {
     try {
       if (this.apiUrl) {
         const nextPage = this.currentPage + 1;
+        const shouldSkipDecryption = Boolean(this.encryption?.lazy ?? (this.encryption?.fields && this.encryption.fields.length > 0));
         await this.requestProvider.registerRequest(this.apiUrl, {
           query: {
             pageNumber: nextPage,
             pageSize: this.pageSize
           },
           deduplicate: this.deduplicate,
-          context: this.context
+          context: this.context,
+          skipDecryption: shouldSkipDecryption
         });
         if (this._lastDataReceivedPromise) {
           await this._lastDataReceivedPromise;
@@ -7836,7 +7840,33 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
       const filteredNodes = this._filteredNodesCache;
       this.filteredData = filteredNodes;
       const paginated = this.paginateNodes(filteredNodes);
-      this.pageData = paginated.map((node) => {
+      if (this.pageSize <= 0) {
+        this.pageData = paginated.map((node) => {
+          const decrypted = this.isEncryptionEnabled ? this._decryptedNodeMap.get(node.id) : void 0;
+          const nodeData = decrypted ? { ...node.data, ...decrypted } : node.data;
+          return {
+            ...nodeData,
+            ...node,
+            __treeNode: node
+          };
+        });
+      } else if (!this.isEncryptionEnabled) {
+        this.pageData = paginated.map((node) => {
+          return {
+            ...node.data,
+            ...node,
+            __treeNode: node
+          };
+        });
+      }
+      if (this.allData.length > 0) {
+        this.initialLoad = false;
+      }
+      return;
+    }
+    const visible = this.visibleRows;
+    if (this.pageSize <= 0) {
+      this.pageData = visible.map((node) => {
         const decrypted = this.isEncryptionEnabled ? this._decryptedNodeMap.get(node.id) : void 0;
         const nodeData = decrypted ? { ...node.data, ...decrypted } : node.data;
         return {
@@ -7845,21 +7875,15 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
           __treeNode: node
         };
       });
-      if (this.allData.length > 0) {
-        this.initialLoad = false;
-      }
-      return;
+    } else if (!this.isEncryptionEnabled) {
+      this.pageData = visible.map((node) => {
+        return {
+          ...node.data,
+          ...node,
+          __treeNode: node
+        };
+      });
     }
-    const visible = this.visibleRows;
-    this.pageData = visible.map((node) => {
-      const decrypted = this.isEncryptionEnabled ? this._decryptedNodeMap.get(node.id) : void 0;
-      const nodeData = decrypted ? { ...node.data, ...decrypted } : node.data;
-      return {
-        ...nodeData,
-        ...node,
-        __treeNode: node
-      };
-    });
     if (this.allData.length > 0) {
       this.initialLoad = false;
     }
@@ -7919,7 +7943,7 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
           } else {
             this._allVisibleRowsCache = [];
           }
-          this.pageData = [...this._allVisibleRowsCache];
+          this.pageData = [...this._allVisibleRowsCache ?? []];
         } else {
           this._allVisibleRowsCache = null;
           const startIndex = (this.currentPage - 1) * this.pageSize;
@@ -8032,8 +8056,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
       this.expandedNodes.add(nodeId);
     }
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8044,8 +8069,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     this._allVisibleRowsCache = null;
     this.expandedNodes.add(nodeId);
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8056,8 +8082,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     this._allVisibleRowsCache = null;
     this.expandedNodes.delete(nodeId);
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8075,8 +8102,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     const allIds = this._staticNodes.filter((n) => n.hasChildren).map((n) => n.id);
     this.expandedNodes = new Set(allIds);
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }
@@ -8087,8 +8115,9 @@ class CTreeClientDataProvider extends CFlatClientDataProvider {
     this._allVisibleRowsCache = null;
     this.expandedNodes = /* @__PURE__ */ new Set();
     this.updatePageData();
-    this.notify();
-    if (this.isEncryptionEnabled) {
+    if (!this.isEncryptionEnabled) {
+      this.notify();
+    } else {
       this.loadPageData();
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@katlux/providers",
-	"version": "0.1.1-alpha.123",
+	"version": "0.1.1-alpha.125",
 	"description": "Core data calculation and caching providers for the Katlux ecosystem",
 	"author": "Katlux",
 	"license": "Apache-2.0",