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

package/src/FormSpec.FS/FormSpecValues.ts

@@ -113,30 +113,7 @@ export function updateField<FieldType>(spec: Spec_FormSpec$1<FieldType>, fieldKe
         if (i_1 === stepIndex) {
             return new Spec_FormStep$1(step.StepOrder, step.StepLabel, map<Spec_FormField$1<FieldType>, Spec_FormField$1<FieldType>>((f: Spec_FormField$1<FieldType>): Spec_FormField$1<FieldType> => {
                 if (equals(f.FieldKey, fieldKey)) {
-                    return new Spec_FormField$1(f.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.Documentation, f.FieldType, newValue);
-                }
-                else {
-                    return f;
-                }
-            }, step.Fields));
-        }
-        else {
-            return step;
-        }
-    }, spec.Steps), spec.CategoryTags, spec.Score, spec.AssociatedCodes, spec.RequiresReview, spec.RequiresReviewAndApproval, spec.ClinicalPathway, spec.Lifecycle, spec.FilledMeta, spec.CustomData, spec.Provenance, spec.Classification);
-}
-
-/**
- * Update a single field's Documentation. Returns new FormSpec.
- * If stepIndex is None, searches for the field across all steps.
- */
-export function updateFieldDocumentation<FieldType>(spec: Spec_FormSpec$1<FieldType>, fieldKey: Shared_FieldKey, newDoc: Option<string>, stepIndexOpt: Option<int32>): Spec_FormSpec$1<FieldType> {
-    const stepIndex: int32 = ((stepIndexOpt == null) ? defaultArg(findStepIndexForField<FieldType>(spec, fieldKey), 0) : value_1(stepIndexOpt)) | 0;
-    return new Spec_FormSpec$1(spec.Id, spec.Code, spec.Title, spec.Abstract, spec.Version, spec.FormSpecVersion, mapIndexed<Spec_FormStep$1<FieldType>, Spec_FormStep$1<FieldType>>((i_1: int32, step: Spec_FormStep$1<FieldType>): Spec_FormStep$1<FieldType> => {
-        if (i_1 === stepIndex) {
-            return new Spec_FormStep$1(step.StepOrder, step.StepLabel, map<Spec_FormField$1<FieldType>, Spec_FormField$1<FieldType>>((f: Spec_FormField$1<FieldType>): Spec_FormField$1<FieldType> => {
-                if (equals(f.FieldKey, fieldKey)) {
-                    return new Spec_FormField$1(f.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, newDoc, f.FieldType, f.Value);
+                    return new Spec_FormField$1(f.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.FieldType, newValue);
                 }
                 else {
                     return f;
@@ -155,7 +132,7 @@ export function updateFieldDocumentation<FieldType>(spec: Spec_FormSpec$1<FieldT
  */
 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, "")) : value_1(matchValue)), field.FieldType, optionsFromField(field));
+    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));
 }
 
 /**

package/src/FormSpec.FS/Helpers.ts

@@ -451,7 +451,7 @@ export function Helpers_FormSpecMutators_addFormFieldToStep<UserField>(formStep:
 export function Helpers_FormSpecMutators_removeFormFieldFromFormSpec<UserField>(formStepOrder: int32, formField: Spec_FormField$1<UserField>, formSpec: Spec_FormSpec$1<UserField>): Spec_FormSpec$1<UserField> {
     return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, map_1<Spec_FormStep$1<UserField>, Spec_FormStep$1<UserField>>((s: Spec_FormStep$1<UserField>): Spec_FormStep$1<UserField> => {
         if (s.StepOrder === formStepOrder) {
-            return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((i: int32, f_1: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(i + 1, f_1.FieldKey, f_1.Label, f_1.Notes, f_1.DependsOn, f_1.IsOptional, f_1.IsDeprecated, f_1.NeedsDocumentation, f_1.Documentation, f_1.FieldType, f_1.Value)), filter<Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): boolean => (f.FieldOrder !== formField.FieldOrder), s.Fields)));
+            return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((i: int32, f_1: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(i + 1, f_1.FieldKey, f_1.Label, f_1.Notes, f_1.DependsOn, f_1.IsOptional, f_1.IsDeprecated, f_1.NeedsDocumentation, f_1.FieldType, f_1.Value)), filter<Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): boolean => (f.FieldOrder !== formField.FieldOrder), s.Fields)));
         }
         else {
             return s;
@@ -463,7 +463,7 @@ export function Helpers_FormSpecMutators_removeFormFieldFromFormSpec<UserField>(
  * Inserts a form field at a specific position within a step.
  */
 export function Helpers_FormSpecMutators_insertFormFieldToStepAt<UserField>(formStep: Spec_FormStep$1<UserField>, newPositionFieldOrder: int32, fieldKey: Shared_FieldKey): FSharpList<Spec_FormField$1<UserField>> {
-    return mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index_1: int32, f_1: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index_1 + 1, f_1.FieldKey, f_1.Label, f_1.Notes, f_1.DependsOn, f_1.IsOptional, f_1.IsDeprecated, f_1.NeedsDocumentation, f_1.Documentation, f_1.FieldType, f_1.Value)), insertAt<Spec_FormField$1<UserField>>(newPositionFieldOrder - 1, find<Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): boolean => equals(f.FieldKey, fieldKey), formStep.Fields), formStep.Fields));
+    return mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index_1: int32, f_1: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index_1 + 1, f_1.FieldKey, f_1.Label, f_1.Notes, f_1.DependsOn, f_1.IsOptional, f_1.IsDeprecated, f_1.NeedsDocumentation, f_1.FieldType, f_1.Value)), insertAt<Spec_FormField$1<UserField>>(newPositionFieldOrder - 1, find<Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): boolean => equals(f.FieldKey, fieldKey), formStep.Fields), formStep.Fields));
 }
 
 /**
@@ -472,12 +472,12 @@ export function Helpers_FormSpecMutators_insertFormFieldToStepAt<UserField>(form
 export function Helpers_FormSpecMutators_moveFormFieldUpInFormSpec<UserField>(formStepOrder: int32, formField: Spec_FormField$1<UserField>, formSpec: Spec_FormSpec$1<UserField>): Spec_FormSpec$1<UserField> {
     return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, map_1<Spec_FormStep$1<UserField>, Spec_FormStep$1<UserField>>((s: Spec_FormStep$1<UserField>): Spec_FormStep$1<UserField> => {
         if (s.StepOrder === formStepOrder) {
-            return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index: int32, f_2: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index + 1, f_2.FieldKey, f_2.Label, f_2.Notes, f_2.DependsOn, f_2.IsOptional, f_2.IsDeprecated, f_2.NeedsDocumentation, f_2.Documentation, f_2.FieldType, f_2.Value)), sortBy<Spec_FormField$1<UserField>, int32>((f_1: Spec_FormField$1<UserField>): int32 => f_1.FieldOrder, map_1<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => {
+            return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index: int32, f_2: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index + 1, f_2.FieldKey, f_2.Label, f_2.Notes, f_2.DependsOn, f_2.IsOptional, f_2.IsDeprecated, f_2.NeedsDocumentation, f_2.FieldType, f_2.Value)), sortBy<Spec_FormField$1<UserField>, int32>((f_1: Spec_FormField$1<UserField>): int32 => f_1.FieldOrder, map_1<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => {
                 if (f.FieldOrder === formField.FieldOrder) {
-                    return new Spec_FormField$1(formField.FieldOrder - 1, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.Documentation, f.FieldType, f.Value);
+                    return new Spec_FormField$1(formField.FieldOrder - 1, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.FieldType, f.Value);
                 }
                 else if (f.FieldOrder === (formField.FieldOrder - 1)) {
-                    return new Spec_FormField$1(formField.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.Documentation, f.FieldType, f.Value);
+                    return new Spec_FormField$1(formField.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.FieldType, f.Value);
                 }
                 else {
                     return f;
@@ -498,12 +498,12 @@ export function Helpers_FormSpecMutators_moveFormFieldUpInFormSpec<UserField>(fo
 export function Helpers_FormSpecMutators_moveFormFieldDownInFormSpec<UserField>(formStepOrder: int32, formField: Spec_FormField$1<UserField>, formSpec: Spec_FormSpec$1<UserField>): Spec_FormSpec$1<UserField> {
     return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, map_1<Spec_FormStep$1<UserField>, Spec_FormStep$1<UserField>>((s: Spec_FormStep$1<UserField>): Spec_FormStep$1<UserField> => {
         if (s.StepOrder === formStepOrder) {
-            return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index: int32, f_2: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index + 1, f_2.FieldKey, f_2.Label, f_2.Notes, f_2.DependsOn, f_2.IsOptional, f_2.IsDeprecated, f_2.NeedsDocumentation, f_2.Documentation, f_2.FieldType, f_2.Value)), sortBy<Spec_FormField$1<UserField>, int32>((f_1: Spec_FormField$1<UserField>): int32 => f_1.FieldOrder, map_1<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => {
+            return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index: int32, f_2: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index + 1, f_2.FieldKey, f_2.Label, f_2.Notes, f_2.DependsOn, f_2.IsOptional, f_2.IsDeprecated, f_2.NeedsDocumentation, f_2.FieldType, f_2.Value)), sortBy<Spec_FormField$1<UserField>, int32>((f_1: Spec_FormField$1<UserField>): int32 => f_1.FieldOrder, map_1<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => {
                 if (f.FieldOrder === formField.FieldOrder) {
-                    return new Spec_FormField$1(formField.FieldOrder + 1, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.Documentation, f.FieldType, f.Value);
+                    return new Spec_FormField$1(formField.FieldOrder + 1, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.FieldType, f.Value);
                 }
                 else if (f.FieldOrder === (formField.FieldOrder + 1)) {
-                    return new Spec_FormField$1(formField.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.Documentation, f.FieldType, f.Value);
+                    return new Spec_FormField$1(formField.FieldOrder, f.FieldKey, f.Label, f.Notes, f.DependsOn, f.IsOptional, f.IsDeprecated, f.NeedsDocumentation, f.FieldType, f.Value);
                 }
                 else {
                     return f;
@@ -527,7 +527,7 @@ export function Helpers_FormSpecMutators_moveFieldByKeyToPositionInFormStepSpec<
         const formStep_1: Spec_FormStep$1<UserField> = value_1(formStep);
         return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, map_1<Spec_FormStep$1<UserField>, Spec_FormStep$1<UserField>>((s: Spec_FormStep$1<UserField>): Spec_FormStep$1<UserField> => {
             if (s.StepOrder === formStep_1.StepOrder) {
-                return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index_1: int32, f_1: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index_1 + 1, f_1.FieldKey, f_1.Label, f_1.Notes, f_1.DependsOn, f_1.IsOptional, f_1.IsDeprecated, f_1.NeedsDocumentation, f_1.Documentation, f_1.FieldType, f_1.Value)), List_distinct<Spec_FormField$1<UserField>>(insertAt<Spec_FormField$1<UserField>>(newPositionFieldOrder - 1, find<Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): boolean => equals(f.FieldKey, fieldKey), s.Fields), s.Fields), {
+                return new Spec_FormStep$1(s.StepOrder, s.StepLabel, mapIndexed<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((index_1: int32, f_1: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1(index_1 + 1, f_1.FieldKey, f_1.Label, f_1.Notes, f_1.DependsOn, f_1.IsOptional, f_1.IsDeprecated, f_1.NeedsDocumentation, f_1.FieldType, f_1.Value)), List_distinct<Spec_FormField$1<UserField>>(insertAt<Spec_FormField$1<UserField>>(newPositionFieldOrder - 1, find<Spec_FormField$1<UserField>>((f: Spec_FormField$1<UserField>): boolean => equals(f.FieldKey, fieldKey), s.Fields), s.Fields), {
                     Equals: equals,
                     GetHashCode: safeHash,
                 })));
@@ -599,7 +599,7 @@ export function Helpers_FormSpecTransformers_flattenSpecSteps<UserField>(formSpe
             if (!isEmpty(steps)) {
                 const step: Spec_FormStep$1<UserField> = head(steps);
                 steps_mut = tail(steps);
-                acc_mut = append(acc, map_1<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((field: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1((step.StepOrder * 1000) + field.FieldOrder, field.FieldKey, field.Label, field.Notes, field.DependsOn, field.IsOptional, field.IsDeprecated, field.NeedsDocumentation, field.Documentation, field.FieldType, field.Value)), step.Fields));
+                acc_mut = append(acc, map_1<Spec_FormField$1<UserField>, Spec_FormField$1<UserField>>((field: Spec_FormField$1<UserField>): Spec_FormField$1<UserField> => (new Spec_FormField$1((step.StepOrder * 1000) + field.FieldOrder, field.FieldKey, field.Label, field.Notes, field.DependsOn, field.IsOptional, field.IsDeprecated, field.NeedsDocumentation, field.FieldType, field.Value)), step.Fields));
                 continue flatten;
             }
             else {
@@ -711,7 +711,7 @@ 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))), specField.FieldType, Helpers_specFieldOptionsToValueOptions(fieldOptions));
+    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));
     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);
@@ -727,7 +727,7 @@ export function Helpers_updateManyFunc(formatter: ((arg0: string) => string), sp
     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 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);
+        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)));

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

@@ -2,18 +2,21 @@ import { Record } from "@fable-org/fable-library-js/Types.js";
 import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { record_type, bool_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { replace } from "@fable-org/fable-library-js/String.js";
 
 export class ElementTypeInfo extends Record implements IEquatable<ElementTypeInfo>, IComparable<ElementTypeInfo> {
     readonly Code: string;
+    readonly Label: string;
     readonly ValueEncoding: string;
     readonly TextFieldRole: string;
     readonly IsPlusNotes: boolean;
     readonly IsScaffold: boolean;
     readonly IsSkip: boolean;
     readonly IsNeedsDocumentation: boolean;
-    constructor(Code: string, ValueEncoding: string, TextFieldRole: string, IsPlusNotes: boolean, IsScaffold: boolean, IsSkip: boolean, IsNeedsDocumentation: boolean) {
+    constructor(Code: string, Label: string, ValueEncoding: string, TextFieldRole: string, IsPlusNotes: boolean, IsScaffold: boolean, IsSkip: boolean, IsNeedsDocumentation: boolean) {
         super();
         this.Code = Code;
+        this.Label = Label;
         this.ValueEncoding = ValueEncoding;
         this.TextFieldRole = TextFieldRole;
         this.IsPlusNotes = IsPlusNotes;
@@ -24,67 +27,67 @@ export class ElementTypeInfo extends Record implements IEquatable<ElementTypeInf
 }
 
 export function ElementTypeInfo_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CorEMRElementTypeMap.ElementTypeInfo", [], ElementTypeInfo, () => [["Code", string_type], ["ValueEncoding", string_type], ["TextFieldRole", string_type], ["IsPlusNotes", bool_type], ["IsScaffold", bool_type], ["IsSkip", bool_type], ["IsNeedsDocumentation", bool_type]]);
+    return record_type("FormSpec.Integrations.CorEMR.CorEMRElementTypeMap.ElementTypeInfo", [], ElementTypeInfo, () => [["Code", string_type], ["Label", string_type], ["ValueEncoding", string_type], ["TextFieldRole", string_type], ["IsPlusNotes", bool_type], ["IsScaffold", bool_type], ["IsSkip", bool_type], ["IsNeedsDocumentation", bool_type]]);
 }
 
 export function getElementTypeInfo(itemTypeId: int32): ElementTypeInfo {
     switch (itemTypeId) {
         case 1:
-            return new ElementTypeInfo("text", "zero", "content", false, false, false, false);
+            return new ElementTypeInfo("text", "Text", "zero", "content", false, false, false, false);
         case 2:
-            return new ElementTypeInfo("text_multiline", "zero", "content", false, false, false, false);
+            return new ElementTypeInfo("text_multiline", "Text Multiline", "zero", "content", false, false, false, false);
         case 20:
-            return new ElementTypeInfo("dropdown", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("dropdown", "Multiple Choice", "choice_score", "ignored", false, false, false, false);
         case 21:
-            return new ElementTypeInfo("dropdown_notes", "choice_score", "optional_notes", true, false, false, true);
+            return new ElementTypeInfo("dropdown_notes", "Multiple Choice with Notes", "choice_score", "optional_notes", true, false, false, true);
         case 25:
-            return new ElementTypeInfo("dropdown_notes_ui", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("dropdown_notes_ui", "Multiple Choice with Notes UI", "choice_score", "ignored", false, false, false, false);
         case 26:
-            return new ElementTypeInfo("chips_notes", "choice_score", "optional_notes", true, false, false, true);
+            return new ElementTypeInfo("chips_notes", "Chips with Notes", "choice_score", "optional_notes", true, false, false, true);
         case 30:
-            return new ElementTypeInfo("yes_no_text", "1_yes_2_no", "optional_notes", false, false, false, false);
+            return new ElementTypeInfo("yes_no_text", "Yes/No with Text", "1_yes_2_no", "optional_notes", false, false, false, false);
         case 31:
-            return new ElementTypeInfo("yes_no_notes", "1_yes_2_no", "optional_notes", true, false, false, true);
+            return new ElementTypeInfo("yes_no_notes", "Yes/No with Notes", "1_yes_2_no", "optional_notes", true, false, false, true);
         case 32:
-            return new ElementTypeInfo("exam_3choice", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("exam_3choice", "Exam 3-Choice", "choice_score", "ignored", false, false, false, false);
         case 40:
-            return new ElementTypeInfo("checkbox", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("checkbox", "Checkboxes", "choice_score", "ignored", false, false, false, false);
         case 41:
-            return new ElementTypeInfo("checkbox_notes", "choice_score", "optional_notes", true, false, false, true);
+            return new ElementTypeInfo("checkbox_notes", "Checkboxes with Notes", "choice_score", "optional_notes", true, false, false, true);
         case 50:
-            return new ElementTypeInfo("date", "zero", "iso_date", false, false, false, false);
+            return new ElementTypeInfo("date", "Date", "zero", "iso_date", false, false, false, false);
         case 51:
-            return new ElementTypeInfo("signature_date", "zero", "content", false, false, false, false);
+            return new ElementTypeInfo("signature_date", "Signature + Date", "zero", "content", false, false, false, false);
         case 60:
-            return new ElementTypeInfo("datetime", "zero", "iso_date", false, false, false, false);
+            return new ElementTypeInfo("datetime", "DateTime", "zero", "iso_date", false, false, false, false);
         case 61:
-            return new ElementTypeInfo("signature", "skip", "skip", false, false, true, false);
+            return new ElementTypeInfo("signature", "Signature", "skip", "skip", false, false, true, false);
         case 110:
-            return new ElementTypeInfo("heading", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("heading", "Heading", "scaffold", "ignored", false, true, false, false);
         case 120:
-            return new ElementTypeInfo("instructions", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("instructions", "Instructions", "scaffold", "ignored", false, true, false, false);
         case 121:
-            return new ElementTypeInfo("group_row", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("group_row", "Group Row", "scaffold", "ignored", false, true, false, false);
         case 130:
-            return new ElementTypeInfo("vitals_widget", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("vitals_widget", "Vitals Widget", "scaffold", "ignored", false, true, false, false);
         case 131:
-            return new ElementTypeInfo("linked_data", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("linked_data", "Linked Data", "scaffold", "ignored", false, true, false, false);
         case 132:
-            return new ElementTypeInfo("linked_data_rare", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("linked_data_rare", "Linked Data (Rare)", "scaffold", "ignored", false, true, false, false);
         case 133:
-            return new ElementTypeInfo("sub_header", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("sub_header", "Sub Header", "scaffold", "ignored", false, true, false, false);
         case 134:
-            return new ElementTypeInfo("score_display", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("score_display", "Score Display", "scaffold", "ignored", false, true, false, false);
         case 135:
-            return new ElementTypeInfo("score_explanation", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("score_explanation", "Score Explanation", "scaffold", "ignored", false, true, false, false);
         case 138:
-            return new ElementTypeInfo("unknown_138", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("unknown_138", "Unknown (138)", "scaffold", "ignored", false, true, false, false);
         case 140:
-            return new ElementTypeInfo("allergy_autofill", "scaffold", "ignored", false, true, false, false);
+            return new ElementTypeInfo("allergy_autofill", "Allergy Autofill", "scaffold", "ignored", false, true, false, false);
         case 143:
-            return new ElementTypeInfo("chips_ros", "choice_score", "ignored", false, false, false, false);
+            return new ElementTypeInfo("chips_ros", "Chips ROS", "choice_score", "ignored", false, false, false, false);
         default:
-            return new ElementTypeInfo(`unknown_${itemTypeId}`, "unknown", "unknown", false, false, true, false);
+            return new ElementTypeInfo(`unknown_${itemTypeId}`, `Unknown (${itemTypeId})`, "unknown", "unknown", false, false, true, false);
     }
 }
 
@@ -102,11 +105,11 @@ export function hasTextHasDate(itemTypeId: int32): [boolean, boolean] {
 
 /**
  * Convert bridge format (code, valueEncoding, textField) to ElementTypeInfo.
- * Used when elementTypes come from bridge templates endpoint (SSOT).
+ * Label derived from code (bridge doesn't carry CoreMR designer labels).
  */
 export function fromBridgeFormat(code: string, valueEncoding: string, textField: string): ElementTypeInfo {
     const isPlusNotes: boolean = (textField === "optional_notes") && ((valueEncoding === "choice_score") ? true : (valueEncoding === "1_yes_2_no"));
-    return new ElementTypeInfo(code, valueEncoding, textField, isPlusNotes, valueEncoding === "scaffold", (valueEncoding === "skip") ? true : (textField === "skip"), isPlusNotes);
+    return new ElementTypeInfo(code, replace(code, "_", " "), valueEncoding, textField, isPlusNotes, valueEncoding === "scaffold", (valueEncoding === "skip") ? true : (textField === "skip"), isPlusNotes);
 }
 
 //# sourceMappingURL=CorEMRElementTypeMap.ts.map

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

@@ -1,18 +1,15 @@
 import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { Helpers_generateDeterministicGuidRaw, Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
-import { defaultArg, Option, value as value_1 } from "@fable-org/fable-library-js/Option.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 { sort, isEmpty, ofArray, FSharpList, sortBy, map } from "@fable-org/fable-library-js/List.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";
-import { normalizeChoiceScores } from "../../../BitmaskHelpers.js";
-import { compare, int64 } from "@fable-org/fable-library-js/BigInt.js";
+import { Option, defaultArg } from "@fable-org/fable-library-js/Option.js";
 
 function buildNamespacedFieldSeed(formCode: string, stepOrder: int32, item: CoreMRItem): string {
-    let matchValue: Option<string>;
-    return `formspec.${isNullOrWhiteSpace(formCode) ? "unknown" : Helpers_canonicalizeFieldKey(formCode)}:step${stepOrder}.${isNullOrWhiteSpace(item.Label) ? ((matchValue = item.Uuid, (matchValue == null) ? (`item_id_${item.ItemId}`) : (`item_uuid_${value_1(matchValue)}`))) : Helpers_canonicalizeFieldKey(item.Label)}`;
+    return `formspec.${isNullOrWhiteSpace(formCode) ? "unknown" : Helpers_canonicalizeFieldKey(formCode)}:step${stepOrder}.item${item.ItemId}.${isNullOrWhiteSpace(item.Label) ? "_blank_" : Helpers_canonicalizeFieldKey(item.Label)}`;
 }
 
 export function generateNamespacedFieldKey(formCode: string, stepOrder: int32, item: CoreMRItem): Shared_FieldKey {
@@ -72,23 +69,9 @@ export function mapFieldType(item: CoreMRItem, choices: FSharpList<CoreMRChoice>
         case 32:
             return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
         case 40:
-            if (normalizeChoiceScores(sort<int64>(map<CoreMRChoice, int64>((c: CoreMRChoice): int64 => c.Score, choices), {
-                Compare: compare,
-            }))[1]) {
-                return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
-            }
-            else {
-                return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(mappedChoices));
-            }
+            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
         case 41:
-            if (normalizeChoiceScores(sort<int64>(map<CoreMRChoice, int64>((c_1: CoreMRChoice): int64 => c_1.Score, choices), {
-                Compare: compare,
-            }))[1]) {
-                return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
-            }
-            else {
-                return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(mappedChoices));
-            }
+            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
         case 50:
             return Spec_FieldType_Date(new Spec_TextInfo(undefined));
         case 51:
@@ -124,7 +107,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), undefined, fieldType, undefined);
+    return new Spec_FormField$1(item.Sequence, generateNamespacedFieldKey(formCode, stepOrder, item), mainLabel, notesField, undefined, !item.IsRequired, false, isNeedsDocumentationType(item), fieldType, undefined);
 }
 
 //# sourceMappingURL=CorEMRFieldTypeMapper.ts.map

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

@@ -15,7 +15,7 @@ export function createSteps(formCode: string, items: FSharpList<CoreMRItem>, cho
     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.Documentation, field.FieldType, field.Value);
+            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;

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

@@ -13,7 +13,7 @@ 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 { Auto_generateBoxedEncoder_437914C6, toString } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Encode.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";
 import { buildReport } from "./CorEMRSemanticReportBuilder.js";

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

@@ -3,22 +3,23 @@ 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, choose, map as map_1, singleton, empty, tryFind, head, isEmpty, FSharpList, collect, filter } from "@fable-org/fable-library-js/List.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 { 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";
 import { item } from "@fable-org/fable-library-js/Array.js";
-import { Auto_generateBoxedDecoder_Z6670B51, fromString } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Decode.js";
+import { Auto_generateBoxedDecoder_Z6670B51, fromString } from "../../../../Thoth.Json/packages/Thoth.Json/Decode.js";
 import { CoreMRStepMap, CoreMRMatrixItemAnchor, CoreMRChoiceAnchor, CoreMRFieldAnchor, CoreMRSourceMap, CoreMRSourceMap_$reflection } from "./CoreMRSourceMap.js";
 import { FSharpResult$2_Ok, FSharpResult$2_Error, FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
-import { Auto_generateBoxedEncoder_437914C6, toString } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Encode.js";
+import { Auto_generateBoxedEncoder_437914C6, toString } from "../../../../Thoth.Json/packages/Thoth.Json/Encode.js";
 import { CoreMRAnswer, CoreMRFormInsertRequest, CoreMRFormInsertRequest_$reflection } from "./FormSpecToCoreMRInsert.js";
-import { CaseStrategy_CamelCase } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Types.js";
+import { CaseStrategy_CamelCase } from "../../../../Thoth.Json/packages/Thoth.Json/Types.js";
 import { Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
 import { op_LeftShift, op_BitwiseOr, int64, fromInt32, toInt64 } from "@fable-org/fable-library-js/BigInt.js";
 import { toList, FSharpSet } from "@fable-org/fable-library-js/Set.js";
 import { computeBitmask } from "../../../BitmaskHelpers.js";
 import { FSharpMap, ofList, tryFind as tryFind_1 } from "@fable-org/fable-library-js/Map.js";
+import { isMatch } from "@fable-org/fable-library-js/RegExp.js";
 import { Operators_FailurePattern } from "@fable-org/fable-library-js/FSharp.Core.js";
 
 export class ExtractedVitals extends Record implements IEquatable<ExtractedVitals>, IComparable<ExtractedVitals> {
@@ -217,6 +218,10 @@ function supportsTextContent(anchor: CoreMRFieldAnchor): boolean {
     }
 }
 
+function supportsOptionalNotes(anchor: CoreMRFieldAnchor): boolean {
+    return anchor.Encoding.TextFieldRole === "optional_notes";
+}
+
 function getOptionsFromFieldType(ft: Spec_FieldType_$union): FSharpList<Shared_FieldOption> {
     let matchResult: int32, info: Spec_SingleChoiceInfo, info_1: Spec_MultiChoiceInfo;
     switch (ft.tag) {
@@ -302,7 +307,7 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                                 throw new Error(`🚨 ItemTypeId ${anchor.ItemTypeId} multiple choice field ${anchor.FieldKey} has no choices`);
                             }
                             else {
-                                return singleton(new CoreMRAnswer(anchor.Sequence, computeBitmask(choose<string, int32>((key: string): Option<int32> => map<[string, int32], int32>((tuple: [string, int32]): int32 => tuple[1], tryFind<[string, int32]>((tupledArg_1: [string, int32]): boolean => (tupledArg_1[0] === key), choicesWithBitPos_1)), choose<string, string>((valStr_1: string): Option<string> => map<Shared_FieldOption, string>((opt_4: Shared_FieldOption): string => getFieldOptionKeyGuid(opt_4.OptionKey), tryFind<Shared_FieldOption>((opt_3: Shared_FieldOption): boolean => (Helpers_canonicalizeFieldKey(opt_3.Value) === Helpers_canonicalizeFieldKey(valStr_1)), options_1)), map_1<Shared_FieldAnswer, string>((a: Shared_FieldAnswer): string => a.Value, toList<Shared_FieldAnswer>(answers))))), undefined));
+                                return singleton(new CoreMRAnswer(anchor.Sequence, computeBitmask(choose<string, int32>((key: string): Option<int32> => map<[string, int32], int32>((tuple: [string, int32]): int32 => tuple[1], tryFind<[string, int32]>((tupledArg_1: [string, int32]): boolean => (tupledArg_1[0] === key), choicesWithBitPos_1)), choose<string, string>((valStr_1: string): Option<string> => map<Shared_FieldOption, string>((opt_4: Shared_FieldOption): string => getFieldOptionKeyGuid(opt_4.OptionKey), tryFind<Shared_FieldOption>((opt_3: Shared_FieldOption): boolean => (Helpers_canonicalizeFieldKey(opt_3.Value) === Helpers_canonicalizeFieldKey(valStr_1)), options_1)), map_1<Shared_FieldAnswer, string>((a: Shared_FieldAnswer): string => a.Value, toList<Shared_FieldAnswer>(answers))))), supportsOptionalNotes(anchor) ? bind<Shared_FieldAnswer, string>((fa: Shared_FieldAnswer): Option<string> => fa.Documentation, tryHead<Shared_FieldAnswer>(toList<Shared_FieldAnswer>(answers))) : undefined));
                             }
                         }
                         default:
@@ -316,7 +321,8 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                     }
                     else {
                         const options_2: FSharpList<Shared_FieldOption> = getOptionsFromFieldType(field.FieldType);
-                        return choose<CoreMRMatrixItemAnchor, CoreMRAnswer>((rowAnchor: CoreMRMatrixItemAnchor): Option<CoreMRAnswer> => map<string, CoreMRAnswer>((selectedValue_1: string): CoreMRAnswer => (new CoreMRAnswer(rowAnchor.Sequence, defaultArg(getScoreFromOption(options_2, selectedValue_1), 0n), undefined)), tryFind_1<Shared_MatrixItemKey, string>(rowAnchor.MatrixItemKey, matrixAnswer.Values)), anchor.MatrixItemAnchors);
+                        const docForFirst: Option<string> = supportsOptionalNotes(anchor) ? matrixAnswer.Documentation : undefined;
+                        return choose<Option<CoreMRAnswer>, CoreMRAnswer>((x_1: Option<CoreMRAnswer>): Option<CoreMRAnswer> => x_1, mapIndexed<CoreMRMatrixItemAnchor, Option<CoreMRAnswer>>((i: int32, rowAnchor: CoreMRMatrixItemAnchor): Option<CoreMRAnswer> => map<string, CoreMRAnswer>((selectedValue_1: string): CoreMRAnswer => (new CoreMRAnswer(rowAnchor.Sequence, defaultArg(getScoreFromOption(options_2, selectedValue_1), 0n), (i === 0) ? docForFirst : undefined)), tryFind_1<Shared_MatrixItemKey, string>(rowAnchor.MatrixItemKey, matrixAnswer.Values)), anchor.MatrixItemAnchors));
                     }
                 }
                 case /* PluginData */ 3: {
@@ -371,7 +377,7 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                                 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), undefined));
+                                return singleton(new CoreMRAnswer(anchor.Sequence, value_3(scoreOpt), supportsOptionalNotes(anchor) ? answer.Documentation : undefined));
                             }
                         }
                         case 26:
@@ -404,17 +410,26 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                                 if (isEmpty(bitPositions)) {
                                     throw new Error(`🚨 No matching bitmask choice found for ItemTypeId ${anchor.ItemTypeId} field ${anchor.FieldKey} answer '${answer.Value}'`);
                                 }
-                                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), undefined));
+                                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 30:
                         case 31: {
                             const valStr: string = canonicalizeForYesNo(answer.Value);
-                            return singleton(new CoreMRAnswer(anchor.Sequence, (((valStr === "yes") ? true : (valStr === "true")) ? true : (valStr === "1")) ? (1n) : (2n), supportsTextContent(anchor) ? answer.Value : undefined));
+                            return singleton(new CoreMRAnswer(anchor.Sequence, (((valStr === "yes") ? true : (valStr === "true")) ? true : (valStr === "1")) ? (1n) : (2n), supportsOptionalNotes(anchor) ? answer.Documentation : undefined));
                         }
                         case 50:
-                        case 51:
                         case 60:
+                            if (isNullOrWhiteSpace(answer.Value)) {
+                                return empty<CoreMRAnswer>();
+                            }
+                            else {
+                                if (!(isMatch(/^\d{4}-\d{2}-\d{2}$/gu, answer.Value) ? true : isMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2})?$/gu, answer.Value))) {
+                                    throw new Error(`🚨 INVALID DATE FORMAT for ItemTypeId ${anchor.ItemTypeId} field ${anchor.FieldKey}: '${answer.Value}' — expected ISO format (YYYY-MM-DD or YYYY-MM-DDTHH:mm). This is a DATA INTEGRITY violation.`);
+                                }
+                                return singleton(new CoreMRAnswer(anchor.Sequence, 0n, supportsTextContent(anchor) ? answer.Value : undefined));
+                            }
+                        case 51:
                             return singleton(new CoreMRAnswer(anchor.Sequence, 0n, supportsTextContent(anchor) ? answer.Value : undefined));
                         case 61:
                             return empty<CoreMRAnswer>();
@@ -456,9 +471,10 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                 case 31:
                     return singleton(new CoreMRAnswer(anchor.Sequence, 2n, undefined));
                 case 50:
-                case 51:
                 case 60:
                     return empty<CoreMRAnswer>();
+                case 51:
+                    return empty<CoreMRAnswer>();
                 case 61:
                     return empty<CoreMRAnswer>();
                 case 110:

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

@@ -12,7 +12,7 @@ import { CoreMRFormData, CoreMRItem, CoreMRChoice, CoreMRTag_$reflection, CoreMR
 import { List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
 import { detectHeadings, groupItemsByHeadings, Section, HeadingItem } from "./CorEMRSectioning.js";
 import { convertToFormSpec } from "./CorEMRTemplateToFormSpec.js";
-import { Auto_generateBoxedEncoder_437914C6, toString } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Encode.js";
+import { Auto_generateBoxedEncoder_437914C6, toString } from "../../../../Thoth.Json/packages/Thoth.Json/Encode.js";
 import { IntegrationProvenance } from "../../../Provenance.js";
 
 export class ValueEncodingInfo extends Record implements IEquatable<ValueEncodingInfo>, IComparable<ValueEncodingInfo> {

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

@@ -9,10 +9,10 @@ import { defaultArg, toArray, value as value_6, map, bind, Option } from "@fable
 import { map as map_1, choose, mapIndexed, collect, head, tail, isEmpty, ofArray, empty, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
 import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
-import { object, toString } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Encode.js";
-import { keyValuePairs, map as map_2, fromString, IOptionalGetter, list as list_4, IRequiredGetter, IGetters, int, object as object_1, string, fail, succeed, andThen, guid, index, field as field_1, oneOf } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Decode.js";
+import { object, toString } from "../../../../Thoth.Json/packages/Thoth.Json/Encode.js";
+import { keyValuePairs, map as map_2, fromString, IOptionalGetter, list as list_4, IRequiredGetter, IGetters, int, object as object_1, string, fail, succeed, andThen, guid, index, field as field_1, oneOf } from "../../../../Thoth.Json/packages/Thoth.Json/Decode.js";
 import { FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
-import { ErrorReason_$union } from "../../../../libs/Thoth.Json/packages/Thoth.Json/Types.js";
+import { ErrorReason_$union } from "../../../../Thoth.Json/packages/Thoth.Json/Types.js";
 import { tryParse } from "@fable-org/fable-library-js/Guid.js";
 import { IntegrationProvenance } from "../../../Provenance.js";
 

package/src/FormSpec.FS/Integrations/CorEMR/TemplateManifestDecoder.ts

@@ -6,11 +6,11 @@ import { int32ToString, uncurry2, comparePrimitives, IComparable, IEquatable } f
 import { class_type, list_type, bool_type, record_type, option_type, string_type, int64_type, int32_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { filter, length, sumBy as sumBy_1, empty, collect, map as map_2, isEmpty, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { toSeq, ofList, FSharpMap } from "@fable-org/fable-library-js/Map.js";
-import { Auto_generateBoxedDecoder_Z6670B51 } from "../../../libs/Thoth.Json/packages/Thoth.Json/Decode.js";
+import { Auto_generateBoxedDecoder_Z6670B51 } from "../../../Thoth.Json/packages/Thoth.Json/Decode.js";
 import { FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
-import { ErrorReason_$union } from "../../../libs/Thoth.Json/packages/Thoth.Json/Types.js";
+import { ErrorReason_$union } from "../../../Thoth.Json/packages/Thoth.Json/Types.js";
 import { isNullOrEmpty, toConsole, printf, toText } from "@fable-org/fable-library-js/String.js";
-import { fromString, list as list_5, bool, IOptionalGetter, IGetters, string, int, IRequiredGetter, object, map, keyValuePairs } from "../../../libs/Thoth.Json/packages/Thoth.Json/Decode.js";
+import { fromString, list as list_5, bool, IOptionalGetter, IGetters, string, int, IRequiredGetter, object, map, keyValuePairs } from "../../../Thoth.Json/packages/Thoth.Json/Decode.js";
 import { CoreMRFormData, CoreMRTag, CoreMRTrigger, CoreMRFormMetadata, CoreMRItem, CoreMRChoice } from "./CoreMRTypes.js";
 import { sumBy } from "@fable-org/fable-library-js/Seq.js";