@mlightcad/mtext-renderer 0.9.1 → 0.9.2

package/dist/mtext-renderer-worker.js

@@ -1,5 +1,5 @@
 var jh = (n, e) => () => (e || n((e = { exports: {} }).exports, e), e.exports);
-var Kd = jh((O) => {
+var t1 = jh((O) => {
   /**
    * @license
    * Copyright 2010-2024 Three.js Authors
@@ -3171,7 +3171,7 @@ var Kd = jh((O) => {
       return super.copy(e), this.color.copy(e.color), this.map = e.map, this.lightMap = e.lightMap, this.lightMapIntensity = e.lightMapIntensity, this.aoMap = e.aoMap, this.aoMapIntensity = e.aoMapIntensity, this.specularMap = e.specularMap, this.alphaMap = e.alphaMap, this.envMap = e.envMap, this.envMapRotation.copy(e.envMapRotation), this.combine = e.combine, this.reflectivity = e.reflectivity, this.refractionRatio = e.refractionRatio, this.wireframe = e.wireframe, this.wireframeLinewidth = e.wireframeLinewidth, this.wireframeLinecap = e.wireframeLinecap, this.wireframeLinejoin = e.wireframeLinejoin, this.fog = e.fog, this;
     }
   }
-  const fe = /* @__PURE__ */ new A(), fn = /* @__PURE__ */ new V();
+  const pe = /* @__PURE__ */ new A(), fn = /* @__PURE__ */ new V();
   class Ve {
     constructor(e, t, r = !1) {
       if (Array.isArray(e))
@@ -3210,22 +3210,22 @@ var Kd = jh((O) => {
           fn.fromBufferAttribute(this, t), fn.applyMatrix3(e), this.setXY(t, fn.x, fn.y);
       else if (this.itemSize === 3)
         for (let t = 0, r = this.count; t < r; t++)
-          fe.fromBufferAttribute(this, t), fe.applyMatrix3(e), this.setXYZ(t, fe.x, fe.y, fe.z);
+          pe.fromBufferAttribute(this, t), pe.applyMatrix3(e), this.setXYZ(t, pe.x, pe.y, pe.z);
       return this;
     }
     applyMatrix4(e) {
       for (let t = 0, r = this.count; t < r; t++)
-        fe.fromBufferAttribute(this, t), fe.applyMatrix4(e), this.setXYZ(t, fe.x, fe.y, fe.z);
+        pe.fromBufferAttribute(this, t), pe.applyMatrix4(e), this.setXYZ(t, pe.x, pe.y, pe.z);
       return this;
     }
     applyNormalMatrix(e) {
       for (let t = 0, r = this.count; t < r; t++)
-        fe.fromBufferAttribute(this, t), fe.applyNormalMatrix(e), this.setXYZ(t, fe.x, fe.y, fe.z);
+        pe.fromBufferAttribute(this, t), pe.applyNormalMatrix(e), this.setXYZ(t, pe.x, pe.y, pe.z);
       return this;
     }
     transformDirection(e) {
       for (let t = 0, r = this.count; t < r; t++)
-        fe.fromBufferAttribute(this, t), fe.transformDirection(e), this.setXYZ(t, fe.x, fe.y, fe.z);
+        pe.fromBufferAttribute(this, t), pe.transformDirection(e), this.setXYZ(t, pe.x, pe.y, pe.z);
       return this;
     }
     set(e, t = 0) {
@@ -28870,8 +28870,57 @@ var Kd = jh((O) => {
       this.type = e, this.ctx = t, this.data = r;
     }
   }
-  var pr = /* @__PURE__ */ ((n) => (n[n.LEFT_TO_RIGHT = 1] = "LEFT_TO_RIGHT", n[n.RIGHT_TO_LEFT = 2] = "RIGHT_TO_LEFT", n[n.TOP_TO_BOTTOM = 3] = "TOP_TO_BOTTOM", n[n.BOTTOM_TO_TOP = 4] = "BOTTOM_TO_TOP", n[n.BY_STYLE = 5] = "BY_STYLE", n))(pr || {}), pe = /* @__PURE__ */ ((n) => (n.CHAR = "CHAR", n.NEW_PARAGRAPH = "NEW_PARAGRAPH", n.STACK = "STACK", n))(pe || {});
-  const Yd = /* @__PURE__ */ new A(), Zd = 1.666666, On = 0.3, vs = "";
+  var pr = /* @__PURE__ */ ((n) => (n[n.LEFT_TO_RIGHT = 1] = "LEFT_TO_RIGHT", n[n.RIGHT_TO_LEFT = 2] = "RIGHT_TO_LEFT", n[n.TOP_TO_BOTTOM = 3] = "TOP_TO_BOTTOM", n[n.BOTTOM_TO_TOP = 4] = "BOTTOM_TO_TOP", n[n.BY_STYLE = 5] = "BY_STYLE", n))(pr || {}), fe = /* @__PURE__ */ ((n) => (n.CHAR = "CHAR", n.NEW_PARAGRAPH = "NEW_PARAGRAPH", n.STACK = "STACK", n))(fe || {});
+  const vs = "";
+  function Yd(n) {
+    if (!(!n || [
+      n.min.x,
+      n.min.y,
+      n.min.z,
+      n.max.x,
+      n.max.y,
+      n.max.z
+    ].some((t) => !Number.isFinite(t))))
+      return n;
+  }
+  function Zd(n, e, t) {
+    const r = [];
+    if (n.filter((l) => l.char !== vs).forEach((l) => {
+      const p = Yd(
+        new Ae().copy(l.box).applyMatrix4(e)
+      );
+      p && r.push({
+        type: l.type === fe.NEW_PARAGRAPH ? fe.NEW_PARAGRAPH : fe.CHAR,
+        box: p,
+        char: l.type === fe.NEW_PARAGRAPH ? `
+` : l.char,
+        children: []
+      });
+    }), t !== fe.STACK)
+      return r;
+    const i = (l) => l.type === fe.CHAR && l.char.trim().length === 0, s = (l) => l.type === fe.CHAR && l.char.trim().length > 0, a = r.findIndex(s);
+    if (a < 0) return r;
+    let o = -1;
+    for (let l = r.length - 1; l >= 0; l--)
+      if (s(r[l])) {
+        o = l;
+        break;
+      }
+    const h = r.slice(0, a).filter(i), c = r.slice(o + 1).filter(i), u = r.slice(a, o + 1).filter(s);
+    if (u.length === 0) return [...h, ...c];
+    const f = new Ae().copy(u[0].box);
+    return u.slice(1).forEach((l) => f.union(l.box)), [
+      ...h,
+      {
+        type: fe.STACK,
+        char: "",
+        box: f,
+        children: u
+      },
+      ...c
+    ];
+  }
+  const Jd = /* @__PURE__ */ new A(), $d = 1.666666, On = 0.3;
   class Ns extends jr {
     /**
      * Creates a new RenderContext instance with optional initial values.
@@ -28905,7 +28954,7 @@ var Kd = jh((O) => {
       this.color.rgb = [t, r, i];
     }
   }
-  class Jd {
+  class jd {
     /**
      * Construct one instance of this class and initialize some properties with default values.
      * @param style Input text style
@@ -29004,7 +29053,7 @@ var Kd = jh((O) => {
      * The height of current line of texts
      */
     get currentLineHeight() {
-      return this.defaultLineSpaceFactor * this.currentFontSize * Zd + this.currentMaxFontSize;
+      return this.defaultLineSpaceFactor * this.currentFontSize * $d + this.currentMaxFontSize;
     }
     /**
      * The maximum font size in current line. Characters in one line may have different font and font
@@ -29211,7 +29260,7 @@ var Kd = jh((O) => {
             i,
             s
           );
-          const c = h[2] === "^" ? pe.CHAR : pe.STACK;
+          const c = h[2] === "^" ? fe.CHAR : fe.STACK;
           this.processGeometries(
             t,
             r,
@@ -29229,7 +29278,7 @@ var Kd = jh((O) => {
         a
       ), this.processLastLine(), a;
     }
-    processGeometries(e, t, r, i, s, a = pe.CHAR) {
+    processGeometries(e, t, r, i, s, a = fe.CHAR) {
       if (e.length > 0 || t.length > 0) {
         const o = this.toThreeObject(
           e,
@@ -29367,12 +29416,12 @@ var Kd = jh((O) => {
         new A(e + r, a, 0)
       );
       this.resolveCharBoxTarget(i, s) === "mesh" ? i.push({
-        type: pe.CHAR,
+        type: fe.CHAR,
         box: o,
         char: vs,
         children: []
       }) : s.push({
-        type: pe.CHAR,
+        type: fe.CHAR,
         box: o,
         char: vs,
         children: []
@@ -29396,12 +29445,12 @@ var Kd = jh((O) => {
           )
         );
         this.resolveCharBoxTarget(e, t) === "mesh" ? e.push({
-          type: pe.CHAR,
+          type: fe.CHAR,
           box: s,
           char: " ",
           children: []
         }) : t.push({
-          type: pe.CHAR,
+          type: fe.CHAR,
           box: s,
           char: " ",
           children: []
@@ -29413,13 +29462,13 @@ var Kd = jh((O) => {
       if (this._options.collectCharBoxes === !1 || !e || !t) return;
       const r = new A(this._hOffset, this._vOffset, 0), i = new Ae(r.clone(), r.clone());
       this.resolveCharBoxTarget(e, t) === "mesh" ? e.push({
-        type: pe.NEW_PARAGRAPH,
+        type: fe.NEW_PARAGRAPH,
         box: i,
         char: `
 `,
         children: []
       }) : t.push({
-        type: pe.NEW_PARAGRAPH,
+        type: fe.NEW_PARAGRAPH,
         box: i,
         char: `
 `,
@@ -29463,12 +29512,12 @@ var Kd = jh((O) => {
         o.userData.char = e, o.boundingBox || o.computeBoundingBox();
         const x = new Ae().copy(o.boundingBox);
         o instanceof cr ? (this._lastCharBoxTarget = "mesh", i.push({
-          type: pe.CHAR,
+          type: fe.CHAR,
           box: x,
           char: e,
           children: []
         })) : (this._lastCharBoxTarget = "line", s.push({
-          type: pe.CHAR,
+          type: fe.CHAR,
           box: x,
           char: e,
           children: []
@@ -29593,7 +29642,7 @@ var Kd = jh((O) => {
       if (e.forEach((a, o) => {
         a.geometry.boundingBox || a.geometry.computeBoundingBox(), o === 0 ? t = a.geometry.boundingBox : t.union(a.geometry.boundingBox);
       }), !t) return;
-      const r = t, i = r.getSize(Yd), s = (a, o) => {
+      const r = t, i = r.getSize(Jd), s = (a, o) => {
         var c;
         const h = (c = a.userData) == null ? void 0 : c.charBoxes;
         if (h && h.length > 0) {
@@ -29891,7 +29940,7 @@ var Kd = jh((O) => {
         value: e.widthFactor ?? 1,
         isRelative: !0
       }, u.align = s, u.paragraph.align = i;
-      const f = new Jd(
+      const f = new jd(
         t,
         this.styleManager,
         this.fontManager,
@@ -29957,32 +30006,12 @@ var Kd = jh((O) => {
       e.updateWorldMatrix(!1, !1);
       const r = (s = e.userData) == null ? void 0 : s.charBoxes;
       if (r && r.length > 0) {
-        const h = r.filter((u) => u.char !== vs).map((u) => {
-          const f = u.box ? new Ae().copy(u.box).applyMatrix4(e.matrixWorld) : void 0;
-          return {
-            type: u.type === pe.NEW_PARAGRAPH ? pe.NEW_PARAGRAPH : pe.CHAR,
-            box: f,
-            char: u.type === pe.NEW_PARAGRAPH ? `
-` : u.char,
-            children: []
-          };
-        });
-        if (((a = e.userData) == null ? void 0 : a.charBoxType) === pe.STACK) {
-          const u = new Ae();
-          h.forEach((f) => {
-            u.union(f.box);
-          }), t.push({
-            type: pe.STACK,
-            char: "",
-            box: u,
-            children: h
-          });
-        } else
-          h.forEach((u) => {
-            t.push({
-              ...u
-            });
-          });
+        const h = (a = e.userData) == null ? void 0 : a.charBoxType, c = Zd(
+          r,
+          e.matrixWorld,
+          h
+        );
+        t.push(...c);
         return;
       }
       if (e instanceof bs || e instanceof Dn) {
@@ -29991,7 +30020,7 @@ var Kd = jh((O) => {
           h.boundingBox === null && h.computeBoundingBox();
           const c = new Ae().copy(h.boundingBox);
           c.applyMatrix4(e.matrixWorld), t.push({
-            type: pe.CHAR,
+            type: fe.CHAR,
             box: c,
             char: "",
             children: []
@@ -30033,7 +30062,7 @@ var Kd = jh((O) => {
       }
     }
   }
-  const es = ft.instance, $d = new Gd();
+  const es = ft.instance, Qd = new Gd();
   self.addEventListener("message", async (n) => {
     const { type: e, id: t, data: r } = n.data;
     try {
@@ -30044,12 +30073,12 @@ var Kd = jh((O) => {
           let o = new Gs(
             i,
             s,
-            $d,
+            Qd,
             es,
             a
           );
           await o.asyncDraw(), o.updateMatrixWorld(!0);
-          const { data: h, transferableObjects: c } = jd(o);
+          const { data: h, transferableObjects: c } = Kd(o);
           self.postMessage(
             {
               type: "render",
@@ -30105,12 +30134,12 @@ var Kd = jh((O) => {
       });
     }
   });
-  function jd(n) {
+  function Kd(n) {
     const e = n.matrixWorld.clone(), t = new A(), r = new Bt(), i = new A();
     e.decompose(t, r, i);
     const s = n.box.clone();
     s.applyMatrix4(e);
-    const { children: a, transferableObjects: o } = Qd(n);
+    const { children: a, transferableObjects: o } = e1(n);
     return { data: {
       // Basic properties
       type: "MText",
@@ -30146,7 +30175,7 @@ var Kd = jh((O) => {
       children: a
     }, transferableObjects: o };
   }
-  function Qd(n) {
+  function e1(n) {
     const e = [], t = [];
     return n.traverse((r) => {
       if (r instanceof Dn || r instanceof bs) {
@@ -30221,4 +30250,4 @@ var Kd = jh((O) => {
     }), { children: e, transferableObjects: t };
   }
 });
-export default Kd();
+export default t1();

package/lib/renderer/charBoxUtils.d.ts

@@ -0,0 +1,4 @@
+import { CharBox, CharBoxType } from './types';
+import * as THREE from 'three';
+export declare function normalizeBox(box?: THREE.Box3): THREE.Box3 | undefined;
+export declare function buildCharBoxesFromObject(objectCharBoxes: CharBox[], matrixWorld: THREE.Matrix4, charBoxType?: CharBoxType): CharBox[];

package/lib/renderer/mtext.charBoxes.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/renderer/mtextProcessor.d.ts

@@ -3,7 +3,6 @@ import { FontManager } from '../font';
 import { StyleManager } from './styleManager';
 import { MTextFlowDirection, TextStyle } from './types';
 import * as THREE from 'three';
-export declare const STACK_DIVIDER_CHAR = "\uE000";
 export interface MTextFormatOptions {
     /**
      * Font size.

package/lib/renderer/types.d.ts

@@ -87,6 +87,10 @@ export declare enum CharBoxType {
     /** Stack token (for fraction-style stacked expressions). */
     STACK = "STACK"
 }
+/**
+ * Sentinel character used internally to represent a stack divider line.
+ */
+export declare const STACK_DIVIDER_CHAR = "\uE000";
 export interface StyleTraits {
     /**
      * Optional layer name. Material is identified by layer and color. So it means different

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlightcad/mtext-renderer",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "AutoCAD MText renderer based on Three.js",
   "license": "MIT",
   "author": "MLight Lee <mlight.lee@outlook.com>",
@@ -41,7 +41,8 @@
   },
   "devDependencies": {
     "@types/opentype.js": "^1.3.8",
-    "@types/three": "^0.172.0"
+    "@types/three": "^0.172.0",
+    "vitest": "^3.2.4"
   },
   "peerDependencies": {
     "three": "^0.172.0"
@@ -52,6 +53,7 @@
     "build:worker": "vite build -c vite.config.worker.ts",
     "clean": "rimraf dist lib tsconfig.tsbuildinfo",
     "lint": "eslint src/",
-    "lint:fix": "eslint --fix --quiet src/"
+    "lint:fix": "eslint --fix --quiet src/",
+    "test": "vitest run"
   }
 }