@svadmin/core 0.20.3 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/core",
-  "version": "0.20.3",
+  "version": "0.21.0",
   "author": "zuohuadong",
   "repository": {
     "type": "git",

package/src/form-hooks.svelte.ts

@@ -252,7 +252,7 @@ export function useForm<
   }
 
   // ─── Query (edit/clone mode) ────────────────────────────────────
-  const query = (action === 'edit' || action === 'clone') && currentId != null
+  const query = (action === 'edit' || action === 'clone')
     ? createQuery(() => ({
         queryKey: [resource, 'one', currentId],
         queryFn: async () => {

package/src/query-hooks.svelte.ts

@@ -16,6 +16,26 @@ import type {
 } from './types';
 import type { LiveMode, LiveEvent } from './live.svelte';
 
+/**
+ * Extend a Tanstack Query result with additional properties.
+ * The query object is returned as-is, with extra properties accessible via Proxy.
+ */
+function extendQuery<Q extends object, E extends Record<string, unknown>>(
+  query: Q,
+  extensions: () => E,
+): Q & E {
+  return new Proxy(query, {
+    get(target, prop, receiver) {
+      const ext = extensions();
+      if (prop in ext) return ext[prop as keyof E];
+      return Reflect.get(target, prop, receiver);
+    },
+    has(target, prop) {
+      return prop in extensions() || Reflect.has(target, prop);
+    },
+  }) as Q & E;
+}
+
 // ─── useList ───────────────────────────────────────────────────
 
 export interface UseListOptions<TData extends BaseRecord = BaseRecord, TError = HttpError> {
@@ -82,10 +102,7 @@ export function useList<TData extends BaseRecord = BaseRecord, TError = HttpErro
     }
   });
 
-  return {
-    query,
-    get overtime() { return overtime; }
-  };
+  return extendQuery(query, () => ({ overtime }));
 }
 
 // ─── useOne ────────────────────────────────────────────────────
@@ -139,8 +156,9 @@ export function useOne<TData extends BaseRecord = BaseRecord, TError = HttpError
     }
   });
 
-  return { query, get overtime() { return overtime; } };
+  return extendQuery(query, () => ({ overtime }));
 }
+
 // ─── useShow ──────────────────────────────────────────────────
 export function useShow<TData extends BaseRecord = BaseRecord, TError = HttpError>(
   options: UseOneOptions<TData, TError> = {}
@@ -155,12 +173,7 @@ export function useShow<TData extends BaseRecord = BaseRecord, TError = HttpErro
     get id() { return showId; },
   });
 
-  return {
-    get query() { return result.query; },
-    get showId() { return showId; },
-    setShowId,
-    get overtime() { return result.overtime; },
-  };
+  return extendQuery(result, () => ({ showId, setShowId }));
 }
 
 // ─── useMany ───────────────────────────────────────────────────
@@ -205,7 +218,7 @@ export function useMany<TData extends BaseRecord = BaseRecord, TError = HttpErro
     else if (query.isError) fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
   });
 
-  return { query, get overtime() { return overtime; } };
+  return extendQuery(query, () => ({ overtime }));
 }
 
 export function useApiUrl(dataProviderName?: string): string {

package/src/table-hooks.svelte.ts

@@ -83,7 +83,7 @@ export function useTable<
     ...restOptions
   });
 
-  const query = tableQueryInfo.query;
+  const query = tableQueryInfo;
   const overtime = tableQueryInfo.overtime;
 
   function setSorters(newSorters: Sort[]) { currentSorters = newSorters; }

package/src/table-state.svelte.ts

@@ -130,7 +130,7 @@ export class TableState<TData extends BaseRecord = BaseRecord, TError = HttpErro
   }
 
   /** Underlying TanStack Query result */
-  get query() { return this._queryResult.query; }
+  get query() { return this._queryResult; }
 
   /** Table data rows */
   get data(): TData[] { return (this.query.data as GetListResult<TData> | undefined)?.data ?? []; }