@f1studio/form-spec 5.0.0-alpha.168 → 5.0.0-alpha.169

package/src/FormSpec.FS/FormSpecHelpers.ts

@@ -1,7 +1,7 @@
 import { singleton, head, isEmpty, ofSeq, iterate, forAll, exists, sumBy, collect, tryFind, FSharpList, empty, sortBy, mapIndexed, map } from "@fable-org/fable-library-js/List.js";
 import { tryParse as tryParse_1, float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { getFieldDetails, FormSpecMetadata, FieldDetails$1 } from "./FormSpecValues.js";
-import { Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_FieldValue_Matrix, Shared_FieldValue_Multiple, Shared_ConditionValue_Single, Shared_ConditionValue_PluginData, Shared_ConditionValue_Matrix, Shared_ConditionValue_Multiple, ClinicalPathway_ConstraintDefinition, ClinicalPathway_ConstraintType_$union, ClinicalPathway_TransitionDefinition, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, Shared_MatrixAnswer, Shared_PluginPropertyKey, Shared_FieldOptionKey, Shared_ConditionValue_$union, ClinicalPathway_FieldEvaluator_$union, Shared_PluginDataProperty_$reflection, Shared_PluginDataProperty, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldValue_$union, Spec_FormSpec$1, Spec_FormClassification_General, Spec_FormLifecycle_Draft, Values_StepOrder, Spec_FormStep$1, Shared_FieldKey, Spec_FormField$1, Spec_FieldType_$union } from "./FormSpec.js";
+import { Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_FieldValue_Matrix, Shared_FieldValue_Multiple, Shared_ConditionValue_Single, Shared_ConditionValue_PluginData, Shared_ConditionValue_Matrix, Shared_ConditionValue_Multiple, ClinicalPathway_ConstraintDefinition, ClinicalPathway_ConstraintType_$union, ClinicalPathway_TransitionDefinition, ClinicalPathway_ClinicalPathwaySpec, Spec_Label_shown, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, Shared_MatrixAnswer, Shared_PluginPropertyKey, Shared_FieldOptionKey, Shared_ConditionValue_$union, ClinicalPathway_FieldEvaluator_$union, Shared_PluginDataProperty_$reflection, Shared_PluginDataProperty, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldValue_$union, Spec_FormSpec$1, Spec_FormClassification_General, Spec_FormLifecycle_Draft, Values_StepOrder, Spec_FormStep$1, Shared_FieldKey, Spec_FormField$1, Spec_FieldType_$union } from "./FormSpec.js";
 import { FSharpMap, toList } from "@fable-org/fable-library-js/Map.js";
 import { compare, int32ToString, equals, comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { newGuid } from "@fable-org/fable-library-js/Guid.js";
@@ -424,7 +424,7 @@ export function validateFormSpecFieldKeys(formSpec: Spec_FormSpec$1<Spec_FieldTy
     iterate<Spec_FormStep$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): void => {
         iterate<Spec_FormField$1<Spec_FieldType_$union>>((field: Spec_FormField$1<Spec_FieldType_$union>): void => {
             if (field.FieldKey.fields[0] === "00000000-0000-0000-0000-000000000000") {
-                void (errors.push(`Field '${field.Label}' has empty GUID field key`));
+                void (errors.push(`Field '${Spec_Label_shown(field.Label)}' has empty GUID field key`));
             }
         }, step.Fields);
     }, formSpec.Steps);

package/src/FormSpec.FS/FormSpecValues.ts

@@ -1,6 +1,6 @@
 import { Record } from "@fable-org/fable-library-js/Types.js";
 import { map as map_1, value as value_1, defaultArg, bind, Option } from "@fable-org/fable-library-js/Option.js";
-import { Values_StepOrder, Shared_FieldValue_Single, Shared_FieldAnswer, Spec_FormSpec$1, Spec_FormStep$1, Spec_FormField$1, Spec_FieldType_$union, Shared_FieldOption_$reflection, Shared_FieldValue_$reflection, Shared_FieldKey_$reflection, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Spec_Score_$reflection, Spec_Score } from "./FormSpec.js";
+import { Values_StepOrder, Shared_FieldValue_Single, Shared_FieldAnswer, Spec_Label_shown, Spec_FormSpec$1, Spec_FormStep$1, Spec_FormField$1, Spec_FieldType_$union, Shared_FieldOption_$reflection, Shared_FieldValue_$reflection, Shared_FieldKey_$reflection, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Spec_Score_$reflection, Spec_Score } from "./FormSpec.js";
 import { compare, equals, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { list_type, int32_type, record_type, option_type, string_type, class_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
@@ -131,8 +131,11 @@ export function updateField<FieldType>(spec: Spec_FormSpec$1<FieldType>, fieldKe
  * Uses field.Value or creates empty default based on field type.
  */
 export function fieldToDetails(field: Spec_FormField$1<Spec_FieldType_$union>): FieldDetails$1<Spec_FieldType_$union> {
-    let matchValue: Option<Shared_FieldValue_$union>;
-    return new FieldDetails$1(field.FieldOrder, field.FieldKey, field.Label, (matchValue = field.Value, (matchValue == null) ? Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, field.Label, "", undefined)) : value_1(matchValue)), field.FieldType, optionsFromField(field));
+    let fieldValue: Shared_FieldValue_$union;
+    const matchValue: Option<Shared_FieldValue_$union> = field.Value;
+    fieldValue = ((matchValue == null) ? Shared_FieldValue_Single(new Shared_FieldAnswer(field.FieldKey, Spec_Label_shown(field.Label), "", undefined)) : value_1(matchValue));
+    const options: FSharpList<Shared_FieldOption> = optionsFromField(field);
+    return new FieldDetails$1(field.FieldOrder, field.FieldKey, Spec_Label_shown(field.Label), fieldValue, field.FieldType, options);
 }
 
 /**

package/src/FormSpec.FS/Helpers.ts

@@ -1,4 +1,4 @@
-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 { Values_StepOrder, Shared_FieldValue_Multiple, Spec_Label_shown, 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";
@@ -6,9 +6,9 @@ import { uint8, int32, parse as parse_1 } from "@fable-org/fable-library-js/Int3
 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 { splitAt, tryFindIndex, forAll, sortBy, find, insertAt, mapIndexed, singleton, append, choose, head, tail, isEmpty, collect, empty, tryFind, FSharpList, filter, map as map_1 } from "@fable-org/fable-library-js/List.js";
 import { compare, safeHash, comparePrimitives, stringHash, equals } from "@fable-org/fable-library-js/Util.js";
+import { Result_Map, FSharpResult$2_$union, FSharpResult$2_Error, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.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";
@@ -70,14 +70,14 @@ export function Helpers_generateDeterministicGuid(fieldName: string): string {
  * Finds a form field by its label string in a specific step.
  */
 export function Helpers_FieldFinders_findFormFieldInStepByLabelString<FieldType>(label: string, stepNumber: int32, formSpec: Spec_FormSpec$1<FieldType>): FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]> {
-    return defaultArg(map<Spec_FormStep$1<FieldType>, FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>>((step_1: Spec_FormStep$1<FieldType>): FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]> => map_1<Spec_FormField$1<FieldType>, [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>((field_1: Spec_FormField$1<FieldType>): [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>] => ([step_1, field_1] as [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]), filter<Spec_FormField$1<FieldType>>((field: Spec_FormField$1<FieldType>): boolean => (field.Label === label), step_1.Fields)), tryFind<Spec_FormStep$1<FieldType>>((step: Spec_FormStep$1<FieldType>): boolean => (step.StepOrder === stepNumber), formSpec.Steps)), empty<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>());
+    return defaultArg(map<Spec_FormStep$1<FieldType>, FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>>((step_1: Spec_FormStep$1<FieldType>): FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]> => map_1<Spec_FormField$1<FieldType>, [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>((field_1: Spec_FormField$1<FieldType>): [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>] => ([step_1, field_1] as [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]), filter<Spec_FormField$1<FieldType>>((field: Spec_FormField$1<FieldType>): boolean => equals(field.Label, label), step_1.Fields)), tryFind<Spec_FormStep$1<FieldType>>((step: Spec_FormStep$1<FieldType>): boolean => (step.StepOrder === stepNumber), formSpec.Steps)), empty<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>());
 }
 
 /**
  * Finds a form field by its label string across all steps in the form.
  */
 export function Helpers_FieldFinders_findFormFieldInFormByLabelString<FieldType>(label: string, formSpec: Spec_FormSpec$1<FieldType>): FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]> {
-    return collect<Spec_FormStep$1<FieldType>, [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>((step: Spec_FormStep$1<FieldType>): FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]> => map_1<Spec_FormField$1<FieldType>, [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>((field_1: Spec_FormField$1<FieldType>): [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>] => ([step, field_1] as [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]), filter<Spec_FormField$1<FieldType>>((field: Spec_FormField$1<FieldType>): boolean => (field.Label === label), step.Fields)), formSpec.Steps);
+    return collect<Spec_FormStep$1<FieldType>, [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>((step: Spec_FormStep$1<FieldType>): FSharpList<[Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]> => map_1<Spec_FormField$1<FieldType>, [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]>((field_1: Spec_FormField$1<FieldType>): [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>] => ([step, field_1] as [Spec_FormStep$1<FieldType>, Spec_FormField$1<FieldType>]), filter<Spec_FormField$1<FieldType>>((field: Spec_FormField$1<FieldType>): boolean => equals(field.Label, label), step.Fields)), formSpec.Steps);
 }
 
 /**
@@ -155,7 +155,7 @@ export function Helpers_FieldFinders_tryFindFieldInSpec<UserField>(fieldNumber:
  * Gets all unique field labels from a FormSpec.
  */
 export function Helpers_FieldFinders_getAllFieldNames<UserField>(formSpec: Spec_FormSpec$1<UserField>): FSharpList<string> {
-    return List_distinct<string>(map_1<Spec_FormField$1<UserField>, string>((field: Spec_FormField$1<UserField>): string => field.Label, collect<Spec_FormStep$1<UserField>, Spec_FormField$1<UserField>>((step: Spec_FormStep$1<UserField>): FSharpList<Spec_FormField$1<UserField>> => step.Fields, formSpec.Steps)), {
+    return List_distinct<string>(choose<Spec_FormField$1<UserField>, string>((field: Spec_FormField$1<UserField>): Option<string> => field.Label, collect<Spec_FormStep$1<UserField>, Spec_FormField$1<UserField>>((step: Spec_FormStep$1<UserField>): FSharpList<Spec_FormField$1<UserField>> => step.Fields, formSpec.Steps)), {
         Equals: (x: string, y: string): boolean => (x === y),
         GetHashCode: stringHash,
     });
@@ -711,7 +711,9 @@ export function Helpers_readManyValue<FieldType>(fieldKey: Shared_FieldKey, valu
 export function Helpers_updateSingleFunc(formatter: ((arg0: string) => string), specField: Spec_FormField$1<Spec_FieldType_$union>, newValue: string, values: FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>): FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>> {
     let Value: string, matchValue: Option<Shared_FieldOption>;
     const fieldOptions: FSharpList<Shared_FieldOption> = Helpers_optionsFromSpecField(specField);
-    const newFieldDetails: FieldDetails$1<Spec_FieldType_$union> = new FieldDetails$1(specField.FieldOrder, specField.FieldKey, specField.Label, Shared_FieldValue_Single((Value = formatter(newValue), new Shared_FieldAnswer(specField.FieldKey, (matchValue = tryFind<Shared_FieldOption>((o: Shared_FieldOption): boolean => (o.Value === newValue), fieldOptions), (matchValue == null) ? newValue : value_1(matchValue).Description), Value, undefined))), specField.FieldType, Helpers_specFieldOptionsToValueOptions(fieldOptions));
+    let newFieldDetails: FieldDetails$1<Spec_FieldType_$union>;
+    const FieldValue: Shared_FieldValue_$union = Shared_FieldValue_Single((Value = formatter(newValue), new Shared_FieldAnswer(specField.FieldKey, (matchValue = tryFind<Shared_FieldOption>((o: Shared_FieldOption): boolean => (o.Value === newValue), fieldOptions), (matchValue == null) ? newValue : value_1(matchValue).Description), Value, undefined)));
+    newFieldDetails = (new FieldDetails$1(specField.FieldOrder, specField.FieldKey, Spec_Label_shown(specField.Label), FieldValue, specField.FieldType, Helpers_specFieldOptionsToValueOptions(fieldOptions)));
     const matchValue_1: Option<Shared_FieldKey> = tryFind_1<Shared_FieldKey>((k: Shared_FieldKey): boolean => equals(k, newFieldDetails.Key), map_2<[Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>], Shared_FieldKey>((tuple: [Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>]): Shared_FieldKey => tuple[0], toSeq<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>(values)));
     if (matchValue_1 != null) {
         const key: Shared_FieldKey = value_1(matchValue_1);
@@ -724,13 +726,15 @@ export function Helpers_updateSingleFunc(formatter: ((arg0: string) => string),
 }
 
 export function Helpers_updateManyFunc(formatter: ((arg0: string) => string), specField: Spec_FormField$1<Spec_FieldType_$union>, newValue: FSharpSet<string>, values: FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>): FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>> {
-    const newFieldDetails: FieldDetails$1<Spec_FieldType_$union> = new FieldDetails$1(specField.FieldOrder, specField.FieldKey, specField.Label, Shared_FieldValue_Multiple(map_3<string, Shared_FieldAnswer>((v: string): Shared_FieldAnswer => {
+    let newFieldDetails: FieldDetails$1<Spec_FieldType_$union>;
+    const FieldValue: Shared_FieldValue_$union = Shared_FieldValue_Multiple(map_3<string, Shared_FieldAnswer>((v: string): Shared_FieldAnswer => {
         let matchValue: Option<Shared_FieldOption>;
         const Value: string = formatter(v);
         return new Shared_FieldAnswer(specField.FieldKey, (matchValue = tryFind<Shared_FieldOption>((o: Shared_FieldOption): boolean => (o.Value === v), Helpers_optionsFromSpecField(specField)), (matchValue == null) ? v : value_1(matchValue).Description), Value, undefined);
     }, newValue, {
         Compare: compare,
-    })), specField.FieldType, Helpers_specFieldOptionsToValueOptions(Helpers_optionsFromSpecField(specField)));
+    }));
+    newFieldDetails = (new FieldDetails$1(specField.FieldOrder, specField.FieldKey, Spec_Label_shown(specField.Label), FieldValue, specField.FieldType, Helpers_specFieldOptionsToValueOptions(Helpers_optionsFromSpecField(specField))));
     const matchValue_1: Option<Shared_FieldKey> = tryFind_1<Shared_FieldKey>((k: Shared_FieldKey): boolean => equals(k, newFieldDetails.Key), map_2<[Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>], Shared_FieldKey>((tuple: [Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>]): Shared_FieldKey => tuple[0], toSeq<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>(values)));
     if (matchValue_1 != null) {
         const key: Shared_FieldKey = value_1(matchValue_1);
@@ -746,9 +750,10 @@ export function Helpers_updateManyFunc(formatter: ((arg0: string) => string), sp
  * Returns the updated ResultStepValues
  */
 export function Helpers_updateFormFieldValue(field: Spec_FormField$1<Spec_FieldType_$union>, newValue: any, values: FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>): FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>> {
-    const newFieldDetails: FieldDetails$1<Spec_FieldType_$union> = new FieldDetails$1(field.FieldOrder, field.FieldKey, field.Label, (() => {
+    const fieldOptions: FSharpList<Shared_FieldOption> = Helpers_optionsFromSpecField(field);
+    const newFieldDetails: FieldDetails$1<Spec_FieldType_$union> = new FieldDetails$1(field.FieldOrder, field.FieldKey, Spec_Label_shown(field.Label), (() => {
         throw new Error("updateFormFieldValue: Field type handling not implemented.");
-    })(), field.FieldType, Helpers_specFieldOptionsToValueOptions(Helpers_optionsFromSpecField(field)));
+    })(), field.FieldType, Helpers_specFieldOptionsToValueOptions(fieldOptions));
     const matchValue_1: Option<Shared_FieldKey> = tryFind_1<Shared_FieldKey>((k: Shared_FieldKey): boolean => equals(k, newFieldDetails.Key), map_2<[Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>], Shared_FieldKey>((tuple: [Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>]): Shared_FieldKey => tuple[0], toSeq<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>(values)));
     if (matchValue_1 != null) {
         const key: Shared_FieldKey = value_1(matchValue_1);

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRFieldTypeMapper.ts

@@ -2,7 +2,7 @@ import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { Helpers_generateDeterministicGuidRaw, Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { CoreMRChoice, CoreMRItem } from "../../CorEMR/CoreMRTypes.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Spec_FieldType_UnsupportedField, Spec_UnsupportedFieldInfo, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Message, Spec_MessageInfo, Spec_MessageType_Info, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_DateTimeLocal, Spec_FieldType_Date, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Spec_FieldType_Dropdown, Spec_FieldType_Radio, Spec_SingleChoiceInfo, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey } from "../../../FormSpec.js";
+import { Spec_FormField$1, Spec_Label_ofStated, Spec_FieldType_$union, Spec_FieldType_UnsupportedField, Spec_UnsupportedFieldInfo, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Message, Spec_MessageInfo, Spec_MessageType_Info, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_DateTimeLocal, Spec_FieldType_Date, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Spec_FieldType_Dropdown, Spec_FieldType_Radio, Spec_SingleChoiceInfo, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey } from "../../../FormSpec.js";
 import { isEmpty, ofArray, FSharpList, sortBy, map } from "@fable-org/fable-library-js/List.js";
 import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { getElementTypeInfo } from "./CorEMRElementTypeMap.js";
@@ -108,7 +108,7 @@ export function mapToFormField(formCode: string, stepOrder: int32, item: CoreMRI
     const fieldType: Spec_FieldType_$union = mapFieldType(item, choices);
     const mainLabel: string = item.Label.trim();
     const notesField: Option<string> = isPlusNotesType(item) ? "" : undefined;
-    return new Spec_FormField$1(item.Sequence, generateNamespacedFieldKey(formCode, stepOrder, item), mainLabel, notesField, undefined, !item.IsRequired, false, isNeedsDocumentationType(item), fieldType, undefined);
+    return new Spec_FormField$1(item.Sequence, generateNamespacedFieldKey(formCode, stepOrder, item), Spec_Label_ofStated(mainLabel), notesField, undefined, !item.IsRequired, false, isNeedsDocumentationType(item), fieldType, undefined);
 }
 
 //# sourceMappingURL=CorEMRFieldTypeMapper.ts.map

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRFormSpecValidator.ts

@@ -1,6 +1,6 @@
 import { toString, Record, Union } from "@fable-org/fable-library-js/Types.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { defaultArg, value as value_3, map as map_1, Option } from "@fable-org/fable-library-js/Option.js";
+import { bind, defaultArg, value as value_3, map as map_1, Option } from "@fable-org/fable-library-js/Option.js";
 import { record_type, list_type, union_type, option_type, bool_type, string_type, int32_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { isEmpty, filter, singleton as singleton_1, empty as empty_1, ofSeq, choose, collect, sortBy, map, sumBy, length, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { IDisposable, disposeSafe, IEnumerator, getEnumerator, compare, int32ToString, comparePrimitives, numberHash, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
@@ -12,7 +12,7 @@ import { List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
 import { join } from "@fable-org/fable-library-js/String.js";
 import { empty, singleton, append, delay, toList } from "@fable-org/fable-library-js/Seq.js";
 import { getElementTypeInfo } from "./CorEMRElementTypeMap.js";
-import { FormScoring, ScoringLabel } from "../../CorEMR/TemplateManifestDecoder.js";
+import { FormScoring, ScoringLabel } from "../../CorEMR/FormTemplateDecoder.js";
 import { FSharpResult$2_$union, FSharpResult$2_Ok, FSharpResult$2_Error } from "@fable-org/fable-library-js/Result.js";
 
 export type ValidationError_$union = 
@@ -371,7 +371,7 @@ export function FormSpecValidator_validateRequiredFields(coreMR: CoreMRFormData,
             try {
                 while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
                     const field: Spec_FormField$1<Spec_FieldType_$union> = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                    const matchValue: Option<CoreMRItem> = tryFind<string, CoreMRItem>(field.Label, itemsByLabel);
+                    const matchValue: Option<CoreMRItem> = bind<string, CoreMRItem>((label: string): Option<CoreMRItem> => tryFind<string, CoreMRItem>(label, itemsByLabel), field.Label);
                     if (matchValue == null) {
                     }
                     else {

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRSectioning.ts

@@ -5,6 +5,7 @@ import { list_type, option_type, record_type, string_type, int32_type, TypeInfo
 import { Option } from "@fable-org/fable-library-js/Option.js";
 import { item as item_3, length, mapIndexed, append, head, singleton, isEmpty, map, sortBy, filter, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { CoreMRItem_$reflection, CoreMRItem } from "../../CorEMR/CoreMRTypes.js";
+import { Spec_Label_ofStated } from "../../../FormSpec.js";
 
 export class HeadingItem extends Record implements IEquatable<HeadingItem>, IComparable<HeadingItem> {
     readonly Sequence: int32;
@@ -25,9 +26,9 @@ export function HeadingItem_$reflection(): TypeInfo {
 export class Section extends Record implements IEquatable<Section>, IComparable<Section> {
     readonly Heading: Option<HeadingItem>;
     readonly HeadingSequence: int32;
-    readonly HeadingLabel: string;
+    readonly HeadingLabel: Option<string>;
     readonly Items: FSharpList<CoreMRItem>;
-    constructor(Heading: Option<HeadingItem>, HeadingSequence: int32, HeadingLabel: string, Items: FSharpList<CoreMRItem>) {
+    constructor(Heading: Option<HeadingItem>, HeadingSequence: int32, HeadingLabel: Option<string>, Items: FSharpList<CoreMRItem>) {
         super();
         this.Heading = Heading;
         this.HeadingSequence = (HeadingSequence | 0);
@@ -37,7 +38,7 @@ export class Section extends Record implements IEquatable<Section>, IComparable<
 }
 
 export function Section_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CorEMRSectioning.Section", [], Section, () => [["Heading", option_type(HeadingItem_$reflection())], ["HeadingSequence", int32_type], ["HeadingLabel", string_type], ["Items", list_type(CoreMRItem_$reflection())]]);
+    return record_type("FormSpec.Integrations.CorEMR.CorEMRSectioning.Section", [], Section, () => [["Heading", option_type(HeadingItem_$reflection())], ["HeadingSequence", int32_type], ["HeadingLabel", option_type(string_type)], ["Items", list_type(CoreMRItem_$reflection())]]);
 }
 
 /**
@@ -58,7 +59,7 @@ export function detectHeadings(items: FSharpList<CoreMRItem>): FSharpList<Headin
 
 /**
  * Group items into sections based on heading positions.
- * Preamble: items before first heading (HeadingLabel = "Form").
+ * Preamble: items before first heading (`HeadingLabel = None` — CoreMR states no heading there).
  * Sections: one per heading, items between heading N and N+1.
  */
 export function groupItemsByHeadings(headings: FSharpList<HeadingItem>, allItems: FSharpList<CoreMRItem>): FSharpList<Section> {
@@ -66,20 +67,21 @@ export function groupItemsByHeadings(headings: FSharpList<HeadingItem>, allItems
         Compare: comparePrimitives,
     });
     if (isEmpty(headings)) {
-        return singleton(new Section(undefined, 0, "Form", nonHeading));
+        return singleton(new Section(undefined, 0, undefined, nonHeading));
     }
     else {
         const firstHeading: HeadingItem = head(headings);
-        return append(singleton(new Section(undefined, 0, "Form", filter<CoreMRItem>((item_1: CoreMRItem): boolean => (item_1.Sequence < firstHeading.Sequence), nonHeading))), mapIndexed<HeadingItem, Section>((index: int32, heading: HeadingItem): Section => {
+        return append(singleton(new Section(undefined, 0, undefined, filter<CoreMRItem>((item_1: CoreMRItem): boolean => (item_1.Sequence < firstHeading.Sequence), nonHeading))), mapIndexed<HeadingItem, Section>((index: int32, heading: HeadingItem): Section => {
             const nextHeadingSeq: int32 = ((index < (length(headings) - 1)) ? item_3(index + 1, headings).Sequence : 2147483647) | 0;
-            return new Section(heading, heading.Sequence, heading.Label, filter<CoreMRItem>((item_2: CoreMRItem): boolean => {
+            const sectionItems: FSharpList<CoreMRItem> = filter<CoreMRItem>((item_2: CoreMRItem): boolean => {
                 if (item_2.Sequence > heading.Sequence) {
                     return item_2.Sequence < nextHeadingSeq;
                 }
                 else {
                     return false;
                 }
-            }, nonHeading));
+            }, nonHeading);
+            return new Section(heading, heading.Sequence, Spec_Label_ofStated(heading.Label), sectionItems);
         }, headings));
     }
 }

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRSemanticReportBuilder.ts

@@ -4,7 +4,7 @@ import { float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { value as value_129, map, defaultArg, Option } from "@fable-org/fable-library-js/Option.js";
 import { stringHash, IDisposable, disposeSafe, IEnumerator, getEnumerator, compareArrays, comparePrimitives, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { int64 } from "@fable-org/fable-library-js/BigInt.js";
-import { reverse, length, sortByDescending, cons, sortBy, choose, map as map_2, collect, exists, empty as empty_1, tryFind, head, isEmpty, ofArray, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { reverse, length, sortByDescending, cons, sortBy, map as map_2, choose, collect, exists, empty as empty_1, tryFind, head, isEmpty, ofArray, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { FSharpMap__get_IsEmpty, tryFind as tryFind_1, FSharpMap__TryFind, ofList, FSharpMap__ContainsKey, FSharpMap } from "@fable-org/fable-library-js/Map.js";
 import { CoreMRFormData, CoreMRChoice, CoreMRItem, CoreMRTrigger, CoreMRTriggerEvent } from "../../CorEMR/CoreMRTypes.js";
 import { toString, utcNow } from "@fable-org/fable-library-js/Date.js";
@@ -499,7 +499,10 @@ export function extractFormReferences(itemId: int32, text: string): FSharpList<F
  * Build field catalog from CoreMR items and FormSpec
  */
 export function buildFieldCatalog<T>(items: FSharpList<CoreMRItem>, formSpec: Spec_FormSpec$1<T>): FSharpList<FieldCatalogEntry> {
-    const fieldDataMap: FSharpMap<string, [string, Option<string>]> = ofList<string, [string, Option<string>]>(collect<Spec_FormStep$1<T>, [string, [string, Option<string>]]>((step: Spec_FormStep$1<T>): FSharpList<[string, [string, Option<string>]]> => map_2<Spec_FormField$1<T>, [string, [string, Option<string>]]>((field: Spec_FormField$1<T>): [string, [string, Option<string>]] => ([field.Label, [field.FieldKey.fields[0], field.Notes] as [string, Option<string>]] as [string, [string, Option<string>]]), step.Fields), formSpec.Steps), {
+    const fieldDataMap: FSharpMap<string, [string, Option<string>]> = ofList<string, [string, Option<string>]>(collect<Spec_FormStep$1<T>, [string, [string, Option<string>]]>((step: Spec_FormStep$1<T>): FSharpList<[string, [string, Option<string>]]> => choose<Spec_FormField$1<T>, [string, [string, Option<string>]]>((field: Spec_FormField$1<T>): Option<[string, [string, Option<string>]]> => {
+        const guid: string = field.FieldKey.fields[0];
+        return map<string, [string, [string, Option<string>]]>((label: string): [string, [string, Option<string>]] => ([label, [guid, field.Notes] as [string, Option<string>]] as [string, [string, Option<string>]]), field.Label);
+    }, step.Fields), formSpec.Steps), {
         Compare: comparePrimitives,
     });
     return choose<CoreMRItem, FieldCatalogEntry>((item: CoreMRItem): Option<FieldCatalogEntry> => {
@@ -548,9 +551,7 @@ export function buildPathwayContext(pathway: Option<ClinicalPathway_ClinicalPath
         const p: ClinicalPathway_ClinicalPathwaySpec = value_129(pathway);
         return new PathwayContext(map_2<ClinicalPathway_StateDefinition, PathwayState>((state: ClinicalPathway_StateDefinition): PathwayState => {
             let matchValue: ClinicalPathway_StateType_$union;
-            return new PathwayState(state.StateKey.fields[0], (matchValue = state.StateType, (matchValue.tag === /* Evaluation */ 1) ? "Evaluation" : ((matchValue.tag === /* Action */ 2) ? "Action" : ((matchValue.tag === /* Terminal */ 5) ? "Terminal" : ((matchValue.tag === /* CompoundAction */ 3) ? "CompoundAction" : ((matchValue.tag === /* ConditionalAction */ 4) ? "ConditionalAction" : (() => {
-                throw new Error("Match failure: F1.Studio.ClinicalPathway.StateType");
-            })()))))), state.StateLabel, state.StateOrder);
+            return new PathwayState(state.StateKey.fields[0], (matchValue = state.StateType, (matchValue.tag === /* Action */ 1) ? "Action" : ((matchValue.tag === /* Terminal */ 4) ? "Terminal" : ((matchValue.tag === /* CompoundAction */ 2) ? "CompoundAction" : ((matchValue.tag === /* ConditionalAction */ 3) ? "ConditionalAction" : "Evaluation")))), state.StateLabel, state.StateOrder);
         }, p.States), map_2<ClinicalPathway_TransitionDefinition, PathwayTransition>((trans: ClinicalPathway_TransitionDefinition): PathwayTransition => {
             let matchValue_2: ClinicalPathway_TransitionCondition_$union;
             const transKey: string = trans.TransitionKey.fields[0];

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRStepsBuilder.ts

@@ -5,22 +5,13 @@ import { FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { CoreMRItem, CoreMRChoice } from "../../CorEMR/CoreMRTypes.js";
 import { Spec_FormStep$1, Spec_FieldType_$union, Spec_FormField$1 } from "../../../FormSpec.js";
-import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { detectHeadings, groupItemsByHeadings, Section } from "./CorEMRSectioning.js";
 
 /**
  * Create FormSpec Steps from CoreMR items
  */
 export function createSteps(formCode: string, items: FSharpList<CoreMRItem>, choicesByItem: FSharpMap<int32, FSharpList<CoreMRChoice>>): FSharpList<Spec_FormStep$1<Spec_FieldType_$union>> {
-    return mapIndexed<Section, Spec_FormStep$1<Spec_FieldType_$union>>((index: int32, section: Section): Spec_FormStep$1<Spec_FieldType_$union> => (new Spec_FormStep$1(index + 1, section.HeadingLabel, map<CoreMRItem, Spec_FormField$1<Spec_FieldType_$union>>((item: CoreMRItem): Spec_FormField$1<Spec_FieldType_$union> => {
-        const field: Spec_FormField$1<Spec_FieldType_$union> = mapToFormField(formCode, index + 1, item, defaultArg(tryFind<int32, FSharpList<CoreMRChoice>>(item.ItemId, choicesByItem), empty<CoreMRChoice>()));
-        if (isNullOrWhiteSpace(field.Label)) {
-            return new Spec_FormField$1(field.FieldOrder, field.FieldKey, "_(blank)_", field.Notes, field.DependsOn, field.IsOptional, field.IsDeprecated, field.NeedsDocumentation, field.FieldType, field.Value);
-        }
-        else {
-            return field;
-        }
-    }, section.Items))), groupItemsByHeadings(detectHeadings(items), items));
+    return mapIndexed<Section, Spec_FormStep$1<Spec_FieldType_$union>>((index: int32, section: Section): Spec_FormStep$1<Spec_FieldType_$union> => (new Spec_FormStep$1(index + 1, section.HeadingLabel, map<CoreMRItem, Spec_FormField$1<Spec_FieldType_$union>>((item: CoreMRItem): Spec_FormField$1<Spec_FieldType_$union> => mapToFormField(formCode, index + 1, item, defaultArg(tryFind<int32, FSharpList<CoreMRChoice>>(item.ItemId, choicesByItem), empty<CoreMRChoice>())), section.Items))), groupItemsByHeadings(detectHeadings(items), items));
 }
 
 //# sourceMappingURL=CorEMRStepsBuilder.ts.map

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRTemplateMapper.ts

@@ -1,16 +1,16 @@
 import { Spec_FormClassification_$union, Spec_FormClassification_General, Spec_FormClassification_Screening, Spec_FormClassification_Intake, Spec_FormClassification_ClinicalInstrument, Spec_ClinicalInstrumentInfo } from "../../../FormSpec.js";
 import { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
-import { bind, orElse, map as map_1, defaultArg, Option, value as value_5 } from "@fable-org/fable-library-js/Option.js";
+import { bind, orElse, map as map_1, defaultArg, Option, value as value_3 } from "@fable-org/fable-library-js/Option.js";
+import { item as item_2, length, sortBy, FSharpList, empty, choose, isEmpty, map, mapIndexed, collect } from "@fable-org/fable-library-js/List.js";
+import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
+import { CoreMRFormData, CoreMRFormDetail, CoreMRTag, CoreMRChoice, CoreMRItem, CoreMRFormMetadata, CoreMRTrigger, CoreMRTriggerEvent, CoreMRTriggerCondition } from "../../CorEMR/CoreMRTypes.js";
+import { TemplateChoice, carriesTextOrDate, ElementTypeEntry, TemplateForm, ReleaseAvailability$1_$union, TemplateItem, ItemTrigger, TriggerAction, TriggerCondition } from "../../CorEMR/FormTemplateDecoder.js";
 import { isNullOrEmpty } from "@fable-org/fable-library-js/String.js";
 import { int64, toInt32 } from "@fable-org/fable-library-js/BigInt.js";
-import { CoreMRFormData, CoreMRFormDetail, CoreMRTag, CoreMRTrigger, CoreMRTriggerEvent, CoreMRTriggerCondition, CoreMRChoice, CoreMRItem, CoreMRFormMetadata } from "../../CorEMR/CoreMRTypes.js";
-import { empty, choose, item as item_3, length, mapIndexed, sortBy, collect, FSharpList, isEmpty, map } from "@fable-org/fable-library-js/List.js";
-import { TemplateForm, ItemTrigger, TriggerAction, TriggerCondition, TemplateChoice, ReleaseAvailability$1_$union, TemplateItem, carriesTextOrDate, ElementTypeEntry } from "../../CorEMR/TemplateManifestDecoder.js";
 import { FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
 import { comparePrimitives, int32ToString } from "@fable-org/fable-library-js/Util.js";
 import { FSharpSet__Contains, FSharpSet, ofSeq } from "@fable-org/fable-library-js/Set.js";
 import { normalizeChoiceScores } from "../../../BitmaskHelpers.js";
-import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 
 /**
  * Map catalog classification fields to the FormClassification DU.
@@ -27,11 +27,11 @@ import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 export function mapFormClassification(formCategory: Option<string>, instrumentType: Option<string>, instrumentMaxScore: Option<int32>): Spec_FormClassification_$union {
     let matchResult: int32, instType: string;
     if (formCategory != null) {
-        switch (value_5(formCategory)) {
+        switch (value_3(formCategory)) {
             case "clinical_instrument": {
                 if (instrumentType != null) {
                     matchResult = 0;
-                    instType = value_5(instrumentType);
+                    instType = value_3(instrumentType);
                 }
                 else {
                     matchResult = 3;
@@ -65,10 +65,34 @@ export function mapFormClassification(formCategory: Option<string>, instrumentTy
     }
 }
 
+/**
+ * The form's RAW trigger rows, reshaped for the record — PROVENANCE ONLY (see the file's teaching note).
+ * One `CoreMRTrigger` per item × trigger attachment, conditions and actions exactly as conduit served them.
+ * ⛔ Never a pathway input: `CoreMRPathwayMapper` reads the domain, and a test holds that it reads nothing here.
+ */
+export function provenanceTriggersOf(template: TemplateForm): FSharpList<CoreMRTrigger> {
+    return collect<TemplateItem, CoreMRTrigger>((item: TemplateItem): FSharpList<CoreMRTrigger> => {
+        let matchValue: ReleaseAvailability$1_$union<FSharpList<ItemTrigger>>;
+        return mapIndexed<ItemTrigger, CoreMRTrigger>((triggerOrder: int32, trigger: ItemTrigger): CoreMRTrigger => (new CoreMRTrigger(trigger.TriggerId, item.ItemId, trigger.EventName, triggerOrder + 1, trigger.ExclusiveTag, trigger.Enabled, map<TriggerCondition, CoreMRTriggerCondition>((cond: TriggerCondition): CoreMRTriggerCondition => (new CoreMRTriggerCondition(cond.ConditionId, trigger.TriggerId, undefined, cond.Source, cond.Operator, !isEmpty(cond.RawChoiceIds) ? cond.RawChoiceIds : choose<string, int32>((value: string): Option<int32> => {
+            let matchValue_1: [boolean, int32];
+            let outArg = 0;
+            matchValue_1 = ([tryParse(value, 511, false, 32, new FSharpRef<int32>((): int32 => outArg, (v: int32): void => {
+                outArg = (v | 0);
+            })), outArg] as [boolean, int32]);
+            if (matchValue_1[0]) {
+                return matchValue_1[1];
+            }
+            else {
+                return undefined;
+            }
+        }, cond.Values))), trigger.Conditions), map<TriggerAction, CoreMRTriggerEvent>((action: TriggerAction): CoreMRTriggerEvent => (new CoreMRTriggerEvent(action.ActionId, trigger.TriggerId, action.ActionType, action.Params)), trigger.Actions))), (matchValue = item.Triggers, (matchValue.tag === /* NotInRelease */ 1) ? empty<ItemTrigger>() : ((matchValue.tag === /* NotReadYet */ 2) ? empty<ItemTrigger>() : matchValue.fields[0])));
+    }, template.Items);
+}
+
 /**
  * Map bridge template (TemplateForm — SSOT) to CoreMRFormDetail.
  * When elementTypes is non-empty, use it for ItemTypeName, HasText, HasDate, and bitmask detection.
- * When elementTypes is empty, fallback to CorEMRElementTypeMap.
+ * A kind `elementTypes` does not carry is NAMED unresolved (`unresolved_<code>`) — never guessed from a constant.
  */
 export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<string, ElementTypeEntry>, template: TemplateForm): CoreMRFormDetail {
     const metadata: CoreMRFormMetadata = new CoreMRFormMetadata(template.FormId, template.Name, isNullOrEmpty(template.Description) ? undefined : template.Description, ~~toInt32(template.CurrentVersionId), 1, undefined, template.RequiresSignature, template.IsIntake, template.FormCode, "");
@@ -92,39 +116,20 @@ export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<string, Ele
         const bitPositions: Option<FSharpList<int32>> = (FSharpSet__Contains(multiSelectTypes, item_1.Type) && patternInput_1[1]) ? patternInput_1[0] : undefined;
         return mapIndexed<TemplateChoice, CoreMRChoice>((index: int32, choice: TemplateChoice): CoreMRChoice => (new CoreMRChoice(choice.ChoiceId, item_1.ItemId, choice.Sequence, choice.Text, choice.Score, orElse(choice.BitPosition, bind<FSharpList<int32>, int32>((positions: FSharpList<int32>): Option<int32> => {
             if (index < length(positions)) {
-                return item_3(index, positions);
+                return item_2(index, positions);
             }
             else {
                 return undefined;
             }
         }, bitPositions)), choice.Code, map_1<int32, string>(int32ToString, choice.Highlight))), sortedChoices);
-    }, template.Items), collect<TemplateItem, CoreMRTrigger>((item_2: TemplateItem): FSharpList<CoreMRTrigger> => {
-        let matchValue_1: ReleaseAvailability$1_$union<FSharpList<ItemTrigger>>;
-        return mapIndexed<ItemTrigger, CoreMRTrigger>((triggerOrder: int32, trigger: ItemTrigger): CoreMRTrigger => {
-            const conditions: FSharpList<CoreMRTriggerCondition> = map<TriggerCondition, CoreMRTriggerCondition>((cond: TriggerCondition): CoreMRTriggerCondition => (new CoreMRTriggerCondition(cond.ConditionId, trigger.TriggerId, undefined, cond.Source, cond.Operator, !isEmpty(cond.RawChoiceIds) ? cond.RawChoiceIds : choose<string, int32>((value_3: string): Option<int32> => {
-                let matchValue_2: [boolean, int32];
-                let outArg = 0;
-                matchValue_2 = ([tryParse(value_3, 511, false, 32, new FSharpRef<int32>((): int32 => outArg, (v: int32): void => {
-                    outArg = (v | 0);
-                })), outArg] as [boolean, int32]);
-                if (matchValue_2[0]) {
-                    return matchValue_2[1];
-                }
-                else {
-                    return undefined;
-                }
-            }, cond.Values))), trigger.Conditions);
-            const events: FSharpList<CoreMRTriggerEvent> = map<TriggerAction, CoreMRTriggerEvent>((action: TriggerAction): CoreMRTriggerEvent => (new CoreMRTriggerEvent(action.ActionId, trigger.TriggerId, action.ActionType, action.Params)), trigger.Actions);
-            return new CoreMRTrigger(trigger.TriggerId, item_2.ItemId, trigger.EventName, triggerOrder + 1, defaultArg(trigger.ExclusiveTag, ""), trigger.Enabled, conditions, events);
-        }, (matchValue_1 = item_2.Triggers, (matchValue_1.tag === /* NotInRelease */ 1) ? empty<ItemTrigger>() : ((matchValue_1.tag === /* NotReadYet */ 2) ? empty<ItemTrigger>() : matchValue_1.fields[0])));
-    }, template.Items), empty<CoreMRTag>(), undefined);
+    }, template.Items), provenanceTriggersOf(template), empty<CoreMRTag>(), undefined);
 }
 
 /**
  * ⭐ THE ONE `TemplateForm -> CoreMRFormData` PATH. A projection of the single builder above, so
  * Studio and f1-api cannot drift: the same CoreMR form becomes the same record in both.
  * 
- * ⚰️ It replaces `TemplateManifestDecoder.toCoreMRFormData`, a SECOND builder that stringified the
+ * ⚰️ It replaces `FormTemplateDecoder.toCoreMRFormData`, a SECOND builder that stringified the
  * item type code, hardcoded `HasText`/`HasDate`, dropped every trigger and tag, and never computed a
  * choice's `BitPosition`. Studio used that one and f1-api used this one.
  */

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRTemplateToFormSpec.ts

@@ -1,18 +1,15 @@
 import { Helpers_generateDeterministicGuidRaw, Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
-import { tryFind, FSharpMap, ofList } from "@fable-org/fable-library-js/Map.js";
-import { empty, collect, isEmpty, sortBy, FSharpList, map } from "@fable-org/fable-library-js/List.js";
+import { defaultArg, Option, bind } from "@fable-org/fable-library-js/Option.js";
+import { empty, isEmpty, FSharpList, map, sortBy } from "@fable-org/fable-library-js/List.js";
+import { Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FormSpec$1, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, Spec_FieldType_$union, Spec_FormStep$1, Spec_VendorScore, Spec_VendorScoreBand } from "../../../FormSpec.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { CoreMRFormData, CoreMRTag, CoreMRItem, CoreMRChoice } from "../../CorEMR/CoreMRTypes.js";
+import { FormScoring, ScoringLabel } from "../../CorEMR/FormTemplateDecoder.js";
 import { numberHash, comparePrimitives } from "@fable-org/fable-library-js/Util.js";
-import { defaultArg, Option, bind } from "@fable-org/fable-library-js/Option.js";
-import { Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FormSpec$1, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, ClinicalPathway_ClinicalPathwaySpec, Spec_FormField$1, Shared_FieldKey, Spec_FieldType_$union, Spec_FormStep$1, Spec_VendorScore, Spec_VendorScoreBand } from "../../../FormSpec.js";
-import { FormScoring, ScoringLabel } from "../../CorEMR/TemplateManifestDecoder.js";
 import { toConsoleError, printf, toText, substring } from "@fable-org/fable-library-js/String.js";
 import { createSteps } from "./CorEMRStepsBuilder.js";
+import { ofList } from "@fable-org/fable-library-js/Map.js";
 import { List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
-import { generateNamespacedFieldKey } from "./CorEMRFieldTypeMapper.js";
-import { nonHeadingItems } from "./CorEMRSectioning.js";
-import { convertTriggersToSinglePathway } from "./CorEMRTriggerConverter.js";
+import { CoreMRFormData, CoreMRTag, CoreMRChoice } from "../../CorEMR/CoreMRTypes.js";
 import { Auto_generateBoxedEncoder_437914C6, toString } from "../../../../Thoth.Json/packages/Thoth.Json/Encode.js";
 import { FSharpResult$2_Ok, FSharpResult$2_$union, FSharpResult$2_Error } from "@fable-org/fable-library-js/Result.js";
 import { FormSpecValidator_validateConversion, ValidationResult } from "./CorEMRFormSpecValidator.js";
@@ -32,15 +29,6 @@ export function generateStableDeterministicGuid(name: string): string {
     return Helpers_generateDeterministicGuidRaw(`coremr:formspec:${name}`);
 }
 
-/**
- * Create mapping from choice ID to actual text value
- */
-export function createChoiceIdToTextMap(choices: FSharpList<CoreMRChoice>): FSharpMap<int32, string> {
-    return ofList<int32, string>(map<CoreMRChoice, [int32, string]>((c: CoreMRChoice): [int32, string] => ([c.ChoiceId, c.Text] as [int32, string]), choices), {
-        Compare: comparePrimitives,
-    });
-}
-
 /**
  * ⚰️ `calculateScore` WAS HERE AND IS NOT COMING BACK. It summed every `item_choices.score`
  * in the form — the BITMASK WEIGHT column, which `CoreMRTypes.CoreMRChoice.Score` documents as
@@ -121,14 +109,7 @@ export function convertToFormSpec(scoring: Option<FormScoring>, formData: CoreMR
         Compare: comparePrimitives,
     }));
     const vendorScore: Option<Spec_VendorScore> = statedScale(scoring);
-    const fieldKeyBySequence: FSharpMap<int32, Shared_FieldKey> = ofList<int32, Shared_FieldKey>(map<Spec_FormField$1<Spec_FieldType_$union>, [int32, Shared_FieldKey]>((field: Spec_FormField$1<Spec_FieldType_$union>): [int32, Shared_FieldKey] => ([field.FieldOrder, field.FieldKey] as [int32, Shared_FieldKey]), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, steps)), {
-        Compare: comparePrimitives,
-    });
-    const itemIdToFieldKeyMap: FSharpMap<int32, Shared_FieldKey> = ofList<int32, Shared_FieldKey>(map<CoreMRItem, [int32, Shared_FieldKey]>((item: CoreMRItem): [int32, Shared_FieldKey] => ([item.ItemId, defaultArg(tryFind<int32, Shared_FieldKey>(item.Sequence, fieldKeyBySequence), generateNamespacedFieldKey(formCode, 1, item))] as [int32, Shared_FieldKey]), nonHeadingItems(formData.Items)), {
-        Compare: comparePrimitives,
-    });
-    const clinicalPathway: Option<ClinicalPathway_ClinicalPathwaySpec> = isEmpty(formData.Triggers) ? undefined : convertTriggersToSinglePathway(formData.Triggers, (itemId: int32): Shared_FieldKey => defaultArg(tryFind<int32, Shared_FieldKey>(itemId, itemIdToFieldKeyMap), new Shared_FieldKey(generateStableDeterministicGuid(`unknown_item_${itemId}`))), createChoiceIdToTextMap(formData.Choices), formData.Metadata, formData.Items);
-    return new Spec_FormSpec$1(generateStableDeterministicGuid(`form_${formData.Metadata.FormId}_${formData.Metadata.FormName}`), formCode, formData.Metadata.FormName, defaultArg(formData.Metadata.Description, ""), toText(printf("1.0.0-CoreEMRv%d"))(formData.Metadata.VersionNumber), "5.0.0", steps, map<CoreMRTag, string>((t: CoreMRTag): string => t.TagName, formData.Tags), undefined, vendorScore, empty<string>(), formData.Metadata.RequiresSignature, false, clinicalPathway, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
+    return new Spec_FormSpec$1(generateStableDeterministicGuid(`form_${formData.Metadata.FormId}_${formData.Metadata.FormName}`), formCode, formData.Metadata.FormName, defaultArg(formData.Metadata.Description, ""), toText(printf("1.0.0-CoreEMRv%d"))(formData.Metadata.VersionNumber), "5.0.0", steps, map<CoreMRTag, string>((t: CoreMRTag): string => t.TagName, formData.Tags), undefined, vendorScore, empty<string>(), formData.Metadata.RequiresSignature, false, undefined, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
 }
 
 /**

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CoreMREncoder.ts

@@ -806,10 +806,9 @@ export function encodeToFormAnswersWithVitals(provenancePayload: string, filledF
     const matchValue: FSharpResult$2_$union<CoreMRSourceMap, string> = tryDecodeSourceMap(provenancePayload);
     if (matchValue.tag === /* Ok */ 0) {
         const sourceMap: CoreMRSourceMap = matchValue.fields[0];
-        const formName: string = defaultArg(sourceMap.FormName, `CORE-${sourceMap.FormId}`);
         const fieldMap: FSharpMap<string, Spec_FormField$1<Spec_FieldType_$union>> = buildFieldByKeyMap(filledFormSpec);
         try {
-            return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, formName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, vitalsIdOpt, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun, undefined));
+            return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, sourceMap.FormName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, vitalsIdOpt, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun, undefined));
         }
         catch (matchValue_1: any) {
             const activePatternResult: Option<string> = Operators_FailurePattern(matchValue_1);
@@ -852,12 +851,9 @@ export function encodeToFormAnswers(provenancePayload: string, filledFormSpec: S
             return FSharpResult$2_Error<CoreMRFormInsertRequest, string>(`FormSpecId mismatch: provenance is for form ${sourceMap.FormSpecId} but data is from form ${filledFormSpec.Id}. This could cause patient data mixing!`);
         }
         else {
-            let formName: string;
-            const value = `CORE-${sourceMap.FormId}`;
-            formName = defaultArg(orElse(sourceMap.FormName, isNullOrWhiteSpace(filledFormSpec.Title) ? undefined : filledFormSpec.Title), value);
             const fieldMap: FSharpMap<string, Spec_FormField$1<Spec_FieldType_$union>> = buildFieldByKeyMap(filledFormSpec);
             try {
-                return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, formName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, undefined, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun, undefined));
+                return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, sourceMap.FormName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, undefined, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun, undefined));
             }
             catch (matchValue_1: any) {
                 const activePatternResult: Option<string> = Operators_FailurePattern(matchValue_1);