From 3214b1dd80d094bcf8c197d8c5ac72d58b0d740d Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 8 Apr 2021 10:08:03 +0800
Subject: [PATCH] chore: remove isNaN util, re-organize validate utils (#8473)

---
 src/address-edit/AddressEdit.tsx       |  8 +++--
 src/address-edit/AddressEditDetail.tsx |  3 +-
 src/badge/Badge.tsx                    |  3 +-
 src/calendar/Calendar.tsx              |  3 +-
 src/contact-edit/ContactEdit.tsx       |  3 +-
 src/datetime-picker/DatePicker.tsx     |  2 +-
 src/datetime-picker/utils.ts           |  3 +-
 src/stepper/Stepper.tsx                |  3 +-
 src/utils/base.ts                      | 19 +----------
 src/utils/create/translate.ts          |  3 +-
 src/utils/deep-assign.ts               |  2 +-
 src/utils/deep-clone.ts                |  2 +-
 src/utils/dom/scroll.ts                |  2 +-
 src/utils/format/unit.ts               |  4 +--
 src/utils/index.ts                     |  1 +
 src/utils/test/index.spec.ts           |  6 ++--
 src/utils/validate.ts                  | 46 ++++++++++++++++++++++++++
 src/utils/validate/date.ts             |  8 -----
 src/utils/validate/mobile.ts           |  6 ----
 src/utils/validate/number.ts           | 12 -------
 src/utils/validate/system.ts           | 11 ------
 21 files changed, 70 insertions(+), 80 deletions(-)
 create mode 100644 src/utils/validate.ts
 delete mode 100644 src/utils/validate/date.ts
 delete mode 100644 src/utils/validate/mobile.ts
 delete mode 100644 src/utils/validate/number.ts
 delete mode 100644 src/utils/validate/system.ts

diff --git a/src/address-edit/AddressEdit.tsx b/src/address-edit/AddressEdit.tsx
index 75f4acf34..3a45dcfba 100644
--- a/src/address-edit/AddressEdit.tsx
+++ b/src/address-edit/AddressEdit.tsx
@@ -9,8 +9,12 @@ import {
 } from 'vue';
 
 // Utils
-import { ComponentInstance, createNamespace, isObject } from '../utils';
-import { isMobile } from '../utils/validate/mobile';
+import {
+  isObject,
+  isMobile,
+  createNamespace,
+  ComponentInstance,
+} from '../utils';
 
 // Composables
 import { useExpose } from '../composables/use-expose';
diff --git a/src/address-edit/AddressEditDetail.tsx b/src/address-edit/AddressEditDetail.tsx
index a936d5816..113794afc 100644
--- a/src/address-edit/AddressEditDetail.tsx
+++ b/src/address-edit/AddressEditDetail.tsx
@@ -1,8 +1,7 @@
 import { PropType, ref, defineComponent } from 'vue';
 
 // Utils
-import { ComponentInstance, createNamespace } from '../utils';
-import { isAndroid } from '../utils/validate/system';
+import { isAndroid, ComponentInstance, createNamespace } from '../utils';
 
 // Components
 import { Cell } from '../cell';
diff --git a/src/badge/Badge.tsx b/src/badge/Badge.tsx
index 9550e257b..edee180de 100644
--- a/src/badge/Badge.tsx
+++ b/src/badge/Badge.tsx
@@ -1,6 +1,5 @@
 import { PropType, CSSProperties, defineComponent } from 'vue';
-import { isDef, createNamespace } from '../utils';
-import { isNumeric } from '../utils/validate/number';
+import { isDef, isNumeric, createNamespace } from '../utils';
 
 const [name, bem] = createNamespace('badge');
 
diff --git a/src/calendar/Calendar.tsx b/src/calendar/Calendar.tsx
index 407b7cda6..00bd5859c 100644
--- a/src/calendar/Calendar.tsx
+++ b/src/calendar/Calendar.tsx
@@ -9,8 +9,7 @@ import {
 } from 'vue';
 
 // Utils
-import { pick, getScrollTop, ComponentInstance } from '../utils';
-import { isDate } from '../utils/validate/date';
+import { pick, isDate, getScrollTop, ComponentInstance } from '../utils';
 import {
   t,
   bem,
diff --git a/src/contact-edit/ContactEdit.tsx b/src/contact-edit/ContactEdit.tsx
index e12f92ed6..1cb4e953f 100644
--- a/src/contact-edit/ContactEdit.tsx
+++ b/src/contact-edit/ContactEdit.tsx
@@ -1,8 +1,7 @@
 import { watch, reactive, PropType, defineComponent } from 'vue';
 
 // Utils
-import { createNamespace } from '../utils';
-import { isMobile } from '../utils/validate/mobile';
+import { isMobile, createNamespace } from '../utils';
 
 // Components
 import { Cell } from '../cell';
diff --git a/src/datetime-picker/DatePicker.tsx b/src/datetime-picker/DatePicker.tsx
index 318066c6b..6bbc89e61 100644
--- a/src/datetime-picker/DatePicker.tsx
+++ b/src/datetime-picker/DatePicker.tsx
@@ -9,10 +9,10 @@ import {
 } from 'vue';
 
 // Utils
-import { isDate } from '../utils/validate/date';
 import {
   pick,
   range,
+  isDate,
   padZero,
   createNamespace,
   ComponentInstance,
diff --git a/src/datetime-picker/utils.ts b/src/datetime-picker/utils.ts
index bda7efa1c..4f5408da9 100644
--- a/src/datetime-picker/utils.ts
+++ b/src/datetime-picker/utils.ts
@@ -1,5 +1,4 @@
 import { PropType } from 'vue';
-import { isNaN } from '../utils/validate/number';
 import { pickerProps } from '../picker/Picker';
 
 export type ColumnType = 'year' | 'month' | 'day' | 'hour' | 'minute';
@@ -42,7 +41,7 @@ export function getTrueValue(value: string | undefined): number {
     return 0;
   }
 
-  while (isNaN(parseInt(value, 10))) {
+  while (Number.isNaN(parseInt(value, 10))) {
     if (value.length > 1) {
       value = value.slice(1);
     } else {
diff --git a/src/stepper/Stepper.tsx b/src/stepper/Stepper.tsx
index 5910a9f50..110553f9b 100644
--- a/src/stepper/Stepper.tsx
+++ b/src/stepper/Stepper.tsx
@@ -1,7 +1,6 @@
 import { ref, watch, computed, PropType, defineComponent } from 'vue';
 
 // Utils
-import { isNaN } from '../utils/validate/number';
 import {
   isDef,
   addUnit,
@@ -106,7 +105,7 @@ export default defineComponent({
 
       value = formatNumber(String(value), !props.integer);
       value = value === '' ? 0 : +value;
-      value = isNaN(value) ? +min : value;
+      value = Number.isNaN(value) ? +min : value;
       value = Math.max(Math.min(+max, value), +min);
 
       // format decimal
diff --git a/src/utils/base.ts b/src/utils/base.ts
index f9877c4ad..9c343083f 100644
--- a/src/utils/base.ts
+++ b/src/utils/base.ts
@@ -10,23 +10,6 @@ export const UnknownProp = (null as unknown) as PropType<unknown>;
 // eslint-disable-next-line
 export type ComponentInstance = ComponentPublicInstance<{}, any>;
 
-export function isDef<T>(val: T): val is NonNullable<T> {
-  return val !== undefined && val !== null;
-}
-
-// eslint-disable-next-line @typescript-eslint/ban-types
-export function isFunction(val: unknown): val is Function {
-  return typeof val === 'function';
-}
-
-export function isObject(val: unknown): val is Record<any, any> {
-  return val !== null && typeof val === 'object';
-}
-
-export function isPromise<T = any>(val: unknown): val is Promise<T> {
-  return isObject(val) && isFunction(val.then) && isFunction(val.catch);
-}
-
 export function get(object: any, path: string): any {
   const keys = path.split('.');
   let result = object;
@@ -38,7 +21,7 @@ export function get(object: any, path: string): any {
   return result;
 }
 
-type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 
 export function pick<T, U extends keyof T>(
   obj: T,
diff --git a/src/utils/create/translate.ts b/src/utils/create/translate.ts
index 0c70d1c35..264e065bd 100644
--- a/src/utils/create/translate.ts
+++ b/src/utils/create/translate.ts
@@ -1,5 +1,6 @@
-import { get, isFunction } from '../base';
+import { get } from '../base';
 import { camelize } from '../format/string';
+import { isFunction } from '../validate';
 import locale from '../../locale';
 
 export function createTranslate(name: string) {
diff --git a/src/utils/deep-assign.ts b/src/utils/deep-assign.ts
index f2c5b1ff4..30be7439d 100644
--- a/src/utils/deep-assign.ts
+++ b/src/utils/deep-assign.ts
@@ -1,4 +1,4 @@
-import { isDef, isObject } from './base';
+import { isDef, isObject } from './validate';
 
 type ObjectIndex = Record<string, any>;
 
diff --git a/src/utils/deep-clone.ts b/src/utils/deep-clone.ts
index f5cdff87d..6849d0c4f 100644
--- a/src/utils/deep-clone.ts
+++ b/src/utils/deep-clone.ts
@@ -1,4 +1,4 @@
-import { isDef } from './base';
+import { isDef } from './validate';
 
 export function deepClone<T extends Record<string, any> | null | undefined>(
   obj: T
diff --git a/src/utils/dom/scroll.ts b/src/utils/dom/scroll.ts
index 3d2cf6312..2c2856d7c 100644
--- a/src/utils/dom/scroll.ts
+++ b/src/utils/dom/scroll.ts
@@ -1,4 +1,4 @@
-import { isIOS as checkIsIOS } from '../validate/system';
+import { isIOS as checkIsIOS } from '../validate';
 
 export type ScrollElement = Element | Window;
 
diff --git a/src/utils/format/unit.ts b/src/utils/format/unit.ts
index 3444a527b..36fabc2db 100644
--- a/src/utils/format/unit.ts
+++ b/src/utils/format/unit.ts
@@ -1,6 +1,6 @@
 import { CSSProperties } from 'vue';
-import { isDef, inBrowser } from '../base';
-import { isNumeric } from '../validate/number';
+import { inBrowser } from '../base';
+import { isDef, isNumeric } from '../validate';
 
 export function addUnit(value?: string | number): string | undefined {
   if (!isDef(value)) {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2cb1391df..d7f30f7cd 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,5 +1,6 @@
 export * from './base';
 export * from './create';
+export * from './validate';
 export * from './with-install';
 export * from './format/unit';
 export * from './format/number';
diff --git a/src/utils/test/index.spec.ts b/src/utils/test/index.spec.ts
index 656a2b489..365078aec 100644
--- a/src/utils/test/index.spec.ts
+++ b/src/utils/test/index.spec.ts
@@ -1,9 +1,7 @@
 import { deepClone } from '../deep-clone';
 import { deepAssign } from '../deep-assign';
-import { isDef, get, noop } from '..';
-import { isMobile } from '../validate/mobile';
-import { isNumeric } from '../validate/number';
-import { isAndroid } from '../validate/system';
+import { get, noop } from '..';
+import { isDef, isMobile, isNumeric, isAndroid } from '../validate';
 import { camelize } from '../format/string';
 import { formatNumber } from '../format/number';
 import { addUnit, unitToPx } from '../format/unit';
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
new file mode 100644
index 000000000..7f35a3c54
--- /dev/null
+++ b/src/utils/validate.ts
@@ -0,0 +1,46 @@
+import { inBrowser } from './base';
+
+export function isDef<T>(val: T): val is NonNullable<T> {
+  return val !== undefined && val !== null;
+}
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function isFunction(val: unknown): val is Function {
+  return typeof val === 'function';
+}
+
+export function isObject(val: unknown): val is Record<any, any> {
+  return val !== null && typeof val === 'object';
+}
+
+export function isPromise<T = any>(val: unknown): val is Promise<T> {
+  return isObject(val) && isFunction(val.then) && isFunction(val.catch);
+}
+
+export function isDate(val: unknown): val is Date {
+  return (
+    Object.prototype.toString.call(val) === '[object Date]' &&
+    !Number.isNaN((val as Date).getTime())
+  );
+}
+
+export function isMobile(value: string): boolean {
+  value = value.replace(/[^-|\d]/g, '');
+  return (
+    /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9-]{10,13}$/.test(value)
+  );
+}
+
+export function isNumeric(val: string | number): val is string {
+  return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
+}
+
+export function isAndroid(): boolean {
+  return inBrowser ? /android/.test(navigator.userAgent.toLowerCase()) : false;
+}
+
+export function isIOS(): boolean {
+  return inBrowser
+    ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase())
+    : false;
+}
diff --git a/src/utils/validate/date.ts b/src/utils/validate/date.ts
deleted file mode 100644
index d62b3c9c3..000000000
--- a/src/utils/validate/date.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { isNaN } from './number';
-
-export function isDate(val: unknown): val is Date {
-  return (
-    Object.prototype.toString.call(val) === '[object Date]' &&
-    !isNaN((val as Date).getTime())
-  );
-}
diff --git a/src/utils/validate/mobile.ts b/src/utils/validate/mobile.ts
deleted file mode 100644
index b32401981..000000000
--- a/src/utils/validate/mobile.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export function isMobile(value: string): boolean {
-  value = value.replace(/[^-|\d]/g, '');
-  return (
-    /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9-]{10,13}$/.test(value)
-  );
-}
diff --git a/src/utils/validate/number.ts b/src/utils/validate/number.ts
deleted file mode 100644
index c6efcf5e9..000000000
--- a/src/utils/validate/number.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export function isNumeric(val: string | number): val is string {
-  return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
-}
-
-export function isNaN(val: number): val is typeof NaN {
-  if (Number.isNaN) {
-    return Number.isNaN(val);
-  }
-
-  // eslint-disable-next-line no-self-compare
-  return val !== val;
-}
diff --git a/src/utils/validate/system.ts b/src/utils/validate/system.ts
deleted file mode 100644
index 1667621b1..000000000
--- a/src/utils/validate/system.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { inBrowser } from '../base';
-
-export function isAndroid(): boolean {
-  return inBrowser ? /android/.test(navigator.userAgent.toLowerCase()) : false;
-}
-
-export function isIOS(): boolean {
-  return inBrowser
-    ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase())
-    : false;
-}