@leafer/path 1.7.0 → 1.9.0

package/package.json

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

package/src/PathCommandDataHelper.ts

@@ -1,5 +1,6 @@
 import { IPathCommandData, IPointData } from '@leafer/interface'
 import { MathHelper, PointHelper } from '@leafer/math'
+import { isNumber, isUndefined, isNull } from '@leafer/data'
 
 import { PathCommandMap } from './PathCommandMap'
 import { BezierHelper } from './BezierHelper'
@@ -45,7 +46,7 @@ export const PathCommandDataHelper = {
     },
 
     roundRect(data: IPathCommandData, x: number, y: number, width: number, height: number, cornerRadius: number | number[]): void {
-        if (typeof cornerRadius === 'number') {
+        if (isNumber(cornerRadius)) {
             data.push(X, x, y, width, height, cornerRadius)
         } else {
             const fourCorners = MathHelper.fourNumber(cornerRadius)
@@ -58,26 +59,26 @@ export const PathCommandDataHelper = {
     },
 
     ellipse(data: IPathCommandData, x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void {
-        if (rotation === undefined) {
+        if (isNull(rotation)) {
             data.push(F, x, y, radiusX, radiusY)
         } else {
-            if (startAngle === undefined) startAngle = 0
-            if (endAngle === undefined) endAngle = 360
+            if (isNull(startAngle)) startAngle = 0
+            if (isNull(endAngle)) endAngle = 360
             data.push(G, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise ? 1 : 0)
         }
     },
 
     arc(data: IPathCommandData, x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): void {
-        if (startAngle === undefined) {
+        if (isNull(startAngle)) {
             data.push(P, x, y, radius)
         } else {
-            if (endAngle === undefined) endAngle = 360
+            if (isNull(endAngle)) endAngle = 360
             data.push(O, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0)
         }
     },
 
     arcTo(data: IPathCommandData, x1: number, y1: number, x2: number, y2: number, radius: number, lastX?: number, lastY?: number): void {
-        if (lastX !== undefined) {
+        if (!isUndefined(lastX)) {
             const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2)
             radius = min(radius, min(d / 2, d / 2 * abs(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))))
         }
@@ -87,13 +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 {
-        BezierHelper.ellipse(null, x, y, radiusX, radiusY, rotation === undefined ? 0 : rotation, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint)
+        BezierHelper.ellipse(null, x, y, radiusX, radiusY, isNull(rotation) ? 0 : rotation, isNull(startAngle) ? 0 : startAngle, isNull(endAngle) ? 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 {
-        BezierHelper.arc(null, x, y, radius, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint)
+        BezierHelper.arc(null, x, y, radius, isNull(startAngle) ? 0 : startAngle, isNull(endAngle) ? 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

@@ -1,4 +1,6 @@
 import { IPathCommandData, IPathCreator, IPathString, IPointData } from '@leafer/interface'
+import { isString } from '@leafer/data'
+
 import { PathCommandDataHelper } from './PathCommandDataHelper'
 import { PathHelper } from './PathHelper'
 
@@ -18,7 +20,7 @@ export class PathCreator implements IPathCreator { //  tip: rewrited Pen
 
     public set(path?: IPathCommandData | IPathString): PathCreator {
         if (path) {
-            this.__path = typeof path === 'string' ? PathHelper.parse(path) : path
+            this.__path = isString(path) ? PathHelper.parse(path) : path
         } else {
             this.__path = []
         }