@svadmin/core 0.34.2 → 0.36.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/core",
-  "version": "0.34.2",
+  "version": "0.36.0",
   "author": "zuohuadong",
   "repository": {
     "type": "git",

package/src/audit.ts

@@ -50,7 +50,11 @@ export function resetAuditLogProvider(): void {
   handler = (entry) => { console.info('[audit]', entry.action, entry.resource, entry.recordId); };
 }
 
-export function audit(entry: Omit<AuditEntry, 'timestamp'>): void {
+/** Record an entry through an explicitly scoped provider and the compatibility handler. */
+export function auditWithProvider(
+  entry: Omit<AuditEntry, 'timestamp'>,
+  provider: AuditLogProvider | null | undefined,
+): void {
   const fullEntry: AuditEntry = { ...entry, timestamp: new Date().toISOString() };
   try {
     const result = handler(fullEntry);
@@ -60,8 +64,8 @@ export function audit(entry: Omit<AuditEntry, 'timestamp'>): void {
   } catch (e) {
     console.error('[audit] handler error:', e);
   }
-  if (auditLogProvider) {
-    auditLogProvider.create({
+  if (provider) {
+    provider.create({
       resource: entry.resource ?? '',
       action: entry.action,
       data: entry.data ?? entry.details,
@@ -70,3 +74,7 @@ export function audit(entry: Omit<AuditEntry, 'timestamp'>): void {
     }).catch(e => console.error('[audit] provider create error:', e));
   }
 }
+
+export function audit(entry: Omit<AuditEntry, 'timestamp'>): void {
+  auditWithProvider(entry, auditLogProvider);
+}

package/src/auth-hooks.svelte.ts

@@ -4,7 +4,7 @@
 
 import { captureAdminContext } from './context.svelte';
 import type { AdminContextAccessor } from './context.svelte';
-import { notify } from './notification.svelte';
+import { notifyWithProvider } from './notification.svelte';
 import { t, useTranslation } from './i18n.svelte';
 import type { AuthActionResult, CheckResult, Identity, AuthProvider } from './types';
 import { useQueryClient } from '@tanstack/svelte-query';
@@ -26,33 +26,72 @@ function createAuthMutation(options: CreateAuthMutationOptions) {
   const adminContext = captureAdminContext();
   const i18n = useTranslation();
   let isLoading = $state(false);
+  let mutationEpoch = 0;
+
+  const activeTenantIdentity = () => adminContext.tenantCacheKey?.__svadminTenant;
+  let observedProvider = adminContext.authProvider;
+  let observedTenantIdentity = activeTenantIdentity();
+
+  function isActiveMutation(
+    epoch: number,
+    provider: AuthProvider,
+    tenantIdentity: string | number | undefined,
+  ): boolean {
+    return epoch === mutationEpoch
+      && provider === adminContext.authProvider
+      && tenantIdentity === activeTenantIdentity();
+  }
 
   async function mutate(params?: Record<string, unknown>): Promise<AuthActionResult> {
     const provider = adminContext.authProvider;
     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`);
-    
+
+    const epoch = ++mutationEpoch;
+    const tenantIdentity = activeTenantIdentity();
+    const notificationProvider = adminContext.notificationProvider;
+    const sendNotification = (notification: Parameters<typeof notifyWithProvider>[0]) =>
+      notifyWithProvider(notification, notificationProvider);
     isLoading = true;
     try {
       const result = await fn.call(provider, params);
+      if (!isActiveMutation(epoch, provider, tenantIdentity)) return result;
       if (result.success) {
-        if (options.successMessage) notify({ type: 'success', message: options.successMessage });
+        if (options.successMessage) sendNotification({ type: 'success', message: options.successMessage });
         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) notify({ type: 'error', message: msg });
+        if (options.errorMessage !== false) sendNotification({ type: 'error', message: msg });
       }
       return result;
     } catch (err) {
       const msg = err instanceof Error ? err.message : (typeof options.errorMessage === 'string' ? options.errorMessage : i18n.t('common.operationFailed'));
-      if (options.errorMessage !== false) notify({ type: 'error', message: msg });
+      if (isActiveMutation(epoch, provider, tenantIdentity) && options.errorMessage !== false) {
+        sendNotification({ type: 'error', message: msg });
+      }
       return { success: false, error: { message: msg } };
     } finally {
-      isLoading = false;
+      if (isActiveMutation(epoch, provider, tenantIdentity)) isLoading = false;
     }
   }
 
+  if (typeof window !== 'undefined') {
+    $effect(() => {
+      const provider = adminContext.authProvider;
+      const tenantIdentity = activeTenantIdentity();
+      if (provider !== observedProvider || tenantIdentity !== observedTenantIdentity) {
+        observedProvider = provider;
+        observedTenantIdentity = tenantIdentity;
+        mutationEpoch++;
+        isLoading = false;
+      }
+      return () => {
+        mutationEpoch++;
+      };
+    });
+  }
+
   return {
     mutate,
     get isLoading() { return isLoading; },
@@ -152,26 +191,57 @@ export function useGetIdentity() {
   let data = $state<Identity | null>(null);
   let isLoading = $state(true);
   let error = $state<Error | null>(null);
+  let requestEpoch = 0;
+  let observedLogoutVersion = _logoutVersion;
 
-  function fetch() {
-    const provider = adminContext.authProvider;
-    if (!provider) { isLoading = false; return; }
+  function requestIdentity(provider: AuthProvider | null): void {
+    const epoch = ++requestEpoch;
+    error = null;
+    if (!provider) {
+      data = null;
+      isLoading = false;
+      return;
+    }
     isLoading = true;
     provider.getIdentity().then(identity => {
+      if (epoch !== requestEpoch) return;
       data = identity;
       isLoading = false;
     }).catch(err => {
+      if (epoch !== requestEpoch) return;
       error = err instanceof Error ? err : new Error(String(err));
       isLoading = false;
       console.warn('[svadmin] useGetIdentity failed:', err);
     });
   }
 
+  function refetchIdentity(): void {
+    requestIdentity(adminContext.authProvider);
+  }
+
+  function loadScopedIdentity(provider: AuthProvider | null): void {
+    data = null;
+    requestIdentity(provider);
+  }
+
   if (typeof window !== 'undefined') {
-    fetch();
     $effect(() => {
-      void _logoutVersion;
-      data = null;
+      const provider = adminContext.authProvider;
+      void adminContext.tenantCacheKey?.__svadminTenant;
+      const logoutVersion = _logoutVersion;
+      if (logoutVersion !== observedLogoutVersion) {
+        observedLogoutVersion = logoutVersion;
+        requestEpoch++;
+        data = null;
+        error = null;
+        isLoading = false;
+        return;
+      }
+
+      loadScopedIdentity(provider);
+      return () => {
+        requestEpoch++;
+      };
     });
   }
 
@@ -179,7 +249,7 @@ export function useGetIdentity() {
     get data() { return data; },
     get isLoading() { return isLoading; },
     get error() { return error; },
-    refetch: fetch,
+    refetch: refetchIdentity,
   };
 }
 

package/src/context.svelte.ts

@@ -5,12 +5,33 @@ import { createContext } from 'svelte';
 import type { DataProvider, AuthProvider, ResourceDefinition, TaskProvider } from './types';
 import type { RouterProvider } from './router-provider';
 import type { LiveProvider } from './live.svelte';
-import { resetNotificationProvider } from './notification.svelte';
-import { resetAuditLogProvider } from './audit';
-import { resetAccessControlProvider } from './permissions.svelte';
+import type { AccessControlProvider } from './permissions.svelte';
+import type { AuditLogProvider } from './audit';
+import type { AgentProvider, ChatProvider } from './chatProvider.svelte';
+import {
+  createTenantCacheKey,
+  resolveTenantProviderMeta,
+  withProviderMeta,
+} from './provider-bundle';
+import { keys } from './query-keys';
+import type { QueryMatcher } from './query-keys';
+import type {
+  DataProviderInput,
+  ProviderBundle,
+  TenantAdapter,
+  TenantCacheKey,
+  TenantContext,
+} from './provider-bundle';
+import { getNotificationProvider as getLegacyNotificationProvider, resetNotificationProvider } from './notification.svelte';
+import { getAuditLogProvider as getLegacyAuditLogProvider, resetAuditLogProvider } from './audit';
+import { getAccessControlProvider as getLegacyAccessControlProvider, resetAccessControlProvider } from './permissions.svelte';
 import { resetAdminOptions } from './options.svelte';
 import { resetI18n } from './i18n.svelte';
-import { resetChatProvider } from './chatProvider.svelte';
+import {
+  getAgentProvider as getLegacyAgentProvider,
+  getChatProvider as getLegacyChatProvider,
+  resetChatProvider,
+} from './chatProvider.svelte';
 import { resetToast } from './toast.svelte';
 import { resetTheme } from './theme.svelte';
 import {
@@ -29,29 +50,35 @@ import { resetSidebarCollapsed } from './hooks.svelte';
 
 // ─── DataProvider (supports single or multiple) ─────────────────
 
-/**
- * Accepts either:
- *   - A single DataProvider
- *   - A record of named providers: { default: rest, cms: graphql }
- */
-export type DataProviderInput = DataProvider | Record<string, DataProvider>;
+export type { DataProviderInput } from './provider-bundle';
 
-export interface AdminContextSource {
-  readonly dataProvider: DataProviderInput;
-  readonly authProvider?: AuthProvider | null;
+interface AdminContextSourceBase extends Omit<Partial<ProviderBundle>, 'dataProvider'> {
   readonly resources: ResourceDefinition[];
-  readonly routerProvider?: RouterProvider;
-  readonly liveProvider?: LiveProvider;
-  readonly taskProvider?: TaskProvider;
+  /** 请求树内租户；未传入时继承最近的 provideTenantContext。 */
+  readonly tenant?: TenantContext;
 }
 
+/** 必须提供旧式 dataProvider 或一等 ProviderBundle；同名顶层字段优先。 */
+export type AdminContextSource = AdminContextSourceBase & (
+  | { readonly dataProvider: DataProviderInput; readonly providerBundle?: ProviderBundle }
+  | { readonly dataProvider?: DataProviderInput; readonly providerBundle: ProviderBundle }
+);
+
 export interface AdminContextValue {
+  readonly providerBundle: ProviderBundle;
   readonly providers: Record<string, DataProvider>;
   readonly authProvider: AuthProvider | null;
   readonly resources: ResourceDefinition[];
   readonly routerProvider: RouterProvider | undefined;
   readonly liveProvider: LiveProvider | undefined;
   readonly taskProvider: TaskProvider | undefined;
+  readonly accessControlProvider: AccessControlProvider | null;
+  readonly auditLogProvider: AuditLogProvider | null;
+  readonly notificationProvider: ProviderBundle['notificationProvider'];
+  readonly chatProvider: ChatProvider | null;
+  readonly agentProvider: AgentProvider | null;
+  readonly tenant: TenantContext | undefined;
+  readonly tenantAdapter: TenantAdapter | undefined;
 }
 
 /**
@@ -63,15 +90,28 @@ export interface AdminContextValue {
  * read the module-level compatibility setters dynamically.
  */
 export interface AdminContextAccessor {
+  readonly providerBundle: ProviderBundle;
   readonly providers: Record<string, DataProvider> | null;
   readonly authProvider: AuthProvider | null;
   readonly resources: ResourceDefinition[];
   readonly routerProvider: RouterProvider | undefined;
   readonly liveProvider: LiveProvider | undefined;
   readonly taskProvider: TaskProvider | undefined;
+  readonly accessControlProvider: AccessControlProvider | null;
+  readonly auditLogProvider: AuditLogProvider | null;
+  readonly notificationProvider: ProviderBundle['notificationProvider'];
+  readonly chatProvider: ChatProvider | null;
+  readonly agentProvider: AgentProvider | null;
+  readonly tenant: TenantContext | undefined;
+  readonly tenantAdapter: TenantAdapter | undefined;
+  readonly tenantCacheKey: TenantCacheKey | undefined;
   getDataProvider(name?: string): DataProvider;
   getDataProviderNames(): string[];
+  resolveDataProviderName(resourceName: string, overrideName?: string): string;
   getDataProviderForResource(resourceName: string, overrideName?: string): DataProvider;
+  queryKeys(resourceName?: string, overrideName?: string): ReturnType<typeof keys>;
+  queryKeyMatcher(resourceName?: string, overrideName?: string): Pick<QueryMatcher, 'provider' | 'tenant'>;
+  getProviderMeta(resourceName: string | undefined, meta?: Record<string, unknown>): Record<string, unknown> | undefined;
   getResource(nameOrIdentifier: string): ResourceDefinition;
   currentPath(): string;
   formatLink(path: string): string;
@@ -80,6 +120,22 @@ export interface AdminContextAccessor {
 }
 
 const [getRequiredAdminContext, setAdminContext] = createContext<AdminContextValue>();
+const [getRequiredTenantContext, setScopedTenantContext] = createContext<TenantContext>();
+
+/** Provide tenant state to a request/component subtree. No module-level fallback is created. */
+export function provideTenantContext(tenant: TenantContext): TenantContext {
+  setScopedTenantContext(tenant);
+  return tenant;
+}
+
+/** Return the nearest request/tree-scoped tenant when called during initialization. */
+export function getTenantContext(): TenantContext | undefined {
+  try {
+    return getRequiredTenantContext();
+  } catch {
+    return undefined;
+  }
+}
 
 function normalizeDataProviders(provider: DataProviderInput): Record<string, DataProvider> {
   return isDataProvider(provider)
@@ -87,14 +143,49 @@ function normalizeDataProviders(provider: DataProviderInput): Record<string, Dat
     : provider;
 }
 
+function resolveProviderBundle(source: AdminContextSource): ProviderBundle {
+  const bundled = source.providerBundle;
+  const dataProvider = source.dataProvider ?? bundled?.dataProvider;
+  if (!dataProvider) {
+    throw new Error('ProviderBundle requires a dataProvider.');
+  }
+
+  return {
+    dataProvider,
+    authProvider: source.authProvider !== undefined ? source.authProvider : bundled?.authProvider,
+    accessControlProvider: source.accessControlProvider !== undefined
+      ? source.accessControlProvider
+      : bundled?.accessControlProvider,
+    liveProvider: source.liveProvider ?? bundled?.liveProvider,
+    auditLogProvider: source.auditLogProvider !== undefined ? source.auditLogProvider : bundled?.auditLogProvider,
+    notificationProvider: source.notificationProvider !== undefined
+      ? source.notificationProvider
+      : bundled?.notificationProvider,
+    chatProvider: source.chatProvider !== undefined ? source.chatProvider : bundled?.chatProvider,
+    agentProvider: source.agentProvider !== undefined ? source.agentProvider : bundled?.agentProvider,
+    taskProvider: source.taskProvider ?? bundled?.taskProvider,
+    routerProvider: source.routerProvider ?? bundled?.routerProvider,
+    tenantAdapter: source.tenantAdapter ?? bundled?.tenantAdapter,
+  };
+}
+
 export function createAdminContext(source: AdminContextSource): AdminContextValue {
+  const inheritedTenant = getTenantContext();
   return {
-    get providers() { return normalizeDataProviders(source.dataProvider); },
-    get authProvider() { return source.authProvider ?? null; },
+    get providerBundle() { return resolveProviderBundle(source); },
+    get providers() { return normalizeDataProviders(resolveProviderBundle(source).dataProvider); },
+    get authProvider() { return resolveProviderBundle(source).authProvider ?? null; },
     get resources() { return source.resources; },
-    get routerProvider() { return source.routerProvider; },
-    get liveProvider() { return source.liveProvider; },
-    get taskProvider() { return source.taskProvider; },
+    get routerProvider() { return resolveProviderBundle(source).routerProvider; },
+    get liveProvider() { return resolveProviderBundle(source).liveProvider; },
+    get taskProvider() { return resolveProviderBundle(source).taskProvider; },
+    get accessControlProvider() { return resolveProviderBundle(source).accessControlProvider ?? null; },
+    get auditLogProvider() { return resolveProviderBundle(source).auditLogProvider ?? null; },
+    get notificationProvider() { return resolveProviderBundle(source).notificationProvider ?? null; },
+    get chatProvider() { return resolveProviderBundle(source).chatProvider ?? null; },
+    get agentProvider() { return resolveProviderBundle(source).agentProvider ?? null; },
+    get tenant() { return source.tenant ?? inheritedTenant; },
+    get tenantAdapter() { return resolveProviderBundle(source).tenantAdapter; },
   };
 }
 
@@ -119,14 +210,55 @@ let providers = $state<Record<string, DataProvider> | null>(null);
 /** Capture the current tree once so delayed callbacks never re-enter getContext. */
 export function captureAdminContext(): AdminContextAccessor {
   const scopedContext = getAdminContext();
+  const adaptedProviders = new Map<DataProvider, DataProvider>();
+
+  function adaptProvider(provider: DataProvider): DataProvider {
+    const hasResourceMetadata = accessor.resources.some((resource) => resource.provider !== undefined);
+    if (!accessor.tenant && !hasResourceMetadata) return provider;
+    const cached = adaptedProviders.get(provider);
+    if (cached) return cached;
+    const adapted = withProviderMeta(provider, ({ resource, meta }) => accessor.getProviderMeta(resource, meta));
+    adaptedProviders.set(provider, adapted);
+    return adapted;
+  }
 
   const accessor: AdminContextAccessor = {
+    get providerBundle() {
+      if (scopedContext) return scopedContext.providerBundle;
+      if (!providers) throw new Error('DataProvider not found. Did you call setDataProvider in App.svelte?');
+      return {
+        dataProvider: providers,
+        authProvider,
+        accessControlProvider: getLegacyAccessControlProvider(),
+        liveProvider: liveProviderState,
+        auditLogProvider: getLegacyAuditLogProvider(),
+        notificationProvider: getLegacyNotificationProvider(),
+        chatProvider: getLegacyChatProvider(),
+        agentProvider: getLegacyAgentProvider(),
+        taskProvider: taskProviderState,
+        routerProvider,
+      };
+    },
     get providers() { return scopedContext ? scopedContext.providers : providers; },
     get authProvider() { return scopedContext ? scopedContext.authProvider : authProvider; },
     get resources() { return scopedContext ? scopedContext.resources : resources ?? []; },
     get routerProvider() { return scopedContext ? scopedContext.routerProvider : routerProvider; },
     get liveProvider() { return scopedContext ? scopedContext.liveProvider : liveProviderState; },
     get taskProvider() { return scopedContext ? scopedContext.taskProvider : taskProviderState; },
+    get accessControlProvider() {
+      return scopedContext ? scopedContext.accessControlProvider : getLegacyAccessControlProvider();
+    },
+    get auditLogProvider() { return scopedContext ? scopedContext.auditLogProvider : getLegacyAuditLogProvider(); },
+    get notificationProvider() {
+      return scopedContext ? scopedContext.notificationProvider : getLegacyNotificationProvider();
+    },
+    get chatProvider() { return scopedContext ? scopedContext.chatProvider : getLegacyChatProvider(); },
+    get agentProvider() { return scopedContext ? scopedContext.agentProvider : getLegacyAgentProvider(); },
+    get tenant() { return scopedContext?.tenant; },
+    get tenantAdapter() { return scopedContext?.tenantAdapter; },
+    get tenantCacheKey() {
+      return accessor.tenant ? createTenantCacheKey(accessor.tenant, accessor.tenantAdapter) : undefined;
+    },
     getDataProvider(name) {
       const activeProviders = accessor.providers;
       if (!activeProviders) throw new Error('DataProvider not found. Did you call setDataProvider in App.svelte?');
@@ -135,27 +267,64 @@ export function captureAdminContext(): AdminContextAccessor {
       if (!provider) {
         throw new Error(`DataProvider "${key}" not found. Available: ${Object.keys(activeProviders).join(', ')}`);
       }
-      return provider;
+      return adaptProvider(provider);
     },
     getDataProviderNames() {
       return accessor.providers ? Object.keys(accessor.providers) : [];
     },
-    getDataProviderForResource(resourceName, overrideName) {
+    resolveDataProviderName(resourceName, overrideName) {
       if (overrideName) {
         try {
-          return accessor.getDataProvider(overrideName);
+          accessor.getDataProvider(overrideName);
+          return overrideName;
         } catch {
-          // Preserve the historical fallback to the resource/default provider.
+          // Fallback to resource/default provider as before.
         }
       }
+
       try {
         const resource = accessor.getResource(resourceName);
-        const dataProviderName = resource.meta?.dataProviderName as string | undefined;
-        if (dataProviderName) return accessor.getDataProvider(dataProviderName);
+        const providerName = resource.provider?.dataProviderName ?? resource.meta?.dataProviderName;
+        if (providerName) {
+          accessor.getDataProvider(providerName);
+          return providerName;
+        }
       } catch {
-        // Preserve the historical fallback when a resource is not registered.
+        // Preserve fallback when a resource is not found or malformed.
       }
-      return accessor.getDataProvider();
+
+      return 'default';
+    },
+    getDataProviderForResource(resourceName, overrideName) {
+      return accessor.getDataProvider(accessor.resolveDataProviderName(resourceName, overrideName));
+    },
+    queryKeys(resourceName, overrideName) {
+      return keys({
+        provider: accessor.resolveDataProviderName(resourceName ?? '', overrideName),
+        tenant: accessor.tenantCacheKey?.__svadminTenant,
+      });
+    },
+    queryKeyMatcher(resourceName, overrideName) {
+      return {
+        provider: accessor.resolveDataProviderName(resourceName ?? '', overrideName),
+        tenant: accessor.tenantCacheKey?.__svadminTenant,
+      };
+    },
+    getProviderMeta(resourceName, meta) {
+      const resource = resourceName
+        ? accessor.resources.find((candidate) => candidate.identifier === resourceName || candidate.name === resourceName)
+        : undefined;
+      const providerConfig = resource?.provider;
+      const tenant = accessor.tenant;
+      if (!providerConfig && !tenant) return meta;
+
+      return {
+        ...(providerConfig?.meta ?? {}),
+        ...(meta ?? {}),
+        ...(providerConfig?.transport === undefined ? {} : { transport: providerConfig.transport }),
+        ...(providerConfig?.adapter === undefined ? {} : { adapter: providerConfig.adapter }),
+        ...(tenant ? resolveTenantProviderMeta(tenant, accessor.tenantAdapter) : {}),
+      };
     },
     getResource(nameOrIdentifier) {
       const resource = accessor.resources.find(
@@ -208,6 +377,10 @@ export function getDataProviderForResource(resourceName: string, overrideName?:
   return captureAdminContext().getDataProviderForResource(resourceName, overrideName);
 }
 
+export function getProviderBundle(): ProviderBundle {
+  return captureAdminContext().providerBundle;
+}
+
 function isDataProvider(value: unknown): value is DataProvider {
   return (
     value !== null &&