chore: all finished

yiminghe · May 31, 2021 · b8b2c2a · b8b2c2a
1 parent 7fe5e93
commit b8b2c2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -302,7 +302,7 @@ class Schema {
     );
   }
 
-  getType(rule: RuleItem) {
+  getType(rule: InternalRuleItem) {
     if (rule.type === undefined && rule.pattern instanceof RegExp) {
       rule.type = 'pattern';
     }
@@ -316,7 +316,7 @@ class Schema {
     return rule.type || 'string';
   }
 
-  getValidationMethod(rule: RuleItem) {
+  getValidationMethod(rule: InternalRuleItem) {
     if (typeof rule.validator === 'function') {
       return rule.validator;
     }

diff --git a/src/interface.ts b/src/interface.ts
@@ -192,7 +192,8 @@ export interface RuleValuePackage {
   field: string;
 }
 
-export interface InternalRuleItem extends RuleItem {
+export interface InternalRuleItem extends Omit<RuleItem, 'validator'> {
   field?: string;
   fullField?: string;
+  validator?: RuleItem['validator'] | ExecuteValidator;
 }
diff --git a/src/util.ts b/src/util.ts
@@ -82,7 +82,7 @@ export function format(
   return template;
 }
 
-function isNativeStringType(type: RuleType) {
+function isNativeStringType(type: string) {
   return (
     type === 'string' ||
     type === 'url' ||
@@ -93,7 +93,7 @@ function isNativeStringType(type: RuleType) {
   );
 }
 
-export function isEmptyValue(value: Value, type?: RuleType) {
+export function isEmptyValue(value: Value, type?: string) {
   if (value === undefined || value === null) {
     return true;
   }