zova-module-a-model 5.0.10 → 5.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-model",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "title": "a-model",
   "zovaModule": {
     "capabilities": {
@@ -63,5 +63,5 @@
     "js-cookie": "^3.0.5",
     "localforage": "^1.10.0"
   },
-  "gitHead": "6b24f8fbc3857e405882791f096d19d146675077"
+  "gitHead": "d7ecefeb8b5f566e4b4831d7b3a02e9e7a765c15"
 }

package/src/bean/bean.model/bean.model.useQuery.ts

@@ -66,23 +66,13 @@ export class BeanModelUseQuery<TScopeModule = unknown> extends BeanModelQuery<TS
         persister: { storage: 'local', sync: true },
       },
     });
-    const queryKey = options.queryKey;
     const self = this;
     return useComputed({
       get() {
-        const query = self.$useQueryExisting(options, queryClient) as any;
-        if (query.data === undefined) {
-          const data = self.$persisterLoad(queryKey);
-          if (data !== undefined) {
-            self.$setQueryData(queryKey, data);
-          }
-        }
-        return query.data;
+        return self._handleSyncDataGet(options, queryClient, true);
       },
       set(value) {
-        const query = self.$useQueryExisting(options, queryClient) as any;
-        self.$setQueryData(queryKey, value, true);
-        return query;
+        self._handleSyncDataSet(options, queryClient, true, value);
       },
     });
   }
@@ -128,23 +118,13 @@ export class BeanModelUseQuery<TScopeModule = unknown> extends BeanModelQuery<TS
         },
       },
     );
-    const queryKey = options.queryKey;
     const self = this;
     return useComputed({
       get() {
-        const query = self.$useQueryExisting(options, queryClient) as any;
-        if (query.data === undefined) {
-          const data = self.$persisterLoad(queryKey);
-          if (data !== undefined) {
-            self.$setQueryData(queryKey, data);
-          }
-        }
-        return query.data;
+        return self._handleSyncDataGet(options, queryClient, true);
       },
       set(value) {
-        const query = self.$useQueryExisting(options, queryClient) as any;
-        self.$setQueryData(queryKey, value, true);
-        return query;
+        self._handleSyncDataSet(options, queryClient, true, value);
       },
     });
   }
@@ -175,17 +155,13 @@ export class BeanModelUseQuery<TScopeModule = unknown> extends BeanModelQuery<TS
         persister: false,
       },
     });
-    const queryKey = options.queryKey;
     const self = this;
     return useComputed({
       get() {
-        const query = self.$useQueryExisting(options, queryClient) as any;
-        return query.data;
+        return self._handleSyncDataGet(options, queryClient, false);
       },
       set(value) {
-        const query = self.$useQueryExisting(options, queryClient) as any;
-        self.$setQueryData(queryKey, value, false);
-        return query;
+        self._handleSyncDataSet(options, queryClient, false, value);
       },
     });
   }
@@ -225,4 +201,35 @@ export class BeanModelUseQuery<TScopeModule = unknown> extends BeanModelQuery<TS
     }
     return this[SymbolUseQueries][queryHash];
   }
+
+  private _handleSyncDataGet(options, queryClient, persister) {
+    const queryKey = options.queryKey;
+    const query = this.$useQueryExisting(options, queryClient);
+    if (query.data === undefined) {
+      if (persister) {
+        const data = this.$persisterLoad(queryKey);
+        if (data !== undefined) {
+          this.$setQueryData(queryKey, data, false);
+        }
+      }
+      if (query.data === undefined) {
+        let defaultData = options.meta?.defaultData;
+        if (typeof defaultData === 'function') {
+          defaultData = defaultData();
+        }
+        if (defaultData !== undefined) {
+          // need not persister save
+          this.$setQueryData(queryKey, defaultData, false);
+        }
+      }
+    }
+    return query.data;
+  }
+
+  private _handleSyncDataSet(options, queryClient, persister, value) {
+    const queryKey = options.queryKey;
+    const query = this.$useQueryExisting(options, queryClient);
+    this.$setQueryData(queryKey, value, persister);
+    return query;
+  }
 }

package/src/types.ts

@@ -15,6 +15,7 @@ declare module '@tanstack/vue-query' {
 }
 
 export interface MyQueryMeta extends Record<string, unknown> {
+  defaultData?: (() => any) | any;
   ssr?: QueryMetaSSR;
   persister?: QueryMetaPersister | boolean;
 }