ag-common 0.0.129 → 0.0.130

package/dist/common/helpers/string.d.ts

@@ -33,3 +33,4 @@ export declare function containsInsensitive(str: string, ...args: string[]): boo
  * @returns
  */
 export declare const safeStringify: (obj: any, indent?: number) => string;
+export declare const chunkString: (str: string, length: number) => string[];

package/dist/common/helpers/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeStringify = exports.containsInsensitive = exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = exports.fromBase64 = exports.toBase64 = void 0;
+exports.chunkString = exports.safeStringify = exports.containsInsensitive = exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = exports.fromBase64 = exports.toBase64 = void 0;
 const toBase64 = (str) => Buffer.from(str).toString('base64');
 exports.toBase64 = toBase64;
 const fromBase64 = (str) => Buffer.from(decodeURIComponent(str), 'base64').toString();
@@ -140,3 +140,5 @@ const safeStringify = (obj, indent = 2) => {
     return retVal;
 };
 exports.safeStringify = safeStringify;
+const chunkString = (str, length) => str.match(new RegExp(`.{1,${length}}`, 'g'));
+exports.chunkString = chunkString;

package/dist/ui/components/Sidebar/index.js

@@ -92,13 +92,11 @@ const ChevronStyled = (0, styled_components_1.default)(Chevron_1.Chevron) `
   }
 `;
 const Sidebar = ({ children, className, key = 'sidebar', cookieDocument, }) => {
-    const [openRaw, setOpenRaw] = (0, cookie_1.useCookie)({
-        key,
-        defaultValue: 'false',
+    const [open, setOpen] = (0, cookie_1.useCookieBoolean)({
+        name: key,
+        defaultValue: false,
         cookieDocument: cookieDocument,
     });
-    const open = openRaw === 'true';
-    const setOpen = (o) => setOpenRaw(o.toString());
     return (react_1.default.createElement(Base, { className: className, "data-open": open, onClick: () => !open && setOpen(true), "data-hover": true },
         react_1.default.createElement(Hamburger, { "data-open": open, onClick: () => setOpen(!open), "data-hover": true },
             react_1.default.createElement(ChevronStyled, { point: open ? 'right' : 'left', width: "100%" })),

package/dist/ui/helpers/callOpenApi/cached.js

@@ -19,7 +19,12 @@ const direct_1 = require("./direct");
 const string_1 = require("../../../common/helpers/string");
 let callOpenApiCache;
 function getCacheKey({ cacheKey, overrideAuth, }) {
-    const authkeyPrefix = (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) || (0, cookie_1.getCookieWrapper)({ cname: 'id_token' });
+    const authkeyPrefix = (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) ||
+        (0, cookie_1.getCookieWrapper)({
+            name: 'id_token',
+            defaultValue: '',
+            parse: (s) => s,
+        });
     let cacheKeyRet;
     if (cacheKey) {
         const pref = !authkeyPrefix ? '' : (0, string_1.toBase64)(authkeyPrefix);

package/dist/ui/helpers/callOpenApi/direct.js

@@ -26,7 +26,11 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
         config.baseOptions.headers.authorization = `Bearer ${overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token}`;
     }
     else {
-        const isAuthed = !!(0, cookie_1.getCookieWrapper)({ cname: 'id_token' });
+        const isAuthed = !!(0, cookie_1.getCookieWrapper)({
+            name: 'id_token',
+            defaultValue: '',
+            parse: (s) => s,
+        });
         if (isAuthed) {
             const updated = yield refreshToken();
             if ((_a = updated === null || updated === void 0 ? void 0 : updated.jwt) === null || _a === void 0 ? void 0 : _a.id_token) {

package/dist/ui/helpers/cookie.d.ts

@@ -1,18 +1,56 @@
-export declare function setCookieWrapper<T>(cname: string, raw: T, exdays?: number): void;
-export declare function wipeCookies(cname: string): void;
-export declare function getCookieWrapper<T>({ cname, cookieDocument, defaultValue, }: {
-    cname: string;
-    /**
-     * set for ssr
-     */
+export declare function wipeCookies(name: string): void;
+/**
+ * json+b64 incoming. chunk. write chunks
+ * @param p
+ * @returns
+ */
+export declare function setCookieWrapper<T>(p: {
+    value: T;
+    name: string;
     cookieDocument?: string;
-    defaultValue?: string;
+    stringify: (s: T) => string;
+}): void;
+/**
+ * read chunks. json parse+unb64
+ * @param param0
+ * @returns
+ */
+export declare function getCookieWrapper<T>({ name, cookieDocument, defaultValue, parse, }: {
+    defaultValue: T;
+    name: string;
+    cookieDocument?: string;
+    parse: (s: string) => T;
 }): T;
-export declare function useCookie<T>({ key, defaultValue, cookieDocument, }: {
-    key: string;
-    defaultValue?: string;
+declare type Dispatch<A> = (value: A) => void;
+declare type SetStateAction<S> = S | ((prevState: S) => S);
+declare type ReturnType<T> = [T, Dispatch<SetStateAction<T>>];
+declare type TParse<T> = (s: string | null | undefined) => T;
+export declare function useCookie<T>(p: {
+    defaultValue: T;
+    name: string;
+    cookieDocument?: string;
     /**
-     * set for ssr
+     * required for objects. defaults to JSON.parse
      */
+    parse?: TParse<T>;
+    /**
+     * required for objects. defaults to JSON.stringify
+     */
+    stringify?: (v: T) => string;
+}): ReturnType<T>;
+export declare const useCookieString: (p: {
+    defaultValue: string;
+    name: string;
+    cookieDocument?: string;
+}) => ReturnType<string>;
+export declare const useCookieNumber: (p: {
+    defaultValue: number | undefined;
+    name: string;
+    cookieDocument?: string;
+}) => ReturnType<number | undefined>;
+export declare const useCookieBoolean: (p: {
+    defaultValue: boolean;
+    name: string;
     cookieDocument?: string;
-}): [T, (v: T) => void];
+}) => ReturnType<boolean>;
+export {};

package/dist/ui/helpers/cookie.js

@@ -1,62 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useCookie = exports.getCookieWrapper = exports.wipeCookies = exports.setCookieWrapper = void 0;
+exports.useCookieBoolean = exports.useCookieNumber = exports.useCookieString = exports.useCookie = exports.getCookieWrapper = exports.setCookieWrapper = exports.wipeCookies = void 0;
 /* eslint-disable guard-for-in */
 /* eslint-disable no-restricted-syntax */
 const react_1 = require("react");
+const log_1 = require("../../common/helpers/log");
 const string_1 = require("../../common/helpers/string");
 const expireDate = 'Thu, 01 Jan 1970 00:00:00 UTC';
 const maxCookieLen = 4000;
-const chunkString = (str, length) => str.match(new RegExp(`.{1,${length}}`, 'g'));
-function setCookie(cname, raw, exdays = 1) {
+/**
+ * expiryDays <0 will delete
+ * @param param0
+ * @returns
+ */
+function setCookieRaw({ name, value, expiryDays = 1, }) {
     if (typeof window === undefined) {
         return;
     }
     const d = new Date();
-    d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000);
-    const expires = `expires=${!raw || exdays < 0 ? expireDate : d.toUTCString()}`;
-    document.cookie = `${cname}=${!raw ? '' : raw};${expires};path=/`;
+    d.setTime(d.getTime() + expiryDays * 24 * 60 * 60 * 1000);
+    const expires = `expires=${!value || expiryDays < 0 ? expireDate : d.toUTCString()}`;
+    document.cookie = `${name}=${!value ? '' : value};${expires};path=/`;
 }
-function getCookie({ cname, cookieDocument, }) {
-    const name = `${cname}=`;
+function getCookieRaw({ name, cookieDocument, }) {
+    const nameeq = `${name}=`;
     const ca1 = cookieDocument || (typeof window !== 'undefined' && document.cookie);
     if (!ca1 || !(ca1 === null || ca1 === void 0 ? void 0 : ca1.trim())) {
         return undefined;
     }
     const ca = ca1.split(';').map((t) => t.trim());
     for (const c of ca) {
-        if (c.indexOf(name) === 0) {
-            return c.substr(name.length, c.length);
+        if (c.indexOf(nameeq) === 0) {
+            const raw = c.substr(nameeq.length, c.length);
+            return raw;
         }
     }
     return undefined;
 }
-function setCookieWrapper(cname, raw, exdays = 1) {
-    let index = 0;
-    while (getCookie({ cname: cname + index })) {
-        setCookie(cname + index, null, -1);
-        index += 1;
-    }
-    if (!raw) {
+function wipeCookies(name) {
+    if (typeof window === 'undefined') {
+        (0, log_1.warn)('cant wipe cookies on server');
         return;
     }
-    const str = (0, string_1.toBase64)(JSON.stringify(raw));
-    let chunks = [str];
-    if (str.length > maxCookieLen) {
-        chunks = chunkString(str, maxCookieLen);
-    }
-    for (const index1 in chunks) {
-        const chunk = chunks[index1];
-        setCookie(cname + index1, chunk, exdays);
-    }
-}
-exports.setCookieWrapper = setCookieWrapper;
-function wipeCookies(cname) {
     let currentCount = 0;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        if (getCookie({ cname: cname + currentCount })) {
-            setCookie(cname + currentCount, undefined);
+        if (getCookieRaw({
+            name: name + currentCount,
+            cookieDocument: '',
+        })) {
+            setCookieRaw({ name: name + currentCount, value: '', expiryDays: -1 });
             currentCount += 1;
         }
         else {
@@ -65,46 +58,83 @@ function wipeCookies(cname) {
     }
 }
 exports.wipeCookies = wipeCookies;
-function getCookieWrapper({ cname, cookieDocument, defaultValue, }) {
+/**
+ * json+b64 incoming. chunk. write chunks
+ * @param p
+ * @returns
+ */
+function setCookieWrapper(p) {
+    wipeCookies(p.name);
+    if (!p.value) {
+        return;
+    }
+    const str = (0, string_1.toBase64)(p.stringify(p.value));
+    const chunks = (0, string_1.chunkString)(str, maxCookieLen);
+    for (const index1 in chunks) {
+        const chunk = chunks[index1];
+        setCookieRaw(Object.assign(Object.assign({}, p), { name: p.name + index1, value: chunk }));
+    }
+}
+exports.setCookieWrapper = setCookieWrapper;
+/**
+ * read chunks. json parse+unb64
+ * @param param0
+ * @returns
+ */
+function getCookieWrapper({ name, cookieDocument, defaultValue, parse, }) {
     let raw = '';
     let currentCount = 0;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        const newv = getCookie({
-            cname: cname + currentCount,
+        const newv = getCookieRaw({
+            name: name + currentCount,
             cookieDocument,
         });
         if (!newv) {
-            if (currentCount === 0) {
-                if (defaultValue) {
-                    setCookie(cname, defaultValue);
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    return defaultValue;
-                }
-                return undefined;
-            }
-            try {
-                return JSON.parse((0, string_1.fromBase64)(raw));
-            }
-            catch (e) {
-                wipeCookies(cname);
-                return undefined;
-            }
+            break;
         }
         raw += newv;
         currentCount += 1;
     }
+    try {
+        return parse((0, string_1.fromBase64)(raw));
+    }
+    catch (e) {
+        (0, log_1.warn)('cookie error:', e);
+        wipeCookies(name);
+        return defaultValue;
+    }
 }
 exports.getCookieWrapper = getCookieWrapper;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function useCookie({ key, defaultValue, cookieDocument, }) {
-    const [cookie, setC] = (0, react_1.useState)(getCookieWrapper({ cname: key, defaultValue, cookieDocument }));
-    return [
-        cookie,
-        (v) => {
-            setCookieWrapper(key, v, 2);
-            setC(v);
-        },
-    ];
+function useCookie(p) {
+    const parse = (s) => {
+        if (!s) {
+            return p.defaultValue;
+        }
+        if (p.parse) {
+            return p.parse(s);
+        }
+        return JSON.parse(s);
+    };
+    const stringify = (s) => {
+        if (p.stringify) {
+            return p.stringify(s);
+        }
+        return JSON.stringify(s);
+    };
+    const [cookie, setCookie] = (0, react_1.useState)(getCookieWrapper(Object.assign(Object.assign({}, p), { parse })) || p.defaultValue);
+    const setState = (valueRaw) => {
+        const value = (valueRaw instanceof Function ? valueRaw(cookie) : valueRaw);
+        setCookieWrapper(Object.assign(Object.assign({}, p), { stringify, value }));
+        setCookie(value);
+    };
+    return [cookie, setState];
 }
 exports.useCookie = useCookie;
+const useCookieString = (p) => useCookie(Object.assign(Object.assign({}, p), { parse: (s) => s || '', stringify: (s) => s }));
+exports.useCookieString = useCookieString;
+const useCookieNumber = (p) => useCookie(Object.assign(Object.assign({}, p), { parse: (s) => (!s ? undefined : Number.parseFloat(s)), stringify: (s) => (!s ? '' : s.toString()) }));
+exports.useCookieNumber = useCookieNumber;
+const useCookieBoolean = (p) => useCookie(Object.assign(Object.assign({}, p), { parse: (s) => s === 'true', stringify: (s) => s.toString() }));
+exports.useCookieBoolean = useCookieBoolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.129",
+  "version": "0.0.130",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",