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

package/src/FormSpec.ts

@@ -1,11 +1,11 @@
 import { FSharpRef, Record, Union } from "@fable-org/fable-library-js/Types.js";
-import { obj_type, float64_type, tuple_type, bool_type, int32_type, list_type, option_type, record_type, string_type, union_type, class_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+import { obj_type, float64_type, tuple_type, bool_type, list_type, record_type, option_type, int32_type, string_type, union_type, class_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+import { Option } from "@fable-org/fable-library-js/Option.js";
+import { float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { FSharpMap } from "@fable-org/fable-library-js/Map.js";
-import { Option } from "@fable-org/fable-library-js/Option.js";
 import { FSharpSet } from "@fable-org/fable-library-js/Set.js";
 import { ofArray, FSharpList } from "@fable-org/fable-library-js/List.js";
-import { float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { newGuid, tryParse } from "@fable-org/fable-library-js/Guid.js";
 import { item } from "@fable-org/fable-library-js/Array.js";
 import { split } from "@fable-org/fable-library-js/String.js";
@@ -116,16 +116,18 @@ export class Shared_FieldOption extends Record implements IEquatable<Shared_Fiel
     readonly Description: string;
     readonly Value: string;
     readonly OptionKey: Shared_FieldOptionKey;
-    constructor(Description: string, Value: string, OptionKey: Shared_FieldOptionKey) {
+    readonly Score: Option<int32>;
+    constructor(Description: string, Value: string, OptionKey: Shared_FieldOptionKey, Score: Option<int32>) {
         super();
         this.Description = Description;
         this.Value = Value;
         this.OptionKey = OptionKey;
+        this.Score = Score;
     }
 }
 
 export function Shared_FieldOption_$reflection(): TypeInfo {
-    return record_type("F1.Studio.Shared.FieldOption", [], Shared_FieldOption, () => [["Description", string_type], ["Value", string_type], ["OptionKey", Shared_FieldOptionKey_$reflection()]]);
+    return record_type("F1.Studio.Shared.FieldOption", [], Shared_FieldOption, () => [["Description", string_type], ["Value", string_type], ["OptionKey", Shared_FieldOptionKey_$reflection()], ["Score", option_type(int32_type)]]);
 }
 
 export class Shared_FieldAnswer extends Record implements IEquatable<Shared_FieldAnswer>, IComparable<Shared_FieldAnswer> {
@@ -1147,7 +1149,8 @@ export class Spec_FormField$1<FieldType> extends Record implements IEquatable<Sp
     readonly IsOptional: boolean;
     readonly IsDeprecated: boolean;
     readonly FieldType: FieldType;
-    constructor(FieldOrder: int32, FieldKey: Shared_FieldKey, Label: string, Notes: Option<string>, DependsOn: Option<Spec_DependsOn>, IsOptional: boolean, IsDeprecated: boolean, FieldType: FieldType) {
+    readonly Value: Option<Shared_FieldValue_$union>;
+    constructor(FieldOrder: int32, FieldKey: Shared_FieldKey, Label: string, Notes: Option<string>, DependsOn: Option<Spec_DependsOn>, IsOptional: boolean, IsDeprecated: boolean, FieldType: FieldType, Value: Option<Shared_FieldValue_$union>) {
         super();
         this.FieldOrder = (FieldOrder | 0);
         this.FieldKey = FieldKey;
@@ -1157,11 +1160,12 @@ export class Spec_FormField$1<FieldType> extends Record implements IEquatable<Sp
         this.IsOptional = IsOptional;
         this.IsDeprecated = IsDeprecated;
         this.FieldType = FieldType;
+        this.Value = Value;
     }
 }
 
 export function Spec_FormField$1_$reflection(gen0: TypeInfo): TypeInfo {
-    return record_type("F1.Studio.Spec.FormField`1", [gen0], Spec_FormField$1, () => [["FieldOrder", int32_type], ["FieldKey", Shared_FieldKey_$reflection()], ["Label", string_type], ["Notes", option_type(string_type)], ["DependsOn", option_type(Spec_DependsOn_$reflection())], ["IsOptional", bool_type], ["IsDeprecated", bool_type], ["FieldType", gen0]]);
+    return record_type("F1.Studio.Spec.FormField`1", [gen0], Spec_FormField$1, () => [["FieldOrder", int32_type], ["FieldKey", Shared_FieldKey_$reflection()], ["Label", string_type], ["Notes", option_type(string_type)], ["DependsOn", option_type(Spec_DependsOn_$reflection())], ["IsOptional", bool_type], ["IsDeprecated", bool_type], ["FieldType", gen0], ["Value", option_type(Shared_FieldValue_$reflection())]]);
 }
 
 export class Spec_FormStep$1<FieldType> extends Record implements IEquatable<Spec_FormStep$1<FieldType>>, IComparable<Spec_FormStep$1<FieldType>> {
@@ -1274,6 +1278,72 @@ export function Spec_Score_$reflection(): TypeInfo {
     return record_type("F1.Studio.Spec.Score", [], Spec_Score, () => [["MaxScore", int32_type], ["ScoreRanges", list_type(Spec_ScoreRange_$reflection())]]);
 }
 
+export type Spec_FormLifecycle_$union = 
+    | Spec_FormLifecycle<0>
+    | Spec_FormLifecycle<1>
+    | Spec_FormLifecycle<2>
+    | Spec_FormLifecycle<3>
+
+export type Spec_FormLifecycle_$cases = {
+    0: ["Blueprint", []],
+    1: ["Draft", [string]],
+    2: ["Submitted", [string]],
+    3: ["Signed", [string]]
+}
+
+export function Spec_FormLifecycle_Blueprint() {
+    return new Spec_FormLifecycle<0>(0, []);
+}
+
+export function Spec_FormLifecycle_Draft(instanceId: string) {
+    return new Spec_FormLifecycle<1>(1, [instanceId]);
+}
+
+export function Spec_FormLifecycle_Submitted(instanceId: string) {
+    return new Spec_FormLifecycle<2>(2, [instanceId]);
+}
+
+export function Spec_FormLifecycle_Signed(instanceId: string) {
+    return new Spec_FormLifecycle<3>(3, [instanceId]);
+}
+
+export class Spec_FormLifecycle<Tag extends keyof Spec_FormLifecycle_$cases> extends Union<Tag, Spec_FormLifecycle_$cases[Tag][0]> {
+    constructor(readonly tag: Tag, readonly fields: Spec_FormLifecycle_$cases[Tag][1]) {
+        super();
+    }
+    cases() {
+        return ["Blueprint", "Draft", "Submitted", "Signed"];
+    }
+}
+
+export function Spec_FormLifecycle_$reflection(): TypeInfo {
+    return union_type("F1.Studio.Spec.FormLifecycle", [], Spec_FormLifecycle, () => [[], [["instanceId", class_type("System.Guid")]], [["instanceId", class_type("System.Guid")]], [["instanceId", class_type("System.Guid")]]]);
+}
+
+export class Spec_FilledMeta extends Record implements IEquatable<Spec_FilledMeta>, IComparable<Spec_FilledMeta> {
+    readonly InstanceId: string;
+    readonly SourceBlueprintId: string;
+    readonly FilledBy: Option<string>;
+    readonly FilledAt: Option<Date>;
+    readonly LastModifiedAt: Option<Date>;
+    readonly Signatures: FSharpList<Values_Signature>;
+    readonly Notes: Option<string>;
+    constructor(InstanceId: string, SourceBlueprintId: string, FilledBy: Option<string>, FilledAt: Option<Date>, LastModifiedAt: Option<Date>, Signatures: FSharpList<Values_Signature>, Notes: Option<string>) {
+        super();
+        this.InstanceId = InstanceId;
+        this.SourceBlueprintId = SourceBlueprintId;
+        this.FilledBy = FilledBy;
+        this.FilledAt = FilledAt;
+        this.LastModifiedAt = LastModifiedAt;
+        this.Signatures = Signatures;
+        this.Notes = Notes;
+    }
+}
+
+export function Spec_FilledMeta_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Spec.FilledMeta", [], Spec_FilledMeta, () => [["InstanceId", class_type("System.Guid")], ["SourceBlueprintId", class_type("System.Guid")], ["FilledBy", option_type(string_type)], ["FilledAt", option_type(class_type("System.DateTimeOffset"))], ["LastModifiedAt", option_type(class_type("System.DateTimeOffset"))], ["Signatures", list_type(Values_Signature_$reflection())], ["Notes", option_type(string_type)]]);
+}
+
 export class Spec_FormSpec$1<FieldType> extends Record implements IEquatable<Spec_FormSpec$1<FieldType>>, IComparable<Spec_FormSpec$1<FieldType>> {
     readonly Id: string;
     readonly Code: Option<string>;
@@ -1288,7 +1358,9 @@ export class Spec_FormSpec$1<FieldType> extends Record implements IEquatable<Spe
     readonly RequiresReview: boolean;
     readonly RequiresReviewAndApproval: boolean;
     readonly ClinicalPathway: Option<ClinicalPathway_ClinicalPathwaySpec>;
-    constructor(Id: string, Code: Option<string>, Title: string, Abstract: string, Version: string, FormSpecVersion: string, Steps: FSharpList<Spec_FormStep$1<FieldType>>, CategoryTags: FSharpList<string>, Score: Option<Spec_Score>, AssociatedCodes: FSharpList<string>, RequiresReview: boolean, RequiresReviewAndApproval: boolean, ClinicalPathway: Option<ClinicalPathway_ClinicalPathwaySpec>) {
+    readonly Lifecycle: Spec_FormLifecycle_$union;
+    readonly FilledMeta: Option<Spec_FilledMeta>;
+    constructor(Id: string, Code: Option<string>, Title: string, Abstract: string, Version: string, FormSpecVersion: string, Steps: FSharpList<Spec_FormStep$1<FieldType>>, CategoryTags: FSharpList<string>, Score: Option<Spec_Score>, AssociatedCodes: FSharpList<string>, RequiresReview: boolean, RequiresReviewAndApproval: boolean, ClinicalPathway: Option<ClinicalPathway_ClinicalPathwaySpec>, Lifecycle: Spec_FormLifecycle_$union, FilledMeta: Option<Spec_FilledMeta>) {
         super();
         this.Id = Id;
         this.Code = Code;
@@ -1303,11 +1375,13 @@ export class Spec_FormSpec$1<FieldType> extends Record implements IEquatable<Spe
         this.RequiresReview = RequiresReview;
         this.RequiresReviewAndApproval = RequiresReviewAndApproval;
         this.ClinicalPathway = ClinicalPathway;
+        this.Lifecycle = Lifecycle;
+        this.FilledMeta = FilledMeta;
     }
 }
 
 export function Spec_FormSpec$1_$reflection(gen0: TypeInfo): TypeInfo {
-    return record_type("F1.Studio.Spec.FormSpec`1", [gen0], Spec_FormSpec$1, () => [["Id", class_type("System.Guid")], ["Code", option_type(string_type)], ["Title", string_type], ["Abstract", string_type], ["Version", string_type], ["FormSpecVersion", string_type], ["Steps", list_type(Spec_FormStep$1_$reflection(gen0))], ["CategoryTags", list_type(string_type)], ["Score", option_type(Spec_Score_$reflection())], ["AssociatedCodes", list_type(string_type)], ["RequiresReview", bool_type], ["RequiresReviewAndApproval", bool_type], ["ClinicalPathway", option_type(ClinicalPathway_ClinicalPathwaySpec_$reflection())]]);
+    return record_type("F1.Studio.Spec.FormSpec`1", [gen0], Spec_FormSpec$1, () => [["Id", class_type("System.Guid")], ["Code", option_type(string_type)], ["Title", string_type], ["Abstract", string_type], ["Version", string_type], ["FormSpecVersion", string_type], ["Steps", list_type(Spec_FormStep$1_$reflection(gen0))], ["CategoryTags", list_type(string_type)], ["Score", option_type(Spec_Score_$reflection())], ["AssociatedCodes", list_type(string_type)], ["RequiresReview", bool_type], ["RequiresReviewAndApproval", bool_type], ["ClinicalPathway", option_type(ClinicalPathway_ClinicalPathwaySpec_$reflection())], ["Lifecycle", Spec_FormLifecycle_$reflection()], ["FilledMeta", option_type(Spec_FilledMeta_$reflection())]]);
 }
 
 export function Spec_Evaluator__get_Key(x: Spec_Evaluator_$union): string {
@@ -2215,15 +2289,19 @@ export type ClinicalPathway_TransitionCondition_$union =
     | ClinicalPathway_TransitionCondition<4>
     | ClinicalPathway_TransitionCondition<5>
     | ClinicalPathway_TransitionCondition<6>
+    | ClinicalPathway_TransitionCondition<7>
+    | ClinicalPathway_TransitionCondition<8>
 
 export type ClinicalPathway_TransitionCondition_$cases = {
     0: ["FieldCondition", [Shared_FieldKey, ClinicalPathway_FieldEvaluator_$union, Shared_ConditionValue_$union]],
     1: ["FieldOptionCondition", [Shared_FieldKey, Option<Shared_MatrixItemKey>, Shared_FieldOptionKey, ClinicalPathway_FieldEvaluator_$union, Shared_ConditionValue_$union]],
     2: ["PluginPropertyCondition", [Shared_FieldKey, Shared_PluginPropertyKey, ClinicalPathway_FieldEvaluator_$union, Shared_ConditionValue_$union]],
-    3: ["StateCondition", [Shared_StateKey, ClinicalPathway_StateEvaluator_$union]],
-    4: ["CompositeCondition", [ClinicalPathway_LogicalOp_$union, FSharpList<ClinicalPathway_TransitionCondition_$union>]],
-    5: ["TestResultCondition", [string, string]],
-    6: ["Always", []]
+    3: ["ScoreInRange", [int32, int32]],
+    4: ["FieldScoreInRange", [Shared_FieldKey, int32, int32]],
+    5: ["StateCondition", [Shared_StateKey, ClinicalPathway_StateEvaluator_$union]],
+    6: ["CompositeCondition", [ClinicalPathway_LogicalOp_$union, FSharpList<ClinicalPathway_TransitionCondition_$union>]],
+    7: ["TestResultCondition", [string, string]],
+    8: ["Always", []]
 }
 
 export function ClinicalPathway_TransitionCondition_FieldCondition(fieldKey: Shared_FieldKey, evaluator: ClinicalPathway_FieldEvaluator_$union, value: Shared_ConditionValue_$union) {
@@ -2238,20 +2316,28 @@ export function ClinicalPathway_TransitionCondition_PluginPropertyCondition(fiel
     return new ClinicalPathway_TransitionCondition<2>(2, [fieldKey, propertyKey, evaluator, value]);
 }
 
+export function ClinicalPathway_TransitionCondition_ScoreInRange(min: int32, max: int32) {
+    return new ClinicalPathway_TransitionCondition<3>(3, [min, max]);
+}
+
+export function ClinicalPathway_TransitionCondition_FieldScoreInRange(fieldKey: Shared_FieldKey, min: int32, max: int32) {
+    return new ClinicalPathway_TransitionCondition<4>(4, [fieldKey, min, max]);
+}
+
 export function ClinicalPathway_TransitionCondition_StateCondition(stateKey: Shared_StateKey, stateEvaluator: ClinicalPathway_StateEvaluator_$union) {
-    return new ClinicalPathway_TransitionCondition<3>(3, [stateKey, stateEvaluator]);
+    return new ClinicalPathway_TransitionCondition<5>(5, [stateKey, stateEvaluator]);
 }
 
 export function ClinicalPathway_TransitionCondition_CompositeCondition(logicalOp: ClinicalPathway_LogicalOp_$union, conditions: FSharpList<ClinicalPathway_TransitionCondition_$union>) {
-    return new ClinicalPathway_TransitionCondition<4>(4, [logicalOp, conditions]);
+    return new ClinicalPathway_TransitionCondition<6>(6, [logicalOp, conditions]);
 }
 
 export function ClinicalPathway_TransitionCondition_TestResultCondition(testName: string, result: string) {
-    return new ClinicalPathway_TransitionCondition<5>(5, [testName, result]);
+    return new ClinicalPathway_TransitionCondition<7>(7, [testName, result]);
 }
 
 export function ClinicalPathway_TransitionCondition_Always() {
-    return new ClinicalPathway_TransitionCondition<6>(6, []);
+    return new ClinicalPathway_TransitionCondition<8>(8, []);
 }
 
 export class ClinicalPathway_TransitionCondition<Tag extends keyof ClinicalPathway_TransitionCondition_$cases> extends Union<Tag, ClinicalPathway_TransitionCondition_$cases[Tag][0]> {
@@ -2259,12 +2345,12 @@ export class ClinicalPathway_TransitionCondition<Tag extends keyof ClinicalPathw
         super();
     }
     cases() {
-        return ["FieldCondition", "FieldOptionCondition", "PluginPropertyCondition", "StateCondition", "CompositeCondition", "TestResultCondition", "Always"];
+        return ["FieldCondition", "FieldOptionCondition", "PluginPropertyCondition", "ScoreInRange", "FieldScoreInRange", "StateCondition", "CompositeCondition", "TestResultCondition", "Always"];
     }
 }
 
 export function ClinicalPathway_TransitionCondition_$reflection(): TypeInfo {
-    return union_type("F1.Studio.ClinicalPathway.TransitionCondition", [], ClinicalPathway_TransitionCondition, () => [[["fieldKey", Shared_FieldKey_$reflection()], ["evaluator", ClinicalPathway_FieldEvaluator_$reflection()], ["value", Shared_ConditionValue_$reflection()]], [["fieldKey", Shared_FieldKey_$reflection()], ["fieldItemKey", option_type(Shared_MatrixItemKey_$reflection())], ["optionKey", Shared_FieldOptionKey_$reflection()], ["evaluator", ClinicalPathway_FieldEvaluator_$reflection()], ["value", Shared_ConditionValue_$reflection()]], [["fieldKey", Shared_FieldKey_$reflection()], ["propertyKey", Shared_PluginPropertyKey_$reflection()], ["evaluator", ClinicalPathway_FieldEvaluator_$reflection()], ["value", Shared_ConditionValue_$reflection()]], [["stateKey", Shared_StateKey_$reflection()], ["stateEvaluator", ClinicalPathway_StateEvaluator_$reflection()]], [["logicalOp", ClinicalPathway_LogicalOp_$reflection()], ["conditions", list_type(ClinicalPathway_TransitionCondition_$reflection())]], [["testName", string_type], ["result", string_type]], []]);
+    return union_type("F1.Studio.ClinicalPathway.TransitionCondition", [], ClinicalPathway_TransitionCondition, () => [[["fieldKey", Shared_FieldKey_$reflection()], ["evaluator", ClinicalPathway_FieldEvaluator_$reflection()], ["value", Shared_ConditionValue_$reflection()]], [["fieldKey", Shared_FieldKey_$reflection()], ["fieldItemKey", option_type(Shared_MatrixItemKey_$reflection())], ["optionKey", Shared_FieldOptionKey_$reflection()], ["evaluator", ClinicalPathway_FieldEvaluator_$reflection()], ["value", Shared_ConditionValue_$reflection()]], [["fieldKey", Shared_FieldKey_$reflection()], ["propertyKey", Shared_PluginPropertyKey_$reflection()], ["evaluator", ClinicalPathway_FieldEvaluator_$reflection()], ["value", Shared_ConditionValue_$reflection()]], [["min", int32_type], ["max", int32_type]], [["fieldKey", Shared_FieldKey_$reflection()], ["min", int32_type], ["max", int32_type]], [["stateKey", Shared_StateKey_$reflection()], ["stateEvaluator", ClinicalPathway_StateEvaluator_$reflection()]], [["logicalOp", ClinicalPathway_LogicalOp_$reflection()], ["conditions", list_type(ClinicalPathway_TransitionCondition_$reflection())]], [["testName", string_type], ["result", string_type]], []]);
 }
 
 export type ClinicalPathway_FieldEvaluator_$union = 
@@ -2892,28 +2978,6 @@ export function Values_StepOrder_$reflection(): TypeInfo {
     return union_type("F1.Studio.Values.StepOrder", [], Values_StepOrder, () => [[["Item", int32_type]]]);
 }
 
-export class Values_FieldDetails$1<FieldType> extends Record implements IEquatable<Values_FieldDetails$1<FieldType>>, IComparable<Values_FieldDetails$1<FieldType>> {
-    readonly FieldOrder: int32;
-    readonly Key: Shared_FieldKey;
-    readonly Label: string;
-    readonly FieldValue: Shared_FieldValue_$union;
-    readonly FieldType: FieldType;
-    readonly Options: FSharpList<Shared_FieldOption>;
-    constructor(FieldOrder: int32, Key: Shared_FieldKey, Label: string, FieldValue: Shared_FieldValue_$union, FieldType: FieldType, Options: FSharpList<Shared_FieldOption>) {
-        super();
-        this.FieldOrder = (FieldOrder | 0);
-        this.Key = Key;
-        this.Label = Label;
-        this.FieldValue = FieldValue;
-        this.FieldType = FieldType;
-        this.Options = Options;
-    }
-}
-
-export function Values_FieldDetails$1_$reflection(gen0: TypeInfo): TypeInfo {
-    return record_type("F1.Studio.Values.FieldDetails`1", [gen0], Values_FieldDetails$1, () => [["FieldOrder", int32_type], ["Key", Shared_FieldKey_$reflection()], ["Label", string_type], ["FieldValue", Shared_FieldValue_$reflection()], ["FieldType", gen0], ["Options", list_type(Shared_FieldOption_$reflection())]]);
-}
-
 export type Values_FormStatus_$union = 
     | Values_FormStatus<0>
     | Values_FormStatus<1>
@@ -3012,56 +3076,16 @@ export function Values_Signature_$reflection(): TypeInfo {
     return record_type("F1.Studio.Values.Signature", [], Values_Signature, () => [["ApprovedById", class_type("System.Guid")], ["ApprovedByFullName", string_type], ["ApprovedByDate", class_type("System.DateTime")], ["ApprovalSignature", string_type], ["SignatureType", Values_SignatureType_$reflection()]]);
 }
 
-export class Values_DynamicFormSpecDetails extends Record implements IEquatable<Values_DynamicFormSpecDetails>, IComparable<Values_DynamicFormSpecDetails> {
-    readonly FormSpecId: string;
-    readonly FormSpecCode: Option<string>;
-    readonly FormSpecVersion: string;
-    readonly DynamicVersion: string;
-    readonly MaxScore: Option<Spec_Score>;
-    readonly Status: Values_FormStatus_$union;
-    readonly Signatures: FSharpList<Values_Signature>;
-    constructor(FormSpecId: string, FormSpecCode: Option<string>, FormSpecVersion: string, DynamicVersion: string, MaxScore: Option<Spec_Score>, Status: Values_FormStatus_$union, Signatures: FSharpList<Values_Signature>) {
-        super();
-        this.FormSpecId = FormSpecId;
-        this.FormSpecCode = FormSpecCode;
-        this.FormSpecVersion = FormSpecVersion;
-        this.DynamicVersion = DynamicVersion;
-        this.MaxScore = MaxScore;
-        this.Status = Status;
-        this.Signatures = Signatures;
-    }
-}
-
-export function Values_DynamicFormSpecDetails_$reflection(): TypeInfo {
-    return record_type("F1.Studio.Values.DynamicFormSpecDetails", [], Values_DynamicFormSpecDetails, () => [["FormSpecId", class_type("System.Guid")], ["FormSpecCode", option_type(string_type)], ["FormSpecVersion", string_type], ["DynamicVersion", string_type], ["MaxScore", option_type(Spec_Score_$reflection())], ["Status", Values_FormStatus_$reflection()], ["Signatures", list_type(Values_Signature_$reflection())]]);
-}
-
 export class Values_DynamicForm$1<FableFormModel> extends Record implements IEquatable<Values_DynamicForm$1<FableFormModel>>, IComparable<Values_DynamicForm$1<FableFormModel>> {
-    readonly DynamicFormSpecDetails: Values_DynamicFormSpecDetails;
     readonly Steps: FSharpMap<Values_StepOrder, FableFormModel>;
-    constructor(DynamicFormSpecDetails: Values_DynamicFormSpecDetails, Steps: FSharpMap<Values_StepOrder, FableFormModel>) {
+    constructor(Steps: FSharpMap<Values_StepOrder, FableFormModel>) {
         super();
-        this.DynamicFormSpecDetails = DynamicFormSpecDetails;
         this.Steps = Steps;
     }
 }
 
 export function Values_DynamicForm$1_$reflection(gen0: TypeInfo): TypeInfo {
-    return record_type("F1.Studio.Values.DynamicForm`1", [gen0], Values_DynamicForm$1, () => [["DynamicFormSpecDetails", Values_DynamicFormSpecDetails_$reflection()], ["Steps", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [Values_StepOrder_$reflection(), gen0])]]);
-}
-
-export class Values_DynamicFormResultData$1<FieldType> extends Record implements IEquatable<Values_DynamicFormResultData$1<FieldType>>, IComparable<Values_DynamicFormResultData$1<FieldType>> {
-    readonly ResultFormSpecDetails: Values_DynamicFormSpecDetails;
-    readonly ResultSteps: FSharpMap<Values_StepOrder, FSharpMap<Shared_FieldKey, Values_FieldDetails$1<FieldType>>>;
-    constructor(ResultFormSpecDetails: Values_DynamicFormSpecDetails, ResultSteps: FSharpMap<Values_StepOrder, FSharpMap<Shared_FieldKey, Values_FieldDetails$1<FieldType>>>) {
-        super();
-        this.ResultFormSpecDetails = ResultFormSpecDetails;
-        this.ResultSteps = ResultSteps;
-    }
-}
-
-export function Values_DynamicFormResultData$1_$reflection(gen0: TypeInfo): TypeInfo {
-    return record_type("F1.Studio.Values.DynamicFormResultData`1", [gen0], Values_DynamicFormResultData$1, () => [["ResultFormSpecDetails", Values_DynamicFormSpecDetails_$reflection()], ["ResultSteps", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [Values_StepOrder_$reflection(), class_type("Microsoft.FSharp.Collections.FSharpMap`2", [Shared_FieldKey_$reflection(), Values_FieldDetails$1_$reflection(gen0)])])]]);
+    return record_type("F1.Studio.Values.DynamicForm`1", [gen0], Values_DynamicForm$1, () => [["Steps", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [Values_StepOrder_$reflection(), gen0])]]);
 }
 
 export function Values_FormStatus__get_toString(x: Values_FormStatus_$union): string {
@@ -3111,4 +3135,20 @@ export function Values_formStatusFromString(formStatusString: string): Values_Fo
     }
 }
 
+/**
+ * Project FormLifecycle to FormStatus for API/TS interop.
+ */
+export function Values_formLifecycleToFormStatus(lifecycle: Spec_FormLifecycle_$union): Values_FormStatus_$union {
+    switch (lifecycle.tag) {
+        case /* Draft */ 1:
+            return Values_FormStatus_Draft(lifecycle.fields[0]);
+        case /* Submitted */ 2:
+            return Values_FormStatus_WaitingForReview();
+        case /* Signed */ 3:
+            return Values_FormStatus_Complete();
+        default:
+            return Values_FormStatus_Pending();
+    }
+}
+
 //# sourceMappingURL=FormSpec.ts.map

package/src/FormSpecHelpers.ts

@@ -1,29 +1,48 @@
+import { singleton, head, isEmpty, ofSeq, iterate, forAll, exists, FSharpList, empty, sortBy, mapIndexed, map } from "@fable-org/fable-library-js/List.js";
+import { float64, int32 } from "@fable-org/fable-library-js/Int32.js";
+import { getFieldDetails, FormSpecMetadata, FieldDetails$1 } from "./FormSpecValues.js";
+import { Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_FieldValue_Multiple, Shared_ConditionValue_Single, Shared_ConditionValue_PluginData, Shared_ConditionValue_Matrix, Shared_ConditionValue_Multiple, ClinicalPathway_ConstraintDefinition, ClinicalPathway_ConstraintType_$union, ClinicalPathway_TransitionDefinition, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, Shared_PluginPropertyKey, Shared_FieldOptionKey, Shared_ConditionValue_$union, ClinicalPathway_FieldEvaluator_$union, Shared_PluginDataProperty_$reflection, Shared_PluginDataProperty, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldValue_$union, Spec_FormSpec$1, Spec_FormLifecycle_Draft, Values_StepOrder, Spec_FormStep$1, Shared_FieldKey, Spec_FormField$1, Spec_FieldType_$union } from "./FormSpec.js";
+import { FSharpMap, toList } from "@fable-org/fable-library-js/Map.js";
+import { compare, comparePrimitives } from "@fable-org/fable-library-js/Util.js";
+import { newGuid } from "@fable-org/fable-library-js/Guid.js";
 import { value as value_2, Option, bind } from "@fable-org/fable-library-js/Option.js";
-import { Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_FieldValue_Multiple, Shared_ConditionValue_Single, Shared_ConditionValue_PluginData, Shared_ConditionValue_Matrix, Shared_ConditionValue_Multiple, Spec_FormSpec$1, ClinicalPathway_ConstraintDefinition, ClinicalPathway_ConstraintType_$union, ClinicalPathway_TransitionDefinition, ClinicalPathway_ClinicalPathwaySpec, Spec_FormStep$1, Spec_FormField$1, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, Shared_PluginPropertyKey, Shared_FieldOptionKey, Shared_ConditionValue_$union, ClinicalPathway_FieldEvaluator_$union, Values_DynamicFormResultData$1, Values_StepOrder, Shared_FieldKey, Spec_FieldType_$union, Values_FieldDetails$1, Shared_PluginDataProperty_$reflection, Shared_PluginDataProperty, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldValue_$union } from "./FormSpec.js";
 import { join } from "@fable-org/fable-library-js/String.js";
-import { singleton, head, isEmpty, ofSeq, iterate, forAll, exists, FSharpList, map } from "@fable-org/fable-library-js/List.js";
-import { map as map_1, toList } from "@fable-org/fable-library-js/Set.js";
-import { iterate as iterate_1, FSharpMap, tryFind, toList as toList_1 } from "@fable-org/fable-library-js/Map.js";
+import { map as map_1, toList as toList_1 } from "@fable-org/fable-library-js/Set.js";
 import { Auto_generateBoxedEncoder_437914C6, toString } from "./fable_modules/Thoth.Json.10.4.1/Encode.fs.js";
 import { list_type } from "@fable-org/fable-library-js/Reflection.js";
-import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
 import { tryParse } from "@fable-org/fable-library-js/Double.js";
 import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { FSharpResult$2_$union, FSharpResult$2_Error, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
 import { addRangeInPlace } from "@fable-org/fable-library-js/Array.js";
-import { compare, comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 
 /**
- * Extract a field value as a string from form data
+ * Build minimal FormSpec structure from ResultSteps Map (for TS interop when formSpec not available)
  */
-export function getFieldValue(fieldKey: Shared_FieldKey, formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>): Option<string> {
-    return bind<Values_FieldDetails$1<Spec_FieldType_$union>, string>((fieldDetails: Values_FieldDetails$1<Spec_FieldType_$union>): Option<string> => {
+export function buildFormSpecFromResultStepsMap(details: FormSpecMetadata, stepsMap: FSharpMap<Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>>): Spec_FormSpec$1<Spec_FieldType_$union> {
+    return new Spec_FormSpec$1(details.FormSpecId, details.FormSpecCode, "", "", details.DynamicVersion, details.FormSpecVersion, map<[Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>], Spec_FormStep$1<Spec_FieldType_$union>>((tupledArg_1: [Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>]): Spec_FormStep$1<Spec_FieldType_$union> => {
+        const stepOrder: int32 = tupledArg_1[0].fields[0] | 0;
+        return new Spec_FormStep$1(stepOrder, `Step ${stepOrder}`, mapIndexed<[Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>], Spec_FormField$1<Spec_FieldType_$union>>((i: int32, tupledArg_3: [Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>]): Spec_FormField$1<Spec_FieldType_$union> => {
+            const fd_1: FieldDetails$1<Spec_FieldType_$union> = tupledArg_3[1];
+            return new Spec_FormField$1(i + 1, tupledArg_3[0], fd_1.Label, undefined, undefined, false, false, fd_1.FieldType, fd_1.FieldValue);
+        }, sortBy<[Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>], int32>((tupledArg_2: [Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>]): int32 => tupledArg_2[1].FieldOrder, toList<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>(tupledArg_1[1]), {
+            Compare: comparePrimitives,
+        })));
+    }, sortBy<[Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>], int32>((tupledArg: [Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>]): int32 => tupledArg[0].fields[0], toList<Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>>(stepsMap), {
+        Compare: comparePrimitives,
+    })), empty<string>(), details.MaxScore, empty<string>(), false, false, undefined, Spec_FormLifecycle_Draft(newGuid()), undefined);
+}
+
+/**
+ * Extract a field value as a string from FormSpec
+ */
+export function getFieldValue(fieldKey: Shared_FieldKey, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): Option<string> {
+    return bind<FieldDetails$1<Spec_FieldType_$union>, string>((fieldDetails: FieldDetails$1<Spec_FieldType_$union>): Option<string> => {
         const matchValue: Shared_FieldValue_$union = fieldDetails.FieldValue;
         switch (matchValue.tag) {
             case /* Multiple */ 1:
-                return join(",", map<Shared_FieldAnswer, string>((a: Shared_FieldAnswer): string => a.Value, toList<Shared_FieldAnswer>(matchValue.fields[0])));
+                return join(",", map<Shared_FieldAnswer, string>((a: Shared_FieldAnswer): string => a.Value, toList_1<Shared_FieldAnswer>(matchValue.fields[0])));
             case /* Matrix */ 2:
-                return join(",", map<[Shared_MatrixItemKey, string], string>((tuple: [Shared_MatrixItemKey, string]): string => tuple[1], toList_1<Shared_MatrixItemKey, string>(matchValue.fields[0].Values)));
+                return join(",", map<[Shared_MatrixItemKey, string], string>((tuple: [Shared_MatrixItemKey, string]): string => tuple[1], toList<Shared_MatrixItemKey, string>(matchValue.fields[0].Values)));
             case /* PluginData */ 3: {
                 const pluginData: FSharpList<Shared_PluginDataProperty> = matchValue.fields[0];
                 return toString(0, Auto_generateBoxedEncoder_437914C6(list_type(Shared_PluginDataProperty_$reflection()), undefined, undefined, undefined)(pluginData));
@@ -31,14 +50,14 @@ export function getFieldValue(fieldKey: Shared_FieldKey, formData: Values_Dynami
             default:
                 return matchValue.fields[0].Value;
         }
-    }, bind<FSharpMap<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>, Values_FieldDetails$1<Spec_FieldType_$union>>((stepValues: FSharpMap<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>): Option<Values_FieldDetails$1<Spec_FieldType_$union>> => tryFind<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>(fieldKey, stepValues), tryFind<Values_StepOrder, FSharpMap<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>>(new Values_StepOrder(1), formData.ResultSteps)));
+    }, getFieldDetails(formSpec, fieldKey));
 }
 
 /**
  * Check if a field has a specific value
  */
-export function fieldHasValue(fieldKey: Shared_FieldKey, expectedValue: string, formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>): boolean {
-    const matchValue: Option<string> = getFieldValue(fieldKey, formData);
+export function fieldHasValue(fieldKey: Shared_FieldKey, expectedValue: string, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): boolean {
+    const matchValue: Option<string> = getFieldValue(fieldKey, formSpec);
     if (matchValue == null) {
         return false;
     }
@@ -50,8 +69,8 @@ export function fieldHasValue(fieldKey: Shared_FieldKey, expectedValue: string,
 /**
  * Check if a field value is greater than a threshold
  */
-export function fieldGreaterThan(fieldKey: Shared_FieldKey, threshold: float64, formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>): boolean {
-    const matchValue: Option<string> = getFieldValue(fieldKey, formData);
+export function fieldGreaterThan(fieldKey: Shared_FieldKey, threshold: float64, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): boolean {
+    const matchValue: Option<string> = getFieldValue(fieldKey, formSpec);
     if (matchValue == null) {
         return false;
     }
@@ -73,8 +92,8 @@ export function fieldGreaterThan(fieldKey: Shared_FieldKey, threshold: float64,
 /**
  * Check if a field value is less than a threshold
  */
-export function fieldLessThan(fieldKey: Shared_FieldKey, threshold: float64, formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>): boolean {
-    const matchValue: Option<string> = getFieldValue(fieldKey, formData);
+export function fieldLessThan(fieldKey: Shared_FieldKey, threshold: float64, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): boolean {
+    const matchValue: Option<string> = getFieldValue(fieldKey, formSpec);
     if (matchValue == null) {
         return false;
     }
@@ -96,12 +115,12 @@ export function fieldLessThan(fieldKey: Shared_FieldKey, threshold: float64, for
 /**
  * Evaluate a single field condition (string-based, for backward compatibility)
  */
-export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: ClinicalPathway_FieldEvaluator_$union, expectedValue: string, formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>): boolean {
+export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: ClinicalPathway_FieldEvaluator_$union, expectedValue: string, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): boolean {
     switch (evaluator.tag) {
         case /* Equals */ 0:
-            return fieldHasValue(fieldKey, expectedValue, formData);
+            return fieldHasValue(fieldKey, expectedValue, formSpec);
         case /* NotEquals */ 1:
-            return !fieldHasValue(fieldKey, expectedValue, formData);
+            return !fieldHasValue(fieldKey, expectedValue, formSpec);
         case /* GreaterThan */ 5: {
             let matchValue: [boolean, float64];
             let outArg = 0;
@@ -109,7 +128,7 @@ export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: Cli
                 outArg = v;
             })), outArg] as [boolean, float64]);
             if (matchValue[0]) {
-                return fieldGreaterThan(fieldKey, matchValue[1], formData);
+                return fieldGreaterThan(fieldKey, matchValue[1], formSpec);
             }
             else {
                 return false;
@@ -122,7 +141,7 @@ export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: Cli
                 outArg_1 = v_1;
             })), outArg_1] as [boolean, float64]);
             if (matchValue_1[0]) {
-                return fieldLessThan(fieldKey, matchValue_1[1], formData);
+                return fieldLessThan(fieldKey, matchValue_1[1], formSpec);
             }
             else {
                 return false;
@@ -135,11 +154,11 @@ export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: Cli
                 outArg_2 = v_2;
             })), outArg_2] as [boolean, float64]);
             if (matchValue_2[0]) {
-                if (fieldGreaterThan(fieldKey, matchValue_2[1], formData)) {
+                if (fieldGreaterThan(fieldKey, matchValue_2[1], formSpec)) {
                     return true;
                 }
                 else {
-                    return fieldHasValue(fieldKey, expectedValue, formData);
+                    return fieldHasValue(fieldKey, expectedValue, formSpec);
                 }
             }
             else {
@@ -153,11 +172,11 @@ export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: Cli
                 outArg_3 = v_3;
             })), outArg_3] as [boolean, float64]);
             if (matchValue_3[0]) {
-                if (fieldLessThan(fieldKey, matchValue_3[1], formData)) {
+                if (fieldLessThan(fieldKey, matchValue_3[1], formSpec)) {
                     return true;
                 }
                 else {
-                    return fieldHasValue(fieldKey, expectedValue, formData);
+                    return fieldHasValue(fieldKey, expectedValue, formSpec);
                 }
             }
             else {
@@ -172,11 +191,15 @@ export function evaluateFieldCondition(fieldKey: Shared_FieldKey, evaluator: Cli
 /**
  * Recursively evaluate a transition condition
  */
-export function evaluateCondition(formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>, condition: ClinicalPathway_TransitionCondition_$union): boolean {
+export function evaluateCondition(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, condition: ClinicalPathway_TransitionCondition_$union): boolean {
     switch (condition.tag) {
+        case /* ScoreInRange */ 3:
+            return false;
+        case /* FieldScoreInRange */ 4:
+            return false;
         case /* FieldCondition */ 0: {
             const conditionValue: Shared_ConditionValue_$union = condition.fields[2];
-            return evaluateFieldCondition(condition.fields[0], condition.fields[1], (conditionValue.tag === /* Multiple */ 1) ? join(",", toList<string>(conditionValue.fields[0])) : ((conditionValue.tag === /* Matrix */ 2) ? join(",", map<[Shared_MatrixItemKey, string], string>((tupledArg: [Shared_MatrixItemKey, string]): string => tupledArg[1], toList_1<Shared_MatrixItemKey, string>(conditionValue.fields[0]))) : ((conditionValue.tag === /* PluginData */ 3) ? conditionValue.fields[0].Value : conditionValue.fields[0])), formData);
+            return evaluateFieldCondition(condition.fields[0], condition.fields[1], (conditionValue.tag === /* Multiple */ 1) ? join(",", toList_1<string>(conditionValue.fields[0])) : ((conditionValue.tag === /* Matrix */ 2) ? join(",", map<[Shared_MatrixItemKey, string], string>((tupledArg: [Shared_MatrixItemKey, string]): string => tupledArg[1], toList<Shared_MatrixItemKey, string>(conditionValue.fields[0]))) : ((conditionValue.tag === /* PluginData */ 3) ? conditionValue.fields[0].Value : conditionValue.fields[0])), formSpec);
         }
         case /* FieldOptionCondition */ 1: {
             const optionKey: Shared_FieldOptionKey = condition.fields[2];
@@ -184,31 +207,31 @@ export function evaluateCondition(formData: Values_DynamicFormResultData$1<Spec_
             const fieldItemKey: Option<Shared_MatrixItemKey> = condition.fields[1];
             const evaluator_1: ClinicalPathway_FieldEvaluator_$union = condition.fields[3];
             const conditionValue_1: Shared_ConditionValue_$union = condition.fields[4];
-            return evaluateFieldCondition((fieldItemKey == null) ? fieldKey_1 : (new Shared_FieldKey(value_2(fieldItemKey).fields[0])), evaluator_1, (conditionValue_1.tag === /* Multiple */ 1) ? join(",", toList<string>(conditionValue_1.fields[0])) : ((conditionValue_1.tag === /* Matrix */ 2) ? join(",", map<[Shared_MatrixItemKey, string], string>((tupledArg_1: [Shared_MatrixItemKey, string]): string => tupledArg_1[1], toList_1<Shared_MatrixItemKey, string>(conditionValue_1.fields[0]))) : ((conditionValue_1.tag === /* PluginData */ 3) ? conditionValue_1.fields[0].Value : conditionValue_1.fields[0])), formData);
+            return evaluateFieldCondition((fieldItemKey == null) ? fieldKey_1 : (new Shared_FieldKey(value_2(fieldItemKey).fields[0])), evaluator_1, (conditionValue_1.tag === /* Multiple */ 1) ? join(",", toList_1<string>(conditionValue_1.fields[0])) : ((conditionValue_1.tag === /* Matrix */ 2) ? join(",", map<[Shared_MatrixItemKey, string], string>((tupledArg_1: [Shared_MatrixItemKey, string]): string => tupledArg_1[1], toList<Shared_MatrixItemKey, string>(conditionValue_1.fields[0]))) : ((conditionValue_1.tag === /* PluginData */ 3) ? conditionValue_1.fields[0].Value : conditionValue_1.fields[0])), formSpec);
         }
         case /* PluginPropertyCondition */ 2: {
             const propertyKey: Shared_PluginPropertyKey = condition.fields[1];
             const fieldKey_2: Shared_FieldKey = condition.fields[0];
             const evaluator_2: ClinicalPathway_FieldEvaluator_$union = condition.fields[2];
             const conditionValue_2: Shared_ConditionValue_$union = condition.fields[3];
-            const expectedValueStr_2: string = (conditionValue_2.tag === /* Multiple */ 1) ? join(",", toList<string>(conditionValue_2.fields[0])) : ((conditionValue_2.tag === /* Matrix */ 2) ? join(",", map<[Shared_MatrixItemKey, string], string>((tupledArg_2: [Shared_MatrixItemKey, string]): string => tupledArg_2[1], toList_1<Shared_MatrixItemKey, string>(conditionValue_2.fields[0]))) : ((conditionValue_2.tag === /* PluginData */ 3) ? conditionValue_2.fields[0].Value : conditionValue_2.fields[0]));
+            const expectedValueStr_2: string = (conditionValue_2.tag === /* Multiple */ 1) ? join(",", toList_1<string>(conditionValue_2.fields[0])) : ((conditionValue_2.tag === /* Matrix */ 2) ? join(",", map<[Shared_MatrixItemKey, string], string>((tupledArg_2: [Shared_MatrixItemKey, string]): string => tupledArg_2[1], toList<Shared_MatrixItemKey, string>(conditionValue_2.fields[0]))) : ((conditionValue_2.tag === /* PluginData */ 3) ? conditionValue_2.fields[0].Value : conditionValue_2.fields[0]));
             return false;
         }
-        case /* CompositeCondition */ 4: {
+        case /* CompositeCondition */ 6: {
             const operator: ClinicalPathway_LogicalOp_$union = condition.fields[0];
             const conditions: FSharpList<ClinicalPathway_TransitionCondition_$union> = condition.fields[1];
             switch (operator.tag) {
                 case /* Or */ 1:
-                    return exists<ClinicalPathway_TransitionCondition_$union>((condition_2: ClinicalPathway_TransitionCondition_$union): boolean => evaluateCondition(formData, condition_2), conditions);
+                    return exists<ClinicalPathway_TransitionCondition_$union>((condition_2: ClinicalPathway_TransitionCondition_$union): boolean => evaluateCondition(formSpec, condition_2), conditions);
                 case /* Not */ 2:
                     throw new Error("Not operator should not be used directly with CompositeCondition");
                 default:
-                    return forAll<ClinicalPathway_TransitionCondition_$union>((condition_1: ClinicalPathway_TransitionCondition_$union): boolean => evaluateCondition(formData, condition_1), conditions);
+                    return forAll<ClinicalPathway_TransitionCondition_$union>((condition_1: ClinicalPathway_TransitionCondition_$union): boolean => evaluateCondition(formSpec, condition_1), conditions);
             }
         }
-        case /* StateCondition */ 3:
+        case /* StateCondition */ 5:
             return true;
-        case /* TestResultCondition */ 5:
+        case /* TestResultCondition */ 7:
             return true;
         default:
             return true;
@@ -252,7 +275,7 @@ export function validateFormSpecFieldKeys(formSpec: Spec_FormSpec$1<Spec_FieldTy
                         }
                         break;
                     }
-                    case /* CompositeCondition */ 4: {
+                    case /* CompositeCondition */ 6: {
                         iterate<ClinicalPathway_TransitionCondition_$union>(validateCondition, condition.fields[1]);
                         break;
                     }
@@ -280,17 +303,17 @@ export function validateFormSpecFieldKeys(formSpec: Spec_FormSpec$1<Spec_FieldTy
 }
 
 /**
- * Validate that form data only contains GUID field keys
+ * Validate that FormSpec only contains GUID field keys (for form data validation)
  */
-export function validateFormDataFieldKeys(formData: Values_DynamicFormResultData$1<Spec_FieldType_$union>): FSharpResult$2_$union<void, FSharpList<string>> {
+export function validateFormDataFieldKeys(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): FSharpResult$2_$union<void, FSharpList<string>> {
     const errors: string[] = [];
-    iterate_1<Values_StepOrder, FSharpMap<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>>((stepOrder: Values_StepOrder, stepValues: FSharpMap<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>): void => {
-        iterate_1<Shared_FieldKey, Values_FieldDetails$1<Spec_FieldType_$union>>((fieldKey: Shared_FieldKey, _arg: Values_FieldDetails$1<Spec_FieldType_$union>): void => {
-            if (fieldKey.fields[0] === "00000000-0000-0000-0000-000000000000") {
-                void (errors.push(`Step ${stepOrder} contains field with empty GUID`));
+    iterate<Spec_FormStep$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): void => {
+        iterate<Spec_FormField$1<Spec_FieldType_$union>>((field: Spec_FormField$1<Spec_FieldType_$union>): void => {
+            if (field.FieldKey.fields[0] === "00000000-0000-0000-0000-000000000000") {
+                void (errors.push(`Step ${step.StepOrder} contains field with empty GUID`));
             }
-        }, stepValues);
-    }, formData.ResultSteps);
+        }, step.Fields);
+    }, formSpec.Steps);
     if (errors.length === 0) {
         return FSharpResult$2_Ok<void, FSharpList<string>>(undefined);
     }
@@ -302,7 +325,7 @@ export function validateFormDataFieldKeys(formData: Values_DynamicFormResultData
 /**
  * Comprehensive validation that ensures FormSpec only works with GUID keys
  */
-export function validateGuidOnlyFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, formData: Option<Values_DynamicFormResultData$1<Spec_FieldType_$union>>): FSharpResult$2_$union<void, FSharpList<string>> {
+export function validateGuidOnlyFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, formSpecWithValues: Option<Spec_FormSpec$1<Spec_FieldType_$union>>): FSharpResult$2_$union<void, FSharpList<string>> {
     const errors: string[] = [];
     const matchValue: FSharpResult$2_$union<void, FSharpList<string>> = validateFormSpecFieldKeys(formSpec);
     if (matchValue.tag === /* Ok */ 0) {
@@ -310,10 +333,10 @@ export function validateGuidOnlyFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldTyp
     else {
         addRangeInPlace(matchValue.fields[0], errors);
     }
-    if (formData == null) {
+    if (formSpecWithValues == null) {
     }
     else {
-        const matchValue_1: FSharpResult$2_$union<void, FSharpList<string>> = validateFormDataFieldKeys(value_2(formData));
+        const matchValue_1: FSharpResult$2_$union<void, FSharpList<string>> = validateFormDataFieldKeys(value_2(formSpecWithValues));
         if (matchValue_1.tag === /* Ok */ 0) {
         }
         else {