@diagrammo/dgmo 0.30.0 → 0.32.0

package/src/utils/tag-groups.ts

@@ -9,7 +9,11 @@ import {
   tagShorthandRemovedMessage,
   type DgmoError,
 } from '../diagnostics';
-import { RECOGNIZED_COLOR_NAMES, resolveColor } from '../colors';
+import {
+  CATEGORICAL_COLOR_ORDER,
+  RECOGNIZED_COLOR_NAMES,
+  resolveColor,
+} from '../colors';
 import type { PaletteColors } from '../palettes/types';
 import type { Writable } from './brand';
 
@@ -91,16 +95,12 @@ export const AUTO_TAG_COLOR_SENTINEL = '';
 
 /**
  * The categorical name cycle used to auto-assign colors to bare tag values,
- * in deterministic order. Drawn from `RECOGNIZED_COLOR_NAMES` but excludes
- * the non-categorical neutrals (`gray`/`black`/`white`) so auto-picked
- * colors are visually distinct legend swatches. If a group has more
- * colorless entries than free categorical names, the cycle wraps.
+ * in deterministic order. Aliased to the shared {@link CATEGORICAL_COLOR_ORDER}
+ * (RGB-seeded, max-contrast, neutrals excluded) so tag swatches and data-chart
+ * series colors share one canonical rotation. If a group has more colorless
+ * entries than free categorical names, the cycle wraps.
  */
-export const autoTagColorCycle: readonly string[] = Object.freeze(
-  RECOGNIZED_COLOR_NAMES.filter(
-    (n) => n !== 'gray' && n !== 'black' && n !== 'white'
-  )
-);
+export const autoTagColorCycle: readonly string[] = CATEGORICAL_COLOR_ORDER;
 
 /**
  * Finalize a tag group's auto-color assignment.
@@ -572,6 +572,44 @@ export function validateTagGroupNames(
   }
 }
 
+// ── Parent → Child Tag Cascade ────────────────────────────
+
+/**
+ * Cascade explicit tag values down a node tree: a child that has no value of
+ * its own for a given tag group inherits the value of its nearest ancestor
+ * that does. A child's own explicit value always wins and becomes the new
+ * inherited value for its subtree.
+ *
+ * Run this on the parsed tree BEFORE {@link injectDefaultTagMetadata} so that
+ * an inherited ancestor value takes precedence over the group's global
+ * default — only nodes with no tagged ancestor fall through to the default.
+ * Idempotent and mutates `metadata` in place.
+ *
+ * @param roots     Root nodes of the tree (each with mutable `metadata` + `children`)
+ * @param tagGroups Declared tag groups (only `.name` is used)
+ */
+export function cascadeTagMetadata<
+  T extends { metadata: Record<string, string>; children: readonly T[] },
+>(roots: readonly T[], tagGroups: ReadonlyArray<{ name: string }>): void {
+  const keys = tagGroups.map((g) => g.name.toLowerCase());
+  if (keys.length === 0) return;
+
+  const walk = (node: T, inherited: Record<string, string>): void => {
+    const childInherited = { ...inherited };
+    for (const key of keys) {
+      const own = node.metadata[key];
+      if (own) {
+        childInherited[key] = own; // own explicit value propagates downward
+      } else if (inherited[key]) {
+        node.metadata[key] = inherited[key]; // inherit from nearest ancestor
+      }
+    }
+    for (const child of node.children) walk(child, childInherited);
+  };
+
+  for (const root of roots) walk(root, {});
+}
+
 // ── Default Metadata Injection ────────────────────────────
 
 /**

package/src/utils/visual-conventions.ts

@@ -0,0 +1,61 @@
+// ============================================================
+// Visual conventions — shared card/group/collapse constants (Story 111.1)
+// ============================================================
+//
+// Single source of truth for the structured-diagram visual constants described
+// in docs/architecture/diagram-visual-conventions.md. Before this module these
+// values were re-declared in every renderer (NODE_STROKE_WIDTH in 13 files,
+// HEADER_HEIGHT in 12, ...), so a convention change meant editing N files and
+// hoping the snapshots agreed.
+//
+// Two tiers, because the renderers do NOT all agree:
+//
+//   1. UNIVERSAL — identical at every call site. Import these everywhere; never
+//      re-declare. Changing one of these is a deliberate cross-chart change.
+//
+//   2. CONVENTION DEFAULTS — the org/sitemap baseline from the convention. Most
+//      card-shaped renderers match these and should import them. A few have a
+//      DOCUMENTED intentional deviation and keep a local override (with a
+//      comment saying why):
+//        - infra: META_FONT_SIZE 10 / META_LINE_HEIGHT 14 (denser meta rows)
+//        - boxes-and-lines: COLLAPSE_BAR_HEIGHT 4 / SEPARATOR_GAP 4
+//        - cycle, raci: HEADER_HEIGHT 36 (not label+meta cards)
+//      Those overrides are the exception that proves the rule — they stay local
+//      and visible, not hidden inside a re-declared full constant set.
+
+// ── Universal (same value at every site) ──
+
+/** Node card + group border stroke width. */
+export const NODE_STROKE_WIDTH = 1.5;
+/** Edge / connector stroke width. */
+export const EDGE_STROKE_WIDTH = 1.5;
+/** Node card corner radius. */
+export const CARD_RADIUS = 6;
+/** Group / container corner radius. */
+export const CONTAINER_RADIUS = 8;
+/** Collapse accent bar horizontal inset from the card edges. */
+export const COLLAPSE_BAR_INSET = 0;
+
+// ── Convention defaults (org/sitemap baseline; see deviations above) ──
+
+/** Node card header band height. */
+export const HEADER_HEIGHT = 28;
+/** Node card label font size. */
+export const LABEL_FONT_SIZE = 13;
+/** Node card metadata-row font size. */
+export const META_FONT_SIZE = 11;
+/** Node card metadata-row line height. */
+export const META_LINE_HEIGHT = 16;
+/** Gap between the header separator and the first metadata row. */
+export const SEPARATOR_GAP = 6;
+/** Collapse accent bar height. */
+export const COLLAPSE_BAR_HEIGHT = 6;
+
+/** Group / container reserved header band height. */
+export const CONTAINER_HEADER_HEIGHT = 28;
+/** Group / container label font size. */
+export const CONTAINER_LABEL_FONT_SIZE = 13;
+/** Group / container metadata-row font size. */
+export const CONTAINER_META_FONT_SIZE = 11;
+/** Group / container metadata-row line height. */
+export const CONTAINER_META_LINE_HEIGHT = 16;

package/src/visualizations/parse.ts

@@ -215,7 +215,12 @@ function parseVisualizationFull(
     // Timeline tag group entries (indented under tag heading)
     if (currentTimelineTagGroup && indent > 0) {
       const { text: entryText, isDefault } = stripDefaultModifier(line);
-      const { label, color } = extractColor(entryText, palette);
+      const { label, color } = extractColor(
+        entryText,
+        palette,
+        result.diagnostics,
+        lineNumber
+      );
       if (color) {
         if (isDefault) {
           currentTimelineTagGroup.defaultValue = label;

package/src/wireframe/parser.ts

@@ -895,7 +895,12 @@ export function parseWireframe(content: string): ParsedWireframe {
       // Indented tag entry: `Value color` or `Value color default`
       if (indent > 0 && currentTagGroup) {
         const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
-        const { label, color } = extractColor(cleanEntry);
+        const { label, color } = extractColor(
+          cleanEntry,
+          undefined,
+          diagnostics,
+          lineNumber
+        );
         // Bare value (no explicit color) → keep it; finalized below.
         currentTagGroup.entries.push({
           value: label,