@mlightcad/mtext-parser 1.1.6 → 1.1.7

package/dist/parser.es.js

@@ -1,9 +1,9 @@
-var b = /* @__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))(b || {}), _ = /* @__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 || {}), S = /* @__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))(S || {});
-const E = {
+var _ = /* @__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))(_ || {}), m = /* @__PURE__ */ ((s) => (s[s.BOTTOM = 0] = "BOTTOM", s[s.MIDDLE = 1] = "MIDDLE", s[s.TOP = 2] = "TOP", s))(m || {}), S = /* @__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))(S || {}), 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: "°",
   p: "±"
-}, F = {
+}, R = {
   l: 1,
   r: 2,
   c: 3,
@@ -11,11 +11,11 @@ const E = {
   d: 5
   /* DISTRIBUTED */
 };
-function v(s) {
+function O(s) {
   const [t, e, r] = s;
   return r << 16 | e << 8 | t;
 }
-function O(s) {
+function y(s) {
   const t = s & 255, e = s >> 8 & 255, r = s >> 16 & 255;
   return [t, e, r];
 }
@@ -25,14 +25,14 @@ function N(s) {
 function I(s) {
   return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
 }
-function y(s, t = !1) {
+function x(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);
+    let l = a[1].toLowerCase();
+    t && (l = l.replace(/\.(ttf|otf|woff|shx)$/, "")), e.add(l);
   }), e;
 }
-class R {
+class v {
   /**
    * Creates a new ContextStack with an initial context.
    * @param initial The initial MTextContext to use as the base of the stack.
@@ -89,12 +89,12 @@ 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
+   * @param options - Parser options
    */
-  constructor(t, e, r = !1) {
+  constructor(t, e, r = {}) {
     this.continueStroke = !1, this.inStackContext = !1, this.scanner = new g(t);
-    const a = e ?? new d();
-    this.ctxStack = new R(a), this.yieldPropertyCommands = r;
+    const a = e ?? new k();
+    this.ctxStack = new v(a), this.yieldPropertyCommands = r.yieldPropertyCommands ?? !1, this.resetParagraphParameters = r.resetParagraphParameters ?? !1;
   }
   /**
    * Decode multi-byte character from hex code
@@ -109,8 +109,8 @@ class D {
       ]), a = new TextDecoder("gbk").decode(e);
       if (a !== "▯")
         return a;
-      const h = new TextDecoder("big5").decode(e);
-      return h !== "▯" ? h : "▯";
+      const i = new TextDecoder("big5").decode(e);
+      return i !== "▯" ? i : "▯";
     } catch {
       return "▯";
     }
@@ -134,31 +134,31 @@ class D {
   parseStacking() {
     const t = new g(this.extractExpression(!0));
     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];
-    }, h = () => {
-      let n = "";
+    const l = () => {
+      let c = t.peek(), n = !1;
+      return c.charCodeAt(0) < 32 && (c = " "), c === "\\" && (n = !0, t.consume(1), c = t.peek()), t.consume(1), [c, n];
+    }, i = () => {
+      let c = "";
       for (; t.hasData; ) {
-        const [l, o] = i();
-        if (!o && (l === "/" || l === "#" || l === "^"))
-          return [n, l];
-        n += l;
+        const [n, p] = l();
+        if (!p && (n === "/" || n === "#" || n === "^"))
+          return [c, n];
+        c += n;
       }
-      return [n, ""];
-    }, u = (n) => {
-      let l = "", o = n;
+      return [c, ""];
+    }, u = (c) => {
+      let n = "", p = c;
       for (; t.hasData; ) {
-        const [c, p] = i();
-        if (!(o && c === " ")) {
-          if (o = !1, !p && c === ";")
+        const [h, o] = l();
+        if (!(p && h === " ")) {
+          if (p = !1, !o && h === ";")
             break;
-          l += c;
+          n += h;
         }
       }
-      return l;
+      return n;
     };
-    return [e, a] = h(), a && (r = u(a === "^")), e === "" && r.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [e, r, "^"]] : [2, [e, r, a]];
+    return [e, a] = i(), a && (r = u(a === "^")), e === "" && r.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [e, r, "^"]] : [2, [e, r, a]];
   }
   /**
    * Parse MText properties
@@ -392,11 +392,11 @@ class D {
   extractExpression(t = !1) {
     const e = this.scanner.find(";", t);
     if (e < 0) {
-      const h = this.scanner.tail;
-      return this.scanner.consume(h.length), h;
+      const i = this.scanner.tail;
+      return this.scanner.consume(i.length), i;
     }
-    const a = this.scanner.peek(e - this.scanner.currentIndex - 1) === "\\", i = this.scanner.tail.slice(0, e - this.scanner.currentIndex + (a ? 1 : 0));
-    return this.scanner.consume(i.length + 1), i;
+    const a = this.scanner.peek(e - this.scanner.currentIndex - 1) === "\\", l = this.scanner.tail.slice(0, e - this.scanner.currentIndex + (a ? 1 : 0));
+    return this.scanner.consume(l.length + 1), l;
   }
   /**
    * Parse font properties
@@ -406,13 +406,13 @@ class D {
     const e = this.extractExpression().split("|");
     if (e.length > 0 && e[0]) {
       const r = e[0];
-      let a = "Regular", i = 400;
-      for (const h of e.slice(1))
-        h.startsWith("b1") ? i = 700 : h === "i" || h.startsWith("i1") ? a = "Italic" : (h === "i0" || h.startsWith("i0")) && (a = "Regular");
+      let a = "Regular", l = 400;
+      for (const i of e.slice(1))
+        i.startsWith("b1") ? l = 700 : i === "i" || i.startsWith("i1") ? a = "Italic" : (i === "i0" || i.startsWith("i0")) && (a = "Regular");
       t.fontFace = {
         family: r,
         style: a,
-        weight: i
+        weight: l
       };
     }
   }
@@ -423,46 +423,46 @@ class D {
    */
   parseParagraphProperties(t) {
     const e = new g(this.extractExpression());
-    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) {
-        const o = parseFloat(l[0]);
-        for (e.consume(l[0].length); e.peek() === ","; )
+    let r = t.paragraph.indent, a = t.paragraph.left, l = t.paragraph.right, i = t.paragraph.align, u = [];
+    const c = () => {
+      const n = e.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
+      if (n) {
+        const p = parseFloat(n[0]);
+        for (e.consume(n[0].length); e.peek() === ","; )
           e.consume(1);
-        return o;
+        return p;
       }
       return 0;
     };
     for (; e.hasData; )
       switch (e.get()) {
         case "i":
-          r = n();
+          r = c();
           break;
         case "l":
-          a = n();
+          a = c();
           break;
         case "r":
-          i = n();
+          l = c();
           break;
         case "x":
           break;
         case "q": {
-          const o = e.get();
-          for (h = F[o] || 0; e.peek() === ","; )
+          const p = e.get();
+          for (i = R[p] || 0; e.peek() === ","; )
             e.consume(1);
           break;
         }
         case "t":
           for (u = []; e.hasData; ) {
-            const o = e.peek();
-            if (o === "r" || o === "c") {
+            const p = e.peek();
+            if (p === "r" || p === "c") {
               e.consume(1);
-              const c = n();
-              u.push(o + c.toString());
+              const h = c();
+              u.push(p + h.toString());
             } else {
-              const c = n();
-              isNaN(c) ? e.consume(1) : u.push(c);
+              const h = c();
+              isNaN(h) ? e.consume(1) : u.push(h);
             }
           }
           break;
@@ -470,8 +470,8 @@ class D {
     t.paragraph = {
       indent: r,
       left: a,
-      right: i,
-      align: h,
+      right: l,
+      align: i,
       tab_stops: u
     };
   }
@@ -487,12 +487,24 @@ class D {
    */
   *parse() {
     let r = null;
-    const a = () => {
-      var h;
+    function a(i) {
+      const u = { ...i.paragraph };
+      i.paragraph = {
+        indent: 0,
+        left: 0,
+        right: 0,
+        align: 0,
+        tab_stops: []
+      };
+      const c = {};
+      return u.indent !== 0 && (c.indent = 0), u.left !== 0 && (c.left = 0), u.right !== 0 && (c.right = 0), u.align !== 0 && (c.align = 0), JSON.stringify(u.tab_stops) !== JSON.stringify([]) && (c.tab_stops = []), c;
+    }
+    const l = () => {
+      var u;
       let i = "";
       for (; this.scanner.hasData; ) {
-        let u = !1, n = this.scanner.peek();
-        const l = this.scanner.currentIndex;
+        let c = !1, n = this.scanner.peek();
+        const p = this.scanner.currentIndex;
         if (n.charCodeAt(0) < 32) {
           if (this.scanner.consume(1), n === "	")
             return [5, null];
@@ -503,13 +515,13 @@ class D {
         }
         if (n === "\\")
           if ("\\{}".includes(this.scanner.peek(1)))
-            u = !0, this.scanner.consume(1), n = this.scanner.peek();
+            c = !0, this.scanner.consume(1), n = this.scanner.peek();
           else {
             if (i)
               return [1, i];
             this.scanner.consume(1);
-            const o = this.scanner.get();
-            switch (o) {
+            const h = this.scanner.get();
+            switch (h) {
               case "~":
                 return [4, null];
               case "P":
@@ -520,44 +532,44 @@ class D {
                 return [8, null];
               case "S": {
                 this.inStackContext = !0;
-                const c = this.parseStacking();
-                return this.inStackContext = !1, c;
+                const o = this.parseStacking();
+                return this.inStackContext = !1, o;
               }
               case "m":
               case "M":
                 if (this.scanner.peek() === "+") {
                   this.scanner.consume(1);
-                  const c = (h = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : h[0];
-                  if (c) {
+                  const o = (u = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : u[0];
+                  if (o) {
                     this.scanner.consume(4);
-                    const p = this.decodeMultiByteChar(c);
-                    return i ? [1, i] : [1, p];
+                    const b = this.decodeMultiByteChar(o);
+                    return i ? [1, i] : [1, b];
                   }
                   this.scanner.consume(-1);
                 }
                 i += "\\M";
                 continue;
               default:
-                if (o)
+                if (h)
                   try {
-                    const c = this.parseProperties(o);
-                    if (this.yieldPropertyCommands && c)
-                      return [9, c];
+                    const o = this.parseProperties(h);
+                    if (this.yieldPropertyCommands && o)
+                      return [9, o];
                     continue;
                   } catch {
-                    const c = this.scanner.tail.slice(
-                      l,
+                    const o = this.scanner.tail.slice(
+                      p,
                       this.scanner.currentIndex
                     );
-                    i += c;
+                    i += o;
                   }
             }
             continue;
           }
         if (n === "%" && this.scanner.peek(1) === "%") {
-          const o = this.scanner.peek(2).toLowerCase(), c = E[o];
-          if (c) {
-            this.scanner.consume(3), i += c;
+          const h = this.scanner.peek(2).toLowerCase(), o = F[h];
+          if (o) {
+            this.scanner.consume(3), i += o;
             continue;
           } else {
             this.scanner.consume(3);
@@ -566,7 +578,7 @@ class D {
         }
         if (n === " ")
           return i ? (this.scanner.consume(1), r = 3, [1, i]) : (this.scanner.consume(1), [3, null]);
-        if (!u) {
+        if (!c) {
           if (n === "{") {
             if (i)
               return [1, i];
@@ -576,13 +588,13 @@ class D {
             if (i)
               return [1, i];
             if (this.scanner.consume(1), this.yieldPropertyCommands) {
-              const o = this.ctxStack.current;
+              const h = this.ctxStack.current;
               this.popCtx();
-              const c = this.getPropertyChanges(o, this.ctxStack.current);
-              if (Object.keys(c).length > 0)
+              const o = this.getPropertyChanges(h, this.ctxStack.current);
+              if (Object.keys(o).length > 0)
                 return [
                   9,
-                  { command: void 0, changes: c, depth: this.ctxStack.depth }
+                  { command: void 0, changes: o, depth: this.ctxStack.depth }
                 ];
             } else
               this.popCtx();
@@ -590,17 +602,17 @@ class D {
           }
         }
         if (!this.inStackContext && n === "^") {
-          const o = this.scanner.peek(1);
-          if (o) {
-            const c = o.charCodeAt(0);
-            if (this.scanner.consume(2), c === 32)
+          const h = this.scanner.peek(1);
+          if (h) {
+            const o = h.charCodeAt(0);
+            if (this.scanner.consume(2), o === 32)
               i += "^";
             else {
-              if (c === 73)
+              if (o === 73)
                 return i ? [1, i] : [5, null];
-              if (c === 74)
+              if (o === 74)
                 return i ? [1, i] : [6, null];
-              if (c === 77)
+              if (o === 77)
                 continue;
               i += "▯";
             }
@@ -612,10 +624,22 @@ class D {
       return i ? [1, i] : [0, null];
     };
     for (; ; ) {
-      const [i, h] = a();
-      if (i)
-        yield new k(i, this.ctxStack.current.copy(), h), r && (yield new k(r, this.ctxStack.current.copy(), null), r = null);
-      else
+      const [i, u] = l.call(this);
+      if (i) {
+        if (yield new f(i, this.ctxStack.current.copy(), u), i === 6 && this.resetParagraphParameters) {
+          const c = this.ctxStack.current, n = a(c);
+          this.yieldPropertyCommands && Object.keys(n).length > 0 && (yield new f(
+            9,
+            c.copy(),
+            {
+              command: void 0,
+              changes: { paragraph: n },
+              depth: this.ctxStack.depth
+            }
+          ));
+        }
+        r && (yield new f(r, this.ctxStack.current.copy(), null), r = null);
+      } else
         break;
     }
   }
@@ -720,7 +744,7 @@ class g {
     return t;
   }
 }
-class f {
+class d {
   // Store as 0xRRGGBB or null
   /**
    * Create a new MTextColor instance.
@@ -796,7 +820,7 @@ class f {
    * @returns A new MTextColor instance with the same color state.
    */
   copy() {
-    const t = new f();
+    const t = new d();
     return t._aci = this._aci, t._rgbValue = this._rgbValue, t;
   }
   /**
@@ -815,9 +839,9 @@ class f {
     return this._aci === t._aci && this._rgbValue === t._rgbValue;
   }
 }
-class d {
+class k {
   constructor() {
-    this._stroke = 0, this.continueStroke = !1, this.color = new f(), this.align = 0, this.fontFace = { family: "", style: "Regular", weight: 400 }, this._capHeight = { value: 1, isRelative: !1 }, this._widthFactor = { value: 1, isRelative: !1 }, this._charTrackingFactor = { value: 1, isRelative: !1 }, this.oblique = 0, this.paragraph = {
+    this._stroke = 0, this.continueStroke = !1, this.color = new d(), this.align = 0, this.fontFace = { family: "", style: "Regular", weight: 400 }, this._capHeight = { value: 1, isRelative: !1 }, this._widthFactor = { value: 1, isRelative: !1 }, this._charTrackingFactor = { value: 1, isRelative: !1 }, this.oblique = 0, this.paragraph = {
       indent: 0,
       left: 0,
       right: 0,
@@ -957,11 +981,11 @@ class d {
    * @returns A new context with the same properties
    */
   copy() {
-    const t = new d();
+    const t = new k();
     return t._stroke = this._stroke, t.continueStroke = this.continueStroke, t.color = this.color.copy(), t.align = this.align, t.fontFace = { ...this.fontFace }, t._capHeight = { ...this._capHeight }, t._widthFactor = { ...this._widthFactor }, t._charTrackingFactor = { ...this._charTrackingFactor }, t.oblique = this.oblique, t.paragraph = { ...this.paragraph }, t;
   }
 }
-class k {
+class f {
   /**
    * Create a new MText token
    * @param type - The token type
@@ -973,19 +997,19 @@ class k {
   }
 }
 export {
-  f as MTextColor,
-  d as MTextContext,
-  _ as MTextLineAlignment,
-  m as MTextParagraphAlignment,
+  d as MTextColor,
+  k as MTextContext,
+  m as MTextLineAlignment,
+  S as MTextParagraphAlignment,
   D as MTextParser,
-  S as MTextStroke,
-  k as MTextToken,
+  E as MTextStroke,
+  f as MTextToken,
   g as TextScanner,
-  b as TokenType,
+  _ as TokenType,
   N as escapeDxfLineEndings,
-  y as getFonts,
+  x as getFonts,
   I as hasInlineFormattingCodes,
-  O as int2rgb,
-  v as rgb2int
+  y as int2rgb,
+  O as rgb2int
 };
 //# sourceMappingURL=parser.es.js.map