@knowvah/dot-engine 2.6.9 → 2.6.11

package/dist/render.js

@@ -5955,28 +5955,46 @@ var HTML_ENTITIES = {
   "zwj": 8205,
   "zwnj": 8204
 };
-var BASIC_ENTITIES = {
-  amp: 38,
-  lt: 60,
-  gt: 62,
-  quot: 34,
-  apos: 39
-};
-function numericEntityValue(body) {
-  const hex = body[1] === "x" || body[1] === "X";
-  const v = hex ? parseInt(body.slice(2), 16) : parseInt(body.slice(1), 10);
-  return Number.isFinite(v) && v > 0 && v <= 1114111 ? v : null;
+var ENTITY_NAME_LENGTH_MAX = 8;
+function numericEntity(s, at) {
+  const hex = s[at + 1] === "x" || s[at + 1] === "X";
+  const digit = hex ? /^[0-9A-Fa-f]$/ : /^[0-9]$/;
+  let n = 0;
+  let i = hex ? 2 : 1;
+  for (; i < 8; i++) {
+    const c = s[at + i] ?? "";
+    if (!digit.test(c)) break;
+    n = n * (hex ? 16 : 10) + parseInt(c, 16);
+  }
+  if (i < 8 && s[at + i] === ";") return { value: n, next: at + i + 1 };
+  return { value: 0, next: at };
+}
+function namedEntity(s, at) {
+  for (let i = 0; i < ENTITY_NAME_LENGTH_MAX; i++) {
+    const c = s[at + i];
+    if (c === void 0 || c === "\0") break;
+    if (c === ";") {
+      const key = s.slice(at, at + i);
+      if (Object.hasOwn(HTML_ENTITIES, key)) return { value: HTML_ENTITIES[key], next: at + i + 1 };
+      break;
+    }
+  }
+  return { value: 0, next: at };
 }
-function entityValue(body) {
-  if (body[0] === "#") return numericEntityValue(body);
-  return BASIC_ENTITIES[body] ?? HTML_ENTITIES[body] ?? null;
+function htmlEntity(s, at) {
+  return s[at] === "#" ? numericEntity(s, at) : namedEntity(s, at);
 }
 function htmlEntityUTF8(s) {
-  if (s.indexOf("&") < 0) return s;
-  return s.replace(/&(#x[0-9a-fA-F]+|#[0-9]+|[A-Za-z]+);/g, (m, body) => {
-    const v = entityValue(body);
-    return v === null ? m : String.fromCodePoint(v);
-  });
+  let amp = s.indexOf("&");
+  if (amp < 0) return s;
+  let out = "";
+  let from = 0;
+  for (; amp >= 0; amp = s.indexOf("&", from)) {
+    const e = htmlEntity(s, amp + 1);
+    out += s.slice(from, amp) + (e.value ? String.fromCodePoint(e.value) : "&");
+    from = e.next;
+  }
+  return out + s.slice(from);
 }
 
 // src/common/htmltable-lex-attvalue.ts
@@ -6370,8 +6388,26 @@ function releaseXb(st, first) {
 function cleanText(decoded) {
   return decoded.replace(/[\x00-\x1f]/g, "");
 }
+var XML_PREDEFINED = { lt: "<", gt: ">", amp: "&", quot: '"', apos: "'" };
+var SCAN_ENTITY_MIN = 2;
+var SCAN_ENTITY_MAX = 8;
+var TEXT_REF = /&(#x[0-9A-Fa-f]+|#[0-9]+|[^&;]+);/g;
+function textRefValue(ref, body) {
+  if (body[0] === "#") {
+    const v = charRefNumber(ref);
+    return v < 0 ? ref : String.fromCodePoint(v);
+  }
+  const n = body.length;
+  if (n >= SCAN_ENTITY_MIN && n <= SCAN_ENTITY_MAX && Object.hasOwn(HTML_ENTITIES, body)) {
+    return String.fromCodePoint(HTML_ENTITIES[body]);
+  }
+  return Object.hasOwn(XML_PREDEFINED, body) ? XML_PREDEFINED[body] : ref;
+}
+function decodeTextRefs(raw) {
+  return raw.indexOf("&") < 0 ? raw : raw.replace(TEXT_REF, textRefValue);
+}
 function textTokens(raw) {
-  return charDataTokens(htmlEntityUTF8(raw));
+  return charDataTokens(decodeTextRefs(raw));
 }
 function charDataTokens(decoded) {
   const clean = cleanText(decoded);
@@ -11292,6 +11328,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, () => {
@@ -11438,14 +11505,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;
     }
@@ -11511,13 +11578,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 },
@@ -11525,7 +11585,7 @@ function emitHtmlCell(cell2, pos, renderer, job) {
     renderer,
     job
   );
-  if (htmlStyleInvisible(cell2.style)) {
+  if (htmlStyle(cell2.style).invisible) {
     if (inAnchor) endHtmlAnchor(renderer, job);
     return;
   }
@@ -11561,7 +11621,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({
@@ -20933,8 +20993,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) {
@@ -21001,7 +21062,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;
     }