@leafer/data 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/LeafData.ts

@@ -1,4 +1,4 @@
-import { ILeafData, ILeaf, IObject, __Value } from '@leafer/interface'
+import { ILeafData, ILeafDataOptions, ILeaf, IObject, __Value } from '@leafer/interface'
 
 
 export class LeafData implements ILeafData {
@@ -41,15 +41,20 @@ export class LeafData implements ILeafData {
         if (this.__input && this.__input[name] !== undefined) this.__input[name] = undefined
     }
 
-    public __getInputData(): IObject {
+    public __getInputData(options?: ILeafDataOptions): IObject {
         const data: IObject = { tag: this.__leaf.tag }, { __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
+        if (options) {
+            for (let key in this) {
+                if (key[0] !== '_') data[key] = this[key]
+            }
+        } else {
+            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

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IObject, ILeafData, ILeaf } from '@leafer/interface';
+import { IObject, ILeafData, ILeaf, ILeafDataOptions } from '@leafer/interface';
 
 declare const DataHelper: {
     default<T>(t: T, defaultData: IObject): T;
@@ -19,7 +19,7 @@ declare class LeafData implements ILeafData {
     __setInput(name: string, value: any): void;
     __getInput(name: string): any;
     __removeInput(name: string): void;
-    __getInputData(): IObject;
+    __getInputData(options?: ILeafDataOptions): IObject;
     __setMiddle(name: string, value: any): void;
     __getMiddle(name: string): any;
     __checkSingle(): void;