@leafer/decorator 1.7.0 → 1.9.0

package/package.json

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

package/src/data.ts

@@ -1,8 +1,8 @@
 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 } from './object'
+import { defineKey, getDescriptor, createDescriptor } from './object'
 
 
 // name
@@ -264,24 +264,16 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
     const computedKey = '_' + key
     const setMethodName = getSetMethodName(key)
 
-    const property: IObject & ThisType<ILeafData> = {
-        get() {
-            const v = (this as IObject)[computedKey]
-            return v === undefined ? defaultValue : v
-        },
-        set(value: IValue) {
-            (this as IObject)[computedKey] = value
-        }
-    }
+    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/index.ts

@@ -1,4 +1,4 @@
 export { defineLeafAttr, decorateLeafAttr, attr, dataType, positionType, autoLayoutType, boundsType, doBoundsType, naturalBoundsType, affectStrokeBoundsType, doStrokeType, strokeType, affectRenderBoundsType, scaleType, rotationType, surfaceType, opacityType, visibleType, sortType, maskType, eraserType, hitType, pathType, pathInputType, cursorType, dataProcessor, layoutProcessor, defineDataProcessor } from './data'
 export { useModule, rewrite, rewriteAble } from './rewrite'
-export { defineKey, getDescriptor } from './object'
+export { defineKey, getDescriptor, createDescriptor } from './object'
 export { registerUI, registerUIEvent } from './class'

package/src/object.ts

@@ -1,4 +1,5 @@
-import { IObject } from '@leafer/interface'
+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
@@ -9,6 +10,14 @@ export function getDescriptor(object: IObject, name: string) {
     return Object.getOwnPropertyDescriptor(object, name)
 }
 
+export function createDescriptor(key: string, defaultValue?: IValue) {
+    const privateKey = '_' + key
+    return {
+        get() { const v = (this as IObject)[privateKey]; return isUndefined(v) ? defaultValue : v },
+        set(value: IValue) { (this as IObject)[privateKey] = value }
+    }
+}
+
 export function getNames(object: IObject): string[] {
     return Object.getOwnPropertyNames(object)
 }

package/types/index.d.ts

@@ -35,8 +35,12 @@ declare function useModule(module: IObject, exclude?: string[]): (target: IObjec
 
 declare function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>, noConfigurable?: boolean): void;
 declare function getDescriptor(object: IObject, name: string): PropertyDescriptor;
+declare function createDescriptor(key: string, defaultValue?: IValue): {
+    get(): any;
+    set(value: IValue): void;
+};
 
 declare function registerUI(): (target: IObject) => void;
 declare function registerUIEvent(): (target: IObject) => void;
 
-export { affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, eraserType, getDescriptor, hitType, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, useModule, visibleType };
+export { affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, eraserType, getDescriptor, hitType, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, useModule, visibleType };