@mlightcad/mtext-parser 1.1.1 → 1.1.3

package/dist/parser.es.js

@@ -1,4 +1,4 @@
-var k = /* @__PURE__ */ ((r) => (r[r.NONE = 0] = "NONE", r[r.WORD = 1] = "WORD", r[r.STACK = 2] = "STACK", r[r.SPACE = 3] = "SPACE", r[r.NBSP = 4] = "NBSP", r[r.TABULATOR = 5] = "TABULATOR", r[r.NEW_PARAGRAPH = 6] = "NEW_PARAGRAPH", r[r.NEW_COLUMN = 7] = "NEW_COLUMN", r[r.WRAP_AT_DIMLINE = 8] = "WRAP_AT_DIMLINE", r[r.PROPERTIES_CHANGED = 9] = "PROPERTIES_CHANGED", r))(k || {}), _ = /* @__PURE__ */ ((r) => (r[r.BOTTOM = 0] = "BOTTOM", r[r.MIDDLE = 1] = "MIDDLE", r[r.TOP = 2] = "TOP", r))(_ || {}), m = /* @__PURE__ */ ((r) => (r[r.DEFAULT = 0] = "DEFAULT", r[r.LEFT = 1] = "LEFT", r[r.RIGHT = 2] = "RIGHT", r[r.CENTER = 3] = "CENTER", r[r.JUSTIFIED = 4] = "JUSTIFIED", r[r.DISTRIBUTED = 5] = "DISTRIBUTED", r))(m || {}), E = /* @__PURE__ */ ((r) => (r[r.NONE = 0] = "NONE", r[r.UNDERLINE = 1] = "UNDERLINE", r[r.OVERLINE = 2] = "OVERLINE", r[r.STRIKE_THROUGH = 4] = "STRIKE_THROUGH", r))(E || {});
+var k = /* @__PURE__ */ ((s) => (s[s.NONE = 0] = "NONE", s[s.WORD = 1] = "WORD", s[s.STACK = 2] = "STACK", s[s.SPACE = 3] = "SPACE", s[s.NBSP = 4] = "NBSP", s[s.TABULATOR = 5] = "TABULATOR", s[s.NEW_PARAGRAPH = 6] = "NEW_PARAGRAPH", s[s.NEW_COLUMN = 7] = "NEW_COLUMN", s[s.WRAP_AT_DIMLINE = 8] = "WRAP_AT_DIMLINE", s[s.PROPERTIES_CHANGED = 9] = "PROPERTIES_CHANGED", s))(k || {}), _ = /* @__PURE__ */ ((s) => (s[s.BOTTOM = 0] = "BOTTOM", s[s.MIDDLE = 1] = "MIDDLE", s[s.TOP = 2] = "TOP", s))(_ || {}), m = /* @__PURE__ */ ((s) => (s[s.DEFAULT = 0] = "DEFAULT", s[s.LEFT = 1] = "LEFT", s[s.RIGHT = 2] = "RIGHT", s[s.CENTER = 3] = "CENTER", s[s.JUSTIFIED = 4] = "JUSTIFIED", s[s.DISTRIBUTED = 5] = "DISTRIBUTED", s))(m || {}), E = /* @__PURE__ */ ((s) => (s[s.NONE = 0] = "NONE", s[s.UNDERLINE = 1] = "UNDERLINE", s[s.OVERLINE = 2] = "OVERLINE", s[s.STRIKE_THROUGH = 4] = "STRIKE_THROUGH", s))(E || {});
 const F = {
   c: "Ø",
   d: "°",
@@ -11,36 +11,36 @@ const F = {
   d: 5
   /* DISTRIBUTED */
 };
-function R(r) {
-  const [t, e, s] = r;
-  return s << 16 | e << 8 | t;
+function R(s) {
+  const [t, e, r] = s;
+  return r << 16 | e << 8 | t;
 }
-function v(r) {
-  const t = r & 255, e = r >> 8 & 255, s = r >> 16 & 255;
-  return [t, e, s];
+function v(s) {
+  const t = s & 255, e = s >> 8 & 255, r = s >> 16 & 255;
+  return [t, e, r];
 }
-function I(r) {
-  return r.replace(/\r\n|\r|\n/g, "\\P");
+function O(s) {
+  return s.replace(/\r\n|\r|\n/g, "\\P");
 }
-function N(r) {
-  return r.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
+function I(s) {
+  return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
 }
-function O(r, t = !1) {
-  const e = /* @__PURE__ */ new Set(), s = /\\[fF](.*?)[;|]/g;
-  return [...r.matchAll(s)].forEach((a) => {
+function N(s, t = !1) {
+  const e = /* @__PURE__ */ new Set(), r = /\\[fF](.*?)[;|]/g;
+  return [...s.matchAll(r)].forEach((a) => {
     let i = a[1].toLowerCase();
     t && (i = i.replace(/\.(ttf|otf|woff|shx)$/, "")), e.add(i);
   }), e;
 }
-class D {
+class x {
   /**
    * Creates a new MTextParser instance
    * @param content - The MText content to parse
    * @param ctx - Optional initial MText context
    * @param yieldPropertyCommands - Whether to yield property change commands
    */
-  constructor(t, e, s = !1) {
-    this.ctxStack = [], this.continueStroke = !1, this.inStackContext = !1, this.scanner = new g(t), this.ctx = e ?? new d(), this.lastCtx = this.ctx.copy(), this.yieldPropertyCommands = s;
+  constructor(t, e, r = !1) {
+    this.ctxStack = [], this.continueStroke = !1, this.inStackContext = !1, this.scanner = new g(t), this.ctx = e ?? new d(), this.lastCtx = this.ctx.copy(), this.yieldPropertyCommands = r;
   }
   /**
    * Decode multi-byte character from hex code
@@ -79,7 +79,7 @@ class D {
    */
   parseStacking() {
     const t = new g(this.extractExpression(!0));
-    let e = "", s = "", a = "";
+    let e = "", r = "", a = "";
     const i = () => {
       let n = t.peek(), l = !1;
       return n.charCodeAt(0) < 32 && (n = " "), n === "\\" && (l = !0, t.consume(1), n = t.peek()), t.consume(1), [n, l];
@@ -104,7 +104,7 @@ class D {
       }
       return l;
     };
-    return [e, a] = h(), a && (s = u(a === "^")), e === "" && s.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [e, s, "^"]] : [2, [e, s, a]];
+    return [e, a] = h(), a && (r = u(a === "^")), e === "" && r.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [e, r, "^"]] : [2, [e, r, a]];
   }
   /**
    * Parse MText properties
@@ -164,11 +164,12 @@ class D {
         throw new Error(`Unknown command: ${t}`);
     }
     if (this.continueStroke = e.hasAnyStroke, e.continueStroke = this.continueStroke, this.ctx = e, this.yieldPropertyCommands) {
-      const s = this.getPropertyChanges(this.lastCtx, e);
-      if (Object.keys(s).length > 0)
+      const r = this.getPropertyChanges(this.lastCtx, e);
+      if (Object.keys(r).length > 0)
         return this.lastCtx = this.ctx.copy(), {
           command: t,
-          changes: s
+          changes: r,
+          depth: this.ctxStack.length
         };
     }
   }
@@ -179,12 +180,12 @@ class D {
    * @returns Object containing changed properties
    */
   getPropertyChanges(t, e) {
-    const s = {};
-    if (t.underline !== e.underline && (s.underline = e.underline), t.overline !== e.overline && (s.overline = e.overline), t.strikeThrough !== e.strikeThrough && (s.strikeThrough = e.strikeThrough), t.color.aci !== e.color.aci && (s.aci = e.color.aci), t.color.rgbValue !== e.color.rgbValue && (s.rgb = e.color.rgb), t.align !== e.align && (s.align = e.align), JSON.stringify(t.fontFace) !== JSON.stringify(e.fontFace) && (s.fontFace = e.fontFace), (t.capHeight.value !== e.capHeight.value || t.capHeight.isRelative !== e.capHeight.isRelative) && (s.capHeight = e.capHeight), (t.widthFactor.value !== e.widthFactor.value || t.widthFactor.isRelative !== e.widthFactor.isRelative) && (s.widthFactor = e.widthFactor), (t.charTrackingFactor.value !== e.charTrackingFactor.value || t.charTrackingFactor.isRelative !== e.charTrackingFactor.isRelative) && (s.charTrackingFactor = e.charTrackingFactor), t.oblique !== e.oblique && (s.oblique = e.oblique), JSON.stringify(t.paragraph) !== JSON.stringify(e.paragraph)) {
+    const r = {};
+    if (t.underline !== e.underline && (r.underline = e.underline), t.overline !== e.overline && (r.overline = e.overline), t.strikeThrough !== e.strikeThrough && (r.strikeThrough = e.strikeThrough), t.color.aci !== e.color.aci && (r.aci = e.color.aci), t.color.rgbValue !== e.color.rgbValue && (r.rgb = e.color.rgb), t.align !== e.align && (r.align = e.align), JSON.stringify(t.fontFace) !== JSON.stringify(e.fontFace) && (r.fontFace = e.fontFace), (t.capHeight.value !== e.capHeight.value || t.capHeight.isRelative !== e.capHeight.isRelative) && (r.capHeight = e.capHeight), (t.widthFactor.value !== e.widthFactor.value || t.widthFactor.isRelative !== e.widthFactor.isRelative) && (r.widthFactor = e.widthFactor), (t.charTrackingFactor.value !== e.charTrackingFactor.value || t.charTrackingFactor.isRelative !== e.charTrackingFactor.isRelative) && (r.charTrackingFactor = e.charTrackingFactor), t.oblique !== e.oblique && (r.oblique = e.oblique), JSON.stringify(t.paragraph) !== JSON.stringify(e.paragraph)) {
       const a = {};
-      t.paragraph.indent !== e.paragraph.indent && (a.indent = e.paragraph.indent), t.paragraph.align !== e.paragraph.align && (a.align = e.paragraph.align), t.paragraph.left !== e.paragraph.left && (a.left = e.paragraph.left), t.paragraph.right !== e.paragraph.right && (a.right = e.paragraph.right), JSON.stringify(t.paragraph.tab_stops) !== JSON.stringify(e.paragraph.tab_stops) && (a.tab_stops = e.paragraph.tab_stops), Object.keys(a).length > 0 && (s.paragraph = a);
+      t.paragraph.indent !== e.paragraph.indent && (a.indent = e.paragraph.indent), t.paragraph.align !== e.paragraph.align && (a.align = e.paragraph.align), t.paragraph.left !== e.paragraph.left && (a.left = e.paragraph.left), t.paragraph.right !== e.paragraph.right && (a.right = e.paragraph.right), JSON.stringify(t.paragraph.tab_stops) !== JSON.stringify(e.paragraph.tab_stops) && (a.tab_stops = e.paragraph.tab_stops), Object.keys(a).length > 0 && (r.paragraph = a);
     }
-    return s;
+    return r;
   }
   /**
    * Parse alignment property
@@ -266,8 +267,8 @@ class D {
     const e = this.extractFloatExpression(!0);
     if (e)
       if (e.endsWith("x")) {
-        const s = parseFloat(e.slice(0, -1));
-        t *= s;
+        const r = parseFloat(e.slice(0, -1));
+        t *= r;
       } else
         t = parseFloat(e);
     return t;
@@ -287,8 +288,8 @@ class D {
   parseAciColor(t) {
     const e = this.extractIntExpression();
     if (e) {
-      const s = parseInt(e);
-      s < 257 && (t.color.aci = s);
+      const r = parseInt(e);
+      r < 257 && (t.color.aci = r);
     }
     this.consumeOptionalTerminator();
   }
@@ -299,8 +300,8 @@ class D {
   parseRgbColor(t) {
     const e = this.extractIntExpression();
     if (e) {
-      const s = parseInt(e) & 16777215;
-      t.color.rgbValue = s;
+      const r = parseInt(e) & 16777215;
+      t.color.rgbValue = r;
     }
     this.consumeOptionalTerminator();
   }
@@ -310,9 +311,9 @@ class D {
    * @returns Extracted expression
    */
   extractFloatExpression(t = !1) {
-    const e = t ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, s = this.scanner.tail.match(e);
-    if (s) {
-      const a = s[0];
+    const e = t ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, r = this.scanner.tail.match(e);
+    if (r) {
+      const a = r[0];
       return this.scanner.consume(a.length), a;
     }
     return "";
@@ -350,12 +351,12 @@ class D {
   parseFontProperties(t) {
     const e = this.extractExpression().split("|");
     if (e.length > 0 && e[0]) {
-      const s = e[0];
+      const r = e[0];
       let a = "Regular", i = 400;
       for (const h of e.slice(1))
-        h.startsWith("b1") ? i = 700 : h.startsWith("i1") && (a = "Italic");
+        h.startsWith("b1") ? i = 700 : h === "i" || h.startsWith("i1") ? a = "Italic" : (h === "i0" || h.startsWith("i0")) && (a = "Regular");
       t.fontFace = {
-        family: s,
+        family: r,
         style: a,
         weight: i
       };
@@ -368,7 +369,7 @@ class D {
    */
   parseParagraphProperties(t) {
     const e = new g(this.extractExpression());
-    let s = t.paragraph.indent, a = t.paragraph.left, i = t.paragraph.right, h = t.paragraph.align, u = [];
+    let r = t.paragraph.indent, a = t.paragraph.left, i = t.paragraph.right, h = t.paragraph.align, u = [];
     const n = () => {
       const l = e.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
       if (l) {
@@ -382,7 +383,7 @@ class D {
     for (; e.hasData; )
       switch (e.get()) {
         case "i":
-          s = n();
+          r = n();
           break;
         case "l":
           a = n();
@@ -413,7 +414,7 @@ class D {
           break;
       }
     t.paragraph = {
-      indent: s,
+      indent: r,
       left: a,
       right: i,
       align: h,
@@ -431,7 +432,7 @@ class D {
    * @yields MTextToken objects
    */
   *parse() {
-    let s = null;
+    let r = null;
     const a = () => {
       var h;
       let i = "";
@@ -510,7 +511,7 @@ class D {
           }
         }
         if (n === " ")
-          return i ? (this.scanner.consume(1), s = 3, [1, i]) : (this.scanner.consume(1), [3, null]);
+          return i ? (this.scanner.consume(1), r = 3, [1, i]) : (this.scanner.consume(1), [3, null]);
         if (!u) {
           if (n === "{") {
             if (i)
@@ -520,7 +521,16 @@ class D {
           } else if (n === "}") {
             if (i)
               return [1, i];
-            this.scanner.consume(1), this.popCtx();
+            if (this.scanner.consume(1), this.yieldPropertyCommands) {
+              this.popCtx();
+              const o = this.getPropertyChanges(this.lastCtx, this.ctx);
+              if (Object.keys(o).length > 0)
+                return this.lastCtx = this.ctx.copy(), [
+                  9,
+                  { command: void 0, changes: o, depth: this.ctxStack.length }
+                ];
+            } else
+              this.popCtx();
             continue;
           }
         }
@@ -549,7 +559,7 @@ class D {
     for (; ; ) {
       const [i, h] = a();
       if (i)
-        yield new b(i, this.ctx, h), s && (yield new b(s, this.ctx, null), s = null);
+        yield new b(i, this.ctx, h), r && (yield new b(r, this.ctx, null), r = null);
       else
         break;
     }
@@ -614,21 +624,21 @@ class g {
    * @returns Index of the character, or -1 if not found
    */
   find(t, e = !1) {
-    let s = this._index;
-    for (; s < this.textLen; ) {
-      if (e && this.text[s] === "\\") {
-        if (s + 1 < this.textLen) {
-          if (this.text[s + 1] === t)
-            return s + 1;
-          s += 2;
+    let r = this._index;
+    for (; r < this.textLen; ) {
+      if (e && this.text[r] === "\\") {
+        if (r + 1 < this.textLen) {
+          if (this.text[r + 1] === t)
+            return r + 1;
+          r += 2;
           continue;
         }
-        s++;
+        r++;
         continue;
       }
-      if (this.text[s] === t)
-        return s;
-      s++;
+      if (this.text[r] === t)
+        return r;
+      r++;
     }
     return -1;
   }
@@ -690,8 +700,8 @@ class f {
    */
   get rgb() {
     if (this._rgbValue === null) return null;
-    const t = this._rgbValue >> 16 & 255, e = this._rgbValue >> 8 & 255, s = this._rgbValue & 255;
-    return [t, e, s];
+    const t = this._rgbValue >> 16 & 255, e = this._rgbValue >> 8 & 255, r = this._rgbValue & 255;
+    return [t, e, r];
   }
   /**
    * Set the RGB color. Setting this disables ACI color.
@@ -699,8 +709,8 @@ class f {
    */
   set rgb(t) {
     if (t) {
-      const [e, s, a] = t;
-      this._rgbValue = (e & 255) << 16 | (s & 255) << 8 | a & 255, this._aci = null;
+      const [e, r, a] = t;
+      this._rgbValue = (e & 255) << 16 | (r & 255) << 8 | a & 255, this._aci = null;
     } else
       this._rgbValue = null;
   }
@@ -903,8 +913,8 @@ class b {
    * @param ctx - The text context at this token
    * @param data - Optional token data
    */
-  constructor(t, e, s) {
-    this.type = t, this.ctx = e, this.data = s;
+  constructor(t, e, r) {
+    this.type = t, this.ctx = e, this.data = r;
   }
 }
 export {
@@ -912,14 +922,14 @@ export {
   d as MTextContext,
   _ as MTextLineAlignment,
   m as MTextParagraphAlignment,
-  D as MTextParser,
+  x as MTextParser,
   E as MTextStroke,
   b as MTextToken,
   g as TextScanner,
   k as TokenType,
-  I as escapeDxfLineEndings,
-  O as getFonts,
-  N as hasInlineFormattingCodes,
+  O as escapeDxfLineEndings,
+  N as getFonts,
+  I as hasInlineFormattingCodes,
   v as int2rgb,
   R as rgb2int
 };