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

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

@@ -1,6 +1,6 @@
 import { Union, Record } from "@fable-org/fable-library-js/Types.js";
 import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
-import { union_type, list_type, int64_type, float64_type, obj_type, array_type, option_type, bool_type, anonRecord_type, class_type, int32_type, record_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+import { union_type, list_type, int64_type, array_type, float64_type, option_type, obj_type, bool_type, anonRecord_type, class_type, int32_type, record_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { FSharpMap } from "@fable-org/fable-library-js/Map.js";
 import { Option } from "@fable-org/fable-library-js/Option.js";
@@ -67,96 +67,6 @@ export function EncounterTypes_$reflection(): TypeInfo {
     return record_type("FormSpec.Integrations.CorEMR.CoreMRTypes.EncounterTypes", [], EncounterTypes, () => [["Medical", bool_type], ["Mental", bool_type], ["Dental", bool_type], ["Other", bool_type]]);
 }
 
-export class EnrichedTemplate extends Record implements IEquatable<EnrichedTemplate>, IComparable<EnrichedTemplate> {
-    readonly FormId: int32;
-    readonly FormCode: string;
-    readonly FormCodeSource: string;
-    readonly Name: string;
-    readonly Description: string;
-    readonly CurrentVersionId: int32;
-    readonly IsIntake: boolean;
-    readonly Usage: string;
-    readonly EncounterTypes: EncounterTypes;
-    readonly RequiresSignature: boolean;
-    readonly StructureHash: string;
-    readonly ClinicalHash: string;
-    readonly CosmeticHash: string;
-    readonly ItemCount: int32;
-    readonly IsScored: boolean;
-    constructor(FormId: int32, FormCode: string, FormCodeSource: string, Name: string, Description: string, CurrentVersionId: int32, IsIntake: boolean, Usage: string, EncounterTypes: EncounterTypes, RequiresSignature: boolean, StructureHash: string, ClinicalHash: string, CosmeticHash: string, ItemCount: int32, IsScored: boolean) {
-        super();
-        this.FormId = (FormId | 0);
-        this.FormCode = FormCode;
-        this.FormCodeSource = FormCodeSource;
-        this.Name = Name;
-        this.Description = Description;
-        this.CurrentVersionId = (CurrentVersionId | 0);
-        this.IsIntake = IsIntake;
-        this.Usage = Usage;
-        this.EncounterTypes = EncounterTypes;
-        this.RequiresSignature = RequiresSignature;
-        this.StructureHash = StructureHash;
-        this.ClinicalHash = ClinicalHash;
-        this.CosmeticHash = CosmeticHash;
-        this.ItemCount = (ItemCount | 0);
-        this.IsScored = IsScored;
-    }
-}
-
-export function EnrichedTemplate_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CoreMRTypes.EnrichedTemplate", [], EnrichedTemplate, () => [["FormId", int32_type], ["FormCode", string_type], ["FormCodeSource", string_type], ["Name", string_type], ["Description", string_type], ["CurrentVersionId", int32_type], ["IsIntake", bool_type], ["Usage", string_type], ["EncounterTypes", EncounterTypes_$reflection()], ["RequiresSignature", bool_type], ["StructureHash", string_type], ["ClinicalHash", string_type], ["CosmeticHash", string_type], ["ItemCount", int32_type], ["IsScored", bool_type]]);
-}
-
-export class EnrichedTemplateCollection extends Record implements IEquatable<EnrichedTemplateCollection>, IComparable<EnrichedTemplateCollection> {
-    readonly Schema: string;
-    readonly Version: int32;
-    readonly GeneratedAt: Date;
-    readonly GeneratedFrom: string;
-    readonly CoreEmr: Option<{ AppVersion: string, SchemaRevision: string, SchemaVersion: string }>;
-    readonly Filter: string;
-    readonly FilterDescription: string;
-    readonly FormCount: int32;
-    readonly Forms: EnrichedTemplate[];
-    readonly ElementTypes: FSharpMap<string, ElementType>;
-    readonly Stats: TemplateCollectionStats;
-    constructor(Schema: string, Version: int32, GeneratedAt: Date, GeneratedFrom: string, CoreEmr: Option<{ AppVersion: string, SchemaRevision: string, SchemaVersion: string }>, Filter: string, FilterDescription: string, FormCount: int32, Forms: EnrichedTemplate[], ElementTypes: FSharpMap<string, ElementType>, Stats: TemplateCollectionStats) {
-        super();
-        this.Schema = Schema;
-        this.Version = (Version | 0);
-        this.GeneratedAt = GeneratedAt;
-        this.GeneratedFrom = GeneratedFrom;
-        this.CoreEmr = CoreEmr;
-        this.Filter = Filter;
-        this.FilterDescription = FilterDescription;
-        this.FormCount = (FormCount | 0);
-        this.Forms = Forms;
-        this.ElementTypes = ElementTypes;
-        this.Stats = Stats;
-    }
-}
-
-export function EnrichedTemplateCollection_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CoreMRTypes.EnrichedTemplateCollection", [], EnrichedTemplateCollection, () => [["Schema", string_type], ["Version", int32_type], ["GeneratedAt", class_type("System.DateTimeOffset")], ["GeneratedFrom", string_type], ["CoreEmr", option_type(anonRecord_type(["AppVersion", string_type], ["SchemaRevision", string_type], ["SchemaVersion", string_type]))], ["Filter", string_type], ["FilterDescription", string_type], ["FormCount", int32_type], ["Forms", array_type(EnrichedTemplate_$reflection())], ["ElementTypes", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, ElementType_$reflection()])], ["Stats", TemplateCollectionStats_$reflection()]]);
-}
-
-export class EnrichedTemplateResponse extends Record implements IEquatable<EnrichedTemplateResponse>, IComparable<EnrichedTemplateResponse> {
-    readonly Success: boolean;
-    readonly Data: Option<EnrichedTemplateCollection>;
-    readonly Error: Option<string>;
-    readonly Timestamp: Option<Date>;
-    constructor(Success: boolean, Data: Option<EnrichedTemplateCollection>, Error$: Option<string>, Timestamp: Option<Date>) {
-        super();
-        this.Success = Success;
-        this.Data = Data;
-        this.Error = Error$;
-        this.Timestamp = Timestamp;
-    }
-}
-
-export function EnrichedTemplateResponse_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CoreMRTypes.EnrichedTemplateResponse", [], EnrichedTemplateResponse, () => [["Success", bool_type], ["Data", option_type(EnrichedTemplateCollection_$reflection())], ["Error", option_type(string_type)], ["Timestamp", option_type(class_type("System.DateTimeOffset"))]]);
-}
-
 export class FormChoice extends Record implements IEquatable<FormChoice> {
     readonly ChoiceId: int32;
     readonly Text: string;
@@ -713,22 +623,6 @@ export function FormSubmissionResponse_$reflection(): TypeInfo {
     return record_type("FormSpec.Integrations.CorEMR.CoreMRTypes.FormSubmissionResponse", [], FormSubmissionResponse, () => [["Success", bool_type], ["Data", option_type(anonRecord_type(["ExternalId", string_type], ["FormRecordId", string_type], ["Status", string_type], ["SubmittedAt", class_type("System.DateTimeOffset")], ["ValidationErrors", option_type(array_type(ValidationError_$reflection()))]))]]);
 }
 
-export class CorEmrTemplatesResponse extends Record implements IEquatable<CorEmrTemplatesResponse>, IComparable<CorEmrTemplatesResponse> {
-    readonly Success: boolean;
-    readonly Data: Option<EnrichedTemplateCollection>;
-    readonly Error: Option<string>;
-    constructor(Success: boolean, Data: Option<EnrichedTemplateCollection>, Error$: Option<string>) {
-        super();
-        this.Success = Success;
-        this.Data = Data;
-        this.Error = Error$;
-    }
-}
-
-export function CorEmrTemplatesResponse_$reflection(): TypeInfo {
-    return record_type("FormSpec.Integrations.CorEMR.CoreMRTypes.CorEmrTemplatesResponse", [], CorEmrTemplatesResponse, () => [["Success", bool_type], ["Data", option_type(EnrichedTemplateCollection_$reflection())], ["Error", option_type(string_type)]]);
-}
-
 export class TemplateDetailResponse extends Record implements IEquatable<TemplateDetailResponse>, IComparable<TemplateDetailResponse> {
     readonly Success: boolean;
     readonly Data: Option<CoreMRFormDetail>;

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

@@ -6,7 +6,7 @@ import { int32, float64 } from "@fable-org/fable-library-js/Int32.js";
 import { append, mapIndexed, tryFind as tryFind_1, map, item as item_2 } from "@fable-org/fable-library-js/Array.js";
 import { length, mapIndexed as mapIndexed_1, filter, choose, map as map_1, singleton, collect, delay, toList } from "@fable-org/fable-library-js/Seq.js";
 import { Auto_generateBoxedEncoder_437914C6, toString } from "../../Thoth.Json/packages/Thoth.Json/Encode.js";
-import { Spec_SingleChoiceInfo, Spec_ClinicalInstrumentInfo, Spec_FormClassification_$union, ClinicalPathway_StateType_$union, ClinicalPathway_TaskPriority_$union, ClinicalPathway_AlertSeverity_$union, ClinicalPathway_ReferralUrgency_$union, ClinicalPathway_ActionInfo_$union, ClinicalPathway_NavigateToFormAction, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_TestAction, ClinicalPathway_DocumentationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_MedicationAction, ClinicalPathway_ReferralAction, Shared_FieldValue, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_SinglePathway, ClinicalPathway_SinglePathwayConfig, ClinicalPathway_SelectionStrategy_HighestPriority, ClinicalPathway_TransitionDefinition, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, ClinicalPathway_FieldEvaluator_Equals, Shared_TransitionKey, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Action, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_High, Shared_StateKey, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Matrix, Spec_MatrixInfo, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, Spec_FieldType_Text, Spec_TextInfo, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Shared_FieldOptionKey, Spec_FieldType_Checkbox, Spec_BooleanInfo, Shared_FieldKey, Shared_FieldOption, Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_MatrixItemKey, Shared_FieldValue_Multiple, Shared_FieldAnswer, Shared_FieldValue_$union, Spec_FormStep$1, Spec_FormField$1, Spec_FieldType_$union, Spec_FormSpec$1, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection } from "../FormSpec.js";
+import { Spec_SingleChoiceInfo, Spec_FormClassification_$union, ClinicalPathway_StateType_$union, ClinicalPathway_TaskPriority_$union, ClinicalPathway_AlertSeverity_$union, ClinicalPathway_ReferralUrgency_$union, ClinicalPathway_ActionInfo_$union, ClinicalPathway_NavigateToFormAction, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_TestAction, ClinicalPathway_DocumentationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_MedicationAction, ClinicalPathway_ReferralAction, Shared_FieldValue, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_SinglePathway, ClinicalPathway_SinglePathwayConfig, ClinicalPathway_SelectionStrategy_HighestPriority, ClinicalPathway_TransitionDefinition, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, ClinicalPathway_FieldEvaluator_Equals, Shared_TransitionKey, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Action, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_High, Shared_StateKey, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Matrix, Spec_MatrixInfo, Spec_FormClassification_General, Spec_FormLifecycle_Blueprint, Spec_FieldType_Text, Spec_TextInfo, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Shared_FieldOptionKey, Spec_FieldType_Checkbox, Spec_BooleanInfo, Shared_FieldKey, Shared_FieldOption, Shared_FieldValue_Single, Shared_FieldValue_PluginData, Shared_PluginDataProperty, Shared_PluginPropertyKey, Shared_FieldValue_Matrix, Shared_MatrixAnswer, Shared_MatrixItemKey, Shared_FieldValue_Multiple, Shared_FieldAnswer, Shared_FieldValue_$union, Spec_FormStep$1, Spec_FormField$1, Spec_FieldType_$union, Spec_FormSpec$1, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection } from "../FormSpec.js";
 import { Auto_generateBoxedDecoder_Z6670B51, fromString } from "../../Thoth.Json/packages/Thoth.Json/Decode.js";
 import { FSharpResult$2_Ok, FSharpResult$2_Error, FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
 import { newGuid, parse, tryParse } from "@fable-org/fable-library-js/Guid.js";
@@ -1407,26 +1407,6 @@ export function getInstrumentMaxScore(spec: Spec_FormSpec$1<Spec_FieldType_$unio
     }
 }
 
-/**
- * Returns "Exact" or "Inferred" when Classification is ClinicalInstrument, None otherwise.
- * TypeScript: getInstrumentConfidence(spec: FormSpec) => "Exact" | "Inferred" | null
- */
-export function getInstrumentConfidence(spec: Spec_FormSpec$1<Spec_FieldType_$union>): Option<string> {
-    const matchValue: Spec_FormClassification_$union = spec.Classification;
-    if (matchValue.tag === /* ClinicalInstrument */ 0) {
-        const info: Spec_ClinicalInstrumentInfo = matchValue.fields[0];
-        if (info.Confidence.tag === /* Inferred */ 1) {
-            return "Inferred";
-        }
-        else {
-            return "Exact";
-        }
-    }
-    else {
-        return undefined;
-    }
-}
-
 /**
  * Decode CoreMR provenance source map from JSON payload.
  * TypeScript: tryDecodeSourceMap(payloadJson: string) => {success: boolean; sourceMap?: CoreMRSourceMap; error?: string}

package/src/FormSpec.FS/TriggerActionDto.ts

@@ -1,67 +1,9 @@
-import { Record } from "@fable-org/fable-library-js/Types.js";
-import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { orElse, defaultArg, map, value as value_2, Option } from "@fable-org/fable-library-js/Option.js";
-import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
-import { record_type, bool_type, option_type, int32_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 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";
-
-export class TriggerActionDto extends Record implements IEquatable<TriggerActionDto>, IComparable<TriggerActionDto> {
-    readonly ActionType: string;
-    readonly TriggerId: int32;
-    readonly TriggerActionId: int32;
-    readonly CategoryId: int32;
-    readonly CategoryName: string;
-    readonly Priority: Option<int32>;
-    readonly Description: Option<string>;
-    readonly DateStart: Option<string>;
-    readonly AllDay: Option<boolean>;
-    readonly ScheduleEnd: Option<string>;
-    readonly ProblemListId: Option<int32>;
-    readonly FormItemId: Option<int32>;
-    readonly TreatmentId: Option<int32>;
-    readonly ScheduleId: Option<int32>;
-    readonly ProviderId: Option<int32>;
-    readonly Signature: Option<string>;
-    readonly SourceRelatedId: Option<int32>;
-    readonly RelatedType: Option<int32>;
-    readonly Chronic: Option<int32>;
-    readonly Severity: Option<int32>;
-    readonly Inflammation: Option<int32>;
-    readonly MedsetId: Option<int32>;
-    readonly PharmacyId: Option<int32>;
-    constructor(ActionType: string, TriggerId: int32, TriggerActionId: int32, CategoryId: int32, CategoryName: string, Priority: Option<int32>, Description: Option<string>, DateStart: Option<string>, AllDay: Option<boolean>, ScheduleEnd: Option<string>, ProblemListId: Option<int32>, FormItemId: Option<int32>, TreatmentId: Option<int32>, ScheduleId: Option<int32>, ProviderId: Option<int32>, Signature: Option<string>, SourceRelatedId: Option<int32>, RelatedType: Option<int32>, Chronic: Option<int32>, Severity: Option<int32>, Inflammation: Option<int32>, MedsetId: Option<int32>, PharmacyId: Option<int32>) {
-        super();
-        this.ActionType = ActionType;
-        this.TriggerId = (TriggerId | 0);
-        this.TriggerActionId = (TriggerActionId | 0);
-        this.CategoryId = (CategoryId | 0);
-        this.CategoryName = CategoryName;
-        this.Priority = Priority;
-        this.Description = Description;
-        this.DateStart = DateStart;
-        this.AllDay = AllDay;
-        this.ScheduleEnd = ScheduleEnd;
-        this.ProblemListId = ProblemListId;
-        this.FormItemId = FormItemId;
-        this.TreatmentId = TreatmentId;
-        this.ScheduleId = ScheduleId;
-        this.ProviderId = ProviderId;
-        this.Signature = Signature;
-        this.SourceRelatedId = SourceRelatedId;
-        this.RelatedType = RelatedType;
-        this.Chronic = Chronic;
-        this.Severity = Severity;
-        this.Inflammation = Inflammation;
-        this.MedsetId = MedsetId;
-        this.PharmacyId = PharmacyId;
-    }
-}
-
-export function TriggerActionDto_$reflection(): TypeInfo {
-    return record_type("F1.Studio.TriggerActions.TriggerActionDto", [], TriggerActionDto, () => [["ActionType", string_type], ["TriggerId", int32_type], ["TriggerActionId", int32_type], ["CategoryId", int32_type], ["CategoryName", string_type], ["Priority", option_type(int32_type)], ["Description", option_type(string_type)], ["DateStart", option_type(string_type)], ["AllDay", option_type(bool_type)], ["ScheduleEnd", option_type(string_type)], ["ProblemListId", option_type(int32_type)], ["FormItemId", option_type(int32_type)], ["TreatmentId", option_type(int32_type)], ["ScheduleId", option_type(int32_type)], ["ProviderId", option_type(int32_type)], ["Signature", option_type(string_type)], ["SourceRelatedId", option_type(int32_type)], ["RelatedType", option_type(int32_type)], ["Chronic", option_type(int32_type)], ["Severity", option_type(int32_type)], ["Inflammation", option_type(int32_type)], ["MedsetId", option_type(int32_type)], ["PharmacyId", option_type(int32_type)]]);
-}
+import { TriggerAction } from "../vye-os-contracts-fs/src/Clinical/TriggerAction.js";
 
 /**
  * Convert ClinicalPathway.TaskPriority DU → CoreMR int (1=High, 2=Medium, 3=Low)
@@ -125,13 +67,13 @@ function requireCategoryId(actionType: string, categoryName: string, categoryIdO
  * Direct callers: unit tests (testing base conversion logic in isolation).
  * Production callers: NONE (production always goes through convertActionsForCoreMR).
  */
-export function convertActionsToBaseDtos(actions: FSharpList<ClinicalPathway_ActionInfo_$union>): FSharpList<TriggerActionDto> {
-    return choose<ClinicalPathway_ActionInfo_$union, TriggerActionDto>((action: ClinicalPathway_ActionInfo_$union): Option<TriggerActionDto> => {
+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 TriggerActionDto(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 => {
+                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: {
@@ -147,19 +89,19 @@ export function convertActionsToBaseDtos(actions: FSharpList<ClinicalPathway_Act
             }
             case /* Alert */ 9: {
                 const alertAction: ClinicalPathway_AlertAction = action.fields[0];
-                return new TriggerActionDto("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);
+                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 /* Problem */ 10: {
                 const problemAction: ClinicalPathway_ProblemAction = action.fields[0];
-                return new TriggerActionDto("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);
+                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 /* Treatment */ 1: {
                 const t: ClinicalPathway_TreatmentAction = action.fields[0];
-                return new TriggerActionDto("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);
+                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);
             }
             case /* Medset */ 2: {
                 const m: ClinicalPathway_MedsetAction = action.fields[0];
-                return new TriggerActionDto("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);
+                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);
             }
             default:
                 return undefined;

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

@@ -16,8 +16,8 @@ import { createElement } from "react";
 import React from "react";
 import { IRefValue$1, ReactElement } from "../../../fable_modules/Fable.React.Types.18.3.0/Fable.React.fs.js";
 import { reactApi } from "../../../fable_modules/Feliz.2.8.0/Interop.fs.js";
-import { PromiseBuilder__Delay_62FBFDE1, PromiseBuilder__Run_212F1D4B } from "../../../fable_modules/Fable.Promise.3.2.0/Promise.fs.js";
-import { promise } from "../../../fable_modules/Fable.Promise.3.2.0/PromiseImpl.fs.js";
+import { PromiseBuilder__Delay_62FBFDE1, PromiseBuilder__Run_212F1D4B } from "../../../fable_modules/Fable.Promise.3.2.1/Promise.fs.js";
+import { promise } from "../../../fable_modules/Fable.Promise.3.2.1/PromiseImpl.fs.js";
 import { searchAllergens, getAllergenInsights } from "./OpenFdaClient.js";
 import { collect, empty as empty_1, map as map_1, singleton, append, delay, toList } from "@fable-org/fable-library-js/Seq.js";
 import { tryParse, float64, int32 } from "@fable-org/fable-library-js/Int32.js";

package/src/plugins/allergyfinder/src/OpenFdaClient.ts

@@ -5,8 +5,8 @@ import { FSharpResult$2_$union } from "@fable-org/fable-library-js/Result.js";
 import { ErrorReason_$union } from "../../../Thoth.Json/packages/Thoth.Json/Types.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { empty as empty_1, FSharpList } from "@fable-org/fable-library-js/List.js";
-import { PromiseBuilder__Delay_62FBFDE1, PromiseBuilder__Run_212F1D4B } from "../../../fable_modules/Fable.Promise.3.2.0/Promise.fs.js";
-import { promise } from "../../../fable_modules/Fable.Promise.3.2.0/PromiseImpl.fs.js";
+import { PromiseBuilder__Delay_62FBFDE1, PromiseBuilder__Run_212F1D4B } from "../../../fable_modules/Fable.Promise.3.2.1/Promise.fs.js";
+import { promise } from "../../../fable_modules/Fable.Promise.3.2.1/PromiseImpl.fs.js";
 import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { some } from "@fable-org/fable-library-js/Option.js";
 

package/src/vye-os-contracts-fs/src/Clinical/RestPayloads.ts

@@ -0,0 +1,114 @@
+import { Record } from "@fable-org/fable-library-js/Types.js";
+import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { int32ToString, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
+import { option_type, string_type, record_type, bool_type, int32_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+import { value, Option } from "@fable-org/fable-library-js/Option.js";
+import { printf, toText } from "@fable-org/fable-library-js/String.js";
+
+export class Pagination extends Record implements IEquatable<Pagination>, IComparable<Pagination> {
+    readonly Page: int32;
+    readonly Limit: int32;
+    readonly Total: int32;
+    readonly HasMore: boolean;
+    constructor(Page: int32, Limit: int32, Total: int32, HasMore: boolean) {
+        super();
+        this.Page = (Page | 0);
+        this.Limit = (Limit | 0);
+        this.Total = (Total | 0);
+        this.HasMore = HasMore;
+    }
+}
+
+export function Pagination_$reflection(): TypeInfo {
+    return record_type("Vye.Contracts.Clinical.RestPayloads.Pagination", [], Pagination, () => [["Page", int32_type], ["Limit", int32_type], ["Total", int32_type], ["HasMore", bool_type]]);
+}
+
+export class PatientList extends Record implements IEquatable<PatientList>, IComparable<PatientList> {
+    readonly Success: boolean;
+    readonly PatientsJson: string;
+    readonly Count: int32;
+    readonly Pagination: Pagination;
+    constructor(Success: boolean, PatientsJson: string, Count: int32, Pagination: Pagination) {
+        super();
+        this.Success = Success;
+        this.PatientsJson = PatientsJson;
+        this.Count = (Count | 0);
+        this.Pagination = Pagination;
+    }
+}
+
+export function PatientList_$reflection(): TypeInfo {
+    return record_type("Vye.Contracts.Clinical.RestPayloads.PatientList", [], PatientList, () => [["Success", bool_type], ["PatientsJson", string_type], ["Count", int32_type], ["Pagination", Pagination_$reflection()]]);
+}
+
+export class NamesIndex extends Record implements IEquatable<NamesIndex>, IComparable<NamesIndex> {
+    readonly Success: boolean;
+    readonly PatientsJson: string;
+    readonly Count: int32;
+    readonly CacheStatus: string;
+    readonly ReasonCode: string;
+    readonly Loaded: Option<int32>;
+    readonly Total: Option<int32>;
+    constructor(Success: boolean, PatientsJson: string, Count: int32, CacheStatus: string, ReasonCode: string, Loaded: Option<int32>, Total: Option<int32>) {
+        super();
+        this.Success = Success;
+        this.PatientsJson = PatientsJson;
+        this.Count = (Count | 0);
+        this.CacheStatus = CacheStatus;
+        this.ReasonCode = ReasonCode;
+        this.Loaded = Loaded;
+        this.Total = Total;
+    }
+}
+
+export function NamesIndex_$reflection(): TypeInfo {
+    return record_type("Vye.Contracts.Clinical.RestPayloads.NamesIndex", [], NamesIndex, () => [["Success", bool_type], ["PatientsJson", string_type], ["Count", int32_type], ["CacheStatus", string_type], ["ReasonCode", string_type], ["Loaded", option_type(int32_type)], ["Total", option_type(int32_type)]]);
+}
+
+function boolJson(b: boolean): string {
+    if (b) {
+        return "true";
+    }
+    else {
+        return "false";
+    }
+}
+
+function intOptJson(o: Option<int32>): string {
+    if (o == null) {
+        return "null";
+    }
+    else {
+        return int32ToString(value(o));
+    }
+}
+
+/**
+ * Emit patient-list JSON. `patientsJson` must already be a JSON array literal.
+ */
+export function encodePatientList(patientsJson: string, count: int32, p: Pagination): string {
+    const arg_5: string = boolJson(p.HasMore);
+    return toText(printf("{\"success\":true,\"patients\":%s,\"count\":%d,\"pagination\":{\"page\":%d,\"limit\":%d,\"total\":%d,\"hasMore\":%s}}"))(patientsJson)(count)(p.Page)(p.Limit)(p.Total)(arg_5);
+}
+
+export function emptyPatientList(page: int32, limit: int32): string {
+    return encodePatientList("[]", 0, new Pagination(page, limit, 0, false));
+}
+
+/**
+ * Emit names-index JSON. Escapes are the caller's job for cacheStatus/reasonCode (ASCII tokens).
+ */
+export function encodeNamesIndex(patientsJson: string, count: int32, cacheStatus: string, reasonCode: string, loaded: Option<int32>, total: Option<int32>): string {
+    const arg_4: string = intOptJson(loaded);
+    const arg_5: string = intOptJson(total);
+    return toText(printf("{\"success\":true,\"patients\":%s,\"count\":%d,\"cacheStatus\":\"%s\",\"reasonCode\":\"%s\",\"loaded\":%s,\"total\":%s}"))(patientsJson)(count)(cacheStatus)(reasonCode)(arg_4)(arg_5);
+}
+
+/**
+ * Conduit live names-index — success/patients/count only (no cache envelope).
+ */
+export function encodeNamesIndexLive(patientsJson: string, count: int32): string {
+    return toText(printf("{\"success\":true,\"patients\":%s,\"count\":%d}"))(patientsJson)(count);
+}
+
+//# sourceMappingURL=RestPayloads.ts.map

package/src/vye-os-contracts-fs/src/Clinical/TriggerAction.ts

@@ -0,0 +1,63 @@
+import { Record } from "@fable-org/fable-library-js/Types.js";
+import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { Option } from "@fable-org/fable-library-js/Option.js";
+import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
+import { record_type, bool_type, option_type, int32_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+
+export class TriggerAction extends Record implements IEquatable<TriggerAction>, IComparable<TriggerAction> {
+    readonly ActionType: string;
+    readonly TriggerId: int32;
+    readonly TriggerActionId: int32;
+    readonly CategoryId: int32;
+    readonly CategoryName: string;
+    readonly Priority: Option<int32>;
+    readonly Description: Option<string>;
+    readonly DateStart: Option<string>;
+    readonly AllDay: Option<boolean>;
+    readonly ScheduleEnd: Option<string>;
+    readonly ProblemListId: Option<int32>;
+    readonly FormItemId: Option<int32>;
+    readonly TreatmentId: Option<int32>;
+    readonly ScheduleId: Option<int32>;
+    readonly ProviderId: Option<int32>;
+    readonly Signature: Option<string>;
+    readonly SourceRelatedId: Option<int32>;
+    readonly RelatedType: Option<int32>;
+    readonly Chronic: Option<int32>;
+    readonly Severity: Option<int32>;
+    readonly Inflammation: Option<int32>;
+    readonly MedsetId: Option<int32>;
+    readonly PharmacyId: Option<int32>;
+    constructor(ActionType: string, TriggerId: int32, TriggerActionId: int32, CategoryId: int32, CategoryName: string, Priority: Option<int32>, Description: Option<string>, DateStart: Option<string>, AllDay: Option<boolean>, ScheduleEnd: Option<string>, ProblemListId: Option<int32>, FormItemId: Option<int32>, TreatmentId: Option<int32>, ScheduleId: Option<int32>, ProviderId: Option<int32>, Signature: Option<string>, SourceRelatedId: Option<int32>, RelatedType: Option<int32>, Chronic: Option<int32>, Severity: Option<int32>, Inflammation: Option<int32>, MedsetId: Option<int32>, PharmacyId: Option<int32>) {
+        super();
+        this.ActionType = ActionType;
+        this.TriggerId = (TriggerId | 0);
+        this.TriggerActionId = (TriggerActionId | 0);
+        this.CategoryId = (CategoryId | 0);
+        this.CategoryName = CategoryName;
+        this.Priority = Priority;
+        this.Description = Description;
+        this.DateStart = DateStart;
+        this.AllDay = AllDay;
+        this.ScheduleEnd = ScheduleEnd;
+        this.ProblemListId = ProblemListId;
+        this.FormItemId = FormItemId;
+        this.TreatmentId = TreatmentId;
+        this.ScheduleId = ScheduleId;
+        this.ProviderId = ProviderId;
+        this.Signature = Signature;
+        this.SourceRelatedId = SourceRelatedId;
+        this.RelatedType = RelatedType;
+        this.Chronic = Chronic;
+        this.Severity = Severity;
+        this.Inflammation = Inflammation;
+        this.MedsetId = MedsetId;
+        this.PharmacyId = PharmacyId;
+    }
+}
+
+export function TriggerAction_$reflection(): TypeInfo {
+    return record_type("Vye.Contracts.Clinical.TriggerAction", [], TriggerAction, () => [["ActionType", string_type], ["TriggerId", int32_type], ["TriggerActionId", int32_type], ["CategoryId", int32_type], ["CategoryName", string_type], ["Priority", option_type(int32_type)], ["Description", option_type(string_type)], ["DateStart", option_type(string_type)], ["AllDay", option_type(bool_type)], ["ScheduleEnd", option_type(string_type)], ["ProblemListId", option_type(int32_type)], ["FormItemId", option_type(int32_type)], ["TreatmentId", option_type(int32_type)], ["ScheduleId", option_type(int32_type)], ["ProviderId", option_type(int32_type)], ["Signature", option_type(string_type)], ["SourceRelatedId", option_type(int32_type)], ["RelatedType", option_type(int32_type)], ["Chronic", option_type(int32_type)], ["Severity", option_type(int32_type)], ["Inflammation", option_type(int32_type)], ["MedsetId", option_type(int32_type)], ["PharmacyId", option_type(int32_type)]]);
+}
+
+//# sourceMappingURL=TriggerAction.ts.map

package/src/vye-os-contracts-fs/src/Core/Ids.ts

@@ -0,0 +1,72 @@
+import { Union } from "@fable-org/fable-library-js/Types.js";
+import { class_type, union_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+
+export class SiteId extends Union<0, "SiteId"> {
+    constructor(Item: string) {
+        super();
+        this.tag = 0;
+        this.fields = [Item];
+    }
+    readonly tag: 0;
+    readonly fields: [string];
+    cases() {
+        return ["SiteId"];
+    }
+}
+
+export function SiteId_$reflection(): TypeInfo {
+    return union_type("Vye.Contracts.Core.SiteId", [], SiteId, () => [[["Item", string_type]]]);
+}
+
+export class PlatformTenantId extends Union<0, "PlatformTenantId"> {
+    constructor(Item: string) {
+        super();
+        this.tag = 0;
+        this.fields = [Item];
+    }
+    readonly tag: 0;
+    readonly fields: [string];
+    cases() {
+        return ["PlatformTenantId"];
+    }
+}
+
+export function PlatformTenantId_$reflection(): TypeInfo {
+    return union_type("Vye.Contracts.Core.PlatformTenantId", [], PlatformTenantId, () => [[["Item", class_type("System.Guid")]]]);
+}
+
+export class OrgId extends Union<0, "OrgId"> {
+    constructor(Item: string) {
+        super();
+        this.tag = 0;
+        this.fields = [Item];
+    }
+    readonly tag: 0;
+    readonly fields: [string];
+    cases() {
+        return ["OrgId"];
+    }
+}
+
+export function OrgId_$reflection(): TypeInfo {
+    return union_type("Vye.Contracts.Core.OrgId", [], OrgId, () => [[["Item", string_type]]]);
+}
+
+export class PatientExternalId extends Union<0, "PatientExternalId"> {
+    constructor(Item: string) {
+        super();
+        this.tag = 0;
+        this.fields = [Item];
+    }
+    readonly tag: 0;
+    readonly fields: [string];
+    cases() {
+        return ["PatientExternalId"];
+    }
+}
+
+export function PatientExternalId_$reflection(): TypeInfo {
+    return union_type("Vye.Contracts.Core.PatientExternalId", [], PatientExternalId, () => [[["Item", string_type]]]);
+}
+
+//# sourceMappingURL=Ids.ts.map

package/vye-os-contracts-fs/src/Clinical/RestPayloads.d.ts

@@ -0,0 +1,46 @@
+import { Record } from "@fable-org/fable-library-js/Types.js";
+import { int32 } from "@fable-org/fable-library-js/Int32.js";
+import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
+import { TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
+import { Option } from "@fable-org/fable-library-js/Option.js";
+export declare class Pagination extends Record implements IEquatable<Pagination>, IComparable<Pagination> {
+    readonly Page: int32;
+    readonly Limit: int32;
+    readonly Total: int32;
+    readonly HasMore: boolean;
+    constructor(Page: int32, Limit: int32, Total: int32, HasMore: boolean);
+}
+export declare function Pagination_$reflection(): TypeInfo;
+export declare class PatientList extends Record implements IEquatable<PatientList>, IComparable<PatientList> {
+    readonly Success: boolean;
+    readonly PatientsJson: string;
+    readonly Count: int32;
+    readonly Pagination: Pagination;
+    constructor(Success: boolean, PatientsJson: string, Count: int32, Pagination: Pagination);
+}
+export declare function PatientList_$reflection(): TypeInfo;
+export declare class NamesIndex extends Record implements IEquatable<NamesIndex>, IComparable<NamesIndex> {
+    readonly Success: boolean;
+    readonly PatientsJson: string;
+    readonly Count: int32;
+    readonly CacheStatus: string;
+    readonly ReasonCode: string;
+    readonly Loaded: Option<int32>;
+    readonly Total: Option<int32>;
+    constructor(Success: boolean, PatientsJson: string, Count: int32, CacheStatus: string, ReasonCode: string, Loaded: Option<int32>, Total: Option<int32>);
+}
+export declare function NamesIndex_$reflection(): TypeInfo;
+/**
+ * Emit patient-list JSON. `patientsJson` must already be a JSON array literal.
+ */
+export declare function encodePatientList(patientsJson: string, count: int32, p: Pagination): string;
+export declare function emptyPatientList(page: int32, limit: int32): string;
+/**
+ * Emit names-index JSON. Escapes are the caller's job for cacheStatus/reasonCode (ASCII tokens).
+ */
+export declare function encodeNamesIndex(patientsJson: string, count: int32, cacheStatus: string, reasonCode: string, loaded: Option<int32>, total: Option<int32>): string;
+/**
+ * Conduit live names-index — success/patients/count only (no cache envelope).
+ */
+export declare function encodeNamesIndexLive(patientsJson: string, count: int32): string;
+//# sourceMappingURL=RestPayloads.d.ts.map

package/vye-os-contracts-fs/src/Clinical/RestPayloads.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RestPayloads.d.ts","sourceRoot":"","sources":["../../../../FormSpec.TS/vye-os-contracts-fs/src/Clinical/RestPayloads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAiB,WAAW,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAgE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACnI,OAAO,EAAS,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGtE,qBAAa,UAAW,SAAQ,MAAO,YAAW,UAAU,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC;IAC7F,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;gBACd,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;CAOxE;AAED,wBAAgB,sBAAsB,IAAI,QAAQ,CAEjD;AAED,qBAAa,WAAY,SAAQ,MAAO,YAAW,UAAU,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC;IAChG,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;gBACpB,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU;CAO3F;AAED,wBAAgB,uBAAuB,IAAI,QAAQ,CAElD;AAED,qBAAa,UAAW,SAAQ,MAAO,YAAW,UAAU,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC;IAC7F,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBAClB,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;CAUzJ;AAED,wBAAgB,sBAAsB,IAAI,QAAQ,CAEjD;AAoBD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,GAAG,MAAM,CAG3F;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAElE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAIjK;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAE/E"}