@f1studio/form-spec 5.0.0-alpha.102 → 5.0.0-alpha.104

package/FormSpec.TS/PathwayExecutor.js

@@ -15,11 +15,11 @@ _export(exports, {
     get ClinicalPlan_$reflection () {
         return ClinicalPlan_$reflection;
     },
-    get ExecutionContext$1 () {
-        return ExecutionContext$1;
+    get ExecutionContext () {
+        return ExecutionContext;
     },
-    get ExecutionContext$1_$reflection () {
-        return ExecutionContext$1_$reflection;
+    get ExecutionContext_$reflection () {
+        return ExecutionContext_$reflection;
     },
     get ExecutionLogEntry () {
         return ExecutionLogEntry;
@@ -36,11 +36,11 @@ _export(exports, {
     get FieldResolver_generateFieldKey () {
         return FieldResolver_generateFieldKey;
     },
-    get IncrementalExecutionResult$1 () {
-        return IncrementalExecutionResult$1;
+    get IncrementalExecutionResult () {
+        return IncrementalExecutionResult;
     },
-    get IncrementalExecutionResult$1_$reflection () {
-        return IncrementalExecutionResult$1_$reflection;
+    get IncrementalExecutionResult_$reflection () {
+        return IncrementalExecutionResult_$reflection;
     },
     get MatchedTransition () {
         return MatchedTransition;
@@ -60,6 +60,24 @@ _export(exports, {
     get PredictedPathway_$reflection () {
         return PredictedPathway_$reflection;
     },
+    get ScoreCalculator_calculateFieldScore () {
+        return ScoreCalculator_calculateFieldScore;
+    },
+    get ScoreCalculator_calculateFieldValueScore () {
+        return ScoreCalculator_calculateFieldValueScore;
+    },
+    get ScoreCalculator_calculateStepScore () {
+        return ScoreCalculator_calculateStepScore;
+    },
+    get ScoreCalculator_calculateTotalScore () {
+        return ScoreCalculator_calculateTotalScore;
+    },
+    get ScoreCalculator_extractFieldOptions () {
+        return ScoreCalculator_extractFieldOptions;
+    },
+    get ScoreCalculator_getScoreRange () {
+        return ScoreCalculator_getScoreRange;
+    },
     get TransitionStatus () {
         return TransitionStatus;
     },
@@ -99,6 +117,9 @@ _export(exports, {
     get evaluateFieldConditionWithConditionValue () {
         return evaluateFieldConditionWithConditionValue;
     },
+    get evaluateMatrixItemCondition () {
+        return evaluateMatrixItemCondition;
+    },
     get evaluateTransitionWithPartialData () {
         return evaluateTransitionWithPartialData;
     },
@@ -152,18 +173,21 @@ const _Types = require("@fable-org/fable-library-js/Types.js");
 const _List = require("@fable-org/fable-library-js/List.js");
 const _Reflection = require("@fable-org/fable-library-js/Reflection.js");
 const _FormSpec = require("./FormSpec.js");
+const _Int32 = require("@fable-org/fable-library-js/Int32.js");
 const _Util = require("@fable-org/fable-library-js/Util.js");
 const _Set = require("@fable-org/fable-library-js/Set.js");
+const _Option = require("@fable-org/fable-library-js/Option.js");
+const _Map = require("@fable-org/fable-library-js/Map.js");
+const _FormSpecValues = require("./FormSpecValues.js");
 const _Array = require("@fable-org/fable-library-js/Array.js");
 const _BitConverter = require("@fable-org/fable-library-js/BitConverter.js");
 const _Guid = require("@fable-org/fable-library-js/Guid.js");
-const _Map = require("@fable-org/fable-library-js/Map.js");
-const _Option = require("@fable-org/fable-library-js/Option.js");
-const _Seq = require("@fable-org/fable-library-js/Seq.js");
 const _String = require("@fable-org/fable-library-js/String.js");
 const _Encodefs = require("./fable_modules/Thoth.Json.10.4.1/Encode.fs.js");
 const _Double = require("@fable-org/fable-library-js/Double.js");
 const _RegExp = require("@fable-org/fable-library-js/RegExp.js");
+const _Decodefs = require("./fable_modules/Thoth.Json.10.4.1/Decode.fs.js");
+const _PluginInterface = require("./PluginInterface.js");
 const _Date = require("@fable-org/fable-library-js/Date.js");
 function TransitionStatus_Satisfied() {
     return new TransitionStatus(0, []);
@@ -253,8 +277,8 @@ function ExecutionLogEntry_$reflection() {
             ]
         ]);
 }
-class ExecutionContext$1 extends _Types.Record {
-    constructor(PathwaySpec, FormSpec, CurrentStates, VisitedStates, CompletedStates, ActiveTransitions, PendingTransitions, ExecutedActions, FormData, FieldResolver, ExecutionLog){
+class ExecutionContext extends _Types.Record {
+    constructor(PathwaySpec, FormSpec, CurrentStates, VisitedStates, CompletedStates, ActiveTransitions, PendingTransitions, ExecutedActions, FieldResolver, ExecutionLog){
         super();
         this.PathwaySpec = PathwaySpec;
         this.FormSpec = FormSpec;
@@ -264,22 +288,19 @@ class ExecutionContext$1 extends _Types.Record {
         this.ActiveTransitions = ActiveTransitions;
         this.PendingTransitions = PendingTransitions;
         this.ExecutedActions = ExecutedActions;
-        this.FormData = FormData;
         this.FieldResolver = FieldResolver;
         this.ExecutionLog = ExecutionLog;
     }
 }
-function ExecutionContext$1_$reflection(gen0) {
-    return (0, _Reflection.record_type)("F1.Studio.PathwayExecutor.ExecutionContext`1", [
-        gen0
-    ], ExecutionContext$1, ()=>[
+function ExecutionContext_$reflection() {
+    return (0, _Reflection.record_type)("F1.Studio.PathwayExecutor.ExecutionContext", [], ExecutionContext, ()=>[
             [
                 "PathwaySpec",
                 (0, _FormSpec.ClinicalPathway_ClinicalPathwaySpec_$reflection)()
             ],
             [
                 "FormSpec",
-                (0, _FormSpec.Spec_FormSpec$1_$reflection)(gen0)
+                (0, _FormSpec.Spec_FormSpec$1_$reflection)((0, _FormSpec.Spec_FieldType_$reflection)())
             ],
             [
                 "CurrentStates",
@@ -311,10 +332,6 @@ function ExecutionContext$1_$reflection(gen0) {
                 "ExecutedActions",
                 (0, _Reflection.list_type)((0, _FormSpec.ClinicalPathway_ActionInfo_$reflection)())
             ],
-            [
-                "FormData",
-                (0, _FormSpec.Values_DynamicFormResultData$1_$reflection)(gen0)
-            ],
             [
                 "FieldResolver",
                 (0, _Reflection.lambda_type)(_Reflection.string_type, (0, _FormSpec.Shared_FieldKey_$reflection)())
@@ -359,7 +376,7 @@ function PredictedPathway_$reflection() {
             ]
         ]);
 }
-class IncrementalExecutionResult$1 extends _Types.Record {
+class IncrementalExecutionResult extends _Types.Record {
     constructor(Context, NewlyActivatedStates, NewlyActiveTransitions, PredictedOutcomes, CompletionPercentage, IsComplete){
         super();
         this.Context = Context;
@@ -370,13 +387,11 @@ class IncrementalExecutionResult$1 extends _Types.Record {
         this.IsComplete = IsComplete;
     }
 }
-function IncrementalExecutionResult$1_$reflection(gen0) {
-    return (0, _Reflection.record_type)("F1.Studio.PathwayExecutor.IncrementalExecutionResult`1", [
-        gen0
-    ], IncrementalExecutionResult$1, ()=>[
+function IncrementalExecutionResult_$reflection() {
+    return (0, _Reflection.record_type)("F1.Studio.PathwayExecutor.IncrementalExecutionResult", [], IncrementalExecutionResult, ()=>[
             [
                 "Context",
-                ExecutionContext$1_$reflection(gen0)
+                ExecutionContext_$reflection()
             ],
             [
                 "NewlyActivatedStates",
@@ -472,6 +487,97 @@ function VisualizationState_$reflection() {
             ]
         ]);
 }
+function ScoreCalculator_extractFieldOptions(fieldType) {
+    const matchValue = fieldType;
+    if (matchValue instanceof _FormSpec.Spec_FieldType) {
+        const ft = matchValue;
+        switch(ft.tag){
+            case /* Radio */ 12:
+                return ft.fields[0].Options;
+            case /* SingleChoice */ 13:
+                return ft.fields[0].Options;
+            case /* Dropdown */ 14:
+                return ft.fields[0].Options;
+            case /* TextAutoComplete */ 18:
+                return ft.fields[0].Options;
+            case /* MultiChoice */ 15:
+                return ft.fields[0].Options;
+            case /* CheckboxList */ 16:
+                return ft.fields[0].Options;
+            case /* TagList */ 17:
+                return ft.fields[0].Options;
+            case /* Matrix */ 19:
+                return ft.fields[0].Options;
+            default:
+                return undefined;
+        }
+    } else {
+        return undefined;
+    }
+}
+function ScoreCalculator_calculateFieldValueScore(options, fieldValue) {
+    switch(fieldValue.tag){
+        case /* Single */ 0:
+            {
+                const answer = fieldValue.fields[0];
+                return (0, _Option.bind)((opt_1)=>opt_1.Score, (0, _List.tryFind)((opt)=>opt.Value === answer.Value, options));
+            }
+        case /* Multiple */ 1:
+            {
+                const _arg = (0, _List.choose)((answer_1)=>(0, _Option.bind)((opt_3)=>opt_3.Score, (0, _List.tryFind)((opt_2)=>opt_2.Value === answer_1.Value, options)), (0, _Set.toList)(fieldValue.fields[0]));
+                if ((0, _List.isEmpty)(_arg)) {
+                    return undefined;
+                } else {
+                    return (0, _List.sum)(_arg, {
+                        GetZero: ()=>0,
+                        Add: (x, y)=>x + y
+                    });
+                }
+            }
+        case /* Matrix */ 2:
+            {
+                const _arg_2 = (0, _List.choose)((tupledArg)=>(0, _Option.bind)((opt_5)=>opt_5.Score, (0, _List.tryFind)((opt_4)=>opt_4.Value === tupledArg[1], options)), (0, _Map.toList)(fieldValue.fields[0].Values));
+                if ((0, _List.isEmpty)(_arg_2)) {
+                    return undefined;
+                } else {
+                    return (0, _List.sum)(_arg_2, {
+                        GetZero: ()=>0,
+                        Add: (x_1, y_1)=>x_1 + y_1
+                    });
+                }
+            }
+        default:
+            return undefined;
+    }
+}
+function ScoreCalculator_calculateFieldScore(field, fieldValue) {
+    return (0, _Option.bind)((options)=>ScoreCalculator_calculateFieldValueScore(options, fieldValue), ScoreCalculator_extractFieldOptions(field.FieldType));
+}
+function ScoreCalculator_calculateStepScore(formSpec, step) {
+    return (0, _List.sum)((0, _List.choose)((field)=>ScoreCalculator_calculateFieldScore(field, (0, _FormSpecValues.fieldToDetails)(field).FieldValue), step.Fields), {
+        GetZero: ()=>0,
+        Add: (x, y)=>x + y
+    });
+}
+function ScoreCalculator_calculateTotalScore(formSpec) {
+    return (0, _List.sumBy)((step)=>ScoreCalculator_calculateStepScore(formSpec, step), formSpec.Steps, {
+        GetZero: ()=>0,
+        Add: (x, y)=>x + y
+    });
+}
+function ScoreCalculator_getScoreRange(score, value) {
+    if (score != null) {
+        return (0, _List.tryFind)((range)=>{
+            if (value >= range.Min) {
+                return value <= range.Max;
+            } else {
+                return false;
+            }
+        }, (0, _Option.value)(score).ScoreRanges);
+    } else {
+        return undefined;
+    }
+}
 function FieldResolver_generateFieldKey(fieldName) {
     const hash = (0, _Util.stringHash)(fieldName) | 0;
     const bytes = (0, _Array.fill)(new Array(16), 0, 16, 0);
@@ -509,16 +615,16 @@ function FieldResolver_createResolver(formSpec) {
         return matchValue == null ? FieldResolver_generateFieldKey(fieldReference) : (0, _Option.value)(matchValue);
     };
 }
-function FieldResolver_extractFieldValues(resolver, formData) {
-    return (0, _Map.ofSeq)((0, _Seq.collect)((tupledArg)=>(0, _Seq.map)((tupledArg_1)=>{
+function FieldResolver_extractFieldValues(resolver, formSpec) {
+    return (0, _Map.ofList)((0, _List.collect)((step)=>(0, _List.map)((field)=>{
             let matchValue, pluginData;
             return [
-                tupledArg_1[0],
-                (matchValue = tupledArg_1[1].FieldValue, matchValue.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)((0, _Set.map)((a)=>a.Value, matchValue.fields[0], {
+                field.FieldKey,
+                (matchValue = (0, _FormSpecValues.fieldToDetails)(field).FieldValue, matchValue.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)((0, _Set.map)((a)=>a.Value, matchValue.fields[0], {
                     Compare: _Util.comparePrimitives
-                }))) : matchValue.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg_2)=>tupledArg_2[1], (0, _Map.toList)(matchValue.fields[0].Values))) : matchValue.tag === /* PluginData */ 3 ? (pluginData = matchValue.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _Reflection.list_type)((0, _FormSpec.Shared_PluginDataProperty_$reflection)()), undefined, undefined, undefined)(pluginData))) : matchValue.fields[0].Value)
+                }))) : matchValue.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg)=>tupledArg[1], (0, _Map.toList)(matchValue.fields[0].Values))) : matchValue.tag === /* PluginData */ 3 ? (pluginData = matchValue.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _Reflection.list_type)((0, _FormSpec.Shared_PluginDataProperty_$reflection)()), undefined, undefined, undefined)(pluginData))) : matchValue.fields[0].Value)
             ];
-        }, (0, _Map.toSeq)(tupledArg[1])), (0, _Map.toSeq)(formData.ResultSteps)), {
+        }, step.Fields), formSpec.Steps), {
         Compare: _Util.compare
     });
 }
@@ -689,7 +795,7 @@ function evaluateFieldCondition(actualValue, evaluator, expectedValue) {
                 let matchValue_12;
                 let outArg_8 = 0;
                 matchValue_12 = [
-                    (0, _Double.tryParse)(actualValue, new _Types.FSharpRef(()=>outArg_8, (v_8)=>{
+                    (0, _Double.tryParse)(actualValue.trim(), new _Types.FSharpRef(()=>outArg_8, (v_8)=>{
                         outArg_8 = v_8;
                     })),
                     outArg_8
@@ -723,30 +829,149 @@ function evaluateFieldCondition(actualValue, evaluator, expectedValue) {
             return actualValue.trim().toLocaleLowerCase() === expectedValue.trim().toLocaleLowerCase();
     }
 }
+function evaluateMatrixItemCondition(actualMatrix, evaluator, expectedMatrix) {
+    const entries = (0, _Map.toList)(expectedMatrix);
+    if ((0, _List.isEmpty)(entries)) {
+        return false;
+    } else {
+        const allMatch = (0, _List.forAll)((tupledArg)=>{
+            const expectedVal = tupledArg[1];
+            const actualVal = (0, _Option.defaultArg)((0, _Map.tryFind)(tupledArg[0], actualMatrix.Values), "0");
+            switch(evaluator.tag){
+                case /* Equals */ 0:
+                    return actualVal.trim().toLocaleLowerCase() === expectedVal.trim().toLocaleLowerCase();
+                case /* NotEquals */ 1:
+                    return actualVal.trim().toLocaleLowerCase() !== expectedVal.trim().toLocaleLowerCase();
+                default:
+                    return evaluateFieldCondition(actualVal, evaluator, expectedVal);
+            }
+        }, entries);
+        switch(evaluator.tag){
+            case /* Equals */ 0:
+                return allMatch;
+            case /* NotEquals */ 1:
+                return allMatch;
+            default:
+                return allMatch;
+        }
+    }
+}
 function evaluateFieldConditionWithConditionValue(actualFieldValue, evaluator, expectedConditionValue) {
     let pluginData, pluginData_1;
-    return evaluateFieldCondition(actualFieldValue.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)((0, _Set.map)((a)=>a.Value, actualFieldValue.fields[0], {
-        Compare: _Util.comparePrimitives
-    }))) : actualFieldValue.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg)=>tupledArg[1], (0, _Map.toList)(actualFieldValue.fields[0].Values))) : actualFieldValue.tag === /* PluginData */ 3 ? (pluginData = actualFieldValue.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _Reflection.list_type)((0, _FormSpec.Shared_PluginDataProperty_$reflection)()), undefined, undefined, undefined)(pluginData))) : actualFieldValue.fields[0].Value, evaluator, expectedConditionValue.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)(expectedConditionValue.fields[0])) : expectedConditionValue.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg_1)=>tupledArg_1[1], (0, _Map.toList)(expectedConditionValue.fields[0]))) : expectedConditionValue.tag === /* PluginData */ 3 ? (pluginData_1 = expectedConditionValue.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _FormSpec.Shared_PluginDataProperty_$reflection)(), undefined, undefined, undefined)(pluginData_1))) : expectedConditionValue.fields[0]);
+    let matchResult, actualMatrix, expectedMatrix;
+    if (actualFieldValue.tag === /* Matrix */ 2) {
+        if (expectedConditionValue.tag === /* Matrix */ 2) {
+            matchResult = 0;
+            actualMatrix = actualFieldValue.fields[0];
+            expectedMatrix = expectedConditionValue.fields[0];
+        } else {
+            matchResult = 1;
+        }
+    } else {
+        matchResult = 1;
+    }
+    switch(matchResult){
+        case 0:
+            return evaluateMatrixItemCondition(actualMatrix, evaluator, expectedMatrix);
+        default:
+            return evaluateFieldCondition(actualFieldValue.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)((0, _Set.map)((a)=>a.Value, actualFieldValue.fields[0], {
+                Compare: _Util.comparePrimitives
+            }))) : actualFieldValue.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg)=>tupledArg[1], (0, _Map.toList)(actualFieldValue.fields[0].Values))) : actualFieldValue.tag === /* PluginData */ 3 ? (pluginData = actualFieldValue.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _Reflection.list_type)((0, _FormSpec.Shared_PluginDataProperty_$reflection)()), undefined, undefined, undefined)(pluginData))) : actualFieldValue.fields[0].Value, evaluator, expectedConditionValue.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)(expectedConditionValue.fields[0])) : expectedConditionValue.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg_1)=>tupledArg_1[1], (0, _Map.toList)(expectedConditionValue.fields[0]))) : expectedConditionValue.tag === /* PluginData */ 3 ? (pluginData_1 = expectedConditionValue.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _FormSpec.Shared_PluginDataProperty_$reflection)(), undefined, undefined, undefined)(pluginData_1))) : expectedConditionValue.fields[0]);
+    }
 }
-function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, condition) {
-    let pluginData, pluginData_1;
+function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, formSpecForScores, condition) {
+    let score, data_1, score_2, pluginData;
     switch(condition.tag){
         case /* FieldCondition */ 0:
             {
                 const fieldKey = condition.fields[0];
                 const evaluator = condition.fields[1];
                 const conditionValue = condition.fields[2];
-                const matchValue = (0, _Map.tryFind)(fieldKey, fieldValues);
-                if (matchValue == null) {
-                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey.fields[0]));
-                } else if (evaluateFieldConditionWithConditionValue((0, _FormSpec.Shared_FieldValue_Single)(new _FormSpec.Shared_FieldAnswer(fieldKey, "", (0, _Option.value)(matchValue))), evaluator, conditionValue)) {
-                    return TransitionStatus_Satisfied();
+                if (evaluator.tag === /* InRange */ 13) {
+                    const minVal = evaluator.fields[0] | 0;
+                    const maxVal = evaluator.fields[1] | 0;
+                    let matchResult, data, spec;
+                    if (formSpec != null) {
+                        if (formSpecForScores != null) {
+                            matchResult = 0;
+                            data = (0, _Option.value)(formSpecForScores);
+                            spec = (0, _Option.value)(formSpec);
+                        } else {
+                            matchResult = 1;
+                        }
+                    } else {
+                        matchResult = 1;
+                    }
+                    switch(matchResult){
+                        case 0:
+                            {
+                                const fieldScoreOpt = (0, _Option.bind)((field_1)=>(0, _Option.bind)((details)=>ScoreCalculator_calculateFieldScore(field_1, details.FieldValue), (0, _FormSpecValues.getFieldDetails)(data, fieldKey)), (0, _List.tryFind)((field)=>(0, _Util.equals)(field.FieldKey, fieldKey), (0, _List.collect)((step)=>step.Fields, spec.Steps)));
+                                if (fieldScoreOpt == null) {
+                                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey.fields[0]));
+                                } else if (score = (0, _Option.value)(fieldScoreOpt) | 0, score >= minVal && score <= maxVal) {
+                                    const score_1 = (0, _Option.value)(fieldScoreOpt) | 0;
+                                    return TransitionStatus_Satisfied();
+                                } else {
+                                    return TransitionStatus_Failed();
+                                }
+                            }
+                        default:
+                            return TransitionStatus_Pending((0, _List.singleton)(fieldKey.fields[0]));
+                    }
                 } else {
-                    return TransitionStatus_Failed();
+                    const actualFieldValueOpt = conditionValue.tag === /* Matrix */ 2 ? formSpecForScores != null ? (data_1 = (0, _Option.value)(formSpecForScores), (0, _Option.map)((details_1)=>details_1.FieldValue, (0, _FormSpecValues.getFieldDetails)(data_1, fieldKey))) : undefined : undefined;
+                    if (actualFieldValueOpt == null) {
+                        const matchValue_2 = (0, _Map.tryFind)(fieldKey, fieldValues);
+                        if (matchValue_2 == null) {
+                            return TransitionStatus_Pending((0, _List.singleton)(fieldKey.fields[0]));
+                        } else if (evaluateFieldConditionWithConditionValue((0, _FormSpec.Shared_FieldValue_Single)(new _FormSpec.Shared_FieldAnswer(fieldKey, "", (0, _Option.value)(matchValue_2))), evaluator, conditionValue)) {
+                            return TransitionStatus_Satisfied();
+                        } else {
+                            return TransitionStatus_Failed();
+                        }
+                    } else if (evaluateFieldConditionWithConditionValue((0, _Option.value)(actualFieldValueOpt), evaluator, conditionValue)) {
+                        return TransitionStatus_Satisfied();
+                    } else {
+                        return TransitionStatus_Failed();
+                    }
+                }
+            }
+        case /* ScoreInRange */ 3:
+            {
+                const minScore = condition.fields[0] | 0;
+                const maxScore = condition.fields[1] | 0;
+                if (formSpecForScores != null) {
+                    const totalScore = ScoreCalculator_calculateTotalScore((0, _Option.value)(formSpecForScores)) | 0;
+                    if (totalScore >= minScore && totalScore <= maxScore) {
+                        return TransitionStatus_Satisfied();
+                    } else {
+                        return TransitionStatus_Failed();
+                    }
+                } else {
+                    return TransitionStatus_Pending((0, _List.singleton)("form_score"));
                 }
             }
-        case /* StateCondition */ 3:
+        case /* FieldScoreInRange */ 4:
+            {
+                const minScore_1 = condition.fields[1] | 0;
+                const maxScore_1 = condition.fields[2] | 0;
+                const fieldKey_1 = condition.fields[0];
+                if (formSpecForScores != null) {
+                    const spec_2 = (0, _Option.value)(formSpecForScores);
+                    const fieldScoreOpt_1 = (0, _Option.bind)((field_3)=>(0, _Option.bind)((details_2)=>ScoreCalculator_calculateFieldScore(field_3, details_2.FieldValue), (0, _FormSpecValues.getFieldDetails)(spec_2, fieldKey_1)), (0, _List.tryFind)((field_2)=>(0, _Util.equals)(field_2.FieldKey, fieldKey_1), (0, _List.collect)((step_1)=>step_1.Fields, spec_2.Steps)));
+                    if (fieldScoreOpt_1 == null) {
+                        return TransitionStatus_Pending((0, _List.singleton)(fieldKey_1.fields[0]));
+                    } else if (score_2 = (0, _Option.value)(fieldScoreOpt_1) | 0, score_2 >= minScore_1 && score_2 <= maxScore_1) {
+                        const score_3 = (0, _Option.value)(fieldScoreOpt_1) | 0;
+                        return TransitionStatus_Satisfied();
+                    } else {
+                        return TransitionStatus_Failed();
+                    }
+                } else {
+                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey_1.fields[0]));
+                }
+            }
+        case /* StateCondition */ 5:
             {
                 const evaluator_1 = condition.fields[1];
                 const stateVisited = (0, _Set.contains)(condition.fields[0], visitedStates);
@@ -773,14 +998,14 @@ function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visi
                         }
                 }
             }
-        case /* CompositeCondition */ 4:
+        case /* CompositeCondition */ 6:
             {
                 const logicalOp = condition.fields[0];
                 const conditions = condition.fields[1];
                 switch(logicalOp.tag){
                     case /* Or */ 1:
                         {
-                            const results_1 = (0, _List.map)((condition_2)=>evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, condition_2), conditions);
+                            const results_1 = (0, _List.map)((condition_2)=>evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, formSpecForScores, condition_2), conditions);
                             if ((0, _List.exists)((r_3)=>(0, _Util.equals)(r_3, TransitionStatus_Satisfied()), results_1)) {
                                 return TransitionStatus_Satisfied();
                             } else if ((0, _List.forAll)((r_4)=>(0, _Util.equals)(r_4, TransitionStatus_Failed()), results_1)) {
@@ -797,26 +1022,26 @@ function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visi
                         }
                     case /* Not */ 2:
                         {
-                            let matchResult, cond;
+                            let matchResult_1, cond;
                             if (!(0, _List.isEmpty)(conditions)) {
                                 if ((0, _List.isEmpty)((0, _List.tail)(conditions))) {
-                                    matchResult = 0;
+                                    matchResult_1 = 0;
                                     cond = (0, _List.head)(conditions);
                                 } else {
-                                    matchResult = 1;
+                                    matchResult_1 = 1;
                                 }
                             } else {
-                                matchResult = 1;
+                                matchResult_1 = 1;
                             }
-                            switch(matchResult){
+                            switch(matchResult_1){
                                 case 0:
                                     {
-                                        const matchValue_1 = evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, cond);
-                                        switch(matchValue_1.tag){
+                                        const matchValue_3 = evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, formSpecForScores, cond);
+                                        switch(matchValue_3.tag){
                                             case /* Failed */ 1:
                                                 return TransitionStatus_Satisfied();
                                             case /* Pending */ 2:
-                                                return TransitionStatus_Pending(matchValue_1.fields[0]);
+                                                return TransitionStatus_Pending(matchValue_3.fields[0]);
                                             default:
                                                 return TransitionStatus_Failed();
                                         }
@@ -827,7 +1052,7 @@ function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visi
                         }
                     default:
                         {
-                            const results = (0, _List.map)((condition_1)=>evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, condition_1), conditions);
+                            const results = (0, _List.map)((condition_1)=>evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visitedStates, formSpecForScores, condition_1), conditions);
                             if ((0, _List.exists)((r)=>(0, _Util.equals)(r, TransitionStatus_Failed()), results)) {
                                 return TransitionStatus_Failed();
                             } else if ((0, _List.forAll)((r_1)=>(0, _Util.equals)(r_1, TransitionStatus_Satisfied()), results)) {
@@ -844,7 +1069,7 @@ function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visi
                         }
                 }
             }
-        case /* TestResultCondition */ 5:
+        case /* TestResultCondition */ 7:
             {
                 const result = condition.fields[1];
                 return TransitionStatus_Pending((0, _List.singleton)(condition.fields[0]));
@@ -853,22 +1078,20 @@ function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visi
             {
                 const optionKey = condition.fields[2];
                 const matrixItemKey = condition.fields[1];
-                const fieldKey_1 = condition.fields[0];
+                const fieldKey_2 = condition.fields[0];
                 const evaluator_2 = condition.fields[3];
                 const conditionValue_1 = condition.fields[4];
-                const optionValueOpt = formSpec == null ? undefined : (0, _Option.bind)((field_1)=>{
-                    const fieldType = field_1.FieldType;
+                const optionValueOpt = formSpec == null ? undefined : (0, _Option.bind)((field_5)=>{
+                    const fieldType = field_5.FieldType;
                     return (0, _Option.map)((opt_1)=>opt_1.Value, (0, _List.tryFind)((opt)=>(0, _Util.equals)(opt.OptionKey, optionKey), fieldType.tag === /* SingleChoice */ 13 ? fieldType.fields[0].Options : fieldType.tag === /* Radio */ 12 ? fieldType.fields[0].Options : fieldType.tag === /* Dropdown */ 14 ? fieldType.fields[0].Options : fieldType.tag === /* MultiChoice */ 15 ? fieldType.fields[0].Options : fieldType.tag === /* CheckboxList */ 16 ? fieldType.fields[0].Options : (0, _List.empty)()));
-                }, (0, _List.tryFind)((field)=>(0, _Util.equals)(field.FieldKey, fieldKey_1), (0, _List.collect)((step)=>step.Fields, (0, _Option.value)(formSpec).Steps)));
-                const matchValue_2 = (0, _Map.tryFind)(fieldKey_1, fieldValues);
+                }, (0, _List.tryFind)((field_4)=>(0, _Util.equals)(field_4.FieldKey, fieldKey_2), (0, _List.collect)((step_2)=>step_2.Fields, (0, _Option.value)(formSpec).Steps)));
+                const matchValue_4 = (0, _Map.tryFind)(fieldKey_2, fieldValues);
                 if (optionValueOpt == null) {
-                    const guid_1 = optionKey.fields[0];
-                    console.error((0, _Option.some)("[evaluateTransition] FieldOptionCondition: Could not find option in formSpec for optionKey:"), guid_1);
                     return TransitionStatus_Failed();
-                } else if (matchValue_2 == null) {
-                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey_1.fields[0]));
+                } else if (matchValue_4 == null) {
+                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey_2.fields[0]));
                 } else {
-                    const actualValueStr_1 = (0, _Option.value)(matchValue_2);
+                    const actualValueStr_1 = (0, _Option.value)(matchValue_4);
                     const optionValue = (0, _Option.value)(optionValueOpt);
                     const actualValues = (0, _Set.ofArray)((0, _Array.map)((s)=>s.trim().toLocaleLowerCase(), actualValueStr_1.split(",")), {
                         Compare: _Util.comparePrimitives
@@ -911,17 +1134,55 @@ function evaluateTransitionWithPartialData(resolver, formSpec, fieldValues, visi
         case /* PluginPropertyCondition */ 2:
             {
                 const propertyKey = condition.fields[1];
-                const fieldKey_2 = condition.fields[0];
+                const fieldKey_3 = condition.fields[0];
                 const evaluator_3 = condition.fields[2];
                 const conditionValue_2 = condition.fields[3];
-                const matchValue_4 = (0, _Map.tryFind)(fieldKey_2, fieldValues);
-                if (matchValue_4 == null) {
-                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey_2.fields[0]));
+                const matchValue_6 = (0, _Map.tryFind)(fieldKey_3, fieldValues);
+                if (matchValue_6 == null) {
+                    return TransitionStatus_Pending((0, _List.singleton)(fieldKey_3.fields[0]));
                 } else {
-                    const actualValueStr_2 = (0, _Option.value)(matchValue_4);
+                    const actualValueStr_2 = (0, _Option.value)(matchValue_6);
                     try {
-                        const actualFieldValue_1 = (0, _FormSpec.Shared_FieldValue_Single)(new _FormSpec.Shared_FieldAnswer(fieldKey_2, "", actualValueStr_2));
-                        return evaluateFieldCondition(actualValueStr_2, evaluator_3, conditionValue_2.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)(conditionValue_2.fields[0])) : conditionValue_2.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg_1)=>tupledArg_1[1], (0, _Map.toList)(conditionValue_2.fields[0]))) : conditionValue_2.tag === /* PluginData */ 3 ? (pluginData_1 = conditionValue_2.fields[0], (0, _Encodefs.toString)(0, (0, _Encodefs.Auto_generateBoxedEncoder_437914C6)((0, _FormSpec.Shared_PluginDataProperty_$reflection)(), undefined, undefined, undefined)(pluginData_1))) : conditionValue_2.fields[0]) ? TransitionStatus_Satisfied() : TransitionStatus_Failed();
+                        const pluginIdOpt = (0, _Option.filter)((id)=>!(0, _String.isNullOrEmpty)(id), (0, _Option.bind)((spec_4)=>(0, _Option.map)((f_1)=>{
+                                const ft = f_1.FieldType;
+                                switch(ft.tag){
+                                    case /* PluginField */ 22:
+                                        return ft.fields[0].PluginId;
+                                    case /* Matrix */ 19:
+                                        return "Fable.Form.Simple.Bulma.Fields.LikertField";
+                                    default:
+                                        return "";
+                                }
+                            }, (0, _List.tryFind)((f)=>(0, _Util.equals)(f.FieldKey, fieldKey_3), (0, _List.collect)((s_1)=>s_1.Fields, spec_4.Steps))), formSpec));
+                        return evaluateFieldCondition(pluginIdOpt == null ? actualValueStr_2 : (0, _Option.defaultArg)((0, _Option.bind)((converter)=>(0, _Option.map)((propMeta)=>{
+                                if (propMeta.Name === "TotalScore") {
+                                    return (0, _Util.int32ToString)((0, _Array.sum)((0, _Array.choose)((s_2)=>{
+                                        let matchValue_7;
+                                        let outArg = 0;
+                                        matchValue_7 = [
+                                            (0, _Int32.tryParse)(s_2.trim(), 511, false, 32, new _Types.FSharpRef(()=>outArg, (v_2)=>{
+                                                outArg = v_2 | 0;
+                                            })),
+                                            outArg
+                                        ];
+                                        if (matchValue_7[0]) {
+                                            return matchValue_7[1];
+                                        } else {
+                                            return undefined;
+                                        }
+                                    }, actualValueStr_2.split(",")), {
+                                        GetZero: ()=>0,
+                                        Add: (x_1, y_1)=>x_1 + y_1
+                                    }));
+                                } else {
+                                    const matchValue_8 = (0, _Decodefs.fromString)((0, _Util.uncurry2)((0, _Decodefs.Auto_generateBoxedDecoder_Z6670B51)((0, _Reflection.list_type)((0, _FormSpec.Shared_PluginDataProperty_$reflection)()), undefined, undefined)), actualValueStr_2);
+                                    if (matchValue_8.tag === /* Error */ 1) {
+                                        return actualValueStr_2;
+                                    } else {
+                                        return (0, _Option.defaultArg)((0, _Option.map)((p_1)=>p_1.Value, (0, _List.tryFind)((p)=>(0, _Util.equals)(p.PropertyKey, propertyKey), matchValue_8.fields[0])), actualValueStr_2);
+                                    }
+                                }
+                            }, converter.GetPropertyMetadataByKey(propertyKey)), (0, _PluginInterface.PluginValueRegistry_tryGet)((0, _Option.value)(pluginIdOpt))), actualValueStr_2), evaluator_3, conditionValue_2.tag === /* Multiple */ 1 ? (0, _String.join)(",", (0, _Set.toList)(conditionValue_2.fields[0])) : conditionValue_2.tag === /* Matrix */ 2 ? (0, _String.join)(",", (0, _List.map)((tupledArg_1)=>tupledArg_1[1], (0, _Map.toList)(conditionValue_2.fields[0]))) : conditionValue_2.tag === /* PluginData */ 3 ? "" : conditionValue_2.fields[0]) ? TransitionStatus_Satisfied() : TransitionStatus_Failed();
                     } catch (ex) {
                         return TransitionStatus_Failed();
                     }
@@ -958,23 +1219,11 @@ function isTerminalState(state) {
     }
 }
 function evaluateAllTransitions(context) {
-    const fieldValues = FieldResolver_extractFieldValues(context.FieldResolver, context.FormData);
-    console.log((0, _Option.some)("[evaluateAllTransitions] Extracted field values:"), fieldValues);
-    console.log((0, _Option.some)("[evaluateAllTransitions] Current states in context:"), context.CurrentStates);
-    console.log((0, _Option.some)("[evaluateAllTransitions] All transitions in pathway:"), context.PathwaySpec.Transitions);
-    const transitionsFromCurrentStates = (0, _List.filter)((t)=>{
-        const isFromCurrentState = (0, _Set.contains)(t.FromState, context.CurrentStates);
-        console.log((0, _Option.some)("[evaluateAllTransitions] Transition from"), t.FromState, "to", t.ToState, "FromCurrentState=", isFromCurrentState);
-        return isFromCurrentState;
-    }, context.PathwaySpec.Transitions);
-    console.log((0, _Option.some)("[evaluateAllTransitions] Transitions from current states:"), transitionsFromCurrentStates);
+    const fieldValues = FieldResolver_extractFieldValues(context.FieldResolver, context.FormSpec);
     return (0, _List.map)((transition)=>{
-        console.log((0, _Option.some)("[evaluateAllTransitions] Evaluating transition:"), transition.TransitionKey);
-        console.log((0, _Option.some)("[evaluateAllTransitions] Transition condition:"), transition.Condition);
-        const status = evaluateTransitionWithPartialData(context.FieldResolver, context.FormSpec, fieldValues, context.VisitedStates, transition.Condition);
-        console.log((0, _Option.some)("[evaluateAllTransitions] Transition status:"), status);
+        const status = evaluateTransitionWithPartialData(context.FieldResolver, context.FormSpec, fieldValues, context.VisitedStates, context.FormSpec, transition.Condition);
         return new MatchedTransition(transition, (0, _Option.defaultArg)(transition.Priority, 999), status);
-    }, transitionsFromCurrentStates);
+    }, (0, _List.filter)((t)=>(0, _Set.contains)(t.FromState, context.CurrentStates), context.PathwaySpec.Transitions));
 }
 function categorizeTransitions(transitions) {
     return [
@@ -1084,7 +1333,7 @@ function isExecutionComplete(context) {
         return false;
     }
 }
-function initializeExecution(formSpec, formData) {
+function initializeExecution(formSpec) {
     const matchValue = formSpec.ClinicalPathway;
     if (matchValue == null) {
         throw new Error("No clinical pathway found in form spec");
@@ -1102,19 +1351,19 @@ function initializeExecution(formSpec, formData) {
         } else {
             initialStates = (0, _List.singleton)((0, _Option.value)(matchValue_1));
         }
-        return new ExecutionContext$1(pathway, formSpec, (0, _Set.ofList)(initialStates, {
+        return new ExecutionContext(pathway, formSpec, (0, _Set.ofList)(initialStates, {
             Compare: _Util.compare
         }), (0, _Set.ofList)(initialStates, {
             Compare: _Util.compare
         }), (0, _Set.empty)({
             Compare: _Util.compare
-        }), (0, _List.empty)(), (0, _List.empty)(), (0, _List.empty)(), formData, resolver, (0, _List.map)((stateKey)=>new ExecutionLogEntry((0, _Date.now)(), stateKey, "Initialized", "Starting state"), initialStates));
+        }), (0, _List.empty)(), (0, _List.empty)(), (0, _List.empty)(), resolver, (0, _List.map)((stateKey)=>new ExecutionLogEntry((0, _Date.now)(), stateKey, "Initialized", "Starting state"), initialStates));
     }
 }
-function resolveFieldValueSource(valueSource, formSpec, formData) {
+function resolveFieldValueSource(valueSource, formSpec) {
     switch(valueSource.tag){
         case /* FieldReference */ 1:
-            return (0, _Option.defaultArg)((0, _Map.tryFind)(valueSource.fields[0], FieldResolver_extractFieldValues(FieldResolver_createResolver(formSpec), formData)), "");
+            return (0, _Option.defaultArg)((0, _Map.tryFind)(valueSource.fields[0], FieldResolver_extractFieldValues(FieldResolver_createResolver(formSpec), formSpec)), "");
         case /* OptionKey */ 2:
             {
                 const optionKey = valueSource.fields[0];
@@ -1127,41 +1376,38 @@ function resolveFieldValueSource(valueSource, formSpec, formData) {
             return valueSource.fields[0];
     }
 }
-function executeSetFieldValueAction(action, formSpec, formData) {
-    let matchValue, condition, fieldValues, fieldType;
-    if (!(matchValue = action.Condition, matchValue == null ? true : (condition = (0, _Option.value)(matchValue), fieldValues = FieldResolver_extractFieldValues(FieldResolver_createResolver(formSpec), formData), evaluateTransitionWithPartialData(FieldResolver_createResolver(formSpec), formSpec, fieldValues, (0, _Set.empty)({
+function executeSetFieldValueAction(action, formSpec) {
+    let matchValue, condition, fieldValues;
+    if (!(matchValue = action.Condition, matchValue == null ? true : (condition = (0, _Option.value)(matchValue), fieldValues = FieldResolver_extractFieldValues(FieldResolver_createResolver(formSpec), formSpec), evaluateTransitionWithPartialData(FieldResolver_createResolver(formSpec), formSpec, fieldValues, (0, _Set.empty)({
         Compare: _Util.compare
-    }), condition).tag === /* Satisfied */ 0))) {
-        return formData;
+    }), formSpec, condition).tag === /* Satisfied */ 0))) {
+        return formSpec;
     } else {
-        const valueToSet = resolveFieldValueSource(action.Value, formSpec, formData);
+        const valueToSet = resolveFieldValueSource(action.Value, formSpec);
         const targetFieldOpt = (0, _List.tryFind)((field)=>(0, _Util.equals)(field.FieldKey, action.TargetField), (0, _List.collect)((step)=>step.Fields, formSpec.Steps));
         if (targetFieldOpt == null) {
-            return formData;
+            return formSpec;
         } else {
             const targetField = (0, _Option.value)(targetFieldOpt);
             const stepOpt = (0, _List.tryFind)((step_1)=>(0, _List.exists)((f)=>(0, _Util.equals)(f.FieldKey, action.TargetField), step_1.Fields), formSpec.Steps);
             if (stepOpt == null) {
-                return formData;
+                return formSpec;
             } else {
-                const stepOrder = new _FormSpec.Values_StepOrder((0, _Option.value)(stepOpt).StepOrder);
-                const fieldAnswer = new _FormSpec.Shared_FieldAnswer(action.TargetField, targetField.Label, valueToSet);
-                return new _FormSpec.Values_DynamicFormResultData$1(formData.ResultFormSpecDetails, (0, _Map.FSharpMap__Add)(formData.ResultSteps, stepOrder, (0, _Map.FSharpMap__Add)((0, _Option.defaultArg)((0, _Map.tryFind)(stepOrder, formData.ResultSteps), (0, _Map.empty)({
-                    Compare: _Util.compare
-                })), action.TargetField, (fieldType = targetField.FieldType, new _FormSpec.Values_FieldDetails$1(targetField.FieldOrder, action.TargetField, targetField.Label, (0, _FormSpec.Shared_FieldValue_Single)(fieldAnswer), targetField.FieldType, (0, _List.map)((opt)=>new _FormSpec.Shared_FieldOption(opt.Description, opt.Value, opt.OptionKey), fieldType.tag === /* SingleChoice */ 13 ? fieldType.fields[0].Options : fieldType.tag === /* MultiChoice */ 15 ? fieldType.fields[0].Options : fieldType.tag === /* CheckboxList */ 16 ? fieldType.fields[0].Options : fieldType.tag === /* Dropdown */ 14 ? fieldType.fields[0].Options : fieldType.tag === /* Radio */ 12 ? fieldType.fields[0].Options : (0, _List.empty)()))))));
+                const step_2 = (0, _Option.value)(stepOpt);
+                return (0, _FormSpecValues.updateField)(formSpec, action.TargetField, (0, _FormSpec.Shared_FieldValue_Single)(new _FormSpec.Shared_FieldAnswer(action.TargetField, targetField.Label, valueToSet)), (0, _List.findIndex)((s)=>s.StepOrder === step_2.StepOrder, formSpec.Steps));
             }
         }
     }
 }
-function executeAction(action, formSpec, formData) {
+function executeAction(action, formSpec) {
     if (action.tag === /* SetFieldValue */ 10) {
-        return executeSetFieldValueAction(action.fields[0], formSpec, formData);
+        return executeSetFieldValueAction(action.fields[0], formSpec);
     } else {
-        return formData;
+        return formSpec;
     }
 }
-function executeActions(actions, formSpec, formData) {
-    return (0, _List.fold)((currentData, action)=>executeAction(action, formSpec, currentData), formData, actions);
+function executeActions(actions, formSpec) {
+    return (0, _List.fold)((currentSpec, action)=>executeAction(action, currentSpec), formSpec, actions);
 }
 function executeStep(context_mut, maxIterations_mut) {
     executeStep: while(true){
@@ -1174,18 +1420,18 @@ function executeStep(context_mut, maxIterations_mut) {
             const active = patternInput[0];
             const selectedTransitions = selectTransitionsByMode(context.PathwaySpec.ExecutionMode, active);
             if ((0, _List.isEmpty)(selectedTransitions)) {
-                return new ExecutionContext$1(context.PathwaySpec, context.FormSpec, context.CurrentStates, context.VisitedStates, context.CompletedStates, active, pending, context.ExecutedActions, context.FormData, context.FieldResolver, context.ExecutionLog);
+                return new ExecutionContext(context.PathwaySpec, context.FormSpec, context.CurrentStates, context.VisitedStates, context.CompletedStates, active, pending, context.ExecutedActions, context.FieldResolver, context.ExecutionLog);
             } else {
                 const newStates = (0, _Set.ofList)((0, _List.map)((t)=>t.Transition.ToState, selectedTransitions), {
                     Compare: _Util.compare
                 });
                 const newActions = (0, _List.collect)(extractActionsFromState, (0, _List.choose)((sk)=>findState(sk, context.PathwaySpec.States), (0, _Set.toList)(newStates)));
-                const updatedFormData = executeActions(newActions, context.FormSpec, context.FormData);
+                const updatedFormSpec = executeActions(newActions, context.FormSpec);
                 const newLogEntries = (0, _List.map)((t_1)=>{
                     let arg, arg_1;
                     return new ExecutionLogEntry((0, _Date.now)(), t_1.Transition.ToState, "Transitioned", (arg = t_1.Transition.FromState.fields[0], arg_1 = t_1.Transition.TransitionKey.fields[0], (0, _String.toText)((0, _String.printf)("From %s via %s"))(arg)(arg_1)));
                 }, selectedTransitions);
-                const updatedContext = new ExecutionContext$1(context.PathwaySpec, context.FormSpec, newStates, (0, _Set.union)(context.VisitedStates, newStates), (0, _Set.union)(context.CompletedStates, context.CurrentStates), active, pending, (0, _List.append)(context.ExecutedActions, newActions), updatedFormData, context.FieldResolver, (0, _List.append)(context.ExecutionLog, newLogEntries));
+                const updatedContext = new ExecutionContext(context.PathwaySpec, updatedFormSpec, newStates, (0, _Set.union)(context.VisitedStates, newStates), (0, _Set.union)(context.CompletedStates, context.CurrentStates), active, pending, (0, _List.append)(context.ExecutedActions, newActions), context.FieldResolver, (0, _List.append)(context.ExecutionLog, newLogEntries));
                 if (isExecutionComplete(updatedContext)) {
                     return updatedContext;
                 } else {
@@ -1198,12 +1444,12 @@ function executeStep(context_mut, maxIterations_mut) {
         break;
     }
 }
-function executeIncremental(context, formData) {
+function executeIncremental(context, formSpec) {
     let previousTransitionKeys, newKeys;
     const startingAtTerminal = (0, _List.exists)(isTerminalState, (0, _List.choose)((sk)=>findState(sk, context.PathwaySpec.States), (0, _Set.toList)(context.CurrentStates)));
-    const updatedContext = new ExecutionContext$1(context.PathwaySpec, context.FormSpec, context.CurrentStates, context.VisitedStates, context.CompletedStates, context.ActiveTransitions, context.PendingTransitions, context.ExecutedActions, formData, context.FieldResolver, context.ExecutionLog);
+    const updatedContext = new ExecutionContext(context.PathwaySpec, formSpec, context.CurrentStates, context.VisitedStates, context.CompletedStates, context.ActiveTransitions, context.PendingTransitions, context.ExecutedActions, context.FieldResolver, context.ExecutionLog);
     const newContext = executeStep(updatedContext, 100);
-    return new IncrementalExecutionResult$1(newContext, (0, _List.map)((_arg)=>_arg.fields[0], (0, _Set.toList)((0, _Set.difference)(newContext.CurrentStates, updatedContext.CurrentStates))), (previousTransitionKeys = (0, _Set.ofList)((0, _List.map)((t)=>t.Transition.TransitionKey, updatedContext.ActiveTransitions), {
+    return new IncrementalExecutionResult(newContext, (0, _List.map)((_arg)=>_arg.fields[0], (0, _Set.toList)((0, _Set.difference)(newContext.CurrentStates, updatedContext.CurrentStates))), (previousTransitionKeys = (0, _Set.ofList)((0, _List.map)((t)=>t.Transition.TransitionKey, updatedContext.ActiveTransitions), {
         Compare: _Util.compare
     }), newKeys = (0, _Set.difference)((0, _Set.ofList)((0, _List.map)((t_1)=>t_1.Transition.TransitionKey, newContext.ActiveTransitions), {
         Compare: _Util.compare
@@ -1242,7 +1488,7 @@ function extractClinicalPlans(context) {
     });
 }
 class PathwayExecutionResult$1 extends _Types.Record {
-    constructor(PathwayId, StartState, CurrentState, ExecutionMode, SelectedPaths, RejectedPaths, ExecutedActions, VisitedStates, TransitionsUsed, FormData, ExecutionTime, Success, Errors){
+    constructor(PathwayId, StartState, CurrentState, ExecutionMode, SelectedPaths, RejectedPaths, ExecutedActions, VisitedStates, TransitionsUsed, FormSpec, ExecutionTime, Success, Errors){
         super();
         this.PathwayId = PathwayId;
         this.StartState = StartState;
@@ -1253,7 +1499,7 @@ class PathwayExecutionResult$1 extends _Types.Record {
         this.ExecutedActions = ExecutedActions;
         this.VisitedStates = VisitedStates;
         this.TransitionsUsed = TransitionsUsed;
-        this.FormData = FormData;
+        this.FormSpec = FormSpec;
         this.ExecutionTime = ExecutionTime;
         this.Success = Success;
         this.Errors = Errors;
@@ -1300,8 +1546,8 @@ function PathwayExecutionResult$1_$reflection(gen0) {
                 (0, _Reflection.list_type)(_Reflection.string_type)
             ],
             [
-                "FormData",
-                (0, _FormSpec.Values_DynamicFormResultData$1_$reflection)(gen0)
+                "FormSpec",
+                (0, _FormSpec.Spec_FormSpec$1_$reflection)(gen0)
             ],
             [
                 "ExecutionTime",