makerjs 0.17.1 → 0.17.2

package/dist/browser.maker.js

@@ -39,19 +39,17 @@ and limitations under the License.
  *   author: Dan Marshall / Microsoft Corporation
  *   maintainers: Dan Marshall <danmar@microsoft.com>
  *   homepage: https://maker.js.org
- *   version: 0.17.1
+ *   version: 0.17.2
  *
  * browserify:
  *   license: MIT (http://opensource.org/licenses/MIT)
  *   author: James Halliday <mail@substack.net>
- *   homepage: https://github.com/browserify/browserify#readme
  *   version: 17.0.0
  *
  * clone:
  *   license: MIT (http://opensource.org/licenses/MIT)
- *   author: Paul Vorbach <paul@vorba.ch>
- *   contributors: Blake Miner <miner.blake@gmail.com>, Tian You <axqd001@gmail.com>, George Stagas <gstagas@gmail.com>, Tobiasz Cudnik <tobiasz.cudnik@gmail.com>, Pavel Lang <langpavel@phpskelet.org>, Dan MacTough, w1nk, Hugh Kennedy, Dustin Diaz, Ilya Shaisultanov, Nathan MacInnes <nathan@macinn.es>, Benjamin E. Coe <ben@npmjs.com>, Nathan Zadoks, Róbert Oroszi <robert+gh@oroszi.net>, Aurélio A. Heckert, Guy Ellis
- *   homepage: https://github.com/pvorb/node-clone#readme
+ *   author: Paul Vorbach <paul@vorba.ch> (http://paul.vorba.ch/)
+ *   contributors: Blake Miner <miner.blake@gmail.com> (http://www.blakeminer.com/), Tian You <axqd001@gmail.com> (http://blog.axqd.net/), George Stagas <gstagas@gmail.com> (http://stagas.com/), Tobiasz Cudnik <tobiasz.cudnik@gmail.com> (https://github.com/TobiaszCudnik), Pavel Lang <langpavel@phpskelet.org> (https://github.com/langpavel), Dan MacTough (http://yabfog.com/), w1nk (https://github.com/w1nk), Hugh Kennedy (http://twitter.com/hughskennedy), Dustin Diaz (http://dustindiaz.com), Ilya Shaisultanov (https://github.com/diversario), Nathan MacInnes <nathan@macinn.es> (http://macinn.es/), Benjamin E. Coe <ben@npmjs.com> (https://twitter.com/benjamincoe), Nathan Zadoks (https://github.com/nathan7), Róbert Oroszi <robert+gh@oroszi.net> (https://github.com/oroce), Aurélio A. Heckert (http://softwarelivre.org/aurium), Guy Ellis (http://www.guyellisrocks.com/)
  *   version: 1.0.4
  *
  * graham_scan:
@@ -63,7 +61,6 @@ and limitations under the License.
  * kdbush:
  *   license: ISC (http://opensource.org/licenses/ISC)
  *   author: Vladimir Agafonkin
- *   homepage: https://github.com/mourner/kdbush#readme
  *   version: 2.0.1
  *
  * This header is generated by licensify (https://github.com/twada/licensify)
@@ -4979,13 +4976,14 @@ var MakerJs;
         function parseNumericList(s) {
             var result = [];
             //http://stackoverflow.com/questions/638565/parsing-scientific-notation-sensibly
-            var re = /[\.-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?/g;
+            var re = /-?(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+\-]?\d+)?/g;
             var matches;
             while ((matches = re.exec(s)) !== null) {
                 if (matches.index === re.lastIndex) {
                     re.lastIndex++;
                 }
-                result.push(parseFloat(matches[0]));
+                if (matches[0] !== "")
+                    result.push(parseFloat(matches[0]));
             }
             return result;
         }
@@ -7367,28 +7365,28 @@ var MakerJs;
                 return wrap(chainToJscadScript(c, maxArcFacet, options.accuracy));
             }
             function scriptUnion(augend, addend) {
-                return augend + (".union(" + addend + ")");
+                return augend + ".union(".concat(addend, ")");
             }
             function scriptSubtraction(minuend, subtrahend) {
-                return minuend + (".subtract(" + subtrahend + ")");
+                return minuend + ".subtract(".concat(subtrahend, ")");
             }
             function to2D(opts) {
                 return convertChainsTo2D(_chainToJscadScript, scriptUnion, scriptSubtraction, modelToExport, options);
             }
             function to3D(cag, extrude, z) {
-                var csg = cag + (".extrude({ offset: [0, 0, " + extrude + "] })");
+                var csg = cag + ".extrude({ offset: [0, 0, ".concat(extrude, "] })");
                 if (z) {
-                    csg = csg + (".translate([0, 0, " + z + "])");
+                    csg = csg + ".translate([0, 0, ".concat(z, "])");
                 }
                 return csg;
             }
             function wrap(s) {
-                return "" + nl + indent + s + nl;
+                return "".concat(nl).concat(indent).concat(s).concat(nl);
             }
             var indent = new Array((options.indent || 0) + 1).join(' ');
             var nl = options.indent ? '\n' : '';
             var result = convert2Dto3D(to2D, to3D, scriptUnion, modelToExport, options).trim();
-            return "function " + (options.functionName || 'main') + "(){" + wrap("return " + result + ";") + "}" + nl;
+            return "function ".concat(options.functionName || 'main', "(){").concat(wrap("return ".concat(result, ";")), "}").concat(nl);
         }
         exporter.toJscadScript = toJscadScript;
         /**
@@ -8018,7 +8016,7 @@ var MakerJs;
                 var tag = new exporter.XmlTag('text', {
                     "alignment-baseline": "middle",
                     "text-anchor": "middle",
-                    "transform": "rotate(" + MakerJs.angle.ofLineInDegrees(anchor) + "," + center[0] + "," + center[1] + ")",
+                    "transform": "rotate(".concat(MakerJs.angle.ofLineInDegrees(anchor), ",").concat(center[0], ",").concat(center[1], ")"),
                     "x": center[0],
                     "y": center[1]
                 });
@@ -8120,14 +8118,18 @@ var MakerJs;
                 }
                 result.models['p_' + ++pathCount] = m;
             }
-            function getPoint(cmd, offset) {
+            function getPoint(cmd, offset, from) {
                 if (offset === void 0) { offset = 0; }
+                if (from === void 0) { from = cmd.from; }
+                if (offset < 0) { // get point from end of list (negative index)
+                    offset = offset + cmd.data.length;
+                }
                 var p = MakerJs.point.mirror([cmd.data[0 + offset], cmd.data[1 + offset]], false, true);
                 if (cmd.absolute) {
                     return p;
                 }
                 else {
-                    return MakerJs.point.add(p, cmd.from);
+                    return MakerJs.point.add(p, from);
                 }
             }
             function lineTo(cmd, end) {
@@ -8139,7 +8141,15 @@ var MakerJs;
             var map = {};
             map['M'] = function (cmd) {
                 firstPoint = getPoint(cmd);
-                return firstPoint;
+                if (cmd.data.length > 2) { // implicit lineTo
+                    cmd.from = firstPoint;
+                    for (var a = 2; a < cmd.data.length; a = a + 2) {
+                        cmd.from = lineTo(cmd, getPoint(cmd, a));
+                    }
+                    return cmd.from;
+                }
+                else
+                    return firstPoint;
             };
             map['Z'] = function (cmd) {
                 return lineTo(cmd, firstPoint);
@@ -8166,97 +8176,139 @@ var MakerJs;
                 return lineTo(cmd, end);
             };
             map['L'] = function (cmd) {
-                var end = getPoint(cmd);
-                return lineTo(cmd, end);
+                var end;
+                for (var a = 0; a < cmd.data.length; a = a + 2) {
+                    end = getPoint(cmd, a);
+                    cmd.from = lineTo(cmd, end);
+                }
+                return cmd.from;
             };
             map['A'] = function (cmd) {
-                var rx = cmd.data[0];
-                var ry = cmd.data[1];
-                var rotation = cmd.data[2];
-                var large = cmd.data[3] === 1;
-                var decreasing = cmd.data[4] === 1;
-                var end = getPoint(cmd, 5);
-                var elliptic = rx !== ry;
-                //first, rotate so we are dealing with a zero angle x-axis
-                var xAxis = new MakerJs.paths.Line(cmd.from, MakerJs.point.rotate(end, rotation, cmd.from));
-                //next, un-distort any ellipse back into a circle in terms of x axis
-                if (elliptic) {
-                    xAxis = MakerJs.path.distort(xAxis, 1, rx / ry);
-                }
-                //now create an arc, making sure we use the large and decreasing flags
-                var arc = new MakerJs.paths.Arc(xAxis.origin, xAxis.end, rx, large, decreasing);
-                if (elliptic) {
-                    //scale up if radius was insufficient.
-                    if (rx < arc.radius) {
-                        var scaleUp = arc.radius / rx;
-                        rx *= scaleUp;
-                        ry *= scaleUp;
-                    }
-                    //create an elliptical arc, this will re-distort
-                    var e = new MakerJs.models.EllipticArc(arc, 1, ry / rx, options.bezierAccuracy);
-                    //un-rotate back to where it should be.
-                    MakerJs.model.rotate(e, -rotation, cmd.from);
-                    addModel(e);
-                }
-                else {
-                    //just use the arc
-                    //un-rotate back to where it should be.
-                    MakerJs.path.rotate(arc, -rotation, cmd.from);
-                    addPath(arc);
+                var rx;
+                var ry;
+                var rotation;
+                var large;
+                var decreasing;
+                var end;
+                var elliptic;
+                var xAxis;
+                var arc;
+                var scaleUp;
+                var e;
+                for (var a = 0; a < cmd.data.length; a = a + 7) {
+                    rx = cmd.data[0 + a];
+                    ry = cmd.data[1 + a];
+                    rotation = cmd.data[2 + a];
+                    large = cmd.data[3 + a] === 1;
+                    decreasing = cmd.data[4 + a] === 1;
+                    end = getPoint(cmd, 5 + a);
+                    elliptic = rx !== ry;
+                    //first, rotate so we are dealing with a zero angle x-axis
+                    xAxis = new MakerJs.paths.Line(cmd.from, MakerJs.point.rotate(end, rotation, cmd.from));
+                    //next, un-distort any ellipse back into a circle in terms of x axis
+                    if (elliptic) {
+                        xAxis = MakerJs.path.distort(xAxis, 1, rx / ry);
+                    }
+                    //now create an arc, making sure we use the large and decreasing flags
+                    arc = new MakerJs.paths.Arc(xAxis.origin, xAxis.end, rx, large, decreasing);
+                    if (elliptic) {
+                        //scale up if radius was insufficient.
+                        if (rx < arc.radius) {
+                            scaleUp = arc.radius / rx;
+                            rx *= scaleUp;
+                            ry *= scaleUp;
+                        }
+                        //create an elliptical arc, this will re-distort
+                        e = new MakerJs.models.EllipticArc(arc, 1, ry / rx, options.bezierAccuracy);
+                        //un-rotate back to where it should be.
+                        MakerJs.model.rotate(e, -rotation, cmd.from);
+                        addModel(e);
+                    }
+                    else {
+                        //just use the arc
+                        //un-rotate back to where it should be.
+                        MakerJs.path.rotate(arc, -rotation, cmd.from);
+                        addPath(arc);
+                    }
+                    cmd.from = end;
                 }
                 return end;
             };
             map['C'] = function (cmd) {
-                var control1 = getPoint(cmd, 0);
-                var control2 = getPoint(cmd, 2);
-                var end = getPoint(cmd, 4);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control1, control2, end, options.bezierAccuracy));
+                var control1;
+                var control2;
+                var start = cmd.from;
+                var end;
+                for (var a = 0; a < cmd.data.length; a = a + 6) {
+                    cmd.from = start;
+                    control1 = getPoint(cmd, 0 + a, start);
+                    control2 = getPoint(cmd, 2 + a, start);
+                    end = getPoint(cmd, 4 + a, start);
+                    addModel(new MakerJs.models.BezierCurve(start, control1, control2, end, options.bezierAccuracy));
+                    start = end;
+                }
                 return end;
             };
             map['S'] = function (cmd) {
                 var control1;
                 var prevControl2;
-                if (cmd.prev.command === 'C') {
-                    prevControl2 = getPoint(cmd.prev, 2);
-                    control1 = MakerJs.point.rotate(prevControl2, 180, cmd.from);
-                }
-                else if (cmd.prev.command === 'S') {
-                    prevControl2 = getPoint(cmd.prev, 0);
-                    control1 = MakerJs.point.rotate(prevControl2, 180, cmd.from);
+                var control2;
+                var start = cmd.from;
+                var end;
+                if (cmd.prev.command === 'C' || cmd.prev.command === 'S') {
+                    prevControl2 = getPoint(cmd.prev, -4);
                 }
                 else {
-                    control1 = cmd.from;
+                    prevControl2 = cmd.from;
+                }
+                for (var a = 0; a < cmd.data.length; a = a + 4) {
+                    cmd.from = start;
+                    control1 = MakerJs.point.rotate(prevControl2, 180, start);
+                    control2 = getPoint(cmd, 0 + a);
+                    end = getPoint(cmd, 2 + a);
+                    addModel(new MakerJs.models.BezierCurve(start, control1, control2, end, options.bezierAccuracy));
+                    start = end;
+                    prevControl2 = control2;
                 }
-                var control2 = getPoint(cmd, 0);
-                var end = getPoint(cmd, 2);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control1, control2, end, options.bezierAccuracy));
                 return end;
             };
             map['Q'] = function (cmd) {
-                var control = getPoint(cmd, 0);
-                var end = getPoint(cmd, 2);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control, end, options.bezierAccuracy));
+                var control;
+                var start = cmd.from;
+                var end;
+                for (var a = 0; a < cmd.data.length; a = a + 4) {
+                    cmd.from = start;
+                    control = getPoint(cmd, 0 + a);
+                    end = getPoint(cmd, 2 + a);
+                    addModel(new MakerJs.models.BezierCurve(start, control, end, options.bezierAccuracy));
+                    start = end;
+                }
                 return end;
             };
             map['T'] = function (cmd) {
                 var control;
                 var prevControl;
+                var end;
                 if (cmd.prev.command === 'Q') {
-                    prevControl = getPoint(cmd.prev, 0);
+                    prevControl = getPoint(cmd.prev, -4);
                     control = MakerJs.point.rotate(prevControl, 180, cmd.from);
                 }
                 else if (cmd.prev.command === 'T') {
-                    prevControl = getPoint(cmd.prev, 2); //see below *
-                    control = MakerJs.point.rotate(prevControl, 180, cmd.from);
+                    cmd.prev.absolute = true;
+                    control = getPoint(cmd.prev, -2); //see below *
                 }
                 else {
                     control = cmd.from;
                 }
+                for (var a = 0; a < cmd.data.length; a = a + 2) {
+                    end = getPoint(cmd, 0 + a);
+                    addModel(new MakerJs.models.BezierCurve(cmd.from, control, end, options.bezierAccuracy));
+                    cmd.from = end;
+                    control = MakerJs.point.rotate(control, 180, cmd.from);
+                }
                 //* save the control point in the data list, will be accessible from index 2
                 var p = MakerJs.point.mirror(control, false, true);
                 cmd.data.push.apply(cmd.data, p);
-                var end = getPoint(cmd, 0);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control, end, options.bezierAccuracy));
                 return end;
             };
             var firstPoint = [0, 0];
@@ -9224,11 +9276,11 @@ var MakerJs;
         }
         var Ellipse = /** @class */ (function () {
             function Ellipse() {
-                var _this = this;
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
+                var _this = this;
                 this.models = {};
                 var n = 360 / maxBezierArcspan;
                 var accuracy;
@@ -9393,11 +9445,11 @@ var MakerJs;
         }
         var ConnectTheDots = /** @class */ (function () {
             function ConnectTheDots() {
-                var _this = this;
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
+                var _this = this;
                 this.paths = {};
                 var isClosed;
                 var points;
@@ -9778,9 +9830,9 @@ var MakerJs;
     (function (models) {
         var OvalArc = /** @class */ (function () {
             function OvalArc(startAngle, endAngle, sweepRadius, slotRadius, selfIntersect, isolateCaps) {
-                var _this = this;
                 if (selfIntersect === void 0) { selfIntersect = false; }
                 if (isolateCaps === void 0) { isolateCaps = false; }
+                var _this = this;
                 this.paths = {};
                 var capRoot;
                 if (isolateCaps) {
@@ -10000,8 +10052,8 @@ var MakerJs;
     (function (models) {
         var Slot = /** @class */ (function () {
             function Slot(origin, endPoint, radius, isolateCaps) {
-                var _this = this;
                 if (isolateCaps === void 0) { isolateCaps = false; }
+                var _this = this;
                 this.paths = {};
                 var capRoot;
                 if (isolateCaps) {
@@ -10125,9 +10177,9 @@ var MakerJs;
              * @returns Model of the text.
              */
             function Text(font, text, fontSize, combine, centerCharacterOrigin, bezierAccuracy, opentypeOptions) {
-                var _this = this;
                 if (combine === void 0) { combine = false; }
                 if (centerCharacterOrigin === void 0) { centerCharacterOrigin = false; }
+                var _this = this;
                 this.models = {};
                 var charIndex = 0;
                 var prevDeleted;
@@ -10233,6 +10285,6 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.1";
+MakerJs.version = "0.17.2";
 
 },{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Maker.js 0.17.1
+// Type definitions for Maker.js 0.17.2
 // 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

@@ -4559,13 +4559,14 @@ var MakerJs;
         function parseNumericList(s) {
             var result = [];
             //http://stackoverflow.com/questions/638565/parsing-scientific-notation-sensibly
-            var re = /[\.-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?/g;
+            var re = /-?(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+\-]?\d+)?/g;
             var matches;
             while ((matches = re.exec(s)) !== null) {
                 if (matches.index === re.lastIndex) {
                     re.lastIndex++;
                 }
-                result.push(parseFloat(matches[0]));
+                if (matches[0] !== "")
+                    result.push(parseFloat(matches[0]));
             }
             return result;
         }
@@ -6947,28 +6948,28 @@ var MakerJs;
                 return wrap(chainToJscadScript(c, maxArcFacet, options.accuracy));
             }
             function scriptUnion(augend, addend) {
-                return augend + (".union(" + addend + ")");
+                return augend + ".union(".concat(addend, ")");
             }
             function scriptSubtraction(minuend, subtrahend) {
-                return minuend + (".subtract(" + subtrahend + ")");
+                return minuend + ".subtract(".concat(subtrahend, ")");
             }
             function to2D(opts) {
                 return convertChainsTo2D(_chainToJscadScript, scriptUnion, scriptSubtraction, modelToExport, options);
             }
             function to3D(cag, extrude, z) {
-                var csg = cag + (".extrude({ offset: [0, 0, " + extrude + "] })");
+                var csg = cag + ".extrude({ offset: [0, 0, ".concat(extrude, "] })");
                 if (z) {
-                    csg = csg + (".translate([0, 0, " + z + "])");
+                    csg = csg + ".translate([0, 0, ".concat(z, "])");
                 }
                 return csg;
             }
             function wrap(s) {
-                return "" + nl + indent + s + nl;
+                return "".concat(nl).concat(indent).concat(s).concat(nl);
             }
             var indent = new Array((options.indent || 0) + 1).join(' ');
             var nl = options.indent ? '\n' : '';
             var result = convert2Dto3D(to2D, to3D, scriptUnion, modelToExport, options).trim();
-            return "function " + (options.functionName || 'main') + "(){" + wrap("return " + result + ";") + "}" + nl;
+            return "function ".concat(options.functionName || 'main', "(){").concat(wrap("return ".concat(result, ";")), "}").concat(nl);
         }
         exporter.toJscadScript = toJscadScript;
         /**
@@ -7598,7 +7599,7 @@ var MakerJs;
                 var tag = new exporter.XmlTag('text', {
                     "alignment-baseline": "middle",
                     "text-anchor": "middle",
-                    "transform": "rotate(" + MakerJs.angle.ofLineInDegrees(anchor) + "," + center[0] + "," + center[1] + ")",
+                    "transform": "rotate(".concat(MakerJs.angle.ofLineInDegrees(anchor), ",").concat(center[0], ",").concat(center[1], ")"),
                     "x": center[0],
                     "y": center[1]
                 });
@@ -7700,14 +7701,18 @@ var MakerJs;
                 }
                 result.models['p_' + ++pathCount] = m;
             }
-            function getPoint(cmd, offset) {
+            function getPoint(cmd, offset, from) {
                 if (offset === void 0) { offset = 0; }
+                if (from === void 0) { from = cmd.from; }
+                if (offset < 0) { // get point from end of list (negative index)
+                    offset = offset + cmd.data.length;
+                }
                 var p = MakerJs.point.mirror([cmd.data[0 + offset], cmd.data[1 + offset]], false, true);
                 if (cmd.absolute) {
                     return p;
                 }
                 else {
-                    return MakerJs.point.add(p, cmd.from);
+                    return MakerJs.point.add(p, from);
                 }
             }
             function lineTo(cmd, end) {
@@ -7719,7 +7724,15 @@ var MakerJs;
             var map = {};
             map['M'] = function (cmd) {
                 firstPoint = getPoint(cmd);
-                return firstPoint;
+                if (cmd.data.length > 2) { // implicit lineTo
+                    cmd.from = firstPoint;
+                    for (var a = 2; a < cmd.data.length; a = a + 2) {
+                        cmd.from = lineTo(cmd, getPoint(cmd, a));
+                    }
+                    return cmd.from;
+                }
+                else
+                    return firstPoint;
             };
             map['Z'] = function (cmd) {
                 return lineTo(cmd, firstPoint);
@@ -7746,97 +7759,139 @@ var MakerJs;
                 return lineTo(cmd, end);
             };
             map['L'] = function (cmd) {
-                var end = getPoint(cmd);
-                return lineTo(cmd, end);
+                var end;
+                for (var a = 0; a < cmd.data.length; a = a + 2) {
+                    end = getPoint(cmd, a);
+                    cmd.from = lineTo(cmd, end);
+                }
+                return cmd.from;
             };
             map['A'] = function (cmd) {
-                var rx = cmd.data[0];
-                var ry = cmd.data[1];
-                var rotation = cmd.data[2];
-                var large = cmd.data[3] === 1;
-                var decreasing = cmd.data[4] === 1;
-                var end = getPoint(cmd, 5);
-                var elliptic = rx !== ry;
-                //first, rotate so we are dealing with a zero angle x-axis
-                var xAxis = new MakerJs.paths.Line(cmd.from, MakerJs.point.rotate(end, rotation, cmd.from));
-                //next, un-distort any ellipse back into a circle in terms of x axis
-                if (elliptic) {
-                    xAxis = MakerJs.path.distort(xAxis, 1, rx / ry);
-                }
-                //now create an arc, making sure we use the large and decreasing flags
-                var arc = new MakerJs.paths.Arc(xAxis.origin, xAxis.end, rx, large, decreasing);
-                if (elliptic) {
-                    //scale up if radius was insufficient.
-                    if (rx < arc.radius) {
-                        var scaleUp = arc.radius / rx;
-                        rx *= scaleUp;
-                        ry *= scaleUp;
-                    }
-                    //create an elliptical arc, this will re-distort
-                    var e = new MakerJs.models.EllipticArc(arc, 1, ry / rx, options.bezierAccuracy);
-                    //un-rotate back to where it should be.
-                    MakerJs.model.rotate(e, -rotation, cmd.from);
-                    addModel(e);
-                }
-                else {
-                    //just use the arc
-                    //un-rotate back to where it should be.
-                    MakerJs.path.rotate(arc, -rotation, cmd.from);
-                    addPath(arc);
+                var rx;
+                var ry;
+                var rotation;
+                var large;
+                var decreasing;
+                var end;
+                var elliptic;
+                var xAxis;
+                var arc;
+                var scaleUp;
+                var e;
+                for (var a = 0; a < cmd.data.length; a = a + 7) {
+                    rx = cmd.data[0 + a];
+                    ry = cmd.data[1 + a];
+                    rotation = cmd.data[2 + a];
+                    large = cmd.data[3 + a] === 1;
+                    decreasing = cmd.data[4 + a] === 1;
+                    end = getPoint(cmd, 5 + a);
+                    elliptic = rx !== ry;
+                    //first, rotate so we are dealing with a zero angle x-axis
+                    xAxis = new MakerJs.paths.Line(cmd.from, MakerJs.point.rotate(end, rotation, cmd.from));
+                    //next, un-distort any ellipse back into a circle in terms of x axis
+                    if (elliptic) {
+                        xAxis = MakerJs.path.distort(xAxis, 1, rx / ry);
+                    }
+                    //now create an arc, making sure we use the large and decreasing flags
+                    arc = new MakerJs.paths.Arc(xAxis.origin, xAxis.end, rx, large, decreasing);
+                    if (elliptic) {
+                        //scale up if radius was insufficient.
+                        if (rx < arc.radius) {
+                            scaleUp = arc.radius / rx;
+                            rx *= scaleUp;
+                            ry *= scaleUp;
+                        }
+                        //create an elliptical arc, this will re-distort
+                        e = new MakerJs.models.EllipticArc(arc, 1, ry / rx, options.bezierAccuracy);
+                        //un-rotate back to where it should be.
+                        MakerJs.model.rotate(e, -rotation, cmd.from);
+                        addModel(e);
+                    }
+                    else {
+                        //just use the arc
+                        //un-rotate back to where it should be.
+                        MakerJs.path.rotate(arc, -rotation, cmd.from);
+                        addPath(arc);
+                    }
+                    cmd.from = end;
                 }
                 return end;
             };
             map['C'] = function (cmd) {
-                var control1 = getPoint(cmd, 0);
-                var control2 = getPoint(cmd, 2);
-                var end = getPoint(cmd, 4);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control1, control2, end, options.bezierAccuracy));
+                var control1;
+                var control2;
+                var start = cmd.from;
+                var end;
+                for (var a = 0; a < cmd.data.length; a = a + 6) {
+                    cmd.from = start;
+                    control1 = getPoint(cmd, 0 + a, start);
+                    control2 = getPoint(cmd, 2 + a, start);
+                    end = getPoint(cmd, 4 + a, start);
+                    addModel(new MakerJs.models.BezierCurve(start, control1, control2, end, options.bezierAccuracy));
+                    start = end;
+                }
                 return end;
             };
             map['S'] = function (cmd) {
                 var control1;
                 var prevControl2;
-                if (cmd.prev.command === 'C') {
-                    prevControl2 = getPoint(cmd.prev, 2);
-                    control1 = MakerJs.point.rotate(prevControl2, 180, cmd.from);
-                }
-                else if (cmd.prev.command === 'S') {
-                    prevControl2 = getPoint(cmd.prev, 0);
-                    control1 = MakerJs.point.rotate(prevControl2, 180, cmd.from);
+                var control2;
+                var start = cmd.from;
+                var end;
+                if (cmd.prev.command === 'C' || cmd.prev.command === 'S') {
+                    prevControl2 = getPoint(cmd.prev, -4);
                 }
                 else {
-                    control1 = cmd.from;
+                    prevControl2 = cmd.from;
+                }
+                for (var a = 0; a < cmd.data.length; a = a + 4) {
+                    cmd.from = start;
+                    control1 = MakerJs.point.rotate(prevControl2, 180, start);
+                    control2 = getPoint(cmd, 0 + a);
+                    end = getPoint(cmd, 2 + a);
+                    addModel(new MakerJs.models.BezierCurve(start, control1, control2, end, options.bezierAccuracy));
+                    start = end;
+                    prevControl2 = control2;
                 }
-                var control2 = getPoint(cmd, 0);
-                var end = getPoint(cmd, 2);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control1, control2, end, options.bezierAccuracy));
                 return end;
             };
             map['Q'] = function (cmd) {
-                var control = getPoint(cmd, 0);
-                var end = getPoint(cmd, 2);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control, end, options.bezierAccuracy));
+                var control;
+                var start = cmd.from;
+                var end;
+                for (var a = 0; a < cmd.data.length; a = a + 4) {
+                    cmd.from = start;
+                    control = getPoint(cmd, 0 + a);
+                    end = getPoint(cmd, 2 + a);
+                    addModel(new MakerJs.models.BezierCurve(start, control, end, options.bezierAccuracy));
+                    start = end;
+                }
                 return end;
             };
             map['T'] = function (cmd) {
                 var control;
                 var prevControl;
+                var end;
                 if (cmd.prev.command === 'Q') {
-                    prevControl = getPoint(cmd.prev, 0);
+                    prevControl = getPoint(cmd.prev, -4);
                     control = MakerJs.point.rotate(prevControl, 180, cmd.from);
                 }
                 else if (cmd.prev.command === 'T') {
-                    prevControl = getPoint(cmd.prev, 2); //see below *
-                    control = MakerJs.point.rotate(prevControl, 180, cmd.from);
+                    cmd.prev.absolute = true;
+                    control = getPoint(cmd.prev, -2); //see below *
                 }
                 else {
                     control = cmd.from;
                 }
+                for (var a = 0; a < cmd.data.length; a = a + 2) {
+                    end = getPoint(cmd, 0 + a);
+                    addModel(new MakerJs.models.BezierCurve(cmd.from, control, end, options.bezierAccuracy));
+                    cmd.from = end;
+                    control = MakerJs.point.rotate(control, 180, cmd.from);
+                }
                 //* save the control point in the data list, will be accessible from index 2
                 var p = MakerJs.point.mirror(control, false, true);
                 cmd.data.push.apply(cmd.data, p);
-                var end = getPoint(cmd, 0);
-                addModel(new MakerJs.models.BezierCurve(cmd.from, control, end, options.bezierAccuracy));
                 return end;
             };
             var firstPoint = [0, 0];
@@ -8804,11 +8859,11 @@ var MakerJs;
         }
         var Ellipse = /** @class */ (function () {
             function Ellipse() {
-                var _this = this;
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
+                var _this = this;
                 this.models = {};
                 var n = 360 / maxBezierArcspan;
                 var accuracy;
@@ -8973,11 +9028,11 @@ var MakerJs;
         }
         var ConnectTheDots = /** @class */ (function () {
             function ConnectTheDots() {
-                var _this = this;
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
+                var _this = this;
                 this.paths = {};
                 var isClosed;
                 var points;
@@ -9358,9 +9413,9 @@ var MakerJs;
     (function (models) {
         var OvalArc = /** @class */ (function () {
             function OvalArc(startAngle, endAngle, sweepRadius, slotRadius, selfIntersect, isolateCaps) {
-                var _this = this;
                 if (selfIntersect === void 0) { selfIntersect = false; }
                 if (isolateCaps === void 0) { isolateCaps = false; }
+                var _this = this;
                 this.paths = {};
                 var capRoot;
                 if (isolateCaps) {
@@ -9580,8 +9635,8 @@ var MakerJs;
     (function (models) {
         var Slot = /** @class */ (function () {
             function Slot(origin, endPoint, radius, isolateCaps) {
-                var _this = this;
                 if (isolateCaps === void 0) { isolateCaps = false; }
+                var _this = this;
                 this.paths = {};
                 var capRoot;
                 if (isolateCaps) {
@@ -9705,9 +9760,9 @@ var MakerJs;
              * @returns Model of the text.
              */
             function Text(font, text, fontSize, combine, centerCharacterOrigin, bezierAccuracy, opentypeOptions) {
-                var _this = this;
                 if (combine === void 0) { combine = false; }
                 if (centerCharacterOrigin === void 0) { centerCharacterOrigin = false; }
+                var _this = this;
                 this.models = {};
                 var charIndex = 0;
                 var prevDeleted;
@@ -9813,5 +9868,5 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.1";
+MakerJs.version = "0.17.2";
 var Bezier = require('bezier-js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "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",