@leafer/data 1.0.0-beta.9 → 1.0.0-rc.2

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer/data",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.2",
   "description": "@leafer/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -19,6 +22,6 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.9"
+    "@leafer/interface": "1.0.0-rc.2"
   }
 }

package/src/LeafData.ts

@@ -16,13 +16,12 @@ export class LeafData implements ILeafData {
         this.__leaf = leaf
     }
 
-    public __get(name: string): unknown {
+    public __get(name: string): any {
         if (this.__input) {
             const value = this.__input[name]
-            return value === undefined ? (this as IObject)[name] : value
-        } else {
-            return (this as IObject)[name]
+            if (value !== undefined) return value
         }
+        return (this as IObject)[name]
     }
 
     public __setInput(name: string, value: any): void {
@@ -30,13 +29,12 @@ export class LeafData implements ILeafData {
         this.__input[name] = value
     }
 
-    public __getInput(name: string): unknown {
+    public __getInput(name: string): any {
         if (this.__input) {
             const value = this.__input[name]
-            return value === undefined ? (this as IObject)['_' + name] : value
-        } else {
-            return (this as IObject)['_' + name]
+            if (value !== undefined) return value
         }
+        return (this as IObject)['_' + name]
     }
 
     public __removeInput(name: string): void {
@@ -44,7 +42,7 @@ export class LeafData implements ILeafData {
     }
 
     public __getInputData(): IObject {
-        const data: IObject = {}, { __input } = this
+        const data: IObject = { tag: this.__leaf.tag }, { __input } = this
         let realKey: string, value: __Value
 
         for (let key in this) {
@@ -79,6 +77,6 @@ export class LeafData implements ILeafData {
     }
 
     public destroy(): void {
-        this.__leaf = null
+        this.__input = this.__middle = null
     }
 }

package/types/index.d.ts

@@ -0,0 +1,29 @@
+import { IObject, ILeafData, ILeaf } from '@leafer/interface';
+
+declare const DataHelper: {
+    default<T>(t: T, defaultData: IObject): T;
+    assign(t: IObject, merge: IObject): void;
+    copyAttrs(t: IObject, from: IObject, include: string[]): IObject;
+    clone(data: unknown): IObject;
+};
+
+declare class LeafData implements ILeafData {
+    __leaf: ILeaf;
+    __input: IObject;
+    __middle: IObject;
+    __single: boolean;
+    __naturalWidth?: number;
+    __naturalHeight?: number;
+    constructor(leaf: ILeaf);
+    __get(name: string): any;
+    __setInput(name: string, value: any): void;
+    __getInput(name: string): any;
+    __removeInput(name: string): void;
+    __getInputData(): IObject;
+    __setMiddle(name: string, value: any): void;
+    __getMiddle(name: string): any;
+    __checkSingle(): void;
+    destroy(): void;
+}
+
+export { DataHelper, LeafData };