@transitrix/diagrams 1.12.0 → 1.12.2

package/src/scope.ts

@@ -20,12 +20,38 @@ export type Scope =
   | { mode: 'level'; maxLevel: number }
   | { mode: 'root'; rootGoalId: string };
 
+/** Column filters on a DGCA/DGA chain. Empty / omitted id = All for that column. */
+export type ChainColumnKey = 'driverId' | 'goalId' | 'changeId' | 'activityId';
+
+export type ChainScope = {
+  mode: 'chain';
+  driverId?: string;
+  goalId?: string;
+  changeId?: string;
+  activityId?: string;
+};
+
+/** Scope accepted by DGCA/DGA layout — Goals tree still uses {@link Scope} only. */
+export type FgcaScope = Scope | ChainScope;
+
 /** Default scope — render everything. */
 export const SCOPE_ALL: Scope = { mode: 'all' };
 
+export function isChainScope(scope: FgcaScope): scope is ChainScope {
+  return scope.mode === 'chain';
+}
+
+/** True when at least one column filter is set. */
+export function chainScopeActive(scope: ChainScope): boolean {
+  return !!(scope.driverId || scope.goalId || scope.changeId || scope.activityId);
+}
+
 /** Warning code emitted when a root-mode scope names a goal that isn't in the document. */
 export const SCOPE_MISSING_ROOT_CODE = 'SCOPE-001';
 
+/** Warning code emitted when a chain-column filter names an id that isn't in the document. */
+export const SCOPE_MISSING_CHAIN_CODE = 'SCOPE-002';
+
 /**
  * Returns the SCOPE-001 warning when `scope` is root-mode and `rootGoalId` is
  * not among the document's goal ids; otherwise null. Goal ids are compared as
@@ -44,3 +70,38 @@ export function checkScopeRoot(scope: Scope, goalIds: Iterable<string | number>)
     message: `Scope root goal "${scope.rootGoalId}" was not found in this document — nothing to show. Clear the scope or pick a goal that exists.`,
   };
 }
+
+function idSetHas(ids: Iterable<string | number>, want: string): boolean {
+  for (const id of ids) {
+    if (String(id) === want) return true;
+  }
+  return false;
+}
+
+/**
+ * Returns a SCOPE-002 warning when a chain filter names an id that is not in
+ * the document's corresponding column; otherwise null. Several missing ids
+ * are listed in one message.
+ */
+export function checkChainScope(
+  scope: ChainScope,
+  ids: {
+    drivers: Iterable<string | number>;
+    goals: Iterable<string | number>;
+    changes: Iterable<string | number>;
+    activities: Iterable<string | number>;
+  },
+  hideChanges = false,
+): ValidationWarning | null {
+  if (scope.mode !== 'chain') return null;
+  const missing: string[] = [];
+  if (scope.driverId && !idSetHas(ids.drivers, scope.driverId)) missing.push(`driver "${scope.driverId}"`);
+  if (scope.goalId && !idSetHas(ids.goals, scope.goalId)) missing.push(`goal "${scope.goalId}"`);
+  if (!hideChanges && scope.changeId && !idSetHas(ids.changes, scope.changeId)) missing.push(`change "${scope.changeId}"`);
+  if (scope.activityId && !idSetHas(ids.activities, scope.activityId)) missing.push(`action "${scope.activityId}"`);
+  if (missing.length === 0) return null;
+  return {
+    code: SCOPE_MISSING_CHAIN_CODE,
+    message: `Scope ${missing.join(', ')} was not found in this document — nothing to show for that filter. Clear the scope or pick an id that exists.`,
+  };
+}

package/src/webview/render-fgca.ts

@@ -21,7 +21,7 @@ import {
   type FGCAPreviewColumn,
 } from '../fgca/preview-layout.js';
 import type { FGCADoc } from '../fgca/validate.js';
-import { horizontalCubicEdgePath, DEFAULT_EDGE_CURVATURE } from '../edge-path.js';
+import { previewEdgePath, DEFAULT_EDGE_CURVATURE, type EdgeStyle } from '../edge-path.js';
 import { parseNodeSizePreset, resolveDgcaNodeSize, type NodeSizePreset } from '../node-size-presets.js';
 import { generateSvgEmbedCss } from '../theme/index.js';
 import { emitCenteredTextSvg, layoutCenteredEntityText, truncateLine } from './entity-text-layout.js';
@@ -39,6 +39,7 @@ type FgcaLayout = ReturnType<typeof layoutFGCAPreview>;
 export interface RenderFgcaBodyOptions {
   nodeWidth?: number;
   nodeHeight?: number;
+  edgeStyle?: EdgeStyle;
 }
 
 /**
@@ -60,6 +61,7 @@ export function renderFgcaBody(
 ): string {
   const nodeWidth = bodyOptions.nodeWidth ?? FGCA_NODE_W;
   const nodeHeight = bodyOptions.nodeHeight ?? FGCA_NODE_H;
+  const edgeStyle = bodyOptions.edgeStyle;
   const headerTruncate = Math.max(8, Math.floor((nodeWidth - 16) / 7));
 
   const headerSvg = columns
@@ -71,7 +73,7 @@ export function renderFgcaBody(
   const edgeSvg = edges
     .map(
       (e) =>
-        `<path d="${horizontalCubicEdgePath(e.sx, e.sy, e.tx, e.ty, curvature, entryCurvature)}" class="diagram-edge" marker-end="url(#arrow)"/>`,
+        `<path d="${previewEdgePath(e.sx, e.sy, e.tx, e.ty, edgeStyle, curvature, entryCurvature)}" class="diagram-edge" marker-end="url(#arrow)"/>`,
     )
     .join('\n');
 
@@ -108,6 +110,7 @@ export interface RenderFgcaOptions {
   curvature?: number;
   /** Entry curvature at the target node; defaults to `curvature` when omitted. */
   entryCurvature?: number;
+  edgeStyle?: EdgeStyle;
   nodeSizePreset?: NodeSizePreset;
   layoutOptions?: Parameters<typeof layoutFGCAPreview>[1];
   /** Show scope caption when goal-scoped projection omits goals that reference out-of-scope goals. */
@@ -120,6 +123,7 @@ export function renderFgcaSvg(doc: FGCADoc, options: RenderFgcaOptions = {}): st
     title = '',
     curvature = DEFAULT_EDGE_CURVATURE,
     entryCurvature,
+    edgeStyle,
     nodeSizePreset = 'normal',
     layoutOptions,
     scopeCaption = false,
@@ -141,6 +145,7 @@ export function renderFgcaSvg(doc: FGCADoc, options: RenderFgcaOptions = {}): st
   const body = renderFgcaBody(columns, nodes, edges, curvature, entryCurvature, {
     nodeWidth: nodeSize.width,
     nodeHeight: nodeSize.height,
+    edgeStyle,
   });
 
   const titleSvg = title

package/src/webview/render-goals.ts

@@ -13,7 +13,7 @@
 import { layoutGoalTree } from '../goals/layout.js';
 import type { GoalTree, GoalTreeLayout, LaidOutEdge } from '../goals/types.js';
 import { displayGoalId } from '../goals/parse-canonical.js';
-import { horizontalCubicEdgePath, DEFAULT_EDGE_CURVATURE } from '../edge-path.js';
+import { previewEdgePath, DEFAULT_EDGE_CURVATURE, type EdgeStyle } from '../edge-path.js';
 import { parseNodeSizePreset, resolveGoalsNodeSize, type NodeSizePreset } from '../node-size-presets.js';
 import { generateSvgEmbedCss, type ThemeId } from '../theme/index.js';
 import { emitCenteredTextSvg, layoutCenteredEntityText } from './entity-text-layout.js';
@@ -28,6 +28,7 @@ export interface RenderGoalsOptions {
   treeName?: string;
   curvature?: number;
   entryCurvature?: number;
+  edgeStyle?: EdgeStyle;
   nodeSizePreset?: NodeSizePreset;
 }
 
@@ -37,7 +38,7 @@ export interface RenderGoalsOptions {
  * with the shared theme CSS embedded so the output is self-contained.
  */
 export function renderGoalsSvg(tree: GoalTree, options: RenderGoalsOptions = {}): string {
-  const { treeName = '', curvature = DEFAULT_EDGE_CURVATURE, entryCurvature, nodeSizePreset = 'normal' } = options;
+  const { treeName = '', curvature = DEFAULT_EDGE_CURVATURE, entryCurvature, edgeStyle, nodeSizePreset = 'normal' } = options;
   const nodeSize = resolveGoalsNodeSize(parseNodeSizePreset(nodeSizePreset));
 
   const layout: GoalTreeLayout = layoutGoalTree(tree, {
@@ -55,12 +56,13 @@ export function renderGoalsSvg(tree: GoalTree, options: RenderGoalsOptions = {})
     ? `<text class="text-header" x="${PAD}" y="${PAD - 6}">${escXml(`Goal tree — ${treeName}`)}</text>`
     : '';
 
-  return renderGoalsLayoutSvg(layout, { curvature, entryCurvature, title, embedCssTheme: 'transitrix' });
+  return renderGoalsLayoutSvg(layout, { curvature, entryCurvature, edgeStyle, title, embedCssTheme: 'transitrix' });
 }
 
 export interface RenderGoalsLayoutOptions {
   curvature?: number;
   entryCurvature?: number;
+  edgeStyle?: EdgeStyle;
   /** Extra vertical space reserved at the top of the canvas (e.g. for a title block). */
   topInset?: number;
   /** Raw SVG injected immediately after `<defs>` — a header line or a full title block. */
@@ -78,7 +80,7 @@ export interface RenderGoalsLayoutOptions {
  *     and the export path own styling).
  */
 export function renderGoalsLayoutSvg(layout: GoalTreeLayout, options: RenderGoalsLayoutOptions = {}): string {
-  const { curvature = DEFAULT_EDGE_CURVATURE, entryCurvature, topInset = 0, title = '', embedCssTheme } = options;
+  const { curvature = DEFAULT_EDGE_CURVATURE, entryCurvature, edgeStyle, topInset = 0, title = '', embedCssTheme } = options;
 
   const w = layout.bounds.width + PAD * 2;
   const h = layout.bounds.height + PAD * 2 + topInset;
@@ -95,7 +97,7 @@ export function renderGoalsLayoutSvg(layout: GoalTreeLayout, options: RenderGoal
     const sy = s.y + oy + s.height / 2;
     const tx = t.x + ox;
     const ty = t.y + oy + t.height / 2;
-    return horizontalCubicEdgePath(sx, sy, tx, ty, curvature, entryCurvature);
+    return previewEdgePath(sx, sy, tx, ty, edgeStyle, curvature, entryCurvature);
   }
 
   const edgeSvg = layout.edges