@leafer/decorator 1.4.2 → 1.5.0

package/package.json

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

package/src/data.ts

@@ -1,5 +1,4 @@
-import { ILeafData, ILeaf, IObject, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from '@leafer/interface'
-import { DataHelper } from '@leafer/data'
+import { ILeafData, ILeaf, IObject, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn, IValueFunction } from '@leafer/interface'
 import { Debug } from '@leafer/debug'
 
 import { defineKey, getDescriptor } from './object'
@@ -255,7 +254,7 @@ function getSetMethodName(key: string): string {
 
 
 // define leaf.__[key] getter/setter
-export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: IValue): void {
+export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: IValue | IValueFunction): void {
 
     const data = target.__DataProcessor.prototype
     const computedKey = '_' + key
@@ -273,11 +272,10 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
 
     if (defaultValue === undefined) {
         property.get = function () { return this[computedKey] }
-    } else if (typeof defaultValue === 'object') {
-        const { clone } = DataHelper
+    } else if (typeof defaultValue === 'function') {
         property.get = function () {
             let v = this[computedKey]
-            if (v === undefined) this[computedKey] = v = clone(defaultValue)
+            if (v === undefined) this[computedKey] = v = defaultValue((this as ILeafData).__leaf)
             return v
         }
     }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn, IObject, IFunction } from '@leafer/interface';
+import { ILeaf, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn, IObject, IValueFunction, IFunction } from '@leafer/interface';
 
 declare function decorateLeafAttr(defaultValue?: IValue, descriptorFn?: ILeafAttrDescriptorFn): (target: ILeaf, key: string) => void;
 declare function attr(partDescriptor?: ILeafAttrDescriptor): ILeafAttrDescriptor;
@@ -27,7 +27,7 @@ declare function hitType(defaultValue?: IValue): (target: ILeaf, key: string) =>
 declare function cursorType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function dataProcessor(processor: IObject): (target: IObject, _key?: string) => void;
 declare function layoutProcessor(processor: IObject): (target: IObject, _key?: string) => void;
-declare function defineDataProcessor(target: ILeaf, key: string, defaultValue?: IValue): void;
+declare function defineDataProcessor(target: ILeaf, key: string, defaultValue?: IValue | IValueFunction): void;
 
 declare function rewrite(method: IFunction): (target: IObject, key: string) => void;
 declare function rewriteAble(): (_target: IObject) => void;