@mlightcad/cad-simple-viewer 1.8.0-preview.2 → 1.8.0-preview.4

package/lib/view/AcTrView2d.js

@@ -112,13 +112,16 @@ import { notifyMeasurementLayoutChanged } from '../command/measure/AcApMeasureme
 import { acedAttachMobileBoxGesture, AcEdBaseView, acedCollectViewportBoxSelectionIds, AcEdConditionWaiter, AcEdCorsorType, AcEdGripManager, acedGuardCanvasTouchCallout, acedInteractionStrategy, acedIsTouchDerivedMouseEvent, AcEdMTextEditor, AcEdOpenMode, acedShouldIgnoreCompatMouse, AcEdViewMode, eventBus, resolvePointerSelectionAction } from '../editor';
 import { ACGI_MODEL_SPACE_BACKGROUND, isModelSpaceDatabase, readLayoutBackgroundColor } from '../editor/global/AcEdUiColor';
 import { ML_UI_Z_CANVAS_HTML_OVERLAY } from '../editor/global/AcEdUiLayout';
-import { acedEntityIntersectsSelectionBox, acedNeedsCrossingGeometryRefine } from '../editor/view/AcEdSelectionBoxIntersect';
+import { acedPickViewportForModelExtents } from '../editor/grip/AcEdGripViewport';
+import { acedBlockReferenceIntersectsSelectionBox, acedEntityIntersectsSelectionBox, acedNeedsCrossingGeometryRefine } from '../editor/view/AcEdSelectionBoxIntersect';
 import { isEffectiveSpatialQueryHit } from '../editor/view/AcEdSpatialQueryResult';
+import { AcApUcsService } from '../service/AcApUcsService';
 import { AcTrGeometryUtil } from '../util';
 import { acapRunDatabaseEdit } from '../util/AcApDatabaseEdit';
-import { acapResolveLayoutFrameBox } from '../util/AcApLayoutViewFraming';
+import { acapResolveContentFrameBox, acapResolveLayoutFrameBox } from '../util/AcApLayoutViewFraming';
 import { collectTextStyleFontNames, planTextStyleFontPreload } from '../util/AcApTextStyleFontPreload';
 import { ACAP_READING_MODE_BACKGROUND, AcApReadingModeState } from './AcApReadingMode';
+import { AcApUcsIconOverlay } from './AcApUcsIconOverlay';
 import { trySelectReviewOverlay, trySelectReviewOverlaysByBox } from './AcEdReviewOverlayPick';
 import { AcEdViewKeyHandler } from './AcEdViewKeyHandler';
 import { absorbConvertQueue, adaptConvertSliceSize, createConvertPending, hasPendingActiveOwner } from './AcTrConvertQueue';
@@ -210,6 +213,8 @@ var AcTrView2d = /** @class */ (function (_super) {
          * A value of `null` indicates that no animation frame is currently scheduled.
          */
         _this._rafId = null;
+        /** Drawing UCS triad overlay (On / at origin). */
+        _this._ucsIconOverlay = null;
         /**
          * Block table record ids of layouts whose entities are currently being
          * batch-converted into the scene. Used by
@@ -255,6 +260,17 @@ var AcTrView2d = /** @class */ (function (_super) {
          * **first visit** to every other layout the user has not framed yet.
          */
         _this._openViewMode = AcApOpenViewMode.Extents;
+        /**
+         * Layout cameras captured by {@link clearForRegen}. Each entry is applied
+         * (and dropped) when the regen recreates that layout's view.
+         */
+        _this._regenCameras = new Map();
+        /**
+         * True once this document's scene has fat-line geometry for LWDISPLAY.
+         * Opening with LWDISPLAY off keeps cheap `GL_LINES`; the first enable may
+         * need one upgrade regen, after which toggles only flip `linewidth`.
+         */
+        _this._lineWeightGeometryReady = false;
         /**
          * Layer names with an in-flight {@link convertMissingEntitiesOnLayer} pass.
          *
@@ -425,12 +441,13 @@ var AcTrView2d = /** @class */ (function (_super) {
         /** Last text-style font preload plan (for OPENPERF). */
         _this._fontPreloadDiag = null;
         _this.animate = function () {
-            var _a;
+            var _a, _b;
             _this._rafId = requestAnimationFrame(_this.animate);
             _this.events.renderFrame.dispatch({
                 render: _this._renderer,
                 camera: _this.internalCamera
             });
+            (_a = _this._ucsIconOverlay) === null || _a === void 0 ? void 0 : _a.update(_this);
             var stillLoading = _this._numOfEntitiesToProcess > 0;
             var sceneBusy = stillLoading || _this._pendingGeometryJobs > 0;
             // Headless non-progressive (`cooperativeYield` false): skip WebGL until
@@ -474,7 +491,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             if (_this.internalCamera && (_this._isDirty || _this._htmlDirty)) {
                 _this._css2dRenderer.render(_this._scene.internalScene, _this.internalCamera);
             }
-            (_a = _this._stats) === null || _a === void 0 ? void 0 : _a.update();
+            (_b = _this._stats) === null || _b === void 0 ? void 0 : _b.update();
             // Do not re-dirty every frame during progressive open — paint is throttled
             // from geometry batches to keep total open time down. Counter hitting 0
             // still forces a final dirty in decreaseNumOfEntitiesToProcess().
@@ -824,11 +841,17 @@ var AcTrView2d = /** @class */ (function (_super) {
         _this._css2dRenderer.domElement.style.maxWidth = '100%';
         _this._css2dRenderer.domElement.style.maxHeight = '100%';
         container.appendChild(_this._css2dRenderer.domElement);
+        _this._ucsIconOverlay = new AcApUcsIconOverlay(container);
+        _this._onUcsChanged = function () {
+            var _a;
+            (_a = _this._ucsIconOverlay) === null || _a === void 0 ? void 0 : _a.update(_this);
+            _this._isDirty = true;
+        };
+        AcApUcsService.events.ucsChanged.addEventListener(_this._onUcsChanged);
         _this._missedImages = new Map();
         _this._layoutViewManager = new AcTrLayoutViewManager();
         _this._progressiveOpenFit = new AcTrProgressiveOpenFitController(function (box, margin) {
-            _this.activeLayoutView.zoomTo(box, margin !== null && margin !== void 0 ? margin : 1.1);
-            _this._isDirty = true;
+            _this.zoomTo(box, margin !== null && margin !== void 0 ? margin : 1.1);
         });
         _this._entityDisplay = new AcTrEntityDisplayController(function (layerName) {
             return _this.resolveLayerInfo(layerName);
@@ -1349,6 +1372,36 @@ var AcTrView2d = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Applies AutoCAD LWDISPLAY.
+     *
+     * - Off: keep fat geometry (if any) and force hairline `linewidth`.
+     * - On, geometry already fat: restore authored `linewidth`.
+     * - On, scene still on cheap `GL_LINES`: returns `true` so the caller can
+     *   run one camera-preserving upgrade regen.
+     *
+     * @param show - Whether entity lineweights should be displayed
+     * @returns `true` when the caller must rebuild line geometry for display-on
+     */
+    AcTrView2d.prototype.setShowLineWeight = function (show) {
+        this._renderer.showLineWeight = show;
+        this._scene.applyShowLineWeight(show);
+        this._isDirty = true;
+        if (!show) {
+            return false;
+        }
+        if (this._lineWeightGeometryReady) {
+            return false;
+        }
+        return true;
+    };
+    /**
+     * Records that the active scene now has fat-line geometry for LWDISPLAY.
+     * Call after open-with-display-on or after an upgrade regen.
+     */
+    AcTrView2d.prototype.markLineWeightGeometryReady = function () {
+        this._lineWeightGeometryReady = true;
+    };
     /**
      * Applies canvas background colour from layout background sysvars or explicit
      * API calls. Also refreshes ACI-7 foreground inversion via the style
@@ -1622,11 +1675,15 @@ var AcTrView2d = /** @class */ (function (_super) {
         },
         set: function (value) {
             var previous = this._scene.activeLayoutBtrId;
+            this.ensureLayoutView(value);
             this._layoutViewManager.activeLayoutBtrId = value;
             this._scene.activeLayoutBtrId = value;
             this.htmlTransientManager.setActiveLayoutId(value);
             this._isDirty = true;
             if (previous !== value) {
+                // Viewport drill-through hints are layout-local; drop them on switch so
+                // grips do not reuse a paper viewport id from the previous sheet.
+                this.clearModelEntityViewportHints();
                 notifyMeasurementLayoutChanged();
             }
         },
@@ -1643,6 +1700,20 @@ var AcTrView2d = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Ensures a scene layout and {@link AcTrLayoutView} exist for `layoutBtrId`.
+     *
+     * Open framing and picking require an active layout view. Entity streams
+     * create scene layouts by owner id, but layout views normally come from
+     * `AcDbLayout` dictionary entries — which can point at a stale BTR id while
+     * `currentSpaceId` / entities use the real `*Model_Space` handle.
+     */
+    AcTrView2d.prototype.ensureLayoutView = function (layoutBtrId) {
+        if (!layoutBtrId)
+            return;
+        this._scene.addEmptyLayout(layoutBtrId);
+        this.createLayoutViewIfNeeded(layoutBtrId);
+    };
     Object.defineProperty(AcTrView2d.prototype, "stats", {
         /**
          * The statistics of the current scene
@@ -1829,26 +1900,34 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.screenToWorld = function (point) {
-        var activeLayoutView = this.activeLayoutView;
-        return activeLayoutView
-            ? activeLayoutView.screenToWorld(point)
-            : new AcGePoint2d(point);
+        var activeLayoutView = this._layoutViewManager.activeLayoutView;
+        if (activeLayoutView) {
+            return activeLayoutView.screenToWorld(point);
+        }
+        // No layout camera yet. Screen Y grows downward; invert so orientation
+        // consumers (UCS icon axes) stay upright until setActiveLayout runs.
+        return new AcGePoint2d(point.x, -point.y);
     };
     /**
      * @inheritdoc
      */
     AcTrView2d.prototype.worldToScreen = function (point) {
-        var activeLayoutView = this.activeLayoutView;
-        return activeLayoutView
-            ? activeLayoutView.worldToScreen(point)
-            : new AcGePoint2d(point);
+        var activeLayoutView = this._layoutViewManager.activeLayoutView;
+        if (activeLayoutView) {
+            return activeLayoutView.worldToScreen(point);
+        }
+        // See screenToWorld — never pass WCS through as CSS pixels (that flips Y).
+        return new AcGePoint2d(point.x, -point.y);
     };
     /**
      * @inheritdoc
      */
     AcTrView2d.prototype.zoomTo = function (box, margin) {
         if (margin === void 0) { margin = 1.1; }
-        this.activeLayoutView.zoomTo(box, margin);
+        var layoutView = this.activeLayoutView;
+        if (!layoutView)
+            return;
+        layoutView.zoomTo(box, margin);
         this._isDirty = true;
     };
     /**
@@ -2323,6 +2402,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         if (!activeLayout)
             return results;
         var activeLayoutView = this.activeLayoutView;
+        if (!activeLayoutView)
+            return results;
         var effectiveHitRadius = hitRadius !== null && hitRadius !== void 0 ? hitRadius : this.selectionBoxSize;
         var paperBox = activeLayoutView.pointToBox(point, effectiveHitRadius);
         var threshold = Math.max(paperBox.size.width / 2, paperBox.size.height / 2);
@@ -2451,6 +2532,63 @@ var AcTrView2d = /** @class */ (function (_super) {
             containsPaperPoint: function (point) { return vpView.containsPaperPoint(point); }
         };
     };
+    /**
+     * @inheritdoc
+     *
+     * Resolves a user viewport that shows the model-space entity so grips can
+     * be positioned in paper WCS (and drag deltas mapped back to model WCS).
+     */
+    AcTrView2d.prototype.findViewportMapperForModelEntity = function (entityId) {
+        var e_9, _a;
+        var _b, _c;
+        var activeLayoutView = this.activeLayoutView;
+        if (!activeLayoutView)
+            return undefined;
+        if (activeLayoutView.layoutBtrId === this._scene.modelSpaceBtrId) {
+            return undefined;
+        }
+        var database = (_c = (_b = AcApDocManager.tryGetInstance()) === null || _b === void 0 ? void 0 : _b.curDocument) === null || _c === void 0 ? void 0 : _c.database;
+        var entity = database === null || database === void 0 ? void 0 : database.tables.blockTable.getEntityById(entityId);
+        if (!entity || entity.ownerId !== this._scene.modelSpaceBtrId) {
+            return undefined;
+        }
+        var candidates = [];
+        try {
+            for (var _d = __values(activeLayoutView.viewportViews), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var vpView = _e.value;
+                var viewBox = vpView.viewport.viewBox;
+                candidates.push({
+                    viewportId: vpView.viewport.id,
+                    viewBox: {
+                        min: { x: viewBox.min.x, y: viewBox.min.y },
+                        max: { x: viewBox.max.x, y: viewBox.max.y }
+                    }
+                });
+            }
+        }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            }
+            finally { if (e_9) throw e_9.error; }
+        }
+        if (candidates.length === 0)
+            return undefined;
+        var extents = entity.geometricExtents;
+        var viewportId = acedPickViewportForModelExtents(extents
+            ? {
+                min: { x: extents.min.x, y: extents.min.y },
+                max: { x: extents.max.x, y: extents.max.y }
+            }
+            : undefined, candidates, this.getModelEntityViewportHint(entityId));
+        if (viewportId == null)
+            return undefined;
+        var mapper = this.getViewportCoordinateMapper(viewportId);
+        if (!mapper)
+            return undefined;
+        return { viewportId: viewportId, mapper: mapper };
+    };
     /**
      * Resolves hits against the model-space layout for each viewport the
      * click drills through. Appends the matches into `results` (caller
@@ -2468,7 +2606,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper-space pick.
      */
     AcTrView2d.prototype.pickThroughViewports = function (paperPoint, paperBox, viewports, results) {
-        var e_9, _a;
+        var e_10, _a;
         var modelLayout = this._scene.modelSpaceLayout;
         if (!modelLayout)
             return;
@@ -2503,12 +2641,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _loop_1(vpView);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (viewports_1_1 && !viewports_1_1.done && (_a = viewports_1.return)) _a.call(viewports_1);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
     };
     /**
@@ -2521,9 +2659,15 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.select = function (point) {
+        var _this = this;
         var idsAdded = [];
         var results = this.pick(point);
-        results.forEach(function (item) { return idsAdded.push(item.id); });
+        results.forEach(function (item) {
+            idsAdded.push(item.id);
+            // Remember which viewport the click drilled through so grips map
+            // through the same viewport when several overlap the entity.
+            _this.rememberModelEntityViewportHint(item.id, item.viewportId);
+        });
         var selectable = this.selectableIds(idsAdded, 'add');
         if (selectable.length > 0)
             this.selectionSet.add(selectable);
@@ -2546,7 +2690,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      * AutoCAD meaning.
      */
     AcTrView2d.prototype.collectViewportDrillThroughSelectionIds = function (box, mode) {
-        var e_10, _a;
+        var e_11, _a;
+        var _this = this;
         var _b, _c;
         var activeLayoutView = this.activeLayoutView;
         var modelLayout = this._scene.modelSpaceLayout;
@@ -2557,6 +2702,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         var viewports = [];
         var _loop_2 = function (vpView) {
             viewports.push({
+                viewportId: vpView.viewport.id,
                 paperBox: vpView.viewport.box,
                 frozenLayers: vpView.viewport.frozenLayers,
                 paperPointToModel: function (point) { return vpView.paperPointToModel(point); },
@@ -2569,12 +2715,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _loop_2(vpView);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         if (viewports.length === 0)
             return [];
@@ -2586,7 +2732,12 @@ var AcTrView2d = /** @class */ (function (_super) {
             searchModel: function (modelBox, selectionMode) {
                 return modelLayout.search(modelBox, { selectionMode: selectionMode });
             },
-            entityOf: function (id) { var _a; return (_a = database === null || database === void 0 ? void 0 : database.tables.blockTable.getEntityById(id)) !== null && _a !== void 0 ? _a : undefined; }
+            entityOf: function (id) { var _a; return (_a = database === null || database === void 0 ? void 0 : database.tables.blockTable.getEntityById(id)) !== null && _a !== void 0 ? _a : undefined; },
+            // Mirror click-pick hints so grips map through the same viewport when
+            // several overlap the entity after a window/crossing select.
+            onHit: function (entityId, viewport) {
+                _this.rememberModelEntityViewportHint(entityId, viewport.viewportId);
+            }
         });
     };
     /**
@@ -2597,7 +2748,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * that interior also selects those polylines and can stall highlight work.
      */
     AcTrView2d.prototype.refineCrossingSelectionHits = function (box, results) {
-        var e_11, _a;
+        var e_12, _a;
         var _b;
         var database = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         if (!database) {
@@ -2608,7 +2759,15 @@ var AcTrView2d = /** @class */ (function (_super) {
             for (var results_1 = __values(results), results_1_1 = results_1.next(); !results_1_1.done; results_1_1 = results_1.next()) {
                 var item = results_1_1.value;
                 if (!acedNeedsCrossingGeometryRefine(item)) {
-                    ids.push(item.id);
+                    // INSERT: the child index only filtered sub-entities by AABB. Like
+                    // AutoCAD, require the box to touch a sub-entity's real geometry so
+                    // a crossing box in the empty interior of a frame block misses it.
+                    var blockRef = database.tables.blockTable.getEntityById(item.id);
+                    if (!(blockRef instanceof AcDbBlockReference) ||
+                        !item.children ||
+                        acedBlockReferenceIntersectsSelectionBox(blockRef, item.children, box)) {
+                        ids.push(item.id);
+                    }
                     continue;
                 }
                 var entityBox = new AcGeBox2d({ x: item.minX, y: item.minY }, { x: item.maxX, y: item.maxY });
@@ -2622,12 +2781,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (results_1_1 && !results_1_1.done && (_a = results_1.return)) _a.call(results_1);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return ids;
     };
@@ -2643,7 +2802,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.updateLayer = function (layer, changes) {
-        var e_12, _a;
+        var e_13, _a;
         var touchedObjectIds = this._scene.updateLayer(this.toLayerInfo(layer)).touchedObjectIds;
         if (this._layerAppearance.layerStyleMayHaveChanged(changes)) {
             this._layerAppearance.syncFromLiveRecord(layer);
@@ -2665,17 +2824,23 @@ var AcTrView2d = /** @class */ (function (_super) {
                 this.applySessionHiddenObjectState(objectId);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (touchedObjectIds_1_1 && !touchedObjectIds_1_1.done && (_a = touchedObjectIds_1.return)) _a.call(touchedObjectIds_1);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         this._isDirty = true;
     };
     /**
-     * Add the specified transient entity or entities into this view
+     * Add the specified transient entity or entities into this view.
+     *
+     * Transients are jig previews of drawing entities (PASTECLIP, MOVE, grip
+     * edits, ...), so they follow the drawing's lineweight display (LWDISPLAY)
+     * like the entities they preview. Markups and measurements draw through
+     * {@link htmlTransientManager} instead.
+     *
      * @param entity Input one or multiple transient entities
      */
     AcTrView2d.prototype.addTransientEntity = function (entity) {
@@ -2683,10 +2848,6 @@ var AcTrView2d = /** @class */ (function (_super) {
         var _a, _b;
         var entities = Array.isArray(entity) ? entity : [entity];
         var epoch = this._convertEpoch;
-        // Overlay transients (markup / measurement / jigs) must honor entity
-        // lineweight even when LWDISPLAY is off; otherwise ribbon style is a no-op.
-        var previousForce = this._renderer.forceShowLineWeight;
-        this._renderer.forceShowLineWeight = true;
         // Force merge-mode glyphs on the transient tree (see AcTrMText). Keep the
         // context flag raised for the whole sync convert so nested MTEXT never
         // enqueue world InstancedMesh placements that flush after the command.
@@ -2745,7 +2906,6 @@ var AcTrView2d = /** @class */ (function (_super) {
             }
         }
         finally {
-            this._renderer.forceShowLineWeight = previousForce;
             releaseSkipMeshGlyph();
         }
     };
@@ -2821,7 +2981,6 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.addEntity = function (entity) {
         var _a;
-        var _b;
         var entities = Array.isArray(entity) ? entity : [entity];
         // Mark each owner layout as loaded as soon as the open-time ENTITY stream
         // enqueues work. Progressive convert may not have committed scene entities
@@ -2831,7 +2990,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         // "Rendering drawing ..." up long after linework should have finished —
         // so progressive rendering cannot release pan/zoom on time.
         for (var i = 0; i < entities.length; i++) {
-            var ownerId = (_b = entities[i]) === null || _b === void 0 ? void 0 : _b.ownerId;
+            var ownerId = (_a = entities[i]) === null || _a === void 0 ? void 0 : _a.ownerId;
             if (!ownerId)
                 continue;
             var layout = this._scene.layouts.get(ownerId);
@@ -2849,7 +3008,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         // many converts in parallel and OOM'd dense drawings (e.g. cathedral.dwg)
         // during "Rendering drawing ...". Progressive mid-open paints stay gated
         // by `_progressiveRendering` inside batchConvert / markProgressiveDirty.
-        (_a = this._convertQueue).push.apply(_a, __spreadArray([], __read(entities), false));
+        this.enqueueConvert(entities);
         void this.drainConvertQueue();
     };
     /**
@@ -2858,10 +3017,14 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.removeEntity = function (entity) {
         var _this = this;
         var entities = Array.isArray(entity) ? entity : [entity];
-        entities.forEach(function (entity) {
-            _this.releaseConvertClaim(entity.objectId);
-            _this._scene.removeEntity(entity.objectId);
-        });
+        entities.forEach(function (entity) { return _this.releaseConvertClaim(entity.objectId); });
+        if (entities.length === 1) {
+            this._scene.removeEntity(entities[0].objectId);
+        }
+        else if (entities.length > 1) {
+            // One bulk removal: batches are compacted once, not once per entity.
+            this._scene.removeEntities(entities.map(function (entity) { return entity.objectId; }));
+        }
         this._isDirty = true;
     };
     /**
@@ -3007,7 +3170,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * drawable entity that must be rebuilt (for example ATTRIB → INSERT).
      */
     AcTrView2d.prototype.resolveSceneUpdateEntities = function (entities) {
-        var e_13, _a;
+        var e_14, _a;
         var _b;
         var db = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         var resolved = [];
@@ -3029,12 +3192,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 resolved.push(target);
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         return resolved;
     };
@@ -3042,10 +3205,42 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.addLayout = function (layout) {
-        this._scene.addEmptyLayout(layout.blockTableRecordId);
-        this.createLayoutViewIfNeeded(layout.blockTableRecordId);
+        var btrId = layout.blockTableRecordId;
+        // Converters can emit a layout before its BTR link is healed (empty
+        // blockTableRecordId). Skip until a real id exists — otherwise the scene
+        // grows a junk layout under `''` and paper tabs stay missing.
+        if (!btrId)
+            return;
+        this._scene.addEmptyLayout(btrId);
+        this.createLayoutViewIfNeeded(btrId);
         this._isDirty = true;
     };
+    /**
+     * Ensures entities for `layoutBtrId` are queued for convert / already loaded.
+     *
+     * Open-into-paper (`$TILEMODE = 0`) activates the sheet via
+     * {@link AcApDocManager.setActiveLayout} without a `layoutSwitched` event, so
+     * the first-visit loader must be invoked explicitly or the canvas stays blank.
+     *
+     * @param layoutBtrId - Layout block table record id.
+     * @param options.forceIfEmpty - When true, clear a stale `isLoaded` flag if
+     *   the scene layout still has no entities so the BTR is scanned again.
+     */
+    AcTrView2d.prototype.ensureLayoutEntitiesLoaded = function (layoutBtrId, options) {
+        if (!layoutBtrId)
+            return;
+        this.ensureLayoutView(layoutBtrId);
+        if (options === null || options === void 0 ? void 0 : options.forceIfEmpty) {
+            var layout = this._scene.layouts.get(layoutBtrId);
+            if (layout &&
+                layout.isLoaded &&
+                layout.entityCount === 0 &&
+                !this._loadingLayouts.has(layoutBtrId)) {
+                layout.isLoaded = false;
+            }
+        }
+        this.loadLayoutEntitiesIfNeeded(layoutBtrId);
+    };
     /**
      * Marks a layout as already framed by an external caller (typically
      * `AcApDocManager.onAfterOpenDocument`, which zooms the startup
@@ -3163,9 +3358,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         }
         // Extents (any layout), or Saved model fallback without *ACTIVE:
         // prefer drawable content; never lead with template model/paper limits.
-        return (_b = acapResolveLayoutFrameBox({
-            limits: undefined,
-            viewportsBox: isModelSpace ? undefined : viewportsBox,
+        return (_b = acapResolveContentFrameBox({
+            isModelSpace: isModelSpace,
+            viewportsBox: viewportsBox,
             layoutExtents: layoutExtents,
             entityBox: entityBox
         })) === null || _b === void 0 ? void 0 : _b.box;
@@ -3196,8 +3391,56 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.clear = function () {
+        this._regenCameras.clear();
+        this._lineWeightGeometryReady = false;
+        this.resetScene();
+    };
+    /**
+     * Clears converted content before `database.regen()` while keeping what
+     * the user is looking at.
+     *
+     * Unlike {@link clear}, which is meant for document open / close, every
+     * layout keeps its camera (re-applied when the regen recreates its view)
+     * and already-framed layouts are not auto-zoomed again on their next visit.
+     */
+    AcTrView2d.prototype.clearForRegen = function () {
+        var _this = this;
+        this._layoutViewManager.forEach(function (layoutView) {
+            var camera = layoutView.internalCamera;
+            _this._regenCameras.set(layoutView.layoutBtrId, {
+                center: { x: camera.position.x, y: camera.position.y },
+                zoom: camera.zoom
+            });
+        });
+        var initializedLayouts = new Set(this._initializedLayouts);
+        var openViewMode = this._openViewMode;
+        this.resetScene();
+        this._initializedLayouts = initializedLayouts;
+        this._openViewMode = openViewMode;
+    };
+    /**
+     * Tears down scene content and layout views shared by {@link clear} and
+     * {@link clearForRegen}.
+     */
+    AcTrView2d.prototype.resetScene = function () {
         this.abortConversion();
+        // Scene.clear keeps active/model BTR ids (regen reuses them). Capture
+        // before layouts are dropped so we can rebind cameras afterward.
+        var activeLayoutBtrId = this._scene.activeLayoutBtrId;
+        var modelSpaceBtrId = this._scene.modelSpaceBtrId;
         this._scene.clear();
+        // Layout views hold cameras for prior BTR ids — drop them with the
+        // scene so a later open cannot activate a stale handle. Regen and
+        // same-document clear still need an active layout view, so rebind
+        // empty views for the ids the scene retained.
+        this._layoutViewManager = new AcTrLayoutViewManager();
+        if (activeLayoutBtrId) {
+            this.ensureLayoutView(activeLayoutBtrId);
+            this._layoutViewManager.activeLayoutBtrId = activeLayoutBtrId;
+        }
+        if (modelSpaceBtrId && modelSpaceBtrId !== activeLayoutBtrId) {
+            this.ensureLayoutView(modelSpaceBtrId);
+        }
         // Scene teardown orphans InstancedMeshes — drop singleton slot maps too.
         AcTrMTextRenderer.getInstance().resetMeshGlyphBatch();
         this._renderer.resetDrawOrderZ();
@@ -3229,6 +3472,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             missedImages: this._missedImages,
             missedFonts: this._renderer.snapshotMissedFonts(),
             selectionIds: this.selectionSet.ids,
+            lineWeightGeometryReady: this._lineWeightGeometryReady,
             // Detach so the next document cannot pick/highlight this one's glyphs.
             meshGlyphBatch: AcTrMTextRenderer.getInstance().detachMeshGlyphBatch()
         };
@@ -3239,7 +3483,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param state - Snapshot previously returned by {@link captureSessionState} or {@link beginNewSession}.
      */
     AcTrView2d.prototype.restoreSessionState = function (state) {
-        var _a, _b;
+        var _a, _b, _c;
         this._convertEpoch++;
         this.clearFontLoadedRedrawTimer();
         this.clearMeshGlyphFlushTimer();
@@ -3251,6 +3495,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._entityConvertGeneration.clear();
         this.resetDeferredGeometryQueue();
         this._entityProcessingIdleAt = 0;
+        this._regenCameras.clear();
         this._scene = state.scene;
         this._layoutViewManager = state.layoutViewManager;
         this._initializedLayouts = state.initializedLayouts;
@@ -3258,7 +3503,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._openViewMode = (_a = state.openViewMode) !== null && _a !== void 0 ? _a : AcApOpenViewMode.Extents;
         this._loadingLayouts = state.loadingLayouts;
         this._missedImages = state.missedImages;
-        this._renderer.replaceMissedFonts((_b = state.missedFonts) !== null && _b !== void 0 ? _b : {});
+        this._lineWeightGeometryReady = (_b = state.lineWeightGeometryReady) !== null && _b !== void 0 ? _b : false;
+        this._renderer.replaceMissedFonts((_c = state.missedFonts) !== null && _c !== void 0 ? _c : {});
         AcTrMTextRenderer.getInstance().attachMeshGlyphBatch(state.meshGlyphBatch);
         this.rebindLayerAppearance();
         this._layoutViewManager.resize(this.width, this.height);
@@ -3286,6 +3532,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._entityConvertGeneration.clear();
         this.resetDeferredGeometryQueue();
         this._entityProcessingIdleAt = 0;
+        this._regenCameras.clear();
+        this._lineWeightGeometryReady = false;
         this._scene = this.createScene();
         this._layoutViewManager = new AcTrLayoutViewManager();
         this._initializedLayouts = new Set();
@@ -3364,6 +3612,17 @@ var AcTrView2d = /** @class */ (function (_super) {
         var active = document.activeElement;
         return active instanceof Node && this.container.contains(active);
     };
+    /**
+     * Appends entities to the convert queue. Not `push(...entities)`: one
+     * commit can carry hundreds of thousands of entities (e.g. a PDF import),
+     * which exceeds the engine's argument limit and throws "Maximum call stack
+     * size exceeded".
+     */
+    AcTrView2d.prototype.enqueueConvert = function (entities) {
+        var queue = this._convertQueue;
+        for (var i = 0; i < entities.length; i++)
+            queue.push(entities[i]);
+    };
     /**
      * Drains the convert queue on a single serial worker so ENTITY flush chunks
      * can enqueue without overlapping multiple {@link batchConvert} runs (which
@@ -3667,7 +3926,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * view teardown). Safe to call more than once.
      */
     AcTrView2d.prototype.dispose = function () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (this._viewDisposed)
             return;
         this._viewDisposed = true;
@@ -3695,6 +3954,12 @@ var AcTrView2d = /** @class */ (function (_super) {
         if (this._onLayoutSwitched) {
             acdbHostApplicationServices().layoutManager.events.layoutSwitched.removeEventListener(this._onLayoutSwitched);
         }
+        if (this._onUcsChanged) {
+            AcApUcsService.events.ucsChanged.removeEventListener(this._onUcsChanged);
+            this._onUcsChanged = undefined;
+        }
+        (_d = this._ucsIconOverlay) === null || _d === void 0 ? void 0 : _d.dispose();
+        this._ucsIconOverlay = null;
         if (this._onCommandWillStartHitTest) {
             this.editor.events.commandWillStart.removeEventListener(this._onCommandWillStartHitTest);
         }
@@ -3790,6 +4055,11 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _this.events.viewChanged.dispatch();
                 _this.clearHover();
             });
+            var regenCamera = this._regenCameras.get(layoutBtrId);
+            if (regenCamera) {
+                this._regenCameras.delete(layoutBtrId);
+                layoutView.flyTo(regenCamera.center, regenCamera.zoom);
+            }
             this._layoutViewManager.add(layoutView);
         }
         // Viewport entities may already have been converted while this view was
@@ -3819,10 +4089,16 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param layoutBtrId Input the block table record id of the layout
      */
     AcTrView2d.prototype.loadLayoutEntitiesIfNeeded = function (layoutBtrId) {
-        var e_14, _a;
+        var e_15, _a;
         var _this = this;
+        var _b, _c, _d;
         try {
-            var db = AcApDocManager.instance.curDocument.database;
+            // Prefer tryGetInstance: setActiveLayout used to call this during
+            // createInstance before the singleton was assigned.
+            var db = (_d = (_c = (_b = AcApDocManager.tryGetInstance()) === null || _b === void 0 ? void 0 : _b.curDocument) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : this._renderer.context.database;
+            if (!db) {
+                return;
+            }
             var blockTableRecord = db.tables.blockTable.getIdAt(layoutBtrId);
             if (!blockTableRecord) {
                 return;
@@ -3883,12 +4159,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                     entities_2.push(entity);
                 }
             }
-            catch (e_14_1) { e_14 = { error: e_14_1 }; }
+            catch (e_15_1) { e_15 = { error: e_15_1 }; }
             finally {
                 try {
                     if (iterator_1_1 && !iterator_1_1.done && (_a = iterator_1.return)) _a.call(iterator_1);
                 }
-                finally { if (e_14) throw e_14.error; }
+                finally { if (e_15) throw e_15.error; }
             }
             if (entities_2.length === 0) {
                 // Empty layout (e.g. a freshly-created paper space tab). Mark as
@@ -3904,21 +4180,20 @@ var AcTrView2d = /** @class */ (function (_super) {
             this._numOfEntitiesToProcess += entities_2.length;
             var convert = function () { return __awaiter(_this, void 0, void 0, function () {
                 var layout;
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            _b.trys.push([0, , 5, 6]);
+                            _a.trys.push([0, , 5, 6]);
                             if (!this._progressiveRendering) return [3 /*break*/, 2];
-                            (_a = this._convertQueue).push.apply(_a, __spreadArray([], __read(entities_2), false));
+                            this.enqueueConvert(entities_2);
                             return [4 /*yield*/, this.drainConvertQueue()];
                         case 1:
-                            _b.sent();
+                            _a.sent();
                             return [3 /*break*/, 4];
                         case 2: return [4 /*yield*/, this.batchConvert(entities_2)];
                         case 3:
-                            _b.sent();
-                            _b.label = 4;
+                            _a.sent();
+                            _a.label = 4;
                         case 4:
                             layout = this._scene.layouts.get(layoutBtrId);
                             if (layout) {
@@ -4231,8 +4506,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.redrawGlyphEntitiesAfterFontLoad = function (epoch, fontName) {
         return __awaiter(this, void 0, void 0, function () {
-            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_15_1, defaults, normalized_1, msSinceIdle, db;
-            var e_16, _c, e_15, _d;
+            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_16_1, defaults, normalized_1, msSinceIdle, db;
+            var e_17, _c, e_16, _d;
             var _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -4254,12 +4529,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_16) throw e_16.error; }
+                            finally { if (e_17) throw e_17.error; }
                         }
                         _g.label = 1;
                     case 1:
@@ -4282,14 +4557,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_15_1 = _g.sent();
-                        e_15 = { error: e_15_1 };
+                        e_16_1 = _g.sent();
+                        e_16 = { error: e_16_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (glyphs_1_1 && !glyphs_1_1.done && (_d = glyphs_1.return)) _d.call(glyphs_1);
                         }
-                        finally { if (e_15) throw e_15.error; }
+                        finally { if (e_16) throw e_16.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (glyphs.length > 0) {
@@ -4340,7 +4615,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         });
     };
     AcTrView2d.prototype.groupHasPendingGlyphGeometry = function (group) {
-        var e_17, _a;
+        var e_18, _a;
         try {
             // Prefer O(block-def shells). A full THREE.traverse over a mega-block
             // (100k+ flattened mesh leaves) was dominating scene-convert wall time.
@@ -4351,12 +4626,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_17) throw e_17.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         return AcTrView2d.directChildrenHavePendingGlyphs(group);
     };
@@ -4367,7 +4642,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * a whole-floor INSERT is O(glyph shells), not O(all drawable leaves).
      */
     AcTrView2d.directChildrenHavePendingGlyphs = function (root) {
-        var e_18, _a;
+        var e_19, _a;
         var children = root.children;
         for (var i = 0; i < children.length; i++) {
             var child = children[i];
@@ -4379,7 +4654,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             }
             if (child instanceof AcTrGroup) {
                 try {
-                    for (var _b = (e_18 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = (e_19 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var entity = _c.value;
                         if (entity instanceof AcTrGlyphEntity &&
                             !entity.hasDrawableGeometry()) {
@@ -4387,12 +4662,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                catch (e_19_1) { e_19 = { error: e_19_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_18) throw e_18.error; }
+                    finally { if (e_19) throw e_19.error; }
                 }
                 if (AcTrView2d.directChildrenHavePendingGlyphs(child)) {
                     return true;
@@ -4556,7 +4831,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper layouts.
      */
     AcTrView2d.prototype.ensureViewportViews = function (blockTableRecord, layoutView) {
-        var e_19, _a;
+        var e_20, _a;
         var iterator = blockTableRecord.newIterator();
         try {
             for (var iterator_2 = __values(iterator), iterator_2_1 = iterator_2.next(); !iterator_2_1.done; iterator_2_1 = iterator_2.next()) {
@@ -4569,12 +4844,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 layoutView.addViewport(viewportView);
             }
         }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+        catch (e_20_1) { e_20 = { error: e_20_1 }; }
         finally {
             try {
                 if (iterator_2_1 && !iterator_2_1.done && (_a = iterator_2.return)) _a.call(iterator_2);
             }
-            finally { if (e_19) throw e_19.error; }
+            finally { if (e_20) throw e_20.error; }
         }
     };
     /**
@@ -4583,7 +4858,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * {@link AcDbViewport.frozenLayerIds} but omit them from `toGiViewport()`.
      */
     AcTrView2d.prototype.toGiViewportWithFrozenLayers = function (entity) {
-        var e_20, _a;
+        var e_21, _a;
         var _b;
         var gi = entity.toGiViewport();
         if (gi.frozenLayers && gi.frozenLayers.length > 0) {
@@ -4603,12 +4878,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         names.push(layer.name);
                 }
             }
-            catch (e_20_1) { e_20 = { error: e_20_1 }; }
+            catch (e_21_1) { e_21 = { error: e_21_1 }; }
             finally {
                 try {
                     if (ids_1_1 && !ids_1_1.done && (_a = ids_1.return)) _a.call(ids_1);
                 }
-                finally { if (e_20) throw e_20.error; }
+                finally { if (e_21) throw e_21.error; }
             }
         }
         gi.frozenLayerIds = __spreadArray([], __read(ids), false);
@@ -4928,8 +5203,8 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.handleGroup = function (group_1, progressive_1) {
         return __awaiter(this, arguments, void 0, function (group, progressive, epoch, convertGen) {
-            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_3, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_21_1;
-            var e_22, _b, e_21, _c;
+            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_3, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_22_1;
+            var e_23, _b, e_22, _c;
             var _this = this;
             var _d, _e;
             if (epoch === void 0) { epoch = this._convertEpoch; }
@@ -4984,12 +5259,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 child.parent = null;
                             }
                         }
-                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+                        catch (e_23_1) { e_23 = { error: e_23_1 }; }
                         finally {
                             try {
                                 if (children_1_1 && !children_1_1.done && (_b = children_1.return)) _b.call(children_1);
                             }
-                            finally { if (e_22) throw e_22.error; }
+                            finally { if (e_23) throw e_23.error; }
                         }
                         renderContext = group.renderContext;
                         groupObjectId = group.objectId;
@@ -5104,14 +5379,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_21_1 = _f.sent();
-                        e_21 = { error: e_21_1 };
+                        e_22_1 = _f.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (objectsGroupByLayer_1_1 && !objectsGroupByLayer_1_1.done && (_c = objectsGroupByLayer_1.return)) _c.call(objectsGroupByLayer_1);
                         }
-                        finally { if (e_21) throw e_21.error; }
+                        finally { if (e_22) throw e_22.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         group.dispose();
@@ -5249,7 +5524,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * Glyphs with no layout owner still follow the active layout.
      */
     AcTrView2d.prototype.resolveMeshGlyphLayerParent = function (layerName, ownerId) {
-        var e_23, _a;
+        var e_24, _a;
         var _b, _c, _d;
         var owner = ownerId === null || ownerId === void 0 ? void 0 : ownerId.trim();
         if (owner) {
@@ -5272,12 +5547,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
                 if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_24) throw e_24.error; }
         }
         return null;
     };