ag-common 0.0.232 → 0.0.233

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

@@ -22,6 +22,8 @@ export declare type TCallOpenApiCached<T, TDefaultApi> = ICallOpenApi<T, TDefaul
 export declare const setOpenApiCacheRaw: <T>(p: {
     cacheKey: string;
     overrideAuth?: OverrideAuth | undefined;
+    ssrCacheItems?: any;
+    cacheTtl?: number;
 }, data: T) => Promise<void>;
 /**
  * sync call to callOpenApiCache.

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

@@ -16,26 +16,39 @@ exports.callOpenApiCached = exports.callOpenApiCachedRaw = exports.setOpenApiCac
 const direct_1 = require("./direct");
 const cookie_1 = require("../cookie");
 const string_1 = require("../../../common/helpers/string");
+const common_1 = require("../../../common");
 const node_cache_1 = __importDefault(require("node-cache"));
 let callOpenApiCache;
-function getCacheKey({ cacheKey, overrideAuth, }) {
-    const authkeyPrefix = (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) ||
+/**
+ * cache differs per user and per SSR provided data
+ * @param param0
+ * @returns
+ */
+function getCacheKey({ cacheKey, overrideAuth, ssrCacheItems, }) {
+    const authkeyPrefix1 = (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) ||
         (0, cookie_1.getCookieString)({
             name: 'id_token',
             defaultValue: '',
         });
+    const authPref = !authkeyPrefix1 ? '' : (0, common_1.hashCode)((0, string_1.toBase64)(authkeyPrefix1));
+    const ssrCachePref = !ssrCacheItems
+        ? ''
+        : (0, common_1.hashCode)((0, string_1.toBase64)(JSON.stringify(ssrCacheItems)));
     let cacheKeyRet;
     if (cacheKey) {
-        const pref = !authkeyPrefix ? '' : (0, string_1.toBase64)(authkeyPrefix);
-        cacheKeyRet = cacheKey + '||' + pref;
+        cacheKeyRet = `${cacheKey}||${authPref}||${ssrCachePref}`;
     }
     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);
+    if (!userPrefixedCacheKey) {
+        return;
+    }
+    if (!callOpenApiCache) {
+        callOpenApiCache = new node_cache_1.default({ stdTTL: p.cacheTtl || 120 });
     }
+    callOpenApiCache.set(userPrefixedCacheKey, data);
 });
 exports.setOpenApiCacheRaw = setOpenApiCacheRaw;
 /**

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

@@ -6,10 +6,6 @@ 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 TUseCallOpenApiInt<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
     cacheKey: string;

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

@@ -51,7 +51,7 @@ const useCallOpenApi = (pIn) => {
         if (ng) {
             return;
         }
-        setData((d) => (Object.assign(Object.assign({}, d), { loading: true })));
+        setData((d) => [d[0], Object.assign(Object.assign({}, d[1]), { loading: true })]);
         void run();
     }, [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) => {
@@ -59,7 +59,7 @@ const useCallOpenApi = (pIn) => {
                 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.232",
+  "version": "0.0.233",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",