@svadmin/core 0.37.0 → 0.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/core",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "author": "zuohuadong",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
     "@testing-library/dom": "^10.4.1",
     "@testing-library/svelte": "^5.4.2",
     "@testing-library/user-event": "^14.6.4",
-    "@types/bun": "^1.3.14",
+    "@types/bun": "^1.4.0",
     "@types/jsdom": "^30.0.0",
     "happy-dom": "^20.11.2",
     "jsdom": "^30.0.1",

package/src/auth-hooks.svelte.ts

@@ -10,6 +10,7 @@ import type { AuthActionResult, CheckResult, Identity, AuthProvider } from './ty
 import { useQueryClient } from '@tanstack/svelte-query';
 
 let _logoutVersion = $state(0);
+let nextAuthMutationInstanceId = 0;
 export function getLogoutVersion() { return _logoutVersion; }
 export function resetLogoutVersion() { _logoutVersion = 0; }
 
@@ -22,7 +23,21 @@ interface CreateAuthMutationOptions {
   onSuccess?: (result: AuthActionResult, adminContext: AdminContextAccessor) => void | Promise<void>;
 }
 
+export interface AuthNotificationOptions {
+  /** Set to false when the page owns the success state. */
+  successNotification?: string | false;
+  errorNotification?: string | false;
+}
+
+function resolveSuccessMessage(
+  configured: string | false | undefined,
+  defaultMessage: string,
+): string | null {
+  return configured === false ? null : configured ?? defaultMessage;
+}
+
 function createAuthMutation(options: CreateAuthMutationOptions) {
+  const mutationInstanceId = nextAuthMutationInstanceId++;
   const adminContext = captureAdminContext();
   const i18n = useTranslation();
   let isLoading = $state(false);
@@ -57,18 +72,31 @@ function createAuthMutation(options: CreateAuthMutationOptions) {
     try {
       const result = await fn.call(provider, params);
       if (!isActiveMutation(epoch, provider, tenantIdentity)) return result;
+      const eventKey = `auth:${mutationInstanceId}:${String(options.method)}:${epoch}`;
       if (result.success) {
-        if (options.successMessage) sendNotification({ type: 'success', message: options.successMessage });
+        if (options.successMessage) {
+          sendNotification({
+            type: 'success',
+            message: options.successMessage,
+            key: `${eventKey}:success`,
+          });
+        }
         if (options.onSuccess) await options.onSuccess(result, adminContext);
       } else {
         const msg = result.error?.message ?? (typeof options.errorMessage === 'string' ? options.errorMessage : i18n.t('common.operationFailed'));
-        if (options.errorMessage !== false) sendNotification({ type: 'error', message: msg });
+        if (options.errorMessage !== false) {
+          sendNotification({ type: 'error', message: msg, key: `${eventKey}:error` });
+        }
       }
       return result;
     } catch (err) {
       const msg = err instanceof Error ? err.message : (typeof options.errorMessage === 'string' ? options.errorMessage : i18n.t('common.operationFailed'));
       if (isActiveMutation(epoch, provider, tenantIdentity) && options.errorMessage !== false) {
-        sendNotification({ type: 'error', message: msg });
+        sendNotification({
+          type: 'error',
+          message: msg,
+          key: `auth:${mutationInstanceId}:${String(options.method)}:${epoch}:error`,
+        });
       }
       return { success: false, error: { message: msg } };
     } finally {
@@ -100,11 +128,11 @@ function createAuthMutation(options: CreateAuthMutationOptions) {
 
 // ─── useLogin ─────────────────────────────────────────────────
 
-export function useLogin(opts?: { errorMessage?: string | false }) {
+export function useLogin(opts?: AuthNotificationOptions & { errorMessage?: string | false }) {
   return createAuthMutation({
     method: 'login',
-    successMessage: t('common.operationSuccess'),
-    errorMessage: opts?.errorMessage ?? t('common.loginFailed'),
+    successMessage: resolveSuccessMessage(opts?.successNotification, t('common.operationSuccess')),
+    errorMessage: opts?.errorNotification ?? opts?.errorMessage ?? t('common.loginFailed'),
     onSuccess: async (result, adminContext) => { await adminContext.navigate(result.redirectTo ?? '/'); }
   });
 }
@@ -131,10 +159,11 @@ export function useLogout() {
 
 // ─── useRegister ──────────────────────────────────────────────
 
-export function useRegister() {
+export function useRegister(opts?: AuthNotificationOptions) {
   return createAuthMutation({
     method: 'register',
-    successMessage: t('auth.registerSuccess'),
+    successMessage: resolveSuccessMessage(opts?.successNotification, t('auth.registerSuccess')),
+    errorMessage: opts?.errorNotification,
     onSuccess: async (result, adminContext) => {
       if (result.redirectTo) await adminContext.navigate(result.redirectTo);
     }
@@ -143,19 +172,21 @@ export function useRegister() {
 
 // ─── useForgotPassword ───────────────────────────────────────
 
-export function useForgotPassword() {
+export function useForgotPassword(opts?: AuthNotificationOptions) {
   return createAuthMutation({
     method: 'forgotPassword',
-    successMessage: t('auth.resetLinkSent')
+    successMessage: resolveSuccessMessage(opts?.successNotification, t('auth.resetLinkSent')),
+    errorMessage: opts?.errorNotification,
   });
 }
 
 // ─── useUpdatePassword ───────────────────────────────────────
 
-export function useUpdatePassword() {
+export function useUpdatePassword(opts?: AuthNotificationOptions) {
   return createAuthMutation({
     method: 'updatePassword',
-    successMessage: t('common.operationSuccess'),
+    successMessage: resolveSuccessMessage(opts?.successNotification, t('common.operationSuccess')),
+    errorMessage: opts?.errorNotification,
     onSuccess: async (result, adminContext) => {
       if (result.redirectTo) await adminContext.navigate(result.redirectTo);
     }
@@ -164,20 +195,22 @@ export function useUpdatePassword() {
 
 // ─── useUpdateIdentity / useUpdateProfile ────────────────────
 
-export function useUpdateIdentity() {
+export function useUpdateIdentity(opts?: AuthNotificationOptions) {
   return createAuthMutation({
     method: 'updateIdentity',
-    successMessage: t('common.operationSuccess'),
+    successMessage: resolveSuccessMessage(opts?.successNotification, t('common.operationSuccess')),
+    errorMessage: opts?.errorNotification,
     onSuccess: async (result, adminContext) => {
       if (result.redirectTo) await adminContext.navigate(result.redirectTo);
     }
   });
 }
 
-export function useUpdateProfile() {
+export function useUpdateProfile(opts?: AuthNotificationOptions) {
   return createAuthMutation({
     method: 'updateProfile',
-    successMessage: t('common.operationSuccess'),
+    successMessage: resolveSuccessMessage(opts?.successNotification, t('common.operationSuccess')),
+    errorMessage: opts?.errorNotification,
     onSuccess: async (result, adminContext) => {
       if (result.redirectTo) await adminContext.navigate(result.redirectTo);
     }

package/src/hook-utils.svelte.ts

@@ -128,7 +128,12 @@ export function createLiveSubscription(paramsFn: () => LiveSubscriptionParams):
 export type NotificationConfig =
   | string
   | false
-  | ((data?: unknown, values?: unknown, resource?: string) => { message: string; description?: string; type?: 'success' | 'error' })
+  | ((data?: unknown, values?: unknown, resource?: string) => {
+      message: string;
+      description?: string;
+      type?: 'success' | 'error';
+      key?: string;
+    })
   | undefined;
 
 export interface SuccessNotificationRequest {
@@ -154,7 +159,12 @@ export function fireSuccessNotification(request: SuccessNotificationRequest): vo
   if (!config && !defaultMessage) return;
   if (typeof config === 'function') {
     const result = config(data, values, resource);
-    notifyWithProvider({ type: 'success', message: result.message, description: result.description }, provider);
+    notifyWithProvider({
+      type: 'success',
+      message: result.message,
+      description: result.description,
+      key: result.key,
+    }, provider);
     return;
   }
   notifyWithProvider({ type: 'success', message: config || defaultMessage }, provider);
@@ -166,7 +176,12 @@ export function fireErrorNotification(request: ErrorNotificationRequest): void {
   if (!config && !defaultMessage) return;
   if (typeof config === 'function') {
     const result = config(error, undefined, resource);
-    notifyWithProvider({ type: 'error', message: result.message, description: result.description }, provider);
+    notifyWithProvider({
+      type: 'error',
+      message: result.message,
+      description: result.description,
+      key: result.key,
+    }, provider);
     return;
   }
   const errMsg = error instanceof Error ? error.message : String(error ?? '');

package/src/i18n.svelte.ts

@@ -125,6 +125,8 @@ const baseLocales: Record<string, Record<string, string>> = {
     'auth.forgotPasswordDescription': '输入您的邮箱地址，我们将发送重置密码的链接。',
     'auth.resetPasswordDescription': '设置一个新的登录密码。',
     'auth.resetLinkSent': '重置链接已发送，请查看您的邮箱。',
+    'auth.resetLinkSentTitle': '重置链接已发送',
+    'auth.resetLinkSentDescription': '如果该账号存在，请按照邮件中的步骤重置密码。',
     'auth.passwordMismatch': '两次输入的密码不一致',
     'auth.emailRequired': '请输入邮箱',
     'auth.passwordRequired': '请输入密码',
@@ -754,6 +756,8 @@ const baseLocales: Record<string, Record<string, string>> = {
     'auth.forgotPasswordDescription': 'Enter your email address and we will send you a reset link.',
     'auth.resetPasswordDescription': 'Set a new sign-in password.',
     'auth.resetLinkSent': 'Reset link sent! Check your email.',
+    'auth.resetLinkSentTitle': 'Reset link sent',
+    'auth.resetLinkSentDescription': 'If the account exists, follow the instructions in the email to reset the password.',
     'auth.passwordMismatch': 'Passwords do not match',
     'auth.emailRequired': 'Email is required',
     'auth.passwordRequired': 'Password is required',

package/src/index.ts

@@ -136,6 +136,7 @@ export {
   useOnError, usePermissions,
   getLogoutVersion, resetLogoutVersion,
 } from './auth-hooks.svelte';
+export type { AuthNotificationOptions } from './auth-hooks.svelte';
 export {
   useSubmitTask,
   useTask,