@leafer/data 1.0.0-alpha.9 → 1.0.0-bate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/data",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-bate",
   "description": "@leafer/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,6 +19,6 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-alpha.9"
+    "@leafer/interface": "1.0.0-bate"
   }
 }

package/src/DataHelper.ts

@@ -3,24 +3,31 @@ import { IObject } from '@leafer/interface'
 
 export const DataHelper = {
 
-    default<T>(data: T, defaultData: IObject): T {
-        assign(defaultData, data)
-        assign(data, defaultData)
-        return data
+    default<T>(t: T, defaultData: IObject): T {
+        assign(defaultData, t)
+        assign(t, defaultData)
+        return t
     },
 
-    assign(data: IObject, merge: IObject): void {
+    assign(t: IObject, merge: IObject): void {
         let value: unknown
         Object.keys(merge).forEach(key => {
             value = merge[key]
             if (value?.constructor === Object) {
-                (data[key]?.constructor === Object) ? assign(data[key], merge[key]) : data[key] = merge[key]
+                (t[key]?.constructor === Object) ? assign(t[key], merge[key]) : t[key] = merge[key]
             } else {
-                data[key] = merge[key]
+                t[key] = merge[key]
             }
         })
     },
 
+    copyAttrs(t: IObject, from: IObject, include: string[]): IObject {
+        include.forEach(key => {
+            if (from[key] !== undefined) t[key] = from[key]
+        })
+        return t
+    },
+
     clone(data: unknown): IObject {
         return JSON.parse(JSON.stringify(data))
     }

package/src/LeafData.ts

@@ -1,4 +1,4 @@
-import { ILeafData, ILeaf, IObject } from '@leafer/interface'
+import { ILeafData, ILeaf, IObject, __Value } from '@leafer/interface'
 
 
 export class LeafData implements ILeafData {
@@ -11,18 +11,45 @@ export class LeafData implements ILeafData {
         this.__leaf = leaf
     }
 
+    public __get(name: string): unknown {
+        if (this.__input) {
+            const value = this.__input[name]
+            return value === undefined ? (this as IObject)[name] : value
+        } else {
+            return (this as IObject)[name]
+        }
+    }
+
     public __setInput(name: string, value: any): void {
         this.__input || (this.__input = {})
         this.__input[name] = value
     }
 
-    public __getInput(name: string): any {
+    public __getInput(name: string): unknown {
         if (this.__input) {
             const value = this.__input[name]
-            return value === undefined ? (this as IObject)[name] : value
+            return value === undefined ? (this as IObject)['_' + name] : value
         } else {
-            return (this as IObject)[name]
+            return (this as IObject)['_' + name]
+        }
+    }
+
+    public __removeInput(name: string): void {
+        if (this.__input && this.__input[name] !== undefined) this.__input[name] = undefined
+    }
+
+    public __getInputData(): IObject {
+        const data: IObject = {}, { __input } = this
+        let realKey: string, value: __Value
+
+        for (let key in this) {
+            realKey = key.substring(1)
+            if ((this as any)[realKey] !== undefined) {
+                value = __input ? __input[realKey] : undefined
+                data[realKey] = value === undefined ? this[key] : value
+            }
         }
+        return data
     }
 
     public __setMiddle(name: string, value: any): void {
@@ -35,6 +62,6 @@ export class LeafData implements ILeafData {
     }
 
     public destroy(): void {
-        this.__leaf = undefined
+        this.__leaf = null
     }
 }