@f1studio/form-spec 5.0.0-alpha.167 → 5.0.0-alpha.169

package/src/FormSpec.FS/PathwayDataExtractor.ts

@@ -1,15 +1,20 @@
-import { ClinicalPathway_TerminalInfo, Shared_StateKey, ClinicalPathway_StateType_$union, ClinicalPathway_EvaluationInfo, ClinicalPathway_ActionInfo_$union, ClinicalPathway_MedicationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_NavigateToFormAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_TaskAction, ClinicalPathway_DocumentationAction, ClinicalPathway_ReferralAction, ClinicalPathway_TestAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction } from "./FormSpec.js";
+import { value as value_1, Option, defaultArg } from "@fable-org/fable-library-js/Option.js";
 import { split, replace, join, isNullOrWhiteSpace, substring, printf, toText } from "@fable-org/fable-library-js/String.js";
-import { Option, value as value_1, defaultArg } from "@fable-org/fable-library-js/Option.js";
-import { singleton, append, map, FSharpList, empty } from "@fable-org/fable-library-js/List.js";
+import { ClinicalPathway_TerminalInfo, Shared_StateKey, ClinicalPathway_StateType_$union, ClinicalPathway_EvaluationInfo, ClinicalPathway_TreatmentAction, ClinicalPathway_ActionInfo_$union, ClinicalPathway_MedicationAction, ClinicalPathway_GroupRef, ClinicalPathway_GroupChangeAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_NavigateToFormAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_AlertAction, ClinicalPathway_TaskAction, ClinicalPathway_DocumentationAction, ClinicalPathway_ReferralAction, ClinicalPathway_TestAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_MedsetAction } from "./FormSpec.js";
+import { singleton, append, FSharpList, empty, map } from "@fable-org/fable-library-js/List.js";
+import { int32ToString } from "@fable-org/fable-library-js/Util.js";
 import { item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 
+function stated(o: Option<string>): string {
+    return defaultArg<string>(o, "(none stated)");
+}
+
 export function extractActionText(action: ClinicalPathway_ActionInfo_$union): string {
     switch (action.tag) {
         case /* Treatment */ 1: {
-            const t: ClinicalPathway_TreatmentAction = action.fields[0];
-            return toText(printf("Treatment: %s"))(t.Name);
+            const arg_1: string = stated(action.fields[0].Name);
+            return toText(printf("Treatment: %s"))(arg_1);
         }
         case /* Medset */ 2: {
             const m_1: ClinicalPathway_MedsetAction = action.fields[0];
@@ -37,15 +42,16 @@ export function extractActionText(action: ClinicalPathway_ActionInfo_$union): st
         }
         case /* Task */ 8: {
             const t_2: ClinicalPathway_TaskAction = action.fields[0];
-            return toText(printf("Task: %s"))(t_2.Description);
+            const arg_7: string = defaultArg<string>(t_2.Description, t_2.Category);
+            return toText(printf("Task: %s"))(arg_7);
         }
         case /* Alert */ 9: {
             const a: ClinicalPathway_AlertAction = action.fields[0];
             return toText(printf("Alert: %s"))(a.Message);
         }
         case /* Problem */ 10: {
-            const p_1: ClinicalPathway_ProblemAction = action.fields[0];
-            return toText(printf("Problem: %s"))(p_1.ProblemName);
+            const arg_9: string = stated(action.fields[0].ProblemName);
+            return toText(printf("Problem: %s"))(arg_9);
         }
         case /* Prescription */ 11: {
             const p_2: ClinicalPathway_PrescriptionAction = action.fields[0];
@@ -79,6 +85,12 @@ export function extractActionText(action: ClinicalPathway_ActionInfo_$union): st
             }
             return toText(printf("Set Field: %s = %s"))(shortGuid)(valueText);
         }
+        case /* ChangeGroups */ 14: {
+            const g_2: ClinicalPathway_GroupChangeAction = action.fields[0];
+            const verb: string = (g_2.Change.tag === /* RemoveFromGroups */ 1) ? "Remove from groups" : "Add to groups";
+            const arg_15: string = join(", ", map<ClinicalPathway_GroupRef, string>((r_1: ClinicalPathway_GroupRef): string => defaultArg<string>(r_1.Name, int32ToString(r_1.GroupId)), g_2.Groups));
+            return toText(printf("%s: %s"))(verb)(arg_15);
+        }
         default: {
             const m: ClinicalPathway_MedicationAction = action.fields[0];
             return toText(printf("Rx: %s"))(m.Name);
@@ -90,8 +102,9 @@ export function extractActionDetails(action: ClinicalPathway_ActionInfo_$union):
     switch (action.tag) {
         case /* Treatment */ 1: {
             const t: ClinicalPathway_TreatmentAction = action.fields[0];
+            const arg_4: string = stated(t.Name);
             const arg_5: string = defaultArg(t.Signature, "");
-            return toText(printf("Treatment: %s (%s)"))(t.Name)(arg_5);
+            return toText(printf("Treatment: %s (%s)"))(arg_4)(arg_5);
         }
         case /* Medset */ 2: {
             const m_1: ClinicalPathway_MedsetAction = action.fields[0];
@@ -115,15 +128,16 @@ export function extractActionDetails(action: ClinicalPathway_ActionInfo_$union):
         }
         case /* Task */ 8: {
             const t_2: ClinicalPathway_TaskAction = action.fields[0];
-            return toText(printf("Task: %s"))(t_2.Description);
+            const arg_11: string = defaultArg<string>(t_2.Description, t_2.Category);
+            return toText(printf("Task: %s"))(arg_11);
         }
         case /* Alert */ 9: {
             const a: ClinicalPathway_AlertAction = action.fields[0];
             return toText(printf("Alert: %s"))(a.Message);
         }
         case /* Problem */ 10: {
-            const p_1: ClinicalPathway_ProblemAction = action.fields[0];
-            return toText(printf("Problem: %s"))(p_1.ProblemName);
+            const arg_13: string = stated(action.fields[0].ProblemName);
+            return toText(printf("Problem: %s"))(arg_13);
         }
         case /* Prescription */ 11: {
             const p_2: ClinicalPathway_PrescriptionAction = action.fields[0];
@@ -154,6 +168,12 @@ export function extractActionDetails(action: ClinicalPathway_ActionInfo_$union):
             }
             return toText(printf("Set Field %s = %s"))(guid)(valueText);
         }
+        case /* ChangeGroups */ 14: {
+            const g_2: ClinicalPathway_GroupChangeAction = action.fields[0];
+            const verb: string = (g_2.Change.tag === /* RemoveFromGroups */ 1) ? "Remove from groups" : "Add to groups";
+            const arg_19: string = join(", ", map<ClinicalPathway_GroupRef, string>((r_1: ClinicalPathway_GroupRef): string => int32ToString(r_1.GroupId), g_2.Groups));
+            return toText(printf("%s: %s"))(verb)(arg_19);
+        }
         default: {
             const m: ClinicalPathway_MedicationAction = action.fields[0];
             return toText(printf("%s %s %s %s"))(m.Name)(m.Dose)(m.Route)(m.Frequency);
@@ -189,6 +209,8 @@ export function extractActionType(action: ClinicalPathway_ActionInfo_$union): st
             return "SetFieldValue";
         case /* NavigateToForm */ 13:
             return "NavigateToForm";
+        case /* ChangeGroups */ 14:
+            return "ChangeGroups";
         default:
             return "Medication";
     }
@@ -205,23 +227,21 @@ export function extractEvaluationName(evaluation: ClinicalPathway_EvaluationInfo
 
 export function stateTypeToString(stateType: ClinicalPathway_StateType_$union): string {
     switch (stateType.tag) {
-        case /* Evaluation */ 1:
-            return "Evaluation";
-        case /* Action */ 2:
+        case /* Action */ 1:
             return "Action";
-        case /* CompoundAction */ 3:
+        case /* CompoundAction */ 2:
             return "CompoundAction";
-        case /* ConditionalAction */ 4:
+        case /* ConditionalAction */ 3:
             return "ConditionalAction";
-        case /* Terminal */ 5:
+        case /* Terminal */ 4:
             return "Terminal";
         default:
-            throw new Error("Match failure: F1.Studio.ClinicalPathway.StateType");
+            return "Evaluation";
     }
 }
 
 export function isTerminalState(stateType: ClinicalPathway_StateType_$union): boolean {
-    if (stateType.tag === /* Terminal */ 5) {
+    if (stateType.tag === /* Terminal */ 4) {
         return true;
     }
     else {

package/src/FormSpec.FS/PathwayExecutor.ts

@@ -1,7 +1,7 @@
 import { FSharpRef, Record, Union } from "@fable-org/fable-library-js/Types.js";
-import { fold, findIndex, tryPick, sortByDescending, truncate, length, sortBy, tryHead, filter as filter_1, ofArray as ofArray_1, append, empty, head, tail, concat, exists, singleton, forAll, collect, map as map_1, sumBy, sum, isEmpty, choose, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { fold, findIndex, tryPick, sortByDescending, truncate, length, sortBy, tryHead, filter as filter_1, ofArray as ofArray_1, append, empty, head, tail, concat, exists, singleton, forAll, map as map_1, collect, sumBy, sum, isEmpty, choose, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { tuple_type, bool_type, float64_type, lambda_type, class_type, record_type, int32_type, union_type, list_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
-import { ClinicalPathway_PathwayExecutionMode_$reflection, ClinicalPathway_SetFieldValueAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_PathwayExecutionMode_$union, ClinicalPathway_SelectionStrategy_$union, ClinicalPathway_CombinationStrategy_$union, ClinicalPathway_StateType_$union, ClinicalPathway_StateDefinition, Shared_PluginPropertyKey, Shared_FieldOptionKey, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, ClinicalPathway_StateEvaluator_$union, Shared_FieldValue_Single, Shared_ConditionValue_$union, Shared_MatrixAnswer, ClinicalPathway_FieldEvaluator_$union, Shared_PluginDataProperty, Shared_PluginDataProperty_$reflection, Spec_Score, Spec_ScoreRange, Spec_FormStep$1, Spec_FormField$1, Shared_FieldValue_$union, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldOption, Spec_FieldType, Shared_TransitionKey_$reflection, Shared_TransitionKey, Shared_FieldKey_$reflection, ClinicalPathway_ActionInfo_$reflection, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, ClinicalPathway_ClinicalPathwaySpec_$reflection, Shared_FieldKey, ClinicalPathway_ActionInfo_$union, Spec_FieldType_$union, Spec_FormSpec$1, ClinicalPathway_ClinicalPathwaySpec, Shared_StateKey_$reflection, Shared_StateKey, ClinicalPathway_TransitionDefinition_$reflection, ClinicalPathway_TransitionDefinition } from "./FormSpec.js";
+import { ClinicalPathway_PathwayExecutionMode_$reflection, ClinicalPathway_ActionInfo_$union, ClinicalPathway_SetFieldValueAction, Spec_Label_shown, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_PathwayExecutionMode_$union, ClinicalPathway_SelectionStrategy_$union, ClinicalPathway_CombinationStrategy_$union, ClinicalPathway_StateType_$union, ClinicalPathway_StateDefinition, Shared_PluginPropertyKey, Shared_FieldOptionKey, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, ClinicalPathway_StateEvaluator_$union, Shared_FieldValue_Single, Shared_ConditionValue_$union, Shared_MatrixAnswer, ClinicalPathway_FieldEvaluator_$union, Shared_PluginDataProperty, Shared_PluginDataProperty_$reflection, Spec_Score, Spec_ScoreRange, Spec_FormStep$1, Spec_FormField$1, Shared_FieldValue_$union, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldOption, Spec_FieldType, Shared_TransitionKey_$reflection, Shared_TransitionKey, Shared_FieldKey_$reflection, ClinicalPathway_PathwayAction_$reflection, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, ClinicalPathway_ClinicalPathwaySpec_$reflection, Shared_FieldKey, ClinicalPathway_PathwayAction, Spec_FieldType_$union, Spec_FormSpec$1, ClinicalPathway_ClinicalPathwaySpec, Shared_StateKey_$reflection, Shared_StateKey, ClinicalPathway_TransitionDefinition_$reflection, ClinicalPathway_TransitionDefinition } from "./FormSpec.js";
 import { tryParse as tryParse_1, float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { int32ToString, equals, compare, comparePrimitives, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { difference, union, empty as empty_1, FSharpSet__get_IsEmpty, FSharpSet__get_Count, contains, isSubset, ofArray, FSharpSet__Contains, ofList as ofList_1, map as map_2, toList, FSharpSet } from "@fable-org/fable-library-js/Set.js";
@@ -95,10 +95,10 @@ export class ExecutionContext extends Record {
     readonly CompletedStates: FSharpSet<Shared_StateKey>;
     readonly ActiveTransitions: FSharpList<MatchedTransition>;
     readonly PendingTransitions: FSharpList<MatchedTransition>;
-    readonly ExecutedActions: FSharpList<ClinicalPathway_ActionInfo_$union>;
+    readonly ExecutedActions: FSharpList<ClinicalPathway_PathwayAction>;
     readonly FieldResolver: ((arg0: string) => Shared_FieldKey);
     readonly ExecutionLog: FSharpList<ExecutionLogEntry>;
-    constructor(PathwaySpec: ClinicalPathway_ClinicalPathwaySpec, FormSpec: Spec_FormSpec$1<Spec_FieldType_$union>, CurrentStates: FSharpSet<Shared_StateKey>, VisitedStates: FSharpSet<Shared_StateKey>, CompletedStates: FSharpSet<Shared_StateKey>, ActiveTransitions: FSharpList<MatchedTransition>, PendingTransitions: FSharpList<MatchedTransition>, ExecutedActions: FSharpList<ClinicalPathway_ActionInfo_$union>, FieldResolver: ((arg0: string) => Shared_FieldKey), ExecutionLog: FSharpList<ExecutionLogEntry>) {
+    constructor(PathwaySpec: ClinicalPathway_ClinicalPathwaySpec, FormSpec: Spec_FormSpec$1<Spec_FieldType_$union>, CurrentStates: FSharpSet<Shared_StateKey>, VisitedStates: FSharpSet<Shared_StateKey>, CompletedStates: FSharpSet<Shared_StateKey>, ActiveTransitions: FSharpList<MatchedTransition>, PendingTransitions: FSharpList<MatchedTransition>, ExecutedActions: FSharpList<ClinicalPathway_PathwayAction>, FieldResolver: ((arg0: string) => Shared_FieldKey), ExecutionLog: FSharpList<ExecutionLogEntry>) {
         super();
         this.PathwaySpec = PathwaySpec;
         this.FormSpec = FormSpec;
@@ -114,16 +114,16 @@ export class ExecutionContext extends Record {
 }
 
 export function ExecutionContext_$reflection(): TypeInfo {
-    return record_type("F1.Studio.PathwayExecutor.ExecutionContext", [], ExecutionContext, () => [["PathwaySpec", ClinicalPathway_ClinicalPathwaySpec_$reflection()], ["FormSpec", Spec_FormSpec$1_$reflection(Spec_FieldType_$reflection())], ["CurrentStates", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [Shared_StateKey_$reflection()])], ["VisitedStates", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [Shared_StateKey_$reflection()])], ["CompletedStates", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [Shared_StateKey_$reflection()])], ["ActiveTransitions", list_type(MatchedTransition_$reflection())], ["PendingTransitions", list_type(MatchedTransition_$reflection())], ["ExecutedActions", list_type(ClinicalPathway_ActionInfo_$reflection())], ["FieldResolver", lambda_type(string_type, Shared_FieldKey_$reflection())], ["ExecutionLog", list_type(ExecutionLogEntry_$reflection())]]);
+    return record_type("F1.Studio.PathwayExecutor.ExecutionContext", [], ExecutionContext, () => [["PathwaySpec", ClinicalPathway_ClinicalPathwaySpec_$reflection()], ["FormSpec", Spec_FormSpec$1_$reflection(Spec_FieldType_$reflection())], ["CurrentStates", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [Shared_StateKey_$reflection()])], ["VisitedStates", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [Shared_StateKey_$reflection()])], ["CompletedStates", class_type("Microsoft.FSharp.Collections.FSharpSet`1", [Shared_StateKey_$reflection()])], ["ActiveTransitions", list_type(MatchedTransition_$reflection())], ["PendingTransitions", list_type(MatchedTransition_$reflection())], ["ExecutedActions", list_type(ClinicalPathway_PathwayAction_$reflection())], ["FieldResolver", lambda_type(string_type, Shared_FieldKey_$reflection())], ["ExecutionLog", list_type(ExecutionLogEntry_$reflection())]]);
 }
 
 export class PredictedPathway extends Record implements IEquatable<PredictedPathway>, IComparable<PredictedPathway> {
     readonly PathwayId: string;
     readonly Probability: float64;
     readonly RequiredFields: FSharpList<string>;
-    readonly ExpectedActions: FSharpList<ClinicalPathway_ActionInfo_$union>;
+    readonly ExpectedActions: FSharpList<ClinicalPathway_PathwayAction>;
     readonly TargetState: string;
-    constructor(PathwayId: string, Probability: float64, RequiredFields: FSharpList<string>, ExpectedActions: FSharpList<ClinicalPathway_ActionInfo_$union>, TargetState: string) {
+    constructor(PathwayId: string, Probability: float64, RequiredFields: FSharpList<string>, ExpectedActions: FSharpList<ClinicalPathway_PathwayAction>, TargetState: string) {
         super();
         this.PathwayId = PathwayId;
         this.Probability = Probability;
@@ -134,7 +134,7 @@ export class PredictedPathway extends Record implements IEquatable<PredictedPath
 }
 
 export function PredictedPathway_$reflection(): TypeInfo {
-    return record_type("F1.Studio.PathwayExecutor.PredictedPathway", [], PredictedPathway, () => [["PathwayId", string_type], ["Probability", float64_type], ["RequiredFields", list_type(string_type)], ["ExpectedActions", list_type(ClinicalPathway_ActionInfo_$reflection())], ["TargetState", string_type]]);
+    return record_type("F1.Studio.PathwayExecutor.PredictedPathway", [], PredictedPathway, () => [["PathwayId", string_type], ["Probability", float64_type], ["RequiredFields", list_type(string_type)], ["ExpectedActions", list_type(ClinicalPathway_PathwayAction_$reflection())], ["TargetState", string_type]]);
 }
 
 export class IncrementalExecutionResult extends Record {
@@ -161,10 +161,10 @@ export function IncrementalExecutionResult_$reflection(): TypeInfo {
 
 export class ClinicalPlan extends Record implements IEquatable<ClinicalPlan>, IComparable<ClinicalPlan> {
     readonly PlanId: string;
-    readonly Actions: FSharpList<ClinicalPathway_ActionInfo_$union>;
+    readonly Actions: FSharpList<ClinicalPathway_PathwayAction>;
     readonly TargetState: string;
     readonly Priority: int32;
-    constructor(PlanId: string, Actions: FSharpList<ClinicalPathway_ActionInfo_$union>, TargetState: string, Priority: int32) {
+    constructor(PlanId: string, Actions: FSharpList<ClinicalPathway_PathwayAction>, TargetState: string, Priority: int32) {
         super();
         this.PlanId = PlanId;
         this.Actions = Actions;
@@ -174,7 +174,7 @@ export class ClinicalPlan extends Record implements IEquatable<ClinicalPlan>, IC
 }
 
 export function ClinicalPlan_$reflection(): TypeInfo {
-    return record_type("F1.Studio.PathwayExecutor.ClinicalPlan", [], ClinicalPlan, () => [["PlanId", string_type], ["Actions", list_type(ClinicalPathway_ActionInfo_$reflection())], ["TargetState", string_type], ["Priority", int32_type]]);
+    return record_type("F1.Studio.PathwayExecutor.ClinicalPlan", [], ClinicalPlan, () => [["PlanId", string_type], ["Actions", list_type(ClinicalPathway_PathwayAction_$reflection())], ["TargetState", string_type], ["Priority", int32_type]]);
 }
 
 export class VisualizationState extends Record implements IEquatable<VisualizationState>, IComparable<VisualizationState> {
@@ -322,7 +322,7 @@ export function ScoreCalculator_getScoreRange(score: Option<Spec_Score>, value:
  */
 export function FieldResolver_createResolver(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): ((arg0: string) => Shared_FieldKey) {
     const formCode: string = defaultArg(map<string, string>(Helpers_canonicalizeFieldKey, formSpec.Code), "unknown");
-    const labelToFieldKey: FSharpMap<string, Shared_FieldKey> = ofList<string, Shared_FieldKey>(map_1<Spec_FormField$1<Spec_FieldType_$union>, [string, Shared_FieldKey]>((field: Spec_FormField$1<Spec_FieldType_$union>): [string, Shared_FieldKey] => ([field.Label.toLocaleLowerCase().trim(), field.FieldKey] as [string, Shared_FieldKey]), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)), {
+    const labelToFieldKey: FSharpMap<string, Shared_FieldKey> = ofList<string, Shared_FieldKey>(choose<Spec_FormField$1<Spec_FieldType_$union>, [string, Shared_FieldKey]>((field: Spec_FormField$1<Spec_FieldType_$union>): Option<[string, Shared_FieldKey]> => map<string, [string, Shared_FieldKey]>((label: string): [string, Shared_FieldKey] => ([label.toLocaleLowerCase().trim(), field.FieldKey] as [string, Shared_FieldKey]), field.Label), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)), {
         Compare: comparePrimitives,
     });
     return (fieldReference: string): Shared_FieldKey => {
@@ -949,19 +949,19 @@ export function findState(stateKey: Shared_StateKey, states: FSharpList<Clinical
 /**
  * Extract actions from state
  */
-export function extractActionsFromState(state: ClinicalPathway_StateDefinition): FSharpList<ClinicalPathway_ActionInfo_$union> {
+export function extractActionsFromState(state: ClinicalPathway_StateDefinition): FSharpList<ClinicalPathway_PathwayAction> {
     const matchValue: ClinicalPathway_StateType_$union = state.StateType;
     switch (matchValue.tag) {
-        case /* Action */ 2:
+        case /* Action */ 1:
             return singleton(matchValue.fields[0]);
-        case /* CompoundAction */ 3:
+        case /* CompoundAction */ 2:
             return matchValue.fields[0];
-        case /* ConditionalAction */ 4: {
+        case /* ConditionalAction */ 3: {
             const condition: ClinicalPathway_TransitionCondition_$union = matchValue.fields[0];
-            return append(singleton(matchValue.fields[1]), ofArray_1(toArray<ClinicalPathway_ActionInfo_$union>(matchValue.fields[2])));
+            return append(singleton(matchValue.fields[1]), ofArray_1(toArray<ClinicalPathway_PathwayAction>(matchValue.fields[2])));
         }
         default:
-            return empty<ClinicalPathway_ActionInfo_$union>();
+            return empty<ClinicalPathway_PathwayAction>();
     }
 }
 
@@ -969,7 +969,7 @@ export function extractActionsFromState(state: ClinicalPathway_StateDefinition):
  * Check if a state is terminal
  */
 export function isTerminalState(state: ClinicalPathway_StateDefinition): boolean {
-    if (state.StateType.tag === /* Terminal */ 5) {
+    if (state.StateType.tag === /* Terminal */ 4) {
         return true;
     }
     else {
@@ -1147,7 +1147,7 @@ export function initializeExecution(formSpec: Spec_FormSpec$1<Spec_FieldType_$un
             Compare: compare,
         }), empty_1<Shared_StateKey>({
             Compare: compare,
-        }), empty<MatchedTransition>(), empty<MatchedTransition>(), empty<ClinicalPathway_ActionInfo_$union>(), resolver, map_1<Shared_StateKey, ExecutionLogEntry>((stateKey: Shared_StateKey): ExecutionLogEntry => (new ExecutionLogEntry(now(), stateKey, "Initialized", "Starting state")), initialStates));
+        }), empty<MatchedTransition>(), empty<MatchedTransition>(), empty<ClinicalPathway_PathwayAction>(), resolver, map_1<Shared_StateKey, ExecutionLogEntry>((stateKey: Shared_StateKey): ExecutionLogEntry => (new ExecutionLogEntry(now(), stateKey, "Initialized", "Starting state")), initialStates));
     }
 }
 
@@ -1194,7 +1194,7 @@ export function executeSetFieldValueAction(action: ClinicalPathway_SetFieldValue
             }
             else {
                 const step_2: Spec_FormStep$1<Spec_FieldType_$union> = value_4(stepOpt);
-                return updateField<Spec_FieldType_$union>(formSpec, action.TargetField, Shared_FieldValue_Single(new Shared_FieldAnswer(action.TargetField, targetField.Label, valueToSet, undefined)), findIndex<Spec_FormStep$1<Spec_FieldType_$union>>((s: Spec_FormStep$1<Spec_FieldType_$union>): boolean => (s.StepOrder === step_2.StepOrder), formSpec.Steps));
+                return updateField<Spec_FieldType_$union>(formSpec, action.TargetField, Shared_FieldValue_Single(new Shared_FieldAnswer(action.TargetField, Spec_Label_shown(targetField.Label), valueToSet, undefined)), findIndex<Spec_FormStep$1<Spec_FieldType_$union>>((s: Spec_FormStep$1<Spec_FieldType_$union>): boolean => (s.StepOrder === step_2.StepOrder), formSpec.Steps));
             }
         }
     }
@@ -1241,8 +1241,8 @@ export function executeStep(context_mut: ExecutionContext, maxIterations_mut: in
                 const newStates: FSharpSet<Shared_StateKey> = ofList_1<Shared_StateKey>(map_1<MatchedTransition, Shared_StateKey>((t: MatchedTransition): Shared_StateKey => t.Transition.ToState, selectedTransitions), {
                     Compare: compare,
                 });
-                const newActions: FSharpList<ClinicalPathway_ActionInfo_$union> = collect<ClinicalPathway_StateDefinition, ClinicalPathway_ActionInfo_$union>(extractActionsFromState, choose<Shared_StateKey, ClinicalPathway_StateDefinition>((sk: Shared_StateKey): Option<ClinicalPathway_StateDefinition> => findState(sk, context.PathwaySpec.States), toList<Shared_StateKey>(newStates)));
-                const updatedFormSpec: Spec_FormSpec$1<Spec_FieldType_$union> = executeActions(newActions, context.FormSpec);
+                const newActions: FSharpList<ClinicalPathway_PathwayAction> = collect<ClinicalPathway_StateDefinition, ClinicalPathway_PathwayAction>(extractActionsFromState, choose<Shared_StateKey, ClinicalPathway_StateDefinition>((sk: Shared_StateKey): Option<ClinicalPathway_StateDefinition> => findState(sk, context.PathwaySpec.States), toList<Shared_StateKey>(newStates)));
+                const updatedFormSpec: Spec_FormSpec$1<Spec_FieldType_$union> = executeActions(map_1<ClinicalPathway_PathwayAction, ClinicalPathway_ActionInfo_$union>((a: ClinicalPathway_PathwayAction): ClinicalPathway_ActionInfo_$union => a.Action, newActions), context.FormSpec);
                 const newLogEntries: FSharpList<ExecutionLogEntry> = map_1<MatchedTransition, ExecutionLogEntry>((t_1: MatchedTransition): ExecutionLogEntry => {
                     let arg: string, arg_1: string;
                     return new ExecutionLogEntry(now(), t_1.Transition.ToState, "Transitioned", (arg = t_1.Transition.FromState.fields[0], (arg_1 = t_1.Transition.TransitionKey.fields[0], toText(printf("From %s via %s"))(arg)(arg_1))));
@@ -1325,14 +1325,14 @@ export class PathwayExecutionResult$1<FieldType> extends Record implements IEqua
     readonly ExecutionMode: ClinicalPathway_PathwayExecutionMode_$union;
     readonly SelectedPaths: FSharpList<string>;
     readonly RejectedPaths: FSharpList<[string, string]>;
-    readonly ExecutedActions: FSharpList<ClinicalPathway_ActionInfo_$union>;
+    readonly ExecutedActions: FSharpList<ClinicalPathway_PathwayAction>;
     readonly VisitedStates: FSharpList<string>;
     readonly TransitionsUsed: FSharpList<string>;
     readonly FormSpec: Spec_FormSpec$1<FieldType>;
     readonly ExecutionTime: Date;
     readonly Success: boolean;
     readonly Errors: FSharpList<string>;
-    constructor(PathwayId: string, StartState: string, CurrentState: string, ExecutionMode: ClinicalPathway_PathwayExecutionMode_$union, SelectedPaths: FSharpList<string>, RejectedPaths: FSharpList<[string, string]>, ExecutedActions: FSharpList<ClinicalPathway_ActionInfo_$union>, VisitedStates: FSharpList<string>, TransitionsUsed: FSharpList<string>, FormSpec: Spec_FormSpec$1<FieldType>, ExecutionTime: Date, Success: boolean, Errors: FSharpList<string>) {
+    constructor(PathwayId: string, StartState: string, CurrentState: string, ExecutionMode: ClinicalPathway_PathwayExecutionMode_$union, SelectedPaths: FSharpList<string>, RejectedPaths: FSharpList<[string, string]>, ExecutedActions: FSharpList<ClinicalPathway_PathwayAction>, VisitedStates: FSharpList<string>, TransitionsUsed: FSharpList<string>, FormSpec: Spec_FormSpec$1<FieldType>, ExecutionTime: Date, Success: boolean, Errors: FSharpList<string>) {
         super();
         this.PathwayId = PathwayId;
         this.StartState = StartState;
@@ -1351,7 +1351,7 @@ export class PathwayExecutionResult$1<FieldType> extends Record implements IEqua
 }
 
 export function PathwayExecutionResult$1_$reflection(gen0: TypeInfo): TypeInfo {
-    return record_type("F1.Studio.PathwayExecutor.PathwayExecutionResult`1", [gen0], PathwayExecutionResult$1, () => [["PathwayId", string_type], ["StartState", string_type], ["CurrentState", string_type], ["ExecutionMode", ClinicalPathway_PathwayExecutionMode_$reflection()], ["SelectedPaths", list_type(string_type)], ["RejectedPaths", list_type(tuple_type(string_type, string_type))], ["ExecutedActions", list_type(ClinicalPathway_ActionInfo_$reflection())], ["VisitedStates", list_type(string_type)], ["TransitionsUsed", list_type(string_type)], ["FormSpec", Spec_FormSpec$1_$reflection(gen0)], ["ExecutionTime", class_type("System.DateTime")], ["Success", bool_type], ["Errors", list_type(string_type)]]);
+    return record_type("F1.Studio.PathwayExecutor.PathwayExecutionResult`1", [gen0], PathwayExecutionResult$1, () => [["PathwayId", string_type], ["StartState", string_type], ["CurrentState", string_type], ["ExecutionMode", ClinicalPathway_PathwayExecutionMode_$reflection()], ["SelectedPaths", list_type(string_type)], ["RejectedPaths", list_type(tuple_type(string_type, string_type))], ["ExecutedActions", list_type(ClinicalPathway_PathwayAction_$reflection())], ["VisitedStates", list_type(string_type)], ["TransitionsUsed", list_type(string_type)], ["FormSpec", Spec_FormSpec$1_$reflection(gen0)], ["ExecutionTime", class_type("System.DateTime")], ["Success", bool_type], ["Errors", list_type(string_type)]]);
 }
 
 //# sourceMappingURL=PathwayExecutor.ts.map

package/src/FormSpec.FS/PathwayValidator.ts

@@ -1,6 +1,6 @@
 import { Record } from "@fable-org/fable-library-js/Types.js";
 import { tryFind, fold, toList, ofList, FSharpMap } from "@fable-org/fable-library-js/Map.js";
-import { ClinicalPathway_StateDefinition, Shared_FieldValue_Single, Shared_FieldAnswer, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_MatrixItemKey, Shared_FieldValue_$union, Spec_FormSpec$1, Spec_FormStep$1, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_TransitionDefinition, ClinicalPathway_TransitionCondition_$union, Spec_FormField$1, Shared_FieldOption, Spec_FieldType_$union, Shared_StateKey_$reflection, Shared_StateKey, Shared_FieldKey_$reflection, Shared_FieldKey } from "./FormSpec.js";
+import { ClinicalPathway_StateDefinition, Shared_FieldValue_Single, Shared_FieldAnswer, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Spec_Label_shown, Shared_MatrixItemKey, Shared_FieldValue_$union, Spec_FormSpec$1, Spec_FormStep$1, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_TransitionDefinition, ClinicalPathway_TransitionCondition_$union, Spec_FormField$1, Shared_FieldOption, Spec_FieldType_$union, Shared_StateKey_$reflection, Shared_StateKey, Shared_FieldKey_$reflection, Shared_FieldKey } from "./FormSpec.js";
 import { stringHash, safeHash, compare, equals, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { option_type, list_type, int32_type, bool_type, record_type, class_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { ofList as ofList_1, intersect, isEmpty as isEmpty_1, empty as empty_1, FSharpSet } from "@fable-org/fable-library-js/Set.js";
@@ -165,15 +165,18 @@ export function generateTestScenarios(formSpec: Spec_FormSpec$1<Spec_FieldType_$
 }
 
 function scenarioToFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, scenario: TestScenario): Spec_FormSpec$1<Spec_FieldType_$union> {
-    return fold<Shared_FieldKey, Shared_FieldValue_$union, Spec_FormSpec$1<Spec_FieldType_$union>>((spec: Spec_FormSpec$1<Spec_FieldType_$union>, fieldKey: Shared_FieldKey, fieldValue_1: Shared_FieldValue_$union): Spec_FormSpec$1<Spec_FieldType_$union> => defaultArg(map_1<int32, Spec_FormSpec$1<Spec_FieldType_$union>>((stepIdx: int32): Spec_FormSpec$1<Spec_FieldType_$union> => updateField<Spec_FieldType_$union>(spec, fieldKey, fieldValue_1, stepIdx), findStepIndexForField<Spec_FieldType_$union>(spec, fieldKey)), spec), formSpec, ofList<Shared_FieldKey, Shared_FieldValue_$union>(choose<Spec_FormField$1<Spec_FieldType_$union>, [Shared_FieldKey, Shared_FieldValue_$union]>((field: Spec_FormField$1<Spec_FieldType_$union>): Option<[Shared_FieldKey, Shared_FieldValue_$union]> => map_1<string, [Shared_FieldKey, Shared_FieldValue_$union]>((value: string): [Shared_FieldKey, Shared_FieldValue_$union] => ([field.FieldKey, (field.FieldType.tag === /* Matrix */ 19) ? Shared_FieldValue_Matrix(new Shared_MatrixAnswer(field.FieldKey, field.Label, ofList<Shared_MatrixItemKey, string>(map<Shared_MatrixItemKey, [Shared_MatrixItemKey, string]>((itemKey: Shared_MatrixItemKey): [Shared_MatrixItemKey, string] => ([itemKey, value] as [Shared_MatrixItemKey, string]), singleton(new Shared_MatrixItemKey(newGuid()))), {
-        Compare: compare,
-    }), undefined)) : Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, field.Label, value, undefined))] as [Shared_FieldKey, Shared_FieldValue_$union]), tryFind<Shared_FieldKey, string>(field.FieldKey, scenario.FieldValues)), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)), {
+    return fold<Shared_FieldKey, Shared_FieldValue_$union, Spec_FormSpec$1<Spec_FieldType_$union>>((spec: Spec_FormSpec$1<Spec_FieldType_$union>, fieldKey: Shared_FieldKey, fieldValue_1: Shared_FieldValue_$union): Spec_FormSpec$1<Spec_FieldType_$union> => defaultArg(map_1<int32, Spec_FormSpec$1<Spec_FieldType_$union>>((stepIdx: int32): Spec_FormSpec$1<Spec_FieldType_$union> => updateField<Spec_FieldType_$union>(spec, fieldKey, fieldValue_1, stepIdx), findStepIndexForField<Spec_FieldType_$union>(spec, fieldKey)), spec), formSpec, ofList<Shared_FieldKey, Shared_FieldValue_$union>(choose<Spec_FormField$1<Spec_FieldType_$union>, [Shared_FieldKey, Shared_FieldValue_$union]>((field: Spec_FormField$1<Spec_FieldType_$union>): Option<[Shared_FieldKey, Shared_FieldValue_$union]> => map_1<string, [Shared_FieldKey, Shared_FieldValue_$union]>((value: string): [Shared_FieldKey, Shared_FieldValue_$union] => {
+        let matrixValues: FSharpMap<Shared_MatrixItemKey, string>;
+        return [field.FieldKey, (field.FieldType.tag === /* Matrix */ 19) ? ((matrixValues = ofList<Shared_MatrixItemKey, string>(map<Shared_MatrixItemKey, [Shared_MatrixItemKey, string]>((itemKey: Shared_MatrixItemKey): [Shared_MatrixItemKey, string] => ([itemKey, value] as [Shared_MatrixItemKey, string]), singleton(new Shared_MatrixItemKey(newGuid()))), {
+            Compare: compare,
+        }), Shared_FieldValue_Matrix(new Shared_MatrixAnswer(field.FieldKey, Spec_Label_shown(field.Label), matrixValues, undefined)))) : Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, Spec_Label_shown(field.Label), value, undefined))] as [Shared_FieldKey, Shared_FieldValue_$union];
+    }, tryFind<Shared_FieldKey, string>(field.FieldKey, scenario.FieldValues)), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)), {
         Compare: compare,
     }));
 }
 
 function isTerminalState(state: ClinicalPathway_StateDefinition): boolean {
-    if (state.StateType.tag === /* Terminal */ 5) {
+    if (state.StateType.tag === /* Terminal */ 4) {
         return true;
     }
     else {

package/src/FormSpec.FS/Provenance.ts

@@ -6,42 +6,50 @@ import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 export class IntegrationProvenance extends Record implements IEquatable<IntegrationProvenance>, IComparable<IntegrationProvenance> {
     readonly Vendor: string;
     readonly TenantId: string;
-    readonly SiteId: string;
+    readonly DbName: string;
     readonly Payload: string;
-    constructor(Vendor: string, TenantId: string, SiteId: string, Payload: string) {
+    constructor(Vendor: string, TenantId: string, DbName: string, Payload: string) {
         super();
         this.Vendor = Vendor;
         this.TenantId = TenantId;
-        this.SiteId = SiteId;
+        this.DbName = DbName;
         this.Payload = Payload;
     }
 }
 
 export function IntegrationProvenance_$reflection(): TypeInfo {
-    return record_type("F1.Studio.Provenance.IntegrationProvenance", [], IntegrationProvenance, () => [["Vendor", string_type], ["TenantId", string_type], ["SiteId", string_type], ["Payload", string_type]]);
+    return record_type("F1.Studio.Provenance.IntegrationProvenance", [], IntegrationProvenance, () => [["Vendor", string_type], ["TenantId", string_type], ["DbName", string_type], ["Payload", string_type]]);
 }
 
 export class ImportOrigin extends Record implements IEquatable<ImportOrigin>, IComparable<ImportOrigin> {
     readonly Vendor: string;
     readonly TenantId: string;
-    readonly SiteId: string;
-    constructor(Vendor: string, TenantId: string, SiteId: string) {
+    readonly DbName: string;
+    constructor(Vendor: string, TenantId: string, DbName: string) {
         super();
         this.Vendor = Vendor;
         this.TenantId = TenantId;
-        this.SiteId = SiteId;
+        this.DbName = DbName;
     }
 }
 
 export function ImportOrigin_$reflection(): TypeInfo {
-    return record_type("F1.Studio.Provenance.ImportOrigin", [], ImportOrigin, () => [["Vendor", string_type], ["TenantId", string_type], ["SiteId", string_type]]);
+    return record_type("F1.Studio.Provenance.ImportOrigin", [], ImportOrigin, () => [["Vendor", string_type], ["TenantId", string_type], ["DbName", string_type]]);
 }
 
 /**
- * ⛔ FAILS LOUDLY. A blank tenant or site is not "unknown, fill it in later" — it is an import
- * whose payload can never be resolved back, and it must not be written at all.
+ * ⛔ FAILS LOUDLY. A blank tenant or database is not "unknown, fill it in later" — it is an
+ * import whose payload can never be resolved back, and it must not be written at all.
+ * 
+ * ⚖️ THE PARAMETER WAS NAMED `siteId` UNTIL 2026-09-25 (#123 W3b) AND THE VALUE NEVER CHANGED.
+ * ⚰️ It has always been a LEVEL 3 **database name** — `coremr_st_johns_fl` — and the failure
+ * message said so in words (*"scoped to ONE CoreMR database"*) while the parameter said
+ * LEVEL 2 in its name. ⭐ That is the whole #123 defect in four lines: **the comment was
+ * right, the name was wrong, and nothing could disagree because there was only ever one
+ * value.** The language is [`TAXONOMY_SSOT.md`](../../../../TAXONOMY_SSOT.md) — a SITE is a
+ * place (a minted Guid, #106); a DB NAME is what a connection opens.
  */
-export function ImportOriginModule_create(vendor: string, tenantId: string, siteId: string): ImportOrigin {
+export function ImportOriginModule_create(vendor: string, tenantId: string, dbName: string): ImportOrigin {
     const blank = isNullOrWhiteSpace;
     if (blank(vendor)) {
         throw new Error("ImportOrigin: vendor is required (e.g. \"coremr\").");
@@ -49,17 +57,17 @@ export function ImportOriginModule_create(vendor: string, tenantId: string, site
     if (blank(tenantId)) {
         throw new Error("ImportOrigin: tenantId is required — a blueprint belongs to an organisation.");
     }
-    if (blank(siteId)) {
-        throw new Error("ImportOrigin: siteId is required — every formId/itemId/choiceId in the payload is scoped to ONE CoreMR database, and without it the provenance cannot be resolved back.");
+    if (blank(dbName)) {
+        throw new Error("ImportOrigin: dbName is required — every formId/itemId/choiceId in the payload is scoped to ONE CoreMR database, and without it the provenance cannot be resolved back.");
     }
-    return new ImportOrigin(vendor.trim(), tenantId.trim(), siteId.trim());
+    return new ImportOrigin(vendor.trim(), tenantId.trim(), dbName.trim());
 }
 
 /**
  * The provenance for a payload read under this origin.
  */
 export function ImportOriginModule_provenance(o: ImportOrigin, payload: string): IntegrationProvenance {
-    return new IntegrationProvenance(o.Vendor, o.TenantId, o.SiteId, payload);
+    return new IntegrationProvenance(o.Vendor, o.TenantId, o.DbName, payload);
 }
 
 //# sourceMappingURL=Provenance.ts.map

package/src/FormSpec.FS/Renderers/FormSpecMarkdownRenderer.ts

@@ -1,7 +1,7 @@
 import { printf, toText, isNullOrWhiteSpace, join, replicate } from "@fable-org/fable-library-js/String.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { value as value_4, Option, map, defaultArg } from "@fable-org/fable-library-js/Option.js";
-import { Shared_FieldKey, Values_StepOrder, Spec_FormStep$1, Spec_FormSpec$1, ClinicalPathway_ClinicalPathwaySpec, Spec_MatrixInfo, Shared_MatrixItemKey, Shared_MatrixAnswer, Spec_FormField$1, Shared_FieldValue_$union, Spec_FieldType_$union, Spec_MultiChoiceInfo, Spec_SingleChoiceInfo, Shared_PluginDataProperty, Shared_FieldAnswer, Shared_FieldOption } from "../FormSpec.js";
+import { Shared_FieldKey, Values_StepOrder, Spec_Label_shown, Spec_FormStep$1, Spec_FormSpec$1, ClinicalPathway_ClinicalPathwaySpec, Spec_MatrixInfo, Shared_MatrixItemKey, Shared_MatrixAnswer, Spec_FormField$1, Shared_FieldValue_$union, Spec_FieldType_$union, Spec_MultiChoiceInfo, Spec_SingleChoiceInfo, Shared_PluginDataProperty, Shared_FieldAnswer, Shared_FieldOption } from "../FormSpec.js";
 import { partition, isEmpty, FSharpList, map as map_1, choose, tryFind } from "@fable-org/fable-library-js/List.js";
 import { FSharpSet, toList } from "@fable-org/fable-library-js/Set.js";
 import { singleton, append, delay, toList as toList_1 } from "@fable-org/fable-library-js/Seq.js";
@@ -722,7 +722,7 @@ function generatePathwayMermaid(pathway: ClinicalPathway_ClinicalPathwaySpec, fo
  * Uses well-typed Spec.FieldType and Values.FieldValue throughout - NO boxing/unboxing.
  */
 export function renderFormSpecToMarkdown(startHeading: int32, withPathway: boolean, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, formValues: Option<FSharpMap<Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>>>): string {
-    let matchValue_4: Option<FieldDetails$1<Spec_FieldType_$union>>, matchValue_5: Shared_FieldValue_$union;
+    let arg_3: string, arg_6: string, arg_2: string, arg: string;
     const lines: string[] = [];
     const titleHeading: string = generateHeadingLevel(startHeading);
     void (lines.push(`${titleHeading} ${formSpec.Title}`));
@@ -777,7 +777,7 @@ export function renderFormSpecToMarkdown(startHeading: int32, withPathway: boole
     try {
         while (enumerator_2["System.Collections.IEnumerator.MoveNext"]()) {
             const step: Spec_FormStep$1<Spec_FieldType_$union> = enumerator_2["System.Collections.Generic.IEnumerator`1.get_Current"]();
-            const stepLabel: string = isNullOrWhiteSpace(step.StepLabel) ? (`Step ${step.StepOrder}`) : step.StepLabel;
+            const stepLabel: string = Spec_Label_shown(step.StepLabel);
             void (lines.push(`${stepHeading} ${stepLabel}`));
             void (lines.push(""));
             const patternInput: [FSharpList<Spec_FormField$1<Spec_FieldType_$union>>, FSharpList<Spec_FormField$1<Spec_FieldType_$union>>] = partition<Spec_FormField$1<Spec_FieldType_$union>>((field: Spec_FormField$1<Spec_FieldType_$union>): boolean => {
@@ -799,7 +799,7 @@ export function renderFormSpecToMarkdown(startHeading: int32, withPathway: boole
                             const field_3: Spec_FormField$1<Spec_FieldType_$union> = enumerator_5["System.Collections.Generic.IEnumerator`1.get_Current"]();
                             const fieldTypeName: string = getFieldTypeName(field_3.FieldType);
                             const requiredText: string = field_3.IsOptional ? "" : " *(required)*";
-                            void (lines.push(toText(printf("- %s%s [%s]"))(field_3.Label)(requiredText)(fieldTypeName)));
+                            void (lines.push((arg_3 = Spec_Label_shown(field_3.Label), toText(printf("- %s%s [%s]"))(arg_3)(requiredText)(fieldTypeName))));
                         }
                     }
                     finally {
@@ -813,7 +813,7 @@ export function renderFormSpecToMarkdown(startHeading: int32, withPathway: boole
                         const field_4: Spec_FormField$1<Spec_FieldType_$union> = enumerator_6["System.Collections.Generic.IEnumerator`1.get_Current"]();
                         const fieldTypeName_1: string = getFieldTypeName(field_4.FieldType);
                         const requiredText_1: string = field_4.IsOptional ? "" : " *(required)*";
-                        void (lines.push(toText(printf("- %s%s [%s]"))(field_4.Label)(requiredText_1)(fieldTypeName_1)));
+                        void (lines.push((arg_6 = Spec_Label_shown(field_4.Label), toText(printf("- %s%s [%s]"))(arg_6)(requiredText_1)(fieldTypeName_1))));
                     }
                 }
                 finally {
@@ -830,12 +830,12 @@ export function renderFormSpecToMarkdown(startHeading: int32, withPathway: boole
                         const field_1: Spec_FormField$1<Spec_FieldType_$union> = enumerator_3["System.Collections.Generic.IEnumerator`1.get_Current"]();
                         const matchValue_2: Option<FieldDetails$1<Spec_FieldType_$union>> = FSharpMap__TryFind(stepValues, field_1.FieldKey);
                         if (matchValue_2 == null) {
-                            void (lines.push(toText(printf("- **%s**: *No response provided*"))(field_1.Label)));
+                            void (lines.push((arg_2 = Spec_Label_shown(field_1.Label), toText(printf("- **%s**: *No response provided*"))(arg_2))));
                         }
                         else {
                             const formattedValue: string = formatFieldValue(field_1.FieldType, value_4(matchValue_2).FieldValue, field_1);
                             if (!isNullOrWhiteSpace(formattedValue)) {
-                                void (lines.push(toText(printf("- **%s**: %s"))(field_1.Label)(formattedValue)));
+                                void (lines.push((arg = Spec_Label_shown(field_1.Label), toText(printf("- **%s**: %s"))(arg)(formattedValue))));
                             }
                         }
                     }
@@ -849,7 +849,17 @@ export function renderFormSpecToMarkdown(startHeading: int32, withPathway: boole
                         const field_2: Spec_FormField$1<Spec_FieldType_$union> = enumerator_4["System.Collections.Generic.IEnumerator`1.get_Current"]();
                         const matchValue_3: Spec_FieldType_$union = field_2.FieldType;
                         if (matchValue_3.tag === /* Matrix */ 19) {
-                            const tableMarkdown: string = formatMatrixFieldAsTable(field_2.Label, matchValue_3.fields[0], (matchValue_4 = FSharpMap__TryFind(stepValues, field_2.FieldKey), (matchValue_4 == null) ? undefined : ((matchValue_5 = value_4(matchValue_4).FieldValue, (matchValue_5.tag === /* Single */ 0) ? undefined : ((matchValue_5.tag === /* Multiple */ 1) ? undefined : ((matchValue_5.tag === /* PluginData */ 3) ? undefined : matchValue_5.fields[0]))))));
+                            const matrixInfo: Spec_MatrixInfo = matchValue_3.fields[0];
+                            let matrixAnswer_1: Option<Shared_MatrixAnswer>;
+                            const matchValue_4: Option<FieldDetails$1<Spec_FieldType_$union>> = FSharpMap__TryFind(stepValues, field_2.FieldKey);
+                            if (matchValue_4 == null) {
+                                matrixAnswer_1 = undefined;
+                            }
+                            else {
+                                const matchValue_5: Shared_FieldValue_$union = value_4(matchValue_4).FieldValue;
+                                matrixAnswer_1 = ((matchValue_5.tag === /* Single */ 0) ? undefined : ((matchValue_5.tag === /* Multiple */ 1) ? undefined : ((matchValue_5.tag === /* PluginData */ 3) ? undefined : matchValue_5.fields[0])));
+                            }
+                            const tableMarkdown: string = formatMatrixFieldAsTable(Spec_Label_shown(field_2.Label), matrixInfo, matrixAnswer_1);
                             if (!isNullOrWhiteSpace(tableMarkdown)) {
                                 void (lines.push(""));
                                 void (lines.push(tableMarkdown));

package/src/FormSpec.FS/Renderers/MermaidRenderer.ts

@@ -1,8 +1,8 @@
 import { StringBuilder_$ctor, StringBuilder__AppendLine_Z721C83C5 } from "@fable-org/fable-library-js/System.Text.js";
-import { sanitizeMermaidText, extractActionText, extractEvaluationName, getTerminalOutcome, stateTypeToString, extractStateKeyString, sanitizeMermaidId } from "../PathwayDataExtractor.js";
+import { sanitizeMermaidText, getTerminalOutcome, extractActionText, extractEvaluationName, stateTypeToString, extractStateKeyString, sanitizeMermaidId } from "../PathwayDataExtractor.js";
 import { isNullOrEmpty, join, printf, toText } from "@fable-org/fable-library-js/String.js";
 import { empty, exists, isEmpty, iterateIndexed, FSharpList, mapIndexed, cons, map } from "@fable-org/fable-library-js/List.js";
-import { ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_TransitionDefinition, ClinicalPathway_StateType_$union, ClinicalPathway_StateDefinition, ClinicalPathway_ActionInfo_$union } from "../FormSpec.js";
+import { ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_TransitionDefinition, ClinicalPathway_StateType_$union, ClinicalPathway_StateDefinition, ClinicalPathway_PathwayAction } from "../FormSpec.js";
 import { toString } from "@fable-org/fable-library-js/Types.js";
 import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
 import { formatRequiredPathLabel, formatConstraintLabel, isTransitionRequired, getTransitionArrowStyle, IGraphRenderer$3 } from "./PathwayRenderers.js";
@@ -24,13 +24,11 @@ export class MermaidRenderer implements IGraphRenderer$3<void, void, string> {
         StringBuilder__AppendLine_Z721C83C5(_.sb, "graph TD");
     }
     AddNode(state: ClinicalPathway_StateDefinition): void {
-        let matchValue: ClinicalPathway_StateType_$union, outcome: string, evalName: string, actionText: string, arg_11: string, actionText_1: string;
+        let matchValue: ClinicalPathway_StateType_$union, evalName: string, actionText: string, arg_11: string, actionText_1: string, outcome: string;
         const _: MermaidRenderer = this;
         const nodeId: string = sanitizeMermaidId(extractStateKeyString(state.StateKey));
         const stateTypeStr: string = stateTypeToString(state.StateType);
-        StringBuilder__AppendLine_Z721C83C5(_.sb, (matchValue = state.StateType, (matchValue.tag === /* Terminal */ 5) ? ((outcome = getTerminalOutcome(matchValue.fields[0]), toText(printf("    %s((\"%s<br/>%s\"))"))(nodeId)(state.StateLabel)(outcome))) : ((matchValue.tag === /* Evaluation */ 1) ? ((evalName = extractEvaluationName(matchValue.fields[0]), toText(printf("    %s[/\"%s<br/>%s\"/]:::evaluation"))(nodeId)(state.StateLabel)(evalName))) : ((matchValue.tag === /* Action */ 2) ? ((actionText = extractActionText(matchValue.fields[0]), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(state.StateLabel)(actionText))) : ((matchValue.tag === /* CompoundAction */ 3) ? ((arg_11 = join("<br/>", map<ClinicalPathway_ActionInfo_$union, string>(extractActionText, matchValue.fields[0])), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(state.StateLabel)(arg_11))) : ((matchValue.tag === /* ConditionalAction */ 4) ? ((actionText_1 = extractActionText(matchValue.fields[1]), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(state.StateLabel)(actionText_1))) : (() => {
-            throw new Error("Match failure: F1.Studio.ClinicalPathway.StateType");
-        })()))))));
+        StringBuilder__AppendLine_Z721C83C5(_.sb, (matchValue = state.StateType, (matchValue.tag === /* Evaluation */ 0) ? ((evalName = extractEvaluationName(matchValue.fields[0]), toText(printf("    %s[/\"%s<br/>%s\"/]:::evaluation"))(nodeId)(state.StateLabel)(evalName))) : ((matchValue.tag === /* Action */ 1) ? ((actionText = extractActionText(matchValue.fields[0].Action), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(state.StateLabel)(actionText))) : ((matchValue.tag === /* CompoundAction */ 2) ? ((arg_11 = join("<br/>", map<ClinicalPathway_PathwayAction, string>((action_1: ClinicalPathway_PathwayAction): string => extractActionText(action_1.Action), matchValue.fields[0])), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(state.StateLabel)(arg_11))) : ((matchValue.tag === /* ConditionalAction */ 3) ? ((actionText_1 = extractActionText(matchValue.fields[1].Action), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(state.StateLabel)(actionText_1))) : ((outcome = getTerminalOutcome(matchValue.fields[0]), toText(printf("    %s((\"%s<br/>%s\"))"))(nodeId)(state.StateLabel)(outcome))))))));
     }
     AddEdge(transition: ClinicalPathway_TransitionDefinition, label: string): void {
         let sanitizedLabel: string;
@@ -92,14 +90,12 @@ export class EnhancedMermaidRenderer implements IGraphRenderer$3<void, void, str
         StringBuilder__AppendLine_Z721C83C5(_.sb, "graph TD");
     }
     AddNode(state: ClinicalPathway_StateDefinition): void {
-        let matchValue: ClinicalPathway_StateType_$union, outcome: string, arg_1: string, evalName: string, arg_4: string, actionText: string, arg_7: string, actionTexts: FSharpList<string>, arg_10: string, arg_11: string, actionText_2: string, arg_13: string;
+        let matchValue: ClinicalPathway_StateType_$union, evalName: string, arg_4: string, actionText: string, arg_7: string, actionTexts: FSharpList<string>, arg_10: string, arg_11: string, actionText_2: string, arg_13: string, outcome: string, arg_1: string;
         const _: EnhancedMermaidRenderer = this;
         _.addedStates = cons(state, _.addedStates);
         const nodeId: string = sanitizeMermaidId(extractStateKeyString(state.StateKey));
         const stateTypeStr: string = stateTypeToString(state.StateType);
-        StringBuilder__AppendLine_Z721C83C5(_.sb, (matchValue = state.StateType, (matchValue.tag === /* Terminal */ 5) ? ((outcome = sanitizeMermaidText(getTerminalOutcome(matchValue.fields[0])), (arg_1 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s((\"%s<br/>%s\"))"))(nodeId)(arg_1)(outcome)))) : ((matchValue.tag === /* Evaluation */ 1) ? ((evalName = sanitizeMermaidText(extractEvaluationName(matchValue.fields[0])), (arg_4 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s[/\"%s<br/>%s\"/]:::evaluation"))(nodeId)(arg_4)(evalName)))) : ((matchValue.tag === /* Action */ 2) ? ((actionText = sanitizeMermaidText(extractActionText(matchValue.fields[0])), (arg_7 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(arg_7)(actionText)))) : ((matchValue.tag === /* CompoundAction */ 3) ? ((actionTexts = mapIndexed<ClinicalPathway_ActionInfo_$union, string>((i: int32, action_1: ClinicalPathway_ActionInfo_$union): string => (`${i + 1}. ${sanitizeMermaidText(extractActionText(action_1))}`), matchValue.fields[0]), (arg_10 = sanitizeMermaidText(state.StateLabel), (arg_11 = join("<br/>", actionTexts), toText(printf("    %s[\"%s<br/>📋 Multiple Actions:<br/>%s\"]:::compound"))(nodeId)(arg_10)(arg_11))))) : ((matchValue.tag === /* ConditionalAction */ 4) ? ((actionText_2 = sanitizeMermaidText(extractActionText(matchValue.fields[1])), (arg_13 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(arg_13)(actionText_2)))) : (() => {
-            throw new Error("Match failure: F1.Studio.ClinicalPathway.StateType");
-        })()))))));
+        StringBuilder__AppendLine_Z721C83C5(_.sb, (matchValue = state.StateType, (matchValue.tag === /* Evaluation */ 0) ? ((evalName = sanitizeMermaidText(extractEvaluationName(matchValue.fields[0])), (arg_4 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s[/\"%s<br/>%s\"/]:::evaluation"))(nodeId)(arg_4)(evalName)))) : ((matchValue.tag === /* Action */ 1) ? ((actionText = sanitizeMermaidText(extractActionText(matchValue.fields[0].Action)), (arg_7 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(arg_7)(actionText)))) : ((matchValue.tag === /* CompoundAction */ 2) ? ((actionTexts = mapIndexed<ClinicalPathway_PathwayAction, string>((i: int32, action_1: ClinicalPathway_PathwayAction): string => (`${i + 1}. ${sanitizeMermaidText(extractActionText(action_1.Action))}`), matchValue.fields[0]), (arg_10 = sanitizeMermaidText(state.StateLabel), (arg_11 = join("<br/>", actionTexts), toText(printf("    %s[\"%s<br/>📋 Multiple Actions:<br/>%s\"]:::compound"))(nodeId)(arg_10)(arg_11))))) : ((matchValue.tag === /* ConditionalAction */ 3) ? ((actionText_2 = sanitizeMermaidText(extractActionText(matchValue.fields[1].Action)), (arg_13 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s[\"%s<br/>%s\"]:::action"))(nodeId)(arg_13)(actionText_2)))) : ((outcome = sanitizeMermaidText(getTerminalOutcome(matchValue.fields[0])), (arg_1 = sanitizeMermaidText(state.StateLabel), toText(printf("    %s((\"%s<br/>%s\"))"))(nodeId)(arg_1)(outcome)))))))));
     }
     AddEdge(transition: ClinicalPathway_TransitionDefinition, label: string): void {
         let sanitizedLabel: string, fullLabel: string, matchValue_1: Option<ClinicalPathway_ClinicalPathwaySpec>, p_2: ClinicalPathway_ClinicalPathwaySpec;