node-opcua-address-space 2.55.0 → 2.58.0

package/src/state_machine/ua_shelving_state_machine_ex.ts

@@ -7,12 +7,13 @@
 // --------------------------------------------------------------------------------------------------
 
 import { assert } from "node-opcua-assert";
-import { StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
-import { UAProperty, MethodFunctorCallback, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
+import { UAProperty, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
 import { UAShelvedStateMachine_Base, UAState } from "node-opcua-nodeset-ua";
+import { CallMethodResultOptions } from "node-opcua-service-call";
 
 import { UAAlarmConditionImpl } from "../alarms_and_conditions/ua_alarm_condition_impl";
 import { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
@@ -22,14 +23,23 @@ import { promoteToStateMachine, UAStateMachineImpl } from "./finite_state_machin
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 
-export interface UAShelvedStateMachineHelper  {
+export interface UAShelvedStateMachineHelper {
     _timer: NodeJS.Timer | null;
     _sheveldTime: Date;
     _unshelvedTime: Date;
     _duration: number;
 }
-export interface UAShelvedStateMachineEx extends 
-    Omit<UAShelvedStateMachine_Base, "oneShotShelvedToUnshelved" | "unshelvedToTimedShelved" |"unshelvedToOneShotShelved" | "timedShelvedToUnshelved" | "timedShelvedToOneShotShelved" | "oneShotShelvedToTimedShelved" >, UAShelvedStateMachineHelper{
+export interface UAShelvedStateMachineEx
+    extends Omit<
+            UAShelvedStateMachine_Base,
+            | "oneShotShelvedToUnshelved"
+            | "unshelvedToTimedShelved"
+            | "unshelvedToOneShotShelved"
+            | "timedShelvedToUnshelved"
+            | "timedShelvedToOneShotShelved"
+            | "oneShotShelvedToTimedShelved"
+        >,
+        UAShelvedStateMachineHelper {
     unshelveTime: UAProperty<number, DataType.Double>;
     unshelved: UAState;
     timedShelved: UAState;
@@ -84,7 +94,7 @@ export class UAShelvedStateMachineEx extends UAStateMachineImpl implements UAShe
 // specifying ConditionId as the ObjectId. The Method cannot be called with an ObjectId of the
 // ShelvedStateMachineType Node.
 // output => BadConditionNotShelved
-function _unshelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _unshelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     assert(inputArguments.length === 0);
     // var alarmNode = context.object.parent;
     // if (!(alarmNode instanceof UAAlarmConditionImpl)) {
@@ -115,7 +125,7 @@ function _unshelve_method(inputArguments: VariantLike[], context: ISessionContex
     });
 }
 
-export function _clear_timer_if_any(shelvingState: UAShelvedStateMachineEx) {
+export function _clear_timer_if_any(shelvingState: UAShelvedStateMachineEx): void {
     if (shelvingState._timer) {
         clearTimeout(shelvingState._timer);
         // xx console.log("_clear_timer_if_any shelvingState = ",shelvingState._timer,shelvingState.constructor.name);
@@ -179,7 +189,7 @@ function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachin
 //                                           a reset of the shelved timer.
 //               BadShelvingTimeOutOfRange
 
-function _timedShelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _timedShelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     assert(inputArguments.length === 1);
     if (!context.object) {
         return;
@@ -241,7 +251,7 @@ function _oneShotShelve_method(
     this: UAMethod,
     inputArguments: Variant[],
     context: ISessionContext,
-    callback: MethodFunctorCallback
+    callback: CallbackT<CallMethodResultOptions>
 ) {
     assert(inputArguments.length === 0);
     const shelvingState = context.object! as UAShelvedStateMachineEx;

package/src/state_machine/ua_two_state_variable.ts

@@ -8,7 +8,7 @@ import { BrowseDirection, coerceLocalizedText, LocalizedText, LocalizedTextLike
 import { DataValueT, DataValueOptionsT } from "node-opcua-data-value";
 import { NodeId, resolveNodeId } from "node-opcua-nodeid";
 import { sameNodeId } from "node-opcua-nodeid";
-import { StatusCodes,StatusCode,  StatusCodeCallback } from "node-opcua-status-code";
+import { StatusCodes, StatusCode, StatusCodeCallback } from "node-opcua-status-code";
 import { Variant, VariantLike, VariantT } from "node-opcua-variant";
 import { DataType } from "node-opcua-variant";
 import { BaseNode, BindVariableOptions, INamespace, UAReference, UAVariable, ISessionContext } from "node-opcua-address-space-base";
@@ -16,7 +16,6 @@ import { UATwoStateVariable } from "node-opcua-nodeset-ua";
 import { NumericRange } from "node-opcua-numeric-range";
 import { QualifiedNameLike } from "node-opcua-data-model";
 
-
 // public interfaces
 import { registerNodePromoter } from "../../source/loader/register_node_promoter";
 import { AddTwoStateVariableOptions } from "../../source/address_space_ts";
@@ -130,7 +129,7 @@ export function _install_TwoStateVariable_machinery(
     assert(node.minimumSamplingInterval === 0);
     assert(node.typeDefinitionObj.browseName.toString() === "TwoStateVariableType");
     assert(node.dataTypeObj.browseName.toString() === "LocalizedText");
-    assert(Object.prototype.hasOwnProperty.call(node,"valueRank") && (node.valueRank === -1 || node.valueRank === 0));
+    assert(Object.prototype.hasOwnProperty.call(node, "valueRank") && (node.valueRank === -1 || node.valueRank === 0));
 
     // promote node into a UATwoStateVariable
     const _node = promoteToTwoStateVariable(node);
@@ -161,8 +160,8 @@ export interface TwoStateVariableInitializeOptions {
 }
 
 export declare interface UATwoStateVariableImpl extends UATwoStateVariableEx {
-    on():this;
-    once():this;
+    on(): this;
+    once(): this;
     readValue(
         context?: ISessionContext | null,
         indexRange?: NumericRange,
@@ -207,7 +206,6 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
     }
 
     public initialize(options: TwoStateVariableInitializeOptions): void {
-
         if (options.trueState) {
             assert(!!options.falseState);
             assert(typeof options.trueState === "string");
@@ -264,7 +262,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
                 },
                 StatusCodes.Good
             );
-        } else if (Object.prototype.hasOwnProperty.call(options.value,"dataType")) {
+        } else if (Object.prototype.hasOwnProperty.call(options.value, "dataType")) {
             assert((options.value as VariantLike).dataType === DataType.Boolean);
             this.id.setValueFromSource(options.value as VariantLike, StatusCodes.Good);
         } else {

package/src/tool_isSupertypeOf.ts

@@ -10,10 +10,6 @@ import { BaseNode, UADataType, UAObjectType, UAReference, UAReferenceType, UAVar
 import { BaseNode_getCache } from "./base_node_private";
 import { ReferenceImpl } from "./reference_impl";
 import { BaseNodeImpl } from "./base_node_impl";
-import { UAReferenceTypeImpl } from "./ua_reference_type_impl";
-import { UADataTypeImpl } from "./ua_data_type_impl";
-import { UAObjectTypeImpl } from "./ua_object_type_impl";
-import { UAVariableTypeImpl } from "./ua_variable_type_impl";
 
 const HasSubTypeNodeId = resolveNodeId("HasSubtype");
 
@@ -38,7 +34,7 @@ function _slow_isSupertypeOf<T extends UAType>(this: T, Class: typeof BaseNodeIm
 
     for (const subType1 of subTypes) {
         const subTypeId = subType1.nodeId;
-        const subTypeNode = (this.addressSpace.findNode(subTypeId) as any) as T;
+        const subTypeNode = this.addressSpace.findNode(subTypeId) as any as T;
         // istanbul ignore next
         if (!subTypeNode) {
             throw new Error("Cannot find object with nodeId " + subTypeId.toString());
@@ -101,7 +97,7 @@ export function construct_isSupertypeOf<T extends UAType>(Class: typeof BaseNode
 }
 
 export function construct_slow_isSupertypeOf<T extends UAType>(Class: typeof BaseNodeImpl) {
-    return function (this: T, baseType: T) {
+    return function (this: T, baseType: T): boolean {
         return _slow_isSupertypeOf.call(this, Class, baseType);
     };
 }

package/src/ua_condition_type.ts

@@ -1,6 +1,5 @@
 import { UAMethod, UAObjectType } from "node-opcua-address-space-base";
 
-
 export interface UAConditionType extends UAObjectType {
     disable: UAMethod;
     enable: UAMethod;

package/src/ua_method_impl.ts

@@ -1,6 +1,7 @@
 /**
  * @module node-opcua-address-space
  */
+import { callbackify } from "util";
 import * as chalk from "chalk";
 import { assert } from "node-opcua-assert";
 
@@ -11,11 +12,23 @@ import { make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug"
 import { NodeId } from "node-opcua-nodeid";
 import { NumericRange } from "node-opcua-numeric-range";
 import { Argument } from "node-opcua-service-call";
-import { StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { CallMethodResultOptions, PermissionType } from "node-opcua-types";
 import { Variant } from "node-opcua-variant";
 import { DataType, VariantLike } from "node-opcua-variant";
-import { MethodFunctor, MethodFunctorCallback, UAMethod, UAObject, CloneExtraInfo, CloneFilter, CloneOptions, UAObjectType, ISessionContext, UAVariable, } from "node-opcua-address-space-base";
+import {
+    MethodFunctor,
+    MethodFunctorA,
+    MethodFunctorC,
+    UAMethod,
+    UAObject,
+    CloneExtraInfo,
+    CloneFilter,
+    CloneOptions,
+    UAObjectType,
+    ISessionContext,
+    UAVariable
+} from "node-opcua-address-space-base";
 import { SessionContext } from "../source";
 import { _clone } from "./base_node_private";
 import { _handle_hierarchy_parent } from "./namespace_impl";
@@ -47,7 +60,7 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
 
     public value?: any;
     public methodDeclarationId: NodeId;
-    public _getExecutableFlag?: (this: UAMethod, context: ISessionContext| null) => boolean;
+    public _getExecutableFlag?: (this: UAMethod, context: ISessionContext | null) => boolean;
 
     public _asyncExecutionFunction?: MethodFunctor;
 
@@ -80,11 +93,10 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
     }
 
     public readAttribute(
-        context: ISessionContext | null, 
-        attributeId: AttributeIds,      
+        context: ISessionContext | null,
+        attributeId: AttributeIds,
         indexRange?: NumericRange,
         dataEncoding?: QualifiedNameLike | null
- 
     ): DataValue {
         const options: DataValueLike = {};
         switch (attributeId) {
@@ -112,6 +124,10 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
 
     public bindMethod(async_func: MethodFunctor): void {
         assert(typeof async_func === "function");
+        if (async_func.length === 2) {
+            async_func = callbackify(async_func as MethodFunctorA) as MethodFunctorC;
+        }
+        assert(async_func.length === 3);
         this._asyncExecutionFunction = async_func;
     }
     public execute(
@@ -123,13 +139,13 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
         object: UAObject | UAObjectType | null,
         inputArguments: null | VariantLike[],
         context: ISessionContext,
-        callback: MethodFunctorCallback
+        callback: CallbackT<CallMethodResultOptions>
     ): void;
     public execute(
         object: UAObject | UAObjectType | null,
         inputArguments: VariantLike[] | null,
         context: ISessionContext,
-        callback?: MethodFunctorCallback
+        callback?: CallbackT<CallMethodResultOptions>
     ): any {
         // istanbul ignore next
         if (!callback) {
@@ -190,7 +206,7 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
                 this as UAMethodImpl,
                 inputArguments as Variant[],
                 context,
-                (err: Error | null, callMethodResult: CallMethodResultOptions) => {
+                (err: Error | null, callMethodResult?: CallMethodResultOptions) => {
                     if (err) {
                         debugLog(err.message);
                         debugLog(err);

package/src/ua_object_impl.ts

@@ -20,23 +20,28 @@ import {
     UAMethod,
     UAObject,
     UAObjectType,
-    CloneOptions, CloneFilter, CloneExtraInfo, BaseNode, UAEventType
+    CloneOptions,
+    CloneFilter,
+    CloneExtraInfo,
+    BaseNode,
+    UAEventType,
+    IEventData
 } from "node-opcua-address-space-base";
 
-import { BaseNodeImpl } from "./base_node_impl";
+import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
 import { _clone, ToStringBuilder, UAObject_toString } from "./base_node_private";
-import { apply_condition_refresh } from "./apply_condition_refresh";
+import { apply_condition_refresh, ConditionRefreshCache } from "./apply_condition_refresh";
 
 export class UAObjectImpl extends BaseNodeImpl implements UAObject {
     public readonly nodeClass = NodeClass.Object;
     public readonly eventNotifier: number;
-    public readonly symbolicName: string;
+    public readonly symbolicName: string | null;
 
     get typeDefinitionObj(): UAObjectType {
         return super.typeDefinitionObj as UAObjectType;
     }
 
-    constructor(options: any) {
+    constructor(options: InternalBaseNodeOptions & { eventNotifier?: number; symbolicName?: string | null }) {
         super(options);
         this.eventNotifier = options.eventNotifier || 0;
         assert(typeof this.eventNotifier === "number" && isValidByte(this.eventNotifier));
@@ -72,7 +77,7 @@ export class UAObjectImpl extends BaseNodeImpl implements UAObject {
         options = {
             ...options,
             eventNotifier: this.eventNotifier,
-            symbolicName: this.symbolicName
+            symbolicName: this.symbolicName || undefined
         };
 
         const cloneObject = _clone.call(this, UAObjectImpl, options, optionalFilter, extraInfo) as UAObject;
@@ -145,7 +150,7 @@ export class UAObjectImpl extends BaseNodeImpl implements UAObject {
         this._bubble_up_event(eventData1);
     }
 
-    public _bubble_up_event(eventData: any) {
+    public _bubble_up_event(eventData: IEventData): void {
         const addressSpace = this.addressSpace;
 
         const queue: any[] = [];
@@ -191,7 +196,7 @@ export class UAObjectImpl extends BaseNodeImpl implements UAObject {
             elements2.forEach(addInQueue);
         }
     }
-    public _conditionRefresh(_cache?: any) {
+    public _conditionRefresh(_cache?: ConditionRefreshCache): void {
         apply_condition_refresh.call(this, _cache);
     }
 

package/src/ua_object_type_impl.ts

@@ -23,7 +23,11 @@ import { BaseNodeImpl } from "./base_node_impl";
 import { ToStringBuilder, UAObjectType_toString } from "./base_node_private";
 import { get_subtypeOf, get_subtypeOfObj } from "./tool_isSupertypeOf";
 import * as tools from "./tool_isSupertypeOf";
-import { assertUnusedChildBrowseName, initialize_properties_and_components, topMostParentIsObjectTypeOrVariableType } from "./ua_variable_type_impl";
+import {
+    assertUnusedChildBrowseName,
+    initialize_properties_and_components,
+    topMostParentIsObjectTypeOrVariableType
+} from "./ua_variable_type_impl";
 import { AddressSpacePrivate } from "./address_space_private";
 
 export class UAObjectTypeImpl extends BaseNodeImpl implements UAObjectType {
@@ -101,8 +105,8 @@ export class UAObjectTypeImpl extends BaseNodeImpl implements UAObjectType {
             "expecting a browse name"
         );
 
-        assert(!Object.prototype.hasOwnProperty.call(options,"propertyOf"), "an Object shall not be a PropertyOf an other object");
-        assert(!Object.prototype.hasOwnProperty.call(options,"optional"), "do you mean optionals ?");
+        assert(!Object.prototype.hasOwnProperty.call(options, "propertyOf"), "an Object shall not be a PropertyOf an other object");
+        assert(!Object.prototype.hasOwnProperty.call(options, "optional"), "do you mean optionals ?");
 
         assertUnusedChildBrowseName(addressSpace, options);
 
@@ -113,7 +117,6 @@ export class UAObjectTypeImpl extends BaseNodeImpl implements UAObjectType {
 
         const copyAlsoModellingRules = topMostParentIsObjectTypeOrVariableType(addressSpace, options);
 
-                
         const opts: AddObjectOptions = {
             browseName: options.browseName,
             componentOf: options.componentOf,

package/src/ua_reference_type_impl.ts

@@ -17,14 +17,10 @@ import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
 import * as tools from "./tool_isSupertypeOf";
 import { get_subtypeOf, get_subtypeOfObj } from "./tool_isSupertypeOf";
 import { ReferenceImpl } from "./reference_impl";
-import {
-    BaseNode_getCache
-} from "./base_node_private";
-
+import { BaseNode_getCache } from "./base_node_private";
 
 const ReferenceTypeCounter = { count: 0 };
 
-
 function _internal_getAllSubtypes(referenceType: UAReferenceType): UAReferenceTypePublic[] {
     const addressSpace = referenceType.addressSpace;
     const possibleReferenceTypes: UAReferenceType[] = [];
@@ -45,7 +41,6 @@ function _internal_getAllSubtypes(referenceType: UAReferenceType): UAReferenceTy
 }
 
 function _getAllSubtypes(ref: UAReferenceType) {
-
     const _cache = BaseNode_getCache(ref);
 
     if (!_cache._allSubTypesVersion || _cache._allSubTypesVersion < ReferenceTypeCounter.count) {
@@ -69,9 +64,8 @@ function _internal_getSubtypeIndex(referenceType: UAReferenceType): { [key: stri
 }
 
 function _getSubtypeIndex(referenceType: UAReferenceType): { [key: string]: UAReferenceTypePublic } {
-
     const _cache = BaseNode_getCache(referenceType);
-    if (!_cache._subtype_idx  || _cache._subtype_idxVersion < ReferenceTypeCounter.count) {
+    if (!_cache._subtype_idx || _cache._subtype_idxVersion < ReferenceTypeCounter.count) {
         // the cache need to be invalidated
         _cache._subtype_idx = null;
     }
@@ -82,7 +76,6 @@ function _getSubtypeIndex(referenceType: UAReferenceType): { [key: string]: UARe
     return _cache._subtype_idx;
 }
 
-
 export interface UAReferenceTypeOptions extends InternalBaseNodeOptions {
     isAbstract?: boolean;
     symmetric?: boolean;
@@ -154,7 +147,9 @@ export class UAReferenceTypeImpl extends BaseNodeImpl implements UAReferenceType
         return str;
     }
 
-    public install_extra_properties(): void { /**  */ }
+    public install_extra_properties(): void {
+        /**  */
+    }
 
     /**
      * returns a array of all ReferenceTypes in the addressSpace that are self or a subType of self
@@ -166,9 +161,8 @@ export class UAReferenceTypeImpl extends BaseNodeImpl implements UAReferenceType
 
     public checkHasSubtype(ref: UAReference | NodeId): boolean {
         const _index = _getSubtypeIndex(this);
-        const referenceTypeNodeId = ref instanceof ReferenceImpl ? ref.nodeId : ref as NodeId;
+        const referenceTypeNodeId = ref instanceof ReferenceImpl ? ref.nodeId : (ref as NodeId);
         const _key = referenceTypeNodeId.toString();
         return !!_index[_key];
     }
-
 }

package/src/ua_variable_impl.ts

@@ -8,7 +8,7 @@
 // tslint:disable:max-line-length
 import * as chalk from "chalk";
 
-import { GetFunc, SetFunc } from "node-opcua-address-space-base";
+import { ContinuationData, GetFunc, SetFunc } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
 import {
     isValidDataEncoding,
@@ -1507,7 +1507,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         return this.$extensionObject;
     }
 
-    public updateExtensionObjectPartial(partialExtensionObject?: {[key:string]: any}): ExtensionObject {
+    public updateExtensionObjectPartial(partialExtensionObject?: { [key: string]: any }): ExtensionObject {
         setExtensionObjectValue(this, partialExtensionObject);
         return this.$extensionObject;
     }
@@ -1571,7 +1571,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
             | ReadAtTimeDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint?: ContinuationPoint
+        continuationData: ContinuationData
     ): Promise<HistoryReadResult>;
 
     public historyRead(
@@ -1584,7 +1584,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
             | ReadAtTimeDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback: CallbackT<HistoryReadResult>
     ): void;
     public historyRead(
@@ -1597,19 +1597,15 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
             | ReadAtTimeDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint?: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback?: CallbackT<HistoryReadResult>
     ): any {
-        if (!callback) {
-            callback = continuationPoint as any as CallbackT<HistoryReadResult>;
-            continuationPoint = undefined;
-        }
         assert(context instanceof SessionContext);
         assert(callback instanceof Function);
         if (typeof this._historyRead !== "function") {
-            return callback(null, new HistoryReadResult({ statusCode: StatusCodes.BadNotReadable }));
+            return callback!(null, new HistoryReadResult({ statusCode: StatusCodes.BadNotReadable }));
         }
-        this._historyRead(context, historyReadDetails, indexRange, dataEncoding, continuationPoint || null, callback);
+        this._historyRead(context, historyReadDetails, indexRange, dataEncoding, continuationData, callback!);
     }
 
     public _historyReadRaw(
@@ -1617,7 +1613,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         historyReadRawModifiedDetails: ReadRawModifiedDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback: CallbackT<HistoryReadResult>
     ): void {
         throw new Error("");
@@ -1628,7 +1624,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         historyReadRawModifiedDetails: ReadRawModifiedDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint?: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback?: CallbackT<HistoryReadResult>
     ): any {
         throw new Error("");
@@ -1644,7 +1640,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
             | ReadAtTimeDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback: CallbackT<HistoryReadResult>
     ): void {
         const result = new HistoryReadResult({
@@ -1672,7 +1668,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         historyReadRawModifiedDetails: ReadRawModifiedDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback: CallbackT<HistoryReadResult>
     ): any {
         throw new Error("");

package/src/ua_variable_type_impl.ts

@@ -122,8 +122,8 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
 
         this.minimumSamplingInterval = 0;
 
-        this.historizing = isNullOrUndefined(options.historizing) ? false : options.historizing as boolean;
-        this.isAbstract = isNullOrUndefined(options.isAbstract) ? false : options.isAbstract as boolean;
+        this.historizing = isNullOrUndefined(options.historizing) ? false : (options.historizing as boolean);
+        this.isAbstract = isNullOrUndefined(options.isAbstract) ? false : (options.isAbstract as boolean);
 
         this.value = options.value; // optional default value for instances of this UAVariableType
 

package/src/ua_view_impl.ts

@@ -7,7 +7,7 @@ import { AttributeIds } from "node-opcua-data-model";
 import { DataValue, DataValueLike } from "node-opcua-data-value";
 import { StatusCodes } from "node-opcua-status-code";
 import { DataType } from "node-opcua-variant";
-import { ISessionContext, UAView  } from "node-opcua-address-space-base";
+import { ISessionContext, UAView } from "node-opcua-address-space-base";
 
 import { SessionContext } from "../source/session_context";
 import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
@@ -17,7 +17,6 @@ export interface InternalViewOptions extends InternalBaseNodeOptions {
 }
 
 export class UAViewImpl extends BaseNodeImpl implements UAView {
-
     public readonly nodeClass = NodeClass.View;
     public readonly containsNoLoops: boolean;
     public readonly eventNotifier: number;
@@ -29,13 +28,11 @@ export class UAViewImpl extends BaseNodeImpl implements UAView {
     }
 
     public readAttribute(context: ISessionContext | null, attributeId: AttributeIds): DataValue {
-
         context = context || SessionContext.defaultContext;
-   
+
         const options: DataValueLike = {};
 
         switch (attributeId) {
-
             case AttributeIds.EventNotifier:
                 options.value = { dataType: DataType.UInt32, value: this.eventNotifier };
                 options.statusCode = StatusCodes.Good;
@@ -47,7 +44,7 @@ export class UAViewImpl extends BaseNodeImpl implements UAView {
                 break;
 
             default:
-               return super.readAttribute(context, attributeId);
+                return super.readAttribute(context, attributeId);
         }
         return new DataValue(options);
     }

package/testHelpers.d.ts

@@ -1 +1 @@
-export * from "./distHelpers";
+export * from "./distHelpers";

package/test_helpers/add_event_generator_object.ts

@@ -1,12 +1,13 @@
 /**
  * @module node-opcua-address-space
  */
-import { StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant } from "node-opcua-variant";
-import { INamespace, UAObject, ISessionContext, MethodFunctorCallback } from "node-opcua-address-space-base";
-import { UAFolder   } from "node-opcua-nodeset-ua";
+import { INamespace, UAObject, ISessionContext } from "node-opcua-address-space-base";
+import { UAFolder } from "node-opcua-nodeset-ua";
+import { CallMethodResultOptions } from "node-opcua-types";
 
-export function add_eventGeneratorObject(namespace: INamespace, parentFolder: UAFolder | string) {
+export function add_eventGeneratorObject(namespace: INamespace, parentFolder: UAFolder | string): void {
     const myEvtType = namespace.addEventType({
         browseName: "MyEventType",
         subtypeOf: "BaseEventType" // should be implicit
@@ -40,7 +41,7 @@ export function add_eventGeneratorObject(namespace: INamespace, parentFolder: UA
         outputArguments: []
     });
 
-    method.bindMethod((inputArguments: Variant[], context: ISessionContext, callback: MethodFunctorCallback) => {
+    method.bindMethod((inputArguments: Variant[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) => {
         // xx console.log("In Event Generator Method");
         // xx console.log(this.toString());
         // xx console.log(context.object.toString());

package/test_helpers/alarms_and_conditions_demo.ts

@@ -2,8 +2,8 @@
  * @module node-opcua-address-space
  */
 import { assert } from "node-opcua-assert";
-import { AddressSpace, UAExclusiveLimitAlarmImpl, UAObject, UAVariable} from "..";
-import { UANonExclusiveLimitAlarmEx , UAExclusiveLimitAlarmEx } from "..";
+import { AddressSpace, UAExclusiveLimitAlarmImpl, UAObject, UAVariable } from "..";
+import { UANonExclusiveLimitAlarmEx, UAExclusiveLimitAlarmEx } from "..";
 
 export interface IAlarmTestData {
     tankLevel: UAVariable;
@@ -13,8 +13,7 @@ export interface IAlarmTestData {
     tankTripCondition: null;
 }
 
-export function construct_demo_alarm_in_address_space(test: IAlarmTestData, addressSpace: AddressSpace) {
-    
+export function construct_demo_alarm_in_address_space(test: IAlarmTestData, addressSpace: AddressSpace): void {
     const a = addressSpace as any;
     if (a.construct_demo_alarm_in_address_space_called) {
         return;
@@ -72,20 +71,22 @@ export function construct_demo_alarm_in_address_space(test: IAlarmTestData, addr
             "Confirm" // confirm state and confirm Method
         ]
     }) as UAExclusiveLimitAlarmImpl;
-    
+
     assert(tankLevelCondition.browseName.toString() === "1:TankLevelCondition");
 
     assert(tankLevel.findReferences("HasCondition").length === 1);
     assert(tankLevel.findReferencesAsObject("HasCondition", true).length === 1);
-      
+
     const conditionName = tankLevel.findReferencesAsObject("HasCondition", true)[0].browseName.toString();
-    const conditionTypeDefinition =  (tankLevel.findReferencesAsObject("HasCondition", true)[0] as UAObject).typeDefinitionObj.browseName.toString();
+    const conditionTypeDefinition = (
+        tankLevel.findReferencesAsObject("HasCondition", true)[0] as UAObject
+    ).typeDefinitionObj.browseName.toString();
     const conditionJavascriptClass = tankLevel.findReferencesAsObject("HasCondition", true)[0].constructor.name.toString();
     if (false) {
         console.log(conditionName, conditionTypeDefinition, conditionJavascriptClass);
     }
     assert("1:TankLevelCondition" === conditionName);
-    assert("ExclusiveLimitAlarmType" === conditionTypeDefinition)
+    assert("ExclusiveLimitAlarmType" === conditionTypeDefinition);
     assert("UAExclusiveLimitAlarmImpl" === conditionJavascriptClass);
 
     // ----------------------------------------------------------------