@mlightcad/libredwg-converter 3.7.5 → 3.7.7

package/lib/AcDbEntitiyConverter.d.ts

@@ -19,6 +19,7 @@ export declare class AcDbEntityConverter {
     private convertLine;
     private convertSpline;
     private convertPoint;
+    private convertShape;
     private convertSolid;
     private convertLWPolyline;
     private convertPolyline2d;
@@ -43,11 +44,18 @@ export declare class AcDbEntityConverter {
     private convertBlockReference;
     private processDimensionCommonAttrs;
     private processCommonAttrs;
+    private convertMLeaderEntityColor;
+    private readMLeaderEntityColor;
+    private isValidHandleId;
     private readNumber;
+    private readPositiveNumber;
     private readString;
     private readBoolean;
     private readPoint;
     private readLeaderLineArray;
+    private readMLeaderLeaders;
+    private readMLeaderLine;
+    private readMLeaderBreaks;
     private isPointLike;
 }
 //# sourceMappingURL=AcDbEntitiyConverter.d.ts.map

package/lib/AcDbEntitiyConverter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcDbEntitiyConverter.d.ts","sourceRoot":"","sources":["../src/AcDbEntitiyConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAiBL,UAAU,EAsDa,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAcV,SAAS,EA2BV,MAAM,yBAAyB,CAAA;AAsDhC,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,IAAI;IAQ7C;;;;OAIG;IACH,OAAO,CAAC,YAAY;IA6DpB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,iBAAiB;IAqGzB,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,YAAY;IA0JpB,OAAO,CAAC,YAAY;IAgCpB,OAAO,CAAC,WAAW;IA8BnB,OAAO,CAAC,YAAY;IAoBpB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IA2BpB,OAAO,CAAC,cAAc;IAmKtB,OAAO,CAAC,gBAAgB;IA2ExB,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,sBAAsB;IAiD9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,kBAAkB;IA6D1B,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,WAAW;CAQpB"}
+{"version":3,"file":"AcDbEntitiyConverter.d.ts","sourceRoot":"","sources":["../src/AcDbEntitiyConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAiBL,UAAU,EA0DX,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAcV,SAAS,EA6BV,MAAM,yBAAyB,CAAA;AA0BhC,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,IAAI;IAQ7C;;;;OAIG;IACH,OAAO,CAAC,YAAY;IA+DpB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,YAAY;IAiBpB,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,iBAAiB;IAqGzB,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,YAAY;IA0JpB,OAAO,CAAC,YAAY;IAgCpB,OAAO,CAAC,WAAW;IA8BnB,OAAO,CAAC,YAAY;IAoBpB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IA2BpB,OAAO,CAAC,cAAc;IAqTtB,OAAO,CAAC,gBAAgB;IA2ExB,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,sBAAsB;IAiD9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,kBAAkB;IA6D1B,OAAO,CAAC,yBAAyB;IAIjC,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,kBAAkB;IAqD1B,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,WAAW;CAQpB"}

package/lib/AcDbEntitiyConverter.js

@@ -20,7 +20,7 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-import { AcCmColor, AcCmTransparency, AcDb2dPolyline, AcDb3dPolyline, AcDb3PointAngularDimension, AcDbAlignedDimension, AcDbArc, AcDbAttribute, AcDbAttributeDefinition, AcDbAttributeFlags, AcDbAttributeMTextFlag, AcDbBlockReference, AcDbCircle, AcDbDiametricDimension, AcDbEllipse, AcDbFace, AcDbHatch, AcDbHatchObjectType, AcDbLeader, AcDbLine, AcDbMLeader, AcDbMLeaderContentType, AcDbMLeaderLineType, AcDbMLine, AcDbMText, AcDbOrdinateDimension, AcDbPoint, AcDbPoly2dType, AcDbPoly3dType, AcDbPolyFaceMesh, AcDbPolygonMesh, AcDbPolyline, AcDbProxyEntity, AcDbRadialDimension, AcDbRasterImage, AcDbRay, AcDbRotatedDimension, AcDbSpline, AcDbTable, AcDbText, AcDbTrace, AcDbViewport, AcDbWipeout, AcDbXline, AcGeCircArc2d, AcGeEllipseArc2d, AcGeLine2d, AcGeLoop2d, AcGePoint2d, AcGePoint3d, AcGePolyline2d, AcGeSpline3d, AcGeVector2d, AcGeVector3d, hexStringsToBytes, transformOcsPointToWcs } from '@mlightcad/data-model';
+import { AcCmColor, AcCmTransparency, AcDb2dPolyline, AcDb3dPolyline, AcDb3PointAngularDimension, AcDbAlignedDimension, AcDbArc, AcDbAttribute, AcDbAttributeDefinition, AcDbAttributeFlags, AcDbAttributeMTextFlag, AcDbBlockReference, AcDbCircle, AcDbDiametricDimension, AcDbEllipse, AcDbFace, AcDbHatch, AcDbHatchObjectType, AcDbLeader, AcDbLine, AcDbMLeader, AcDbMLeaderContentType, AcDbMLeaderLineType, AcDbMLine, AcDbMText, AcDbOrdinateDimension, AcDbPoint, AcDbPoly2dType, AcDbPoly3dType, AcDbPolyFaceMesh, AcDbPolygonMesh, AcDbPolyline, AcDbProxyEntity, AcDbRadialDimension, AcDbRasterImage, AcDbRay, AcDbRotatedDimension, AcDbShape, AcDbSpline, AcDbTable, AcDbText, AcDbTrace, AcDbViewport, AcDbWipeout, AcDbXline, AcGeCircArc2d, AcGeEllipseArc2d, AcGeLine2d, AcGeLoop2d, AcGePoint2d, AcGePoint3d, AcGePolyline2d, AcGeSpline3d, AcGeVector2d, AcGeVector3d, decodeMLeaderStyleRawColor, hexStringsToBytes, transformOcsPointToWcs } from '@mlightcad/data-model';
 var AcDbEntityConverter = /** @class */ (function () {
     function AcDbEntityConverter() {
     }
@@ -103,6 +103,9 @@ var AcDbEntityConverter = /** @class */ (function () {
         else if (entity.type == 'TEXT') {
             return this.convertText(entity);
         }
+        else if (entity.type == 'SHAPE') {
+            return this.convertShape(entity);
+        }
         else if (entity.type == 'SOLID') {
             return this.convertSolid(entity);
         }
@@ -205,6 +208,23 @@ var AcDbEntityConverter = /** @class */ (function () {
         dbEntity.position = point.position;
         return dbEntity;
     };
+    AcDbEntityConverter.prototype.convertShape = function (shape) {
+        var _a, _b, _c, _d, _e;
+        var normal = (_a = shape.extrusionDirection) !== null && _a !== void 0 ? _a : AcGeVector3d.Z_AXIS;
+        var dbEntity = new AcDbShape();
+        dbEntity.position = transformOcsPointToWcs(shape.insertionPoint, normal);
+        dbEntity.size = shape.size;
+        dbEntity.shapeNumber = shape.shapeNumber;
+        if (shape.styleName) {
+            dbEntity.styleName = shape.styleName;
+        }
+        dbEntity.rotation = (_b = shape.rotation) !== null && _b !== void 0 ? _b : 0;
+        dbEntity.widthFactor = (_c = shape.xScale) !== null && _c !== void 0 ? _c : 1;
+        dbEntity.oblique = (_d = shape.obliqueAngle) !== null && _d !== void 0 ? _d : 0;
+        dbEntity.thickness = (_e = shape.thickness) !== null && _e !== void 0 ? _e : 0;
+        dbEntity.normal.copy(normal);
+        return dbEntity;
+    };
     AcDbEntityConverter.prototype.convertSolid = function (solid) {
         var dbEntity = new AcDbTrace();
         dbEntity.setPointAt(0, __assign(__assign({}, solid.corner1), { z: 0 }));
@@ -617,58 +637,154 @@ var AcDbEntityConverter = /** @class */ (function () {
         return dbEntity;
     };
     AcDbEntityConverter.prototype.convertMLeader = function (mleader) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         var dbEntity = new AcDbMLeader();
         var raw = mleader;
-        dbEntity.leaderLineType = ((_a = this.readNumber(raw, [
-            'multileaderType',
-            'leaderLineType',
-            'leaderType'
-        ])) !== null && _a !== void 0 ? _a : AcDbMLeaderLineType.StraightLeader);
-        var contentType = (_b = this.readNumber(raw, ['contentType'])) !== null && _b !== void 0 ? _b : (mleader.textContent
+        dbEntity.version = mleader.version;
+        dbEntity.leaderStyleId = mleader.leaderStyleId;
+        if (mleader.leaderStyleId)
+            dbEntity.mleaderStyleId = mleader.leaderStyleId;
+        dbEntity.propertyOverrideFlag = mleader.propertyOverrideFlag;
+        dbEntity.leaderLineType = ((_a = mleader.leaderLineType) !== null && _a !== void 0 ? _a : AcDbMLeaderLineType.StraightLeader);
+        if (mleader.leaderLineColor != null) {
+            dbEntity.leaderLineColor = this.convertMLeaderEntityColor(mleader.leaderLineColor);
+        }
+        dbEntity.leaderLineTypeId = mleader.leaderLineTypeId;
+        dbEntity.leaderLineWeight = mleader.leaderLineWeight;
+        dbEntity.landingEnabled = mleader.landingEnabled;
+        dbEntity.doglegEnabled = (_b = mleader.doglegEnabled) !== null && _b !== void 0 ? _b : false;
+        dbEntity.doglegLength = (_c = mleader.doglegLength) !== null && _c !== void 0 ? _c : 0;
+        dbEntity.arrowheadId = mleader.arrowheadId;
+        dbEntity.arrowheadSize = mleader.arrowheadSize;
+        dbEntity.textStyleId = mleader.textStyleId;
+        dbEntity.textLeftAttachmentType = mleader.textLeftAttachmentType;
+        dbEntity.textRightAttachmentType = mleader.textRightAttachmentType;
+        dbEntity.textAngleType = mleader.textAngleType;
+        dbEntity.textAlignmentType = mleader.textAlignmentType;
+        if (mleader.textColor != null) {
+            dbEntity.textColor = this.convertMLeaderEntityColor(mleader.textColor);
+        }
+        dbEntity.textFrameEnabled = mleader.textFrameEnabled;
+        dbEntity.landingGap = mleader.landingGap;
+        dbEntity.textAttachment = mleader.textAttachment;
+        dbEntity.textFlowDirection = mleader.textFlowDirection;
+        if (this.isValidHandleId(mleader.blockContentId)) {
+            dbEntity.blockContentId = mleader.blockContentId;
+        }
+        if (mleader.blockContentColor != null) {
+            dbEntity.blockContentColor = this.convertMLeaderEntityColor(mleader.blockContentColor);
+        }
+        dbEntity.blockContentRotation = mleader.blockContentRotation;
+        dbEntity.blockContentConnectionType = mleader.blockContentConnectionType;
+        dbEntity.annotativeScaleEnabled = mleader.annotativeScaleEnabled;
+        dbEntity.arrowheadOverrides = mleader.arrowheadOverrides
+            ? mleader.arrowheadOverrides.map(function (item) { return (__assign({}, item)); })
+            : [];
+        dbEntity.blockAttributes = mleader.blockAttributes
+            ? mleader.blockAttributes.map(function (item) { return (__assign({}, item)); })
+            : [];
+        dbEntity.textDirectionNegative = mleader.textDirectionNegative;
+        dbEntity.textAlignInIPE = mleader.textAlignInIPE;
+        dbEntity.bottomTextAttachmentDirection =
+            mleader.bottomTextAttachmentDirection;
+        dbEntity.topTextAttachmentDirection = mleader.topTextAttachmentDirection;
+        dbEntity.contentScale = mleader.contentScale;
+        dbEntity.textLineSpacingStyle = mleader.textLineSpacingStyle;
+        if (mleader.textBackgroundColor != null) {
+            dbEntity.textBackgroundColor = this.convertMLeaderEntityColor(mleader.textBackgroundColor);
+        }
+        dbEntity.textBackgroundScaleFactor = mleader.textBackgroundScaleFactor;
+        dbEntity.textBackgroundTransparency = mleader.textBackgroundTransparency;
+        dbEntity.textBackgroundColorOn = mleader.textBackgroundColorOn;
+        dbEntity.textFillOn = mleader.textFillOn;
+        dbEntity.textColumnType = mleader.textColumnType;
+        dbEntity.textUseAutoHeight = mleader.textUseAutoHeight;
+        dbEntity.textColumnWidth = mleader.textColumnWidth;
+        dbEntity.textColumnGutterWidth = mleader.textColumnGutterWidth;
+        dbEntity.textColumnFlowReversed = mleader.textColumnFlowReversed;
+        dbEntity.textColumnHeight = mleader.textColumnHeight;
+        dbEntity.textUseWordBreak = mleader.textUseWordBreak;
+        dbEntity.hasMText = mleader.hasMText;
+        dbEntity.hasBlock = mleader.hasBlock;
+        dbEntity.planeNormalReversed = mleader.planeNormalReversed;
+        if (mleader.blockContentScale) {
+            dbEntity.blockContentScale = new AcGeVector3d(mleader.blockContentScale);
+        }
+        if (mleader.contentBasePosition) {
+            dbEntity.contentBasePosition = new AcGePoint3d().copy(mleader.contentBasePosition);
+        }
+        if (mleader.textAnchor) {
+            dbEntity.textAnchor = new AcGePoint3d().copy(mleader.textAnchor);
+        }
+        if (mleader.planeOrigin) {
+            dbEntity.planeOrigin = new AcGePoint3d().copy(mleader.planeOrigin);
+        }
+        if (mleader.planeXAxisDirection) {
+            dbEntity.planeXAxisDirection = new AcGeVector3d(mleader.planeXAxisDirection);
+        }
+        if (mleader.planeYAxisDirection) {
+            dbEntity.planeYAxisDirection = new AcGeVector3d(mleader.planeYAxisDirection);
+        }
+        var rawTextContent = raw.textContent;
+        var rawTextContentRecord = rawTextContent && typeof rawTextContent === 'object'
+            ? rawTextContent
+            : undefined;
+        var hasMTextContent = (typeof rawTextContent === 'string' && rawTextContent.length > 0) ||
+            this.readString(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, ['text', 'contents']) !=
+                null ||
+            this.readString(raw, ['text', 'contents', 'mtext']) != null;
+        var contentType = (_d = mleader.contentType) !== null && _d !== void 0 ? _d : (hasMTextContent
             ? AcDbMLeaderContentType.MTextContent
             : mleader.blockContent
                 ? AcDbMLeaderContentType.BlockContent
                 : AcDbMLeaderContentType.NoneContent);
         dbEntity.contentType = contentType;
-        dbEntity.doglegEnabled =
-            (_c = this.readBoolean(raw, ['doglegEnabled', 'enableDogleg'])) !== null && _c !== void 0 ? _c : false;
-        dbEntity.doglegLength = (_d = this.readNumber(raw, ['doglegLength'])) !== null && _d !== void 0 ? _d : 0;
-        if (mleader.landingPoint)
-            dbEntity.landingPoint = mleader.landingPoint;
-        if (mleader.doglegVector)
-            dbEntity.doglegVector = mleader.doglegVector;
-        var styleId = this.readString(raw, [
-            'mleaderStyleId',
-            'mLeaderStyleId',
-            'mleaderStyleHandle',
-            'styleHandle',
-            'styleName'
-        ]);
-        if (styleId)
-            dbEntity.mleaderStyleId = styleId;
         var normal = this.readPoint(raw, ['normal', 'extrusionDirection']);
         if (normal)
             dbEntity.normal = normal;
-        var textContent = mleader.textContent;
-        var textStyleName = (_e = this.readString(textContent !== null && textContent !== void 0 ? textContent : {}, ['styleName', 'textStyleName'])) !== null && _e !== void 0 ? _e : this.readString(raw, ['textStyleName', 'textStyle', 'styleName']);
+        var textStyleName = (_e = this.readString(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, [
+            'styleName',
+            'textStyleName',
+            'textStyle'
+        ])) !== null && _e !== void 0 ? _e : this.readString(raw, ['textStyleName', 'textStyle', 'styleName']);
         if (textStyleName)
             dbEntity.textStyleName = textStyleName;
-        dbEntity.textHeight =
-            (_g = (_f = this.readNumber(textContent !== null && textContent !== void 0 ? textContent : {}, ['textHeight', 'height'])) !== null && _f !== void 0 ? _f : this.readNumber(raw, [
-                'textHeight',
-                'mtextHeight',
-                'textContentHeight'
-            ])) !== null && _g !== void 0 ? _g : dbEntity.textHeight;
-        dbEntity.textWidth =
-            (_j = (_h = this.readNumber(textContent !== null && textContent !== void 0 ? textContent : {}, ['textWidth', 'width'])) !== null && _h !== void 0 ? _h : this.readNumber(raw, ['textWidth', 'mtextWidth', 'textContentWidth'])) !== null && _j !== void 0 ? _j : dbEntity.textWidth;
-        var textRotation = (_k = this.readNumber(textContent !== null && textContent !== void 0 ? textContent : {}, ['textRotation', 'rotation'])) !== null && _k !== void 0 ? _k : this.readNumber(raw, [
+        var textHeight = (_g = (_f = this.readPositiveNumber(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, [
+            'textHeight',
+            'height'
+        ])) !== null && _f !== void 0 ? _f : this.readPositiveNumber(raw, [
+            'textHeight',
+            'mtextHeight',
+            'textContentHeight'
+        ])) !== null && _g !== void 0 ? _g : this.readPositiveNumber(raw, ['arrowheadSize', 'contentScale']);
+        if (textHeight != null)
+            dbEntity.textHeight = textHeight;
+        var textWidth = (_h = this.readPositiveNumber(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, [
+            'textWidth',
+            'width'
+        ])) !== null && _h !== void 0 ? _h : this.readPositiveNumber(raw, [
+            'textWidth',
+            'mtextWidth',
+            'textContentWidth'
+        ]);
+        if (textWidth != null)
+            dbEntity.textWidth = textWidth;
+        dbEntity.textLineSpacingFactor =
+            (_k = (_j = this.readNumber(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, [
+                'lineSpacingFactor',
+                'textLineSpacingFactor'
+            ])) !== null && _j !== void 0 ? _j : this.readNumber(raw, ['textLineSpacingFactor'])) !== null && _k !== void 0 ? _k : dbEntity.textLineSpacingFactor;
+        var textRotation = (_l = this.readNumber(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, [
+            'textRotation',
+            'rotation'
+        ])) !== null && _l !== void 0 ? _l : this.readNumber(raw, [
             'textRotation',
             'mtextRotation',
             'textContentRotation'
         ]);
-        if (textRotation != null)
+        if (textRotation != null) {
             dbEntity.textRotation = textRotation;
+        }
         var textDirection = this.readPoint(raw, [
             'textDirection',
             'mtextDirection',
@@ -680,10 +796,15 @@ var AcDbEntityConverter = /** @class */ (function () {
             'textAttachmentPoint',
             'attachmentPoint'
         ]);
-        if (textAttachmentPoint != null) {
+        if (textAttachmentPoint != null && textAttachmentPoint !== 0) {
             dbEntity.textAttachmentPoint =
                 textAttachmentPoint;
         }
+        var textAttachmentDirection = mleader.textAttachmentDirection;
+        if (textAttachmentDirection != null) {
+            dbEntity.textAttachmentDirection =
+                textAttachmentDirection;
+        }
         var textDrawingDirection = this.readNumber(raw, [
             'textDrawingDirection',
             'drawingDirection'
@@ -692,69 +813,78 @@ var AcDbEntityConverter = /** @class */ (function () {
             dbEntity.textDrawingDirection =
                 textDrawingDirection;
         }
-        if (((_l = mleader.textContent) === null || _l === void 0 ? void 0 : _l.text) != null && mleader.textContent.anchorPoint) {
-            dbEntity.mtextContent = {
-                text: mleader.textContent.text,
-                anchorPoint: mleader.textContent.anchorPoint
-            };
-        }
-        else {
-            var text = this.readString(raw, ['text', 'contents', 'mtext']);
-            var anchorPoint = this.readPoint(raw, [
-                'textLocation',
-                'textPosition',
-                'textAnchorPoint'
-            ]);
-            if (text != null && anchorPoint) {
-                dbEntity.mtextContent = { text: text, anchorPoint: anchorPoint };
+        var text = typeof rawTextContent === 'string'
+            ? rawTextContent
+            : ((_m = this.readString(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, ['text', 'contents'])) !== null && _m !== void 0 ? _m : this.readString(raw, ['text', 'contents', 'mtext']));
+        var anchorPoint = (_o = this.readPoint(rawTextContentRecord !== null && rawTextContentRecord !== void 0 ? rawTextContentRecord : {}, [
+            'anchorPoint',
+            'textAnchor',
+            'textLocation',
+            'textPosition',
+            'textAnchorPoint'
+        ])) !== null && _o !== void 0 ? _o : this.readPoint(raw, [
+            'textAnchor',
+            'textLocation',
+            'textPosition',
+            'textAnchorPoint',
+            'contentBasePosition'
+        ]);
+        if (text != null && anchorPoint) {
+            dbEntity.mtextContent = { text: text, anchorPoint: anchorPoint };
+        }
+        if (mleader.blockContent) {
+            var blockRecord = mleader.blockContent;
+            var blockContentId = mleader.blockContent.blockContentId;
+            if (this.isValidHandleId(blockContentId)) {
+                var rawBlockColor = this.readMLeaderEntityColor(blockRecord, ['color']);
+                dbEntity.blockContent = {
+                    blockContentId: blockContentId,
+                    normal: this.readPoint(blockRecord, ['normal']),
+                    position: mleader.blockContent.position,
+                    scale: this.readPoint(blockRecord, ['scale']),
+                    rotation: this.readNumber(blockRecord, ['rotation']),
+                    color: rawBlockColor,
+                    transformationMatrix: Array.isArray(mleader.blockContent.transformationMatrix)
+                        ? mleader.blockContent.transformationMatrix
+                        : []
+                };
             }
         }
-        if (((_m = mleader.blockContent) === null || _m === void 0 ? void 0 : _m.blockHandle) && mleader.blockContent.position) {
+        else if (this.isValidHandleId(mleader.blockContentId)) {
             dbEntity.blockContent = {
-                blockHandle: mleader.blockContent.blockHandle,
-                position: mleader.blockContent.position
+                blockContentId: mleader.blockContentId,
+                scale: mleader.blockContentScale,
+                rotation: mleader.blockContentRotation,
+                color: dbEntity.blockContentColor,
+                transformationMatrix: []
             };
         }
-        else {
-            var blockHandle = this.readString(raw, [
-                'blockHandle',
-                'blockContentHandle',
-                'blockId'
-            ]);
-            var blockPosition = this.readPoint(raw, [
-                'blockPosition',
-                'blockContentPosition'
-            ]);
-            if (blockHandle && blockPosition) {
-                dbEntity.blockContent = {
-                    blockHandle: blockHandle,
-                    position: blockPosition
-                };
-            }
-        }
-        (_o = mleader.leaders) === null || _o === void 0 ? void 0 : _o.forEach(function (leader) {
-            var _a, _b, _c, _d;
-            var leaderIndex = dbEntity.addLeader({
-                landingPoint: (_a = leader.landingPoint) !== null && _a !== void 0 ? _a : mleader.landingPoint,
-                doglegVector: (_b = leader.doglegVector) !== null && _b !== void 0 ? _b : mleader.doglegVector,
-                doglegLength: (_c = leader.doglegLength) !== null && _c !== void 0 ? _c : mleader.doglegLength
-            });
-            (_d = leader.leaderLines) === null || _d === void 0 ? void 0 : _d.forEach(function (line) {
-                var _a, _b;
-                var lineIndex = dbEntity.addLeaderLine(leaderIndex, (_a = line.vertices) !== null && _a !== void 0 ? _a : []);
-                (_b = line.breaks) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
-                    dbEntity.addBreak(leaderIndex, lineIndex, item.start, item.end);
-                });
+        (_p = this.readMLeaderLeaders(raw)) === null || _p === void 0 ? void 0 : _p.forEach(function (leader) {
+            var _a;
+            dbEntity.addLeader({
+                lastLeaderLinePoint: leader.lastLeaderLinePoint,
+                lastLeaderLinePointSet: leader.lastLeaderLinePointSet,
+                doglegVector: leader.doglegVector,
+                doglegVectorSet: leader.doglegVectorSet,
+                doglegLength: (_a = leader.doglegLength) !== null && _a !== void 0 ? _a : mleader.doglegLength,
+                breaks: leader.breaks,
+                leaderBranchIndex: leader.leaderBranchIndex,
+                leaderLines: leader.leaderLines
             });
         });
         if (dbEntity.numberOfLeaders === 0) {
-            (_p = this.readLeaderLineArray(raw)) === null || _p === void 0 ? void 0 : _p.forEach(function (line) {
-                var leaderIndex = dbEntity.addLeader({
-                    landingPoint: mleader.landingPoint,
-                    doglegVector: mleader.doglegVector,
+            (_q = this.readLeaderLineArray(raw)) === null || _q === void 0 ? void 0 : _q.forEach(function (line) {
+                dbEntity.addLeader({
                     doglegLength: mleader.doglegLength
                 });
-                dbEntity.addLeaderLine(leaderIndex, line);
+                dbEntity.addLeaderLine(dbEntity.numberOfLeaders - 1, line);
+            });
+        }
+        if (dbEntity.numberOfLeaders === 0 && mleader.contentBasePosition) {
+            dbEntity.addLeader({
+                lastLeaderLinePoint: mleader.contentBasePosition,
+                lastLeaderLinePointSet: true,
+                doglegLength: mleader.doglegLength
             });
         }
         return dbEntity;
@@ -1036,14 +1166,18 @@ var AcDbEntityConverter = /** @class */ (function () {
             dbEntity.transparency = transparency;
         }
     };
-    AcDbEntityConverter.prototype.readNumber = function (source, names) {
+    AcDbEntityConverter.prototype.convertMLeaderEntityColor = function (color) {
+        return decodeMLeaderStyleRawColor(color);
+    };
+    AcDbEntityConverter.prototype.readMLeaderEntityColor = function (source, names) {
         var e_1, _a;
         try {
             for (var names_1 = __values(names), names_1_1 = names_1.next(); !names_1_1.done; names_1_1 = names_1.next()) {
                 var name_1 = names_1_1.value;
                 var value = source[name_1];
-                if (typeof value === 'number' && Number.isFinite(value))
-                    return value;
+                if (typeof value === 'number' && Number.isFinite(value)) {
+                    return decodeMLeaderStyleRawColor(value);
+                }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -1055,13 +1189,16 @@ var AcDbEntityConverter = /** @class */ (function () {
         }
         return undefined;
     };
-    AcDbEntityConverter.prototype.readString = function (source, names) {
+    AcDbEntityConverter.prototype.isValidHandleId = function (id) {
+        return id != null && id !== '' && id !== '0';
+    };
+    AcDbEntityConverter.prototype.readNumber = function (source, names) {
         var e_2, _a;
         try {
             for (var names_2 = __values(names), names_2_1 = names_2.next(); !names_2_1.done; names_2_1 = names_2.next()) {
                 var name_2 = names_2_1.value;
                 var value = source[name_2];
-                if (typeof value === 'string')
+                if (typeof value === 'number' && Number.isFinite(value))
                     return value;
             }
         }
@@ -1074,16 +1211,18 @@ var AcDbEntityConverter = /** @class */ (function () {
         }
         return undefined;
     };
-    AcDbEntityConverter.prototype.readBoolean = function (source, names) {
+    AcDbEntityConverter.prototype.readPositiveNumber = function (source, names) {
+        var value = this.readNumber(source, names);
+        return value != null && value > 0 ? value : undefined;
+    };
+    AcDbEntityConverter.prototype.readString = function (source, names) {
         var e_3, _a;
         try {
             for (var names_3 = __values(names), names_3_1 = names_3.next(); !names_3_1.done; names_3_1 = names_3.next()) {
                 var name_3 = names_3_1.value;
                 var value = source[name_3];
-                if (typeof value === 'boolean')
+                if (typeof value === 'string')
                     return value;
-                if (typeof value === 'number')
-                    return value !== 0;
             }
         }
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -1095,13 +1234,34 @@ var AcDbEntityConverter = /** @class */ (function () {
         }
         return undefined;
     };
-    AcDbEntityConverter.prototype.readPoint = function (source, names) {
+    AcDbEntityConverter.prototype.readBoolean = function (source, names) {
         var e_4, _a;
-        var _b;
         try {
             for (var names_4 = __values(names), names_4_1 = names_4.next(); !names_4_1.done; names_4_1 = names_4.next()) {
                 var name_4 = names_4_1.value;
                 var value = source[name_4];
+                if (typeof value === 'boolean')
+                    return value;
+                if (typeof value === 'number')
+                    return value !== 0;
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (names_4_1 && !names_4_1.done && (_a = names_4.return)) _a.call(names_4);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+        return undefined;
+    };
+    AcDbEntityConverter.prototype.readPoint = function (source, names) {
+        var e_5, _a;
+        var _b;
+        try {
+            for (var names_5 = __values(names), names_5_1 = names_5.next(); !names_5_1.done; names_5_1 = names_5.next()) {
+                var name_5 = names_5_1.value;
+                var value = source[name_5];
                 if (this.isPointLike(value))
                     return value;
                 if (Array.isArray(value) &&
@@ -1111,12 +1271,12 @@ var AcDbEntityConverter = /** @class */ (function () {
                 }
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
-                if (names_4_1 && !names_4_1.done && (_a = names_4.return)) _a.call(names_4);
+                if (names_5_1 && !names_5_1.done && (_a = names_5.return)) _a.call(names_5);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         return undefined;
     };
@@ -1142,6 +1302,107 @@ var AcDbEntityConverter = /** @class */ (function () {
         }
         return undefined;
     };
+    AcDbEntityConverter.prototype.readMLeaderLeaders = function (source) {
+        var _this = this;
+        var leaders = source.leaderSections;
+        if (!Array.isArray(leaders))
+            return undefined;
+        var dbLeaders = [];
+        leaders.forEach(function (leader) {
+            if (!leader || typeof leader !== 'object')
+                return;
+            var leaderRecord = leader;
+            var leaderLines = leaderRecord.leaderLines;
+            var lines = Array.isArray(leaderLines)
+                ? leaderLines.reduce(function (result, line) {
+                    var dbLine = _this.readMLeaderLine(line);
+                    if (dbLine)
+                        result.push(dbLine);
+                    return result;
+                }, [])
+                : undefined;
+            var dbLeader = {};
+            var lastLeaderLinePoint = _this.readPoint(leaderRecord, [
+                'lastLeaderLinePoint'
+            ]);
+            var doglegVector = _this.readPoint(leaderRecord, ['doglegVector']);
+            var doglegLength = _this.readNumber(leaderRecord, ['doglegLength']);
+            var leaderBreaks = _this.readMLeaderBreaks(leaderRecord.breaks);
+            var leaderBranchIndex = _this.readNumber(leaderRecord, [
+                'leaderBranchIndex'
+            ]);
+            if (lastLeaderLinePoint)
+                dbLeader.lastLeaderLinePoint = lastLeaderLinePoint;
+            if (leaderRecord.lastLeaderLinePointSet != null) {
+                dbLeader.lastLeaderLinePointSet = _this.readBoolean(leaderRecord, [
+                    'lastLeaderLinePointSet'
+                ]);
+            }
+            if (doglegVector)
+                dbLeader.doglegVector = doglegVector;
+            if (leaderRecord.doglegVectorSet != null) {
+                dbLeader.doglegVectorSet = _this.readBoolean(leaderRecord, [
+                    'doglegVectorSet'
+                ]);
+            }
+            if (doglegLength != null)
+                dbLeader.doglegLength = doglegLength;
+            if (leaderBreaks)
+                dbLeader.breaks = leaderBreaks;
+            if (leaderBranchIndex != null) {
+                dbLeader.leaderBranchIndex = leaderBranchIndex;
+            }
+            if (lines)
+                dbLeader.leaderLines = lines;
+            dbLeaders.push(dbLeader);
+        });
+        return dbLeaders;
+    };
+    AcDbEntityConverter.prototype.readMLeaderLine = function (value) {
+        var _this = this;
+        if (!value || typeof value !== 'object')
+            return undefined;
+        var lineRecord = value;
+        var vertices = lineRecord.vertices;
+        var dbVertices = Array.isArray(vertices)
+            ? vertices.filter(function (point) { return _this.isPointLike(point); })
+            : [];
+        var dbBreaks = this.readMLeaderBreaks(lineRecord.breaks);
+        var breakPointIndexes = Array.isArray(lineRecord.breakPointIndexes)
+            ? lineRecord.breakPointIndexes.filter(function (item) { return typeof item === 'number'; })
+            : undefined;
+        var leaderLineIndex = this.readNumber(lineRecord, ['leaderLineIndex']);
+        return dbVertices.length > 0 || (dbBreaks && dbBreaks.length > 0)
+            ? {
+                vertices: dbVertices,
+                breakPointIndexes: breakPointIndexes,
+                leaderLineIndex: leaderLineIndex,
+                breaks: dbBreaks
+            }
+            : undefined;
+    };
+    AcDbEntityConverter.prototype.readMLeaderBreaks = function (value) {
+        var _this = this;
+        if (!Array.isArray(value))
+            return undefined;
+        var breaks = value
+            .map(function (item) {
+            if (!item || typeof item !== 'object')
+                return undefined;
+            var breakRecord = item;
+            var start = _this.readPoint(breakRecord, ['start']);
+            var end = _this.readPoint(breakRecord, ['end']);
+            var index = _this.readNumber(breakRecord, ['index']);
+            if (!start || !end)
+                return undefined;
+            var parsed = { start: start, end: end };
+            if (index != null)
+                parsed.index = index;
+            return parsed;
+        })
+            .filter(function (item) { return !!item; });
+        return breaks.length > 0 ? breaks : undefined;
+    };
     AcDbEntityConverter.prototype.isPointLike = function (value) {
         return (!!value &&
             typeof value === 'object' &&