@esportsplus/web-storage 0.0.1 → 0.0.2

package/build/index.d.ts

@@ -1,9 +1,10 @@
 import local from './local';
 declare const _default: {
     local: {
-        clear: (callback?: ((err: any) => void) | undefined) => Promise<void>;
+        clear: () => void;
         delete: (key: string) => void;
-        get: (key: string) => Promise<any>;
+        get: (key: string, fallback?: any) => Promise<any>;
+        has: (key: string) => Promise<boolean>;
         set: (key: string, value: any) => void;
         useIndexedDB: (options?: import("./local/types").Options) => void;
         useLocalStorage: (options?: import("./local/types").Options) => void;

package/build/local/index.d.ts

@@ -1,8 +1,9 @@
 import type { Options } from './types';
 declare const _default: {
-    clear: (callback?: ((err: any) => void) | undefined) => Promise<void>;
+    clear: () => void;
     delete: (key: string) => void;
-    get: (key: string) => Promise<any>;
+    get: (key: string, fallback?: any) => Promise<any>;
+    has: (key: string) => Promise<boolean>;
     set: (key: string, value: any) => void;
     useIndexedDB: (options?: Options) => void;
     useLocalStorage: (options?: Options) => void;

package/build/local/index.js

@@ -1,16 +1,36 @@
+import dot from '@esportsplus/dot';
 import localforage from 'localforage';
-let driver = localforage.LOCALSTORAGE;
+let cache = {}, driver = localforage.LOCALSTORAGE;
 function init(options = {}) {
     localforage.config(Object.assign({ name: 'store' }, options, { driver }));
 }
-const clear = localforage.clear;
+const clear = () => {
+    cache = {};
+    localforage.clear();
+};
 const del = (key) => {
+    cache[key] = undefined;
     localforage.removeItem(key);
 };
-const get = (key) => {
-    return localforage.getItem(key);
+const get = async (key, fallback = null) => {
+    if (dot.has(cache, key)) {
+        return dot.get(cache, key);
+    }
+    let value = await localforage.getItem(key);
+    if (value === null && typeof fallback === 'function') {
+        set(key, await fallback());
+    }
+    value = dot.get(cache, key) || value;
+    if (value === null) {
+        throw new Error(`'${key}' has not been set in storage`);
+    }
+    return value;
+};
+const has = async (key) => {
+    return dot.has(cache, key) || (await localforage.getItem(key)) === null;
 };
 const set = (key, value) => {
+    cache[key] = value;
     localforage.setItem(key, value);
 };
 const useIndexedDB = (options = {}) => {
@@ -25,4 +45,4 @@ const useOptions = (options = {}) => {
     init(options);
 };
 init();
-export default { clear, delete: del, get, set, useIndexedDB, useLocalStorage, useOptions };
+export default { clear, delete: del, get, has, set, useIndexedDB, useLocalStorage, useOptions };

package/package.json

@@ -26,5 +26,5 @@
         "prepublishOnly": "npm run build"
     },
     "types": "./build/index.d.ts",
-    "version": "0.0.1"
+    "version": "0.0.2"
 }

package/src/local/index.ts

@@ -1,46 +1,73 @@
-import type { Options } from './types';
-import localforage from 'localforage';
-
-
-let driver: any = localforage.LOCALSTORAGE;
-
-
-function init(options: Options = {}): void {
-    localforage.config(Object.assign({ name: 'store' }, options, { driver }));
-}
-
-
-const clear = localforage.clear;
-
-const del = (key: string): void => {
-    localforage.removeItem(key);
-}
-
-const get = (key: string): Promise<any> => {
-    return localforage.getItem(key);
-};
-
-const set = (key: string, value: any): void => {
-    localforage.setItem(key, value);
-};
-
-const useIndexedDB = (options: Options = {}): void => {
-    driver = localforage.INDEXEDDB;
-    init(options);
-};
-
-const useLocalStorage = (options: Options = {}): void => {
-    driver = localforage.LOCALSTORAGE;
-    init(options);
-};
-
-const useOptions = (options: Options = {}): void => {
-    init(options);
-};
-
-
-// Initialize using localstorage as default storage
-init();
-
-
-export default { clear, delete: del, get, set, useIndexedDB, useLocalStorage, useOptions };
+import type { Options } from './types';
+import dot from '@esportsplus/dot';
+import localforage from 'localforage';
+
+
+let cache: any = {},
+    driver: any = localforage.LOCALSTORAGE;
+
+
+function init(options: Options = {}): void {
+    localforage.config(Object.assign({ name: 'store' }, options, { driver }));
+}
+
+
+const clear = () => {
+    cache = {};
+    localforage.clear();
+};
+
+const del = (key: string): void => {
+    cache[key] = undefined;
+    localforage.removeItem(key);
+}
+
+const get = async (key: string, fallback: any = null): Promise<any> => {
+    if (dot.has(cache, key)) {
+        return dot.get(cache, key);
+    }
+
+    let value: any = await localforage.getItem(key);
+
+    if (value === null && typeof fallback === 'function' ) {
+        set(key, await fallback());
+    }
+
+    value = dot.get(cache, key) || value;
+
+    if (value === null) {
+        throw new Error(`'${key}' has not been set in storage`);
+    }
+
+    return value;
+};
+
+const has = async (key: string): Promise<boolean> => {
+    return dot.has(cache, key) || (await localforage.getItem(key)) === null;
+};
+
+const set = (key: string, value: any): void => {
+    cache[key] = value;
+    localforage.setItem(key, value);
+};
+
+const useIndexedDB = (options: Options = {}): void => {
+    driver = localforage.INDEXEDDB;
+    init(options);
+};
+
+const useLocalStorage = (options: Options = {}): void => {
+    driver = localforage.LOCALSTORAGE;
+    init(options);
+};
+
+const useOptions = (options: Options = {}): void => {
+    init(options);
+};
+
+
+// Initialize using localstorage as default storage
+init();
+
+
+export default { clear, delete: del, get, has, set, useIndexedDB, useLocalStorage, useOptions };