@mlightcad/data-model 1.10.1 → 1.10.2

package/lib/database/AcDbDatabase.js

@@ -49,17 +49,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -85,10 +74,21 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 /* eslint-disable simple-import-sort/imports */
 import { AcCmColor, AcCmColorMethod, AcCmEventManager, AcCmTransparency } from '@mlightcad/common';
 import { AcDbDxfFiler } from '../base/AcDbDxfFiler';
-import { AcDbObject } from '../base/AcDbObject';
+import { AcDbObject, TEMP_OBJECT_ID_PREFIX } from '../base/AcDbObject';
 import { AcDbOpenMode } from '../base/AcDbOpenMode';
 import { AcDbRegenerator } from '../converter/AcDbRegenerator';
 import { AcDbDatabaseConverterManager, AcDbFileType } from './AcDbDatabaseConverterManager';
@@ -103,6 +103,7 @@ import { AcDbMLeaderStyle } from '../object/AcDbMLeaderStyle';
 import { AcDbMlineStyle } from '../object/AcDbMlineStyle';
 import { AcDbBlockTable } from './AcDbBlockTable';
 import { AcDbBlockTableRecord } from './AcDbBlockTableRecord';
+import { AcDbOpenDatabaseError } from './AcDbOpenDatabaseError';
 import { AcDbDimStyleTable } from './AcDbDimStyleTable';
 import { AcDbDimStyleTableRecord } from './AcDbDimStyleTableRecord';
 import { AcDbLayerTable } from './AcDbLayerTable';
@@ -147,6 +148,8 @@ var AcDbDatabase = /** @class */ (function (_super) {
      */
     function AcDbDatabase() {
         var _this = _super.call(this, { objectId: '0' }) || this;
+        /** Global registry of committed object handles across all database-resident objects */
+        _this._handleRegistry = new Map();
         /**
          * When false, entities on non-plottable layers are not drawn (viewer semantics).
          * Set from {@link AcDbOpenDatabaseOptions.drawNoPlotLayers} when opening a database.
@@ -157,6 +160,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         _this._pendingEntityErased = [];
         _this._pendingDictObjectSet = [];
         _this._pendingDictObjectErased = [];
+        _this._lastOpenError = null;
         /**
          * Events that can be triggered by the database.
          *
@@ -181,7 +185,9 @@ var AcDbDatabase = /** @class */ (function (_super) {
             /** Fired when a layer is erased from the database */
             layerErased: new AcCmEventManager(),
             /** Fired during database opening operations to report progress */
-            openProgress: new AcCmEventManager()
+            openProgress: new AcCmEventManager(),
+            /** Fired when {@link AcDbDatabase.read} or {@link AcDbDatabase.openUri} fails */
+            openFailed: new AcCmEventManager()
         };
         AcDbDatabase._unsavedDrawingSequence += 1;
         _this._dwgname = "Drawing".concat(AcDbDatabase._unsavedDrawingSequence, ".dwg");
@@ -237,6 +243,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
             xrecord: new AcDbDictionary(_this)
         };
         _this.transactionManager = new AcDbDatabaseTransactionManager(_this);
+        _this.registerBootstrapHandles();
         return _this;
     }
     Object.defineProperty(AcDbDatabase.prototype, "tables", {
@@ -279,69 +286,18 @@ var AcDbDatabase = /** @class */ (function (_super) {
     /**
      * Looks up a database-resident object by its object ID.
      *
-     * Search order: entities, symbol table records, dictionary objects
-     * (including nested dictionaries), then the database object itself.
+     * Uses the global handle registry maintained by {@link registerObjectHandle}.
      *
      * @param id - Object identifier to resolve
      * @param _openErased - Reserved for erased-object support
      * @returns The matching object, or undefined if not found
      */
     AcDbDatabase.prototype.getObjectById = function (id, _openErased) {
-        var e_1, _a, e_2, _b;
         if (_openErased === void 0) { _openErased = false; }
         if (id === this.objectId) {
             return this;
         }
-        var entity = this.tables.blockTable.getEntityById(id);
-        if (entity) {
-            return entity;
-        }
-        var symbolTables = [
-            this.tables.appIdTable,
-            this.tables.blockTable,
-            this.tables.dimStyleTable,
-            this.tables.linetypeTable,
-            this.tables.textStyleTable,
-            this.tables.viewTable,
-            this.tables.layerTable,
-            this.tables.viewportTable
-        ];
-        try {
-            for (var symbolTables_1 = __values(symbolTables), symbolTables_1_1 = symbolTables_1.next(); !symbolTables_1_1.done; symbolTables_1_1 = symbolTables_1.next()) {
-                var table = symbolTables_1_1.value;
-                var record = table.getIdAt(id);
-                if (record) {
-                    return record;
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (symbolTables_1_1 && !symbolTables_1_1.done && (_a = symbolTables_1.return)) _a.call(symbolTables_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        try {
-            for (var _c = __values(this.getRootDictionaries()), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var dictionary = _d.value;
-                if (dictionary.objectId === id) {
-                    return dictionary;
-                }
-                var object = this.findObjectInDictionary(dictionary, id);
-                if (object) {
-                    return object;
-                }
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        return undefined;
+        return this._handleRegistry.get(id);
     };
     /**
      * Returns true when the transaction manager is actively recording changes.
@@ -428,45 +384,6 @@ var AcDbDatabase = /** @class */ (function (_super) {
             this.objects.xrecord
         ];
     };
-    /**
-     * Recursively searches a dictionary tree for an object with the given ID.
-     *
-     * @param dictionary - Root dictionary to search (including nested dictionaries)
-     * @param id - Object identifier to resolve
-     * @returns Matching object, or undefined when not found under `dictionary`
-     */
-    AcDbDatabase.prototype.findObjectInDictionary = function (dictionary, id) {
-        var e_3, _a;
-        if (dictionary.objectId === id) {
-            return dictionary;
-        }
-        var direct = dictionary.getIdAt(id);
-        if (direct) {
-            return direct;
-        }
-        try {
-            for (var _b = __values(dictionary.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), entry = _d[1];
-                if (entry.objectId === id) {
-                    return entry;
-                }
-                if (entry instanceof AcDbDictionary) {
-                    var nested = this.findObjectInDictionary(entry, id);
-                    if (nested) {
-                        return nested;
-                    }
-                }
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
-        return undefined;
-    };
     /**
      * Begins suppressing database events until {@link endEventBatch} is called.
      */
@@ -567,7 +484,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * Appended and erased entities are dispatched in batch arrays where applicable.
      */
     AcDbDatabase.prototype.flushEventBatch = function () {
-        var e_4, _a, e_5, _b;
+        var e_1, _a, e_2, _b;
         if (this._pendingEntityAppended.length > 0) {
             var appended = this._pendingEntityAppended;
             this._pendingEntityAppended = [];
@@ -597,12 +514,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                     });
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
                     if (dictSet_1_1 && !dictSet_1_1.done && (_a = dictSet_1.return)) _a.call(dictSet_1);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_1) throw e_1.error; }
             }
         }
         if (this._pendingDictObjectErased.length > 0) {
@@ -618,12 +535,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                     });
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (dictErased_1_1 && !dictErased_1_1.done && (_b = dictErased_1.return)) _b.call(dictErased_1);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_2) throw e_2.error; }
             }
         }
     };
@@ -662,6 +579,143 @@ var AcDbDatabase = /** @class */ (function (_super) {
         this._maxHandle++;
         return this._maxHandle.toString(16).toUpperCase();
     };
+    /**
+     * Generates a handle that is not already registered in this database.
+     *
+     * @internal
+     */
+    AcDbDatabase.prototype.generateUniqueHandle = function () {
+        var handle = this.generateHandle();
+        while (this.isHandleTaken(handle)) {
+            handle = this.generateHandle();
+        }
+        return handle;
+    };
+    /**
+     * Initializes {@link generateHandle} from a DXF/DWG `$HANDSEED` value.
+     *
+     * `$HANDSEED` is the next handle AutoCAD would assign; internal `_maxHandle`
+     * is kept one below that value.
+     *
+     * @param seed - Hexadecimal handle seed from the drawing header
+     */
+    AcDbDatabase.prototype.initializeHandleSeed = function (seed) {
+        var next = parseInt(seed, 16);
+        if (!isNaN(next) && next > 0) {
+            var baseline = next - 1;
+            if (baseline > this._maxHandle) {
+                this._maxHandle = baseline;
+            }
+        }
+    };
+    /**
+     * Adopts a handle from an external drawing when it is still available.
+     *
+     * When the preferred handle is already registered to another object, a new
+     * unique handle is generated instead.
+     *
+     * @internal
+     */
+    AcDbDatabase.prototype.adoptExternalHandle = function (object, preferredId) {
+        this.releaseObjectHandle(object);
+        if (preferredId &&
+            !preferredId.startsWith(TEMP_OBJECT_ID_PREFIX) &&
+            !this.isHandleTaken(preferredId)) {
+            object.objectId = preferredId;
+            this.registerObjectHandle(object);
+            this.updateMaxHandle(preferredId);
+            return preferredId;
+        }
+        return this.assignGeneratedHandle(object);
+    };
+    /**
+     * Registers an object's current {@link AcDbObject.objectId} in the global handle map.
+     *
+     * @internal
+     */
+    AcDbDatabase.prototype.registerObjectHandle = function (object) {
+        var objectId = object.objectId;
+        if (!objectId || objectId.startsWith(TEMP_OBJECT_ID_PREFIX)) {
+            return;
+        }
+        this._handleRegistry.set(objectId, object);
+    };
+    /**
+     * Removes an object's handle from the global handle map.
+     *
+     * @internal
+     */
+    AcDbDatabase.prototype.releaseObjectHandle = function (object) {
+        var objectId = object.objectId;
+        if (!objectId || objectId.startsWith(TEMP_OBJECT_ID_PREFIX)) {
+            return;
+        }
+        if (this._handleRegistry.get(objectId) === object) {
+            this._handleRegistry.delete(objectId);
+        }
+    };
+    /**
+     * Returns true when a handle is already registered to another object.
+     *
+     * @internal
+     */
+    AcDbDatabase.prototype.isHandleTaken = function (objectId, except) {
+        if (!objectId || objectId.startsWith(TEMP_OBJECT_ID_PREFIX)) {
+            return false;
+        }
+        var owner = this._handleRegistry.get(objectId);
+        return owner !== undefined && owner !== except;
+    };
+    /**
+     * Registers bootstrap tables, dictionaries, and the database object itself.
+     */
+    AcDbDatabase.prototype.registerBootstrapHandles = function () {
+        var e_3, _a, e_4, _b;
+        this._handleRegistry.clear();
+        this.registerObjectHandle(this);
+        try {
+            for (var _c = __values(Object.values(this._tables)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var table = _d.value;
+                this.registerObjectHandle(table);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        try {
+            for (var _e = __values(Object.values(this._objects)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var dictionary = _f.value;
+                this.registerObjectHandle(dictionary);
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+    };
+    /**
+     * Assigns a freshly generated unique handle to an object.
+     *
+     * @internal
+     */
+    AcDbDatabase.prototype.assignGeneratedHandle = function (object) {
+        var oldId = object.objectId;
+        this.releaseObjectHandle(object);
+        var handle = this.generateUniqueHandle();
+        object.objectId = handle;
+        this.registerObjectHandle(object);
+        if (oldId && oldId !== handle) {
+            this.updateMaxHandle(handle);
+        }
+        return handle;
+    };
     /**
      * Updates the maximum handle value if the provided handle is greater.
      * This is called when setting an object's objectId from external sources (e.g., reading DXF/DWG).
@@ -689,12 +743,33 @@ var AcDbDatabase = /** @class */ (function (_super) {
      */
     AcDbDatabase.prototype.commitObjectHandle = function (object, hasId) {
         var objectId = object.getAttrWithoutException('objectId');
-        if (!objectId || object.isTemp || (hasId && hasId(objectId))) {
-            object.objectId = this.generateHandle();
+        var tableDuplicate = hasId != null && objectId != null && hasId(objectId);
+        var needsGenerated = !objectId ||
+            object.isTemp ||
+            tableDuplicate;
+        if (needsGenerated) {
+            this.assignGeneratedHandle(object);
+            return;
         }
-        else {
-            this.updateMaxHandle(objectId);
+        var incumbent = this._handleRegistry.get(objectId);
+        if (incumbent && incumbent !== object) {
+            if (this.shouldPreserveIncomingHandle(object)) {
+                this.assignGeneratedHandle(incumbent);
+            }
+            else {
+                this.assignGeneratedHandle(object);
+                return;
+            }
         }
+        this.registerObjectHandle(object);
+        this.updateMaxHandle(objectId);
+    };
+    /**
+     * Returns true when an object already carries an explicit handle that should
+     * be preserved over auto-generated registry occupants (typically DXF/DWG imports).
+     */
+    AcDbDatabase.prototype.shouldPreserveIncomingHandle = function (object) {
+        return !object.isTemp;
     };
     Object.defineProperty(AcDbDatabase.prototype, "currentSpaceId", {
         /**
@@ -1498,6 +1573,19 @@ var AcDbDatabase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AcDbDatabase.prototype, "lastOpenError", {
+        /**
+         * The most recent failure from {@link read} or {@link openUri}, or `null` after a successful open.
+         *
+         * Useful when a caller catches no exception (for example a viewer that returns `false`)
+         * but still needs to distinguish worker out-of-memory from other parse failures.
+         */
+        get: function () {
+            return this._lastOpenError;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Reads drawing data from a string or ArrayBuffer.
      *
@@ -1524,8 +1612,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      */
     AcDbDatabase.prototype.read = function (data_1, options_1) {
         return __awaiter(this, arguments, void 0, function (data, options, fileType) {
-            var converter;
-            var _this = this;
+            var converter, error_1, openError;
             var _a;
             if (fileType === void 0) { fileType = AcDbFileType.DXF; }
             return __generator(this, function (_b) {
@@ -1535,46 +1622,95 @@ var AcDbDatabase = /** @class */ (function (_super) {
                         if (converter == null)
                             throw new Error("Database converter for file type '".concat(fileType, "' isn't registered and can can't read this file!"));
                         this.clear();
+                        this._lastOpenError = null;
                         this._drawNoPlotLayers = (_a = options === null || options === void 0 ? void 0 : options.drawNoPlotLayers) !== null && _a !== void 0 ? _a : true;
                         if (options === null || options === void 0 ? void 0 : options.fileName) {
                             this.setDwgName(options.fileName);
                         }
-                        return [4 /*yield*/, converter.read(data, this, (options && options.minimumChunkSize) || 10, function (percentage, stage, stageStatus, data) { return __awaiter(_this, void 0, void 0, function () {
-                                var fonts_1;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            this.events.openProgress.dispatch({
-                                                database: this,
-                                                percentage: percentage,
-                                                stage: 'CONVERSION',
-                                                subStage: stage,
-                                                subStageStatus: stageStatus,
-                                                data: data
-                                            });
-                                            if (!(options &&
-                                                options.fontLoader &&
-                                                stage == 'FONT' &&
-                                                stageStatus == 'END')) return [3 /*break*/, 2];
-                                            fonts_1 = data
-                                                ? data
-                                                : this.tables.textStyleTable.fonts;
-                                            return [4 /*yield*/, options.fontLoader.load(fonts_1)];
-                                        case 1:
-                                            _a.sent();
-                                            _a.label = 2;
-                                        case 2: return [2 /*return*/];
-                                    }
-                                });
-                            }); }, options === null || options === void 0 ? void 0 : options.timeout, options === null || options === void 0 ? void 0 : options.sysVars)];
+                        _b.label = 1;
                     case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, converter.read(data, this, (options && options.minimumChunkSize) || 10, this.createConversionProgressHandler(options), options === null || options === void 0 ? void 0 : options.timeout, options === null || options === void 0 ? void 0 : options.sysVars)];
+                    case 2:
                         _b.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_1 = _b.sent();
+                        openError = AcDbOpenDatabaseError.from(error_1);
+                        this._lastOpenError = openError;
+                        this.events.openFailed.dispatch({ database: this, error: openError });
+                        throw openError;
+                    case 4:
+                        this._lastOpenError = null;
                         this.ensureDatabaseDefaults();
                         return [2 /*return*/];
                 }
             });
         });
     };
+    AcDbDatabase.prototype.createConversionProgressHandler = function (options) {
+        var _this = this;
+        return function (percentage, stage, stageStatus, data, taskError) { return __awaiter(_this, void 0, void 0, function () {
+            var progressData, openError, fonts_1, error_2, message;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        progressData = data;
+                        if (stageStatus === 'ERROR' && taskError) {
+                            openError = AcDbOpenDatabaseError.fromTask(taskError);
+                            this._lastOpenError = openError;
+                            progressData = {
+                                code: openError.code,
+                                message: openError.message,
+                                stage: (_a = openError.stage) !== null && _a !== void 0 ? _a : stage
+                            };
+                        }
+                        this.events.openProgress.dispatch({
+                            database: this,
+                            percentage: percentage,
+                            stage: 'CONVERSION',
+                            subStage: stage,
+                            subStageStatus: stageStatus,
+                            data: progressData
+                        });
+                        if (!(options &&
+                            options.fontLoader &&
+                            stage == 'FONT' &&
+                            stageStatus == 'END')) return [3 /*break*/, 4];
+                        fonts_1 = data
+                            ? data
+                            : this.tables.textStyleTable.fonts;
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, options.fontLoader.load(fonts_1)];
+                    case 2:
+                        _b.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_2 = _b.sent();
+                        if (options.failOnFontLoadError) {
+                            throw error_2;
+                        }
+                        message = error_2 instanceof Error ? error_2.message : String(error_2);
+                        console.warn('Failed to load fonts; continuing without them. ' +
+                            'Check your network or configure a local baseUrl. See ' +
+                            'https://github.com/mlightcad/cad-viewer/wiki/Self-Hosted-Fonts-and-Templates', error_2);
+                        this.events.openProgress.dispatch({
+                            database: this,
+                            percentage: percentage,
+                            stage: 'CONVERSION',
+                            subStage: stage,
+                            subStageStatus: 'ERROR',
+                            data: { fonts: fonts_1, error: message, code: 'font_load_failed' }
+                        });
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); };
+    };
     /**
      * Read AutoCAD DXF or DWG drawing specified by the URL into the database object.
      * The method automatically detects the file type based on the URL extension:
@@ -1586,7 +1722,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
     AcDbDatabase.prototype.openUri = function (url, options) {
         return __awaiter(this, void 0, void 0, function () {
             var response, contentLength, totalBytes, loadedBytes, reader, chunks, _a, done, value, percentage, content, position, chunks_1, chunks_1_1, chunk, fileName, fileExtension;
-            var e_6, _b;
+            var e_5, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1649,12 +1785,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                                 position += chunk.length;
                             }
                         }
-                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
                                 if (chunks_1_1 && !chunks_1_1.done && (_b = chunks_1.return)) _b.call(chunks_1);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                         fileName = this.getFileNameFromUri(url);
                         if (fileName) {
@@ -1732,24 +1868,11 @@ var AcDbDatabase = /** @class */ (function (_super) {
     AcDbDatabase.prototype.regen = function () {
         return __awaiter(this, void 0, void 0, function () {
             var converter;
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         converter = new AcDbRegenerator(this);
-                        return [4 /*yield*/, converter.read(null, this, 500, function (percentage, stage, stageStatus, data) { return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_a) {
-                                    this.events.openProgress.dispatch({
-                                        database: this,
-                                        percentage: percentage,
-                                        stage: 'CONVERSION',
-                                        subStage: stage,
-                                        subStageStatus: stageStatus,
-                                        data: data
-                                    });
-                                    return [2 /*return*/];
-                                });
-                            }); })];
+                        return [4 /*yield*/, converter.read(null, this, 500, this.createConversionProgressHandler())];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1839,7 +1962,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         }));
     };
     AcDbDatabase.prototype.hasDefaultTextStyle = function () {
-        var e_7, _a, e_8, _b;
+        var e_6, _a, e_7, _b;
         var defaultNames = [DEFAULT_TEXT_STYLE, 'STANDARD'];
         try {
             for (var defaultNames_1 = __values(defaultNames), defaultNames_1_1 = defaultNames_1.next(); !defaultNames_1_1.done; defaultNames_1_1 = defaultNames_1.next()) {
@@ -1849,12 +1972,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (defaultNames_1_1 && !defaultNames_1_1.done && (_a = defaultNames_1.return)) _a.call(defaultNames_1);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         try {
             for (var _c = __values(this.tables.textStyleTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -1864,12 +1987,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         return false;
     };
@@ -1956,7 +2079,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * Ensures one MLINE style exists for the provided style name.
      */
     AcDbDatabase.prototype.ensureMLineStyle = function (styleName) {
-        var e_9, _a;
+        var e_8, _a;
         var dictionary = this.objects.mlineStyle;
         var normalizedName = styleName.trim();
         if (!normalizedName)
@@ -1973,12 +2096,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         var style = new AcDbMlineStyle();
         style.styleName = normalizedName;
@@ -2000,7 +2123,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * Ensures one MLEADER style exists for the provided style name.
      */
     AcDbDatabase.prototype.ensureMLeaderStyle = function (styleName) {
-        var e_10, _a;
+        var e_9, _a;
         var dictionary = this.objects.mleaderStyle;
         var normalizedName = styleName.trim();
         if (!normalizedName)
@@ -2016,12 +2139,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         var style = new AcDbMLeaderStyle();
         // Match AutoCAD "Standard" defaults observed in exported DXF.
@@ -2148,7 +2271,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfBlocksSection = function (filer) {
-        var e_11, _a, e_12, _b;
+        var e_10, _a, e_11, _b;
         filer.startSection('BLOCKS');
         try {
             for (var _c = __values(this.tables.blockTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -2156,28 +2279,28 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 btr.dxfOutBlockBegin(filer);
                 if (!btr.isModelSapce && !btr.isPaperSapce) {
                     try {
-                        for (var _e = (e_12 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        for (var _e = (e_11 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
                             var entity = _f.value;
                             this.writeDxfEntity(filer, entity);
                         }
                     }
-                    catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                    catch (e_11_1) { e_11 = { error: e_11_1 }; }
                     finally {
                         try {
                             if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_11) throw e_11.error; }
                     }
                 }
                 btr.dxfOutBlockEnd(filer);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         filer.endSection();
     };
@@ -2187,7 +2310,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfEntitiesSection = function (filer) {
-        var e_13, _a, e_14, _b;
+        var e_12, _a, e_13, _b;
         filer.startSection('ENTITIES');
         try {
             for (var _c = __values(this.tables.blockTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -2195,26 +2318,26 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 if (!btr.isModelSapce && !btr.isPaperSapce)
                     continue;
                 try {
-                    for (var _e = (e_14 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    for (var _e = (e_13 = void 0, __values(btr.newIterator())), _f = _e.next(); !_f.done; _f = _e.next()) {
                         var entity = _f.value;
                         this.writeDxfEntity(filer, entity);
                     }
                 }
-                catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                catch (e_13_1) { e_13 = { error: e_13_1 }; }
                 finally {
                     try {
                         if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                     }
-                    finally { if (e_14) throw e_14.error; }
+                    finally { if (e_13) throw e_13.error; }
                 }
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         filer.endSection();
     };
@@ -2224,7 +2347,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfObjectsSection = function (filer) {
-        var e_15, _a, e_16, _b, e_17, _c, e_18, _d, e_19, _e;
+        var e_14, _a, e_15, _b, e_16, _c, e_17, _d, e_18, _e;
         filer.startSection('OBJECTS');
         var rootDict = this.objects.dictionary;
         rootDict.ownerId = '0';
@@ -2289,12 +2412,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 layout.dxfOut(filer);
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         try {
             for (var _j = __values(this.objects.imageDefinition.entries()), _k = _j.next(); !_k.done; _k = _j.next()) {
@@ -2303,12 +2426,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 imageDef.dxfOut(filer);
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         try {
             for (var _m = __values(this.objects.mleaderStyle.entries()), _o = _m.next(); !_o.done; _o = _m.next()) {
@@ -2317,12 +2440,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 mleaderStyle.dxfOut(filer);
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (_o && !_o.done && (_c = _m.return)) _c.call(_m);
             }
-            finally { if (e_17) throw e_17.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         try {
             for (var _q = __values(this.objects.mlineStyle.entries()), _r = _q.next(); !_r.done; _r = _q.next()) {
@@ -2331,12 +2454,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 mlineStyle.dxfOut(filer);
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
                 if (_r && !_r.done && (_d = _q.return)) _d.call(_q);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_17) throw e_17.error; }
         }
         try {
             for (var _t = __values(this.objects.xrecord.entries()), _u = _t.next(); !_u.done; _u = _t.next()) {
@@ -2345,12 +2468,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 xrecord.dxfOut(filer);
             }
         }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (_u && !_u.done && (_e = _t.return)) _e.call(_t);
             }
-            finally { if (e_19) throw e_19.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         filer.endSection();
     };
@@ -2364,7 +2487,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_20, _a;
+        var e_19, _a;
         var items = __spreadArray([], __read(records), false);
         filer.startTable(tableName);
         table.dxfOut(filer);
@@ -2380,12 +2503,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 record.dxfOut(filer);
             }
         }
-        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
             }
-            finally { if (e_20) throw e_20.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         filer.endTable();
     };
@@ -2431,6 +2554,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         this._objects.xrecord.removeAll();
         this._currentSpace = undefined;
         this._extents.makeEmpty();
+        this.registerBootstrapHandles();
     };
     /**
      * Updates a sysvar value and dispatches the change event only when the value changed.