@f1studio/form-spec 5.0.0-alpha.151 → 5.0.0-alpha.154

package/plugins/allergyfinder/src/AllergyLogic.d.ts

@@ -49,12 +49,6 @@ export declare function validateAllergyData(entries: AllergyEntryData[], reporte
 export declare const PropertyKeys_AllergyCount: Shared_PluginPropertyKey;
 export declare const PropertyKeys_HasSevereAllergy: Shared_PluginPropertyKey;
 export declare const PropertyKeys_AllergiesJson: Shared_PluginPropertyKey;
-/**
- * Serialize allergy entries to the canonical TS wire format.
- * Returns the output of Convert.fieldValueToTs(FieldValue.PluginData [...]).
- * TypeScript passes this directly to onValueChange — zero ad-hoc construction.
- */
-export declare function serializeAllergiesToCanonical(entries: AllergyEntryData[]): any;
 /**
  * Validate plugin data from the wire format.
  * Takes array (not list) of PluginDataProperty for TS interop.

package/plugins/allergyfinder/src/AllergyLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AllergyLogic.d.ts","sourceRoot":"","sources":["../../../../FormSpec.TS/plugins/allergyfinder/src/AllergyLogic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AllergyLogic.d.ts","sourceRoot":"","sources":["../../../../FormSpec.TS/plugins/allergyfinder/src/AllergyLogic.ts"],"names":[],"mappings":"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"}

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

@@ -37,11 +37,11 @@ export function getElementTypeInfo(itemTypeId: int32): ElementTypeInfo {
         case 2:
             return new ElementTypeInfo("text_multiline", "Text Multiline", "zero", "content", false, false, false, false);
         case 20:
-            return new ElementTypeInfo("dropdown", "Multiple Choice", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("multiple_choice", "Multiple Choice", "choice_score", "ignored", false, false, false, false);
         case 21:
-            return new ElementTypeInfo("dropdown_notes", "Multiple Choice with Notes", "choice_score", "optional_notes", true, false, false, true);
+            return new ElementTypeInfo("multiple_choice_notes", "Multiple Choice Plus Notes", "choice_score", "optional_notes", true, false, false, true);
         case 25:
-            return new ElementTypeInfo("dropdown_notes_ui", "Multiple Choice with Notes UI", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("dropdown", "Drop Down", "choice_score", "ignored", false, false, false, false);
         case 26:
             return new ElementTypeInfo("chips_notes", "Chips with Notes", "choice_score", "optional_notes", true, false, false, true);
         case 30:

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_DateTimeLocal, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_Date, Spec_FieldType_Radio, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Spec_FieldType_Dropdown, Spec_SingleChoiceInfo, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey } from "../../../FormSpec.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_DateTimeLocal, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_Date, Spec_FieldType_Radio, Spec_FieldType_Dropdown, Spec_SingleChoiceInfo, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, 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";
@@ -55,9 +55,9 @@ export function mapFieldType(item: CoreMRItem, choices: FSharpList<CoreMRChoice>
         case 2:
             return Spec_FieldType_TextArea(new Spec_TextInfo(undefined));
         case 20:
-            return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
+            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
         case 21:
-            return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
+            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
         case 25:
             return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
         case 26:

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

@@ -103,7 +103,7 @@ export function convertToFormSpec(formData: CoreMRFormData): Spec_FormSpec$1<Spe
         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), score, empty<string>(), formData.Metadata.RequiresSignature, false, undefined, 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), score, empty<string>(), formData.Metadata.RequiresSignature, false, clinicalPathway, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
 }
 
 /**

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

@@ -3,7 +3,7 @@ import { orElse, defaultArg, map, value as value_3, bind, unwrap, Option } from
 import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
 import { comparePrimitives, stringHash, uncurry2, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { record_type, option_type, float64_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
-import { fold, contains, exists, tail, mapIndexed, tryHead, choose, map as map_1, singleton, empty, tryFind, head, isEmpty, FSharpList, collect, filter } from "@fable-org/fable-library-js/List.js";
+import { exists, fold, contains, tail, mapIndexed, tryHead, choose, map as map_1, singleton, empty, tryFind, head, isEmpty, FSharpList, collect, filter } from "@fable-org/fable-library-js/List.js";
 import { Shared_MatrixItemKey, Shared_MatrixAnswer, Spec_MultiChoiceInfo, Spec_SingleChoiceInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey, Spec_FormSpec$1, Shared_FieldValue, Shared_FieldAnswer, Shared_PluginDataProperty, Shared_FieldValue_$union, Spec_FormStep$1, Spec_FormField$1, Spec_PluginFieldConfig, Spec_FieldType_$union } from "../../../FormSpec.js";
 import { split, isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { tryParse } from "@fable-org/fable-library-js/Double.js";
@@ -294,6 +294,8 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                     const answers: FSharpSet<Shared_FieldAnswer> = (value_3(matchValue) as Shared_FieldValue<1>).fields[0];
                     const matchValue_3: int32 = anchor.ItemTypeId | 0;
                     switch (matchValue_3) {
+                        case 20:
+                        case 21:
                         case 26:
                         case 40:
                         case 41:
@@ -311,7 +313,7 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                             }
                         }
                         default:
-                            throw new Error(`🚨 Multiple answers not supported for CoreMR ItemTypeId ${anchor.ItemTypeId} field ${anchor.FieldKey} - only bitmask types (26,40,41,143) support multiple selection!`);
+                            throw new Error(`🚨 Multiple answers not supported for CoreMR ItemTypeId ${anchor.ItemTypeId} field ${anchor.FieldKey} - only bitmask types (20,21,26,40,41,143) support multiple selection!`);
                     }
                 }
                 case /* Matrix */ 2: {
@@ -362,24 +364,6 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                             return singleton(new CoreMRAnswer(anchor.Sequence, 0n, supportsTextContent(anchor) ? answer.Value : undefined));
                         case 20:
                         case 21:
-                        case 25:
-                        case 32: {
-                            const canonicalAnswer: string = Helpers_canonicalizeFieldKey(answer.Value);
-                            const scoreOpt: Option<int64> = map<CoreMRChoiceAnchor, int64>((c_1: CoreMRChoiceAnchor): int64 => c_1.Score, tryFind<CoreMRChoiceAnchor>((c: CoreMRChoiceAnchor): boolean => exists<Shared_FieldOption>((opt: Shared_FieldOption): boolean => {
-                                if (getFieldOptionKeyGuid(opt.OptionKey) === getFieldOptionKeyGuid(c.FieldOptionKey)) {
-                                    return Helpers_canonicalizeFieldKey(opt.Value) === canonicalAnswer;
-                                }
-                                else {
-                                    return false;
-                                }
-                            }, options), anchor.Choices));
-                            if (scoreOpt == null) {
-                                throw new Error(`🚨 No matching choice found for ItemTypeId ${anchor.ItemTypeId} field ${anchor.FieldKey} answer '${answer.Value}'`);
-                            }
-                            else {
-                                return singleton(new CoreMRAnswer(anchor.Sequence, value_3(scoreOpt), supportsOptionalNotes(anchor) ? answer.Documentation : undefined));
-                            }
-                        }
                         case 26:
                         case 40:
                         case 41:
@@ -413,6 +397,24 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                                 return singleton(new CoreMRAnswer(anchor.Sequence, fold<int32, int64>((acc: int64, bit_1: int32): int64 => toInt64(op_BitwiseOr(acc, toInt64(op_LeftShift(1n, bit_1)))), 0n, bitPositions), supportsOptionalNotes(anchor) ? answer.Documentation : undefined));
                             }
                         }
+                        case 25:
+                        case 32: {
+                            const canonicalAnswer: string = Helpers_canonicalizeFieldKey(answer.Value);
+                            const scoreOpt: Option<int64> = map<CoreMRChoiceAnchor, int64>((c_1: CoreMRChoiceAnchor): int64 => c_1.Score, tryFind<CoreMRChoiceAnchor>((c: CoreMRChoiceAnchor): boolean => exists<Shared_FieldOption>((opt: Shared_FieldOption): boolean => {
+                                if (getFieldOptionKeyGuid(opt.OptionKey) === getFieldOptionKeyGuid(c.FieldOptionKey)) {
+                                    return Helpers_canonicalizeFieldKey(opt.Value) === canonicalAnswer;
+                                }
+                                else {
+                                    return false;
+                                }
+                            }, options), anchor.Choices));
+                            if (scoreOpt == null) {
+                                throw new Error(`🚨 No matching choice found for ItemTypeId ${anchor.ItemTypeId} field ${anchor.FieldKey} answer '${answer.Value}'`);
+                            }
+                            else {
+                                return singleton(new CoreMRAnswer(anchor.Sequence, value_3(scoreOpt), supportsOptionalNotes(anchor) ? answer.Documentation : undefined));
+                            }
+                        }
                         case 30:
                         case 31: {
                             const valStr: string = canonicalizeForYesNo(answer.Value);
@@ -459,14 +461,14 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                     return empty<CoreMRAnswer>();
                 case 20:
                 case 21:
-                case 25:
-                case 32:
-                    return empty<CoreMRAnswer>();
                 case 26:
                 case 40:
                 case 41:
                 case 143:
                     return empty<CoreMRAnswer>();
+                case 25:
+                case 32:
+                    return empty<CoreMRAnswer>();
                 case 30:
                 case 31:
                     return singleton(new CoreMRAnswer(anchor.Sequence, 2n, undefined));

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

@@ -3,11 +3,12 @@ import { numberHash, comparePrimitives, IComparable, IEquatable } from "@fable-o
 import { class_type, list_type, option_type, int64_type, int32_type, record_type, bool_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { getElementTypeInfo, ElementTypeInfo } from "./CorEMRElementTypeMap.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { ofList, FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
-import { map, defaultArg, Option, value as value_2 } from "@fable-org/fable-library-js/Option.js";
+import { empty as empty_1, ofList, FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
+import { map, defaultArg, Option, value as value_3 } from "@fable-org/fable-library-js/Option.js";
 import { int64 } from "@fable-org/fable-library-js/BigInt.js";
 import { Spec_FormClassification_General, Spec_FormStep$1, Spec_FormField$1, Spec_MultiChoiceInfo, Spec_SingleChoiceInfo, Shared_FieldOption, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FieldType_$union, Spec_FormSpec$1, Spec_FormClassification_$reflection, Spec_FormClassification_$union, Shared_FieldKey_$reflection, Shared_FieldKey, Shared_MatrixItemKey_$reflection, Shared_MatrixItemKey, Shared_FieldOptionKey_$reflection, Shared_FieldOptionKey } from "../../../FormSpec.js";
 import { tryFind as tryFind_1, choose, item as item_1, length, mapIndexed, sortBy, empty, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { ItemTrigger_$reflection, ItemTrigger } from "../../CorEMR/TemplateManifestDecoder.js";
 import { CoreMRFormData, CoreMRItem, CoreMRChoice, CoreMRTag_$reflection, CoreMRTrigger_$reflection, CoreMRTag, CoreMRTrigger } from "../../CorEMR/CoreMRTypes.js";
 import { List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
 import { detectHeadings, groupItemsByHeadings, Section, HeadingItem } from "./CorEMRSectioning.js";
@@ -48,12 +49,12 @@ function getValueEncodingWithOverride(elementTypes: Option<FSharpMap<int32, Elem
         return getValueEncoding(itemTypeId);
     }
     else {
-        const matchValue: Option<ElementTypeInfo> = tryFind<int32, ElementTypeInfo>(itemTypeId, value_2(elementTypes));
+        const matchValue: Option<ElementTypeInfo> = tryFind<int32, ElementTypeInfo>(itemTypeId, value_3(elementTypes));
         if (matchValue == null) {
             return getValueEncoding(itemTypeId);
         }
         else {
-            return toValueEncodingInfo(value_2(matchValue));
+            return toValueEncodingInfo(value_3(matchValue));
         }
     }
 }
@@ -113,7 +114,8 @@ export class CoreMRFieldAnchor extends Record implements IEquatable<CoreMRFieldA
     readonly Choices: FSharpList<CoreMRChoiceAnchor>;
     readonly FieldKey: Shared_FieldKey;
     readonly MatrixItemAnchors: FSharpList<CoreMRMatrixItemAnchor>;
-    constructor(ItemId: int32, ItemTypeId: int32, Sequence: int32, NestingLevel: int32, Label: string, IsRequired: boolean, SequenceText: Option<string>, Code: Option<string>, Uuid: Option<string>, GenderRequired: Option<string>, Encoding: ValueEncodingInfo, Choices: FSharpList<CoreMRChoiceAnchor>, FieldKey: Shared_FieldKey, MatrixItemAnchors: FSharpList<CoreMRMatrixItemAnchor>) {
+    readonly Triggers: FSharpList<ItemTrigger>;
+    constructor(ItemId: int32, ItemTypeId: int32, Sequence: int32, NestingLevel: int32, Label: string, IsRequired: boolean, SequenceText: Option<string>, Code: Option<string>, Uuid: Option<string>, GenderRequired: Option<string>, Encoding: ValueEncodingInfo, Choices: FSharpList<CoreMRChoiceAnchor>, FieldKey: Shared_FieldKey, MatrixItemAnchors: FSharpList<CoreMRMatrixItemAnchor>, Triggers: FSharpList<ItemTrigger>) {
         super();
         this.ItemId = (ItemId | 0);
         this.ItemTypeId = (ItemTypeId | 0);
@@ -129,11 +131,12 @@ export class CoreMRFieldAnchor extends Record implements IEquatable<CoreMRFieldA
         this.Choices = Choices;
         this.FieldKey = FieldKey;
         this.MatrixItemAnchors = MatrixItemAnchors;
+        this.Triggers = Triggers;
     }
 }
 
 export function CoreMRFieldAnchor_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CoreMRSourceMap.CoreMRFieldAnchor", [], CoreMRFieldAnchor, () => [["ItemId", int32_type], ["ItemTypeId", int32_type], ["Sequence", int32_type], ["NestingLevel", int32_type], ["Label", string_type], ["IsRequired", bool_type], ["SequenceText", option_type(string_type)], ["Code", option_type(string_type)], ["Uuid", option_type(string_type)], ["GenderRequired", option_type(string_type)], ["Encoding", ValueEncodingInfo_$reflection()], ["Choices", list_type(CoreMRChoiceAnchor_$reflection())], ["FieldKey", Shared_FieldKey_$reflection()], ["MatrixItemAnchors", list_type(CoreMRMatrixItemAnchor_$reflection())]]);
+    return record_type("FormSpec.Integrations.CorEMR.CoreMRSourceMap.CoreMRFieldAnchor", [], CoreMRFieldAnchor, () => [["ItemId", int32_type], ["ItemTypeId", int32_type], ["Sequence", int32_type], ["NestingLevel", int32_type], ["Label", string_type], ["IsRequired", bool_type], ["SequenceText", option_type(string_type)], ["Code", option_type(string_type)], ["Uuid", option_type(string_type)], ["GenderRequired", option_type(string_type)], ["Encoding", ValueEncodingInfo_$reflection()], ["Choices", list_type(CoreMRChoiceAnchor_$reflection())], ["FieldKey", Shared_FieldKey_$reflection()], ["MatrixItemAnchors", list_type(CoreMRMatrixItemAnchor_$reflection())], ["Triggers", list_type(ItemTrigger_$reflection())]]);
 }
 
 export class CoreMRStepAnchor extends Record implements IEquatable<CoreMRStepAnchor>, IComparable<CoreMRStepAnchor> {
@@ -307,7 +310,7 @@ export function buildFieldAnchor(elementTypes: Option<FSharpMap<int32, ElementTy
         Compare: comparePrimitives,
     });
     const fieldOptions: FSharpList<Shared_FieldOption> = getFieldOptions(field);
-    return new CoreMRFieldAnchor(item.ItemId, item.ItemTypeId, item.Sequence, item.NestingLevel, item.Label, item.IsRequired, item.SequenceText, item.Code, item.Uuid, item.GenderRequired, encoding, mapIndexed<CoreMRChoice, CoreMRChoiceAnchor>((i: int32, choice: CoreMRChoice): CoreMRChoiceAnchor => (new CoreMRChoiceAnchor(choice.ChoiceId, choice.Sequence, choice.Text, choice.Score, choice.BitPosition, choice.Code, (i < length(fieldOptions)) ? item_1(i, fieldOptions).OptionKey : (new Shared_FieldOptionKey("00000000-0000-0000-0000-000000000000")))), sortedChoices), field.FieldKey, empty<CoreMRMatrixItemAnchor>());
+    return new CoreMRFieldAnchor(item.ItemId, item.ItemTypeId, item.Sequence, item.NestingLevel, item.Label, item.IsRequired, item.SequenceText, item.Code, item.Uuid, item.GenderRequired, encoding, mapIndexed<CoreMRChoice, CoreMRChoiceAnchor>((i: int32, choice: CoreMRChoice): CoreMRChoiceAnchor => (new CoreMRChoiceAnchor(choice.ChoiceId, choice.Sequence, choice.Text, choice.Score, choice.BitPosition, choice.Code, (i < length(fieldOptions)) ? item_1(i, fieldOptions).OptionKey : (new Shared_FieldOptionKey("00000000-0000-0000-0000-000000000000")))), sortedChoices), field.FieldKey, empty<CoreMRMatrixItemAnchor>(), empty<ItemTrigger>());
 }
 
 export class ListMetadata extends Record implements IEquatable<ListMetadata>, IComparable<ListMetadata> {
@@ -335,7 +338,7 @@ export function ListMetadata_$reflection(): TypeInfo {
  * When listMetadata is Some (from FormListItem during import), IsScored and EncounterTypes are populated.
  * When elementTypes is Some (from bridge templates endpoint), use it for ValueEncoding; else fallback to CorEMRElementTypeMap.
  */
-export function buildSourceMap(elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>, formData: CoreMRFormData, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, listMetadata: Option<ListMetadata>): CoreMRSourceMap {
+export function buildSourceMap(elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>, triggersByItemId: FSharpMap<int32, FSharpList<ItemTrigger>>, formData: CoreMRFormData, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>, listMetadata: Option<ListMetadata>): CoreMRSourceMap {
     const formCode: string = defaultArg(formSpec.Code, `CORE-${formData.Metadata.FormId}`);
     const choicesByItem: FSharpMap<int32, FSharpList<CoreMRChoice>> = ofList<int32, FSharpList<CoreMRChoice>>(List_groupBy<CoreMRChoice, int32>((c: CoreMRChoice): int32 => c.ItemId, formData.Choices, {
         Equals: (x: int32, y: int32): boolean => (x === y),
@@ -348,13 +351,14 @@ export function buildSourceMap(elementTypes: Option<FSharpMap<int32, ElementType
         stepOrder = ((stepOrder + 1) | 0);
         const formStep: Option<Spec_FormStep$1<Spec_FieldType_$union>> = tryFind_1<Spec_FormStep$1<Spec_FieldType_$union>>((s: Spec_FormStep$1<Spec_FieldType_$union>): boolean => (s.StepOrder === stepOrder), formSpec.Steps);
         if (formStep != null) {
-            const step: Spec_FormStep$1<Spec_FieldType_$union> = value_2(formStep);
+            const step: Spec_FormStep$1<Spec_FieldType_$union> = value_3(formStep);
             if (length(section.Items) !== length(step.Fields)) {
                 throw new Error(`CoreMR section mismatch: step ${stepOrder} has ${length(section.Items)} section items but ${length(step.Fields)} fields. Lengths must match.`);
             }
             const fieldAnchors: FSharpList<CoreMRFieldAnchor> = mapIndexed<CoreMRItem, CoreMRFieldAnchor>((i: int32, item: CoreMRItem): CoreMRFieldAnchor => {
                 const field: Spec_FormField$1<Spec_FieldType_$union> = item_1(i, step.Fields);
-                return buildFieldAnchor(elementTypes, item, defaultArg(tryFind<int32, FSharpList<CoreMRChoice>>(item.ItemId, choicesByItem), empty<CoreMRChoice>()), field);
+                const anchor: CoreMRFieldAnchor = buildFieldAnchor(elementTypes, item, defaultArg(tryFind<int32, FSharpList<CoreMRChoice>>(item.ItemId, choicesByItem), empty<CoreMRChoice>()), field);
+                return new CoreMRFieldAnchor(anchor.ItemId, anchor.ItemTypeId, anchor.Sequence, anchor.NestingLevel, anchor.Label, anchor.IsRequired, anchor.SequenceText, anchor.Code, anchor.Uuid, anchor.GenderRequired, anchor.Encoding, anchor.Choices, anchor.FieldKey, anchor.MatrixItemAnchors, defaultArg(tryFind<int32, FSharpList<ItemTrigger>>(item.ItemId, triggersByItemId), empty<ItemTrigger>()));
             }, section.Items);
             const headingItemId: Option<int32> = map<HeadingItem, int32>((h: HeadingItem): int32 => h.ItemId, section.Heading);
             return new CoreMRStepMap(stepOrder, new CoreMRStepAnchor(headingItemId, section.HeadingSequence, section.HeadingLabel), fieldAnchors);
@@ -372,9 +376,9 @@ export function buildSourceMap(elementTypes: Option<FSharpMap<int32, ElementType
  * When listMetadata is Some (from FormListItem during import), IsScored and EncounterTypes are populated in the SourceMap.
  * When elementTypes is Some (from bridge templates endpoint), use it for ValueEncoding; else fallback to CorEMRElementTypeMap.
  */
-export function convertWithMap(formData: CoreMRFormData, listMetadata: Option<ListMetadata>, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>): CoreMRConversionResult {
+export function convertWithMap(formData: CoreMRFormData, listMetadata: Option<ListMetadata>, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>, triggersByItemId: FSharpMap<int32, FSharpList<ItemTrigger>>): CoreMRConversionResult {
     const formSpec: Spec_FormSpec$1<Spec_FieldType_$union> = convertToFormSpec(formData);
-    return new CoreMRConversionResult(formSpec, buildSourceMap(elementTypes, formData, formSpec, listMetadata));
+    return new CoreMRConversionResult(formSpec, buildSourceMap(elementTypes, triggersByItemId, formData, formSpec, listMetadata));
 }
 
 /**
@@ -383,7 +387,9 @@ export function convertWithMap(formData: CoreMRFormData, listMetadata: Option<Li
  * When elementTypes is Some (from bridge templates endpoint), use it for ValueEncoding; else fallback to CorEMRElementTypeMap.
  */
 export function convertWithMapAndProvenance(formData: CoreMRFormData, listMetadata: Option<ListMetadata>, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>): Spec_FormSpec$1<Spec_FieldType_$union> {
-    const result: CoreMRConversionResult = convertWithMap(formData, listMetadata, elementTypes);
+    const result: CoreMRConversionResult = convertWithMap(formData, listMetadata, elementTypes, empty_1<int32, FSharpList<ItemTrigger>>({
+        Compare: comparePrimitives,
+    }));
     const bind$0040: Spec_FormSpec$1<Spec_FieldType_$union> = result.FormSpec;
     return new Spec_FormSpec$1(bind$0040.Id, bind$0040.Code, bind$0040.Title, bind$0040.Abstract, bind$0040.Version, bind$0040.FormSpecVersion, bind$0040.Steps, bind$0040.CategoryTags, bind$0040.Score, bind$0040.AssociatedCodes, bind$0040.RequiresReview, bind$0040.RequiresReviewAndApproval, bind$0040.ClinicalPathway, bind$0040.Lifecycle, bind$0040.FilledMeta, bind$0040.CustomData, new IntegrationProvenance("coremr", toString(0, Auto_generateBoxedEncoder_437914C6(CoreMRSourceMap_$reflection(), undefined, undefined, undefined)(result.SourceMap))), result.SourceMap.Classification);
 }