fix: x-validator typo error (#98)

web-infra-dev · May 9, 2023 · d856abc · d856abc
1 parent a0be694
commit d856abc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/tough-squids-judge.md b/.changeset/tough-squids-judge.md
@@ -0,0 +1,5 @@
+---
+'@modern-js/codesmith-formily': patch
+---
+
+fix: x-validator typo error
diff --git a/packages/formily/src/transform.ts b/packages/formily/src/transform.ts
@@ -6,15 +6,16 @@ import {
   isFunction,
 } from '@modern-js/utils/lodash';
 import { Question as InquirerQuestion } from 'inquirer';
-import { validate } from '@formily/validator';
+import { Validator, validate } from '@formily/validator';
 
 export type Schema = Partial<
   Pick<
     FormilySchema,
-    'type' | 'title' | 'default' | 'enum' | 'x-validate' | 'x-reactions'
+    'type' | 'title' | 'default' | 'enum' | 'x-validator' | 'x-reactions'
   >
 > & {
   properties?: Record<string, Schema>;
+  'x-validate'?: Validator; // fix typo error
 };
 
 export type Question = InquirerQuestion & { origin: Schema };
@@ -57,9 +58,11 @@ export function getQuestionFromSchema(
       title,
       default: defaultValue,
       enum: items,
-      'x-validate': fieldValidate,
+      'x-validator': _fieldValidate_1,
+      'x-validate': _fieldValidate_2,
       ...extra
     } = properties![field];
+    const fieldValidate = _fieldValidate_1 || _fieldValidate_2;
     if (type === 'void' || type === 'object') {
       return getQuestionFromSchema(
         properties![field],