@leafer/path 1.9.3 → 1.9.5

package/package.json

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

package/src/BezierHelper.ts

@@ -6,7 +6,7 @@ import { RectHelper } from './RectHelper'
 import { PathHelper } from './PathHelper'
 
 
-const { sin, cos, atan2, ceil, abs, PI, sqrt, pow } = Math
+const { sin, cos, hypot, atan2, ceil, abs, PI, sqrt, pow } = Math
 const { setPoint, addPoint } = TwoPointBoundsHelper
 const { set, toNumberPoints } = PointHelper
 const { M, L, C, Q, Z } = PathCommandMap
@@ -98,10 +98,14 @@ export const BezierHelper = {
 
         let startRadian = atan2(BAy, BAx)
         let endRadian = atan2(CBy, CBx)
+
+        const lenBA = hypot(BAx, BAy)
+        const lenCB = hypot(CBx, CBy)
+
         let totalRadian = endRadian - startRadian
         if (totalRadian < 0) totalRadian += PI2
 
-        if (totalRadian === PI || (abs(BAx + BAy) < 1.e-12) || (abs(CBx + CBy) < 1.e-12)) { // invalid
+        if (lenBA < 1e-12 || lenCB < 1e-12 || totalRadian < 1e-12 || abs(totalRadian - PI) < 1e-12) {
             if (data) data.push(L, x1, y1)
             if (setPointBounds) {
                 setPoint(setPointBounds, fromX, fromY)

package/src/PathCreator.ts

@@ -19,11 +19,7 @@ export class PathCreator implements IPathCreator { //  tip: rewrited Pen
     }
 
     public set(path?: IPathCommandData | IPathString): PathCreator {
-        if (path) {
-            this.__path = isString(path) ? PathHelper.parse(path) : path
-        } else {
-            this.__path = []
-        }
+        this.__path = path ? (isString(path) ? PathHelper.parse(path) : path) : []
         return this
     }
 

package/src/index.ts

@@ -16,8 +16,15 @@ import { PathConvert } from './PathConvert'
 import { PathCreator } from './PathCreator'
 import { PathHelper } from './PathHelper'
 
-PathHelper.creator = new PathCreator()
-PathHelper.parse = PathConvert.parse
-PathHelper.convertToCanvasData = PathConvert.toCanvasData
+import { IPathCommandData, IPathString } from '@leafer/interface'
+
+
+export function path(path?: IPathCommandData | IPathString): PathCreator {
+    return new PathCreator(path)
+}
 
-export const pen = new PathCreator()
+export const pen = path()
+
+PathHelper.creator = path()
+PathHelper.parse = PathConvert.parse
+PathHelper.convertToCanvasData = PathConvert.toCanvasData

package/types/index.d.ts

@@ -104,6 +104,7 @@ declare const NeedConvertToCanvasCommandMap: INumberMap;
 declare const PathNumberCommandMap: IStringMap;
 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, pen };
+export { BezierHelper, EllipseHelper, NeedConvertToCanvasCommandMap, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, RectHelper, path, pen };