@leafer/path 1.10.1 → 1.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/path",
-  "version": "1.10.1",
+  "version": "1.11.1",
   "description": "@leafer/path",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/data": "1.10.1",
-    "@leafer/math": "1.10.1",
-    "@leafer/debug": "1.10.1"
+    "@leafer/data": "1.11.1",
+    "@leafer/math": "1.11.1",
+    "@leafer/debug": "1.11.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.10.1"
+    "@leafer/interface": "1.11.1"
   }
 }

package/src/PathCommandNodeHelper.ts

@@ -0,0 +1,11 @@
+import { IPathCommandNode, IPathCommandData, IPathNodeBase } from '@leafer/interface'
+
+// 路径节点辅助(适合可视化编辑)，提供接口（需重写）
+export const PathCommandNodeHelper = {
+    toCommand(_nodes: IPathCommandNode[] | IPathNodeBase[]): IPathCommandData {
+        return []
+    },
+    toNode(_data: IPathCommandData): IPathCommandNode[] {
+        return []
+    }
+}

package/src/PathConvert.ts

@@ -1,10 +1,11 @@
-import { IPathCommandData, IPathCommandObject, IPointData } from '@leafer/interface'
+import { IPathCommandData, IPathCommandNode, IPathCommandObject, IPointData } from '@leafer/interface'
 import { MathHelper, StringNumberMap } from '@leafer/math'
 import { Debug } from '@leafer/debug'
 
 import { PathCommandMap as Command, NeedConvertToCanvasCommandMap, NeedConvertToCurveCommandMap, PathCommandLengthMap, PathNumberCommandMap, PathNumberCommandLengthMap } from './PathCommandMap'
 import { BezierHelper } from './BezierHelper'
 import { EllipseHelper } from './EllipseHelper'
+import { PathCommandNodeHelper } from './PathCommandNodeHelper'
 
 
 interface ICurrentCommand {
@@ -303,18 +304,22 @@ export const PathConvert = {
 
     },
 
-    objectToCanvasData(list: IPathCommandObject[]): IPathCommandData {
-        const data: IPathCommandData = []
-        list.forEach(item => {
-            switch (item.name) {
-                case 'M': data.push(M, item.x, item.y); break
-                case 'L': data.push(L, item.x, item.y); break
-                case 'C': data.push(C, item.x1, item.y1, item.x2, item.y2, item.x, item.y); break
-                case 'Q': data.push(Q, item.x1, item.y1, item.x, item.y); break
-                case 'Z': data.push(Z)
-            }
-        })
-        return data
+    objectToCanvasData(list: IPathCommandNode[] | IPathCommandObject[]): IPathCommandData {
+        if (list[0].name.length > 1) { // nodes
+            return PathCommandNodeHelper.toCommand(list as IPathCommandNode[])
+        } else {
+            const data: IPathCommandData = []
+            list.forEach(item => {
+                switch (item.name) {
+                    case 'M': data.push(M, item.x, item.y); break
+                    case 'L': data.push(L, item.x, item.y); break
+                    case 'C': data.push(C, item.x1, item.y1, item.x2, item.y2, item.x, item.y); break
+                    case 'Q': data.push(Q, item.x1, item.y1, item.x, item.y); break
+                    case 'Z': data.push(Z)
+                }
+            })
+            return data
+        }
     },
 
     copyData(data: IPathCommandData, old: IPathCommandData, index: number, count: number): void {

package/src/index.ts

@@ -2,6 +2,7 @@ export { PathHelper } from './PathHelper'
 export { PathConvert } from './PathConvert'
 export { PathCreator } from './PathCreator'
 export { PathCommandDataHelper } from './PathCommandDataHelper'
+export { PathCommandNodeHelper } from './PathCommandNodeHelper'
 export { PathDrawer } from './PathDrawer'
 export { PathBounds } from './PathBounds'
 export { PathCorner } from './PathCorner'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IPathCreator, IPathCommandData, IPathCommandObject, IPathString, IPointData, IPathDrawer, IBoundsData, ITwoPointBoundsData, INumberMap, IStringMap } from '@leafer/interface';
+import { IPathCreator, IPathCommandData, IPathCommandNode, IPathCommandObject, IPathString, IPointData, IPathNodeBase, IPathDrawer, IBoundsData, ITwoPointBoundsData, INumberMap, IStringMap } from '@leafer/interface';
 
 declare const PathHelper: {
     creator: IPathCreator;
@@ -17,7 +17,7 @@ declare const PathConvert: {
     stringify(data: IPathCommandData, floatLength?: number): string;
     parse(pathString: string, curveMode?: boolean): IPathCommandData;
     toCanvasData(old: IPathCommandData, curveMode?: boolean): IPathCommandData;
-    objectToCanvasData(list: IPathCommandObject[]): IPathCommandData;
+    objectToCanvasData(list: IPathCommandNode[] | IPathCommandObject[]): IPathCommandData;
     copyData(data: IPathCommandData, old: IPathCommandData, index: number, count: number): void;
     pushData(data: IPathCommandData, strNum: string | number): void;
 };
@@ -63,6 +63,11 @@ declare const PathCommandDataHelper: {
     drawPoints(data: IPathCommandData, points: number[] | IPointData[], curve?: boolean | number, close?: boolean): void;
 };
 
+declare const PathCommandNodeHelper: {
+    toCommand(_nodes: IPathCommandNode[] | IPathNodeBase[]): IPathCommandData;
+    toNode(_data: IPathCommandData): IPathCommandNode[];
+};
+
 declare const PathDrawer: {
     drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
 };
@@ -107,4 +112,4 @@ declare const PathNumberCommandLengthMap: INumberMap;
 declare function path(path?: IPathCommandData | IPathString): PathCreator;
 declare const pen: PathCreator;
 
-export { BezierHelper, EllipseHelper, NeedConvertToCanvasCommandMap, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, RectHelper, path, pen };
+export { BezierHelper, EllipseHelper, NeedConvertToCanvasCommandMap, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, RectHelper, path, pen };