@svadmin/core 0.19.1 → 0.19.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/core",
-  "version": "0.19.1",
+  "version": "0.19.3",
   "author": "zuohuadong",
   "repository": {
     "type": "git",
@@ -61,7 +61,5 @@
   "sideEffects": false,
   "type": "module",
   "types": "src/index.ts",
-  "dependencies": {
-    "sonner-svelte": "^0.3.3"
-  }
+  "dependencies": {}
 }

package/src/auth-hooks.svelte.ts

@@ -4,32 +4,42 @@
 
 import { getAuthProvider } from './context.svelte';
 import { navigate } from './router';
-import { toast } from './toast.svelte';
+import { notify } from './notification.svelte';
 import { t } from './i18n.svelte';
-import type { AuthActionResult, CheckResult, Identity } from './types';
+import type { AuthActionResult, CheckResult, Identity, AuthProvider } from './types';
 
-// ─── useLogin ─────────────────────────────────────────────────
+// ─── Mutate Factory ─────────────────────────────────────────────
 
-export function useLogin() {
+interface CreateAuthMutationOptions {
+  method: keyof AuthProvider;
+  successMessage?: string | null;
+  errorMessage?: string;
+  onSuccess?: (result: AuthActionResult) => void;
+}
+
+function createAuthMutation(options: CreateAuthMutationOptions) {
   const provider = getAuthProvider();
   let isLoading = $state(false);
 
-  async function mutate(params: Record<string, unknown>): Promise<AuthActionResult> {
+  async function mutate(params?: Record<string, unknown>): Promise<AuthActionResult> {
     if (!provider) throw new Error('AuthProvider not configured');
+    const fn = provider[options.method] as ((params?: Record<string, unknown>) => Promise<AuthActionResult>) | undefined;
+    if (!fn) throw new Error(`AuthProvider.${options.method} not implemented`);
+    
     isLoading = true;
     try {
-      const result = await provider.login(params);
+      const result = await fn.call(provider, params);
       if (result.success) {
-        toast.success(t('common.operationSuccess'));
-        if (result.redirectTo) navigate(result.redirectTo);
+        if (options.successMessage) notify({ type: 'success', message: options.successMessage });
+        if (options.onSuccess) options.onSuccess(result);
       } else {
-        const msg = result.error?.message ?? t('common.loginFailed');
-        toast.error(msg);
+        const msg = result.error?.message ?? options.errorMessage ?? t('common.operationFailed');
+        notify({ type: 'error', message: msg });
       }
       return result;
     } catch (err) {
-      const msg = err instanceof Error ? err.message : t('common.loginFailed');
-      toast.error(msg);
+      const msg = err instanceof Error ? err.message : (options.errorMessage ?? t('common.operationFailed'));
+      notify({ type: 'error', message: msg });
       return { success: false, error: { message: msg } };
     } finally {
       isLoading = false;
@@ -42,135 +52,54 @@ export function useLogin() {
   };
 }
 
-// ─── useLogout ────────────────────────────────────────────────
+// ─── useLogin ─────────────────────────────────────────────────
 
-export function useLogout() {
-  const provider = getAuthProvider();
-  let isLoading = $state(false);
+export function useLogin() {
+  return createAuthMutation({
+    method: 'login',
+    successMessage: t('common.operationSuccess'),
+    errorMessage: t('common.loginFailed'),
+    onSuccess: (result) => { if (result.redirectTo) navigate(result.redirectTo); }
+  });
+}
 
-  async function mutate(params?: Record<string, unknown>): Promise<AuthActionResult> {
-    if (!provider) throw new Error('AuthProvider not configured');
-    isLoading = true;
-    try {
-      const result = await provider.logout(params);
-      if (result.success) {
-        navigate(result.redirectTo ?? '/login');
-      }
-      return result;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : t('common.operationFailed');
-      toast.error(msg);
-      return { success: false, error: { message: msg } };
-    } finally {
-      isLoading = false;
-    }
-  }
+// ─── useLogout ────────────────────────────────────────────────
 
-  return {
-    mutate,
-    get isLoading() { return isLoading; },
-  };
+export function useLogout() {
+  return createAuthMutation({
+    method: 'logout',
+    successMessage: null,
+    onSuccess: (result) => { navigate(result.redirectTo ?? '/login'); }
+  });
 }
 
 // ─── useRegister ──────────────────────────────────────────────
 
 export function useRegister() {
-  const provider = getAuthProvider();
-  let isLoading = $state(false);
-
-  async function mutate(params: Record<string, unknown>): Promise<AuthActionResult> {
-    if (!provider?.register) throw new Error('AuthProvider.register not implemented');
-    isLoading = true;
-    try {
-      const result = await provider.register(params);
-      if (result.success) {
-        toast.success(t('auth.registerSuccess'));
-        if (result.redirectTo) navigate(result.redirectTo);
-      } else {
-        const msg = result.error?.message ?? t('common.operationFailed');
-        toast.error(msg);
-      }
-      return result;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : t('common.operationFailed');
-      toast.error(msg);
-      return { success: false, error: { message: msg } };
-    } finally {
-      isLoading = false;
-    }
-  }
-
-  return {
-    mutate,
-    get isLoading() { return isLoading; },
-  };
+  return createAuthMutation({
+    method: 'register',
+    successMessage: t('auth.registerSuccess'),
+    onSuccess: (result) => { if (result.redirectTo) navigate(result.redirectTo); }
+  });
 }
 
 // ─── useForgotPassword ───────────────────────────────────────
 
 export function useForgotPassword() {
-  const provider = getAuthProvider();
-  let isLoading = $state(false);
-
-  async function mutate(params: Record<string, unknown>): Promise<AuthActionResult> {
-    if (!provider?.forgotPassword) throw new Error('AuthProvider.forgotPassword not implemented');
-    isLoading = true;
-    try {
-      const result = await provider.forgotPassword(params);
-      if (result.success) {
-        toast.success(t('auth.resetLinkSent'));
-      } else {
-        const msg = result.error?.message ?? t('common.operationFailed');
-        toast.error(msg);
-      }
-      return result;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : t('common.operationFailed');
-      toast.error(msg);
-      return { success: false, error: { message: msg } };
-    } finally {
-      isLoading = false;
-    }
-  }
-
-  return {
-    mutate,
-    get isLoading() { return isLoading; },
-  };
+  return createAuthMutation({
+    method: 'forgotPassword',
+    successMessage: t('auth.resetLinkSent')
+  });
 }
 
 // ─── useUpdatePassword ───────────────────────────────────────
 
 export function useUpdatePassword() {
-  const provider = getAuthProvider();
-  let isLoading = $state(false);
-
-  async function mutate(params: Record<string, unknown>): Promise<AuthActionResult> {
-    if (!provider?.updatePassword) throw new Error('AuthProvider.updatePassword not implemented');
-    isLoading = true;
-    try {
-      const result = await provider.updatePassword(params);
-      if (result.success) {
-        toast.success(t('common.operationSuccess'));
-        if (result.redirectTo) navigate(result.redirectTo);
-      } else {
-        const msg = result.error?.message ?? t('common.operationFailed');
-        toast.error(msg);
-      }
-      return result;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : t('common.operationFailed');
-      toast.error(msg);
-      return { success: false, error: { message: msg } };
-    } finally {
-      isLoading = false;
-    }
-  }
-
-  return {
-    mutate,
-    get isLoading() { return isLoading; },
-  };
+  return createAuthMutation({
+    method: 'updatePassword',
+    successMessage: t('common.operationSuccess'),
+    onSuccess: (result) => { if (result.redirectTo) navigate(result.redirectTo); }
+  });
 }
 
 // ─── useGetIdentity ──────────────────────────────────────────

package/src/context.svelte.ts

@@ -86,8 +86,7 @@ export function setResources(newResources: ResourceDefinition[]): void {
 }
 
 export function getResources(): ResourceDefinition[] {
-  if (!resources || resources.length === 0) throw new Error('Resources not found. Did you call setResources in App.svelte?');
-  return resources;
+  return resources ?? [];
 }
 
 export function getResource(nameOrIdentifier: string): ResourceDefinition {

package/src/form-hooks.svelte.ts

@@ -3,7 +3,7 @@ import { useParsed } from './useParsed.svelte';
 import { getAdminOptions } from './options.svelte';
 import { getDataProviderForResource } from './context.svelte';
 import { createQuery, createMutation } from '@tanstack/svelte-query';
-import { toast } from './toast.svelte';
+import { notify } from './notification.svelte';
 import { t } from './i18n.svelte';
 import { audit } from './audit';
 import { navigate } from './router';
@@ -245,9 +245,9 @@ export function useForm<
         const msg = Array.isArray(messages) ? messages[0] : messages;
         setFieldError(field, msg);
       }
-      if (errorNotification !== false) toast.error(errorNotification || error.message || t('common.operationFailed'));
+      if (errorNotification !== false) notify({ type: 'error', message: typeof errorNotification === 'string' ? errorNotification : (error.message || t('common.operationFailed')) });
     } else {
-      if (errorNotification !== false) toast.error(errorNotification || t('common.operationFailed') + ': ' + error.message);
+      if (errorNotification !== false) notify({ type: 'error', message: typeof errorNotification === 'string' ? errorNotification : (t('common.operationFailed') + ': ' + error.message) });
     }
   }
 
@@ -288,7 +288,7 @@ export function useForm<
     mutationFn: (variables: TVariables) => provider.create<TData, TVariables>({ resource, variables, meta: mutationMeta }),
     onSuccess: (data: { data: TData }) => {
       if (invalidateScopes !== false) queryClient.invalidateQueries({ queryKey: [resource] });
-      if (successNotification !== false) toast.success(successNotification || t('common.createSuccess'));
+      if (successNotification !== false) notify({ type: 'success', message: typeof successNotification === 'string' ? successNotification : t('common.createSuccess') });
       audit({ action: 'create', resource, recordId: String((data.data as Record<string, unknown>).id) });
       onMutationSuccess?.(data);
       if (redirectOverride !== false) doRedirect(redirectOverride ?? redirectDefault);
@@ -301,7 +301,7 @@ export function useForm<
     mutationFn: (variables: TVariables) => provider.update<TData, TVariables>({ resource, id: currentId!, variables, meta: mutationMeta }),
     onSuccess: (data: { data: TData }) => {
       if (invalidateScopes !== false) queryClient.invalidateQueries({ queryKey: [resource] });
-      if (successNotification !== false) toast.success(successNotification || t('common.updateSuccess'));
+      if (successNotification !== false) notify({ type: 'success', message: typeof successNotification === 'string' ? successNotification : t('common.updateSuccess') });
       audit({ action: 'update', resource, recordId: String(currentId) });
       onMutationSuccess?.(data);
       if (redirectOverride !== false) doRedirect(redirectOverride ?? redirectDefault);
@@ -324,7 +324,7 @@ export function useForm<
       if (result === false || cancelled) return;
     }
 
-    if (!runValidation()) { toast.warning(t('validation.required')); return; }
+    if (!runValidation()) { notify({ type: 'warning', message: t('validation.required') }); return; }
     redirectOverride = overrides?.redirect;
     try {
       if (action === 'create' || action === 'clone') await createMut.mutateAsync(values);
@@ -334,7 +334,6 @@ export function useForm<
     } catch (error) {
       // Errors are already handled by the mutation's onError callback.
       // We catch here to prevent unhandled promise rejections.
-      handleHttpError(error instanceof Error ? error : new Error(String(error)));
     }
   }
 

package/src/i18n.svelte.ts

@@ -477,6 +477,7 @@ const locales: Record<string, Locale> = {
 
 /** Detect best locale from browser language */
 function detectLocale(): string {
+  if (typeof navigator === 'undefined') return 'en'; // Safe default for SSR
   const browserLang = navigator.language || navigator.languages?.[0] || 'zh-CN';
   // Exact match
   if (locales[browserLang]) return browserLang;

package/src/index.ts

@@ -29,7 +29,7 @@ export { matchRoute, navigate, currentPath, setActiveRouterProvider } from './ro
 export { readURLState, writeURLState } from './url-sync';
 export { setAccessControlProvider, getAccessControlProvider, getAccessControlOptions, canAccessAsync } from './permissions';
 export { useLive, useSubscription, usePublish } from './live.svelte';
-export { toast } from './toast.svelte';
+export { toast, getToastQueue, consumeToastQueue, getPromiseQueue, consumePromiseQueue } from './toast.svelte';
 export { notify, closeNotification, setNotificationProvider, getNotificationProvider } from './notification.svelte';
 export { t, setLocale, getLocale, getAvailableLocales, addTranslations, useTranslation } from './i18n.svelte';
 export { audit, setAuditHandler, setAuditLogProvider, getAuditLogProvider } from './audit';

package/src/theme.svelte.ts

@@ -27,7 +27,7 @@ export interface ColorPreset {
 }
 
 /** Built-in color presets — consumers can extend via registerColorPreset(). */
-export const builtinPresets: Record<string, ColorPreset> = {
+export const builtinPresets: Record<string, ColorPreset> = $state({
   neutral: {
     name: 'neutral',
     label: 'Neutral',
@@ -189,7 +189,7 @@ export const builtinPresets: Record<string, ColorPreset> = {
       '--chart-1': 'oklch(0.541 0.281 293.009)',
     },
   },
-};
+});
 
 /** Register a custom color preset. Overwrites any built-in preset with the same name. */
 export function registerColorPreset(preset: ColorPreset): void {
@@ -292,11 +292,11 @@ export function clearCssOverrides(keys?: string[]): void {
 }
 
 // ── Color themes (display metadata, derived from presets) ──
-export const colorThemes: { id: ColorTheme | string; label: string; color: string }[] = Object.values(builtinPresets).map(p => ({
+export const colorThemes: { id: ColorTheme | string; label: string; color: string }[] = $state(Object.values(builtinPresets).map(p => ({
   id: p.name as ColorTheme,
   label: p.label,
   color: p.color,
-}));
+})));
 
 // ── Dark/Light mode ──────────────────────────────────────
 

package/src/toast.svelte.ts

@@ -1,40 +1,40 @@
-// Toast notification system — wraps sonner-svelte for consistent API
-// Maintains backward-compatible `toast.success()` / `toast.error()` etc.
-
-import { toast as sonner } from 'sonner-svelte';
-
 export type ToastType = 'success' | 'error' | 'info' | 'warning' | 'undoable';
 
-export interface Toast {
+export interface ToastItem {
   id: number;
   type: ToastType;
   message: string;
-  duration: number;
+  duration?: number;
   onUndo?: () => void;
   onTimeout?: () => void;
 }
 
-// Legacy compatibility — kept for existing consumers
 let nextId = 0;
-let toasts = $state<Toast[]>([]);
 
-export function getToasts(): Toast[] {
-  return toasts;
-}
-
-export function addToast(type: ToastType, message: string, duration = 3000, options?: { onUndo?: () => void, onTimeout?: () => void }): void {
-  // Use sonner-svelte for regular toasts
+// Queue for simple toasts (consumed by UI Toast bridge)
+let queue = $state<ToastItem[]>([]);
+export function getToastQueue() { return queue; }
+export function consumeToastQueue() { queue = []; }
+
+// Promise Queue
+let promiseQueue = $state<{ id: number; promise: Promise<any>; opts: { loading: string; success: string; error: string } }[]>([]);
+export function getPromiseQueue() { return promiseQueue; }
+export function consumePromiseQueue() { promiseQueue = []; }
+
+// Legacy compatibility — kept for existing consumers (Undoable)
+let toasts = $state<ToastItem[]>([]);
+export function getToasts(): ToastItem[] { return toasts; }
+
+export function addToast(
+  type: ToastType, 
+  message: string, 
+  duration = 3000, 
+  options?: { onUndo?: () => void, onTimeout?: () => void }
+): void {
   if (type !== 'undoable') {
-    switch (type) {
-      case 'success': sonner.success(message, { duration }); break;
-      case 'error': sonner.error(message, { duration }); break;
-      case 'warning': sonner.warning(message, { duration }); break;
-      case 'info': sonner.info(message, { duration }); break;
-    }
+    queue.push({ id: nextId++, type, message, duration });
     return;
   }
-
-  // Undoable toasts still use custom system
   const id = nextId++;
   toasts = [...toasts, { id, type, message, duration, ...options }];
 }
@@ -52,6 +52,8 @@ export const toast = {
   undoable: (msg: string, duration: number, onUndo: () => void, onTimeout: () => void) =>
     addToast('undoable', msg, duration, { onUndo, onTimeout }),
   /** Promise toast — shows loading → success/error automatically */
-  promise: <T>(promise: Promise<T>, opts: { loading: string; success: string; error: string }) =>
-    sonner.promise(promise, opts),
+  promise: <T>(promise: Promise<T>, opts: { loading: string; success: string; error: string }) => {
+    promiseQueue.push({ id: nextId++, promise, opts });
+    return promise;
+  },
 };