@f1studio/form-spec 5.0.0-alpha.163 → 5.0.0-alpha.165

package/src/FormSpec.FS/FormSpecHelpers.ts

@@ -30,7 +30,7 @@ export function buildFormSpecFromResultStepsMap(details: FormSpecMetadata, steps
         })));
     }, sortBy<[Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>], int32>((tupledArg: [Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>]): int32 => tupledArg[0].fields[0], toList<Values_StepOrder, FSharpMap<Shared_FieldKey, FieldDetails$1<Spec_FieldType_$union>>>(stepsMap), {
         Compare: comparePrimitives,
-    })), empty<string>(), details.MaxScore, empty<string>(), false, false, undefined, Spec_FormLifecycle_Draft(newGuid()), undefined, undefined, undefined, Spec_FormClassification_General());
+    })), empty<string>(), details.MaxScore, undefined, empty<string>(), false, false, undefined, Spec_FormLifecycle_Draft(newGuid()), undefined, undefined, undefined, Spec_FormClassification_General());
 }
 
 /**

package/src/FormSpec.FS/FormSpecValues.ts

@@ -123,7 +123,7 @@ export function updateField<FieldType>(spec: Spec_FormSpec$1<FieldType>, fieldKe
         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);
+    }, spec.Steps), spec.CategoryTags, spec.Score, spec.VendorScore, spec.AssociatedCodes, spec.RequiresReview, spec.RequiresReviewAndApproval, spec.ClinicalPathway, spec.Lifecycle, spec.FilledMeta, spec.CustomData, spec.Provenance, spec.Classification);
 }
 
 /**

package/src/FormSpec.FS/Helpers.ts

@@ -413,7 +413,7 @@ export function Helpers_FormSpecMutators_updateFormFieldInFormSpecStep<UserField
         else {
             return s;
         }
-    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -427,7 +427,7 @@ export function Helpers_FormSpecMutators_updateFormStepInFormSpec<UserField>(for
         else {
             return s;
         }
-    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -442,7 +442,7 @@ export function Helpers_FormSpecMutators_addFormFieldToStep<UserField>(formStep:
         else {
             return s;
         }
-    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -456,7 +456,7 @@ export function Helpers_FormSpecMutators_removeFormFieldFromFormSpec<UserField>(
         else {
             return s;
         }
-    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -489,7 +489,7 @@ export function Helpers_FormSpecMutators_moveFormFieldUpInFormSpec<UserField>(fo
         else {
             return s;
         }
-    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -515,7 +515,7 @@ export function Helpers_FormSpecMutators_moveFormFieldDownInFormSpec<UserField>(
         else {
             return s;
         }
-    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -535,7 +535,7 @@ export function Helpers_FormSpecMutators_moveFieldByKeyToPositionInFormStepSpec<
             else {
                 return s;
             }
-        }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+        }, formSpec.Steps), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
     }
     else {
         return formSpec;
@@ -558,7 +558,7 @@ export function Helpers_FormSpecMutators_moveFormStepUpInFormSpec<UserField>(for
         }
     }, formSpec.Steps), {
         Compare: comparePrimitives,
-    })), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    })), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -577,14 +577,14 @@ export function Helpers_FormSpecMutators_moveFormStepDownInFormSpec<UserField>(f
         }
     }, formSpec.Steps), {
         Compare: comparePrimitives,
-    })), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    })), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
  * Removes a form step from a FormSpec.
  */
 export function Helpers_FormSpecMutators_removeFormStepFromFormSpec<UserField>(formStepOrder: int32, 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, mapIndexed<Spec_FormStep$1<UserField>, Spec_FormStep$1<UserField>>((i: int32, s_1: Spec_FormStep$1<UserField>): Spec_FormStep$1<UserField> => (new Spec_FormStep$1(i + 1, s_1.StepLabel, s_1.Fields)), filter<Spec_FormStep$1<UserField>>((s: Spec_FormStep$1<UserField>): boolean => (s.StepOrder !== formStepOrder), formSpec.Steps)), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, mapIndexed<Spec_FormStep$1<UserField>, Spec_FormStep$1<UserField>>((i: int32, s_1: Spec_FormStep$1<UserField>): Spec_FormStep$1<UserField> => (new Spec_FormStep$1(i + 1, s_1.StepLabel, s_1.Fields)), filter<Spec_FormStep$1<UserField>>((s: Spec_FormStep$1<UserField>): boolean => (s.StepOrder !== formStepOrder), formSpec.Steps)), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**
@@ -608,7 +608,7 @@ export function Helpers_FormSpecTransformers_flattenSpecSteps<UserField>(formSpe
             break;
         }
     };
-    return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, singleton(new Spec_FormStep$1(1, "Complete Form", flatten(formSpec.Steps, empty<Spec_FormField$1<UserField>>()))), formSpec.CategoryTags, formSpec.Score, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
+    return new Spec_FormSpec$1(formSpec.Id, formSpec.Code, formSpec.Title, formSpec.Abstract, formSpec.Version, formSpec.FormSpecVersion, singleton(new Spec_FormStep$1(1, "Complete Form", flatten(formSpec.Steps, empty<Spec_FormField$1<UserField>>()))), formSpec.CategoryTags, formSpec.Score, formSpec.VendorScore, formSpec.AssociatedCodes, formSpec.RequiresReview, formSpec.RequiresReviewAndApproval, formSpec.ClinicalPathway, formSpec.Lifecycle, formSpec.FilledMeta, formSpec.CustomData, formSpec.Provenance, formSpec.Classification);
 }
 
 /**

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

@@ -3,40 +3,53 @@ import { exists, length, isEmpty, FSharpList, cons, singleton, empty } from "@fa
 import { FSharpResult$2_$union, FSharpResult$2_Ok, FSharpResult$2_Error } from "@fable-org/fable-library-js/Result.js";
 import { Spec_FieldType_$union, Spec_FormSpec$1 } from "../../../FormSpec.js";
 import { ListMetadata, convertWithMapAndProvenance } from "./CoreMRSourceMap.js";
+import { ImportOrigin } from "../../../Provenance.js";
 import { CoreMRChoice, CoreMRItem, CoreMRFormData } from "../../CorEMR/CoreMRTypes.js";
 import { defaultArg, Option } from "@fable-org/fable-library-js/Option.js";
 import { FSharpMap } from "@fable-org/fable-library-js/Map.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { ElementTypeInfo } from "./CorEMRElementTypeMap.js";
+import { FormSystemAdapter$1, FormMetadata, FormSystemFeatures } from "../FormSystemAdapter.js";
 import { buildReport } from "./CorEMRSemanticReportBuilder.js";
 import { nonHeadingItems } from "./CorEMRSectioning.js";
 import { compare } from "@fable-org/fable-library-js/BigInt.js";
 import { int32ToString } from "@fable-org/fable-library-js/Util.js";
-import { FormSystemAdapter$1, FormSystemFeatures, FormMetadata } from "../FormSystemAdapter.js";
 
 /**
  * Convert with list metadata (IsScored, EncounterTypes) from FormListItem.
  * Use when importing from fetch-coremr-forms where FormListItem is available.
  * When elementTypes is Some (from bridge templates endpoint), use it for ValueEncoding; else fallback to CorEMRElementTypeMap.
+ * ⭐ `origin` is REQUIRED — the tenant and database this import is being made FROM. Without them the
+ * provenance names a product and nothing else, and its ids resolve to no database.
  */
-export function convertWithListMetadata(formData: CoreMRFormData, listMetadata: ListMetadata, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>): FSharpResult$2_$union<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>> {
+export function convertWithListMetadata(origin: ImportOrigin, formData: CoreMRFormData, listMetadata: ListMetadata, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>): FSharpResult$2_$union<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>> {
     let arg: string;
     try {
-        return FSharpResult$2_Ok<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(convertWithMapAndProvenance(formData, listMetadata, elementTypes));
+        return FSharpResult$2_Ok<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(convertWithMapAndProvenance(origin, formData, listMetadata, elementTypes));
     }
     catch (ex: any) {
         return FSharpResult$2_Error<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(cons((arg = ex.message, toText(printf("CorEMR conversion failed: %s"))(arg)), (ex.stack == null) ? empty<string>() : singleton("  Stack: " + ex.stack)));
     }
 }
 
-export const adapter: FormSystemAdapter$1<CoreMRFormData> = new FormSystemAdapter$1("coremr", (template: CoreMRFormData): FSharpResult$2_$union<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>> => {
-    let arg: string;
-    try {
-        return FSharpResult$2_Ok<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(convertWithMapAndProvenance(template, undefined, undefined));
-    }
-    catch (ex: any) {
-        return FSharpResult$2_Error<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(cons((arg = ex.message, toText(printf("CorEMR conversion failed: %s"))(arg)), (ex.stack == null) ? empty<string>() : singleton("  Stack: " + ex.stack)));
-    }
-}, buildReport, (template_2: CoreMRFormData): FSharpResult$2_$union<void, FSharpList<string>> => (isEmpty(template_2.Items) ? FSharpResult$2_Error<void, FSharpList<string>>(singleton("Template has no items")) : (isNullOrWhiteSpace(template_2.Metadata.FormName) ? FSharpResult$2_Error<void, FSharpList<string>>(singleton("Template has no name")) : FSharpResult$2_Ok<void, FSharpList<string>>(undefined))), (template_3: CoreMRFormData): FormMetadata => (new FormMetadata(template_3.Metadata.FormName, defaultArg(template_3.Metadata.Description, ""), length<CoreMRItem>(nonHeadingItems(template_3.Items)), exists<CoreMRChoice>((c: CoreMRChoice): boolean => (compare(c.Score, 0n) > 0), template_3.Choices), !isEmpty(template_3.Triggers), int32ToString(template_3.Metadata.VersionNumber))), new FormSystemFeatures(true, true, true, true, true));
+export const supportedFeatures: FormSystemFeatures = new FormSystemFeatures(true, true, true, true, true);
+
+/**
+ * CorEMR adapter implementation.
+ * ⭐ A FUNCTION OF ITS ORIGIN, not a value. There is no adapter that does not know which tenant and
+ * which database it is importing from — that is what makes a site-less import unrepresentable rather
+ * than merely discouraged.
+ */
+export function adapterFor(origin: ImportOrigin): FormSystemAdapter$1<CoreMRFormData> {
+    return new FormSystemAdapter$1("coremr", (template: CoreMRFormData): FSharpResult$2_$union<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>> => {
+        let arg: string;
+        try {
+            return FSharpResult$2_Ok<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(convertWithMapAndProvenance(origin, template, undefined, undefined));
+        }
+        catch (ex: any) {
+            return FSharpResult$2_Error<Spec_FormSpec$1<Spec_FieldType_$union>, FSharpList<string>>(cons((arg = ex.message, toText(printf("CorEMR conversion failed: %s"))(arg)), (ex.stack == null) ? empty<string>() : singleton("  Stack: " + ex.stack)));
+        }
+    }, buildReport, (template_2: CoreMRFormData): FSharpResult$2_$union<void, FSharpList<string>> => (isEmpty(template_2.Items) ? FSharpResult$2_Error<void, FSharpList<string>>(singleton("Template has no items")) : (isNullOrWhiteSpace(template_2.Metadata.FormName) ? FSharpResult$2_Error<void, FSharpList<string>>(singleton("Template has no name")) : FSharpResult$2_Ok<void, FSharpList<string>>(undefined))), (template_3: CoreMRFormData): FormMetadata => (new FormMetadata(template_3.Metadata.FormName, defaultArg(template_3.Metadata.Description, ""), length<CoreMRItem>(nonHeadingItems(template_3.Items)), exists<CoreMRChoice>((c: CoreMRChoice): boolean => (compare(c.Score, 0n) > 0), template_3.Choices), !isEmpty(template_3.Triggers), int32ToString(template_3.Metadata.VersionNumber))), supportedFeatures);
+}
 
 //# sourceMappingURL=CorEMRAdapter.ts.map

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_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_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";
@@ -45,62 +45,62 @@ export function isNeedsDocumentationType(item: CoreMRItem): boolean {
     return getElementTypeInfo(item.ItemTypeId).IsNeedsDocumentation;
 }
 
+/**
+ * CoreMR item → FormSpec `FieldType`, decided by THE CONTROL THE SITE STATES.
+ * 
+ * ⚖️ RE-KEYED 2026-09-23 (FLIP-9 Part D). This was `match item.ItemTypeId with` over 24 hardcoded
+ * integers — 24 arms producing 11 distinct outcomes, 13 of them byte-identical duplicates — and
+ * `item.ItemTypeName` was never read, so the site's own vocabulary was DECORATIVE. Even at
+ * 5.5.0+9704, which states `form_item_types` in full, a type-61 item still became whatever the
+ * constant said.
+ * 
+ * ⭐ `ItemTypeName` now carries THE CONTROL: stated by the site at 9704 (`form_item_types.php_class`)
+ * and declared by conduit at 10245, which ships no such table. ⇒ **No CoreMR integer appears in this
+ * function.** A second EHR supplies controls and needs no new branch here.
+ * 
+ * 🔴 WHAT THIS FUNCTION DELIBERATELY DOES NOT DECIDE — measured, conduit `audit/260923-1655`:
+ * • whether several options may be chosen — that is the ITEM's own stated `item_choices.score`
+ * (FLIP-8), never the type. A "multi-select" type produces ONE answer row per cell 99.6% of
+ * the time.
+ * • whether it offers options at all — STRUCTURAL: `hasChoices`, below, from the item's own rows.
+ * 21 items of type 20 state none, and 73 of 132 type-140 items state some.
+ */
 export function mapFieldType(item: CoreMRItem, choices: FSharpList<CoreMRChoice>): Spec_FieldType_$union {
     const mappedChoices: FSharpList<Shared_FieldOption> = mapChoices(choices);
     const hasChoices: boolean = !isEmpty(mappedChoices);
-    const matchValue: int32 = item.ItemTypeId | 0;
+    const matchValue: string = item.ItemTypeName;
     switch (matchValue) {
-        case 1:
+        case "ShortAnswer":
             return Spec_FieldType_Text(new Spec_TextInfo(undefined));
-        case 2:
+        case "NoteEssay":
             return Spec_FieldType_TextArea(new Spec_TextInfo(undefined));
-        case 20:
-            return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(mappedChoices));
-        case 21:
-            return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(mappedChoices));
-        case 25:
-            return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
-        case 26:
-            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
-        case 30:
-            return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(hasChoices ? mappedChoices : buildImplicitYesNoOptions(item)));
-        case 31:
+        case "MultipleChoice":
+        case "MultipleChoicePlusNotes":
             return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(hasChoices ? mappedChoices : buildImplicitYesNoOptions(item)));
-        case 32:
+        case "DropDown":
+        case "DropDownPlusNotes":
             return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
-        case 40:
-            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
-        case 41:
+        case "CheckboxSeries":
+        case "CheckboxSeriesPlusNotes":
             return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
-        case 50:
+        case "DateField":
             return Spec_FieldType_Date(new Spec_TextInfo(undefined));
-        case 51:
-            return Spec_FieldType_Signature(new Spec_SignatureInfo(undefined));
-        case 60:
+        case "DateFieldWithTime":
             return Spec_FieldType_DateTimeLocal(new Spec_TextInfo(undefined));
-        case 61:
+        case "SignatureAndDate":
+        case "SignatureAndDateWithTime":
             return Spec_FieldType_Signature(new Spec_SignatureInfo(undefined));
-        case 110:
-            throw new Error("Type 110 (Heading) should be filtered out before mapping to FieldType");
-        case 120:
-            return Spec_FieldType_Message(new Spec_MessageInfo("", Spec_MessageType_Info(), item.Label, undefined));
-        case 121:
+        case "FormHeading":
+            throw new Error(`a heading reached mapFieldType (item ${item.ItemId}); headings become Steps and must be filtered by CorEMRSectioning first`);
+        case "FormInstructions":
+        case "DisplayFormId":
             return Spec_FieldType_Message(new Spec_MessageInfo("", Spec_MessageType_Info(), item.Label, undefined));
-        case 130:
+        case "PatientVitals":
             return Spec_FieldType_PluginField(new Spec_PluginFieldConfig("Fable.Form.Simple.Bulma.Fields.VitalsField", undefined, undefined));
-        case 131:
-        case 132:
-            return Spec_FieldType_Message(new Spec_MessageInfo("", Spec_MessageType_Info(), item.Label, undefined));
-        case 133:
-        case 134:
-        case 135:
-            return Spec_FieldType_Message(new Spec_MessageInfo("", Spec_MessageType_Info(), item.Label, undefined));
-        case 140:
+        case "AllergyFinder":
             return Spec_FieldType_PluginField(new Spec_PluginFieldConfig("Fable.Form.Simple.Bulma.Fields.AllergyFinderField", undefined, undefined));
-        case 143:
-            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
         default:
-            return Spec_FieldType_UnsupportedField(new Spec_UnsupportedFieldInfo(item.ItemId, defaultArg(item.Code, ""), matchValue));
+            return Spec_FieldType_UnsupportedField(new Spec_UnsupportedFieldInfo(item.ItemId, defaultArg(item.Code, ""), item.ItemTypeId));
     }
 }
 

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

@@ -2,16 +2,17 @@ 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 { 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, empty as empty_1, singleton as singleton_1, ofSeq, choose, collect, map, sumBy, length, FSharpList } from "@fable-org/fable-library-js/List.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";
 import { HeadingItem, detectHeadings } from "./CorEMRSectioning.js";
 import { CoreMRTrigger, CoreMRFormData, CoreMRFormMetadata, CoreMRChoice, CoreMRItem } from "../../CorEMR/CoreMRTypes.js";
-import { ClinicalPathway_ClinicalPathwaySpec, Spec_Score, Spec_SingleChoiceInfo, Spec_MultiChoiceInfo, Spec_FormField$1, Shared_FieldKey, Spec_FormSpec$1, Spec_FieldType_$union, Spec_FormStep$1 } from "../../../FormSpec.js";
+import { ClinicalPathway_ClinicalPathwaySpec, Spec_VendorScore, Spec_VendorScoreBand, Spec_SingleChoiceInfo, Spec_MultiChoiceInfo, Spec_FormField$1, Shared_FieldKey, Spec_FormSpec$1, Spec_FieldType_$union, Spec_FormStep$1 } from "../../../FormSpec.js";
 import { tryFind, FSharpMap, ofList } from "@fable-org/fable-library-js/Map.js";
 import { List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
-import { toInt32 } from "@fable-org/fable-library-js/BigInt.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 { FSharpResult$2_$union, FSharpResult$2_Ok, FSharpResult$2_Error } from "@fable-org/fable-library-js/Result.js";
 
 export type ValidationError_$union = 
@@ -44,7 +45,7 @@ export type ValidationError_$cases = {
     7: ["MissingStep", [string]],
     8: ["ChoiceCountMismatch", [int32, string, int32, int32]],
     9: ["RequiredFieldMismatch", [int32, string, boolean, boolean]],
-    10: ["ScoreMismatch", [int32, Option<int32>]],
+    10: ["ScoreMismatch", [string, Option<string>]],
     11: ["TagCountMismatch", [int32, int32]],
     12: ["PathwayMissing", [int32]],
     13: ["PathwayStateCountInvalid", [string, int32, int32]],
@@ -93,7 +94,7 @@ export function ValidationError_RequiredFieldMismatch(itemId: int32, itemLabel:
     return new ValidationError<9>(9, [itemId, itemLabel, expected, actual]);
 }
 
-export function ValidationError_ScoreMismatch(expected: int32, actual: Option<int32>) {
+export function ValidationError_ScoreMismatch(expected: string, actual: Option<string>) {
     return new ValidationError<10>(10, [expected, actual]);
 }
 
@@ -131,7 +132,7 @@ export class ValidationError<Tag extends keyof ValidationError_$cases> extends U
 }
 
 export function ValidationError_$reflection(): TypeInfo {
-    return union_type("FormSpec.Integrations.CorEMR.CorEMRFormSpecValidator.ValidationError", [], ValidationError, () => [[["expected", int32_type], ["actual", int32_type]], [["expected", int32_type], ["actual", int32_type]], [["step", string_type], ["expected", int32_type], ["actual", int32_type]], [["field", string_type], ["expected", string_type], ["actual", string_type]], [["itemId", int32_type], ["itemLabel", string_type]], [["itemId", int32_type], ["itemType", string_type], ["reason", string_type]], [["itemId", int32_type], ["heading", string_type]], [["heading", string_type]], [["itemId", int32_type], ["itemLabel", string_type], ["expected", int32_type], ["actual", int32_type]], [["itemId", int32_type], ["itemLabel", string_type], ["expected", bool_type], ["actual", bool_type]], [["expected", int32_type], ["actual", option_type(int32_type)]], [["expected", int32_type], ["actual", int32_type]], [["triggerCount", int32_type]], [["pathwayId", string_type], ["expected", int32_type], ["actual", int32_type]], [["pathwayId", string_type], ["expected", int32_type], ["actual", int32_type]], [["triggerId", int32_type], ["expected", int32_type], ["actual", int32_type]], [["triggerId", int32_type], ["expected", int32_type], ["actual", int32_type]]]);
+    return union_type("FormSpec.Integrations.CorEMR.CorEMRFormSpecValidator.ValidationError", [], ValidationError, () => [[["expected", int32_type], ["actual", int32_type]], [["expected", int32_type], ["actual", int32_type]], [["step", string_type], ["expected", int32_type], ["actual", int32_type]], [["field", string_type], ["expected", string_type], ["actual", string_type]], [["itemId", int32_type], ["itemLabel", string_type]], [["itemId", int32_type], ["itemType", string_type], ["reason", string_type]], [["itemId", int32_type], ["heading", string_type]], [["heading", string_type]], [["itemId", int32_type], ["itemLabel", string_type], ["expected", int32_type], ["actual", int32_type]], [["itemId", int32_type], ["itemLabel", string_type], ["expected", bool_type], ["actual", bool_type]], [["expected", string_type], ["actual", option_type(string_type)]], [["expected", int32_type], ["actual", int32_type]], [["triggerCount", int32_type]], [["pathwayId", string_type], ["expected", int32_type], ["actual", int32_type]], [["pathwayId", string_type], ["expected", int32_type], ["actual", int32_type]], [["triggerId", int32_type], ["expected", int32_type], ["actual", int32_type]], [["triggerId", int32_type], ["expected", int32_type], ["actual", int32_type]]]);
 }
 
 export class ValidationResult extends Record implements IEquatable<ValidationResult>, IComparable<ValidationResult> {
@@ -213,14 +214,10 @@ export function FormSpecValidator_getChoicesPerItem(choices: FSharpList<CoreMRCh
     });
 }
 
-/**
- * Calculate expected max score from CoreMR
- */
-export function FormSpecValidator_calculateExpectedMaxScore(choices: FSharpList<CoreMRChoice>): int32 {
-    return sumBy<CoreMRChoice, int32>((c: CoreMRChoice): int32 => ~~toInt32(c.Score), choices, {
-        GetZero: (): int32 => 0,
-        Add: (x: int32, y: int32): int32 => (x + y),
-    });
+function FormSpecValidator_describeScale(name: string, bands: FSharpList<[string, int32]>): string {
+    return `${name} [${join(", ", map<[string, int32], string>((tupledArg: [string, int32]): string => (`${tupledArg[0]}>=${tupledArg[1]}`), sortBy<[string, int32], int32>((tuple: [string, int32]): int32 => tuple[1], bands, {
+        Compare: comparePrimitives,
+    })))}]`;
 }
 
 /**
@@ -398,27 +395,62 @@ export function FormSpecValidator_validateRequiredFields(coreMR: CoreMRFormData,
 }
 
 /**
- * Validate scoring calculation
+ * Does the blueprint carry exactly the scale CoreMR stated for this form?
+ * 
+ * ⭐ THE ORACLE IS THE SITE, NOT US. `scoring` is the form's own `form_scores` row as conduit
+ * published it — the scale's name and its bands. This function only asks whether the
+ * blueprint says the same thing.
+ * 
+ * It catches, by construction, the defect that shipped for months and that no validator saw:
+ * a blueprint carrying bands nobody stated. ⛔ It must never grow a branch that computes a
+ * scale of its own to compare against — that is precisely how it went blind the first time.
+ * 
+ * | the site | the blueprint | verdict |
+ * |---|---|---|
+ * | states a scale | carries the same one | ✅ |
+ * | states a scale | carries a different one, or none | 🚨 `ScoreMismatch` |
+ * | states none | carries none | ✅ |
+ * | states none | carries one | 🚨 `ScoreMismatch` — invented out of nothing |
  */
-export function FormSpecValidator_validateScoring(coreMR: CoreMRFormData, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): FSharpList<ValidationError_$union> {
-    const expectedScore: int32 = FormSpecValidator_calculateExpectedMaxScore(coreMR.Choices) | 0;
-    if (expectedScore > 0) {
-        const matchValue: Option<Spec_Score> = formSpec.Score;
-        if (matchValue == null) {
-            return singleton_1(ValidationError_ScoreMismatch(expectedScore, undefined));
-        }
-        else {
-            const score: Spec_Score = value_3(matchValue);
-            if (score.MaxScore !== expectedScore) {
-                return singleton_1(ValidationError_ScoreMismatch(expectedScore, score.MaxScore));
+export function FormSpecValidator_validateScoring(scoring: Option<FormScoring>, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): FSharpList<ValidationError_$union> {
+    const statedText: Option<string> = map_1<FormScoring, string>((s: FormScoring): string => FormSpecValidator_describeScale(s.ScoreName, map<ScoringLabel, [string, int32]>((l: ScoringLabel): [string, int32] => ([l.Name, l.Min] as [string, int32]), s.Labels)), scoring);
+    const carriedText: Option<string> = map_1<Spec_VendorScore, string>((sc: Spec_VendorScore): string => FormSpecValidator_describeScale(sc.ScaleName, map<Spec_VendorScoreBand, [string, int32]>((b: Spec_VendorScoreBand): [string, int32] => ([b.Label, b.Min] as [string, int32]), sc.Bands)), formSpec.VendorScore);
+    let matchResult: int32, carried_1: string, stated_1: string, carried_2: Option<string>, stated_2: string, carried_3: string;
+    if (statedText != null) {
+        if (carriedText != null) {
+            if (value_3(statedText) === value_3(carriedText)) {
+                matchResult = 1;
+                carried_1 = value_3(carriedText);
+                stated_1 = value_3(statedText);
             }
             else {
-                return empty_1<ValidationError_$union>();
+                matchResult = 2;
+                carried_2 = carriedText;
+                stated_2 = value_3(statedText);
             }
         }
+        else {
+            matchResult = 2;
+            carried_2 = carriedText;
+            stated_2 = value_3(statedText);
+        }
+    }
+    else if (carriedText != null) {
+        matchResult = 3;
+        carried_3 = value_3(carriedText);
     }
     else {
-        return empty_1<ValidationError_$union>();
+        matchResult = 0;
+    }
+    switch (matchResult) {
+        case 0:
+            return empty_1<ValidationError_$union>();
+        case 1:
+            return empty_1<ValidationError_$union>();
+        case 2:
+            return singleton_1(ValidationError_ScoreMismatch(stated_2!, carried_2!));
+        default:
+            return singleton_1(ValidationError_ScoreMismatch("(CoreMR states no scale for this form)", carried_3!));
     }
 }
 
@@ -478,9 +510,9 @@ export function FormSpecValidator_validatePathways(triggers: FSharpList<CoreMRTr
 /**
  * Main validation function
  */
-export function FormSpecValidator_validateConversion(coreMR: CoreMRFormData, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): FSharpResult$2_$union<ValidationResult, string> {
+export function FormSpecValidator_validateConversion(scoring: Option<FormScoring>, coreMR: CoreMRFormData, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): FSharpResult$2_$union<ValidationResult, string> {
     try {
-        const allErrors: FSharpList<ValidationError_$union> = toList<ValidationError_$union>(delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateMetadata(coreMR.Metadata, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateCounts(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateChoices(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateRequiredFields(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateScoring(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateTags(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => FormSpecValidator_validatePathways(coreMR.Triggers, formSpec.ClinicalPathway)))))))))))))));
+        const allErrors: FSharpList<ValidationError_$union> = toList<ValidationError_$union>(delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateMetadata(coreMR.Metadata, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateCounts(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateChoices(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateRequiredFields(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateScoring(scoring, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => append<ValidationError_$union>(FormSpecValidator_validateTags(coreMR, formSpec), delay<ValidationError_$union>((): Iterable<ValidationError_$union> => FormSpecValidator_validatePathways(coreMR.Triggers, formSpec.ClinicalPathway)))))))))))))));
         return FSharpResult$2_Ok<ValidationResult, string>(new ValidationResult(isEmpty(allErrors), allErrors, empty_1<ValidationError_$union>(), FormSpecValidator_createSummary(coreMR, formSpec)));
     }
     catch (ex: any) {

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

@@ -1,41 +1,93 @@
 import { FSharpRef, Record } from "@fable-org/fable-library-js/Types.js";
-import { int32ToString, comparePrimitives, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
+import { comparePrimitives, int32ToString, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { record_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
-import { FSharpSet__Contains, contains, FSharpSet, ofSeq } from "@fable-org/fable-library-js/Set.js";
 import { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { Spec_FormClassification_$union, Spec_FormClassification_General, Spec_FormClassification_Screening, Spec_FormClassification_Intake, Spec_FormClassification_ClinicalInstrument, Spec_ClinicalInstrumentInfo } from "../../../FormSpec.js";
-import { bind, orElse, map as map_1, orElseWith, 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_5 } from "@fable-org/fable-library-js/Option.js";
 import { isNullOrEmpty } from "@fable-org/fable-library-js/String.js";
 import { int64, toInt32 } from "@fable-org/fable-library-js/BigInt.js";
 import { 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 { FSharpMap, filter, keys, isEmpty as isEmpty_1, tryFind } from "@fable-org/fable-library-js/Map.js";
-import { ElementTypeInfo, getElementTypeInfo } from "./CorEMRElementTypeMap.js";
+import { FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
 import { TemplateForm, ItemTrigger, TriggerAction, TriggerCondition, TemplateChoice, TemplateItem } from "../../CorEMR/TemplateManifestDecoder.js";
+import { FSharpSet__Contains, FSharpSet, ofSeq } from "@fable-org/fable-library-js/Set.js";
 import { normalizeChoiceScores } from "../../../BitmaskHelpers.js";
 
 export class BridgeElementTypeInfo extends Record implements IEquatable<BridgeElementTypeInfo>, IComparable<BridgeElementTypeInfo> {
-    readonly Code: string;
-    readonly ValueEncoding: string;
-    readonly TextFieldRole: string;
-    constructor(Code: string, ValueEncoding: string, TextFieldRole: string) {
+    readonly Label: string;
+    readonly Control: string;
+    constructor(Label: string, Control: string) {
         super();
-        this.Code = Code;
-        this.ValueEncoding = ValueEncoding;
-        this.TextFieldRole = TextFieldRole;
+        this.Label = Label;
+        this.Control = Control;
     }
 }
 
 export function BridgeElementTypeInfo_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CorEMRTemplateMapper.BridgeElementTypeInfo", [], BridgeElementTypeInfo, () => [["Code", string_type], ["ValueEncoding", string_type], ["TextFieldRole", string_type]]);
+    return record_type("FormSpec.Integrations.CorEMR.CorEMRTemplateMapper.BridgeElementTypeInfo", [], BridgeElementTypeInfo, () => [["Label", string_type], ["Control", string_type]]);
 }
 
-const multiSelectCodes: FSharpSet<string> = ofSeq(["chips_notes", "checkbox", "checkbox_notes", "chips_ros"], {
-    Compare: comparePrimitives,
-});
-
-function hasTextHasDateFromBridge(textField: string): [boolean, boolean] {
-    return [(textField === "content") ? true : (textField === "optional_notes"), textField === "iso_date"] as [boolean, boolean];
+function carriesTextOrDate(control: string): [boolean, boolean] {
+    let matchResult: int32, c_3: string;
+    switch (control) {
+        case "DateField":
+        case "DateFieldWithTime": {
+            matchResult = 0;
+            break;
+        }
+        case "SignatureAndDate":
+        case "SignatureAndDateWithTime": {
+            matchResult = 1;
+            break;
+        }
+        case "ShortAnswer":
+        case "NoteEssay": {
+            matchResult = 2;
+            break;
+        }
+        case "PatientVitals": {
+            if (control.endsWith("PlusNotes")) {
+                matchResult = 3;
+                c_3 = control;
+            }
+            else {
+                matchResult = 4;
+            }
+            break;
+        }
+        case "AllergyFinder": {
+            if (control.endsWith("PlusNotes")) {
+                matchResult = 3;
+                c_3 = control;
+            }
+            else {
+                matchResult = 4;
+            }
+            break;
+        }
+        default:
+            if (control.endsWith("PlusNotes")) {
+                matchResult = 3;
+                c_3 = control;
+            }
+            else {
+                matchResult = 5;
+            }
+    }
+    switch (matchResult) {
+        case 0:
+            return [true, true] as [boolean, boolean];
+        case 1:
+            return [true, true] as [boolean, boolean];
+        case 2:
+            return [true, false] as [boolean, boolean];
+        case 3:
+            return [true, false] as [boolean, boolean];
+        case 4:
+            return [true, false] as [boolean, boolean];
+        default:
+            return [false, false] as [boolean, boolean];
+    }
 }
 
 /**
@@ -99,19 +151,14 @@ export function mapFormClassification(formCategory: Option<string>, instrumentTy
 export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<int32, BridgeElementTypeInfo>, 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, "");
     const items: FSharpList<CoreMRItem> = map<TemplateItem, CoreMRItem>((item: TemplateItem): CoreMRItem => {
-        let info_1: BridgeElementTypeInfo;
+        let info: BridgeElementTypeInfo;
         const itemTypeId: int32 = item.Type | 0;
-        const value: BridgeElementTypeInfo = new BridgeElementTypeInfo(`unknown_${itemTypeId}`, "unknown", "unknown");
-        info_1 = defaultArg(orElseWith<BridgeElementTypeInfo>(tryFind<int32, BridgeElementTypeInfo>(itemTypeId, elementTypes), (): Option<BridgeElementTypeInfo> => {
-            const info: ElementTypeInfo = getElementTypeInfo(itemTypeId);
-            return new BridgeElementTypeInfo(info.Code, info.ValueEncoding, info.TextFieldRole);
-        }), value);
-        const patternInput: [boolean, boolean] = hasTextHasDateFromBridge(info_1.TextFieldRole);
-        return new CoreMRItem(item.ItemId, item.Sequence, item.NestingLevel, item.SequenceText, item.Type, info_1.Code, !isEmpty(item.Choices), patternInput[0], patternInput[1], item.Text, item.IsRequired, item.GenderRequired, map_1<int32, string>(int32ToString, item.Highlight), item.Code, item.Uuid, undefined, undefined, 0, 0, undefined);
+        const value: BridgeElementTypeInfo = new BridgeElementTypeInfo(`unresolved item kind ${itemTypeId}`, `unresolved_${itemTypeId}`);
+        info = defaultArg(tryFind<int32, BridgeElementTypeInfo>(itemTypeId, elementTypes), value);
+        const patternInput: [boolean, boolean] = carriesTextOrDate(info.Control);
+        return new CoreMRItem(item.ItemId, item.Sequence, item.NestingLevel, item.SequenceText, item.Type, info.Control, !isEmpty(item.Choices), patternInput[0], patternInput[1], item.Text, item.IsRequired, item.GenderRequired, map_1<int32, string>(int32ToString, item.Highlight), item.Code, item.Uuid, undefined, undefined, 0, 0, undefined);
     }, template.Items);
-    const multiSelectTypes: FSharpSet<int32> = isEmpty_1<int32, BridgeElementTypeInfo>(elementTypes) ? ofSeq([26, 40, 41, 143], {
-        Compare: comparePrimitives,
-    }) : ofSeq<int32>(keys<int32, BridgeElementTypeInfo>(filter<int32, BridgeElementTypeInfo>((_arg: int32, info_2: BridgeElementTypeInfo): boolean => contains<string>(info_2.Code, multiSelectCodes), elementTypes)), {
+    const multiSelectTypes: FSharpSet<int32> = ofSeq([26, 40, 41, 143], {
         Compare: comparePrimitives,
     });
     return new CoreMRFormDetail(metadata, items, collect<TemplateItem, CoreMRChoice>((item_1: TemplateItem): FSharpList<CoreMRChoice> => {