@libs-ui/utils 0.2.51 → 0.2.53

package/fesm2022/libs-ui-utils.mjs

@@ -241,11 +241,13 @@ const set = (obj, path, value) => {
                 key = key.replace(/\[(\d+)]/g, '$1');
                 current[key] = /\[(\d+)]/g.test(nextKey) ? [] : {};
             }
-            lastIsSignal = isSignal(current[key]);
-            current = lastIsSignal ? current[key]() : current[key];
+            current = key ? current[key] : current;
+            lastIsSignal = isSignal(current);
+            current = lastIsSignal ? current() : current;
             return;
         }
         // Gán giá trị ở cuối đường dẫn
+        key = key.replace(/\[(\d+)]/g, '$1');
         if (lastIsSignal) {
             current.update((data) => {
                 data[key] = value;
@@ -968,8 +970,8 @@ class UtilsCache {
         if (config.typeKeyClearLocalStorage) {
             UtilsCache.typeKeyClearLocalStorage = config.typeKeyClearLocalStorage;
         }
-        if (config.listKeyKeepWhenClearALll) {
-            UtilsCache.listKeyKeepWhenClearALll = config.listKeyKeepWhenClearALll;
+        if (config.listKeyKeepWhenClearAll) {
+            UtilsCache.listKeyKeepWhenClearALll = config.listKeyKeepWhenClearAll;
         }
         if (config.languageKeyCache) {
             UtilsCache.languageKeyCache = config.languageKeyCache;
@@ -991,7 +993,7 @@ class UtilsCache {
             request.onupgradeneeded = (event) => {
                 const db = event.target.result;
                 if (!db.objectStoreNames.contains(UtilsCache.dbName)) {
-                    const objectStore = db.createObjectStore(UtilsCache.dbName, { keyPath: 'id', autoIncrement: true });
+                    const objectStore = db.createObjectStore(UtilsCache.dbName, { keyPath: UtilsCache.itemIndexByKey, autoIncrement: true });
                     objectStore.createIndex(UtilsCache.itemIndexByKey, UtilsCache.itemIndexByKey, { unique: true });
                 }
             };
@@ -1087,8 +1089,7 @@ class UtilsCache {
             if (!objectStore) {
                 return resolve(default_value);
             }
-            const index = objectStore.index(UtilsCache.itemIndexByKey);
-            const request = index.get(key);
+            const request = objectStore.get(key);
             request.onsuccess = () => {
                 if (!request.result) {
                     return resolve(default_value);
@@ -1136,41 +1137,25 @@ class UtilsCache {
         return default_value;
     }
     static async SetAsync(key, value, expireTimeBySecond = UtilsCache.CACHE_EXPIRE_TIME_DEFAULT, isKeyMD5 = false) {
-        return new Promise(async (resolve, reject) => {
-            let objectStore = await UtilsCache.getObjectStore();
+        return new Promise(async (resolve) => {
+            const objectStore = await UtilsCache.getObjectStore();
             key = isKeyMD5 ? key : md5(key);
             try {
                 const currentMillisecond = expireTimeBySecond === UtilsCache.CACHE_EXPIRE_NONE ? UtilsCache.CACHE_EXPIRE_NONE : (new Date().valueOf() / 1000) + expireTimeBySecond;
                 const data = {
-                    key: key,
                     value: encrypt(JSON.stringify({ json: value, expire: currentMillisecond })),
                 };
+                data[UtilsCache.itemIndexByKey] = key;
                 if (!objectStore) {
                     return resolve(-1);
                 }
-                const index = objectStore.index(UtilsCache.itemIndexByKey);
-                const getIndexKeyRequest = index.get(key);
-                getIndexKeyRequest.onsuccess = async () => {
-                    const item = getIndexKeyRequest.result;
-                    if (item) {
-                        await UtilsCache.ClearAsync(key, true);
-                        objectStore = await UtilsCache.getObjectStore();
-                    }
-                    if (!objectStore) {
-                        return resolve(-1);
-                    }
-                    const request = objectStore.add(data);
-                    request.onsuccess = () => {
-                        resolve(request.result);
-                    };
-                    request.onerror = () => {
-                        console.log(request.error);
-                        return resolve(-1);
-                    };
+                const request = objectStore?.put(data);
+                request.onsuccess = () => {
+                    resolve(request.result);
                 };
-                getIndexKeyRequest.onerror = (event) => {
-                    console.error('Error fetching item by name:', event.target.error);
-                    reject(event.target.error);
+                request.onerror = () => {
+                    console.log(request.error);
+                    return resolve(-1);
                 };
             }
             catch (error) {
@@ -1201,23 +1186,11 @@ class UtilsCache {
             if (!objectStore) {
                 return resolve({});
             }
-            const index = objectStore.index(UtilsCache.itemIndexByKey);
-            const getRequest = index.get(isMD5 ? key : md5(key));
-            getRequest.onsuccess = () => {
-                const result = getRequest.result;
-                if (result) {
-                    const deleteRequest = objectStore.delete(result.id); // Xóa theo id của item tìm được
-                    deleteRequest.onsuccess = () => {
-                        resolve({});
-                    };
-                    deleteRequest.onerror = () => {
-                        resolve({});
-                    };
-                    return;
-                }
+            const request = objectStore.delete(isMD5 ? key : md5(key));
+            request.onsuccess = () => {
                 resolve({});
             };
-            getRequest.onerror = () => {
+            request.onerror = () => {
                 resolve({});
             };
         });
@@ -1229,8 +1202,12 @@ class UtilsCache {
         this.LocalStorage.removeItem(key);
     }
     static ClearAllAsync() {
-        return new Promise((resolve, reject) => {
-            const request = indexedDB.deleteDatabase(this.dbName);
+        return new Promise(async (resolve, reject) => {
+            const objectStore = await UtilsCache.getObjectStore();
+            if (!objectStore) {
+                return resolve({});
+            }
+            const request = objectStore.clear();
             request.onsuccess = () => {
                 console.log('Database deleted successfully');
                 resolve(true);
@@ -1239,9 +1216,6 @@ class UtilsCache {
                 console.error('Error deleting database:', event.target.error);
                 reject(event.target.error);
             };
-            request.onblocked = () => {
-                console.warn('Delete request is blocked');
-            };
         });
     }
     static ClearAll() {
@@ -1293,18 +1267,18 @@ class UtilsCache {
             if (!objectStore) {
                 return resolve({});
             }
-            const index = objectStore.index(UtilsCache.itemIndexByKey);
             // Lấy tất cả các keys từ index
-            const request = index.getAll();
+            const request = objectStore.getAll();
             keyCacheStartWith = isKeyMD5 ? keyCacheStartWith : md5(keyCacheStartWith);
             request.onsuccess = (e) => {
                 const data = e.target.result;
+                console.log(data);
                 if (!Array.isArray(data)) {
                     return resolve({});
                 }
                 data.forEach(obj => {
-                    if (obj.key.startsWith(keyCacheStartWith)) {
-                        UtilsCache.ClearAsync(obj.key, true);
+                    if (obj[UtilsCache.itemIndexByKey].startsWith(keyCacheStartWith)) {
+                        UtilsCache.ClearAsync(obj[UtilsCache.itemIndexByKey], true);
                     }
                 });
                 return resolve({});
@@ -1326,6 +1300,22 @@ class UtilsCache {
             }
         });
     }
+    static DeleteDatabaseIndexDB(dbName) {
+        return new Promise((resolve, reject) => {
+            const request = indexedDB.deleteDatabase(dbName);
+            request.onsuccess = () => {
+                console.log('Database deleted successfully');
+                resolve(true);
+            };
+            request.onerror = (event) => {
+                console.error('Error deleting database:', event.target.error);
+                reject(event.target.error);
+            };
+            request.onblocked = () => {
+                console.warn('Delete request is blocked');
+            };
+        });
+    }
 }
 
 const formatNumber = (value) => {