@f1studio/form-spec 5.0.0-alpha.168 → 5.0.0-alpha.169

package/src/FormSpec.FS/TriggerActionDto.ts

@@ -1,12 +1,37 @@
-import { ClinicalPathway_ActionInfo_$union, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_$union, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_$union, ClinicalPathway_TaskPriority_$union } from "./FormSpec.js";
-import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { fromDateTimeOffset, today, addDays, toString } from "@fable-org/fable-library-js/Date.js";
-import { orElse, defaultArg, map, Option, value as value_2 } from "@fable-org/fable-library-js/Option.js";
-import { FSharpList, choose } from "@fable-org/fable-library-js/List.js";
-import { TriggerAction } from "../vye-os-contracts-fs/src/Clinical/TriggerAction.js";
+import { Result_Map, FSharpResult$2_$union, FSharpResult$2_Error, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
+import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { ClinicalPathway_ActionInfo_$union, ClinicalPathway_TaskAction, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_StandingSchedule, ClinicalPathway_Cadence_$union, ClinicalPathway_TaskPriority_$union, ClinicalPathway_DueDate_$union } from "./FormSpec.js";
+import { bind, map, defaultArg, Option, value } from "@fable-org/fable-library-js/Option.js";
+import { Union } from "@fable-org/fable-library-js/Types.js";
+import { TriggerAction_$reflection, TriggerAction } from "../vye-os-contracts-fs/src/Clinical/TriggerAction.js";
+import { union_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 
 /**
- * Convert ClinicalPathway.TaskPriority DU → CoreMR int (1=High, 2=Medium, 3=Low)
+ * Convert ClinicalPathway.DueDate DU → date-only string (yyyy-MM-dd), or the reason it cannot be dated.
+ * Date-only format avoids timezone offset issues — the conduit computes date_end as end-of-day from the date portion.
+ * ⛔ `AsStated` is the source's own expression ("+2 months", "+1 hours next monday"); f1 cannot date it exactly, so
+ * it is NOT WRITTEN rather than guessed (CTA-033).
+ */
+export function convertDueDate(dueDate: ClinicalPathway_DueDate_$union): FSharpResult$2_$union<string, string> {
+    switch (dueDate.tag) {
+        case /* Tomorrow */ 1:
+            return FSharpResult$2_Ok<string, string>(toString(addDays(today(), 1), "yyyy-MM-dd"));
+        case /* DaysFromNow */ 2: {
+            const days: int32 = dueDate.fields[0] | 0;
+            return FSharpResult$2_Ok<string, string>(toString(addDays(today(), days), "yyyy-MM-dd"));
+        }
+        case /* SpecificDate */ 3:
+            return FSharpResult$2_Ok<string, string>(toString(fromDateTimeOffset(dueDate.fields[0], 0), "yyyy-MM-dd"));
+        case /* AsStated */ 4:
+            return FSharpResult$2_Error<string, string>(`due "${dueDate.fields[0]}" is the source's own expression and cannot be dated by f1`);
+        default:
+            return FSharpResult$2_Ok<string, string>(toString(today(), "yyyy-MM-dd"));
+    }
+}
+
+/**
+ * Convert ClinicalPathway.TaskPriority DU → CoreMR int (1=High, 2=Medium, 3=Low; a stated band verbatim).
  */
 export function convertPriority(priority: ClinicalPathway_TaskPriority_$union): int32 {
     switch (priority.tag) {
@@ -14,99 +39,247 @@ export function convertPriority(priority: ClinicalPathway_TaskPriority_$union):
             return 2;
         case /* Low */ 2:
             return 3;
+        case /* Stated */ 3:
+            return priority.fields[0] | 0;
         default:
             return 1;
     }
 }
 
-/**
- * Convert ClinicalPathway.DueDate DU → date-only string (yyyy-MM-dd).
- * Date-only format avoids timezone offset issues — the conduit computes
- * date_end as end-of-day from the date portion.
- */
-export function convertDueDate(dueDate: ClinicalPathway_DueDate_$union): string {
-    switch (dueDate.tag) {
-        case /* Tomorrow */ 1:
-            return toString(addDays(today(), 1), "yyyy-MM-dd");
-        case /* DaysFromNow */ 2: {
-            const days: int32 = dueDate.fields[0] | 0;
-            return toString(addDays(today(), days), "yyyy-MM-dd");
-        }
-        case /* SpecificDate */ 3:
-            return toString(fromDateTimeOffset(dueDate.fields[0], 0), "yyyy-MM-dd");
-        default:
-            return toString(today(), "yyyy-MM-dd");
+function requireCategoryId(categoryName: string, categoryIdOpt: Option<int32>): FSharpResult$2_$union<int32, string> {
+    if (categoryIdOpt == null) {
+        return FSharpResult$2_Error<int32, string>(`it states no categoryId (category '${categoryName}'), and CoreMR records every action under one`);
+    }
+    else if (value(categoryIdOpt) > 0) {
+        const id_1: int32 = value(categoryIdOpt) | 0;
+        return FSharpResult$2_Ok<int32, string>(id_1);
+    }
+    else {
+        const id_2: int32 = value(categoryIdOpt) | 0;
+        return FSharpResult$2_Error<int32, string>(`its categoryId ${id_2} (category '${categoryName}') is not a CoreMR id — it must be > 0`);
     }
 }
 
-function requireCategoryId(actionType: string, categoryName: string, categoryIdOpt: Option<int32>): int32 {
-    if (categoryIdOpt == null) {
-        throw new Error(`TriggerActionDto.convert: missing categoryId for actionType='${actionType}' category='${categoryName}'. CoreMR submit requires provenance category IDs.`);
+export type ActionWrite_$union = 
+    | ActionWrite<0>
+    | ActionWrite<1>
+
+export type ActionWrite_$cases = {
+    0: ["Written", [TriggerAction]],
+    1: ["NotWritten", [string, string]]
+}
+
+export function ActionWrite_Written(Item: TriggerAction) {
+    return new ActionWrite<0>(0, [Item]);
+}
+
+export function ActionWrite_NotWritten(action: string, reason: string) {
+    return new ActionWrite<1>(1, [action, reason]);
+}
+
+export class ActionWrite<Tag extends keyof ActionWrite_$cases> extends Union<Tag, ActionWrite_$cases[Tag][0]> {
+    constructor(readonly tag: Tag, readonly fields: ActionWrite_$cases[Tag][1]) {
+        super();
+    }
+    cases() {
+        return ["Written", "NotWritten"];
+    }
+}
+
+export function ActionWrite_$reflection(): TypeInfo {
+    return union_type("F1.Studio.TriggerActions.ActionWrite", [], ActionWrite, () => [[["Item", TriggerAction_$reflection()]], [["action", string_type], ["reason", string_type]]]);
+}
+
+const blank: TriggerAction = new TriggerAction("", 0, 0, 0, "", undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+
+function optionalDate(d: Option<ClinicalPathway_DueDate_$union>): FSharpResult$2_$union<Option<string>, string> {
+    if (d != null) {
+        return Result_Map<string, Option<string>, string>((Value: string): Option<string> => Value, convertDueDate(value(d)));
+    }
+    else {
+        return FSharpResult$2_Ok<Option<string>, string>(undefined);
     }
-    else if (value_2(categoryIdOpt) > 0) {
-        const id_1: int32 = value_2(categoryIdOpt) | 0;
-        return id_1 | 0;
+}
+
+function scheduleIdOf(s: ClinicalPathway_StandingSchedule): Option<int32> {
+    const matchValue: ClinicalPathway_Cadence_$union = s.Cadence;
+    if (matchValue.tag === /* Every */ 1) {
+        return undefined;
     }
     else {
-        const id_2: int32 = value_2(categoryIdOpt) | 0;
-        throw new Error(`TriggerActionDto.convert: invalid categoryId=${id_2} for actionType='${actionType}' category='${categoryName}'. categoryId must be > 0.`);
+        return matchValue.fields[0];
     }
 }
 
 /**
- * BASE conversion: ClinicalPathway ActionInfo → TriggerActionDto.
- * Provider-agnostic — converts only Task, Alert, Problem (generic clinical actions).
- * 
- * DOES NOT produce treatment or medset DTOs (those map to Medication in the pathway,
- * which this function skips). DOES NOT enrich with trigger IDs from provenance.
- * 
- * For CoreMR publishing, use CoreMRTriggerEnrichment.convertActionsForCoreMR instead —
- * it calls this function internally, then adds treatment/medset DTOs and enriches
- * with trigger IDs from provenance.
- * 
- * Direct callers: unit tests (testing base conversion logic in isolation).
- * Production callers: NONE (production always goes through convertActionsForCoreMR).
+ * BASE conversion: ONE ClinicalPathway ActionInfo → its `ActionWrite`. Vendor-free: it sets no trigger identity —
+ * `CoreMRTriggerEnrichment.convertActionsForCoreMR` calls this per action and adds the identity the action's ORIGIN
+ * states (or names an `Authored` action NOT WRITTEN).
+ * ⛔ NOTHING IS SKIPPED SILENTLY: an action the CoreMR write path has no home for (a group change, a medication, a
+ * referral, …) or whose date f1 cannot compute (`AsStated`) is `NotWritten` with its reason.
+ * Callers: `convertActionsForCoreMR` (production) and unit tests.
  */
-export function convertActionsToBaseDtos(actions: FSharpList<ClinicalPathway_ActionInfo_$union>): FSharpList<TriggerAction> {
-    return choose<ClinicalPathway_ActionInfo_$union, TriggerAction>((action: ClinicalPathway_ActionInfo_$union): Option<TriggerAction> => {
-        switch (action.tag) {
-            case /* Task */ 8: {
-                const taskAction: ClinicalPathway_TaskAction = action.fields[0];
-                const actionType: string = (taskAction.Recurrence != null) ? "recurring_task" : "task";
-                return new TriggerAction(actionType, 0, 0, requireCategoryId(actionType, taskAction.Category, taskAction.CategoryId), taskAction.Category, convertPriority(taskAction.Priority), taskAction.Description, convertDueDate(taskAction.DueDate), true, map<ClinicalPathway_RecurrencePattern, string>((r: ClinicalPathway_RecurrencePattern): string => {
-                    const matchValue: ClinicalPathway_RecurrenceEnd_$union = r.Until;
-                    switch (matchValue.tag) {
-                        case /* AfterOccurrences */ 1: {
-                            const n: int32 = matchValue.fields[0] | 0;
-                            return toString(addDays(today(), n), "yyyy-MM-dd");
+export function convertActionToBaseDto(action: ClinicalPathway_ActionInfo_$union): ActionWrite_$union {
+    const notWritten = ActionWrite_NotWritten;
+    switch (action.tag) {
+        case /* Alert */ 9: {
+            const alertAction: ClinicalPathway_AlertAction = action.fields[0];
+            const matchValue_4: FSharpResult$2_$union<int32, string> = requireCategoryId(alertAction.Category, alertAction.CategoryId);
+            if (matchValue_4.tag === /* Ok */ 0) {
+                return ActionWrite_Written(new TriggerAction("alert", blank.TriggerId, blank.TriggerActionId, matchValue_4.fields[0], alertAction.Category, blank.Priority, blank.Description, blank.DateStart, blank.AllDay, blank.ScheduleEnd, blank.ProblemListId, blank.FormItemId, blank.TreatmentId, blank.ScheduleId, blank.ProviderId, blank.Signature, blank.SourceRelatedId, blank.RelatedType, blank.Chronic, blank.Severity, blank.Inflammation, blank.MedsetId, blank.PharmacyId));
+            }
+            else {
+                return notWritten("alert", matchValue_4.fields[0]);
+            }
+        }
+        case /* Problem */ 10: {
+            const problemAction: ClinicalPathway_ProblemAction = action.fields[0];
+            const name: string = defaultArg<string>(problemAction.ProblemName, "");
+            const matchValue_5: FSharpResult$2_$union<int32, string> = requireCategoryId(name, problemAction.CategoryId);
+            if (matchValue_5.tag === /* Ok */ 0) {
+                return ActionWrite_Written(new TriggerAction("problem", blank.TriggerId, blank.TriggerActionId, matchValue_5.fields[0], name, blank.Priority, blank.Description, blank.DateStart, blank.AllDay, blank.ScheduleEnd, blank.ProblemListId, blank.FormItemId, blank.TreatmentId, blank.ScheduleId, blank.ProviderId, blank.Signature, blank.SourceRelatedId, blank.RelatedType, problemAction.Chronic, problemAction.Severity, problemAction.Inflammation, blank.MedsetId, blank.PharmacyId));
+            }
+            else {
+                return notWritten("problem", matchValue_5.fields[0]);
+            }
+        }
+        case /* Treatment */ 1: {
+            const t: ClinicalPathway_TreatmentAction = action.fields[0];
+            const matchValue_6: FSharpResult$2_$union<string, string> = convertDueDate(t.DateStart);
+            const matchValue_7: FSharpResult$2_$union<Option<string>, string> = optionalDate(t.Standing.Ends);
+            let matchResult: int32, reason_5: string, ends_1: Option<string>, start_1: string;
+            const copyOfStruct_2: FSharpResult$2_$union<string, string> = matchValue_6;
+            if (copyOfStruct_2.tag === /* Ok */ 0) {
+                const copyOfStruct_3: FSharpResult$2_$union<Option<string>, string> = matchValue_7;
+                if (copyOfStruct_3.tag === /* Ok */ 0) {
+                    matchResult = 1;
+                    ends_1 = copyOfStruct_3.fields[0];
+                    start_1 = copyOfStruct_2.fields[0];
+                }
+                else {
+                    matchResult = 0;
+                    reason_5 = copyOfStruct_3.fields[0];
+                }
+            }
+            else {
+                matchResult = 0;
+                reason_5 = copyOfStruct_2.fields[0];
+            }
+            switch (matchResult) {
+                case 0:
+                    return notWritten("treatment", reason_5!);
+                default: {
+                    const matchValue_9: Option<int32> = t.TreatmentId;
+                    let matchResult_1: int32, treatmentId: int32;
+                    if (matchValue_9 != null) {
+                        if (value(matchValue_9) === 0) {
+                            matchResult_1 = 0;
+                        }
+                        else {
+                            matchResult_1 = 1;
+                            treatmentId = value(matchValue_9);
                         }
-                        case /* Never */ 2:
-                            return toString(addDays(today(), 7), "yyyy-MM-dd");
+                    }
+                    else {
+                        matchResult_1 = 0;
+                    }
+                    switch (matchResult_1) {
+                        case 0:
+                            return notWritten("treatment", "it states no treatment id, and CoreMR orders a treatment by its id");
                         default:
-                            return toString(fromDateTimeOffset(matchValue.fields[0], 0), "yyyy-MM-dd");
+                            return ActionWrite_Written(new TriggerAction("treatment", blank.TriggerId, blank.TriggerActionId, treatmentId!, defaultArg<string>(t.Name, ""), map<ClinicalPathway_TaskPriority_$union, int32>(convertPriority, t.Priority), t.Description, start_1, blank.AllDay, ends_1, blank.ProblemListId, blank.FormItemId, treatmentId!, scheduleIdOf(t.Standing), t.ProviderId, t.Signature, t.SourceRelatedId, 3, blank.Chronic, blank.Severity, blank.Inflammation, blank.MedsetId, blank.PharmacyId));
                     }
-                }, taskAction.Recurrence), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+                }
             }
-            case /* Alert */ 9: {
-                const alertAction: ClinicalPathway_AlertAction = action.fields[0];
-                return new TriggerAction("alert", 0, 0, requireCategoryId("alert", alertAction.Category, alertAction.CategoryId), alertAction.Category, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+        }
+        case /* Medset */ 2: {
+            const m: ClinicalPathway_MedsetAction = action.fields[0];
+            const matchValue_10: FSharpResult$2_$union<string, string> = convertDueDate(m.DateStart);
+            if (matchValue_10.tag === /* Ok */ 0) {
+                const start_2: string = matchValue_10.fields[0];
+                const matchValue_11: Option<int32> = m.MedsetId;
+                let matchResult_2: int32, medsetId: int32;
+                if (matchValue_11 != null) {
+                    if (value(matchValue_11) === 0) {
+                        matchResult_2 = 0;
+                    }
+                    else {
+                        matchResult_2 = 1;
+                        medsetId = value(matchValue_11);
+                    }
+                }
+                else {
+                    matchResult_2 = 0;
+                }
+                switch (matchResult_2) {
+                    case 0:
+                        return notWritten("medset", "it states no medset id, and CoreMR orders a medset by its id");
+                    default:
+                        return ActionWrite_Written(new TriggerAction("medset", blank.TriggerId, blank.TriggerActionId, medsetId!, m.Name, blank.Priority, blank.Description, start_2, blank.AllDay, blank.ScheduleEnd, blank.ProblemListId, blank.FormItemId, blank.TreatmentId, blank.ScheduleId, m.ProviderId, blank.Signature, blank.SourceRelatedId, blank.RelatedType, blank.Chronic, blank.Severity, blank.Inflammation, medsetId!, m.PharmacyId));
+                }
+            }
+            else {
+                return notWritten("medset", matchValue_10.fields[0]);
             }
-            case /* Problem */ 10: {
-                const problemAction: ClinicalPathway_ProblemAction = action.fields[0];
-                return new TriggerAction("problem", 0, 0, requireCategoryId("problem", problemAction.ProblemName, problemAction.CategoryId), problemAction.ProblemName, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, problemAction.Chronic, problemAction.Severity, problemAction.Inflammation, undefined, undefined);
+        }
+        case /* ChangeGroups */ 14:
+            return notWritten("groups", "a patient-group change: conduit has no write for patient groups");
+        case /* Medication */ 0:
+            return notWritten("medication", "the CoreMR write path has no medication action");
+        case /* Test */ 3:
+            return notWritten("test", "the CoreMR write path has no test action");
+        case /* Referral */ 4:
+            return notWritten("referral", "the CoreMR write path has no referral action");
+        case /* Education */ 5:
+            return notWritten("education", "the CoreMR write path has no education action");
+        case /* Procedure */ 6:
+            return notWritten("procedure", "the CoreMR write path has no procedure action");
+        case /* Documentation */ 7:
+            return notWritten("documentation", "the CoreMR write path has no documentation action");
+        case /* Prescription */ 11:
+            return notWritten("prescription", "the CoreMR write path has no prescription action");
+        case /* SetFieldValue */ 12:
+            return notWritten("setFieldValue", "a form-local field change, not a CoreMR record");
+        case /* NavigateToForm */ 13:
+            return notWritten("navigateToForm", "a navigation, not a CoreMR record");
+        default: {
+            const taskAction: ClinicalPathway_TaskAction = action.fields[0];
+            const actionType: string = (taskAction.Standing != null) ? "recurring_task" : "task";
+            const matchValue: FSharpResult$2_$union<string, string> = convertDueDate(taskAction.DueDate);
+            const matchValue_1: FSharpResult$2_$union<Option<string>, string> = optionalDate(bind<ClinicalPathway_StandingSchedule, ClinicalPathway_DueDate_$union>((s: ClinicalPathway_StandingSchedule): Option<ClinicalPathway_DueDate_$union> => s.Ends, taskAction.Standing));
+            let matchResult_3: int32, reason_1: string, ends: Option<string>, start: string;
+            const copyOfStruct: FSharpResult$2_$union<string, string> = matchValue;
+            if (copyOfStruct.tag === /* Ok */ 0) {
+                const copyOfStruct_1: FSharpResult$2_$union<Option<string>, string> = matchValue_1;
+                if (copyOfStruct_1.tag === /* Ok */ 0) {
+                    matchResult_3 = 1;
+                    ends = copyOfStruct_1.fields[0];
+                    start = copyOfStruct.fields[0];
+                }
+                else {
+                    matchResult_3 = 0;
+                    reason_1 = copyOfStruct_1.fields[0];
+                }
             }
-            case /* Treatment */ 1: {
-                const t: ClinicalPathway_TreatmentAction = action.fields[0];
-                return new TriggerAction("treatment", 0, 0, defaultArg(orElse(t.CategoryId, t.TreatmentId), 0), t.Name, map<ClinicalPathway_TaskPriority_$union, int32>(convertPriority, t.Priority), t.Description, convertDueDate(t.DateStart), undefined, convertDueDate(t.Duration), undefined, undefined, t.TreatmentId, t.ScheduleId, t.ProviderId, t.Signature, t.SourceRelatedId, 3, undefined, undefined, undefined, undefined, undefined);
+            else {
+                matchResult_3 = 0;
+                reason_1 = copyOfStruct.fields[0];
             }
-            case /* Medset */ 2: {
-                const m: ClinicalPathway_MedsetAction = action.fields[0];
-                return new TriggerAction("medset", 0, 0, defaultArg(orElse(m.CategoryId, m.MedsetId), 0), m.Name, undefined, undefined, convertDueDate(m.DateStart), undefined, undefined, undefined, undefined, undefined, undefined, m.ProviderId, undefined, undefined, undefined, undefined, undefined, undefined, m.MedsetId, m.PharmacyId);
+            switch (matchResult_3) {
+                case 0:
+                    return notWritten(actionType, reason_1!);
+                default: {
+                    const matchValue_3: FSharpResult$2_$union<int32, string> = requireCategoryId(taskAction.Category, taskAction.CategoryId);
+                    if (matchValue_3.tag === /* Ok */ 0) {
+                        return ActionWrite_Written(new TriggerAction(actionType, blank.TriggerId, blank.TriggerActionId, matchValue_3.fields[0], taskAction.Category, convertPriority(taskAction.Priority), taskAction.Description, start!, true, ends!, blank.ProblemListId, blank.FormItemId, blank.TreatmentId, bind<ClinicalPathway_StandingSchedule, int32>(scheduleIdOf, taskAction.Standing), blank.ProviderId, blank.Signature, blank.SourceRelatedId, blank.RelatedType, blank.Chronic, blank.Severity, blank.Inflammation, blank.MedsetId, blank.PharmacyId));
+                    }
+                    else {
+                        return notWritten(actionType, matchValue_3.fields[0]);
+                    }
+                }
             }
-            default:
-                return undefined;
         }
-    }, actions);
+    }
 }
 
 //# sourceMappingURL=TriggerActionDto.ts.map

package/src/plugins/allergyfinder/src/AllergyFinderField.ts

@@ -23,7 +23,7 @@ import { collect, empty as empty_1, map as map_1, singleton, append, delay, toLi
 import { tryParse, float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { IReactProperty } from "../../../fable_modules/Feliz.2.8.0/Types.fs.js";
 import { IStandardField$3_$reflection, IStandardField$3, IField$1, StandardRenderFieldConfig$2 } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Types.fs.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Shared_FieldAnswer, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
+import { Spec_FormField$1, Spec_Label_shown, Spec_FieldType_$union, Shared_FieldAnswer, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
 import { IPluginValueConverter } from "../../../FormSpec.FS/PluginInterface.js";
 import { Helpers_combineClasses } from "../../../fable_modules/Feliz.Bulma.3.0.0/ElementBuilders.fs.js";
 import { RenderPreviewProps$1 } from "../../../FormSpec.FS/Interfaces.js";
@@ -1315,10 +1315,10 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
     let matchValue: Shared_FieldValue_$union;
     const allergies: FSharpList<AllergyFinderField_AllergyEntry> = AllergyFinderField_parseAllergies((matchValue = fieldDetails.FieldValue, (matchValue.tag === /* Single */ 0) ? matchValue.fields[0].Value : ((matchValue.tag === /* PluginData */ 3) ? defaultArg(map_2<Shared_PluginDataProperty, string>((p_1: Shared_PluginDataProperty): string => p_1.Value, tryFind<Shared_PluginDataProperty>((p: Shared_PluginDataProperty): boolean => (p.Name === "allergies_json"), matchValue.fields[0])), "[]") : "[]")));
     if (isEmpty_1(allergies)) {
-        return `**${field.Label}:** *[No allergies recorded]*`;
+        return `**${Spec_Label_shown(field.Label)}:** *[No allergies recorded]*`;
     }
     else {
-        let rows: FSharpList<string> = ofArray([`**${field.Label}**`, "", "| Allergen | Severity | Category | Reactions | Remedy |", "|----------|----------|----------|-----------|--------|"]);
+        let rows: FSharpList<string> = ofArray([`**${Spec_Label_shown(field.Label)}**`, "", "| Allergen | Severity | Category | Reactions | Remedy |", "|----------|----------|----------|-----------|--------|"]);
         const enumerator: IEnumerator<AllergyFinderField_AllergyEntry> = getEnumerator(allergies);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {

package/src/plugins/bmi/src/BMIField.ts

@@ -16,7 +16,7 @@ import { empty, singleton, append, delay, toList } from "@fable-org/fable-librar
 import { empty as empty_1, tryFind, FSharpList, ofArray } from "@fable-org/fable-library-js/List.js";
 import { ReactElement } from "../../../fable_modules/Fable.React.Types.18.3.0/Fable.React.fs.js";
 import { IStandardField$3_$reflection, IStandardField$3, IField$1, StandardRenderFieldConfig$2 } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Types.fs.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
+import { Spec_FormField$1, Spec_Label_shown, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
 import { FSharpResult$2_$union, FSharpResult$2_Error, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
 import { IPluginValueConverter } from "../../../FormSpec.FS/PluginInterface.js";
 import { RenderPreviewProps$1 } from "../../../FormSpec.FS/Interfaces.js";
@@ -453,20 +453,27 @@ export function Form_designerPreview(props: RenderPreviewProps$1<Spec_FieldType_
 }
 
 export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$union>, fieldDetails: FieldDetails): string {
-    let matchValue_1: string;
     let value: string;
     const matchValue: Shared_FieldValue_$union = fieldDetails.FieldValue;
     value = ((matchValue.tag === /* Single */ 0) ? matchValue.fields[0].Value : "");
     if (isNullOrWhiteSpace(value)) {
-        return `**${field.Label}:** *[No data entered]*`;
+        return `**${Spec_Label_shown(field.Label)}:** *[No data entered]*`;
     }
     else {
         try {
             const bmiData: BMIField_BMIData = BMIField_parseBMIData(value);
-            return ((((bmiData.Height > 0) && (bmiData.Weight > 0)) && (bmiData.BMI != null)) && (bmiData.Category != null)) ? join("\n", [`**${field.Label}** ${(matchValue_1 = value_90(bmiData.Category), (matchValue_1 === "Underweight") ? "⚖️" : ((matchValue_1 === "Normal weight") ? "✅" : ((matchValue_1 === "Overweight") ? "⚠️" : ((matchValue_1 === "Obese") ? "🚨" : "📊"))))}`, "", "| Metric | Value |", "|--------|-------|", `| **Height** | %P(F1) cm |`, `| **Weight** | %P(F1) kg |`, `| **BMI** | **%P(F1)** |`, `| **Category** | **${value_90(bmiData.Category)}** |`, "", "> 💡 *BMI is calculated as weight (kg) divided by height (m) squared*"]) : (`**${field.Label}:** *[Incomplete data: Height=%P(F1)cm, Weight=%P(F1)kg]*`);
+            if ((((bmiData.Height > 0) && (bmiData.Weight > 0)) && (bmiData.BMI != null)) && (bmiData.Category != null)) {
+                let emoji: string;
+                const matchValue_1: string = value_90(bmiData.Category);
+                emoji = ((matchValue_1 === "Underweight") ? "⚖️" : ((matchValue_1 === "Normal weight") ? "✅" : ((matchValue_1 === "Overweight") ? "⚠️" : ((matchValue_1 === "Obese") ? "🚨" : "📊"))));
+                return join("\n", [`**${Spec_Label_shown(field.Label)}** ${emoji}`, "", "| Metric | Value |", "|--------|-------|", `| **Height** | %P(F1) cm |`, `| **Weight** | %P(F1) kg |`, `| **BMI** | **%P(F1)** |`, `| **Category** | **${value_90(bmiData.Category)}** |`, "", "> 💡 *BMI is calculated as weight (kg) divided by height (m) squared*"]);
+            }
+            else {
+                return `**${Spec_Label_shown(field.Label)}:** *[Incomplete data: Height=%P(F1)cm, Weight=%P(F1)kg]*`;
+            }
         }
         catch (ex: any) {
-            return `**${field.Label}:** *[Error processing data: ${ex.message}]*`;
+            return `**${Spec_Label_shown(field.Label)}:** *[Error processing data: ${ex.message}]*`;
         }
     }
 }

package/src/plugins/demographics/src/DemographicsField.ts

@@ -6,7 +6,7 @@ import { mapValues, Field$3, IAttributes } from "../../../fable_modules/Fable.Fo
 import { Form$3, FieldConfig$4, field as field_1 } from "../../../fable_modules/Fable.Form.3.0.0/Base.fs.js";
 import { join, split, isNullOrWhiteSpace, isNullOrEmpty } from "@fable-org/fable-library-js/String.js";
 import { newGuid } from "@fable-org/fable-library-js/Guid.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig, Shared_FieldOption, Shared_FieldOptionKey } from "../../../FormSpec.FS/FormSpec.js";
+import { Spec_FormField$1, Spec_Label_shown, Spec_FieldType_$union, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig, Shared_FieldOption, Shared_FieldOptionKey } from "../../../FormSpec.FS/FormSpec.js";
 import { empty as empty_1, tryFind, FSharpList, ofArray } from "@fable-org/fable-library-js/List.js";
 import { item } from "@fable-org/fable-library-js/Array.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
@@ -464,7 +464,7 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
     const matchValue: Shared_FieldValue_$union = fieldDetails.FieldValue;
     value = ((matchValue.tag === /* Single */ 0) ? matchValue.fields[0].Value : "");
     if (isNullOrWhiteSpace(value)) {
-        return `**${field.Label}:** *[No demographics recorded]*`;
+        return `**${Spec_Label_shown(field.Label)}:** *[No demographics recorded]*`;
     }
     else {
         try {
@@ -489,12 +489,12 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
             if (data.MRN != null) {
                 void (parts.push(`MRN: ${value_40(data.MRN)}`));
             }
-            return (parts.length > 0) ? ((`**${field.Label}**
+            return (parts.length > 0) ? ((`**${Spec_Label_shown(field.Label)}**
 
-`) + join("\n", map_1<string, string>((p: string): string => ("- " + p), parts))) : (`**${field.Label}:** *[No demographics recorded]*`);
+`) + join("\n", map_1<string, string>((p: string): string => ("- " + p), parts))) : (`**${Spec_Label_shown(field.Label)}:** *[No demographics recorded]*`);
         }
         catch (ex: any) {
-            return `**${field.Label}:** *[Error: ${ex.message}]*`;
+            return `**${Spec_Label_shown(field.Label)}:** *[Error: ${ex.message}]*`;
         }
     }
 }

package/src/plugins/likert/src/LikertField.ts

@@ -14,7 +14,7 @@ import { map as map_2, defaultArg, some, value as value_47, Option } from "@fabl
 import { reactApi } from "../../../fable_modules/Feliz.2.8.0/Interop.fs.js";
 import { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { IStandardField$3_$reflection, IStandardField$3, IField$1, StandardRenderFieldConfig$2 } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Types.fs.js";
-import { Spec_FormField$1, Shared_FieldAnswer, Spec_FieldType_$union, Shared_MatrixAnswer, Shared_FieldOption, Shared_MatrixItemKey, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
+import { Spec_FormField$1, Spec_Label_shown, Shared_FieldAnswer, Spec_FieldType_$union, Shared_MatrixAnswer, Shared_FieldOption, Shared_MatrixItemKey, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
 import { tryParse as tryParse_1 } from "@fable-org/fable-library-js/Guid.js";
 import { FSharpResult$2_$union, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
 import { IPluginValueConverter } from "../../../FormSpec.FS/PluginInterface.js";
@@ -396,10 +396,10 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
             const pairs: FSharpList<[string, string]> = Form_parseLikertSerialized(answer.Value);
             if (isEmpty_2(pairs)) {
                 if (isNullOrWhiteSpace(answer.Value)) {
-                    return `**${field.Label}:** *No responses provided*`;
+                    return `**${Spec_Label_shown(field.Label)}:** *No responses provided*`;
                 }
                 else {
-                    return `**${field.Label}:** ${answer.Value}`;
+                    return `**${Spec_Label_shown(field.Label)}:** ${answer.Value}`;
                 }
             }
             else {
@@ -422,28 +422,32 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
                 const optionScoreMap: FSharpMap<string, int32> = ofList<string, int32>(choose_1<Shared_FieldOption, [string, int32]>((o_2: Shared_FieldOption): Option<[string, int32]> => map_2<int32, [string, int32]>((sc: int32): [string, int32] => ([o_2.Value, sc] as [string, int32]), o_2.Score), options), {
                     Compare: comparePrimitives,
                 });
-                return join("\n", append_1(ofArray([`**${field.Label}** 📊`, "", "| Item | Rating |", "|------|--------|"]), append_1(map_1<[string, string], string>((tupledArg_2: [string, string]): string => {
+                const valueRows_1: FSharpList<string> = map_1<[string, string], string>((tupledArg_2: [string, string]): string => {
                     const itemKey_1: string = tupledArg_2[0];
                     const optValue: string = tupledArg_2[1];
                     return `| ${defaultArg(tryFind<string, string>(itemKey_1, itemLabelMap), itemKey_1)} | **${defaultArg(tryFind<string, string>(optValue, optionLabelMap), optValue)}** |`;
-                }, pairs), ofArray(["", `> **Total Score:** ${sum<int32>(choose_1<[string, string], int32>((tupledArg_3: [string, string]): Option<int32> => tryFind<string, int32>(tupledArg_3[1], optionScoreMap), pairs), {
+                }, pairs);
+                const totalScore_1: int32 = sum<int32>(choose_1<[string, string], int32>((tupledArg_3: [string, string]): Option<int32> => tryFind<string, int32>(tupledArg_3[1], optionScoreMap), pairs), {
                     GetZero: (): int32 => 0,
                     Add: (x_4: int32, y_4: int32): int32 => (x_4 + y_4),
-                })} (${length<[string, string]>(pairs)} items rated)`]))));
+                }) | 0;
+                const itemCount_1: int32 = length<[string, string]>(pairs) | 0;
+                return join("\n", append_1(ofArray([`**${Spec_Label_shown(field.Label)}** 📊`, "", "| Item | Rating |", "|------|--------|"]), append_1(valueRows_1, ofArray(["", `> **Total Score:** ${totalScore_1} (${itemCount_1} items rated)`]))));
             }
         }
         case /* Multiple */ 1:
-            return `**${field.Label}:** *Multiple values (unexpected format)*`;
+            return `**${Spec_Label_shown(field.Label)}:** *Multiple values (unexpected format)*`;
         case /* PluginData */ 3:
-            return `**${field.Label}:** *Plugin data (use plugin-specific export)*`;
+            return `**${Spec_Label_shown(field.Label)}:** *Plugin data (use plugin-specific export)*`;
         default: {
             const matrixAnswer: Shared_MatrixAnswer = matchValue.fields[0];
             const itemCount: int32 = FSharpMap__get_Count(matrixAnswer.Values) | 0;
             if (itemCount === 0) {
-                return `**${field.Label}:** *No responses provided*`;
+                return `**${Spec_Label_shown(field.Label)}:** *No responses provided*`;
             }
             else {
-                return join("\n", append_1(ofArray([`**${field.Label}** 📊`, "", "| Item | Rating |", "|------|--------|"]), append_1(map_1<[Shared_MatrixItemKey, string], string>((tupledArg: [Shared_MatrixItemKey, string]): string => (`| ${substring(tupledArg[0].fields[0], 0, 8)} | **${tupledArg[1]}** |`), toList_1<Shared_MatrixItemKey, string>(matrixAnswer.Values)), ofArray(["", `> **Total Score:** ${sum<int32>(choose_1<[Shared_MatrixItemKey, string], int32>((tupledArg_1: [Shared_MatrixItemKey, string]): Option<int32> => {
+                const valueRows: FSharpList<string> = map_1<[Shared_MatrixItemKey, string], string>((tupledArg: [Shared_MatrixItemKey, string]): string => (`| ${substring(tupledArg[0].fields[0], 0, 8)} | **${tupledArg[1]}** |`), toList_1<Shared_MatrixItemKey, string>(matrixAnswer.Values));
+                const totalScore: int32 = sum<int32>(choose_1<[Shared_MatrixItemKey, string], int32>((tupledArg_1: [Shared_MatrixItemKey, string]): Option<int32> => {
                     let matchValue_1: [boolean, int32];
                     let outArg = 0;
                     matchValue_1 = ([tryParse(tupledArg_1[1], 511, false, 32, new FSharpRef<int32>((): int32 => outArg, (v_1: int32): void => {
@@ -458,7 +462,8 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
                 }, toList_1<Shared_MatrixItemKey, string>(matrixAnswer.Values)), {
                     GetZero: (): int32 => 0,
                     Add: (x: int32, y: int32): int32 => (x + y),
-                })} (${itemCount} items rated)`]))));
+                }) | 0;
+                return join("\n", append_1(ofArray([`**${Spec_Label_shown(field.Label)}** 📊`, "", "| Item | Rating |", "|------|--------|"]), append_1(valueRows, ofArray(["", `> **Total Score:** ${totalScore} (${itemCount} items rated)`]))));
             }
         }
     }

package/src/plugins/signature/src/SignatureField.ts

@@ -19,7 +19,7 @@ import { reactApi as reactApi_1 } from "../../../fable_modules/Feliz.2.8.0/Inter
 import react_signature_pad_wrapper from "react-signature-pad-wrapper";
 import { IStandardField$3_$reflection, IStandardField$3, IField$1, StandardRenderFieldConfig$2 } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Types.fs.js";
 import { ISignaturePadProperty } from "../../../fable_modules/Glutinum.Feliz.ReactSignaturePadWrapper.1.0.2/Types.fs.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_Single, Shared_FieldAnswer, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
+import { Spec_FormField$1, Spec_Label_shown, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_Single, Shared_FieldAnswer, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
 import { FSharpResult$2_$union, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
 import { IPluginValueConverter } from "../../../FormSpec.FS/PluginInterface.js";
 import { Helpers_combineClasses } from "../../../fable_modules/Feliz.Bulma.3.0.0/ElementBuilders.fs.js";
@@ -175,10 +175,11 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
     const matchValue: Shared_FieldValue_$union = fieldDetails.FieldValue;
     value = ((matchValue.tag === /* Single */ 0) ? matchValue.fields[0].Value : "");
     if (isNullOrWhiteSpace(value)) {
-        return `**${field.Label}:** ❌ *[No signature provided]*`;
+        return `**${Spec_Label_shown(field.Label)}:** ❌ *[No signature provided]*`;
     }
     else {
-        return join("\n", [`**${field.Label}** ✍️`, "", "| Status | Details |", "|--------|---------|", "| **Signature** | ✅ **Captured** |", `| **Timestamp** | ${toString(now(), "yyyy-MM-dd HH:mm")} |`, `| **Data Size** | ${value.length} characters |`, "| **Format** | Digital signature |", "", "> 🔒 *Digital signature has been securely captured and stored*", ">", "> 📋 *This signature serves as electronic consent and acknowledgment*"]);
+        const timestamp: string = toString(now(), "yyyy-MM-dd HH:mm");
+        return join("\n", [`**${Spec_Label_shown(field.Label)}** ✍️`, "", "| Status | Details |", "|--------|---------|", "| **Signature** | ✅ **Captured** |", `| **Timestamp** | ${timestamp} |`, `| **Data Size** | ${value.length} characters |`, "| **Format** | Digital signature |", "", "> 🔒 *Digital signature has been securely captured and stored*", ">", "> 📋 *This signature serves as electronic consent and acknowledgment*"]);
     }
 }
 

package/src/plugins/vitals/src/VitalsField.ts

@@ -17,7 +17,7 @@ import { append as append_1, cons, empty as empty_1, tryFind, FSharpList, exists
 import { IReactProperty } from "../../../fable_modules/Feliz.2.8.0/Types.fs.js";
 import { withLabelAndError } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Html.View.fs.js";
 import { IStandardField$3_$reflection, IStandardField$3, IField$1, StandardRenderFieldConfig$2 } from "../../../fable_modules/Fable.Form.Simple.Bulma.5.0.1/Types.fs.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
+import { Spec_FormField$1, Spec_Label_shown, Spec_FieldType_$union, Shared_FieldOption, Shared_FieldValue_$union, Shared_FieldKey, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Spec_PluginFieldConfig } from "../../../FormSpec.FS/FormSpec.js";
 import { FSharpResult$2_$union, FSharpResult$2_Error, FSharpResult$2_Ok } from "@fable-org/fable-library-js/Result.js";
 import { IPluginValueConverter } from "../../../FormSpec.FS/PluginInterface.js";
 import { Helpers_combineClasses } from "../../../fable_modules/Feliz.Bulma.3.0.0/ElementBuilders.fs.js";
@@ -531,7 +531,7 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
     const matchValue: Shared_FieldValue_$union = fieldDetails.FieldValue;
     value = ((matchValue.tag === /* Single */ 0) ? matchValue.fields[0].Value : "");
     if (isNullOrWhiteSpace(value)) {
-        return `**${field.Label}:** *[No vital signs recorded]*`;
+        return `**${Spec_Label_shown(field.Label)}:** *[No vital signs recorded]*`;
     }
     else {
         try {
@@ -553,7 +553,7 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
                     }
                 };
                 const propStatus = (name: string): Option<VitalPropertyValidation> => tryFind_1<VitalPropertyValidation>((p: VitalPropertyValidation): boolean => (p.PropertyName === name), result.Properties);
-                let rows: FSharpList<string> = ofArray([("**" + field.Label) + "** 🩺", "", "| Vital Sign | Value | Status |", "|------------|-------|--------|"]);
+                let rows: FSharpList<string> = ofArray([("**" + Spec_Label_shown(field.Label)) + "** 🩺", "", "| Vital Sign | Value | Status |", "|------------|-------|--------|"]);
                 if (vitalsData.Temperature != null) {
                     const v_1: Option<VitalPropertyValidation> = propStatus("temperature");
                     rows = append_1(rows, singleton_1(((("| **Temperature** | " + ((arg = value_202(vitalsData.Temperature), toText(printf("%.1f"))(arg)))) + "°F | ") + statusEmoji(defaultArg(map<VitalPropertyValidation, string>((p_1: VitalPropertyValidation): string => p_1.ClinicalStatus, v_1), "empty"))) + " |"));
@@ -601,11 +601,11 @@ export function Form_markdownRenderer(field: Spec_FormField$1<Spec_FieldType_$un
                 return join("\n", rows);
             }
             else {
-                return ("**" + field.Label) + ":** *[No complete vital signs recorded]*";
+                return ("**" + Spec_Label_shown(field.Label)) + ":** *[No complete vital signs recorded]*";
             }
         }
         catch (ex: any) {
-            return ((("**" + field.Label) + ":** *[Error processing vital signs data: ") + ex.message) + "]*";
+            return ((("**" + Spec_Label_shown(field.Label)) + ":** *[Error processing vital signs data: ") + ex.message) + "]*";
         }
     }
 }