From d856abc4f76048f2fc852a42fab546d3caa33261 Mon Sep 17 00:00:00 2001
From: Belinda Cao <caohuilin@bytedance.com>
Date: Tue, 9 May 2023 11:04:00 +0800
Subject: [PATCH] fix: x-validator typo error (#98)

---
 .changeset/tough-squids-judge.md  | 5 +++++
 packages/formily/src/transform.ts | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/tough-squids-judge.md

diff --git a/.changeset/tough-squids-judge.md b/.changeset/tough-squids-judge.md
new file mode 100644
index 0000000..8d8ebef
--- /dev/null
+++ 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
index f760c5d..6184a6f 100644
--- 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],