node-opcua-address-space 2.96.0 → 2.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.96.0",
+    "version": "2.97.0",
     "description": "pure nodejs OPCUA SDK - module -address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -22,35 +22,35 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.96.0",
+        "node-opcua-address-space-base": "2.97.0",
         "node-opcua-assert": "2.88.0",
-        "node-opcua-basic-types": "2.92.0",
+        "node-opcua-basic-types": "2.97.0",
         "node-opcua-binary-stream": "2.90.1",
-        "node-opcua-client-dynamic-extension-object": "2.96.0",
+        "node-opcua-client-dynamic-extension-object": "2.97.0",
         "node-opcua-constants": "2.88.0",
         "node-opcua-crypto": "^2.1.2",
-        "node-opcua-data-access": "2.96.0",
-        "node-opcua-data-model": "2.95.0",
-        "node-opcua-data-value": "2.95.0",
+        "node-opcua-data-access": "2.97.0",
+        "node-opcua-data-model": "2.97.0",
+        "node-opcua-data-value": "2.97.0",
         "node-opcua-date-time": "2.90.1",
         "node-opcua-debug": "2.90.1",
         "node-opcua-enum": "2.90.1",
-        "node-opcua-extension-object": "2.95.0",
-        "node-opcua-factory": "2.95.0",
-        "node-opcua-nodeid": "2.90.1",
-        "node-opcua-nodeset-ua": "2.96.0",
-        "node-opcua-numeric-range": "2.95.0",
+        "node-opcua-extension-object": "2.97.0",
+        "node-opcua-factory": "2.97.0",
+        "node-opcua-nodeid": "2.97.0",
+        "node-opcua-nodeset-ua": "2.97.0",
+        "node-opcua-numeric-range": "2.97.0",
         "node-opcua-object-registry": "2.90.1",
-        "node-opcua-pseudo-session": "2.96.0",
-        "node-opcua-service-browse": "2.96.0",
-        "node-opcua-service-call": "2.96.0",
-        "node-opcua-service-history": "2.96.0",
-        "node-opcua-service-translate-browse-path": "2.96.0",
-        "node-opcua-service-write": "2.96.0",
+        "node-opcua-pseudo-session": "2.97.0",
+        "node-opcua-service-browse": "2.97.0",
+        "node-opcua-service-call": "2.97.0",
+        "node-opcua-service-history": "2.97.0",
+        "node-opcua-service-translate-browse-path": "2.97.0",
+        "node-opcua-service-write": "2.97.0",
         "node-opcua-status-code": "2.90.1",
-        "node-opcua-types": "2.96.0",
+        "node-opcua-types": "2.97.0",
         "node-opcua-utils": "2.90.1",
-        "node-opcua-variant": "2.95.0",
+        "node-opcua-variant": "2.97.0",
         "node-opcua-xml2json": "2.96.0",
         "semver": "^7.3.8",
         "set-prototype-of": "^1.0.0",
@@ -62,9 +62,9 @@
         "node-opcua-benchmarker": "2.90.1",
         "node-opcua-leak-detector": "2.90.1",
         "node-opcua-nodesets": "2.96.0",
-        "node-opcua-packet-analyzer": "2.95.0",
-        "node-opcua-service-filter": "2.96.0",
-        "node-opcua-test-fixtures": "2.96.0",
+        "node-opcua-packet-analyzer": "2.97.0",
+        "node-opcua-service-filter": "2.97.0",
+        "node-opcua-test-fixtures": "2.97.0",
         "should": "^13.2.3",
         "sinon": "^15.0.1",
         "source-map-support": "^0.5.21"
@@ -84,5 +84,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "43642e4aaa1ca2a3938b044cc2237544dfff764a"
+    "gitHead": "19c96bda0810d2dec73dd1c2427546be40908646"
 }

package/source/loader/make_xml_extension_object_parser.ts

@@ -1,7 +1,7 @@
 import { Byte, coerceInt64, coerceUInt64, Int16, Int32, Int64, SByte, UAString, UInt16, UInt32, UInt64 } from "node-opcua-basic-types";
 import { LocalizedTextOptions } from "node-opcua-data-model";
 import { make_debugLog, make_warningLog } from "node-opcua-debug";
-import { coerceNodeId, NodeId, NodeIdType } from "node-opcua-nodeid";
+import { coerceNodeId, INodeId, NodeId, NodeIdType } from "node-opcua-nodeid";
 import { EnumDefinition, StructureDefinition } from "node-opcua-types";
 import { lowerFirstLetter } from "node-opcua-utils";
 import { DataType } from "node-opcua-variant";
@@ -82,7 +82,7 @@ const localizedTextReader: ReaderStateParserLike = {
 };
 
 function clamp(value: number, minValue: number, maxValue: number) {
-    if (value< minValue) {
+    if (value < minValue) {
         warningLog(`invalid value range : ${value} < ${minValue} but should be [${minValue} , ${maxValue}]`);
         return minValue;
     }
@@ -257,25 +257,26 @@ function _clone(a: any): any {
 }
 
 function _makeTypeReader(
-    dataTypeNodeId: NodeId,
+    dataTypeNodeId1: NodeId,
     definitionMap: DefinitionMap2,
     readerMap: Record<string, ReaderStateParserLike>
 ): { name: string; parser: ReaderStateParserLike } {
-    if (dataTypeNodeId.namespace === 0 && dataTypeNodeId.value === 0) {
+    const n = dataTypeNodeId1 as INodeId;
+    if (n.identifierType === NodeIdType.NUMERIC && n.namespace === 0 && n.value === 0) {
         // a generic Extension Object
         return { name: "Variant", parser: partials["Variant"] };
     }
     if (
-        dataTypeNodeId.namespace === 0 &&
-        dataTypeNodeId.identifierType === NodeIdType.NUMERIC &&
-        dataTypeNodeId.value < DataType.ExtensionObject
+        n.namespace === 0 &&
+        n.identifierType === NodeIdType.NUMERIC &&
+        n.value < DataType.ExtensionObject
     ) {
-        const name = DataType[dataTypeNodeId.value as number] as string;
+        const name = DataType[n.value as number] as string;
         const parser = partials[name];
         return { name, parser };
     }
 
-    const { name, definition } = definitionMap.findDefinition(dataTypeNodeId);
+    const { name, definition } = definitionMap.findDefinition(n);
     const dataTypeName = name;
 
     // console.log("NAME = ", dataTypeNodeId.toString(), name, definition);

package/src/address_space.ts

@@ -10,7 +10,7 @@ import { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object
 import { DataTypeIds, VariableTypeIds } from "node-opcua-constants";
 import { BrowseDirection, NodeClass, QualifiedName } from "node-opcua-data-model";
 import { ExtensionObject } from "node-opcua-extension-object";
-import { coerceExpandedNodeId, coerceNodeId, makeNodeId, NodeId, NodeIdLike, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
+import { coerceExpandedNodeId, coerceNodeId, INodeId, makeNodeId, NodeId, NodeIdLike, NodeIdType, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
 import { ObjectRegistry } from "node-opcua-object-registry";
 import { BrowseResult } from "node-opcua-service-browse";
 import { StatusCodes } from "node-opcua-status-code";
@@ -483,18 +483,19 @@ export class AddressSpace implements AddressSpacePrivate {
         if (sameNodeId(enumerationTypeNodeId, dataTypeNode!.nodeId)) {
             return DataType.Int32;
         }
+        const n = dataTypeNode.nodeId as INodeId;
 
-        if (dataTypeNode.nodeId.namespace === 0 && dataTypeNode.nodeId.value === 29) {
+        if (n.namespace === 0 && n.value === 29) {
             // Number
             return DataType.Null; //which one ?
         }
 
-        if (dataTypeNode.nodeId.namespace === 0 && dataTypeNode.nodeId.value === 0) {
+        if (n.namespace === 0 && n.value === 0) {
             return DataType.Null;
         }
 
-        if (dataTypeNode.nodeId.namespace === 0 && dataTypeNode.nodeId.value <= 25) {
-            return dataTypeNode.nodeId.value as DataType;
+        if (n.identifierType === NodeIdType.NUMERIC && n.namespace === 0 && n.value <= 25) {
+            return n.value as DataType;
         }
 
         const result = this.findCorrespondingBasicDataType(dataTypeNode.subtypeOfObj as UADataType);

package/src/base_node_impl.ts

@@ -1159,6 +1159,10 @@ export class BaseNodeImpl extends EventEmitter implements BaseNode {
         BaseNode_removePrivate(this);
     }
 
+    public isDisposed(): boolean {
+        return !this.addressSpacePrivate;
+    }
+
     // istanbul ignore next
     public dumpXML(xmlWriter: XmlWriter): void {
         console.error(" This ", (NodeClass as any)[this.nodeClass]);
@@ -1504,8 +1508,8 @@ function _asObject<T extends BaseNode>(references: UAReference[], addressSpace:
             // tslint:disable-next-line:no-console
             console.log(
                 chalk.red(" Warning :  object with nodeId ") +
-                    chalk.cyan(reference.nodeId.toString()) +
-                    chalk.red(" cannot be found in the address space !")
+                chalk.cyan(reference.nodeId.toString()) +
+                chalk.red(" cannot be found in the address space !")
             );
         }
         return obj as any as T;

package/src/data_access/ua_two_state_discrete_impl.ts

@@ -130,7 +130,9 @@ export function _addTwoStateDiscrete(namespace: INamespace, options: AddTwoState
     const variable = namespace.addVariable({
         accessLevel: options.accessLevel,
         browseName: options.browseName,
+        displayName: options.displayName,
         componentOf: options.componentOf,
+        propertyOf: options.propertyOf,
         dataType: DataType.Boolean,
         nodeId: options.nodeId,
         typeDefinition: twoStateDiscreteType.nodeId,

package/src/nodeset_tools/dump_to_bsd.ts

@@ -1,7 +1,7 @@
 import { IAddressSpace, INamespace, UADataType } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
 import { StructureDefinition, EnumDefinition } from "node-opcua-types";
-import { NodeId } from "node-opcua-nodeid";
+import { INodeId, NodeId, NodeIdType } from "node-opcua-nodeid";
 import { AddressSpacePrivate } from "../address_space_private";
 import { XmlWriter } from "../../source/xml_writer";
 import { NamespacePrivate } from "../namespace_private";
@@ -33,7 +33,9 @@ function buildXmlName(addressSpace: AddressSpacePrivate, map: { [key: number]: s
         throw new Error("Cannot find Node for" + nodeId?.toString());
     }
     const typeName = node.browseName.name!;
-    const prefix = node.nodeId.namespace === 0 ? (node.nodeId.value<= 15 ? "opc" : "ua") : map[node.nodeId.namespace];
+
+    const n = node.nodeId as INodeId;
+    const prefix = (n.identifierType === NodeIdType.NUMERIC && n.namespace === 0) ? (n.value <= 15 ? "opc" : "ua") : map[node.nodeId.namespace];
     return prefix + ":" + (typeName === "Structure" && prefix === "ua" ? "ExtensionObject" : typeName);
 }
 
@@ -162,7 +164,7 @@ export function dumpToBSD(namespace: NamespacePrivate): string {
     xw.writeAttribute("xmlns:tns", namespace.namespaceUri);
 
     const map: { [key: number]: string } = {};
-    
+
     map[namespace.index] = "tns";
 
     for (const dependantNamespace of dependency) {
@@ -190,7 +192,7 @@ export function dumpToBSD(namespace: NamespacePrivate): string {
         dumpDataTypeToBSD(xw, dataType, map);
     }
     xw.endElement();
-//    xw.endDocument();
+    //    xw.endDocument();
 
     return xw.toString();
 }