makerjs 0.18.0 → 0.18.2

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.0
+ *   version: 0.18.2
  *
  * 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() :
@@ -2009,6 +2010,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]);
@@ -2039,10 +2041,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);
@@ -2069,8 +2071,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];
@@ -2673,7 +2675,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) {
@@ -4593,7 +4595,7 @@ var MakerJs;
             if (m) {
                 return augment(m);
             }
-            return m;
+            return null;
         }
         measure.modelExtents = modelExtents;
         /**
@@ -5028,6 +5030,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) {
@@ -5037,9 +5045,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),
@@ -5051,24 +5060,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)
@@ -5077,6 +5090,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
@@ -5098,6 +5112,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) {
@@ -5139,15 +5154,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
                         }
                     }
                 };
@@ -5239,15 +5270,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]
@@ -5258,7 +5301,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");
             };
@@ -5281,11 +5326,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';
@@ -6436,7 +6484,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) {
@@ -6473,7 +6521,7 @@ var MakerJs;
                 _loop_3(layer_2);
             }
             if (beziers) {
-                swapBezierPathsWithSeeds(beziers, false);
+                swapBezierPathsWithSeeds(beziers, false, opts.pointMatchingDistance);
             }
             if (opts.byLayers) {
                 return chainsByLayer;
@@ -6570,7 +6618,7 @@ var MakerJs;
         /**
          * @private
          */
-        function swapBezierPathsWithSeeds(beziers, swap) {
+        function swapBezierPathsWithSeeds(beziers, swap, pointMatchingDistance) {
             var tempKey = 'tempPaths';
             var tempLayerKey = 'tempLayer';
             beziers.forEach(function (wm) {
@@ -6582,7 +6630,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) {
@@ -9001,7 +9049,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();
@@ -9010,7 +9058,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;
                 }
             }
@@ -9019,13 +9067,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
@@ -9187,7 +9235,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);
@@ -9202,7 +9250,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);
@@ -10302,6 +10350,6 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.18.0";
+MakerJs.version = "0.18.2";
 
 },{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Maker.js 0.18.0
+// Type definitions for Maker.js 0.18.2
 // Project: https://github.com/Microsoft/maker.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -2584,7 +2584,7 @@ declare namespace MakerJs.measure {
      * @param atlas Optional atlas to save measurements.
      * @returns object with low and high points.
      */
-    function modelExtents(modelToMeasure: IModel, atlas?: Atlas): IMeasureWithCenter;
+    function modelExtents(modelToMeasure: IModel, atlas?: Atlas): IMeasureWithCenter | null;
     /**
      * Augment a measurement - add more properties such as center point, height and width.
      *
@@ -2734,6 +2734,11 @@ declare namespace MakerJs.exporter {
          * Text size for TEXT entities.
          */
         fontSize?: number;
+        /**
+         * DXF linetype name for this layer.
+         * Example: "CONTINUOUS", "DASHED", "DOTTED"
+         */
+        lineType?: 'CONTINUOUS' | 'DASHED' | 'DOTTED';
     }
     /**
      * DXF rendering options.

package/dist/index.js

@@ -1592,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]);
@@ -1622,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);
@@ -1652,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];
@@ -2256,7 +2257,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) {
@@ -4176,7 +4177,7 @@ var MakerJs;
             if (m) {
                 return augment(m);
             }
-            return m;
+            return null;
         }
         measure.modelExtents = modelExtents;
         /**
@@ -4611,6 +4612,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) {
@@ -4620,9 +4627,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),
@@ -4634,24 +4642,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)
@@ -4660,6 +4672,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
@@ -4681,6 +4694,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) {
@@ -4722,15 +4736,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
                         }
                     }
                 };
@@ -4822,15 +4852,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]
@@ -4841,7 +4883,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");
             };
@@ -4864,11 +4908,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';
@@ -6019,7 +6066,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) {
@@ -6056,7 +6103,7 @@ var MakerJs;
                 _loop_3(layer_2);
             }
             if (beziers) {
-                swapBezierPathsWithSeeds(beziers, false);
+                swapBezierPathsWithSeeds(beziers, false, opts.pointMatchingDistance);
             }
             if (opts.byLayers) {
                 return chainsByLayer;
@@ -6153,7 +6200,7 @@ var MakerJs;
         /**
          * @private
          */
-        function swapBezierPathsWithSeeds(beziers, swap) {
+        function swapBezierPathsWithSeeds(beziers, swap, pointMatchingDistance) {
             var tempKey = 'tempPaths';
             var tempLayerKey = 'tempLayer';
             beziers.forEach(function (wm) {
@@ -6165,7 +6212,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) {
@@ -8584,7 +8631,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();
@@ -8593,7 +8640,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;
                 }
             }
@@ -8602,13 +8649,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
@@ -8770,7 +8817,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);
@@ -8785,7 +8832,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);
@@ -9885,5 +9932,5 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.18.0";
+MakerJs.version = "0.18.2";
 var Bezier = require('bezier-js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.18.0",
+  "version": "0.18.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",
@@ -97,7 +97,7 @@
     "@jscad/csg": "^0.3.7",
     "@jscad/stl-serializer": "^0.1.0",
     "@types/graham_scan": "^1.0.28",
-    "dxf-parser-typings": "^1.3.0"
+    "dxf-parser-typings": "^1.3.1"
   },
   "dependencies": {
     "@danmarshall/jscad-typings": "^1.0.0",