node-opcua-address-space 2.170.1 → 2.173.0

package/source/helpers/resolve_opaque_on_address_space.ts

@@ -1,8 +1,8 @@
+import type { IAddressSpace } from "node-opcua-address-space-base";
 import { resolveDynamicExtensionObject } from "node-opcua-client-dynamic-extension-object";
 import { Variant } from "node-opcua-variant";
-import { IAddressSpace } from "node-opcua-address-space-base";
-import { PseudoSession } from "../pseudo_session";
 import { ensureDatatypeExtracted } from "../loader/ensure_datatype_extracted";
+import { PseudoSession } from "../pseudo_session";
 
 export async function resolveOpaqueOnAddressSpace(
     addressSpace: IAddressSpace,

package/source/index.ts

@@ -1,24 +1,32 @@
 /**
  * @module node-opcua-address-space
  */
-export * from "./address_space_ts";
-
-export * from "./interfaces/state_machine/ua_state_machine_type";
-export * from "./interfaces/state_machine/ua_exclusive_limit_state_machine_type_ex";
-export * from "./interfaces/state_machine/ua_finite_state_machine_type";
-export * from "./interfaces/state_machine/ua_program_state_machine_type";
-export * from "./interfaces/state_machine/ua_shelved_state_machine_ex";
-
-export * from "./interfaces/state_machine/ua_transition_ex";
-
-export * from "./interfaces/ua_subscription_diagnostics_variable_ex";
-
-export * from "./interfaces/data_access/ua_multistate_discrete_ex";
-export * from "./interfaces/data_access/ua_multistate_value_discrete_ex";
-export * from "./interfaces/data_access/ua_two_state_discrete_ex";
-export * from "./interfaces/data_access/ua_y_array_item_ex";
-export * from "./interfaces/extension_object_constructor";
 
+export * from "node-opcua-address-space-base";
+export * from "node-opcua-nodeset-ua";
+export { instantiateCertificateExpirationAlarm } from "../src/alarms_and_conditions/ua_certificate_expiration_alarm_impl";
+export { promoteToMultiStateDiscrete } from "../src/data_access/ua_multistate_discrete_impl";
+// deprecated: validateDataType
+export {
+    promoteToMultiStateValueDiscrete,
+    validateDataType,
+    validateIsNumericDataType
+} from "../src/data_access/ua_multistate_value_discrete_impl";
+export { promoteToTwoStateDiscrete } from "../src/data_access/ua_two_state_discrete_impl";
+export * from "../src/event_data";
+export { ConstructNodeIdOptions, NodeIdManager } from "../src/nodeid_manager";
+export * from "../src/nodeset_tools/construct_namespace_dependency";
+export * from "../src/private_namespace";
+export { validateDataTypeCorrectness } from "../src/validate_data_type_correctness";
+export * from "./address_space_ts";
+export { ContinuationPointManager } from "./continuation_points/continuation_point_manager";
+export { adjustBrowseDirection } from "./helpers/adjust_browse_direction";
+export * from "./helpers/argument_list";
+export * from "./helpers/call_helpers";
+export * from "./helpers/dump_tools";
+export * from "./helpers/ensure_secure_access";
+export * from "./helpers/make_optionals_map";
+export { resolveOpaqueOnAddressSpace } from "./helpers/resolve_opaque_on_address_space";
 export * from "./interfaces/alarms_and_conditions/condition_info_i";
 export * from "./interfaces/alarms_and_conditions/condition_snapshot";
 export * from "./interfaces/alarms_and_conditions/instantiate_alarm_condition_options";
@@ -28,6 +36,7 @@ export * from "./interfaces/alarms_and_conditions/instantiate_limit_alarm_option
 export * from "./interfaces/alarms_and_conditions/instantiate_off_normal_alarm_options";
 export * from "./interfaces/alarms_and_conditions/ua_acknowledgeable_condition_ex";
 export * from "./interfaces/alarms_and_conditions/ua_alarm_condition_ex";
+export * from "./interfaces/alarms_and_conditions/ua_base_event_ex";
 export * from "./interfaces/alarms_and_conditions/ua_certificate_expiration_alarm_ex";
 export * from "./interfaces/alarms_and_conditions/ua_condition_ex";
 export * from "./interfaces/alarms_and_conditions/ua_discrete_alarm_ex";
@@ -36,47 +45,28 @@ export * from "./interfaces/alarms_and_conditions/ua_exclusive_limit_alarm_ex";
 export * from "./interfaces/alarms_and_conditions/ua_limit_alarm_ex";
 export * from "./interfaces/alarms_and_conditions/ua_non_exclusive_deviation_alarm_ex";
 export * from "./interfaces/alarms_and_conditions/ua_non_exclusive_limit_alarm_ex";
-
+export * from "./interfaces/data_access/ua_multistate_discrete_ex";
+export * from "./interfaces/data_access/ua_multistate_value_discrete_ex";
+export * from "./interfaces/data_access/ua_two_state_discrete_ex";
+export * from "./interfaces/data_access/ua_y_array_item_ex";
+export * from "./interfaces/extension_object_constructor";
 export * from "./interfaces/nodeset_loader_options";
-
-export { promoteToMultiStateDiscrete } from "../src/data_access/ua_multistate_discrete_impl";
-export { promoteToMultiStateValueDiscrete } from "../src/data_access/ua_multistate_value_discrete_impl";
-export { promoteToTwoStateDiscrete } from "../src/data_access/ua_two_state_discrete_impl";
-export { validateIsNumericDataType } from "../src/data_access/ua_multistate_value_discrete_impl";
-// deprecated: validateDataType
-export { validateDataType } from "../src/data_access/ua_multistate_value_discrete_impl";
-export { validateDataTypeCorrectness  } from "../src/validate_data_type_correctness";
-export * from "./ua_root_folder";
-export * from "./ua_addin";
-export * from "./ua_interface";
-
-export * from "./session_context";
-export * from "./pseudo_session";
-
-export * from "./helpers/dump_tools";
-export * from "./helpers/make_optionals_map";
-export * from "./helpers/argument_list";
-export * from "./helpers/call_helpers";
-export * from "./helpers/ensure_secure_access";
-export { adjustBrowseDirection } from "./helpers/adjust_browse_direction";
-export { resolveOpaqueOnAddressSpace } from "./helpers/resolve_opaque_on_address_space";
-
-export { ContinuationPointManager } from "./continuation_points/continuation_point_manager";
+export * from "./interfaces/state_machine/ua_exclusive_limit_state_machine_type_ex";
+export * from "./interfaces/state_machine/ua_finite_state_machine_type";
+export * from "./interfaces/state_machine/ua_program_state_machine_type";
+export * from "./interfaces/state_machine/ua_shelved_state_machine_ex";
+export * from "./interfaces/state_machine/ua_state_machine_type";
+export * from "./interfaces/state_machine/ua_transition_ex";
+export * from "./interfaces/ua_subscription_diagnostics_variable_ex";
 export { ensureDatatypeExtracted, ensureDatatypeExtractedWithCallback } from "./loader/ensure_datatype_extracted";
-
 export * from "./loader/generateAddressSpaceRaw";
 export * from "./loader/register_node_promoter";
-
 export * from "./namespace";
+export type { INamespaceAlarmAndCondition } from "./namespace_alarm_and_condition.js";
 export * from "./namespace_data_access";
-export * from "../src/private_namespace";
-
-export { instantiateCertificateExpirationAlarm } from "../src/alarms_and_conditions/ua_certificate_expiration_alarm_impl";
-
-export { NodeIdManager, ConstructNodeIdOptions } from "../src/nodeid_manager";
-export * from "../src/event_data";
+export * from "./pseudo_session";
+export * from "./session_context";
 export * from "./set_namespace_meta_data";
-
-export * from "node-opcua-address-space-base";
-export * from "node-opcua-nodeset-ua";
-export * from "../src/nodeset_tools/construct_namespace_dependency";
+export * from "./ua_addin";
+export * from "./ua_interface";
+export * from "./ua_root_folder";

package/source/interfaces/alarms_and_conditions/condition_info_i.ts

@@ -1,9 +1,9 @@
 /**
  * @module node-opcua-address-space
  */
-import { UInt16 } from "node-opcua-basic-types";
-import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
-import { StatusCode } from "node-opcua-status-code";
+import type { UInt16 } from "node-opcua-basic-types";
+import type { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
+import type { StatusCode } from "node-opcua-status-code";
 
 export interface ConditionInfoOptions {
     message?: string | LocalizedTextLike | null;
@@ -13,7 +13,6 @@ export interface ConditionInfoOptions {
 
     time?: Date | null;
     receiveTime?: Date | null;
-
 }
 
 export interface ConditionInfo {

package/source/interfaces/alarms_and_conditions/condition_snapshot.ts

@@ -1,17 +1,17 @@
 /**
  * @module node-opcua-address-space.AlarmsAndConditions
  */
-import { EventEmitter } from "events";
-import { Variant } from "node-opcua-variant";
-import { IEventData, UAVariable, BaseNode } from "node-opcua-address-space-base";
-import { UInt16 } from "node-opcua-basic-types";
-import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
-import { NodeId } from "node-opcua-nodeid";
-import { StatusCode } from "node-opcua-status-code";
-import { TimeZoneDataType } from "node-opcua-types";
-import { UtcTime } from "../state_machine/ua_state_machine_type";
-import { ISetStateOptions } from "../i_set_state_options";
-import { IConditionVariableTypeSetterOptions } from "../i_condition_variable_type_setter_options";
+import type { EventEmitter } from "node:events";
+import type { BaseNode, IEventData, UAVariable } from "node-opcua-address-space-base";
+import type { UInt16 } from "node-opcua-basic-types";
+import type { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
+import type { NodeId } from "node-opcua-nodeid";
+import type { StatusCode } from "node-opcua-status-code";
+import type { TimeZoneDataType } from "node-opcua-types";
+import type { Variant } from "node-opcua-variant";
+import type { IConditionVariableTypeSetterOptions } from "../i_condition_variable_type_setter_options";
+import type { ISetStateOptions } from "../i_set_state_options";
+import type { UtcTime } from "../state_machine/ua_state_machine_type";
 
 export interface ConditionSnapshot {
     on(
@@ -108,7 +108,7 @@ export interface ConditionSnapshot extends EventEmitter {
      */
     setQuality(quality: StatusCode, options?: IConditionVariableTypeSetterOptions): void;
     /**
-     * 
+     *
      */
     getQuality(): StatusCode;
     /*
@@ -203,7 +203,7 @@ export interface ConditionSnapshot extends EventEmitter {
     getSourceNode(): NodeId;
 
     /**
-     * 
+     *
      */
     getEventType(): NodeId;
     getMessage(): LocalizedText;

package/source/interfaces/alarms_and_conditions/deviation_stuff.ts

@@ -1,17 +1,15 @@
-import { UAVariableT, UAVariable, IAddressSpace } from "node-opcua-address-space-base";
-import { DataType } from "node-opcua-basic-types";
-import { DataValue } from "node-opcua-data-value";
-import { SetPointSupport } from "./install_setpoint_options";
+import type { IAddressSpace, UAVariableT } from "node-opcua-address-space-base";
+import type { DataType } from "node-opcua-basic-types";
+import type { DataValue } from "node-opcua-data-value";
+import type { SetPointSupport } from "./install_setpoint_options";
 
 export interface DeviationStuff extends SetPointSupport {
-    
-    
     _onSetpointDataValueChange(dataValue: DataValue): void;
-    _setStateBasedOnInputValue(value: any): void;
-    
-    getSetpointNodeNode(): UAVariableT<number, DataType.Double> | UAVariableT<number, DataType.Float> | undefined ;
+    _setStateBasedOnInputValue(value: unknown): void;
 
-    getInputNodeValue(): any;
+    getSetpointNodeNode(): UAVariableT<number, DataType.Double> | UAVariableT<number, DataType.Float> | undefined;
+
+    getInputNodeValue(): number | null;
     getSetpointValue(): number | null;
 
     readonly addressSpace: IAddressSpace;

package/source/interfaces/alarms_and_conditions/install_setpoint_options.ts

@@ -1,10 +1,9 @@
-import { UAVariableT } from "node-opcua-address-space-base";
-import { DataType } from "node-opcua-basic-types";
-import { NodeId } from "node-opcua-nodeid";
+import type { UAVariableT } from "node-opcua-address-space-base";
+import type { DataType } from "node-opcua-basic-types";
+import type { NodeId } from "node-opcua-nodeid";
 
 export interface InstallSetPointOptions {
-    
-    // the set point used in the deviation calculation. 
+    // the set point used in the deviation calculation.
     // In cases where the Alarm is generated by an underlying system and if the Variable is not in the AddressSpace
     // a NULL NodeId shall be provided.
     setpointNode?: UAVariableT<number, DataType.Double> | UAVariableT<number, DataType.Float> | null;

package/source/interfaces/alarms_and_conditions/instantiate_alarm_condition_options.ts

@@ -1,10 +1,8 @@
-import { BaseNode } from "node-opcua-address-space-base";
-import { NodeId } from "node-opcua-nodeid";
-import { InstantiateConditionOptions } from "./instantiate_condition_options";
-
-
+import type { UAVariable } from "node-opcua-address-space-base";
+import type { NodeId } from "node-opcua-nodeid";
+import type { InstantiateConditionOptions } from "./instantiate_condition_options";
 
 export interface InstantiateAlarmConditionOptions extends InstantiateConditionOptions {
     maxTimeShelved?: number;
-    inputNode: BaseNode | NodeId;
+    inputNode: UAVariable | NodeId;
 }

package/source/interfaces/alarms_and_conditions/instantiate_condition_options.ts

@@ -1,8 +1,8 @@
-import { BaseNode, InstantiateObjectOptions, UAObject } from "node-opcua-address-space-base";
-import { NodeId } from "node-opcua-nodeid";
+import type { BaseNode, InstantiateObjectOptions, UAObject } from "node-opcua-address-space-base";
+import type { NodeId } from "node-opcua-nodeid";
 
 export interface InstantiateConditionOptions extends InstantiateObjectOptions {
     conditionOf?: UAObject | BaseNode | NodeId | null;
     conditionClass?: UAObject | BaseNode | NodeId | null;
     conditionName?: string;
-}
+}

package/source/interfaces/alarms_and_conditions/instantiate_exclusive_deviation_alarm_options.ts

@@ -1,5 +1,5 @@
-import { InstallSetPointOptions } from "./install_setpoint_options";
-import { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
+import type { InstallSetPointOptions } from "./install_setpoint_options";
+import type { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
 
 export interface InstantiateExclusiveDeviationAlarmOptions extends InstantiateLimitAlarmOptions, InstallSetPointOptions {
     /** empty interface */

package/source/interfaces/alarms_and_conditions/instantiate_exclusive_limit_alarm_options.ts

@@ -1,5 +1,5 @@
-import { InstallSetPointOptions } from "./install_setpoint_options";
-import { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
+import type { InstallSetPointOptions } from "./install_setpoint_options";
+import type { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
 
 export interface InstantiateExclusiveLimitAlarmOptions extends InstantiateLimitAlarmOptions, InstallSetPointOptions {
     /** empty interface */

package/source/interfaces/alarms_and_conditions/instantiate_limit_alarm_options.ts

@@ -1,10 +1,13 @@
-import { UAVariable } from "node-opcua-address-space-base";
-import { InstantiateAlarmConditionOptions } from "./instantiate_alarm_condition_options";
+// import type { UAVariable } from "node-opcua-address-space-base";
+import type { NodeId } from "node-opcua-nodeid";
+import type { UAVariable } from "../..";
+import type { InstantiateAlarmConditionOptions } from "./instantiate_alarm_condition_options";
 
 export interface InstantiateLimitAlarmOptions extends InstantiateAlarmConditionOptions {
     highHighLimit?: number;
     highLimit: number;
     lowLimit: number;
     lowLowLimit?: number;
-    inputNode: UAVariable;
+
+    inputNode: UAVariable | NodeId;
 }

package/source/interfaces/alarms_and_conditions/instantiate_non_exclusive_deviation_alarm_options.ts

@@ -1,5 +1,5 @@
-import { InstallSetPointOptions } from "./install_setpoint_options";
-import { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
+import type { InstallSetPointOptions } from "./install_setpoint_options";
+import type { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
 
 export interface InstantiateNonExclusiveDeviationAlarmOptions extends InstantiateLimitAlarmOptions, InstallSetPointOptions {
     /** empty interface */

package/source/interfaces/alarms_and_conditions/instantiate_non_exclusive_limit_alarm_options.ts

@@ -1,5 +1,5 @@
-import { InstallSetPointOptions } from "./install_setpoint_options";
-import { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
+import type { InstallSetPointOptions } from "./install_setpoint_options";
+import type { InstantiateLimitAlarmOptions } from "./instantiate_limit_alarm_options";
 
 export interface InstantiateNonExclusiveLimitAlarmOptions extends InstantiateLimitAlarmOptions, InstallSetPointOptions {
     /** empty interface */

package/source/interfaces/alarms_and_conditions/instantiate_off_normal_alarm_options.ts

@@ -1,21 +1,21 @@
-import { UAVariable } from "node-opcua-address-space-base";
-import { NodeIdLike } from "node-opcua-nodeid";
-import { InstantiateAlarmConditionOptions } from "./instantiate_alarm_condition_options";
+import type { UAVariable } from "node-opcua-address-space-base";
+import type { NodeIdLike } from "node-opcua-nodeid";
+import type { InstantiateAlarmConditionOptions } from "./instantiate_alarm_condition_options";
 
 export interface InstantiateOffNormalAlarmOptions extends InstantiateAlarmConditionOptions {
     /**
-     * 
+     *
      * https://reference.opcfoundation.org/v105/Core/docs/Part9/5.8.23/#5.8.23.2
-     * 
-     * The NormalState Property is a Property that points to a Variable which has a value that corresponds 
-     * to one of the possible values of the Variable pointed to by the InputNode Property where the NormalState 
+     *
+     * The NormalState Property is a Property that points to a Variable which has a value that corresponds
+     * to one of the possible values of the Variable pointed to by the InputNode Property where the NormalState
      * Property Variable value is the value that is considered to be the normal state of the Variable
-     * pointed to by the InputNode Property. 
-     * 
-     * When the value of the Variable referenced by the InputNode Property is not equal to the value of 
+     * pointed to by the InputNode Property.
+     *
+     * When the value of the Variable referenced by the InputNode Property is not equal to the value of
      * the NormalState Property the Alarm is Active. If this Variable is not in the AddressSpace,
      * a NULL NodeId shall be provided.
-     * 
+     *
      */
     normalState?: NodeIdLike | UAVariable | null;
 }

package/source/interfaces/alarms_and_conditions/ua_acknowledgeable_condition_ex.ts

@@ -1,38 +1,24 @@
-import { UAMethod } from "node-opcua-address-space-base";
-import { LocalizedTextLike, LocalizedText } from "node-opcua-data-model";
-import { UAAcknowledgeableCondition_Base } from "node-opcua-nodeset-ua";
-import { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
-import { ConditionSnapshot } from "./condition_snapshot";
-import { UAConditionEx, UAConditionHelper } from "./ua_condition_ex";
+import type { ListenerSignature, UAMethod, UAObject } from "node-opcua-address-space-base";
+import type { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
+import type { UAAcknowledgeableCondition_Base } from "node-opcua-nodeset-ua";
+import type { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
+import type { ConditionSnapshot } from "./condition_snapshot";
+import type { UAConditionEvents, UAConditionEx } from "./ua_condition_ex";
 
 export interface UAAcknowledgeableConditionHelper {
     autoConfirmBranch(branch: ConditionSnapshot, comment: LocalizedTextLike): void;
-
-
     acknowledgeAndAutoConfirmBranch(branch: ConditionSnapshot, comment: string | LocalizedTextLike | LocalizedText): void;
 }
 
-export interface UAAcknowledgeableConditionHelper extends UAConditionHelper {
-    ///
-    on(eventName: string, eventHandler: (...args: any[]) => void): this;
-    once(eventName: string, eventHandler: (...args: any[]) => void): this;
-
-    on(
-        eventName: "acknowledged" | "confirmed",
-        eventHandler: (eventId: Buffer | null, comment: LocalizedText, branch: ConditionSnapshot) => void
-    ): this;
+export interface UAAcknowledgeableConditionEvents extends UAConditionEvents {
+    acknowledged: (eventId: Buffer | null, comment: LocalizedText, branch: ConditionSnapshot) => void;
+    confirmed: (eventId: Buffer | null, comment: LocalizedText, branch: ConditionSnapshot) => void;
 }
 
-
-export interface UAAcknowledgeableConditionEx
+export interface UAAcknowledgeableConditionEx<T extends UAAcknowledgeableConditionEvents & ListenerSignature<T> = UAAcknowledgeableConditionEvents>
     extends UAAcknowledgeableCondition_Base,
         UAAcknowledgeableConditionHelper,
-        UAConditionEx {
-
-    on(eventName: string, eventHandler: any): this;
-    once(eventName: string, eventHandler: any): this;
-
-    
+        UAConditionEx<T> {
     enabledState: UATwoStateVariableEx;
     ackedState: UATwoStateVariableEx;
     confirmedState?: UATwoStateVariableEx;

package/source/interfaces/alarms_and_conditions/ua_alarm_condition_ex.ts

@@ -1,12 +1,12 @@
-import { BaseNode, UAVariable } from "node-opcua-address-space-base";
-import { NodeId } from "node-opcua-nodeid";
-import { UAAlarmCondition_Base } from "node-opcua-nodeset-ua";
-
-import { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
-import { UAShelvedStateMachineEx } from "../state_machine/ua_shelved_state_machine_ex";
-import { ConditionInfo } from "./condition_info_i";
-import { UAAcknowledgeableConditionEx, UAAcknowledgeableConditionHelper } from "./ua_acknowledgeable_condition_ex";
+import type { BaseNode, ITypedEventEmitter, ListenerSignature, UAObject, UAVariable } from "node-opcua-address-space-base";
+import type { NodeId } from "node-opcua-nodeid";
+import type { UAAlarmCondition_Base } from "node-opcua-nodeset-ua";
 
+import type { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
+import type { UAShelvedStateMachineEx } from "../state_machine/ua_shelved_state_machine_ex";
+import type { ConditionInfo } from "./condition_info_i";
+import type { UAAcknowledgeableConditionEvents, UAAcknowledgeableConditionEx, UAAcknowledgeableConditionHelper } from "./ua_acknowledgeable_condition_ex";
+import { ITypeDictionary } from "../../../../node-opcua-schemas/source";
 
 export interface UAAlarmConditionHelper extends UAAcknowledgeableConditionHelper {
     activateAlarm(): void;
@@ -16,16 +16,20 @@ export interface UAAlarmConditionHelper extends UAAcknowledgeableConditionHelper
     setMaxTimeShelved(duration: number): void;
     getMaxTimeShelved(): number;
     getInputNodeNode(): UAVariable | null;
-    getInputNodeValue(): any | null;
+    getInputNodeValue(): number | null;
     updateState(): void;
     getCurrentConditionInfo(): ConditionInfo;
     installInputNodeMonitoring(inputNode: BaseNode | NodeId): void;
 }
 
-export interface UAAlarmConditionEx extends UAAlarmConditionHelper, UAAlarmCondition_Base, UAAcknowledgeableConditionEx {
-    on(eventName: string, eventHandler: any): this;
-    once(eventName: string, eventHandler: any): this;
+export interface UALarmConditionEvents extends UAAcknowledgeableConditionEvents {
 
+}
+export interface UAAlarmConditionEx<T extends UALarmConditionEvents & ListenerSignature<T> = UALarmConditionEvents>
+extends  UAAlarmConditionHelper, 
+UAAlarmCondition_Base, 
+UAAcknowledgeableConditionEx<T>
+{
     enabledState: UATwoStateVariableEx;
     activeState: UATwoStateVariableEx;
     ackedState: UATwoStateVariableEx;
@@ -38,4 +42,3 @@ export interface UAAlarmConditionEx extends UAAlarmConditionHelper, UAAlarmCondi
     silenceState?: UATwoStateVariableEx;
     latchedState?: UATwoStateVariableEx;
 }
-

package/source/interfaces/alarms_and_conditions/ua_base_event_ex.ts

@@ -0,0 +1,12 @@
+import type { BaseNode, UAObjectEvents } from "node-opcua-address-space-base";
+import type { NodeId } from "node-opcua-nodeid";
+import type { UABaseEvent_Base } from "node-opcua-nodeset-ua";
+
+export interface UABaseEventHelper {
+    setSourceName(name: string): void;
+    setSourceNode(node: NodeId | BaseNode): void;
+}
+
+export interface UABaseEventEvents extends UAObjectEvents {}
+
+export interface UABaseEventEx extends UABaseEvent_Base, UABaseEventHelper {}

package/source/interfaces/alarms_and_conditions/ua_certificate_expiration_alarm_ex.ts

@@ -1,8 +1,8 @@
-import { DateTime } from "node-opcua-basic-types";
-import { Certificate } from "node-opcua-crypto/web";
-import { UACertificateExpirationAlarm_Base } from "node-opcua-nodeset-ua";
-import { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
-import { UAAcknowledgeableConditionEx, UAAcknowledgeableConditionHelper } from "./ua_acknowledgeable_condition_ex";
+import type { DateTime } from "node-opcua-basic-types";
+import type { Certificate } from "node-opcua-crypto/web";
+import type { UACertificateExpirationAlarm_Base } from "node-opcua-nodeset-ua";
+import type { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
+import type { UAAcknowledgeableConditionEx } from "./ua_acknowledgeable_condition_ex";
 
 export interface UACertificateExpirationAlarmEx
     extends Omit<

package/source/interfaces/alarms_and_conditions/ua_condition_ex.ts

@@ -1,39 +1,25 @@
-import { BaseNode, UAObject, UAProperty, UAVariable } from "node-opcua-address-space-base";
-import { LocalizedText } from "node-opcua-data-model";
-import { NodeId } from "node-opcua-nodeid";
-import { UACondition_Base } from "node-opcua-nodeset-ua";
-import { StatusCode } from "node-opcua-status-code";
-import { TimeZoneDataType } from "node-opcua-types";
-import { DataType } from "node-opcua-basic-types";
-import { ISetStateOptions } from "../i_set_state_options";
-import { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
-import { ConditionInfoOptions } from "./condition_info_i";
-import { ConditionSnapshot } from "./condition_snapshot";
-
-
-
-export interface UABaseEventHelper {
-    setSourceName(name: string): void;
-    setSourceNode(node: NodeId | BaseNode): void;
-}
-
+import type { ITypedEventEmitter, ListenerSignature, UAObject, UAProperty, UAVariable } from "node-opcua-address-space-base";
+import type { LocalizedText } from "node-opcua-data-model";
+import type { NodeId } from "node-opcua-nodeid";
+import type { UACondition_Base } from "node-opcua-nodeset-ua";
+import type { StatusCode } from "node-opcua-status-code";
+import type { TimeZoneDataType } from "node-opcua-types";
+import type { DataType } from "node-opcua-variant";
+import type { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
+import type { ISetStateOptions } from "../i_set_state_options";
+import type { ConditionInfoOptions } from "./condition_info_i";
+import type { ConditionSnapshot } from "./condition_snapshot";
+import type { UABaseEventEvents, UABaseEventEx, UABaseEventHelper } from "./ua_base_event_ex";
+
+export type { UABaseEventHelper } from "./ua_base_event_ex";
 
 export type AddCommentEventHandler = (eventId: Buffer | null, comment: LocalizedText, branch: ConditionSnapshot) => void;
 
-export interface UAConditionHelper {
-    on(eventName: string, eventHandler: (...args: any[]) => void): this;
-    // -- Events
-    on(eventName: "addComment", eventHandler: AddCommentEventHandler): this;
-    on(eventName: "branch_deleted", eventHandler: (branchId: string) => void): this;
-
-
-    once(eventName: string, eventHandler: (...args: any[]) => void): this;
-    // -- Events
-    once(eventName: "addComment", eventHandler: AddCommentEventHandler): this;
-    once(eventName: "branch_deleted", eventHandler: (branchId: string) => void): this;
+export interface UAConditionEvents extends UABaseEventEvents {
+    addComment: AddCommentEventHandler;
+    branch_deleted: (branchId: string) => void;
 }
 
-
 export interface UAConditionHelper extends UABaseEventHelper {
     getBranchCount(): number;
     getBranches(): ConditionSnapshot[];
@@ -51,30 +37,20 @@ export interface UAConditionHelper extends UABaseEventHelper {
     raiseNewCondition(conditionInfo: ConditionInfoOptions): void;
     raiseNewBranchState(branch: ConditionSnapshot): void;
     currentBranch(): ConditionSnapshot;
-    findBranchForEventId(eventId: Buffer| null): ConditionSnapshot | null;
-
+    findBranchForEventId(eventId: Buffer | null): ConditionSnapshot | null;
 }
 
-export interface UAConditionEx extends UAObject, UACondition_Base, UAConditionHelper {
+export interface UAConditionEx<T extends UAConditionEvents & ListenerSignature<T> = UAConditionEvents> extends 
+UABaseEventEx,
+ UACondition_Base, 
+ UAObject<T>, 
+ UAConditionHelper 
+ {
     enabledState: UATwoStateVariableEx;
-    on(eventName: string, eventHandler: any): this;
-    once(eventName: string, eventHandler: any): this;
-
-    //
-    conditionClassId: UAProperty<NodeId, /*c*/ DataType.NodeId>;
-    conditionClassName: UAProperty<LocalizedText, /*c*/ DataType.LocalizedText>;
-    conditionSubClassId?: UAProperty<NodeId[], /*c*/ DataType.NodeId>;
-    conditionSubClassName?: UAProperty<LocalizedText[], /*c*/ DataType.LocalizedText>;
-    // conditionName: UAProperty<UAString, /*c*/DataType.String>;
-    // branchId: UAProperty<NodeId, /*c*/DataType.NodeId>;
-    // retain: UAProperty<boolean, /*c*/DataType.Boolean>;
-    // quality: UAConditionVariable<StatusCode, /*c*/DataType.StatusCode>;
-    // lastSeverity: UAConditionVariable<UInt16, /*c*/DataType.UInt16>;
-    // comment: UAConditionVariable<LocalizedText, /*c*/DataType.LocalizedText>;
-    // clientUserId: UAProperty<UAString, /*c*/DataType.String>;
-    // disable: UAMethod;
-    // enable: UAMethod;
-    // addComment: UAMethod;
-    // conditionRefresh: UAMethod;
-    // conditionRefresh2: UAMethod;
+    // these are declared as optional in UABaseEvent_Base but required in UACondition_Base;
+    // re-state them here to disambiguate the two parent interfaces.
+    conditionClassId: UAProperty<NodeId, DataType.NodeId>;
+    conditionClassName: UAProperty<LocalizedText, DataType.LocalizedText>;
+    conditionSubClassId?: UAProperty<NodeId[], DataType.NodeId>;
+    conditionSubClassName?: UAProperty<LocalizedText[], DataType.LocalizedText>;
 }