@leafer/data 1.0.0-rc.2 → 1.0.0-rc.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/data",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.20",
   "description": "@leafer/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,13 +15,13 @@
     "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-rc.2"
+    "@leafer/interface": "1.0.0-rc.20"
   }
 }

package/src/LeafData.ts

@@ -1,4 +1,4 @@
-import { ILeafData, ILeaf, IObject, __Value } from '@leafer/interface'
+import { ILeafData, ILeaf, IObject, IValue, IPathCommandData } from '@leafer/interface'
 
 
 export class LeafData implements ILeafData {
@@ -12,6 +12,15 @@ export class LeafData implements ILeafData {
     public __naturalWidth?: number
     public __naturalHeight?: number
 
+    public __pathInputed?: number
+    public __pathForRender?: IPathCommandData
+
+    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
     }
@@ -24,6 +33,18 @@ export class LeafData implements ILeafData {
         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 {
         this.__input || (this.__input = {})
         this.__input[name] = value
@@ -34,6 +55,9 @@ export class LeafData implements ILeafData {
             const value = this.__input[name]
             if (value !== undefined) return value
         }
+
+        if (name === 'path' && !this.__pathInputed) return // no path mode
+
         return (this as IObject)['_' + name]
     }
 
@@ -41,17 +65,36 @@ export class LeafData implements ILeafData {
         if (this.__input && this.__input[name] !== undefined) this.__input[name] = undefined
     }
 
-    public __getInputData(): IObject {
-        const data: IObject = { tag: this.__leaf.tag }, { __input } = this
-        let realKey: string, value: __Value
+    public __getInputData(names?: string[] | IObject): IObject {
+        const data: IObject = {}
 
-        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 (names) {
+
+            if (names instanceof Array) {
+                for (let name of names) data[name] = this.__getInput(name)
+            } else {
+                for (let name in names) data[name] = this.__getInput(name)
+            }
+
+        } else {
+
+            let value: IValue, inputValue: IValue, { __input } = this
+            data.tag = this.__leaf.tag
+            for (let key in this) {
+                if (key[0] !== '_') {
+                    value = (this as IObject)['_' + key]
+                    if (value !== undefined) {
+
+                        if (key === 'path' && !this.__pathInputed) continue // no path mode
+
+                        inputValue = __input ? __input[key] : undefined
+                        data[key] = (inputValue === undefined) ? value : inputValue
+                    }
+                }
             }
+
         }
+
         return data
     }
 
@@ -65,17 +108,23 @@ 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 __removeNaturalSize(): void {
+        this.__naturalWidth = this.__naturalHeight = undefined
+    }
+
     public destroy(): void {
         this.__input = this.__middle = null
     }

package/src/index.ts

@@ -1,2 +1,13 @@
+import { IObject } from '@leafer/interface'
+
 export { DataHelper } from './DataHelper'
 export { LeafData } from './LeafData'
+
+export enum Answer {
+    No = 0,
+    Yes = 1,
+    NoAndSkip = 2,
+    YesAndSkip = 3
+}
+
+export const emptyData: IObject = {}

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IObject, ILeafData, ILeaf } from '@leafer/interface';
+import { IObject, ILeafData, ILeaf, IPathCommandData } from '@leafer/interface';
 
 declare const DataHelper: {
     default<T>(t: T, defaultData: IObject): T;
@@ -14,16 +14,29 @@ declare class LeafData implements ILeafData {
     __single: boolean;
     __naturalWidth?: number;
     __naturalHeight?: number;
+    __pathInputed?: number;
+    __pathForRender?: IPathCommandData;
+    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;
+    __getInputData(names?: string[] | IObject): IObject;
     __setMiddle(name: string, value: any): void;
     __getMiddle(name: string): any;
     __checkSingle(): void;
+    __removeNaturalSize(): void;
     destroy(): void;
 }
 
-export { DataHelper, LeafData };
+declare enum Answer {
+    No = 0,
+    Yes = 1,
+    NoAndSkip = 2,
+    YesAndSkip = 3
+}
+declare const emptyData: IObject;
+
+export { Answer, DataHelper, LeafData, emptyData };