@svadmin/core 0.47.0 → 0.47.1

package/package.json

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

package/src/helpers-pure.ts

@@ -165,34 +165,7 @@ export function parseCSV(text: string): string[][] {
   return rows;
 }
 
-// ─── Universal Schema Validator Helper ──────────────────────────
-
-/**
- * Universal schema interface compatible with TypeBox, Standard Schema (v1), Valibot, Zod,
- * Yup, Joi, etc.
- */
-export interface SchemaValidatorLike {
-  Check?: (value: unknown) => boolean;
-  Errors?: (value: unknown) => Iterable<{ path?: string; message: string; schema?: unknown }>;
-  safeParse?: (data: unknown) => {
-    success: boolean;
-    data?: unknown;
-    error?: {
-      issues?: Array<{ path?: Array<string | number>; message: string }>;
-      errors?: Array<{ path?: Array<string | number>; message: string }>;
-    };
-  };
-  parse?: (data: unknown) => unknown;
-  validate?: (data: unknown) => {
-    error?: {
-      details?: Array<{ path?: Array<string | number>; message: string }>;
-      message?: string;
-    };
-  };
-  '~standard'?: {
-    validate: (data: unknown) => unknown | Promise<unknown>;
-  };
-}
+// ─── TypeBox Validator Helper ───────────────────────────────────
 
 /**
  * TypeBox validator interface matching TypeCompiler.Compile or Value.Errors
@@ -202,134 +175,6 @@ export type TypeBoxValidatorLike = {
   Errors: (value: unknown) => Iterable<{ path?: string; message: string }>;
 };
 
-/**
- * Creates a synchronous form validator function from any TypeBox, Standard Schema v1,
- * Valibot, Zod, Yup, or Joi object.
- *
- * @example
- * ```ts
- * import { Type } from '@sinclair/typebox';
- * import { TypeCompiler } from '@sinclair/typebox/compiler';
- * import { createSchemaValidator, useForm } from '@svadmin/core';
- *
- * const userSchema = Type.Object({
- *   name: Type.String({ minLength: 2 }),
- *   email: Type.String({ format: 'email' }),
- * });
- *
- * const form = useForm({
- *   resource: 'users',
- *   validate: createSchemaValidator(TypeCompiler.Compile(userSchema)),
- * });
- * ```
- */
-export function createSchemaValidator(
-  schema: SchemaValidatorLike | unknown
-): (values: Record<string, unknown>) => Record<string, string> | null {
-  if (!schema || typeof schema !== 'object') {
-    return () => null;
-  }
-
-  const s = schema as SchemaValidatorLike;
-
-  return (values: Record<string, unknown>) => {
-    const errors: Record<string, string> = {};
-
-    // 0. TypeBox TypeCompiler compiled validator (.Check & .Errors)
-    if (typeof s.Check === 'function' && typeof s.Errors === 'function') {
-      if (s.Check(values)) return null;
-      for (const err of s.Errors(values)) {
-        const rawPath = err.path || '';
-        const cleanPath = rawPath.replace(/^\//, '').replace(/\//g, '.');
-        const key = cleanPath || '_root';
-        if (!errors[key]) errors[key] = err.message;
-      }
-      return Object.keys(errors).length > 0 ? errors : null;
-    }
-
-    // 0b. TypeBox Value.Errors iterator provider
-    if (typeof s.Errors === 'function') {
-      for (const err of s.Errors(values)) {
-        const rawPath = err.path || '';
-        const cleanPath = rawPath.replace(/^\//, '').replace(/\//g, '.');
-        const key = cleanPath || '_root';
-        if (!errors[key]) errors[key] = err.message;
-      }
-      return Object.keys(errors).length > 0 ? errors : null;
-    }
-
-    // 1. Standard Schema v1 (~standard)
-    if (s['~standard'] && typeof s['~standard'].validate === 'function') {
-      const res = s['~standard'].validate(values);
-      if (res && typeof res === 'object' && 'issues' in res && Array.isArray((res as { issues?: Array<{ path?: Array<unknown>; message: string }> }).issues)) {
-        for (const issue of (res as { issues: Array<{ path?: Array<unknown>; message: string }> }).issues) {
-          const rawPath = issue.path?.[0];
-          const key = typeof rawPath === 'object' && rawPath !== null && 'key' in rawPath
-            ? String((rawPath as { key: unknown }).key)
-            : rawPath != null
-              ? String(rawPath)
-              : '_root';
-          if (!errors[key]) errors[key] = issue.message;
-        }
-      }
-      return Object.keys(errors).length > 0 ? errors : null;
-    }
-
-    // 2. Zod / Valibot safeParse
-    if (typeof s.safeParse === 'function') {
-      const res = s.safeParse(values);
-      if (!res.success && res.error) {
-        const issues = res.error.issues ?? res.error.errors ?? [];
-        for (const issue of issues) {
-          const key = issue.path?.[0] != null ? String(issue.path[0]) : '_root';
-          if (!errors[key]) errors[key] = issue.message;
-        }
-      }
-      return Object.keys(errors).length > 0 ? errors : null;
-    }
-
-    // 3. Joi / generic .validate()
-    if (typeof s.validate === 'function') {
-      const res = s.validate(values);
-      if (res && typeof res === 'object' && res.error) {
-        const details = res.error.details;
-        if (Array.isArray(details) && details.length > 0) {
-          for (const d of details) {
-            const key = d.path?.[0] != null ? String(d.path[0]) : '_root';
-            if (!errors[key]) errors[key] = d.message;
-          }
-        } else if (res.error.message) {
-          errors._root = res.error.message;
-        }
-      }
-      return Object.keys(errors).length > 0 ? errors : null;
-    }
-
-    // 4. Synchronous .parse() that throws (e.g. standard Zod parse or Yup validateSync)
-    if (typeof s.parse === 'function') {
-      try {
-        s.parse(values);
-      } catch (err: unknown) {
-        if (err && typeof err === 'object') {
-          const issues = (err as { issues?: Array<{ path?: Array<string | number>; message: string }>; errors?: Array<{ path?: Array<string | number>; message: string }> }).issues ??
-            (err as { errors?: Array<{ path?: Array<string | number>; message: string }> }).errors;
-          if (Array.isArray(issues)) {
-            for (const issue of issues) {
-              const key = issue.path?.[0] != null ? String(issue.path[0]) : '_root';
-              if (!errors[key]) errors[key] = issue.message;
-            }
-          } else if ('message' in err && typeof (err as { message: unknown }).message === 'string') {
-            errors._root = (err as { message: string }).message;
-          }
-        }
-      }
-      return Object.keys(errors).length > 0 ? errors : null;
-    }
-
-    return null;
-  };
-}
-
 /**
  * Creates a synchronous form validator function specifically optimized for TypeBox
  * compiled validators (from TypeCompiler.Compile) or TypeBox value checks.
@@ -354,7 +199,18 @@ export function createSchemaValidator(
  * ```
  */
 export function createTypeBoxValidator(
-  compiledOrSchema: TypeBoxValidatorLike | SchemaValidatorLike | unknown
+  validator: TypeBoxValidatorLike
 ): (values: Record<string, unknown>) => Record<string, string> | null {
-  return createSchemaValidator(compiledOrSchema);
+  return (values) => {
+    if (validator.Check?.(values)) return null;
+
+    const errors: Record<string, string> = {};
+    for (const error of validator.Errors(values)) {
+      const path = (error.path ?? '').replace(/^\//, '').replace(/\//g, '.');
+      const key = path || '_root';
+      if (!errors[key]) errors[key] = error.message;
+    }
+
+    return Object.keys(errors).length > 0 ? errors : null;
+  };
 }

package/src/helpers.ts

@@ -8,10 +8,9 @@ export {
   getDefaultFilter, getDefaultSortOrder,
   unionFilters, unionSorters,
   file2Base64, parseCSV,
-  createSchemaValidator,
   createTypeBoxValidator,
 } from './helpers-pure';
-export type { SchemaValidatorLike, TypeBoxValidatorLike } from './helpers-pure';
+export type { TypeBoxValidatorLike } from './helpers-pure';
 
 
 // ─── Document Title Helper ────────────────────────────────────
@@ -61,7 +60,7 @@ export function generateDefaultDocumentTitle(options?: {
  * - `type === 'number'` fields (must be a valid number)
  * - Custom per-field `field.validate()` callback
  *
- * This eliminates the need for hand-written Zod schemas in most CRUD scenarios.
+ * This eliminates the need for hand-written schemas in most CRUD scenarios.
  *
  * @example
  * ```ts

package/src/index.ts

@@ -203,10 +203,9 @@ export {
   unionFilters, unionSorters,
   file2Base64, generateDefaultDocumentTitle,
   deriveValidator,
-  createSchemaValidator,
   createTypeBoxValidator,
 } from './helpers';
-export type { SchemaValidatorLike, TypeBoxValidatorLike } from './helpers';
+export type { TypeBoxValidatorLike } from './helpers';
 export { TableState } from './table-state.svelte';
 export type { TableStateOptions } from './table-state.svelte';
 export type { UseInfiniteListOptions } from './hooks.svelte';