ag-common 0.0.413 → 0.0.415

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

@@ -1,11 +1,12 @@
+/// <reference types="react" />
 import { AxiosWrapper } from '../jwt';
 import { CacheItems } from '../routes';
 import { ICallOpenApi } from './types';
-export type TUseCallOpenApiDispatch<A> = (value: A) => A;
 export type TUseCallOpenApi<T> = AxiosWrapper<T> & {
     loaded: boolean;
     loadcount: number;
-    setData: (d: TUseCallOpenApiDispatch<T | undefined>) => void;
+    /** internally mutate state, but do not refetch. will automatically bump datetime */
+    setData: React.Dispatch<React.SetStateAction<Omit<TUseCallOpenApi<T>, 'reFetch' | 'setData'>>>;
 };
 type TUseCallOpenApiInt<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
     cacheKey: string;
@@ -23,5 +24,5 @@ type TUseCallOpenApiInt<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
  * @param p
  * @returns
  */
-export declare const useCallOpenApi: <T, TDefaultApi>(pIn: TUseCallOpenApiInt<T, TDefaultApi>) => TUseCallOpenApi<T>;
+export declare const useCallOpenApi: <T, TDefaultApi>(inConfig: TUseCallOpenApiInt<T, TDefaultApi>) => TUseCallOpenApi<T>;
 export {};

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useCallOpenApi = void 0;
 const react_1 = require("react");
+const useGranularHook_1 = require("../useGranularHook");
 const cached_1 = require("./cached");
 const direct_1 = require("./direct");
 const defaultState = (p, 
@@ -22,42 +23,55 @@ 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 }, (cachedData && { data: cachedData })), { loaded: !!cachedData });
+    return Object.assign(Object.assign({ data: undefined, datetime: 0, loadcount: 0, loading: false }, (cachedData && { data: cachedData })), { loaded: !!cachedData });
 };
 /**
  * hooks+cached call to callOpenApi
  * @param p
  * @returns
  */
-const useCallOpenApi = (pIn) => {
-    const [data, setData] = (0, react_1.useState)([pIn, defaultState(pIn)]);
-    (0, react_1.useEffect)(() => {
-        if (JSON.stringify(data[0]) !== JSON.stringify(pIn)) {
-            setData([pIn, defaultState(pIn, true)]);
+const useCallOpenApi = (inConfig) => {
+    /** response from hook */
+    const [resp, setResp] = (0, react_1.useState)(defaultState(inConfig));
+    /** config about hook*/
+    const [config, setConfig] = (0, react_1.useState)(inConfig);
+    (0, useGranularHook_1.useGranularEffect)(() => {
+        if (JSON.stringify(config) !== JSON.stringify(inConfig)) {
+            setConfig(inConfig);
+            setResp(defaultState(inConfig, true));
         }
-    }, [data, pIn]);
-    const run = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
-        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() }),
-        ]);
-    }), [data]);
+    }, [inConfig], [resp, setResp, config, setConfig]);
+    const reFetch = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
+        const newdate = new Date().getTime();
+        const newresp = yield (0, direct_1.callOpenApi)(config);
+        setResp((d) => {
+            let newState = Object.assign(Object.assign({}, d), { loaded: true, loading: false });
+            if (newdate > d.datetime) {
+                newState = Object.assign(Object.assign({}, newresp), { loaded: true, loading: false, loadcount: d.loadcount + 1, datetime: newdate });
+            }
+            if (JSON.stringify(d) !== JSON.stringify(newState)) {
+                return newState;
+            }
+            else {
+                return d;
+            }
+        });
+    }), [config]);
     (0, react_1.useEffect)(() => {
-        const { error, loaded, loading, loadcount } = data[1];
-        const ng = data[0].disabled || loaded || loading || (error && loadcount > 2);
+        const { error, loaded, loading, loadcount } = resp;
+        const ng = config.disabled || loaded || loading || (error && loadcount > 2);
         if (ng) {
             return;
         }
-        setData((d) => [d[0], Object.assign(Object.assign({}, d[1]), { loading: true })]);
-        void run();
-    }, [data, run, setData]);
-    const ret = Object.assign(Object.assign({}, data[1]), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return run; }), setData: (d) => {
-            setData([
-                data[0],
-                Object.assign(Object.assign({}, data[1]), { data: d(data[1].data), datetime: new Date().getTime() }),
-            ]);
-        } });
-    return ret;
+        setResp((d) => (Object.assign(Object.assign({}, d), { loading: true })));
+        void reFetch();
+    }, [config.disabled, reFetch, resp]);
+    return Object.assign(Object.assign({}, resp), { reFetch, setData: (p) => __awaiter(void 0, void 0, void 0, function* () {
+            //wipe cache, or might revert
+            yield (0, cached_1.setOpenApiCacheRaw)(config, undefined);
+            setResp(p);
+            //ensure datetime is changed, or might get overwritten
+            setResp((x) => (Object.assign(Object.assign({}, x), { datetime: new Date().getTime() })));
+        }) });
 };
 exports.useCallOpenApi = useCallOpenApi;

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

@@ -54,7 +54,6 @@ export interface AxiosWrapper<T> {
     error?: AxiosError<unknown, any>;
     loading: boolean;
     reFetch: () => Promise<any>;
-    url: string;
     datetime: number;
 }
 export interface AxiosWrapperLite<T> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.413",
+  "version": "0.0.415",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -19,19 +19,19 @@
     "aws-sdk": "2.x",
     "axios": "1.x",
     "constructs": "10.x",
+    "eslint-import-resolver-typescript": ">=3",
+    "eslint-plugin-simple-import-sort": ">=10",
     "jsonwebtoken": "9.x",
     "jwks-rsa": "3.x",
     "node-cache": "5.x",
-    "openapi-request-validator": "12.1.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "typescript": "4.x",
-    "eslint-import-resolver-typescript": "3.x",
-    "eslint-plugin-simple-import-sort": ">=8"
+    "openapi-request-validator": "12.x",
+    "react": "18.x",
+    "react-dom": "18.x",
+    "typescript": "4.x"
   },
   "peerDependencies": {
-    "@emotion/react": ">11",
-    "@emotion/styled": ">11"
+    "@emotion/react": ">=11",
+    "@emotion/styled": ">=11"
   },
   "devDependencies": {
     "@babel/core": "7.20.12",