@cardenelabs/cdl 0.5.0 → 0.6.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as CdlDiagram, S as Signal, a as CdlInput, b as CdlLane, c as CdlNode, T as Tone, d as Side, E as EdgeStyle, e as CdlState, f as CdlEventTarget, g as Computed, h as CdlScrollTrigger, L as LaidDiagram, i as CdlDiagramViewProps, j as LaidEdge, k as LaidNode, l as CdlEdge, B as BBox, N as NodeKind } from './render-C78lIXeC.cjs';
-export { m as CdlDiagramView, n as CdlEventBinding, o as CdlEventKind, p as CdlFormula, q as CdlPhase, I as InteractiveHandlerMap, r as InteractiveSignalsAccessor, s as LaidLane, t as NODE_KINDS, u as ScrollProgressHandle, v as TONES, w as computeEventBindingKey, x as computeFormulaKey, y as computeInputSignalKey, z as computeScrollTriggerKey, A as computed, D as createInteractiveSignalsAccessor, F as createScrollProgressHandle, G as createScrollProgressSignals, H as hasInteractivePrimitives, J as signal } from './render-C78lIXeC.cjs';
+import { C as CdlDiagram, S as Signal, a as CdlInput, b as CdlLane, c as CdlNode, T as Tone, d as Side, E as EdgeStyle, e as CdlState, f as CdlEventTarget, g as Computed, h as CdlDerivedValue, i as CdlScrollTrigger, L as LaidDiagram, j as CdlDiagramViewProps, k as LaidEdge, l as LaidNode, m as CdlEdge, B as BBox, N as NodeKind, J as JourneyEmotion, Q as QuadrantKey } from './render-DquCvgOB.cjs';
+export { n as CdlDiagramView, o as CdlEventBinding, p as CdlEventKind, q as CdlFormula, r as CdlPhase, I as InteractiveHandlerMap, s as InteractiveSignalsAccessor, t as LaidLane, u as NODE_KINDS, v as ScrollProgressHandle, w as TONES, x as computeEventBindingKey, y as computeFormulaKey, z as computeInputSignalKey, A as computeScrollTriggerKey, D as computed, F as createInteractiveSignalsAccessor, G as createScrollProgressHandle, H as createScrollProgressSignals, K as hasInteractivePrimitives, M as signal } from './render-DquCvgOB.cjs';
 import { JSX } from 'react';
 
 declare function effect(fn: () => void | (() => void)): () => void;
@@ -1259,6 +1259,44 @@ declare function evaluate(ast: FormulaAst, ctxOrResolver: FormulaContext | Formu
  */
 declare function createFormulaComputeds(diagram: CdlDiagram, signals: Record<string, Signal<unknown>>): Record<string, Computed<number | boolean>>;
 
+/**
+ * 他の値から自動で決まる値を解く層 (cdl#453 / dragon#1161 段 1)。
+ *
+ * 段 (`animation`) が動かす値を出した後に、 参照の関係から順序を決めて式を評価する。
+ * 段の補間中も毎 frame ここを通るため、 掛け算 / 割り算 / 比較 / `min` / `max` のような
+ * 端点 2 点では表せない関係も途中の値が正しくなる。
+ *
+ * 止まった値は結果に載せない。 載せなければ図には `{名前}` が残り、 読み手
+ * (`resolveNumericAttr` / `payload-binding` / `visibleIf`) が既に持っている
+ * 「解決できていない」 の扱いにそのまま乗る。 伝えるための経路を新設しない。
+ *
+ * ただし同じ名前が `states` にもある場合は、 段が出した初期値をそのまま残す
+ * (「まだ計算されていない間の値」 として使う)。
+ */
+/** 値が止まった理由。 呼び出し側が伝え方を決められるように種類を分けておく */
+type DerivedNoticeKind = "cycle" | "unknown-reference" | "parse-error" | "eval-error" | "duplicate-id" | "invalid-id";
+type DerivedNotice = {
+    /** 止まった値の名前 */
+    id: string;
+    kind: DerivedNoticeKind;
+    message: string;
+};
+type DerivedResult = {
+    /** 段の値に、 解けた値を足したもの */
+    values: Record<string, string>;
+    /** 止まった値。 解けた値しか無ければ空 */
+    notices: DerivedNotice[];
+};
+/**
+ * 段の値に、 他の値から決まる値を足して返す。
+ *
+ * 宣言が無ければ受け取った値をそのまま返す (同じ object をそのまま返すので、
+ * 宣言を持たない図は追加の割当てを 1 つも払わない)。
+ */
+declare function applyDerivedValues(base: Record<string, string>, derived: readonly CdlDerivedValue[] | undefined): DerivedResult;
+/** 段の値に、 他の値から決まる値を足した record だけを返す (伝える情報が要らない呼び出し用) */
+declare function withDerivedValues(base: Record<string, string>, derived: readonly CdlDerivedValue[] | undefined): Record<string, string>;
+
 /**
  * scroll progress 計算 (pure function、 CAR #245)。
  *
@@ -3013,7 +3051,7 @@ type TreeBuilder = {
  *   .build();
  */
 declare function tree(preset: TreePreset): TreeBuilder;
-type JourneyEmotion = "delighted" | "happy" | "neutral" | "frustrated" | "angry";
+
 type JourneyStep = {
     id: string;
     title: string;
@@ -3111,7 +3149,7 @@ type FunnelBuilder = {
  *   .build();
  */
 declare function funnel(preset: FunnelPreset): FunnelBuilder;
-type QuadrantQuadrantLabel = "topLeft" | "topRight" | "bottomLeft" | "bottomRight";
+type QuadrantQuadrantLabel = QuadrantKey;
 type QuadrantItem = {
     id: string;
     title: string;
@@ -3368,48 +3406,27 @@ type StateMachine2Builder = {
  *   .build();
  */
 declare function stateMachine2(preset: StateMachine2Preset): StateMachine2Builder;
-type MindMapRadialBranch = {
-    id: string;
-    title: string;
-    /** 色 tone (default は defaultTone)。 8 方向で auto rotate も可 */
-    tone?: Tone;
-    subtitle?: string;
-};
-type MindMapRadialPreset = {
-    id: string;
-    topic: string;
-    /** 中心 node の title (id は builder が "center" で内部生成) */
-    centerTitle: string;
-    /** 中心 node の id override (default "center") */
-    centerId?: string;
-    /** 中心から branch までの距離 (world coord、 default 350) */
-    radius?: number;
-    /** branch node の width (default 260) */
-    branchWidth?: number;
-    /** 中心 node の width (default 260) */
-    centerWidth?: number;
-    defaultTone?: Tone;
-};
-type MindMapRadialBuilder = {
-    branch: (b: MindMapRadialBranch) => MindMapRadialBuilder;
-    build: () => ReturnType<DiagramBuilder["build"]>;
-};
+
 /**
- * mindMapRadial preset ... 中心 node を軸に 8 方向 (0°/45°/90°/135°/180°/225°/270°/315°)
- * へ branch を放射状に配置する。 現行 mindMap (左から右へ水平 tree) と使い分ける用途。
+ * 全 state の現時点 value を計算 (現在 phase + これまでの phase の最終 tween 値を集約)。
+ * - set = 即時切替 (phase 到達で value 上書き、 lerp なし)
+ * - tween = 数値補間 (現 phase 中は progress で lerp、 過去 phase は to 固定)
  *
- * 実装戦略 ... engine の lane × stack grid を活用し、 3 lane (left / center / right) を
- * radius に基づき explicit x で配置、 3 stack row (top / middle / bottom) を stack index 0/1/2 で
- * 割当てる。 branch 順は position 順 (E/SE/S/SW/W/NW/N/NE) に固定し、 index → grid cell mapping。
+ * 段の値を出した後に `laid.derived` (他の値から自動で決まる値) を参照順で解いて足す。
+ * 毎 frame ここを通るので、 掛け算 / 比較のような端点 2 点では表せない関係も途中の値が
+ * 正しくなる。 同じ名前が `states` にもある場合は解けた値が勝ち、 解けなければ初期値が残る。
+ */
+declare function computeStateValues(laid: LaidDiagram, phaseIdx: number, progress: number): Record<string, string>;
+/**
+ * template literal `{stateId}` を values map で置換 (未解決は `{id}` のまま)。
+ * array signal 拡張 (SSOT): 値が JSON array (例 `"[1,2,3]"`) の signal に対しては、
+ *   `{sig[0]}` = 要素 0 の値、 `{sig.length}` = 要素数、
+ *   `{sig.sum}` / `{sig.max}` / `{sig.min}` / `{sig.avg}` = 数値集約 (非数値 element は 0 扱い)。
+ * array 記法対象外 signal は従来通り `{sig}` で単純置換。
  *
- * @example
- * mindMapRadial({ id: "mr", topic: "Product Radial", centerTitle: "Product" })
- *   .branch({ id: "users", title: "Users" })      // 0° (right)
- *   .branch({ id: "road", title: "Roadmap" })     // 45° (bottom-right)
- *   .branch({ id: "metrics", title: "Metrics" })  // 90° (bottom)
- *   ...
- *   .build();
+ * 名前に使える文字は `template-name.ts` が決める (engine 全体で 1 つ)。 ここだけで
+ * 定義すると、 式を書ける側との間で「読めるが書けない」 「書けるが読めない」 名前ができる。
  */
-declare function mindMapRadial(preset: MindMapRadialPreset): MindMapRadialBuilder;
+declare function interpolate(template: string, values: Record<string, string>): string;
 
-export { ARROW_ANGLE_MAX_DEG, ARROW_ENDPOINT_CENTER_TOL, type AnimationChain, type AuthorIntentOptions, type AuthorIntentReport, type BinaryOp, CHAIN_MIN_CLEARANCE, CHAIN_SHIFT_MAX_ACCUMULATED, CHAIN_SHIFT_MAX_ITER, CLEARANCE_LABEL_LABEL, CLEARANCE_LANE_LABEL, CLEARANCE_NODE_LABEL, CLEARANCE_PATH_LABEL, COLUMN_GAP_VARIANCE_TOL, CdlDiagram, CdlDiagramThumbnail, CdlEdge, type CdlEventHandler, CdlEventTarget, CdlInput, CdlLane, CdlNode, CdlScrollTrigger, CdlState, type ChartBuilder, type ChartDatum, type ChartPreset, type ChartType, type ClassDiagramBuilder, type ClassDiagramPreset, type ClassRelationType, Computed, DETOUR_GAP, DETOUR_SLOT_GAP, DIST_LABEL_PATH_MAX, DIST_LABEL_PATH_MIN, type DiagramAdapter, type DiagramBuilder, type Discrepancy, type DiscrepancyKind, type DomVerifyReport, EDGE_LABEL_TEXT, EDGE_STUB_OUT, type EdgeLabelLine, type EdgeLabelTextSpec, EdgeStyle, type ErBuilder, type ErEntity, type ErPreset, type ErRelation, type ErRelationCardinality, type EventAttachHandle, type EventChain, FAN_GAP, FONT_RENDER_TOLERANCE_WORLD, type FlowBuilder, type FlowPreset, type FlowStepInput, type FlowchartBuilder, type FlowchartEdge, type FlowchartNode, type FlowchartNodeShape, type FlowchartPreset, type FormulaAst, type FormulaContext, type FsmState, type FsmStateNested, type FsmTransition, type FsmTransitionExt, type FunnelBuilder, type FunnelPreset, type FunnelStage, type GanttBuilder, type GanttPreset, type GanttTask, type GenericDiagramSpec, type GenericDiscrepancy, type GenericDiscrepancyKind, type GenericVerifyOptions, type Rect as GeometryRect, type Segment as GeometrySegment, type InfraConnection, type InfraNode, type InfrastructureBuilder, type InfrastructurePreset, type InputChain, type IntentDiscrepancy, type IntentDiscrepancyKind, type JourneyEmotion, type JourneyStep, LABEL_INIT_CLEARANCE, LABEL_INIT_CLEARANCE_DOTTED_FLOW, LABEL_SIZE_TOLERANCE_WORLD, LABEL_TO_PATH_CLEARANCE, LANE_BORDER_CLEARANCE_TOL, LaidDiagram, LaidEdge, LaidNode, type LayoutWithValidationOptions, type LayoutWithValidationResult, MARKER_GLOW_RADIUS, MIN_COLUMN_ALIGNMENT_TOLERANCE, MIN_ROW_ALIGNMENT_TOLERANCE, type MathFnName, type MindBranch, type MindMapBuilder, type MindMapPreset, type MindMapRadialBranch, type MindMapRadialBuilder, type MindMapRadialPreset, NEAR_COLLISION_DEFAULT_MIN, NEAR_COLLISION_POLICY, NODE_FRAME_SELECTOR, type NetworkBuilder, type NetworkDevice, type NetworkDeviceKind, type NetworkLink, type NetworkPreset, NodeKind, type PageLike, type PhaseBuilder, type QuadrantBuilder, type QuadrantItem, type QuadrantPreset, type QuadrantQuadrantLabel, ROW_GAP_VARIANCE_TOL, SPEC_CLEARANCE_POLICY, STAGE_SVG_SELECTOR, type SequenceBuilder, type SequencePreset, type SequenceStep, Side, Signal, type StateMachine2Builder, type StateMachine2Preset, type StateMachineBuilder, type StateMachinePreset, type SweepReport, type SwimlanePreset, TARGET_LABEL_PATH_DIST, Tone, type TopologyBuilder, type TopologyConnection, type TopologyContainer, type TopologyGroupBuilder, type TopologyPreset, type TreeBuilder, type TreeNode, type TreePreset, type UmlClass, type UmlRelation, type UserJourneyBuilder, type UserJourneyPreset, type ValidateOptions, type ValidationProfile, type VerifyOptions, type Violation, type VisualAxis, type VisualValidationReport, WCAG_AA_LARGE, WCAG_AA_NORMAL, assertNever, attachEventHandlers, batch, bboxClearance, bboxDiffWorld, cdlAdapter, chart, classDiagram, compile, computeScrollProgress, computeViewportScale, countEdgeCrossings, createFormulaComputeds, createInputSignals, diagram, effect, er, evaluate as evaluateFormula, extractIdentifiers, flow, flowchart, funnel, gantt, infrastructure, inputDefaultValue, isLargeText, labelInitClearance, layout, layoutWithValidation, mindMap, mindMapRadial, network, parseFormula, pointRectEdgeDistance, pointToSegmentDistance, predictLabelBBoxWorld, predictNodeBBoxWorld, projectEdgeLabel, projectNode, projectPathSegment, pxToWorld, quadrant, rectRectClearance, rectRectOverlapArea, rendersRows, requiredContrastRatio, requiredNearClearance, requiredRowsHeight, requiredRowsWidth, requiredSpecClearance, resolveEdgeLabelOverlapsWithChain, resolveEdgeLabelOverlapsWithChainAndPropagate, resolveOverlapsWithChain, resolveTarget, resolveTargetAll, segmentsIntersect, sequence, stateMachine, stateMachine2, swimlane, topology, tree, untrack, userJourney, validate, verifyAllDiagramsDom, verifyAuthorIntent, verifyAuthorIntentAll, verifyDiagramDom, visualValidate, visualValidateAll, visualValidateLaid, worldToPx };
+export { ARROW_ANGLE_MAX_DEG, ARROW_ENDPOINT_CENTER_TOL, type AnimationChain, type AuthorIntentOptions, type AuthorIntentReport, type BinaryOp, CHAIN_MIN_CLEARANCE, CHAIN_SHIFT_MAX_ACCUMULATED, CHAIN_SHIFT_MAX_ITER, CLEARANCE_LABEL_LABEL, CLEARANCE_LANE_LABEL, CLEARANCE_NODE_LABEL, CLEARANCE_PATH_LABEL, COLUMN_GAP_VARIANCE_TOL, CdlDerivedValue, CdlDiagram, CdlDiagramThumbnail, CdlEdge, type CdlEventHandler, CdlEventTarget, CdlInput, CdlLane, CdlNode, CdlScrollTrigger, CdlState, type ChartBuilder, type ChartDatum, type ChartPreset, type ChartType, type ClassDiagramBuilder, type ClassDiagramPreset, type ClassRelationType, Computed, DETOUR_GAP, DETOUR_SLOT_GAP, DIST_LABEL_PATH_MAX, DIST_LABEL_PATH_MIN, type DerivedNotice, type DerivedNoticeKind, type DerivedResult, type DiagramAdapter, type DiagramBuilder, type Discrepancy, type DiscrepancyKind, type DomVerifyReport, EDGE_LABEL_TEXT, EDGE_STUB_OUT, type EdgeLabelLine, type EdgeLabelTextSpec, EdgeStyle, type ErBuilder, type ErEntity, type ErPreset, type ErRelation, type ErRelationCardinality, type EventAttachHandle, type EventChain, FAN_GAP, FONT_RENDER_TOLERANCE_WORLD, type FlowBuilder, type FlowPreset, type FlowStepInput, type FlowchartBuilder, type FlowchartEdge, type FlowchartNode, type FlowchartNodeShape, type FlowchartPreset, type FormulaAst, type FormulaContext, type FsmState, type FsmStateNested, type FsmTransition, type FsmTransitionExt, type FunnelBuilder, type FunnelPreset, type FunnelStage, type GanttBuilder, type GanttPreset, type GanttTask, type GenericDiagramSpec, type GenericDiscrepancy, type GenericDiscrepancyKind, type GenericVerifyOptions, type Rect as GeometryRect, type Segment as GeometrySegment, type InfraConnection, type InfraNode, type InfrastructureBuilder, type InfrastructurePreset, type InputChain, type IntentDiscrepancy, type IntentDiscrepancyKind, JourneyEmotion, type JourneyStep, LABEL_INIT_CLEARANCE, LABEL_INIT_CLEARANCE_DOTTED_FLOW, LABEL_SIZE_TOLERANCE_WORLD, LABEL_TO_PATH_CLEARANCE, LANE_BORDER_CLEARANCE_TOL, LaidDiagram, LaidEdge, LaidNode, type LayoutWithValidationOptions, type LayoutWithValidationResult, MARKER_GLOW_RADIUS, MIN_COLUMN_ALIGNMENT_TOLERANCE, MIN_ROW_ALIGNMENT_TOLERANCE, type MathFnName, type MindBranch, type MindMapBuilder, type MindMapPreset, NEAR_COLLISION_DEFAULT_MIN, NEAR_COLLISION_POLICY, NODE_FRAME_SELECTOR, type NetworkBuilder, type NetworkDevice, type NetworkDeviceKind, type NetworkLink, type NetworkPreset, NodeKind, type PageLike, type PhaseBuilder, type QuadrantBuilder, type QuadrantItem, type QuadrantPreset, type QuadrantQuadrantLabel, ROW_GAP_VARIANCE_TOL, SPEC_CLEARANCE_POLICY, STAGE_SVG_SELECTOR, type SequenceBuilder, type SequencePreset, type SequenceStep, Side, Signal, type StateMachine2Builder, type StateMachine2Preset, type StateMachineBuilder, type StateMachinePreset, type SweepReport, type SwimlanePreset, TARGET_LABEL_PATH_DIST, Tone, type TopologyBuilder, type TopologyConnection, type TopologyContainer, type TopologyGroupBuilder, type TopologyPreset, type TreeBuilder, type TreeNode, type TreePreset, type UmlClass, type UmlRelation, type UserJourneyBuilder, type UserJourneyPreset, type ValidateOptions, type ValidationProfile, type VerifyOptions, type Violation, type VisualAxis, type VisualValidationReport, WCAG_AA_LARGE, WCAG_AA_NORMAL, applyDerivedValues, assertNever, attachEventHandlers, batch, bboxClearance, bboxDiffWorld, cdlAdapter, chart, classDiagram, compile, computeScrollProgress, computeStateValues, computeViewportScale, countEdgeCrossings, createFormulaComputeds, createInputSignals, diagram, effect, er, evaluate as evaluateFormula, extractIdentifiers, flow, flowchart, funnel, gantt, infrastructure, inputDefaultValue, interpolate, isLargeText, labelInitClearance, layout, layoutWithValidation, mindMap, network, parseFormula, pointRectEdgeDistance, pointToSegmentDistance, predictLabelBBoxWorld, predictNodeBBoxWorld, projectEdgeLabel, projectNode, projectPathSegment, pxToWorld, quadrant, rectRectClearance, rectRectOverlapArea, rendersRows, requiredContrastRatio, requiredNearClearance, requiredRowsHeight, requiredRowsWidth, requiredSpecClearance, resolveEdgeLabelOverlapsWithChain, resolveEdgeLabelOverlapsWithChainAndPropagate, resolveOverlapsWithChain, resolveTarget, resolveTargetAll, segmentsIntersect, sequence, stateMachine, stateMachine2, swimlane, topology, tree, untrack, userJourney, validate, verifyAllDiagramsDom, verifyAuthorIntent, verifyAuthorIntentAll, verifyDiagramDom, visualValidate, visualValidateAll, visualValidateLaid, withDerivedValues, worldToPx };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { C as CdlDiagram, S as Signal, a as CdlInput, b as CdlLane, c as CdlNode, T as Tone, d as Side, E as EdgeStyle, e as CdlState, f as CdlEventTarget, g as Computed, h as CdlScrollTrigger, L as LaidDiagram, i as CdlDiagramViewProps, j as LaidEdge, k as LaidNode, l as CdlEdge, B as BBox, N as NodeKind } from './render-C78lIXeC.js';
-export { m as CdlDiagramView, n as CdlEventBinding, o as CdlEventKind, p as CdlFormula, q as CdlPhase, I as InteractiveHandlerMap, r as InteractiveSignalsAccessor, s as LaidLane, t as NODE_KINDS, u as ScrollProgressHandle, v as TONES, w as computeEventBindingKey, x as computeFormulaKey, y as computeInputSignalKey, z as computeScrollTriggerKey, A as computed, D as createInteractiveSignalsAccessor, F as createScrollProgressHandle, G as createScrollProgressSignals, H as hasInteractivePrimitives, J as signal } from './render-C78lIXeC.js';
+import { C as CdlDiagram, S as Signal, a as CdlInput, b as CdlLane, c as CdlNode, T as Tone, d as Side, E as EdgeStyle, e as CdlState, f as CdlEventTarget, g as Computed, h as CdlDerivedValue, i as CdlScrollTrigger, L as LaidDiagram, j as CdlDiagramViewProps, k as LaidEdge, l as LaidNode, m as CdlEdge, B as BBox, N as NodeKind, J as JourneyEmotion, Q as QuadrantKey } from './render-DquCvgOB.js';
+export { n as CdlDiagramView, o as CdlEventBinding, p as CdlEventKind, q as CdlFormula, r as CdlPhase, I as InteractiveHandlerMap, s as InteractiveSignalsAccessor, t as LaidLane, u as NODE_KINDS, v as ScrollProgressHandle, w as TONES, x as computeEventBindingKey, y as computeFormulaKey, z as computeInputSignalKey, A as computeScrollTriggerKey, D as computed, F as createInteractiveSignalsAccessor, G as createScrollProgressHandle, H as createScrollProgressSignals, K as hasInteractivePrimitives, M as signal } from './render-DquCvgOB.js';
 import { JSX } from 'react';
 
 declare function effect(fn: () => void | (() => void)): () => void;
@@ -1259,6 +1259,44 @@ declare function evaluate(ast: FormulaAst, ctxOrResolver: FormulaContext | Formu
  */
 declare function createFormulaComputeds(diagram: CdlDiagram, signals: Record<string, Signal<unknown>>): Record<string, Computed<number | boolean>>;
 
+/**
+ * 他の値から自動で決まる値を解く層 (cdl#453 / dragon#1161 段 1)。
+ *
+ * 段 (`animation`) が動かす値を出した後に、 参照の関係から順序を決めて式を評価する。
+ * 段の補間中も毎 frame ここを通るため、 掛け算 / 割り算 / 比較 / `min` / `max` のような
+ * 端点 2 点では表せない関係も途中の値が正しくなる。
+ *
+ * 止まった値は結果に載せない。 載せなければ図には `{名前}` が残り、 読み手
+ * (`resolveNumericAttr` / `payload-binding` / `visibleIf`) が既に持っている
+ * 「解決できていない」 の扱いにそのまま乗る。 伝えるための経路を新設しない。
+ *
+ * ただし同じ名前が `states` にもある場合は、 段が出した初期値をそのまま残す
+ * (「まだ計算されていない間の値」 として使う)。
+ */
+/** 値が止まった理由。 呼び出し側が伝え方を決められるように種類を分けておく */
+type DerivedNoticeKind = "cycle" | "unknown-reference" | "parse-error" | "eval-error" | "duplicate-id" | "invalid-id";
+type DerivedNotice = {
+    /** 止まった値の名前 */
+    id: string;
+    kind: DerivedNoticeKind;
+    message: string;
+};
+type DerivedResult = {
+    /** 段の値に、 解けた値を足したもの */
+    values: Record<string, string>;
+    /** 止まった値。 解けた値しか無ければ空 */
+    notices: DerivedNotice[];
+};
+/**
+ * 段の値に、 他の値から決まる値を足して返す。
+ *
+ * 宣言が無ければ受け取った値をそのまま返す (同じ object をそのまま返すので、
+ * 宣言を持たない図は追加の割当てを 1 つも払わない)。
+ */
+declare function applyDerivedValues(base: Record<string, string>, derived: readonly CdlDerivedValue[] | undefined): DerivedResult;
+/** 段の値に、 他の値から決まる値を足した record だけを返す (伝える情報が要らない呼び出し用) */
+declare function withDerivedValues(base: Record<string, string>, derived: readonly CdlDerivedValue[] | undefined): Record<string, string>;
+
 /**
  * scroll progress 計算 (pure function、 CAR #245)。
  *
@@ -3013,7 +3051,7 @@ type TreeBuilder = {
  *   .build();
  */
 declare function tree(preset: TreePreset): TreeBuilder;
-type JourneyEmotion = "delighted" | "happy" | "neutral" | "frustrated" | "angry";
+
 type JourneyStep = {
     id: string;
     title: string;
@@ -3111,7 +3149,7 @@ type FunnelBuilder = {
  *   .build();
  */
 declare function funnel(preset: FunnelPreset): FunnelBuilder;
-type QuadrantQuadrantLabel = "topLeft" | "topRight" | "bottomLeft" | "bottomRight";
+type QuadrantQuadrantLabel = QuadrantKey;
 type QuadrantItem = {
     id: string;
     title: string;
@@ -3368,48 +3406,27 @@ type StateMachine2Builder = {
  *   .build();
  */
 declare function stateMachine2(preset: StateMachine2Preset): StateMachine2Builder;
-type MindMapRadialBranch = {
-    id: string;
-    title: string;
-    /** 色 tone (default は defaultTone)。 8 方向で auto rotate も可 */
-    tone?: Tone;
-    subtitle?: string;
-};
-type MindMapRadialPreset = {
-    id: string;
-    topic: string;
-    /** 中心 node の title (id は builder が "center" で内部生成) */
-    centerTitle: string;
-    /** 中心 node の id override (default "center") */
-    centerId?: string;
-    /** 中心から branch までの距離 (world coord、 default 350) */
-    radius?: number;
-    /** branch node の width (default 260) */
-    branchWidth?: number;
-    /** 中心 node の width (default 260) */
-    centerWidth?: number;
-    defaultTone?: Tone;
-};
-type MindMapRadialBuilder = {
-    branch: (b: MindMapRadialBranch) => MindMapRadialBuilder;
-    build: () => ReturnType<DiagramBuilder["build"]>;
-};
+
 /**
- * mindMapRadial preset ... 中心 node を軸に 8 方向 (0°/45°/90°/135°/180°/225°/270°/315°)
- * へ branch を放射状に配置する。 現行 mindMap (左から右へ水平 tree) と使い分ける用途。
+ * 全 state の現時点 value を計算 (現在 phase + これまでの phase の最終 tween 値を集約)。
+ * - set = 即時切替 (phase 到達で value 上書き、 lerp なし)
+ * - tween = 数値補間 (現 phase 中は progress で lerp、 過去 phase は to 固定)
  *
- * 実装戦略 ... engine の lane × stack grid を活用し、 3 lane (left / center / right) を
- * radius に基づき explicit x で配置、 3 stack row (top / middle / bottom) を stack index 0/1/2 で
- * 割当てる。 branch 順は position 順 (E/SE/S/SW/W/NW/N/NE) に固定し、 index → grid cell mapping。
+ * 段の値を出した後に `laid.derived` (他の値から自動で決まる値) を参照順で解いて足す。
+ * 毎 frame ここを通るので、 掛け算 / 比較のような端点 2 点では表せない関係も途中の値が
+ * 正しくなる。 同じ名前が `states` にもある場合は解けた値が勝ち、 解けなければ初期値が残る。
+ */
+declare function computeStateValues(laid: LaidDiagram, phaseIdx: number, progress: number): Record<string, string>;
+/**
+ * template literal `{stateId}` を values map で置換 (未解決は `{id}` のまま)。
+ * array signal 拡張 (SSOT): 値が JSON array (例 `"[1,2,3]"`) の signal に対しては、
+ *   `{sig[0]}` = 要素 0 の値、 `{sig.length}` = 要素数、
+ *   `{sig.sum}` / `{sig.max}` / `{sig.min}` / `{sig.avg}` = 数値集約 (非数値 element は 0 扱い)。
+ * array 記法対象外 signal は従来通り `{sig}` で単純置換。
  *
- * @example
- * mindMapRadial({ id: "mr", topic: "Product Radial", centerTitle: "Product" })
- *   .branch({ id: "users", title: "Users" })      // 0° (right)
- *   .branch({ id: "road", title: "Roadmap" })     // 45° (bottom-right)
- *   .branch({ id: "metrics", title: "Metrics" })  // 90° (bottom)
- *   ...
- *   .build();
+ * 名前に使える文字は `template-name.ts` が決める (engine 全体で 1 つ)。 ここだけで
+ * 定義すると、 式を書ける側との間で「読めるが書けない」 「書けるが読めない」 名前ができる。
  */
-declare function mindMapRadial(preset: MindMapRadialPreset): MindMapRadialBuilder;
+declare function interpolate(template: string, values: Record<string, string>): string;
 
-export { ARROW_ANGLE_MAX_DEG, ARROW_ENDPOINT_CENTER_TOL, type AnimationChain, type AuthorIntentOptions, type AuthorIntentReport, type BinaryOp, CHAIN_MIN_CLEARANCE, CHAIN_SHIFT_MAX_ACCUMULATED, CHAIN_SHIFT_MAX_ITER, CLEARANCE_LABEL_LABEL, CLEARANCE_LANE_LABEL, CLEARANCE_NODE_LABEL, CLEARANCE_PATH_LABEL, COLUMN_GAP_VARIANCE_TOL, CdlDiagram, CdlDiagramThumbnail, CdlEdge, type CdlEventHandler, CdlEventTarget, CdlInput, CdlLane, CdlNode, CdlScrollTrigger, CdlState, type ChartBuilder, type ChartDatum, type ChartPreset, type ChartType, type ClassDiagramBuilder, type ClassDiagramPreset, type ClassRelationType, Computed, DETOUR_GAP, DETOUR_SLOT_GAP, DIST_LABEL_PATH_MAX, DIST_LABEL_PATH_MIN, type DiagramAdapter, type DiagramBuilder, type Discrepancy, type DiscrepancyKind, type DomVerifyReport, EDGE_LABEL_TEXT, EDGE_STUB_OUT, type EdgeLabelLine, type EdgeLabelTextSpec, EdgeStyle, type ErBuilder, type ErEntity, type ErPreset, type ErRelation, type ErRelationCardinality, type EventAttachHandle, type EventChain, FAN_GAP, FONT_RENDER_TOLERANCE_WORLD, type FlowBuilder, type FlowPreset, type FlowStepInput, type FlowchartBuilder, type FlowchartEdge, type FlowchartNode, type FlowchartNodeShape, type FlowchartPreset, type FormulaAst, type FormulaContext, type FsmState, type FsmStateNested, type FsmTransition, type FsmTransitionExt, type FunnelBuilder, type FunnelPreset, type FunnelStage, type GanttBuilder, type GanttPreset, type GanttTask, type GenericDiagramSpec, type GenericDiscrepancy, type GenericDiscrepancyKind, type GenericVerifyOptions, type Rect as GeometryRect, type Segment as GeometrySegment, type InfraConnection, type InfraNode, type InfrastructureBuilder, type InfrastructurePreset, type InputChain, type IntentDiscrepancy, type IntentDiscrepancyKind, type JourneyEmotion, type JourneyStep, LABEL_INIT_CLEARANCE, LABEL_INIT_CLEARANCE_DOTTED_FLOW, LABEL_SIZE_TOLERANCE_WORLD, LABEL_TO_PATH_CLEARANCE, LANE_BORDER_CLEARANCE_TOL, LaidDiagram, LaidEdge, LaidNode, type LayoutWithValidationOptions, type LayoutWithValidationResult, MARKER_GLOW_RADIUS, MIN_COLUMN_ALIGNMENT_TOLERANCE, MIN_ROW_ALIGNMENT_TOLERANCE, type MathFnName, type MindBranch, type MindMapBuilder, type MindMapPreset, type MindMapRadialBranch, type MindMapRadialBuilder, type MindMapRadialPreset, NEAR_COLLISION_DEFAULT_MIN, NEAR_COLLISION_POLICY, NODE_FRAME_SELECTOR, type NetworkBuilder, type NetworkDevice, type NetworkDeviceKind, type NetworkLink, type NetworkPreset, NodeKind, type PageLike, type PhaseBuilder, type QuadrantBuilder, type QuadrantItem, type QuadrantPreset, type QuadrantQuadrantLabel, ROW_GAP_VARIANCE_TOL, SPEC_CLEARANCE_POLICY, STAGE_SVG_SELECTOR, type SequenceBuilder, type SequencePreset, type SequenceStep, Side, Signal, type StateMachine2Builder, type StateMachine2Preset, type StateMachineBuilder, type StateMachinePreset, type SweepReport, type SwimlanePreset, TARGET_LABEL_PATH_DIST, Tone, type TopologyBuilder, type TopologyConnection, type TopologyContainer, type TopologyGroupBuilder, type TopologyPreset, type TreeBuilder, type TreeNode, type TreePreset, type UmlClass, type UmlRelation, type UserJourneyBuilder, type UserJourneyPreset, type ValidateOptions, type ValidationProfile, type VerifyOptions, type Violation, type VisualAxis, type VisualValidationReport, WCAG_AA_LARGE, WCAG_AA_NORMAL, assertNever, attachEventHandlers, batch, bboxClearance, bboxDiffWorld, cdlAdapter, chart, classDiagram, compile, computeScrollProgress, computeViewportScale, countEdgeCrossings, createFormulaComputeds, createInputSignals, diagram, effect, er, evaluate as evaluateFormula, extractIdentifiers, flow, flowchart, funnel, gantt, infrastructure, inputDefaultValue, isLargeText, labelInitClearance, layout, layoutWithValidation, mindMap, mindMapRadial, network, parseFormula, pointRectEdgeDistance, pointToSegmentDistance, predictLabelBBoxWorld, predictNodeBBoxWorld, projectEdgeLabel, projectNode, projectPathSegment, pxToWorld, quadrant, rectRectClearance, rectRectOverlapArea, rendersRows, requiredContrastRatio, requiredNearClearance, requiredRowsHeight, requiredRowsWidth, requiredSpecClearance, resolveEdgeLabelOverlapsWithChain, resolveEdgeLabelOverlapsWithChainAndPropagate, resolveOverlapsWithChain, resolveTarget, resolveTargetAll, segmentsIntersect, sequence, stateMachine, stateMachine2, swimlane, topology, tree, untrack, userJourney, validate, verifyAllDiagramsDom, verifyAuthorIntent, verifyAuthorIntentAll, verifyDiagramDom, visualValidate, visualValidateAll, visualValidateLaid, worldToPx };
+export { ARROW_ANGLE_MAX_DEG, ARROW_ENDPOINT_CENTER_TOL, type AnimationChain, type AuthorIntentOptions, type AuthorIntentReport, type BinaryOp, CHAIN_MIN_CLEARANCE, CHAIN_SHIFT_MAX_ACCUMULATED, CHAIN_SHIFT_MAX_ITER, CLEARANCE_LABEL_LABEL, CLEARANCE_LANE_LABEL, CLEARANCE_NODE_LABEL, CLEARANCE_PATH_LABEL, COLUMN_GAP_VARIANCE_TOL, CdlDerivedValue, CdlDiagram, CdlDiagramThumbnail, CdlEdge, type CdlEventHandler, CdlEventTarget, CdlInput, CdlLane, CdlNode, CdlScrollTrigger, CdlState, type ChartBuilder, type ChartDatum, type ChartPreset, type ChartType, type ClassDiagramBuilder, type ClassDiagramPreset, type ClassRelationType, Computed, DETOUR_GAP, DETOUR_SLOT_GAP, DIST_LABEL_PATH_MAX, DIST_LABEL_PATH_MIN, type DerivedNotice, type DerivedNoticeKind, type DerivedResult, type DiagramAdapter, type DiagramBuilder, type Discrepancy, type DiscrepancyKind, type DomVerifyReport, EDGE_LABEL_TEXT, EDGE_STUB_OUT, type EdgeLabelLine, type EdgeLabelTextSpec, EdgeStyle, type ErBuilder, type ErEntity, type ErPreset, type ErRelation, type ErRelationCardinality, type EventAttachHandle, type EventChain, FAN_GAP, FONT_RENDER_TOLERANCE_WORLD, type FlowBuilder, type FlowPreset, type FlowStepInput, type FlowchartBuilder, type FlowchartEdge, type FlowchartNode, type FlowchartNodeShape, type FlowchartPreset, type FormulaAst, type FormulaContext, type FsmState, type FsmStateNested, type FsmTransition, type FsmTransitionExt, type FunnelBuilder, type FunnelPreset, type FunnelStage, type GanttBuilder, type GanttPreset, type GanttTask, type GenericDiagramSpec, type GenericDiscrepancy, type GenericDiscrepancyKind, type GenericVerifyOptions, type Rect as GeometryRect, type Segment as GeometrySegment, type InfraConnection, type InfraNode, type InfrastructureBuilder, type InfrastructurePreset, type InputChain, type IntentDiscrepancy, type IntentDiscrepancyKind, JourneyEmotion, type JourneyStep, LABEL_INIT_CLEARANCE, LABEL_INIT_CLEARANCE_DOTTED_FLOW, LABEL_SIZE_TOLERANCE_WORLD, LABEL_TO_PATH_CLEARANCE, LANE_BORDER_CLEARANCE_TOL, LaidDiagram, LaidEdge, LaidNode, type LayoutWithValidationOptions, type LayoutWithValidationResult, MARKER_GLOW_RADIUS, MIN_COLUMN_ALIGNMENT_TOLERANCE, MIN_ROW_ALIGNMENT_TOLERANCE, type MathFnName, type MindBranch, type MindMapBuilder, type MindMapPreset, NEAR_COLLISION_DEFAULT_MIN, NEAR_COLLISION_POLICY, NODE_FRAME_SELECTOR, type NetworkBuilder, type NetworkDevice, type NetworkDeviceKind, type NetworkLink, type NetworkPreset, NodeKind, type PageLike, type PhaseBuilder, type QuadrantBuilder, type QuadrantItem, type QuadrantPreset, type QuadrantQuadrantLabel, ROW_GAP_VARIANCE_TOL, SPEC_CLEARANCE_POLICY, STAGE_SVG_SELECTOR, type SequenceBuilder, type SequencePreset, type SequenceStep, Side, Signal, type StateMachine2Builder, type StateMachine2Preset, type StateMachineBuilder, type StateMachinePreset, type SweepReport, type SwimlanePreset, TARGET_LABEL_PATH_DIST, Tone, type TopologyBuilder, type TopologyConnection, type TopologyContainer, type TopologyGroupBuilder, type TopologyPreset, type TreeBuilder, type TreeNode, type TreePreset, type UmlClass, type UmlRelation, type UserJourneyBuilder, type UserJourneyPreset, type ValidateOptions, type ValidationProfile, type VerifyOptions, type Violation, type VisualAxis, type VisualValidationReport, WCAG_AA_LARGE, WCAG_AA_NORMAL, applyDerivedValues, assertNever, attachEventHandlers, batch, bboxClearance, bboxDiffWorld, cdlAdapter, chart, classDiagram, compile, computeScrollProgress, computeStateValues, computeViewportScale, countEdgeCrossings, createFormulaComputeds, createInputSignals, diagram, effect, er, evaluate as evaluateFormula, extractIdentifiers, flow, flowchart, funnel, gantt, infrastructure, inputDefaultValue, interpolate, isLargeText, labelInitClearance, layout, layoutWithValidation, mindMap, network, parseFormula, pointRectEdgeDistance, pointToSegmentDistance, predictLabelBBoxWorld, predictNodeBBoxWorld, projectEdgeLabel, projectNode, projectPathSegment, pxToWorld, quadrant, rectRectClearance, rectRectOverlapArea, rendersRows, requiredContrastRatio, requiredNearClearance, requiredRowsHeight, requiredRowsWidth, requiredSpecClearance, resolveEdgeLabelOverlapsWithChain, resolveEdgeLabelOverlapsWithChainAndPropagate, resolveOverlapsWithChain, resolveTarget, resolveTargetAll, segmentsIntersect, sequence, stateMachine, stateMachine2, swimlane, topology, tree, untrack, userJourney, validate, verifyAllDiagramsDom, verifyAuthorIntent, verifyAuthorIntentAll, verifyDiagramDom, visualValidate, visualValidateAll, visualValidateLaid, withDerivedValues, worldToPx };