@leafer/data 1.0.0-beta.12 → 1.0.0-beta.15

package/package.json

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

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 };

package/src/DataHelper.ts

@@ -1,37 +0,0 @@
-import { IObject } from '@leafer/interface'
-
-
-export const DataHelper = {
-
-    default<T>(t: T, defaultData: IObject): T {
-        assign(defaultData, t)
-        assign(t, defaultData)
-        return t
-    },
-
-    assign(t: IObject, merge: IObject): void {
-        let value: unknown
-        Object.keys(merge).forEach(key => {
-            value = merge[key]
-            if (value?.constructor === Object) {
-                (t[key]?.constructor === Object) ? assign(t[key], merge[key]) : t[key] = merge[key]
-            } else {
-                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))
-    }
-
-}
-
-const { assign } = DataHelper

package/src/LeafData.ts

@@ -1,84 +0,0 @@
-import { ILeafData, ILeaf, IObject, __Value } from '@leafer/interface'
-
-
-export class LeafData implements ILeafData {
-
-    public __leaf: ILeaf
-    public __input: IObject
-    public __middle: IObject
-
-    public __single: boolean
-
-    public __naturalWidth?: number
-    public __naturalHeight?: number
-
-    constructor(leaf: ILeaf) {
-        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): unknown {
-        if (this.__input) {
-            const value = this.__input[name]
-            return value === undefined ? (this as IObject)['_' + name] : value
-        } else {
-            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 {
-        this.__middle || (this.__middle = {})
-        this.__middle[name] = value
-    }
-
-    public __getMiddle(name: string): any {
-        return this.__middle && this.__middle[name]
-    }
-
-    public __checkSingle(): void {
-        if ((this as ILeafData).blendMode === 'pass-through') {
-            if (this.__leaf.__hasEraser || (this as ILeafData).isEraser) {
-                this.__single = true
-            } else if (this.__single) {
-                this.__single = false
-            }
-        } else {
-            this.__single = true
-        }
-    }
-
-    public destroy(): void {
-        this.__input = this.__middle = null
-    }
-}