@mlightcad/mtext-parser 1.1.4 → 1.1.6

package/dist/parser.es.js

@@ -1,9 +1,9 @@
-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 = {
+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 = {
   c: "Ø",
   d: "°",
   p: "±"
-}, S = {
+}, F = {
   l: 1,
   r: 2,
   c: 3,
@@ -11,28 +11,80 @@ const F = {
   d: 5
   /* DISTRIBUTED */
 };
-function R(s) {
+function v(s) {
   const [t, e, r] = s;
   return r << 16 | e << 8 | t;
 }
-function v(s) {
+function O(s) {
   const t = s & 255, e = s >> 8 & 255, r = s >> 16 & 255;
   return [t, e, r];
 }
-function O(s) {
+function N(s) {
   return s.replace(/\r\n|\r|\n/g, "\\P");
 }
 function I(s) {
   return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
 }
-function N(s, t = !1) {
+function y(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 x {
+class R {
+  /**
+   * Creates a new ContextStack with an initial context.
+   * @param initial The initial MTextContext to use as the base of the stack.
+   */
+  constructor(t) {
+    this.stack = [], this.stack.push(t);
+  }
+  /**
+   * Pushes a copy of the given context onto the stack.
+   * @param ctx The MTextContext to push (copied).
+   */
+  push(t) {
+    this.stack.push(t);
+  }
+  /**
+   * Pops the top context from the stack and merges its paragraph properties into the new top context.
+   * If only one context remains, nothing is popped.
+   * @returns The popped MTextContext, or undefined if the stack has only one context.
+   */
+  pop() {
+    if (this.stack.length <= 1) return;
+    const t = this.stack.pop(), e = this.stack[this.stack.length - 1];
+    return JSON.stringify(e.paragraph) !== JSON.stringify(t.paragraph) && (e.paragraph = { ...t.paragraph }), t;
+  }
+  /**
+   * Returns the current (top) context on the stack.
+   */
+  get current() {
+    return this.stack[this.stack.length - 1];
+  }
+  /**
+   * Returns the current stack depth (number of nested blocks), not counting the root context.
+   */
+  get depth() {
+    return this.stack.length - 1;
+  }
+  /**
+   * Returns the root (bottom) context, which represents the global formatting state.
+   * Used for paragraph property application.
+   */
+  get root() {
+    return this.stack[0];
+  }
+  /**
+   * Replaces the current (top) context with the given context.
+   * @param ctx The new context to set as the current context.
+   */
+  setCurrent(t) {
+    this.stack[this.stack.length - 1] = t;
+  }
+}
+class D {
   /**
    * Creates a new MTextParser instance
    * @param content - The MText content to parse
@@ -40,7 +92,9 @@ class x {
    * @param yieldPropertyCommands - Whether to yield property change commands
    */
   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;
+    this.continueStroke = !1, this.inStackContext = !1, this.scanner = new g(t);
+    const a = e ?? new d();
+    this.ctxStack = new R(a), this.yieldPropertyCommands = r;
   }
   /**
    * Decode multi-byte character from hex code
@@ -65,13 +119,13 @@ class x {
    * Push current context onto the stack
    */
   pushCtx() {
-    this.ctxStack.push(this.ctx);
+    this.ctxStack.push(this.ctxStack.current);
   }
   /**
    * Pop context from the stack
    */
   popCtx() {
-    this.ctxStack.length > 0 && (this.ctx = this.ctxStack.pop());
+    this.ctxStack.pop();
   }
   /**
    * Parse stacking expression (numerator/denominator)
@@ -112,64 +166,64 @@ class x {
    * @returns Property changes if yieldPropertyCommands is true and changes occurred
    */
   parseProperties(t) {
-    const e = this.ctx.copy();
+    const e = this.ctxStack.current.copy(), r = this.ctxStack.current.copy();
     switch (t) {
       case "L":
-        e.underline = !0, this.continueStroke = !0;
+        r.underline = !0, this.continueStroke = !0;
         break;
       case "l":
-        e.underline = !1, e.hasAnyStroke || (this.continueStroke = !1);
+        r.underline = !1, r.hasAnyStroke || (this.continueStroke = !1);
         break;
       case "O":
-        e.overline = !0, this.continueStroke = !0;
+        r.overline = !0, this.continueStroke = !0;
         break;
       case "o":
-        e.overline = !1, e.hasAnyStroke || (this.continueStroke = !1);
+        r.overline = !1, r.hasAnyStroke || (this.continueStroke = !1);
         break;
       case "K":
-        e.strikeThrough = !0, this.continueStroke = !0;
+        r.strikeThrough = !0, this.continueStroke = !0;
         break;
       case "k":
-        e.strikeThrough = !1, e.hasAnyStroke || (this.continueStroke = !1);
+        r.strikeThrough = !1, r.hasAnyStroke || (this.continueStroke = !1);
         break;
       case "A":
-        this.parseAlign(e);
+        this.parseAlign(r);
         break;
       case "C":
-        this.parseAciColor(e);
+        this.parseAciColor(r);
         break;
       case "c":
-        this.parseRgbColor(e);
+        this.parseRgbColor(r);
         break;
       case "H":
-        this.parseHeight(e);
+        this.parseHeight(r);
         break;
       case "W":
-        this.parseWidth(e);
+        this.parseWidth(r);
         break;
       case "Q":
-        this.parseOblique(e);
+        this.parseOblique(r);
         break;
       case "T":
-        this.parseCharTracking(e);
+        this.parseCharTracking(r);
         break;
       case "p":
-        this.parseParagraphProperties(e);
+        this.parseParagraphProperties(r);
         break;
       case "f":
       case "F":
-        this.parseFontProperties(e);
+        this.parseFontProperties(r);
         break;
       default:
         throw new Error(`Unknown command: ${t}`);
     }
-    if (this.continueStroke = e.hasAnyStroke, e.continueStroke = this.continueStroke, this.ctx = e, this.yieldPropertyCommands) {
-      const r = this.getPropertyChanges(this.lastCtx, e);
-      if (Object.keys(r).length > 0)
-        return this.lastCtx = this.ctx.copy(), {
+    if (this.continueStroke = r.hasAnyStroke, r.continueStroke = this.continueStroke, this.ctxStack.setCurrent(r), this.yieldPropertyCommands) {
+      const a = this.getPropertyChanges(e, r);
+      if (Object.keys(a).length > 0)
+        return {
           command: t,
-          changes: r,
-          depth: this.ctxStack.length
+          changes: a,
+          depth: this.ctxStack.depth
         };
     }
   }
@@ -395,7 +449,7 @@ class x {
           break;
         case "q": {
           const o = e.get();
-          for (h = S[o] || 0; e.peek() === ","; )
+          for (h = F[o] || 0; e.peek() === ","; )
             e.consume(1);
           break;
         }
@@ -488,7 +542,7 @@ class x {
                   try {
                     const c = this.parseProperties(o);
                     if (this.yieldPropertyCommands && c)
-                      return this.lastCtx = this.ctx.copy(), [9, c];
+                      return [9, c];
                     continue;
                   } catch {
                     const c = this.scanner.tail.slice(
@@ -501,7 +555,7 @@ class x {
             continue;
           }
         if (n === "%" && this.scanner.peek(1) === "%") {
-          const o = this.scanner.peek(2).toLowerCase(), c = F[o];
+          const o = this.scanner.peek(2).toLowerCase(), c = E[o];
           if (c) {
             this.scanner.consume(3), i += c;
             continue;
@@ -522,12 +576,13 @@ class x {
             if (i)
               return [1, i];
             if (this.scanner.consume(1), this.yieldPropertyCommands) {
+              const o = this.ctxStack.current;
               this.popCtx();
-              const o = this.getPropertyChanges(this.lastCtx, this.ctx);
-              if (Object.keys(o).length > 0)
-                return this.lastCtx = this.ctx.copy(), [
+              const c = this.getPropertyChanges(o, this.ctxStack.current);
+              if (Object.keys(c).length > 0)
+                return [
                   9,
-                  { command: void 0, changes: o, depth: this.ctxStack.length }
+                  { command: void 0, changes: c, depth: this.ctxStack.depth }
                 ];
             } else
               this.popCtx();
@@ -559,7 +614,7 @@ class x {
     for (; ; ) {
       const [i, h] = a();
       if (i)
-        yield new b(i, this.ctx, h), r && (yield new b(r, this.ctx, null), r = null);
+        yield new k(i, this.ctxStack.current.copy(), h), r && (yield new k(r, this.ctxStack.current.copy(), null), r = null);
       else
         break;
     }
@@ -906,7 +961,7 @@ class d {
     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 b {
+class k {
   /**
    * Create a new MText token
    * @param type - The token type
@@ -922,15 +977,15 @@ export {
   d as MTextContext,
   _ as MTextLineAlignment,
   m as MTextParagraphAlignment,
-  x as MTextParser,
-  E as MTextStroke,
-  b as MTextToken,
+  D as MTextParser,
+  S as MTextStroke,
+  k as MTextToken,
   g as TextScanner,
-  k as TokenType,
-  O as escapeDxfLineEndings,
-  N as getFonts,
+  b as TokenType,
+  N as escapeDxfLineEndings,
+  y as getFonts,
   I as hasInlineFormattingCodes,
-  v as int2rgb,
-  R as rgb2int
+  O as int2rgb,
+  v as rgb2int
 };
 //# sourceMappingURL=parser.es.js.map