@leafer/path 1.0.0-rc.11 → 1.0.0-rc.16

package/package.json

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

package/src/PathCommandDataHelper.ts

@@ -88,18 +88,13 @@ export const PathCommandDataHelper = {
     // new
 
     drawEllipse(data: IPathCommandData, x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void {
-        if (rotation === undefined) rotation = 0
-        if (startAngle === undefined) startAngle = 0
-        if (endAngle === undefined) endAngle = 360
-        BezierHelper.ellipse(null, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise, null, null, startPoint)
+        BezierHelper.ellipse(null, x, y, radiusX, radiusY, rotation === undefined ? 0 : rotation, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint)
         data.push(M, startPoint.x, startPoint.y)
         ellipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise)
     },
 
     drawArc(data: IPathCommandData, x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void {
-        if (startAngle === undefined) startAngle = 0
-        if (endAngle === undefined) endAngle = 360
-        BezierHelper.arc(null, x, y, radius, startAngle, endAngle, anticlockwise, null, null, startPoint)
+        BezierHelper.arc(null, x, y, radius, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint)
         data.push(M, startPoint.x, startPoint.y)
         arc(data, x, y, radius, startAngle, endAngle, anticlockwise)
     },

package/src/PathCreator.ts

@@ -7,89 +7,92 @@ const { moveTo, lineTo, quadraticCurveTo, bezierCurveTo, closePath, beginPath, r
 
 export class PathCreator implements IPathDrawer {
 
-    public path: IPathCommandData
+    public set path(value: IPathCommandData) { this.__path = value }
+    public get path() { return this.__path }
+
+    public __path: IPathCommandData // 提供一个更安全的内部变量（比如覆盖给Pen时需要用到，避免与原有属性冲突）
 
     constructor(path?: IPathCommandData | IPathString) {
         if (path) {
-            this.path = typeof path === 'string' ? PathHelper.parse(path) : path
+            this.__path = typeof path === 'string' ? PathHelper.parse(path) : path
         } else {
-            this.path = []
+            this.__path = []
         }
     }
 
     public beginPath(): PathCreator {
-        beginPath(this.path)
+        beginPath(this.__path)
         return this
     }
 
     // svg and canvas
 
     public moveTo(x: number, y: number): PathCreator {
-        moveTo(this.path, x, y)
+        moveTo(this.__path, x, y)
         return this
     }
 
     public lineTo(x: number, y: number): PathCreator {
-        lineTo(this.path, x, y)
+        lineTo(this.__path, x, y)
         return this
     }
 
     public bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): PathCreator {
-        bezierCurveTo(this.path, x1, y1, x2, y2, x, y)
+        bezierCurveTo(this.__path, x1, y1, x2, y2, x, y)
         return this
     }
 
     public quadraticCurveTo(x1: number, y1: number, x: number, y: number): PathCreator {
-        quadraticCurveTo(this.path, x1, y1, x, y)
+        quadraticCurveTo(this.__path, x1, y1, x, y)
         return this
     }
 
     public closePath(): PathCreator {
-        closePath(this.path)
+        closePath(this.__path)
         return this
     }
 
     // canvas
 
     public rect(x: number, y: number, width: number, height: number): PathCreator {
-        rect(this.path, x, y, width, height)
+        rect(this.__path, x, y, width, height)
         return this
     }
 
     public roundRect(x: number, y: number, width: number, height: number, cornerRadius: number | number[]): PathCreator {
-        roundRect(this.path, x, y, width, height, cornerRadius)
+        roundRect(this.__path, x, y, width, height, cornerRadius)
         return this
     }
 
     public ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): PathCreator {
-        ellipse(this.path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise)
+        ellipse(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise)
         return this
     }
 
     public arc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): PathCreator {
-        arc(this.path, x, y, radius, startAngle, endAngle, anticlockwise)
+        arc(this.__path, x, y, radius, startAngle, endAngle, anticlockwise)
         return this
     }
 
     public arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): PathCreator {
-        arcTo(this.path, x1, y1, x2, y2, radius)
+        arcTo(this.__path, x1, y1, x2, y2, radius)
         return this
     }
 
     // moveTo, then draw
 
     public drawEllipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): PathCreator {
-        drawEllipse(this.path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise)
+        drawEllipse(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise)
         return this
     }
 
     public drawArc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): PathCreator {
-        drawArc(this.path, x, y, radius, startAngle, endAngle, anticlockwise)
+        drawArc(this.__path, x, y, radius, startAngle, endAngle, anticlockwise)
         return this
     }
 
     public drawPoints(points: number[], curve?: boolean | number, close?: boolean): PathCreator {
-        drawPoints(this.path, points, curve, close)
+        drawPoints(this.__path, points, curve, close)
         return this
     }
 

package/types/index.d.ts

@@ -22,7 +22,9 @@ declare const PathConvert: {
 };
 
 declare class PathCreator implements IPathDrawer {
-    path: IPathCommandData;
+    set path(value: IPathCommandData);
+    get path(): IPathCommandData;
+    __path: IPathCommandData;
     constructor(path?: IPathCommandData | IPathString);
     beginPath(): PathCreator;
     moveTo(x: number, y: number): PathCreator;