ag-common 0.0.112 → 0.0.113

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

@@ -1,8 +1,15 @@
 import { AxiosWrapper } from './jwt';
 import { ICallOpenApi } from './types';
+import { CacheItems } from './routes';
 declare type AxiosWrapperWrap<T> = AxiosWrapper<T | undefined> & {
     loaded: boolean;
     loadcount: number;
 };
-export declare const useCallOpenApi: <T, TDefaultApi>(p: ICallOpenApi<T, TDefaultApi>) => AxiosWrapperWrap<T>;
+export declare const useCallOpenApi: <T, TDefaultApi>(p: ICallOpenApi<T, TDefaultApi> & {
+    cacheKey: string;
+    /**
+     * will shortcut and return the appropriate axioswrapper data if cachekey is found
+     */
+    ssrCacheItems?: CacheItems | undefined;
+}) => AxiosWrapperWrap<T>;
 export {};

package/dist/ui/helpers/useCallOpenApi.js

@@ -12,36 +12,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useCallOpenApi = void 0;
 const react_1 = require("react");
 const callOpenApi_1 = require("./callOpenApi");
-const defaultV = (def) => ({
-    loading: false,
-    data: def,
-    datetime: new Date().getTime(),
-    reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }),
-    error: undefined,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    url: undefined,
-    //
-    loaded: false,
-    loadcount: 0,
-});
 const useCallOpenApi = (p) => {
-    const [data, setData] = (0, react_1.useState)(defaultV(undefined));
+    var _a, _b;
+    const ssrCached = (_a = p.ssrCacheItems) === null || _a === void 0 ? void 0 : _a.find((s) => s.cacheKey === p.cacheKey);
+    const defv = {
+        data: undefined,
+        url: '',
+        datetime: 0,
+        loadcount: 0,
+        loading: false,
+        loaded: false,
+        reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }),
+    };
+    const [data, setData] = (0, react_1.useState)(Object.assign(Object.assign({}, defv), { data: ssrCached ? (_b = ssrCached.prefillData) === null || _b === void 0 ? void 0 : _b.data : undefined, loaded: !!ssrCached }));
     (0, react_1.useEffect)(() => {
         function run() {
             return __awaiter(this, void 0, void 0, function* () {
                 const res = yield (0, callOpenApi_1.callOpenApi)(p);
+                console.log('set res=', res);
                 setData((d) => (Object.assign(Object.assign({}, res), { loaded: true, loading: false, loadcount: d.loadcount + 1 })));
             });
         }
         const { error, loaded, loading, loadcount } = data;
-        if (p.disabled || loaded || loading || (error && loadcount < 2)) {
+        const ng = p.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* () {
-            setData(defaultV(undefined));
+            setData(defv);
         }) });
 };
 exports.useCallOpenApi = useCallOpenApi;

package/package.json

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