@transitrix/diagrams 1.0.1 → 1.1.0

package/dist/fgca/validate.js

@@ -9,10 +9,13 @@ export function validateFGCADoc(input) {
         errors.push({ code: 'MISSING_NOTATION', message: 'notation field is required' });
         return { valid: false, errors, warnings };
     }
-    if (raw.notation !== 'fgca') {
-        errors.push({ code: 'WRONG_NOTATION', message: `notation must be "fgca", got "${String(raw.notation)}"` });
+    if (raw.notation !== 'fgca' && raw.notation !== 'dgca') {
+        errors.push({ code: 'WRONG_NOTATION', message: `notation must be "dgca" (or legacy "fgca"), got "${String(raw.notation)}"` });
         return { valid: false, errors, warnings };
     }
+    if (raw.notation === 'fgca') {
+        warnings.push({ code: 'DEPRECATED_NOTATION', message: 'notation "fgca" is deprecated — rename to "dgca"' });
+    }
     if (!Array.isArray(raw.factors))
         errors.push({ code: 'SCHEMA_INVALID', message: 'factors must be an array', path: 'factors' });
     if (!Array.isArray(raw.goals))
@@ -29,7 +32,7 @@ export function validateFGCADoc(input) {
         for (const el of arr) {
             if (el && typeof el === 'object') {
                 const id = el.id;
-                if (typeof id === 'number')
+                if (typeof id === 'number' || typeof id === 'string')
                     out.add(id);
             }
         }
@@ -45,8 +48,8 @@ export function validateFGCADoc(input) {
             continue;
         }
         const factor = f;
-        if (typeof factor.id !== 'number')
-            errors.push({ code: 'SCHEMA_INVALID', message: 'factor id must be a number', path: `factors[${i}]` });
+        if (typeof factor.id !== 'number' && typeof factor.id !== 'string')
+            errors.push({ code: 'SCHEMA_INVALID', message: 'factor id must be a number or string', path: `factors[${i}]` });
         if (typeof factor.name !== 'string' || !factor.name.trim())
             errors.push({ code: 'EMPTY_NAME', message: `Factor ${String(factor.id)} has empty name`, path: `factors[${i}]` });
     }
@@ -57,8 +60,8 @@ export function validateFGCADoc(input) {
             continue;
         }
         const goal = g;
-        if (typeof goal.id !== 'number')
-            errors.push({ code: 'SCHEMA_INVALID', message: 'goal id must be a number', path: `goals[${i}]` });
+        if (typeof goal.id !== 'number' && typeof goal.id !== 'string')
+            errors.push({ code: 'SCHEMA_INVALID', message: 'goal id must be a number or string', path: `goals[${i}]` });
         if (typeof goal.name !== 'string' || !goal.name.trim())
             errors.push({ code: 'EMPTY_NAME', message: `Goal ${String(goal.id)} has empty name`, path: `goals[${i}]` });
         const factorRefs = Array.isArray(goal.factor) ? goal.factor : [];
@@ -66,7 +69,7 @@ export function validateFGCADoc(input) {
             if (!fr || typeof fr !== 'object')
                 continue;
             const fid = fr.id;
-            if (typeof fid === 'number' && !factorIds.has(fid)) {
+            if ((typeof fid === 'number' || typeof fid === 'string') && !factorIds.has(fid)) {
                 warnings.push({ code: 'BROKEN_REF', message: `Goal ${String(goal.id)} references missing factor ${fid}`, path: `goals[${i}].factor` });
             }
         }
@@ -78,16 +81,16 @@ export function validateFGCADoc(input) {
             continue;
         }
         const change = c;
-        if (typeof change.id !== 'number')
-            errors.push({ code: 'SCHEMA_INVALID', message: 'change id must be a number', path: `changes[${i}]` });
+        if (typeof change.id !== 'number' && typeof change.id !== 'string')
+            errors.push({ code: 'SCHEMA_INVALID', message: 'change id must be a number or string', path: `changes[${i}]` });
         if (typeof change.name !== 'string' || !change.name.trim())
             errors.push({ code: 'EMPTY_NAME', message: `Change ${String(change.id)} has empty name`, path: `changes[${i}]` });
-        if (typeof change.goal_id === 'number' && !goalIds.has(change.goal_id)) {
+        if ((typeof change.goal_id === 'number' || typeof change.goal_id === 'string') && !goalIds.has(change.goal_id)) {
             warnings.push({ code: 'BROKEN_REF', message: `Change ${String(change.id)} references missing goal ${change.goal_id}`, path: `changes[${i}].goal_id` });
         }
         const aids = Array.isArray(change.activity_ids) ? change.activity_ids : [];
         for (const aid of aids) {
-            if (typeof aid === 'number' && !activityIds.has(aid)) {
+            if ((typeof aid === 'number' || typeof aid === 'string') && !activityIds.has(aid)) {
                 warnings.push({ code: 'BROKEN_REF', message: `Change ${String(change.id)} references missing activity ${aid}`, path: `changes[${i}].activity_ids` });
             }
         }
@@ -99,8 +102,8 @@ export function validateFGCADoc(input) {
             continue;
         }
         const activity = a;
-        if (typeof activity.id !== 'number')
-            errors.push({ code: 'SCHEMA_INVALID', message: 'activity id must be a number', path: `activities[${i}]` });
+        if (typeof activity.id !== 'number' && typeof activity.id !== 'string')
+            errors.push({ code: 'SCHEMA_INVALID', message: 'activity id must be a number or string', path: `activities[${i}]` });
         if (typeof activity.name !== 'string' || !activity.name.trim())
             errors.push({ code: 'EMPTY_NAME', message: `Activity ${String(activity.id)} has empty name`, path: `activities[${i}]` });
     }

package/dist/process-blueprint/index.d.ts

@@ -1,4 +1,4 @@
-export type { AspectCategory, Stage, AspectEntry, LaneConfig, ProcessBlueprintHeader, ProcessBlueprintFile, ProcessBlueprintLayoutOptions, LegendCell, StageHeaderCell, StageTextCell, AspectPill, AspectRow, ProcessBlueprintLayout, ComplianceDecoration, ComplianceChip, ComplianceRow, ComplianceLaneConfig, ComplianceLaneAssertion, ComplianceLaneRequirement, ComplianceLaneInput, } from './types.js';
+export type { AspectCategory, RowId, Stage, AspectEntry, LaneConfig, ProcessBlueprintHeader, ProcessBlueprintFile, ProcessBlueprintLayoutOptions, LegendCell, StageHeaderCell, StageTextCell, AspectPill, AspectRow, ProcessBlueprintLayout, ComplianceDecoration, ComplianceChip, ComplianceRow, ComplianceLaneConfig, ComplianceLaneAssertion, ComplianceLaneRequirement, ComplianceLaneInput, } from './types.js';
 export { validateProcessBlueprint } from './validate.js';
 export type { ValidationError as ProcessBlueprintValidationError, ValidationWarning as ProcessBlueprintValidationWarning, ValidationResult as ProcessBlueprintValidationResult, } from './validate.js';
 export { layoutProcessBlueprint } from './layout.js';

package/dist/process-blueprint/layout.js

@@ -12,14 +12,19 @@ const DEFAULTS = {
     goalRowHeight: 56,
     resultRowHeight: 56,
     aspectRowMinHeight: 60,
-    pillHeight: 28,
+    pillHeight: 40,
     pillGap: 4,
     cellPadding: 8,
-    textLineHeight: 15,
-    textCharWidth: 6.2,
+    // 17px gives comfortable breathing room between wrapped lines at typical
+    // webview font sizes (VS Code uses ~13–14px body, SVG text-secondary ≈ same).
+    textLineHeight: 17,
+    // 7.5px per char is a conservative estimate that causes wrap to trigger
+    // before text visually overflows the cell border.
+    textCharWidth: 7.5,
     cellTextPadX: 10,
     cellTextPadY: 10,
-    maxTextLines: 6,
+    // No hard truncation: rows grow to fit all wrapped lines.
+    maxTextLines: 100,
 };
 function resolveOptions(options) {
     return { ...DEFAULTS, ...(options ?? {}) };
@@ -285,8 +290,21 @@ function deriveComplianceRow(stages, stageIndexById, input, opts, yStart) {
 export function layoutProcessBlueprint(file, options) {
     const opts = resolveOptions(options);
     const pb = file.process_blueprint;
-    const stages = Array.isArray(pb?.stages) ? pb.stages : [];
+    // Filter stages by visibleStages if set
+    const allStages = Array.isArray(pb?.stages) ? pb.stages : [];
+    const stages = opts.visibleStages
+        ? allStages.filter(s => s?.id != null && opts.visibleStages.includes(s.id))
+        : allStages;
     const stageIndexById = buildStageIndex(stages);
+    // Row visibility from visibleRows
+    const visRows = opts.visibleRows;
+    const showGoal = !visRows || visRows.includes('goal');
+    const showResult = !visRows || visRows.includes('result');
+    const effectiveVisibleAspects = visRows
+        ? ASPECT_CATEGORIES.filter(c => visRows.includes(c))
+        : opts.visibleAspects;
+    const effectiveComplianceEnabled = opts.complianceLane?.enabled === true &&
+        (!visRows || visRows.includes('compliance'));
     // Stage headers
     const stageHeaders = stages.map((s, i) => ({
         stageIndex: i,
@@ -307,33 +325,36 @@ export function layoutProcessBlueprint(file, options) {
     };
     const goalLines = stages.map(s => wrap(s?.goal ?? ''));
     const resultLines = stages.map(s => wrap(s?.result ?? ''));
-    const goalRowY = opts.stageHeaderHeight;
-    const goalRowHeight = rowHeightFor(goalLines.map(l => l.length), opts.goalRowHeight);
-    const resultRowY = goalRowY + goalRowHeight;
-    const resultRowHeight = rowHeightFor(resultLines.map(l => l.length), opts.resultRowHeight);
-    const goalCells = stages.map((s, i) => ({
-        stageIndex: i,
-        text: s?.goal ?? '',
-        lines: goalLines[i],
-        x: opts.legendColumnWidth + i * opts.stageColumnWidth,
-        y: goalRowY,
-        width: opts.stageColumnWidth,
-        height: goalRowHeight,
-    }));
-    const resultCells = stages.map((s, i) => ({
-        stageIndex: i,
-        text: s?.result ?? '',
-        lines: resultLines[i],
-        x: opts.legendColumnWidth + i * opts.stageColumnWidth,
-        y: resultRowY,
-        width: opts.stageColumnWidth,
-        height: resultRowHeight,
-    }));
-    const aspectsStartY = resultRowY + resultRowHeight;
+    let cursorY = opts.stageHeaderHeight;
+    let goalRowY = 0, goalRowHeight = 0;
+    let resultRowY = 0, resultRowHeight = 0;
+    const goalCells = [];
+    const resultCells = [];
+    if (showGoal) {
+        goalRowY = cursorY;
+        goalRowHeight = rowHeightFor(goalLines.map(l => l.length), opts.goalRowHeight);
+        goalCells.push(...stages.map((s, i) => ({
+            stageIndex: i, text: s?.goal ?? '', lines: goalLines[i],
+            x: opts.legendColumnWidth + i * opts.stageColumnWidth, y: goalRowY,
+            width: opts.stageColumnWidth, height: goalRowHeight,
+        })));
+        cursorY += goalRowHeight;
+    }
+    if (showResult) {
+        resultRowY = cursorY;
+        resultRowHeight = rowHeightFor(resultLines.map(l => l.length), opts.resultRowHeight);
+        resultCells.push(...stages.map((s, i) => ({
+            stageIndex: i, text: s?.result ?? '', lines: resultLines[i],
+            x: opts.legendColumnWidth + i * opts.stageColumnWidth, y: resultRowY,
+            width: opts.stageColumnWidth, height: resultRowHeight,
+        })));
+        cursorY += resultRowHeight;
+    }
+    const aspectsStartY = cursorY;
     // Aspect rows: only categories with at least one entry, in fixed order.
-    // When visibleAspects is set, skip categories not in the list.
-    const aspectCategoriesToRender = opts.visibleAspects !== undefined
-        ? ASPECT_CATEGORIES.filter(c => opts.visibleAspects.includes(c))
+    // When effectiveVisibleAspects is set, skip categories not in the list.
+    const aspectCategoriesToRender = effectiveVisibleAspects !== undefined
+        ? ASPECT_CATEGORIES.filter(c => effectiveVisibleAspects.includes(c))
         : ASPECT_CATEGORIES;
     const aspectRows = [];
     let aspectCursorY = aspectsStartY;
@@ -358,6 +379,13 @@ export function layoutProcessBlueprint(file, options) {
             const x = opts.legendColumnWidth + p.startStageIndex * opts.stageColumnWidth + opts.cellPadding;
             const width = (p.endStageIndex - p.startStageIndex + 1) * opts.stageColumnWidth - 2 * opts.cellPadding;
             const y = aspectCursorY + opts.cellPadding + slot[i] * (opts.pillHeight + opts.pillGap);
+            const pillMaxChars = Math.max(4, Math.floor((width - 2 * opts.cellPadding) / opts.textCharWidth));
+            const nameWrapped = wrapText(p.name, pillMaxChars, 2);
+            // Show id as second line only when the name fits on one line; otherwise
+            // use both lines for the name so it isn't truncated.
+            const lines = p.id && nameWrapped.length <= 1
+                ? [...nameWrapped, p.id].slice(0, 2)
+                : nameWrapped;
             return {
                 category: p.category,
                 entryIndex: p.entryIndex,
@@ -369,6 +397,7 @@ export function layoutProcessBlueprint(file, options) {
                 y,
                 width,
                 height: opts.pillHeight,
+                lines,
             };
         });
         aspectRows.push({
@@ -381,7 +410,7 @@ export function layoutProcessBlueprint(file, options) {
     }
     // Compliance lane — derived from assertions/requirements, rendered after aspect rows.
     let complianceRow;
-    if (opts.complianceLane?.enabled && opts.complianceInput) {
+    if (effectiveComplianceEnabled && opts.complianceInput) {
         complianceRow = deriveComplianceRow(stages, stageIndexById, opts.complianceInput, opts, aspectCursorY);
         if (complianceRow) {
             aspectCursorY += complianceRow.height;
@@ -389,8 +418,8 @@ export function layoutProcessBlueprint(file, options) {
     }
     // Legend (left column labels): one entry per row.
     const legend = [
-        { kind: 'goal', label: 'Goal', y: goalRowY, height: goalRowHeight },
-        { kind: 'result', label: 'Result', y: resultRowY, height: resultRowHeight },
+        ...(showGoal ? [{ kind: 'goal', label: 'Goal', y: goalRowY, height: goalRowHeight }] : []),
+        ...(showResult ? [{ kind: 'result', label: 'Result', y: resultRowY, height: resultRowHeight }] : []),
         ...aspectRows.map(row => ({
             kind: 'aspect',
             category: row.category,
@@ -398,9 +427,7 @@ export function layoutProcessBlueprint(file, options) {
             y: row.y,
             height: row.height,
         })),
-        ...(complianceRow
-            ? [{ kind: 'compliance', label: 'Compliance', y: complianceRow.y, height: complianceRow.height }]
-            : []),
+        ...(complianceRow ? [{ kind: 'compliance', label: 'Compliance', y: complianceRow.y, height: complianceRow.height }] : []),
     ];
     const totalWidth = opts.legendColumnWidth + stages.length * opts.stageColumnWidth;
     const totalHeight = aspectCursorY;

package/dist/process-blueprint/types.d.ts

@@ -1,4 +1,5 @@
 export type AspectCategory = 'systems' | 'actors' | 'equipment' | 'information_entities';
+export type RowId = 'goal' | 'result' | 'systems' | 'actors' | 'equipment' | 'information_entities' | 'compliance';
 /**
  * One of the three orthogonal decoration signals that can appear on a compliance
  * law chip (ADR 2026-06-09-compliance-impact-as-blueprint-lane §3):
@@ -176,6 +177,17 @@ export interface ProcessBlueprintLayoutOptions {
      * Pass an empty array to suppress all aspect rows.
      */
     visibleAspects?: AspectCategory[];
+    /**
+     * Restrict which rows are rendered. When absent, all rows with data are shown.
+     * When set, takes precedence over `visibleAspects` for aspect categories and
+     * overrides `complianceLane.enabled` for the compliance row.
+     */
+    visibleRows?: RowId[];
+    /**
+     * Restrict which stages (columns) are rendered by their stage ID.
+     * When absent, all stages are shown.
+     */
+    visibleStages?: string[];
 }
 import type { LayoutBounds } from '../geometry.js';
 export type { LayoutBounds };
@@ -216,6 +228,8 @@ export interface AspectPill {
     y: number;
     width: number;
     height: number;
+    /** Word-wrapped lines of `name`, pre-fitted to the pill width by the layout. */
+    lines: string[];
 }
 export interface AspectRow {
     category: AspectCategory;

package/dist/scenarios/index.d.ts

@@ -1,2 +1,2 @@
-export type { ScenarioStatus, FactorRelevance, FactorView, GoalRef, CapabilityRef, ActivityRef, ProductRef, ProcessRef, ApplicationRef, ScenarioHeader, ScenarioFile, } from './types.js';
+export type { ScenarioStatus, DriverRelevance, DriverView, GoalRef, CapabilityRef, ActivityRef, ProductRef, ProcessRef, ApplicationRef, ScenarioHeader, ScenarioFile, } from './types.js';
 export { validateScenario } from './validate.js';

package/dist/scenarios/types.d.ts

@@ -1,8 +1,8 @@
 export type ScenarioStatus = 'Draft' | 'Active' | 'Archived';
-export type FactorRelevance = 'High' | 'Medium' | 'Low';
-export interface FactorView {
+export type DriverRelevance = 'High' | 'Medium' | 'Low';
+export interface DriverView {
     factor_id: string;
-    relevance?: FactorRelevance;
+    relevance?: DriverRelevance;
     impact?: string;
 }
 export interface GoalRef {
@@ -30,7 +30,7 @@ export interface ScenarioHeader {
     status: ScenarioStatus;
     created_at?: string;
     vision?: string;
-    factors_view?: FactorView[];
+    factors_view?: DriverView[];
     goals?: GoalRef[];
     capabilities?: CapabilityRef[];
     activities?: ActivityRef[];

package/dist/theme/themes.js

@@ -62,6 +62,7 @@ function diagramVars(variant) {
     const mat = MATURITY_COLORS[variant];
     const levelVars = lv.map((c, i) => `--ts-level-${i}:${c}`).join(';') + ';';
     return [
+        `${CSS_VAR.layerDriver}:${lc.driver[variant]}`,
         `${CSS_VAR.layerFactor}:${lc.factor[variant]}`,
         `${CSS_VAR.layerGoal}:${lc.goal[variant]}`,
         `${CSS_VAR.layerChange}:${lc.change[variant]}`,
@@ -112,6 +113,7 @@ function diagramClassCss() {
     // contract every notation preview honours so the catalogue reads as one
     // visual family.
     return `.diagram-node{stroke:var(${cv.nodeStroke});stroke-width:1;}
+.layer-driver{fill:var(${cv.layerDriver});}
 .layer-factor{fill:var(${cv.layerFactor});}
 .layer-goal{fill:var(${cv.layerGoal});}
 .layer-change{fill:var(${cv.layerChange});}

package/dist/theme/tokens.d.ts

@@ -11,8 +11,13 @@ export declare const FUNCTIONAL: {
     readonly error: "#b91c1c";
     readonly info: "#1d6fa8";
 };
-/** Fill colors for FGCA notation columns. */
+/** Fill colors for FGCA/DGCA notation columns. */
 export declare const LAYER_COLORS: {
+    readonly driver: {
+        readonly light: "#fef3c7";
+        readonly dark: "#292108";
+        readonly hc: "#f59e0b";
+    };
     readonly factor: {
         readonly light: "#fef3c7";
         readonly dark: "#292108";
@@ -140,6 +145,7 @@ export declare const CSS_VAR: {
     readonly statusInfoFg: "--ts-status-info-fg";
     readonly statusErrorBg: "--ts-status-error-bg";
     readonly statusErrorFg: "--ts-status-error-fg";
+    readonly layerDriver: "--ts-layer-driver";
     readonly layerFactor: "--ts-layer-factor";
     readonly layerGoal: "--ts-layer-goal";
     readonly layerChange: "--ts-layer-change";

package/dist/theme/tokens.js

@@ -11,8 +11,9 @@ export const FUNCTIONAL = {
     error: '#b91c1c',
     info: '#1d6fa8',
 };
-/** Fill colors for FGCA notation columns. */
+/** Fill colors for FGCA/DGCA notation columns. */
 export const LAYER_COLORS = {
+    driver: { light: '#fef3c7', dark: '#292108', hc: '#f59e0b' },
     factor: { light: '#fef3c7', dark: '#292108', hc: '#f59e0b' },
     goal: { light: '#e0e7ff', dark: '#1e1b4b', hc: '#818cf8' },
     change: { light: '#dbeafe', dark: '#0c2042', hc: '#60a5fa' },
@@ -85,6 +86,7 @@ export const CSS_VAR = {
     statusInfoFg: '--ts-status-info-fg',
     statusErrorBg: '--ts-status-error-bg',
     statusErrorFg: '--ts-status-error-fg',
+    layerDriver: '--ts-layer-driver',
     layerFactor: '--ts-layer-factor',
     layerGoal: '--ts-layer-goal',
     layerChange: '--ts-layer-change',

package/dist/webview/__tests__/entry-notations.test.js

@@ -15,6 +15,8 @@ const EXAMPLES = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../
 // example per notation is enough to prove the dispatch + renderer wiring.
 const FIXTURES = [
     { kind: 'goals', file: 'goals/strategy-2026.goals.transitrix.yaml', markup: 'svg' },
+    { kind: 'dgca', file: 'dgca/strategy-2026.dgca.transitrix.yaml', markup: 'svg' },
+    { kind: 'dga', file: 'dga/strategy-2026.dga.transitrix.yaml', markup: 'svg' },
     { kind: 'fgca', file: 'fgca/strategy-2026.fgca.transitrix.yaml', markup: 'svg' },
     { kind: 'fga', file: 'fga/strategy-2026.fga.transitrix.yaml', markup: 'svg' },
     { kind: 'activities', file: 'activities/platform-launch.activities.transitrix.yaml', markup: 'svg' },

package/dist/webview/__tests__/render-process.test.d.ts

@@ -0,0 +1 @@
+export {};