@mlightcad/data-model 1.15.21 → 1.15.22

package/lib/database/AcDbDatabase.js

@@ -103,7 +103,9 @@ import { AcDbObject, TEMP_OBJECT_ID_PREFIX, acdbAssignWorkingDatabase } from '..
 import { AcDbOpenMode } from '../base/AcDbOpenMode.js';
 import { AcDbRegenerator } from '../converter/AcDbRegenerator.js';
 import { AcDbDatabaseConverterManager, AcDbFileType } from './AcDbDatabaseConverterManager.js';
+import { AcDbEntity } from '../entity/AcDbEntity.js';
 import { AcDbPolyline } from '../entity/AcDbPolyline.js';
+import { AcDbUnknownEntity } from '../entity/AcDbUnknownEntity.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';
@@ -112,6 +114,7 @@ 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 { AcDbGroup } from '../object/AcDbGroup.js';
 import { AcDbMLeaderStyle } from '../object/AcDbMLeaderStyle.js';
 import { AcDbMlineStyle } from '../object/AcDbMlineStyle.js';
 import { AcDbXrecord } from '../object/AcDbXrecord.js';
@@ -144,6 +147,50 @@ 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';
+import { acdbDxfObjectRecordName } from '../dxf/AcDbDxfObjectRecordName.js';
+/**
+ * HEADER variables {@link AcDbDatabase.dxfOut} writes from the live model.
+ * Verbatim copies preserved from the source file are never written for these.
+ */
+var DXF_HEADER_NATIVE_VARS = new Set([
+    '$ACADVER',
+    '$HANDSEED',
+    '$DWGCODEPAGE',
+    '$INSUNITS',
+    '$LUNITS',
+    '$LUPREC',
+    '$UNITMODE',
+    '$MEASUREMENT',
+    '$LTSCALE',
+    '$LWDISPLAY',
+    '$CELTSCALE',
+    '$CELWEIGHT',
+    '$CECOLOR',
+    '$TILEMODE',
+    '$PSLTSCALE',
+    '$CLAYER',
+    '$CELTYPE',
+    '$CETRANSPARENCY',
+    '$CMLSTYLE',
+    '$CMLSCALE',
+    '$CMLEADERSTYLE',
+    '$HPCOLOR',
+    '$HPBACKGROUNDCOLOR',
+    '$HPLAYER',
+    '$HPTRANSPARENCY',
+    '$TEXTSTYLE',
+    '$DIMSTYLE',
+    '$ANGBASE',
+    '$ANGDIR',
+    '$AUNITS',
+    '$AUPREC',
+    '$EXTMIN',
+    '$EXTMAX',
+    '$PDMODE',
+    '$PDSIZE',
+    '$OSMODE',
+    '$ORTHOMODE'
+]);
 /**
  * The AcDbDatabase class represents an AutoCAD drawing file.
  *
@@ -183,6 +230,18 @@ var AcDbDatabase = /** @class */ (function (_super) {
          * Set from {@link AcDbOpenDatabaseOptions.circleSides} when opening a database.
          */
         _this._drawCircleSides = ACDB_DRAW_CIRCLE_SIDES_DRAFT;
+        /**
+         * DXF HEADER variables without a native model, kept verbatim in file order
+         * and re-emitted by {@link dxfOut} (ezdxf keeps the whole HEADER section).
+         */
+        _this._dxfHeaderExtras = [];
+        /** DWG version value of the file {@link _dxfHeaderExtras} came from. */
+        _this._dxfHeaderExtrasVersion = 0;
+        /**
+         * OBJECTS-section records without a native class, kept verbatim
+         * ({@link AcDbUnknownObject}) and re-emitted by {@link dxfOut}.
+         */
+        _this._dxfUnknownObjects = [];
         _this._eventBatchDepth = 0;
         _this._pendingEntityAppended = [];
         _this._pendingEntityErased = [];
@@ -1583,7 +1642,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
             _this._dwgname = nextValue;
         });
     };
-    Object.defineProperty(AcDbDatabase.prototype, "thumbnailImage", {
+    Object.defineProperty(AcDbDatabase.prototype, "dxfHeaderExtras", {
         /**
          * Gets or sets the drawing thumbnail preview image.
          *
@@ -1593,6 +1652,48 @@ var AcDbDatabase = /** @class */ (function (_super) {
          *
          * @returns Thumbnail image bytes, or `undefined` when none exist.
          */
+        /**
+         * HEADER variables read from DXF that have no native model, in file order.
+         * @internal
+         */
+        get: function () {
+            return this._dxfHeaderExtras;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /** @internal Used by the DXF HEADER reader. */
+    AcDbDatabase.prototype.addDxfHeaderExtra = function (name, pairs) {
+        var index = this._dxfHeaderExtras.findIndex(function (v) { return v.name === name; });
+        if (index >= 0) {
+            this._dxfHeaderExtras[index] = { name: name, pairs: pairs };
+        }
+        else {
+            this._dxfHeaderExtras.push({ name: name, pairs: pairs });
+        }
+        this._dxfHeaderExtrasVersion = this._version.value;
+    };
+    Object.defineProperty(AcDbDatabase.prototype, "dxfUnknownObjects", {
+        /**
+         * OBJECTS records read from DXF without a native class.
+         * @internal
+         */
+        get: function () {
+            return this._dxfUnknownObjects;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /** @internal Used by the DXF OBJECTS reader. */
+    AcDbDatabase.prototype.addDxfUnknownObject = function (object) {
+        this._dxfUnknownObjects.push(object);
+    };
+    /** @internal Used by the DXF HEADER reader. */
+    AcDbDatabase.prototype.clearDxfHeaderExtras = function () {
+        this._dxfHeaderExtras = [];
+        this._dxfHeaderExtrasVersion = 0;
+    };
+    Object.defineProperty(AcDbDatabase.prototype, "thumbnailImage", {
         get: function () {
             return this._thumbnailImage;
         },
@@ -2416,7 +2517,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @returns ASCII DXF string, or `Uint8Array` when format is `'binary'`.
      */
     AcDbDatabase.prototype.dxfOut = function (_fileName, precision, version, optionsOrThumbnail) {
-        var _a, _b;
+        var _a, _b, _c;
         if (precision === void 0) { precision = 16; }
         if (version === void 0) { version = this.version.name; }
         if (optionsOrThumbnail === void 0) { optionsOrThumbnail = false; }
@@ -2441,12 +2542,17 @@ var AcDbDatabase = /** @class */ (function (_super) {
             version: outVersion,
             outputFormat: options.format
         });
+        var objectsPlan = filer.capabilities.supportsObjectsSection
+            ? this.planDxfObjectsSection(filer)
+            : undefined;
+        filer.writtenObjectIds = (_c = objectsPlan === null || objectsPlan === void 0 ? void 0 : objectsPlan.writtenObjectIds) !== null && _c !== void 0 ? _c : new Set();
+        this.ensureXDataAppIds(objectsPlan);
         this.writeDxfHeaderSection(filer);
         this.writeDxfClassesSection(filer);
         this.writeDxfTablesSection(filer, outVersion);
         this.writeDxfBlocksSection(filer);
         this.writeDxfEntitiesSection(filer);
-        this.writeDxfObjectsSection(filer);
+        this.writeDxfObjectsSection(filer, objectsPlan);
         this.writeDxfThumbnailImageSection(filer, options.saveThumbnailImage);
         filer.writeStart('EOF');
         // `$HANDSEED` is written early in HEADER; patch it now that every handle
@@ -2916,8 +3022,38 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeInt32(70, this.osmode);
         filer.writeString(9, '$ORTHOMODE');
         filer.writeInt16(70, this.orthomode);
+        this.writeDxfHeaderExtras(filer);
         filer.endSection();
     };
+    /**
+     * Re-emits HEADER variables preserved verbatim from the source DXF.
+     *
+     * Skipped when exporting to an older version than the source, since newer
+     * variables (and their value encodings) may be invalid there.
+     */
+    AcDbDatabase.prototype.writeDxfHeaderExtras = function (filer) {
+        var e_14, _a;
+        var _b, _c;
+        var target = (_c = (_b = filer.version) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : this.version.value;
+        if (target < this._dxfHeaderExtrasVersion)
+            return;
+        try {
+            for (var _d = __values(this._dxfHeaderExtras), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var _f = _e.value, name_5 = _f.name, pairs = _f.pairs;
+                if (DXF_HEADER_NATIVE_VARS.has(name_5))
+                    continue;
+                filer.writeString(9, name_5);
+                filer.writeRawPairs(pairs);
+            }
+        }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            }
+            finally { if (e_14) throw e_14.error; }
+        }
+    };
     /**
      * Writes `$EXTMIN` / `$EXTMAX`. Empty drawings use AutoCAD's 1e20 / -1e20
      * convention; otherwise extents are taken from the database box, refreshed
@@ -2941,7 +3077,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
     };
     /** Expands {@link _extents} from model-space entity geometry when possible. */
     AcDbDatabase.prototype.refreshExtentsFromModelSpace = function () {
-        var e_14, _a;
+        var e_15, _a;
         try {
             for (var _b = __values(this.tables.blockTable.modelSpace.newIterator()), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var entity = _c.value;
@@ -2956,12 +3092,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_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_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
     };
     /**
@@ -2973,7 +3109,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfClassesSection = function (filer) {
-        var e_15, _a;
+        var e_16, _a;
         if (!filer.capabilities.supportsClassesSection ||
             this._classes.length === 0) {
             return;
@@ -2992,12 +3128,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 filer.writeInt8(281, dxfClass.isEntity ? 1 : 0);
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         filer.endSection();
     };
@@ -3028,7 +3164,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfBlocksSection = function (filer) {
-        var e_16, _a, e_17, _b;
+        var e_17, _a, e_18, _b;
         filer.startSection('BLOCKS');
         try {
             for (var _c = __values(this.tables.blockTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -3036,28 +3172,28 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 btr.dxfOutBlockBegin(filer);
                 if (!btr.isModelSapce && !btr.isPaperSapce) {
                     try {
-                        for (var _e = (e_17 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        for (var _e = (e_18 = 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_18_1) { e_18 = { error: e_18_1 }; }
                     finally {
                         try {
                             if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                         }
-                        finally { if (e_17) throw e_17.error; }
+                        finally { if (e_18) throw e_18.error; }
                     }
                 }
                 btr.dxfOutBlockEnd(filer);
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_17) throw e_17.error; }
         }
         filer.endSection();
     };
@@ -3067,7 +3203,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfEntitiesSection = function (filer) {
-        var e_18, _a, e_19, _b;
+        var e_19, _a, e_20, _b;
         filer.startSection('ENTITIES');
         try {
             for (var _c = __values(this.tables.blockTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -3075,47 +3211,48 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 if (!btr.isModelSapce && !btr.isPaperSapce)
                     continue;
                 try {
-                    for (var _e = (e_19 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    for (var _e = (e_20 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
                         var entity = _f.value;
                         this.writeDxfEntity(filer, entity);
                     }
                 }
-                catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                catch (e_20_1) { e_20 = { error: e_20_1 }; }
                 finally {
                     try {
                         if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                     }
-                    finally { if (e_19) throw e_19.error; }
+                    finally { if (e_20) throw e_20.error; }
                 }
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         filer.endSection();
     };
     /**
-     * Writes the OBJECTS section for the DXF export.
+     * Decides which OBJECTS-section records a DXF export writes.
      *
-     * @param filer - DXF output writer.
+     * Like ezdxf / ODA, every record reachable from the named object dictionary
+     * and from extension dictionaries (of tables, table records, entities and
+     * objects) is written, including records preserved verbatim
+     * ({@link AcDbUnknownObject}, context data). Only records that are actually
+     * written are listed in their dictionaries, so the output never carries
+     * dangling 350/360 handles.
+     *
+     * Must run before any section is written: {@link AcDbObject} consults the
+     * resulting handle set when it emits extension-dictionary pointers.
      */
-    AcDbDatabase.prototype.writeDxfObjectsSection = function (filer) {
-        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;
-        }
-        filer.startSection('OBJECTS');
+    AcDbDatabase.prototype.planDxfObjectsSection = function (filer) {
+        var e_21, _a, e_22, _b, e_23, _c, e_24, _d, e_25, _e, e_26, _f, e_27, _g, e_28, _h, e_29, _j, e_30, _k, e_31, _l;
+        var _this = this;
+        var _m, _o;
         var rootDict = this.objects.dictionary;
         rootDict.ownerId = '0';
-        var writeDictionary = function (dict) {
-            // Dictionary entries (3/350 pairs) are embedded in the DICTIONARY object.
-            filer.writeStart('DICTIONARY');
-            dict.dxfOut(filer, true);
-        };
         var ensureRootEntry = function (key, dict) {
             if (rootDict.getAt(key) !== dict) {
                 rootDict.setAt(key, dict);
@@ -3159,164 +3296,480 @@ var AcDbDatabase = /** @class */ (function (_super) {
         else {
             dropRootEntry('ISM_RASTER_IMAGE_DICT');
         }
-        if (this.objects.xrecord.numEntries > 0) {
-            ensureRootEntry('MLIGHT_XRECORD', this.objects.xrecord);
-        }
-        else {
-            dropRootEntry('MLIGHT_XRECORD');
-        }
-        writeDictionary(rootDict);
-        writeDictionary(this.objects.layout);
-        writeDictionary(this.objects.group);
-        if (this.objects.sortentsTable.numEntries > 0) {
-            writeDictionary(this.objects.sortentsTable);
-        }
-        if (writeMLeader) {
-            writeDictionary(this.objects.mleaderStyle);
-        }
-        if (this.objects.mlineStyle.numEntries > 0) {
-            writeDictionary(this.objects.mlineStyle);
-        }
-        if (this.objects.imageDefinition.numEntries > 0) {
-            writeDictionary(this.objects.imageDefinition);
-        }
-        if (this.objects.xrecord.numEntries > 0) {
-            writeDictionary(this.objects.xrecord);
+        var norm = function (id) { return (id !== null && id !== void 0 ? id : '').trim().toUpperCase(); };
+        var classNames = new Set(this._classes.map(function (item) { var _a; return ((_a = item.name) !== null && _a !== void 0 ? _a : '').toUpperCase(); }));
+        var records = new Map();
+        // Records replaced by freshly generated ones (Layer Manager filter tree):
+        // neither written nor collected into MLIGHT_XRECORD.
+        var superseded = new Set();
+        var xrecordContainer = this.objects.xrecord;
+        var queue = [];
+        var visit = function (object) {
+            if (!object || object === xrecordContainer)
+                return;
+            var key = norm(object.objectId);
+            if (!key || records.has(key) || superseded.has(key))
+                return;
+            var type = acdbDxfObjectRecordName(object, classNames);
+            if (!type)
+                return;
+            records.set(key, { object: object, type: type });
+            queue.push(object);
+        };
+        var visitExtensionDictionary = function (owner) {
+            var id = owner.extensionDictionary;
+            if (id)
+                visit(_this.getObjectById(id));
+        };
+        var next = 0;
+        var drain = function () {
+            var e_32, _a;
+            while (next < queue.length) {
+                var object = queue[next++];
+                visitExtensionDictionary(object);
+                if (object instanceof AcDbDictionary) {
+                    try {
+                        for (var _b = (e_32 = void 0, __values(object.entries())), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            var _d = __read(_c.value, 2), entry = _d[1];
+                            visit(entry);
+                        }
+                    }
+                    catch (e_32_1) { e_32 = { error: e_32_1 }; }
+                    finally {
+                        try {
+                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        }
+                        finally { if (e_32) throw e_32.error; }
+                    }
+                    if (object.defaultId)
+                        visit(_this.getObjectById(object.defaultId));
+                }
+            }
+        };
+        var markSuperseded = function (object) {
+            var e_33, _a;
+            if (!object)
+                return;
+            var key = norm(object.objectId);
+            if (!key || superseded.has(key))
+                return;
+            superseded.add(key);
+            if (object.extensionDictionary) {
+                markSuperseded(_this.getObjectById(object.extensionDictionary));
+            }
+            if (object instanceof AcDbDictionary) {
+                try {
+                    for (var _b = __values(object.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var _d = __read(_c.value, 2), entry = _d[1];
+                        markSuperseded(entry);
+                    }
+                }
+                catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_33) throw e_33.error; }
+                }
+            }
+        };
+        // The named object dictionary must be the first record of OBJECTS.
+        visit(rootDict);
+        drain();
+        // The Layer Manager filter tree is regenerated by
+        // writeAcLyLayerFilterObjects, which also writes the layer table's
+        // extension dictionary. Keep its other entries.
+        var layerTable = this.tables.layerTable;
+        var writesLayerFilters = this._layerFilters.root.getNestedFilters().length > 0;
+        if (writesLayerFilters && layerTable.extensionDictionary) {
+            var layerExtId = layerTable.extensionDictionary;
+            var layerExt = this.getObjectById(layerExtId);
+            superseded.add(norm(layerExtId));
+            if (layerExt instanceof AcDbDictionary) {
+                try {
+                    for (var _p = __values(layerExt.entries()), _q = _p.next(); !_q.done; _q = _p.next()) {
+                        var _r = __read(_q.value, 2), key = _r[0], entry = _r[1];
+                        if (key === ACLY_DICTIONARY_NAME || key === ACAD_LAYERFILTERS_NAME) {
+                            markSuperseded(entry);
+                        }
+                        else {
+                            visit(entry);
+                        }
+                    }
+                }
+                catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                finally {
+                    try {
+                        if (_q && !_q.done && (_a = _p.return)) _a.call(_p);
+                    }
+                    finally { if (e_21) throw e_21.error; }
+                }
+            }
         }
         try {
-            for (var _k = __values(this.objects.layout.entries()), _l = _k.next(); !_l.done; _l = _k.next()) {
-                var _m = __read(_l.value, 2), _ = _m[0], layout = _m[1];
-                filer.writeStart('LAYOUT');
-                layout.dxfOut(filer, true);
+            for (var _s = __values(Object.values(this.tables)), _t = _s.next(); !_t.done; _t = _s.next()) {
+                var table = _t.value;
+                visitExtensionDictionary(table);
+                try {
+                    for (var _u = (e_23 = void 0, __values(table.newIterator())), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var record = _v.value;
+                        visitExtensionDictionary(record);
+                    }
+                }
+                catch (e_23_1) { e_23 = { error: e_23_1 }; }
+                finally {
+                    try {
+                        if (_v && !_v.done && (_c = _u.return)) _c.call(_u);
+                    }
+                    finally { if (e_23) throw e_23.error; }
+                }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
         finally {
             try {
-                if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+                if (_t && !_t.done && (_b = _s.return)) _b.call(_s);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_22) throw e_22.error; }
         }
         try {
-            for (var _o = __values(this.objects.group.entries()), _p = _o.next(); !_p.done; _p = _o.next()) {
-                var _q = __read(_p.value, 2), key = _q[0], group = _q[1];
-                if (!group.name)
-                    group.name = key;
-                filer.writeStart('GROUP');
-                group.dxfOut(filer, true);
+            for (var _w = __values(this.tables.blockTable.newIterator()), _x = _w.next(); !_x.done; _x = _w.next()) {
+                var btr = _x.value;
+                try {
+                    for (var _y = (e_25 = void 0, __values(btr.newIterator())), _z = _y.next(); !_z.done; _z = _y.next()) {
+                        var entity = _z.value;
+                        visitExtensionDictionary(entity);
+                        var attributes = (_o = (_m = entity).attributeIterator) === null || _o === void 0 ? void 0 : _o.call(_m);
+                        if (attributes) {
+                            try {
+                                for (var attributes_1 = (e_26 = void 0, __values(attributes)), attributes_1_1 = attributes_1.next(); !attributes_1_1.done; attributes_1_1 = attributes_1.next()) {
+                                    var attribute = attributes_1_1.value;
+                                    visitExtensionDictionary(attribute);
+                                }
+                            }
+                            catch (e_26_1) { e_26 = { error: e_26_1 }; }
+                            finally {
+                                try {
+                                    if (attributes_1_1 && !attributes_1_1.done && (_f = attributes_1.return)) _f.call(attributes_1);
+                                }
+                                finally { if (e_26) throw e_26.error; }
+                            }
+                        }
+                    }
+                }
+                catch (e_25_1) { e_25 = { error: e_25_1 }; }
+                finally {
+                    try {
+                        if (_z && !_z.done && (_e = _y.return)) _e.call(_y);
+                    }
+                    finally { if (e_25) throw e_25.error; }
+                }
             }
         }
-        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
-                if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
+                if (_x && !_x.done && (_d = _w.return)) _d.call(_w);
             }
-            finally { if (e_21) throw e_21.error; }
+            finally { if (e_24) throw e_24.error; }
         }
+        drain();
         try {
-            for (var _r = __values(this.objects.sortentsTable.entries()), _s = _r.next(); !_s.done; _s = _r.next()) {
-                var _t = __read(_s.value, 2), _ = _t[0], sortents = _t[1];
-                filer.writeStart('SORTENTSTABLE');
-                sortents.dxfOut(filer, true);
+            // Index objects are not dictionary entries; written as before.
+            for (var _0 = __values(this.objects.layerFilter.entries()), _1 = _0.next(); !_1.done; _1 = _0.next()) {
+                var _2 = __read(_1.value, 2), layerFilter = _2[1];
+                visit(layerFilter);
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
-                if (_s && !_s.done && (_c = _r.return)) _c.call(_r);
+                if (_1 && !_1.done && (_g = _0.return)) _g.call(_0);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         try {
-            for (var _u = __values(this.objects.imageDefinition.entries()), _v = _u.next(); !_v.done; _v = _u.next()) {
-                var _w = __read(_v.value, 2), _ = _w[0], imageDef = _w[1];
-                filer.writeStart('IMAGEDEF');
-                imageDef.dxfOut(filer, true);
+            for (var _3 = __values(this.objects.layerIndex.entries()), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+                var _5 = __read(_4.value, 2), layerIndex = _5[1];
+                visit(layerIndex);
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_28_1) { e_28 = { error: e_28_1 }; }
         finally {
             try {
-                if (_v && !_v.done && (_d = _u.return)) _d.call(_u);
+                if (_4 && !_4.done && (_h = _3.return)) _h.call(_3);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_28) throw e_28.error; }
         }
         try {
-            for (var _x = __values(this.objects.layerFilter.entries()), _y = _x.next(); !_y.done; _y = _x.next()) {
-                var _z = __read(_y.value, 2), _ = _z[0], layerFilter = _z[1];
-                filer.writeStart('LAYER_FILTER');
-                layerFilter.dxfOut(filer, true);
+            // Preserved records owned by an entity or object rather than a
+            // dictionary (e.g. IMAGEDEF_REACTOR) — kept while their owner exists.
+            for (var _6 = __values(this._dxfUnknownObjects), _7 = _6.next(); !_7.done; _7 = _6.next()) {
+                var object = _7.value;
+                var owner = this.getObjectById(object.ownerId);
+                // Kept while the owner is exported; a removed dictionary entry is not.
+                if (owner instanceof AcDbEntity ||
+                    (owner &&
+                        !(owner instanceof AcDbDictionary) &&
+                        records.has(norm(owner.objectId)))) {
+                    visit(object);
+                }
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_29_1) { e_29 = { error: e_29_1 }; }
         finally {
             try {
-                if (_y && !_y.done && (_e = _x.return)) _e.call(_x);
+                if (_7 && !_7.done && (_j = _6.return)) _j.call(_6);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_29) throw e_29.error; }
         }
+        drain();
+        // XRecords not owned by any written dictionary go to MLIGHT_XRECORD.
+        var looseXrecords = [];
         try {
-            for (var _0 = __values(this.objects.layerIndex.entries()), _1 = _0.next(); !_1.done; _1 = _0.next()) {
-                var _2 = __read(_1.value, 2), _ = _2[0], layerIndex = _2[1];
-                filer.writeStart('LAYER_INDEX');
-                layerIndex.dxfOut(filer, true);
+            for (var _8 = __values(xrecordContainer.entries()), _9 = _8.next(); !_9.done; _9 = _8.next()) {
+                var _10 = __read(_9.value, 2), xrecord = _10[1];
+                var key = norm(xrecord.objectId);
+                if (!key || records.has(key) || superseded.has(key))
+                    continue;
+                looseXrecords.push(xrecord);
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_30_1) { e_30 = { error: e_30_1 }; }
         finally {
             try {
-                if (_1 && !_1.done && (_f = _0.return)) _f.call(_0);
+                if (_9 && !_9.done && (_k = _8.return)) _k.call(_8);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_30) throw e_30.error; }
         }
-        if (writeMLeader) {
+        if (looseXrecords.length > 0) {
+            ensureRootEntry('MLIGHT_XRECORD', xrecordContainer);
+        }
+        else {
+            dropRootEntry('MLIGHT_XRECORD');
+        }
+        var writtenObjectIds = new Set(records.keys());
+        if (looseXrecords.length > 0) {
+            writtenObjectIds.add(norm(xrecordContainer.objectId));
             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);
+                for (var looseXrecords_1 = __values(looseXrecords), looseXrecords_1_1 = looseXrecords_1.next(); !looseXrecords_1_1.done; looseXrecords_1_1 = looseXrecords_1.next()) {
+                    var xrecord = looseXrecords_1_1.value;
+                    writtenObjectIds.add(norm(xrecord.objectId));
                 }
             }
-            catch (e_26_1) { e_26 = { error: e_26_1 }; }
+            catch (e_31_1) { e_31 = { error: e_31_1 }; }
             finally {
                 try {
-                    if (_4 && !_4.done && (_g = _3.return)) _g.call(_3);
+                    if (looseXrecords_1_1 && !looseXrecords_1_1.done && (_l = looseXrecords_1.return)) _l.call(looseXrecords_1);
                 }
-                finally { if (e_26) throw e_26.error; }
+                finally { if (e_31) throw e_31.error; }
             }
         }
+        if (writesLayerFilters && layerTable.extensionDictionary) {
+            writtenObjectIds.add(norm(layerTable.extensionDictionary));
+        }
+        return {
+            records: __spreadArray([], __read(records.values()), false),
+            looseXrecords: looseXrecords,
+            writtenObjectIds: writtenObjectIds,
+            restoreMLeaderRoot: restoreMLeaderRoot
+        };
+    };
+    /**
+     * Registers an APPID record for every application whose XData is about to
+     * be written. AutoCAD rejects a DXF whose XData names an unregistered
+     * application (ezdxf's auditor adds the missing records the same way).
+     */
+    AcDbDatabase.prototype.ensureXDataAppIds = function (plan) {
+        var e_34, _a, e_35, _b, e_36, _c, e_37, _d, e_38, _e, e_39, _f, e_40, _g;
+        var _h, _j;
+        var appIdTable = this.tables.appIdTable;
+        var register = function (object) {
+            var e_41, _a;
+            try {
+                for (var _b = __values(object.xDataAppIds()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var appId = _c.value;
+                    if (appId && !appIdTable.has(appId)) {
+                        appIdTable.add(new AcDbRegAppTableRecord(appId));
+                    }
+                }
+            }
+            catch (e_41_1) { e_41 = { error: e_41_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_41) throw e_41.error; }
+            }
+        };
         try {
-            for (var _6 = __values(this.objects.mlineStyle.entries()), _7 = _6.next(); !_7.done; _7 = _6.next()) {
-                var _8 = __read(_7.value, 2), _ = _8[0], mlineStyle = _8[1];
-                filer.writeStart('MLINESTYLE');
-                mlineStyle.dxfOut(filer, true);
+            for (var _k = __values(Object.values(this.tables)), _l = _k.next(); !_l.done; _l = _k.next()) {
+                var table = _l.value;
+                try {
+                    for (var _m = (e_35 = void 0, __values(table.newIterator())), _o = _m.next(); !_o.done; _o = _m.next()) {
+                        var record = _o.value;
+                        register(record);
+                    }
+                }
+                catch (e_35_1) { e_35 = { error: e_35_1 }; }
+                finally {
+                    try {
+                        if (_o && !_o.done && (_b = _m.return)) _b.call(_m);
+                    }
+                    finally { if (e_35) throw e_35.error; }
+                }
             }
         }
-        catch (e_27_1) { e_27 = { error: e_27_1 }; }
+        catch (e_34_1) { e_34 = { error: e_34_1 }; }
         finally {
             try {
-                if (_7 && !_7.done && (_h = _6.return)) _h.call(_6);
+                if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
             }
-            finally { if (e_27) throw e_27.error; }
+            finally { if (e_34) throw e_34.error; }
         }
         try {
-            for (var _9 = __values(this.objects.xrecord.entries()), _10 = _9.next(); !_10.done; _10 = _9.next()) {
-                var _11 = __read(_10.value, 2), _ = _11[0], xrecord = _11[1];
-                filer.writeStart('XRECORD');
-                xrecord.dxfOut(filer, true);
+            for (var _p = __values(this.tables.blockTable.newIterator()), _q = _p.next(); !_q.done; _q = _p.next()) {
+                var btr = _q.value;
+                try {
+                    for (var _r = (e_37 = void 0, __values(btr.newIterator())), _s = _r.next(); !_s.done; _s = _r.next()) {
+                        var entity = _s.value;
+                        register(entity);
+                        var attributes = (_j = (_h = entity).attributeIterator) === null || _j === void 0 ? void 0 : _j.call(_h);
+                        if (attributes) {
+                            try {
+                                for (var attributes_2 = (e_38 = void 0, __values(attributes)), attributes_2_1 = attributes_2.next(); !attributes_2_1.done; attributes_2_1 = attributes_2.next()) {
+                                    var attribute = attributes_2_1.value;
+                                    register(attribute);
+                                }
+                            }
+                            catch (e_38_1) { e_38 = { error: e_38_1 }; }
+                            finally {
+                                try {
+                                    if (attributes_2_1 && !attributes_2_1.done && (_e = attributes_2.return)) _e.call(attributes_2);
+                                }
+                                finally { if (e_38) throw e_38.error; }
+                            }
+                        }
+                    }
+                }
+                catch (e_37_1) { e_37 = { error: e_37_1 }; }
+                finally {
+                    try {
+                        if (_s && !_s.done && (_d = _r.return)) _d.call(_r);
+                    }
+                    finally { if (e_37) throw e_37.error; }
+                }
             }
         }
-        catch (e_28_1) { e_28 = { error: e_28_1 }; }
+        catch (e_36_1) { e_36 = { error: e_36_1 }; }
         finally {
             try {
-                if (_10 && !_10.done && (_j = _9.return)) _j.call(_9);
+                if (_q && !_q.done && (_c = _p.return)) _c.call(_p);
+            }
+            finally { if (e_36) throw e_36.error; }
+        }
+        if (plan) {
+            try {
+                for (var _t = __values(plan.records), _u = _t.next(); !_u.done; _u = _t.next()) {
+                    var object = _u.value.object;
+                    register(object);
+                }
+            }
+            catch (e_39_1) { e_39 = { error: e_39_1 }; }
+            finally {
+                try {
+                    if (_u && !_u.done && (_f = _t.return)) _f.call(_t);
+                }
+                finally { if (e_39) throw e_39.error; }
+            }
+            try {
+                for (var _v = __values(plan.looseXrecords), _w = _v.next(); !_w.done; _w = _v.next()) {
+                    var xrecord = _w.value;
+                    register(xrecord);
+                }
+            }
+            catch (e_40_1) { e_40 = { error: e_40_1 }; }
+            finally {
+                try {
+                    if (_w && !_w.done && (_g = _v.return)) _g.call(_v);
+                }
+                finally { if (e_40) throw e_40.error; }
+            }
+        }
+    };
+    /**
+     * Writes the OBJECTS section for the DXF export.
+     *
+     * @param filer - DXF output writer.
+     * @param plan - Records chosen by {@link planDxfObjectsSection}.
+     */
+    AcDbDatabase.prototype.writeDxfObjectsSection = function (filer, plan) {
+        var e_42, _a, e_43, _b, e_44, _c;
+        if (!plan)
+            return;
+        filer.startSection('OBJECTS');
+        var isWritten = function (object) { var _a; return plan.writtenObjectIds.has(((_a = object.objectId) !== null && _a !== void 0 ? _a : '').trim().toUpperCase()); };
+        try {
+            for (var _d = __values(plan.records), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var _f = _e.value, object = _f.object, type = _f.type;
+                if (object instanceof AcDbDictionary) {
+                    filer.writeStart(type);
+                    object.dxfOutFiltered(filer, isWritten);
+                    continue;
+                }
+                if (object instanceof AcDbGroup && !object.name) {
+                    try {
+                        // Keep the group name in sync with its ACAD_GROUP key.
+                        for (var _g = (e_43 = void 0, __values(this.objects.group.entries())), _h = _g.next(); !_h.done; _h = _g.next()) {
+                            var _j = __read(_h.value, 2), key = _j[0], group = _j[1];
+                            if (group === object)
+                                object.name = key;
+                        }
+                    }
+                    catch (e_43_1) { e_43 = { error: e_43_1 }; }
+                    finally {
+                        try {
+                            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                        }
+                        finally { if (e_43) throw e_43.error; }
+                    }
+                }
+                filer.writeStart(type);
+                object.dxfOut(filer, true);
+            }
+        }
+        catch (e_42_1) { e_42 = { error: e_42_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            }
+            finally { if (e_42) throw e_42.error; }
+        }
+        if (plan.looseXrecords.length > 0) {
+            var container = this.objects.xrecord;
+            container.ownerId = this.objects.dictionary.objectId;
+            filer.writeStart('DICTIONARY');
+            container.dxfOutFiltered(filer, isWritten);
+            try {
+                for (var _k = __values(plan.looseXrecords), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var xrecord = _l.value;
+                    xrecord.ownerId = container.objectId;
+                    filer.writeStart('XRECORD');
+                    xrecord.dxfOut(filer, true);
+                }
+            }
+            catch (e_44_1) { e_44 = { error: e_44_1 }; }
+            finally {
+                try {
+                    if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
+                }
+                finally { if (e_44) throw e_44.error; }
             }
-            finally { if (e_28) throw e_28.error; }
         }
         this.writeAcLyLayerFilterObjects(filer);
         filer.endSection();
-        if (restoreMLeaderRoot) {
-            rootDict.setAt('ACAD_MLEADERSTYLE', this.objects.mleaderStyle);
+        if (plan.restoreMLeaderRoot) {
+            this.objects.dictionary.setAt('ACAD_MLEADERSTYLE', this.objects.mleaderStyle);
         }
     };
     /**
@@ -3327,9 +3780,9 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeAcLyLayerFilterObjects = function (filer) {
-        var e_29, _a, e_30, _b, e_31, _c, e_32, _d, e_33, _e;
+        var e_45, _a, e_46, _b, e_47, _c, e_48, _d, e_49, _e, e_50, _f, e_51, _g;
         var _this = this;
-        var _f;
+        var _h;
         var serialized = acdbSerializeLayerFilterTree(this._layerFilters);
         if (serialized.nodes.length === 0) {
             return;
@@ -3337,14 +3790,14 @@ var AcDbDatabase = /** @class */ (function (_super) {
         var dicts = [];
         var xrecs = [];
         var layerTable = this.tables.layerTable;
-        var layerExtHandle = (_f = layerTable.extensionDictionary) !== null && _f !== void 0 ? _f : this.generateHandle();
+        var layerExtHandle = (_h = layerTable.extensionDictionary) !== null && _h !== void 0 ? _h : this.generateHandle();
         layerTable.extensionDictionary = layerExtHandle;
         var aclyHandle = this.generateHandle();
         var acadHandle = this.generateHandle();
         var rootAclyEntries = [];
         var rootAcadEntries = [];
         var emit = function (node, parentAclyHandle, addToLegacy) {
-            var e_34, _a;
+            var e_52, _a;
             var xHandle = _this.generateHandle();
             var extensionDictionaryId;
             if (node.children.length > 0) {
@@ -3360,12 +3813,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                         });
                     }
                 }
-                catch (e_34_1) { e_34 = { error: e_34_1 }; }
+                catch (e_52_1) { e_52 = { error: e_52_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_34) throw e_34.error; }
+                    finally { if (e_52) throw e_52.error; }
                 }
                 dicts.push({
                     handle: extHandle,
@@ -3391,36 +3844,36 @@ var AcDbDatabase = /** @class */ (function (_super) {
             return xHandle;
         };
         try {
-            for (var _g = __values(serialized.nodes), _h = _g.next(); !_h.done; _h = _g.next()) {
-                var node = _h.value;
+            for (var _j = __values(serialized.nodes), _k = _j.next(); !_k.done; _k = _j.next()) {
+                var node = _k.value;
                 rootAclyEntries.push({
                     name: node.key,
                     id: emit(node, aclyHandle, true)
                 });
             }
         }
-        catch (e_29_1) { e_29 = { error: e_29_1 }; }
+        catch (e_45_1) { e_45 = { error: e_45_1 }; }
         finally {
             try {
-                if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
+                if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
             }
-            finally { if (e_29) throw e_29.error; }
+            finally { if (e_45) throw e_45.error; }
         }
         var layerExtEntries = new Map();
         var existingLayerExt = this.getObjectById(layerExtHandle);
         if (existingLayerExt instanceof AcDbDictionary) {
             try {
-                for (var _j = __values(existingLayerExt.entries()), _k = _j.next(); !_k.done; _k = _j.next()) {
-                    var _l = __read(_k.value, 2), key = _l[0], value = _l[1];
+                for (var _l = __values(existingLayerExt.entries()), _m = _l.next(); !_m.done; _m = _l.next()) {
+                    var _o = __read(_m.value, 2), key = _o[0], value = _o[1];
                     layerExtEntries.set(key, value.objectId);
                 }
             }
-            catch (e_30_1) { e_30 = { error: e_30_1 }; }
+            catch (e_46_1) { e_46 = { error: e_46_1 }; }
             finally {
                 try {
-                    if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
+                    if (_m && !_m.done && (_b = _l.return)) _b.call(_l);
                 }
-                finally { if (e_30) throw e_30.error; }
+                finally { if (e_46) throw e_46.error; }
             }
         }
         layerExtEntries.set(ACLY_DICTIONARY_NAME, aclyHandle);
@@ -3442,8 +3895,36 @@ var AcDbDatabase = /** @class */ (function (_super) {
             entries: rootAcadEntries
         });
         try {
+            // Generated here, after planning: register them so the extension
+            // dictionary pointers of the filter XRecords are written.
             for (var dicts_1 = __values(dicts), dicts_1_1 = dicts_1.next(); !dicts_1_1.done; dicts_1_1 = dicts_1.next()) {
                 var dict = dicts_1_1.value;
+                filer.markObjectIdWritten(dict.handle);
+            }
+        }
+        catch (e_47_1) { e_47 = { error: e_47_1 }; }
+        finally {
+            try {
+                if (dicts_1_1 && !dicts_1_1.done && (_c = dicts_1.return)) _c.call(dicts_1);
+            }
+            finally { if (e_47) throw e_47.error; }
+        }
+        try {
+            for (var xrecs_1 = __values(xrecs), xrecs_1_1 = xrecs_1.next(); !xrecs_1_1.done; xrecs_1_1 = xrecs_1.next()) {
+                var item = xrecs_1_1.value;
+                filer.markObjectIdWritten(item.handle);
+            }
+        }
+        catch (e_48_1) { e_48 = { error: e_48_1 }; }
+        finally {
+            try {
+                if (xrecs_1_1 && !xrecs_1_1.done && (_d = xrecs_1.return)) _d.call(xrecs_1);
+            }
+            finally { if (e_48) throw e_48.error; }
+        }
+        try {
+            for (var dicts_2 = __values(dicts), dicts_2_1 = dicts_2.next(); !dicts_2_1.done; dicts_2_1 = dicts_2.next()) {
+                var dict = dicts_2_1.value;
                 filer.writeStart('DICTIONARY');
                 filer.writeHandle(5, dict.handle);
                 filer.writeObjectId(330, dict.ownerId);
@@ -3451,31 +3932,31 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 filer.writeInt16(280, 1);
                 filer.writeInt16(281, 1);
                 try {
-                    for (var _m = (e_32 = void 0, __values(dict.entries)), _o = _m.next(); !_o.done; _o = _m.next()) {
-                        var entry = _o.value;
+                    for (var _p = (e_50 = void 0, __values(dict.entries)), _q = _p.next(); !_q.done; _q = _p.next()) {
+                        var entry = _q.value;
                         filer.writeString(3, entry.name);
                         filer.writeObjectId(350, entry.id);
                     }
                 }
-                catch (e_32_1) { e_32 = { error: e_32_1 }; }
+                catch (e_50_1) { e_50 = { error: e_50_1 }; }
                 finally {
                     try {
-                        if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
+                        if (_q && !_q.done && (_f = _p.return)) _f.call(_p);
                     }
-                    finally { if (e_32) throw e_32.error; }
+                    finally { if (e_50) throw e_50.error; }
                 }
             }
         }
-        catch (e_31_1) { e_31 = { error: e_31_1 }; }
+        catch (e_49_1) { e_49 = { error: e_49_1 }; }
         finally {
             try {
-                if (dicts_1_1 && !dicts_1_1.done && (_c = dicts_1.return)) _c.call(dicts_1);
+                if (dicts_2_1 && !dicts_2_1.done && (_e = dicts_2.return)) _e.call(dicts_2);
             }
-            finally { if (e_31) throw e_31.error; }
+            finally { if (e_49) throw e_49.error; }
         }
         try {
-            for (var xrecs_1 = __values(xrecs), xrecs_1_1 = xrecs_1.next(); !xrecs_1_1.done; xrecs_1_1 = xrecs_1.next()) {
-                var item = xrecs_1_1.value;
+            for (var xrecs_2 = __values(xrecs), xrecs_2_1 = xrecs_2.next(); !xrecs_2_1.done; xrecs_2_1 = xrecs_2.next()) {
+                var item = xrecs_2_1.value;
                 var xrecord = new AcDbXrecord();
                 xrecord.objectId = item.handle;
                 xrecord.ownerId = item.ownerId;
@@ -3487,12 +3968,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 xrecord.dxfOut(filer);
             }
         }
-        catch (e_33_1) { e_33 = { error: e_33_1 }; }
+        catch (e_51_1) { e_51 = { error: e_51_1 }; }
         finally {
             try {
-                if (xrecs_1_1 && !xrecs_1_1.done && (_e = xrecs_1.return)) _e.call(xrecs_1);
+                if (xrecs_2_1 && !xrecs_2_1.done && (_g = xrecs_2.return)) _g.call(xrecs_2);
             }
-            finally { if (e_33) throw e_33.error; }
+            finally { if (e_51) throw e_51.error; }
         }
     };
     /**
@@ -3505,7 +3986,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_35, _a;
+        var e_53, _a;
         var items = __spreadArray([], __read(records), false);
         filer.startTable(tableName);
         table.dxfOut(filer);
@@ -3521,12 +4002,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 record.dxfOut(filer, true);
             }
         }
-        catch (e_35_1) { e_35 = { error: e_35_1 }; }
+        catch (e_53_1) { e_53 = { error: e_53_1 }; }
         finally {
             try {
                 if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
             }
-            finally { if (e_35) throw e_35.error; }
+            finally { if (e_53) throw e_53.error; }
         }
         filer.endTable();
     };
@@ -3541,6 +4022,13 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param entity - Entity to serialize.
      */
     AcDbDatabase.prototype.writeDxfEntity = function (filer, entity) {
+        // Preserved tags only fit the layout they were read in: R13+ tags (with
+        // subclass markers) cannot go to R12 and vice versa; ezdxf drops such
+        // entities as well.
+        if (entity instanceof AcDbUnknownEntity &&
+            entity.hasSubclassData !== filer.capabilities.supportsSubclassMarkers) {
+            return;
+        }
         if (entity instanceof AcDbPolyline &&
             !filer.capabilities.supportsLwPolyline) {
             filer.writeStart('POLYLINE');
@@ -3587,6 +4075,8 @@ var AcDbDatabase = /** @class */ (function (_super) {
         this.transactionManager.clearUndoStack();
         // Clear all tables and dictionaries
         this._classes = [];
+        this.clearDxfHeaderExtras();
+        this._dxfUnknownObjects = [];
         this._tables.blockTable.removeAll();
         this._tables.dimStyleTable.removeAll();
         this._tables.linetypeTable.removeAll();