@mlightcad/cad-simple-viewer 1.5.9 → 1.5.10

package/lib/app/AcApFontLoader.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -34,41 +45,94 @@ 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;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { AcDbOpenDatabaseError } from '@mlightcad/data-model';
 import { AcTrFontLoader } from '@mlightcad/three-renderer';
 import { eventBus } from '../editor';
+var lastFontLoadStats = null;
+/** Returns timing from the most recent {@link AcApFontLoader.load} call. */
+export function getLastFontLoadStats() {
+    return lastFontLoadStats ? __assign({}, lastFontLoadStats) : null;
+}
+function isMeshFontInfo(info) {
+    var _a, _b;
+    var type = String((_a = info.type) !== null && _a !== void 0 ? _a : '').toLowerCase();
+    if (type === 'mesh' || type === 'ttf' || type === 'otf' || type === 'woff') {
+        return true;
+    }
+    var file = String((_b = info.file) !== null && _b !== void 0 ? _b : '').toLowerCase();
+    return (file.endsWith('.ttf') ||
+        file.endsWith('.otf') ||
+        file.endsWith('.woff') ||
+        file.endsWith('.woff2'));
+}
 /**
- * Font loader implementation for CAD text rendering.
+ * Viewer-side font loader for explicit loads (default fonts, missing-font UI).
  *
- * This class implements the {@link AcDbFontLoader} interface and provides functionality to:
- * - Fetch available font metadata from a CDN
- * - Load required fonts for CAD text rendering
- * - Handle font loading errors and emit appropriate events
- * - Manage font availability checking
+ * Drawing open no longer collects or awaits fonts in data-model. Text entities
+ * load faces on demand via {@link FontManager.lazyFontLoading}. This class is
+ * still used for {@link AcApDocManager.loadFonts} /
+ * {@link AcApDocManager.loadDefaultFonts}.
  *
- * The font loader works with a Three.js renderer to load fonts that are used
- * for rendering CAD text entities like MText and Text.
+ * Mesh/TTF/WOFF fonts (e.g. `simsun.woff`) are expensive to re-parse from
+ * IndexedDB. When {@link deferMeshFonts} is true and a load mixes SHX with
+ * mesh fonts, SHX is awaited first and mesh continues in the background.
+ * Mesh-only loads always await so callers like
+ * {@link AcApFontUtil.ensureDrawingFontLoaded} see a ready face.
  *
  * @example
  * ```typescript
- * const renderer = new AcTrRenderer();
- * const fontLoader = new AcApFontLoader(renderer);
- *
- * // Load specific fonts
+ * const fontLoader = new AcApFontLoader();
  * await fontLoader.load(['Arial', 'SimSun']);
- *
- * // Get all available fonts
- * const fonts = await fontLoader.getAvaiableFonts();
- * console.log('Available fonts:', fonts);
  * ```
  */
 var AcApFontLoader = /** @class */ (function () {
     /**
      * Creates a new font loader instance.
-     *
-     * @param renderer - The Three.js renderer that will use the loaded fonts
      */
     function AcApFontLoader() {
+        /**
+         * When true (default), mixed SHX+mesh {@link load} calls await only SHX;
+         * mesh fonts continue in the background. Mesh-only loads still await.
+         */
+        this.deferMeshFonts = true;
+        /** Serialize overlapping loads (init defaults vs UI loads) to avoid double-parse. */
+        this._loadChain = Promise.resolve();
         this._loader = new AcTrFontLoader();
     }
     Object.defineProperty(AcApFontLoader.prototype, "baseUrl", {
@@ -86,7 +150,7 @@ var AcApFontLoader = /** @class */ (function () {
     });
     Object.defineProperty(AcApFontLoader.prototype, "avaiableFonts", {
         /**
-         * Avaiable fonts to load.
+         * Available fonts already fetched into the underlying loader cache.
          */
         get: function () {
             return this._loader.avaiableFonts;
@@ -95,7 +159,7 @@ var AcApFontLoader = /** @class */ (function () {
         configurable: true
     });
     /**
-     * @inheritdoc
+     * Fetches available font metadata from the font repository.
      */
     AcApFontLoader.prototype.getAvaiableFonts = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -108,52 +172,185 @@ var AcApFontLoader = /** @class */ (function () {
         });
     };
     /**
-     * @inheritdoc
+     * Loads the given font names. With {@link deferMeshFonts}, mixed SHX+mesh
+     * loads await SHX first; mesh-only loads always await.
      */
     AcApFontLoader.prototype.load = function (fontNames) {
         return __awaiter(this, void 0, void 0, function () {
-            var loadStatus, error_1, fontsNotFound, fontsNotLoaded;
+            var run, result;
+            var _this = this;
             return __generator(this, function (_a) {
-                switch (_a.label) {
+                run = function () { return _this.loadInternal(fontNames); };
+                result = this._loadChain.then(run, run);
+                this._loadChain = result.then(function () { return undefined; }, function () { return undefined; });
+                return [2 /*return*/, result];
+            });
+        });
+    };
+    AcApFontLoader.prototype.loadInternal = function (fontNames) {
+        return __awaiter(this, void 0, void 0, function () {
+            var totalStartedAt, loadStatus, criticalFonts, deferredFonts, metaMs, criticalLoadMs, deferredLoadMs, metaStartedAt, available, byName, available_1, available_1_1, info, _a, _b, name_1, fontNames_1, fontNames_1_1, raw, key, info, shouldDeferMesh, criticalStartedAt, _c, deferredStartedAt, deferredStatus, stats_1, deferredStartedAt_1, error_1;
+            var e_1, _d, e_2, _e, e_3, _f;
+            var _this = this;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this._loader.load(fontNames)];
+                        totalStartedAt = performance.now();
+                        loadStatus = [];
+                        criticalFonts = [];
+                        deferredFonts = [];
+                        metaMs = 0;
+                        criticalLoadMs = 0;
+                        deferredLoadMs = 0;
+                        _g.label = 1;
                     case 1:
-                        loadStatus = _a.sent();
-                        return [3 /*break*/, 3];
+                        _g.trys.push([1, 9, , 10]);
+                        metaStartedAt = performance.now();
+                        return [4 /*yield*/, this._loader.getAvailableFonts()];
                     case 2:
-                        error_1 = _a.sent();
-                        throw new AcDbOpenDatabaseError(error_1 instanceof Error ? error_1.message : String(error_1), 'font_load_failed', { stage: 'FONT', cause: error_1 });
-                    case 3:
-                        fontsNotFound = [];
-                        fontsNotLoaded = [];
-                        loadStatus.forEach(function (item) {
-                            if (item.status === 'NotFound') {
-                                fontsNotFound.push(item.fontName);
+                        available = _g.sent();
+                        metaMs = performance.now() - metaStartedAt;
+                        byName = new Map();
+                        try {
+                            for (available_1 = __values(available), available_1_1 = available_1.next(); !available_1_1.done; available_1_1 = available_1.next()) {
+                                info = available_1_1.value;
+                                try {
+                                    for (_a = (e_2 = void 0, __values(info.name)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                        name_1 = _b.value;
+                                        byName.set(name_1.toLowerCase(), info);
+                                    }
+                                }
+                                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                                finally {
+                                    try {
+                                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                    }
+                                    finally { if (e_2) throw e_2.error; }
+                                }
                             }
-                            else if (item.status === 'FailedToLoad') {
-                                fontsNotLoaded.push({
-                                    fontName: item.fontName,
-                                    url: item.url
-                                });
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (available_1_1 && !available_1_1.done && (_d = available_1.return)) _d.call(available_1);
                             }
-                        });
-                        if (fontsNotFound.length > 0) {
-                            eventBus.emit('fonts-not-found', {
-                                fonts: fontsNotFound
-                            });
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        try {
+                            for (fontNames_1 = __values(fontNames), fontNames_1_1 = fontNames_1.next(); !fontNames_1_1.done; fontNames_1_1 = fontNames_1.next()) {
+                                raw = fontNames_1_1.value;
+                                key = raw.toLowerCase();
+                                info = byName.get(key);
+                                if (this.deferMeshFonts && info && isMeshFontInfo(info)) {
+                                    deferredFonts.push(raw);
+                                }
+                                else {
+                                    criticalFonts.push(raw);
+                                }
+                            }
+                        }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        finally {
+                            try {
+                                if (fontNames_1_1 && !fontNames_1_1.done && (_f = fontNames_1.return)) _f.call(fontNames_1);
+                            }
+                            finally { if (e_3) throw e_3.error; }
                         }
-                        if (fontsNotLoaded.length > 0) {
-                            eventBus.emit('fonts-not-loaded', {
-                                fonts: fontsNotLoaded
+                        shouldDeferMesh = this.deferMeshFonts &&
+                            deferredFonts.length > 0 &&
+                            criticalFonts.length > 0;
+                        criticalStartedAt = performance.now();
+                        if (!(criticalFonts.length > 0)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._loader.load(criticalFonts)];
+                    case 3:
+                        _c = _g.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        _c = [];
+                        _g.label = 5;
+                    case 5:
+                        loadStatus = _c;
+                        criticalLoadMs = performance.now() - criticalStartedAt;
+                        if (!(deferredFonts.length > 0 && !shouldDeferMesh)) return [3 /*break*/, 7];
+                        deferredStartedAt = performance.now();
+                        return [4 /*yield*/, this._loader.load(deferredFonts)];
+                    case 6:
+                        deferredStatus = _g.sent();
+                        deferredLoadMs = performance.now() - deferredStartedAt;
+                        loadStatus = __spreadArray(__spreadArray([], __read(loadStatus), false), __read(deferredStatus), false);
+                        return [3 /*break*/, 8];
+                    case 7:
+                        if (shouldDeferMesh) {
+                            // Still in flight when load() resolves; null until the callback fills it in.
+                            deferredLoadMs = null;
+                        }
+                        _g.label = 8;
+                    case 8:
+                        stats_1 = {
+                            fontCount: fontNames.length,
+                            criticalFonts: __spreadArray([], __read(criticalFonts), false),
+                            deferredFonts: __spreadArray([], __read(deferredFonts), false),
+                            metaMs: metaMs,
+                            criticalLoadMs: criticalLoadMs,
+                            deferredLoadMs: deferredLoadMs,
+                            deferred: shouldDeferMesh,
+                            totalMs: performance.now() - totalStartedAt
+                        };
+                        lastFontLoadStats = stats_1;
+                        if (shouldDeferMesh && deferredFonts.length > 0) {
+                            deferredStartedAt_1 = performance.now();
+                            void this._loader.load(deferredFonts).then(function (status) {
+                                if (lastFontLoadStats === stats_1) {
+                                    stats_1.deferredLoadMs = performance.now() - deferredStartedAt_1;
+                                }
+                                _this.emitPartialFailures(status);
+                            }, function (error) {
+                                if (lastFontLoadStats === stats_1) {
+                                    stats_1.deferredLoadMs = performance.now() - deferredStartedAt_1;
+                                }
+                                logDeferredFontError(error);
                             });
                         }
+                        return [3 /*break*/, 10];
+                    case 9:
+                        error_1 = _g.sent();
+                        throw new AcDbOpenDatabaseError(error_1 instanceof Error ? error_1.message : String(error_1), 'font_load_failed', { cause: error_1 });
+                    case 10:
+                        this.emitPartialFailures(loadStatus);
                         return [2 /*return*/];
                 }
             });
         });
     };
+    AcApFontLoader.prototype.emitPartialFailures = function (loadStatus) {
+        var fontsNotFound = [];
+        var fontsNotLoaded = [];
+        loadStatus.forEach(function (item) {
+            if (item.status === 'NotFound') {
+                fontsNotFound.push(item.fontName);
+            }
+            else if (item.status === 'FailedToLoad') {
+                fontsNotLoaded.push({
+                    fontName: item.fontName,
+                    url: item.url
+                });
+            }
+        });
+        if (fontsNotFound.length > 0) {
+            eventBus.emit('fonts-not-found', {
+                fonts: fontsNotFound
+            });
+        }
+        if (fontsNotLoaded.length > 0) {
+            eventBus.emit('fonts-not-loaded', {
+                fonts: fontsNotLoaded
+            });
+        }
+    };
     return AcApFontLoader;
 }());
 export { AcApFontLoader };
+function logDeferredFontError(error) {
+    console.warn('[AcApFontLoader] Deferred mesh font load failed; text may use SHX fallbacks.', error);
+}
 //# sourceMappingURL=AcApFontLoader.js.map

package/lib/app/AcApFontLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApFontLoader.js","sourceRoot":"","sources":["../../src/app/AcApFontLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAGL,qBAAqB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAyB,QAAQ,EAAE,MAAM,WAAW,CAAA;AAE3D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;IAIE;;;;OAIG;IACH;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA;IACrC,CAAC;IAKD,sBAAI,mCAAO;QAHX;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;QAC7B,CAAC;aACD,UAAY,KAAa;YACvB,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;QAC9B,CAAC;;;OAHA;IAQD,sBAAI,yCAAa;QAHjB;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAA;QACnC,CAAC;;;OAAA;IAED;;OAEG;IACG,yCAAgB,GAAtB;;;;4BACS,qBAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAA;4BAA7C,sBAAO,SAAsC,EAAA;;;;KAC9C;IAED;;OAEG;IACG,6BAAI,GAAV,UAAW,SAAmB;;;;;;;wBAGb,qBAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAA;;wBAA/C,UAAU,GAAG,SAAkC,CAAA;;;;wBAE/C,MAAM,IAAI,qBAAqB,CAC7B,OAAK,YAAY,KAAK,CAAC,CAAC,CAAC,OAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAK,CAAC,EACtD,kBAAkB,EAClB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAK,EAAE,CAChC,CAAA;;wBAEG,aAAa,GAAa,EAAE,CAAA;wBAC5B,cAAc,GAA4B,EAAE,CAAA;wBAClD,UAAU,CAAC,OAAO,CAAC,UAAA,IAAI;4BACrB,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gCAC/B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;4BACnC,CAAC;iCAAM,IAAI,IAAI,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;gCAC1C,cAAc,CAAC,IAAI,CAAC;oCAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oCACvB,GAAG,EAAE,IAAI,CAAC,GAAG;iCACd,CAAC,CAAA;4BACJ,CAAC;wBACH,CAAC,CAAC,CAAA;wBACF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC7B,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE;gCAC/B,KAAK,EAAE,aAAa;6BACrB,CAAC,CAAA;wBACJ,CAAC;wBACD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC9B,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE;gCAChC,KAAK,EAAE,cAAc;6BACtB,CAAC,CAAA;wBACJ,CAAC;;;;;KACF;IACH,qBAAC;AAAD,CAAC,AA1ED,IA0EC"}
+{"version":3,"file":"AcApFontLoader.js","sourceRoot":"","sources":["../../src/app/AcApFontLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAyB,QAAQ,EAAE,MAAM,WAAW,CAAA;AAsB3D,IAAI,iBAAiB,GAA6B,IAAI,CAAA;AAEtD,4EAA4E;AAC5E,MAAM,UAAU,oBAAoB;IAClC,OAAO,iBAAiB,CAAC,CAAC,cAAM,iBAAiB,EAAG,CAAC,CAAC,IAAI,CAAA;AAC5D,CAAC;AAED,SAAS,cAAc,CAAC,IAAkB;;IACxC,IAAM,IAAI,GAAG,MAAM,CAAC,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAClD,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3E,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAM,IAAI,GAAG,MAAM,CAAC,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAClD,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH;IAaE;;OAEG;IACH;QAZA;;;WAGG;QACH,mBAAc,GAAG,IAAI,CAAA;QAErB,qFAAqF;QAC7E,eAAU,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAA;QAMtD,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA;IACrC,CAAC;IAKD,sBAAI,mCAAO;QAHX;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;QAC7B,CAAC;aACD,UAAY,KAAa;YACvB,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;QAC9B,CAAC;;;OAHA;IAQD,sBAAI,yCAAa;QAHjB;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAA;QACnC,CAAC;;;OAAA;IAED;;OAEG;IACG,yCAAgB,GAAtB;;;;4BACS,qBAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAA;4BAA7C,sBAAO,SAAsC,EAAA;;;;KAC9C;IAED;;;OAGG;IACG,6BAAI,GAAV,UAAW,SAAmB;;;;;gBACtB,GAAG,GAAG,cAAM,OAAA,KAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAA5B,CAA4B,CAAA;gBACxC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBAC7C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,CAC3B,cAAM,OAAA,SAAS,EAAT,CAAS,EACf,cAAM,OAAA,SAAS,EAAT,CAAS,CAChB,CAAA;gBACD,sBAAO,MAAM,EAAA;;;KACd;IAEa,qCAAY,GAA1B,UAA2B,SAAmB;;;;;;;;wBACtC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;wBACpC,UAAU,GAAgD,EAAE,CAAA;wBAC1D,aAAa,GAAa,EAAE,CAAA;wBAC5B,aAAa,GAAa,EAAE,CAAA;wBAC9B,MAAM,GAAG,CAAC,CAAA;wBACV,cAAc,GAAG,CAAC,CAAA;wBAClB,cAAc,GAAkB,CAAC,CAAA;;;;wBAG7B,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;wBACrB,qBAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAA;;wBAAlD,SAAS,GAAG,SAAsC;wBACxD,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,aAAa,CAAA;wBAEpC,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAA;;4BAC9C,KAAmB,cAAA,SAAA,SAAS,CAAA,+FAAE,CAAC;gCAApB,IAAI;;oCACb,KAAmB,oBAAA,SAAA,IAAI,CAAC,IAAI,CAAA,CAAA,4CAAE,CAAC;wCAA1B;wCACH,MAAM,CAAC,GAAG,CAAC,MAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAA;oCACtC,CAAC;;;;;;;;;4BACH,CAAC;;;;;;;;;;4BAED,KAAkB,cAAA,SAAA,SAAS,CAAA,+FAAE,CAAC;gCAAnB,GAAG;gCACN,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;gCACvB,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gCAC5B,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;oCACxD,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gCACzB,CAAC;qCAAM,CAAC;oCACN,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gCACzB,CAAC;4BACH,CAAC;;;;;;;;;wBAIK,eAAe,GACnB,IAAI,CAAC,cAAc;4BACnB,aAAa,CAAC,MAAM,GAAG,CAAC;4BACxB,aAAa,CAAC,MAAM,GAAG,CAAC,CAAA;wBAEpB,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;6BAEzC,CAAA,aAAa,CAAC,MAAM,GAAG,CAAC,CAAA,EAAxB,wBAAwB;wBACpB,qBAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAtC,KAAA,SAAsC,CAAA;;;wBACtC,KAAA,EAAE,CAAA;;;wBAHR,UAAU,KAGF,CAAA;wBACR,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAA;6BAElD,CAAA,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,eAAe,CAAA,EAA5C,wBAA4C;wBACxC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;wBACpB,qBAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAvD,cAAc,GAAG,SAAsC;wBAC7D,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAA;wBACtD,UAAU,0CAAO,UAAU,kBAAK,cAAc,SAAC,CAAA;;;wBAC1C,IAAI,eAAe,EAAE,CAAC;4BAC3B,6EAA6E;4BAC7E,cAAc,GAAG,IAAI,CAAA;wBACvB,CAAC;;;wBAEK,UAA2B;4BAC/B,SAAS,EAAE,SAAS,CAAC,MAAM;4BAC3B,aAAa,2BAAM,aAAa,SAAC;4BACjC,aAAa,2BAAM,aAAa,SAAC;4BACjC,MAAM,QAAA;4BACN,cAAc,gBAAA;4BACd,cAAc,gBAAA;4BACd,QAAQ,EAAE,eAAe;4BACzB,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,cAAc;yBAC5C,CAAA;wBACD,iBAAiB,GAAG,OAAK,CAAA;wBAEzB,IAAI,eAAe,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAE1C,sBAAoB,WAAW,CAAC,GAAG,EAAE,CAAA;4BAC3C,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CACxC,UAAA,MAAM;gCACJ,IAAI,iBAAiB,KAAK,OAAK,EAAE,CAAC;oCAChC,OAAK,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,mBAAiB,CAAA;gCAC9D,CAAC;gCACD,KAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;4BAClC,CAAC,EACD,UAAA,KAAK;gCACH,IAAI,iBAAiB,KAAK,OAAK,EAAE,CAAC;oCAChC,OAAK,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,mBAAiB,CAAA;gCAC9D,CAAC;gCACD,oBAAoB,CAAC,KAAK,CAAC,CAAA;4BAC7B,CAAC,CACF,CAAA;wBACH,CAAC;;;;wBAED,MAAM,IAAI,qBAAqB,CAC7B,OAAK,YAAY,KAAK,CAAC,CAAC,CAAC,OAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAK,CAAC,EACtD,kBAAkB,EAClB,EAAE,KAAK,EAAE,OAAK,EAAE,CACjB,CAAA;;wBAGH,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAA;;;;;KACrC;IAEO,4CAAmB,GAA3B,UACE,UAAuD;QAEvD,IAAM,aAAa,GAAa,EAAE,CAAA;QAClC,IAAM,cAAc,GAA4B,EAAE,CAAA;QAClD,UAAU,CAAC,OAAO,CAAC,UAAA,IAAI;YACrB,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBAC/B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACnC,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;gBAC1C,cAAc,CAAC,IAAI,CAAC;oBAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd,CAAC,CAAA;YACJ,CAAC;QACH,CAAC,CAAC,CAAA;QACF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC/B,KAAK,EAAE,aAAa;aACrB,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAChC,KAAK,EAAE,cAAc;aACtB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IACH,qBAAC;AAAD,CAAC,AApLD,IAoLC;;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,OAAO,CAAC,IAAI,CACV,8EAA8E,EAC9E,KAAK,CACN,CAAA;AACH,CAAC"}

package/lib/app/AcApOpenFileProfiler.d.ts

@@ -1,21 +1,70 @@
 import { AcDbDatabase } from '@mlightcad/data-model';
 import type { AcTrView2d } from '../view/AcTrView2d';
 /**
- * Session open-file profiler gated by the {@link AcDbSystemVariables.OPENPROF}
- * system variable.
+ * Snapshot of the most recent document-open profile for palette / console use.
+ */
+export interface AcApOpenFileProfileSnapshot {
+    collectedAt: number;
+    fileName?: string;
+    totalMs: number;
+    readMs: number;
+    convertMs: number;
+    parseMs: number;
+    entityMs: number;
+    stages: {
+        name: string;
+        durationMs: number;
+    }[];
+    cache: {
+        hits: number;
+        misses: number;
+        hitMs: number;
+        cloneMs: number;
+        missBuildMs: number;
+        missCompactMs: number;
+        setCloneMs: number;
+        applyMs: number;
+        topLevel: {
+            hits: number;
+            misses: number;
+            hitMs: number;
+            cloneMs: number;
+            missBuildMs: number;
+            missCompactMs: number;
+            setCloneMs: number;
+            applyMs: number;
+        };
+    };
+    slowBlocks: {
+        blockName: string;
+        buildMs: number;
+        compactMs: number;
+    }[];
+    progressive?: {
+        enabled: boolean;
+        paintCount: number;
+        yieldCount: number;
+    };
+}
+/**
+ * Session open-file profiler.
  *
- * When enabled, records PARSE/FONT/ENTITY (and other `openProgress` sub-stages),
- * wall-clock read vs scene convert time, and {@link AcDbRenderingCache} hit/miss
- * counters, then prints a console summary once the view finishes converting
- * entities (`isProcessingEntities === false`).
+ * Always records PARSE/ENTITY (and other `openProgress` sub-stages),
+ * wall-clock read vs scene convert time, and {@link AcDbRenderingCache}
+ * hit/miss counters for the last open. Console output remains gated by the
+ * {@link AcDbSystemVariables.OPENPROF} system variable.
  *
  * Stage durations use **active-stage wall time**: from the first event of a
- * sub-stage until the first event of a different sub-stage. This matches the
- * UI overlay (e.g. font download that continues after a converter emits
- * `FONT`/`END` prematurely) better than START→END alone.
+ * sub-stage until the first event of a different sub-stage.
+ *
+ * Drawing fonts are loaded on demand during text draw, not during `db.read`.
+ * Explicit {@link AcApFontLoader} loads still contribute via
+ * {@link getLastFontLoadStats} in the console report.
  */
 export declare class AcApOpenFileProfiler {
+    private static _lastSnapshot;
     private _active;
+    private _printToConsole;
     private _t0;
     private _readEndMs;
     private _stages;
@@ -25,34 +74,38 @@ export declare class AcApOpenFileProfiler {
     private _database?;
     private _finishScheduled;
     /**
-     * Returns whether OPENPROF is currently enabled for `database`.
+     * Returns the most recent completed open-file profile, if any.
+     */
+    static getLastSnapshot(): AcApOpenFileProfileSnapshot | null;
+    /**
+     * Returns whether OPENPROF console logging is enabled for `database`.
      */
     static isEnabled(database: AcDbDatabase): boolean;
     /**
-     * Starts a profiling session if OPENPROF is on.
+     * Starts a profiling session for the next document open.
      *
-     * Call from document-open start (before `db.read` / URI open). Safe to call
-     * when profiling is off — it becomes a no-op.
+     * Call from document-open start (before `db.read` / URI open). Always
+     * collects a snapshot; console printing follows OPENPROF.
      *
      * @param database - Database that will emit `openProgress` for this open.
      */
     begin(database: AcDbDatabase): void;
     /**
-     * Marks the end of `db.read` / document open await and schedules the console
-     * report once the view has finished converting entities.
+     * Marks the end of `db.read` / document open await and schedules the report
+     * once the view has finished converting entities.
      *
      * @param view - Active 2d view whose entity convert queue is drained.
      */
     markReadCompleteAndScheduleReport(view: AcTrView2d): void;
     /**
-     * Aborts an in-flight session without printing (e.g. document replaced).
+     * Aborts an in-flight session without publishing (e.g. document replaced).
      */
     cancel(): void;
     private onProgress;
     private closeActiveStage;
     private scheduleReport;
     private waitForIdle;
-    private printReport;
+    private publishReport;
     private detachProgressListener;
 }
 //# sourceMappingURL=AcApOpenFileProfiler.d.ts.map

package/lib/app/AcApOpenFileProfiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApOpenFileProfiler.d.ts","sourceRoot":"","sources":["../../src/app/AcApOpenFileProfiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAMb,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAMpD;;;;;;;;;;;;;GAaG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,GAAG,CAAI;IACf,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,qBAAqB,CAAI;IACjC,OAAO,CAAC,iBAAiB,CAAC,CAAwC;IAClE,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,gBAAgB,CAAQ;IAEhC;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAajD;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAwBnC;;;;;OAKG;IACH,iCAAiC,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAQzD;;OAEG;IACH,MAAM,IAAI,IAAI;IAYd,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,cAAc;YAmBR,WAAW;IAkBzB,OAAO,CAAC,WAAW;IAkFnB,OAAO,CAAC,sBAAsB;CAQ/B"}
+{"version":3,"file":"AcApOpenFileProfiler.d.ts","sourceRoot":"","sources":["../../src/app/AcApOpenFileProfiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAMb,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAOpD;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC9C,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,WAAW,EAAE,MAAM,CAAA;QACnB,aAAa,EAAE,MAAM,CAAA;QACrB,UAAU,EAAE,MAAM,CAAA;QAClB,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAA;YACZ,MAAM,EAAE,MAAM,CAAA;YACd,KAAK,EAAE,MAAM,CAAA;YACb,OAAO,EAAE,MAAM,CAAA;YACf,WAAW,EAAE,MAAM,CAAA;YACnB,aAAa,EAAE,MAAM,CAAA;YACrB,UAAU,EAAE,MAAM,CAAA;YAClB,OAAO,EAAE,MAAM,CAAA;SAChB,CAAA;KACF,CAAA;IACD,UAAU,EAAE;QACV,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,SAAS,EAAE,MAAM,CAAA;KAClB,EAAE,CAAA;IACH,WAAW,CAAC,EAAE;QACZ,OAAO,EAAE,OAAO,CAAA;QAChB,UAAU,EAAE,MAAM,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,aAAa,CAA2C;IAEvE,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,GAAG,CAAI;IACf,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,qBAAqB,CAAI;IACjC,OAAO,CAAC,iBAAiB,CAAC,CAAwC;IAClE,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,gBAAgB,CAAQ;IAEhC;;OAEG;IACH,MAAM,CAAC,eAAe,IAAI,2BAA2B,GAAG,IAAI;IAI5D;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAajD;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,iCAAiC,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAQzD;;OAEG;IACH,MAAM,IAAI,IAAI;IAad,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,cAAc;YAmBR,WAAW;IAkBzB,OAAO,CAAC,aAAa;IAwIrB,OAAO,CAAC,sBAAsB;CAQ/B"}