npm - node-opcua-address-space-base - Versions diffs - 2.169.0 → 2.170.1 - Mend

node-opcua-address-space-base 2.169.0 → 2.170.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist/address_space.d.ts CHANGED Viewed

@@ -142,16 +142,13 @@ export interface IAddressSpace {
     /***
      * construct a simple javascript object with all the default properties of the event
      *
-     * @return result.$eventDataSource  the event type node
-     * @return result.eventId the
-     * ...
      *
      *
      * eventTypeId can be a UAObjectType deriving from EventType
      * or an instance of a ConditionType
      *
      */
-    constructEventData(eventTypeId: UAEventType, data: any): IEventData;
+    constructEventData(eventTypeId: UAEventType, data: Record<string, unknown>): IEventData;
     /**
      * walk up the hierarchy of objects until a view is found
      * objects may belong to multiples views.

package/dist/clone_helper.d.ts CHANGED Viewed

@@ -1,15 +1,15 @@
-import { UAObject } from "./ua_object";
-import { UAVariable } from "./ua_variable";
-import { UAMethod } from "./ua_method";
-import { UAObjectType } from "./ua_object_type";
-import { UAVariableType } from "./ua_variable_type";
-import { BaseNode } from "./base_node";
+import type { BaseNode } from "./base_node";
+import type { UAMethod } from "./ua_method";
+import type { UAObject } from "./ua_object";
+import type { UAObjectType } from "./ua_object_type";
+import type { UAVariable } from "./ua_variable";
+import type { UAVariableType } from "./ua_variable_type";
 /**
  * @private
  */
 export declare function fullPath(node: BaseNode): string;
 /** @private */
-export declare function fullPath2(node: BaseNode): string;
+export declare function fullPath2(node: BaseNode | null | undefined): string;
 /** @private */
 export declare function exploreNode(node: BaseNode): void;
 interface CloneInfo {

package/dist/clone_helper.js CHANGED Viewed

@@ -7,12 +7,12 @@ exports.exploreNode = exploreNode;
 exports.reconstructNonHierarchicalReferences = reconstructNonHierarchicalReferences;
 exports.reconstructFunctionalGroupType = reconstructFunctionalGroupType;
 const node_opcua_assert_1 = require("node-opcua-assert");
-const node_opcua_debug_1 = require("node-opcua-debug");
+const node_opcua_constants_1 = require("node-opcua-constants");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const node_opcua_constants_1 = require("node-opcua-constants");
-const warningLog = (0, node_opcua_debug_1.make_warningLog)("CLONE");
-const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
+const warningLog = (0, node_opcua_debug_1.make_warningLog)("INSTANTIATE");
+const errorLog = (0, node_opcua_debug_1.make_errorLog)("INSTANTIATE");
 const doTrace = (0, node_opcua_debug_1.checkDebugFlag)("INSTANTIATE");
 const traceLog = errorLog;
 /* c8 ignore start */
@@ -23,41 +23,45 @@ function fullPath(node) {
     const browseName = node.browseName.toString();
     const parent = node.findReferencesExAsObject("Aggregates", node_opcua_data_model_1.BrowseDirection.Inverse)[0];
     if (parent) {
-        return fullPath(parent) + "/" + browseName;
+        return `${fullPath(parent)}/${browseName}`;
     }
     const containingFolder = node.findReferencesExAsObject("Organizes", node_opcua_data_model_1.BrowseDirection.Inverse)[0];
     if (containingFolder) {
-        return fullPath(containingFolder) + "@" + browseName;
+        return `${fullPath(containingFolder)}@${browseName}`;
     }
     return browseName;
 }
 /** @private */
 function fullPath2(node) {
-    return fullPath(node) + " (" + node.nodeId.toString() + ")";
+    if (!node)
+        return "(unknown)";
+    return `${fullPath(node)} (${node.nodeId.toString()})`;
 }
 /** @private */
 function exploreNode(node) {
     const f = (n) => {
-        return `${n.browseName.toString()} (${n.nodeId.toString()})${n.modellingRule ? " - " + n.modellingRule : ""}`;
+        return `${n.browseName.toString()} (${n.nodeId.toString()})${n.modellingRule ? ` - ${n.modellingRule}` : ""}`;
     };
     const r = (r) => {
         const ref = node.addressSpace.findNode(r);
         if (!ref)
-            return `${r.nodeId.toString()} (unknown)`;
-        return ref?.browseName.toString() + " " + ref.nodeId.toString();
+            return `(unknown)`;
+        return `${ref?.browseName.toString()} ${ref?.nodeId.toString()}`;
     };
     const map = new Set();
     const _explore = (node, pad) => {
         const a = node.findReferencesEx("Aggregates", node_opcua_data_model_1.BrowseDirection.Forward);
         const b = node.findReferencesEx("Organizes", node_opcua_data_model_1.BrowseDirection.Forward);
         for (const ref of [...a, ...b]) {
+            if (!ref.node)
+                continue;
             const alreadyVisited = map.has(ref.nodeId.toString());
             traceLog(pad, "  +-- ", r(ref.referenceType).padEnd(20), "-->", f(ref.node).padEnd(10), alreadyVisited ? " (already visited)" : "");
             if (alreadyVisited) {
                 continue;
             }
             map.add(ref.nodeId.toString());
-            _explore(ref.node, pad + "   ");
+            _explore(ref.node, `${pad}   `);
         }
     };
     traceLog("exploring ", f(node));
@@ -77,8 +81,8 @@ function exploreNode(node) {
 //              |
 //              +-------------------------------|- EnabledState    <
 //
-// find also child object with the same browse name that are
-// overridden in the SuperType
+// find also child object with the same browse name that is overridden in the SuperType
+//
 // case 2:
 //
 //   /-----------------------------\
@@ -101,7 +105,7 @@ function exploreNode(node) {
 //              |                     |
 //              |                     +--------------|- (EnabledState)
 //
-// find also child object with the same browse name that are
+// find also child object with the same browse name that is overridden in the same child of the SuperType
 function _get_parent_type_and_path(originalObject) {
     if (originalObject.nodeClass === node_opcua_data_model_1.NodeClass.Method) {
         return { parentType: null, path: [] };
@@ -110,11 +114,25 @@ function _get_parent_type_and_path(originalObject) {
     const parents = originalObject.findReferencesEx("HasChild", node_opcua_data_model_1.BrowseDirection.Inverse);
     // c8 ignore next
     if (parents.length > 1) {
-        warningLog(" object ", originalObject.browseName.toString(), " has more than one parent !");
+        // it could be a tricky buggy situation  like that we have seen with SIOME
+        //
+        //  AnalogUnitTyoe
+        //    |-- HasProperty --> EngineeringUnits (i=17052)
+        //  MyObjectType
+        //    |-- HasComponent --> ActualSpeed
+        //                              |-- HasComponent --> EngineeringUnits (i=17052) <== BUGGY !!!
+        const parentTypes = parents.filter((p) => {
+            const n = addressSpace.findNode(p.nodeId);
+            return n && (n.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType || n.nodeClass === node_opcua_data_model_1.NodeClass.VariableType);
+        });
+        if (parentTypes.length === 1) {
+            return { parentType: addressSpace.findNode(parentTypes[0].nodeId), path: [originalObject.browseName] };
+        }
+        warningLog(" object ", originalObject.browseName.toString(), originalObject.nodeId.toString(), " has more than one parent !");
         warningLog(originalObject.toString());
         warningLog(" parents : ");
         for (const parent of parents) {
-            warningLog("     ", parent.toString(), addressSpace.findNode(parent.nodeId).browseName.toString());
+            warningLog("     ", parent.toString(), addressSpace.findNode(parent.nodeId)?.browseName.toString());
         }
         return { parentType: null, path: [] };
     }
@@ -122,7 +140,7 @@ function _get_parent_type_and_path(originalObject) {
     if (parents.length === 0) {
         return { parentType: null, path: [] };
     }
-    const theParent = addressSpace.findNode(parents[0].nodeId);
+    const theParent = addressSpace.findNode(parents[0]?.nodeId);
     if (theParent && (theParent.nodeClass === node_opcua_data_model_1.NodeClass.VariableType || theParent.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType)) {
         return { parentType: theParent, path: [originalObject.browseName] };
     }
@@ -180,7 +198,7 @@ class CloneHelper {
     }
     popContext() {
         (0, node_opcua_assert_1.assert)(this._contextStack.length > 0);
-        this._context = this._contextStack.pop();
+        this._context = this._contextStack.pop() || null;
     }
     registerClonedObject({ clonedNode, originalNode }) {
         if (!this._context) {
@@ -231,7 +249,7 @@ class CloneHelper {
         // c8 ignore next
         doTrace &&
             traceLog("typeInstance (3) = originalParent", fullPath2(originalParent), "originalNode=", fullPath2(originalNode), "clonedParent", fullPath2(clonedParent));
-        const info = this._context.get(originalNode.nodeId.toString());
+        const info = this._context?.get(originalNode.nodeId.toString());
         if (info) {
             return info.cloned;
         }
@@ -256,12 +274,12 @@ function _remove_unwanted_ref(references) {
  */
 function findNonHierarchicalReferences(originalObject) {
     // todo: MEMOIZE this method
-    const addressSpace = originalObject.addressSpace;
+    const _addressSpace = originalObject.addressSpace;
     // we need to explore the non hierarchical references backwards
     let references = originalObject.findReferencesEx("NonHierarchicalReferences", node_opcua_data_model_1.BrowseDirection.Inverse);
     references = [].concat(references, originalObject.findReferencesEx("HasEventSource", node_opcua_data_model_1.BrowseDirection.Inverse));
     const { parentType, path } = _get_parent_type_and_path(originalObject);
-    if (parentType && parentType.subtypeOfObj) {
+    if (parentType?.subtypeOfObj) {
         // parent is a ObjectType or VariableType and is not a root type
         (0, node_opcua_assert_1.assert)(parentType.nodeClass === node_opcua_data_model_1.NodeClass.VariableType || parentType.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType);
         // let investigate the same child base child
@@ -306,7 +324,7 @@ function reconstructNonHierarchicalReferences(extraInfo) {
             if (!info)
                 continue;
             // if the object pointed by this reference is also cloned ...
-            const originalDest = info.original;
+            const _originalDest = info.original;
             const cloneDest = info.cloned;
             // c8 ignore next
             doTrace &&
@@ -352,7 +370,7 @@ function reconstructFunctionalGroupType(extraInfo) {
                 continue;
             if (!folder.typeDefinitionObj)
                 continue;
-            if (folder.typeDefinitionObj.browseName.name.toString() !== "FunctionalGroupType") {
+            if (folder.typeDefinitionObj.browseName.name?.toString() !== "FunctionalGroupType") {
                 continue;
             }
             // now create the same reference with the instantiated function group

package/dist/clone_helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"clone_helper.js","sourceRoot":"","sources":["../source/clone_helper.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"clone_helper.js","sourceRoot":"","sources":["../source/clone_helper.ts"],"names":[],"mappings":"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"}

package/dist/i_event_data.d.ts CHANGED Viewed

@@ -1,16 +1,13 @@
-import { NodeId } from "node-opcua-nodeid";
-import { BrowsePath, BrowsePathResult } from "node-opcua-types";
-import { Variant, VariantLike } from "node-opcua-variant";
-import { BaseNode } from "./base_node";
+import type { NodeId } from "node-opcua-nodeid";
+import type { BrowsePath, BrowsePathResult } from "node-opcua-types";
+import type { Variant, VariantLike } from "node-opcua-variant";
+import type { BaseNode } from "./base_node";
 export interface IEventData {
-    /**
-     * the event type node
-     */
-    $eventDataSource?: BaseNode;
     /**
      *
      */
     eventId: NodeId;
+    getEventDataSource(): BaseNode;
     _createValue(fullBrowsePath: string, node: BaseNode, variant: VariantLike): void;
     _readValue(nodeId: NodeId): Variant | null;
     _browse(browsePath: BrowsePath): BrowsePathResult | null;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space-base",
-    "version": "2.169.0",
+    "version": "2.170.1",
     "description": "pure nodejs OPCUA SDK - module address-space-base",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -21,17 +21,17 @@
         "node-opcua-basic-types": "2.169.0",
         "node-opcua-constants": "2.157.0",
         "node-opcua-crypto": "5.3.5",
-        "node-opcua-data-model": "2.169.0",
-        "node-opcua-data-value": "2.169.0",
+        "node-opcua-data-model": "2.170.0",
+        "node-opcua-data-value": "2.170.0",
         "node-opcua-date-time": "2.169.0",
         "node-opcua-debug": "2.168.0",
         "node-opcua-extension-object": "2.169.0",
         "node-opcua-nodeid": "2.169.0",
         "node-opcua-numeric-range": "2.169.0",
-        "node-opcua-schemas": "2.169.0",
+        "node-opcua-schemas": "2.170.0",
         "node-opcua-status-code": "2.169.0",
-        "node-opcua-types": "2.169.0",
-        "node-opcua-variant": "2.169.0"
+        "node-opcua-types": "2.170.0",
+        "node-opcua-variant": "2.170.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -48,7 +48,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "82d570d3e95bea689cbbe30096279885c5282245",
+    "gitHead": "40629feaff284ba70596149e58b3cc2a7a0e8f68",
     "files": [
         "dist",
         "source"

package/source/address_space.ts CHANGED Viewed

@@ -176,16 +176,13 @@ export interface IAddressSpace {
     /***
      * construct a simple javascript object with all the default properties of the event
      *
-     * @return result.$eventDataSource  the event type node
-     * @return result.eventId the
-     * ...
      *
      *
      * eventTypeId can be a UAObjectType deriving from EventType
      * or an instance of a ConditionType
      *
      */
-    constructEventData(eventTypeId: UAEventType, data: any): IEventData;
+    constructEventData(eventTypeId: UAEventType, data: Record<string, unknown>): IEventData;
     /**
      * walk up the hierarchy of objects until a view is found

package/source/clone_helper.ts CHANGED Viewed

@@ -1,20 +1,19 @@
 import { assert } from "node-opcua-assert";
-import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
-import { BrowseDirection, NodeClass, QualifiedName } from "node-opcua-data-model";
-import { makeNodeId, sameNodeId } from "node-opcua-nodeid";
 import { ReferenceTypeIds } from "node-opcua-constants";
-import { UAObject } from "./ua_object";
-import { UAVariable } from "./ua_variable";
-import { UAMethod } from "./ua_method";
-import { UAObjectType } from "./ua_object_type";
-import { UAVariableType } from "./ua_variable_type";
-import { BaseNode } from "./base_node";
-import { UAReference } from "./ua_reference";
-import { IAddressSpace } from "./address_space";
-const warningLog = make_warningLog("CLONE");
-const errorLog = make_errorLog(__filename);
+import { BrowseDirection, NodeClass, type QualifiedName } from "node-opcua-data-model";
+import { checkDebugFlag, make_errorLog, make_warningLog } from "node-opcua-debug";
+import { makeNodeId, type NodeIdLike, sameNodeId } from "node-opcua-nodeid";
+import type { IAddressSpace } from "./address_space";
+import type { BaseNode } from "./base_node";
+import type { UAMethod } from "./ua_method";
+import type { UAObject } from "./ua_object";
+import type { UAObjectType } from "./ua_object_type";
+import type { UAReference } from "./ua_reference";
+import type { UAVariable } from "./ua_variable";
+import type { UAVariableType } from "./ua_variable_type";
+const warningLog = make_warningLog("INSTANTIATE");
+const errorLog = make_errorLog("INSTANTIATE");
 const doTrace = checkDebugFlag("INSTANTIATE");
 const traceLog = errorLog;
@@ -29,27 +28,28 @@ export function fullPath(node: BaseNode): string {
     const parent = node.findReferencesExAsObject("Aggregates", BrowseDirection.Inverse)[0];
     if (parent) {
-        return fullPath(parent) + "/" + browseName;
+        return `${fullPath(parent)}/${browseName}`;
     }
     const containingFolder = node.findReferencesExAsObject("Organizes", BrowseDirection.Inverse)[0];
     if (containingFolder) {
-        return fullPath(containingFolder) + "@" + browseName;
+        return `${fullPath(containingFolder)}@${browseName}`;
     }
     return browseName;
 }
 /** @private */
-export function fullPath2(node: BaseNode): string {
-    return fullPath(node) + " (" + node.nodeId.toString() + ")";
+export function fullPath2(node: BaseNode | null | undefined): string {
+    if (!node) return "(unknown)";
+    return `${fullPath(node)} (${node.nodeId.toString()})`;
 }
 /** @private */
 export function exploreNode(node: BaseNode) {
     const f = (n: BaseNode) => {
-        return `${n.browseName.toString()} (${n.nodeId.toString()})${n.modellingRule ? " - " + n.modellingRule : ""}`;
+        return `${n.browseName.toString()} (${n.nodeId.toString()})${n.modellingRule ? ` - ${n.modellingRule}` : ""}`;
     };
-    const r = (r: any) => {
+    const r = (r: NodeIdLike) => {
         const ref = node.addressSpace.findNode(r);
-        if (!ref) return `${r.nodeId.toString()} (unknown)`;
-        return ref?.browseName.toString() + " " + ref!.nodeId.toString();
+        if (!ref) return `(unknown)`;
+        return `${ref?.browseName.toString()} ${ref?.nodeId.toString()}`;
     };
     const map = new Set();
     const _explore = (node: BaseNode, pad: string) => {
@@ -57,20 +57,21 @@ export function exploreNode(node: BaseNode) {
         const b = node.findReferencesEx("Organizes", BrowseDirection.Forward);
         for (const ref of [...a, ...b]) {
+            if (!ref.node) continue;
             const alreadyVisited = map.has(ref.nodeId.toString());
             traceLog(
                 pad,
                 "  +-- ",
                 r(ref.referenceType).padEnd(20),
                 "-->",
-                f(ref.node!).padEnd(10),
+                f(ref.node).padEnd(10),
                 alreadyVisited ? " (already visited)" : ""
             );
             if (alreadyVisited) {
                 continue;
             }
             map.add(ref.nodeId.toString());
-            _explore(ref.node!, pad + "   ");
+            _explore(ref.node, `${pad}   `);
         }
     };
     traceLog("exploring ", f(node));
@@ -90,9 +91,8 @@ export function exploreNode(node: BaseNode) {
 //              |
 //              +-------------------------------|- EnabledState    <
 //
-// find also child object with the same browse name that are
-// overridden in the SuperType
+// find also child object with the same browse name that is overridden in the SuperType
+//
 // case 2:
 //
 //   /-----------------------------\
@@ -115,7 +115,7 @@ export function exploreNode(node: BaseNode) {
 //              |                     |
 //              |                     +--------------|- (EnabledState)
 //
-// find also child object with the same browse name that are
+// find also child object with the same browse name that is overridden in the same child of the SuperType
 function _get_parent_type_and_path(originalObject: BaseNode): {
     parentType: null | UAVariableType | UAObjectType;
@@ -124,17 +124,33 @@ function _get_parent_type_and_path(originalObject: BaseNode): {
     if (originalObject.nodeClass === NodeClass.Method) {
         return { parentType: null, path: [] };
     }
     const addressSpace = originalObject.addressSpace;
     const parents = originalObject.findReferencesEx("HasChild", BrowseDirection.Inverse);
     // c8 ignore next
     if (parents.length > 1) {
-        warningLog(" object ", originalObject.browseName.toString(), " has more than one parent !");
+        // it could be a tricky buggy situation  like that we have seen with SIOME
+        //
+        //  AnalogUnitTyoe
+        //    |-- HasProperty --> EngineeringUnits (i=17052)
+        //  MyObjectType
+        //    |-- HasComponent --> ActualSpeed
+        //                              |-- HasComponent --> EngineeringUnits (i=17052) <== BUGGY !!!
+        const parentTypes = parents.filter((p) => {
+            const n = addressSpace.findNode(p.nodeId);
+            return n && (n.nodeClass === NodeClass.ObjectType || n.nodeClass === NodeClass.VariableType);
+        });
+        if (parentTypes.length === 1) {
+            return { parentType: addressSpace.findNode(parentTypes[0].nodeId) as UAObjectType | UAVariableType, path: [originalObject.browseName] };
+        }
+        warningLog(" object ", originalObject.browseName.toString(), originalObject.nodeId.toString(), " has more than one parent !");
         warningLog(originalObject.toString());
         warningLog(" parents : ");
         for (const parent of parents) {
-            warningLog("     ", parent.toString(), addressSpace.findNode(parent.nodeId)!.browseName.toString());
+            warningLog("     ", parent.toString(), addressSpace.findNode(parent.nodeId)?.browseName.toString());
         }
         return { parentType: null, path: [] };
     }
@@ -143,12 +159,12 @@ function _get_parent_type_and_path(originalObject: BaseNode): {
     if (parents.length === 0) {
         return { parentType: null, path: [] };
     }
-    const theParent = addressSpace.findNode(parents[0]!.nodeId)!;
+    const theParent = addressSpace.findNode(parents[0]?.nodeId) as BaseNode;
     if (theParent && (theParent.nodeClass === NodeClass.VariableType || theParent.nodeClass === NodeClass.ObjectType)) {
         return { parentType: theParent as UAVariableType | UAObjectType, path: [originalObject.browseName] };
     }
     // walk up
-    const { parentType, path } = _get_parent_type_and_path(theParent!);
+    const { parentType, path } = _get_parent_type_and_path(theParent);
     return { parentType, path: [...path, originalObject.browseName] };
 }
 /* c8 ignore stop */
@@ -220,7 +236,7 @@ export class CloneHelper {
     }
     public popContext() {
         assert(this._contextStack.length > 0);
-        this._context = this._contextStack.pop()!;
+        this._context = this._contextStack.pop() || null;
     }
     public registerClonedObject<
         TO extends UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
@@ -294,7 +310,7 @@ export class CloneHelper {
                 fullPath2(clonedParent)
             );
-        const info = this._context!.get(originalNode.nodeId.toString());
+        const info = this._context?.get(originalNode.nodeId.toString());
         if (info) {
             return info.cloned;
         }
@@ -324,7 +340,7 @@ function _remove_unwanted_ref(references: UAReference[]): UAReference[] {
  */
 function findNonHierarchicalReferences(originalObject: BaseNode): UAReference[] {
     // todo: MEMOIZE this method
-    const addressSpace: IAddressSpace = originalObject.addressSpace;
+    const _addressSpace: IAddressSpace = originalObject.addressSpace;
     // we need to explore the non hierarchical references backwards
     let references = originalObject.findReferencesEx("NonHierarchicalReferences", BrowseDirection.Inverse);
@@ -336,7 +352,7 @@ function findNonHierarchicalReferences(originalObject: BaseNode): UAReference[]
     const { parentType, path } = _get_parent_type_and_path(originalObject);
-    if (parentType && parentType.subtypeOfObj) {
+    if (parentType?.subtypeOfObj) {
         // parent is a ObjectType or VariableType and is not a root type
         assert(parentType.nodeClass === NodeClass.VariableType || parentType.nodeClass === NodeClass.ObjectType);
@@ -392,14 +408,14 @@ export function reconstructNonHierarchicalReferences(extraInfo: CloneHelper): vo
             // if the object pointed by this reference is also cloned ...
-            const originalDest = info.original;
+            const _originalDest = info.original;
             const cloneDest = info.cloned;
             // c8 ignore next
             doTrace &&
                 traceLog(
                     "   adding reference ",
-                    fullPath2(addressSpace.findNode(ref.referenceType)!),
+                    fullPath2(addressSpace.findNode(ref.referenceType)),
                     " from cloned ",
                     fullPath2(cloned),
                     " to cloned ",
@@ -450,7 +466,7 @@ export function reconstructFunctionalGroupType(extraInfo: CloneHelper) {
             if (!folder.typeDefinitionObj) continue;
-            if (folder.typeDefinitionObj.browseName.name!.toString() !== "FunctionalGroupType") {
+            if (folder.typeDefinitionObj.browseName.name?.toString() !== "FunctionalGroupType") {
                 continue;
             }

package/source/i_event_data.ts CHANGED Viewed

@@ -1,18 +1,18 @@
-import { NodeId } from "node-opcua-nodeid";
-import { BrowsePath, BrowsePathResult } from "node-opcua-types";
-import { Variant, VariantLike } from "node-opcua-variant";
-import { BaseNode } from "./base_node";
+import type { NodeId } from "node-opcua-nodeid";
+import type { BrowsePath, BrowsePathResult } from "node-opcua-types";
+import type { Variant, VariantLike } from "node-opcua-variant";
+import type { BaseNode } from "./base_node";
 export interface IEventData {
-    /**
-     * the event type node
-     */
-    $eventDataSource?: BaseNode;
     /**
      *
      */
     eventId: NodeId;
+    getEventDataSource(): BaseNode;
     _createValue(fullBrowsePath: string, node: BaseNode, variant: VariantLike): void;
     _readValue(nodeId: NodeId): Variant | null;
     _browse(browsePath: BrowsePath): BrowsePathResult | null;
 }

package/source/ua_object.ts CHANGED Viewed

@@ -144,6 +144,7 @@ export type PseudoVariant =
     | PseudoVariantExtensionObjectArray
     | PseudoVariantVariant
     | PseudoVariantVariantArray;
 export interface RaiseEventData {
     $eventDataSource?: UAEventType;