@leafer/decorator 1.8.0 → 1.9.0

package/package.json

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

package/src/data.ts

@@ -1,5 +1,5 @@
 import { ILeafData, ILeaf, IObject, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn, IValueFunction } from '@leafer/interface'
-import { DataHelper, isEmptyData } from '@leafer/data'
+import { DataHelper, isEmptyData, isObject, isUndefined } from '@leafer/data'
 import { Debug } from '@leafer/debug'
 
 import { defineKey, getDescriptor, createDescriptor } from './object'
@@ -266,14 +266,14 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
 
     const property: IObject & ThisType<ILeafData> = createDescriptor(key, defaultValue)
 
-    if (defaultValue === undefined) {
+    if (isUndefined(defaultValue)) {
         property.get = function () { return this[computedKey] }
     } else if (typeof defaultValue === 'function') {
         property.get = function () {
             let v = this[computedKey]
             return v === undefined ? defaultValue((this as ILeafData).__leaf) : v
         }
-    } else if (typeof defaultValue === 'object') {
+    } else if (isObject(defaultValue)) {
         const isEmpty = isEmptyData(defaultValue)
         property.get = function () {
             let v = this[computedKey]

package/src/object.ts

@@ -1,4 +1,5 @@
 import { IObject, IValue } from '@leafer/interface'
+import { isUndefined } from '@leafer/data'
 
 export function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>, noConfigurable?: boolean): void {
     if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true
@@ -12,7 +13,7 @@ export function getDescriptor(object: IObject, name: string) {
 export function createDescriptor(key: string, defaultValue?: IValue) {
     const privateKey = '_' + key
     return {
-        get() { const v = (this as IObject)[privateKey]; return v === undefined ? defaultValue : v },
+        get() { const v = (this as IObject)[privateKey]; return isUndefined(v) ? defaultValue : v },
         set(value: IValue) { (this as IObject)[privateKey] = value }
     }
 }