@knowvah/dot-engine 2.7.0 → 2.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowvah/dot-engine",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "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/attr-get.ts

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: EPL-2.0
+
+/**
+ * Attribute reads with cgraph's `agxget` semantics: an object's own value,
+ * else the declared default it was created under. A leaf module (model types
+ * only) so label and shape code can share it without an import cycle.
+ *
+ * @see lib/cgraph/attr.c:agxget
+ */
+
+import type { Node } from '../model/node.js';
+import type { Graph } from '../model/graph.js';
+
+/**
+ * Read a node attribute: the node's own value, else the node-attribute defaults
+ * (`node [...]`) captured from the node's declaring scope up to root *at the
+ * time the node was created*. The snapshot makes a `node [...]` declared after
+ * the node — at any scope — correctly not apply, and lets a cluster-scoped
+ * default reach nodes declared in that cluster, as the oracle does.
+ *
+ * Programmatically created nodes have no snapshot; they fall back to the live
+ * defaults of the passed graph `g` and root.
+ * @see lib/cgraph/attr.c:agxget; src/parser/builder.ts:effectiveNodeDefaults
+ */
+export function nodeAttr(n: Node, g: Graph, key: string): string | undefined {
+  const own = n.attrs.get(key);
+  if (own !== undefined) return own;
+  if (n.nodeDefaultsSnapshot !== undefined) return n.nodeDefaultsSnapshot.get(key);
+  return g.nodeDefaults.get(key)
+    ?? (g !== g.root ? g.root.nodeDefaults.get(key) : undefined);
+}
+
+/**
+ * Read a graph attribute with subgraph→root inheritance, mirroring C's
+ * agxget (late_nnstring(sg, agfindgraphattr(sg, key), ...) in do_graph_label):
+ * a cluster inherits `fontname`/`fontsize`/`fontcolor` set on an ancestor
+ * (e.g. root `graph[fontname=Arial]`) when it sets none of its own.
+ * @see lib/common/input.c:do_graph_label
+ */
+export function graphAttrInherited(sg: Graph, key: string): string | undefined {
+  // Own value wins; otherwise the ancestor defaults SNAPSHOTTED when this
+  // subgraph opened (not a live parent walk) — so an ancestor attribute set
+  // later in statement order does not retroactively apply (2184).
+  // @see lib/cgraph/graph.c:agsubg (parse-time defval copy)
+  return sg.attrs.get(key) ?? sg.graphDefaultsSnapshot?.get(key);
+}

package/src/common/make-label.ts

@@ -16,6 +16,8 @@ import { makeHtmlLabelTo } from './htmltable-label.js';
 import { labelStderr } from './htmltable-attr-warn.js';
 import { substObj, type GraphObj } from './subst.js';
 import { Edge } from '../model/edge.js';
+import { Node } from '../model/node.js';
+import { nodeAttr, graphAttrInherited } from './attr-get.js';
 import { Graph } from '../model/graph.js';
 import { htmlEntityUTF8 } from './html-entities.js';
 
@@ -33,17 +35,27 @@ export { htmlEntityUTF8 };
 /**
  * The object's pen color: `pencolor` attr, else `color` attr, else undefined
  * (no default). An HTML table/cell border with no explicit COLOR inherits it.
+ * Read as C's agget does, so declared defaults count: a node's `node [...]`
+ * snapshot and a subgraph's inherited graph attributes (894589). Edge
+ * defaults are already materialized into `attrs` by the builder.
  * @see lib/common/htmltable.c:getPenColor
  */
 function getPenColor(obj?: GraphObj): string | undefined {
   if (obj === undefined) return undefined;
-  const pc = obj.attrs.get('pencolor');
+  const pc = aggetObj(obj, 'pencolor');
   if (pc !== undefined && pc !== '') return pc;
-  const c = obj.attrs.get('color');
+  const c = aggetObj(obj, 'color');
   if (c !== undefined && c !== '') return c;
   return undefined;
 }
 
+/** `agget(obj, key)` for any object kind. @see lib/cgraph/attr.c:agxget */
+function aggetObj(obj: GraphObj, key: string): string | undefined {
+  if (obj instanceof Node) return nodeAttr(obj, obj.root, key);
+  if (obj instanceof Graph) return graphAttrInherited(obj, key);
+  return obj.attrs.get(key);
+}
+
 /** The root graph owning `obj` (edges resolve through their tail node). */
 function rootOf(obj: GraphObj): Graph {
   return obj instanceof Edge ? obj.tail.root : obj.root;

package/src/common/poly-init.ts

@@ -10,6 +10,7 @@
 import type { Node } from '../model/node.js';
 import type { Graph } from '../model/graph.js';
 import type { TextMeasurer } from './textmeasure.js';
+import { nodeAttr } from './attr-get.js';
 import type { PolygonT, ShapeDesc } from './types.js';
 import { ShapeKind } from './types.js';
 import type { TextlabelT } from './types.js';
@@ -32,24 +33,9 @@ const DEFAULT_LW = 27;
 const DEFAULT_RW = 27;
 const DEFAULT_HT = 36;
 
-/**
- * Read a node attribute: the node's own value, else the node-attribute defaults
- * (`node [...]`) captured from the node's declaring scope up to root *at the
- * time the node was created*. The snapshot makes a `node [...]` declared after
- * the node — at any scope — correctly not apply, and lets a cluster-scoped
- * default reach nodes declared in that cluster, as the oracle does.
- *
- * Programmatically created nodes have no snapshot; they fall back to the live
- * defaults of the passed graph `g` and root.
- * @see lib/cgraph/attr.c:agxget; src/parser/builder.ts:effectiveNodeDefaults
- */
-export function nodeAttr(n: Node, g: Graph, key: string): string | undefined {
-  const own = n.attrs.get(key);
-  if (own !== undefined) return own;
-  if (n.nodeDefaultsSnapshot !== undefined) return n.nodeDefaultsSnapshot.get(key);
-  return g.nodeDefaults.get(key)
-    ?? (g !== g.root ? g.root.nodeDefaults.get(key) : undefined);
-}
+// nodeAttr moved to attr-get.ts (leaf module, shared with make-label.ts);
+// re-exported so existing importers are unchanged.
+export { nodeAttr };
 
 /** Read label-font attributes from node, falling back to defaults. */
 export function readFontAttrs(n: Node, g: Graph): {

package/src/layout/dot/graph-label.ts

@@ -9,6 +9,7 @@
 import type { Graph } from '../../model/graph.js';
 import type { Point } from '../../model/geom.js';
 import type { TextMeasurer } from '../../common/textmeasure.js';
+import { graphAttrInherited } from '../../common/attr-get.js';
 import { makeAnyLabel, DEFAULT_FONTSIZE, DEFAULT_FONTNAME, DEFAULT_COLOR } from '../../common/make-label.js';
 import { isHtmlValue, htmlValueContent } from '../../common/html-string.js';
 import { BOTTOM_IX, TOP_IX, RIGHT_IX, LEFT_IX } from './position-aux.js';
@@ -45,21 +46,6 @@ function readLabelPos(sg: Graph): number {
   return pos;
 }
 
-/**
- * Read a graph attribute with subgraph→root inheritance, mirroring C's
- * agxget (late_nnstring(sg, agfindgraphattr(sg, key), ...) in do_graph_label):
- * a cluster inherits `fontname`/`fontsize`/`fontcolor` set on an ancestor
- * (e.g. root `graph[fontname=Arial]`) when it sets none of its own.
- * @see lib/common/input.c:do_graph_label
- */
-function graphAttrInherited(sg: Graph, key: string): string | undefined {
-  // Own value wins; otherwise the ancestor defaults SNAPSHOTTED when this
-  // subgraph opened (not a live parent walk) — so an ancestor attribute set
-  // later in statement order does not retroactively apply (2184).
-  // @see lib/cgraph/graph.c:agsubg (parse-time defval copy)
-  return sg.attrs.get(key) ?? sg.graphDefaultsSnapshot?.get(key);
-}
-
 /**
  * Graph/cluster label font, read through graphAttrInherited.
  * @internal also used by src/async/collect.ts to request the same face.