@f1studio/form-spec 5.0.0-alpha.152 → 5.0.0-alpha.155

package/README.md

@@ -1,6 +1,6 @@
 # FormSpec – Build & Publish
 
-**Version: `5.0.0-alpha.152`**
+**Version: `5.0.0-alpha.155`**
 
 TypeScript package generated from F# via Fable. Runtime uses external `@fable-org/fable-library-js`.
 
@@ -63,17 +63,17 @@ Notes:
 ### From Verdaccio (local testing)
 
 ```bash
-npm install @f1studio/form-spec@5.0.0-alpha.152 --registry http://localhost:4873
-pnpm add @f1studio/form-spec@5.0.0-alpha.152 --registry http://localhost:4873
-bun add @f1studio/form-spec@5.0.0-alpha.152 --registry http://localhost:4873
+npm install @f1studio/form-spec@5.0.0-alpha.155 --registry http://localhost:4873
+pnpm add @f1studio/form-spec@5.0.0-alpha.155 --registry http://localhost:4873
+bun add @f1studio/form-spec@5.0.0-alpha.155 --registry http://localhost:4873
 ```
 
 ### From npm (public registry)
 
 ```bash
-npm install @f1studio/form-spec@5.0.0-alpha.152
-pnpm add @f1studio/form-spec@5.0.0-alpha.152
-bun add @f1studio/form-spec@5.0.0-alpha.152
+npm install @f1studio/form-spec@5.0.0-alpha.155
+pnpm add @f1studio/form-spec@5.0.0-alpha.155
+bun add @f1studio/form-spec@5.0.0-alpha.155
 ```
 
 Entry points:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@f1studio/form-spec",
-  "version": "5.0.0-alpha.152",
+  "version": "5.0.0-alpha.155",
   "description": "F1 Core - Form specification and types",
   "main": "./FormSpec.FS/Interop/FormSpec.Api.Option.js",
   "types": "./FormSpec.FS/Interop/FormSpec.Api.Option.d.ts",

package/plugins/allergyfinder/src/AllergyLogic.d.ts

@@ -49,12 +49,6 @@ export declare function validateAllergyData(entries: AllergyEntryData[], reporte
 export declare const PropertyKeys_AllergyCount: Shared_PluginPropertyKey;
 export declare const PropertyKeys_HasSevereAllergy: Shared_PluginPropertyKey;
 export declare const PropertyKeys_AllergiesJson: Shared_PluginPropertyKey;
-/**
- * Serialize allergy entries to the canonical TS wire format.
- * Returns the output of Convert.fieldValueToTs(FieldValue.PluginData [...]).
- * TypeScript passes this directly to onValueChange — zero ad-hoc construction.
- */
-export declare function serializeAllergiesToCanonical(entries: AllergyEntryData[]): any;
 /**
  * Validate plugin data from the wire format.
  * Takes array (not list) of PluginDataProperty for TS interop.

package/plugins/allergyfinder/src/AllergyLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AllergyLogic.d.ts","sourceRoot":"","sources":["../../../../FormSpec.TS/plugins/allergyfinder/src/AllergyLogic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AllergyLogic.d.ts","sourceRoot":"","sources":["../../../../FormSpec.TS/plugins/allergyfinder/src/AllergyLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAwB,WAAW,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACpG,OAAO,EAA+D,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAClI,OAAO,EAAY,KAAK,EAAE,MAAM,sCAAsC,CAAC;AASvE,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAEvG,qBAAa,gBAAiB,SAAQ,MAAO,YAAW,UAAU,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC;IAC/G,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBACX,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM;CAchN;AAED,wBAAgB,4BAA4B,IAAI,QAAQ,CAEvD;AAED,qBAAa,yBAA0B,SAAQ,MAAO,YAAW,UAAU,CAAC,yBAAyB,CAAC,EAAE,WAAW,CAAC,yBAAyB,CAAC;IAC1I,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBACb,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAO7F;AAED,wBAAgB,qCAAqC,IAAI,QAAQ,CAEhE;AAED,qBAAa,uBAAwB,SAAQ,MAAO,YAAW,UAAU,CAAC,uBAAuB,CAAC,EAAE,WAAW,CAAC,uBAAuB,CAAC;IACpI,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,yBAAyB,EAAE,CAAC;gBACtC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE;CAOzH;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,eAAO,MAAM,eAAe,EAAE,MAAM,EAAgD,CAAC;AAErF,eAAO,MAAM,eAAe,EAAE,MAAM,EAAkE,CAAC;AAEvG,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAA4C,CAAC;AAEnF,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAOlD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,GAAG,yBAAyB,CAsBvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,GAAG,uBAAuB,CAS1I;AAUD,eAAO,MAAM,yBAAyB,EAAE,wBAA+F,CAAC;AAExI,eAAO,MAAM,6BAA6B,EAAE,wBAA+F,CAAC;AAE5I,eAAO,MAAM,0BAA0B,EAAE,wBAA+F,CAAC;AAEzI;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,yBAAyB,EAAE,GAAG,uBAAuB,CAoC1G"}

package/src/FormSpec.FS/BitmaskHelpers.ts

@@ -1,5 +1,5 @@
-import { empty, mapIndexed, forAll, length, FSharpList, fold } from "@fable-org/fable-library-js/List.js";
-import { equals, int64, op_LeftShift, op_BitwiseOr, toInt64 } from "@fable-org/fable-library-js/BigInt.js";
+import { map, mapIndexed, forAll, length, FSharpList, fold } from "@fable-org/fable-library-js/List.js";
+import { toInt32, equals, int64, op_LeftShift, op_BitwiseOr, toInt64 } from "@fable-org/fable-library-js/BigInt.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { toList } from "@fable-org/fable-library-js/Seq.js";
 import { rangeDouble } from "@fable-org/fable-library-js/Range.js";
@@ -46,7 +46,7 @@ export function normalizeChoiceScores(sortedScores: FSharpList<int64>): [FSharpL
         return [toList<int32>(rangeDouble(0, 1, length(sortedScores) - 1)), true] as [FSharpList<int32>, boolean];
     }
     else {
-        return [empty<int32>(), false] as [FSharpList<int32>, boolean];
+        return [map<int64, int32>((value: int64): int32 => ~~toInt32(value), sortedScores), false] as [FSharpList<int32>, boolean];
     }
 }
 

package/src/FormSpec.FS/FormSpec.ts

@@ -1893,14 +1893,16 @@ export function ClinicalPathway_RecurrencePattern_$reflection(): TypeInfo {
 }
 
 export class ClinicalPathway_TaskAction extends Record implements IEquatable<ClinicalPathway_TaskAction>, IComparable<ClinicalPathway_TaskAction> {
+    readonly CategoryId: Option<int32>;
     readonly Category: string;
     readonly Description: string;
     readonly Priority: ClinicalPathway_TaskPriority_$union;
     readonly DueDate: ClinicalPathway_DueDate_$union;
     readonly Assignee: string;
     readonly Recurrence: Option<ClinicalPathway_RecurrencePattern>;
-    constructor(Category: string, Description: string, Priority: ClinicalPathway_TaskPriority_$union, DueDate: ClinicalPathway_DueDate_$union, Assignee: string, Recurrence: Option<ClinicalPathway_RecurrencePattern>) {
+    constructor(CategoryId: Option<int32>, Category: string, Description: string, Priority: ClinicalPathway_TaskPriority_$union, DueDate: ClinicalPathway_DueDate_$union, Assignee: string, Recurrence: Option<ClinicalPathway_RecurrencePattern>) {
         super();
+        this.CategoryId = CategoryId;
         this.Category = Category;
         this.Description = Description;
         this.Priority = Priority;
@@ -1911,7 +1913,7 @@ export class ClinicalPathway_TaskAction extends Record implements IEquatable<Cli
 }
 
 export function ClinicalPathway_TaskAction_$reflection(): TypeInfo {
-    return record_type("F1.Studio.ClinicalPathway.TaskAction", [], ClinicalPathway_TaskAction, () => [["Category", string_type], ["Description", string_type], ["Priority", ClinicalPathway_TaskPriority_$reflection()], ["DueDate", ClinicalPathway_DueDate_$reflection()], ["Assignee", string_type], ["Recurrence", option_type(ClinicalPathway_RecurrencePattern_$reflection())]]);
+    return record_type("F1.Studio.ClinicalPathway.TaskAction", [], ClinicalPathway_TaskAction, () => [["CategoryId", option_type(int32_type)], ["Category", string_type], ["Description", string_type], ["Priority", ClinicalPathway_TaskPriority_$reflection()], ["DueDate", ClinicalPathway_DueDate_$reflection()], ["Assignee", string_type], ["Recurrence", option_type(ClinicalPathway_RecurrencePattern_$reflection())]]);
 }
 
 export type ClinicalPathway_AlertSeverity_$union = 
@@ -1957,12 +1959,14 @@ export function ClinicalPathway_AlertSeverity_$reflection(): TypeInfo {
 }
 
 export class ClinicalPathway_AlertAction extends Record implements IEquatable<ClinicalPathway_AlertAction>, IComparable<ClinicalPathway_AlertAction> {
+    readonly CategoryId: Option<int32>;
     readonly Category: string;
     readonly Message: string;
     readonly Severity: ClinicalPathway_AlertSeverity_$union;
     readonly ExpiresAfter: Option<number>;
-    constructor(Category: string, Message: string, Severity: ClinicalPathway_AlertSeverity_$union, ExpiresAfter: Option<number>) {
+    constructor(CategoryId: Option<int32>, Category: string, Message: string, Severity: ClinicalPathway_AlertSeverity_$union, ExpiresAfter: Option<number>) {
         super();
+        this.CategoryId = CategoryId;
         this.Category = Category;
         this.Message = Message;
         this.Severity = Severity;
@@ -1971,7 +1975,7 @@ export class ClinicalPathway_AlertAction extends Record implements IEquatable<Cl
 }
 
 export function ClinicalPathway_AlertAction_$reflection(): TypeInfo {
-    return record_type("F1.Studio.ClinicalPathway.AlertAction", [], ClinicalPathway_AlertAction, () => [["Category", string_type], ["Message", string_type], ["Severity", ClinicalPathway_AlertSeverity_$reflection()], ["ExpiresAfter", option_type(class_type("System.TimeSpan"))]]);
+    return record_type("F1.Studio.ClinicalPathway.AlertAction", [], ClinicalPathway_AlertAction, () => [["CategoryId", option_type(int32_type)], ["Category", string_type], ["Message", string_type], ["Severity", ClinicalPathway_AlertSeverity_$reflection()], ["ExpiresAfter", option_type(class_type("System.TimeSpan"))]]);
 }
 
 export type ClinicalPathway_ProblemStatus_$union = 
@@ -2017,13 +2021,15 @@ export function ClinicalPathway_ProblemStatus_$reflection(): TypeInfo {
 }
 
 export class ClinicalPathway_ProblemAction extends Record implements IEquatable<ClinicalPathway_ProblemAction>, IComparable<ClinicalPathway_ProblemAction> {
+    readonly CategoryId: Option<int32>;
     readonly ProblemName: string;
     readonly IcdCode: Option<string>;
     readonly Onset: Option<Date>;
     readonly Status: ClinicalPathway_ProblemStatus_$union;
     readonly Notes: Option<string>;
-    constructor(ProblemName: string, IcdCode: Option<string>, Onset: Option<Date>, Status: ClinicalPathway_ProblemStatus_$union, Notes: Option<string>) {
+    constructor(CategoryId: Option<int32>, ProblemName: string, IcdCode: Option<string>, Onset: Option<Date>, Status: ClinicalPathway_ProblemStatus_$union, Notes: Option<string>) {
         super();
+        this.CategoryId = CategoryId;
         this.ProblemName = ProblemName;
         this.IcdCode = IcdCode;
         this.Onset = Onset;
@@ -2033,7 +2039,7 @@ export class ClinicalPathway_ProblemAction extends Record implements IEquatable<
 }
 
 export function ClinicalPathway_ProblemAction_$reflection(): TypeInfo {
-    return record_type("F1.Studio.ClinicalPathway.ProblemAction", [], ClinicalPathway_ProblemAction, () => [["ProblemName", string_type], ["IcdCode", option_type(string_type)], ["Onset", option_type(class_type("System.DateTimeOffset"))], ["Status", ClinicalPathway_ProblemStatus_$reflection()], ["Notes", option_type(string_type)]]);
+    return record_type("F1.Studio.ClinicalPathway.ProblemAction", [], ClinicalPathway_ProblemAction, () => [["CategoryId", option_type(int32_type)], ["ProblemName", string_type], ["IcdCode", option_type(string_type)], ["Onset", option_type(class_type("System.DateTimeOffset"))], ["Status", ClinicalPathway_ProblemStatus_$reflection()], ["Notes", option_type(string_type)]]);
 }
 
 export class ClinicalPathway_PrescriptionAction extends Record implements IEquatable<ClinicalPathway_PrescriptionAction>, IComparable<ClinicalPathway_PrescriptionAction> {

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

@@ -1,17 +1,17 @@
-import { Record } from "@fable-org/fable-library-js/Types.js";
+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 { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { bind, orElse, map as map_1, orElseWith, defaultArg, Option, value as value_3 } 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, orElseWith, defaultArg, Option, value as value_5 } from "@fable-org/fable-library-js/Option.js";
 import { Spec_FormClassification_$union, Spec_FormClassification_General, Spec_FormClassification_Screening, Spec_FormClassification_Intake, Spec_FormClassification_ClinicalInstrument, Spec_ClinicalInstrumentInfo, Spec_InstrumentConfidence_Inferred, Spec_InstrumentConfidence_Exact } from "../../../FormSpec.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, CoreMRChoice, CoreMRItem, CoreMRFormMetadata } from "../../CorEMR/CoreMRTypes.js";
-import { empty, item as item_2, length, mapIndexed, sortBy, collect, FSharpList, isEmpty, map } from "@fable-org/fable-library-js/List.js";
+import { CoreMRFormDetail, CoreMRTag, CoreMRTrigger, CoreMRTriggerEvent, CoreMRTriggerCondition, CoreMRChoice, CoreMRItem, CoreMRFormMetadata } from "../../CorEMR/CoreMRTypes.js";
+import { empty, choose, item as item_3, length, mapIndexed, sortBy, collect, FSharpList, isEmpty, map } from "@fable-org/fable-library-js/List.js";
 import { FSharpMap, filter, keys, isEmpty as isEmpty_1, tryFind } from "@fable-org/fable-library-js/Map.js";
 import { ElementTypeInfo, getElementTypeInfo } from "./CorEMRElementTypeMap.js";
-import { TemplateForm, TemplateChoice, TemplateItem } from "../../CorEMR/TemplateManifestDecoder.js";
+import { TemplateForm, ItemTrigger, TriggerAction, TriggerCondition, TemplateChoice, TemplateItem } from "../../CorEMR/TemplateManifestDecoder.js";
 import { normalizeChoiceScores } from "../../../BitmaskHelpers.js";
 
 export class BridgeElementTypeInfo extends Record implements IEquatable<BridgeElementTypeInfo>, IComparable<BridgeElementTypeInfo> {
@@ -46,11 +46,11 @@ function hasTextHasDateFromBridge(textField: string): [boolean, boolean] {
 export function mapFormClassification(formCategory: Option<string>, instrumentType: Option<string>, instrumentConfidence: Option<string>, instrumentMaxScore: Option<int32>): Spec_FormClassification_$union {
     let matchResult: int32, instType: string;
     if (formCategory != null) {
-        switch (value_3(formCategory)) {
+        switch (value_5(formCategory)) {
             case "clinical_instrument": {
                 if (instrumentType != null) {
                     matchResult = 0;
-                    instType = value_3(instrumentType);
+                    instType = value_5(instrumentType);
                 }
                 else {
                     matchResult = 3;
@@ -74,7 +74,7 @@ export function mapFormClassification(formCategory: Option<string>, instrumentTy
     }
     switch (matchResult) {
         case 0:
-            return Spec_FormClassification_ClinicalInstrument(new Spec_ClinicalInstrumentInfo(instType!, (instrumentConfidence != null) ? ((value_3(instrumentConfidence) === "exact") ? Spec_InstrumentConfidence_Exact() : Spec_InstrumentConfidence_Inferred()) : Spec_InstrumentConfidence_Inferred(), instrumentMaxScore));
+            return Spec_FormClassification_ClinicalInstrument(new Spec_ClinicalInstrumentInfo(instType!, (instrumentConfidence != null) ? ((value_5(instrumentConfidence) === "exact") ? Spec_InstrumentConfidence_Exact() : Spec_InstrumentConfidence_Inferred()) : Spec_InstrumentConfidence_Inferred(), instrumentMaxScore));
         case 1:
             return Spec_FormClassification_Intake();
         case 2:
@@ -115,13 +115,29 @@ export function mapNewTemplateToCoreMRDetail(elementTypes: FSharpMap<int32, Brid
         const bitPositions: Option<FSharpList<int32>> = (FSharpSet__Contains(multiSelectTypes, item_1.Type) && patternInput_1[1]) ? patternInput_1[0] : undefined;
         return mapIndexed<TemplateChoice, CoreMRChoice>((index: int32, choice: TemplateChoice): CoreMRChoice => (new CoreMRChoice(choice.ChoiceId, item_1.ItemId, choice.Sequence, choice.Text, choice.Score, orElse(choice.BitPosition, bind<FSharpList<int32>, int32>((positions: FSharpList<int32>): Option<int32> => {
             if (index < length(positions)) {
-                return item_2(index, positions);
+                return item_3(index, positions);
             }
             else {
                 return undefined;
             }
         }, bitPositions)), choice.Code, map_1<int32, string>(int32ToString, choice.Highlight))), sortedChoices);
-    }, template.Items), empty<CoreMRTrigger>(), empty<CoreMRTag>(), undefined);
+    }, template.Items), collect<TemplateItem, CoreMRTrigger>((item_2: TemplateItem): FSharpList<CoreMRTrigger> => mapIndexed<ItemTrigger, CoreMRTrigger>((triggerOrder: int32, trigger: ItemTrigger): CoreMRTrigger => {
+        const conditions: FSharpList<CoreMRTriggerCondition> = map<TriggerCondition, CoreMRTriggerCondition>((cond: TriggerCondition): CoreMRTriggerCondition => (new CoreMRTriggerCondition(cond.ConditionId, trigger.TriggerId, undefined, cond.Source, cond.Operator, !isEmpty(cond.RawChoiceIds) ? cond.RawChoiceIds : choose<string, int32>((value_3: string): Option<int32> => {
+            let matchValue: [boolean, int32];
+            let outArg = 0;
+            matchValue = ([tryParse(value_3, 511, false, 32, new FSharpRef<int32>((): int32 => outArg, (v: int32): void => {
+                outArg = (v | 0);
+            })), outArg] as [boolean, int32]);
+            if (matchValue[0]) {
+                return matchValue[1];
+            }
+            else {
+                return undefined;
+            }
+        }, cond.Values))), trigger.Conditions);
+        const events: FSharpList<CoreMRTriggerEvent> = map<TriggerAction, CoreMRTriggerEvent>((action: TriggerAction): CoreMRTriggerEvent => (new CoreMRTriggerEvent(action.ActionId, trigger.TriggerId, action.ActionType, action.Params)), trigger.Actions);
+        return new CoreMRTrigger(trigger.TriggerId, item_2.ItemId, trigger.EventName, triggerOrder + 1, defaultArg(trigger.ExclusiveTag, ""), trigger.Enabled, conditions, events);
+    }, item_2.Triggers), template.Items), empty<CoreMRTag>(), undefined);
 }
 
 //# sourceMappingURL=CorEMRTemplateMapper.ts.map

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

@@ -1,12 +1,12 @@
 import { Helpers_generateDeterministicGuidRaw } from "../../../Helpers.js";
 import { ClinicalPathway_PathwayExecutionMode_MultiPathway, ClinicalPathway_MultiPathwayConfig, ClinicalPathway_ConflictResolution_CombineActions, ClinicalPathway_CombinationStrategy_AllMatching, ClinicalPathway_PathwayExecutionMode_$union, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_TriggerBased, ClinicalPathway_TriggerBasedConfig, ClinicalPathway_TransitionDefinition, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateType_CompoundAction, ClinicalPathway_StateType_Action, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Evaluation, ClinicalPathway_EvaluationInfo, Shared_TransitionKey, Shared_StateKey, ClinicalPathway_TransitionCondition_Always, ClinicalPathway_TransitionCondition_CompositeCondition, ClinicalPathway_LogicalOp_And, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, Shared_ConditionValue_Multiple, Shared_FieldKey, ClinicalPathway_ActionInfo_$union, ClinicalPathway_ActionInfo_Prescription, ClinicalPathway_PrescriptionAction, ClinicalPathway_ActionInfo_Medication, ClinicalPathway_MedicationAction, ClinicalPathway_ActionInfo_Problem, ClinicalPathway_ProblemAction, ClinicalPathway_ProblemStatus_Active, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_ActionInfo_Alert, ClinicalPathway_AlertAction, ClinicalPathway_AlertSeverity_High, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_OnDate, ClinicalPathway_RecurrenceEnd_Never, ClinicalPathway_DueDate_$union, ClinicalPathway_DueDate_DaysFromNow, ClinicalPathway_DueDate_Tomorrow, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_$union, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_High, ClinicalPathway_TriggerTiming_$union, ClinicalPathway_TriggerTiming_OnFormLoad, ClinicalPathway_TriggerTiming_OnFormSubmit, ClinicalPathway_TriggerTiming_OnFormSave, ClinicalPathway_FieldEvaluator_$union, ClinicalPathway_FieldEvaluator_NotInSet, ClinicalPathway_FieldEvaluator_ContainsAll, ClinicalPathway_FieldEvaluator_LessOrEqual, ClinicalPathway_FieldEvaluator_LessThan, ClinicalPathway_FieldEvaluator_GreaterOrEqual, ClinicalPathway_FieldEvaluator_GreaterThan, ClinicalPathway_FieldEvaluator_NotEquals, ClinicalPathway_FieldEvaluator_Equals, ClinicalPathway_FieldEvaluator_InSet } from "../../../FormSpec.js";
 import { join, trimStart, trim, split, replace, toConsoleError, printf, toFail } from "@fable-org/fable-library-js/String.js";
-import { singleton, tryHead, append, cons, collect, mapIndexed, filter, empty, ofArray, map as map_1, item as item_3, length, tryFind as tryFind_1, head, tail, isEmpty, choose, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { singleton, tryHead, append, cons, collect, mapIndexed, filter, empty, map as map_1, item as item_3, length, tryFind as tryFind_1, head, tail, isEmpty, choose, ofArray, tryPick, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { item as item_2 } from "@fable-org/fable-library-js/Array.js";
 import { fromDays, fromHours } from "@fable-org/fable-library-js/TimeSpan.js";
-import { map, defaultArg, Option, value as value_7 } from "@fable-org/fable-library-js/Option.js";
+import { map, defaultArg, bind, Option, value as value_7 } from "@fable-org/fable-library-js/Option.js";
 import { addDays, now, add } from "@fable-org/fable-library-js/DateOffset.js";
 import { FSharpMap, tryFind } from "@fable-org/fable-library-js/Map.js";
 import { CoreMRFormMetadata, CoreMRTrigger, CoreMRItem, CoreMRTriggerCondition, CoreMRTriggerEvent } from "../../CorEMR/CoreMRTypes.js";
@@ -186,11 +186,36 @@ export function parseRecurrence(recurEvery: Option<string>, recurEnd: Option<str
  * Convert CoreMR event to FormSpec ActionInfo
  */
 export function convertEvent(event: CoreMRTriggerEvent): ClinicalPathway_ActionInfo_$union {
-    const matchValue: string = event.EventType.toLocaleLowerCase();
-    switch (matchValue) {
+    const tryEventParamInt = (keys: FSharpList<string>): Option<int32> => tryPick<string, int32>((key: string): Option<int32> => bind<string, int32>((raw: string): Option<int32> => {
+        let matchValue: [boolean, int32];
+        let outArg = 0;
+        matchValue = ([tryParse(raw, 511, false, 32, new FSharpRef<int32>((): int32 => outArg, (v: int32): void => {
+            outArg = (v | 0);
+        })), outArg] as [boolean, int32]);
+        let matchResult: int32;
+        if (matchValue[0]) {
+            if (matchValue[1] > 0) {
+                matchResult = 0;
+            }
+            else {
+                matchResult = 1;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+        switch (matchResult) {
+            case 0:
+                return matchValue[1];
+            default:
+                return undefined;
+        }
+    }, tryFind<string, string>(key, event.EventParams)), keys);
+    const matchValue_1: string = event.EventType.toLocaleLowerCase();
+    switch (matchValue_1) {
         case "alert": {
             const category: string = defaultArg(tryFind<string, string>("category_desc", event.EventParams), "Alert");
-            return ClinicalPathway_ActionInfo_Alert(new ClinicalPathway_AlertAction(category, `Alert: ${category}`, ClinicalPathway_AlertSeverity_High(), undefined));
+            return ClinicalPathway_ActionInfo_Alert(new ClinicalPathway_AlertAction(tryEventParamInt(ofArray(["category_id", "id"])), category, `Alert: ${category}`, ClinicalPathway_AlertSeverity_High(), undefined));
         }
         case "task": {
             const category_1: string = defaultArg(tryFind<string, string>("cat_desc", event.EventParams), "Task");
@@ -199,19 +224,20 @@ export function convertEvent(event: CoreMRTriggerEvent): ClinicalPathway_ActionI
             const dateStr: string = defaultArg(tryFind<string, string>("date", event.EventParams), "Today");
             const recurEvery: Option<string> = tryFind<string, string>("recur_every", event.EventParams);
             const recurEnd: Option<string> = tryFind<string, string>("recur_end", event.EventParams);
+            const categoryId_1: Option<int32> = tryEventParamInt(ofArray(["cat_id", "category_id", "id"]));
             let assignee: string;
             const parts: string[] = split(category_1, ["-"], 2);
             assignee = ((parts.length > 0) ? item_2(0, parts).trim() : "Staff");
-            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(category_1, description, convertPriority(priorityStr), parseDueDate(dateStr), assignee, parseRecurrence(recurEvery, recurEnd)));
+            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(categoryId_1, category_1, description, convertPriority(priorityStr), parseDueDate(dateStr), assignee, parseRecurrence(recurEvery, recurEnd)));
         }
         case "problem":
-            return ClinicalPathway_ActionInfo_Problem(new ClinicalPathway_ProblemAction("Problem", undefined, now(), ClinicalPathway_ProblemStatus_Active(), undefined));
+            return ClinicalPathway_ActionInfo_Problem(new ClinicalPathway_ProblemAction(tryEventParamInt(ofArray(["problem_list_id", "category_id", "id"])), "Problem", undefined, now(), ClinicalPathway_ProblemStatus_Active(), undefined));
         case "medset":
             return ClinicalPathway_ActionInfo_Medication(new ClinicalPathway_MedicationAction("Medication Set", "", "", "", "", false));
         case "prescription":
             return ClinicalPathway_ActionInfo_Prescription(new ClinicalPathway_PrescriptionAction("", "", "PO", "", "", 30, 0, true, undefined));
         default:
-            return toFail(printf("Unknown CoreMR event type: %s"))(matchValue);
+            return toFail(printf("Unknown CoreMR event type: %s"))(matchValue_1);
     }
 }
 

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

@@ -3,7 +3,7 @@ import { orElse, defaultArg, map, value as value_3, bind, unwrap, Option } from
 import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
 import { comparePrimitives, stringHash, uncurry2, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { record_type, option_type, float64_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
-import { exists, fold, contains, tail, mapIndexed, tryHead, choose, map as map_1, singleton, empty, tryFind, head, isEmpty, FSharpList, collect, filter } from "@fable-org/fable-library-js/List.js";
+import { exists, fold, contains, tail, mapIndexed, singleton, tryHead, choose, map as map_1, empty, tryFind, head, isEmpty, FSharpList, collect, filter } from "@fable-org/fable-library-js/List.js";
 import { Shared_MatrixItemKey, Shared_MatrixAnswer, Spec_MultiChoiceInfo, Spec_SingleChoiceInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey, Spec_FormSpec$1, Shared_FieldValue, Shared_FieldAnswer, Shared_PluginDataProperty, Shared_FieldValue_$union, Spec_FormStep$1, Spec_FormField$1, Spec_PluginFieldConfig, Spec_FieldType_$union } from "../../../FormSpec.js";
 import { split, isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { tryParse } from "@fable-org/fable-library-js/Double.js";
@@ -280,12 +280,9 @@ function getOptionsFromFieldType(ft: Spec_FieldType_$union): FSharpList<Shared_F
 }
 
 function fieldToAnswers(field: Spec_FormField$1<Spec_FieldType_$union>, vitalsIdOpt: Option<int64>, anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> {
-    if (anchor.Encoding.IsSkip) {
+    if (anchor.Encoding.IsSkip ? true : anchor.Encoding.IsScaffold) {
         return empty<CoreMRAnswer>();
     }
-    else if (anchor.Encoding.IsScaffold) {
-        return singleton(new CoreMRAnswer(anchor.Sequence, 2n, undefined));
-    }
     else {
         const matchValue: Option<Shared_FieldValue_$union> = field.Value;
         if (matchValue != null) {
@@ -506,10 +503,7 @@ function buildFieldByKeyMap(spec: Spec_FormSpec$1<Spec_FieldType_$union>): FShar
 
 function anchorToAnswers(fieldMap: FSharpMap<string, Spec_FormField$1<Spec_FieldType_$union>>, vitalsIdOpt: Option<int64>, anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> {
     const field: Option<Spec_FormField$1<Spec_FieldType_$union>> = tryFind_1<string, Spec_FormField$1<Spec_FieldType_$union>>(getFieldKeyGuid(anchor.FieldKey), fieldMap);
-    if (anchor.Encoding.IsSkip) {
-        return empty<CoreMRAnswer>();
-    }
-    else if (anchor.Encoding.IsScaffold) {
+    if (anchor.Encoding.IsSkip ? true : anchor.Encoding.IsScaffold) {
         return empty<CoreMRAnswer>();
     }
     else if (field != null) {
@@ -548,7 +542,7 @@ export function encodeToFormAnswersWithVitals(provenancePayload: string, filledF
         const formName: string = defaultArg(sourceMap.FormName, `CORE-${sourceMap.FormId}`);
         const fieldMap: FSharpMap<string, Spec_FormField$1<Spec_FieldType_$union>> = buildFieldByKeyMap(filledFormSpec);
         try {
-            return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, formName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, vitalsIdOpt, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun));
+            return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, formName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, vitalsIdOpt, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun, undefined));
         }
         catch (matchValue_1: any) {
             const activePatternResult: Option<string> = Operators_FailurePattern(matchValue_1);
@@ -578,7 +572,7 @@ export function extractVitalsAndFormData(provenancePayload: string, filledFormSp
 
 /**
  * Encode filled FormSpec to CoreMR form-insert payload.
- * scaffoldMode: when true, omit answers (scaffold mode — all items get value=2).
+ * scaffoldMode: when true, omit answers.
  * Iterates over provenance anchors (source of truth) so we never omit required items.
  * LEGACY: Use extractVitalsAndFormData for new smart coordination.
  */
@@ -596,7 +590,7 @@ export function encodeToFormAnswers(provenancePayload: string, filledFormSpec: S
             formName = defaultArg(orElse(sourceMap.FormName, isNullOrWhiteSpace(filledFormSpec.Title) ? undefined : filledFormSpec.Title), value);
             const fieldMap: FSharpMap<string, Spec_FormField$1<Spec_FieldType_$union>> = buildFieldByKeyMap(filledFormSpec);
             try {
-                return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, formName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, undefined, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun));
+                return FSharpResult$2_Ok<CoreMRFormInsertRequest, string>(new CoreMRFormInsertRequest(sourceMap.FormId, formName, scaffoldMode ? undefined : ((acc = collect<CoreMRFieldAnchor, CoreMRAnswer>((anchor: CoreMRFieldAnchor): FSharpList<CoreMRAnswer> => anchorToAnswers(fieldMap, undefined, anchor), collect<CoreMRStepMap, CoreMRFieldAnchor>((step: CoreMRStepMap): FSharpList<CoreMRFieldAnchor> => step.FieldAnchors, sourceMap.Steps)), isEmpty(acc) ? undefined : acc)), dryRun, undefined));
             }
             catch (matchValue_1: any) {
                 const activePatternResult: Option<string> = Operators_FailurePattern(matchValue_1);

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

@@ -7,6 +7,7 @@ import { bool_type, list_type, option_type, int64_type, record_type, class_type,
 import { fromInt32, toInt64, int64 } from "@fable-org/fable-library-js/BigInt.js";
 import { defaultArg, toArray, value as value_6, map, bind, Option } from "@fable-org/fable-library-js/Option.js";
 import { map as map_1, choose, mapIndexed, collect, head, tail, isEmpty, ofArray, empty, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { TriggerActionDto_$reflection, TriggerActionDto } from "../../../TriggerActionDto.js";
 import { Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
 import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { object, toString } from "../../../../Thoth.Json/packages/Thoth.Json/Encode.js";
@@ -53,17 +54,19 @@ export class CoreMRFormInsertRequest extends Record implements IEquatable<CoreMR
     readonly FormName: string;
     readonly Answers: Option<FSharpList<CoreMRAnswer>>;
     readonly DryRun: Option<boolean>;
-    constructor(FormId: int32, FormName: string, Answers: Option<FSharpList<CoreMRAnswer>>, DryRun: Option<boolean>) {
+    readonly TriggerActions: Option<FSharpList<TriggerActionDto>>;
+    constructor(FormId: int32, FormName: string, Answers: Option<FSharpList<CoreMRAnswer>>, DryRun: Option<boolean>, TriggerActions: Option<FSharpList<TriggerActionDto>>) {
         super();
         this.FormId = (FormId | 0);
         this.FormName = FormName;
         this.Answers = Answers;
         this.DryRun = DryRun;
+        this.TriggerActions = TriggerActions;
     }
 }
 
 export function CoreMRFormInsertRequest_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CoreMRFormInsertRequest", [], CoreMRFormInsertRequest, () => [["FormId", int32_type], ["FormName", string_type], ["Answers", option_type(list_type(CoreMRAnswer_$reflection()))], ["DryRun", option_type(bool_type)]]);
+    return record_type("FormSpec.Integrations.CorEMR.CoreMRFormInsertRequest", [], CoreMRFormInsertRequest, () => [["FormId", int32_type], ["FormName", string_type], ["Answers", option_type(list_type(CoreMRAnswer_$reflection()))], ["DryRun", option_type(bool_type)], ["TriggerActions", option_type(list_type(TriggerActionDto_$reflection()))]]);
 }
 
 function FormSpecToCoreMRInsert_getScoreFromOption(options: FSharpList<Shared_FieldOption>, selectedValue: string): Option<int32> {
@@ -252,7 +255,7 @@ function FormSpecToCoreMRInsert_fieldToValueAndText(field: Spec_FormField$1<Spec
  */
 export function FormSpecToCoreMRInsert_convertToCoreMRInsertPayload(filledFormSpec: Spec_FormSpec$1<Spec_FieldType_$union>, metadata: CoreMRPublishMetadata, scaffoldMode: boolean, dryRun: boolean): CoreMRFormInsertRequest {
     let allFields: FSharpList<Spec_FormField$1<Spec_FieldType_$union>>, acc: FSharpList<CoreMRAnswer>;
-    return new CoreMRFormInsertRequest(metadata.FormId, metadata.FormName, scaffoldMode ? undefined : ((allFields = 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, filledFormSpec.Steps), (acc = (isEmpty_1<Shared_FieldKey, int32>(metadata.FieldKeyToSequence) ? mapIndexed<[int32, Option<string>], CoreMRAnswer>((i: int32, tupledArg: [int32, Option<string>]): CoreMRAnswer => (new CoreMRAnswer((2 * i) + 1, toInt64(fromInt32(tupledArg[0])), tupledArg[1])), choose<Spec_FormField$1<Spec_FieldType_$union>, [int32, Option<string>]>(FormSpecToCoreMRInsert_fieldToValueAndText, allFields)) : collect<Spec_FormField$1<Spec_FieldType_$union>, CoreMRAnswer>((f: Spec_FormField$1<Spec_FieldType_$union>): FSharpList<CoreMRAnswer> => FormSpecToCoreMRInsert_fieldToAnswers(f, metadata.FieldKeyToSequence), allFields)), isEmpty(acc) ? undefined : acc))), dryRun);
+    return new CoreMRFormInsertRequest(metadata.FormId, metadata.FormName, scaffoldMode ? undefined : ((allFields = 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, filledFormSpec.Steps), (acc = (isEmpty_1<Shared_FieldKey, int32>(metadata.FieldKeyToSequence) ? mapIndexed<[int32, Option<string>], CoreMRAnswer>((i: int32, tupledArg: [int32, Option<string>]): CoreMRAnswer => (new CoreMRAnswer((2 * i) + 1, toInt64(fromInt32(tupledArg[0])), tupledArg[1])), choose<Spec_FormField$1<Spec_FieldType_$union>, [int32, Option<string>]>(FormSpecToCoreMRInsert_fieldToValueAndText, allFields)) : collect<Spec_FormField$1<Spec_FieldType_$union>, CoreMRAnswer>((f: Spec_FormField$1<Spec_FieldType_$union>): FSharpList<CoreMRAnswer> => FormSpecToCoreMRInsert_fieldToAnswers(f, metadata.FieldKeyToSequence), allFields)), isEmpty(acc) ? undefined : acc))), dryRun, undefined);
 }
 
 const CoreMRPublishMetadataCustomData_key = "coremr_publish";

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

@@ -1,7 +1,7 @@
 import { Helpers_generateDeterministicGuidRaw } from "../../Helpers.js";
 import { ClinicalPathway_PathwayExecutionMode_MultiPathway, ClinicalPathway_MultiPathwayConfig, ClinicalPathway_ConflictResolution_CombineActions, ClinicalPathway_CombinationStrategy_AllMatching, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_TriggerBased, ClinicalPathway_TriggerBasedConfig, ClinicalPathway_TransitionDefinition, Shared_TransitionKey, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateType_Action, ClinicalPathway_StateType_CompoundAction, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Evaluation, ClinicalPathway_EvaluationInfo, Shared_StateKey, ClinicalPathway_ActionInfo_$union, ClinicalPathway_ActionInfo_Documentation, ClinicalPathway_DocumentationAction, ClinicalPathway_ActionInfo_Problem, ClinicalPathway_ProblemAction, ClinicalPathway_ProblemStatus_Active, ClinicalPathway_ActionInfo_Medication, ClinicalPathway_MedicationAction, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_ActionInfo_Alert, ClinicalPathway_AlertAction, ClinicalPathway_AlertSeverity_High, ClinicalPathway_TransitionCondition_Always, ClinicalPathway_TransitionCondition_CompositeCondition, ClinicalPathway_LogicalOp_And, ClinicalPathway_LogicalOp_Or, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_TransitionCondition_FieldCondition, ClinicalPathway_TransitionCondition_PluginPropertyCondition, Shared_PluginPropertyKey, Shared_ConditionValue_Single, Shared_ConditionValue_Multiple, Shared_ConditionValue_$union, Shared_FieldKey, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_AfterOccurrences, ClinicalPathway_RecurrenceEnd_OnDate, ClinicalPathway_RecurrenceEnd_$union, ClinicalPathway_DueDate_$union, ClinicalPathway_DueDate_DaysFromNow, ClinicalPathway_DueDate_Tomorrow, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_$union, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_High, ClinicalPathway_TriggerTiming_$union, ClinicalPathway_TriggerTiming_OnFormLoad, ClinicalPathway_TriggerTiming_OnFormSubmit, ClinicalPathway_TriggerTiming_OnFormSave, ClinicalPathway_FieldEvaluator_$union, ClinicalPathway_FieldEvaluator_MatchesPattern, ClinicalPathway_FieldEvaluator_NotInSet, ClinicalPathway_FieldEvaluator_ContainsAll, ClinicalPathway_FieldEvaluator_LessOrEqual, ClinicalPathway_FieldEvaluator_LessThan, ClinicalPathway_FieldEvaluator_GreaterOrEqual, ClinicalPathway_FieldEvaluator_GreaterThan, ClinicalPathway_FieldEvaluator_NotEquals, ClinicalPathway_FieldEvaluator_Equals, ClinicalPathway_FieldEvaluator_InSet } from "../../FormSpec.js";
 import { bind, map as map_1, defaultArgWith, Option, value as value_1, defaultArg } from "@fable-org/fable-library-js/Option.js";
-import { sortByDescending, append, indexed, singleton, collect, filter, empty, ofArray, length, tryFind as tryFind_1, map, tail, head, isEmpty, FSharpList, tryHead } from "@fable-org/fable-library-js/List.js";
+import { sortByDescending, append, indexed, singleton, collect, filter, empty, length, tryFind as tryFind_1, ofArray, tryPick, map, tail, head, isEmpty, FSharpList, tryHead } from "@fable-org/fable-library-js/List.js";
 import { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { substring, join, isNullOrEmpty, split, replace } from "@fable-org/fable-library-js/String.js";
 import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
@@ -206,42 +206,74 @@ function param(key: string, action: TriggerAction): string {
     return defaultArg(tryFind<string, string>(key, action.Params), "");
 }
 
+function tryParsePositiveInt(value: string): Option<int32> {
+    let matchValue: [boolean, int32];
+    let outArg = 0;
+    matchValue = ([tryParse(value, 511, false, 32, new FSharpRef<int32>((): int32 => outArg, (v: int32): void => {
+        outArg = (v | 0);
+    })), outArg] as [boolean, int32]);
+    let matchResult: int32;
+    if (matchValue[0]) {
+        if (matchValue[1] > 0) {
+            matchResult = 0;
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return matchValue[1];
+        default:
+            return undefined;
+    }
+}
+
+function paramInt(keys: FSharpList<string>, action: TriggerAction): Option<int32> {
+    return tryPick<string, int32>((key: string): Option<int32> => bind<string, int32>(tryParsePositiveInt, tryFind<string, string>(key, action.Params)), keys);
+}
+
 export function convertAction(action: TriggerAction): ClinicalPathway_ActionInfo_$union {
     let s: string, s_1: string;
     const matchValue: string = action.ActionType.toLowerCase();
     switch (matchValue) {
         case "alert": {
             const categoryName: string = param("category_name", action);
-            return ClinicalPathway_ActionInfo_Alert(new ClinicalPathway_AlertAction(categoryName, `Alert: ${categoryName}`, ClinicalPathway_AlertSeverity_High(), undefined));
+            return ClinicalPathway_ActionInfo_Alert(new ClinicalPathway_AlertAction(paramInt(ofArray(["category_id", "id"]), action), categoryName, `Alert: ${categoryName}`, ClinicalPathway_AlertSeverity_High(), undefined));
         }
         case "task": {
             const category: string = param("category_name", action);
+            const categoryId_1: Option<int32> = paramInt(ofArray(["id", "category_id", "cat_id"]), action);
             let assignee: string;
             const parts: string[] = split(category, ["-"], undefined, 0);
             assignee = ((parts.length > 0) ? item_1(0, parts).trim() : "Staff");
-            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(category, param("description", action), convertPriority(param("priority", action)), parseDueDate(param("start", action)), assignee, undefined));
+            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(categoryId_1, category, param("description", action), convertPriority(param("priority", action)), parseDueDate(param("start", action)), assignee, undefined));
         }
         case "recurring_task": {
             const category_1: string = param("category_name", action);
+            const categoryId_2: Option<int32> = paramInt(ofArray(["id", "category_id", "cat_id"]), action);
             let assignee_1: string;
             const parts_1: string[] = split(category_1, ["-"], undefined, 0);
             assignee_1 = ((parts_1.length > 0) ? item_1(0, parts_1).trim() : "Staff");
-            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(category_1, param("description", action), convertPriority(param("priority", action)), parseDueDate(param("start", action)), assignee_1, parseRecurrence(tryFind<string, string>("end", action.Params))));
+            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(categoryId_2, category_1, param("description", action), convertPriority(param("priority", action)), parseDueDate(param("start", action)), assignee_1, parseRecurrence(tryFind<string, string>("end", action.Params))));
         }
         case "medset":
             return ClinicalPathway_ActionInfo_Medication(new ClinicalPathway_MedicationAction(param("medset_name", action), "", "", "", "", false));
         case "problem":
-            return ClinicalPathway_ActionInfo_Problem(new ClinicalPathway_ProblemAction((s = param("category_name", action), isNullOrEmpty(s) ? "Problem" : s), undefined, utcNow(), ClinicalPathway_ProblemStatus_Active(), undefined));
+            return ClinicalPathway_ActionInfo_Problem(new ClinicalPathway_ProblemAction(paramInt(ofArray(["problem_list_id", "category_id", "id"]), action), (s = param("category_name", action), isNullOrEmpty(s) ? "Problem" : s), undefined, utcNow(), ClinicalPathway_ProblemStatus_Active(), undefined));
         case "treatment":
             return ClinicalPathway_ActionInfo_Medication(new ClinicalPathway_MedicationAction((s_1 = param("category_name", action), isNullOrEmpty(s_1) ? "Treatment" : s_1), "", "", "", "", false));
         case "taskcomplete":
-            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(`Complete: ${param("category_name", action)}`, "Mark task as complete", ClinicalPathway_TaskPriority_Medium(), ClinicalPathway_DueDate_Today(), "Staff", undefined));
+            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(undefined, `Complete: ${param("category_name", action)}`, "Mark task as complete", ClinicalPathway_TaskPriority_Medium(), ClinicalPathway_DueDate_Today(), "Staff", undefined));
         case "approval":
-            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction("Approval Required", param("description", action), ClinicalPathway_TaskPriority_High(), ClinicalPathway_DueDate_Today(), "Supervisor", undefined));
+            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(undefined, "Approval Required", param("description", action), ClinicalPathway_TaskPriority_High(), ClinicalPathway_DueDate_Today(), "Supervisor", undefined));
         case "groups":
             return ClinicalPathway_ActionInfo_Documentation(new ClinicalPathway_DocumentationAction("Group Assignment", param("category_name", action), false));
         default:
-            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(`Unknown action: ${matchValue}`, join("; ", map<[string, string], string>((tupledArg: [string, string]): string => (`${tupledArg[0]}=${tupledArg[1]}`), toList<string, string>(action.Params))), ClinicalPathway_TaskPriority_Medium(), ClinicalPathway_DueDate_Today(), "Staff", undefined));
+            return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(undefined, `Unknown action: ${matchValue}`, join("; ", map<[string, string], string>((tupledArg: [string, string]): string => (`${tupledArg[0]}=${tupledArg[1]}`), toList<string, string>(action.Params))), ClinicalPathway_TaskPriority_Medium(), ClinicalPathway_DueDate_Today(), "Staff", undefined));
     }
 }
 

package/src/FormSpec.FS/Interop/FormSpec.Api.Helpers.ts

@@ -732,7 +732,7 @@ export function createPluginField(fieldKeyString: string, label: string, config:
  * TypeScript: createActionState(stateKey: string, label: string, taskDescription: string, priority?: string)
  */
 export function createActionState(stateKeyString: string, label: string, taskDescription: string, priority: Option<string>): ClinicalPathway_StateDefinition {
-    return new ClinicalPathway_StateDefinition(new Shared_StateKey(parse(stateKeyString)), label, 1, ClinicalPathway_StateType_Action(ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction("Clinical", taskDescription, (priority != null) ? ((value_19(priority) === "High") ? ClinicalPathway_TaskPriority_High() : ((value_19(priority) === "Low") ? ClinicalPathway_TaskPriority_Low() : ClinicalPathway_TaskPriority_Medium())) : ClinicalPathway_TaskPriority_Medium(), ClinicalPathway_DueDate_Today(), "Clinical Staff", undefined))), undefined);
+    return new ClinicalPathway_StateDefinition(new Shared_StateKey(parse(stateKeyString)), label, 1, ClinicalPathway_StateType_Action(ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(undefined, "Clinical", taskDescription, (priority != null) ? ((value_19(priority) === "High") ? ClinicalPathway_TaskPriority_High() : ((value_19(priority) === "Low") ? ClinicalPathway_TaskPriority_Low() : ClinicalPathway_TaskPriority_Medium())) : ClinicalPathway_TaskPriority_Medium(), ClinicalPathway_DueDate_Today(), "Clinical Staff", undefined))), undefined);
 }
 
 /**