@knowvah/dot-engine 2.6.8 → 2.6.10

package/dist/render/xml-escape.d.ts

@@ -1,6 +1,6 @@
 /**
- * Base XML escape (gv_xml_escape with flags {0}): ids, titles, hrefs.
- * @see lib/util/xml.c gv_xml_escape / xml_core / xml_isentity
+ * Base XML escape (gv_xml_escape with flags {0}): ids, hrefs.
+ * @see lib/util/xml.c:gv_xml_escape
  */
 export declare function escapeXml(s: string): string;
 /**
@@ -12,10 +12,12 @@ export declare function escapeXml(s: string): string;
  */
 export declare function escapeXmlTitle(s: string): string;
 /**
- * Text/tooltip XML escape (gv_xml_escape with flags {raw, dash, nbsp}):
- * additionally escapes '-'→-, newline/CR→
/
, and 2nd+ consecutive
- * spaces→ . Used for textspans and tooltips.
- * @see plugin/core/gvrender_core_svg.c:546 (svg_textspan flags)
+ * Text/tooltip XML escape (gv_xml_escape with flags {raw, dash, nbsp}): raw
+ * escapes every '&' -- entity-looking or not -- and newline/CR to
+ * 
/
; also '-'→- and 2nd+ consecutive spaces→ . Used for
+ * textspans and xlink:title.
+ * @see plugin/core/gvrender_core_svg.c:svg_textspan, svg_begin_anchor
+ * @see lib/util/xml.c:xml_core (`flags.raw || !xml_isentity(s)`)
  */
 export declare function escapeXmlText(s: string): string;
 //# sourceMappingURL=xml-escape.d.ts.map

package/dist/render/xml-escape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xml-escape.d.ts","sourceRoot":"","sources":["../../src/render/xml-escape.ts"],"names":[],"mappings":"AAeA;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAO3C;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAKhD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAO/C"}
+{"version":3,"file":"xml-escape.d.ts","sourceRoot":"","sources":["../../src/render/xml-escape.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/C"}

package/dist/render.js

@@ -8436,6 +8436,9 @@ function interpretCRNL(str) {
   }
   return out;
 }
+function preprocessTooltip(s) {
+  return interpretCRNL(htmlEntityUTF8(s));
+}
 
 // src/model/graphInfo.ts
 function makeGraphInfo() {
@@ -11289,6 +11292,37 @@ function underlineDraw(ring, coord, filled, ctx) {
   renderShapePolyline([ring[2], ring[3]], coord, ctx);
 }
 
+// src/common/htmltable-style.ts
+function htmlStyle(style2) {
+  const s = { radial: false, rounded: false, invisible: false, dotted: false, dashed: false };
+  if (style2 === void 0) return s;
+  for (const tk of style2.split(/[ ,]+/)) {
+    switch (tk.toUpperCase()) {
+      case "ROUNDED":
+        s.rounded = true;
+        break;
+      case "RADIAL":
+        s.radial = true;
+        break;
+      case "SOLID":
+        s.dotted = false;
+        s.dashed = false;
+        break;
+      case "INVISIBLE":
+      case "INVIS":
+        s.invisible = true;
+        break;
+      case "DOTTED":
+        s.dotted = true;
+        break;
+      case "DASHED":
+        s.dashed = true;
+        break;
+    }
+  }
+  return s;
+}
+
 // src/common/htmltable-emit-rules.ts
 function emitHtmlRules(ctx) {
   withHtmlPaint({ fill: ctx.color, pen: ctx.color, penWidth: 1 }, ctx.job, () => {
@@ -11435,14 +11469,14 @@ function bgFillPaint(ctx) {
     fill: spec[0],
     stop: spec[1],
     gradientAngle: ctx.gradientangle ?? 0,
-    radial: ctx.style !== void 0 && ctx.style.includes("radial"),
+    radial: htmlStyle(ctx.style).radial,
     penWidth
   };
 }
 function emitBgFill(ctx) {
   const { box, pos, border: border2, renderer, job } = ctx;
   withHtmlPaint(bgFillPaint(ctx), job, () => {
-    if (parseStyleFlags(ctx.style).rounded) {
+    if (htmlStyle(ctx.style).rounded) {
       emitRoundedBezier(mkPts(box, border2, pos), { x: 0, y: 0 }, true, { renderer, job });
       return;
     }
@@ -11508,13 +11542,6 @@ function emitHtmlImg(img, pos, renderer, job) {
   }
   renderer.usershape?.(img.src, b, job);
 }
-function htmlStyleInvisible(style2) {
-  if (style2 === void 0) return false;
-  return style2.split(/[ ,]+/).some((tok) => {
-    const t = tok.toUpperCase();
-    return t === "INVIS" || t === "INVISIBLE";
-  });
-}
 function emitHtmlCell(cell2, pos, renderer, job) {
   const inAnchor = initHtmlAnchor(
     { href: cell2.href, title: cell2.title, target: cell2.target, id: cell2.id },
@@ -11522,7 +11549,7 @@ function emitHtmlCell(cell2, pos, renderer, job) {
     renderer,
     job
   );
-  if (htmlStyleInvisible(cell2.style)) {
+  if (htmlStyle(cell2.style).invisible) {
     if (inAnchor) endHtmlAnchor(renderer, job);
     return;
   }
@@ -11558,7 +11585,7 @@ function emitHtmlLabel(placed, pos, renderer, job) {
   const tblBox = absBox(placed.box, pos);
   const clustersLast = (job.flags & EMIT_CLUSTERS_LAST) !== 0;
   const inAnchor = clustersLast ? false : initHtmlAnchor(anchorData, tblBox, renderer, job);
-  const tblInvisible = htmlStyleInvisible(placed.style);
+  const tblInvisible = htmlStyle(placed.style).invisible;
   if (!tblInvisible) {
     if (placed.bgcolor !== void 0) {
       emitBgFill({
@@ -15698,31 +15725,141 @@ function stripedBox(job, pts, clrs, rotate, renderer) {
   return error;
 }
 
+// src/util/xml.ts
+function gvXmlEscape(s, flags) {
+  return XmlEscaper.escape(s, flags);
+}
+var XmlEscaper = class _XmlEscaper {
+  static escape(s, flags) {
+    let result = "";
+    let previous = "";
+    let pos = 0;
+    while (pos < s.length) {
+      const prev = s[pos];
+      const [fragment, consumed] = _XmlEscaper.core(previous, s, pos, flags);
+      result += fragment;
+      previous = prev;
+      pos += consumed;
+    }
+    return result;
+  }
+  /**
+   * Escape one character/codepoint at s[pos].
+   * Returns [escaped_fragment, characters_consumed].
+   * Delegates to focused helpers to stay within CCN limit.
+   * @see lib/util/xml.c:xml_core
+   */
+  static core(previous, s, pos, flags) {
+    const special = _XmlEscaper.coreSpecial(previous, s, pos, flags);
+    if (special !== null) return special;
+    const code = s.charCodeAt(pos);
+    if (code > 127 && flags.utf8) return _XmlEscaper.utf8Entity(s, pos);
+    return [s[pos], 1];
+  }
+  /**
+   * Handle all the fixed-escape cases (& < > - space " ' \n \r).
+   * Returns null when none of those cases applies.
+   * @see lib/util/xml.c:xml_core
+   */
+  static coreSpecial(previous, s, pos, flags) {
+    const c = s[pos];
+    if (c === "&" && (flags.raw || !_XmlEscaper.isEntity(s, pos))) {
+      return ["&amp;", 1];
+    }
+    if (c === "<") return ["&lt;", 1];
+    if (c === ">") return ["&gt;", 1];
+    if (c === '"') return ["&quot;", 1];
+    if (c === "'") return ["&#39;", 1];
+    if (c === "-" && flags.dash) return ["&#45;", 1];
+    if (c === " " && previous === " " && flags.nbsp) return ["&#160;", 1];
+    if (c === "\n" && flags.raw) return ["&#10;", 1];
+    if (c === "\r" && flags.raw) return ["&#13;", 1];
+    return null;
+  }
+  /**
+   * Return true if s[pos] (which is '&') starts a valid XML entity:
+   *   &[A-Za-z]+;      e.g. &Ccedil;
+   *   &#[0-9]*;        e.g. &#38;
+   *   &#x[0-9a-fA-F]*; e.g. &#x6C34;
+   * @see lib/util/xml.c:xml_isentity
+   */
+  static isEntity(s, pos) {
+    let i = pos + 1;
+    if (i >= s.length || s[i] === ";") return false;
+    i = s[i] === "#" ? _XmlEscaper.scanNumericRef(s, i) : _XmlEscaper.scanNamedRef(s, i);
+    return i < s.length && s[i] === ";";
+  }
+  /** Scan a numeric entity body starting just after the '#'. */
+  static scanNumericRef(s, hashPos) {
+    let i = hashPos + 1;
+    if (i < s.length && (s[i] === "x" || s[i] === "X")) {
+      i++;
+      while (i < s.length && _XmlEscaper.isXDigit(s[i])) i++;
+    } else {
+      while (i < s.length && _XmlEscaper.isDecDigit(s[i])) i++;
+    }
+    return i;
+  }
+  /** Scan a named entity body (alpha chars after the '&'). */
+  static scanNamedRef(s, start) {
+    let i = start;
+    while (i < s.length && _XmlEscaper.isAlpha(s[i])) i++;
+    return i;
+  }
+  /**
+   * Emit &#xNNNN; for the Unicode code point at s[pos]. JS strings are
+   * UTF-16, so the code point (what C decodes from UTF-8) comes from
+   * codePointAt, and an astral character consumes two units.
+   * @see lib/util/xml.c:xml_core (UTF-8 block)
+   */
+  static utf8Entity(s, pos) {
+    const cp = _XmlEscaper.decodeUtf8(s, pos);
+    const consumed = _XmlEscaper.utf8ByteLen(cp);
+    return [`&#x${cp.toString(16)};`, consumed];
+  }
+  /**
+   * Return the code point at s[pos]. A lone surrogate is the analogue of
+   * malformed UTF-8, where C reports an error and exits (xml.c:135).
+   * @see lib/util/xml.c:xml_core (fprintf + graphviz_exit at xml.c:135)
+   */
+  static decodeUtf8(s, pos) {
+    const cp = s.codePointAt(pos);
+    if (cp >= 55296 && cp <= 57343) {
+      throw new RenderError(`gvXmlEscape: malformed UTF-8 at position ${pos}`, "RENDER_ERROR");
+    }
+    return cp;
+  }
+  /**
+   * Return how many UTF-16 units encode the code point (C: the UTF-8 byte
+   * length from the leading byte).
+   * @see lib/util/xml.c:xml_core (length computation)
+   */
+  static utf8ByteLen(cp) {
+    return cp > 65535 ? 2 : 1;
+  }
+  static isDecDigit(c) {
+    return c >= "0" && c <= "9";
+  }
+  static isAlpha(c) {
+    return c >= "a" && c <= "z" || c >= "A" && c <= "Z";
+  }
+  static isXDigit(c) {
+    return _XmlEscaper.isDecDigit(c) || c >= "a" && c <= "f" || c >= "A" && c <= "F";
+  }
+};
+
 // src/render/xml-escape.ts
-var RE_DQUOTE = new RegExp('"', "g");
-var RE_SQUOTE = new RegExp("'", "g");
-var RE_AMP_NONENTITY = /&(?![A-Za-z]+;|#[0-9]+;|#x[0-9A-Fa-f]+;)/g;
+var FLAGS_BASE = { raw: false, dash: false, nbsp: false, utf8: false };
+var FLAGS_TITLE = { raw: false, dash: true, nbsp: true, utf8: false };
+var FLAGS_TEXT = { raw: true, dash: true, nbsp: true, utf8: false };
 function escapeXml(s) {
-  let r = s.replace(RE_AMP_NONENTITY, "&amp;");
-  r = r.replace(/</g, "&lt;");
-  r = r.replace(/>/g, "&gt;");
-  r = r.replace(RE_DQUOTE, "&quot;");
-  r = r.replace(RE_SQUOTE, "&#39;");
-  return r;
+  return gvXmlEscape(s, FLAGS_BASE);
 }
 function escapeXmlTitle(s) {
-  let r = escapeXml(s);
-  r = r.replace(/-/g, "&#45;");
-  r = r.replace(/ {2,}/g, (m) => " " + "&#160;".repeat(m.length - 1));
-  return r;
+  return gvXmlEscape(s, FLAGS_TITLE);
 }
 function escapeXmlText(s) {
-  let r = escapeXml(s);
-  r = r.replace(/-/g, "&#45;");
-  r = r.replace(/\n/g, "&#10;");
-  r = r.replace(/\r/g, "&#13;");
-  r = r.replace(/ {2,}/g, (m) => " " + "&#160;".repeat(m.length - 1));
-  return r;
+  return gvXmlEscape(s, FLAGS_TEXT);
 }
 
 // src/gvc/device-cluster.ts
@@ -15903,7 +16040,7 @@ function anchorAttr(n, key) {
   return v !== void 0 && v !== "" ? v : void 0;
 }
 function resolveTooltip(n, tooltip) {
-  if (tooltip !== void 0) return substObjAnchor(interpretCRNL(tooltip), n);
+  if (tooltip !== void 0) return substObjAnchor(preprocessTooltip(tooltip), n);
   const label = n.info.label;
   return label?.text ?? "";
 }
@@ -20041,7 +20178,7 @@ function subst(s, obj) {
   return substObjAnchor(s, obj);
 }
 function tip(s, obj) {
-  return substObjAnchor(interpretCRNL(s), obj);
+  return substObjAnchor(preprocessTooltip(s), obj);
 }
 function textOf(lp) {
   return lp?.text ?? null;
@@ -20820,8 +20957,9 @@ function resetHtmlFillPenWidth() {
   htmlFillPen = 1;
 }
 function penTypeOf(style2) {
-  if (style2 !== void 0 && style2.includes("dashed")) return 1 /* Dashed */;
-  if (style2 !== void 0 && style2.includes("dotted")) return 2 /* Dotted */;
+  const st = htmlStyle(style2);
+  if (st.dashed) return 1 /* Dashed */;
+  if (st.dotted) return 2 /* Dotted */;
   return 3 /* Solid */;
 }
 function withHtmlPaint(paint, job, drawFn) {
@@ -20888,7 +21026,7 @@ function doBorder(spec, renderer, job) {
   const { box, pos, border: border2, color, sides: sides2, style: style2 } = spec;
   htmlFillPen = border2;
   withHtmlPaint({ pen: color, penWidth: border2, penStyle: style2 }, job, () => {
-    if (parseStyleFlags(style2).rounded) {
+    if (htmlStyle(style2).rounded) {
       emitRoundedBezier(mkPts(box, border2, pos), { x: 0, y: 0 }, false, { renderer, job });
       return;
     }