@f1studio/form-spec 5.0.0-alpha.109 → 5.0.0-alpha.111

package/src/FormSpec.FS/Helpers.ts

@@ -1,13 +1,14 @@
-import { Values_StepOrder, Shared_FieldValue_Multiple, Shared_FieldValue_Single, Shared_FieldAnswer, Shared_FieldValue_$union, Shared_FieldOption, Spec_FieldType_$union, Spec_FieldType, Spec_FormSpec$1, Spec_FormField$1, Spec_FormStep$1, Shared_FieldKey } from "./FormSpec.js";
+import { Values_StepOrder, Shared_FieldValue_Multiple, Shared_FieldValue_Single, Shared_FieldAnswer, Shared_FieldValue_$union, Shared_FieldOption, Spec_PluginFieldConfig, Spec_FieldType_$union, Spec_FieldType, Spec_FormSpec$1, Spec_FormField$1, Spec_FormStep$1, Shared_FieldKey } from "./FormSpec.js";
 import { arrayToGuid, parse } from "@fable-org/fable-library-js/Guid.js";
 import { toConsole, isNullOrEmpty, trimEnd, trim, isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { replace } from "@fable-org/fable-library-js/RegExp.js";
-import { compare, safeHash, comparePrimitives, equals, stringHash } from "@fable-org/fable-library-js/Util.js";
-import { uint8, int32 } from "@fable-org/fable-library-js/Int32.js";
-import { item, setItem, fill } from "@fable-org/fable-library-js/Array.js";
+import { uint8, int32, parse as parse_1 } from "@fable-org/fable-library-js/Int32.js";
+import sha256 from "crypto-js/sha256";
+import { initialize } from "@fable-org/fable-library-js/Array.js";
 import { value as value_1, Option, map, defaultArg } from "@fable-org/fable-library-js/Option.js";
 import { splitAt, tryFindIndex, forAll, sortBy, find, insertAt, mapIndexed, singleton, append, head, tail, isEmpty, collect, empty, tryFind, FSharpList, filter, map as map_1 } from "@fable-org/fable-library-js/List.js";
 import { Result_Map, FSharpResult$2_$union, FSharpResult$2_Error, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
+import { compare, safeHash, comparePrimitives, stringHash, equals } from "@fable-org/fable-library-js/Util.js";
 import { List_distinct } from "@fable-org/fable-library-js/Seq2.js";
 import { map as map_2, tryFind as tryFind_1 } from "@fable-org/fable-library-js/Seq.js";
 import { FieldDetails$1 } from "./FormSpecValues.js";
@@ -42,18 +43,27 @@ export function Helpers_canonicalizeFieldKey(input: string): string {
     }
 }
 
+function Helpers_parseHexByte(hex: string, offset: int32): uint8 {
+    let copyOfStruct: string, copyOfStruct_1: string;
+    const hi: int32 = parse_1((copyOfStruct = hex[offset], copyOfStruct), 511, false, 32, 16) | 0;
+    const lo: int32 = parse_1((copyOfStruct_1 = hex[offset + 1], copyOfStruct_1), 511, false, 32, 16) | 0;
+    return ((hi << 4) + lo) & 0xFF;
+}
+
+/**
+ * Generate deterministic GUID from raw input using SHA256 (cross-runtime stable).
+ */
+export function Helpers_generateDeterministicGuidRaw(input: string): string {
+    const source: string = (input == null) ? "" : input;
+    const hashHex: string = sha256(source).toString();
+    return arrayToGuid(initialize<uint8>(16, (i: int32): uint8 => Helpers_parseHexByte(hashHex, i * 2)));
+}
+
+/**
+ * Generate deterministic GUID using canonicalized field-key input.
+ */
 export function Helpers_generateDeterministicGuid(fieldName: string): string {
-    const hash: int32 = stringHash(Helpers_canonicalizeFieldKey(fieldName)) | 0;
-    const bytes: uint8[] = fill(new Array(16), 0, 16, 0);
-    for (let i = 0; i <= 3; i++) {
-        setItem(bytes, i, (hash >> (i * 8)) & 0xFF);
-        setItem(bytes, i + 4, ((hash >> 1) >> (i * 8)) & 0xFF);
-        setItem(bytes, i + 8, ((hash >> 2) >> (i * 8)) & 0xFF);
-        setItem(bytes, i + 12, ((hash >> 3) >> (i * 8)) & 0xFF);
-    }
-    setItem(bytes, 6, (item(6, bytes) & 15) | 64);
-    setItem(bytes, 8, (item(8, bytes) & 63) | 128);
-    return arrayToGuid(bytes);
+    return Helpers_generateDeterministicGuidRaw(Helpers_canonicalizeFieldKey(fieldName));
 }
 
 /**
@@ -239,14 +249,14 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
     }
     switch (matchResult) {
         case 0: {
-            let matchResult_1: int32;
+            let matchResult_1: int32, cfg1_1: Spec_PluginFieldConfig, cfg2_1: Spec_PluginFieldConfig;
             switch (ft1!.tag) {
                 case /* Message */ 21: {
                     if (ft2!.tag === /* Message */ 21) {
                         matchResult_1 = 0;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -255,7 +265,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 1;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -264,7 +274,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 2;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -273,7 +283,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 3;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -282,7 +292,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 4;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -291,7 +301,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 5;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -300,7 +310,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 6;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -309,7 +319,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 7;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -318,7 +328,7 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 8;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
                     }
                     break;
                 }
@@ -327,12 +337,28 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                         matchResult_1 = 9;
                     }
                     else {
-                        matchResult_1 = 10;
+                        matchResult_1 = 11;
+                    }
+                    break;
+                }
+                case /* PluginField */ 22: {
+                    if (ft2!.tag === /* PluginField */ 22) {
+                        if (ft1!.fields[0].PluginId === ft2!.fields[0].PluginId) {
+                            matchResult_1 = 10;
+                            cfg1_1 = ft1!.fields[0];
+                            cfg2_1 = ft2!.fields[0];
+                        }
+                        else {
+                            matchResult_1 = 11;
+                        }
+                    }
+                    else {
+                        matchResult_1 = 11;
                     }
                     break;
                 }
                 default:
-                    matchResult_1 = 10;
+                    matchResult_1 = 11;
             }
             switch (matchResult_1) {
                 case 0:
@@ -355,6 +381,8 @@ export function Helpers_FieldTypeUtils_fieldTypesMatchByCaseName(fieldType1: any
                     return true;
                 case 9:
                     return true;
+                case 10:
+                    return true;
                 default:
                     return false;
             }

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

@@ -1,25 +1,26 @@
 import { value as value_11, map, unwrap, defaultArgWith as defaultArgWith_1, Option, defaultArg as defaultArg_1 } from "@fable-org/fable-library-js/Option.js";
-import { tryPick, isEmpty, singleton, map as map_3, empty, ofArray as ofArray_1, ofSeq, fold, collect, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { tryPick, filter, mapIndexed as mapIndexed_1, isEmpty, singleton, map as map_3, empty, ofArray as ofArray_1, ofSeq, fold, collect, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { join, printf, toConsole } from "@fable-org/fable-library-js/String.js";
 import { Auto_generateBoxedEncoder_437914C6, toString } from "../../fable_modules/Thoth.Json.10.4.1/Encode.fs.js";
 import { array_type, string_type, union_type, TypeInfo, obj_type } from "@fable-org/fable-library-js/Reflection.js";
 import { Auto_generateBoxedDecoder_Z6670B51, fromString } from "../../fable_modules/Thoth.Json.10.4.1/Decode.fs.js";
-import { equals, createObj, compare, IDisposable, disposeSafe, IEnumerator, getEnumerator, IMap, isArrayLike, uncurry2 } from "@fable-org/fable-library-js/Util.js";
-import { 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_$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_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 { equals, createObj, stringHash, compare, IDisposable, disposeSafe, IEnumerator, getEnumerator, IMap, isArrayLike, uncurry2 } from "@fable-org/fable-library-js/Util.js";
+import { 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_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 { FSharpResult$2_Ok, FSharpResult$2_Error, FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
-import { Union } from "@fable-org/fable-library-js/Types.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 { IOptionalGetter, array as array_4, IGetters, dict as dict_1, string, IRequiredGetter, object, fromString as fromString_1 } from "../../fable_modules/Thoth.Json.10.4.1/Decode.fs.js";
 import { ErrorReason_$union } from "../../fable_modules/Thoth.Json.10.4.1/Types.fs.js";
-import { ofSeq as ofSeq_1, FSharpMap } from "@fable-org/fable-library-js/Map.js";
+import { count, ofSeq as ofSeq_1, toList, FSharpMap } from "@fable-org/fable-library-js/Map.js";
 import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
-import { getFieldDetails as getFieldDetails_1, FieldDetails$1, findStepIndexForField, updateField } from "../FormSpecValues.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { singleton as singleton_1, empty as empty_1, collect as collect_1, delay, toList, mapIndexed, map as map_2, choose } from "@fable-org/fable-library-js/Seq.js";
+import { getFieldDetails as getFieldDetails_1, FieldDetails$1, findStepIndexForField, updateField } from "../FormSpecValues.js";
+import { 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 { map as map_1 } from "@fable-org/fable-library-js/Array.js";
-import { newGuid, parse } from "@fable-org/fable-library-js/Guid.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";
 
 /**
  * Get value from Option or return default (SAFE - recommended)
@@ -82,7 +83,17 @@ export function deserializeFormSpec(json: string): Option<Spec_FormSpec$1<Spec_F
  * Find FormField by its FieldKey string representation
  */
 export function findFieldByKey(spec: Spec_FormSpec$1<Spec_FieldType_$union>, fieldKeyString: string): Option<Spec_FormField$1<Spec_FieldType_$union>> {
-    return tryFind<Spec_FormField$1<Spec_FieldType_$union>>((field: Spec_FormField$1<Spec_FieldType_$union>): boolean => (field.FieldKey.fields[0] === fieldKeyString), 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));
+    let matchValue: [boolean, string];
+    let outArg = "00000000-0000-0000-0000-000000000000";
+    matchValue = ([tryParse(fieldKeyString, new FSharpRef<string>((): string => outArg, (v: string): void => {
+        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));
+    }
+    else {
+        return undefined;
+    }
 }
 
 export type ExpectedFieldValueType_$union = 
@@ -227,32 +238,35 @@ export function decodeAsStringArray(fieldKey: string, obj: any): string[] {
 
 export function decodeAsMatrixValue(fieldKey: string, obj: any): { description: string, values: IMap<string, string> } {
     let str: string;
+    const valuesDict: IMap<string, string> = new Map<string, string>([]);
+    const arg_3: string = (obj == null) ? "null" : "Object";
+    toConsole(printf("[DEBUGGING_FORMSPEC_RENDERER] decodeAsMatrixValue fieldKey=%s path=JSON objType=%s"))(fieldKey)(arg_3);
     const objAsString: string = (typeof obj === "string") ? ((str = (obj as string), str)) : toString(0, Auto_generateBoxedEncoder_437914C6(obj_type, undefined, undefined, undefined)(obj));
     try {
-        const matchValue_1: FSharpResult$2_$union<{ description: string, values: IMap<string, string> }, string> = fromString_1<{ description: string, values: IMap<string, string> }>((path_2: string, v: any): FSharpResult$2_$union<{ description: string, values: IMap<string, string> }, [string, ErrorReason_$union]> => object<{ description: string, values: IMap<string, string> }>((get$: IGetters): { description: string, values: IMap<string, string> } => {
+        const matchValue_1: FSharpResult$2_$union<{ description: string, values: IMap<string, string> }, string> = fromString_1<{ description: string, values: IMap<string, string> }>((path_2: string, v_1: any): FSharpResult$2_$union<{ description: string, values: IMap<string, string> }, [string, ErrorReason_$union]> => object<{ description: string, values: IMap<string, string> }>((get$: IGetters): { description: string, values: IMap<string, string> } => {
             let description: string;
             const objectArg: IRequiredGetter = get$.Required;
             description = objectArg.Field<string>("description", string);
             let valuesMap: FSharpMap<string, string>;
-            const arg_3: ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<FSharpMap<string, string>, [string, ErrorReason_$union]>)) = dict_1<string>(string);
+            const arg_7: ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<FSharpMap<string, string>, [string, ErrorReason_$union]>)) = dict_1<string>(string);
             const objectArg_1: IRequiredGetter = get$.Required;
-            valuesMap = objectArg_1.Field<FSharpMap<string, string>>("values", uncurry2(arg_3));
-            const valuesDict: IMap<string, string> = new Map<string, string>([]);
-            const enumerator: IEnumerator<[string, string]> = getEnumerator(valuesMap);
+            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));
             try {
-                while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
-                    const kvp: [string, string] = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                    addToDict(valuesDict, kvp[0], kvp[1]);
+                while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
+                    const forLoopVar: [string, string] = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
+                    addToDict(valuesDict_1, forLoopVar[0], forLoopVar[1]);
                 }
             }
             finally {
-                disposeSafe(enumerator as IDisposable);
+                disposeSafe(enumerator_1 as IDisposable);
             }
             return {
                 description: description,
-                values: valuesDict,
+                values: valuesDict_1,
             };
-        }, path_2, v), objAsString);
+        }, path_2, v_1), objAsString);
         if (matchValue_1.tag === /* Error */ 1) {
             let matchValue_2: FSharpResult$2_$union<{ description: string, values: IMap<string, string> }, string>;
             const matchValue: FSharpResult$2_$union<FSharpMap<string, string>, string> = fromString_1<FSharpMap<string, string>>(uncurry2(dict_1<string>(string)), objAsString);
@@ -261,34 +275,42 @@ export function decodeAsMatrixValue(fieldKey: string, obj: any): { description:
             }
             else {
                 const valuesMap_1: FSharpMap<string, string> = matchValue.fields[0];
-                const valuesDict_1: IMap<string, string> = new Map<string, string>([]);
-                const enumerator_1: IEnumerator<[string, string]> = getEnumerator(valuesMap_1);
+                const valuesDict_2: IMap<string, string> = new Map<string, string>([]);
+                const enumerator_2: IEnumerator<[string, string]> = getEnumerator(toList<string, string>(valuesMap_1));
                 try {
-                    while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
-                        const kvp_1: [string, string] = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                        addToDict(valuesDict_1, kvp_1[0], kvp_1[1]);
+                    while (enumerator_2["System.Collections.IEnumerator.MoveNext"]()) {
+                        const forLoopVar_1: [string, string] = enumerator_2["System.Collections.Generic.IEnumerator`1.get_Current"]();
+                        addToDict(valuesDict_2, forLoopVar_1[0], forLoopVar_1[1]);
                     }
                 }
                 finally {
-                    disposeSafe(enumerator_1 as IDisposable);
+                    disposeSafe(enumerator_2 as IDisposable);
                 }
                 matchValue_2 = FSharpResult$2_Ok<{ description: string, values: IMap<string, string> }, string>({
                     description: "",
-                    values: valuesDict_1,
+                    values: valuesDict_2,
                 });
             }
             if (matchValue_2.tag === /* Error */ 1) {
                 throw new Error(`Field ${fieldKey}: Invalid matrix data format - ${matchValue_2.fields[0]}`);
             }
             else {
-                return matchValue_2.fields[0];
+                const matrixData_1: { description: string, values: IMap<string, string> } = matchValue_2.fields[0];
+                const arg_11: int32 = matrixData_1.values.size | 0;
+                toConsole(printf("[DEBUGGING_FORMSPEC_RENDERER] decodeAsMatrixValue fieldKey=%s path=PlainFormat count=%d"))(fieldKey)(arg_11);
+                return matrixData_1;
             }
         }
         else {
-            return matchValue_1.fields[0];
+            const matrixData: { description: string, values: IMap<string, string> } = matchValue_1.fields[0];
+            const arg_9: int32 = matrixData.values.size | 0;
+            toConsole(printf("[DEBUGGING_FORMSPEC_RENDERER] decodeAsMatrixValue fieldKey=%s path=StandardFormat count=%d"))(fieldKey)(arg_9);
+            return matrixData;
         }
     }
     catch (ex: any) {
+        const arg_13: string = ex.message;
+        toConsole(printf("[DEBUGGING_FORMSPEC_RENDERER] decodeAsMatrixValue fieldKey=%s path=FAILED ex=%s"))(fieldKey)(arg_13);
         throw new Error(`Field ${fieldKey}: Failed to decode matrix value - ${ex.message}`);
     }
 }
@@ -355,7 +377,7 @@ export function buildFormSpecWithValues(formSpec: Spec_FormSpec$1<Spec_FieldType
         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;
+        let matchValue_1: ExpectedFieldValueType_$union, matrixData: { description: string, values: IMap<string, string> }, matrixValues: FSharpMap<Shared_MatrixItemKey, string>, matrixAnswer: Shared_MatrixAnswer, arg_1: int32, matchValue_2: Spec_FieldType_$union;
         const matchValue: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(formSpec, input.fieldKey);
         if (matchValue == null) {
             toConsole(`Warning: Field ${input.fieldKey} not found in FormSpec`);
@@ -366,9 +388,9 @@ export function buildFormSpecWithValues(formSpec: Spec_FormSpec$1<Spec_FieldType
             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), {
+                })) : ((matchValue_1.tag === /* MatrixValue */ 2) ? ((matrixData = decodeAsMatrixValue(input.fieldKey, input.objectValue), (matrixValues = 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>];
+                }), (matrixAnswer = (new Shared_MatrixAnswer(field.FieldKey, matrixData.description, matrixValues)), ((arg_1 = (count<Shared_MatrixItemKey, string>(matrixValues) | 0), toConsole(printf("[DEBUGGING_FORMSPEC_RENDERER] buildFormSpecWithValues Matrix fieldKey=%s valuesCount=%d"))(input.fieldKey)(arg_1)), Shared_FieldValue_Matrix(matrixAnswer)))))) : ((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>];
             }
             catch (ex: any) {
                 toConsole(`Error processing field ${input.fieldKey}: ${ex.message}`);
@@ -440,7 +462,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, Spec_FieldType_PluginField(new Spec_PluginFieldConfig(config.pluginId)), undefined);
+    return new Spec_FormField$1(1, new Shared_FieldKey(parse(fieldKeyString)), label, undefined, undefined, false, false, Spec_FieldType_PluginField(new Spec_PluginFieldConfig(config.pluginId, undefined, undefined)), undefined);
 }
 
 /**
@@ -550,7 +572,7 @@ 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, 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, 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, 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, Spec_FieldType_PluginField(new Spec_PluginFieldConfig("test.plugin")), 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, 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, 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, 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, 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);
 }
 
@@ -584,15 +606,31 @@ export function getFieldTypeInfo(field: Spec_FormField$1<Spec_FieldType_$union>)
 }
 
 /**
- * Extract plugin field config (PluginId) for PluginField types.
- * TypeScript: getPluginFieldConfig(field: FormField) => {pluginId: string} | null
+ * Extract plugin field config (PluginId, optional items/options) for PluginField types.
+ * TypeScript: getPluginFieldConfig(field: FormField) => {pluginId: string, items?: ..., options?: ...} | null
  * Returns null for non-PluginField fields.
  */
-export function getPluginFieldConfig(field: Spec_FormField$1<Spec_FieldType_$union>): Option<{ pluginId: string }> {
+export function getPluginFieldConfig(field: Spec_FormField$1<Spec_FieldType_$union>): Option<{ items?: { key: string, label: string }[], options?: { description: string, key: string, value: string }[], pluginId: string }> {
     const matchValue: Spec_FieldType_$union = field.FieldType;
     if (matchValue.tag === /* PluginField */ 22) {
+        const config: Spec_PluginFieldConfig = matchValue.fields[0];
         return {
-            pluginId: matchValue.fields[0].PluginId,
+            items: unwrap(map<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 }[] => {
+                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],
+                    value: opt.Value,
+                }), opts);
+                return Array.from(collection_1);
+            }, config.Options)),
+            pluginId: config.PluginId,
         };
     }
     else {
@@ -656,28 +694,147 @@ export function getFieldChoiceOptions(field: Spec_FormField$1<Spec_FieldType_$un
 }
 
 /**
- * Extract matrix field structure (items and options)
+ * Extract matrix field structure (items and options).
+ * Handles both Matrix fields and PluginField (e.g. Likert) when config has Items and Options.
  * TypeScript: getFieldMatrixInfo(field: FormField) => {items: {key: string, label: string}[], options: {key: string, description: string, value: string}[]} | null
  */
 export function getFieldMatrixInfo(field: Spec_FormField$1<Spec_FieldType_$union>): Option<{ items: { key: string, label: string }[], options: { description: string, key: string, value: string }[] }> {
-    let collection: FSharpList<{ key: string, label: string }>, collection_1: FSharpList<{ description: string, key: string, value: string }>;
+    let collection: FSharpList<{ key: string, label: string }>, collection_1: FSharpList<{ description: string, key: string, value: string }>, collection_2: FSharpList<{ key: string, label: string }>, collection_3: FSharpList<{ description: string, key: string, value: string }>, config: Spec_PluginFieldConfig;
     const matchValue: Spec_FieldType_$union = field.FieldType;
-    if (matchValue.tag === /* Matrix */ 19) {
-        const matrixInfo: Spec_MatrixInfo = matchValue.fields[0];
-        return {
-            items: (collection = map_3<Shared_FieldOption, { key: string, label: string }>((item: Shared_FieldOption): { key: string, label: string } => ({
-                key: item.OptionKey.fields[0],
-                label: item.Description,
-            }), matrixInfo.Items), Array.from(collection)),
-            options: (collection_1 = 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],
-                value: opt.Value,
-            }), matrixInfo.Options), Array.from(collection_1)),
-        };
+    let matchResult: int32, matrixInfo: Spec_MatrixInfo, config_1: Spec_PluginFieldConfig;
+    switch (matchValue.tag) {
+        case /* Matrix */ 19: {
+            matchResult = 0;
+            matrixInfo = matchValue.fields[0];
+            break;
+        }
+        case /* PluginField */ 22: {
+            if ((config = matchValue.fields[0], (config.Items != null) && (config.Options != null))) {
+                matchResult = 1;
+                config_1 = matchValue.fields[0];
+            }
+            else {
+                matchResult = 2;
+            }
+            break;
+        }
+        default:
+            matchResult = 2;
+    }
+    switch (matchResult) {
+        case 0:
+            return {
+                items: (collection = map_3<Shared_FieldOption, { key: string, label: string }>((item: Shared_FieldOption): { key: string, label: string } => ({
+                    key: item.OptionKey.fields[0],
+                    label: item.Description,
+                }), matrixInfo!.Items), Array.from(collection)),
+                options: (collection_1 = 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],
+                    value: opt.Value,
+                }), matrixInfo!.Options), Array.from(collection_1)),
+            };
+        case 1:
+            return {
+                items: (collection_2 = map_3<Shared_FieldOption, { key: string, label: string }>((item_1: Shared_FieldOption): { key: string, label: string } => ({
+                    key: item_1.OptionKey.fields[0],
+                    label: item_1.Description,
+                }), value_11(config_1!.Items)), Array.from(collection_2)),
+                options: (collection_3 = map_3<Shared_FieldOption, { description: string, key: string, value: string }>((opt_1: Shared_FieldOption): { description: string, key: string, value: string } => ({
+                    description: opt_1.Description,
+                    key: opt_1.OptionKey.fields[0],
+                    value: opt_1.Value,
+                }), value_11(config_1!.Options)), Array.from(collection_3)),
+            };
+        default:
+            return undefined;
+    }
+}
+
+/**
+ * Extract matrix info from field.Value when it's Matrix or PluginData (FilledForm).
+ * Use when getFieldMatrixInfo returns null - e.g. when FieldType doesn't match but Value has Matrix/PluginData.
+ * TypeScript: getFieldMatrixInfoFromValue(field: FormField) => {items, options} | null
+ */
+export function getFieldMatrixInfoFromValue(field: Spec_FormField$1<Spec_FieldType_$union>): Option<{ items: { key: string, label: string }[], options: { description: string, key: string, value: string }[] }> {
+    let collection: FSharpList<{ key: string, label: string }>, collection_1: FSharpList<{ description: string, key: string, value: string }>, collection_2: FSharpList<{ key: string, label: string }>, collection_3: FSharpList<{ description: string, key: string, value: string }>;
+    const matchValue: Option<Shared_FieldValue_$union> = field.Value;
+    let matchResult: int32, ma: Shared_MatrixAnswer, props: FSharpList<Shared_PluginDataProperty>;
+    if (matchValue != null) {
+        switch (value_11(matchValue).tag) {
+            case /* Matrix */ 2: {
+                matchResult = 0;
+                ma = (value_11(matchValue) as Shared_FieldValue<2>).fields[0];
+                break;
+            }
+            case /* PluginData */ 3: {
+                matchResult = 1;
+                props = (value_11(matchValue) as Shared_FieldValue<3>).fields[0];
+                break;
+            }
+            default:
+                matchResult = 2;
+        }
     }
     else {
-        return undefined;
+        matchResult = 2;
+    }
+    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), {
+                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), {
+                Equals: (x_1: string, y_1: string): boolean => (x_1 === y_1),
+                GetHashCode: stringHash,
+            }));
+            if (isEmpty(itemKeys) ? true : isEmpty(optionValues)) {
+                return undefined;
+            }
+            else {
+                return {
+                    items: (collection = mapIndexed_1<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 } => ({
+                        description: v,
+                        key: v,
+                        value: v,
+                    }), optionValues), Array.from(collection_1)),
+                };
+            }
+        }
+        case 1: {
+            const likertProps: FSharpList<Shared_PluginDataProperty> = filter<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,
+            });
+            const optionValues_1: FSharpList<string> = List_distinct<string>(map_3<Shared_PluginDataProperty, string>((p_2: Shared_PluginDataProperty): string => p_2.Value, likertProps), {
+                Equals: (x_3: string, y_3: string): boolean => (x_3 === y_3),
+                GetHashCode: stringHash,
+            });
+            if (isEmpty(itemKeys_1) ? true : isEmpty(optionValues_1)) {
+                return undefined;
+            }
+            else {
+                return {
+                    items: (collection_2 = mapIndexed_1<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 } => ({
+                        description: v_1,
+                        key: v_1,
+                        value: v_1,
+                    }), optionValues_1), Array.from(collection_3)),
+                };
+            }
+        }
+        default:
+            return undefined;
     }
 }
 
@@ -695,7 +852,7 @@ export function getFieldKeyString(fieldKey: Shared_FieldKey): string {
  * TypeScript: extractFormValuesFromFormSpec(formSpec: FormSpec) => Record<string, any>
  */
 export function extractFormValuesFromFormSpec(spec: Spec_FormSpec$1<Spec_FieldType_$union>): any {
-    const pairs: FSharpList<[string, any]> = toList<[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]> => {
+    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) {

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

@@ -1168,7 +1168,7 @@ export function Converters_fieldTypeFromTS(fieldType: Types_FieldTypeTS): Option
                 return undefined;
             }
             else {
-                return Spec_FieldType_PluginField(new Spec_PluginFieldConfig(value_2(matchValue_34).PluginId));
+                return Spec_FieldType_PluginField(new Spec_PluginFieldConfig(value_2(matchValue_34).PluginId, undefined, undefined));
             }
         }
         default: