@knowvah/dot-engine 2.6.9 → 2.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowvah/dot-engine",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "Faithful TypeScript port of Graphviz (dot, neato, fdp, sfdp, circo, twopi, osage, patchwork) — no C: no native binary, no WASM. Oracle-verified against the C implementation, runs in the browser.",
   "keywords": [
     "graphviz",

package/src/common/htmltable-emit-fill.ts

@@ -18,7 +18,7 @@ import { FillType, PenType } from '../gvc/context.js';
 import { transformPoint } from '../gvc/device.js';
 import { resolveRenderColor } from '../render/color-resolve.js';
 import { emitRoundedBezier } from './poly-shapes.js';
-import { parseStyleFlags } from './style-resolve.js';
+import { htmlStyle } from './htmltable-style.js';
 import {
   BORDER_LEFT,
   BORDER_TOP,
@@ -94,7 +94,7 @@ export interface HtmlPaint {
   pen?: string;
   /** Pen width; default 1.0 (omitted from SVG at 1.0). */
   penWidth?: number;
-  /** Style string; "dashed"/"dotted" map to the pen type. */
+  /** HTML STYLE string; its dashed/dotted flags map to the pen type. */
   penStyle?: string;
   /**
    * Second/stop color of a gradient fill. Presence switches the fill from
@@ -137,10 +137,11 @@ export function resetHtmlFillPenWidth(): void {
   htmlFillPen = 1.0;
 }
 
-/** Map a style string to the C pen type. @see lib/common/htmltable.c:doBorder */
+/** Map an HTML STYLE to the C pen type: dashed wins over dotted. @see lib/common/htmltable.c:doBorder */
 function penTypeOf(style: string | undefined): PenType {
-  if (style !== undefined && style.includes('dashed')) return PenType.Dashed;
-  if (style !== undefined && style.includes('dotted')) return PenType.Dotted;
+  const st = htmlStyle(style);
+  if (st.dashed) return PenType.Dashed;
+  if (st.dotted) return PenType.Dotted;
   return PenType.Solid;
 }
 
@@ -277,7 +278,7 @@ export function doBorder(
   // value persists and leaks into the next bgcolor fill's stroke-width.
   htmlFillPen = border;
   withHtmlPaint({ pen: color, penWidth: border, penStyle: style }, job, () => {
-    if (parseStyleFlags(style).rounded) {
+    if (htmlStyle(style).rounded) {
       // C: round_corners(job, mkPts(AF,b,border), 4, {rounded}, 0) — unfilled
       // rounded border path; emitRoundedBezier transforms the AF ring itself.
       emitRoundedBezier(mkPts(box, border, pos), { x: 0, y: 0 }, false, { renderer, job });

package/src/common/htmltable-emit.ts

@@ -35,7 +35,7 @@ import {
   htmlFillPenWidth, resetHtmlFillPenWidth, type HtmlPaint,
 } from './htmltable-emit-fill.js';
 import { emitRoundedBezier } from './poly-shapes.js';
-import { parseStyleFlags } from './style-resolve.js';
+import { htmlStyle } from './htmltable-style.js';
 import { emitHtmlRules, initHtmlAnchor, endHtmlAnchor, htmlObjImgscale } from './htmltable-emit-rules.js';
 
 export type { PlacedHtml, PlacedCell, PlacedLine, PlacedImage };
@@ -125,7 +125,7 @@ function bgFillPaint(ctx: BgFillCtx): HtmlPaint {
   if (spec === null) return { fill: ctx.bgcolor, penWidth };
   return {
     fill: spec[0], stop: spec[1], gradientAngle: ctx.gradientangle ?? 0,
-    radial: ctx.style !== undefined && ctx.style.includes('radial'), penWidth,
+    radial: htmlStyle(ctx.style).radial, penWidth,
   };
 }
 
@@ -139,7 +139,7 @@ function bgFillPaint(ctx: BgFillCtx): HtmlPaint {
 function emitBgFill(ctx: BgFillCtx): void {
   const { box, pos, border, renderer, job } = ctx;
   withHtmlPaint(bgFillPaint(ctx), job, () => {
-    if (parseStyleFlags(ctx.style).rounded) {
+    if (htmlStyle(ctx.style).rounded) {
       emitRoundedBezier(mkPts(box, border, pos), { x: 0, y: 0 }, true, { renderer, job });
       return;
     }
@@ -258,23 +258,6 @@ export function emitHtmlImg(
  *
  * @see lib/common/htmltable.c:emit_html_cell
  */
-/**
- * True when an HTML element's STYLE declares it invisible.
- *
- * HTML STYLE is lexed by its OWN parser, not the node/edge one: tokens are
- * split on space or comma, compared case-insensitively, and BOTH "INVIS" and
- * "INVISIBLE" set the flag. (The node/edge parser splits on comma only and
- * matches exact-case, so it cannot be reused here.)
- * @see lib/common/htmllex.c:168 (DELIM " ,", strview_case_str_eq)
- */
-function htmlStyleInvisible(style: string | undefined): boolean {
-  if (style === undefined) return false;
-  return style.split(/[ ,]+/).some((tok) => {
-    const t = tok.toUpperCase();
-    return t === 'INVIS' || t === 'INVISIBLE';
-  });
-}
-
 export function emitHtmlCell(
   cell: PlacedCell,
   pos: Point,
@@ -287,7 +270,7 @@ export function emitHtmlCell(
   );
   // An invisible cell emits no fill, no border and no content — only the
   // anchor, which C opens before the gate. @see htmltable.c:emit_html_cell:643
-  if (htmlStyleInvisible(cell.style)) {
+  if (htmlStyle(cell.style).invisible) {
     if (inAnchor) endHtmlAnchor(renderer, job);
     return;
   }
@@ -354,7 +337,7 @@ export function emitHtmlLabel(
   const inAnchor = clustersLast ? false : initHtmlAnchor(anchorData, tblBox, renderer, job);
   // An invisible TABLE suppresses its fill, ALL its cells, and its rules and
   // border — the whole block C guards at emit_html_tbl:542.
-  const tblInvisible = htmlStyleInvisible(placed.style);
+  const tblInvisible = htmlStyle(placed.style).invisible;
   if (!tblInvisible) {
     if (placed.bgcolor !== undefined) {
       emitBgFill({ bgcolor: placed.bgcolor, box: placed.box, pos, border: placed.border,

package/src/common/htmltable-style.ts

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: EPL-2.0
+/**
+ * The HTML STYLE flags. C's stylefn sets an htmlstyle_t bitfield at lex time;
+ * the port keeps the legal tokens as a string (htmltable-attr-warn.ts joins
+ * them with ' ') and reads the flags back here, token by token in order, so
+ * SOLID still clears only the DOTTED/DASHED before it. HTML STYLE is not the
+ * node/edge style: tokens split on space or comma and compare
+ * case-insensitively, so `parseStyleFlags` cannot read it.
+ *
+ * @see lib/common/htmltable.h:htmlstyle_t
+ * @see lib/common/htmllex.c:stylefn (DELIM " ,", strview_case_str_eq)
+ */
+
+/** @see lib/common/htmltable.h:htmlstyle_t */
+export interface HtmlStyle {
+  radial: boolean;
+  rounded: boolean;
+  invisible: boolean;
+  dotted: boolean;
+  dashed: boolean;
+}
+
+/** Read the htmlstyle_t flags from a kept HTML STYLE string. */
+export function htmlStyle(style: string | undefined): HtmlStyle {
+  const s: HtmlStyle = { radial: false, rounded: false, invisible: false, dotted: false, dashed: false };
+  if (style === undefined) return s;
+  for (const tk of style.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;
+}