@mlightcad/data-model 1.15.20 → 1.15.22

package/lib/dxf/AcDbDxfObjectsReader.js

@@ -25,6 +25,7 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+import { AcDbDxfFiler } from '../base/AcDbDxfFiler.js';
 import { AcDbBlockTableRecord } from '../database/AcDbBlockTableRecord.js';
 import { acdbReadLayerFilterTree } from '../ly/AcLyLayerFilterIO.js';
 import { AcDbBlkRefObjectContextData } from '../object/AcDbBlkRefObjectContextData.js';
@@ -45,8 +46,11 @@ import { AcDbRasterImageDef } from '../object/AcDbRasterImageDef.js';
 import { AcDbScale } from '../object/AcDbScale.js';
 import { AcDbSortentsTable } from '../object/AcDbSortentsTable.js';
 import { AcDbTextObjectContextData } from '../object/AcDbTextObjectContextData.js';
+import { AcDbUnknownObject } from '../object/AcDbUnknownObject.js';
 import { AcDbXrecord } from '../object/AcDbXrecord.js';
 import { AcDbLayout } from '../object/layout/AcDbLayout.js';
+import { acdbDrainDxfObjectPairs, AcDbDxfPairArrayReader, acdbTypedValueToDxfPair } from './AcDbDxfPairArrayReader.js';
+import { acdbSplitDxfRawTags } from './AcDbDxfRawTags.js';
 var normalizeHandle = function (handle) {
     return handle ? handle.trim().toUpperCase() : '';
 };
@@ -63,9 +67,11 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
         this._dictionaries = new Map();
         this._xrecords = new Map();
         this._unknownObjectCount = 0;
+        /** Objects kept verbatim, linked into dictionaries once all are loaded. */
+        this._unknownObjects = [];
     }
     Object.defineProperty(AcDbDxfObjectsReader.prototype, "unknownObjectCount", {
-        /** Count of OBJECTS types skipped because no native reader exists yet. */
+        /** Count of OBJECTS records kept verbatim because no native reader exists. */
         get: function () {
             return this._unknownObjectCount;
         },
@@ -78,6 +84,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
      */
     AcDbDxfObjectsReader.prototype.read = function (filer) {
         this._unknownObjectCount = 0;
+        this._unknownObjects.length = 0;
         while (!filer.atEof) {
             var item = filer.peekItem();
             if (!item)
@@ -159,7 +166,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
             }
             case 'DICTIONARY':
             case 'ACDBDICTIONARYWDFLT': {
-                var dict = this.readPersistDictionary(filer);
+                var dict = this.readPersistDictionary(filer, typeName);
                 if (dict.handle) {
                     this._dictionaries.set(normalizeHandle(dict.handle), dict);
                 }
@@ -184,8 +191,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_MTEXTOBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbMTextObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbMTextObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -193,8 +199,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_TEXTOBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbTextObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbTextObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -209,8 +214,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
             case 'ACDB_RADDIMOBJECTCONTEXTDATA_CLASS':
             case 'ACDB_RADIMOBJECTCONTEXTDATA_CLASS':
             case 'ACDB_RADDIMLGCOBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbDimensionObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbDimensionObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -218,8 +222,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_HATCHSCALECONTEXTDATA_CLASS': {
-                var context = new AcDbHatchScaleContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbHatchScaleContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -227,8 +230,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_BLKREFOBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbBlkRefObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbBlkRefObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -236,8 +238,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_LEADEROBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbLeaderObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbLeaderObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -245,8 +246,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_MLEADEROBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbMLeaderObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbMLeaderObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -254,8 +254,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 break;
             }
             case 'ACDB_MTEXTATTRIBUTEOBJECTCONTEXTDATA_CLASS': {
-                var context = new AcDbMTextAttributeObjectContextData();
-                context.dxfIn(filer);
+                var context = this.readContextData(filer, new AcDbMTextAttributeObjectContextData(), typeName);
                 var handle = normalizeHandle(context.objectId);
                 if (handle) {
                     this._db.objects.objectContextData.setAt(handle, context);
@@ -285,12 +284,42 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 }
                 break;
             }
-            default:
-                // Unsupported object type — skip its pairs and record for diagnostics.
+            default: {
+                // No native class: keep the tags verbatim (ezdxf DXFTagStorage) so
+                // dictionaries and handles that point at the record stay valid.
                 this._unknownObjectCount += 1;
-                filer.skipToEndOfObject();
+                var object = new AcDbUnknownObject(typeName);
+                object.dxfIn(filer);
+                if (object.objectId) {
+                    object.database = this._db;
+                    this._db.registerObjectHandle(object);
+                    this._db.addDxfUnknownObject(object);
+                    this._unknownObjects.push(object);
+                }
+                break;
+            }
+        }
+    };
+    /**
+     * Reads a context-data record keeping its tags for verbatim export; only
+     * part of each record is modeled natively.
+     */
+    AcDbDxfObjectsReader.prototype.readContextData = function (filer, context, typeName) {
+        var pairs = acdbDrainDxfObjectPairs(filer);
+        // Trailing XData is replayed too so dxfIn stores it on the object.
+        while (!filer.atEndOfObject && !filer.atEof) {
+            var item = filer.readItem();
+            if (!item)
                 break;
+            pairs.push(acdbTypedValueToDxfPair(item));
         }
+        var replay = AcDbDxfFiler.forReading(new AcDbDxfPairArrayReader(pairs), {
+            database: filer.database
+        });
+        context.dxfIn(replay);
+        context.dxfRecordName = typeName;
+        context.setDxfRawTags(acdbSplitDxfRawTags(pairs).tags);
+        return context;
     };
     /**
      * Wire the root named-object dictionary and known child dictionaries
@@ -320,7 +349,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
         if (!(root === null || root === void 0 ? void 0 : root.handle))
             return;
         var rootDict = this._db.objects.dictionary;
-        rootDict.objectId = root.handle;
+        this.adoptDxfHandle(rootDict, root.handle);
         rootDict.ownerId = '0';
         var typedByKey = {
             ACAD_LAYOUT: this._db.objects.layout,
@@ -339,7 +368,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 var typed = typedByKey[key.toUpperCase()];
                 if (!typed)
                     continue;
-                typed.objectId = childHandle;
+                this.adoptDxfHandle(typed, childHandle);
                 typed.ownerId = root.handle;
                 rootDict.setAt(key, typed);
                 var child = this._dictionaries.get(normalizeHandle(childHandle));
@@ -358,12 +387,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                         // from the NOD child handle before merging, so ownerId-based hasId()
                         // misses objects that were setAt under the previous dictionary handle.
                         var targetId = normalizeHandle(obj.objectId);
-                        var alreadyStored = false;
+                        var storedKey = void 0;
                         try {
                             for (var _o = (e_4 = void 0, __values(typed.entries())), _p = _o.next(); !_p.done; _p = _o.next()) {
-                                var _q = __read(_p.value, 2), existing = _q[1];
+                                var _q = __read(_p.value, 2), key_1 = _q[0], existing = _q[1];
                                 if (normalizeHandle(existing.objectId) === targetId) {
-                                    alreadyStored = true;
+                                    storedKey = key_1;
                                     break;
                                 }
                             }
@@ -375,7 +404,19 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                             }
                             finally { if (e_4) throw e_4.error; }
                         }
-                        if (!typed.getAt(entryName) && !alreadyStored) {
+                        if (typed === this._db.objects.mleaderStyle &&
+                            storedKey != null &&
+                            storedKey !== entryName &&
+                            normalizeHandle(storedKey) === targetId &&
+                            !typed.getAt(entryName)) {
+                            // MLEADERSTYLE has no name of its own: it is keyed by handle until
+                            // the NOD entry names it. Without the rename, CMLEADERSTYLE never
+                            // matches and a duplicate "Standard" style is created on every open.
+                            typed.remove(storedKey);
+                            typed.setAt(entryName, obj);
+                            continue;
+                        }
+                        if (!typed.getAt(entryName) && storedKey == null) {
                             typed.setAt(entryName, obj);
                         }
                     }
@@ -397,170 +438,234 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
             finally { if (e_2) throw e_2.error; }
         }
     };
-    AcDbDxfObjectsReader.prototype.collectLoadedObjectsByHandle = function () {
-        var e_5, _a, e_6, _b, e_7, _c, e_8, _d, e_9, _e, e_10, _f, e_11, _g, e_12, _h, e_13, _j, e_14, _k, e_15, _l, e_16, _m;
-        var map = new Map();
-        var add = function (obj) {
-            var id = normalizeHandle(obj.objectId);
-            if (id)
-                map.set(id, obj);
-        };
-        try {
-            for (var _o = __values(this._db.objects.layout.entries()), _p = _o.next(); !_p.done; _p = _o.next()) {
-                var _q = __read(_p.value, 2), o = _q[1];
-                add(o);
-            }
-        }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-        finally {
-            try {
-                if (_p && !_p.done && (_a = _o.return)) _a.call(_o);
+    /**
+     * Gives a bootstrap dictionary the handle it has in the DXF. A default
+     * object that was minted the same handle (e.g. an `ACAD_GROUP` the file
+     * does not contain) moves to a fresh handle so no handle is written twice.
+     */
+    AcDbDxfObjectsReader.prototype.adoptDxfHandle = function (dict, handle) {
+        var e_5, _a, e_6, _b;
+        if (normalizeHandle(dict.objectId) === normalizeHandle(handle))
+            return;
+        var incumbent = this._db.getObjectById(handle);
+        if (incumbent && incumbent !== dict) {
+            var fresh = this._db.generateUniqueHandle();
+            this._db.releaseObjectHandle(incumbent);
+            incumbent.objectId = fresh;
+            this._db.registerObjectHandle(incumbent);
+            if (incumbent instanceof AcDbDictionary) {
+                try {
+                    for (var _c = __values(incumbent.entries()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var _e = __read(_d.value, 2), entry = _e[1];
+                        if (entry.ownerId === handle)
+                            entry.ownerId = fresh;
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
             }
-            finally { if (e_5) throw e_5.error; }
         }
+        var oldHandle = dict.objectId;
+        this._db.releaseObjectHandle(dict);
+        dict.objectId = handle;
+        this._db.registerObjectHandle(dict);
         try {
-            for (var _r = __values(this._db.objects.group.entries()), _s = _r.next(); !_s.done; _s = _r.next()) {
-                var _t = __read(_s.value, 2), o = _t[1];
-                add(o);
+            for (var _f = __values(dict.entries()), _g = _f.next(); !_g.done; _g = _f.next()) {
+                var _h = __read(_g.value, 2), entry = _h[1];
+                if (entry.ownerId === oldHandle)
+                    entry.ownerId = handle;
             }
         }
         catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
-                if (_s && !_s.done && (_b = _r.return)) _b.call(_r);
+                if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
             }
             finally { if (e_6) throw e_6.error; }
         }
+    };
+    AcDbDxfObjectsReader.prototype.collectLoadedObjectsByHandle = function () {
+        var e_7, _a, e_8, _b, e_9, _c, e_10, _d, e_11, _e, e_12, _f, e_13, _g, e_14, _h, e_15, _j, e_16, _k, e_17, _l, e_18, _m, e_19, _o;
+        var map = new Map();
+        var add = function (obj) {
+            var id = normalizeHandle(obj.objectId);
+            if (id)
+                map.set(id, obj);
+        };
         try {
-            for (var _u = __values(this._db.objects.sortentsTable.entries()), _v = _u.next(); !_v.done; _v = _u.next()) {
-                var _w = __read(_v.value, 2), o = _w[1];
+            for (var _p = __values(this._db.objects.layout.entries()), _q = _p.next(); !_q.done; _q = _p.next()) {
+                var _r = __read(_q.value, 2), o = _r[1];
                 add(o);
             }
         }
         catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
-                if (_v && !_v.done && (_c = _u.return)) _c.call(_u);
+                if (_q && !_q.done && (_a = _p.return)) _a.call(_p);
             }
             finally { if (e_7) throw e_7.error; }
         }
         try {
-            for (var _x = __values(this._db.objects.imageDefinition.entries()), _y = _x.next(); !_y.done; _y = _x.next()) {
-                var _z = __read(_y.value, 2), o = _z[1];
+            for (var _s = __values(this._db.objects.group.entries()), _t = _s.next(); !_t.done; _t = _s.next()) {
+                var _u = __read(_t.value, 2), o = _u[1];
                 add(o);
             }
         }
         catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
-                if (_y && !_y.done && (_d = _x.return)) _d.call(_x);
+                if (_t && !_t.done && (_b = _s.return)) _b.call(_s);
             }
             finally { if (e_8) throw e_8.error; }
         }
         try {
-            for (var _0 = __values(this._db.objects.mleaderStyle.entries()), _1 = _0.next(); !_1.done; _1 = _0.next()) {
-                var _2 = __read(_1.value, 2), o = _2[1];
+            for (var _v = __values(this._db.objects.sortentsTable.entries()), _w = _v.next(); !_w.done; _w = _v.next()) {
+                var _x = __read(_w.value, 2), o = _x[1];
                 add(o);
             }
         }
         catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
-                if (_1 && !_1.done && (_e = _0.return)) _e.call(_0);
+                if (_w && !_w.done && (_c = _v.return)) _c.call(_v);
             }
             finally { if (e_9) throw e_9.error; }
         }
         try {
-            for (var _3 = __values(this._db.objects.mlineStyle.entries()), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                var _5 = __read(_4.value, 2), o = _5[1];
+            for (var _y = __values(this._db.objects.imageDefinition.entries()), _z = _y.next(); !_z.done; _z = _y.next()) {
+                var _0 = __read(_z.value, 2), o = _0[1];
                 add(o);
             }
         }
         catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
-                if (_4 && !_4.done && (_f = _3.return)) _f.call(_3);
+                if (_z && !_z.done && (_d = _y.return)) _d.call(_y);
             }
             finally { if (e_10) throw e_10.error; }
         }
         try {
-            for (var _6 = __values(this._db.objects.layerFilter.entries()), _7 = _6.next(); !_7.done; _7 = _6.next()) {
-                var _8 = __read(_7.value, 2), o = _8[1];
+            for (var _1 = __values(this._db.objects.mleaderStyle.entries()), _2 = _1.next(); !_2.done; _2 = _1.next()) {
+                var _3 = __read(_2.value, 2), o = _3[1];
                 add(o);
             }
         }
         catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
-                if (_7 && !_7.done && (_g = _6.return)) _g.call(_6);
+                if (_2 && !_2.done && (_e = _1.return)) _e.call(_1);
             }
             finally { if (e_11) throw e_11.error; }
         }
         try {
-            for (var _9 = __values(this._db.objects.layerIndex.entries()), _10 = _9.next(); !_10.done; _10 = _9.next()) {
-                var _11 = __read(_10.value, 2), o = _11[1];
+            for (var _4 = __values(this._db.objects.mlineStyle.entries()), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                var _6 = __read(_5.value, 2), o = _6[1];
                 add(o);
             }
         }
         catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
-                if (_10 && !_10.done && (_h = _9.return)) _h.call(_9);
+                if (_5 && !_5.done && (_f = _4.return)) _f.call(_4);
             }
             finally { if (e_12) throw e_12.error; }
         }
         try {
-            for (var _12 = __values(this._db.objects.xrecord.entries()), _13 = _12.next(); !_13.done; _13 = _12.next()) {
-                var _14 = __read(_13.value, 2), o = _14[1];
+            for (var _7 = __values(this._db.objects.layerFilter.entries()), _8 = _7.next(); !_8.done; _8 = _7.next()) {
+                var _9 = __read(_8.value, 2), o = _9[1];
                 add(o);
             }
         }
         catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
-                if (_13 && !_13.done && (_j = _12.return)) _j.call(_12);
+                if (_8 && !_8.done && (_g = _7.return)) _g.call(_7);
             }
             finally { if (e_13) throw e_13.error; }
         }
         try {
-            for (var _15 = __values(this._db.objects.scale.entries()), _16 = _15.next(); !_16.done; _16 = _15.next()) {
-                var _17 = __read(_16.value, 2), o = _17[1];
+            for (var _10 = __values(this._db.objects.layerIndex.entries()), _11 = _10.next(); !_11.done; _11 = _10.next()) {
+                var _12 = __read(_11.value, 2), o = _12[1];
                 add(o);
             }
         }
         catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
-                if (_16 && !_16.done && (_k = _15.return)) _k.call(_15);
+                if (_11 && !_11.done && (_h = _10.return)) _h.call(_10);
             }
             finally { if (e_14) throw e_14.error; }
         }
         try {
-            for (var _18 = __values(this._db.objects.dictionaryVar.entries()), _19 = _18.next(); !_19.done; _19 = _18.next()) {
-                var _20 = __read(_19.value, 2), o = _20[1];
+            for (var _13 = __values(this._db.objects.xrecord.entries()), _14 = _13.next(); !_14.done; _14 = _13.next()) {
+                var _15 = __read(_14.value, 2), o = _15[1];
                 add(o);
             }
         }
         catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
-                if (_19 && !_19.done && (_l = _18.return)) _l.call(_18);
+                if (_14 && !_14.done && (_j = _13.return)) _j.call(_13);
             }
             finally { if (e_15) throw e_15.error; }
         }
         try {
-            for (var _21 = __values(this._db.objects.objectContextData.entries()), _22 = _21.next(); !_22.done; _22 = _21.next()) {
-                var _23 = __read(_22.value, 2), o = _23[1];
+            for (var _16 = __values(this._db.objects.scale.entries()), _17 = _16.next(); !_17.done; _17 = _16.next()) {
+                var _18 = __read(_17.value, 2), o = _18[1];
                 add(o);
             }
         }
         catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
-                if (_22 && !_22.done && (_m = _21.return)) _m.call(_21);
+                if (_17 && !_17.done && (_k = _16.return)) _k.call(_16);
             }
             finally { if (e_16) throw e_16.error; }
         }
+        try {
+            for (var _19 = __values(this._db.objects.dictionaryVar.entries()), _20 = _19.next(); !_20.done; _20 = _19.next()) {
+                var _21 = __read(_20.value, 2), o = _21[1];
+                add(o);
+            }
+        }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        finally {
+            try {
+                if (_20 && !_20.done && (_l = _19.return)) _l.call(_19);
+            }
+            finally { if (e_17) throw e_17.error; }
+        }
+        try {
+            for (var _22 = __values(this._db.objects.objectContextData.entries()), _23 = _22.next(); !_23.done; _23 = _22.next()) {
+                var _24 = __read(_23.value, 2), o = _24[1];
+                add(o);
+            }
+        }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        finally {
+            try {
+                if (_23 && !_23.done && (_m = _22.return)) _m.call(_22);
+            }
+            finally { if (e_18) throw e_18.error; }
+        }
+        try {
+            for (var _25 = __values(this._unknownObjects), _26 = _25.next(); !_26.done; _26 = _25.next()) {
+                var o = _26.value;
+                add(o);
+            }
+        }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        finally {
+            try {
+                if (_26 && !_26.done && (_o = _25.return)) _o.call(_25);
+            }
+            finally { if (e_19) throw e_19.error; }
+        }
         return map;
     };
     /**
@@ -570,7 +675,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
      * {@link AcDbDatabase.getObjectById}.
      */
     AcDbDxfObjectsReader.prototype.materializeBufferedDictionaries = function () {
-        var e_17, _a, e_18, _b, e_19, _c, e_20, _d, e_21, _e, e_22, _f, e_23, _g, e_24, _h;
+        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;
         var _j;
         if (this._dictionaries.size === 0)
             return;
@@ -587,12 +692,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 }
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_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_17) throw e_17.error; }
+            finally { if (e_20) throw e_20.error; }
         }
         var materialized = new Map();
         try {
@@ -610,6 +715,8 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 this._db.releaseObjectHandle(dict);
                 dict.objectId = handle;
                 dict.ownerId = persist.ownerObjectId || '0';
+                if (persist.defaultId)
+                    dict.defaultId = persist.defaultId;
                 if (persist.extensionDictionaryId) {
                     dict.extensionDictionary = persist.extensionDictionaryId;
                 }
@@ -617,12 +724,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 materialized.set(handle, dict);
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
                 if (_o && !_o.done && (_b = _m.return)) _b.call(_m);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_21) throw e_21.error; }
         }
         var objectsByHandle = this.collectLoadedObjectsByHandle();
         try {
@@ -631,12 +738,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 objectsByHandle.set(handle, dict);
             }
         }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
         finally {
             try {
                 if (materialized_1_1 && !materialized_1_1.done && (_c = materialized_1.return)) _c.call(materialized_1);
             }
-            finally { if (e_19) throw e_19.error; }
+            finally { if (e_22) throw e_22.error; }
         }
         try {
             for (var _r = __values(this._dictionaries), _s = _r.next(); !_s.done; _s = _r.next()) {
@@ -645,7 +752,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 if (!dict)
                     continue;
                 try {
-                    for (var _u = (e_21 = void 0, __values(Object.entries(persist.entries))), _v = _u.next(); !_v.done; _v = _u.next()) {
+                    for (var _u = (e_24 = void 0, __values(Object.entries(persist.entries))), _v = _u.next(); !_v.done; _v = _u.next()) {
                         var _w = __read(_v.value, 2), entryName = _w[0], entryHandle = _w[1];
                         var obj = objectsByHandle.get(normalizeHandle(entryHandle));
                         if (!obj)
@@ -658,7 +765,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                         var targetId = normalizeHandle(obj.objectId);
                         var alreadyStored = false;
                         try {
-                            for (var _x = (e_22 = void 0, __values(dict.entries())), _y = _x.next(); !_y.done; _y = _x.next()) {
+                            for (var _x = (e_25 = void 0, __values(dict.entries())), _y = _x.next(); !_y.done; _y = _x.next()) {
                                 var _z = __read(_y.value, 2), existing = _z[1];
                                 if (normalizeHandle(existing.objectId) === targetId) {
                                     alreadyStored = true;
@@ -666,12 +773,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+                        catch (e_25_1) { e_25 = { error: e_25_1 }; }
                         finally {
                             try {
                                 if (_y && !_y.done && (_f = _x.return)) _f.call(_x);
                             }
-                            finally { if (e_22) throw e_22.error; }
+                            finally { if (e_25) throw e_25.error; }
                         }
                         if (alreadyStored)
                             continue;
@@ -683,21 +790,21 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                         }
                     }
                 }
-                catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                catch (e_24_1) { e_24 = { error: e_24_1 }; }
                 finally {
                     try {
                         if (_v && !_v.done && (_e = _u.return)) _e.call(_u);
                     }
-                    finally { if (e_21) throw e_21.error; }
+                    finally { if (e_24) throw e_24.error; }
                 }
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
                 if (_s && !_s.done && (_d = _r.return)) _d.call(_r);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_23) throw e_23.error; }
         }
         // Attach non-typed root NOD children (e.g. AcDbVariableDictionary) so
         // callers can resolve them by name from objects.dictionary.
@@ -711,12 +818,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 }
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (_2 && !_2.done && (_g = _1.return)) _g.call(_1);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_26) throw e_26.error; }
         }
         if (!(rootPersist === null || rootPersist === void 0 ? void 0 : rootPersist.handle))
             return;
@@ -737,12 +844,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 }
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (_4 && !_4.done && (_h = _3.return)) _h.call(_3);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_27) throw e_27.error; }
         }
     };
     /**
@@ -774,13 +881,14 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
         var raw = String(annoVar.value).trim();
         this._db.annoallvisible = raw !== '0' && raw.toLowerCase() !== 'false';
     };
-    AcDbDxfObjectsReader.prototype.readPersistDictionary = function (filer) {
+    AcDbDxfObjectsReader.prototype.readPersistDictionary = function (filer, typeName) {
         var result = {
             handle: '',
             ownerObjectId: '',
             entries: {}
         };
         var pendingName;
+        var inDefaultSubclass = false;
         while (!filer.atEndOfObject && !filer.atEof && !filer.atExtendedData) {
             var item = filer.readItem();
             if (!item)
@@ -794,6 +902,9 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                     result.ownerObjectId = String(item.value);
                     break;
                 case 100:
+                    inDefaultSubclass =
+                        String(item.value) === 'AcDbDictionaryWithDefault';
+                    break;
                 case 280:
                 case 281:
                     break;
@@ -804,7 +915,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 case 340:
                 case 360: {
                     var target = normalizeHandle(String(item.value));
-                    if (pendingName) {
+                    if (code === 340 &&
+                        (inDefaultSubclass || typeName === 'ACDBDICTIONARYWDFLT') &&
+                        !pendingName) {
+                        result.defaultId = target;
+                    }
+                    else if (pendingName) {
                         result.entries[pendingName] = target;
                         pendingName = undefined;
                     }
@@ -845,7 +961,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
      * matching {@link AcDbObjectConverter.convertLayout} resolution rules.
      */
     AcDbDxfObjectsReader.prototype.linkLayoutsToBlockTableRecords = function () {
-        var e_25, _a, e_26, _b, e_27, _c;
+        var e_28, _a, e_29, _b, e_30, _c;
         var blockTable = this._db.tables.blockTable;
         var modelSpaceName = AcDbBlockTableRecord.MODEL_SPACE_NAME.toUpperCase();
         try {
@@ -860,7 +976,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 var layoutHandle = normalizeHandle(layout.objectId);
                 var linked = false;
                 try {
-                    for (var _g = (e_26 = void 0, __values(blockTable.newIterator())), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    for (var _g = (e_29 = void 0, __values(blockTable.newIterator())), _h = _g.next(); !_h.done; _h = _g.next()) {
                         var btr = _h.value;
                         if (normalizeHandle(btr.layoutId) === layoutHandle) {
                             layout.blockTableRecordId = btr.objectId;
@@ -869,12 +985,12 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                         }
                     }
                 }
-                catch (e_26_1) { e_26 = { error: e_26_1 }; }
+                catch (e_29_1) { e_29 = { error: e_29_1 }; }
                 finally {
                     try {
                         if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
                     }
-                    finally { if (e_26) throw e_26.error; }
+                    finally { if (e_29) throw e_29.error; }
                 }
                 if (!linked && layout.blockTableRecordId) {
                     var btr = blockTable.getIdAt(layout.blockTableRecordId);
@@ -885,7 +1001,7 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                 else if (!linked) {
                     try {
                         // Fallback: paper-space BTR whose name is not model space and has no layout yet.
-                        for (var _j = (e_27 = void 0, __values(blockTable.newIterator())), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        for (var _j = (e_30 = void 0, __values(blockTable.newIterator())), _k = _j.next(); !_k.done; _k = _j.next()) {
                             var btr = _k.value;
                             if (btr.isPaperSapce &&
                                 btr.name.toUpperCase() !== modelSpaceName &&
@@ -896,22 +1012,22 @@ var AcDbDxfObjectsReader = /** @class */ (function () {
                             }
                         }
                     }
-                    catch (e_27_1) { e_27 = { error: e_27_1 }; }
+                    catch (e_30_1) { e_30 = { error: e_30_1 }; }
                     finally {
                         try {
                             if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
                         }
-                        finally { if (e_27) throw e_27.error; }
+                        finally { if (e_30) throw e_30.error; }
                     }
                 }
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_28_1) { e_28 = { error: e_28_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_28) throw e_28.error; }
         }
     };
     return AcDbDxfObjectsReader;