@mlightcad/mtext-renderer 0.3.3 → 0.3.4

package/dist/font/defaultFontLoader.d.ts

@@ -1,4 +1,4 @@
-import { FontInfo, FontLoader } from './fontLoader';
+import { FontInfo, FontLoader, FontLoadStatus } from './fontLoader';
 
 /**
  * Default implementation of the FontLoader interface.
@@ -25,10 +25,11 @@ export declare class DefaultFontLoader implements FontLoader {
      */
     getAvaiableFonts(): Promise<FontInfo[]>;
     /**
-     * Loads the specified fonts into the system.
-     * If no font names are provided, loads all available fonts.
+     * Loads the specified fonts into the system. If one font is already loaded,
+     * the font will not be loaded again. If no font names are provided, just loads
+     * all available fonts information (not fonts).
      * @param fontNames - Array of font names to load
      * @returns Promise that resolves to an array of FontLoadStatus objects
      */
-    load(fontNames: string[]): Promise<import('./fontLoader').FontLoadStatus[]>;
+    load(fontNames: string[]): Promise<FontLoadStatus[]>;
 }

package/dist/font/fontManager.d.ts

@@ -102,6 +102,12 @@ export declare class FontManager {
      * @returns The shape for the not found indicator, or undefined if not available
      */
     getNotFoundTextShape(size: number): BaseTextShape | undefined;
+    /**
+     * Checks if a font is already loaded in the system
+     * @param fontName - The name of the font to check
+     * @returns True if the font is loaded, false otherwise
+     */
+    isFontLoaded(fontName: string): boolean;
     /**
      * Records a font that was requested but not found
      * @param fontName - The name of the font that was not found

package/dist/index.js

@@ -79,7 +79,7 @@ function Sa(t) {
     const a = () => {
       t.removeEventListener("success", s), t.removeEventListener("error", i);
     }, s = () => {
-      r(Ue(t.result)), a();
+      r(Le(t.result)), a();
     }, i = () => {
       n(t.error), a();
     };
@@ -110,7 +110,7 @@ let _t = {
       if (e === "store")
         return r.objectStoreNames[1] ? void 0 : r.objectStore(r.objectStoreNames[0]);
     }
-    return Ue(t[e]);
+    return Le(t[e]);
   },
   set(t, e, r) {
     return t[e] = r, !0;
@@ -124,15 +124,15 @@ function mn(t) {
 }
 function Ta(t) {
   return ba().includes(t) ? function(...e) {
-    return t.apply(Ht(this), e), Ue(this.request);
+    return t.apply(Ht(this), e), Le(this.request);
   } : function(...e) {
-    return Ue(t.apply(Ht(this), e));
+    return Le(t.apply(Ht(this), e));
   };
 }
 function Fa(t) {
   return typeof t == "function" ? Ta(t) : (t instanceof IDBTransaction && ka(t), Gt(t, xa()) ? new Proxy(t, _t) : t);
 }
-function Ue(t) {
+function Le(t) {
   if (t instanceof IDBRequest)
     return Sa(t);
   if (St.has(t))
@@ -142,9 +142,9 @@ function Ue(t) {
 }
 const Ht = (t) => vt.get(t);
 function Ca(t, e, { blocked: r, upgrade: n, blocking: a, terminated: s } = {}) {
-  const i = indexedDB.open(t, e), u = Ue(i);
+  const i = indexedDB.open(t, e), u = Le(i);
   return n && i.addEventListener("upgradeneeded", (o) => {
-    n(Ue(i.result), o.oldVersion, o.newVersion, Ue(i.transaction), o);
+    n(Le(i.result), o.oldVersion, o.newVersion, Le(i.transaction), o);
   }), r && i.addEventListener("blocked", (o) => r(
     // Casting due to https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1405
     o.oldVersion,
@@ -213,14 +213,14 @@ mn((t) => ({
     return mr(e, r) || t.has(e, r);
   }
 }));
-const Ae = {
+const De = {
   fonts: "fonts"
 }, Tt = [
   {
     version: 1,
     stores: [
       {
-        name: Ae.fonts,
+        name: De.fonts,
         keyPath: "name"
       }
     ]
@@ -243,7 +243,7 @@ const Ae = {
    * @param fontData The font data to store
    */
   async set(e, r) {
-    await (await this.getDatabase()).put(Ae.fonts, { ...r, name: e });
+    await (await this.getDatabase()).put(De.fonts, { ...r, name: e });
   }
   /**
    * Gets a font from the cache
@@ -251,27 +251,27 @@ const Ae = {
    * @returns The font data if found, undefined otherwise
    */
   async get(e) {
-    return await (await this.getDatabase()).get(Ae.fonts, e);
+    return await (await this.getDatabase()).get(De.fonts, e);
   }
   /**
    * Deletes a font from the cache
    * @param fileName The font file name (key)
    */
   async delete(e) {
-    await (await this.getDatabase()).delete(Ae.fonts, e);
+    await (await this.getDatabase()).delete(De.fonts, e);
   }
   /**
    * Gets all fonts from the cache
    * @returns An array of all font data in the cache
    */
   async getAll() {
-    return await (await this.getDatabase()).getAll(Ae.fonts);
+    return await (await this.getDatabase()).getAll(De.fonts);
   }
   /**
    * Clears all fonts from the cache
    */
   async clear() {
-    await (await this.getDatabase()).clear(Ae.fonts);
+    await (await this.getDatabase()).clear(De.fonts);
   }
   /**
    * Checks if a font exists in the cache
@@ -903,7 +903,7 @@ wn(Fn, Cn, 2, 1);
 $t[28] = 0;
 er[28] = 258;
 var qa = Va;
-function Re(t, e, r, n, a) {
+function Ae(t, e, r, n, a) {
   return Math.pow(1 - a, 3) * t + 3 * Math.pow(1 - a, 2) * a * e + 3 * (1 - a) * Math.pow(a, 2) * r + Math.pow(a, 3) * n;
 }
 function Fe() {
@@ -930,15 +930,15 @@ Fe.prototype.addBezier = function(t, e, r, n, a, s, i, u) {
       if (p === 0)
         continue;
       var y = -g / p;
-      0 < y && y < 1 && (h === 0 && this.addX(Re(o[h], l[h], c[h], f[h], y)), h === 1 && this.addY(Re(o[h], l[h], c[h], f[h], y)));
+      0 < y && y < 1 && (h === 0 && this.addX(Ae(o[h], l[h], c[h], f[h], y)), h === 1 && this.addY(Ae(o[h], l[h], c[h], f[h], y)));
       continue;
     }
     var m = Math.pow(p, 2) - 4 * g * d;
     if (!(m < 0)) {
       var S = (-p + Math.sqrt(m)) / (2 * d);
-      0 < S && S < 1 && (h === 0 && this.addX(Re(o[h], l[h], c[h], f[h], S)), h === 1 && this.addY(Re(o[h], l[h], c[h], f[h], S)));
+      0 < S && S < 1 && (h === 0 && this.addX(Ae(o[h], l[h], c[h], f[h], S)), h === 1 && this.addY(Ae(o[h], l[h], c[h], f[h], S)));
       var x = (-p - Math.sqrt(m)) / (2 * d);
-      0 < x && x < 1 && (h === 0 && this.addX(Re(o[h], l[h], c[h], f[h], x)), h === 1 && this.addY(Re(o[h], l[h], c[h], f[h], x)));
+      0 < x && x < 1 && (h === 0 && this.addX(Ae(o[h], l[h], c[h], f[h], x)), h === 1 && this.addY(Ae(o[h], l[h], c[h], f[h], x)));
     }
   }
 };
@@ -6296,7 +6296,7 @@ function bi(t, e, r, n) {
 function Si(t, e, r, n, a) {
   return a.lowMemory ? bi(t, e, r, n) : xi(t, e, r, n);
 }
-var aa = { getPath: ra, parse: Si }, sa, Le, ia, Qt;
+var aa = { getPath: ra, parse: Si }, sa, Re, ia, Qt;
 function oa(t) {
   this.font = t, this.getCommands = function(e) {
     return aa.getPath(e).commands;
@@ -6522,7 +6522,7 @@ oa.prototype.exec = function(t, e) {
       if (!a) {
         be.prototype = Ei, a = this._fpgmState = new be("fpgm", r.tables.fpgm), a.funcs = [], a.font = r, exports.DEBUG && (console.log("---EXEC FPGM---"), a.step = -1);
         try {
-          Le(a);
+          Re(a);
         } catch (l) {
           console.log("Hinting error in FPGM:" + l), this._errorState = 3;
           return;
@@ -6537,7 +6537,7 @@ oa.prototype.exec = function(t, e) {
         n.cvt = [];
       exports.DEBUG && (console.log("---EXEC PREP---"), n.step = -1);
       try {
-        Le(n);
+        Re(n);
       } catch (l) {
         this._errorState < 2 && console.log("Hinting error in PREP:" + l), this._errorState = 2;
       }
@@ -6573,7 +6573,7 @@ ia = function(t, e) {
     t.instructions && !u.inhibitGridFit && (u = new be("glyf", t.instructions), u.gZone = u.z0 = u.z1 = u.z2 = i, u.contours = s, i.push(
       new ge(0, 0),
       new ge(Math.round(t.advanceWidth * r), 0)
-    ), exports.DEBUG && (console.log("---EXEC COMPOSITE---"), u.step = -1), Le(u), i.length -= 2);
+    ), exports.DEBUG && (console.log("---EXEC COMPOSITE---"), u.step = -1), Re(u), i.length -= 2);
   }
   return i;
 };
@@ -6596,14 +6596,14 @@ Qt = function(t, e, r, n) {
     if (i.push(
       new ge(0, 0),
       new ge(Math.round(t.advanceWidth * r), 0)
-    ), Le(e), i.length -= 2, exports.DEBUG) {
+    ), Re(e), i.length -= 2, exports.DEBUG) {
       console.log("FINISHED GLYPH", e.stack);
       for (var d = 0; d < s; d++)
         console.log(d, i[d].x, i[d].y);
     }
   }
 };
-Le = function(t) {
+Re = function(t) {
   var e = t.prog;
   if (e) {
     var r = e.length, n;
@@ -6795,7 +6795,7 @@ function Ji(t) {
   var a = t.ip, s = t.prog;
   t.prog = t.funcs[r];
   for (var i = 0; i < n; i++)
-    Le(t), exports.DEBUG && console.log(
+    Re(t), exports.DEBUG && console.log(
       ++t.step,
       i + 1 < n ? "next loopcall" : "done loopcall",
       i
@@ -6806,7 +6806,7 @@ function $i(t) {
   var e = t.stack.pop();
   exports.DEBUG && console.log(t.step, "CALL[]", e);
   var r = t.ip, n = t.prog;
-  t.prog = t.funcs[e], Le(t), t.ip = r, t.prog = n, exports.DEBUG && console.log(++t.step, "returning from", e);
+  t.prog = t.funcs[e], Re(t), t.ip = r, t.prog = n, exports.DEBUG && console.log(++t.step, "returning from", e);
 }
 function eo(t) {
   var e = t.stack, r = e.pop();
@@ -10584,7 +10584,7 @@ class Se {
     throw new Error(`Unsupported font file type: ${n}`);
   }
 }
-class Me {
+class Ue {
   constructor() {
     this.fontMapping = {}, this.fontMap = /* @__PURE__ */ new Map(), this.unsupportedChars = {}, this.missedFonts = {}, this.enableFontCache = !0, this.defaultFont = "simsun", this.events = {
       /** Event triggered when a font cannot be found */
@@ -10598,7 +10598,7 @@ class Me {
    * @returns The FontManager instance
    */
   static get instance() {
-    return Me._instance || (Me._instance = new Me()), Me._instance;
+    return Ue._instance || (Ue._instance = new Ue()), Ue._instance;
   }
   /**
    * Sets the font mapping configuration
@@ -10696,6 +10696,14 @@ class Me {
       if (n) return n;
     }
   }
+  /**
+   * Checks if a font is already loaded in the system
+   * @param fontName - The name of the font to check
+   * @returns True if the font is loaded, false otherwise
+   */
+  isFontLoaded(e) {
+    return this.fontMap.has(e.toLowerCase());
+  }
   /**
    * Records a font that was requested but not found
    * @param fontName - The name of the font that was not found
@@ -10797,21 +10805,44 @@ class Sl {
     return this._avaiableFonts;
   }
   /**
-   * Loads the specified fonts into the system.
-   * If no font names are provided, loads all available fonts.
+   * Loads the specified fonts into the system. If one font is already loaded,
+   * the font will not be loaded again. If no font names are provided, just loads
+   * all available fonts information (not fonts).
    * @param fontNames - Array of font names to load
    * @returns Promise that resolves to an array of FontLoadStatus objects
    */
   async load(e) {
-    e.length == 0 && await this.getAvaiableFonts();
-    const r = [];
-    return e.forEach((n) => {
-      const a = n.toLowerCase(), s = this._avaiableFonts.find((i) => i.name.findIndex((u) => u.toLowerCase() === a) >= 0);
-      s && r.push(s.url);
-    }), await Me.instance.loadFonts(r);
+    if (e.length == 0)
+      return await this.getAvaiableFonts(), [];
+    const r = [], n = [], a = {};
+    this._avaiableFonts.forEach((u) => {
+      u.name.forEach((o) => {
+        a[o.toLowerCase()] = u.url;
+      });
+    }), e.forEach((u) => {
+      const o = u.toLowerCase(), l = a[o];
+      l && (Ue.instance.isFontLoaded(o) ? n.push({
+        fontName: o,
+        url: l,
+        status: !0
+      }) : r.push(l));
+    });
+    let s = [];
+    r.length > 0 && (s = await Ue.instance.loadFonts(r));
+    const i = {};
+    return [...n, ...s].forEach((u) => {
+      i[u.fontName] = u;
+    }), e.map((u) => {
+      const o = u.toLowerCase();
+      return i[o] || {
+        fontName: o,
+        url: a[o] || "",
+        status: !1
+      };
+    });
   }
 }
-var je = /* @__PURE__ */ ((t) => (t[t.LEFT_TO_RIGHT = 1] = "LEFT_TO_RIGHT", t[t.RIGHT_TO_LEFT = 2] = "RIGHT_TO_LEFT", t[t.TOP_TO_BOTTOM = 3] = "TOP_TO_BOTTOM", t[t.BOTTOM_TO_TOP = 4] = "BOTTOM_TO_TOP", t[t.BY_STYLE = 5] = "BY_STYLE", t))(je || {}), cl = /* @__PURE__ */ ((t) => (t[t.TopLeft = 1] = "TopLeft", t[t.TopCenter = 2] = "TopCenter", t[t.TopRight = 3] = "TopRight", t[t.MiddleLeft = 4] = "MiddleLeft", t[t.MiddleCenter = 5] = "MiddleCenter", t[t.MiddleRight = 6] = "MiddleRight", t[t.BottomLeft = 7] = "BottomLeft", t[t.BottomCenter = 8] = "BottomCenter", t[t.BottomRight = 9] = "BottomRight", t))(cl || {}), De = /* @__PURE__ */ ((t) => (t[t.NONE = 0] = "NONE", t[t.WORD = 1] = "WORD", t[t.STACK = 2] = "STACK", t[t.SPACE = 3] = "SPACE", t[t.NBSP = 4] = "NBSP", t[t.TABULATOR = 5] = "TABULATOR", t[t.NEW_PARAGRAPH = 6] = "NEW_PARAGRAPH", t[t.NEW_COLUMN = 7] = "NEW_COLUMN", t[t.WRAP_AT_DIMLINE = 8] = "WRAP_AT_DIMLINE", t[t.PROPERTIES_CHANGED = 9] = "PROPERTIES_CHANGED", t))(De || {}), _e = /* @__PURE__ */ ((t) => (t[t.BOTTOM = 0] = "BOTTOM", t[t.MIDDLE = 1] = "MIDDLE", t[t.TOP = 2] = "TOP", t))(_e || {}), se = /* @__PURE__ */ ((t) => (t[t.DEFAULT = 0] = "DEFAULT", t[t.LEFT = 1] = "LEFT", t[t.RIGHT = 2] = "RIGHT", t[t.CENTER = 3] = "CENTER", t[t.JUSTIFIED = 4] = "JUSTIFIED", t[t.DISTRIBUTED = 5] = "DISTRIBUTED", t))(se || {});
+var je = /* @__PURE__ */ ((t) => (t[t.LEFT_TO_RIGHT = 1] = "LEFT_TO_RIGHT", t[t.RIGHT_TO_LEFT = 2] = "RIGHT_TO_LEFT", t[t.TOP_TO_BOTTOM = 3] = "TOP_TO_BOTTOM", t[t.BOTTOM_TO_TOP = 4] = "BOTTOM_TO_TOP", t[t.BY_STYLE = 5] = "BY_STYLE", t))(je || {}), cl = /* @__PURE__ */ ((t) => (t[t.TopLeft = 1] = "TopLeft", t[t.TopCenter = 2] = "TopCenter", t[t.TopRight = 3] = "TopRight", t[t.MiddleLeft = 4] = "MiddleLeft", t[t.MiddleCenter = 5] = "MiddleCenter", t[t.MiddleRight = 6] = "MiddleRight", t[t.BottomLeft = 7] = "BottomLeft", t[t.BottomCenter = 8] = "BottomCenter", t[t.BottomRight = 9] = "BottomRight", t))(cl || {}), Me = /* @__PURE__ */ ((t) => (t[t.NONE = 0] = "NONE", t[t.WORD = 1] = "WORD", t[t.STACK = 2] = "STACK", t[t.SPACE = 3] = "SPACE", t[t.NBSP = 4] = "NBSP", t[t.TABULATOR = 5] = "TABULATOR", t[t.NEW_PARAGRAPH = 6] = "NEW_PARAGRAPH", t[t.NEW_COLUMN = 7] = "NEW_COLUMN", t[t.WRAP_AT_DIMLINE = 8] = "WRAP_AT_DIMLINE", t[t.PROPERTIES_CHANGED = 9] = "PROPERTIES_CHANGED", t))(Me || {}), _e = /* @__PURE__ */ ((t) => (t[t.BOTTOM = 0] = "BOTTOM", t[t.MIDDLE = 1] = "MIDDLE", t[t.TOP = 2] = "TOP", t))(_e || {}), se = /* @__PURE__ */ ((t) => (t[t.DEFAULT = 0] = "DEFAULT", t[t.LEFT = 1] = "LEFT", t[t.RIGHT = 2] = "RIGHT", t[t.CENTER = 3] = "CENTER", t[t.JUSTIFIED = 4] = "JUSTIFIED", t[t.DISTRIBUTED = 5] = "DISTRIBUTED", t))(se || {});
 const hl = {
   c: "Ø",
   d: "°",
@@ -12063,17 +12094,17 @@ class yl {
   processText(e) {
     const r = [], n = [], a = new R.Group();
     for (const s of e)
-      if (s.type === De.NEW_PARAGRAPH)
+      if (s.type === Me.NEW_PARAGRAPH)
         this.startNewLine(), this.processGeometries(r, n, a);
-      else if (s.type === De.WORD) {
+      else if (s.type === Me.WORD) {
         const i = s.data;
         Array.isArray(i) ? i.forEach((u) => this.processWord(u, r, n)) : typeof i == "string" && i.length > 0 && this.processWord(i, r, n), this.processGeometries(r, n, a);
-      } else if (s.type === De.SPACE)
+      } else if (s.type === Me.SPACE)
         this.processBlank();
-      else if (s.type === De.PROPERTIES_CHANGED) {
+      else if (s.type === Me.PROPERTIES_CHANGED) {
         const i = s.data;
         i.command === void 0 ? this._contextStack.length > 0 && (this._currentContext = this._contextStack.pop()) : (this._contextStack.length === 0 && this._contextStack.push(this._currentContext.clone()), this.processFormat(i)), this.processGeometries(r, n, a);
-      } else s.type === De.STACK && (this.processStack(s.data, r, n), this.processGeometries(r, n, a));
+      } else s.type === Me.STACK && (this.processStack(s.data, r, n), this.processGeometries(r, n, a));
     return (r.length > 0 || n.length > 0) && this.processGeometries(r, n, a), a;
   }
   processGeometries(e, r, n) {
@@ -12538,7 +12569,7 @@ export {
   Sl as DefaultFontLoader,
   pr as EventManager,
   Se as FontFactory,
-  Me as FontManager,
+  Ue as FontManager,
   kl as MText,
   cl as MTextAttachmentPoint,
   je as MTextFlowDirection,