@mlightcad/mtext-parser 1.0.1 → 1.0.4

package/dist/parser.es.js

@@ -1,9 +1,9 @@
-var x = /* @__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))(x || {}), g = /* @__PURE__ */ ((s) => (s[s.BOTTOM = 0] = "BOTTOM", s[s.MIDDLE = 1] = "MIDDLE", s[s.TOP = 2] = "TOP", s))(g || {}), E = /* @__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))(E || {}), m = /* @__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))(m || {});
-const b = {
+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 || {}), b = /* @__PURE__ */ ((r) => (r[r.BOTTOM = 0] = "BOTTOM", r[r.MIDDLE = 1] = "MIDDLE", r[r.TOP = 2] = "TOP", r))(b || {}), E = /* @__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))(E || {}), m = /* @__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))(m || {});
+const F = {
   c: "Ø",
   d: "°",
   p: "±"
-}, w = {
+}, S = {
   l: 1,
   r: 2,
   c: 3,
@@ -11,36 +11,36 @@ const b = {
   d: 5
   /* DISTRIBUTED */
 };
-function I(s) {
-  const [e, t, r] = s;
-  return r << 16 | t << 8 | e;
+function N(r) {
+  const [e, t, s] = r;
+  return s << 16 | t << 8 | e;
 }
-function _(s) {
-  const e = s & 255, t = s >> 8 & 255, r = s >> 16 & 255;
-  return [e, t, r];
+function _(r) {
+  const e = r & 255, t = r >> 8 & 255, s = r >> 16 & 255;
+  return [e, t, s];
 }
-function S(s) {
-  return s.replace(/\^(.)/g, (e, t) => {
-    const r = t.charCodeAt(0);
-    return r === 32 ? "^" : r === 73 ? "	" : r === 74 ? `
-` : r === 77 ? "" : "▯";
+function I(r) {
+  return r.replace(/\^(.)/g, (e, t) => {
+    const s = t.charCodeAt(0);
+    return s === 32 ? "^" : s === 73 ? "	" : s === 74 ? `
+` : s === 77 ? "" : "▯";
   });
 }
-function F(s) {
-  return s.replace(/\r\n|\r|\n/g, "\\P");
+function O(r) {
+  return r.replace(/\r\n|\r|\n/g, "\\P");
 }
-function C(s) {
-  return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
+function R(r) {
+  return r.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
 }
-class N {
+class D {
   /**
    * 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(e, t, r = !1) {
-    this.ctxStack = [], this.continueStroke = !1, this.scanner = new p(S(e)), this.ctx = t ?? new d(), this.yieldPropertyCommands = r, this.decoder = new TextDecoder("gbk");
+  constructor(e, t, s = !1) {
+    this.ctxStack = [], this.continueStroke = !1, this.scanner = new p(I(e)), this.ctx = t ?? new f(), this.lastCtx = this.ctx.copy(), this.yieldPropertyCommands = s, this.decoder = new TextDecoder("gbk");
   }
   /**
    * Decode multi-byte character from hex code
@@ -76,32 +76,33 @@ class N {
    */
   parseStacking() {
     const e = new p(this.extractExpression(!0));
-    let t = "", r = "", a = "";
-    const n = () => {
-      let i = e.peek(), o = !1;
-      return i.charCodeAt(0) < 32 && (i = " "), i === "\\" && (o = !0, e.consume(1), i = e.peek()), e.consume(1), [i, o];
+    let t = "", s = "", n = "";
+    const i = () => {
+      let a = e.peek(), h = !1;
+      return a.charCodeAt(0) < 32 && (a = " "), a === "\\" && (h = !0, e.consume(1), a = e.peek()), e.consume(1), [a, h];
     }, c = () => {
-      let i = "";
+      let a = "";
       for (; e.hasData; ) {
-        const [o, h] = n();
-        if (!h && "^/#".includes(o))
-          return [i, o];
-        i += o;
+        const [h, o] = i();
+        if (!o && "^/#".includes(h))
+          return [a, h];
+        a += h;
       }
-      return [i, ""];
+      return [a, ""];
     }, l = () => {
-      let i = "";
+      let a = "";
       for (; e.hasData; ) {
-        const [o, h] = n();
-        h && o === ";" ? i += ";" : i += o;
+        const [h, o] = i();
+        o && h === ";" ? a += ";" : a += h;
       }
-      return i;
+      return a;
     };
-    return [t, a] = c(), a && (r = l()), [2, [t, r, a]];
+    return [t, n] = c(), n && (s = l()), [2, [t, s, n]];
   }
   /**
    * Parse MText properties
    * @param cmd - The property command to parse
+   * @returns Property changes if yieldPropertyCommands is true and changes occurred
    */
   parseProperties(e) {
     const t = this.ctx.copy();
@@ -155,7 +156,28 @@ class N {
       default:
         throw new Error(`Unknown command: ${e}`);
     }
-    t.continueStroke = this.continueStroke, this.ctx = t;
+    if (t.continueStroke = this.continueStroke, this.ctx = t, this.yieldPropertyCommands) {
+      const s = this.getPropertyChanges(this.lastCtx, t);
+      if (Object.keys(s).length > 0)
+        return this.lastCtx = this.ctx.copy(), {
+          command: e,
+          changes: s
+        };
+    }
+  }
+  /**
+   * Get property changes between two contexts
+   * @param oldCtx - The old context
+   * @param newCtx - The new context
+   * @returns Object containing changed properties
+   */
+  getPropertyChanges(e, t) {
+    const s = {};
+    if (e.underline !== t.underline && (s.underline = t.underline), e.overline !== t.overline && (s.overline = t.overline), e.strikeThrough !== t.strikeThrough && (s.strikeThrough = t.strikeThrough), e.aci !== t.aci && (s.aci = t.aci, s.rgb = t.rgb), e.rgb !== t.rgb && (s.rgb = t.rgb), e.align !== t.align && (s.align = t.align), JSON.stringify(e.fontFace) !== JSON.stringify(t.fontFace) && (s.fontFace = t.fontFace), e.capHeight !== t.capHeight && (s.capHeight = t.capHeight), e.widthFactor !== t.widthFactor && (s.widthFactor = t.widthFactor), e.charTrackingFactor !== t.charTrackingFactor && (s.charTrackingFactor = t.charTrackingFactor), e.oblique !== t.oblique && (s.oblique = t.oblique), JSON.stringify(e.paragraph) !== JSON.stringify(t.paragraph)) {
+      const n = {};
+      e.paragraph.indent !== t.paragraph.indent && (n.indent = t.paragraph.indent), e.paragraph.align !== t.paragraph.align && (n.align = t.paragraph.align), e.paragraph.left !== t.paragraph.left && (n.left = t.paragraph.left), e.paragraph.right !== t.paragraph.right && (n.right = t.paragraph.right), JSON.stringify(e.paragraph.tab_stops) !== JSON.stringify(t.paragraph.tab_stops) && (n.tab_stops = t.paragraph.tab_stops), Object.keys(n).length > 0 && (s.paragraph = n);
+    }
+    return s;
   }
   /**
    * Parse alignment property
@@ -219,8 +241,8 @@ class N {
     const t = this.extractFloatExpression(!0);
     if (t)
       if (t.endsWith("x")) {
-        const r = parseFloat(t.slice(0, -1));
-        e *= Math.abs(r);
+        const s = parseFloat(t.slice(0, -1));
+        e *= Math.abs(s);
       } else
         e = Math.abs(parseFloat(t));
     return e;
@@ -240,8 +262,8 @@ class N {
   parseAciColor(e) {
     const t = this.extractIntExpression();
     if (t) {
-      const r = parseInt(t);
-      r < 257 && (e.aci = r, e.rgb = null);
+      const s = parseInt(t);
+      s < 257 && (e.aci = s, e.rgb = null);
     }
     this.consumeOptionalTerminator();
   }
@@ -252,8 +274,8 @@ class N {
   parseRgbColor(e) {
     const t = this.extractIntExpression();
     if (t) {
-      const r = parseInt(t) & 16777215, [a, n, c] = _(r);
-      e.rgb = [c, n, a];
+      const s = parseInt(t) & 16777215, [n, i, c] = _(s);
+      e.rgb = [c, i, n];
     }
     this.consumeOptionalTerminator();
   }
@@ -263,10 +285,10 @@ class N {
    * @returns Extracted expression
    */
   extractFloatExpression(e = !1) {
-    const t = e ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, r = this.scanner.tail.match(t);
-    if (r) {
-      const a = r[0];
-      return this.scanner.consume(a.length), a;
+    const t = e ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, s = this.scanner.tail.match(t);
+    if (s) {
+      const n = s[0];
+      return this.scanner.consume(n.length), n;
     }
     return "";
   }
@@ -293,8 +315,8 @@ class N {
       const c = this.scanner.tail;
       return this.scanner.consume(c.length), c;
     }
-    const a = this.scanner.peek(t - this.scanner.currentIndex - 1) === "\\", n = this.scanner.tail.slice(0, t - this.scanner.currentIndex + (a ? 1 : 0));
-    return this.scanner.consume(n.length + 1), n;
+    const n = this.scanner.peek(t - this.scanner.currentIndex - 1) === "\\", i = this.scanner.tail.slice(0, t - this.scanner.currentIndex + (n ? 1 : 0));
+    return this.scanner.consume(i.length + 1), i;
   }
   /**
    * Parse font properties
@@ -303,14 +325,14 @@ class N {
   parseFontProperties(e) {
     const t = this.extractExpression().split("|");
     if (t.length > 0 && t[0]) {
-      const r = t[0];
-      let a = "Regular", n = 400;
+      const s = t[0];
+      let n = "Regular", i = 400;
       for (const c of t.slice(1))
-        c.startsWith("b1") ? n = 700 : c.startsWith("i1") && (a = "Italic");
+        c.startsWith("b1") ? i = 700 : c.startsWith("i1") && (n = "Italic");
       e.fontFace = {
-        family: r,
-        style: a,
-        weight: n
+        family: s,
+        style: n,
+        weight: i
       };
     }
   }
@@ -321,54 +343,54 @@ class N {
    */
   parseParagraphProperties(e) {
     const t = new p(this.extractExpression());
-    let r = e.paragraph.indent, a = e.paragraph.left, n = e.paragraph.right, c = e.paragraph.align, l = [];
-    const i = () => {
-      const o = t.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
-      if (o) {
-        const h = parseFloat(o[0]);
-        for (t.consume(o[0].length); t.peek() === ","; )
+    let s = e.paragraph.indent, n = e.paragraph.left, i = e.paragraph.right, c = e.paragraph.align, l = [];
+    const a = () => {
+      const h = t.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
+      if (h) {
+        const o = parseFloat(h[0]);
+        for (t.consume(h[0].length); t.peek() === ","; )
           t.consume(1);
-        return h;
+        return o;
       }
       return 0;
     };
     for (; t.hasData; )
       switch (t.get()) {
         case "i":
-          r = i();
+          s = a();
           break;
         case "l":
-          a = i();
+          n = a();
           break;
         case "r":
-          n = i();
+          i = a();
           break;
         case "x":
           break;
         case "q": {
-          const h = t.get();
-          for (c = w[h] || 0; t.peek() === ","; )
+          const o = t.get();
+          for (c = S[o] || 0; t.peek() === ","; )
             t.consume(1);
           break;
         }
         case "t":
           for (l = []; t.hasData; ) {
-            const h = t.peek();
-            if (h === "r" || h === "c") {
+            const o = t.peek();
+            if (o === "r" || o === "c") {
               t.consume(1);
-              const u = i();
-              l.push(h + u.toString());
+              const u = a();
+              l.push(o + u.toString());
             } else {
-              const u = i();
+              const u = a();
               isNaN(u) ? t.consume(1) : l.push(u);
             }
           }
           break;
       }
     e.paragraph = {
-      indent: r,
-      left: a,
-      right: n,
+      indent: s,
+      left: n,
+      right: i,
       align: c,
       tab_stops: l
     };
@@ -384,30 +406,30 @@ class N {
    * @yields MTextToken objects
    */
   *parse() {
-    let r = null;
-    const a = () => {
+    let s = null;
+    const n = () => {
       var c;
-      let n = "";
+      let i = "";
       for (; this.scanner.hasData; ) {
-        let l = !1, i = this.scanner.peek();
-        const o = this.scanner.currentIndex;
-        if (i.charCodeAt(0) < 32) {
-          if (this.scanner.consume(1), i === "	")
+        let l = !1, a = this.scanner.peek();
+        const h = this.scanner.currentIndex;
+        if (a.charCodeAt(0) < 32) {
+          if (this.scanner.consume(1), a === "	")
             return [5, null];
-          if (i === `
+          if (a === `
 `)
             return [6, null];
-          i = " ";
+          a = " ";
         }
-        if (i === "\\")
+        if (a === "\\")
           if ("\\{}".includes(this.scanner.peek(1)))
-            l = !0, this.scanner.consume(1), i = this.scanner.peek();
+            l = !0, this.scanner.consume(1), a = this.scanner.peek();
           else {
-            if (n)
-              return [1, n];
+            if (i)
+              return [1, i];
             this.scanner.consume(1);
-            const h = this.scanner.get();
-            switch (h) {
+            const o = this.scanner.get();
+            switch (o) {
               case "~":
                 return [4, null];
               case "P":
@@ -425,65 +447,63 @@ class N {
                   const u = (c = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : c[0];
                   if (u) {
                     this.scanner.consume(4);
-                    const k = this.decodeMultiByteChar(u);
-                    return n ? [1, n] : [1, k];
+                    const d = this.decodeMultiByteChar(u);
+                    return i ? [1, i] : [1, d];
                   }
                   this.scanner.consume(-1);
                 }
-                n += "\\M";
+                i += "\\M";
                 continue;
               default:
-                if (h)
+                if (o)
                   try {
-                    if (this.parseProperties(h), this.yieldPropertyCommands)
-                      return [
-                        9,
-                        this.scanner.tail.slice(o, this.scanner.currentIndex)
-                      ];
+                    const u = this.parseProperties(o);
+                    if (this.yieldPropertyCommands && u)
+                      return this.lastCtx = this.ctx.copy(), [9, u];
                     continue;
                   } catch {
                     const u = this.scanner.tail.slice(
-                      o,
+                      h,
                       this.scanner.currentIndex
                     );
-                    n += u;
+                    i += u;
                   }
             }
             continue;
           }
-        if (i === "%" && this.scanner.peek(1) === "%") {
-          const h = this.scanner.peek(2).toLowerCase(), u = b[h];
+        if (a === "%" && this.scanner.peek(1) === "%") {
+          const o = this.scanner.peek(2).toLowerCase(), u = F[o];
           if (u) {
-            this.scanner.consume(3), n += u;
+            this.scanner.consume(3), i += u;
             continue;
           } else {
             this.scanner.consume(3);
             continue;
           }
         }
-        if (i === " ")
-          return n ? (this.scanner.consume(1), r = 3, [1, n]) : (this.scanner.consume(1), [3, null]);
+        if (a === " ")
+          return i ? (this.scanner.consume(1), s = 3, [1, i]) : (this.scanner.consume(1), [3, null]);
         if (!l) {
-          if (i === "{") {
-            if (n)
-              return [1, n];
+          if (a === "{") {
+            if (i)
+              return [1, i];
             this.scanner.consume(1), this.pushCtx();
             continue;
-          } else if (i === "}") {
-            if (n)
-              return [1, n];
+          } else if (a === "}") {
+            if (i)
+              return [1, i];
             this.scanner.consume(1), this.popCtx();
             continue;
           }
         }
-        this.scanner.consume(1), i.charCodeAt(0) >= 32 && (n += i);
+        this.scanner.consume(1), a.charCodeAt(0) >= 32 && (i += a);
       }
-      return n ? [1, n] : [0, null];
+      return i ? [1, i] : [0, null];
     };
     for (; ; ) {
-      const [n, c] = a();
-      if (n)
-        yield new f(n, this.ctx, c), r && (yield new f(r, this.ctx, null), r = null);
+      const [i, c] = n();
+      if (i)
+        yield new g(i, this.ctx, c), s && (yield new g(s, this.ctx, null), s = null);
       else
         break;
     }
@@ -548,21 +568,21 @@ class p {
    * @returns Index of the character, or -1 if not found
    */
   find(e, t = !1) {
-    let r = this._index;
-    for (; r < this.textLen; ) {
-      if (t && this.text[r] === "\\") {
-        if (r + 1 < this.textLen) {
-          if (this.text[r + 1] === e)
-            return r + 1;
-          r += 2;
+    let s = this._index;
+    for (; s < this.textLen; ) {
+      if (t && this.text[s] === "\\") {
+        if (s + 1 < this.textLen) {
+          if (this.text[s + 1] === e)
+            return s + 1;
+          s += 2;
           continue;
         }
-        r++;
+        s++;
         continue;
       }
-      if (this.text[r] === e)
-        return r;
-      r++;
+      if (this.text[s] === e)
+        return s;
+      s++;
     }
     return -1;
   }
@@ -589,7 +609,7 @@ class p {
     return e;
   }
 }
-class d {
+class f {
   constructor() {
     this._stroke = 0, this.continueStroke = !1, this._aci = 7, this.rgb = null, this.align = 0, this.fontFace = { family: "", style: "Regular", weight: 400 }, this.capHeight = 1, this.widthFactor = 1, this.charTrackingFactor = 1, this.oblique = 0, this.paragraph = {
       indent: 0,
@@ -674,34 +694,34 @@ class d {
    * @returns A new context with the same properties
    */
   copy() {
-    const e = new d();
+    const e = new f();
     return e._stroke = this._stroke, e.continueStroke = this.continueStroke, e._aci = this._aci, e.rgb = this.rgb, e.align = this.align, e.fontFace = { ...this.fontFace }, e.capHeight = this.capHeight, e.widthFactor = this.widthFactor, e.charTrackingFactor = this.charTrackingFactor, e.oblique = this.oblique, e.paragraph = { ...this.paragraph }, e;
   }
 }
-class f {
+class g {
   /**
    * Create a new MText token
    * @param type - The token type
    * @param ctx - The text context at this token
    * @param data - Optional token data
    */
-  constructor(e, t, r) {
-    this.type = e, this.ctx = t, this.data = r;
+  constructor(e, t, s) {
+    this.type = e, this.ctx = t, this.data = s;
   }
 }
 export {
-  d as MTextContext,
-  g as MTextLineAlignment,
+  f as MTextContext,
+  b as MTextLineAlignment,
   E as MTextParagraphAlignment,
-  N as MTextParser,
+  D as MTextParser,
   m as MTextStroke,
-  f as MTextToken,
+  g as MTextToken,
   p as TextScanner,
-  x as TokenType,
-  S as caretDecode,
-  F as escapeDxfLineEndings,
-  C as hasInlineFormattingCodes,
+  k as TokenType,
+  I as caretDecode,
+  O as escapeDxfLineEndings,
+  R as hasInlineFormattingCodes,
   _ as int2rgb,
-  I as rgb2int
+  N as rgb2int
 };
 //# sourceMappingURL=parser.es.js.map