@f1studio/form-spec 5.0.0-alpha.164 → 5.0.0-alpha.166

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,42 +1,16 @@
-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 { 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 { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
+import { bind, orElse, map as map_1, defaultArg, Option, value as value_5 } from "@fable-org/fable-library-js/Option.js";
 import { 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 { CoreMRFormData, CoreMRFormDetail, CoreMRTag, CoreMRTrigger, CoreMRTriggerEvent, CoreMRTriggerCondition, CoreMRChoice, CoreMRItem, CoreMRFormMetadata } from "../../CorEMR/CoreMRTypes.js";
 import { empty, choose, item as item_3, length, mapIndexed, sortBy, collect, FSharpList, isEmpty, map } from "@fable-org/fable-library-js/List.js";
-import { FSharpMap, filter, keys, isEmpty as isEmpty_1, tryFind } from "@fable-org/fable-library-js/Map.js";
-import { ElementTypeInfo, getElementTypeInfo } from "./CorEMRElementTypeMap.js";
-import { TemplateForm, ItemTrigger, TriggerAction, TriggerCondition, TemplateChoice, TemplateItem } from "../../CorEMR/TemplateManifestDecoder.js";
+import { TemplateForm, ItemTrigger, TriggerAction, TriggerCondition, TemplateChoice, TemplateItem, carriesTextOrDate, ElementTypeEntry } from "../../CorEMR/TemplateManifestDecoder.js";
+import { FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
+import { comparePrimitives, int32ToString } from "@fable-org/fable-library-js/Util.js";
+import { FSharpSet__Contains, FSharpSet, ofSeq } from "@fable-org/fable-library-js/Set.js";
 import { normalizeChoiceScores } from "../../../BitmaskHelpers.js";
-
-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) {
-        super();
-        this.Code = Code;
-        this.ValueEncoding = ValueEncoding;
-        this.TextFieldRole = TextFieldRole;
-    }
-}
-
-export function BridgeElementTypeInfo_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CorEMRTemplateMapper.BridgeElementTypeInfo", [], BridgeElementTypeInfo, () => [["Code", string_type], ["ValueEncoding", string_type], ["TextFieldRole", 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];
-}
+import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 
 /**
  * Map catalog classification fields to the FormClassification DU.
@@ -96,22 +70,17 @@ export function mapFormClassification(formCategory: Option<string>, instrumentTy
  * When elementTypes is non-empty, use it for ItemTypeName, HasText, HasDate, and bitmask detection.
  * When elementTypes is empty, fallback to CorEMRElementTypeMap.
  */
-export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<int32, BridgeElementTypeInfo>, template: TemplateForm): CoreMRFormDetail {
+export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<string, ElementTypeEntry>, template: TemplateForm): CoreMRFormDetail {
     const metadata: CoreMRFormMetadata = new CoreMRFormMetadata(template.FormId, template.Name, isNullOrEmpty(template.Description) ? undefined : template.Description, ~~toInt32(template.CurrentVersionId), 1, undefined, template.RequiresSignature, template.IsIntake, template.FormCode, "");
     const items: FSharpList<CoreMRItem> = map<TemplateItem, CoreMRItem>((item: TemplateItem): CoreMRItem => {
-        let info_1: BridgeElementTypeInfo;
+        let info: ElementTypeEntry;
         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: ElementTypeEntry = new ElementTypeEntry(`unresolved item kind ${itemTypeId}`, `unresolved_${itemTypeId}`);
+        info = defaultArg(tryFind<string, ElementTypeEntry>(int32ToString(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> => {
@@ -147,4 +116,17 @@ export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<int32, Brid
     }, item_2.Triggers), template.Items), empty<CoreMRTag>(), undefined);
 }
 
+/**
+ * ⭐ THE ONE `TemplateForm -> CoreMRFormData` PATH. A projection of the single builder above, so
+ * Studio and f1-api cannot drift: the same CoreMR form becomes the same record in both.
+ * 
+ * ⚰️ It replaces `TemplateManifestDecoder.toCoreMRFormData`, a SECOND builder that stringified the
+ * item type code, hardcoded `HasText`/`HasDate`, dropped every trigger and tag, and never computed a
+ * choice's `BitPosition`. Studio used that one and f1-api used this one.
+ */
+export function toCoreMRFormData(elementTypes: FSharpMap<string, ElementTypeEntry>, template: TemplateForm): CoreMRFormData {
+    const detail: CoreMRFormDetail = mapNewTemplateToCoreMRDetail(elementTypes, template);
+    return new CoreMRFormData(detail.Metadata, detail.Items, detail.Choices, detail.Triggers, detail.Tags);
+}
+
 //# sourceMappingURL=CorEMRTemplateMapper.ts.map

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

@@ -1,12 +1,12 @@
 import { Helpers_generateDeterministicGuidRaw, Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
 import { tryFind, FSharpMap, ofList } from "@fable-org/fable-library-js/Map.js";
-import { empty, isEmpty, collect, ofArray, sumBy, FSharpList, map } from "@fable-org/fable-library-js/List.js";
+import { empty, collect, isEmpty, sortBy, FSharpList, map } from "@fable-org/fable-library-js/List.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { CoreMRFormData, CoreMRTag, CoreMRItem, CoreMRChoice } from "../../CorEMR/CoreMRTypes.js";
 import { numberHash, comparePrimitives } from "@fable-org/fable-library-js/Util.js";
-import { op_Addition, toInt64, int64, toInt32 } from "@fable-org/fable-library-js/BigInt.js";
-import { Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FormSpec$1, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, ClinicalPathway_ClinicalPathwaySpec, Spec_FormField$1, Shared_FieldKey, Spec_FieldType_$union, Spec_FormStep$1, Spec_Score, Spec_ScoreColor_Danger, Spec_ScoreColor_Warning, Spec_ScoreRange, Spec_ScoreColor_Success } from "../../../FormSpec.js";
-import { defaultArg, Option } from "@fable-org/fable-library-js/Option.js";
+import { defaultArg, Option, bind } from "@fable-org/fable-library-js/Option.js";
+import { Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FormSpec$1, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, ClinicalPathway_ClinicalPathwaySpec, Spec_FormField$1, Shared_FieldKey, Spec_FieldType_$union, Spec_FormStep$1, Spec_VendorScore, Spec_VendorScoreBand } from "../../../FormSpec.js";
+import { FormScoring, ScoringLabel } from "../../CorEMR/TemplateManifestDecoder.js";
 import { toConsoleError, printf, toText, substring } from "@fable-org/fable-library-js/String.js";
 import { createSteps } from "./CorEMRStepsBuilder.js";
 import { List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
@@ -42,19 +42,39 @@ export function createChoiceIdToTextMap(choices: FSharpList<CoreMRChoice>): FSha
 }
 
 /**
- * Calculate scoring from choice scores
+ * ⚰️ `calculateScore` WAS HERE AND IS NOT COMING BACK. It summed every `item_choices.score`
+ * in the form — the BITMASK WEIGHT column, which `CoreMRTypes.CoreMRChoice.Score` documents as
+ * reaching 2^31 — called the total a clinical maximum, and cut three bands at thirds labelled
+ * "Low Risk" / "Medium Risk" / "High Risk". CoreMR states none of that.
+ * 
+ * 🔴 It was not merely noisy. For five of the six forms CoreMR scores, a total the site calls
+ * SEVERE fell inside the band this function painted "Low Risk" (GAD-7 severe ≥ 17 against a
+ * fabricated Low of 0–37; CIWA severe ≥ 20 against 0–378). ⇒ `AGENTS.md` non-negotiable 3 —
+ * *"a score is CoreMR's to state, never ours to compute"* — and non-negotiable 4, a value and
+ * its interpretation travel together or neither travels.
+ * 
+ * ⛔ Do not reintroduce a computed maximum "just for a progress bar". `form_scores` is
+ * `id · name · form_name · labels · deleted` — there is no max column — and conduit publishes
+ * `maxScore: null` for every scored form. A maximum here would be ours, not the site's.
+ * Read the stated scale off the catalog row CoreMR published for this form.
+ * 
+ * ⛔ REFUSES rather than degrades. A scale whose bands did not survive (`labels` unparseable,
+ * so conduit sent an empty list) yields `None`: a scale's NAME without its bands cannot say
+ * what a total means, and carrying half the sentence is how a consumer ends up inventing the
+ * cutoff — the exact failure conduit's own `ScoreBand.parse` comment records.
  */
-export function calculateScore(choices: FSharpList<CoreMRChoice>, formName: string): Option<Spec_Score> {
-    const maxScore: int32 = ~~toInt32(sumBy<CoreMRChoice, int64>((c: CoreMRChoice): int64 => c.Score, choices, {
-        GetZero: (): int64 => (0n),
-        Add: (x: int64, y: int64): int64 => toInt64(op_Addition(x, y)),
-    })) | 0;
-    if (maxScore > 0) {
-        return new Spec_Score(maxScore, ofArray([new Spec_ScoreRange(generateStableDeterministicGuid(`score_range_${formName}_low`), 0, ~~(maxScore / 3), "Low Risk", Spec_ScoreColor_Success()), new Spec_ScoreRange(generateStableDeterministicGuid(`score_range_${formName}_medium`), ~~(maxScore / 3) + 1, ~~((maxScore * 2) / 3), "Medium Risk", Spec_ScoreColor_Warning()), new Spec_ScoreRange(generateStableDeterministicGuid(`score_range_${formName}_high`), ~~((maxScore * 2) / 3) + 1, maxScore, "High Risk", Spec_ScoreColor_Danger())]));
-    }
-    else {
-        return undefined;
-    }
+export function statedScale(scoring: Option<FormScoring>): Option<Spec_VendorScore> {
+    return bind<FormScoring, Spec_VendorScore>((s: FormScoring): Option<Spec_VendorScore> => {
+        const bands: FSharpList<Spec_VendorScoreBand> = sortBy<Spec_VendorScoreBand, int32>((b: Spec_VendorScoreBand): int32 => b.Min, map<ScoringLabel, Spec_VendorScoreBand>((l: ScoringLabel): Spec_VendorScoreBand => (new Spec_VendorScoreBand(l.Name, l.Min)), s.Labels), {
+            Compare: comparePrimitives,
+        });
+        if (isEmpty(bands)) {
+            return undefined;
+        }
+        else {
+            return new Spec_VendorScore(s.ScoreName, bands);
+        }
+    }, scoring);
 }
 
 /**
@@ -85,9 +105,14 @@ export function extractFormCode(formName: string, formId: int32): string {
 }
 
 /**
- * Convert CoreMR form data to FormSpec
+ * Convert CoreMR form data to FormSpec.
+ * 
+ * ⭐ `scoring` is the catalog row's OWN sentence about this form's scale, threaded in rather
+ * than derived here. ⛔ It is REQUIRED as a parameter — `None` must be a caller's explicit
+ * statement that no catalog row was supplied, never this function's default. Nothing in a
+ * form's items or choices can tell you what a total means.
  */
-export function convertToFormSpec(formData: CoreMRFormData): Spec_FormSpec$1<Spec_FieldType_$union> {
+export function convertToFormSpec(scoring: Option<FormScoring>, formData: CoreMRFormData): Spec_FormSpec$1<Spec_FieldType_$union> {
     const formCode: string = extractFormCode(formData.Metadata.FormName, formData.Metadata.FormId);
     const steps: FSharpList<Spec_FormStep$1<Spec_FieldType_$union>> = createSteps(formCode, formData.Items, ofList<int32, FSharpList<CoreMRChoice>>(List_groupBy<CoreMRChoice, int32>((c: CoreMRChoice): int32 => c.ItemId, formData.Choices, {
         Equals: (x: int32, y: int32): boolean => (x === y),
@@ -95,7 +120,7 @@ export function convertToFormSpec(formData: CoreMRFormData): Spec_FormSpec$1<Spe
     }), {
         Compare: comparePrimitives,
     }));
-    const score: Option<Spec_Score> = calculateScore(formData.Choices, formData.Metadata.FormName);
+    const vendorScore: Option<Spec_VendorScore> = statedScale(scoring);
     const fieldKeyBySequence: FSharpMap<int32, Shared_FieldKey> = ofList<int32, Shared_FieldKey>(map<Spec_FormField$1<Spec_FieldType_$union>, [int32, Shared_FieldKey]>((field: Spec_FormField$1<Spec_FieldType_$union>): [int32, Shared_FieldKey] => ([field.FieldOrder, field.FieldKey] as [int32, Shared_FieldKey]), collect<Spec_FormStep$1<Spec_FieldType_$union>, Spec_FormField$1<Spec_FieldType_$union>>((step: Spec_FormStep$1<Spec_FieldType_$union>): FSharpList<Spec_FormField$1<Spec_FieldType_$union>> => step.Fields, steps)), {
         Compare: comparePrimitives,
     });
@@ -103,7 +128,7 @@ export function convertToFormSpec(formData: CoreMRFormData): Spec_FormSpec$1<Spe
         Compare: comparePrimitives,
     });
     const clinicalPathway: Option<ClinicalPathway_ClinicalPathwaySpec> = isEmpty(formData.Triggers) ? undefined : convertTriggersToSinglePathway(formData.Triggers, (itemId: int32): Shared_FieldKey => defaultArg(tryFind<int32, Shared_FieldKey>(itemId, itemIdToFieldKeyMap), new Shared_FieldKey(generateStableDeterministicGuid(`unknown_item_${itemId}`))), createChoiceIdToTextMap(formData.Choices), formData.Metadata, formData.Items);
-    return new Spec_FormSpec$1(generateStableDeterministicGuid(`form_${formData.Metadata.FormId}_${formData.Metadata.FormName}`), formCode, formData.Metadata.FormName, defaultArg(formData.Metadata.Description, ""), toText(printf("1.0.0-CoreEMRv%d"))(formData.Metadata.VersionNumber), "5.0.0", steps, map<CoreMRTag, string>((t: CoreMRTag): string => t.TagName, formData.Tags), score, empty<string>(), formData.Metadata.RequiresSignature, false, clinicalPathway, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
+    return new Spec_FormSpec$1(generateStableDeterministicGuid(`form_${formData.Metadata.FormId}_${formData.Metadata.FormName}`), formCode, formData.Metadata.FormName, defaultArg(formData.Metadata.Description, ""), toText(printf("1.0.0-CoreEMRv%d"))(formData.Metadata.VersionNumber), "5.0.0", steps, map<CoreMRTag, string>((t: CoreMRTag): string => t.TagName, formData.Tags), undefined, vendorScore, empty<string>(), formData.Metadata.RequiresSignature, false, clinicalPathway, Spec_FormLifecycle_Blueprint(), undefined, undefined, undefined, Spec_FormClassification_General());
 }
 
 /**
@@ -134,17 +159,17 @@ export function serializeFormSpec(formSpec: Spec_FormSpec$1<Spec_FieldType_$unio
 /**
  * Main conversion function
  */
-export function convertForm(formData: CoreMRFormData): Spec_FormSpec$1<Spec_FieldType_$union> {
-    return convertToFormSpec(formData);
+export function convertForm(scoring: Option<FormScoring>, formData: CoreMRFormData): Spec_FormSpec$1<Spec_FieldType_$union> {
+    return convertToFormSpec(scoring, formData);
 }
 
 /**
  * Convert form with validation
  */
-export function convertFormWithValidation(formData: CoreMRFormData): FSharpResult$2_$union<[Spec_FormSpec$1<Spec_FieldType_$union>, ValidationResult], string> {
+export function convertFormWithValidation(scoring: Option<FormScoring>, formData: CoreMRFormData): FSharpResult$2_$union<[Spec_FormSpec$1<Spec_FieldType_$union>, ValidationResult], string> {
     try {
-        const formSpec: Spec_FormSpec$1<Spec_FieldType_$union> = convertToFormSpec(formData);
-        const matchValue: FSharpResult$2_$union<ValidationResult, string> = FormSpecValidator_validateConversion(formData, formSpec);
+        const formSpec: Spec_FormSpec$1<Spec_FieldType_$union> = convertToFormSpec(scoring, formData);
+        const matchValue: FSharpResult$2_$union<ValidationResult, string> = FormSpecValidator_validateConversion(scoring, formData, formSpec);
         return (matchValue.tag === /* Error */ 1) ? FSharpResult$2_Error<[Spec_FormSpec$1<Spec_FieldType_$union>, ValidationResult], string>(matchValue.fields[0]) : FSharpResult$2_Ok<[Spec_FormSpec$1<Spec_FieldType_$union>, ValidationResult], string>([formSpec, matchValue.fields[0]] as [Spec_FormSpec$1<Spec_FieldType_$union>, ValidationResult]);
     }
     catch (ex: any) {
@@ -155,8 +180,8 @@ export function convertFormWithValidation(formData: CoreMRFormData): FSharpResul
 /**
  * Convert form with semantic analysis
  */
-export function convertFormWithSemantics(formData: CoreMRFormData): [Spec_FormSpec$1<Spec_FieldType_$union>, string] {
-    return [convertToFormSpec(formData), buildReport(formData)] as [Spec_FormSpec$1<Spec_FieldType_$union>, string];
+export function convertFormWithSemantics(scoring: Option<FormScoring>, formData: CoreMRFormData): [Spec_FormSpec$1<Spec_FieldType_$union>, string] {
+    return [convertToFormSpec(scoring, formData), buildReport(formData)] as [Spec_FormSpec$1<Spec_FieldType_$union>, string];
 }
 
 //# sourceMappingURL=CorEMRTemplateToFormSpec.ts.map

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

@@ -4,7 +4,7 @@ import { class_type, list_type, option_type, int64_type, int32_type, record_type
 import { getElementTypeInfo, ElementTypeInfo } from "./CorEMRElementTypeMap.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { empty as empty_1, ofList, FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
-import { map, defaultArg, Option, value as value_3 } from "@fable-org/fable-library-js/Option.js";
+import { bind, map, defaultArg, Option, value as value_3 } from "@fable-org/fable-library-js/Option.js";
 import { int64 } from "@fable-org/fable-library-js/BigInt.js";
 import { Spec_FormClassification_General, Spec_FormStep$1, Spec_FormField$1, Spec_MultiChoiceInfo, Spec_SingleChoiceInfo, Shared_FieldOption, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, Spec_FieldType_$union, Spec_FormSpec$1, Spec_FormClassification_$reflection, Spec_FormClassification_$union, Shared_FieldKey_$reflection, Shared_FieldKey, Shared_MatrixItemKey_$reflection, Shared_MatrixItemKey, Shared_FieldOptionKey_$reflection, Shared_FieldOptionKey } from "../../../FormSpec.js";
 import { tryFind as tryFind_1, choose, item as item_1, length, mapIndexed, sortBy, empty, FSharpList } from "@fable-org/fable-library-js/List.js";
@@ -13,8 +13,8 @@ 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 { ImportOrigin, ImportOriginModule_provenance } from "../../../Provenance.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> {
     readonly ValueEncoding: string;
@@ -381,7 +381,7 @@ export function buildSourceMap(elementTypes: Option<FSharpMap<int32, ElementType
  * When elementTypes is Some (from bridge templates endpoint), use it for ValueEncoding; else fallback to CorEMRElementTypeMap.
  */
 export function convertWithMap(formData: CoreMRFormData, listMetadata: Option<ListMetadata>, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>, triggersByItemId: FSharpMap<int32, FSharpList<ItemTrigger>>): CoreMRConversionResult {
-    const formSpec: Spec_FormSpec$1<Spec_FieldType_$union> = convertToFormSpec(formData);
+    const formSpec: Spec_FormSpec$1<Spec_FieldType_$union> = convertToFormSpec(bind<ListMetadata, FormScoring>((m: ListMetadata): Option<FormScoring> => m.Scoring, listMetadata), formData);
     return new CoreMRConversionResult(formSpec, buildSourceMap(elementTypes, triggersByItemId, formData, formSpec, listMetadata));
 }
 
@@ -390,13 +390,15 @@ export function convertWithMap(formData: CoreMRFormData, listMetadata: Option<Li
  * When listMetadata is Some (from the templates catalog during import), Scoring, EncounterTypes,
  * Usage and Classification are populated. IsIntake always comes from formData.Metadata.
  * When elementTypes is Some (from bridge templates endpoint), use it for ValueEncoding; else fallback to CorEMRElementTypeMap.
+ * ⭐ `origin` is REQUIRED. A blueprint imported without naming its tenant and database produces a
+ * provenance that cannot be resolved back — measured 2026-09-23: 228 of 228 imports were unresolvable.
  */
-export function convertWithMapAndProvenance(formData: CoreMRFormData, listMetadata: Option<ListMetadata>, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>): Spec_FormSpec$1<Spec_FieldType_$union> {
+export function convertWithMapAndProvenance(origin: ImportOrigin, formData: CoreMRFormData, listMetadata: Option<ListMetadata>, elementTypes: Option<FSharpMap<int32, ElementTypeInfo>>): Spec_FormSpec$1<Spec_FieldType_$union> {
     const result: CoreMRConversionResult = convertWithMap(formData, listMetadata, elementTypes, empty_1<int32, FSharpList<ItemTrigger>>({
         Compare: comparePrimitives,
     }));
     const bind$0040: Spec_FormSpec$1<Spec_FieldType_$union> = result.FormSpec;
-    return new Spec_FormSpec$1(bind$0040.Id, bind$0040.Code, bind$0040.Title, bind$0040.Abstract, bind$0040.Version, bind$0040.FormSpecVersion, bind$0040.Steps, bind$0040.CategoryTags, bind$0040.Score, bind$0040.AssociatedCodes, bind$0040.RequiresReview, bind$0040.RequiresReviewAndApproval, bind$0040.ClinicalPathway, bind$0040.Lifecycle, bind$0040.FilledMeta, bind$0040.CustomData, new IntegrationProvenance("coremr", toString(0, Auto_generateBoxedEncoder_437914C6(CoreMRSourceMap_$reflection(), undefined, undefined, undefined)(result.SourceMap))), result.SourceMap.Classification);
+    return new Spec_FormSpec$1(bind$0040.Id, bind$0040.Code, bind$0040.Title, bind$0040.Abstract, bind$0040.Version, bind$0040.FormSpecVersion, bind$0040.Steps, bind$0040.CategoryTags, bind$0040.Score, bind$0040.VendorScore, bind$0040.AssociatedCodes, bind$0040.RequiresReview, bind$0040.RequiresReviewAndApproval, bind$0040.ClinicalPathway, bind$0040.Lifecycle, bind$0040.FilledMeta, bind$0040.CustomData, ImportOriginModule_provenance(origin, toString(0, Auto_generateBoxedEncoder_437914C6(CoreMRSourceMap_$reflection(), undefined, undefined, undefined)(result.SourceMap))), result.SourceMap.Classification);
 }
 
 //# sourceMappingURL=CoreMRSourceMap.ts.map

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

@@ -76,7 +76,7 @@ export function convertActionsForCoreMR(actions: FSharpList<ClinicalPathway_Acti
     const matchValue: Option<IntegrationProvenance> = formSpec.Provenance;
     let matchResult: int32, p_1: IntegrationProvenance;
     if (matchValue != null) {
-        if (value_1(matchValue).IntegrationKey === "coremr") {
+        if (value_1(matchValue).Vendor === "coremr") {
             matchResult = 0;
             p_1 = value_1(matchValue);
         }

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

@@ -302,7 +302,7 @@ const CoreMRPublishMetadataCustomData_sourceMapPayloadDecoder = (path_1: string)
 function CoreMRPublishMetadataCustomData_tryDeserializeFromProvenance(formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): Option<CoreMRPublishMetadata> {
     return bind<IntegrationProvenance, CoreMRPublishMetadata>((p: IntegrationProvenance): Option<CoreMRPublishMetadata> => {
         let matchValue_1: Option<string>;
-        if (p.IntegrationKey !== "coremr") {
+        if (p.Vendor !== "coremr") {
             return undefined;
         }
         else {