node-opcua-address-space 2.169.0 → 2.170.1

package/distHelpers/get_address_space_fixture.js

@@ -7,33 +7,33 @@ exports.getAddressSpaceFixture = getAddressSpaceFixture;
 /**
  * @module node-opcua-address-space
  */
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 function getAddressSpaceFixture(pathname) {
     // find in nodesets folder in the first place
-    const folder1 = path_1.default.join(__dirname, "../nodesets");
-    if (fs_1.default.existsSync(folder1)) {
-        const filename = path_1.default.join(folder1, pathname);
-        if (fs_1.default.existsSync(filename)) {
+    const folder1 = node_path_1.default.join(__dirname, "../nodesets");
+    if (node_fs_1.default.existsSync(folder1)) {
+        const filename = node_path_1.default.join(folder1, pathname);
+        if (node_fs_1.default.existsSync(filename)) {
             return filename;
         }
     }
     // find in  test_fixtures seconds
-    let folder = path_1.default.join(__dirname, "./test_fixtures");
-    if (!fs_1.default.existsSync(folder)) {
-        folder = path_1.default.join(__dirname, "../test_helpers/test_fixtures");
-        if (!fs_1.default.existsSync(folder)) {
-            folder = path_1.default.join(__dirname, "../../test_helpers/test_fixtures");
+    let folder = node_path_1.default.join(__dirname, "./test_fixtures");
+    if (!node_fs_1.default.existsSync(folder)) {
+        folder = node_path_1.default.join(__dirname, "../test_helpers/test_fixtures");
+        if (!node_fs_1.default.existsSync(folder)) {
+            folder = node_path_1.default.join(__dirname, "../../test_helpers/test_fixtures");
             // c8 ignore next
-            if (!fs_1.default.existsSync(folder)) {
+            if (!node_fs_1.default.existsSync(folder)) {
                 // tslint:disable:no-console
                 console.log(" cannot find test_fixtures folder ");
             }
         }
     }
-    const filename = path_1.default.join(folder, pathname);
+    const filename = node_path_1.default.join(folder, pathname);
     // c8 ignore next
-    if (!fs_1.default.existsSync(filename)) {
+    if (!node_fs_1.default.existsSync(filename)) {
         throw new Error(" cannot find fixture with name " + pathname);
     }
     return filename;

package/distHelpers/get_address_space_fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"get_address_space_fixture.js","sourceRoot":"","sources":["../test_helpers/get_address_space_fixture.ts"],"names":[],"mappings":";;;;;AAMA,wDAgCC;AAtCD;;GAEG;AACH,4CAAoB;AACpB,gDAAwB;AAExB,SAAgB,sBAAsB,CAAC,QAAgB;IAEnD,6CAA6C;IAC7C,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IAED,iCAAiC;IACjC,IAAI,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IACrD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;YAElE,iBAAiB;YACjB,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzB,4BAA4B;gBAC5B,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;YACtD,CAAC;QACL,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE7C,iBAAiB;IACjB,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,QAAQ,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}
+{"version":3,"file":"get_address_space_fixture.js","sourceRoot":"","sources":["../test_helpers/get_address_space_fixture.ts"],"names":[],"mappings":";;;;;AAMA,wDAgCC;AAtCD;;GAEG;AACH,sDAAyB;AACzB,0DAA6B;AAE7B,SAAgB,sBAAsB,CAAC,QAAgB;IAEnD,6CAA6C;IAC7C,MAAM,OAAO,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,iBAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,iBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IAED,iCAAiC;IACjC,IAAI,MAAM,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IACrD,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC;QAC/D,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,MAAM,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;YAElE,iBAAiB;YACjB,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzB,4BAA4B;gBAC5B,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;YACtD,CAAC;QACL,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE7C,iBAAiB;IACjB,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,QAAQ,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}

package/distHelpers/index.d.ts

@@ -4,9 +4,9 @@
 export * from "./add_event_generator_object";
 export * from "./alarms_and_conditions_demo";
 export * from "./assertHasMatchingReference";
+export * from "./boiler_system";
 export * from "./create_minimalist_address_space_nodeset";
+export * from "./date_utils";
 export * from "./get_address_space_fixture";
 export * from "./get_mini_address_space";
-export * from "./boiler_system";
 export * from "./mock_session";
-export * from "./date_utils";

package/distHelpers/index.js

@@ -20,10 +20,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./add_event_generator_object"), exports);
 __exportStar(require("./alarms_and_conditions_demo"), exports);
 __exportStar(require("./assertHasMatchingReference"), exports);
+__exportStar(require("./boiler_system"), exports);
 __exportStar(require("./create_minimalist_address_space_nodeset"), exports);
+__exportStar(require("./date_utils"), exports);
 __exportStar(require("./get_address_space_fixture"), exports);
 __exportStar(require("./get_mini_address_space"), exports);
-__exportStar(require("./boiler_system"), exports);
 __exportStar(require("./mock_session"), exports);
-__exportStar(require("./date_utils"), exports);
 //# sourceMappingURL=index.js.map

package/distHelpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../test_helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,+DAA6C;AAC7C,+DAA6C;AAC7C,+DAA6C;AAC7C,4EAA0D;AAC1D,8DAA4C;AAC5C,2DAAyC;AACzC,kDAAgC;AAChC,iDAA+B;AAC/B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../test_helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,+DAA6C;AAC7C,+DAA6C;AAC7C,+DAA6C;AAC7C,kDAAgC;AAChC,4EAA0D;AAC1D,+CAA6B;AAC7B,8DAA4C;AAC5C,2DAAyC;AACzC,iDAA+B"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.169.0",
+    "version": "2.170.1",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -21,35 +21,35 @@
         "@types/semver": "7.7.1",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.169.0",
+        "node-opcua-address-space-base": "2.170.1",
         "node-opcua-assert": "2.164.0",
         "node-opcua-basic-types": "2.169.0",
         "node-opcua-binary-stream": "2.169.0",
-        "node-opcua-client-dynamic-extension-object": "2.169.0",
+        "node-opcua-client-dynamic-extension-object": "2.170.1",
         "node-opcua-constants": "2.157.0",
         "node-opcua-crypto": "5.3.5",
-        "node-opcua-data-access": "2.169.0",
-        "node-opcua-data-model": "2.169.0",
-        "node-opcua-data-value": "2.169.0",
+        "node-opcua-data-access": "2.170.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-enum": "2.169.0",
         "node-opcua-extension-object": "2.169.0",
         "node-opcua-factory": "2.169.0",
         "node-opcua-nodeid": "2.169.0",
-        "node-opcua-nodeset-ua": "2.169.0",
+        "node-opcua-nodeset-ua": "2.170.1",
         "node-opcua-numeric-range": "2.169.0",
         "node-opcua-object-registry": "2.169.0",
-        "node-opcua-pseudo-session": "2.169.0",
-        "node-opcua-service-browse": "2.169.0",
-        "node-opcua-service-call": "2.169.0",
-        "node-opcua-service-history": "2.169.0",
-        "node-opcua-service-translate-browse-path": "2.169.0",
-        "node-opcua-service-write": "2.169.0",
+        "node-opcua-pseudo-session": "2.170.1",
+        "node-opcua-service-browse": "2.170.0",
+        "node-opcua-service-call": "2.170.0",
+        "node-opcua-service-history": "2.170.0",
+        "node-opcua-service-translate-browse-path": "2.170.0",
+        "node-opcua-service-write": "2.170.0",
         "node-opcua-status-code": "2.169.0",
-        "node-opcua-types": "2.169.0",
+        "node-opcua-types": "2.170.0",
         "node-opcua-utils": "2.169.0",
-        "node-opcua-variant": "2.169.0",
+        "node-opcua-variant": "2.170.0",
         "node-opcua-xml2json": "2.169.0",
         "semver": "^7.7.4",
         "thenify-ex": "4.4.0",
@@ -61,8 +61,8 @@
         "node-opcua-leak-detector": "2.169.0",
         "node-opcua-nodesets": "2.163.1",
         "node-opcua-packet-analyzer": "2.169.0",
-        "node-opcua-schemas": "2.169.0",
-        "node-opcua-service-filter": "2.169.0",
+        "node-opcua-schemas": "2.170.0",
+        "node-opcua-service-filter": "2.170.1",
         "node-opcua-test-fixtures": "2.157.0"
     },
     "author": "Etienne Rossignon",
@@ -80,7 +80,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "82d570d3e95bea689cbbe30096279885c5282245",
+    "gitHead": "40629feaff284ba70596149e58b3cc2a7a0e8f68",
     "files": [
         "dist",
         "distHelpers",

package/source/ua_interface.ts

@@ -1,49 +1,35 @@
-
-
-import { UAObject, UAObjectType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
-import { BrowseDirection } from "node-opcua-data-model";
+import type { UAObject, UAObjectType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
+import { NodeClass } from "node-opcua-types";
 import { initialize_properties_and_components } from "../src/_instantiate_helpers";
 
-export function implementInterfaceBad(uaNode: UAObject | UAObjectType | UAVariable | UAVariableType, interfaceType: UAObjectType) {
+export function implementInterface(
+    uaNode: UAObject | UAObjectType | UAVariable | UAVariableType, 
+    interfaceType: UAObjectType,
+    optionals?: string[],
+    isModellingType?: boolean
+) {
 
-    const addressSpace = uaNode.addressSpace;
-    const tmp = interfaceType.instantiate({
-        browseName: uaNode.browseName,
-        copyAlsoModellingRules: true,
-        copyAlsoAllOptionals: true,
-        modellingRule: "Mandatory"
-    });
-    // 
-    uaNode.addReference({
-        nodeId: interfaceType,
-        referenceType: "HasInterface"
-    });
-    const childrenRef = tmp.findReferencesEx("HasChild", BrowseDirection.Forward);
-    // transfer children to uaNode
-    for (const childRef of childrenRef) {
+    optionals = optionals || [];
 
-        tmp.removeReference({
-            nodeId: childRef.nodeId,
-            referenceType: childRef.referenceType,
-            isForward: childRef.isForward
-        });
-        uaNode.addReference({
-            nodeId: childRef.nodeId,
-            referenceType: childRef.referenceType,
-            isForward: childRef.isForward
-        });
+    const addressSpace = uaNode.addressSpace;
+    const topMost = addressSpace.findObjectType("BaseInterfaceType");
+    if (!topMost) {
+        throw new Error("cannot find BaseInterfaceType");
     }
-    addressSpace.deleteNode(tmp);
-}
 
-export function implementInterface(uaNode: UAObject | UAObjectType | UAVariable | UAVariableType, interfaceType: UAObjectType) {
-
-    const addressSpace = uaNode.addressSpace;
-    const topMost = addressSpace.findObjectType("BaseInterfaceType")!;
-    initialize_properties_and_components(uaNode as any, topMost, interfaceType, true, true, []);
+    isModellingType = isModellingType === undefined ? uaNode.nodeClass === NodeClass.ObjectType || uaNode.nodeClass === NodeClass.VariableType : isModellingType;
+
+    const copyAlsoModellingRules = isModellingType;
+    const copyAlsoAllOptionals = isModellingType;
+    initialize_properties_and_components(
+        uaNode as UAObject | UAVariable, 
+        topMost, interfaceType, 
+        copyAlsoModellingRules, 
+        copyAlsoAllOptionals, 
+        optionals
+    );
     uaNode.addReference({
         nodeId: interfaceType,
         referenceType: "HasInterface"
     });
-
 }

package/src/_instantiate_helpers.ts

@@ -4,33 +4,30 @@
 // tslint:disable:max-classes-per-file
 // tslint:disable:no-console
 import chalk from "chalk";
-
 import {
-    UAMethod,
-    UAObject,
-    UAObjectType,
-    UAVariable,
-    UAVariableType,
+    CloneHelper,
     reconstructFunctionalGroupType,
     reconstructNonHierarchicalReferences,
-    CloneHelper
+    type UAMethod,
+    type UAObject,
+    type UAObjectType,
+    type UAVariable,
+    type UAVariableType,
 } from "node-opcua-address-space-base";
-
-import { checkDebugFlag, make_debugLog, make_warningLog, make_errorLog } from "node-opcua-debug";
-import { sameNodeId } from "node-opcua-nodeid";
-
-import { makeOptionalsMap, OptionalMap } from "../source/helpers/make_optionals_map";
-
-import { _clone_hierarchical_references } from "./base_node_private";
+import { checkDebugFlag, make_errorLog, make_warningLog} from "node-opcua-debug";
+import { resolveNodeId, sameNodeId } from "node-opcua-nodeid";
+import { makeOptionalsMap, type OptionalMap } from "../source/helpers/make_optionals_map";
 import { MandatoryChildOrRequestedOptionalFilter } from "./_mandatory_child_or_requested_optional_filter";
+import { _clone_hierarchical_references } from "./base_node_private";
+import { BrowseDirection } from "node-opcua-data-model";
 
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
-const warningLog = make_warningLog(__filename);
-const errorLog = make_errorLog(__filename);
+// const debugLog = make_debugLog("INSTANTIATE");
+// const doDebug = checkDebugFlag("INSTANTIATE");
+const warningLog = make_warningLog("INSTANTIATE");
+const errorLog = make_errorLog("INSTANTIATE");
 
 // eslint-disable-next-line prefer-const
-let doTrace = checkDebugFlag("INSTANTIATE");
+const doTrace = checkDebugFlag("INSTANTIATE");
 const traceLog = errorLog;
 
 // install properties and components on a instantiated Object
@@ -58,7 +55,7 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
         warningLog("optionalsMap        =", Object.keys(optionalsMap).join(" "));
 
         const c = typeDefinitionNode.findReferencesEx("Aggregates");
-        warningLog("typeDefinition aggregates      =", c.map((x) => x.node!.browseName.toString()).join(" "));
+        warningLog("typeDefinition aggregates      =", c.map((x) => x.node?.browseName.toString()).join(" "));
     }
     optionalsMap = optionalsMap || {};
 
@@ -71,7 +68,7 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
     doTrace &&
         traceLog(
             chalk.cyan(extraInfo.pad(), "cloning relevant member of typeDefinition class"),
-            typeDefinitionNode.browseName.toString()+ "\n optionals" + (JSON.stringify(optionalsMap))
+            `${typeDefinitionNode.browseName.toString()}\n optionals${JSON.stringify(optionalsMap)}`
         );
 
     _clone_hierarchical_references(typeDefinitionNode, instance, copyAlsoModellingRules, filter, extraInfo, browseNameMap);
@@ -79,7 +76,7 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
     // now apply recursion on baseTypeDefinition  to get properties and components from base class
 
     const baseTypeDefinitionNodeId = typeDefinitionNode.subtypeOf;
-    const baseTypeDefinition = typeDefinitionNode.subtypeOfObj!;
+    const baseTypeDefinition = typeDefinitionNode.subtypeOfObj;
 
     doTrace &&
         traceLog(
@@ -87,9 +84,9 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
                 extraInfo.pad(),
                 "now apply recursion on baseTypeDefinition  to get properties and components from base class"
             ),
-            baseTypeDefinition.browseName.toString()
+            baseTypeDefinition ? baseTypeDefinition.browseName.toString() : "undefined"
         );
-
+ 
     // c8 ignore next
     if (!baseTypeDefinition) {
         throw new Error(chalk.red("Cannot find object with nodeId ") + baseTypeDefinitionNodeId);
@@ -141,7 +138,53 @@ export function initialize_properties_and_components<
         browseNameMap
     );
 
+    // instantiate optionals from interfaces
+    instantiate_interface_children<B>(nodeType, extraInfo, instance, copyAlsoModellingRules, copyAlsoAllOptionals, optionalsMap, browseNameMap);
+
     reconstructFunctionalGroupType(extraInfo);
 
     reconstructNonHierarchicalReferences(extraInfo);
 }
+
+function instantiate_interface_children<B extends UAObject | UAVariable | UAMethod>(
+    nodeType: UAObjectType | UAVariableType, 
+    extraInfo: CloneHelper, 
+    instance: B, 
+    copyAlsoModellingRules: boolean, 
+    copyAlsoAllOptionals: boolean, 
+    optionalsMap: OptionalMap, 
+    browseNameMap: Set<string>
+) {
+    const interfaces = nodeType.findReferencesEx(resolveNodeId("HasInterface"), BrowseDirection.Forward);
+    if (interfaces.length === 0) {
+        return;
+    }
+    for (const reference of interfaces) {
+        const interfaceType =
+            (reference.node as UAObjectType) || nodeType.addressSpace.findObjectType(reference.nodeId);
+        if (!interfaceType) {
+            warningLog(" cannot find node ", reference.nodeId.toString());
+            continue;
+        }
+        const topMostTypeBaseInterface = nodeType.addressSpace.findObjectType("BaseInterfaceType");
+        if (!topMostTypeBaseInterface) {
+            throw new Error("cannot find BaseInterfaceType");
+        }
+        doTrace &&
+            traceLog(
+                chalk.cyan(extraInfo.pad(), "instantiating optionals from interface"),
+                `${interfaceType.browseName.toString()}`
+            );
+        _initialize_properties_and_components(
+            instance,
+            topMostTypeBaseInterface,
+            interfaceType,
+            copyAlsoModellingRules,
+            copyAlsoAllOptionals,
+            optionalsMap,
+            extraInfo,
+            browseNameMap
+        );
+    }
+}
+

package/src/_mandatory_child_or_requested_optional_filter.ts

@@ -32,13 +32,13 @@ export class MandatoryChildOrRequestedOptionalFilter implements CloneFilter {
         const addressSpace = node.addressSpace;
 
         const alreadyIn = this.references.filter((r: UAReference) => {
-            const n = addressSpace.findNode(r.nodeId)!;
+            const n = addressSpace.findNode(r.nodeId);
             // c8 ignore next
             if (!n) {
                 warningLog(" cannot find node ", r.nodeId.toString());
                 return false;
             }
-            return n.browseName!.name!.toString() === node.browseName!.name!.toString();
+            return n.browseName?.name?.toString() === node.browseName?.name?.toString();
         });
 
         if (alreadyIn.length > 0) {
@@ -76,7 +76,7 @@ export class MandatoryChildOrRequestedOptionalFilter implements CloneFilter {
                 return true; // keep;
             case "Optional":
                 // only if in requested optionals
-                return this.copyAlsoAllOptionals || (node.browseName!.name! in this.optionalsMap);
+                return this.copyAlsoAllOptionals || ((node.browseName?.name || "") in this.optionalsMap);
             case "OptionalPlaceholder":
                 return false; // ignored
             default:
@@ -85,12 +85,12 @@ export class MandatoryChildOrRequestedOptionalFilter implements CloneFilter {
     }
 
     public filterFor(childInstance: UAVariable | UAObject | UAMethod): CloneFilter {
-        const browseName: string = childInstance.browseName.name!;
+        const browseName: string = childInstance.browseName.name || "";
 
         let map: OptionalMap = Object.create(null);
 
         if (browseName in this.optionalsMap) {
-            map = this.optionalsMap[browseName] as any;
+            map = this.optionalsMap[browseName] as OptionalMap;
         }
         // c8 ignore next
         doTrace && traceLog("filterFor ", browseName, map);

package/src/address_space.ts

@@ -693,30 +693,25 @@ export class AddressSpace implements AddressSpacePrivate {
     /*=
      * construct a simple javascript object with all the default properties of the event
      *
-     * @return result.$eventDataSource {BaseNode} the event type node
-     * @return result.eventId {NodeId} the
-     * ...
-     *
      *
      * eventTypeId can be a UAEventType
      *
      * @private
      */
-    public constructEventData(eventTypeId: UAEventType, data: RaiseEventData): IEventData {
-        data = data || {};
+    public constructEventData(eventTypeId: UAEventType, dataInput: Record<string, unknown>): IEventData {
+        const data: RaiseEventData = (dataInput || {}) as RaiseEventData;
 
         // construct the reference dataStructure to store event Data
-        let eventTypeNode = eventTypeId;
+        let eventTypeNode: UAEventType | null = eventTypeId;
 
         // make sure that eventType is really a object that derived from EventType
         if (eventTypeId instanceof UAObjectTypeImpl) {
-            eventTypeNode = this.findEventType(eventTypeId)!;
+            eventTypeNode = this.findEventType(eventTypeId) as UAEventType | null;
         }
-
         /* c8 ignore next */
-        if (!eventTypeNode) {
-            throw new Error(` cannot find EvenType for ${eventTypeId}`);
-        }
+        if (!eventTypeNode) throw new Error(` cannot find EventType for ${eventTypeId}`);
+
+
         assert(eventTypeNode instanceof UAObjectTypeImpl, "eventTypeId must represent a UAObjectType");
 
         // eventId
@@ -732,11 +727,15 @@ export class AddressSpace implements AddressSpacePrivate {
         assert(data.sourceNode.dataType === DataType.NodeId);
 
         // sourceName
-        const sourceNode = this.findNode(data.sourceNode.value)!;
-
+        const sourceNode = this.findNode(data.sourceNode.value);
+        if (!sourceNode) {
+            warningLog(
+                `constructEventData: cannot find sourceNode ${data.sourceNode.value?.toString()} for event ${eventTypeNode.browseName.toString()}`
+            );
+        }
         data.sourceName = data.sourceName || {
             dataType: DataType.String,
-            value: sourceNode.getDisplayName("en")
+            value: sourceNode?.getDisplayName("en") || ""
         };
 
         const nowUTC = new Date();
@@ -826,7 +825,7 @@ export class AddressSpace implements AddressSpacePrivate {
                         "' in [ " +
                         Object.keys(visitedProperties).join(", ") +
                         "] when filling " +
-                        eventTypeNode.browseName.toString()
+                        eventTypeNode?.browseName.toString()
                     );
                 }
             });

package/src/alarms_and_conditions/condition_snapshot_impl.ts

@@ -90,7 +90,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         }
         const c = this.condition as UAConditionImpl;
         const isDisabled = !c.getEnabledState();
-        const eventData = new EventData(this.condition!);
+        const eventData = new EventData(this.condition);
 
         for (const fullBrowsePath of this._map.keys()) {
             const node = this._node_index.get(fullBrowsePath);
@@ -98,10 +98,10 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
                 debugLog("cannot node for find key", fullBrowsePath);
                 continue;
             }
-            if (isDisabled && !Object.prototype.hasOwnProperty.call(_varTable, fullBrowsePath)) {
+            if (isDisabled && !Object.hasOwn(_varTable, fullBrowsePath)) {
                 eventData._createValue(fullBrowsePath, node, disabledVar);
             } else {
-                eventData._createValue(fullBrowsePath, node, this._map.get(fullBrowsePath)!);
+                eventData._createValue(fullBrowsePath, node, this._map.get(fullBrowsePath) as Variant);
             }
         }
         return eventData;

package/src/base_node_impl.ts

@@ -1031,7 +1031,7 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
         return options.toString();
     }
 
-    public toJSON(): Record<string, string | undefined | null> {
+    public toJSON(): Record<string, unknown> {
         return {
             nodeId: this.nodeId.toString(),
             nodeClass: NodeClass[this.nodeClass],