ag-common 0.0.112 → 0.0.116

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

@@ -1,3 +1,3 @@
 import { AxiosWrapper } from './jwt';
 import { ICallOpenApi } from './types';
-export declare const callOpenApi: <T, TDefaultApi>({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, }: ICallOpenApi<T, TDefaultApi>) => Promise<AxiosWrapper<T>>;
+export declare const callOpenApi: <T, TDefaultApi>({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, headers, }: ICallOpenApi<T, TDefaultApi>) => Promise<AxiosWrapper<T>>;

package/dist/ui/helpers/callOpenApi.js

@@ -13,14 +13,14 @@ exports.callOpenApi = void 0;
 const cookie_1 = require("./cookie");
 const sleep_1 = require("../../common/helpers/sleep");
 const array_1 = require("../../common/helpers/array");
-const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, }) => __awaiter(void 0, void 0, void 0, function* () {
+const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, headers, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let error;
     let data = undefined;
     const config = {
         basePath: apiUrl,
-        baseOptions: { headers: { authorization: '' } },
+        baseOptions: { headers: Object.assign({ authorization: '' }, (headers || {})) },
     };
     const isAuthed = !!(0, cookie_1.getCookieWrapper)({ cname: 'id_token' });
     if (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) {

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

@@ -11,4 +11,5 @@ export interface ICallOpenApi<T, TDefaultApi> {
     refreshToken: () => Promise<User | undefined>;
     newDefaultApi: (config: any) => TDefaultApi;
     disabled?: boolean;
+    headers?: Record<string, string | number>;
 }

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,20 +12,19 @@ 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* () {
@@ -34,14 +33,15 @@ const useCallOpenApi = (p) => {
             });
         }
         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.116",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -13,7 +13,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "aws-sdk": "2.1064.0",
+    "aws-sdk": "2.1066.0",
     "axios": "0.25.0",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "17.0.12",
+    "@types/node": "17.0.13",
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
     "@types/styled-components": "5.1.21",