makerjs 0.17.6 → 0.18.1

package/dist/browser.maker.js

@@ -39,7 +39,7 @@ and limitations under the License.
  *   author: Dan Marshall / Microsoft Corporation
  *   maintainers: Dan Marshall <danmar@microsoft.com>
  *   homepage: https://maker.js.org
- *   version: 0.17.6
+ *   version: 0.18.1
  *
  * browserify:
  *   license: MIT (http://opensource.org/licenses/MIT)
@@ -471,6 +471,10 @@ var MakerJs;
         WebWorker: 'worker',
         Unknown: 'unknown'
     };
+    /**
+     * @private
+     */
+    var EPSILON = Number.EPSILON || Math.pow(2, -52);
     /**
      * @private
      */
@@ -568,28 +572,8 @@ var MakerJs;
         //optimize for early exit for integers
         if (n % 1 === 0)
             return n;
-        var exp = 1 - String(Math.ceil(1 / accuracy)).length;
-        //Adapted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round
-        // If the exp is undefined or zero...
-        if (typeof exp === 'undefined' || +exp === 0) {
-            return Math.round(n);
-        }
-        n = +n;
-        exp = +exp;
-        // If the value is not a number or the exp is not an integer...
-        if (isNaN(n) || !(typeof exp === 'number' && exp % 1 === 0)) {
-            return NaN;
-        }
-        // If the value is negative...
-        if (n < 0) {
-            return -round(-n, accuracy);
-        }
-        // Shift
-        var a = split(n.toString(), 'e');
-        n = Math.round(+(a[0] + 'e' + (a[1] ? (+a[1] - exp) : -exp)));
-        // Shift back
-        a = split(n.toString(), 'e');
-        return +(a[0] + 'e' + (a[1] ? (+a[1] + exp) : exp));
+        var temp = 1 / accuracy;
+        return Math.round((n + EPSILON) * temp) / temp;
     }
     MakerJs.round = round;
     /**
@@ -2025,6 +2009,7 @@ var MakerJs;
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
+                var _a, _b;
                 function getSpan(origin) {
                     var startAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 1 : 0]);
                     var endAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 0 : 1]);
@@ -2055,10 +2040,10 @@ var MakerJs;
                         }
                         else {
                             //find the 2 potential origins
-                            var origins = MakerJs.path.intersection(new Circle(pointA, this.radius), new Circle(pointB, this.radius));
+                            var intersectionPoints = (_b = (_a = MakerJs.path.intersection(new Circle(pointA, this.radius), new Circle(pointB, this.radius))) === null || _a === void 0 ? void 0 : _a.intersectionPoints) !== null && _b !== void 0 ? _b : [pointA, pointB];
                             var spans = [];
-                            for (var i = origins.intersectionPoints.length; i--;) {
-                                span = getSpan(origins.intersectionPoints[i]);
+                            for (var i = intersectionPoints.length; i--;) {
+                                span = getSpan(intersectionPoints[i]);
                                 //insert sorted by size ascending
                                 if (spans.length == 0 || span.size > spans[0].size) {
                                     spans.push(span);
@@ -2085,8 +2070,8 @@ var MakerJs;
                             //from 3 points
                             Circle.apply(this, args);
                             var angles = [];
-                            for (var i = 0; i < 3; i++) {
-                                angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[i]));
+                            for (var i_1 = 0; i_1 < 3; i_1++) {
+                                angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[i_1]));
                             }
                             this.startAngle = angles[0];
                             this.endAngle = angles[2];
@@ -10318,6 +10303,6 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.6";
+MakerJs.version = "0.18.1";
 
 },{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Maker.js 0.17.6
+// Type definitions for Maker.js 0.18.1
 // Project: https://github.com/Microsoft/maker.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

package/dist/index.js

@@ -54,6 +54,10 @@ var MakerJs;
         WebWorker: 'worker',
         Unknown: 'unknown'
     };
+    /**
+     * @private
+     */
+    var EPSILON = Number.EPSILON || Math.pow(2, -52);
     /**
      * @private
      */
@@ -151,28 +155,8 @@ var MakerJs;
         //optimize for early exit for integers
         if (n % 1 === 0)
             return n;
-        var exp = 1 - String(Math.ceil(1 / accuracy)).length;
-        //Adapted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round
-        // If the exp is undefined or zero...
-        if (typeof exp === 'undefined' || +exp === 0) {
-            return Math.round(n);
-        }
-        n = +n;
-        exp = +exp;
-        // If the value is not a number or the exp is not an integer...
-        if (isNaN(n) || !(typeof exp === 'number' && exp % 1 === 0)) {
-            return NaN;
-        }
-        // If the value is negative...
-        if (n < 0) {
-            return -round(-n, accuracy);
-        }
-        // Shift
-        var a = split(n.toString(), 'e');
-        n = Math.round(+(a[0] + 'e' + (a[1] ? (+a[1] - exp) : -exp)));
-        // Shift back
-        a = split(n.toString(), 'e');
-        return +(a[0] + 'e' + (a[1] ? (+a[1] + exp) : exp));
+        var temp = 1 / accuracy;
+        return Math.round((n + EPSILON) * temp) / temp;
     }
     MakerJs.round = round;
     /**
@@ -1608,6 +1592,7 @@ var MakerJs;
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
+                var _a, _b;
                 function getSpan(origin) {
                     var startAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 1 : 0]);
                     var endAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 0 : 1]);
@@ -1638,10 +1623,10 @@ var MakerJs;
                         }
                         else {
                             //find the 2 potential origins
-                            var origins = MakerJs.path.intersection(new Circle(pointA, this.radius), new Circle(pointB, this.radius));
+                            var intersectionPoints = (_b = (_a = MakerJs.path.intersection(new Circle(pointA, this.radius), new Circle(pointB, this.radius))) === null || _a === void 0 ? void 0 : _a.intersectionPoints) !== null && _b !== void 0 ? _b : [pointA, pointB];
                             var spans = [];
-                            for (var i = origins.intersectionPoints.length; i--;) {
-                                span = getSpan(origins.intersectionPoints[i]);
+                            for (var i = intersectionPoints.length; i--;) {
+                                span = getSpan(intersectionPoints[i]);
                                 //insert sorted by size ascending
                                 if (spans.length == 0 || span.size > spans[0].size) {
                                     spans.push(span);
@@ -1668,8 +1653,8 @@ var MakerJs;
                             //from 3 points
                             Circle.apply(this, args);
                             var angles = [];
-                            for (var i = 0; i < 3; i++) {
-                                angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[i]));
+                            for (var i_1 = 0; i_1 < 3; i_1++) {
+                                angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[i_1]));
                             }
                             this.startAngle = angles[0];
                             this.endAngle = angles[2];
@@ -9901,5 +9886,5 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.6";
+MakerJs.version = "0.18.1";
 var Bezier = require('bezier-js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.17.6",
+  "version": "0.18.1",
   "description": "Maker.js, a Microsoft Garage project, is a JavaScript library for creating and sharing modular line drawings for CNC and laser cutters.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",