node-opcua-address-space 2.170.1 → 2.173.0

package/src/reference_impl.ts

@@ -3,9 +3,9 @@
  */
 // tslint:disable:no-console
 import chalk from "chalk";
-import { AddReferenceOpts, UAReference, BaseNode, UAReferenceType } from "node-opcua-address-space-base";
+import type { AddReferenceOpts, BaseNode, UAReference, UAReferenceType } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
-import { coerceNodeId, NodeId, NodeIdLike, sameNodeId } from "node-opcua-nodeid";
+import { coerceNodeId, NodeId, type NodeIdLike, sameNodeId } from "node-opcua-nodeid";
 import { isNullOrUndefined } from "node-opcua-utils";
 
 export function isNodeIdString(str: string): boolean {
@@ -15,9 +15,7 @@ export function isNodeIdString(str: string): boolean {
 
 function is_valid_reference(ref: UAReference): boolean {
     const hasRequestedProperties =
-        Object.prototype.hasOwnProperty.call(ref, "referenceType") &&
-        Object.prototype.hasOwnProperty.call(ref, "nodeId") &&
-        !isNullOrUndefined(ref.isForward);
+        Object.hasOwn(ref, "referenceType") && Object.hasOwn(ref, "nodeId") && !isNullOrUndefined(ref.isForward);
 
     if (!hasRequestedProperties) {
         return false;
@@ -44,9 +42,9 @@ function _arrow(text: string, length: number, isForward: boolean): string {
     const extra = text.length % 2 === 1 ? "-" : "";
 
     if (isForward) {
-        return extra + h + " " + text + " " + h + "> ";
+        return `${extra + h} ${text} ${h}> `;
     }
-    return "<" + h + " " + text + " " + h + extra + " ";
+    return `<${h} ${text} ${h}${extra} `;
 }
 
 function _w(str: string, width: number): string {
@@ -54,7 +52,7 @@ function _w(str: string, width: number): string {
 }
 
 function _localCoerceToNodeID(nodeIdLike: string | NodeIdLike | { nodeId: NodeId }): NodeId {
-    if (Object.prototype.hasOwnProperty.call(nodeIdLike, "nodeId")) {
+    if (typeof nodeIdLike === "object" &&  Object.hasOwn(nodeIdLike, "nodeId")) {
         return (nodeIdLike as { nodeId: NodeId }).nodeId;
     }
     return coerceNodeId(nodeIdLike);
@@ -133,13 +131,13 @@ export class ReferenceImpl implements UAReference {
         let infoNode = _w(this.nodeId.toString(), 24);
         let refType = this.referenceType.toString();
 
-        if (options && options.addressSpace) {
+        if (options?.addressSpace) {
             const node = options.addressSpace.findNode(this.nodeId);
-            infoNode = "[" + infoNode + "]" + _w(node?.browseName.toString(), 40);
+            infoNode = `[${infoNode}]${_w(node?.browseName.toString(), 40)}`;
 
             const ref = options.addressSpace.findReferenceType(this.referenceType);
             const refNode = options.addressSpace.findNode(ref.nodeId);
-            refType = refNode.browseName.toString() + " (" + ref.nodeId.toString() + ")";
+            refType = `${refNode.browseName.toString()} (${ref.nodeId.toString()})`;
         }
         return _arrow(refType, 40, this.isForward) + infoNode;
     }
@@ -149,7 +147,7 @@ export class ReferenceImpl implements UAReference {
      */
     get hash(): string {
         if (!this.__hash) {
-            this.__hash = (this.isForward ? "" : "!") + this.referenceType.toString() + "-" + this.nodeId.toString();
+            this.__hash = `${(this.isForward ? "" : "!") + this.referenceType.toString()}-${this.nodeId.toString()}`;
         }
         return this.__hash;
     }
@@ -167,7 +165,6 @@ export class ReferenceImpl implements UAReference {
         */
     }
 }
-function errorLog(arg0: string, reference: UAReference) {
+function errorLog(_arg0: string, _reference: UAReference) {
     throw new Error("Function not implemented.");
 }
-

package/src/role_permissions.ts

@@ -1,4 +1,4 @@
-import { RolePermissionType, RolePermissionTypeOptions } from "node-opcua-types";
+import { RolePermissionType, type RolePermissionTypeOptions } from "node-opcua-types";
 
 export function coerceRolePermissions(rolePermissions: RolePermissionTypeOptions[] | undefined): RolePermissionType[] | undefined {
     if (!rolePermissions) return undefined;

package/src/state_machine/finite_state_machine.ts

@@ -2,43 +2,44 @@
  * @module node-opcua-address-space
  */
 import chalk from "chalk";
-import { UAState, UAStateVariable, UATransition, UATransition_Base, UATransitionVariable } from "node-opcua-nodeset-ua";
+import type { BaseNode, UAMethod, UAObject, UAObjectType, UAVariable } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
 import { ObjectTypeIds } from "node-opcua-constants";
 import {
+    AttributeIds,
     BrowseDirection,
     coerceLocalizedText,
     coerceQualifiedName,
-    LocalizedText,
     NodeClass,
-    QualifiedName
+    type QualifiedName
 } from "node-opcua-data-model";
-import { AttributeIds } from "node-opcua-data-model";
 import { make_debugLog, make_warningLog } from "node-opcua-debug";
 import { NodeId, sameNodeId } from "node-opcua-nodeid";
+import type { UAState, UATransition } from "node-opcua-nodeset-ua";
 import { StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant, VariantArrayType } from "node-opcua-variant";
-import { UAString } from "node-opcua-basic-types";
-import { BaseNode, UAMethod, UAObject, UAObjectType, UAProperty, UAVariable, UAVariableT } from "node-opcua-address-space-base";
-import { registerNodePromoter } from "../../source/loader/register_node_promoter";
-
-import {
-    UAStateMachineEx,
+import type {
     TransitionSelector,
+    UAStateMachineEx,
     UAStateMachineTypeHelper
 } from "../../source/interfaces/state_machine/ua_state_machine_type";
-import { UAObjectImpl } from "../ua_object_impl";
-import { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
+import type { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
+import { registerNodePromoter } from "../../source/loader/register_node_promoter";
 import { BaseNodeImpl } from "../base_node_impl";
+import { UAObjectImpl } from "../ua_object_impl";
 import { UAObjectTypeImpl } from "../ua_object_type_impl";
 
 const warningLog = make_warningLog(__filename);
 
 const doDebug = false;
-const debugLog = make_debugLog(__filename);
+const debugLog = make_debugLog(__filename); 
+
+export class UATransitionImplBase extends BaseNodeImpl {
+    /* intentionnaly empty */
+}
+export type UATransitionImpl = UATransitionImplBase & UATransitionEx;
+export const  UATransitionImpl = UATransitionImplBase as unknown as new () => UATransitionImpl;
 
-export declare interface UATransitionImpl extends UATransition, UATransitionEx {}
-export class UATransitionImpl implements UATransition, UATransitionEx {}
 
 function getComponentOfType(typeDef: UAObjectType, typedefinition: UAObjectType): UAObject[] {
     const get = (typeDef: UAObjectType) =>
@@ -61,13 +62,7 @@ function getComponentOfType(typeDef: UAObjectType, typedefinition: UAObjectType)
     return components_parts as UAObject[];
 }
 
-export interface UAStateMachineImpl {
-    currentState: UAStateVariable<LocalizedText>;
-    lastTransition?: UATransitionVariable<LocalizedText>;
 
-    // Extra
-    _currentStateNode: UAState | null;
-}
 
 const defaultPredicate = (transitions: UATransition[], fromState: UAState, toState: UAState) => {
     if (transitions.length === 0) {
@@ -123,19 +118,20 @@ export function getFiniteStateMachineTypeTransitions(uaFiniteStateMachineType: U
 
 export function getFiniteStateMachineTypeStateByName(uaFiniteStateMachineType: UAObjectType, stateName: string): UAState | null {
     let states = getFiniteStateMachineTypeStates(uaFiniteStateMachineType);
-    states = states.filter((s: any) => {
+    states = states.filter((s) => {
         return s.browseName.name === stateName;
     });
     assert(states.length <= 1);
-    return states.length === 1 ? (states[0] as any as UAState) : null;
+    return states.length === 1 ? (states[0]) : null;
 }
 
+const $ = (uaObject: UAStateMachineImplBase) =>  uaObject as  unknown as UAStateMachineEx;
 /*
  *
  * @class StateMachine
  *
  */
-export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx {
+export class UAStateMachineImplBase extends UAObjectImpl {
     public getStates(): UAState[] {
         const typeDef = this.typeDefinitionObj;
         return getFiniteStateMachineTypeStates(typeDef);
@@ -169,7 +165,8 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
     get initialState(): UAState | null {
         const addressSpace = this.addressSpace;
 
-        const initialStateType = addressSpace.findObjectType("InitialStateType")!;
+        const initialStateType = addressSpace.findObjectType("InitialStateType");
+        if (!initialStateType) throw new Error("cannot find InitialStateType");
         const typeDef = this.typeDefinitionObj;
 
         const comp = getComponentOfType(typeDef, initialStateType);
@@ -190,9 +187,9 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
             return node;
         } else if (node instanceof NodeId) {
             const addressSpace = this.addressSpace;
-            return addressSpace.findNode(node) as BaseNode;
+            return addressSpace.findNode(node);
         } else if (typeof node === "string") {
-            return this.getStateByName(node) as any as BaseNode;
+            return this.getStateByName(node);
         }
         return null;
     }
@@ -204,7 +201,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
         if (!this.currentStateNode) {
             return true;
         }
-        const n = this.currentState.readValue();
+        const _n = $(this).currentState.readValue();
 
         // to be executed there must be a transition from currentState to toState
         const transition = this.findTransitionNode(this.currentStateNode, toStateNode, predicate);
@@ -247,18 +244,18 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
         }
 
         const stateType = addressSpace.findObjectType("StateType");
-        
+
         // c8 ignore next
         if (!stateType) {
             throw new Error("Cannot find StateType");
         }
-        assert((_fromStateNode.typeDefinitionObj as any).isSubtypeOf(stateType));
-        assert((_toStateNode.typeDefinitionObj as any).isSubtypeOf(stateType));
+        assert(_fromStateNode.typeDefinitionObj.isSubtypeOf(stateType));
+        assert(_toStateNode.typeDefinitionObj.isSubtypeOf(stateType));
 
         let transitions = _fromStateNode.findReferencesAsObject("FromState", false) as UATransitionImpl[];
 
-        transitions = transitions.filter((transition: any) => {
-            assert(transition.toStateNode.nodeClass === NodeClass.Object);
+        transitions = transitions.filter((transition) => {
+            assert(transition.toStateNode?.nodeClass === NodeClass.Object);
             return transition.toStateNode === _toStateNode;
         });
         if (transitions.length === 0) {
@@ -278,7 +275,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
     }
 
     public get currentStateNode(): UAState | null {
-        return this._currentStateNode;
+        return $(this)._currentStateNode;
     }
 
     /**
@@ -286,7 +283,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
      * @type BaseNode
      */
     public set currentStateNode(value: UAState | null) {
-        this._currentStateNode = value;
+        $(this)._currentStateNode = value;
     }
 
     /**
@@ -305,7 +302,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
     public setState(toStateNode: string | UAState | null, predicate?: TransitionSelector): void {
         if (!toStateNode) {
             this.currentStateNode = null;
-            this.currentState.setValueFromSource({ dataType: DataType.LocalizedText, value: null }, StatusCodes.BadStateNotActive);
+            $(this).currentState.setValueFromSource({ dataType: DataType.LocalizedText, value: null }, StatusCodes.BadStateNotActive);
             return;
         }
 
@@ -313,19 +310,19 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
             const state = this.getStateByName(toStateNode);
             // c8 ignore next
             if (!state) {
-                throw new Error("Cannot find state with name " + toStateNode);
+                throw new Error(`Cannot find state with name ${toStateNode}`);
             }
             toStateNode = state;
         }
         const fromStateNode = this.currentStateNode;
 
-        toStateNode = this._coerceNode(toStateNode) as any as UAState;
+        toStateNode = this._coerceNode(toStateNode) as UAState;
         assert(toStateNode.nodeClass === NodeClass.Object);
 
-        this.currentState.setValueFromSource(
+        $(this).currentState.setValueFromSource(
             {
                 dataType: DataType.LocalizedText,
-                value: coerceLocalizedText(toStateNode.displayName[0] || toStateNode.browseName.name!)
+                value: coerceLocalizedText(toStateNode.displayName[0] || toStateNode.browseName.name  || "")
             },
             StatusCodes.Good
         );
@@ -333,7 +330,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
         this.currentStateNode = toStateNode;
 
         const applyCurrentStateOptionalProps = () => {
-            const uaId = this.currentState.getPropertyByName("Id")! as UAVariable;
+            const uaId = $(this).currentState.getPropertyByName("Id") as UAVariable;
             if (uaId) {
                 uaId.setValueFromSource({
                     dataType: DataType.NodeId,
@@ -341,7 +338,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                 });
             }
 
-            const uaName = this.currentState.getPropertyByName("Name")! as UAVariable;
+            const uaName = $(this).currentState.getPropertyByName("Name") as UAVariable;
             if (uaName) {
                 uaName.setValueFromSource({
                     dataType: DataType.QualifiedName,
@@ -349,22 +346,22 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                 });
             }
 
-            const uaNumber = this.currentState.getPropertyByName("Number")! as UAVariable;
+            const uaNumber = $(this).currentState.getPropertyByName("Number") as UAVariable;
             if (uaNumber) {
                 if (!this.currentStateNode) {
-                    const n = uaNumber.setValueFromSource({
+                    const _n = uaNumber.setValueFromSource({
                         dataType: DataType.UInt32,
                         value: 0 // may be wrong !
                     });
                 } else {
-                    const n = uaNumber.setValueFromSource({
+                    const _n = uaNumber.setValueFromSource({
                         dataType: DataType.UInt32,
                         value: this.currentStateNode.stateNumber.readValue().value.value
                     });
                 }
             }
 
-            const uaEffectiveDisplayName = this.currentState.getPropertyByName("EffectiveDisplayName")! as UAVariable;
+            const uaEffectiveDisplayName = $(this).currentState.getPropertyByName("EffectiveDisplayName") as UAVariable;
             if (uaEffectiveDisplayName) {
                 uaEffectiveDisplayName.setValueFromSource({
                     dataType: DataType.LocalizedText,
@@ -404,13 +401,15 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                 | null;
             if (!ms) return;
             if (ms.nodeClass !== NodeClass.Object) return;
-            const stateMachineType = this.addressSpace.findObjectType("StateMachineType")!;
+            const stateMachineType = this.addressSpace.findObjectType("StateMachineType");
+            if (!stateMachineType) throw new Error("cannot find StateMachineType");
+
             if (!ms.typeDefinitionObj.isSubtypeOf(stateMachineType)) return;
 
             const find = (node: UAObjectType, browseName: QualifiedName): UAObject | UAVariable | null => {
                 const r = node
                     .getAggregates()
-                    .filter((x) => x.browseName.name! === browseName.name && x.namespaceIndex === browseName.namespaceIndex);
+                    .filter((x) => x.browseName.name === browseName.name && x.namespaceIndex === browseName.namespaceIndex);
                 if (r.length === 0) {
                     // look in subType
                     const subType = node.subtypeOfObj;
@@ -442,7 +441,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                 if (uaLastTransitionMain) {
                     const uaEffectiveTransitionTimeMain = uaLastTransitionMain.getPropertyByName(
                         "EffectiveTransitionTime"
-                    )! as UAVariable;
+                    ) as UAVariable;
                     if (uaEffectiveTransitionTimeMain) {
                         uaEffectiveTransitionTimeMain.setValueFromSource({
                             dataType: DataType.DateTime,
@@ -462,13 +461,13 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                     uaLastTransition.setValueFromSource(
                         {
                             dataType: DataType.LocalizedText,
-                            value: transitionNode.displayName[0] || transitionNode.browseName.name!
+                            value: transitionNode.displayName[0] || transitionNode.browseName.name || ""
                         },
                         StatusCodes.Good,
                         transitionTime
                     );
 
-                    const uaId = uaLastTransition.getPropertyByName("Id")! as UAVariable;
+                    const uaId = uaLastTransition.getPropertyByName("Id") as UAVariable;
                     if (uaId) {
                         uaId.setValueFromSource({
                             dataType: DataType.NodeId,
@@ -476,7 +475,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                         });
                     }
 
-                    const uaLastTransitionTime = uaLastTransition.getPropertyByName("TransitionTime")! as UAVariable;
+                    const uaLastTransitionTime = uaLastTransition.getPropertyByName("TransitionTime") as UAVariable;
                     if (uaLastTransitionTime) {
                         uaLastTransitionTime.setValueFromSource({
                             dataType: DataType.DateTime,
@@ -489,7 +488,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                      * SubA and SubB, then the TransitionTime stays at the point in time where StateA became active whereas the *
                      * EffectiveTransitionTime changes with each change of a sub-state.
                      */
-                    const uaEffectiveTransitionTime = uaLastTransition.getPropertyByName("EffectiveTransitionTime")! as UAVariable;
+                    const uaEffectiveTransitionTime = uaLastTransition.getPropertyByName("EffectiveTransitionTime") as UAVariable;
                     if (uaEffectiveTransitionTime) {
                         uaEffectiveTransitionTime.setValueFromSource({
                             dataType: DataType.DateTime,
@@ -497,14 +496,14 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                         });
                     }
                     //
-                    const uaName = uaLastTransition.getPropertyByName("Name")! as UAVariable;
+                    const uaName = uaLastTransition.getPropertyByName("Name") as UAVariable;
                     if (uaName) {
                         uaName.setValueFromSource({
                             dataType: DataType.QualifiedName,
                             value: transitionNode.browseName
                         });
                     }
-                    const uaNumber = uaLastTransition.getPropertyByName("Number")! as UAVariable;
+                    const uaNumber = uaLastTransition.getPropertyByName("Number") as UAVariable;
                     if (uaNumber) {
                         uaNumber.setValueFromSource({
                             dataType: DataType.UInt32,
@@ -557,7 +556,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
                 if (doDebug) {
                     const f = fromStateNode.browseName.toString();
                     const t = toStateNode.browseName.toString();
-                    warningLog(chalk.red("Warning"), " cannot raise event :  transition " + f + " to " + t + " is missing");
+                    warningLog(chalk.red("Warning"), ` cannot raise event :  transition ${f} to ${t} is missing`);
                 }
             }
         }
@@ -575,7 +574,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
     public _post_initialize(): void {
         const addressSpace = this.addressSpace;
         const finiteStateMachineType = addressSpace.findObjectType("FiniteStateMachineType");
-       
+
         // c8 ignore next
         if (!finiteStateMachineType) {
             throw new Error("cannot find FiniteStateMachineType");
@@ -585,13 +584,12 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
         // xx assert(!this.typeDefinitionObj || this.typeDefinitionObj.isSubtypeOf(finiteStateMachineType));
         // get current Status
 
-        const d = this.currentState.readValue();
+        const d = $(this).currentState.readValue();
 
         if (d.statusCode.isNotGood()) {
             this.setState(null);
         } else {
-            const txt =
-                d.value && d.value.value ? (d.value.value.text ? d.value.value.text.toString() : d.value.value.toString()) : "";
+            const txt = d.value?.value ? (d.value.value.text ? d.value.value.text.toString() : d.value.value.toString()) : "";
             this.currentStateNode = this.getStateByName(txt);
         }
 
@@ -628,7 +626,8 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
         }
     }
 }
-
+export type UAStateMachineImpl = UAStateMachineImplBase & UAStateMachineEx;
+export const UAStateMachineImpl = UAStateMachineImplBase as unknown as new () => UAStateMachineImpl;
 export function promoteToStateMachine(node: UAObject): UAStateMachineEx {
     if (node instanceof UAStateMachineImpl) {
         return node; // already promoted

package/src/state_machine/ua_shelving_state_machine_ex.ts

@@ -6,19 +6,17 @@
 // ShelvingStateMachine
 // --------------------------------------------------------------------------------------------------
 
+import type { ISessionContext, UAMethod, UAObject, UAProperty } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
-import { CallbackT, StatusCodes } from "node-opcua-status-code";
-import { DataType, Variant, VariantLike } from "node-opcua-variant";
-
-import { UAProperty, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
-import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
-import { UAState, UATransition } from "node-opcua-nodeset-ua";
-import { CallMethodResultOptions } from "node-opcua-service-call";
 import { DataValue } from "node-opcua-data-value";
-
-import { UAAlarmConditionImpl } from "../alarms_and_conditions/ua_alarm_condition_impl";
-import { UAShelvedStateMachineEx } from "../../source/interfaces/state_machine/ua_shelved_state_machine_ex";
-import { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
+import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
+import type { UAState } from "node-opcua-nodeset-ua";
+import type { CallMethodResultOptions } from "node-opcua-service-call";
+import { type CallbackT, StatusCodes } from "node-opcua-status-code";
+import { DataType, Variant, type VariantLike } from "node-opcua-variant";
+import type { UAShelvedStateMachineEx } from "../../source/interfaces/state_machine/ua_shelved_state_machine_ex";
+import type { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
+import { UAAlarmConditionImpl, UAAlarmConditionImplBase } from "../alarms_and_conditions/ua_alarm_condition_impl";
 
 import { promoteToStateMachine, UAStateMachineImpl } from "./finite_state_machine";
 
@@ -32,8 +30,8 @@ export interface UAShelvedStateMachineHelper {
     _duration: number;
 }
 
-export interface UAShelvedStateMachineExImpl extends UAShelvedStateMachineHelper {
-        unshelveTime: UAProperty<number, /*z*/ DataType.Double>;
+export interface UAShelvedStateMachineHelper2 extends UAShelvedStateMachineHelper {
+    unshelveTime: UAProperty<number, /*z*/ DataType.Double>;
     unshelved: UAState;
     timedShelved: UAState;
     oneShotShelved: UAState;
@@ -51,7 +49,7 @@ export interface UAShelvedStateMachineExImpl extends UAShelvedStateMachineHelper
     oneShotShelve2?: UAMethod;
 }
 
-export class UAShelvedStateMachineExImpl extends UAStateMachineImpl implements UAShelvedStateMachineEx {
+export class UAShelvedStateMachineExImplBase extends UAStateMachineImpl {
     public static promote(object: UAObject): UAShelvedStateMachineEx {
         const shelvingState = object as UAShelvedStateMachineExImpl;
         promoteToStateMachine(shelvingState);
@@ -83,6 +81,8 @@ export class UAShelvedStateMachineExImpl extends UAStateMachineImpl implements U
         return shelvingState;
     }
 }
+export type UAShelvedStateMachineExImpl = UAShelvedStateMachineExImplBase & UAShelvedStateMachineEx;
+export const  UAShelvedStateMachineExImpl = UAShelvedStateMachineExImplBase as unknown as new () => UAShelvedStateMachineExImpl;
 
 // The Unshelve Method sets the AlarmCondition to the Unshelved state. Normally, the MethodId found
 // the Shelving child of the Condition instance and the NodeId of the Shelving object as the ObjectId
@@ -102,7 +102,7 @@ function _unshelve_method(inputArguments: VariantLike[], context: ISessionContex
     //     return callback(null, {statusCode: StatusCodes.BadConditionDisabled});
     // }
 
-    const shelvingState = context.object! as UAShelvedStateMachineExImpl;
+    const shelvingState = context.object as UAShelvedStateMachineExImpl;
     promoteToStateMachine(shelvingState);
 
     if (shelvingState.getCurrentState() === "Unshelved") {
@@ -149,8 +149,8 @@ function _automatically_unshelve(shelvingState: UAShelvedStateMachineExImpl) {
 }
 
 function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachineExImpl, duration: number) {
-    if (duration < 10 || duration >= Math.pow(2, 31)) {
-        throw new Error(" Invalid maxTimeShelved duration: " + duration + "  must be [10,2**31] ");
+    if (duration < 10 || duration >= 2 ** 31) {
+        throw new Error(` Invalid maxTimeShelved duration: ${duration}  must be [10,2**31] `);
     }
     assert(!shelvingState._timer);
 
@@ -162,7 +162,7 @@ function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachin
         debugLog("shelvingState._duration", shelvingState._duration);
     }
 
-    if (duration !== UAAlarmConditionImpl.MaxDuration) {
+    if (duration !== UAAlarmConditionImplBase.MaxDuration) {
         assert(!shelvingState._timer);
         shelvingState._timer = setTimeout(_automatically_unshelve.bind(null, shelvingState), shelvingState._duration);
     }
@@ -213,7 +213,7 @@ function _timedShelve_method(
         });
     }
     const maxTimeShelved = alarmNode.getMaxTimeShelved();
-    assert(isFinite(maxTimeShelved));
+    assert(Number.isFinite(maxTimeShelved));
 
     assert(inputArguments[0].dataType === DataType.Double); // Duration
     assert(inputArguments[0] instanceof Variant);
@@ -271,8 +271,8 @@ function _oneShotShelve_method(
     }
 
     const maxTimeShelved = alarmNode.getMaxTimeShelved();
-    assert(isFinite(maxTimeShelved));
-    assert(maxTimeShelved !== UAAlarmConditionImpl.MaxDuration);
+    assert(Number.isFinite(maxTimeShelved));
+    assert(maxTimeShelved !== UAAlarmConditionImplBase.MaxDuration);
 
     // set automatic un-shelving timer
     _clear_timer_if_any(shelvingState);
@@ -305,12 +305,12 @@ function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineExImpl): DataValu
             value: { dataType: DataType.Double, value: 0 }
         });
     }
-    if (shelvingState.getCurrentState() === "OneShotShelved" && shelvingState._duration === UAAlarmConditionImpl.MaxDuration) {
+    if (shelvingState.getCurrentState() === "OneShotShelved" && shelvingState._duration === UAAlarmConditionImplBase.MaxDuration) {
         return new DataValue({
             statusCode: StatusCodes.Good,
             value: {
                 dataType: DataType.Double,
-                value: UAAlarmConditionImpl.MaxDuration
+                value: UAAlarmConditionImplBase.MaxDuration
             }
         });
     }