@svadmin/core 0.21.0 → 0.21.2

package/src/mutation-hooks.svelte.ts

@@ -1,6 +1,6 @@
 import { createMutation, useQueryClient } from '@tanstack/svelte-query';
 import { getAdminOptions } from './options.svelte';
-import { getDataProviderForResource } from './context.svelte';
+import { getDataProviderForResource, getResource } from './context.svelte';
 import { useParsed } from './useParsed.svelte';
 import { audit } from './audit';
 import { UndoError } from './types';
@@ -41,6 +41,7 @@ export function useCreate<TData extends BaseRecord = BaseRecord, TError = HttpEr
     TError,
     UseCreateMutateParams<TVariables>
   >(() => ({
+    ...options.mutationOptions,
     mutationFn: async (params) => {
       isMutating = true;
       const resName = params.resource ?? defaultResource;
@@ -55,16 +56,25 @@ export function useCreate<TData extends BaseRecord = BaseRecord, TError = HttpEr
         isMutating = false;
       }
     },
-    onSuccess: (data, params) => {
+    onMutate: (options.mutationOptions as any)?.onMutate,
+    onSuccess: (data, params, context) => {
       const resName = params.resource ?? defaultResource;
       if (params.invalidates !== false) {
         queryClient.invalidateQueries({ queryKey: [resName] });
       }
       fireSuccessNotification(params.successNotification, 'Created successfully', data.data, params.variables, resName);
-      audit({ action: 'create', resource: resName, recordId: String((data.data as Record<string, unknown>).id) });
+      const res = getResource(resName);
+      const pk = res.primaryKey ?? 'id';
+      audit({ action: 'create', resource: resName, recordId: String((data.data as Record<string, unknown>)[pk]) });
+      if (typeof options.mutationOptions?.onSuccess === 'function') {
+        (options.mutationOptions.onSuccess as Function)(data, params, context);
+      }
     },
-    onError: (error, params) => {
+    onError: (error, params, context) => {
       fireErrorNotification(params.errorNotification, 'Create failed', error);
+      if (typeof options.mutationOptions?.onError === 'function') {
+        (options.mutationOptions.onError as Function)(error, params, context);
+      }
     },
   }));
 
@@ -115,6 +125,7 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
     TError,
     UseUpdateMutateParams<TVariables>
   >(() => ({
+    ...options.mutationOptions,
     mutationFn: async (params) => {
       isMutating = true;
       const resName = params.resource ?? defaultResource;
@@ -143,7 +154,10 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
       }
     },
     onMutate: async (params) => {
-      if (mutationMode === 'pessimistic') return undefined;
+      const userOnMutate = (options.mutationOptions as any)?.onMutate;
+      const userContext = typeof userOnMutate === 'function' ? await userOnMutate(params) : undefined;
+      
+      if (mutationMode === 'pessimistic') return { _svadmin_ctx: true, userContext };
       const resName = params.resource ?? defaultResource;
       const targetId = params.id ?? defaultId;
       
@@ -151,7 +165,9 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
       const previousDetail = queryClient.getQueryData([resName, 'one', targetId]);
       const previousList = queryClient.getQueriesData({ queryKey: [resName, 'list'] });
       
+      const pk = getResource(resName).primaryKey ?? 'id';
       const updater = params.optimisticUpdateMap;
+      
       if (updater?.detail) {
         queryClient.setQueryData([resName, 'one', targetId], (old: unknown) => updater.detail!(old, params.variables, targetId));
       } else {
@@ -164,13 +180,14 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
         queryClient.setQueriesData({ queryKey: [resName, 'list'] }, (old: unknown) => {
           if (!old || typeof old !== 'object' || !('data' in old)) return old;
           const o = old as { data: Record<string, unknown>[] };
-          return { ...o, data: o.data.map((item) => String(item.id) === String(targetId) ? { ...item, ...params.variables } : item) };
+          return { ...o, data: o.data.map((item) => String(item[pk]) === String(targetId) ? { ...item, ...params.variables } : item) };
         });
       }
 
-      return { previousDetail, previousList };
+      return { _svadmin_ctx: true, userContext, previousDetail, previousList };
     },
-    onSuccess: (data, params) => {
+    onSuccess: (data, params, context) => {
+      const extractedCtx = (context as any)?._svadmin_ctx ? (context as any).userContext : context;
       const resName = params.resource ?? defaultResource;
       const targetId = params.id ?? defaultId;
       if (params.invalidates !== false) {
@@ -178,8 +195,12 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
       }
       fireSuccessNotification(params.successNotification, 'Updated successfully', data.data, params.variables, resName);
       audit({ action: 'update', resource: resName, recordId: String(targetId) });
+      if (typeof options.mutationOptions?.onSuccess === 'function') {
+        (options.mutationOptions.onSuccess as Function)(data, params, extractedCtx);
+      }
     },
     onError: (error, params, context: unknown) => {
+      const extractedCtx = (context as any)?._svadmin_ctx ? (context as any).userContext : context;
       const resName = params.resource ?? defaultResource;
       const targetId = params.id ?? defaultId;
       const ctx = context as { previousDetail?: unknown; previousList?: [unknown, unknown][] } | undefined;
@@ -189,6 +210,9 @@ export function useUpdate<TData extends BaseRecord = BaseRecord, TError = HttpEr
       }
       if (error instanceof UndoError) return;
       fireErrorNotification(params.errorNotification, 'Update failed', error);
+      if (typeof options.mutationOptions?.onError === 'function') {
+        (options.mutationOptions.onError as Function)(error, params, extractedCtx);
+      }
     },
   }));
 
@@ -235,6 +259,7 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
     TError,
     UseDeleteMutateParams<TVariables>
   >(() => ({
+    ...options.mutationOptions,
     mutationFn: async (params) => {
       isMutating = true;
       const resName = params.resource ?? defaultResource;
@@ -263,22 +288,28 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
       }
     },
     onMutate: async (params) => {
-      if (mutationMode === 'pessimistic') return undefined;
+      const userOnMutate = (options.mutationOptions as any)?.onMutate;
+      const userContext = typeof userOnMutate === 'function' ? await userOnMutate(params) : undefined;
+      
+      if (mutationMode === 'pessimistic') return { _svadmin_ctx: true, userContext };
       const resName = params.resource ?? defaultResource;
       const targetId = params.id ?? defaultId;
       
       await queryClient.cancelQueries({ queryKey: [resName] });
       const previousList = queryClient.getQueriesData({ queryKey: [resName, 'list'] });
       
+      const pk = getResource(resName).primaryKey ?? 'id';
+      
       queryClient.setQueriesData({ queryKey: [resName, 'list'] }, (old: unknown) => {
         if (!old || typeof old !== 'object' || !('data' in old)) return old;
         const o = old as { data: Record<string, unknown>[] };
-        return { ...o, data: o.data.filter((item) => String(item.id) !== String(targetId)) };
+        return { ...o, data: o.data.filter((item) => String(item[pk]) !== String(targetId)) };
       });
 
-      return { previousList };
+      return { _svadmin_ctx: true, userContext, previousList };
     },
-    onSuccess: (data, params) => {
+    onSuccess: (data, params, context) => {
+      const extractedCtx = (context as any)?._svadmin_ctx ? (context as any).userContext : context;
       const resName = params.resource ?? defaultResource;
       const targetId = params.id ?? defaultId;
       if (params.invalidates !== false) {
@@ -286,14 +317,21 @@ export function useDelete<TData extends BaseRecord = BaseRecord, TError = HttpEr
       }
       fireSuccessNotification(params.successNotification, 'Deleted successfully', data.data, params.variables, resName);
       audit({ action: 'delete', resource: resName, recordId: String(targetId) });
+      if (typeof options.mutationOptions?.onSuccess === 'function') {
+        (options.mutationOptions.onSuccess as Function)(data, params, extractedCtx);
+      }
     },
     onError: (error, params, context: unknown) => {
+      const extractedCtx = (context as any)?._svadmin_ctx ? (context as any).userContext : context;
       const ctx = context as { previousList?: [unknown, unknown][] } | undefined;
       if (ctx?.previousList) {
         ctx.previousList.forEach(([qk, data]) => queryClient.setQueryData(qk as string[], data));
       }
       if (error instanceof UndoError) return;
       fireErrorNotification(params.errorNotification, 'Delete failed', error);
+      if (typeof options.mutationOptions?.onError === 'function') {
+        (options.mutationOptions.onError as Function)(error, params, extractedCtx);
+      }
     },
   }));
 

package/src/query-hooks.svelte.ts

@@ -56,34 +56,33 @@ export interface UseListOptions<TData extends BaseRecord = BaseRecord, TError =
 
 export function useList<TData extends BaseRecord = BaseRecord, TError = HttpError>(options: UseListOptions<TData, TError> = {}) {
   const parsed = useParsed();
-  const resource = options.resource ?? parsed.resource ?? '';
   const adminOptions = getAdminOptions();
-  const provider = getDataProviderForResource(resource, options.dataProviderName);
 
-  const queryOptions = options.queryOptions;
+  const query = createQuery<GetListResult<TData>, TError>(() => {
+    const resource = options.resource ?? parsed.resource ?? '';
+    const queryOptions = options.queryOptions;
+    const provider = getDataProviderForResource(resource, options.dataProviderName);
 
-  const query = createQuery<GetListResult<TData>, TError>(() => ({
-    queryKey: [resource, 'list', options.pagination, options.sorters, options.filters, options.meta],
-    queryFn: async () => {
-      const result = await provider.getList<TData>({
+    return {
+      queryKey: [resource, 'list', options.pagination, options.sorters, options.filters, options.meta],
+      queryFn: async () => provider.getList<TData>({
         resource,
         pagination: options.pagination,
         sorters: options.sorters,
         filters: options.filters,
         meta: options.meta,
-      });
-      return result;
-    },
-    enabled: queryOptions?.enabled ?? true,
-    staleTime: queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
-    gcTime: queryOptions?.gcTime ?? adminOptions.reactQuery?.gcTime,
-    refetchOnWindowFocus: queryOptions?.refetchOnWindowFocus ?? adminOptions.reactQuery?.refetchOnWindowFocus,
-  }));
+      }),
+      enabled: queryOptions?.enabled ?? true,
+      staleTime: queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
+      gcTime: queryOptions?.gcTime ?? adminOptions.reactQuery?.gcTime,
+      refetchOnWindowFocus: queryOptions?.refetchOnWindowFocus ?? adminOptions.reactQuery?.refetchOnWindowFocus,
+    };
+  });
 
   const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
 
-  createLiveSubscription({
-    resource,
+  createLiveSubscription(() => ({
+    resource: options.resource ?? parsed.resource ?? '',
     liveProvider: getLiveProvider(),
     liveMode: options.liveMode ?? adminOptions.liveMode,
     onLiveEvent: (e) => {
@@ -91,13 +90,19 @@ export function useList<TData extends BaseRecord = BaseRecord, TError = HttpErro
       adminOptions.onLiveEvent?.(e);
     },
     liveParams: options.liveParams,
-    enabled: queryOptions?.enabled ?? true,
-  });
+    enabled: options.queryOptions?.enabled ?? true,
+  }));
+
+  let lastSuccess = $state(0);
+  let lastError = $state(0);
 
   $effect(() => {
-    if (query.isSuccess && options.successNotification) {
+    if (query.isSuccess && options.successNotification && query.dataUpdatedAt > lastSuccess) {
+      lastSuccess = query.dataUpdatedAt;
+      const resource = options.resource ?? parsed.resource ?? '';
       fireSuccessNotification(options.successNotification, '', query.data, undefined, resource);
-    } else if (query.isError) {
+    } else if (query.isError && query.errorUpdatedAt > lastError) {
+      lastError = query.errorUpdatedAt;
       fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
     }
   });
@@ -123,35 +128,54 @@ export interface UseOneOptions<TData extends BaseRecord = BaseRecord, TError = H
 
 export function useOne<TData extends BaseRecord = BaseRecord, TError = HttpError>(options: UseOneOptions<TData, TError> = {}) {
   const parsed = useParsed();
-  const resource = options.resource ?? parsed.resource ?? '';
-  const id = options.id ?? parsed.id;
   const adminOptions = getAdminOptions();
-  const provider = getDataProviderForResource(resource, options.dataProviderName);
 
-  const queryOptions = options.queryOptions;
+  const query = createQuery<GetOneResult<TData>, TError>(() => {
+    const resource = options.resource ?? parsed.resource ?? '';
+    const id = options.id ?? parsed.id;
+    const queryOptions = options.queryOptions;
+    const provider = getDataProviderForResource(resource, options.dataProviderName);
 
-  const query = createQuery<GetOneResult<TData>, TError>(() => ({
-    queryKey: [resource, 'one', id, options.meta],
-    queryFn: async () => {
-      if (id == null) throw new Error('useOne requires an id');
-      const result = await provider.getOne<TData>({
-        resource,
-        id,
-        meta: options.meta,
-      });
-      return result;
+    return {
+      queryKey: [resource, 'one', id, options.meta],
+      queryFn: async () => {
+        if (id == null) throw new Error('useOne requires an id');
+        return provider.getOne<TData>({
+          resource,
+          id,
+          meta: options.meta,
+        });
+      },
+      enabled: (queryOptions?.enabled ?? true) && id != null,
+      staleTime: queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
+      gcTime: queryOptions?.gcTime ?? adminOptions.reactQuery?.gcTime,
+    };
+  });
+
+  const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
+
+  createLiveSubscription(() => ({
+    resource: options.resource ?? parsed.resource ?? '',
+    liveProvider: getLiveProvider(),
+    liveMode: options.liveMode ?? adminOptions.liveMode,
+    onLiveEvent: (e) => {
+      options.onLiveEvent?.(e);
+      adminOptions.onLiveEvent?.(e);
     },
-    enabled: (queryOptions?.enabled ?? true) && id != null,
-    staleTime: queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
-    gcTime: queryOptions?.gcTime ?? adminOptions.reactQuery?.gcTime,
+    liveParams: options.liveParams,
+    enabled: (options.queryOptions?.enabled ?? true) && (options.id ?? parsed.id) != null,
   }));
 
-  const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
+  let lastSuccess = $state(0);
+  let lastError = $state(0);
 
   $effect(() => {
-    if (query.isSuccess && options.successNotification) {
+    if (query.isSuccess && options.successNotification && query.dataUpdatedAt > lastSuccess) {
+      lastSuccess = query.dataUpdatedAt;
+      const resource = options.resource ?? parsed.resource ?? '';
       fireSuccessNotification(options.successNotification, '', query.data, undefined, resource);
-    } else if (query.isError) {
+    } else if (query.isError && query.errorUpdatedAt > lastError) {
+      lastError = query.errorUpdatedAt;
       fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
     }
   });
@@ -193,29 +217,51 @@ export interface UseManyOptions<TData extends BaseRecord = BaseRecord, TError =
 }
 
 export function useMany<TData extends BaseRecord = BaseRecord, TError = HttpError>(options: UseManyOptions<TData, TError>) {
-  const { resource, ids, meta, dataProviderName, queryOptions } = options;
   const adminOptions = getAdminOptions();
-  const provider = getDataProviderForResource(resource, dataProviderName);
-
-  const query = createQuery<GetManyResult<TData>, TError>(() => ({
-    queryKey: [resource, 'many', ids, meta],
-    queryFn: async () => {
-      if (!ids.length) return { data: [] };
-      if (provider.getMany) {
-        return provider.getMany<TData>({ resource, ids, meta });
-      }
-      const results = await Promise.all(ids.map(id => provider.getOne<TData>({ resource, id, meta })));
-      return { data: results.map(r => r.data) };
+
+  const query = createQuery<GetManyResult<TData>, TError>(() => {
+    const { resource, ids, meta, dataProviderName, queryOptions } = options;
+    const provider = getDataProviderForResource(resource, dataProviderName);
+    return {
+      queryKey: [resource, 'many', ids, meta],
+      queryFn: async () => {
+        if (!ids.length) return { data: [] };
+        if (provider.getMany) {
+          return provider.getMany<TData>({ resource, ids, meta });
+        }
+        const results = await Promise.all(ids.map(id => provider.getOne<TData>({ resource, id, meta })));
+        return { data: results.map(r => r.data) };
+      },
+      enabled: (queryOptions?.enabled ?? true) && ids.length > 0,
+      staleTime: queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
+    };
+  });
+
+  const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
+
+  createLiveSubscription(() => ({
+    resource: options.resource,
+    liveProvider: getLiveProvider(),
+    liveMode: options.liveMode ?? adminOptions.liveMode,
+    onLiveEvent: (e) => {
+      options.onLiveEvent?.(e);
+      adminOptions.onLiveEvent?.(e);
     },
-    enabled: (queryOptions?.enabled ?? true) && ids.length > 0,
-    staleTime: queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
+    liveParams: options.liveParams,
+    enabled: (options.queryOptions?.enabled ?? true) && options.ids?.length > 0,
   }));
 
-  const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
+  let lastSuccess = $state(0);
+  let lastError = $state(0);
 
   $effect(() => {
-    if (query.isSuccess && options.successNotification) fireSuccessNotification(options.successNotification, '', query.data, undefined, resource);
-    else if (query.isError) fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
+    if (query.isSuccess && options.successNotification && query.dataUpdatedAt > lastSuccess) {
+      lastSuccess = query.dataUpdatedAt;
+      fireSuccessNotification(options.successNotification, '', query.data, undefined, options.resource);
+    } else if (query.isError && query.errorUpdatedAt > lastError) {
+      lastError = query.errorUpdatedAt;
+      fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
+    }
   });
 
   return extendQuery(query, () => ({ overtime }));

package/src/router-provider.ts

@@ -18,6 +18,8 @@ export interface RouterProvider {
     params: Record<string, string>;
     pathname: string;
   };
+  /** Formats an internal path into an href string for <a> tags */
+  formatLink?: (path: string) => string;
 }
 
 // ─── Hash Router (default) ──────────────────────────────────
@@ -25,21 +27,29 @@ export interface RouterProvider {
 export function createHashRouterProvider(): RouterProvider {
   return {
     go({ to, query, type = 'push' }) {
-      let url = `#${to}`;
+      if (typeof window === 'undefined') return;
+      let url = to;
       if (query) {
         const params = new URLSearchParams(query).toString();
         if (params) url += `?${params}`;
       }
       if (type === 'replace') {
-        window.location.replace(url);
+        const urlObj = new URL(window.location.href);
+        urlObj.hash = url;
+        window.history.replaceState(null, '', urlObj.href);
+        window.dispatchEvent(new HashChangeEvent('hashchange'));
       } else {
-        window.location.hash = to;
+        window.location.hash = url;
       }
     },
     back() {
+      if (typeof window === 'undefined') return;
       history.back();
     },
     parse() {
+      if (typeof window === 'undefined') {
+        return { resource: undefined, action: undefined, id: undefined, params: {}, pathname: '/' };
+      }
       const hash = window.location.hash.slice(1) || '/';
       const [pathname, queryString] = hash.split('?');
       const params: Record<string, string> = {};
@@ -57,6 +67,9 @@ export function createHashRouterProvider(): RouterProvider {
         pathname,
       };
     },
+    formatLink(path) {
+      return '#' + path.replace(/^#/, '');
+    },
   };
 }
 
@@ -65,6 +78,7 @@ export function createHashRouterProvider(): RouterProvider {
 export function createHistoryRouterProvider(basePath = ''): RouterProvider {
   return {
     go({ to, query, type = 'push' }) {
+      if (typeof window === 'undefined') return;
       let url = `${basePath}${to}`;
       if (query) {
         const params = new URLSearchParams(query).toString();
@@ -79,9 +93,13 @@ export function createHistoryRouterProvider(basePath = ''): RouterProvider {
       window.dispatchEvent(new PopStateEvent('popstate'));
     },
     back() {
+      if (typeof window === 'undefined') return;
       history.back();
     },
     parse() {
+      if (typeof window === 'undefined') {
+        return { resource: undefined, action: undefined, id: undefined, params: {}, pathname: '/' };
+      }
       const pathname = window.location.pathname.replace(basePath, '') || '/';
       const params: Record<string, string> = {};
       for (const [k, v] of new URLSearchParams(window.location.search).entries()) {
@@ -96,5 +114,8 @@ export function createHistoryRouterProvider(basePath = ''): RouterProvider {
         pathname,
       };
     },
+    formatLink(path) {
+      return basePath + path;
+    },
   };
 }

package/src/router.ts

@@ -50,21 +50,34 @@ export function matchRoute(
   return null;
 }
 
-/**
- * Navigate to a path. Uses RouterProvider if available, falls back to hash.
- */
 export function navigate(path: string, options?: { replaceState?: boolean }): void {
   if (_routerProvider) {
     _routerProvider.go({ to: path, type: options?.replaceState ? 'replace' : 'push' });
-  } else {
+  } else if (typeof window !== 'undefined') {
     window.location.hash = '#' + path.replace(/^#/, '');
   }
 }
 
+/**
+ * Format a path into an href suitable for <a> tags.
+ */
+export function formatLink(path: string): string {
+  if (_routerProvider?.formatLink) {
+    return _routerProvider.formatLink(path);
+  }
+  return '#' + path.replace(/^#/, '');
+}
+
 export function currentPath(): string {
   if (_routerProvider) {
     const parsed = _routerProvider.parse();
-    return parsed.pathname || '/';
+    const pathname = parsed.pathname || '/';
+    let qs = '';
+    if (parsed.params && Object.keys(parsed.params).length > 0) {
+      qs = '?' + new URLSearchParams(parsed.params).toString();
+    }
+    return pathname + qs;
   }
+  if (typeof window === 'undefined') return '/';
   return window.location.hash.replace(/^#/, '') || '/';
 }

package/src/routing-hooks.svelte.ts

@@ -7,13 +7,14 @@ import { useParsed } from './useParsed.svelte';
 export function useGetToPath() {
   const routerProvider = getRouterProvider();
 
-  return (options: { resource?: string; action?: 'list' | 'create' | 'edit' | 'show'; id?: string | number; meta?: Record<string, unknown> }) => {
+  return (options: { resource?: string; action?: 'list' | 'create' | 'edit' | 'show' | 'clone'; id?: string | number; meta?: Record<string, unknown> }) => {
     const { resource, action, id } = options;
     if (!resource) return '/';
     let path = `/${resource}`;
     if (action === 'create') path += '/create';
     else if (action === 'edit' && id) path += `/edit/${id}`;
     else if (action === 'show' && id) path += `/show/${id}`;
+    else if (action === 'clone' && id) path += `/clone/${id}`;
 
     // Apply router mapping if the router provider defines custom path transformers
     if (routerProvider?.go) {
@@ -30,7 +31,7 @@ export function useGo() {
   return (options: { to?: string; query?: Record<string, unknown>; type?: 'push' | 'replace'; resource?: string; action?: 'list' | 'create' | 'edit' | 'show' | 'clone'; id?: string | number }) => {
     let targetUrl = options.to;
     if (!targetUrl && options.resource) {
-      targetUrl = getToPath({ resource: options.resource, action: options.action === 'clone' ? 'edit' : options.action, id: options.id });
+      targetUrl = getToPath({ resource: options.resource, action: options.action, id: options.id });
     }
     if (!targetUrl) targetUrl = '/';
 

package/src/table-hooks.svelte.ts

@@ -115,9 +115,9 @@ export function useTable<
       writeURLState({
         page: pagination.current,
         pageSize: pagination.pageSize,
-        sortField: effectiveSorters[0]?.field,
-        sortOrder: effectiveSorters[0]?.order,
-        filters: effectiveFilters,
+        sortField: currentSorters[0]?.field,
+        sortOrder: currentSorters[0]?.order,
+        filters: currentFilters,
       });
     });
   }
@@ -126,12 +126,12 @@ export function useTable<
     const params = new URLSearchParams();
     if (pagination.current) params.set('page', String(pagination.current));
     if (pagination.pageSize) params.set('pageSize', String(pagination.pageSize));
-    if (effectiveSorters[0]) {
-      params.set('sortField', effectiveSorters[0].field);
-      params.set('sortOrder', effectiveSorters[0].order);
+    if (currentSorters[0]) {
+      params.set('sort', currentSorters[0].field);
+      params.set('order', currentSorters[0].order);
     }
-    if (effectiveFilters.length > 0) {
-      params.set('filters', JSON.stringify(effectiveFilters));
+    if (currentFilters.length > 0) {
+      params.set('filters', JSON.stringify(currentFilters));
     }
     return `?${params.toString()}`;
   }

package/src/table-state.svelte.ts

@@ -94,12 +94,13 @@ export class TableState<TData extends BaseRecord = BaseRecord, TError = HttpErro
     this.currentFilters = initFilters;
 
     // Create query
+    const _this = this;
     const { meta, syncWithLocation: _s, dataProviderName, pagination: _p, sorters: _sr, filters: _f, ...restOptions } = options;
     this._queryResult = useList<TData, TError>({
       resource,
-      pagination: this.queryPagination,
-      sorters: this.effectiveSorters,
-      filters: this.effectiveFilters,
+      get pagination() { return _this.queryPagination; },
+      get sorters() { return _this.effectiveSorters; },
+      get filters() { return _this.effectiveFilters; },
       meta,
       dataProviderName,
       ...restOptions,
@@ -111,9 +112,9 @@ export class TableState<TData extends BaseRecord = BaseRecord, TError = HttpErro
         writeURLState({
           page: this.pagination.current,
           pageSize: this.pagination.pageSize,
-          sortField: this.effectiveSorters[0]?.field,
-          sortOrder: this.effectiveSorters[0]?.order,
-          filters: this.effectiveFilters,
+          sortField: this.currentSorters[0]?.field,
+          sortOrder: this.currentSorters[0]?.order,
+          filters: this.currentFilters,
         });
       });
     }