zova-module-a-model 5.0.11 → 5.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-model",
-  "version": "5.0.11",
+  "version": "5.0.13",
   "title": "a-model",
   "zovaModule": {
     "capabilities": {
@@ -14,12 +14,6 @@
           ],
           "output": "tanstack"
         },
-        {
-          "match": [
-            "js-cookie"
-          ],
-          "output": "js-cookie"
-        },
         {
           "match": [
             "localforage"
@@ -59,9 +53,7 @@
   "dependencies": {
     "@tanstack/query-persist-client-core": "^5.45.0",
     "@tanstack/vue-query": "^5.45.0",
-    "@types/js-cookie": "^3.0.6",
-    "js-cookie": "^3.0.5",
     "localforage": "^1.10.0"
   },
-  "gitHead": "d7ecefeb8b5f566e4b4831d7b3a02e9e7a765c15"
+  "gitHead": "14e181241069cfa0d5325cfb19f21259420c19de"
 }

package/src/bean/bean.model/bean.model.persister.ts

@@ -1,7 +1,6 @@
 import { QueryMetaPersister } from '../../types.js';
 import { experimental_createPersister } from '@tanstack/query-persist-client-core';
 import { Query, QueryKey } from '@tanstack/vue-query';
-import { cookieStorage } from '../../common/cookieStorage.js';
 import localforage from 'localforage';
 import { SymbolBeanFullName } from 'zova';
 import { BeanModelLast } from './bean.model.last.js';
@@ -125,7 +124,7 @@ export class BeanModelPersister<TScopeModule = unknown> extends BeanModelLast<TS
   protected _getPersisterStorage(options?: QueryMetaPersister | boolean) {
     options = this._adjustPersisterOptions(options);
     if (!options) return undefined;
-    if (options.storage === 'cookie') return cookieStorage;
+    if (options.storage === 'cookie') return this.app.meta.cookie;
     if (options.storage === 'local') return localStorage;
     if (options.storage === 'db') return localforage;
   }

package/src/config/config.ts

@@ -1,5 +1,22 @@
+import { DefaultOptions, defaultShouldDehydrateQuery } from '@tanstack/vue-query';
 import { ZovaApplication } from 'zova';
 
+const defaultOptions: DefaultOptions = {
+  queries: {
+    retry: false,
+    refetchOnWindowFocus: false,
+    refetchOnMount: false,
+    refetchOnReconnect: true,
+    gcTime: 1000 * 60 * 5,
+  },
+  dehydrate: {
+    shouldDehydrateQuery(query) {
+      if (query.meta?.ssr?.dehydrate === false) return false;
+      return defaultShouldDehydrateQuery(query);
+    },
+  },
+};
+
 export const config = (_app: ZovaApplication) => {
   return {
     persister: {
@@ -10,5 +27,8 @@ export const config = (_app: ZovaApplication) => {
         maxAge: 1000 * 60 * 60 * 24, // 24 hours
       },
     },
+    queryClientConfig: {
+      defaultOptions,
+    },
   };
 };

package/src/local/storage.ts

@@ -1,27 +1,13 @@
 import { BeanBase, Local } from 'zova';
 import { ScopeModule } from '../resource/this.js';
-import { VueQueryPlugin, VueQueryPluginOptions, defaultShouldDehydrateQuery } from '@tanstack/vue-query';
+import { VueQueryPlugin, VueQueryPluginOptions } from '@tanstack/vue-query';
 
 @Local()
 export class Storage extends BeanBase<ScopeModule> {
   protected async __init__() {
     const vueQueryPluginOptions: VueQueryPluginOptions = {
       queryClientConfig: {
-        defaultOptions: {
-          queries: {
-            retry: false,
-            refetchOnWindowFocus: false,
-            refetchOnMount: false,
-            refetchOnReconnect: false,
-            // gcTime: 1000 * 60 * 5,
-          },
-          dehydrate: {
-            shouldDehydrateQuery(query) {
-              if (query.meta?.ssr?.dehydrate === false) return false;
-              return defaultShouldDehydrateQuery(query);
-            },
-          },
-        },
+        defaultOptions: this.scope.config.queryClientConfig.defaultOptions,
       },
     };
     this.app.vue.use(VueQueryPlugin, vueQueryPluginOptions);

package/src/common/cookieStorage.ts

@@ -1,13 +0,0 @@
-import Cookies from 'js-cookie';
-
-export const cookieStorage = {
-  getItem(key: string): string | undefined {
-    return Cookies.get(key);
-  },
-  setItem(key: string, value: string): void {
-    Cookies.set(key, value);
-  },
-  removeItem(key: string): void {
-    Cookies.remove(key);
-  },
-};