@f1studio/form-spec 5.0.0-alpha.139 → 5.0.0-alpha.140

package/src/FormSpec.FS/Interop/FormSpec.Api.Helpers.ts

@@ -1,23 +1,25 @@
-import { map, unwrap, value as value_19, orElseWith, orElse, defaultArgWith as defaultArgWith_1, Option, defaultArg as defaultArg_1 } from "@fable-org/fable-library-js/Option.js";
-import { exists, sortBy, toArray as toArray_1, length as length_1, tryPick, filter, mapIndexed as mapIndexed_1, isEmpty, map as map_3, empty, ofArray as ofArray_1, ofSeq, fold, singleton, collect, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
-import { Auto_generateBoxedEncoder_437914C6, toString } from "../../libs/Thoth.Json/packages/Thoth.Json/Encode.js";
-import { Spec_SingleChoiceInfo, Spec_ClinicalInstrumentInfo, Spec_FormClassification_$union, ClinicalPathway_StateType_$union, ClinicalPathway_TaskPriority_$union, ClinicalPathway_AlertSeverity_$union, ClinicalPathway_ReferralUrgency_$union, ClinicalPathway_ActionInfo_$union, ClinicalPathway_NavigateToFormAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_TestAction, ClinicalPathway_DocumentationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_MedicationAction, ClinicalPathway_ReferralAction, Shared_FieldValue, Shared_FieldValue_$union, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_SinglePathway, ClinicalPathway_SinglePathwayConfig, ClinicalPathway_SelectionStrategy_HighestPriority, ClinicalPathway_TransitionDefinition, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, ClinicalPathway_FieldEvaluator_Equals, Shared_TransitionKey, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Action, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_High, Shared_StateKey, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Matrix, Spec_MatrixInfo, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, Spec_FieldType_Text, Spec_TextInfo, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Shared_FieldOptionKey, Spec_FieldType_Checkbox, Spec_BooleanInfo, Shared_FieldKey, Shared_FieldOption, Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_MatrixItemKey, Shared_FieldValue_Multiple, Shared_FieldAnswer, Spec_FormStep$1, Spec_FormField$1, Spec_FieldType_$union, Spec_FormSpec$1, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection } from "../FormSpec.js";
-import { Auto_generateBoxedDecoder_Z6670B51, fromString } from "../../libs/Thoth.Json/packages/Thoth.Json/Decode.js";
-import { comparePrimitives, int32ToString, int64ToString, defaultOf, equals, createObj, stringHash, compare, IDisposable, disposeSafe, IEnumerator, getEnumerator, IMap, isArrayLike, uncurry2 } from "@fable-org/fable-library-js/Util.js";
+import { map as map_2, bind, unwrap, orElse, value as value_19, orElseWith, defaultArgWith as defaultArgWith_1, Option, defaultArg as defaultArg_1 } from "@fable-org/fable-library-js/Option.js";
+import { exists, sortBy, toArray, length as length_1, tryPick, filter as filter_1, mapIndexed as mapIndexed_2, isEmpty, map as map_3, empty, fold, ofSeq as ofSeq_1, ofArray as ofArray_2, singleton as singleton_1, collect as collect_1, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { int32ToString, int64ToString, stringHash, compare, comparePrimitives, IDisposable, disposeSafe, IEnumerator, getEnumerator, IMap, isArrayLike, uncurry2, createObj, equals, defaultOf } from "@fable-org/fable-library-js/Util.js";
+import { toText, join, isNullOrWhiteSpace, printf, toConsole, isNullOrEmpty } from "@fable-org/fable-library-js/String.js";
+import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
+import { append, mapIndexed, tryFind as tryFind_1, map, item as item_2 } from "@fable-org/fable-library-js/Array.js";
+import { length, mapIndexed as mapIndexed_1, filter, choose, map as map_1, singleton, collect, delay, toList } from "@fable-org/fable-library-js/Seq.js";
+import { Auto_generateBoxedEncoder_437914C6, toString } from "../../Thoth.Json/packages/Thoth.Json/Encode.js";
+import { Spec_SingleChoiceInfo, Spec_ClinicalInstrumentInfo, Spec_FormClassification_$union, ClinicalPathway_StateType_$union, ClinicalPathway_TaskPriority_$union, ClinicalPathway_AlertSeverity_$union, ClinicalPathway_ReferralUrgency_$union, ClinicalPathway_ActionInfo_$union, ClinicalPathway_NavigateToFormAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_TestAction, ClinicalPathway_DocumentationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_MedicationAction, ClinicalPathway_ReferralAction, Shared_FieldValue, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_SinglePathway, ClinicalPathway_SinglePathwayConfig, ClinicalPathway_SelectionStrategy_HighestPriority, ClinicalPathway_TransitionDefinition, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, ClinicalPathway_FieldEvaluator_Equals, Shared_TransitionKey, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Action, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_High, Shared_StateKey, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Matrix, Spec_MatrixInfo, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, Spec_FieldType_Text, Spec_TextInfo, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Shared_FieldOptionKey, Spec_FieldType_Checkbox, Spec_BooleanInfo, Shared_FieldKey, Shared_FieldOption, Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_MatrixItemKey, Shared_FieldValue_Multiple, Shared_FieldAnswer, Shared_FieldValue_$union, Spec_FormStep$1, Spec_FormField$1, Spec_FieldType_$union, Spec_FormSpec$1, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection } from "../FormSpec.js";
+import { Auto_generateBoxedDecoder_Z6670B51, fromString } from "../../Thoth.Json/packages/Thoth.Json/Decode.js";
 import { FSharpResult$2_Ok, FSharpResult$2_Error, FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
 import { newGuid, parse, tryParse } from "@fable-org/fable-library-js/Guid.js";
-import { Union, FSharpRef } from "@fable-org/fable-library-js/Types.js";
+import { toString as toString_1, Union, FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { array_type, string_type, obj_type, union_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
-import { isNullOrEmpty, toText, join, isNullOrWhiteSpace, printf, toConsole } from "@fable-org/fable-library-js/String.js";
-import { array as array_7, at, IOptionalGetter, IGetters, dict as dict_1, string, IRequiredGetter, object, fromString as fromString_1 } from "../../libs/Thoth.Json/packages/Thoth.Json/Decode.js";
-import { ErrorReason_$union } from "../../libs/Thoth.Json/packages/Thoth.Json/Types.js";
-import { tryFind as tryFind_1, empty as empty_2, ofSeq as ofSeq_1, toList, FSharpMap } from "@fable-org/fable-library-js/Map.js";
+import { at, dict as dict_1, IRequiredGetter, array as array_7, IGetters, IOptionalGetter, string, object, fromString as fromString_1 } from "../../Thoth.Json/packages/Thoth.Json/Decode.js";
+import { ErrorReason_$union } from "../../Thoth.Json/packages/Thoth.Json/Types.js";
+import { empty as empty_1, fold as fold_1, ofSeq, tryFind as tryFind_2, ofArray, toList as toList_1, FSharpMap } from "@fable-org/fable-library-js/Map.js";
 import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
-import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { tryDecodeFieldValueFromObject } from "./Facade/FormAnswersGate.js";
+import { Convert_fieldValueToTs } from "./Facade/BlueprintFilledForm.js";
+import { ofArray as ofArray_1 } from "@fable-org/fable-library-js/Set.js";
 import { getFieldDetails as getFieldDetails_1, FieldDetails$1, findStepIndexForField, updateField } from "../FormSpecValues.js";
-import { length, singleton as singleton_1, empty as empty_1, collect as collect_1, delay, toList as toList_1, mapIndexed, map as map_2, choose } from "@fable-org/fable-library-js/Seq.js";
-import { toArray, ofArray } from "@fable-org/fable-library-js/Set.js";
-import { tryFind as tryFind_2, append, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { now } from "@fable-org/fable-library-js/DateOffset.js";
 import { initializeExecution } from "../PathwayExecutor.js";
 import { List_distinct, distinct } from "@fable-org/fable-library-js/Seq2.js";
@@ -67,13 +69,69 @@ export function listToArray<T>(list: FSharpList<T>): T[] {
     return Array.from(list);
 }
 
-/**
- * Normalize form values for platform API (f1-api fill_form, etc.).
- * Ensures field keys and value shapes are in the format expected by the API.
- * TypeScript: normalizeFormValuesForPlatformApi(formValues: Record<string, unknown>) => Record<string, unknown>
- */
+function normalizeValue(v: any): any {
+    if (v == null) {
+        return defaultOf();
+    }
+    else if (equals(v, "")) {
+        return defaultOf();
+    }
+    else if (typeof v === "string") {
+        const s: string = (v as string).trim();
+        if (isNullOrEmpty(s)) {
+            return defaultOf();
+        }
+        else {
+            return s;
+        }
+    }
+    else if (typeof v === "number") {
+        const n = v as float64;
+        if (Number.isNaN(n)) {
+            return defaultOf();
+        }
+        else {
+            return n;
+        }
+    }
+    else if (typeof v === "boolean") {
+        return v;
+    }
+    else if (Array.isArray(v)) {
+        return (function(arr){var c=Array.from(arr).filter(function(x){return x!==''&&x!=null});return c.length>0?c:[]})(v);
+    }
+    else if (typeof v === 'object' && v !== null && !Array.isArray(v)) {
+        const entries: [string, any][] = Object.entries(v);
+        let hasValues = false;
+        const pairs: [string, any][] = [];
+        for (let idx = 0; idx <= (entries.length - 1); idx++) {
+            const forLoopVar: [string, any] = item_2(idx, entries);
+            const nv: any = forLoopVar[1];
+            if (!(nv == null) && !equals(nv, "")) {
+                void (pairs.push([forLoopVar[0], nv] as [string, any]));
+                hasValues = true;
+            }
+        }
+        if (hasValues) {
+            return createObj(toList<[string, any]>(delay<[string, any]>((): Iterable<[string, any]> => collect<[string, any], Iterable<[string, any]>, [string, any]>((matchValue: [string, any]): Iterable<[string, any]> => singleton<[string, any]>([matchValue[0], matchValue[1]] as [string, any]), pairs))));
+        }
+        else {
+            return {};
+        }
+    }
+    else {
+        return v;
+    }
+}
+
 export function normalizeFormValuesForPlatformApi(formValues: any): any {
-    return formValues;
+    if (formValues == null) {
+        return {};
+    }
+    else {
+        const entries: [string, any][] = Object.entries(formValues);
+        return createObj(toList<[string, any]>(delay<[string, any]>((): Iterable<[string, any]> => collect<[string, any], Iterable<[string, any]>, [string, any]>((matchValue: [string, any]): Iterable<[string, any]> => singleton<[string, any]>([matchValue[0], normalizeValue(matchValue[1])] as [string, any]), entries))));
+    }
 }
 
 export function serializeFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): string {
@@ -100,7 +158,7 @@ export function findFieldByKey(spec: Spec_FormSpec$1<Spec_FieldType_$union>, fie
         outArg = v;
     })), outArg] as [boolean, string]);
     if (matchValue[0]) {
-        return tryFind<Spec_FormField$1<Spec_FieldType_$union>>((field: Spec_FormField$1<Spec_FieldType_$union>): boolean => (field.FieldKey.fields[0] === matchValue[1]), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, spec.Steps));
+        return tryFind<Spec_FormField$1<Spec_FieldType_$union>>((field: Spec_FormField$1<Spec_FieldType_$union>): boolean => (field.FieldKey.fields[0] === matchValue[1]), collect_1<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, spec.Steps));
     }
     else {
         return undefined;
@@ -202,21 +260,76 @@ export function getExpectedFieldValueType(fieldType: Spec_FieldType_$union): Exp
     }
 }
 
-export function decodeAsString(fieldKey: string, obj: any): string {
-    let matchValue: FSharpResult$2_$union<string, string>;
-    const json: string = toString(0, Auto_generateBoxedEncoder_437914C6(obj_type, undefined, undefined, undefined)(obj));
-    matchValue = fromString<string>(uncurry2(Auto_generateBoxedDecoder_Z6670B51(string_type, undefined, undefined)), json);
-    if (matchValue.tag === /* Error */ 1) {
-        if (typeof obj === "string") {
-            const str = obj as string;
-            return str;
+function decodeAsOptionalDocumentation(obj: any): Option<string> {
+    if (obj == null) {
+        return undefined;
+    }
+    else {
+        try {
+            const matchValue_2: FSharpResult$2_$union<Option<string>, string> = fromString_1<Option<string>>((path_2: string, v_6: any): FSharpResult$2_$union<Option<string>, [string, ErrorReason_$union]> => object<Option<string>>((get$: IGetters): Option<string> => {
+                let objectArg: IOptionalGetter;
+                return orElseWith<string>((objectArg = get$.Optional, objectArg.Field<string>("documentation", string)), (): Option<string> => {
+                    const objectArg_1: IOptionalGetter = get$.Optional;
+                    return objectArg_1.Field<string>("Documentation", string);
+                });
+            }, path_2, v_6), toString(0, Auto_generateBoxedEncoder_437914C6(obj_type, undefined, undefined, undefined)(obj)));
+            return (matchValue_2.tag === /* Error */ 1) ? undefined : matchValue_2.fields[0];
         }
-        else {
-            throw new Error(`Field ${fieldKey}: Expected string value, got ${"Object"}`);
+        catch (matchValue_3: any) {
+            return undefined;
         }
     }
+}
+
+export function decodeAsString(fieldKey: string, obj: any): string {
+    if (typeof obj === "string") {
+        return obj;
+    }
     else {
-        return matchValue.fields[0];
+        try {
+            const json: string = toString(0, Auto_generateBoxedEncoder_437914C6(obj_type, undefined, undefined, undefined)(obj));
+            const matchValue_2: FSharpResult$2_$union<Option<string>, string> = fromString_1<Option<string>>((path_2: string, v_4: any): FSharpResult$2_$union<Option<string>, [string, ErrorReason_$union]> => object<Option<string>>((get$: IGetters): Option<string> => {
+                let objectArg: IOptionalGetter;
+                return orElseWith<string>((objectArg = get$.Optional, objectArg.Field<string>("value", string)), (): Option<string> => {
+                    const objectArg_1: IOptionalGetter = get$.Optional;
+                    return objectArg_1.Field<string>("Value", string);
+                });
+            }, path_2, v_4), json);
+            let matchResult: int32;
+            if (matchValue_2.tag === /* Ok */ 0) {
+                if (matchValue_2.fields[0] != null) {
+                    matchResult = 0;
+                }
+                else {
+                    matchResult = 1;
+                }
+            }
+            else {
+                matchResult = 1;
+            }
+            switch (matchResult) {
+                case 0:
+                    return value_19(matchValue_2.fields[0]);
+                default: {
+                    const matchValue_3: FSharpResult$2_$union<string, string> = fromString<string>(uncurry2(Auto_generateBoxedDecoder_Z6670B51(string_type, undefined, undefined)), json);
+                    if (matchValue_3.tag === /* Error */ 1) {
+                        throw new Error(`Field ${fieldKey}: Expected string value, got ${"Object"}`);
+                    }
+                    else {
+                        return matchValue_3.fields[0];
+                    }
+                }
+            }
+        }
+        catch (matchValue_4: any) {
+            if (typeof obj === "string") {
+                const str_1 = obj as string;
+                return str_1;
+            }
+            else {
+                throw new Error(`Field ${fieldKey}: Expected string value, got ${"Object"}`);
+            }
+        }
     }
 }
 
@@ -233,14 +346,38 @@ export function decodeAsStringArray(fieldKey: string, obj: any): string[] {
     }
     else {
         try {
-            let matchValue: FSharpResult$2_$union<string[], string>;
             const json: string = toString(0, Auto_generateBoxedEncoder_437914C6(obj_type, undefined, undefined, undefined)(obj));
-            matchValue = fromString<string[]>(uncurry2(Auto_generateBoxedDecoder_Z6670B51(array_type(string_type), undefined, undefined)), json);
-            if (matchValue.tag === /* Error */ 1) {
-                throw new Error(`Field ${fieldKey}: Expected string array, got ${"Object"}`);
+            const matchValue: FSharpResult$2_$union<Option<string[]>, string> = fromString_1<Option<string[]>>((path_4: string, v: any): FSharpResult$2_$union<Option<string[]>, [string, ErrorReason_$union]> => object<Option<string[]>>((get$: IGetters): Option<string[]> => {
+                let objectArg: IOptionalGetter;
+                return orElseWith<string[]>((objectArg = get$.Optional, objectArg.Field<string[]>("values", (path_1: string, value_3: any): FSharpResult$2_$union<string[], [string, ErrorReason_$union]> => array_7<string>(string, path_1, value_3))), (): Option<string[]> => {
+                    const objectArg_1: IOptionalGetter = get$.Optional;
+                    return objectArg_1.Field<string[]>("Values", (path_3: string, value_5: any): FSharpResult$2_$union<string[], [string, ErrorReason_$union]> => array_7<string>(string, path_3, value_5));
+                });
+            }, path_4, v), json);
+            let matchResult: int32;
+            if (matchValue.tag === /* Ok */ 0) {
+                if (matchValue.fields[0] != null) {
+                    matchResult = 0;
+                }
+                else {
+                    matchResult = 1;
+                }
             }
             else {
-                return matchValue.fields[0];
+                matchResult = 1;
+            }
+            switch (matchResult) {
+                case 0:
+                    return value_19(matchValue.fields[0]);
+                default: {
+                    const matchValue_1: FSharpResult$2_$union<string[], string> = fromString<string[]>(uncurry2(Auto_generateBoxedDecoder_Z6670B51(array_type(string_type), undefined, undefined)), json);
+                    if (matchValue_1.tag === /* Error */ 1) {
+                        throw new Error(`Field ${fieldKey}: Expected string array, got ${"Object"}`);
+                    }
+                    else {
+                        return matchValue_1.fields[0];
+                    }
+                }
             }
         }
         catch (ex: any) {
@@ -265,7 +402,7 @@ export function decodeAsMatrixValue(fieldKey: string, obj: any): { description:
             const objectArg_1: IRequiredGetter = get$.Required;
             valuesMap = objectArg_1.Field<FSharpMap<string, string>>("values", uncurry2(arg_7));
             const valuesDict_1: IMap<string, string> = new Map<string, string>([]);
-            const enumerator_1: IEnumerator<[string, string]> = getEnumerator(toList<string, string>(valuesMap));
+            const enumerator_1: IEnumerator<[string, string]> = getEnumerator(toList_1<string, string>(valuesMap));
             try {
                 while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
                     const forLoopVar: [string, string] = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -289,7 +426,7 @@ export function decodeAsMatrixValue(fieldKey: string, obj: any): { description:
             else {
                 const valuesMap_1: FSharpMap<string, string> = matchValue.fields[0];
                 const valuesDict_2: IMap<string, string> = new Map<string, string>([]);
-                const enumerator_2: IEnumerator<[string, string]> = getEnumerator(toList<string, string>(valuesMap_1));
+                const enumerator_2: IEnumerator<[string, string]> = getEnumerator(toList_1<string, string>(valuesMap_1));
                 try {
                     while (enumerator_2["System.Collections.IEnumerator.MoveNext"]()) {
                         const forLoopVar_1: [string, string] = enumerator_2["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -333,9 +470,9 @@ function decodePropertyKey(get$: IGetters): string {
     const matchValue: Option<string> = orElse(orElseWith<string>((objectArg = get$.Optional, objectArg.Field<string>("PropertyKey", string)), (): Option<string> => {
         const objectArg_1: IOptionalGetter = get$.Optional;
         return objectArg_1.Field<string>("propertyKey", string);
-    }), orElseWith<string>((objectArg_2 = get$.Optional, objectArg_2.Field<string>("PropertyKey", (firstPath: string, firstValue: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => at<string>(singleton("Value"), string, firstPath, firstValue))), (): Option<string> => {
+    }), orElseWith<string>((objectArg_2 = get$.Optional, objectArg_2.Field<string>("PropertyKey", (firstPath: string, firstValue: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => at<string>(singleton_1("Value"), string, firstPath, firstValue))), (): Option<string> => {
         const objectArg_3: IOptionalGetter = get$.Optional;
-        return objectArg_3.Field<string>("propertyKey", (firstPath_1: string, firstValue_1: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => at<string>(singleton("Value"), string, firstPath_1, firstValue_1));
+        return objectArg_3.Field<string>("propertyKey", (firstPath_1: string, firstValue_1: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => at<string>(singleton_1("Value"), string, firstPath_1, firstValue_1));
     }));
     let matchResult: int32, s_1: string;
     if (matchValue != null) {
@@ -391,6 +528,76 @@ export function decodeAsPluginDataArray(fieldKey: string, obj: any): { dataType:
     }
 }
 
+/**
+ * Convert flat LLM/wire values to canonical BlueprintFilledFormFieldValueAnswersMap.
+ * This is the ONE place flat→canonical conversion exists. LLM produces flat primitives
+ * (string, string[], Record, Plugin[]); this function uses the blueprint to determine
+ * expected types, decodes the flat values, builds FieldValue DUs, and converts them
+ * to canonical ISingleValue/IMultipleValue/IMatrixValue/IPluginDataValue via Convert.fieldValueToTs.
+ * Also merges a top-level "documentation" block into per-field values.
+ * TypeScript: convertFlatValuesToCanonical(formSpec: FormSpec, flatValues: Record<string, unknown>) => BlueprintFilledFormFieldValueAnswersMap
+ */
+export function convertFlatValuesToCanonical(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, flatValues: any): any {
+    let matchValue_2: ExpectedFieldValueType_$union, matrixData: { description: string, values: IMap<string, string> };
+    if (flatValues == null) {
+        return {};
+    }
+    else {
+        const entries: [string, any][] = Object.entries(flatValues);
+        const docMap: FSharpMap<string, string> = ofArray<string, string>(map<[string, any], [string, string]>((tupledArg_2: [string, any]): [string, string] => ([tupledArg_2[0], toString_1(tupledArg_2[1])] as [string, string]), defaultArg_1(bind<[string, any], [string, any][]>((tupledArg_1: [string, any]): Option<[string, any][]> => {
+            const docObj: any = tupledArg_1[1];
+            if (docObj == null) {
+                return undefined;
+            }
+            else {
+                return Object.entries(docObj);
+            }
+        }, tryFind_1<[string, any]>((tupledArg: [string, any]): boolean => (tupledArg[0] === "documentation"), entries)), [])), {
+            Compare: comparePrimitives,
+        });
+        const resultPairs: [string, any][] = [];
+        for (let idx = 0; idx <= (entries.length - 1); idx++) {
+            const forLoopVar: [string, any] = item_2(idx, entries);
+            const rawValue: any = forLoopVar[1];
+            const fieldKey: string = forLoopVar[0];
+            if (fieldKey === "documentation") {
+            }
+            else {
+                const matchValue: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(formSpec, fieldKey);
+                if (matchValue == null) {
+                }
+                else {
+                    const field: Spec_FormField$1<Spec_FieldType_$union> = value_19(matchValue);
+                    try {
+                        const matchValue_1: Option<Shared_FieldValue_$union> = tryDecodeFieldValueFromObject(rawValue);
+                        if (matchValue_1 == null) {
+                            const docOpt: Option<string> = orElseWith<string>(decodeAsOptionalDocumentation(rawValue), (): Option<string> => tryFind_2<string, string>(fieldKey, docMap));
+                            const canonical_1: any = Convert_fieldValueToTs((matchValue_2 = getExpectedFieldValueType(field.FieldType), (matchValue_2.tag === /* MultipleValues */ 1) ? Shared_FieldValue_Multiple(ofArray_1<Shared_FieldAnswer>(mapIndexed<string, Shared_FieldAnswer>((i: int32, value_1: string): Shared_FieldAnswer => (new Shared_FieldAnswer(field.FieldKey, field.Label, value_1, (i === 0) ? docOpt : undefined)), decodeAsStringArray(fieldKey, rawValue)), {
+                                Compare: compare,
+                            })) : ((matchValue_2.tag === /* MatrixValue */ 2) ? ((matrixData = decodeAsMatrixValue(fieldKey, rawValue), Shared_FieldValue_Matrix(new Shared_MatrixAnswer(field.FieldKey, matrixData.description, ofSeq<Shared_MatrixItemKey, string>(map_1<[string, string], [Shared_MatrixItemKey, string]>((kvp: [string, string]): [Shared_MatrixItemKey, string] => ([new Shared_MatrixItemKey(parse(kvp[0])), kvp[1]] as [Shared_MatrixItemKey, string]), matrixData.values), {
+                                Compare: compare,
+                            }), docOpt)))) : ((matchValue_2.tag === /* PluginDataValue */ 3) ? Shared_FieldValue_PluginData(ofArray_2<Shared_PluginDataProperty>(map<{ dataType: string, description?: string, displayName?: string, name: string, propertyKey: string, unit?: string, value: string }, Shared_PluginDataProperty>((prop: { dataType: string, description?: string, displayName?: string, name: string, propertyKey: string, unit?: string, value: string }): Shared_PluginDataProperty => (new Shared_PluginDataProperty(new Shared_PluginPropertyKey(parse(prop.propertyKey)), prop.name, prop.dataType, prop.value, prop.displayName, prop.unit, prop.description)), decodeAsPluginDataArray(fieldKey, rawValue)))) : Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, field.Label, decodeAsString(fieldKey, rawValue), docOpt))))));
+                            void (resultPairs.push([fieldKey, canonical_1] as [string, any]));
+                        }
+                        else {
+                            const canonical: any = Convert_fieldValueToTs(value_19(matchValue_1));
+                            void (resultPairs.push([fieldKey, canonical] as [string, any]));
+                        }
+                    }
+                    catch (matchValue_3: any) {
+                    }
+                }
+            }
+        }
+        if (resultPairs.length === 0) {
+            return {};
+        }
+        else {
+            return createObj(ofSeq_1<[string, any]>(map_1<[string, any], [string, any]>((tupledArg_3: [string, any]): [string, any] => ([tupledArg_3[0], tupledArg_3[1]] as [string, any]), resultPairs)));
+        }
+    }
+}
+
 export function createFormFieldData(fieldKey: string, objectValue: any): { fieldKey: string, objectValue: any } {
     return {
         fieldKey: fieldKey,
@@ -398,36 +605,61 @@ export function createFormFieldData(fieldKey: string, objectValue: any): { field
     };
 }
 
-/**
- * Build FormSpec with field values applied. Primary API - pathway uses FormSpec directly.
- * TypeScript: buildFormSpecWithValues(formSpec: FormSpec, fieldData: FieldInput[]) => FormSpec
- */
 export function buildFormSpecWithValues(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, fieldData: { fieldKey: string, objectValue: any }[]): Spec_FormSpec$1<Spec_FieldType_$union> {
+    let collection: Iterable<{ fieldKey: string, objectValue: any }>;
     return fold<[Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>], Spec_FormSpec$1<Spec_FieldType_$union>>((spec: Spec_FormSpec$1<Spec_FieldType_$union>, tupledArg: [Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]): Spec_FormSpec$1<Spec_FieldType_$union> => {
         const field_1: Spec_FormField$1<Spec_FieldType_$union> = tupledArg[0];
-        return defaultArg_1(map<int32, Spec_FormSpec$1<Spec_FieldType_$union>>((stepIdx: int32): Spec_FormSpec$1<Spec_FieldType_$union> => updateField<Spec_FieldType_$union>(spec, field_1.FieldKey, tupledArg[1].FieldValue, stepIdx), findStepIndexForField<Spec_FieldType_$union>(spec, field_1.FieldKey)), spec);
-    }, formSpec, ofSeq<[Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]>(choose<{ fieldKey: string, objectValue: any }, [Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]>((input: { fieldKey: string, objectValue: any }): Option<[Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]> => {
-        let matchValue_1: ExpectedFieldValueType_$union, matrixData: { description: string, values: IMap<string, string> }, matchValue_2: Spec_FieldType_$union;
-        const matchValue: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(formSpec, input.fieldKey);
+        return defaultArg_1(map_2<int32, Spec_FormSpec$1<Spec_FieldType_$union>>((stepIdx: int32): Spec_FormSpec$1<Spec_FieldType_$union> => updateField<Spec_FieldType_$union>(spec, field_1.FieldKey, tupledArg[1].FieldValue, stepIdx), findStepIndexForField<Spec_FieldType_$union>(spec, field_1.FieldKey)), spec);
+    }, formSpec, ofSeq_1<[Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]>(choose<{ fieldKey: string, objectValue: any }, [Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]>((input_1: { fieldKey: string, objectValue: any }): Option<[Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]> => {
+        let matchValue_1: Option<Shared_FieldValue_$union>, matchValue_2: Spec_FieldType_$union;
+        const matchValue: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(formSpec, input_1.fieldKey);
         if (matchValue == null) {
-            toConsole(`Warning: Field ${input.fieldKey} not found in FormSpec`);
+            toConsole(`Warning: Field ${input_1.fieldKey} not found in FormSpec`);
             return undefined;
         }
         else {
             const field: Spec_FormField$1<Spec_FieldType_$union> = value_19(matchValue);
             try {
-                return [field, new FieldDetails$1(field.FieldOrder, field.FieldKey, field.Label, (matchValue_1 = getExpectedFieldValueType(field.FieldType), (matchValue_1.tag === /* MultipleValues */ 1) ? Shared_FieldValue_Multiple(ofArray<Shared_FieldAnswer>(map_1<string, Shared_FieldAnswer>((value: string): Shared_FieldAnswer => (new Shared_FieldAnswer(field.FieldKey, field.Label, value)), decodeAsStringArray(input.fieldKey, input.objectValue)), {
-                    Compare: compare,
-                })) : ((matchValue_1.tag === /* MatrixValue */ 2) ? ((matrixData = decodeAsMatrixValue(input.fieldKey, input.objectValue), Shared_FieldValue_Matrix(new Shared_MatrixAnswer(field.FieldKey, matrixData.description, ofSeq_1<Shared_MatrixItemKey, string>(map_2<[string, string], [Shared_MatrixItemKey, string]>((kvp: [string, string]): [Shared_MatrixItemKey, string] => ([new Shared_MatrixItemKey(parse(kvp[0])), kvp[1]] as [Shared_MatrixItemKey, string]), matrixData.values), {
-                    Compare: compare,
-                }))))) : ((matchValue_1.tag === /* PluginDataValue */ 3) ? Shared_FieldValue_PluginData(ofArray_1<Shared_PluginDataProperty>(map_1<{ dataType: string, description?: string, displayName?: string, name: string, propertyKey: string, unit?: string, value: string }, Shared_PluginDataProperty>((prop: { dataType: string, description?: string, displayName?: string, name: string, propertyKey: string, unit?: string, value: string }): Shared_PluginDataProperty => (new Shared_PluginDataProperty(new Shared_PluginPropertyKey(parse(prop.propertyKey)), prop.name, prop.dataType, prop.value, prop.displayName, prop.unit, prop.description)), decodeAsPluginDataArray(input.fieldKey, input.objectValue)))) : Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, field.Label, decodeAsString(input.fieldKey, input.objectValue)))))), field.FieldType, (matchValue_2 = field.FieldType, (matchValue_2.tag === /* Radio */ 12) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* SingleChoice */ 13) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* Dropdown */ 14) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* MultiChoice */ 15) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* CheckboxList */ 16) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* TagList */ 17) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* TextAutoComplete */ 18) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* Matrix */ 19) ? matchValue_2.fields[0].Options : empty<Shared_FieldOption>())))))))))] as [Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>];
+                return [field, new FieldDetails$1(field.FieldOrder, field.FieldKey, field.Label, (matchValue_1 = tryDecodeFieldValueFromObject(input_1.objectValue), (matchValue_1 == null) ? (() => {
+                    throw new Error(`Field ${input_1.fieldKey}: Expected canonical discriminated format (with 'kind' tag). Got flat value. Use convertFlatValuesToCanonical() at the boundary to convert flat values before calling buildFormSpecWithValues.`);
+                })() : value_19(matchValue_1)), field.FieldType, (matchValue_2 = field.FieldType, (matchValue_2.tag === /* Radio */ 12) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* SingleChoice */ 13) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* Dropdown */ 14) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* MultiChoice */ 15) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* CheckboxList */ 16) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* TagList */ 17) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* TextAutoComplete */ 18) ? matchValue_2.fields[0].Options : ((matchValue_2.tag === /* Matrix */ 19) ? matchValue_2.fields[0].Options : empty<Shared_FieldOption>())))))))))] as [Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>];
             }
             catch (ex: any) {
-                toConsole(`Error processing field ${input.fieldKey}: ${ex.message}`);
-                return undefined;
+                toConsole(`Error processing field ${input_1.fieldKey}: ${ex.message}`);
+                throw ex;
+            }
+        }
+    }, (collection = filter<{ fieldKey: string, objectValue: any }>((input: { fieldKey: string, objectValue: any }): boolean => {
+        if (input.fieldKey !== "documentation") {
+            return !input.fieldKey.endsWith("_doc");
+        }
+        else {
+            return false;
+        }
+    }, fieldData), Array.from(collection)))));
+}
+
+/**
+ * Build FormSpec with pre-decoded FieldValues (server-side: HTTP decoder already validated).
+ * Skips tryDecodeFieldValueFromObject — values are already domain types.
+ */
+export function buildFormSpecFromDecodedValues(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, fieldValues: FSharpMap<string, Shared_FieldValue_$union>): Spec_FormSpec$1<Spec_FieldType_$union> {
+    return fold_1<string, Shared_FieldValue_$union, Spec_FormSpec$1<Spec_FieldType_$union>>((spec: Spec_FormSpec$1<Spec_FieldType_$union>, fieldKey: string, fieldValue: Shared_FieldValue_$union): Spec_FormSpec$1<Spec_FieldType_$union> => {
+        if ((fieldKey === "documentation") ? true : fieldKey.endsWith("_doc")) {
+            return spec;
+        }
+        else {
+            const matchValue: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(spec, fieldKey);
+            if (matchValue == null) {
+                toConsole(`Warning: Field ${fieldKey} not found in FormSpec`);
+                return spec;
+            }
+            else {
+                const field: Spec_FormField$1<Spec_FieldType_$union> = value_19(matchValue);
+                return defaultArg_1(map_2<int32, Spec_FormSpec$1<Spec_FieldType_$union>>((stepIdx: int32): Spec_FormSpec$1<Spec_FieldType_$union> => updateField<Spec_FieldType_$union>(spec, field.FieldKey, fieldValue, stepIdx), findStepIndexForField<Spec_FieldType_$union>(spec, field.FieldKey)), spec);
             }
         }
-    }, fieldData)));
+    }, formSpec, fieldValues);
 }
 
 /**
@@ -435,7 +667,7 @@ export function buildFormSpecWithValues(formSpec: Spec_FormSpec$1<Spec_FieldType
  * TypeScript: createCheckboxField(fieldKey: string, label: string, isOptional: boolean)
  */
 export function createCheckboxField(fieldKeyString: string, label: string, isOptional: boolean): Spec_FormField$1<Spec_FieldType_$union> {
-    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, isOptional, false, false, undefined, Spec_FieldType_Checkbox(new Spec_BooleanInfo(undefined, undefined)), undefined);
+    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, isOptional, false, false, Spec_FieldType_Checkbox(new Spec_BooleanInfo(undefined, undefined)), undefined);
 }
 
 /**
@@ -443,8 +675,8 @@ export function createCheckboxField(fieldKeyString: string, label: string, isOpt
  * TypeScript: createCheckboxListField(fieldKey: string, label: string, options: {value: string, description: string, optionKey: string}[])
  */
 export function createCheckboxListField(fieldKeyString: string, label: string, options: { description: string, optionKey: string, value: string }[]): Spec_FormField$1<Spec_FieldType_$union> {
-    const fieldOptions: FSharpList<Shared_FieldOption> = ofSeq<Shared_FieldOption>(mapIndexed<{ description: string, optionKey: string, value: string }, Shared_FieldOption>((_arg: int32, opt: { description: string, optionKey: string, value: string }): Shared_FieldOption => (new Shared_FieldOption(opt.description, opt.value, new Shared_FieldOptionKey(parse(opt.optionKey)), undefined)), options));
-    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, false, undefined, Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(fieldOptions)), undefined);
+    const fieldOptions: FSharpList<Shared_FieldOption> = ofSeq_1<Shared_FieldOption>(mapIndexed_1<{ description: string, optionKey: string, value: string }, Shared_FieldOption>((_arg: int32, opt: { description: string, optionKey: string, value: string }): Shared_FieldOption => (new Shared_FieldOption(opt.description, opt.value, new Shared_FieldOptionKey(parse(opt.optionKey)), undefined)), options));
+    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, false, Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(fieldOptions)), undefined);
 }
 
 /**
@@ -452,7 +684,7 @@ export function createCheckboxListField(fieldKeyString: string, label: string, o
  * TypeScript: createTextField(fieldKey: string, label: string, isOptional: boolean)
  */
 export function createTextField(fieldKeyString: string, label: string, isOptional: boolean): Spec_FormField$1<Spec_FieldType_$union> {
-    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, isOptional, false, false, undefined, Spec_FieldType_Text(new Spec_TextInfo(undefined)), undefined);
+    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, isOptional, false, false, Spec_FieldType_Text(new Spec_TextInfo(undefined)), undefined);
 }
 
 /**
@@ -460,7 +692,7 @@ export function createTextField(fieldKeyString: string, label: string, isOptiona
  * TypeScript: createFormStep(stepOrder: number, stepLabel: string, fields: FormField[])
  */
 export function createFormStep(stepOrder: int32, stepLabel: string, fields: Spec_FormField$1<Spec_FieldType_$union>[]): Spec_FormStep$1<Spec_FieldType_$union> {
-    return new Spec_FormStep$1(stepOrder, stepLabel, ofSeq<Spec_FormField$1<Spec_FieldType_$union>>(mapIndexed<Spec_FormField$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((index: int32, field: Spec_FormField$1<Spec_FieldType_$union>): Spec_FormField$1<Spec_FieldType_$union> => (new Spec_FormField$1(index + 1, field.FieldKey, field.Label, field.Notes, field.DependsOn, field.IsOptional, field.IsDeprecated, field.NeedsDocumentation, field.Documentation, field.FieldType, field.Value)), fields)));
+    return new Spec_FormStep$1(stepOrder, stepLabel, ofSeq_1<Spec_FormField$1<Spec_FieldType_$union>>(mapIndexed_1<Spec_FormField$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((index: int32, field: Spec_FormField$1<Spec_FieldType_$union>): Spec_FormField$1<Spec_FieldType_$union> => (new Spec_FormField$1(index + 1, field.FieldKey, field.Label, field.Notes, field.DependsOn, field.IsOptional, field.IsDeprecated, field.NeedsDocumentation, field.FieldType, field.Value)), fields)));
 }
 
 /**
@@ -468,7 +700,7 @@ export function createFormStep(stepOrder: int32, stepLabel: string, fields: Spec
  * TypeScript: createFormSpec(id: string, title: string, steps: FormStep[])
  */
 export function createFormSpec(idString: string, title: string, steps: Spec_FormStep$1<Spec_FieldType_$union>[]): Spec_FormSpec$1<Spec_FieldType_$union> {
-    return new Spec_FormSpec$1(parse(idString), "DYN", title, "Dynamically created FormSpec", "1.0.0", "2.0.5", ofSeq<Spec_FormStep$1<Spec_FieldType_$union>>(steps), empty<string>(), undefined, empty<string>(), false, false, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
+    return new Spec_FormSpec$1(parse(idString), "DYN", title, "Dynamically created FormSpec", "1.0.0", "2.0.5", ofSeq_1<Spec_FormStep$1<Spec_FieldType_$union>>(steps), empty<string>(), undefined, empty<string>(), false, false, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
 }
 
 /**
@@ -484,7 +716,7 @@ export function createFieldOption(description: string, value: string, optionKeyS
  * TypeScript: createMatrixField(fieldKey: string, label: string, items: FieldOption[], options: FieldOption[])
  */
 export function createMatrixField(fieldKeyString: string, label: string, items: Shared_FieldOption[], options: Shared_FieldOption[]): Spec_FormField$1<Spec_FieldType_$union> {
-    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, false, undefined, Spec_FieldType_Matrix(new Spec_MatrixInfo(ofSeq<Shared_FieldOption>(items), ofSeq<Shared_FieldOption>(options))), undefined);
+    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, false, Spec_FieldType_Matrix(new Spec_MatrixInfo(ofSeq_1<Shared_FieldOption>(items), ofSeq_1<Shared_FieldOption>(options))), undefined);
 }
 
 /**
@@ -492,7 +724,7 @@ export function createMatrixField(fieldKeyString: string, label: string, items:
  * TypeScript: createPluginField(fieldKey: string, label: string, config: {pluginId: string})
  */
 export function createPluginField(fieldKeyString: string, label: string, config: { pluginId: string }): Spec_FormField$1<Spec_FieldType_$union> {
-    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, false, undefined, Spec_FieldType_PluginField(new Spec_PluginFieldConfig(config.pluginId, undefined, undefined)), undefined);
+    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, false, Spec_FieldType_PluginField(new Spec_PluginFieldConfig(config.pluginId, undefined, undefined)), undefined);
 }
 
 /**
@@ -525,8 +757,8 @@ export function createTransition(transitionKeyString: string, fromStateString: s
  */
 export function createClinicalPathway(name: string, states: ClinicalPathway_StateDefinition[], transitions: ClinicalPathway_TransitionDefinition[]): ClinicalPathway_ClinicalPathwaySpec {
     let copyOfStruct: string;
-    const statesWithOrder: FSharpList<ClinicalPathway_StateDefinition> = ofSeq<ClinicalPathway_StateDefinition>(mapIndexed<ClinicalPathway_StateDefinition, ClinicalPathway_StateDefinition>((index: int32, state: ClinicalPathway_StateDefinition): ClinicalPathway_StateDefinition => (new ClinicalPathway_StateDefinition(state.StateKey, state.StateLabel, index + 1, state.StateType, state.DependsOn)), states));
-    return new ClinicalPathway_ClinicalPathwaySpec((copyOfStruct = newGuid(), copyOfStruct), name, "1.0.0", "Dynamic Builder", ClinicalPathway_PathwayExecutionMode_SinglePathway(new ClinicalPathway_SinglePathwayConfig(ClinicalPathway_SelectionStrategy_HighestPriority(), true)), new Shared_StateKey("00000000-0000-0000-0000-000000000001"), statesWithOrder, ofSeq<ClinicalPathway_TransitionDefinition>(transitions), empty<ClinicalPathway_ConstraintDefinition>(), empty<ClinicalPathway_PathRequirement>(), now(), undefined, undefined, undefined);
+    const statesWithOrder: FSharpList<ClinicalPathway_StateDefinition> = ofSeq_1<ClinicalPathway_StateDefinition>(mapIndexed_1<ClinicalPathway_StateDefinition, ClinicalPathway_StateDefinition>((index: int32, state: ClinicalPathway_StateDefinition): ClinicalPathway_StateDefinition => (new ClinicalPathway_StateDefinition(state.StateKey, state.StateLabel, index + 1, state.StateType, state.DependsOn)), states));
+    return new ClinicalPathway_ClinicalPathwaySpec((copyOfStruct = newGuid(), copyOfStruct), name, "1.0.0", "Dynamic Builder", ClinicalPathway_PathwayExecutionMode_SinglePathway(new ClinicalPathway_SinglePathwayConfig(ClinicalPathway_SelectionStrategy_HighestPriority(), true)), new Shared_StateKey("00000000-0000-0000-0000-000000000001"), statesWithOrder, ofSeq_1<ClinicalPathway_TransitionDefinition>(transitions), empty<ClinicalPathway_ConstraintDefinition>(), empty<ClinicalPathway_PathRequirement>(), now(), undefined, undefined, undefined);
 }
 
 /**
@@ -542,7 +774,7 @@ export function addPathwayToFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$u
  * TypeScript: getFieldDataFromFormSpec(formSpec: FormSpec, stepOrder: number, fieldKey: string)
  */
 export function getFieldDataFromFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, _stepOrder: int32, fieldKeyString: string): Option<any> {
-    return map<FieldDetails$1<Spec_FieldType_$union>, any>((fieldDetails: FieldDetails$1<Spec_FieldType_$union>): any => ({
+    return map_2<FieldDetails$1<Spec_FieldType_$union>, any>((fieldDetails: FieldDetails$1<Spec_FieldType_$union>): any => ({
         FieldOrder: fieldDetails.FieldOrder,
         FieldType: fieldDetails.FieldType,
         FieldValue: fieldDetails.FieldValue,
@@ -565,7 +797,7 @@ export function getFormResultStepOrders(formSpec: Spec_FormSpec$1<Spec_FieldType
  * TypeScript: getFormResultFieldKeys(formSpec: FormSpec, stepOrder: number)
  */
 export function getFormResultFieldKeys(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, stepOrder: int32): string[] {
-    return defaultArgWith_1<string[]>(map<Spec_FormStep$1<Spec_FieldType_$union>, string[]>((step_1: Spec_FormStep$1<Spec_FieldType_$union>): string[] => {
+    return defaultArgWith_1<string[]>(map_2<Spec_FormStep$1<Spec_FieldType_$union>, string[]>((step_1: Spec_FormStep$1<Spec_FieldType_$union>): string[] => {
         const collection: FSharpList<string> = map_3<Spec_FormField$1<Spec_FieldType_$union>, string>((f: Spec_FormField$1<Spec_FieldType_$union>): string => f.FieldKey.fields[0], step_1.Fields);
         return Array.from(collection);
     }, tryFind<Spec_FormStep$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): boolean => (step.StepOrder === stepOrder), formSpec.Steps)), (): string[] => []);
@@ -584,7 +816,7 @@ export function getResultSteps(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>)
  * TypeScript: getFieldValue(formSpec: FormSpec, stepOrder: number, fieldKey: string)
  */
 export function getFieldValue(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, _stepOrder: int32, fieldKeyString: string): Option<any> {
-    return map<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details.FieldValue, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
+    return map_2<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details.FieldValue, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
 }
 
 /**
@@ -592,7 +824,7 @@ export function getFieldValue(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>,
  * TypeScript: getFieldDetails(formSpec: FormSpec, stepOrder: number, fieldKey: string)
  */
 export function getFieldDetails(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, _stepOrder: int32, fieldKeyString: string): Option<any> {
-    return map<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
+    return map_2<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
 }
 
 /**
@@ -602,8 +834,8 @@ export function getFieldDetails(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>
 export function createTestFormSpec(): Spec_FormSpec$1<Spec_FieldType_$union> {
     const option1: Shared_FieldOption = new Shared_FieldOption("Option 1", "opt1", new Shared_FieldOptionKey(newGuid()), undefined);
     const option2: Shared_FieldOption = new Shared_FieldOption("Option 2", "opt2", new Shared_FieldOptionKey(newGuid()), undefined);
-    const testStep: Spec_FormStep$1<Spec_FieldType_$union> = new Spec_FormStep$1(1, "Test Step", ofArray_1([new Spec_FormField$1(1, new Shared_FieldKey("11111111-1111-1111-1111-111111111111"), "Test Text Field", undefined, undefined, false, false, false, undefined, Spec_FieldType_Text(new Spec_TextInfo(undefined)), undefined), new Spec_FormField$1(2, new Shared_FieldKey("22222222-2222-2222-2222-222222222222"), "Test Checkbox List", undefined, undefined, false, false, false, undefined, Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(ofArray_1([option1, option2]))), undefined), new Spec_FormField$1(3, new Shared_FieldKey("33333333-3333-3333-3333-333333333333"), "Test Matrix", undefined, undefined, false, false, false, undefined, Spec_FieldType_Matrix(new Spec_MatrixInfo(ofArray_1([option1, option2]), ofArray_1([new Shared_FieldOption("Scale 1", "1", new Shared_FieldOptionKey(newGuid()), 1), new Shared_FieldOption("Scale 2", "2", new Shared_FieldOptionKey(newGuid()), 2)]))), undefined), new Spec_FormField$1(4, new Shared_FieldKey("44444444-4444-4444-4444-444444444444"), "Test Plugin Field", undefined, undefined, false, false, false, undefined, Spec_FieldType_PluginField(new Spec_PluginFieldConfig("test.plugin", undefined, undefined)), undefined)]));
-    return new Spec_FormSpec$1(newGuid(), "TEST-001", "Test Form", "Test form for buildDynamicFormResultData", "1.0.0", "5.0.0", singleton(testStep), empty<string>(), undefined, empty<string>(), false, false, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
+    const testStep: Spec_FormStep$1<Spec_FieldType_$union> = new Spec_FormStep$1(1, "Test Step", ofArray_2([new Spec_FormField$1(1, new Shared_FieldKey("11111111-1111-1111-1111-111111111111"), "Test Text Field", undefined, undefined, false, false, false, Spec_FieldType_Text(new Spec_TextInfo(undefined)), undefined), new Spec_FormField$1(2, new Shared_FieldKey("22222222-2222-2222-2222-222222222222"), "Test Checkbox List", undefined, undefined, false, false, false, Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(ofArray_2([option1, option2]))), undefined), new Spec_FormField$1(3, new Shared_FieldKey("33333333-3333-3333-3333-333333333333"), "Test Matrix", undefined, undefined, false, false, false, Spec_FieldType_Matrix(new Spec_MatrixInfo(ofArray_2([option1, option2]), ofArray_2([new Shared_FieldOption("Scale 1", "1", new Shared_FieldOptionKey(newGuid()), 1), new Shared_FieldOption("Scale 2", "2", new Shared_FieldOptionKey(newGuid()), 2)]))), undefined), new Spec_FormField$1(4, new Shared_FieldKey("44444444-4444-4444-4444-444444444444"), "Test Plugin Field", undefined, undefined, false, false, false, Spec_FieldType_PluginField(new Spec_PluginFieldConfig("test.plugin", undefined, undefined)), undefined)]));
+    return new Spec_FormSpec$1(newGuid(), "TEST-001", "Test Form", "Test form for buildDynamicFormResultData", "1.0.0", "5.0.0", singleton_1(testStep), empty<string>(), undefined, empty<string>(), false, false, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
 }
 
 /**
@@ -637,6 +869,24 @@ export function getFieldTypeInfo(field: Spec_FormField$1<Spec_FieldType_$union>)
     };
 }
 
+/**
+ * Get BooleanInfo from a Checkbox field. Returns null for non-Checkbox fields.
+ * TypeScript: getFieldBooleanInfo(field: FormField) => { defaultValue?: boolean, selection?: boolean } | null
+ */
+export function getFieldBooleanInfo(field: Spec_FormField$1<Spec_FieldType_$union>): any {
+    const matchValue: Spec_FieldType_$union = field.FieldType;
+    if (matchValue.tag === /* Checkbox */ 11) {
+        const info: Spec_BooleanInfo = matchValue.fields[0];
+        return {
+            defaultValue: unwrap(info.DefaultValue),
+            selection: unwrap(info.Selection),
+        };
+    }
+    else {
+        return defaultOf();
+    }
+}
+
 /**
  * Extract plugin field config (PluginId, optional items/options) for PluginField types.
  * TypeScript: getPluginFieldConfig(field: FormField) => {pluginId: string, items?: ..., options?: ...} | null
@@ -647,14 +897,14 @@ export function getPluginFieldConfig(field: Spec_FormField$1<Spec_FieldType_$uni
     if (matchValue.tag === /* PluginField */ 23) {
         const config: Spec_PluginFieldConfig = matchValue.fields[0];
         return {
-            items: unwrap(map<FSharpList<Shared_FieldOption>, { key: string, label: string }[]>((items: FSharpList<Shared_FieldOption>): { key: string, label: string }[] => {
+            items: unwrap(map_2<FSharpList<Shared_FieldOption>, { key: string, label: string }[]>((items: FSharpList<Shared_FieldOption>): { key: string, label: string }[] => {
                 const collection: FSharpList<{ key: string, label: string }> = map_3<Shared_FieldOption, { key: string, label: string }>((item: Shared_FieldOption): { key: string, label: string } => ({
                     key: item.OptionKey.fields[0],
                     label: item.Description,
                 }), items);
                 return Array.from(collection);
             }, config.Items)),
-            options: unwrap(map<FSharpList<Shared_FieldOption>, { description: string, key: string, value: string }[]>((opts: FSharpList<Shared_FieldOption>): { description: string, key: string, value: string }[] => {
+            options: unwrap(map_2<FSharpList<Shared_FieldOption>, { description: string, key: string, value: string }[]>((opts: FSharpList<Shared_FieldOption>): { description: string, key: string, value: string }[] => {
                 const collection_1: FSharpList<{ description: string, key: string, value: string }> = map_3<Shared_FieldOption, { description: string, key: string, value: string }>((opt: Shared_FieldOption): { description: string, key: string, value: string } => ({
                     description: opt.Description,
                     key: opt.OptionKey.fields[0],
@@ -813,11 +1063,11 @@ export function getFieldMatrixInfoFromValue(field: Spec_FormField$1<Spec_FieldTy
     }
     switch (matchResult) {
         case 0: {
-            const itemKeys: FSharpList<string> = toList_1<string>(distinct<string>(map_2<[Shared_MatrixItemKey, string], string>((kvp: [Shared_MatrixItemKey, string]): string => kvp[0].fields[0], ma!.Values), {
+            const itemKeys: FSharpList<string> = toList<string>(distinct<string>(map_1<[Shared_MatrixItemKey, string], string>((kvp: [Shared_MatrixItemKey, string]): string => kvp[0].fields[0], ma!.Values), {
                 Equals: (x: string, y: string): boolean => (x === y),
                 GetHashCode: stringHash,
             }));
-            const optionValues: FSharpList<string> = toList_1<string>(distinct<string>(map_2<[Shared_MatrixItemKey, string], string>((kvp_1: [Shared_MatrixItemKey, string]): string => kvp_1[1], ma!.Values), {
+            const optionValues: FSharpList<string> = toList<string>(distinct<string>(map_1<[Shared_MatrixItemKey, string], string>((kvp_1: [Shared_MatrixItemKey, string]): string => kvp_1[1], ma!.Values), {
                 Equals: (x_1: string, y_1: string): boolean => (x_1 === y_1),
                 GetHashCode: stringHash,
             }));
@@ -826,11 +1076,11 @@ export function getFieldMatrixInfoFromValue(field: Spec_FormField$1<Spec_FieldTy
             }
             else {
                 return {
-                    items: (collection = mapIndexed_1<string, { key: string, label: string }>((i: int32, k: string): { key: string, label: string } => ({
+                    items: (collection = mapIndexed_2<string, { key: string, label: string }>((i: int32, k: string): { key: string, label: string } => ({
                         key: k,
                         label: k,
                     }), itemKeys), Array.from(collection)),
-                    options: (collection_1 = mapIndexed_1<string, { description: string, key: string, value: string }>((i_1: int32, v: string): { description: string, key: string, value: string } => ({
+                    options: (collection_1 = mapIndexed_2<string, { description: string, key: string, value: string }>((i_1: int32, v: string): { description: string, key: string, value: string } => ({
                         description: v,
                         key: v,
                         value: v,
@@ -839,7 +1089,7 @@ export function getFieldMatrixInfoFromValue(field: Spec_FormField$1<Spec_FieldTy
             }
         }
         case 1: {
-            const likertProps: FSharpList<Shared_PluginDataProperty> = filter<Shared_PluginDataProperty>((p: Shared_PluginDataProperty): boolean => (p.Name !== "TotalScore"), props!);
+            const likertProps: FSharpList<Shared_PluginDataProperty> = filter_1<Shared_PluginDataProperty>((p: Shared_PluginDataProperty): boolean => (p.Name !== "TotalScore"), props!);
             const itemKeys_1: FSharpList<string> = List_distinct<string>(map_3<Shared_PluginDataProperty, string>((p_1: Shared_PluginDataProperty): string => p_1.Name, likertProps), {
                 Equals: (x_2: string, y_2: string): boolean => (x_2 === y_2),
                 GetHashCode: stringHash,
@@ -853,11 +1103,11 @@ export function getFieldMatrixInfoFromValue(field: Spec_FormField$1<Spec_FieldTy
             }
             else {
                 return {
-                    items: (collection_2 = mapIndexed_1<string, { key: string, label: string }>((i_2: int32, k_1: string): { key: string, label: string } => ({
+                    items: (collection_2 = mapIndexed_2<string, { key: string, label: string }>((i_2: int32, k_1: string): { key: string, label: string } => ({
                         key: k_1,
                         label: k_1,
                     }), itemKeys_1), Array.from(collection_2)),
-                    options: (collection_3 = mapIndexed_1<string, { description: string, key: string, value: string }>((i_3: int32, v_1: string): { description: string, key: string, value: string } => ({
+                    options: (collection_3 = mapIndexed_2<string, { description: string, key: string, value: string }>((i_3: int32, v_1: string): { description: string, key: string, value: string } => ({
                         description: v_1,
                         key: v_1,
                         value: v_1,
@@ -880,44 +1130,42 @@ export function getFieldKeyString(fieldKey: Shared_FieldKey): string {
 
 /**
  * Extract form values from a FormSpec that has embedded field values (e.g. from f1-api filled form).
- * Walks the FormSpec and reads field.Value (Shared.FieldValue DU) directly - no JSON/Thoth format guessing.
- * TypeScript: extractFormValuesFromFormSpec(formSpec: FormSpec) => Record<string, any>
+ * Walks the FormSpec and reads field.Value (Shared.FieldValue DU) directly.
+ * Returns canonical BlueprintFilledFormFieldValueAnswersMap — every value is ISingleValue | IMultipleValue | IMatrixValue | IPluginDataValue.
+ * TypeScript: extractFormValuesFromFormSpec(formSpec: FormSpec) => BlueprintFilledFormFieldValueAnswersMap
  */
 export function extractFormValuesFromFormSpec(spec: Spec_FormSpec$1<Spec_FieldType_$union>): any {
-    const pairs: FSharpList<[string, any]> = toList_1<[string, any]>(delay<[string, any]>((): Iterable<[string, any]> => collect_1<Spec_FormStep$1<Spec_FieldType_$union>, Iterable<[string, any]>, [string, any]>((step: Spec_FormStep$1<Spec_FieldType_$union>): Iterable<[string, any]> => collect_1<Spec_FormField$1<Spec_FieldType_$union>, Iterable<[string, any]>, [string, any]>((field: Spec_FormField$1<Spec_FieldType_$union>): Iterable<[string, any]> => {
-        let arr: string[], ma: Shared_MatrixAnswer, dict: IMap<string, string>, enumerator: IEnumerator<[Shared_MatrixItemKey, string]>, arr_1: FSharpList<any>;
-        const matchValue: Option<Shared_FieldValue_$union> = field.Value;
-        if (matchValue == null) {
-            return empty_1<[string, any]>();
-        }
-        else {
-            const fv: Shared_FieldValue_$union = value_19(matchValue);
-            return singleton_1<[string, any]>([getFieldKeyString(field.FieldKey), (fv.tag === /* Multiple */ 1) ? ((arr = map_1<Shared_FieldAnswer, string>((fa_1: Shared_FieldAnswer): string => fa_1.Value, toArray<Shared_FieldAnswer>(fv.fields[0])), Array.from(arr))) : ((fv.tag === /* Matrix */ 2) ? ((ma = fv.fields[0], (dict = (new Map<string, string>([])), ((enumerator = getEnumerator(ma.Values), (() => {
-                try {
-                    while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
-                        const kvp: [Shared_MatrixItemKey, string] = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                        addToDict(dict, kvp[0].fields[0], kvp[1]);
+    const valuePairs: [string, any][] = [];
+    const enumerator: IEnumerator<Spec_FormStep$1<Spec_FieldType_$union>> = getEnumerator(spec.Steps);
+    try {
+        while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+            const enumerator_1: IEnumerator<Spec_FormField$1<Spec_FieldType_$union>> = getEnumerator(enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]().Fields);
+            try {
+                while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
+                    const field: Spec_FormField$1<Spec_FieldType_$union> = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
+                    const keyStr: string = getFieldKeyString(field.FieldKey);
+                    const matchValue: Option<Shared_FieldValue_$union> = field.Value;
+                    if (matchValue == null) {
+                    }
+                    else {
+                        const value: any = Convert_fieldValueToTs(value_19(matchValue));
+                        void (valuePairs.push([keyStr, value] as [string, any]));
                     }
                 }
-                finally {
-                    disposeSafe(enumerator as IDisposable);
-                }
-            })()), dict)))) : ((fv.tag === /* PluginData */ 3) ? ((arr_1 = map_3<Shared_PluginDataProperty, any>((p: Shared_PluginDataProperty): any => ({
-                dataType: p.DataType,
-                description: unwrap(p.Description),
-                displayName: unwrap(p.DisplayName),
-                name: p.Name,
-                propertyKey: p.PropertyKey.fields[0],
-                unit: unwrap(p.Unit),
-                value: p.Value,
-            }), fv.fields[0]), Array.from(arr_1))) : fv.fields[0].Value))] as [string, any]);
+            }
+            finally {
+                disposeSafe(enumerator_1 as IDisposable);
+            }
         }
-    }, step.Fields), spec.Steps)));
-    if (isEmpty(pairs)) {
+    }
+    finally {
+        disposeSafe(enumerator as IDisposable);
+    }
+    if (valuePairs.length === 0) {
         return {};
     }
     else {
-        return createObj(map_3<[string, any], [string, any]>((tupledArg: [string, any]): [string, any] => ([tupledArg[0], tupledArg[1]] as [string, any]), pairs));
+        return createObj(ofSeq_1<[string, any]>(map_1<[string, any], [string, any]>((tupledArg: [string, any]): [string, any] => ([tupledArg[0], tupledArg[1]] as [string, any]), valuePairs)));
     }
 }
 
@@ -1023,7 +1271,7 @@ export function convertActionInfo(action: ClinicalPathway_ActionInfo_$union): an
         case /* Problem */ 8: {
             const prob: ClinicalPathway_ProblemAction = action.fields[0];
             return {
-                description: `${prob.ProblemName}${defaultArg_1(map<string, string>((code: string): string => (` (ICD: ${code})`), prob.IcdCode), "")}`,
+                description: `${prob.ProblemName}${defaultArg_1(map_2<string, string>((code: string): string => (` (ICD: ${code})`), prob.IcdCode), "")}`,
                 icdCode: unwrap(prob.IcdCode),
                 problemName: prob.ProblemName,
                 type: "problem",
@@ -1285,7 +1533,7 @@ export function tryEncodeToFormAnswers(provenancePayload: string, filledFormSpec
  * This is the SOURCE OF TRUTH for field counting!
  */
 export function getAllFieldKeys(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): string[] {
-    return toArray_1<string>(map_3<Spec_FormField$1<Spec_FieldType_$union>, string>((field: Spec_FormField$1<Spec_FieldType_$union>): string => getFieldKeyString(field.FieldKey), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)));
+    return toArray<string>(map_3<Spec_FormField$1<Spec_FieldType_$union>, string>((field: Spec_FormField$1<Spec_FieldType_$union>): string => getFieldKeyString(field.FieldKey), collect_1<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)));
 }
 
 /**
@@ -1298,7 +1546,7 @@ export function getFieldChoiceScoreSignal(fieldAnchor: Option<CoreMRFieldAnchor>
         return 0;
     }
     else {
-        return length_1<CoreMRChoiceAnchor>(filter<CoreMRChoiceAnchor>((c: CoreMRChoiceAnchor): boolean => (compare_1(c.Score, 0n) > 0), value_19(fieldAnchor).Choices)) | 0;
+        return length_1<CoreMRChoiceAnchor>(filter_1<CoreMRChoiceAnchor>((c: CoreMRChoiceAnchor): boolean => (compare_1(c.Score, 0n) > 0), value_19(fieldAnchor).Choices)) | 0;
     }
 }
 
@@ -1315,7 +1563,7 @@ export function getFieldBitmaskChoiceTable(fieldAnchor: Option<CoreMRFieldAnchor
         const collection: FSharpList<{ bitPosition?: string, code?: string, score: string, sequence: int32, text: string }> = map_3<CoreMRChoiceAnchor, { bitPosition?: string, code?: string, score: string, sequence: int32, text: string }>((choice: CoreMRChoiceAnchor): { bitPosition?: string, code?: string, score: string, sequence: int32, text: string } => {
             const score: string = int64ToString(choice.Score);
             return {
-                bitPosition: unwrap(map<int32, string>(int32ToString, choice.BitPosition)),
+                bitPosition: unwrap(map_2<int32, string>(int32ToString, choice.BitPosition)),
                 code: unwrap(choice.Code),
                 score: score,
                 sequence: choice.Sequence,
@@ -1345,7 +1593,7 @@ export function getBitmaskChoiceAnalysis(fieldAnchor: Option<CoreMRFieldAnchor>)
     else {
         const anchor: CoreMRFieldAnchor = value_19(fieldAnchor);
         const totalChoices: int32 = length_1(anchor.Choices) | 0;
-        const scoredChoices: int32 = length_1<CoreMRChoiceAnchor>(filter<CoreMRChoiceAnchor>((c: CoreMRChoiceAnchor): boolean => (compare_1(c.Score, 0n) > 0), anchor.Choices)) | 0;
+        const scoredChoices: int32 = length_1<CoreMRChoiceAnchor>(filter_1<CoreMRChoiceAnchor>((c: CoreMRChoiceAnchor): boolean => (compare_1(c.Score, 0n) > 0), anchor.Choices)) | 0;
         const hasBitPositions: boolean = exists<CoreMRChoiceAnchor>((c_1: CoreMRChoiceAnchor): boolean => (c_1.BitPosition != null), anchor.Choices);
         return {
             fieldTypeInfo: toText(printf("CoreMR ItemType %d (%s)"))(anchor.ItemTypeId)(anchor.Encoding.ValueEncoding),
@@ -1381,7 +1629,7 @@ export function getFieldCoreMRAnchor(formSpec: Spec_FormSpec$1<Spec_FieldType_$u
         case 0:
             try {
                 const matchValue_1: FSharpResult$2_$union<CoreMRSourceMap, string> = fromString<CoreMRSourceMap>(uncurry2(Auto_generateBoxedDecoder_Z6670B51(CoreMRSourceMap_$reflection(), undefined, undefined)), provenance_1!.Payload);
-                return (matchValue_1.tag === /* Error */ 1) ? undefined : tryFind<CoreMRFieldAnchor>((anchor: CoreMRFieldAnchor): boolean => (getFieldKeyString(anchor.FieldKey) === fieldKeyString), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, matchValue_1.fields[0].Steps));
+                return (matchValue_1.tag === /* Error */ 1) ? undefined : tryFind<CoreMRFieldAnchor>((anchor: CoreMRFieldAnchor): boolean => (getFieldKeyString(anchor.FieldKey) === fieldKeyString), collect_1<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, matchValue_1.fields[0].Steps));
             }
             catch (matchValue_2: any) {
                 return undefined;
@@ -1398,15 +1646,15 @@ export function getFieldCoreMRAnchor(formSpec: Spec_FormSpec$1<Spec_FieldType_$u
  */
 export function getFullValidationTelemetry(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, values: any): any {
     let dict: any;
-    const valuesDict: FSharpMap<string, any> = empty_2<string, any>({
+    const valuesDict: FSharpMap<string, any> = empty_1<string, any>({
         Compare: comparePrimitives,
     });
-    const fieldTelemetry: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }[] = toArray_1<{ actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }>(map_3<Spec_FormField$1<Spec_FieldType_$union>, { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }>((field: Spec_FormField$1<Spec_FieldType_$union>): { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean } => {
+    const fieldTelemetry: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }[] = toArray<{ actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }>(map_3<Spec_FormField$1<Spec_FieldType_$union>, { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }>((field: Spec_FormField$1<Spec_FieldType_$union>): { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean } => {
         let matchValue_2: Spec_FieldType_$union;
         const fieldKey: string = getFieldKeyString(field.FieldKey);
         const fieldLabel: string = isNullOrEmpty(field.Label) ? fieldKey : field.Label;
         const fieldTypeInfo: { isRequired: boolean, typeName: string } = getFieldTypeInfo(field);
-        const fieldValue: Option<any> = tryFind_1<string, any>(fieldKey, valuesDict);
+        const fieldValue: Option<any> = tryFind_2<string, any>(fieldKey, valuesDict);
         let patternInput: [boolean, any[], string[], string[]];
         const matchValue: Spec_FieldType_$union = field.FieldType;
         let matchResult: int32, info_2: Spec_SingleChoiceInfo;
@@ -1439,18 +1687,18 @@ export function getFullValidationTelemetry(formSpec: Spec_FormSpec$1<Spec_FieldT
         }
         switch (matchResult) {
             case 0: {
-                const expected: string[] = toArray_1<string>(map_3<Shared_FieldOption, string>((opt: Shared_FieldOption): string => opt.Value, matchValue.fields[0].Options));
+                const expected: string[] = toArray<string>(map_3<Shared_FieldOption, string>((opt: Shared_FieldOption): string => opt.Value, matchValue.fields[0].Options));
                 patternInput = ([true, [], expected, expected] as [boolean, any[], string[], string[]]);
                 break;
             }
             case 1: {
                 const info_1: Spec_MatrixInfo = matchValue.fields[0];
-                const expected_1: string[] = append<string>(toArray_1<string>(map_3<Shared_FieldOption, string>((item: Shared_FieldOption): string => item.Value, info_1.Items)), toArray_1<string>(map_3<Shared_FieldOption, string>((opt_1: Shared_FieldOption): string => opt_1.Value, info_1.Options)));
+                const expected_1: string[] = append<string>(toArray<string>(map_3<Shared_FieldOption, string>((item: Shared_FieldOption): string => item.Value, info_1.Items)), toArray<string>(map_3<Shared_FieldOption, string>((opt_1: Shared_FieldOption): string => opt_1.Value, info_1.Options)));
                 patternInput = ([true, [], expected_1, expected_1] as [boolean, any[], string[], string[]]);
                 break;
             }
             case 2: {
-                const expected_2: string[] = toArray_1<string>(map_3<Shared_FieldOption, string>((opt_2: Shared_FieldOption): string => opt_2.Value, info_2!.Options));
+                const expected_2: string[] = toArray<string>(map_3<Shared_FieldOption, string>((opt_2: Shared_FieldOption): string => opt_2.Value, info_2!.Options));
                 patternInput = ([true, [], expected_2, expected_2] as [boolean, any[], string[], string[]]);
                 break;
             }
@@ -1528,7 +1776,7 @@ export function getFullValidationTelemetry(formSpec: Spec_FormSpec$1<Spec_FieldT
             structureIssues: patternInput[1],
             structureValid: patternInput[0],
         };
-    }, collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)));
+    }, collect_1<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, formSpec.Steps)));
     const totalFields: int32 = fieldTelemetry.length | 0;
     let validFields: int32;
     const array_1: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }[] = fieldTelemetry.filter((f: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }): boolean => f.dataValid);
@@ -1546,7 +1794,7 @@ export function getFullValidationTelemetry(formSpec: Spec_FormSpec$1<Spec_FieldT
         estimatedTimeToComplete: (dataIssues_1 === 0) ? "Complete" : ((dataIssues_1 <= 2) ? "1-2 minutes" : "3-5 minutes"),
         fields: fieldTelemetry,
         formValid: (dataIssues_1 === 0) && (structuralIssues === 0),
-        nextCriticalAction: defaultArg_1(map<{ actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }, string>((f_4: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }): string => f_4.actionHint, tryFind_2<{ actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }>((f_3: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }): boolean => !f_3.dataValid, fieldTelemetry)), ""),
+        nextCriticalAction: defaultArg_1(map_2<{ actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }, string>((f_4: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }): string => f_4.actionHint, tryFind_1<{ actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }>((f_3: { actionHint: string, actualChoices: string[], actualValue: string, dataIssues: string[], dataValid: boolean, expectedChoices: string[], expectedValue: string, fieldKey: string, fieldLabel: string, fieldType: string, severity: string, structureIssues: any[], structureValid: boolean }): boolean => !f_3.dataValid, fieldTelemetry)), ""),
         overallStatus: overallStatus,
         progressPercent: progressPercent,
         structuralIssues: structuralIssues,