@svadmin/core 0.22.0 → 0.23.0

package/src/helpers.ts

@@ -4,122 +4,13 @@ import type { Filter, Sort, CrudOperator } from './types';
 import { t } from './i18n.svelte';
 import { getTextTransformers } from './options.svelte';
 
-// ─── Table Helpers ────────────────────────────────────────────
+// ─── Re-export pure utilities (testable without Svelte runtime) ───
+export {
+  getDefaultFilter, getDefaultSortOrder,
+  unionFilters, unionSorters,
+  file2Base64, parseCSV,
+} from './helpers-pure';
 
-/**
- * Get the current filter value for a field from a filter array.
- * Useful for setting default values in filter inputs.
- */
-export function getDefaultFilter(
-  columnName: string,
-  filters?: Filter[],
-  operatorType: CrudOperator = 'eq',
-): unknown | undefined {
-  if (!filters) return undefined;
-  const filter = filters.find((f) => {
-    if ('field' in f) {
-      return f.field === columnName && f.operator === operatorType;
-    }
-    return false;
-  });
-  return filter && 'value' in filter ? filter.value : undefined;
-}
-
-/**
- * Get the current sort order for a field from a sorter array.
- * Returns 'asc', 'desc', or undefined.
- */
-export function getDefaultSortOrder(
-  columnName: string,
-  sorters?: Sort[],
-): 'asc' | 'desc' | undefined {
-  if (!sorters) return undefined;
-  const sortItem = sorters.find((item) => item.field === columnName);
-  return sortItem?.order as 'asc' | 'desc' | undefined;
-}
-
-/**
- * Merge two filter arrays, deduplicating by field+operator.
- * Filters in `newFilters` take priority over `prevFilters`.
- * `permanentFilter` items are always preserved.
- * Filters with undefined values are removed from the result.
- */
-export function unionFilters(
-  permanentFilter: Filter[],
-  newFilters: Filter[],
-  prevFilters: Filter[] = [],
-): Filter[] {
-  const compareFilters = (a: Filter, b: Filter): boolean => {
-    if ('field' in a && 'field' in b) {
-      return a.field === b.field && a.operator === b.operator;
-    }
-    return false;
-  };
-
-  // Start with previous filters
-  let result = [...prevFilters];
-
-  // Apply new filters (override previous by field+operator)
-  for (const newFilter of newFilters) {
-    const idx = result.findIndex((f) => compareFilters(f, newFilter));
-    if (idx >= 0) {
-      result[idx] = newFilter;
-    } else {
-      result.push(newFilter);
-    }
-  }
-
-  // Ensure permanent filters are always present
-  for (const perm of permanentFilter) {
-    const idx = result.findIndex((f) => compareFilters(f, perm));
-    if (idx >= 0) {
-      result[idx] = perm;
-    } else {
-      result.push(perm);
-    }
-  }
-
-  // Remove filters with undefined values
-  return result.filter((f) => !('value' in f && f.value === undefined));
-}
-
-/**
- * Merge two sorter arrays, deduplicating by field.
- * Sorters in `newSorters` take priority.
- */
-export function unionSorters(
-  permanentSorters: Sort[],
-  newSorters: Sort[],
-): Sort[] {
-  const result = [...newSorters];
-
-  for (const perm of permanentSorters) {
-    if (!result.some((s) => s.field === perm.field)) {
-      result.push(perm);
-    }
-  }
-
-  return result;
-}
-
-// ─── Upload Helpers ───────────────────────────────────────────
-
-/**
- * Convert a File (or file-like object) to a base64 data URL string.
- * Useful for image uploads and previews.
- */
-export function file2Base64(file: File | { uid?: string } & Blob): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(file as Blob);
-    reader.addEventListener('load', () => {
-      resolve(reader.result as string);
-    });
-    reader.addEventListener('error', () => {
-      reject(reader.error);
-    });
-  });
-}
 
 // ─── Document Title Helper ────────────────────────────────────
 
@@ -219,7 +110,7 @@ export function deriveValidator(
         case 'email': {
           const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
           if (typeof value === 'string' && !emailRegex.test(value)) {
-            errors[field.key] = t('validation.email', { defaultValue: 'Invalid email address' });
+            errors[field.key] = t('validation.invalidEmail');
           }
           break;
         }
@@ -227,13 +118,13 @@ export function deriveValidator(
           try {
             new URL(value as string);
           } catch {
-            errors[field.key] = t('validation.url', { defaultValue: 'Invalid URL' });
+            errors[field.key] = t('validation.invalidUrl');
           }
           break;
         }
         case 'number': {
           if (typeof value === 'string' && isNaN(Number(value))) {
-            errors[field.key] = t('validation.number', { defaultValue: 'Must be a number' });
+            errors[field.key] = t('validation.invalidNumber');
           }
           break;
         }

package/src/hook-utils.svelte.ts

@@ -3,7 +3,27 @@
 
 import { useQueryClient } from '@tanstack/svelte-query';
 import type { LiveProvider, LiveEvent, LiveMode } from './live.svelte';
-import { toast } from './toast.svelte';
+import { getAuthProvider } from './context.svelte';
+import { notify } from './notification.svelte';
+
+// ─── Auth Error Delegate ────────────────────────────────────────
+// Delegate auth errors (401/403) to authProvider.onError() — refine pattern
+
+export async function checkError(error: unknown): Promise<void> {
+  try {
+    const authProvider = getAuthProvider({ optional: true });
+    if (!authProvider?.onError) return;
+    const result = await authProvider.onError(error);
+    if (result.logout) {
+      await authProvider.logout?.();
+      const { navigate } = await import('./router');
+      navigate(result.redirectTo ?? '/login');
+    } else if (result.redirectTo) {
+      const { navigate } = await import('./router');
+      navigate(result.redirectTo);
+    }
+  } catch { /* auth check failed silently */ }
+}
 
 // ─── Overtime Tracker ───────────────────────────────────────────
 // Tracks elapsed time during loading, auto-cleans via $effect
@@ -71,7 +91,7 @@ export function createLiveSubscription(paramsFn: () => LiveSubscriptionParams):
       callback: (event: LiveEvent) => {
         params.onLiveEvent?.(event);
         if (liveMode === 'auto') {
-          queryClient.invalidateQueries({ queryKey: [params.resource] });
+          queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === params.resource });
         }
       },
     });
@@ -98,10 +118,10 @@ export function fireSuccessNotification(
   if (!config && !defaultMessage) return;
   if (typeof config === 'function') {
     const result = config(data, values, resource);
-    toast.success(result.message);
+    notify({ type: 'success', message: result.message, description: result.description });
     return;
   }
-  toast.success(config || defaultMessage);
+  notify({ type: 'success', message: config || defaultMessage });
 }
 
 export function fireErrorNotification(
@@ -110,11 +130,12 @@ export function fireErrorNotification(
   error?: unknown,
 ): void {
   if (config === false) return;
+  if (!config && !defaultMessage) return;
   if (typeof config === 'function') {
     const result = config(error);
-    toast.error(result.message);
+    notify({ type: 'error', message: result.message, description: result.description });
     return;
   }
   const errMsg = error instanceof Error ? error.message : String(error ?? '');
-  toast.error(config || `${defaultMessage}${errMsg ? ': ' + errMsg : ''}`);
+  notify({ type: 'error', message: config || `${defaultMessage}${errMsg ? ': ' + errMsg : ''}` });
 }

package/src/hooks.svelte.ts

@@ -23,10 +23,11 @@ export type { OvertimeResult, OvertimeOptions, NotificationConfig } from './hook
 
 import { createQuery, createInfiniteQuery, createMutation, useQueryClient } from '@tanstack/svelte-query';
 import { getAdminOptions } from './options.svelte';
-import { getDataProviderForResource, getDataProvider } from './context.svelte';
+import { getDataProviderForResource, getDataProvider, getLiveProvider } from './context.svelte';
 import { useParsed } from './useParsed.svelte';
-import { createOvertimeTracker, fireSuccessNotification, fireErrorNotification } from './hook-utils.svelte';
-import type { NotificationConfig, OvertimeOptions } from './hook-utils.svelte';
+import { createOvertimeTracker, createLiveSubscription, fireSuccessNotification, fireErrorNotification, checkError } from './hook-utils.svelte';
+import { invalidateByScopes } from './mutation-hooks.svelte';
+import type { NotificationConfig, OvertimeOptions, LiveSubscriptionParams } from './hook-utils.svelte';
 import type { BaseRecord, HttpError, Pagination, Sort, Filter, DataProvider, KnownResources } from './types';
 import type { LiveMode, LiveEvent } from './live.svelte';
 import { useList } from './query-hooks.svelte';
@@ -52,13 +53,13 @@ export interface UseInfiniteListOptions<TData extends BaseRecord = BaseRecord, T
 
 export function useInfiniteList<TData extends BaseRecord = BaseRecord, TError = HttpError>(options: UseInfiniteListOptions<TData, TError> = {}) {
   const parsed = useParsed();
-  const resource = options.resource ?? parsed.resource ?? '';
   const adminOptions = getAdminOptions();
 
   const query = createInfiniteQuery<{ data: TData[]; total: number }, TError>(() => {
+    const resource = options.resource ?? parsed.resource ?? '';
     const provider = getDataProviderForResource(resource, options.dataProviderName);
     return {
-    queryKey: [resource, 'infiniteList', options.sorters, options.filters, options.meta],
+    queryKey: [options.dataProviderName, resource, 'infiniteList', options.pagination?.pageSize, options.sorters, options.filters, options.meta],
     queryFn: async ({ pageParam = 1 }) => {
       const result = await provider.getList<TData>({
         resource,
@@ -82,6 +83,30 @@ export function useInfiniteList<TData extends BaseRecord = BaseRecord, TError =
 
   const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
 
+  createLiveSubscription((): LiveSubscriptionParams => ({
+    resource: options.resource ?? parsed.resource ?? '',
+    liveProvider: getLiveProvider(),
+    liveMode: options.liveMode ?? adminOptions.liveMode,
+    onLiveEvent: (e: LiveEvent) => {
+      options.onLiveEvent?.(e);
+      adminOptions.onLiveEvent?.(e);
+    },
+    enabled: options.queryOptions?.enabled ?? true,
+  }));
+
+  let lastSuccessAt = 0;
+  let lastErrorAt = 0;
+  $effect(() => {
+    if (query.isSuccess && query.dataUpdatedAt > lastSuccessAt && options.successNotification) {
+      lastSuccessAt = query.dataUpdatedAt;
+      fireSuccessNotification(options.successNotification, '', query.data, undefined, options.resource ?? parsed.resource ?? '');
+    } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
+      lastErrorAt = query.errorUpdatedAt;
+      checkError(query.error);
+      fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
+    }
+  });
+
   return { query, get overtime() { return overtime; } };
 }
 
@@ -126,7 +151,7 @@ export function useSelect<TData extends BaseRecord = BaseRecord, TOption = { lab
   const query = createQuery<{ data: TData[]; total: number }>(() => {
     const provider = getDataProviderForResource(resource, dataProviderName);
     return {
-    queryKey: [resource, 'select', allFilters, sorters, pagination, meta],
+    queryKey: [dataProviderName, resource, 'select', allFilters, sorters, pagination, meta],
     queryFn: () => provider.getList<TData>({ resource, sorters, filters: allFilters, pagination: { current: 1, pageSize: effectivePageSize }, meta }),
     enabled: options.queryOptions?.enabled ?? true,
     staleTime: options.queryOptions?.staleTime ?? adminOptions.reactQuery?.staleTime,
@@ -139,7 +164,7 @@ export function useSelect<TData extends BaseRecord = BaseRecord, TOption = { lab
     ? createQuery<{ data: TData[] }>(() => {
         const provider = getDataProviderForResource(resource, dataProviderName);
         return {
-          queryKey: [resource, 'select-defaults', defaultValueIds],
+          queryKey: [dataProviderName, resource, 'select-defaults', defaultValueIds],
           queryFn: async () => {
             if (provider.getMany) return provider.getMany<TData>({ resource, ids: defaultValueIds, meta });
             const results = await Promise.all(defaultValueIds.map(id => provider.getOne<TData>({ resource, id, meta })));
@@ -172,6 +197,19 @@ export function useSelect<TData extends BaseRecord = BaseRecord, TOption = { lab
 
   const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
 
+  let lastSuccessAt = 0;
+  let lastErrorAt = 0;
+  $effect(() => {
+    if (query.isSuccess && query.dataUpdatedAt > lastSuccessAt && options.successNotification) {
+      lastSuccessAt = query.dataUpdatedAt;
+      fireSuccessNotification(options.successNotification, '', query.data, undefined, resource);
+    } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
+      lastErrorAt = query.errorUpdatedAt;
+      checkError(query.error);
+      fireErrorNotification(options.errorNotification, 'Fetch failed', query.error);
+    }
+  });
+
   function onSearchChange(value: string) {
     if (debounceTimer) clearTimeout(debounceTimer);
     debounceTimer = setTimeout(() => { searchText = value; }, debounceMs);
@@ -210,7 +248,7 @@ export function useCustom<TData = unknown, TError = HttpError>(options: UseCusto
   const query = createQuery<{ data: TData }, TError>(() => {
     const provider = getDataProvider(options.dataProviderName);
     return {
-    queryKey: ['custom', options.url, options.method, options.config, options.meta],
+    queryKey: [options.dataProviderName, 'custom', options.url, options.method, options.config, options.meta],
     queryFn: async () => {
       if (!provider.custom) throw new Error('DataProvider does not support custom method');
       return provider.custom<TData>({
@@ -231,6 +269,19 @@ export function useCustom<TData = unknown, TError = HttpError>(options: UseCusto
 
   const overtime = createOvertimeTracker(() => query.isLoading, options.overtimeOptions ?? adminOptions.overtime);
 
+  let lastSuccessAt = 0;
+  let lastErrorAt = 0;
+  $effect(() => {
+    if (query.isSuccess && query.dataUpdatedAt > lastSuccessAt && options.successNotification) {
+      lastSuccessAt = query.dataUpdatedAt;
+      fireSuccessNotification(options.successNotification, '', query.data);
+    } else if (query.isError && query.errorUpdatedAt > lastErrorAt) {
+      lastErrorAt = query.errorUpdatedAt;
+      checkError(query.error);
+      fireErrorNotification(options.errorNotification, 'Custom request failed', query.error);
+    }
+  });
+
   return { query, get overtime() { return overtime; } };
 }
 
@@ -239,11 +290,19 @@ export function useCustom<TData = unknown, TError = HttpError>(options: UseCusto
 export function useCustomMutation<TData = unknown, TError = HttpError, TVariables = unknown>(dataProviderName?: string) {
   const queryClient = useQueryClient();
 
-  const mutation = createMutation<{ data: TData }, TError, { url: string; method: 'get' | 'post' | 'put' | 'patch' | 'delete'; values?: TVariables; meta?: Record<string, unknown> }>(() => ({
+  const mutation = createMutation<{ data: TData }, TError, { url: string; method: 'get' | 'post' | 'put' | 'patch' | 'delete'; values?: TVariables; query?: Record<string, unknown>; headers?: Record<string, string>; sorters?: Sort[]; filters?: Filter[]; meta?: Record<string, unknown>; invalidates?: string[] | false; resource?: string }>(() => ({
     mutationFn: async (params) => {
       const provider = getDataProvider(dataProviderName);
       if (!provider.custom) throw new Error('DataProvider does not support custom method');
-      return provider.custom<TData>({ url: params.url, method: params.method, payload: params.values, meta: params.meta });
+      return provider.custom<TData>({ url: params.url, method: params.method, payload: params.values, query: params.query, headers: params.headers, sorters: params.sorters, filters: params.filters, meta: params.meta });
+    },
+    onSuccess: (data, params) => {
+      if (params.resource && params.invalidates !== false) {
+        invalidateByScopes(queryClient, params.resource, params.invalidates, ['list', 'many']);
+      }
+    },
+    onError: (error) => {
+      checkError(error);
     },
   }));
 
@@ -271,7 +330,19 @@ export function useCreateMany<TData extends BaseRecord = BaseRecord, TError = Ht
         return { data: results.map(r => r.data) };
       } finally { isMutating = false; }
     },
-    onSuccess: (_d, params) => { queryClient.invalidateQueries({ queryKey: [params.resource ?? resource] }); },
+    onSuccess: (data, params) => {
+      const resName = params.resource ?? resource;
+      fireSuccessNotification(undefined, 'Created successfully', data.data, params.variables, resName);
+      audit({ action: 'create', resource: resName });
+    },
+    onError: (error, params) => {
+      checkError(error);
+      fireErrorNotification(undefined, 'Create many failed', error);
+    },
+    onSettled: (_d, _e, params) => {
+      const resName = params.resource ?? resource;
+      invalidateByScopes(queryClient, resName, undefined, ['list', 'many']);
+    },
   }));
 
   return { mutation, get overtime() { return overtime; } };
@@ -296,7 +367,22 @@ export function useUpdateMany<TData extends BaseRecord = BaseRecord, TError = Ht
         return { data: results.map(r => r.data) };
       } finally { isMutating = false; }
     },
-    onSuccess: (_d, params) => { queryClient.invalidateQueries({ queryKey: [params.resource ?? resource] }); },
+    onSuccess: (data, params) => {
+      const resName = params.resource ?? resource;
+      fireSuccessNotification(undefined, 'Updated successfully', data.data, params.variables, resName);
+      audit({ action: 'update', resource: resName });
+    },
+    onError: (error, params) => {
+      checkError(error);
+      fireErrorNotification(undefined, 'Update many failed', error);
+    },
+    onSettled: (_d, _e, params) => {
+      const resName = params.resource ?? resource;
+      invalidateByScopes(queryClient, resName, undefined, ['list', 'many', 'detail'], undefined);
+      for (const id of params.ids) {
+        queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === resName && q.queryKey[2] === 'one' && q.queryKey[3] === id });
+      }
+    },
   }));
 
   return { mutation, get overtime() { return overtime; } };
@@ -321,7 +407,22 @@ export function useDeleteMany<TData extends BaseRecord = BaseRecord, TError = Ht
         return { data: results.map(r => r.data) };
       } finally { isMutating = false; }
     },
-    onSuccess: (_d, params) => { queryClient.invalidateQueries({ queryKey: [params.resource ?? resource] }); },
+    onSuccess: (data, params) => {
+      const resName = params.resource ?? resource;
+      fireSuccessNotification(undefined, 'Deleted successfully', data.data, undefined, resName);
+      audit({ action: 'delete', resource: resName });
+    },
+    onError: (error, params) => {
+      checkError(error);
+      fireErrorNotification(undefined, 'Delete many failed', error);
+    },
+    onSettled: (_d, _e, params) => {
+      const resName = params.resource ?? resource;
+      invalidateByScopes(queryClient, resName, undefined, ['list', 'many']);
+      for (const id of params.ids) {
+        queryClient.removeQueries({ predicate: (q) => q.queryKey[1] === resName && q.queryKey[2] === 'one' && q.queryKey[3] === id });
+      }
+    },
   }));
 
   return { mutation, get overtime() { return overtime; } };
@@ -338,12 +439,13 @@ export function useInvalidate() {
       return;
     }
     const scopes = params.invalidates || ['resourceAll'];
+    const res = params.resource;
     for (const scope of scopes) {
-      if (scope === 'resourceAll') queryClient.invalidateQueries({ queryKey: [params.resource] });
-      else if ((scope === 'detail' || scope === 'one') && params.id) queryClient.invalidateQueries({ queryKey: [params.resource, 'one', params.id] });
-      else if (scope === 'one') queryClient.invalidateQueries({ queryKey: [params.resource, 'one'] });
-      else if (scope === 'list') queryClient.invalidateQueries({ queryKey: [params.resource, 'list'] });
-      else if (scope === 'many') queryClient.invalidateQueries({ queryKey: [params.resource, 'many'] });
+      if (scope === 'resourceAll') queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === res });
+      else if ((scope === 'detail' || scope === 'one') && params.id) queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === res && q.queryKey[2] === 'one' && q.queryKey[3] === params.id });
+      else if (scope === 'one') queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === res && q.queryKey[2] === 'one' });
+      else if (scope === 'list') queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === res && (q.queryKey[2] === 'list' || q.queryKey[2] === 'infiniteList' || q.queryKey[2] === 'select') });
+      else if (scope === 'many') queryClient.invalidateQueries({ predicate: (q) => q.queryKey[1] === res && q.queryKey[2] === 'many' });
     }
   };
 }

package/src/i18n.svelte.ts

@@ -2,14 +2,25 @@
 
 
 
-const locales: Record<string, Record<string, string>> = {
+let locales = $state<Record<string, Record<string, string>>>({
   'zh-CN': {
+    'common.list': '列表',
+    'common.prev': '上一页',
+    'common.pageOf': '第 {page} 页，共 {total} 页',
+    'common.areYouSure': '确认操作？',
+    'common.backToList': '返回列表',
+    'common.refresh': '刷新',
+    'common.importData': '导入数据',
+    'common.upload': '上传',
+    'common.returnHome': '返回首页',
     // Common
     'common.save': '保存',
     'common.cancel': '取消',
     'common.create': '新建',
     'common.edit': '编辑',
     'common.delete': '删除',
+    'common.batchDeletePartialFail': '批量删除部分失败：{failed}/{total} 条未成功',
+    'common.batchDeleteSuccess': '成功删除 {count} 条记录',
     'common.search': '搜索...',
     'common.confirm': '确定',
     'common.loading': '加载中...',
@@ -142,6 +153,8 @@ const locales: Record<string, Record<string, string>> = {
     'validation.minLength': '最少 {min} 个字符',
     'validation.maxLength': '最多 {max} 个字符',
     'validation.invalidEmail': '请输入有效的邮箱地址',
+    'validation.invalidUrl': '请输入有效的 URL 地址',
+    'validation.invalidNumber': '请输入有效的数字',
     'validation.invalidFormat': '格式不正确',
     // Settings
     'settings.title': '设置',
@@ -242,12 +255,23 @@ const locales: Record<string, Record<string, string>> = {
     'profile.updatePassword': '更新密码',
   },
   'en': {
+    'common.list': 'List',
+    'common.prev': 'Prev',
+    'common.pageOf': 'Page {page} of {total}',
+    'common.areYouSure': 'Are you sure?',
+    'common.backToList': 'Back to List',
+    'common.refresh': 'Refresh',
+    'common.importData': 'Import data',
+    'common.upload': 'Upload',
+    'common.returnHome': 'Return to Home',
     // Common
     'common.save': 'Save',
     'common.cancel': 'Cancel',
     'common.create': 'Create',
     'common.edit': 'Edit',
     'common.delete': 'Delete',
+    'common.batchDeletePartialFail': 'Batch delete partially failed: {failed}/{total} unsuccessful',
+    'common.batchDeleteSuccess': 'Successfully deleted {count} records',
     'common.search': 'Search...',
     'common.confirm': 'Confirm',
     'common.loading': 'Loading...',
@@ -380,6 +404,8 @@ const locales: Record<string, Record<string, string>> = {
     'validation.minLength': 'Minimum {min} characters',
     'validation.maxLength': 'Maximum {max} characters',
     'validation.invalidEmail': 'Please enter a valid email address',
+    'validation.invalidUrl': 'Please enter a valid URL',
+    'validation.invalidNumber': 'Please enter a valid number',
     'validation.invalidFormat': 'Invalid format',
     // Settings
     'settings.title': 'Settings',
@@ -479,19 +505,18 @@ const locales: Record<string, Record<string, string>> = {
     'profile.passwordChanged': 'Password updated successfully',
     'profile.updatePassword': 'Update Password',
   },
-};
+});
 
 /** Detect best locale from browser language */
 function detectLocale(): string {
-  if (typeof navigator === 'undefined') return 'en'; // Safe default for SSR
+  if (typeof navigator === 'undefined') return 'en';
   const browserLang = navigator.language || navigator.languages?.[0] || 'zh-CN';
-  // Exact match
   if (locales[browserLang]) return browserLang;
-  // Prefix match (e.g., 'zh' → 'zh-CN', 'en-US' → 'en')
   const prefix = browserLang.split('-')[0];
   for (const key of Object.keys(locales)) {
-    if (key.startsWith(prefix)) return key;
+    if (key === browserLang || key.startsWith(prefix + '-')) return key;
   }
+  if (locales[prefix]) return prefix;
   return 'en';
 }
 
@@ -510,8 +535,8 @@ export function getAvailableLocales(): string[] {
 }
 
 export function t(key: string, params?: Record<string, string | number>): string {
-  const locale = locales[currentLocale] ?? locales['en'];
-  let text = locale[key] ?? key;
+  const locale = locales[currentLocale];
+  let text = locale?.[key] ?? locales['en']?.[key] ?? key;
 
   if (params) {
     for (const [k, v] of Object.entries(params)) {
@@ -522,7 +547,11 @@ export function t(key: string, params?: Record<string, string | number>): string
 }
 
 export function addTranslations(locale: string, translations: Record<string, string>): void {
-  locales[locale] = { ...locales[locale], ...translations };
+  locales = { ...locales, [locale]: { ...locales[locale], ...translations } };
+}
+
+export function resetI18n(): void {
+  currentLocale = detectLocale();
 }
 
 /**
@@ -530,14 +559,9 @@ export function addTranslations(locale: string, translations: Record<string, str
  * Tracks locale changes natively.
  */
 export function useTranslation() {
-  const translate = $derived.by(() => {
-    // Read currentLocale so this $derived depends on it
-    const loc = currentLocale;
-    return (key: string, params?: Record<string, string | number>): string => {
-      // Intentionally passing the key to the main t() function which uses currentLocale
-      return t(key, params);
-    };
-  });
+  const translate = (key: string, params?: Record<string, string | number>): string => {
+    return t(key, params);
+  };
   
   return { 
     get t() { return translate; },

package/src/index.ts

@@ -6,6 +6,7 @@ export {
   setResources, getResources, getResource,
   setRouterProvider, getRouterProvider,
   setLiveProvider, getLiveProvider,
+  resetContext,
 } from './context.svelte';
 export type { DataProviderInput } from './context.svelte';
 export {
@@ -26,7 +27,8 @@ export {
   useNotification, useDataProvider,
   useMenu, useBreadcrumb, useThemedLayoutContext,
 } from './hooks.svelte';
-export { matchRoute, navigate, currentPath, setActiveRouterProvider } from './router';
+export { matchRoute, navigate, currentPath, setActiveRouterProvider, beforeEach, afterEach } from './router';
+export type { RouteGuard } from './router';
 export { readURLState, writeURLState } from './url-sync';
 export { setAccessControlProvider, getAccessControlProvider, getAccessControlOptions, canAccessAsync } from './permissions';
 export { useLive, useSubscription, usePublish } from './live.svelte';
@@ -42,12 +44,14 @@ export type { ThemeMode, ColorTheme, ThemeStrategy, ThemeConfig, ColorPreset } f
 export { setUnsavedChanges, getUnsavedChanges, initUnsavedChangesNotifier } from './unsaved-changes.svelte';
 export { setAdminOptions, getAdminOptions, getTextTransformers } from './options.svelte';
 export type { AdminOptions, TextTransformers, OvertimeConfig } from './options.svelte';
+export { checkError } from './hook-utils.svelte';
+export type { NotificationConfig, OvertimeOptions, OvertimeResult, LiveSubscriptionParams } from './hook-utils.svelte';
 
 export * from './query-keys';
-export { HttpError } from './types';
+export { HttpError, UndoError } from './types';
 export type {
   DataProvider, AuthProvider, NotificationProvider, MutationMode,
-  ValidationErrors, CrudOperator, LogicalFilter,
+  ValidationErrors, CrudOperator, LogicalFilter, FieldFilter,
   CustomParams, CustomResult,
   GetListParams, GetListResult,
   GetOneParams, GetOneResult,
@@ -101,3 +105,6 @@ export {
 } from './helpers';
 export { TableState } from './table-state.svelte';
 export type { TableStateOptions } from './table-state.svelte';
+export type { UseInfiniteListOptions } from './hooks.svelte';
+export type { UseSelectOptions } from './hooks.svelte';
+export type { UseFormReturn } from './form-hooks.svelte';