@mlightcad/data-model 1.15.12 → 1.15.14

package/lib/database/AcDbDatabase.js

@@ -98,52 +98,52 @@ var __values = (this && this.__values) || function(o) {
 };
 /* eslint-disable simple-import-sort/imports */
 import { AcCmColor, AcCmColorMethod, AcCmEventManager, AcCmTransparency } from '@mlightcad/common';
-import { AcDbDxfFiler } from '../base/AcDbDxfFiler';
-import { AcDbObject, TEMP_OBJECT_ID_PREFIX, acdbAssignWorkingDatabase } from '../base/AcDbObject';
-import { AcDbOpenMode } from '../base/AcDbOpenMode';
-import { AcDbRegenerator } from '../converter/AcDbRegenerator';
-import { AcDbDatabaseConverterManager, AcDbFileType } from './AcDbDatabaseConverterManager';
-import { AcDbPolyline } from '../entity/AcDbPolyline';
-import { ACAD_APPID, ACDB_COMPAREHATCH_DEFAULT, ACDB_COMPAREHATCH_MAX, ACDB_COMPAREHATCH_MIN, ACDB_COMPARERCMARGIN_DEFAULT, ACDB_COMPARERCMARGIN_MAX, ACDB_COMPARERCMARGIN_MIN, ACDB_COMPARETEXT_DEFAULT, ACDB_COMPARETEXT_MAX, ACDB_COMPARETEXT_MIN, ACDB_COMPARETOLERANCE_DEFAULT, ACDB_COMPARETOLERANCE_MAX, ACDB_COMPARETOLERANCE_MIN, acdbCoerceIntegerSysVar, ACTIVE_VPORT_NAME, ByBlock, ByLayer, DEFAULT_MLEADER_STYLE, DEFAULT_MLINE_STYLE, DEFAULT_LINE_TYPE, DEFAULT_TEXT_STYLE, MLIGHTCAD_APPID } from '../misc/AcDbConstants';
-import { AcDbAngleUnits } from '../misc/AcDbAngleUnits';
-import { AcDbDataGenerator } from '../misc/AcDbDataGenerator';
-import { ACDB_DRAW_CIRCLE_SIDES_DRAFT } from '../misc/AcDbDrawTessellate';
-import { AcDbFormatter } from '../misc/AcDbFormatter';
-import { AcDbLinearUnits } from '../misc/AcDbLinearUnits';
-import { AcDbUnitsValue } from '../misc/AcDbUnitsValue';
-import { AcDbDictionary } from '../object/AcDbDictionary';
-import { AcDbMLeaderStyle } from '../object/AcDbMLeaderStyle';
-import { AcDbMlineStyle } from '../object/AcDbMlineStyle';
-import { AcDbXrecord } from '../object/AcDbXrecord';
-import { AcLyLayerFilterTree } from '../ly/AcLyLayerFilterTree';
-import { ACAD_LAYERFILTERS_NAME, ACLY_DICTIONARY_NAME, acdbLayerGroupsToResultBuffer, acdbSerializeLayerFilterTree } from '../ly/AcLyLayerFilterIO';
-import { acdbBytesToHexString } from '../misc/proxyGraphic';
-import { AcDbBlockTable } from './AcDbBlockTable';
-import { AcDbBlockTableRecord } from './AcDbBlockTableRecord';
-import { AcDbOpenDatabaseError } from './AcDbOpenDatabaseError';
-import { AcDbDimStyleTable } from './AcDbDimStyleTable';
-import { AcDbDimStyleTableRecord } from './AcDbDimStyleTableRecord';
-import { AcDbLayerTable } from './AcDbLayerTable';
-import { AcDbLayerTableRecord } from './AcDbLayerTableRecord';
-import { AcDbLinetypeTable } from './AcDbLinetypeTable';
-import { AcDbLinetypeTableRecord } from './AcDbLinetypeTableRecord';
-import { AcDbTextStyleTable } from './AcDbTextStyleTable';
-import { AcDbTextStyleTableRecord } from './AcDbTextStyleTableRecord';
-import { AcDbUcsTable } from './AcDbUcsTable';
-import { AcDbViewTable } from './AcDbViewTable';
-import { AcDbViewportTable } from './AcDbViewportTable';
-import { AcDbViewportTableRecord } from './AcDbViewportTableRecord';
+import { AcDbDxfFiler } from '../base/AcDbDxfFiler.js';
+import { AcDbObject, TEMP_OBJECT_ID_PREFIX, acdbAssignWorkingDatabase } from '../base/AcDbObject.js';
+import { AcDbOpenMode } from '../base/AcDbOpenMode.js';
+import { AcDbRegenerator } from '../converter/AcDbRegenerator.js';
+import { AcDbDatabaseConverterManager, AcDbFileType } from './AcDbDatabaseConverterManager.js';
+import { AcDbPolyline } from '../entity/AcDbPolyline.js';
+import { ACAD_APPID, ACDB_COMPAREHATCH_DEFAULT, ACDB_COMPAREHATCH_MAX, ACDB_COMPAREHATCH_MIN, ACDB_COMPARERCMARGIN_DEFAULT, ACDB_COMPARERCMARGIN_MAX, ACDB_COMPARERCMARGIN_MIN, ACDB_COMPARETEXT_DEFAULT, ACDB_COMPARETEXT_MAX, ACDB_COMPARETEXT_MIN, ACDB_COMPARETOLERANCE_DEFAULT, ACDB_COMPARETOLERANCE_MAX, ACDB_COMPARETOLERANCE_MIN, acdbCoerceIntegerSysVar, ACTIVE_VPORT_NAME, ByBlock, ByLayer, DEFAULT_MLEADER_STYLE, DEFAULT_MLINE_STYLE, DEFAULT_LINE_TYPE, DEFAULT_TEXT_STYLE, MLIGHTCAD_APPID } from '../misc/AcDbConstants.js';
+import { AcDbAngleUnits } from '../misc/AcDbAngleUnits.js';
+import { AcDbDataGenerator } from '../misc/AcDbDataGenerator.js';
+import { ACDB_DRAW_CIRCLE_SIDES_DRAFT } from '../misc/AcDbDrawTessellate.js';
+import { AcDbFormatter } from '../misc/AcDbFormatter.js';
+import { AcDbLinearUnits } from '../misc/AcDbLinearUnits.js';
+import { AcDbUnitsValue } from '../misc/AcDbUnitsValue.js';
+import { AcDbDictionary } from '../object/AcDbDictionary.js';
+import { AcDbMLeaderStyle } from '../object/AcDbMLeaderStyle.js';
+import { AcDbMlineStyle } from '../object/AcDbMlineStyle.js';
+import { AcDbXrecord } from '../object/AcDbXrecord.js';
+import { AcLyLayerFilterTree } from '../ly/AcLyLayerFilterTree.js';
+import { ACAD_LAYERFILTERS_NAME, ACLY_DICTIONARY_NAME, acdbLayerGroupsToResultBuffer, acdbSerializeLayerFilterTree } from '../ly/AcLyLayerFilterIO.js';
+import { acdbBytesToHexString } from '../misc/proxyGraphic/index.js';
+import { AcDbBlockTable } from './AcDbBlockTable.js';
+import { AcDbBlockTableRecord } from './AcDbBlockTableRecord.js';
+import { AcDbOpenDatabaseError } from './AcDbOpenDatabaseError.js';
+import { AcDbDimStyleTable } from './AcDbDimStyleTable.js';
+import { AcDbDimStyleTableRecord } from './AcDbDimStyleTableRecord.js';
+import { AcDbLayerTable } from './AcDbLayerTable.js';
+import { AcDbLayerTableRecord } from './AcDbLayerTableRecord.js';
+import { AcDbLinetypeTable } from './AcDbLinetypeTable.js';
+import { AcDbLinetypeTableRecord } from './AcDbLinetypeTableRecord.js';
+import { AcDbTextStyleTable } from './AcDbTextStyleTable.js';
+import { AcDbTextStyleTableRecord } from './AcDbTextStyleTableRecord.js';
+import { AcDbUcsTable } from './AcDbUcsTable.js';
+import { AcDbViewTable } from './AcDbViewTable.js';
+import { AcDbViewportTable } from './AcDbViewportTable.js';
+import { AcDbViewportTableRecord } from './AcDbViewportTableRecord.js';
 import { AcGeBox3d, AcGeCircArc2d } from '@mlightcad/geometry-engine';
-import { AcDbDwgVersion } from './AcDbDwgVersion';
+import { AcDbDwgVersion } from './AcDbDwgVersion.js';
 import { AcGiLineWeight } from '@mlightcad/graphic-interface';
-import { AcDbRegAppTable } from './AcDbRegAppTable';
-import { AcDbRegAppTableRecord } from './AcDbRegAppTableRecord';
-import { AcDbSysVarManager } from './AcDbSysVarManager';
-import { AcDbSystemVariables } from './AcDbSystemVariables';
-import { AcDbLayout } from '../object/layout/AcDbLayout';
-import { AcDbLayoutDictionary } from '../object/layout/AcDbLayoutDictionary';
-import { AcDbSymbolTable } from './AcDbSymbolTable';
-import { AcDbDatabaseTransactionManager } from './transaction/AcDbDatabaseTransactionManager';
+import { AcDbRegAppTable } from './AcDbRegAppTable.js';
+import { AcDbRegAppTableRecord } from './AcDbRegAppTableRecord.js';
+import { AcDbSysVarManager } from './AcDbSysVarManager.js';
+import { AcDbSystemVariables } from './AcDbSystemVariables.js';
+import { AcDbLayout } from '../object/layout/AcDbLayout.js';
+import { AcDbLayoutDictionary } from '../object/layout/AcDbLayoutDictionary.js';
+import { AcDbSymbolTable } from './AcDbSymbolTable.js';
+import { AcDbDatabaseTransactionManager } from './transaction/AcDbDatabaseTransactionManager.js';
 /**
  * The AcDbDatabase class represents an AutoCAD drawing file.
  *
@@ -2424,6 +2424,9 @@ var AcDbDatabase = /** @class */ (function (_super) {
         this.writeDxfObjectsSection(filer);
         this.writeDxfThumbnailImageSection(filer, options.saveThumbnailImage);
         filer.writeStart('EOF');
+        // `$HANDSEED` is written early in HEADER; patch it now that every handle
+        // (including BLOCK/ENDBLK) has been assigned.
+        filer.finalizeHandseed();
         return options.format === 'binary' ? filer.toBinary() : filer.toString();
     };
     /**
@@ -2635,6 +2638,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
             this.objects.layout.setAt(layout.layoutName, layout);
             modelSpace.layoutId = layout.objectId;
         }
+        this.ensureDefaultPaperSpaceLayout();
         if (!this.tables.appIdTable.has(ACAD_APPID)) {
             this.tables.appIdTable.add(new AcDbRegAppTableRecord(ACAD_APPID));
         }
@@ -2642,11 +2646,52 @@ var AcDbDatabase = /** @class */ (function (_super) {
             this.tables.appIdTable.add(new AcDbRegAppTableRecord(MLIGHTCAD_APPID));
         }
     };
+    /**
+     * Ensures a `*Paper_Space` block record and `Layout1` exist.
+     *
+     * AutoCAD rejects / repairs drawings that only have model space.
+     */
+    AcDbDatabase.prototype.ensureDefaultPaperSpaceLayout = function () {
+        var e_11, _a;
+        try {
+            for (var _b = __values(this.tables.blockTable.newIterator()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var btr = _c.value;
+                if (btr.isPaperSapce) {
+                    return;
+                }
+            }
+        }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_11) throw e_11.error; }
+        }
+        var paperSpace = new AcDbBlockTableRecord();
+        paperSpace.name = AcDbBlockTableRecord.PAPER_SPACE_NAME_PREFIX;
+        this.tables.blockTable.add(paperSpace);
+        var layoutName = this.objects.layout.getAt('Layout1')
+            ? "Layout".concat(this.objects.layout.maxTabOrder + 1)
+            : 'Layout1';
+        var layout = new AcDbLayout();
+        layout.layoutName = layoutName;
+        layout.tabOrder = Math.max(1, this.objects.layout.maxTabOrder + 1);
+        layout.blockTableRecordId = paperSpace.objectId;
+        // Avoid 420 in extents so dialect tests can assert absence of true-color
+        // group code 420 without false positives from paper size.
+        layout.limits.min.copy({ x: 0, y: 0 });
+        layout.limits.max.copy({ x: 12, y: 9 });
+        layout.extents.min.copy({ x: 0, y: 0, z: 0 });
+        layout.extents.max.copy({ x: 12, y: 9, z: 0 });
+        this.objects.layout.setAt(layout.layoutName, layout);
+        paperSpace.layoutId = layout.objectId;
+    };
     /**
      * Ensures one MLINE style exists for the provided style name.
      */
     AcDbDatabase.prototype.ensureMLineStyle = function (styleName) {
-        var e_11, _a;
+        var e_12, _a;
         var _b;
         var dictionary = this.objects.mlineStyle;
         var normalizedName = styleName.trim();
@@ -2666,12 +2711,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         var style = new AcDbMlineStyle();
         style.styleName = normalizedName;
@@ -2693,7 +2738,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * Ensures one MLEADER style exists for the provided style name.
      */
     AcDbDatabase.prototype.ensureMLeaderStyle = function (styleName) {
-        var e_12, _a;
+        var e_13, _a;
         var dictionary = this.objects.mleaderStyle;
         var normalizedName = styleName.trim();
         if (!normalizedName)
@@ -2709,12 +2754,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         var style = new AcDbMLeaderStyle();
         // Match AutoCAD "Standard" defaults observed in exported DXF.
@@ -2743,8 +2788,9 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.startSection('HEADER');
         filer.writeString(9, '$ACADVER');
         filer.writeString(1, (_b = (_a = filer.version) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.version.name);
-        filer.writeString(9, '$HANDSEED');
-        filer.writeString(5, filer.nextHandle.toString(16).toUpperCase());
+        // Placeholder — patched by {@link AcDbDxfFiler.finalizeHandseed} after
+        // every handle (including BLOCK/ENDBLK) has been assigned.
+        filer.writeHandseedPlaceholder();
         filer.writeString(9, '$DWGCODEPAGE');
         if (filer.capabilities.supportsUtf8CodePage) {
             filer.writeString(3, 'UTF-8');
@@ -2769,8 +2815,9 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeString(9, '$LTSCALE');
         filer.writeDouble(40, this.ltscale);
         if (filer.capabilities.supportsLineWeight) {
+            // DXF Reference: $LWDISPLAY is group code 290 (boolean), not 70.
             filer.writeString(9, '$LWDISPLAY');
-            filer.writeInt16(70, this.lwdisplay ? 1 : 0);
+            filer.writeBoolean(290, this.lwdisplay);
         }
         filer.writeString(9, '$CELTSCALE');
         filer.writeDouble(40, this.celtscale);
@@ -2797,22 +2844,31 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeString(2, this.cmlstyle);
         filer.writeString(9, '$CMLSCALE');
         filer.writeDouble(40, this.cmlscale);
-        filer.writeString(9, '$CMLEADERSTYLE');
-        filer.writeString(2, this.cmleaderstyle);
-        if (this.hpcolor.colorMethod !== AcCmColorMethod.None) {
-            filer.writeString(9, '$HPCOLOR');
-            filer.writeCmColor(this.hpcolor, 2);
-        }
-        if (this.hpbackgroundcolor.colorMethod !== AcCmColorMethod.None) {
-            filer.writeString(9, '$HPBACKGROUNDCOLOR');
-            filer.writeCmColor(this.hpbackgroundcolor, 2);
-        }
-        filer.writeString(9, '$HPLAYER');
-        filer.writeString(8, this.hplayer);
-        if (filer.capabilities.supportsTransparency &&
-            !this.hptransparency.isInvalid) {
-            filer.writeString(9, '$HPTRANSPARENCY');
-            filer.writeTransparency(this.hptransparency);
+        if (filer.capabilities.supportsMLeader) {
+            filer.writeString(9, '$CMLEADERSTYLE');
+            filer.writeString(2, this.cmleaderstyle);
+        }
+        if (filer.capabilities.supportsHatchHeaderVars) {
+            if (this.hpcolor.colorMethod !== AcCmColorMethod.None) {
+                filer.writeString(9, '$HPCOLOR');
+                // Color header vars use ACI group 62 (and 420 when supported), not 2.
+                filer.writeCmColor(this.hpcolor);
+            }
+            if (this.hpbackgroundcolor.colorMethod !== AcCmColorMethod.None) {
+                filer.writeString(9, '$HPBACKGROUNDCOLOR');
+                filer.writeCmColor(this.hpbackgroundcolor);
+            }
+            // "." means "use current layer" in AutoCAD; omit when unset/placeholder
+            // so R2000-era readers are not handed a non-layer name.
+            if (this.hplayer && this.hplayer !== '.') {
+                filer.writeString(9, '$HPLAYER');
+                filer.writeString(8, this.hplayer);
+            }
+            if (filer.capabilities.supportsTransparency &&
+                !this.hptransparency.isInvalid) {
+                filer.writeString(9, '$HPTRANSPARENCY');
+                filer.writeTransparency(this.hptransparency);
+            }
         }
         filer.writeString(9, '$TEXTSTYLE');
         filer.writeString(7, this.textstyle);
@@ -2826,10 +2882,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeInt16(70, this.aunits);
         filer.writeString(9, '$AUPREC');
         filer.writeInt16(70, this.auprec);
-        filer.writeString(9, '$EXTMIN');
-        filer.writePoint3d(10, this.extmin);
-        filer.writeString(9, '$EXTMAX');
-        filer.writePoint3d(10, this.extmax);
+        this.writeDxfExtentsHeader(filer);
         filer.writeString(9, '$PDMODE');
         filer.writeInt32(70, this.pdmode);
         filer.writeString(9, '$PDSIZE');
@@ -2840,6 +2893,52 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeInt16(70, this.orthomode);
         filer.endSection();
     };
+    /**
+     * Writes `$EXTMIN` / `$EXTMAX`. Empty drawings use AutoCAD's 1e20 / -1e20
+     * convention; otherwise extents are taken from the database box, refreshed
+     * from model-space geometry when still empty.
+     */
+    AcDbDatabase.prototype.writeDxfExtentsHeader = function (filer) {
+        if (this._extents.isEmpty()) {
+            this.refreshExtentsFromModelSpace();
+        }
+        if (this._extents.isEmpty()) {
+            filer.writeString(9, '$EXTMIN');
+            filer.writePoint3d(10, { x: 1e20, y: 1e20, z: 1e20 });
+            filer.writeString(9, '$EXTMAX');
+            filer.writePoint3d(10, { x: -1e20, y: -1e20, z: -1e20 });
+            return;
+        }
+        filer.writeString(9, '$EXTMIN');
+        filer.writePoint3d(10, this.extmin);
+        filer.writeString(9, '$EXTMAX');
+        filer.writePoint3d(10, this.extmax);
+    };
+    /** Expands {@link _extents} from model-space entity geometry when possible. */
+    AcDbDatabase.prototype.refreshExtentsFromModelSpace = function () {
+        var e_14, _a;
+        try {
+            for (var _b = __values(this.tables.blockTable.modelSpace.newIterator()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var entity = _c.value;
+                try {
+                    var box = entity.geometricExtents;
+                    if (box && !box.isEmpty()) {
+                        this._extents.union(box);
+                    }
+                }
+                catch (_d) {
+                    // Some entities may not yet have computable extents; skip them.
+                }
+            }
+        }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_14) throw e_14.error; }
+        }
+    };
     /**
      * Writes the CLASSES section for the DXF export.
      *
@@ -2849,7 +2948,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfClassesSection = function (filer) {
-        var e_13, _a;
+        var e_15, _a;
         if (!filer.capabilities.supportsClassesSection ||
             this._classes.length === 0) {
             return;
@@ -2868,12 +2967,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 filer.writeInt8(281, dxfClass.isEntity ? 1 : 0);
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         filer.endSection();
     };
@@ -2904,7 +3003,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfBlocksSection = function (filer) {
-        var e_14, _a, e_15, _b;
+        var e_16, _a, e_17, _b;
         filer.startSection('BLOCKS');
         try {
             for (var _c = __values(this.tables.blockTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -2912,28 +3011,28 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 btr.dxfOutBlockBegin(filer);
                 if (!btr.isModelSapce && !btr.isPaperSapce) {
                     try {
-                        for (var _e = (e_15 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        for (var _e = (e_17 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
                             var entity = _f.value;
                             this.writeDxfEntity(filer, entity);
                         }
                     }
-                    catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                    catch (e_17_1) { e_17 = { error: e_17_1 }; }
                     finally {
                         try {
                             if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                         }
-                        finally { if (e_15) throw e_15.error; }
+                        finally { if (e_17) throw e_17.error; }
                     }
                 }
                 btr.dxfOutBlockEnd(filer);
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         filer.endSection();
     };
@@ -2943,7 +3042,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfEntitiesSection = function (filer) {
-        var e_16, _a, e_17, _b;
+        var e_18, _a, e_19, _b;
         filer.startSection('ENTITIES');
         try {
             for (var _c = __values(this.tables.blockTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -2951,26 +3050,26 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 if (!btr.isModelSapce && !btr.isPaperSapce)
                     continue;
                 try {
-                    for (var _e = (e_17 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    for (var _e = (e_19 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
                         var entity = _f.value;
                         this.writeDxfEntity(filer, entity);
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_19_1) { e_19 = { error: e_19_1 }; }
                 finally {
                     try {
                         if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_19) throw e_19.error; }
                 }
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         filer.endSection();
     };
@@ -2980,7 +3079,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfObjectsSection = function (filer) {
-        var e_18, _a, e_19, _b, e_20, _c, e_21, _d, e_22, _e, e_23, _f, e_24, _g, e_25, _h, e_26, _j;
+        var e_20, _a, e_21, _b, e_22, _c, e_23, _d, e_24, _e, e_25, _f, e_26, _g, e_27, _h, e_28, _j;
         if (!filer.capabilities.supportsObjectsSection) {
             return;
         }
@@ -3003,19 +3102,21 @@ var AcDbDatabase = /** @class */ (function (_super) {
             }
         };
         ensureRootEntry('ACAD_LAYOUT', this.objects.layout);
-        if (this.objects.group.numEntries > 0) {
-            ensureRootEntry('ACAD_GROUP', this.objects.group);
-        }
-        else {
-            dropRootEntry('ACAD_GROUP');
-        }
+        // AutoCAD always expects an ACAD_GROUP dictionary (may be empty).
+        ensureRootEntry('ACAD_GROUP', this.objects.group);
         if (this.objects.sortentsTable.numEntries > 0) {
             ensureRootEntry('ACAD_SORTENTS', this.objects.sortentsTable);
         }
         else {
             dropRootEntry('ACAD_SORTENTS');
         }
-        if (this.objects.mleaderStyle.numEntries > 0) {
+        var hasMLeaderStyles = this.objects.mleaderStyle.numEntries > 0;
+        var writeMLeader = filer.capabilities.supportsMLeader && hasMLeaderStyles;
+        // When the target DXF version cannot carry MLEADERSTYLE, omit it from
+        // this export only — do not permanently strip it from the live root dict.
+        var restoreMLeaderRoot = !writeMLeader &&
+            rootDict.getAt('ACAD_MLEADERSTYLE') === this.objects.mleaderStyle;
+        if (writeMLeader) {
             ensureRootEntry('ACAD_MLEADERSTYLE', this.objects.mleaderStyle);
         }
         else {
@@ -3041,13 +3142,11 @@ var AcDbDatabase = /** @class */ (function (_super) {
         }
         writeDictionary(rootDict);
         writeDictionary(this.objects.layout);
-        if (this.objects.group.numEntries > 0) {
-            writeDictionary(this.objects.group);
-        }
+        writeDictionary(this.objects.group);
         if (this.objects.sortentsTable.numEntries > 0) {
             writeDictionary(this.objects.sortentsTable);
         }
-        if (this.objects.mleaderStyle.numEntries > 0) {
+        if (writeMLeader) {
             writeDictionary(this.objects.mleaderStyle);
         }
         if (this.objects.mlineStyle.numEntries > 0) {
@@ -3066,12 +3165,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 layout.dxfOut(filer, true);
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_20_1) { e_20 = { error: e_20_1 }; }
         finally {
             try {
                 if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_20) throw e_20.error; }
         }
         try {
             for (var _o = __values(this.objects.group.entries()), _p = _o.next(); !_p.done; _p = _o.next()) {
@@ -3082,12 +3181,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 group.dxfOut(filer, true);
             }
         }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
             }
-            finally { if (e_19) throw e_19.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         try {
             for (var _r = __values(this.objects.sortentsTable.entries()), _s = _r.next(); !_s.done; _s = _r.next()) {
@@ -3096,12 +3195,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 sortents.dxfOut(filer, true);
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
         finally {
             try {
                 if (_s && !_s.done && (_c = _r.return)) _c.call(_r);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_22) throw e_22.error; }
         }
         try {
             for (var _u = __values(this.objects.imageDefinition.entries()), _v = _u.next(); !_v.done; _v = _u.next()) {
@@ -3110,12 +3209,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 imageDef.dxfOut(filer, true);
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
                 if (_v && !_v.done && (_d = _u.return)) _d.call(_u);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_23) throw e_23.error; }
         }
         try {
             for (var _x = __values(this.objects.layerFilter.entries()), _y = _x.next(); !_y.done; _y = _x.next()) {
@@ -3124,12 +3223,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 layerFilter.dxfOut(filer, true);
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
                 if (_y && !_y.done && (_e = _x.return)) _e.call(_x);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_24) throw e_24.error; }
         }
         try {
             for (var _0 = __values(this.objects.layerIndex.entries()), _1 = _0.next(); !_1.done; _1 = _0.next()) {
@@ -3138,26 +3237,28 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 layerIndex.dxfOut(filer, true);
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_25_1) { e_25 = { error: e_25_1 }; }
         finally {
             try {
                 if (_1 && !_1.done && (_f = _0.return)) _f.call(_0);
             }
-            finally { if (e_23) throw e_23.error; }
-        }
-        try {
-            for (var _3 = __values(this.objects.mleaderStyle.entries()), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                var _5 = __read(_4.value, 2), _ = _5[0], mleaderStyle = _5[1];
-                filer.writeStart('MLEADERSTYLE');
-                mleaderStyle.dxfOut(filer, true);
-            }
+            finally { if (e_25) throw e_25.error; }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
-        finally {
+        if (writeMLeader) {
             try {
-                if (_4 && !_4.done && (_g = _3.return)) _g.call(_3);
+                for (var _3 = __values(this.objects.mleaderStyle.entries()), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+                    var _5 = __read(_4.value, 2), _ = _5[0], mleaderStyle = _5[1];
+                    filer.writeStart('MLEADERSTYLE');
+                    mleaderStyle.dxfOut(filer, true);
+                }
+            }
+            catch (e_26_1) { e_26 = { error: e_26_1 }; }
+            finally {
+                try {
+                    if (_4 && !_4.done && (_g = _3.return)) _g.call(_3);
+                }
+                finally { if (e_26) throw e_26.error; }
             }
-            finally { if (e_24) throw e_24.error; }
         }
         try {
             for (var _6 = __values(this.objects.mlineStyle.entries()), _7 = _6.next(); !_7.done; _7 = _6.next()) {
@@ -3166,12 +3267,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 mlineStyle.dxfOut(filer, true);
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (_7 && !_7.done && (_h = _6.return)) _h.call(_6);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         try {
             for (var _9 = __values(this.objects.xrecord.entries()), _10 = _9.next(); !_10.done; _10 = _9.next()) {
@@ -3180,15 +3281,18 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 xrecord.dxfOut(filer, true);
             }
         }
-        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+        catch (e_28_1) { e_28 = { error: e_28_1 }; }
         finally {
             try {
                 if (_10 && !_10.done && (_j = _9.return)) _j.call(_9);
             }
-            finally { if (e_26) throw e_26.error; }
+            finally { if (e_28) throw e_28.error; }
         }
         this.writeAcLyLayerFilterObjects(filer);
         filer.endSection();
+        if (restoreMLeaderRoot) {
+            rootDict.setAt('ACAD_MLEADERSTYLE', this.objects.mleaderStyle);
+        }
     };
     /**
      * Writes Layer Manager filter tree objects (`ACAD_LAYERFILTERS` /
@@ -3198,7 +3302,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeAcLyLayerFilterObjects = function (filer) {
-        var e_27, _a, e_28, _b, e_29, _c, e_30, _d, e_31, _e;
+        var e_29, _a, e_30, _b, e_31, _c, e_32, _d, e_33, _e;
         var _this = this;
         var _f;
         var serialized = acdbSerializeLayerFilterTree(this._layerFilters);
@@ -3215,7 +3319,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         var rootAclyEntries = [];
         var rootAcadEntries = [];
         var emit = function (node, parentAclyHandle, addToLegacy) {
-            var e_32, _a;
+            var e_34, _a;
             var xHandle = _this.generateHandle();
             var extensionDictionaryId;
             if (node.children.length > 0) {
@@ -3231,12 +3335,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                         });
                     }
                 }
-                catch (e_32_1) { e_32 = { error: e_32_1 }; }
+                catch (e_34_1) { e_34 = { error: e_34_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_32) throw e_32.error; }
+                    finally { if (e_34) throw e_34.error; }
                 }
                 dicts.push({
                     handle: extHandle,
@@ -3270,12 +3374,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 });
             }
         }
-        catch (e_27_1) { e_27 = { error: e_27_1 }; }
+        catch (e_29_1) { e_29 = { error: e_29_1 }; }
         finally {
             try {
                 if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
             }
-            finally { if (e_27) throw e_27.error; }
+            finally { if (e_29) throw e_29.error; }
         }
         var layerExtEntries = new Map();
         var existingLayerExt = this.getObjectById(layerExtHandle);
@@ -3286,12 +3390,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                     layerExtEntries.set(key, value.objectId);
                 }
             }
-            catch (e_28_1) { e_28 = { error: e_28_1 }; }
+            catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
                     if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
                 }
-                finally { if (e_28) throw e_28.error; }
+                finally { if (e_30) throw e_30.error; }
             }
         }
         layerExtEntries.set(ACLY_DICTIONARY_NAME, aclyHandle);
@@ -3322,27 +3426,27 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 filer.writeInt16(280, 1);
                 filer.writeInt16(281, 1);
                 try {
-                    for (var _m = (e_30 = void 0, __values(dict.entries)), _o = _m.next(); !_o.done; _o = _m.next()) {
+                    for (var _m = (e_32 = void 0, __values(dict.entries)), _o = _m.next(); !_o.done; _o = _m.next()) {
                         var entry = _o.value;
                         filer.writeString(3, entry.name);
                         filer.writeObjectId(350, entry.id);
                     }
                 }
-                catch (e_30_1) { e_30 = { error: e_30_1 }; }
+                catch (e_32_1) { e_32 = { error: e_32_1 }; }
                 finally {
                     try {
                         if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
                     }
-                    finally { if (e_30) throw e_30.error; }
+                    finally { if (e_32) throw e_32.error; }
                 }
             }
         }
-        catch (e_29_1) { e_29 = { error: e_29_1 }; }
+        catch (e_31_1) { e_31 = { error: e_31_1 }; }
         finally {
             try {
                 if (dicts_1_1 && !dicts_1_1.done && (_c = dicts_1.return)) _c.call(dicts_1);
             }
-            finally { if (e_29) throw e_29.error; }
+            finally { if (e_31) throw e_31.error; }
         }
         try {
             for (var xrecs_1 = __values(xrecs), xrecs_1_1 = xrecs_1.next(); !xrecs_1_1.done; xrecs_1_1 = xrecs_1.next()) {
@@ -3358,12 +3462,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 xrecord.dxfOut(filer);
             }
         }
-        catch (e_31_1) { e_31 = { error: e_31_1 }; }
+        catch (e_33_1) { e_33 = { error: e_33_1 }; }
         finally {
             try {
                 if (xrecs_1_1 && !xrecs_1_1.done && (_e = xrecs_1.return)) _e.call(xrecs_1);
             }
-            finally { if (e_31) throw e_31.error; }
+            finally { if (e_33) throw e_33.error; }
         }
     };
     /**
@@ -3376,7 +3480,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param recordType - DXF record type name for each table record.
      */
     AcDbDatabase.prototype.writeDxfTable = function (filer, tableName, table, records, recordType) {
-        var e_33, _a;
+        var e_35, _a;
         var items = __spreadArray([], __read(records), false);
         filer.startTable(tableName);
         table.dxfOut(filer);
@@ -3392,12 +3496,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 record.dxfOut(filer, true);
             }
         }
-        catch (e_33_1) { e_33 = { error: e_33_1 }; }
+        catch (e_35_1) { e_35 = { error: e_35_1 }; }
         finally {
             try {
                 if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
             }
-            finally { if (e_33) throw e_33.error; }
+            finally { if (e_35) throw e_35.error; }
         }
         filer.endTable();
     };