ag-common 0.0.231 → 0.0.232

package/dist/ui/helpers/callOpenApi/cached.d.ts

@@ -1,4 +1,4 @@
-import { ICallOpenApi } from './types';
+import { ICallOpenApi, OverrideAuth } from './types';
 import { CacheItems } from '../routes';
 import { AxiosWrapperLite } from '../jwt';
 export declare type TCallOpenApiCached<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
@@ -19,6 +19,10 @@ export declare type TCallOpenApiCached<T, TDefaultApi> = ICallOpenApi<T, TDefaul
      */
     onlyCached?: boolean;
 };
+export declare const setOpenApiCacheRaw: <T>(p: {
+    cacheKey: string;
+    overrideAuth?: OverrideAuth | undefined;
+}, data: T) => Promise<void>;
 /**
  * sync call to callOpenApiCache.
  * @param p

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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callOpenApiCached = exports.callOpenApiCachedRaw = void 0;
+exports.callOpenApiCached = exports.callOpenApiCachedRaw = exports.setOpenApiCacheRaw = void 0;
 const direct_1 = require("./direct");
 const cookie_1 = require("../cookie");
 const string_1 = require("../../../common/helpers/string");
@@ -31,6 +31,13 @@ function getCacheKey({ cacheKey, overrideAuth, }) {
     }
     return cacheKeyRet;
 }
+const setOpenApiCacheRaw = (p, data) => __awaiter(void 0, void 0, void 0, function* () {
+    const userPrefixedCacheKey = getCacheKey(p);
+    if (callOpenApiCache && userPrefixedCacheKey) {
+        callOpenApiCache.set(userPrefixedCacheKey, data);
+    }
+});
+exports.setOpenApiCacheRaw = setOpenApiCacheRaw;
 /**
  * sync call to callOpenApiCache.
  * @param p
@@ -68,10 +75,7 @@ const callOpenApiCached = (p) => __awaiter(void 0, void 0, void 0, function* ()
     if (resp.error) {
         return { error: resp.error, data: undefined };
     }
-    const userPrefixedCacheKey = getCacheKey(p);
-    if (callOpenApiCache && userPrefixedCacheKey) {
-        callOpenApiCache.set(userPrefixedCacheKey, resp.data);
-    }
+    yield (0, exports.setOpenApiCacheRaw)(p, resp.data);
     return resp;
 });
 exports.callOpenApiCached = callOpenApiCached;

package/dist/ui/helpers/callOpenApi/hook.d.ts

@@ -6,8 +6,12 @@ export declare type TUseCallOpenApi<T> = AxiosWrapper<T> & {
     loaded: boolean;
     loadcount: number;
     setData: (d: TUseCallOpenApiDispatch<T | undefined>) => void;
+    /**
+     * call when you want to refetch, but at a later point (ie same hook/cachekey across different components)
+     */
+    invalidateCacheKey: () => void;
 };
-declare type TUseCallOpenApi1<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
+declare type TUseCallOpenApiInt<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
     cacheKey: string;
     /**
      * will shortcut and return the appropriate axioswrapper data if cachekey is found
@@ -23,5 +27,5 @@ declare type TUseCallOpenApi1<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
  * @param p
  * @returns
  */
-export declare const useCallOpenApi: <T, TDefaultApi>(pIn: TUseCallOpenApi1<T, TDefaultApi>) => TUseCallOpenApi<T>;
+export declare const useCallOpenApi: <T, TDefaultApi>(pIn: TUseCallOpenApiInt<T, TDefaultApi>) => TUseCallOpenApi<T>;
 export {};

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

@@ -22,7 +22,7 @@ noSsr = false) => {
     const cachedData = noSsr
         ? undefined
         : (_a = (0, cached_1.callOpenApiCachedRaw)(Object.assign(Object.assign({}, p), { onlyCached: true }))) === null || _a === void 0 ? void 0 : _a.data;
-    return Object.assign(Object.assign({ data: undefined, url: '', datetime: 0, loadcount: 0, loading: false, reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }), setData: () => { } }, (cachedData && { data: cachedData })), { loaded: !!cachedData });
+    return Object.assign(Object.assign({ data: undefined, url: '', datetime: 0, loadcount: 0, loading: false }, (cachedData && { data: cachedData })), { loaded: !!cachedData });
 };
 /**
  * hooks+cached call to callOpenApi
@@ -30,31 +30,36 @@ noSsr = false) => {
  * @returns
  */
 const useCallOpenApi = (pIn) => {
-    const [p, setP] = (0, react_1.useState)(pIn);
-    const [data, setData] = (0, react_1.useState)(defaultState(p));
+    const [data, setData] = (0, react_1.useState)([pIn, defaultState(pIn)]);
     (0, react_1.useEffect)(() => {
-        if (JSON.stringify(p) !== JSON.stringify(pIn)) {
-            setP(pIn);
-            setData(defaultState(pIn, true));
+        if (JSON.stringify(data[0]) !== JSON.stringify(pIn)) {
+            setData([pIn, defaultState(pIn, true)]);
         }
-    }, [p, pIn]);
+    }, [data, pIn]);
     (0, react_1.useEffect)(() => {
         function run() {
             return __awaiter(this, void 0, void 0, function* () {
-                const resp = yield (0, direct_1.callOpenApi)(p);
-                setData((d) => (Object.assign(Object.assign({}, resp), { loaded: true, loading: false, loadcount: d.loadcount + 1, reFetch: () => __awaiter(this, void 0, void 0, function* () { }), url: '', datetime: new Date().getTime(), setData: () => { } })));
+                const resp = yield (0, direct_1.callOpenApi)(data[0]);
+                setData((d) => [
+                    d[0],
+                    Object.assign(Object.assign({}, resp), { loaded: true, loading: false, loadcount: d[1].loadcount + 1, url: '', datetime: new Date().getTime() }),
+                ]);
             });
         }
-        const { error, loaded, loading, loadcount } = data;
-        const ng = p.disabled || loaded || loading || (error && loadcount > 2);
+        const { error, loaded, loading, loadcount } = data[1];
+        const ng = data[0].disabled || loaded || loading || (error && loadcount > 2);
         if (ng) {
             return;
         }
         setData((d) => (Object.assign(Object.assign({}, d), { loading: true })));
         void run();
-    }, [data, p, setData]);
-    return Object.assign(Object.assign({}, data), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return setData(defaultState(p, true)); }), setData: (d) => {
-            setData(Object.assign(Object.assign({}, data), { data: d(data.data), datetime: new Date().getTime() }));
-        } });
+    }, [data, setData]);
+    const ret = Object.assign(Object.assign({}, data[1]), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return setData([data[0], defaultState(data[0], true)]); }), setData: (d) => {
+            setData([
+                data[0],
+                Object.assign(Object.assign({}, data[1]), { data: d(data[1].data), datetime: new Date().getTime() }),
+            ]);
+        }, invalidateCacheKey: () => (0, cached_1.setOpenApiCacheRaw)(data[0], undefined) });
+    return ret;
 };
 exports.useCallOpenApi = useCallOpenApi;

package/package.json

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