@leafer/data 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/data",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "@leafer/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.7.0"
+    "@leafer/interface": "1.9.0"
   }
 }

package/src/DataHelper.ts

@@ -1,5 +1,5 @@
 import { IBooleanMap, IObject } from '@leafer/interface'
-
+import { isUndefined } from './data'
 
 export const DataHelper = {
 
@@ -24,7 +24,7 @@ export const DataHelper = {
 
     copyAttrs(t: IObject, from: IObject, include: string[]): IObject {
         include.forEach(key => {
-            if (from[key] !== undefined) t[key] = from[key]
+            if (!isUndefined(from[key])) t[key] = from[key]
         })
         return t
     },

package/src/LeafData.ts

@@ -1,4 +1,5 @@
 import { ILeafData, ILeaf, IObject, IValue, IPathCommandData, IJSONOptions } from '@leafer/interface'
+import { isArray, isUndefined } from './data'
 
 
 export class LeafData implements ILeafData {
@@ -35,7 +36,7 @@ export class LeafData implements ILeafData {
     public __get(name: string): any {
         if (this.__input) {
             const value = this.__input[name]
-            if (value !== undefined) return value
+            if (!isUndefined(value)) return value
         }
         return (this as IObject)[name]
     }
@@ -46,7 +47,7 @@ export class LeafData implements ILeafData {
         for (let key in this) {
             if (key[0] !== '_') {
                 inputValue = __input ? __input[key] : undefined
-                data[key] = (inputValue === undefined) ? this[key] : inputValue
+                data[key] = isUndefined(inputValue) ? this[key] : inputValue
             }
         }
         return data
@@ -60,7 +61,7 @@ export class LeafData implements ILeafData {
     public __getInput(name: string): any {
         if (this.__input) {
             const value = this.__input[name]
-            if (value !== undefined) return value
+            if (!isUndefined(value)) return value
         }
 
         if (name === 'path' && !(this as ILeafData).__pathInputed) return // no path mode
@@ -69,7 +70,7 @@ export class LeafData implements ILeafData {
     }
 
     public __removeInput(name: string): void {
-        if (this.__input && this.__input[name] !== undefined) this.__input[name] = undefined
+        if (this.__input && !isUndefined(this.__input[name])) this.__input[name] = undefined
     }
 
     public __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject {
@@ -77,7 +78,7 @@ export class LeafData implements ILeafData {
 
         if (names) {
 
-            if (names instanceof Array) {
+            if (isArray(names)) {
                 for (let name of names) data[name] = this.__getInput(name)
             } else {
                 for (let name in names) data[name] = this.__getInput(name)
@@ -90,12 +91,12 @@ export class LeafData implements ILeafData {
             for (let key in this) {
                 if (key[0] !== '_') {
                     value = (this as IObject)['_' + key]
-                    if (value !== undefined) {
+                    if (!isUndefined(value)) {
 
                         if (key === 'path' && !(this as ILeafData).__pathInputed) continue // no path mode
 
                         inputValue = __input ? __input[key] : undefined
-                        data[key] = (inputValue === undefined) ? value : inputValue
+                        data[key] = isUndefined(inputValue) ? value : inputValue
                     }
                 }
             }

package/src/data.ts

@@ -0,0 +1,48 @@
+import { IObject } from '@leafer/interface'
+
+export enum Answer {
+    No = 0,
+    Yes = 1,
+    NoAndSkip = 2,
+    YesAndSkip = 3
+}
+
+export const emptyData: IObject = {}
+
+export function isUndefined(value: any): boolean {
+    return value === undefined
+}
+
+export function isNull(value: any): boolean {
+    return value === undefined || value === null
+}
+
+export function isString<T extends string>(value: any): value is T {
+    return typeof value === 'string'
+}
+
+export const { isFinite } = Number
+
+export function isNumber<T extends number>(value: any): value is T {
+    return typeof value === 'number'
+}
+
+const numberReg = /^-?\d+(?:\.\d+)?$/
+
+export function tryToNumber(value: any): number {
+    return (typeof value === 'string' && numberReg.test(value)) ? +value : value
+}
+
+export const { isArray } = Array
+
+export function isObject<T extends object>(value: any): value is T {
+    return value && typeof value === 'object' // fix: null is object
+}
+
+export function isData<T extends object>(value: any): value is T { // 检测 {} 对象
+    return isObject(value) && !isArray(value) // 排除数组
+}
+
+export function isEmptyData(value: any): boolean {
+    return JSON.stringify(value) === '{}'
+}

package/src/index.ts

@@ -1,21 +1,3 @@
-import { IObject } from '@leafer/interface'
-
 export { DataHelper } from './DataHelper'
 export { LeafData } from './LeafData'
-
-export enum Answer {
-    No = 0,
-    Yes = 1,
-    NoAndSkip = 2,
-    YesAndSkip = 3
-}
-
-export const emptyData: IObject = {}
-
-export function isNull(value: any): boolean {
-    return value === undefined || value === null
-}
-
-export function isEmptyData(value: any): boolean {
-    return JSON.stringify(value) === '{}'
-}
+export { Answer, emptyData, isUndefined, isNull, isString, isFinite, isNumber, isArray, isObject, isData, isEmptyData, tryToNumber } from './data'

package/types/index.d.ts

@@ -42,7 +42,15 @@ declare enum Answer {
     YesAndSkip = 3
 }
 declare const emptyData: IObject;
+declare function isUndefined(value: any): boolean;
 declare function isNull(value: any): boolean;
+declare function isString<T extends string>(value: any): value is T;
+declare const isFinite: (number: unknown) => boolean;
+declare function isNumber<T extends number>(value: any): value is T;
+declare function tryToNumber(value: any): number;
+declare const isArray: (arg: any) => arg is any[];
+declare function isObject<T extends object>(value: any): value is T;
+declare function isData<T extends object>(value: any): value is T;
 declare function isEmptyData(value: any): boolean;
 
-export { Answer, DataHelper, LeafData, emptyData, isEmptyData, isNull };
+export { Answer, DataHelper, LeafData, emptyData, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, tryToNumber };