@svadmin/core 0.52.0 → 0.53.0

package/package.json

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

package/src/i18n.svelte.ts

@@ -18,9 +18,13 @@ const baseLocales: Record<string, Record<string, string>> = {
     'common.moveUp': '上移',
     'common.moveDown': '下移',
     'common.treeSelect': '树形选择',
+    'tree.toggleChildren': '展开或折叠子节点',
+    'tree.loadFailed': '子节点加载失败',
     'common.cascader': '级联选择',
     'common.transfer': '穿梭框',
     'common.filterBuilder': '高级筛选',
+    'filter.incomplete': '请补全筛选条件后再应用。',
+    'filter.readonly': '只读筛选条件',
     'common.addRule': '添加筛选条件',
     'common.sourceList': '源列表',
     'common.targetList': '目标列表',
@@ -716,9 +720,13 @@ const baseLocales: Record<string, Record<string, string>> = {
     'common.moveUp': 'Move Up',
     'common.moveDown': 'Move Down',
     'common.treeSelect': 'Tree Select',
+    'tree.toggleChildren': 'Expand or collapse children',
+    'tree.loadFailed': 'Failed to load child nodes',
     'common.cascader': 'Cascader',
     'common.transfer': 'Transfer',
     'common.filterBuilder': 'Filter Builder',
+    'filter.incomplete': 'Complete the filter conditions before applying.',
+    'filter.readonly': 'Read-only filter condition',
     'common.addRule': 'Add Filter Rule',
     'common.sourceList': 'Source',
     'common.targetList': 'Target',

package/src/inferencer.ts

@@ -351,6 +351,15 @@ export function generateTypeBoxSchemaCode(resource: ResourceDefinition): string
       case 'date':
         typeDef = "Type.String({ format: 'date-time' })";
         break;
+      case 'datetime':
+      case 'time':
+        // 原生输入没有强制时区，不把本地时间误标为 RFC3339 date-time。
+        typeDef = 'Type.String()';
+        break;
+      case 'daterange':
+        // 与 DateRangeInput 一致：两个端点明确存在，未选择时为 null。
+        typeDef = 'Type.Union([Type.Object({ start: Type.Union([Type.String(), Type.Null()]), end: Type.Union([Type.String(), Type.Null()]) }, { additionalProperties: false }), Type.Null()])';
+        break;
       case 'email':
         typeDef = "Type.String({ format: 'email' })";
         break;

package/src/query-session.svelte.ts

@@ -26,6 +26,8 @@ export interface QuerySessionOptions {
   isTargetCurrent?: () => boolean;
   /** Allow a shared query function to delegate work to another live observer. */
   allowRetiredQueryFn?: boolean;
+  /** Internal domain adapter; must return a sanitized error without provider diagnostics. */
+  normalizeError?: (error: unknown) => Error;
 }
 
 export function supersededQuerySession(): HttpError {
@@ -88,6 +90,8 @@ export function createQuerySession<O extends QuerySessionOptions>(context: Admin
     origin.provider === context.authProvider && origin.tenant === context.tenantCacheKey?.__svadminTenant &&
     origin.router === context.routerProvider && (origin.isTargetCurrent === undefined || origin.isTargetCurrent() === true);
   const current = (origin: Origin) => targetCurrent(origin) && sessionCurrent(origin);
+  const errorFor = (origin: Origin, error: unknown): Error =>
+    origin.normalizeError ? origin.normalizeError(error) : querySessionError(error);
 
   function notify(origin: Origin, type: 'success' | 'error', value: unknown): void {
     try {
@@ -125,7 +129,7 @@ export function createQuerySession<O extends QuerySessionOptions>(context: Admin
       });
       return;
     }
-    const error = querySessionError(result.error);
+    const error = errorFor(origin, result.error);
     query.setState({
       error,
       errorUpdatedAt: now,
@@ -154,7 +158,7 @@ export function createQuerySession<O extends QuerySessionOptions>(context: Admin
         throw supersededQuerySession();
       }
       if (!current(origin)) settleDetached(origin, { success: false, error });
-      throw querySessionError(error);
+      throw errorFor(origin, error);
     }
   }
 
@@ -174,7 +178,7 @@ export function createQuerySession<O extends QuerySessionOptions>(context: Admin
         untrack(() => {
           void handleAuthError(querySessionError(result.error), context, () => targetCurrent(origin),
             () => clearAuthQueries(client, origin.provider), origin.auth).catch(() => {});
-          notify(origin, 'error', querySessionError(result.error));
+          notify(origin, 'error', errorFor(origin, result.error));
         });
       }
     });
@@ -186,12 +190,12 @@ export function createQuerySession<O extends QuerySessionOptions>(context: Admin
       if (query?.getObserversCount() === 0) void query.cancel();
     });
   });
-  return { get options() { return options; }, client, current, sessionCurrent, run, observe };
+  return { get options() { return options; }, client, current, sessionCurrent, run, observe, errorFor };
 }
 
 export function pendingQueryResult<T, F extends (settings?: RefetchOptions) => Promise<unknown> = QueryObserverResult<T, unknown>['refetch']>(
   refetch: F,
-): Omit<QueryObserverPendingResult<T, unknown>, 'refetch'> & { refetch: F } {
+): Omit<QueryObserverPendingResult<T, Error>, 'refetch'> & { refetch: F } {
   return {
     data: undefined, dataUpdatedAt: 0, error: null, errorUpdatedAt: 0,
     failureCount: 0, failureReason: null, errorUpdateCount: 0,

package/src/session-query.svelte.ts

@@ -3,7 +3,7 @@ import { tick, untrack } from 'svelte';
 import type { AdminContextAccessor } from './context.svelte';
 import { definedOptions } from './defined-options';
 import {
-  createQuerySession, createQueryResultView, pendingQueryResult, querySessionError, supersededQuerySession,
+  createQuerySession, createQueryResultView, pendingQueryResult, supersededQuerySession,
   type QuerySessionOptions,
 } from './query-session.svelte';
 
@@ -14,17 +14,28 @@ interface SessionQueryOptions<TQuery, T> extends QuerySessionOptions {
   staleTime?: number;
   gcTime?: number;
   refetchOnWindowFocus?: boolean;
+  refetchInterval?: number | false;
+  refetchIntervalInBackground?: boolean;
 }
 
+// 只有显式提供错误归一化器的内部领域查询才承诺 Error；普通查询保留 unknown 契约。
+export function createSessionQuery<TQuery, T = TQuery>(
+  context: AdminContextAccessor,
+  getOptions: () => SessionQueryOptions<TQuery, T> & { normalizeError: (error: unknown) => Error },
+): QueryObserverResult<T, Error>;
+export function createSessionQuery<TQuery, T = TQuery>(
+  context: AdminContextAccessor,
+  getOptions: () => SessionQueryOptions<TQuery, T>,
+): QueryObserverResult<T, unknown>;
 /** Ordinary reads keep their public result shape while cache and effects own an auth revision. */
 export function createSessionQuery<TQuery, T = TQuery>(
   context: AdminContextAccessor,
   getOptions: () => SessionQueryOptions<TQuery, T>,
-): QueryObserverResult<T, unknown> {
+): QueryObserverResult<T, Error> {
   const session = createQuerySession(context, getOptions);
   const inFlight = new Map<string, { origin: typeof session.options; request: Promise<TQuery> }>();
   type Origin = typeof session.options;
-  const query = createQuery<TQuery, unknown>(() => {
+  const query = createQuery<TQuery, Error>(() => {
     const origin = session.options;
     return {
       queryKey: origin.queryKey,
@@ -45,39 +56,43 @@ export function createSessionQuery<TQuery, T = TQuery>(
       enabled: origin.enabled && origin.auth.available,
       ...definedOptions({
         staleTime: origin.staleTime, gcTime: origin.gcTime, refetchOnWindowFocus: origin.refetchOnWindowFocus,
+        refetchInterval: origin.refetchInterval, refetchIntervalInBackground: origin.refetchIntervalInBackground,
       }),
     };
   });
 
-  function project(origin: Origin, result: QueryObserverResult<TQuery, unknown>): QueryObserverResult<T, unknown> {
-    const refetch = async (settings?: RefetchOptions): Promise<QueryObserverResult<T, unknown>> => {
+  function project(origin: Origin, result: QueryObserverResult<TQuery, Error>): QueryObserverResult<T, Error> {
+    const refetch = async (settings?: RefetchOptions): Promise<QueryObserverResult<T, Error>> => {
       if (!session.current(origin)) return pendingQueryResult(refetch);
       await tick();
       if (!session.current(origin)) return pendingQueryResult(refetch);
       try {
         return project(origin, await query.refetch(settings));
       } catch (error) {
-        throw session.current(origin) ? querySessionError(error) : supersededQuerySession();
+        throw session.current(origin) ? session.errorFor(origin, error) : supersededQuerySession();
       }
     };
     if (!session.current(origin)) return pendingQueryResult(refetch);
+    // 新查询键尚未入缓存时也要订阅结果，否则请求完成后视图不会重新计算。
+    const observedData = result.data;
+    const observedError = result.error;
     const state = session.client.getQueryState(origin.queryKey);
     // The observer may still expose its previous key until Svelte flushes its effects.
-    if (!state || state.data !== result.data || state.error !== result.error) return pendingQueryResult(refetch);
-    const failureReason = result.failureReason === null ? null : querySessionError(result.failureReason);
+    if (!state || state.data !== observedData || state.error !== observedError) return pendingQueryResult(refetch);
+    const failureReason = result.failureReason === null ? null : session.errorFor(origin, result.failureReason);
     try {
       if (result.isSuccess || result.isRefetchError) {
         const data = untrack(() => origin.decode(result.data, state.dataUpdateCount));
         if (!session.current(origin)) return pendingQueryResult(refetch);
         if (result.isSuccess) return { ...result, data, failureReason, refetch };
-        return { ...result, data, error: querySessionError(result.error), failureReason, refetch };
+        return { ...result, data, error: session.errorFor(origin, result.error), failureReason, refetch };
       }
-      if (result.isError) return { ...result, error: querySessionError(result.error), failureReason, refetch };
+      if (result.isError) return { ...result, error: session.errorFor(origin, result.error), failureReason, refetch };
       return { ...result, failureReason, refetch };
     } catch (error) {
       if (!session.current(origin)) return pendingQueryResult(refetch);
       return {
-        ...pendingQueryResult(refetch), data: undefined, error: querySessionError(error), status: 'error',
+        ...pendingQueryResult(refetch), data: undefined, error: session.errorFor(origin, error), status: 'error',
         isError: true, isPending: false, isLoading: false, isLoadingError: true,
         isRefetchError: false, isSuccess: false, isPlaceholderData: false,
       };

package/src/task-hooks.svelte.ts

@@ -1,5 +1,7 @@
 import { definedOptions } from './defined-options';
-import { createMutation,createQuery,useQueryClient } from '@tanstack/svelte-query';
+import { createMutation,useQueryClient } from '@tanstack/svelte-query';
+import { createSessionQuery } from './session-query.svelte';
+import { supersededQuerySession } from './query-session.svelte';
 import { getAdminOptions } from './options.svelte';
 import { captureAdminContext } from './context.svelte';
 import type { AdminContextAccessor } from './context.svelte';
@@ -9,7 +11,7 @@ import {
 import { queryKeyMatches, type QueryKey } from './query-keys';
 import { replaceReactiveMembers } from './reactive-projection';
 import { taskQueryParams, withValidatedTaskProvider } from './task-provider';
-import type { TaskError } from './task-contract';
+import { TaskError, decodeTaskRecord, decodeTaskList } from './task-contract';
 import { checkError,createOvertimeTracker,fireErrorNotification,fireSuccessNotification } from './hook-utils.svelte';
 import type { NotificationConfig,OvertimeOptions } from './hook-utils.svelte';
 import { useTranslation } from './i18n.svelte';
@@ -48,6 +50,19 @@ function scopedTaskKey(key: QueryKey, provider: TaskProvider | undefined): Query
   return [{ ...key[0], params: definedOptions({ taskProvider: providerKey, query: key[0].params }) }];
 }
 
+function taskReadError(error: unknown): Error {
+  try {
+    if (typeof error === 'object' && error !== null) {
+      const code: unknown = Object.getOwnPropertyDescriptor(error, 'code')?.value;
+      if (code === 'QUERY_SESSION_SUPERSEDED') return supersededQuerySession();
+      if (code === 'INVALID_TASK_INPUT' || code === 'INVALID_TASK_RESPONSE' || code === 'TASK_PROVIDER_FAILED') {
+        return new TaskError(code);
+      }
+    }
+  } catch { /* 不执行错误对象中的 getter，也不回显上游诊断。 */ }
+  return new TaskError('TASK_PROVIDER_FAILED');
+}
+
 export interface UseSubmitTaskOptions {
   mutationOptions?: {
     onSuccess?: (data: unknown,variables: unknown,context: unknown) => void;
@@ -157,12 +172,17 @@ export function useTask(
   const i18n=useTranslation();
   const adminOptions=getAdminOptions();
 
-  const query=createQuery<TaskRecord,Error>(() => {
+  const query=createSessionQuery<TaskRecord>(adminContext, () => {
     const activeProvider=options.taskProvider??adminContext.taskProvider;
     const provider=activeProvider? withValidatedTaskProvider(activeProvider):undefined;
     const taskId=options.taskId;
     const queryOptions=options.queryOptions;
     return {
+      resource: taskId ?? '',
+      successNotification: options.successNotification,
+      errorNotification: options.errorNotification ?? i18n.t('task.fetchFailed'),
+      normalizeError: taskReadError,
+      decode: value => decodeTaskRecord(value, taskId),
       queryKey: scopedTaskKey(adminContext.queryKeys().task.one(taskId??''),provider),
       queryFn: async () => {
         if(!provider) throw new Error('TaskProvider not found.');
@@ -184,37 +204,6 @@ export function useTask(
 
   const overtime=createOvertimeTracker(() => query.isLoading,options.overtimeOptions??adminOptions.overtime);
 
-  let lastSuccessAt=0;
-  let lastErrorAt=0;
-  $effect(() => {
-    if(query.isSuccess&&query.dataUpdatedAt>lastSuccessAt) {
-      lastSuccessAt=query.dataUpdatedAt;
-      if(options.successNotification) {
-        fireSuccessNotification({
-          config: options.successNotification,
-          defaultMessage: '',
-          data: query.data,
-          ...definedOptions({ resource: options.taskId }),
-          ...definedOptions({
-            provider: adminContext.notificationProvider
-          })
-        });
-      }
-    } else if(query.isError&&query.errorUpdatedAt>lastErrorAt) {
-      lastErrorAt=query.errorUpdatedAt;
-      checkError(query.error,adminContext);
-      fireErrorNotification({
-        config: options.errorNotification,
-        defaultMessage: i18n.t('task.fetchFailed'),
-        error: query.error,
-        ...definedOptions({ resource: options.taskId }),
-        ...definedOptions({
-          provider: adminContext.notificationProvider
-        })
-      });
-    }
-  });
-
   return replaceReactiveMembers(query,{ get overtime() { return overtime; } });
 }
 
@@ -242,13 +231,22 @@ export function useTaskList(
   const i18n=useTranslation();
   const adminOptions=getAdminOptions();
 
-  const query=createQuery<TaskListResult,Error>(() => {
+  const query=createSessionQuery<TaskListResult>(adminContext, () => {
     const activeProvider=options.taskProvider??adminContext.taskProvider;
     const provider=activeProvider? withValidatedTaskProvider(activeProvider):undefined;
     const params=options.params===undefined? undefined:taskQueryParams(options.params);
     const dlq=options.dlq??false;
     const queryOptions=options.queryOptions;
+    const resource = dlq ? 'taskDlq' : 'tasks';
+    const successNotification = options.successNotification;
     return {
+      resource,
+      successNotification: typeof successNotification === 'function'
+        ? (data: unknown) => successNotification(data, params, resource)
+        : successNotification,
+      errorNotification: options.errorNotification ?? i18n.t('task.fetchListFailed'),
+      normalizeError: taskReadError,
+      decode: decodeTaskList,
       queryKey: scopedTaskKey(adminContext.queryKeys().task.list(definedOptions({
         list: dlq? 'dlq':'default',
         params,
@@ -277,38 +275,6 @@ export function useTaskList(
 
   const overtime=createOvertimeTracker(() => query.isLoading,options.overtimeOptions??adminOptions.overtime);
 
-  let lastSuccessAt=0;
-  let lastErrorAt=0;
-  $effect(() => {
-    if(query.isSuccess&&query.dataUpdatedAt>lastSuccessAt) {
-      lastSuccessAt=query.dataUpdatedAt;
-      if(options.successNotification) {
-        fireSuccessNotification({
-          config: options.successNotification,
-          defaultMessage: '',
-          data: query.data,
-          values: options.params,
-          resource: options.dlq? 'taskDlq':'tasks',
-          ...definedOptions({
-            provider: adminContext.notificationProvider
-          })
-        });
-      }
-    } else if(query.isError&&query.errorUpdatedAt>lastErrorAt) {
-      lastErrorAt=query.errorUpdatedAt;
-      checkError(query.error,adminContext);
-      fireErrorNotification({
-        config: options.errorNotification,
-        defaultMessage: i18n.t('task.fetchListFailed'),
-        error: query.error,
-        resource: options.dlq? 'taskDlq':'tasks',
-        ...definedOptions({
-          provider: adminContext.notificationProvider
-        })
-      });
-    }
-  });
-
   return replaceReactiveMembers(query,{ get overtime() { return overtime; } });
 }
 

package/src/types.ts

@@ -408,9 +408,9 @@ export interface MenuItem {
 export interface FieldDefinition {
   key: string;
   label: string;
-  type: 'text' | 'number' | 'boolean' | 'date' | 'select' | 'multiselect' | 'tags'
+  type: 'text' | 'number' | 'boolean' | 'date' | 'time' | 'datetime' | 'daterange' | 'select' | 'multiselect' | 'tags'
     | 'textarea' | 'richtext' | 'image' | 'images' | 'json' | 'relation' | 'color'
-    | 'url' | 'email' | 'phone' | 'currency' | 'file' | 'markdown' | 'password' | 'array'
+    | 'url' | 'email' | 'phone' | 'currency' | 'percent' | 'file' | 'markdown' | 'password' | 'array'
     | 'tree-select' | 'treeselect' | 'cascader' | 'transfer' | 'rate' | 'rating' | 'avatar' | 'copy' | 'code';
   required?: boolean;
   searchable?: boolean;
@@ -430,6 +430,17 @@ export interface FieldDefinition {
   changeOnSelect?: boolean;
   separator?: string;
   defaultValue?: unknown;
+  // Numeric input contract
+  min?: number;
+  max?: number;
+  step?: number;
+  precision?: number;
+  currency?: string;
+  locale?: string;
+  scale?: '100' | '1';
+  // File upload contract
+  accept?: string;
+  maxSize?: number;
   // Relation support
   resource?: string;       // related resource name
   optionLabel?: string;    // field to use as label