@mlightcad/mtext-renderer 0.13.2 → 0.13.3

package/dist/index.js

@@ -30300,7 +30300,7 @@ class Oo {
 const Yi = /* @__PURE__ */ new I.Vector3(), Xi = /* @__PURE__ */ new I.Vector3(), Zi = /* @__PURE__ */ new I.Vector3();
 class V0 {
   constructor(e = {}) {
-    this.workers = [], this.inFlightPerWorker = [], this.pendingRequests = /* @__PURE__ */ new Map(), this.requestId = 0, this.readyPromise = null, this.poolSyncedFonts = /* @__PURE__ */ new Set(), this.poolFontSyncInFlight = /* @__PURE__ */ new Map(), this.poolFontLoadedDispatched = /* @__PURE__ */ new Set(), this.poolSize = e.poolSize ?? Math.max(
+    this.workers = [], this.inFlightPerWorker = [], this.pendingRequests = /* @__PURE__ */ new Map(), this.requestId = 0, this.readyPromise = null, this.fontsPerWorker = [], this.poolFontLoadedDispatched = /* @__PURE__ */ new Set(), this.poolSize = e.poolSize ?? Math.max(
       1,
       navigator.hardwareConcurrency ? Math.min(4, navigator.hardwareConcurrency) : 2
     ), this.defaultStyleManager = new Oo();
@@ -30310,7 +30310,7 @@ class V0 {
       const s = new Worker(n, {
         type: "module"
       });
-      this.attachWorkerHandlers(s, r), this.workers.push(s), this.inFlightPerWorker.push(0);
+      this.attachWorkerHandlers(s, r), this.workers.push(s), this.inFlightPerWorker.push(0), this.fontsPerWorker.push(/* @__PURE__ */ new Set());
     }
     this.isInitialized = !1;
   }
@@ -30330,55 +30330,42 @@ class V0 {
    * Handles messages coming from any worker.
    */
   handleWorkerMessage(e, n) {
-    var c, l, u;
+    var c, l, u, f;
     if (e.type === "fontLoaded") {
-      const f = (c = e.data) == null ? void 0 : c.fontName;
-      f && this.syncFontToWorkerPool(f).then((h) => {
-        h && (j.instance.applyRemoteFontLoaded(f), j.instance.events.fontLoaded.dispatch({ fontName: f }));
-      }).catch((h) => {
-        console.warn(
-          `Failed to sync lazy-loaded font "${f}" across worker pool:`,
-          h
-        );
-      });
+      const h = (c = e.data) == null ? void 0 : c.fontName;
+      if (h) {
+        const p = h.toLowerCase();
+        (l = this.fontsPerWorker[n]) == null || l.add(p), p && !this.poolFontLoadedDispatched.has(p) && (this.poolFontLoadedDispatched.add(p), j.instance.applyRemoteFontLoaded(h), j.instance.events.fontLoaded.dispatch({ fontName: h }));
+      }
       return;
     }
     if (e.type === "fontNotFound") {
-      const f = (l = e.data) == null ? void 0 : l.fontName;
-      f && j.instance.applyRemoteFontNotFound(
-        f,
-        ((u = e.data) == null ? void 0 : u.count) ?? 1
+      const h = (u = e.data) == null ? void 0 : u.fontName;
+      h && j.instance.applyRemoteFontNotFound(
+        h,
+        ((f = e.data) == null ? void 0 : f.count) ?? 1
       );
       return;
     }
     const { id: r, success: s, data: i, error: a } = e, o = this.pendingRequests.get(r);
-    o ? (this.pendingRequests.delete(r), this.inFlightPerWorker[n] = Math.max(
-      0,
-      this.inFlightPerWorker[n] - 1
-    ), s ? o.resolve(i) : o.reject(new Error(a || "Unknown worker error"))) : console.warn(`No pending request found for worker response id=${r}`);
-  }
-  /**
-   * Ensures every worker has `fontName`, then returns whether the main thread
-   * should emit {@link FontManager.events.fontLoaded} for this name.
-   */
-  syncFontToWorkerPool(e) {
-    const n = e.toLowerCase();
-    if (!n || this.workers.length === 0 || this.poolFontLoadedDispatched.has(n))
-      return Promise.resolve(!1);
-    const r = this.poolFontSyncInFlight.get(n), s = r ?? (async () => {
-      this.poolSyncedFonts.has(n) || (await this.sendMessageToAllWorkers({
-        type: "loadFonts",
-        data: { fonts: [e] }
-      })).every(
-        (o) => {
-          var c;
-          return (c = o == null ? void 0 : o.loaded) == null ? void 0 : c.some((l) => l.toLowerCase() === n);
+    if (o)
+      if (this.pendingRequests.delete(r), this.inFlightPerWorker[n] = Math.max(
+        0,
+        this.inFlightPerWorker[n] - 1
+      ), s) {
+        if (e.type === "loadFonts") {
+          const h = (i == null ? void 0 : i.loaded) ?? [], p = this.fontsPerWorker[n];
+          if (p)
+            for (const y of h) {
+              const m = y.toLowerCase();
+              m && p.add(m);
+            }
         }
-      ) && this.poolSyncedFonts.add(n);
-    })().finally(() => {
-      this.poolFontSyncInFlight.delete(n);
-    });
-    return r || this.poolFontSyncInFlight.set(n, s), s.then(() => !this.poolSyncedFonts.has(n) || this.poolFontLoadedDispatched.has(n) ? !1 : (this.poolFontLoadedDispatched.add(n), !0));
+        o.resolve(i);
+      } else
+        o.reject(new Error(a || "Unknown worker error"));
+    else
+      console.warn(`No pending request found for worker response id=${r}`);
   }
   /**
    * Attaches message and error handlers to a worker.
@@ -30398,10 +30385,11 @@ class V0 {
     };
   }
   pickLeastLoadedWorker() {
-    let e = 0, n = this.inFlightPerWorker[0] ?? 0;
-    for (let r = 1; r < this.inFlightPerWorker.length; r++) {
-      const s = this.inFlightPerWorker[r] ?? 0;
-      s < n && (n = s, e = r);
+    var s, i;
+    let e = 0, n = this.inFlightPerWorker[0] ?? 0, r = ((s = this.fontsPerWorker[0]) == null ? void 0 : s.size) ?? 0;
+    for (let a = 1; a < this.inFlightPerWorker.length; a++) {
+      const o = this.inFlightPerWorker[a] ?? 0, c = ((i = this.fontsPerWorker[a]) == null ? void 0 : i.size) ?? 0;
+      (o < n || o === n && c > r) && (n = o, r = c, e = a);
     }
     return e;
   }
@@ -30553,28 +30541,55 @@ class V0 {
       "Function 'syncRenderShape' isn't supported in 'WebWorkerRenderer'!"
     );
   }
-  async loadFonts(e) {
-    await this.ensureTasksFinished();
-    const n = await this.sendMessageToAllWorkers({
-      type: "loadFonts",
-      data: { fonts: [...e] }
-    }), r = /* @__PURE__ */ new Set();
-    n.forEach((s) => {
-      var i;
-      return (i = s == null ? void 0 : s.loaded) == null ? void 0 : i.forEach((a) => r.add(a));
-    });
-    for (const s of e) {
-      const i = s.toLowerCase();
-      if (!i)
-        continue;
-      n.every(
-        (o) => {
-          var c;
-          return (c = o == null ? void 0 : o.loaded) == null ? void 0 : c.some((l) => l.toLowerCase() === i);
+  /**
+   * Loads fonts into the worker pool.
+   *
+   * @param fonts - Logical font names (extensions stripped by workers).
+   * @param options.scope - `one` (default) warms a single least-loaded /
+   *   already-warm worker so open-time preload does not re-parse large mesh
+   *   fonts into every isolate. Pass `all` only when every worker must have
+   *   the faces before the first draw (rare; expensive for mesh fonts).
+   * @returns Fonts confirmed loaded in the target isolate(s). With
+   *   `scope: 'all'`, only faces present in every worker.
+   */
+  async loadFonts(e, n) {
+    var o;
+    if (await this.ensureTasksFinished(), ((n == null ? void 0 : n.scope) ?? "one") === "one") {
+      const c = this.pickLeastLoadedWorker(), l = await this.sendMessageToOneWorker(
+        {
+          type: "loadFonts",
+          data: { fonts: [...e] }
+        },
+        c
+      ), u = (l == null ? void 0 : l.loaded) ?? [], f = this.fontsPerWorker[c];
+      if (f)
+        for (const h of u) {
+          const p = h.toLowerCase();
+          p && f.add(p);
         }
-      ) && (this.poolSyncedFonts.add(i), this.poolFontLoadedDispatched.add(i));
+      for (const h of u) {
+        const p = h.toLowerCase();
+        p && this.poolFontLoadedDispatched.add(p);
+      }
+      return { loaded: [...u] };
     }
-    return { loaded: Array.from(r) };
+    const s = await this.sendMessageToAllWorkers({
+      type: "loadFonts",
+      data: { fonts: [...e] }
+    }), i = [], a = ((o = s[0]) == null ? void 0 : o.loaded) ?? [];
+    if (s.length > 0)
+      for (const c of a) {
+        const l = c.toLowerCase();
+        if (!l)
+          continue;
+        s.every(
+          (f) => {
+            var h;
+            return (h = f == null ? void 0 : f.loaded) == null ? void 0 : h.some((p) => p.toLowerCase() === l);
+          }
+        ) && (this.poolFontLoadedDispatched.add(l), i.push(c));
+      }
+    return { loaded: i };
   }
   async getAvailableFonts() {
     return (await this.sendMessageToAllWorkers({
@@ -30748,7 +30763,7 @@ class V0 {
    * Terminate the worker
    */
   terminate() {
-    this.workers.forEach((e) => e.terminate()), this.workers = [], this.inFlightPerWorker = [], this.readyPromise = null, this.poolSyncedFonts.clear(), this.poolFontSyncInFlight.clear(), this.poolFontLoadedDispatched.clear(), this.pendingRequests.forEach(({ reject: e }) => {
+    this.workers.forEach((e) => e.terminate()), this.workers = [], this.inFlightPerWorker = [], this.fontsPerWorker = [], this.readyPromise = null, this.poolFontLoadedDispatched.clear(), this.pendingRequests.forEach(({ reject: e }) => {
       e(new Error("Renderer terminated"));
     }), this.pendingRequests.clear();
   }
@@ -30836,9 +30851,9 @@ class q0 {
   /**
    * Load fonts in the main thread
    */
-  async loadFonts(e) {
+  async loadFonts(e, n) {
     return await this.fontManager.loadFontsByNames(e), {
-      loaded: e.filter((n) => this.fontManager.isFontLoaded(n))
+      loaded: e.filter((r) => this.fontManager.isFontLoaded(r))
     };
   }
   /**
@@ -31018,10 +31033,14 @@ class Z0 {
     return j.instance.getSymbolFontsPreset(e);
   }
   /**
-   * Load fonts using the current mode
+   * Load fonts using the current mode.
+   *
+   * In worker mode, `options.scope` defaults to `one` (warm a single isolate).
+   * Pass `{ scope: 'all' }` only when every worker must have the faces;
+   * `loaded` then lists only faces confirmed in every isolate.
    */
-  async loadFonts(e) {
-    return this.renderer.loadFonts(e);
+  async loadFonts(e, n) {
+    return this.renderer.loadFonts(e, n);
   }
   /**
    * Get available fonts using the current mode