ag-common 0.0.108 → 0.0.112

package/dist/ui/components/Confirm/index.d.ts

@@ -1,4 +1,4 @@
 export declare const confirm: ({ bottomText, topText, }: {
     topText?: string | undefined;
     bottomText: string;
-}) => Promise<unknown>;
+}) => Promise<boolean>;

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 | undefined>>;
+export declare const callOpenApi: <T, TDefaultApi>({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, }: ICallOpenApi<T, TDefaultApi>) => Promise<AxiosWrapper<T>>;

package/dist/ui/helpers/callOpenApi.js

@@ -17,7 +17,7 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
     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;
+    let data = undefined;
     const config = {
         basePath: apiUrl,
         baseOptions: { headers: { authorization: '' } },
@@ -79,13 +79,6 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
         // eslint-disable-next-line no-await-in-loop
         yield (0, sleep_1.sleep)(2000);
     }
-    return {
-        data,
-        error,
-        loading: false,
-        reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return func(cl); }),
-        url: func.toString(),
-        datetime: new Date().getTime(),
-    };
+    return Object.assign(Object.assign({ data }, (error && { error })), { loading: false, reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return func(cl); }), url: func.toString(), datetime: new Date().getTime() });
 });
 exports.callOpenApi = callOpenApi;

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

@@ -2,11 +2,17 @@ export declare function setCookieWrapper<T>(cname: string, raw: T, exdays?: numb
 export declare function wipeCookies(cname: string): void;
 export declare function getCookieWrapper<T>({ cname, cookieDocument, defaultValue, }: {
     cname: string;
+    /**
+     * set for ssr
+     */
     cookieDocument?: string;
     defaultValue?: string;
 }): T;
 export declare function useCookie<T>({ key, defaultValue, cookieDocument, }: {
     key: string;
     defaultValue?: string;
+    /**
+     * set for ssr
+     */
     cookieDocument?: string;
-}): [T, (v: T) => any];
+}): [T, (v: T) => void];

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

@@ -51,7 +51,7 @@ export interface User {
 }
 export interface AxiosWrapper<T> {
     data: T;
-    error: AxiosError<unknown, any> | undefined;
+    error?: AxiosError<unknown, any>;
     loading: boolean;
     reFetch: () => Promise<any>;
     url: string;

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

@@ -1,5 +1,6 @@
-import { TLang } from '../..';
+import { TLang } from '../../common/helpers/i18n';
 import { ICognitoAuth } from './cognito';
+import { AxiosWrapper } from './jwt';
 export interface LocationSubset {
     pathname: string;
     hash: string;
@@ -7,14 +8,14 @@ export interface LocationSubset {
     query: Record<string, string>;
     host: string;
 }
-export declare type CacheItems = CacheItem[];
-export interface CacheItem {
+export declare type CacheItems = CacheItem<any>[];
+export interface CacheItem<T> {
     cacheKey: string;
-    prefillData: any;
+    prefillData: AxiosWrapper<T>;
     ttlSeconds: number;
 }
 export interface IInitialStateCommon {
-    openApiCache?: CacheItem[];
+    openApiCache?: CacheItem<any>[];
     headerTitle?: string;
     seed?: number;
 }
@@ -29,4 +30,8 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
     request: TRequest;
     auth: ICognitoAuth;
     pushPath: (path: string) => Promise<void>;
+    /**
+     * set for ssr
+     */
+    cookieDocument: string | undefined;
 }

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

@@ -1,7 +1,6 @@
-import { AxiosResponse } from 'axios';
 import { CacheItems } from './routes';
-import { AxiosWrapper, User } from './jwt';
-import { OverrideAuth } from './types';
+import { AxiosWrapper } from './jwt';
+import { ICallOpenApi } from './types';
 export declare const deleteMutexData: (key: string) => void;
 export declare const setMutexData: ({ key, data, ttlSeconds, }: {
     key: string;
@@ -14,15 +13,12 @@ export declare const getMutexData: <T>(key: string) => AxiosWrapper<T>;
  * @param overrideAuth - auth automatically picked up from id_token cookie, can override value here, but not required
  * @returns
  */
-export declare const useOpenApiStore: <T, TDefaultApi>(p: {
+export declare const useOpenApiStore: <T, TDefaultApi>(p: ICallOpenApi<T, TDefaultApi> & {
     ttlSeconds?: number | undefined;
-    func: (f: TDefaultApi) => Promise<AxiosResponse<T, any>>;
     cacheKey: string;
-    logout: () => void;
-    refreshToken: () => Promise<User | undefined>;
-    disabled?: boolean | undefined;
-    apiUrl: string;
-    newDefaultApi: (config: any) => TDefaultApi;
-    overrideAuth?: OverrideAuth | undefined;
+    /**
+     * will shortcut and return the appropriate axioswrapper data if cachekey is found
+     */
+    ssrCacheItems?: CacheItems | undefined;
 }) => AxiosWrapper<T>;
 export declare const setOpenApiCache: (items: CacheItems) => void;

package/dist/ui/helpers/useOpenApiStore.js

@@ -85,6 +85,7 @@ const getTs = () => new Date().getTime();
  * @returns
  */
 const useOpenApiStore = (p) => {
+    var _a;
     const { cacheKey, disabled } = p;
     if (!cacheKey) {
         throw new Error('no cache key');
@@ -105,10 +106,6 @@ const useOpenApiStore = (p) => {
             mLock(Object.assign({ key }, p));
         }
     }, [disabled, key, p]);
-    if (!mutexData.getData(key)) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        return { loading: true };
-    }
     if (disabled) {
         return {
             loading: false,
@@ -120,7 +117,15 @@ const useOpenApiStore = (p) => {
             url: '',
         };
     }
+    const ssrCached = (_a = p.ssrCacheItems) === null || _a === void 0 ? void 0 : _a.find((s) => s.cacheKey === cacheKey);
+    if (typeof window === 'undefined' && ssrCached) {
+        return ssrCached.prefillData;
+    }
     const current = mutexData.getData(key);
+    if (!current) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return { loading: true };
+    }
     return Object.assign(Object.assign({}, current), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () {
             mutexData.setData({
                 key,

package/package.json

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