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

package/package.json

@@ -1,24 +1,27 @@
 {
   "name": "@leafer/data",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.10",
   "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",
     "url": "https://github.com/leaferjs/leafer.git"
   },
-  "homepage": "https://github.com/leaferjs/leafer/tree/main/packages/data",
+  "homepage": "https://github.com/leaferjs/leafer/tree/main/packages/display-module/data",
   "bugs": "https://github.com/leaferjs/leafer/issues",
   "keywords": [
     "leafer",
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.9"
+    "@leafer/interface": "1.0.0-rc.10"
   }
 }

package/src/LeafData.ts

@@ -1,4 +1,4 @@
-import { ILeafData, ILeaf, IObject, __Value } from '@leafer/interface'
+import { ILeafData, ILeaf, IObject, IValue } from '@leafer/interface'
 
 
 export class LeafData implements ILeafData {
@@ -12,17 +12,34 @@ export class LeafData implements ILeafData {
     public __naturalWidth?: number
     public __naturalHeight?: number
 
+    public get __blendMode(): string {
+        if ((this as ILeafData).eraser) return 'destination-out'
+        const { blendMode } = (this as ILeafData)
+        return blendMode === 'pass-through' ? null : blendMode
+    }
+
     constructor(leaf: ILeaf) {
         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 __getData(): IObject {
+        const data: IObject = { tag: this.__leaf.tag }, { __input } = this
+        let inputValue: IValue
+        for (let key in this) {
+            if (key[0] !== '_') {
+                inputValue = __input ? __input[key] : undefined
+                data[key] = (inputValue === undefined) ? this[key] : inputValue
+            }
+        }
+        return data
     }
 
     public __setInput(name: string, value: any): void {
@@ -30,13 +47,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,14 +60,15 @@ export class LeafData implements ILeafData {
     }
 
     public __getInputData(): IObject {
-        const data: IObject = {}, { __input } = this
-        let realKey: string, value: __Value
-
+        const data: IObject = { tag: this.__leaf.tag }, { __input } = this
+        let value: IValue, inputValue: IValue
         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 (key[0] !== '_') {
+                value = (this as IObject)['_' + key]
+                if (value !== undefined) {
+                    inputValue = __input ? __input[key] : undefined
+                    data[key] = (inputValue === undefined) ? value : inputValue
+                }
             }
         }
         return data
@@ -67,18 +84,20 @@ export class LeafData implements ILeafData {
     }
 
     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
+        const t = this as ILeafData
+        if (t.blendMode === 'pass-through') {
+            const leaf = this.__leaf
+            if ((t.opacity < 1 && leaf.isBranch) || leaf.__hasEraser || t.eraser) {
+                t.__single = true
+            } else if (t.__single) {
+                t.__single = false
             }
         } else {
-            this.__single = true
+            t.__single = true
         }
     }
 
     public destroy(): void {
-        this.__leaf = null
+        this.__input = this.__middle = null
     }
 }

package/src/index.ts

@@ -1,2 +1,9 @@
 export { DataHelper } from './DataHelper'
 export { LeafData } from './LeafData'
+
+export enum Answer {
+    No = 0,
+    Yes = 1,
+    NoAndSkip = 2,
+    YesAndSkip = 3
+}

package/types/index.d.ts

@@ -0,0 +1,38 @@
+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;
+    get __blendMode(): string;
+    constructor(leaf: ILeaf);
+    __get(name: string): any;
+    __getData(): IObject;
+    __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;
+}
+
+declare enum Answer {
+    No = 0,
+    Yes = 1,
+    NoAndSkip = 2,
+    YesAndSkip = 3
+}
+
+export { Answer, DataHelper, LeafData };