@svadmin/core 0.31.0 → 0.32.0

package/src/routing-hooks.svelte.ts

@@ -1,12 +1,10 @@
-/* eslint-disable svelte/prefer-svelte-reactivity */
-import { navigate } from './router';
-import { getResource, getResources, getRouterProvider } from './context.svelte';
+import { captureAdminContext } from './context.svelte';
 import { useParsed } from './useParsed.svelte';
 
 // ─── routing-hooks.svelte.ts ───────────────────────────────────
 
 export function useGetToPath() {
-  const routerProvider = getRouterProvider();
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
 
   return (options: { resource?: string; action?: 'list' | 'create' | 'edit' | 'show' | 'clone'; id?: string | number; meta?: Record<string, unknown> }) => {
@@ -31,7 +29,7 @@ export function useGetToPath() {
     else if (action === 'clone' && id) path += `/clone/${id}`;
 
     // Apply router mapping if the router provider defines custom path transformers
-    if (routerProvider?.go) {
+    if (adminContext.routerProvider?.go) {
       // SvelteKit path generation can be injected here.
     }
     return path;
@@ -39,6 +37,7 @@ export function useGetToPath() {
 }
 
 export function useGo() {
+  const adminContext = captureAdminContext();
   const getToPath = useGetToPath();
 
   return (options: { to?: string; query?: Record<string, unknown>; type?: 'push' | 'replace'; resource?: string; action?: 'list' | 'create' | 'edit' | 'show' | 'clone'; id?: string | number }) => {
@@ -55,19 +54,13 @@ export function useGo() {
       }
     }
 
-    navigate(targetUrl, options.type === 'replace' ? { replaceState: true } : undefined);
+    void adminContext.navigate(targetUrl, options.type === 'replace' ? { replaceState: true } : undefined);
   };
 }
 
 export function useBack() {
-  return () => {
-    const routerProvider = getRouterProvider();
-    if (routerProvider?.back) {
-      routerProvider.back();
-    } else if (typeof window !== 'undefined') {
-      window.history.back();
-    }
-  };
+  const adminContext = captureAdminContext();
+  return () => adminContext.back();
 }
 
 /**
@@ -75,13 +68,15 @@ export function useBack() {
  * (to avoid full page reloads in SSR apps)
  */
 export function useLink() {
+  const adminContext = captureAdminContext();
   return () => {
-    const routerProvider = getRouterProvider() as Record<string, unknown> | undefined;
+    const routerProvider = adminContext.routerProvider as unknown as Record<string, unknown> | undefined;
     return (routerProvider?.Link as string) ?? 'a';
   };
 }
 
 export function useResource(resourceName?: string) {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
 
   // Derived resource — re-evaluates when parsed.resource or resourceName changes
@@ -89,7 +84,7 @@ export function useResource(resourceName?: string) {
     const target = resourceName ?? parsed.resource;
     if (!target) return undefined;
     try {
-      return getResource(target);
+      return adminContext.getResource(target);
     } catch {
       return undefined;
     }
@@ -97,7 +92,7 @@ export function useResource(resourceName?: string) {
 
   return {
     get resource() { return resolvedResource; },
-    get resources() { return getResources(); },
+    get resources() { return adminContext.resources; },
     get identifier() { return resolvedResource?.identifier ?? resolvedResource?.name; },
     /** 当前 URL 解析出的 parent 资源信息（嵌套资源路由） */
     get parent() {
@@ -111,7 +106,7 @@ export function useResource(resourceName?: string) {
     /** Resolve a resource by name — useful for dynamic lookups inside callbacks */
     select: (name: string) => {
       try {
-        const res = getResource(name);
+        const res = adminContext.getResource(name);
         return { resource: res, identifier: res.identifier ?? res.name };
       } catch {
         return { resource: undefined, identifier: undefined };

package/src/table-hooks.svelte.ts

@@ -1,6 +1,7 @@
 import { useParsed } from './useParsed.svelte';
 import { useList } from './query-hooks.svelte';
 import { readURLState, writeURLState } from './url-sync';
+import { captureAdminContext } from './context.svelte';
 import { getAdminOptions } from './options.svelte';
 import type { Pagination, Sort, Filter, BaseRecord, HttpError, KnownResources, GetListResult } from './types';
 import type { UseListOptions, MaybeGetter } from './query-hooks.svelte';
@@ -29,6 +30,7 @@ export function useTable<
   TError = HttpError,
   TSearchVariables = Record<string, unknown>
 >(optionsOrGetter: MaybeGetter<UseTableOptions<TQueryFnData, TError, TSearchVariables>> = {}) {
+  const adminContext = captureAdminContext();
   const getOptions = () => typeof optionsOrGetter === 'function' ? optionsOrGetter() : optionsOrGetter;
   const parsed = useParsed();
   
@@ -50,7 +52,7 @@ export function useTable<
   let initFilters = initialOpts.filters?.initial ?? [];
 
   if (syncWithLocation && typeof window !== 'undefined') {
-    const urlState = readURLState();
+    const urlState = readURLState(adminContext);
     if (urlState.page || urlState.pageSize) {
       initPagination = {
         current: urlState.page ?? initPagination.current,
@@ -128,12 +130,12 @@ export function useTable<
         sortField: currentSorters[0]?.field,
         sortOrder: currentSorters[0]?.order,
         filters: currentFilters,
-      });
+      }, adminContext);
     });
 
     $effect(() => {
       const handler = () => {
-        const urlState = readURLState();
+        const urlState = readURLState(adminContext);
         const newPage = urlState.page ?? 1;
         if (newPage !== pagination.current) {
           pagination = { ...pagination, current: newPage };

package/src/table-state.svelte.ts

@@ -1,10 +1,11 @@
-/* eslint-disable svelte/prefer-svelte-reactivity */
 // TableState — Svelte 5 Class State Pattern for table data management
 // Reactive class that encapsulates all table state with fine-grained $state/$derived
 
 import { useParsed } from './useParsed.svelte';
 import { useList } from './query-hooks.svelte';
 import { readURLState, writeURLState } from './url-sync';
+import { captureAdminContext } from './context.svelte';
+import type { AdminContextAccessor } from './context.svelte';
 import type { Pagination, Sort, Filter, BaseRecord, HttpError, KnownResources, GetListResult } from './types';
 import type { UseListOptions } from './query-hooks.svelte';
 
@@ -53,11 +54,13 @@ export class TableState<TData extends BaseRecord = BaseRecord, TError = HttpErro
   private filterDefaultBehavior: FilterSetMode;
   private syncWithLocation: boolean;
   private paginationMode: string;
+  private adminContext: AdminContextAccessor;
 
   // ─── Query result ─────────────────────────────────────────────
   private _queryResult;
 
   constructor(options: TableStateOptions<TData, TError> = {}) {
+    this.adminContext = captureAdminContext();
     const parsed = useParsed();
     const resource = options.resource ?? parsed.resource ?? '';
 
@@ -75,7 +78,7 @@ export class TableState<TData extends BaseRecord = BaseRecord, TError = HttpErro
     let initFilters = options.filters?.initial ?? [];
 
     if (this.syncWithLocation && typeof window !== 'undefined') {
-      const urlState = readURLState();
+      const urlState = readURLState(this.adminContext);
       if (urlState.page || urlState.pageSize) {
         initPagination = {
           current: urlState.page ?? initPagination.current,
@@ -116,7 +119,7 @@ export class TableState<TData extends BaseRecord = BaseRecord, TError = HttpErro
           sortField: this.currentSorters[0]?.field,
           sortOrder: this.currentSorters[0]?.order,
           filters: this.currentFilters,
-        });
+        }, this.adminContext);
       });
     }
   }

package/src/task-hooks.svelte.ts

@@ -1,9 +1,10 @@
 import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query';
 import { getAdminOptions } from './options.svelte';
-import { getTaskProvider } from './context.svelte';
+import { captureAdminContext } from './context.svelte';
+import type { AdminContextAccessor } from './context.svelte';
 import { checkError, createOvertimeTracker, fireErrorNotification, fireSuccessNotification } from './hook-utils.svelte';
 import type { NotificationConfig, OvertimeOptions } from './hook-utils.svelte';
-import { t } from './i18n.svelte';
+import { useTranslation } from './i18n.svelte';
 import type {
   HttpError,
   SubmitTaskOptions,
@@ -15,8 +16,13 @@ import type {
 
 function normalizeTaskProvider<TTask extends TaskRecord = TaskRecord>(
   provider?: TaskProvider<TTask>,
+  adminContext: AdminContextAccessor = captureAdminContext(),
 ): TaskProvider<TTask> {
-  return (provider ?? getTaskProvider({ optional: true }) ?? getTaskProvider()) as TaskProvider<TTask>;
+  const activeProvider = provider ?? adminContext.taskProvider;
+  if (!activeProvider) {
+    throw new Error('TaskProvider not found. Did you call setTaskProvider in App.svelte?');
+  }
+  return activeProvider as TaskProvider<TTask>;
 }
 
 export interface UseSubmitTaskOptions {
@@ -39,19 +45,21 @@ export function useSubmitTask<
   TTask extends TaskRecord = TaskRecord,
   TError = HttpError,
 >(options: UseSubmitTaskOptions = {}) {
+  const adminContext = captureAdminContext();
+  const i18n = useTranslation();
   const adminOptions = getAdminOptions();
   const queryClient = useQueryClient();
   const overtime = createOvertimeTracker(() => mutation.isPending, options.overtimeOptions ?? adminOptions.overtime);
 
   const mutation = createMutation<TaskHandle<TTask>, TError, UseSubmitTaskMutateParams<TTask>>(() => ({
     mutationFn: async (params) => {
-      const provider = normalizeTaskProvider<TTask>(params.taskProvider);
+      const provider = normalizeTaskProvider<TTask>(params.taskProvider, adminContext);
       return provider.submit(params.taskName, params.options);
     },
     onSuccess: (data, params, context) => {
       fireSuccessNotification(
         params.successNotification,
-        t('task.submitSuccess'),
+        i18n.t('task.submitSuccess'),
         data,
         params.options,
         params.taskName,
@@ -60,10 +68,10 @@ export function useSubmitTask<
       options.mutationOptions?.onSuccess?.(data, params, context);
     },
     onError: (error, params, context) => {
-      checkError(error);
+      checkError(error, adminContext);
       fireErrorNotification(
         params.errorNotification,
-        t('task.submitFailed'),
+        i18n.t('task.submitFailed'),
         error,
         params.taskName,
       );
@@ -93,10 +101,12 @@ export interface UseTaskOptions<TTask extends TaskRecord = TaskRecord, _TError =
 export function useTask<TTask extends TaskRecord = TaskRecord, TError = HttpError>(
   options: UseTaskOptions<TTask, TError> = {},
 ) {
+  const adminContext = captureAdminContext();
+  const i18n = useTranslation();
   const adminOptions = getAdminOptions();
 
   const query = createQuery<TTask, TError>(() => {
-    const provider = normalizeTaskProvider<TTask>(options.taskProvider);
+    const provider = normalizeTaskProvider<TTask>(options.taskProvider, adminContext);
     const queryOptions = options.queryOptions;
     return {
       queryKey: ['task', options.taskId],
@@ -125,8 +135,8 @@ export function useTask<TTask extends TaskRecord = TaskRecord, TError = HttpErro
       }
     } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
       lastErrorAt = query.errorUpdatedAt;
-      checkError(query.error);
-      fireErrorNotification(options.errorNotification, t('task.fetchFailed'), query.error, options.taskId);
+      checkError(query.error, adminContext);
+      fireErrorNotification(options.errorNotification, i18n.t('task.fetchFailed'), query.error, options.taskId);
     }
   });
 
@@ -158,10 +168,12 @@ export interface UseTaskListOptions<TTask extends TaskRecord = TaskRecord, _TErr
 export function useTaskList<TTask extends TaskRecord = TaskRecord, TError = HttpError>(
   options: UseTaskListOptions<TTask, TError> = {},
 ) {
+  const adminContext = captureAdminContext();
+  const i18n = useTranslation();
   const adminOptions = getAdminOptions();
 
   const query = createQuery<TaskListResult<TTask>, TError>(() => {
-    const provider = normalizeTaskProvider<TTask>(options.taskProvider);
+    const provider = normalizeTaskProvider<TTask>(options.taskProvider, adminContext);
     const queryOptions = options.queryOptions;
     return {
       queryKey: ['taskList', options.dlq ? 'dlq' : 'default', options.params],
@@ -194,8 +206,8 @@ export function useTaskList<TTask extends TaskRecord = TaskRecord, TError = Http
       }
     } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
       lastErrorAt = query.errorUpdatedAt;
-      checkError(query.error);
-      fireErrorNotification(options.errorNotification, t('task.fetchListFailed'), query.error, options.dlq ? 'taskDlq' : 'tasks');
+      checkError(query.error, adminContext);
+      fireErrorNotification(options.errorNotification, i18n.t('task.fetchListFailed'), query.error, options.dlq ? 'taskDlq' : 'tasks');
     }
   });
 
@@ -217,11 +229,12 @@ export interface UseTaskSubscriptionOptions<TTask extends TaskRecord = TaskRecor
 export function useTaskSubscription<TTask extends TaskRecord = TaskRecord>(
   options: UseTaskSubscriptionOptions<TTask>,
 ): void {
+  const adminContext = captureAdminContext();
   $effect(() => {
     const enabled = options.enabled ?? true;
     if (!enabled) return;
 
-    const provider = normalizeTaskProvider<TTask>(options.taskProvider);
+    const provider = normalizeTaskProvider<TTask>(options.taskProvider, adminContext);
     if (!provider.subscribe) {
       throw new Error('TaskProvider does not implement subscribe');
     }