@taybart/corvid 0.1.26 → 0.1.28

package/dist/index.js

@@ -66,7 +66,6 @@ __webpack_require__.d(local_storage_namespaceObject, {
     getJSON: ()=>getJSON,
     listen: ()=>listen,
     set: ()=>set,
-    setObj: ()=>setObj,
     unlisten: ()=>unlisten,
     update: ()=>local_storage_update
 });
@@ -168,20 +167,36 @@ const clipboard = {
         if (!navigator.clipboard) throw new Error('Clipboard API not supported, or context is not https');
     },
     async copy (text) {
-        this.check();
-        await navigator.clipboard.writeText(text);
+        try {
+            this.check();
+            await navigator.clipboard.writeText(text);
+        } catch (e) {
+            throw e;
+        }
     },
     async copyArbitrary (data) {
-        this.check();
-        await navigator.clipboard.write(data);
+        try {
+            this.check();
+            await navigator.clipboard.write(data);
+        } catch (e) {
+            throw e;
+        }
     },
     async read () {
-        this.check();
-        return await navigator.clipboard.readText();
+        try {
+            this.check();
+            return await navigator.clipboard.readText();
+        } catch (e) {
+            throw e;
+        }
     },
     async readArbitrary () {
-        this.check();
-        return await navigator.clipboard.read();
+        try {
+            this.check();
+            return await navigator.clipboard.read();
+        } catch (e) {
+            throw e;
+        }
     },
     listen (query, cb) {
         let el;
@@ -713,71 +728,82 @@ function getJSON(key, _default) {
 }
 function local_storage_update(key, update1, broadcast = false) {
     const prev = get(key);
-    const value = update1(prev);
+    let value = update1(prev);
+    const v = value;
+    if ('object' == typeof value) value = JSON.stringify(value);
+    localStorage.setItem(key, value);
     if (prev !== value || broadcast) {
         const event = new CustomEvent('@corvid/ls-update', {
             detail: {
                 key,
-                value
+                value: v
             }
         });
         document.dispatchEvent(event);
     }
-    localStorage.setItem(key, value);
 }
 function set(key, value, broadcast = false) {
+    const v = value;
+    if ('object' == typeof value) value = JSON.stringify(value);
     const prev = get(key);
+    localStorage.setItem(key, value);
     if (prev !== value || broadcast) {
         const event = new CustomEvent('@corvid/ls-update', {
             detail: {
                 key,
-                value
+                value: v
             }
         });
         document.dispatchEvent(event);
     }
-    if ('object' == typeof value) value = JSON.stringify(value);
-    localStorage.setItem(key, value);
-}
-function setObj(update, prefix, broadcast = false) {
-    const flatten = (ob)=>{
-        const ret = {};
-        for(let i in ob)if (ob.hasOwnProperty(i)) if ('object' == typeof ob[i] && null !== ob[i]) {
-            const flat = flatten(ob[i]);
-            for(let x in flat)if (flat.hasOwnProperty(x)) ret[`${i}.${x}`] = flat[x];
-        } else ret[i] = ob[i];
-        return ret;
-    };
-    for (let [k, v] of Object.entries(flatten(update))){
-        let key = k;
-        if (prefix) key = `${prefix}.${k}`;
-        set(key, v, broadcast);
-    }
 }
 const listeners = new Map();
 function listen(key, cb) {
-    const listener = (ev)=>{
-        if (ev.detail.key === key || '*' === key) {
+    const customListener = (ev)=>{
+        const customEv = ev;
+        if (customEv.detail.key === key || '*' === key) {
+            if (cb instanceof dom_el) {
+                if (customEv.detail.key === key) cb.content(customEv.detail.value);
+                return;
+            }
+            cb({
+                key: customEv.detail.key,
+                value: customEv.detail.value
+            });
+        }
+    };
+    const storageListener = (ev)=>{
+        const storageEv = ev;
+        if (storageEv.key === key || '*' === key) {
+            let value = storageEv.newValue;
+            try {
+                value = JSON.parse(value);
+            } catch (e) {}
             if (cb instanceof dom_el) {
-                if (ev.detail.key === key) cb.content(ev.detail.value);
+                if (storageEv.key === key) cb.content(value);
                 return;
             }
             cb({
-                key: ev.detail.key,
-                value: ev.detail.value
+                key: storageEv.key,
+                value
             });
         }
     };
     if (!listeners.has(key)) listeners.set(key, new Map());
-    listeners.get(key).set(cb, listener);
-    document.addEventListener('@corvid/ls-update', listener);
+    listeners.get(key).set(cb, {
+        custom: customListener,
+        storage: storageListener
+    });
+    document.addEventListener('@corvid/ls-update', customListener);
+    window.addEventListener('storage', storageListener);
 }
 function unlisten(key, cb) {
     const keyListeners = listeners.get(key);
     if (!keyListeners) return;
     const listener = keyListeners.get(cb);
     if (!listener) return;
-    document.removeEventListener('@corvid/ls-update', listener);
+    document.removeEventListener('@corvid/ls-update', listener.custom);
+    window.removeEventListener('storage', listener.storage);
     keyListeners.delete(cb);
     if (0 === keyListeners.size) listeners.delete(key);
 }

package/dist/local_storage.d.ts

@@ -3,7 +3,6 @@ export declare function get(key: string, _default?: any): any;
 export declare function getJSON(key: string, _default?: any): any;
 export declare function update(key: string, update: (current: any) => any, broadcast?: boolean): void;
 export declare function set(key: string, value: any, broadcast?: boolean): void;
-export declare function setObj(update: object, prefix?: string, broadcast?: boolean): void;
 export declare function listen(key: string, cb: (update: {
     key: string;
     value: any;

package/dist/ls.js

@@ -267,71 +267,82 @@ function getJSON(key, _default) {
 }
 function local_storage_update(key, update1, broadcast = false) {
     const prev = get(key);
-    const value = update1(prev);
+    let value = update1(prev);
+    const v = value;
+    if ('object' == typeof value) value = JSON.stringify(value);
+    localStorage.setItem(key, value);
     if (prev !== value || broadcast) {
         const event = new CustomEvent('@corvid/ls-update', {
             detail: {
                 key,
-                value
+                value: v
             }
         });
         document.dispatchEvent(event);
     }
-    localStorage.setItem(key, value);
 }
 function set(key, value, broadcast = false) {
+    const v = value;
+    if ('object' == typeof value) value = JSON.stringify(value);
     const prev = get(key);
+    localStorage.setItem(key, value);
     if (prev !== value || broadcast) {
         const event = new CustomEvent('@corvid/ls-update', {
             detail: {
                 key,
-                value
+                value: v
             }
         });
         document.dispatchEvent(event);
     }
-    if ('object' == typeof value) value = JSON.stringify(value);
-    localStorage.setItem(key, value);
-}
-function setObj(update, prefix, broadcast = false) {
-    const flatten = (ob)=>{
-        const ret = {};
-        for(let i in ob)if (ob.hasOwnProperty(i)) if ('object' == typeof ob[i] && null !== ob[i]) {
-            const flat = flatten(ob[i]);
-            for(let x in flat)if (flat.hasOwnProperty(x)) ret[`${i}.${x}`] = flat[x];
-        } else ret[i] = ob[i];
-        return ret;
-    };
-    for (let [k, v] of Object.entries(flatten(update))){
-        let key = k;
-        if (prefix) key = `${prefix}.${k}`;
-        set(key, v, broadcast);
-    }
 }
 const listeners = new Map();
 function listen(key, cb) {
-    const listener = (ev)=>{
-        if (ev.detail.key === key || '*' === key) {
+    const customListener = (ev)=>{
+        const customEv = ev;
+        if (customEv.detail.key === key || '*' === key) {
+            if (cb instanceof dom_el) {
+                if (customEv.detail.key === key) cb.content(customEv.detail.value);
+                return;
+            }
+            cb({
+                key: customEv.detail.key,
+                value: customEv.detail.value
+            });
+        }
+    };
+    const storageListener = (ev)=>{
+        const storageEv = ev;
+        if (storageEv.key === key || '*' === key) {
+            let value = storageEv.newValue;
+            try {
+                value = JSON.parse(value);
+            } catch (e) {}
             if (cb instanceof dom_el) {
-                if (ev.detail.key === key) cb.content(ev.detail.value);
+                if (storageEv.key === key) cb.content(value);
                 return;
             }
             cb({
-                key: ev.detail.key,
-                value: ev.detail.value
+                key: storageEv.key,
+                value
             });
         }
     };
     if (!listeners.has(key)) listeners.set(key, new Map());
-    listeners.get(key).set(cb, listener);
-    document.addEventListener('@corvid/ls-update', listener);
+    listeners.get(key).set(cb, {
+        custom: customListener,
+        storage: storageListener
+    });
+    document.addEventListener('@corvid/ls-update', customListener);
+    window.addEventListener('storage', storageListener);
 }
 function unlisten(key, cb) {
     const keyListeners = listeners.get(key);
     if (!keyListeners) return;
     const listener = keyListeners.get(cb);
     if (!listener) return;
-    document.removeEventListener('@corvid/ls-update', listener);
+    document.removeEventListener('@corvid/ls-update', listener.custom);
+    window.removeEventListener('storage', listener.storage);
     keyListeners.delete(cb);
     if (0 === keyListeners.size) listeners.delete(key);
 }
@@ -347,4 +358,4 @@ const local_storage = {
     unlisten,
     clear
 };
-export { clear, local_storage as default, get, getJSON, listen, set, setObj, unlisten, local_storage_update as update };
+export { clear, local_storage as default, get, getJSON, listen, set, unlisten, local_storage_update as update };

package/dist/utils.js

@@ -18,20 +18,36 @@ const clipboard = {
         if (!navigator.clipboard) throw new Error('Clipboard API not supported, or context is not https');
     },
     async copy (text) {
-        this.check();
-        await navigator.clipboard.writeText(text);
+        try {
+            this.check();
+            await navigator.clipboard.writeText(text);
+        } catch (e) {
+            throw e;
+        }
     },
     async copyArbitrary (data) {
-        this.check();
-        await navigator.clipboard.write(data);
+        try {
+            this.check();
+            await navigator.clipboard.write(data);
+        } catch (e) {
+            throw e;
+        }
     },
     async read () {
-        this.check();
-        return await navigator.clipboard.readText();
+        try {
+            this.check();
+            return await navigator.clipboard.readText();
+        } catch (e) {
+            throw e;
+        }
     },
     async readArbitrary () {
-        this.check();
-        return await navigator.clipboard.read();
+        try {
+            this.check();
+            return await navigator.clipboard.read();
+        } catch (e) {
+            throw e;
+        }
     },
     listen (query, cb) {
         let el;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taybart/corvid",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {