@f1studio/form-spec 5.0.0-alpha.117 → 5.0.0-alpha.123

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

@@ -1,24 +1,23 @@
-import { map as map_1, value as value_11, unwrap, defaultArgWith as defaultArgWith_1, Option, defaultArg as defaultArg_1 } from "@fable-org/fable-library-js/Option.js";
-import { tryPick, filter, mapIndexed as mapIndexed_1, isEmpty, map as map_3, ofSeq, fold, partition, ofArray, append, singleton, empty, collect, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
-import { join, substring, isNullOrEmpty, printf, toConsole } from "@fable-org/fable-library-js/String.js";
+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, 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, stringHash, compare, createObj, 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 { 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_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 { 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 { toString as toString_1, Union, FSharpRef } from "@fable-org/fable-library-js/Types.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 { 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 { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { extractPropertyKeyFromUnknown, resolvePropertyKey } from "./PluginPropertyKeyRegistry.js";
-import { empty as empty_1, append as append_1, mapIndexed, map as map_2, choose, singleton as singleton_1, collect as collect_1, delay, toList as toList_1 } from "@fable-org/fable-library-js/Seq.js";
-import { map } from "@fable-org/fable-library-js/Array.js";
-import { getFieldDetails as getFieldDetails_1, FieldDetails$1, updateField, findStepIndexForField, updateFieldDocumentation } from "../FormSpecValues.js";
-import { toArray, 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 { 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 { 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";
@@ -371,86 +370,36 @@ export function createFormFieldData(fieldKey: string, objectValue: any): { field
     };
 }
 
-function normalizePluginDataItem(item: any): any {
-    const name: string = toString_1((item["Name"] != null && item["Name"] !== undefined ? item["Name"] : (item["name"] != null && item["name"] !== undefined ? item["name"] : null)));
-    const value_2: string = toString_1((item["Value"] != null && item["Value"] !== undefined ? item["Value"] : (item["value"] != null && item["value"] !== undefined ? item["value"] : null)));
-    const dataType: string = toString_1((item["DataType"] != null && item["DataType"] !== undefined ? item["DataType"] : (item["dataType"] != null && item["dataType"] !== undefined ? item["dataType"] : null)));
-    const displayName: any = (item["DisplayName"] != null && item["DisplayName"] !== undefined ? item["DisplayName"] : (item["displayName"] != null && item["displayName"] !== undefined ? item["displayName"] : null));
-    const unitVal: any = (item["Unit"] != null && item["Unit"] !== undefined ? item["Unit"] : (item["unit"] != null && item["unit"] !== undefined ? item["unit"] : null));
-    const description: any = (item["Description"] != null && item["Description"] !== undefined ? item["Description"] : (item["description"] != null && item["description"] !== undefined ? item["description"] : null));
-    const pk: any = (item["PropertyKey"] != null && item["PropertyKey"] !== undefined ? item["PropertyKey"] : (item["propertyKey"] != null && item["propertyKey"] !== undefined ? item["propertyKey"] : null));
-    const withOpt = (k: string, v: any): FSharpList<[string, any]> => {
-        if (v == null) {
-            return empty<[string, any]>();
-        }
-        else {
-            return singleton([k, v] as [string, any]);
-        }
-    };
-    return createObj(append(ofArray([["propertyKey", resolvePropertyKey(name, (pk == null) ? undefined : extractPropertyKeyFromUnknown(pk))] as [string, any], ["name", name] as [string, any], ["dataType", isNullOrEmpty(dataType) ? "string" : dataType] as [string, any], ["value", value_2] as [string, any]]), append(withOpt("displayName", displayName), append(withOpt("unit", unitVal), withOpt("description", description)))));
-}
-
-/**
- * Normalize filledFormData for platform API (fill_form, buildFormSpecWithValues).
- * Converts PluginData arrays from PascalCase to camelCase, resolves propertyKey.
- * Passes through non-PluginData values (e.g. fieldKey_doc) unchanged.
- * TypeScript: import { normalizeFormValuesForPlatformApi } from '@f1studio/form-spec/Interop/FormSpec.Api.Helpers'
- */
-export function normalizeFormValuesForPlatformApi(formValues: any): any {
-    if (formValues == null) {
-        throw new Error("normalizeFormValuesForPlatformApi: formValues is null");
-    }
-    const entries: [string, any][] = Object.entries(formValues);
-    return createObj(toList_1<[string, any]>(delay<[string, any]>((): Iterable<[string, any]> => collect_1<[string, any], Iterable<[string, any]>, [string, any]>((matchValue: [string, any]): Iterable<[string, any]> => {
-        const value: any = matchValue[1];
-        return singleton_1<[string, any]>([matchValue[0], (Array.isArray(value) && value.length > 0 && typeof value[0] === 'object' && value[0] !== null && ('Name' in value[0] || 'name' in value[0])) ? map<any, any>(normalizePluginDataItem, value as any[]) : value] as [string, any]);
-    }, entries))));
-}
-
 /**
  * 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> {
-    const patternInput: [FSharpList<{ fieldKey: string, objectValue: any }>, FSharpList<{ fieldKey: string, objectValue: any }>] = partition<{ fieldKey: string, objectValue: any }>((input: { fieldKey: string, objectValue: any }): boolean => !input.fieldKey.endsWith("_doc"), toList_1<{ fieldKey: string, objectValue: any }>(fieldData));
-    return fold<{ fieldKey: string, objectValue: any }, Spec_FormSpec$1<Spec_FieldType_$union>>((spec_1: Spec_FormSpec$1<Spec_FieldType_$union>, input_2: { fieldKey: string, objectValue: any }): Spec_FormSpec$1<Spec_FieldType_$union> => {
-        const baseKey: string = substring(input_2.fieldKey, 0, input_2.fieldKey.length - 4);
-        const matchValue_3: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(spec_1, baseKey);
-        if (matchValue_3 == null) {
-            toConsole(`Warning: Documentation field ${input_2.fieldKey} - base field ${baseKey} not found in FormSpec`);
-            return spec_1;
-        }
-        else {
-            const field_2: Spec_FormField$1<Spec_FieldType_$union> = value_11(matchValue_3);
-            const docStr: string = decodeAsString(input_2.fieldKey, input_2.objectValue);
-            const docOpt: Option<string> = isNullOrEmpty(docStr) ? undefined : docStr;
-            return defaultArg_1(map_1<int32, Spec_FormSpec$1<Spec_FieldType_$union>>((stepIdx_1: int32): Spec_FormSpec$1<Spec_FieldType_$union> => updateFieldDocumentation<Spec_FieldType_$union>(spec_1, field_2.FieldKey, docOpt, stepIdx_1), findStepIndexForField<Spec_FieldType_$union>(spec_1, field_2.FieldKey)), spec_1);
-        }
-    }, 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> => {
+    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_1<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_1: { fieldKey: string, objectValue: any }): Option<[Spec_FormField$1<Spec_FieldType_$union>, FieldDetails$1<Spec_FieldType_$union>]> => {
+        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> }, 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_1.fieldKey);
+        const matchValue: Option<Spec_FormField$1<Spec_FieldType_$union>> = findFieldByKey(formSpec, input.fieldKey);
         if (matchValue == null) {
-            toConsole(`Warning: Field ${input_1.fieldKey} not found in FormSpec`);
+            toConsole(`Warning: Field ${input.fieldKey} not found in FormSpec`);
             return undefined;
         }
         else {
             const field: Spec_FormField$1<Spec_FieldType_$union> = value_11(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_1<Shared_FieldAnswer>(map<string, Shared_FieldAnswer>((value: string): Shared_FieldAnswer => (new Shared_FieldAnswer(field.FieldKey, field.Label, value)), decodeAsStringArray(input_1.fieldKey, input_1.objectValue)), {
+                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_1.fieldKey, input_1.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), {
+                })) : ((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,
-                }), (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_1.fieldKey)(arg_1)), Shared_FieldValue_Matrix(matrixAnswer)))))) : ((matchValue_1.tag === /* PluginDataValue */ 3) ? Shared_FieldValue_PluginData(ofArray<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(input_1.fieldKey, input_1.objectValue)))) : Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, field.Label, decodeAsString(input_1.fieldKey, input_1.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_1.fieldKey}: ${ex.message}`);
+                toConsole(`Error processing field ${input.fieldKey}: ${ex.message}`);
                 return undefined;
             }
         }
-    }, patternInput[0]))), patternInput[1]);
+    }, fieldData)));
 }
 
 /**
@@ -491,7 +440,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);
+    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());
 }
 
 /**
@@ -557,7 +506,7 @@ export function createClinicalPathway(name: string, states: ClinicalPathway_Stat
  * TypeScript: addPathwayToFormSpec(formSpec: FormSpec, pathway: ClinicalPathwaySpec)
  */
 export function addPathwayToFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, pathway: ClinicalPathway_ClinicalPathwaySpec): Spec_FormSpec$1<Spec_FieldType_$union> {
-    return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, formSpec.Steps, formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, pathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance);
+    return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, formSpec.Steps, formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, pathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -565,7 +514,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_1<FieldDetails$1<Spec_FieldType_$union>, any>((fieldDetails: FieldDetails$1<Spec_FieldType_$union>): any => ({
+    return map<FieldDetails$1<Spec_FieldType_$union>, any>((fieldDetails: FieldDetails$1<Spec_FieldType_$union>): any => ({
         FieldOrder: fieldDetails.FieldOrder,
         FieldType: fieldDetails.FieldType,
         FieldValue: fieldDetails.FieldValue,
@@ -588,7 +537,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_1<Spec_FormStep$1<Spec_FieldType_$union>, string[]>((step_1: Spec_FormStep$1<Spec_FieldType_$union>): string[] => {
+    return defaultArgWith_1<string[]>(map<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[] => []);
@@ -607,7 +556,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_1<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<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details.FieldValue, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
 }
 
 /**
@@ -615,7 +564,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_1<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
+    return map<FieldDetails$1<Spec_FieldType_$union>, any>((details: FieldDetails$1<Spec_FieldType_$union>): any => details, getFieldDetails_1(formSpec, new Shared_FieldKey(parse(fieldKeyString))));
 }
 
 /**
@@ -625,8 +574,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([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([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([option1, option2]), ofArray([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);
+    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());
 }
 
 /**
@@ -670,14 +619,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_1<FSharpList<Shared_FieldOption>, { key: string, label: string }[]>((items: FSharpList<Shared_FieldOption>): { key: string, label: string }[] => {
+            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_1<FSharpList<Shared_FieldOption>, { description: string, key: string, value: string }[]>((opts: FSharpList<Shared_FieldOption>): { description: string, key: string, value: string }[] => {
+            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],
@@ -908,27 +857,33 @@ export function getFieldKeyString(fieldKey: Shared_FieldKey): string {
  */
 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 matchValue: Option<Shared_FieldValue_$union>, fv: Shared_FieldValue_$union, arr: string[], ma: Shared_MatrixAnswer, dict: IMap<string, string>, enumerator: IEnumerator<[Shared_MatrixItemKey, string]>, arr_1: FSharpList<any>;
-        const keyStr: string = getFieldKeyString(field.FieldKey);
-        return append_1<[string, any]>((matchValue = field.Value, (matchValue == null) ? (empty_1<[string, any]>()) : ((fv = value_11(matchValue), singleton_1<[string, any]>([keyStr, (fv.tag === /* Multiple */ 1) ? ((arr = map<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]);
+        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_11(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]);
+                    }
                 }
-            }
-            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])))), delay<[string, any]>((): Iterable<[string, any]> => (field.NeedsDocumentation ? singleton_1<[string, any]>([keyStr + "_doc", defaultArg_1(field.Documentation, "")] as [string, any]) : empty_1<[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]);
+        }
     }, step.Fields), spec.Steps)));
     if (isEmpty(pairs)) {
         return {};
@@ -1040,7 +995,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_1<string, string>((code: string): string => (` (ICD: ${code})`), prob.IcdCode), "")}`,
+                description: `${prob.ProblemName}${defaultArg_1(map<string, string>((code: string): string => (` (ICD: ${code})`), prob.IcdCode), "")}`,
                 icdCode: unwrap(prob.IcdCode),
                 problemName: prob.ProblemName,
                 type: "problem",

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

@@ -3,7 +3,7 @@ import { uncurry2, IComparable, IEquatable } from "@fable-org/fable-library-js/U
 import { obj_type, enum_type, int32_type, array_type, bool_type, option_type, record_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { map as map_2, value as value_2, Option } from "@fable-org/fable-library-js/Option.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FormLifecycle_Blueprint, Spec_FormSpec$1, Spec_FilledMeta, Spec_FormLifecycle_$union, ClinicalPathway_ClinicalPathwaySpec, Spec_Score, Spec_ScoreRange, Spec_ScoreColor_Danger, Spec_ScoreColor_Warning, Spec_ScoreColor_Success, Spec_ScoreColor_Info, Spec_ScoreColor_Link, Spec_ScoreColor_Primary, Spec_ScoreColor_Unspecified, Spec_ScoreColor_$union, Spec_FormStep$1, Spec_FormField$1, Shared_FieldValue_$union, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Message, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_Matrix, Spec_FieldType_TextAutoComplete, Spec_FieldType_TagList, Spec_FieldType_CheckboxList, Spec_FieldType_MultiChoice, Spec_MultiChoiceInfo, Spec_FieldType_Dropdown, Spec_FieldType_SingleChoice, Spec_FieldType_Radio, Spec_SingleChoiceInfo, Spec_FieldType_Checkbox, Spec_FieldType_Time, Spec_FieldType_DateTimeLocal, Spec_FieldType_Date, Spec_FieldType_Tel, Spec_FieldType_Number, Spec_FieldType_Color, Spec_FieldType_Search, Spec_FieldType_Password, Spec_FieldType_Email, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Spec_FieldType_$union, Spec_MessageInfo, Spec_MatrixInfo, Spec_BooleanInfo, Spec_MessageType_Danger, Spec_MessageType_Info, Spec_MessageType_Error, Spec_MessageType_Success, Spec_MessageType_Warning, Spec_MessageType_$union, Spec_DependsOn, Spec_Evaluator_Contains, Spec_Evaluator_IsEmpty, Spec_Evaluator_Exists, Spec_Evaluator_LessThanOrEquals, Spec_Evaluator_LessThan, Spec_Evaluator_GreaterThanOrEquals, Spec_Evaluator_GreaterThan, Spec_Evaluator_NotEquals, Spec_Evaluator_Equals, Spec_Evaluator_$union, Shared_FieldOption, Shared_FieldOptionKey, Shared_MatrixItemKey, Shared_TransitionKey, Shared_StateKey, Shared_FieldKey } from "../FormSpec.js";
+import { Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, Spec_FormSpec$1, Spec_FilledMeta, Spec_FormLifecycle_$union, ClinicalPathway_ClinicalPathwaySpec, Spec_Score, Spec_ScoreRange, Spec_ScoreColor_Danger, Spec_ScoreColor_Warning, Spec_ScoreColor_Success, Spec_ScoreColor_Info, Spec_ScoreColor_Link, Spec_ScoreColor_Primary, Spec_ScoreColor_Unspecified, Spec_ScoreColor_$union, Spec_FormStep$1, Spec_FormField$1, Shared_FieldValue_$union, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Message, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_Matrix, Spec_FieldType_TextAutoComplete, Spec_FieldType_TagList, Spec_FieldType_CheckboxList, Spec_FieldType_MultiChoice, Spec_MultiChoiceInfo, Spec_FieldType_Dropdown, Spec_FieldType_SingleChoice, Spec_FieldType_Radio, Spec_SingleChoiceInfo, Spec_FieldType_Checkbox, Spec_FieldType_Time, Spec_FieldType_DateTimeLocal, Spec_FieldType_Date, Spec_FieldType_Tel, Spec_FieldType_Number, Spec_FieldType_Color, Spec_FieldType_Search, Spec_FieldType_Password, Spec_FieldType_Email, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Spec_FieldType_$union, Spec_MessageInfo, Spec_MatrixInfo, Spec_BooleanInfo, Spec_MessageType_Danger, Spec_MessageType_Info, Spec_MessageType_Error, Spec_MessageType_Success, Spec_MessageType_Warning, Spec_MessageType_$union, Spec_DependsOn, Spec_Evaluator_Contains, Spec_Evaluator_IsEmpty, Spec_Evaluator_Exists, Spec_Evaluator_LessThanOrEquals, Spec_Evaluator_LessThan, Spec_Evaluator_GreaterThanOrEquals, Spec_Evaluator_GreaterThan, Spec_Evaluator_NotEquals, Spec_Evaluator_Equals, Spec_Evaluator_$union, Shared_FieldOption, Shared_FieldOptionKey, Shared_MatrixItemKey, Shared_TransitionKey, Shared_StateKey, Shared_FieldKey } from "../FormSpec.js";
 import { tryParse } from "@fable-org/fable-library-js/Guid.js";
 import { ofArray, reverse, empty, FSharpList, cons, map, toArray } from "@fable-org/fable-library-js/List.js";
 import { sumBy, tryFind, collect, map as map_1, fold } from "@fable-org/fable-library-js/Array.js";
@@ -1457,7 +1457,7 @@ export function Converters_formSpecFromTS(spec: Types_FormSpecTS): Option<Spec_F
             return undefined;
         }
         else {
-            return new Spec_FormSpec$1(matchValue[1], spec.Code, spec.Title, spec.Abstract, spec.Version, spec.FormSpecVersion, reverse<Spec_FormStep$1<Spec_FieldType_$union>>(value_2(convertedSteps)), ofArray<string>(spec.CategoryTags), scoreResult, ofArray<string>(spec.AssociatedCodes), spec.RequiresReview, spec.RequiresReviewAndApproval, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined);
+            return new Spec_FormSpec$1(matchValue[1], spec.Code, spec.Title, spec.Abstract, spec.Version, spec.FormSpecVersion, reverse<Spec_FormStep$1<Spec_FieldType_$union>>(value_2(convertedSteps)), ofArray<string>(spec.CategoryTags), scoreResult, ofArray<string>(spec.AssociatedCodes), spec.RequiresReview, spec.RequiresReviewAndApproval, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
         }
     }
     else {

package/src/plugins/bmi/src/BMIField.ts

@@ -1,6 +1,6 @@
 import { FSharpRef, Record } from "@fable-org/fable-library-js/Types.js";
 import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
-import { some, bind, defaultArg, map, value as value_97, Option } from "@fable-org/fable-library-js/Option.js";
+import { some, bind, defaultArg, map, value as value_90, Option } from "@fable-org/fable-library-js/Option.js";
 import { equals, createObj, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { class_type, record_type, string_type, option_type, float64_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { mapValues, Field$3, IAttributes } from "../../../fable_modules/Fable.Form.3.0.0/Field.fs.js";
@@ -13,9 +13,7 @@ import React from "react";
 import { reactApi } from "../../../fable_modules/Feliz.2.8.0/Interop.fs.js";
 import { withLabelAndError } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Html.View.fs.js";
 import { empty, singleton, append, delay, toList } from "@fable-org/fable-library-js/Seq.js";
-import { Helpers_combineClasses } from "../../../fable_modules/Feliz.Bulma.3.0.0/ElementBuilders.fs.js";
-import { empty as empty_1, tryFind, FSharpList, ofArray, cons, singleton as singleton_1 } from "@fable-org/fable-library-js/List.js";
-import { IReactProperty } from "../../../fable_modules/Feliz.2.8.0/Types.fs.js";
+import { empty as empty_1, tryFind, FSharpList, ofArray } from "@fable-org/fable-library-js/List.js";
 import { ReactElement } from "../../../fable_modules/Fable.React.Types.18.3.0/Fable.React.fs.js";
 import { IStandardField$3_$reflection, IStandardField$3, IField$1, StandardRenderFieldConfig$2 } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Types.fs.js";
 import { Spec_FormField$1, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
@@ -121,7 +119,7 @@ export function BMIField_serializeBMIData(bmiData: BMIField_BMIData): string {
 }
 
 export function BMIField_BMIFieldComponent(config: StandardRenderFieldConfig$2<string, BMIField_Attributes>): ReactElement {
-    let elems_12: Iterable<ReactElement>;
+    let elems_9: Iterable<ReactElement>;
     const bmiData: BMIField_BMIData = BMIField_parseBMIData(config.Value);
     let patternInput: [string, ((arg0: string) => void)];
     const initial: string = (bmiData.Height > 0) ? bmiData.Height.toString() : "";
@@ -224,61 +222,56 @@ export function BMIField_BMIFieldComponent(config: StandardRenderFieldConfig$2<s
         default:
             currentBMI = undefined;
     }
-    return withLabelAndError(config.Attributes.Label, config.ShowError, config.Error, createElement<any>("div", createObj(ofArray([["className", "bmi-calculator"] as [string, any], (elems_12 = toList<ReactElement>(delay<ReactElement>((): Iterable<ReactElement> => {
-        let children_5: Iterable<ReactElement>, children_4: Iterable<ReactElement>, elems_2: Iterable<ReactElement>, children_1: Iterable<ReactElement>, children: Iterable<ReactElement>, elems_5: Iterable<ReactElement>, children_3: Iterable<ReactElement>, children_2: Iterable<ReactElement>;
-        return append<ReactElement>(singleton<ReactElement>((children_5 = [(children_4 = [createElement<any>("div", createObj(Helpers_combineClasses("column", ofArray([["className", "is-half"] as [string, any], (elems_2 = [(children_1 = [createElement<any>("label", createObj(Helpers_combineClasses("label", singleton_1(["children", "Height (cm)"] as [string, any])))), (children = [createElement<any>("input", createObj(cons(["type", "number"] as [string, any], Helpers_combineClasses("input", toList<IReactProperty>(delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["value", height] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["placeholder", "Enter height in cm"] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["disabled", config.Disabled ? true : config.IsReadOnly] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["onChange", (ev: Event): void => {
-            patternInput[1](ev.target.value);
-        }] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => ((config.ShowError && (config.Error != null)) ? singleton<IReactProperty>(["className", "is-danger"] as [string, any]) : empty<IReactProperty>())))))))))))))))], createElement<any>("div", {
-            className: "control",
-            children: reactApi.Children.toArray(Array.from(children)),
-        }))], createElement<any>("div", {
-            className: "field",
-            children: reactApi.Children.toArray(Array.from(children_1)),
-        }))], ["children", reactApi.Children.toArray(Array.from(elems_2))] as [string, any])])))), createElement<any>("div", createObj(Helpers_combineClasses("column", ofArray([["className", "is-half"] as [string, any], (elems_5 = [(children_3 = [createElement<any>("label", createObj(Helpers_combineClasses("label", singleton_1(["children", "Weight (kg)"] as [string, any])))), (children_2 = [createElement<any>("input", createObj(cons(["type", "number"] as [string, any], Helpers_combineClasses("input", toList<IReactProperty>(delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["value", weight] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["placeholder", "Enter weight in kg"] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["disabled", config.Disabled ? true : config.IsReadOnly] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => append<IReactProperty>(singleton<IReactProperty>(["onChange", (ev_1: Event): void => {
-            patternInput_1[1](ev_1.target.value);
-        }] as [string, any]), delay<IReactProperty>((): Iterable<IReactProperty> => ((config.ShowError && (config.Error != null)) ? singleton<IReactProperty>(["className", "is-danger"] as [string, any]) : empty<IReactProperty>())))))))))))))))], createElement<any>("div", {
-            className: "control",
-            children: reactApi.Children.toArray(Array.from(children_2)),
-        }))], createElement<any>("div", {
-            className: "field",
-            children: reactApi.Children.toArray(Array.from(children_3)),
-        }))], ["children", reactApi.Children.toArray(Array.from(elems_5))] as [string, any])]))))], createElement<any>("div", {
-            className: "columns",
-            children: reactApi.Children.toArray(Array.from(children_4)),
-        }))], createElement<any>("div", {
-            className: "field",
-            children: reactApi.Children.toArray(Array.from(children_5)),
-        }))), delay<ReactElement>((): Iterable<ReactElement> => {
-            let children_6: Iterable<ReactElement>, elems_10: Iterable<ReactElement>, elems_9: Iterable<ReactElement>, elems_8: Iterable<ReactElement>;
+    return withLabelAndError(config.Attributes.Label, config.ShowError, config.Error, createElement<any>("div", createObj(ofArray([["className", "bmi-calculator"] as [string, any], (elems_9 = toList<ReactElement>(delay<ReactElement>((): Iterable<ReactElement> => {
+        let elems_4: Iterable<ReactElement>, elems_1: Iterable<ReactElement>, elems: Iterable<ReactElement>, elems_3: Iterable<ReactElement>, elems_2: Iterable<ReactElement>;
+        return append<ReactElement>(singleton<ReactElement>(createElement<any>("div", createObj(ofArray([["className", "grid grid-cols-1 md:grid-cols-2 gap-4"] as [string, any], (elems_4 = [createElement<any>("div", createObj(ofArray([["className", "field"] as [string, any], (elems_1 = [createElement<any>("label", {
+            className: "label",
+            children: "Height (cm)",
+        }), createElement<any>("div", createObj(ofArray([["className", "control"] as [string, any], (elems = [createElement<any>("input", {
+            type: "number",
+            className: join(" ", toList<string>(delay<string>((): Iterable<string> => append<string>(singleton<string>("input input-bordered w-full"), delay<string>((): Iterable<string> => ((config.ShowError && (config.Error != null)) ? singleton<string>("input-error") : empty<string>())))))),
+            value: height,
+            placeholder: "Enter height in cm",
+            disabled: config.Disabled ? true : config.IsReadOnly,
+            onChange: (ev: Event): void => {
+                patternInput[1](ev.target.value);
+            },
+        })], ["children", reactApi.Children.toArray(Array.from(elems))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_1))] as [string, any])]))), createElement<any>("div", createObj(ofArray([["className", "field"] as [string, any], (elems_3 = [createElement<any>("label", {
+            className: "label",
+            children: "Weight (kg)",
+        }), createElement<any>("div", createObj(ofArray([["className", "control"] as [string, any], (elems_2 = [createElement<any>("input", {
+            type: "number",
+            className: join(" ", toList<string>(delay<string>((): Iterable<string> => append<string>(singleton<string>("input input-bordered w-full"), delay<string>((): Iterable<string> => ((config.ShowError && (config.Error != null)) ? singleton<string>("input-error") : empty<string>())))))),
+            value: weight,
+            placeholder: "Enter weight in kg",
+            disabled: config.Disabled ? true : config.IsReadOnly,
+            onChange: (ev_1: Event): void => {
+                patternInput_1[1](ev_1.target.value);
+            },
+        })], ["children", reactApi.Children.toArray(Array.from(elems_2))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_3))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_4))] as [string, any])])))), delay<ReactElement>((): Iterable<ReactElement> => {
+            let elems_8: Iterable<ReactElement>, elems_7: Iterable<ReactElement>, elems_6: Iterable<ReactElement>, elems_5: Iterable<ReactElement>;
             const matchValue_5: Option<[float64, string]> = currentBMI;
             if (matchValue_5 == null) {
                 return singleton<ReactElement>(createElement<any>("div", {
-                    className: "has-text-grey-light has-text-centered",
-                    style: {
-                        padding: 20,
-                    },
+                    className: "text-center text-base-content/70 py-5 mt-4",
                     children: "Enter height and weight to calculate BMI",
                 }));
             }
             else {
-                const category: string = value_97(matchValue_5)[1];
-                const bmi_1: float64 = value_97(matchValue_5)[0];
-                return singleton<ReactElement>((children_6 = [createElement<any>("label", createObj(Helpers_combineClasses("label", singleton_1(["children", "BMI Result"] as [string, any])))), createElement<any>("div", createObj(Helpers_combineClasses("box", ofArray([["style", {
-                    backgroundColor: "#f0f9ff",
-                    border: (((1 + "px ") + "solid") + " ") + "#0ea5e9",
-                }] as [string, any], (elems_10 = [createElement<any>("div", createObj(ofArray([["className", "has-text-centered"] as [string, any], (elems_9 = [createElement<any>("p", {
-                    className: "is-size-4 has-text-weight-bold",
-                    style: {
-                        color: "#0ea5e9",
-                    },
+                const category: string = value_90(matchValue_5)[1];
+                const bmi_1: float64 = value_90(matchValue_5)[0];
+                return singleton<ReactElement>(createElement<any>("div", createObj(ofArray([["className", "field mt-4"] as [string, any], (elems_8 = [createElement<any>("label", {
+                    className: "label",
+                    children: "BMI Result",
+                }), createElement<any>("div", createObj(ofArray([["className", "rounded-lg border border-info bg-info/20 p-4"] as [string, any], (elems_7 = [createElement<any>("div", createObj(ofArray([["className", "text-center"] as [string, any], (elems_6 = [createElement<any>("p", {
+                    className: "text-xl font-bold text-info",
                     children: toText(interpolate("BMI: %.1f%P()", [bmi_1])),
                 }), createElement<any>("p", {
-                    className: "is-size-6",
+                    className: (category === "Underweight") ? "text-sm text-warning" : ((category === "Normal weight") ? "text-sm text-success" : ((category === "Overweight") ? "text-sm text-warning" : ((category === "Obese") ? "text-sm text-error" : "text-sm text-base-content/70"))),
                     children: `Category: ${category}`,
-                    style: {
-                        color: (category === "Underweight") ? "#f59e0b" : ((category === "Normal weight") ? "#10b981" : ((category === "Overweight") ? "#f59e0b" : ((category === "Obese") ? "#ef4444" : "#6b7280"))),
-                    },
-                }), createElement<any>("hr", {}), createElement<any>("div", createObj(ofArray([["className", "is-size-7"] as [string, any], (elems_8 = [createElement<any>("p", {
+                }), createElement<any>("hr", {
+                    className: "my-2 border-base-300",
+                }), createElement<any>("div", createObj(ofArray([["className", "text-xs text-base-content"] as [string, any], (elems_5 = [createElement<any>("p", {
                     children: "BMI Categories:",
                 }), createElement<any>("p", {
                     children: "• Underweight: < 18.5",
@@ -288,13 +281,10 @@ export function BMIField_BMIFieldComponent(config: StandardRenderFieldConfig$2<s
                     children: "• Overweight: 25.0-29.9",
                 }), createElement<any>("p", {
                     children: "• Obese: ≥ 30.0",
-                })], ["children", reactApi.Children.toArray(Array.from(elems_8))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_9))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_10))] as [string, any])]))))], createElement<any>("div", {
-                    className: "field",
-                    children: reactApi.Children.toArray(Array.from(children_6)),
-                })));
+                })], ["children", reactApi.Children.toArray(Array.from(elems_5))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_6))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_7))] as [string, any])])))], ["children", reactApi.Children.toArray(Array.from(elems_8))] as [string, any])]))));
             }
         }));
-    })), ["children", reactApi.Children.toArray(Array.from(elems_12))] as [string, any])]))));
+    })), ["children", reactApi.Children.toArray(Array.from(elems_9))] as [string, any])]))));
 }
 
 export class BMIField_Field$1<Values> extends IStandardField$3<Values, string, BMIField_Attributes> implements IField$1<Values> {
@@ -442,34 +432,24 @@ export const Form_enhancedBMIConverter: IPluginValueConverter = new IPluginValue
 });
 
 export function Form_designerPreview(props: RenderPreviewProps$1<Spec_FieldType_$union>): ReactElement {
-    let elems_3: Iterable<ReactElement>, elems_2: Iterable<ReactElement>, elems: Iterable<ReactElement>, elems_1: Iterable<ReactElement>;
-    const children: Iterable<ReactElement> = [createElement<any>("div", createObj(Helpers_combineClasses("box", ofArray([["style", {
-        border: (((1 + "px ") + "dashed") + " ") + "hsl(0, 0%, 86%)",
-        backgroundColor: "hsl(0, 0%, 98%)",
-        textAlign: "center",
-        padding: 20,
-    }] as [string, any], (elems_3 = [createElement<any>("div", {
-        className: "has-text-weight-bold",
+    let elems_1: Iterable<ReactElement>, elems: Iterable<ReactElement>;
+    return createElement<any>("div", createObj(ofArray([["className", "rounded-lg border border-dashed border-base-300 bg-base-200 text-center p-5"] as [string, any], (elems_1 = [createElement<any>("div", {
+        className: "font-bold mb-2",
         children: "📊 BMI Calculator",
-        style: {
-            marginBottom: 10,
-        },
-    }), createElement<any>("div", createObj(Helpers_combineClasses("columns", ofArray([["className", "is-gapless"] as [string, any], ["className", "is-mobile"] as [string, any], (elems_2 = [createElement<any>("div", createObj(Helpers_combineClasses("column", singleton_1((elems = [createElement<any>("input", createObj(cons(["type", "text"] as [string, any], Helpers_combineClasses("input", ofArray([["readOnly", true] as [string, any], ["placeholder", "Height (cm)"] as [string, any], ["style", {
-        fontSize: 12 + "px",
-    }] as [string, any]])))))], ["children", reactApi.Children.toArray(Array.from(elems))] as [string, any]))))), createElement<any>("div", createObj(Helpers_combineClasses("column", singleton_1((elems_1 = [createElement<any>("input", createObj(cons(["type", "text"] as [string, any], Helpers_combineClasses("input", ofArray([["readOnly", true] as [string, any], ["placeholder", "Weight (kg)"] as [string, any], ["style", {
-        fontSize: 12 + "px",
-    }] as [string, any]])))))], ["children", reactApi.Children.toArray(Array.from(elems_1))] as [string, any])))))], ["children", reactApi.Children.toArray(Array.from(elems_2))] as [string, any])])))), createElement<any>("div", {
-        style: {
-            fontSize: 10 + "px",
-            color: "hsl(0, 0%, 60%)",
-            marginTop: 5,
-        },
+    }), createElement<any>("div", createObj(ofArray([["className", "grid grid-cols-2 gap-2"] as [string, any], (elems = [createElement<any>("input", {
+        type: "text",
+        readOnly: true,
+        placeholder: "Height (cm)",
+        className: "input input-bordered input-sm w-full",
+    }), createElement<any>("input", {
+        type: "text",
+        readOnly: true,
+        placeholder: "Weight (kg)",
+        className: "input input-bordered input-sm w-full",
+    })], ["children", reactApi.Children.toArray(Array.from(elems))] as [string, any])]))), createElement<any>("div", {
+        className: "text-xs text-base-content/60 mt-1.5",
         children: "Automatically calculates BMI and category",
-    })], ["children", reactApi.Children.toArray(Array.from(elems_3))] as [string, any])]))))];
-    return createElement<any>("div", {
-        className: "control",
-        children: reactApi.Children.toArray(Array.from(children)),
-    });
+    })], ["children", reactApi.Children.toArray(Array.from(elems_1))] as [string, any])])));
 }
 
 export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$union>, fieldDetails: FieldDetails): string {
@@ -483,7 +463,7 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
     else {
         try {
             const bmiData: BMIField_BMIData = BMIField_parseBMIData(value);
-            return ((((bmiData.Height > 0) && (bmiData.Weight > 0)) && (bmiData.BMI != null)) && (bmiData.Category != null)) ? join("\n", [`**${field.Label}** ${(matchValue_1 = value_97(bmiData.Category), (matchValue_1 === "Underweight") ? "⚖️" : ((matchValue_1 === "Normal weight") ? "✅" : ((matchValue_1 === "Overweight") ? "⚠️" : ((matchValue_1 === "Obese") ? "🚨" : "📊"))))}`, "", "| Metric | Value |", "|--------|-------|", `| **Height** | %P(F1) cm |`, `| **Weight** | %P(F1) kg |`, `| **BMI** | **%P(F1)** |`, `| **Category** | **${value_97(bmiData.Category)}** |`, "", "> 💡 *BMI is calculated as weight (kg) divided by height (m) squared*"]) : (`**${field.Label}:** *[Incomplete data: Height=%P(F1)cm, Weight=%P(F1)kg]*`);
+            return ((((bmiData.Height > 0) && (bmiData.Weight > 0)) && (bmiData.BMI != null)) && (bmiData.Category != null)) ? join("\n", [`**${field.Label}** ${(matchValue_1 = value_90(bmiData.Category), (matchValue_1 === "Underweight") ? "⚖️" : ((matchValue_1 === "Normal weight") ? "✅" : ((matchValue_1 === "Overweight") ? "⚠️" : ((matchValue_1 === "Obese") ? "🚨" : "📊"))))}`, "", "| Metric | Value |", "|--------|-------|", `| **Height** | %P(F1) cm |`, `| **Weight** | %P(F1) kg |`, `| **BMI** | **%P(F1)** |`, `| **Category** | **${value_90(bmiData.Category)}** |`, "", "> 💡 *BMI is calculated as weight (kg) divided by height (m) squared*"]) : (`**${field.Label}:** *[Incomplete data: Height=%P(F1)cm, Weight=%P(F1)kg]*`);
         }
         catch (ex: any) {
             return `**${field.Label}:** *[Error processing data: ${ex.message}]*`;