@taybart/corvid 0.1.17 → 0.1.19

package/README.md

@@ -1,8 +1,11 @@
 # Corvid
 
-fear the crow
+<p align="center"><img src="https://github.com/user-attachments/assets/b3bbf267-d7b0-4116-80a5-b932b409a111" width="100" height="100"></p>
 
-![crowtein](https://github.com/user-attachments/assets/b3bbf267-d7b0-4116-80a5-b932b409a111)
+<p align="center">fear the crow</p>
+
+
+<!-- ![crowtein](https://github.com/user-attachments/assets/b3bbf267-d7b0-4116-80a5-b932b409a111) -->
 
 ## Usage
 
@@ -83,7 +86,7 @@ import { network } '@taybart/corvid'
 const api = network.create({
   url: 'https://api.example.com',
   credentials: 'include',
-  success: 250, // odd success code
+  success: 250, // check for non-200 success code
   // corvid params, string, or custom object that has .toString() and renders url safe params
   params: new network.params({hello: 'corvid'})
 })
@@ -115,15 +118,27 @@ style.onDarkMode((isDark) => {
     // get css variables
     console.log(`is dark mode: ${isDark} and background is ${style.cssVar('--color-bg')`)
 })
+
+```
+
+Just handle switching automatically
+
+```html
+<script type='module'>
+    import { handleThemeSwitch } from '@taybart/corvid/style'
+    handleThemeSwitch()
+</script>
 ```
 
 ### QR
 
 ```js
+import { dom } from '@taybart/corvid'
 import { QR } '@taybart/corvid/qr'
 
+const el = new dom.el('#qr')
 QR.render({
     text: 'https://example.com',
     size: 200,
-}, document.getElementById('qr'))
+}, el) // can also be regular element query -> document.getElementById('qr')
 ```

package/dist/dom.d.ts

@@ -25,6 +25,7 @@ type elOpts = {
     style?: Object;
     id?: string;
     parent?: HTMLElement | el;
+    attrs?: Object;
 };
 export declare class el {
     el: HTMLElement | null;

package/dist/dom.js

@@ -233,7 +233,7 @@ class dom_el {
             this.el = opts;
             return;
         }
-        const { query, element, type, class: styleClass, style, id, content, parent } = opts;
+        const { query, element, type, class: styleClass, style, id, content, parent, attrs } = opts;
         if (query) {
             this.log.debug(`using query: ${query}`);
             this.query = query;
@@ -264,6 +264,10 @@ class dom_el {
                 parent.appendChild(this.el);
             }
         }
+        if (attrs) for (const [key, val] of Object.entries(attrs)){
+            this.log.debug(`setting prop: ${key} to ${val}`);
+            this.el.setAttribute(key, val);
+        }
     }
 }
 function interpolate(str, params) {

package/dist/index.js

@@ -62,9 +62,11 @@ __webpack_require__.r(local_storage_namespaceObject);
 __webpack_require__.d(local_storage_namespaceObject, {
     clear: ()=>clear,
     get: ()=>get,
+    getJSON: ()=>getJSON,
     listen: ()=>listen,
     set: ()=>set,
     setObj: ()=>setObj,
+    unlisten: ()=>unlisten,
     update: ()=>local_storage_update
 });
 function bytesToHuman(bytes, options = {}) {
@@ -411,7 +413,7 @@ class dom_el {
             this.el = opts;
             return;
         }
-        const { query, element, type, class: styleClass, style, id, content, parent } = opts;
+        const { query, element, type, class: styleClass, style, id, content, parent, attrs } = opts;
         if (query) {
             this.log.debug(`using query: ${query}`);
             this.query = query;
@@ -442,6 +444,10 @@ class dom_el {
                 parent.appendChild(this.el);
             }
         }
+        if (attrs) for (const [key, val] of Object.entries(attrs)){
+            this.log.debug(`setting prop: ${key} to ${val}`);
+            this.el.setAttribute(key, val);
+        }
     }
 }
 function interpolate(str, params) {
@@ -487,10 +493,8 @@ class network_params {
     }
 }
 class request {
-    auth(token) {
-        const header = `Bearer ${token}`;
-        this.log.debug(`adding auth token header ${header}`);
-        this.opts.headers.Authorization = header;
+    auth(a) {
+        this.opts.auth = a;
         return this;
     }
     basicAuth(username, password) {
@@ -504,7 +508,7 @@ class request {
         return this;
     }
     build({ path, params: passedParams, override } = {}) {
-        if (this.opts.auth && !this.opts.headers.Authorization) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
+        if (this.opts.auth) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
         else this.opts.headers.Authorization = `Basic ${btoa(`${this.opts.auth.username}:${this.opts.auth.password}`)}`;
         if (!override) override = {};
         const body = override.body || this.opts.body;
@@ -533,7 +537,7 @@ class request {
             }
         };
     }
-    async do({ path, params: passedParams, override = {} } = {}) {
+    async do({ path, params: passedParams, override = {}, _recurselevel = 0 } = {}) {
         const { url, options } = this.build({
             path,
             params: passedParams,
@@ -544,7 +548,15 @@ class request {
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
             const body = await res.text();
-            throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
+            if (401 === res.status && this.opts.onUnauthorized && _recurselevel < 1) {
+                this.log.warn("unauthorized");
+                if (await this.opts.onUnauthorized.call(this, this, body)) return this.do({
+                    path,
+                    params: passedParams,
+                    override,
+                    _recurselevel: _recurselevel + 1
+                });
+            } else throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
         }
         this.log.debug(`content type: ${res.headers.get('content-type')}`);
         if ('application/json' === res.headers.get('content-type')) return await res.json();
@@ -565,6 +577,7 @@ class request {
             this.log.debug("converting object params to class");
             this.opts.params = new network_params(this.opts.params);
         }
+        if (!this.opts.fetch) this.opts.fetch = window.fetch;
         this.log.debug(`with options: ${JSON.stringify(this.opts)}`);
     }
 }
@@ -683,6 +696,11 @@ function get(key, _default) {
     }
     return ret;
 }
+function getJSON(key, _default) {
+    const val = get(key, _default);
+    if (null === val) return null;
+    return JSON.parse(val);
+}
 function local_storage_update(key, update1, broadcast = false) {
     const prev = get(key);
     const value = update1(prev);
@@ -708,6 +726,7 @@ function set(key, value, broadcast = false) {
         });
         document.dispatchEvent(event);
     }
+    if ('object' == typeof value) value = JSON.stringify(value);
     localStorage.setItem(key, value);
 }
 function setObj(update, prefix, broadcast = false) {
@@ -725,8 +744,9 @@ function setObj(update, prefix, broadcast = false) {
         set(key, v, broadcast);
     }
 }
+const listeners = new Map();
 function listen(key, cb) {
-    document.addEventListener('@corvid/ls-update', (ev)=>{
+    const listener = (ev)=>{
         if (ev.detail.key === key || '*' === key) {
             if (cb instanceof dom_el) {
                 if (ev.detail.key === key) cb.content(ev.detail.value);
@@ -737,7 +757,19 @@ function listen(key, cb) {
                 value: ev.detail.value
             });
         }
-    });
+    };
+    if (!listeners.has(key)) listeners.set(key, new Map());
+    listeners.get(key).set(cb, listener);
+    document.addEventListener('@corvid/ls-update', listener);
+}
+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);
+    keyListeners.delete(cb);
+    if (0 === keyListeners.size) listeners.delete(key);
 }
 function clear(key) {
     localStorage.removeItem(key);

package/dist/local_storage.d.ts

@@ -1,5 +1,6 @@
 import { el } from './dom';
 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;
@@ -7,4 +8,8 @@ export declare function listen(key: string, cb: (update: {
     key: string;
     value: any;
 }) => void | el): void;
+export declare function unlisten(key: string, cb: (update: {
+    key: string;
+    value: any;
+}) => void | el): void;
 export declare function clear(key: string): void;

package/dist/ls.js

@@ -204,7 +204,7 @@ class dom_el {
             this.el = opts;
             return;
         }
-        const { query, element, type, class: styleClass, style, id, content, parent } = opts;
+        const { query, element, type, class: styleClass, style, id, content, parent, attrs } = opts;
         if (query) {
             this.log.debug(`using query: ${query}`);
             this.query = query;
@@ -235,6 +235,10 @@ class dom_el {
                 parent.appendChild(this.el);
             }
         }
+        if (attrs) for (const [key, val] of Object.entries(attrs)){
+            this.log.debug(`setting prop: ${key} to ${val}`);
+            this.el.setAttribute(key, val);
+        }
     }
 }
 function interpolate(str, params) {
@@ -251,6 +255,11 @@ function get(key, _default) {
     }
     return ret;
 }
+function getJSON(key, _default) {
+    const val = get(key, _default);
+    if (null === val) return null;
+    return JSON.parse(val);
+}
 function local_storage_update(key, update1, broadcast = false) {
     const prev = get(key);
     const value = update1(prev);
@@ -276,6 +285,7 @@ function set(key, value, broadcast = false) {
         });
         document.dispatchEvent(event);
     }
+    if ('object' == typeof value) value = JSON.stringify(value);
     localStorage.setItem(key, value);
 }
 function setObj(update, prefix, broadcast = false) {
@@ -293,8 +303,9 @@ function setObj(update, prefix, broadcast = false) {
         set(key, v, broadcast);
     }
 }
+const listeners = new Map();
 function listen(key, cb) {
-    document.addEventListener('@corvid/ls-update', (ev)=>{
+    const listener = (ev)=>{
         if (ev.detail.key === key || '*' === key) {
             if (cb instanceof dom_el) {
                 if (ev.detail.key === key) cb.content(ev.detail.value);
@@ -305,9 +316,21 @@ function listen(key, cb) {
                 value: ev.detail.value
             });
         }
-    });
+    };
+    if (!listeners.has(key)) listeners.set(key, new Map());
+    listeners.get(key).set(cb, listener);
+    document.addEventListener('@corvid/ls-update', listener);
+}
+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);
+    keyListeners.delete(cb);
+    if (0 === keyListeners.size) listeners.delete(key);
 }
 function clear(key) {
     localStorage.removeItem(key);
 }
-export { clear, get, listen, set, setObj, local_storage_update as update };
+export { clear, get, getJSON, listen, set, setObj, unlisten, local_storage_update as update };

package/dist/network.d.ts

@@ -22,12 +22,14 @@ export type requestOpts = {
     expect?: number;
     credentials?: RequestCredentials;
     insecureNoVerify?: boolean;
+    onUnauthorized?: (client: request, body: any) => Promise<boolean>;
+    fetch?: (url: string, init: RequestInit) => Promise<any>;
 };
 export declare class request {
     opts: requestOpts;
     log: logger;
     constructor(opts?: requestOpts, verbose?: boolean);
-    auth(token: string | {
+    auth(a: string | {
         username: string;
         password: string;
     }): this;
@@ -60,7 +62,7 @@ export declare class request {
             body: string;
         };
     };
-    do({ path, params: passedParams, override, }?: {
+    do({ path, params: passedParams, override, _recurselevel, }?: {
         path?: string;
         params?: Object;
         method?: string;
@@ -71,6 +73,7 @@ export declare class request {
             body?: Object;
             expect?: number;
         };
+        _recurselevel?: number;
     }): Promise<any>;
 }
 /*** websocket ***/

package/dist/network.js

@@ -84,10 +84,8 @@ class network_params {
     }
 }
 class request {
-    auth(token) {
-        const header = `Bearer ${token}`;
-        this.log.debug(`adding auth token header ${header}`);
-        this.opts.headers.Authorization = header;
+    auth(a) {
+        this.opts.auth = a;
         return this;
     }
     basicAuth(username, password) {
@@ -101,7 +99,7 @@ class request {
         return this;
     }
     build({ path, params: passedParams, override } = {}) {
-        if (this.opts.auth && !this.opts.headers.Authorization) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
+        if (this.opts.auth) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
         else this.opts.headers.Authorization = `Basic ${btoa(`${this.opts.auth.username}:${this.opts.auth.password}`)}`;
         if (!override) override = {};
         const body = override.body || this.opts.body;
@@ -130,7 +128,7 @@ class request {
             }
         };
     }
-    async do({ path, params: passedParams, override = {} } = {}) {
+    async do({ path, params: passedParams, override = {}, _recurselevel = 0 } = {}) {
         const { url, options } = this.build({
             path,
             params: passedParams,
@@ -141,7 +139,15 @@ class request {
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
             const body = await res.text();
-            throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
+            if (401 === res.status && this.opts.onUnauthorized && _recurselevel < 1) {
+                this.log.warn("unauthorized");
+                if (await this.opts.onUnauthorized.call(this, this, body)) return this.do({
+                    path,
+                    params: passedParams,
+                    override,
+                    _recurselevel: _recurselevel + 1
+                });
+            } else throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
         }
         this.log.debug(`content type: ${res.headers.get('content-type')}`);
         if ('application/json' === res.headers.get('content-type')) return await res.json();
@@ -162,6 +168,7 @@ class request {
             this.log.debug("converting object params to class");
             this.opts.params = new network_params(this.opts.params);
         }
+        if (!this.opts.fetch) this.opts.fetch = window.fetch;
         this.log.debug(`with options: ${JSON.stringify(this.opts)}`);
     }
 }

package/dist/qr.js

@@ -2110,7 +2110,7 @@ class dom_el {
             this.el = opts;
             return;
         }
-        const { query, element, type, class: styleClass, style, id, content, parent } = opts;
+        const { query, element, type, class: styleClass, style, id, content, parent, attrs } = opts;
         if (query) {
             this.log.debug(`using query: ${query}`);
             this.query = query;
@@ -2141,6 +2141,10 @@ class dom_el {
                 parent.appendChild(this.el);
             }
         }
+        if (attrs) for (const [key, val] of Object.entries(attrs)){
+            this.log.debug(`setting prop: ${key} to ${val}`);
+            this.el.setAttribute(key, val);
+        }
     }
 }
 function interpolate(str, params) {

package/dist/style.js

@@ -0,0 +1,37 @@
+function toKebab(str) {
+    return str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, (s, ofs)=>(ofs ? '-' : '') + s.toLowerCase());
+}
+function cssVar(name) {
+    const style = window.getComputedStyle(document.body);
+    return style.getPropertyValue(name);
+}
+function render(style) {
+    let s = '';
+    Object.entries(style).forEach(([k, v])=>s += `${toKebab(k)}:${v};`);
+    return s;
+}
+function isDarkMode() {
+    return window.matchMedia('(prefers-color-scheme: dark)').matches;
+}
+function onDarkMode(cb) {
+    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (ev)=>{
+        cb(ev.matches);
+    });
+}
+function switchTheme(theme) {
+    document.documentElement.setAttribute('data-theme', theme);
+}
+function handleThemeSwitch() {
+    switchTheme(isDarkMode() ? 'dark' : 'light');
+    onDarkMode((dark)=>{
+        switchTheme(dark ? 'dark' : 'light');
+    });
+}
+function gradient(start, end, value) {
+    value = Math.max(0, Math.min(100, value));
+    const red = Math.round(start.red + (end.red - start.red) * value / 100);
+    const green = Math.round(start.green + (end.green - start.green) * value / 100);
+    const blue = Math.round(start.blue + (end.blue - start.blue) * value / 100);
+    return `rgb(${red}, ${green}, ${blue})`;
+}
+export { cssVar, gradient, handleThemeSwitch, isDarkMode, onDarkMode, render, switchTheme };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taybart/corvid",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -12,6 +12,10 @@
       "types": "./dist/dom.d.ts",
       "import": "./dist/dom.js"
     },
+    "./style": {
+      "types": "./dist/style.d.ts",
+      "import": "./dist/style.js"
+    },
     "./local_storage": {
       "types": "./dist/ls.d.ts",
       "import": "./dist/ls.js"
@@ -30,6 +34,10 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "rslib build",
+    "dev": "rslib build --watch"
+  },
   "devDependencies": {
     "@happy-dom/global-registrator": "^17.4.7",
     "@rslib/core": "^0.6.2",
@@ -39,9 +47,5 @@
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.8.1",
     "typescript": "^5.8.3"
-  },
-  "scripts": {
-    "build": "rslib build",
-    "dev": "rslib build --watch"
   }
-}
+}