node-opcua-address-space 2.156.0 → 2.157.0

package/distNodeJS/generate_address_space.d.ts

@@ -1,4 +1,4 @@
 import { IAddressSpace } from "node-opcua-address-space-base";
-import { NodeSetLoaderOptions } from "../source/interfaces/nodeset_loader_options";
+import { NodeSetLoaderOptions } from "..";
 export declare function readNodeSet2XmlFile(xmlFile: string): Promise<string>;
 export declare function generateAddressSpace(addressSpace: IAddressSpace, xmlFiles: string | string[], options?: NodeSetLoaderOptions): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.156.0",
+    "version": "2.157.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -13,57 +13,58 @@
         "lint": "eslint source test src source_nodejs test_helpers",
         "format": "prettier --write source test src source_nodejs test_helpers",
         "clean": "npx rimraf -g node_modules dist *.tsbuildinfo",
-        "c": "mocha --version"
+        "c": "mocha --version",
+        "fix:tsconfig": "node ../../code_gen/extract-modules.js tsconfig_base.json"
     },
     "dependencies": {
-        "@types/lodash": "4.17.16",
-        "@types/semver": "^7.7.0",
+        "@types/lodash": "4.17.20",
+        "@types/semver": "7.7.1",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.155.0",
-        "node-opcua-assert": "2.139.0",
-        "node-opcua-basic-types": "2.154.0",
-        "node-opcua-binary-stream": "2.153.0",
-        "node-opcua-client-dynamic-extension-object": "2.156.0",
-        "node-opcua-constants": "2.139.0",
+        "node-opcua-address-space-base": "2.157.0",
+        "node-opcua-assert": "2.157.0",
+        "node-opcua-basic-types": "2.157.0",
+        "node-opcua-binary-stream": "2.157.0",
+        "node-opcua-client-dynamic-extension-object": "2.157.0",
+        "node-opcua-constants": "2.157.0",
         "node-opcua-crypto": "4.16.0",
-        "node-opcua-data-access": "2.155.0",
-        "node-opcua-data-model": "2.155.0",
-        "node-opcua-data-value": "2.155.0",
-        "node-opcua-date-time": "2.153.0",
-        "node-opcua-debug": "2.153.0",
-        "node-opcua-enum": "2.153.0",
-        "node-opcua-extension-object": "2.155.0",
-        "node-opcua-factory": "2.155.0",
-        "node-opcua-nodeid": "2.153.0",
-        "node-opcua-nodeset-ua": "2.155.0",
-        "node-opcua-numeric-range": "2.155.0",
-        "node-opcua-object-registry": "2.153.0",
-        "node-opcua-pseudo-session": "2.156.0",
-        "node-opcua-schemas": "2.155.0",
-        "node-opcua-service-browse": "2.155.0",
-        "node-opcua-service-call": "2.155.0",
-        "node-opcua-service-history": "2.155.0",
-        "node-opcua-service-translate-browse-path": "2.155.0",
-        "node-opcua-service-write": "2.155.0",
-        "node-opcua-status-code": "2.153.0",
-        "node-opcua-types": "2.155.0",
-        "node-opcua-utils": "2.153.0",
-        "node-opcua-variant": "2.155.0",
-        "node-opcua-xml2json": "2.155.0",
-        "semver": "^7.7.1",
+        "node-opcua-data-access": "2.157.0",
+        "node-opcua-data-model": "2.157.0",
+        "node-opcua-data-value": "2.157.0",
+        "node-opcua-date-time": "2.157.0",
+        "node-opcua-debug": "2.157.0",
+        "node-opcua-enum": "2.157.0",
+        "node-opcua-extension-object": "2.157.0",
+        "node-opcua-factory": "2.157.0",
+        "node-opcua-nodeid": "2.157.0",
+        "node-opcua-nodeset-ua": "2.157.0",
+        "node-opcua-numeric-range": "2.157.0",
+        "node-opcua-object-registry": "2.157.0",
+        "node-opcua-pseudo-session": "2.157.0",
+        "node-opcua-service-browse": "2.157.0",
+        "node-opcua-service-call": "2.157.0",
+        "node-opcua-service-history": "2.157.0",
+        "node-opcua-service-translate-browse-path": "2.157.0",
+        "node-opcua-service-write": "2.157.0",
+        "node-opcua-status-code": "2.157.0",
+        "node-opcua-types": "2.157.0",
+        "node-opcua-utils": "2.157.0",
+        "node-opcua-variant": "2.157.0",
+        "node-opcua-xml2json": "2.157.0",
+        "semver": "^7.7.2",
         "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
-        "node-opcua-benchmarker": "2.153.0",
-        "node-opcua-leak-detector": "2.154.0",
-        "node-opcua-nodesets": "2.155.0",
-        "node-opcua-packet-analyzer": "2.155.0",
-        "node-opcua-service-filter": "2.155.0",
-        "node-opcua-test-fixtures": "2.155.0",
-        "source-map-support": "^0.5.21"
+        "humanize": "0.0.9",
+        "node-opcua-benchmarker": "2.157.0",
+        "node-opcua-leak-detector": "2.157.0",
+        "node-opcua-nodesets": "2.157.0",
+        "node-opcua-packet-analyzer": "2.157.0",
+        "node-opcua-schemas": "2.157.0",
+        "node-opcua-service-filter": "2.157.0",
+        "node-opcua-test-fixtures": "2.157.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -80,7 +81,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "53bc91f8992b50b9ddb938e279f78ac1026ec13f",
+    "gitHead": "e0a948ac5379ae8d9cc8200a1b4a31515a35be37",
     "files": [
         "dist",
         "distHelpers",

package/source/index.ts

@@ -37,6 +37,8 @@ export * from "./interfaces/alarms_and_conditions/ua_limit_alarm_ex";
 export * from "./interfaces/alarms_and_conditions/ua_non_exclusive_deviation_alarm_ex";
 export * from "./interfaces/alarms_and_conditions/ua_non_exclusive_limit_alarm_ex";
 
+export * from "./interfaces/nodeset_loader_options";
+
 export { promoteToMultiStateDiscrete } from "../src/data_access/ua_multistate_discrete_impl";
 export { promoteToMultiStateValueDiscrete } from "../src/data_access/ua_multistate_value_discrete_impl";
 export { promoteToTwoStateDiscrete } from "../src/data_access/ua_two_state_discrete_impl";

package/source/interfaces/alarms_and_conditions/ua_acknowledgeable_condition_ex.ts

@@ -7,6 +7,8 @@ import { UAConditionEx, UAConditionHelper } from "./ua_condition_ex";
 
 export interface UAAcknowledgeableConditionHelper {
     autoConfirmBranch(branch: ConditionSnapshot, comment: LocalizedTextLike): void;
+
+
     acknowledgeAndAutoConfirmBranch(branch: ConditionSnapshot, comment: string | LocalizedTextLike | LocalizedText): void;
 }
 

package/source/interfaces/alarms_and_conditions/ua_alarm_condition_ex.ts

@@ -19,7 +19,6 @@ export interface UAAlarmConditionHelper extends UAAcknowledgeableConditionHelper
     getInputNodeValue(): any | null;
     updateState(): void;
     getCurrentConditionInfo(): ConditionInfo;
-
     installInputNodeMonitoring(inputNode: BaseNode | NodeId): void;
 }
 

package/source/interfaces/alarms_and_conditions/ua_condition_ex.ts

@@ -51,6 +51,8 @@ export interface UAConditionHelper extends UABaseEventHelper {
     raiseNewCondition(conditionInfo: ConditionInfoOptions): void;
     raiseNewBranchState(branch: ConditionSnapshot): void;
     currentBranch(): ConditionSnapshot;
+    findBranchForEventId(eventId: Buffer| null): ConditionSnapshot | null;
+
 }
 
 export interface UAConditionEx extends UAObject, UACondition_Base, UAConditionHelper {

package/source_nodejs/generate_address_space.ts

@@ -4,7 +4,7 @@ import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
 import { IAddressSpace } from "node-opcua-address-space-base";
 
 import { generateAddressSpaceRaw } from "..";
-import { NodeSetLoaderOptions } from "../source/interfaces/nodeset_loader_options";
+import { NodeSetLoaderOptions } from "..";
 
 const doDebug = checkDebugFlag(__filename);
 const debugLog = make_debugLog(__filename);

package/src/address_space.ts

@@ -77,6 +77,7 @@ import { ReferenceImpl } from "./reference_impl";
 import { UAVariableImpl } from "./ua_variable_impl";
 import { UAReferenceTypeImpl } from "./ua_reference_type_impl";
 import { BaseNodeImpl } from "./base_node_impl";
+import { resolve } from "path";
 
 const doDebug = false;
 const errorLog = make_errorLog(__filename);
@@ -88,10 +89,17 @@ const Dequeue = require("dequeue");
 
 const regexNumberColumnString = /^([0-9]+):(.*)/;
 const enumerationTypeNodeId = coerceNodeId(DataTypeIds.Enumeration);
-
+/**
+ * Extracts the namespace and browse name as a string from the given input.
+ * 
+ * @param addressSpace The address space instance.
+ * @param browseNameOrNodeId A NodeIdLike, QualifiedName, or string representing the browse name or node id.
+ * @param namespaceIndex Optional namespace index.
+ * @returns A tuple containing the NamespacePrivate and the browse name as a string.
+ */
 function _extract_namespace_and_browse_name_as_string(
     addressSpace: AddressSpace,
-    browseName: NodeIdLike | QualifiedName,
+    browseNameOrNodeId: NodeIdLike | QualifiedName,
     namespaceIndex?: number
 ): [NamespacePrivate, string] {
     assert(!namespaceIndex || namespaceIndex >= 0);
@@ -99,26 +107,37 @@ function _extract_namespace_and_browse_name_as_string(
     let result;
 
     if (namespaceIndex !== undefined && namespaceIndex > 0) {
-        assert(typeof browseName === "string", "expecting a string when namespaceIndex is specified");
-        result = [addressSpace.getNamespace(namespaceIndex), browseName];
-    } else if (typeof browseName === "string") {
-        // split
-        if (browseName.indexOf(":") >= 0) {
-            const a = browseName.split(":");
+        assert(typeof browseNameOrNodeId === "string", "expecting a string when namespaceIndex is specified");
+        result = [addressSpace.getNamespace(namespaceIndex), browseNameOrNodeId];
+    } else if (typeof browseNameOrNodeId === "string") {
+        // we may have a string like "ns=1;i=1234" or "ns=1:MyBrowseName"
+        if (isNodeIdString(browseNameOrNodeId)) {
+            return _extract_namespace_and_browse_name_as_string(addressSpace, addressSpace.resolveNodeId(browseNameOrNodeId), namespaceIndex);
+        }
+        // we must have a BrowseName string
+        if (browseNameOrNodeId.indexOf(":") >= 0) {
+            const a = browseNameOrNodeId.split(":");
             namespaceIndex = a.length === 2 ? parseInt(a[0], 10) : namespaceIndex;
-            browseName = a.length === 2 ? a[1] : browseName;
-        }
-        result = [addressSpace.getNamespace(namespaceIndex || 0), browseName];
-    } else if (browseName instanceof QualifiedName) {
-        namespaceIndex = browseName.namespaceIndex;
-        result = [addressSpace.getNamespace(namespaceIndex), browseName.name];
-    } else if (typeof browseName === "number") {
-        result = [addressSpace.getDefaultNamespace(), DataType[browseName]];
+            browseNameOrNodeId = a.length === 2 ? a[1] : browseNameOrNodeId;
+        }
+        result = [addressSpace.getNamespace(namespaceIndex || 0), browseNameOrNodeId];
+    } else if (browseNameOrNodeId instanceof QualifiedName) {
+        namespaceIndex = browseNameOrNodeId.namespaceIndex;
+        result = [addressSpace.getNamespace(namespaceIndex), browseNameOrNodeId.name];
+    } else if (typeof browseNameOrNodeId === "number") {
+        result = [addressSpace.getDefaultNamespace(), DataType[browseNameOrNodeId]];
+    } else if (browseNameOrNodeId instanceof NodeId) {
+        // we have a nodeId
+        const nodeId = browseNameOrNodeId as NodeId;
+        namespaceIndex = nodeId.namespace;
+        const node = addressSpace.findNode(nodeId);
+        const browseName = node ? node.browseName.toString() : "UnknownNode";
+        result = [addressSpace.getNamespace(namespaceIndex), browseName];
     }
 
     /* istanbul ignore next */
     if (!result || !result[0]) {
-        throw new Error(` Cannot find namespace associated with ${browseName} ${namespaceIndex}`);
+        throw new Error(` Cannot find namespace associated with ${browseNameOrNodeId} ${namespaceIndex}`);
     }
     return result as [NamespacePrivate, string];
 }
@@ -331,7 +350,7 @@ export class AddressSpace implements AddressSpacePrivate {
                 }
             }
         }
-        const namespaceArray: string[] = this.getNamespaceArray().map((a)=>a.namespaceUri);
+        const namespaceArray: string[] = this.getNamespaceArray().map((a) => a.namespaceUri);
 
         return resolveNodeId(nodeId, { namespaceArray });
     }
@@ -429,7 +448,7 @@ export class AddressSpace implements AddressSpacePrivate {
         }
         if (typeof dataType === "number") {
             if (DataType[dataType] !== undefined) {
-                dataType = DataType[dataType];
+                return this.findDataType(makeNodeId(dataType, 0)) as UADataType;
             } else {
                 return this.findDataType(resolveNodeId(dataType));
             }
@@ -1376,11 +1395,14 @@ export class AddressSpace implements AddressSpacePrivate {
         return returnValue;
     }
 
-    public _coerce_DataType(dataType: NodeId | string | BaseNode): NodeId {
+    public _coerce_DataType(dataType: number | NodeId | string | BaseNode): NodeId {
         if (dataType instanceof NodeId) {
             // xx assert(self.findDataType(dataType));
             return dataType;
         }
+        if (dataType === 0) {
+            return NodeId.nullNodeId
+        }
         return this._coerce_Type(dataType, DataTypeIds, "DataTypeIds", AddressSpace.prototype.findDataType);
     }
 
@@ -1459,13 +1481,31 @@ export class AddressSpace implements AddressSpacePrivate {
         return dataTypeNode.isSubtypeOf(enumerationNode);
     }
 
-    private _coerce_Type(dataType: BaseNode | string | NodeId, typeMap: any, typeMapName: string, finderMethod: any): NodeId {
+    private _coerce_Type(dataType: BaseNode | string | NodeId | number, typeMap: any, typeMapName: string, finderMethod: any): NodeId {
+        if (typeof dataType === "number") {
+            return this._coerce_Type(coerceNodeId(dataType), typeMap, typeMapName, finderMethod);
+        }
         if (dataType instanceof BaseNodeImpl) {
             dataType = dataType.nodeId;
         }
         assert(typeMap !== null && typeof typeMap === "object");
         let nodeId: NodeId | null;
         if (typeof dataType === "string") {
+            if (isNodeIdString(dataType)) {
+                const nodeId = this.resolveNodeId(dataType);
+                if (nodeId.isEmpty()) {
+                    // this is a valid dataType NodeId, but it has no definition in the address space
+                    return NodeId.nullNodeId;
+                }
+                const node = this.findNode(nodeId);
+                if (node) {
+                    // if dataType is a nodeId string, we can use it directly
+                    return node.nodeId;
+                } else {
+                    warningLog("Expecting valid nodeId of a DataType : ", nodeId.toString());
+                    return nodeId;
+                }
+            }
             const namespace0 = this.getDefaultNamespace();
             // resolve dataType
             nodeId = namespace0.resolveAlias(dataType);
@@ -1539,7 +1579,7 @@ function _increase_version_number(node: BaseNode | null) {
         let rawValue = uaNodeVersion.readValue().value.value || ""
         let previousValue = parseInt(rawValue || "0", 10);
         if (Number.isNaN(previousValue)) {
-            warningLog("NodeVersion was ", rawValue );
+            warningLog("NodeVersion was ", rawValue);
             previousValue = 0;
         }
         uaNodeVersion.setValueFromSource({

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -173,7 +173,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
         const comment = inputArguments[1].value;
         assert(comment instanceof LocalizedText);
 
-        const branch = conditionNode._findBranchForEventId(eventId);
+        const branch = conditionNode.findBranchForEventId(eventId);
         if (!branch) {
             callback(null, {
                 statusCode: StatusCodes.BadEventIdUnknown
@@ -607,11 +607,12 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
         // xx }
     }
 
-    protected _findBranchForEventId(eventId: Buffer): ConditionSnapshot | null {
+    public findBranchForEventId(eventId: Buffer| null): ConditionSnapshot | null {
         if (sameBuffer(this.eventId!.readValue().value.value, eventId)) {
             return this.currentBranch();
         }
-        const e = [...this._branches.values()].filter((branch: ConditionSnapshot) => sameBuffer(branch.getEventId(), eventId));
+        const e = [...this._branches.values()]
+                    .filter((branch: ConditionSnapshot) => sameBuffer(branch.getEventId(), eventId));
         if (e.length === 1) {
             return e[0];
         }

package/src/index_current.ts

@@ -12,6 +12,7 @@ export * from "../source/helpers/call_helpers";
 export * from "../source/helpers/ensure_secure_access";
 export * from "../source/helpers/resolve_opaque_on_address_space";
 export * from "../source/interfaces/alarms_and_conditions/condition_info_i";
+export * from "../source/interfaces/nodeset_loader_options"
 export * from "../src/nodeset_tools/construct_namespace_dependency";
 
 

package/src/ua_variable_impl.ts

@@ -2323,7 +2323,7 @@ function changeUAVariableDataType(uaVariable: UAVariableImpl, newDataType: NodeI
     uaVariable.dataType = newDataTypeNode.nodeId;
     (uaVariable as any)._basicDataType = null;
     (uaVariable as any).$dataValue.value.dataType = newDataType;
-    (uaVariable as any).$dataValue.value.value = value;
+    (uaVariable as any).$dataValue.value = value;
     // also change the value to ensure that we have a default value with the correct dataType
     uaVariable._internal_set_value(value);
 }