makerjs 0.18.1 → 0.19.1

package/dist/browser.maker.js

@@ -39,12 +39,12 @@ and limitations under the License.
  *   author: Dan Marshall / Microsoft Corporation
  *   maintainers: Dan Marshall <danmar@microsoft.com>
  *   homepage: https://maker.js.org
- *   version: 0.18.1
+ *   version: 0.19.1
  *
  * browserify:
  *   license: MIT (http://opensource.org/licenses/MIT)
  *   author: James Halliday <mail@substack.net>
- *   version: 17.0.0
+ *   version: 17.0.1
  *
  * clone:
  *   license: MIT (http://opensource.org/licenses/MIT)
@@ -54,9 +54,9 @@ and limitations under the License.
  *
  * graham_scan:
  *   license: MIT (http://opensource.org/licenses/MIT)
- *   author: Brian Barnett <brian@3kb.co.uk>
+ *   author: Brian Barnett <me@brianbar.net>
  *   homepage: http://brian3kb.github.io/graham_scan_js
- *   version: 1.0.4
+ *   version: 1.0.5
  *
  * kdbush:
  *   license: ISC (http://opensource.org/licenses/ISC)
@@ -242,9 +242,10 @@ if (typeof module === 'object' && module.exports) {
  * Graham's Scan Convex Hull Algorithm
  * @desc An implementation of the Graham's Scan Convex Hull algorithm in JavaScript.
  * @author Brian Barnett, brian@3kb.co.uk, http://brianbar.net/ || http://3kb.co.uk/
- * @version 1.0.4
+ * @version 1.0.5
  */
-function ConvexHullGrahamScan(){this.anchorPoint=void 0,this.reverse=!1,this.points=[]}ConvexHullGrahamScan.prototype={constructor:ConvexHullGrahamScan,Point:function(n,t){this.x=n,this.y=t},_findPolarAngle:function(n,t){var i,o,h=57.295779513082;if(!n||!t)return 0;if(i=t.x-n.x,o=t.y-n.y,0==i&&0==o)return 0;var r=Math.atan2(o,i)*h;return this.reverse?0>=r&&(r+=360):r>=0&&(r+=360),r},addPoint:function(n,t){return void 0===this.anchorPoint?void(this.anchorPoint=new this.Point(n,t)):this.anchorPoint.y>t&&this.anchorPoint.x>n||this.anchorPoint.y===t&&this.anchorPoint.x>n||this.anchorPoint.y>t&&this.anchorPoint.x===n?(this.points.push(new this.Point(this.anchorPoint.x,this.anchorPoint.y)),void(this.anchorPoint=new this.Point(n,t))):void this.points.push(new this.Point(n,t))},_sortPoints:function(){var n=this;return this.points.sort(function(t,i){var o=n._findPolarAngle(n.anchorPoint,t),h=n._findPolarAngle(n.anchorPoint,i);return h>o?-1:o>h?1:0})},_checkPoints:function(n,t,i){var o,h=this._findPolarAngle(n,t),r=this._findPolarAngle(n,i);return h>r?(o=h-r,!(o>180)):r>h?(o=r-h,o>180):!0},getHull:function(){var n,t,i=[];if(this.reverse=this.points.every(function(n){return n.x<0&&n.y<0}),n=this._sortPoints(),t=n.length,3>t)return n.unshift(this.anchorPoint),n;for(i.push(n.shift(),n.shift());;){var o,h,r;if(i.push(n.shift()),o=i[i.length-3],h=i[i.length-2],r=i[i.length-1],this._checkPoints(o,h,r)&&i.splice(i.length-2,1),0==n.length){if(t==i.length){var e=this.anchorPoint;return i=i.filter(function(n){return!!n}),i.some(function(n){return n.x==e.x&&n.y==e.y})||i.unshift(this.anchorPoint),i}n=i,t=n.length,i=[],i.push(n.shift(),n.shift())}}}},"function"==typeof define&&define.amd&&define(function(){return ConvexHullGrahamScan}),"undefined"!=typeof module&&(module.exports=ConvexHullGrahamScan);
+function ConvexHullGrahamScan(){this.anchorPoint=void 0,this.reverse=!1,this.points=[]}ConvexHullGrahamScan.prototype={constructor:ConvexHullGrahamScan,Point:function(a,b){this.x=a,this.y=b},_findPolarAngle:function(a,b){var c,d,e=57.295779513082;if(!a||!b)return 0;if(c=b.x-a.x,d=b.y-a.y,0==c&&0==d)return 0;var f=Math.atan2(d,c)*e;return this.reverse?0>=f&&(f+=360):f>=0&&(f+=360),f},addPoint:function(a,b){var c=void 0===this.anchorPoint||this.anchorPoint.y>b||this.anchorPoint.y===b&&this.anchorPoint.x>a;c?(void 0!==this.anchorPoint&&this.points.push(new this.Point(this.anchorPoint.x,this.anchorPoint.y)),this.anchorPoint=new this.Point(a,b)):this.points.push(new this.Point(a,b))},_sortPoints:function(){var a=this;return this.points.sort(function(b,c){var d=a._findPolarAngle(a.anchorPoint,b),e=a._findPolarAngle(a.anchorPoint,c);return e>d?-1:d>e?1:0})},_checkPoints:function(a,b,c){var d,e=this._findPolarAngle(a,b),f=this._findPolarAngle(a,c);return e>f?(d=e-f,!(d>180)):f>e?(d=f-e,d>180):!0},getHull:function(){var a,b,c=[];if(this.reverse=this.points.every(function(a){return a.x<0&&a.y<0}),a=this._sortPoints(),b=a.length,3>b)return a.unshift(this.anchorPoint),a;for(c.push(a.shift(),a.shift());;){var d,e,f;if(c.push(a.shift()),d=c[c.length-3],e=c[c.length-2],f=c[c.length-1],this._checkPoints(d,e,f)&&c.splice(c.length-2,1),0==a.length){if(b==c.length){var g=this.anchorPoint;return c=c.filter(function(a){return!!a}),c.some(function(a){return a.x==g.x&&a.y==g.y})||c.unshift(this.anchorPoint),c}a=c,b=a.length,c=[],c.push(a.shift(),a.shift())}}}},"function"==typeof define&&define.amd&&define(function(){return ConvexHullGrahamScan}),"undefined"!=typeof module&&(module.exports=ConvexHullGrahamScan);
+
 },{}],4:[function(require,module,exports){
 (function (global, factory) {
 typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -447,6 +448,7 @@ return kdbush;
 })));
 
 },{}],"makerjs":[function(require,module,exports){
+(function (global){(function (){
 /**
  * Root module for Maker.js.
  *
@@ -475,29 +477,35 @@ var MakerJs;
      * @private
      */
     var EPSILON = Number.EPSILON || Math.pow(2, -52);
-    /**
-     * @private
-     */
-    function tryEval(name) {
-        try {
-            var value = eval(name);
-            return value;
-        }
-        catch (e) { }
-        return;
-    }
     /**
      * @private
      */
     function detectEnvironment() {
-        if (tryEval('WorkerGlobalScope') && tryEval('self')) {
+        // Use a function to get the global object to avoid TypeScript checking specific globals
+        var getGlobal = function () {
+            // In browsers and workers, 'self' refers to the global scope
+            if (typeof self !== 'undefined') {
+                return self;
+            }
+            // In Node.js, 'global' refers to the global scope
+            if (typeof global !== 'undefined') {
+                return global;
+            }
+            // Fallback for older environments
+            return this || {};
+        };
+        var globalObj = getGlobal();
+        // Check for Web Worker environment
+        // Workers have 'self' and 'WorkerGlobalScope' but not 'window'
+        if (globalObj['self'] && globalObj['WorkerGlobalScope'] && !globalObj['window']) {
             return MakerJs.environmentTypes.WebWorker;
         }
-        if (tryEval('window') && tryEval('document')) {
+        // Check for Browser UI environment
+        if (globalObj['window'] && globalObj['document']) {
             return MakerJs.environmentTypes.BrowserUI;
         }
         //put node last since packagers usually add shims for it
-        if (tryEval('global') && tryEval('process')) {
+        if (globalObj['global'] && globalObj['process']) {
             return MakerJs.environmentTypes.NodeJs;
         }
         return MakerJs.environmentTypes.Unknown;
@@ -2674,7 +2682,7 @@ var MakerJs;
             }
             if (modelToDistort.type === MakerJs.models.BezierCurve.typeName) {
                 var b = modelToDistort;
-                var bezierPartsByLayer = MakerJs.models.BezierCurve.getBezierSeeds(b, { byLayers: true });
+                var bezierPartsByLayer = MakerJs.models.BezierCurve.getBezierSeeds(b, { byLayers: true, pointMatchingDistance: bezierAccuracy });
                 var _loop_1 = function (layer_1) {
                     var pathArray = bezierPartsByLayer[layer_1];
                     pathArray.forEach(function (p, i) {
@@ -4594,7 +4602,7 @@ var MakerJs;
             if (m) {
                 return augment(m);
             }
-            return m;
+            return null;
         }
         measure.modelExtents = modelExtents;
         /**
@@ -5029,6 +5037,12 @@ var MakerJs;
                     };
                 }
             }
+            function lineTypeLayerOptions(layer) {
+                if (opts.layerOptions && opts.layerOptions[layer] && opts.layerOptions[layer].lineType) {
+                    return opts.layerOptions[layer].lineType;
+                }
+                return "CONTINUOUS";
+            }
             function defaultLayer(pathContext, parentLayer) {
                 var layerId = (pathContext && pathContext.layer) || parentLayer || '0';
                 if (layerIds.indexOf(layerId) < 0) {
@@ -5038,9 +5052,10 @@ var MakerJs;
             }
             var map = {};
             map[MakerJs.pathType.Line] = function (line, offset, layer) {
+                var layerId = defaultLayer(line, layer);
                 var lineEntity = {
                     type: "LINE",
-                    layer: defaultLayer(line, layer),
+                    layer: layerId,
                     vertices: [
                         {
                             x: MakerJs.round(line.origin[0] + offset[0], opts.accuracy),
@@ -5052,24 +5067,28 @@ var MakerJs;
                         }
                     ]
                 };
+                lineEntity.lineType = lineTypeLayerOptions(layerId);
                 return lineEntity;
             };
             map[MakerJs.pathType.Circle] = function (circle, offset, layer) {
+                var layerId = defaultLayer(circle, layer);
                 var circleEntity = {
                     type: "CIRCLE",
-                    layer: defaultLayer(circle, layer),
+                    layer: layerId,
                     center: {
                         x: MakerJs.round(circle.origin[0] + offset[0], opts.accuracy),
                         y: MakerJs.round(circle.origin[1] + offset[1], opts.accuracy)
                     },
                     radius: MakerJs.round(circle.radius, opts.accuracy)
                 };
+                circleEntity.lineType = lineTypeLayerOptions(layerId);
                 return circleEntity;
             };
             map[MakerJs.pathType.Arc] = function (arc, offset, layer) {
+                var layerId = defaultLayer(arc, layer);
                 var arcEntity = {
                     type: "ARC",
-                    layer: defaultLayer(arc, layer),
+                    layer: layerId,
                     center: {
                         x: MakerJs.round(arc.origin[0] + offset[0], opts.accuracy),
                         y: MakerJs.round(arc.origin[1] + offset[1], opts.accuracy)
@@ -5078,6 +5097,7 @@ var MakerJs;
                     startAngle: MakerJs.round(arc.startAngle, opts.accuracy),
                     endAngle: MakerJs.round(arc.endAngle, opts.accuracy)
                 };
+                arcEntity.lineType = lineTypeLayerOptions(layerId);
                 return arcEntity;
             };
             //TODO - handle scenario if any bezier seeds get passed
@@ -5099,6 +5119,7 @@ var MakerJs;
                     shape: c.chain.endless,
                     vertices: []
                 };
+                polylineEntity.lineType = lineTypeLayerOptions(polylineEntity.layer);
                 c.chain.links.forEach(function (link, i) {
                     var bulge;
                     if (link.walkedPath.pathContext.type === MakerJs.pathType.Arc) {
@@ -5140,15 +5161,31 @@ var MakerJs;
                     name: layerId,
                     color: layerColor
                 };
+                layerEntity.lineType = lineTypeLayerOptions(layerId);
                 return layerEntity;
             }
             function lineTypesOut() {
+                // Dash pattern convention: positive = drawn segment, negative = gap, 0 can be dot.
+                // patternLength is sum of absolute values.
                 var lineStyleTable = {
                     lineTypes: {
                         "CONTINUOUS": {
                             name: "CONTINUOUS",
                             description: "______",
-                            patternLength: 0
+                            patternLength: 0,
+                            elements: []
+                        },
+                        "DASHED": {
+                            name: "DASHED",
+                            description: "_ _ _ ",
+                            elements: [5, -2.5],
+                            patternLength: 7.5
+                        },
+                        "DOTTED": {
+                            name: "DOTTED",
+                            description: ". . . ",
+                            elements: [0.5, -1.0],
+                            patternLength: 1.5
                         }
                     }
                 };
@@ -5240,15 +5277,27 @@ var MakerJs;
                 }
                 dxf.push.apply(dxf, values);
             }
+            function appendLineType(entity) {
+                var lt = entity.lineType;
+                if (lt) {
+                    append("6", lt);
+                }
+            }
             var map = {};
             map["LINE"] = function (line) {
-                append("0", "LINE", "8", line.layer, "10", line.vertices[0].x, "20", line.vertices[0].y, "11", line.vertices[1].x, "21", line.vertices[1].y);
+                append("0", "LINE", "8", line.layer);
+                appendLineType(line);
+                append("10", line.vertices[0].x, "20", line.vertices[0].y, "11", line.vertices[1].x, "21", line.vertices[1].y);
             };
             map["CIRCLE"] = function (circle) {
-                append("0", "CIRCLE", "8", circle.layer, "10", circle.center.x, "20", circle.center.y, "40", circle.radius);
+                append("0", "CIRCLE", "8", circle.layer);
+                appendLineType(circle);
+                append("10", circle.center.x, "20", circle.center.y, "40", circle.radius);
             };
             map["ARC"] = function (arc) {
-                append("0", "ARC", "8", arc.layer, "10", arc.center.x, "20", arc.center.y, "40", arc.radius, "50", arc.startAngle, "51", arc.endAngle);
+                append("0", "ARC", "8", arc.layer);
+                appendLineType(arc);
+                append("10", arc.center.x, "20", arc.center.y, "40", arc.radius, "50", arc.startAngle, "51", arc.endAngle);
             };
             //TODO - handle scenario if any bezier seeds get passed
             //map[pathType.BezierSeed]
@@ -5259,7 +5308,9 @@ var MakerJs;
                 }
             };
             map["POLYLINE"] = function (polyline) {
-                append("0", "POLYLINE", "8", polyline.layer, "66", 1, "70", polyline.shape ? 1 : 0);
+                append("0", "POLYLINE", "8", polyline.layer);
+                appendLineType(polyline);
+                append("66", 1, "70", polyline.shape ? 1 : 0);
                 polyline.vertices.forEach(function (vertex) { return map["VERTEX"](vertex); });
                 append("0", "SEQEND");
             };
@@ -5282,11 +5333,14 @@ var MakerJs;
                 table(layersOut);
             }
             function layerOut(layer) {
-                append("0", "LAYER", "2", layer.name, "70", "0", "62", layer.color, "6", "CONTINUOUS");
+                var lt = (layer.lineType || "CONTINUOUS");
+                append("0", "LAYER", "2", layer.name, "70", "0", "62", layer.color, "6", lt);
             }
             function lineTypeOut(lineType) {
+                var elements = ((lineType.elements) || []);
                 append("0", "LTYPE", "72", //72 Alignment code; value is always 65, the ASCII code for A
-                "65", "70", "64", "2", lineType.name, "3", lineType.description, "73", "0", "40", lineType.patternLength);
+                "65", "70", "0", "2", lineType.name, "3", lineType.description, "73", elements.length, "40", lineType.patternLength);
+                elements.forEach(function (e) { return append("49", e); });
             }
             function lineTypesOut() {
                 var lineTypeTableName = 'lineType';
@@ -6437,7 +6491,7 @@ var MakerJs;
             var beziers;
             if (opts.unifyBeziers) {
                 beziers = getBezierModels(modelContext);
-                swapBezierPathsWithSeeds(beziers, true);
+                swapBezierPathsWithSeeds(beziers, true, opts.pointMatchingDistance);
             }
             model.walk(modelContext, walkOptions);
             var _loop_3 = function (layer_2) {
@@ -6474,7 +6528,7 @@ var MakerJs;
                 _loop_3(layer_2);
             }
             if (beziers) {
-                swapBezierPathsWithSeeds(beziers, false);
+                swapBezierPathsWithSeeds(beziers, false, opts.pointMatchingDistance);
             }
             if (opts.byLayers) {
                 return chainsByLayer;
@@ -6571,7 +6625,7 @@ var MakerJs;
         /**
          * @private
          */
-        function swapBezierPathsWithSeeds(beziers, swap) {
+        function swapBezierPathsWithSeeds(beziers, swap, pointMatchingDistance) {
             var tempKey = 'tempPaths';
             var tempLayerKey = 'tempLayer';
             beziers.forEach(function (wm) {
@@ -6583,7 +6637,7 @@ var MakerJs;
                         b.layer = wm.layer;
                     }
                     //use seeds as path, hide the arc paths from findChains()
-                    var bezierPartsByLayer = MakerJs.models.BezierCurve.getBezierSeeds(b, { byLayers: true });
+                    var bezierPartsByLayer = MakerJs.models.BezierCurve.getBezierSeeds(b, { byLayers: true, pointMatchingDistance: pointMatchingDistance });
                     for (var layer in bezierPartsByLayer) {
                         var bezierSeeds = bezierPartsByLayer[layer];
                         if (bezierSeeds.length > 0) {
@@ -7538,20 +7592,29 @@ var MakerJs;
         /**
          * Convert a chain to SVG path data.
          *
-         * @param chain Chain to convert.
+         * @param c Chain to convert.
          * @param offset IPoint relative offset point.
          * @param accuracy Optional accuracy of SVG path data.
+         * @param clockwise Optional flag to specify desired winding direction for nonzero fill rule.
          * @returns String of SVG path data.
          */
-        function chainToSVGPathData(chain, offset, accuracy) {
+        function chainToSVGPathData(c, offset, accuracy, clockwise) {
             function offsetPoint(p) {
                 return MakerJs.point.add(p, offset);
             }
-            var first = chain.links[0];
+            // If clockwise direction is specified, check if chain needs to be reversed
+            if (clockwise !== undefined) {
+                var isClockwise = MakerJs.measure.isChainClockwise(c);
+                if (isClockwise !== null && isClockwise !== clockwise) {
+                    c = MakerJs.cloneObject(c);
+                    MakerJs.chain.reverse(c);
+                }
+            }
+            var first = c.links[0];
             var firstPoint = offsetPoint(svgCoords(first.endPoints[first.reversed ? 1 : 0]));
             var d = ['M', MakerJs.round(firstPoint[0], accuracy), MakerJs.round(firstPoint[1], accuracy)];
-            for (var i = 0; i < chain.links.length; i++) {
-                var link = chain.links[i];
+            for (var i = 0; i < c.links.length; i++) {
+                var link = c.links[i];
                 var pathContext = link.walkedPath.pathContext;
                 var fn = chainLinkToPathDataMap[pathContext.type];
                 if (fn) {
@@ -7563,7 +7626,7 @@ var MakerJs;
                     fn(fixedPath, offsetPoint(svgCoords(link.endPoints[link.reversed ? 0 : 1])), link.reversed, d, accuracy);
                 }
             }
-            if (chain.endless) {
+            if (c.endless) {
                 d.push('Z');
             }
             return d.join(' ');
@@ -7639,16 +7702,16 @@ var MakerJs;
                 }
                 pathDataByLayer[layer] = [];
                 function doChains(cs, clockwise) {
-                    cs.forEach(function (chain) {
-                        if (chain.links.length > 1) {
-                            var pathData = chainToSVGPathData(chain, offset, accuracy);
+                    cs.forEach(function (c) {
+                        if (c.links.length > 1) {
+                            var pathData = chainToSVGPathData(c, offset, accuracy, clockwise);
                             pathDataByLayer[layer].push(pathData);
                         }
                         else {
-                            single(chain.links[0].walkedPath, clockwise);
+                            single(c.links[0].walkedPath, clockwise);
                         }
-                        if (chain.contains) {
-                            doChains(chain.contains, !clockwise);
+                        if (c.contains) {
+                            doChains(c.contains, !clockwise);
                         }
                     });
                 }
@@ -9002,7 +9065,7 @@ var MakerJs;
         /**
          * @private
          */
-        function getActualBezierRange(curve, arc, endpoints, offset) {
+        function getActualBezierRange(curve, arc, endpoints, offset, pointMatchingDistance) {
             var b = getScratch(curve.seed);
             var tPoints = [arc.bezierData.startT, arc.bezierData.endT].map(function (t) { return new TPoint(b, t, offset); });
             var ends = endpoints.slice();
@@ -9011,7 +9074,7 @@ var MakerJs;
             if (endpointDistancetoStart[0] > endpointDistancetoStart[1])
                 ends.reverse();
             for (var i = 2; i--;) {
-                if (!MakerJs.measure.isPointEqual(ends[i], tPoints[i].point)) {
+                if (!MakerJs.measure.isPointEqual(ends[i], tPoints[i].point, pointMatchingDistance)) {
                     return null;
                 }
             }
@@ -9020,13 +9083,13 @@ var MakerJs;
         /**
          * @private
          */
-        function getChainBezierRange(curve, c, layer, addToLayer) {
+        function getChainBezierRange(curve, c, layer, addToLayer, pointMatchingDistance) {
             var endLinks = [c.links[0], c.links[c.links.length - 1]];
             if (endLinks[0].walkedPath.pathContext.bezierData.startT > endLinks[1].walkedPath.pathContext.bezierData.startT) {
                 MakerJs.chain.reverse(c);
                 endLinks.reverse();
             }
-            var actualBezierRanges = endLinks.map(function (endLink) { return getActualBezierRange(curve, endLink.walkedPath.pathContext, endLink.endPoints, endLink.walkedPath.offset); });
+            var actualBezierRanges = endLinks.map(function (endLink) { return getActualBezierRange(curve, endLink.walkedPath.pathContext, endLink.endPoints, endLink.walkedPath.offset, pointMatchingDistance); });
             var result = {
                 startT: actualBezierRanges[0] ? actualBezierRanges[0].startT : null,
                 endT: actualBezierRanges[1] ? actualBezierRanges[1].endT : null
@@ -9188,7 +9251,7 @@ var MakerJs;
                 };
                 MakerJs.model.findChains(curve, function (chains, loose, layer) {
                     chains.forEach(function (c) {
-                        var range = getChainBezierRange(curve, c, layer, addToLayer);
+                        var range = getChainBezierRange(curve, c, layer, addToLayer, options.pointMatchingDistance);
                         if (range) {
                             var b = getScratch(curve.seed);
                             var piece = b.split(range.startT, range.endT);
@@ -9203,7 +9266,7 @@ var MakerJs;
                             //bezier is linear
                             return addToLayer(wp.pathContext, layer, true);
                         }
-                        var range = getActualBezierRange(curve, wp.pathContext, MakerJs.point.fromPathEnds(wp.pathContext), wp.offset);
+                        var range = getActualBezierRange(curve, wp.pathContext, MakerJs.point.fromPathEnds(wp.pathContext), wp.offset, options.pointMatchingDistance);
                         if (range) {
                             var b = getScratch(curve.seed);
                             var piece = b.split(range.startT, range.endT);
@@ -10178,6 +10241,7 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
+/// <reference types="fontkit" />
 var MakerJs;
 (function (MakerJs) {
     var models;
@@ -10185,13 +10249,13 @@ var MakerJs;
         var Text = /** @class */ (function () {
             /**
              * Renders text in a given font to a model.
-             * @param font OpenType.Font object.
+             * @param font OpenType.Font object or fontkit font object.
              * @param text String of text to render.
              * @param fontSize Font size.
              * @param combine Flag (default false) to perform a combineUnion upon each character with characters to the left and right.
              * @param centerCharacterOrigin Flag (default false) to move the x origin of each character to the center. Useful for rotating text characters.
              * @param bezierAccuracy Optional accuracy of Bezier curves.
-             * @param opentypeOptions Optional opentype.RenderOptions object.
+             * @param opentypeOptions Optional opentype.RenderOptions object or fontkit layout options.
              * @returns Model of the text.
              */
             function Text(font, text, fontSize, combine, centerCharacterOrigin, bezierAccuracy, opentypeOptions) {
@@ -10203,7 +10267,7 @@ var MakerJs;
                 var prevDeleted;
                 var prevChar;
                 var cb = function (glyph, x, y, _fontSize, options) {
-                    var charModel = Text.glyphToModel(glyph, _fontSize, bezierAccuracy);
+                    var charModel = Text.glyphToModel(glyph, _fontSize, bezierAccuracy, font);
                     charModel.origin = [x, 0];
                     if (centerCharacterOrigin && (charModel.paths || charModel.models)) {
                         var m = MakerJs.measure.modelExtents(charModel);
@@ -10235,62 +10299,227 @@ var MakerJs;
                     charIndex++;
                     prevChar = charModel;
                 };
-                font.forEachGlyph(text, 0, 0, fontSize, opentypeOptions, cb);
+                // Detect if font is fontkit (has layout method) or opentype.js (has forEachGlyph)
+                if (font.layout && typeof font.layout === 'function') {
+                    // fontkit font - use layout engine
+                    var fontkitFont = font;
+                    var layoutOpts = opentypeOptions;
+                    var run = fontkitFont.layout(text, layoutOpts === null || layoutOpts === void 0 ? void 0 : layoutOpts.features, layoutOpts === null || layoutOpts === void 0 ? void 0 : layoutOpts.script, layoutOpts === null || layoutOpts === void 0 ? void 0 : layoutOpts.language, layoutOpts === null || layoutOpts === void 0 ? void 0 : layoutOpts.direction);
+                    var scale = fontSize / fontkitFont.unitsPerEm;
+                    var currentX = 0;
+                    for (var i = 0; i < run.glyphs.length; i++) {
+                        var glyph = run.glyphs[i];
+                        var position = run.positions[i];
+                        var glyphX = currentX + (position.xOffset || 0) * scale;
+                        var glyphY = (position.yOffset || 0) * scale;
+                        cb(glyph, glyphX, glyphY, fontSize, opentypeOptions);
+                        currentX += (position.xAdvance || 0) * scale;
+                    }
+                }
+                else {
+                    // opentype.js font - use forEachGlyph
+                    var opentypeFont = font;
+                    opentypeFont.forEachGlyph(text, 0, 0, fontSize, opentypeOptions, cb);
+                }
             }
             /**
-             * Convert an opentype glyph to a model.
-             * @param glyph Opentype.Glyph object.
+             * Convert an opentype glyph or fontkit glyph to a model.
+             * @param glyph Opentype.Glyph object or fontkit glyph.
              * @param fontSize Font size.
              * @param bezierAccuracy Optional accuracy of Bezier curves.
+             * @param font Optional font object (needed for fontkit to get scale).
              * @returns Model of the glyph.
              */
-            Text.glyphToModel = function (glyph, fontSize, bezierAccuracy) {
+            Text.glyphToModel = function (glyph, fontSize, bezierAccuracy, font) {
                 var charModel = {};
                 var firstPoint;
                 var currPoint;
                 var pathCount = 0;
-                function addPath(p) {
+                function addPath(p, layer) {
                     if (!charModel.paths) {
                         charModel.paths = {};
                     }
+                    if (layer) {
+                        if (!charModel.layer)
+                            charModel.layer = layer;
+                    }
                     charModel.paths['p_' + ++pathCount] = p;
                 }
-                function addModel(m) {
+                function addModel(m, layer) {
                     if (!charModel.models) {
                         charModel.models = {};
                     }
+                    if (layer) {
+                        if (!charModel.layer)
+                            charModel.layer = layer;
+                    }
                     charModel.models['p_' + ++pathCount] = m;
                 }
-                var p = glyph.getPath(0, 0, fontSize);
-                p.commands.map(function (command, i) {
-                    var points = [[command.x, command.y], [command.x1, command.y1], [command.x2, command.y2]].map(function (p) {
-                        if (p[0] !== void 0) {
-                            return MakerJs.point.mirror(p, false, true);
-                        }
-                    });
-                    switch (command.type) {
-                        case 'M':
-                            firstPoint = points[0];
-                            break;
-                        case 'Z':
-                            points[0] = firstPoint;
-                        //fall through to line
-                        case 'L':
-                            if (!MakerJs.measure.isPointEqual(currPoint, points[0])) {
-                                addPath(new MakerJs.paths.Line(currPoint, points[0]));
+                // Detect if this is a fontkit glyph (has path property) or opentype.js glyph (has getPath method)
+                var isFontkitGlyph = glyph.path && !glyph.getPath;
+                var p;
+                if (isFontkitGlyph && font) {
+                    // fontkit glyph
+                    var scale_1 = fontSize / font.unitsPerEm;
+                    p = glyph.path;
+                    // Check for color layers (COLR table support)
+                    if (glyph.layers && glyph.layers.length > 0) {
+                        // Handle color glyph with layers
+                        glyph.layers.forEach(function (layer, layerIndex) {
+                            var layerGlyph = font.getGlyph(layer.glyph);
+                            var layerPath = layerGlyph.path;
+                            if (layerPath && layerPath.commands) {
+                                // Get color from palette if available
+                                var layerColor = void 0;
+                                if (font['COLR'] && font['CPAL'] && layer.color !== undefined) {
+                                    // CPAL table structure varies, try to access color palettes
+                                    var cpal = font['CPAL'];
+                                    var colorPalettes = cpal.colorPalettes || cpal.colorRecords;
+                                    if (colorPalettes && colorPalettes.length > 0) {
+                                        // Get the first palette
+                                        var palette = colorPalettes[0];
+                                        if (palette && palette.length > layer.color) {
+                                            var color = palette[layer.color];
+                                            if (color) {
+                                                // Convert RGBA to hex color for layer name
+                                                var red = color.red !== undefined ? color.red : color.r || 0;
+                                                var green = color.green !== undefined ? color.green : color.g || 0;
+                                                var blue = color.blue !== undefined ? color.blue : color.b || 0;
+                                                layerColor = "color_".concat(red.toString(16).padStart(2, '0')).concat(green.toString(16).padStart(2, '0')).concat(blue.toString(16).padStart(2, '0'));
+                                            }
+                                        }
+                                    }
+                                }
+                                // Process layer path commands
+                                var layerFirstPoint = void 0;
+                                var layerCurrPoint = void 0;
+                                for (var _i = 0, _a = layerPath.commands; _i < _a.length; _i++) {
+                                    var cmd = _a[_i];
+                                    var points = Text.convertFontkitCommand(cmd, scale_1);
+                                    switch (cmd.command) {
+                                        case 'moveTo':
+                                            layerFirstPoint = points[0];
+                                            layerCurrPoint = points[0];
+                                            break;
+                                        case 'closePath':
+                                            points[0] = layerFirstPoint;
+                                        // fall through to line
+                                        case 'lineTo':
+                                            if (layerCurrPoint && !MakerJs.measure.isPointEqual(layerCurrPoint, points[0])) {
+                                                addPath(new MakerJs.paths.Line(layerCurrPoint, points[0]), layerColor);
+                                            }
+                                            layerCurrPoint = points[0];
+                                            break;
+                                        case 'bezierCurveTo':
+                                            if (layerCurrPoint) {
+                                                addModel(new models.BezierCurve(layerCurrPoint, points[0], points[1], points[2], bezierAccuracy), layerColor);
+                                            }
+                                            layerCurrPoint = points[2];
+                                            break;
+                                        case 'quadraticCurveTo':
+                                            if (layerCurrPoint) {
+                                                addModel(new models.BezierCurve(layerCurrPoint, points[0], points[1], bezierAccuracy), layerColor);
+                                            }
+                                            layerCurrPoint = points[1];
+                                            break;
+                                    }
+                                }
                             }
-                            break;
-                        case 'C':
-                            addModel(new models.BezierCurve(currPoint, points[1], points[2], points[0], bezierAccuracy));
-                            break;
-                        case 'Q':
-                            addModel(new models.BezierCurve(currPoint, points[1], points[0], bezierAccuracy));
-                            break;
+                        });
+                        return charModel;
+                    }
+                    // Standard fontkit glyph (no color layers)
+                    if (!p || !p.commands) {
+                        return charModel; // Empty glyph (e.g., space)
+                    }
+                    for (var _i = 0, _a = p.commands; _i < _a.length; _i++) {
+                        var cmd = _a[_i];
+                        var points = Text.convertFontkitCommand(cmd, scale_1);
+                        switch (cmd.command) {
+                            case 'moveTo':
+                                firstPoint = points[0];
+                                currPoint = points[0];
+                                break;
+                            case 'closePath':
+                                points[0] = firstPoint;
+                            // fall through to line
+                            case 'lineTo':
+                                if (!MakerJs.measure.isPointEqual(currPoint, points[0])) {
+                                    addPath(new MakerJs.paths.Line(currPoint, points[0]));
+                                }
+                                currPoint = points[0];
+                                break;
+                            case 'bezierCurveTo':
+                                addModel(new models.BezierCurve(currPoint, points[0], points[1], points[2], bezierAccuracy));
+                                currPoint = points[2];
+                                break;
+                            case 'quadraticCurveTo':
+                                addModel(new models.BezierCurve(currPoint, points[0], points[1], bezierAccuracy));
+                                currPoint = points[1];
+                                break;
+                        }
                     }
-                    currPoint = points[0];
-                });
+                }
+                else {
+                    // opentype.js glyph
+                    p = glyph.getPath(0, 0, fontSize);
+                    p.commands.map(function (command, i) {
+                        var points = [[command.x, command.y], [command.x1, command.y1], [command.x2, command.y2]].map(function (p) {
+                            if (p[0] !== void 0) {
+                                return MakerJs.point.mirror(p, false, true);
+                            }
+                        });
+                        switch (command.type) {
+                            case 'M':
+                                firstPoint = points[0];
+                                break;
+                            case 'Z':
+                                points[0] = firstPoint;
+                            //fall through to line
+                            case 'L':
+                                if (!MakerJs.measure.isPointEqual(currPoint, points[0])) {
+                                    addPath(new MakerJs.paths.Line(currPoint, points[0]));
+                                }
+                                break;
+                            case 'C':
+                                addModel(new models.BezierCurve(currPoint, points[1], points[2], points[0], bezierAccuracy));
+                                break;
+                            case 'Q':
+                                addModel(new models.BezierCurve(currPoint, points[1], points[0], bezierAccuracy));
+                                break;
+                        }
+                        currPoint = points[0];
+                    });
+                }
                 return charModel;
             };
+            /**
+             * Convert fontkit path command to points array
+             * @param cmd Fontkit path command
+             * @param scale Scale factor
+             * @returns Array of points
+             */
+            Text.convertFontkitCommand = function (cmd, scale) {
+                var points = [];
+                switch (cmd.command) {
+                    case 'moveTo':
+                    case 'lineTo':
+                        points.push([cmd.args[0] * scale, cmd.args[1] * scale]);
+                        break;
+                    case 'quadraticCurveTo':
+                        // Control point, end point
+                        points.push([cmd.args[0] * scale, cmd.args[1] * scale]);
+                        points.push([cmd.args[2] * scale, cmd.args[3] * scale]);
+                        break;
+                    case 'bezierCurveTo':
+                        // Control point 1, control point 2, end point
+                        points.push([cmd.args[0] * scale, cmd.args[1] * scale]);
+                        points.push([cmd.args[2] * scale, cmd.args[3] * scale]);
+                        points.push([cmd.args[4] * scale, cmd.args[5] * scale]);
+                        break;
+                }
+                return points;
+            };
             return Text;
         }());
         models.Text = Text;
@@ -10303,6 +10532,7 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.18.1";
+MakerJs.version = "0.19.1";
 
+}).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);