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

package/plugins/vitals/src/VitalsLogic.d.ts.map

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

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:

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

@@ -19,6 +19,7 @@ import { op_LeftShift, op_BitwiseOr, int64, fromInt32, toInt64 } from "@fable-or
 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> {
@@ -418,8 +419,17 @@ function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsId
                             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>();
@@ -461,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/OpenFda/OpenFdaTypes.ts

@@ -0,0 +1,160 @@
+import { Record, Union } from "@fable-org/fable-library-js/Types.js";
+import { list_type, record_type, int32_type, option_type, string_type, union_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+import { Option } from "@fable-org/fable-library-js/Option.js";
+import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
+import { FSharpList } from "@fable-org/fable-library-js/List.js";
+
+export type AllergyCategory_$union = 
+    | AllergyCategory<0>
+    | AllergyCategory<1>
+    | AllergyCategory<2>
+    | AllergyCategory<3>
+
+export type AllergyCategory_$cases = {
+    0: ["Drug", []],
+    1: ["Food", []],
+    2: ["Environmental", []],
+    3: ["Custom", []]
+}
+
+export function AllergyCategory_Drug() {
+    return new AllergyCategory<0>(0, []);
+}
+
+export function AllergyCategory_Food() {
+    return new AllergyCategory<1>(1, []);
+}
+
+export function AllergyCategory_Environmental() {
+    return new AllergyCategory<2>(2, []);
+}
+
+export function AllergyCategory_Custom() {
+    return new AllergyCategory<3>(3, []);
+}
+
+export class AllergyCategory<Tag extends keyof AllergyCategory_$cases> extends Union<Tag, AllergyCategory_$cases[Tag][0]> {
+    constructor(readonly tag: Tag, readonly fields: AllergyCategory_$cases[Tag][1]) {
+        super();
+    }
+    cases() {
+        return ["Drug", "Food", "Environmental", "Custom"];
+    }
+}
+
+export function AllergyCategory_$reflection(): TypeInfo {
+    return union_type("F1.Studio.Integrations.OpenFda.AllergyCategory", [], AllergyCategory, () => [[], [], [], []]);
+}
+
+export class OpenFdaSearchResult extends Record implements IEquatable<OpenFdaSearchResult>, IComparable<OpenFdaSearchResult> {
+    readonly Name: string;
+    readonly GenericName: Option<string>;
+    readonly SubstanceName: string;
+    readonly Category: AllergyCategory_$union;
+    readonly Source: string;
+    readonly NdcCode: Option<string>;
+    readonly Manufacturer: Option<string>;
+    readonly Route: Option<string>;
+    readonly DosageForm: Option<string>;
+    readonly Strength: Option<string>;
+    readonly ReportCount: Option<int32>;
+    constructor(Name: string, GenericName: Option<string>, SubstanceName: string, Category: AllergyCategory_$union, Source: string, NdcCode: Option<string>, Manufacturer: Option<string>, Route: Option<string>, DosageForm: Option<string>, Strength: Option<string>, ReportCount: Option<int32>) {
+        super();
+        this.Name = Name;
+        this.GenericName = GenericName;
+        this.SubstanceName = SubstanceName;
+        this.Category = Category;
+        this.Source = Source;
+        this.NdcCode = NdcCode;
+        this.Manufacturer = Manufacturer;
+        this.Route = Route;
+        this.DosageForm = DosageForm;
+        this.Strength = Strength;
+        this.ReportCount = ReportCount;
+    }
+}
+
+export function OpenFdaSearchResult_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Integrations.OpenFda.OpenFdaSearchResult", [], OpenFdaSearchResult, () => [["Name", string_type], ["GenericName", option_type(string_type)], ["SubstanceName", string_type], ["Category", AllergyCategory_$reflection()], ["Source", string_type], ["NdcCode", option_type(string_type)], ["Manufacturer", option_type(string_type)], ["Route", option_type(string_type)], ["DosageForm", option_type(string_type)], ["Strength", option_type(string_type)], ["ReportCount", option_type(int32_type)]]);
+}
+
+export class CountResult extends Record implements IEquatable<CountResult>, IComparable<CountResult> {
+    readonly Term: string;
+    readonly Count: int32;
+    constructor(Term: string, Count: int32) {
+        super();
+        this.Term = Term;
+        this.Count = (Count | 0);
+    }
+}
+
+export function CountResult_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Integrations.OpenFda.CountResult", [], CountResult, () => [["Term", string_type], ["Count", int32_type]]);
+}
+
+export class LabelWarnings extends Record implements IEquatable<LabelWarnings>, IComparable<LabelWarnings> {
+    readonly Contraindications: Option<string>;
+    readonly Warnings: Option<string>;
+    readonly AdverseReactions: Option<string>;
+    constructor(Contraindications: Option<string>, Warnings: Option<string>, AdverseReactions: Option<string>) {
+        super();
+        this.Contraindications = Contraindications;
+        this.Warnings = Warnings;
+        this.AdverseReactions = AdverseReactions;
+    }
+}
+
+export function LabelWarnings_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Integrations.OpenFda.LabelWarnings", [], LabelWarnings, () => [["Contraindications", option_type(string_type)], ["Warnings", option_type(string_type)], ["AdverseReactions", option_type(string_type)]]);
+}
+
+export class AllergenInsights extends Record implements IEquatable<AllergenInsights>, IComparable<AllergenInsights> {
+    readonly Reactions: FSharpList<CountResult>;
+    readonly TotalEvents: int32;
+    readonly LabelWarnings: Option<LabelWarnings>;
+    constructor(Reactions: FSharpList<CountResult>, TotalEvents: int32, LabelWarnings: Option<LabelWarnings>) {
+        super();
+        this.Reactions = Reactions;
+        this.TotalEvents = (TotalEvents | 0);
+        this.LabelWarnings = LabelWarnings;
+    }
+}
+
+export function AllergenInsights_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Integrations.OpenFda.AllergenInsights", [], AllergenInsights, () => [["Reactions", list_type(CountResult_$reflection())], ["TotalEvents", int32_type], ["LabelWarnings", option_type(LabelWarnings_$reflection())]]);
+}
+
+export class OpenFdaSearchResponse extends Record implements IEquatable<OpenFdaSearchResponse>, IComparable<OpenFdaSearchResponse> {
+    readonly Results: FSharpList<OpenFdaSearchResult>;
+    readonly Query: string;
+    readonly CachedAt: Option<string>;
+    constructor(Results: FSharpList<OpenFdaSearchResult>, Query: string, CachedAt: Option<string>) {
+        super();
+        this.Results = Results;
+        this.Query = Query;
+        this.CachedAt = CachedAt;
+    }
+}
+
+export function OpenFdaSearchResponse_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Integrations.OpenFda.OpenFdaSearchResponse", [], OpenFdaSearchResponse, () => [["Results", list_type(OpenFdaSearchResult_$reflection())], ["Query", string_type], ["CachedAt", option_type(string_type)]]);
+}
+
+export class OpenFdaInsightsResponse extends Record implements IEquatable<OpenFdaInsightsResponse>, IComparable<OpenFdaInsightsResponse> {
+    readonly Insights: AllergenInsights;
+    readonly SubstanceName: string;
+    readonly CachedAt: Option<string>;
+    constructor(Insights: AllergenInsights, SubstanceName: string, CachedAt: Option<string>) {
+        super();
+        this.Insights = Insights;
+        this.SubstanceName = SubstanceName;
+        this.CachedAt = CachedAt;
+    }
+}
+
+export function OpenFdaInsightsResponse_$reflection(): TypeInfo {
+    return record_type("F1.Studio.Integrations.OpenFda.OpenFdaInsightsResponse", [], OpenFdaInsightsResponse, () => [["Insights", AllergenInsights_$reflection()], ["SubstanceName", string_type], ["CachedAt", option_type(string_type)]]);
+}
+
+//# sourceMappingURL=OpenFdaTypes.ts.map

package/src/PluginRegistration.ts

@@ -4,6 +4,7 @@ import { Form_enhancedBMIConverter, Form_pluginConfig as Form_pluginConfig_1 } f
 import { Form_likertConverter, Form_pluginConfig as Form_pluginConfig_2 } from "./plugins/likert/src/LikertField.js";
 import { Form_signatureConverter, Form_pluginConfig as Form_pluginConfig_3 } from "./plugins/signature/src/SignatureField.js";
 import { Form_enhancedDemographicsConverter, Form_pluginConfig as Form_pluginConfig_4 } from "./plugins/demographics/src/DemographicsField.js";
+import { Form_enhancedAllergyConverter, Form_pluginConfig as Form_pluginConfig_5 } from "./plugins/allergyfinder/src/AllergyFinderField.js";
 
 function registerAllPlugins(): void {
     PluginValueRegistry_register(Form_pluginConfig.PluginId, Form_enhancedVitalsConverter);
@@ -11,6 +12,7 @@ function registerAllPlugins(): void {
     PluginValueRegistry_register(Form_pluginConfig_2.PluginId, Form_likertConverter);
     PluginValueRegistry_register(Form_pluginConfig_3.PluginId, Form_signatureConverter);
     PluginValueRegistry_register(Form_pluginConfig_4.PluginId, Form_enhancedDemographicsConverter);
+    PluginValueRegistry_register(Form_pluginConfig_5.PluginId, Form_enhancedAllergyConverter);
 }
 
 registerAllPlugins();

package/src/Thoth.Json/packages/Thoth.Json/Decode.ts

@@ -4,14 +4,14 @@ import { Result_Bind, Result_Map, FSharpResult$2_Ok, FSharpResult$2_Error, FShar
 import { tryParse as tryParse_2 } from "@fable-org/fable-library-js/Guid.js";
 import { toString as toString_12, FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { float32 as float32_1, uint32 as uint32_1, int32, uint16 as uint16_1, int16 as int16_1, uint8, tryParse as tryParse_3, int8, float64 } from "@fable-org/fable-library-js/Int32.js";
-import { parse, fromInt32, toUInt64, uint64 as uint64_1, int64 as int64_1, fromFloat64, toInt64, toFloat64 } from "@fable-org/fable-library-js/BigInt.js";
+import { parse, fromInt32, uint64 as uint64_1, toUInt64, int64 as int64_1, fromFloat64, toInt64, toFloat64 } from "@fable-org/fable-library-js/BigInt.js";
 import { tryParse as tryParse_4 } from "@fable-org/fable-library-js/Long.js";
 import { tryParse as tryParse_5, decimal as decimal_1 } from "@fable-org/fable-library-js/Decimal.js";
 import Decimal from "@fable-org/fable-library-js/Decimal.js";
 import { toUniversalTime, tryParse as tryParse_6, minValue } from "@fable-org/fable-library-js/Date.js";
 import { tryParse as tryParse_7, minValue as minValue_1 } from "@fable-org/fable-library-js/DateOffset.js";
 import { tryParse as tryParse_8 } from "@fable-org/fable-library-js/TimeSpan.js";
-import { map as map_4, value as value_45, defaultArg, some, Option } from "@fable-org/fable-library-js/Option.js";
+import { map as map_4, value as value_44, defaultArg, some, Option } from "@fable-org/fable-library-js/Option.js";
 import { ofArray, toArray, map as map_1, length, singleton, append as append_1, tail as tail_1, head as head_1, isEmpty, ofSeq, empty, reverse, fold, FSharpList, tryLast, cons } from "@fable-org/fable-library-js/List.js";
 import { IComparable, int16ToString, numberHash, compare, comparePrimitives, uncurry3, defaultOf, uncurry2, int32ToString } from "@fable-org/fable-library-js/Util.js";
 import { map as map_2, tryFind, foldBack, fill, setItem, fold as fold_1, item } from "@fable-org/fable-library-js/Array.js";
@@ -306,64 +306,45 @@ export const uint32 = (path: string): ((arg0: any) => FSharpResult$2_$union<uint
     }
 });
 
-export function int64(path: string, value_1: any): FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]> {
-    if (typeof value_1 === "number") {
-        const floatVal: float64 = value_1;
-        if ((floatVal >= toFloat64(-9223372036854775808n)) && (floatVal <= toFloat64(9223372036854775807n))) {
-            return FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(toInt64(fromFloat64(floatVal)));
-        }
-        else {
-            return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an int64", value_1)] as [string, ErrorReason_$union]);
-        }
+export const int64 = (path: string): ((arg0: any) => FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]>) => ((value_2: any): FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]> => {
+    const path_1: string = path;
+    const value_3: any = value_2;
+    if ((typeof value_3) === "number") {
+        const value_1_1: float64 = value_3;
+        return (isFinite(value_1_1) && Math.floor(value_1_1) === value_1_1) ? (((toFloat64(-9223372036854775808n) <= value_1_1) && (value_1_1 <= toFloat64(9223372036854775807n))) ? FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(toInt64(fromFloat64(value_1_1))) : FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an int64", value_1_1, "Value was either too large or too small for an int64")] as [string, ErrorReason_$union])) : FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an int64", value_1_1, "Value is not an integral value")] as [string, ErrorReason_$union]);
     }
-    else if (typeof value_1 === "string") {
+    else if (typeof value_3 === "string") {
         let matchValue: [boolean, int64_1];
         let outArg: int64_1 = 0n;
-        matchValue = ([tryParse_4(value_1, 511, false, 64, new FSharpRef<int64_1>((): int64_1 => outArg, (v: int64_1): void => {
+        matchValue = ([tryParse_4(value_3, 511, false, 64, new FSharpRef<int64_1>((): int64_1 => outArg, (v: int64_1): void => {
             outArg = v;
         })), outArg] as [boolean, int64_1]);
-        if (matchValue[0]) {
-            return FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(matchValue[1]);
-        }
-        else {
-            return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an int64", value_1)] as [string, ErrorReason_$union]);
-        }
+        return matchValue[0] ? FSharpResult$2_Ok<int64_1, [string, ErrorReason_$union]>(matchValue[1]) : FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an int64", value_3)] as [string, ErrorReason_$union]);
     }
     else {
-        return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an int64", value_1)] as [string, ErrorReason_$union]);
+        return FSharpResult$2_Error<int64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an int64", value_3)] as [string, ErrorReason_$union]);
     }
-}
+});
 
-export function uint64(path: string, value_1: any): FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]> {
-    if (typeof value_1 === "bigint") {
-        return FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(value_1);
-    }
-    else if (typeof value_1 === "number") {
-        const floatVal: float64 = value_1;
-        if (((floatVal >= 0) && (floatVal <= toFloat64(18446744073709551615n))) && (floatVal === Math.floor(floatVal))) {
-            return FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(toUInt64(fromFloat64(floatVal)));
-        }
-        else {
-            return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an uint64", value_1)] as [string, ErrorReason_$union]);
-        }
+export const uint64 = (path: string): ((arg0: any) => FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]>) => ((value_2: any): FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]> => {
+    const path_1: string = path;
+    const value_3: any = value_2;
+    if ((typeof value_3) === "number") {
+        const value_1_1: float64 = value_3;
+        return (isFinite(value_1_1) && Math.floor(value_1_1) === value_1_1) ? (((toFloat64(0n) <= value_1_1) && (value_1_1 <= toFloat64(18446744073709551615n))) ? FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(toUInt64(fromFloat64(value_1_1))) : FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an uint64", value_1_1, "Value was either too large or too small for an uint64")] as [string, ErrorReason_$union])) : FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitiveExtra("an uint64", value_1_1, "Value is not an integral value")] as [string, ErrorReason_$union]);
     }
-    else if (typeof value_1 === "string") {
+    else if (typeof value_3 === "string") {
         let matchValue: [boolean, uint64_1];
         let outArg: uint64_1 = 0n;
-        matchValue = ([tryParse_4(value_1, 511, true, 64, new FSharpRef<uint64_1>((): uint64_1 => outArg, (v: uint64_1): void => {
+        matchValue = ([tryParse_4(value_3, 511, true, 64, new FSharpRef<uint64_1>((): uint64_1 => outArg, (v: uint64_1): void => {
             outArg = v;
         })), outArg] as [boolean, uint64_1]);
-        if (matchValue[0]) {
-            return FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(matchValue[1]);
-        }
-        else {
-            return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an uint64", value_1)] as [string, ErrorReason_$union]);
-        }
+        return matchValue[0] ? FSharpResult$2_Ok<uint64_1, [string, ErrorReason_$union]>(matchValue[1]) : FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an uint64", value_3)] as [string, ErrorReason_$union]);
     }
     else {
-        return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path, ErrorReason_BadPrimitive("an uint64", value_1)] as [string, ErrorReason_$union]);
+        return FSharpResult$2_Error<uint64_1, [string, ErrorReason_$union]>([path_1, ErrorReason_BadPrimitive("an uint64", value_3)] as [string, ErrorReason_$union]);
     }
-}
+});
 
 export function bigint(path: string, value_1: any): FSharpResult$2_$union<bigint, [string, ErrorReason_$union]> {
     if ((typeof value_1) === "number") {
@@ -596,7 +577,7 @@ export function optionalAt<value>(fieldNames: FSharpList<string>, decoder: ((arg
         }
     }
     else {
-        return value_45(_arg[2]);
+        return value_44(_arg[2]);
     }
 }
 
@@ -645,7 +626,7 @@ export function at<value>(fieldNames: FSharpList<string>, decoder: ((arg0: strin
         return decoder(_arg[0], _arg[1]);
     }
     else {
-        return value_45(_arg[2]);
+        return value_44(_arg[2]);
     }
 }
 
@@ -1668,7 +1649,7 @@ function mixedArray(offset: int32, decoders: ((arg0: string) => ((arg0: any) =>
 function makeUnion(extra: FSharpMap<string, FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>, caseStrategy: CaseStrategy_$union, t: any, name: string, path: string, values: any[]): FSharpResult$2_$union<any, [string, ErrorReason_$union]> {
     const uci: Option<any> = tryFind<any>((x: any): boolean => (name_3(x) === name), getUnionCases(t, true));
     if (uci != null) {
-        const uci_1: any = value_45(uci);
+        const uci_1: any = value_44(uci);
         const decoders: ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))[] = map_2<any, ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>((fi: any): ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>)) => autoDecoder(extra, caseStrategy, false, fi[1]), getUnionCaseFields(uci_1));
         return Result_Map<FSharpList<any>, any, [string, ErrorReason_$union]>((values_2: FSharpList<any>): any => makeUnion_1(uci_1, toArray<any>(values_2), true), ((decoders.length === 0) && (values.length <= 1)) ? FSharpResult$2_Ok<FSharpList<any>, [string, ErrorReason_$union]>(empty<any>()) : mixedArray(1, decoders, path, values));
     }
@@ -1897,19 +1878,21 @@ function autoDecoder(extra: FSharpMap<string, FSharpRef<((arg0: string) => ((arg
                 case "System.Single":
                     return (path_28: string): ((arg0: any) => FSharpResult$2_$union<float32_1, [string, ErrorReason_$union]>) => ((value_37: any): FSharpResult$2_$union<float32_1, [string, ErrorReason_$union]> => float32(path_28, value_37));
                 case "System.Int64":
-                    return (path_29: string): ((arg0: any) => FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]>) => ((value_38: any): FSharpResult$2_$union<int64_1, [string, ErrorReason_$union]> => int64(path_29, value_38));
+                    return int64;
                 case "System.UInt64":
-                    return (path_30: string): ((arg0: any) => FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]>) => ((value_39: any): FSharpResult$2_$union<uint64_1, [string, ErrorReason_$union]> => uint64(path_30, value_39));
+                    return uint64;
                 case "System.Numerics.BigInteger":
-                    return (path_31: string): ((arg0: any) => FSharpResult$2_$union<bigint, [string, ErrorReason_$union]>) => ((value_40: any): FSharpResult$2_$union<bigint, [string, ErrorReason_$union]> => bigint(path_31, value_40));
+                    return (path_29: string): ((arg0: any) => FSharpResult$2_$union<bigint, [string, ErrorReason_$union]>) => ((value_38: any): FSharpResult$2_$union<bigint, [string, ErrorReason_$union]> => bigint(path_29, value_38));
+                case "System.Decimal":
+                    return (path_30: string): ((arg0: any) => FSharpResult$2_$union<decimal_1, [string, ErrorReason_$union]>) => ((value_39: any): FSharpResult$2_$union<decimal_1, [string, ErrorReason_$union]> => decimal(path_30, value_39));
                 case "System.DateTime":
-                    return (path_32: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_41: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeUtc(path_32, value_41));
+                    return (path_31: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_40: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeUtc(path_31, value_40));
                 case "System.DateTimeOffset":
-                    return (path_33: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_42: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeOffset(path_33, value_42));
+                    return (path_32: string): ((arg0: any) => FSharpResult$2_$union<Date, [string, ErrorReason_$union]>) => ((value_41: any): FSharpResult$2_$union<Date, [string, ErrorReason_$union]> => datetimeOffset(path_32, value_41));
                 case "System.TimeSpan":
-                    return (path_34: string): ((arg0: any) => FSharpResult$2_$union<number, [string, ErrorReason_$union]>) => ((value_43: any): FSharpResult$2_$union<number, [string, ErrorReason_$union]> => timespan(path_34, value_43));
+                    return (path_33: string): ((arg0: any) => FSharpResult$2_$union<number, [string, ErrorReason_$union]>) => ((value_42: any): FSharpResult$2_$union<number, [string, ErrorReason_$union]> => timespan(path_33, value_42));
                 case "System.Guid":
-                    return (path_35: string): ((arg0: any) => FSharpResult$2_$union<string, [string, ErrorReason_$union]>) => ((value_44: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => guid(path_35, value_44));
+                    return (path_34: string): ((arg0: any) => FSharpResult$2_$union<string, [string, ErrorReason_$union]>) => ((value_43: any): FSharpResult$2_$union<string, [string, ErrorReason_$union]> => guid(path_34, value_43));
                 case "System.Object":
                     return (_arg_6: string): ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>) => (FSharpResult$2_Ok);
                 default:
@@ -1918,14 +1901,14 @@ function autoDecoder(extra: FSharpMap<string, FSharpRef<((arg0: string) => ((arg
         }
     }
     else {
-        const decoderRef: FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> = value_45(matchValue);
+        const decoderRef: FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> = value_44(matchValue);
         return (path: string): ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>) => ((value_1: any): FSharpResult$2_$union<any, [string, ErrorReason_$union]> => decoderRef.contents(path)(value_1));
     }
 }
 
 function makeExtra(extra: Option<ExtraCoders>): FSharpMap<string, FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>> {
     if (extra != null) {
-        return map_3<string, [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))], FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>((_arg: string, tupledArg: [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))]): FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> => (new FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>(tupledArg[1])), value_45(extra).Coders);
+        return map_3<string, [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))], FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>((_arg: string, tupledArg: [((arg0: any) => any), ((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))]): FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))> => (new FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>(tupledArg[1])), value_44(extra).Coders);
     }
     else {
         return empty_1<string, FSharpRef<((arg0: string) => ((arg0: any) => FSharpResult$2_$union<any, [string, ErrorReason_$union]>))>>({