node-opcua-address-space 2.86.1 → 2.87.0

package/dist/src/nodeid_manager.js

@@ -9,6 +9,7 @@ const node_opcua_nodeid_1 = require("node-opcua-nodeid");
 const node_opcua_debug_1 = require("node-opcua-debug");
 const base_node_impl_1 = require("./base_node_impl");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
+const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
 exports.NamespaceOptions = {
     nodeIdNameSeparator: "-"
 };
@@ -19,11 +20,13 @@ const regExp1 = /^(s|i|b|g)=/;
 const regExp2 = /^ns=[0-9]+;(s|i|b|g)=/;
 const hasPropertyRefId = (0, node_opcua_nodeid_1.resolveNodeId)("HasProperty");
 const hasComponentRefId = (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent");
+const hasOrderedComponentRefId = (0, node_opcua_nodeid_1.resolveNodeId)("HasOrderedComponent");
 const hasEncoding = (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding");
 function _identifyParentInReference(references) {
     const candidates = references.filter((r) => {
         return (!r.isForward &&
             ((0, node_opcua_nodeid_1.sameNodeId)(r.referenceType, hasComponentRefId) ||
+                (0, node_opcua_nodeid_1.sameNodeId)(r.referenceType, hasOrderedComponentRefId) ||
                 (0, node_opcua_nodeid_1.sameNodeId)(r.referenceType, hasPropertyRefId) ||
                 (0, node_opcua_nodeid_1.sameNodeId)(r.referenceType, hasEncoding)));
     });
@@ -37,32 +40,48 @@ function _identifyParentInReference(references) {
     }
     return [ref.nodeId, ""];
 }
+function _findParentNodeId(addressSpace, options) {
+    if (!options.references) {
+        return null;
+    }
+    for (const ref of options.references) {
+        ref._referenceType = addressSpace.findReferenceType(ref.referenceType);
+        /* istanbul ignore next */
+        if (!(0, base_node_impl_1.getReferenceType)(ref)) {
+            throw new Error("Cannot find referenceType " + JSON.stringify(ref));
+        }
+        ref.referenceType = ref._referenceType.nodeId;
+    }
+    // find HasComponent, or has Property reverse
+    return _identifyParentInReference(options.references);
+}
+function prepareName(browseName) {
+    const m = browseName.name.toString().replace(/[ ]/g, "").replace(/(<|>)/g, "");
+    return m;
+}
 class NodeIdManager {
     constructor(namespaceIndex, addressSpace) {
-        this._cache = {};
-        this._reverseCache = {};
+        this._cacheSymbolicName = {};
+        this._cacheSymbolicNameRev = new Set();
         this._internal_id_counter = 1000;
         this.namespaceIndex = namespaceIndex;
         this.addressSpace = addressSpace;
     }
-    setCache(cache) {
-        this._cache = {};
-        this._reverseCache = {};
-        for (const [key, value, nodeClass] of cache) {
-            this._addInCache(key, value, nodeClass);
-        }
-    }
     setSymbols(symbols) {
         function convertNodeClass(nodeClass) {
             return node_opcua_data_model_1.NodeClass[nodeClass];
         }
         const symbols2 = symbols.map((e) => [e[0], e[1], convertNodeClass(e[2])]);
-        this.setCache(symbols2);
+        for (const [name, value, nodeClass] of symbols2) {
+            this._cacheSymbolicName[name] = [value, nodeClass];
+            this._cacheSymbolicNameRev.add(value);
+        }
     }
     getSymbols() {
         const line = [];
-        for (const [key, value] of Object.entries(this._cache)) {
-            const nodeClass = node_opcua_data_model_1.NodeClass[this._reverseCache[value].nodeClass];
+        for (const [key, [value, nodeClass1]] of Object.entries(this._cacheSymbolicName)) {
+            const node = this.addressSpace.findNode((0, node_opcua_nodeid_1.makeNodeId)(value, this.namespaceIndex));
+            const nodeClass = node_opcua_data_model_1.NodeClass[nodeClass1 || node_opcua_data_model_1.NodeClass.Unspecified];
             line.push([key, value, nodeClass]);
         }
         return line;
@@ -79,16 +98,44 @@ class NodeIdManager {
         do {
             nodeId = (0, node_opcua_nodeid_1.makeNodeId)(this._internal_id_counter, this.namespaceIndex);
             this._internal_id_counter += 1;
-        } while (this.addressSpace.findNode(nodeId) || this._isInCache(nodeId.value));
+        } while (this.addressSpace.findNode(nodeId) || this._isInCache(nodeId));
         return nodeId;
     }
     constructNodeId(options) {
-        function prepareName(browseName) {
-            const m = browseName.name.toString().replace(/[ ]/g, "").replace(/(<|>)/g, "");
-            return m;
+        const compose = (left, right) => { return right ? (left ? left + '_' + right : right) : left; };
+        const buildUpName2 = (nodeId, suffix) => {
+            const namespaceIndex = nodeId.namespace;
+            let name = "";
+            let n = this.addressSpace.findNode(nodeId);
+            while (n && n.nodeId.namespace === namespaceIndex) {
+                const e = prepareName(n.browseName) + suffix;
+                name = compose(e, name);
+                n = n.parentNodeId ? this.addressSpace.findNode(n.parentNodeId) : null;
+            }
+            return name;
+        };
+        if (!options.nodeId && options.registerSymbolicNames) {
+            const parentInfo = this.findParentNodeId(options);
+            let fullParentName = "";
+            if (parentInfo) {
+                const [parentNodeId, suffix] = parentInfo;
+                fullParentName = buildUpName2(parentNodeId, suffix);
+            }
+            const fullName = compose(fullParentName, prepareName(options.browseName));
+            if (this._cacheSymbolicName[fullName]) {
+                return (0, node_opcua_nodeid_1.makeNodeId)(this._cacheSymbolicName[fullName][0], this.namespaceIndex);
+            }
+            const nodeId = this._constructNodeId(options);
+            if (nodeId.identifierType === node_opcua_nodeid_1.NodeIdType.NUMERIC) {
+                this._cacheSymbolicName[fullName] = [nodeId.value, options.nodeClass];
+                this._cacheSymbolicNameRev.add(nodeId.value);
+            }
+            return nodeId;
         }
+        return this._constructNodeId(options);
+    }
+    _constructNodeId(options) {
         let nodeId = options.nodeId;
-        const nodeClass = options.nodeClass;
         if (!nodeId) {
             const parentInfo = this.findParentNodeId(options);
             if (parentInfo) {
@@ -101,44 +148,6 @@ class NodeIdManager {
                     nodeId = new node_opcua_nodeid_1.NodeId(node_opcua_nodeid_1.NodeId.NodeIdType.STRING, childName, parentNodeId.namespace);
                     return nodeId;
                 }
-                else if (parentNodeId.identifierType === node_opcua_nodeid_1.NodeId.NodeIdType.NUMERIC) {
-                    //
-                    const baseNameInCache = this._reverseCache[parentNodeId.value];
-                    if (baseNameInCache) {
-                        const newName = baseNameInCache.name + linkName + "_" + name;
-                        const nodeIdValueInCache = this._cache[newName];
-                        if (nodeIdValueInCache) {
-                            return new node_opcua_nodeid_1.NodeId(node_opcua_nodeid_1.NodeIdType.NUMERIC, nodeIdValueInCache, this.namespaceIndex);
-                        }
-                        else {
-                            return this._getOrCreateFromName(newName, nodeClass);
-                        }
-                    }
-                    else {
-                        if (options.registerSymbolicNames) {
-                            const newName = name;
-                            const nodeIdValueInCache = this._cache[newName];
-                            if (nodeIdValueInCache) {
-                                return new node_opcua_nodeid_1.NodeId(node_opcua_nodeid_1.NodeIdType.NUMERIC, nodeIdValueInCache, this.namespaceIndex);
-                            }
-                            else {
-                                return this._getOrCreateFromName(newName, nodeClass);
-                            }
-                        }
-                    }
-                }
-                // }} has parent ...
-            }
-            else {
-                const isRootType = options.nodeClass === node_opcua_data_model_1.NodeClass.DataType ||
-                    options.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType ||
-                    options.nodeClass === node_opcua_data_model_1.NodeClass.ReferenceType ||
-                    options.nodeClass === node_opcua_data_model_1.NodeClass.VariableType;
-                // try to find
-                if (isRootType) {
-                    const baseName = options.browseName.name.toString();
-                    return this._getOrCreateFromName(baseName, nodeClass);
-                }
             }
         }
         else if (typeof nodeId === "string") {
@@ -148,9 +157,8 @@ class NodeIdManager {
                 }
                 else if (nodeId.match(regExp1)) {
                     nodeId = "ns=" + this.namespaceIndex + ";" + nodeId;
-                }
-                else {
-                    nodeId = this._getOrCreateFromName(nodeId, nodeClass);
+                    // } else {
+                    //     nodeId = this._getOrCreateFromName(nodeId, nodeClass);
                 }
             }
         }
@@ -164,46 +172,12 @@ class NodeIdManager {
         return nodeId;
     }
     findParentNodeId(options) {
-        if (!options.references) {
-            return null;
-        }
-        for (const ref of options.references) {
-            ref._referenceType = this.addressSpace.findReferenceType(ref.referenceType);
-            /* istanbul ignore next */
-            if (!(0, base_node_impl_1.getReferenceType)(ref)) {
-                throw new Error("Cannot find referenceType " + JSON.stringify(ref));
-            }
-            ref.referenceType = ref._referenceType.nodeId;
-        }
-        // find HasComponent, or has Property reverse
-        return _identifyParentInReference(options.references);
-    }
-    _addInCache(name, nodeIdValue, nodeClass) {
-        (0, node_opcua_assert_1.assert)(!name.includes(":"), "Alias name should not contain special characters");
-        (0, node_opcua_assert_1.assert)(typeof name === "string" && name[0] !== "[");
-        if (this._isInCache(nodeIdValue) || this._cache[name]) {
-            throw new Error("Already in Cache !" + name + " " + nodeIdValue + " = " + this._cache[name]);
-        }
-        this._cache[name] = nodeIdValue;
-        this._reverseCache[nodeIdValue] = { name, nodeClass };
-    }
-    _isInCache(nodeIdValue) {
-        return this._reverseCache[nodeIdValue] ? true : false;
+        return _findParentNodeId(this.addressSpace, options);
     }
-    _getOrCreateFromName(aliasName, nodeClass) {
-        (0, node_opcua_assert_1.assert)(isValidNodeClass(nodeClass), "invalid node class " + nodeClass);
-        if (aliasName.includes(":")) {
-            debugLog("alias name should not contain special characters");
-        }
-        (0, node_opcua_assert_1.assert)(!aliasName.includes(":"), "Alias name should not contain special characters");
-        if (this._cache[aliasName]) {
-            return new node_opcua_nodeid_1.NodeId(node_opcua_nodeid_1.NodeIdType.NUMERIC, this._cache[aliasName], this.namespaceIndex);
-        }
-        else {
-            const nodeIdResult = this.buildNewNodeId();
-            this._addInCache(aliasName, nodeIdResult.value, nodeClass);
-            return nodeIdResult;
-        }
+    _isInCache(nodeId) {
+        if (nodeId.namespace !== this.namespaceIndex || nodeId.identifierType !== node_opcua_nodeid_1.NodeIdType.NUMERIC)
+            return false;
+        return this._cacheSymbolicNameRev.has(nodeId.value) ? true : false;
     }
 }
 exports.NodeIdManager = NodeIdManager;

package/dist/src/nodeid_manager.js.map

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

package/dist/src/nodeset_tools/construct_namespace_dependency.d.ts

@@ -1,4 +1,18 @@
 import { INamespace } from "node-opcua-address-space-base";
 export declare function hasHigherPriorityThan(namespaceIndex1: number, namespaceIndex2: number, priorityTable: number[]): boolean;
+/**
+ *
+ * @param namespace
+ * @returns the order
+ *
+ *      ---
+ *  ua, own , di  => 0 , 2,  1
+ *
+ *      ---
+ *  ua, own , di , kitchen , own2,  adi  => 0 , 2,  3, 1
+ *
+ *                           ---
+ *  ua, own , di , kitchen , own2,  adi  => 0 , 2,  3,  5, 1
+ */
 export declare function constructNamespacePriorityTable(namespace: INamespace): number[];
 export declare function constructNamespaceDependency(namespace: INamespace, priorityTable?: number[]): INamespace[];

package/dist/src/nodeset_tools/construct_namespace_dependency.js

@@ -82,6 +82,20 @@ function hasHigherPriorityThan(namespaceIndex1, namespaceIndex2, priorityTable)
     return order1 > order2;
 }
 exports.hasHigherPriorityThan = hasHigherPriorityThan;
+/**
+ *
+ * @param namespace
+ * @returns the order
+ *
+ *      ---
+ *  ua, own , di  => 0 , 2,  1
+ *
+ *      ---
+ *  ua, own , di , kitchen , own2,  adi  => 0 , 2,  3, 1
+ *
+ *                           ---
+ *  ua, own , di , kitchen , own2,  adi  => 0 , 2,  3,  5, 1
+ */
 function constructNamespacePriorityTable(namespace) {
     // Namespace 0 will always be 0 
     // Namespaces with no requiredModel will be considered as instance namespaces and will added at the end
@@ -102,6 +116,7 @@ function constructNamespacePriorityTable(namespace) {
     return priorityList;
 }
 exports.constructNamespacePriorityTable = constructNamespacePriorityTable;
+const doDebug = false;
 function constructNamespaceDependency(namespace, priorityTable) {
     const addressSpace = namespace.addressSpace;
     priorityTable = priorityTable || constructNamespacePriorityTable(namespace);
@@ -115,7 +130,12 @@ function constructNamespaceDependency(namespace, priorityTable) {
     }
     const _visitedDataType = new Set();
     _constructNamespaceDependency(namespace, dependency, depMap, _visitedDataType, priorityTable);
-    return dependency;
+    doDebug && console.log("namespace : ", namespace.index, namespace.namespaceUri);
+    doDebug && console.log("   ", dependency.map((d) => d.index + " " + d.namespaceUri).join("\n   "));
+    const sorted = dependency.sort((a, b) => priorityTable[a.index] < priorityTable[b.index] ? -1 : 1);
+    doDebug && console.log("sorted:");
+    doDebug && console.log("   ", sorted.map((d) => d.index + " " + d.namespaceUri).join("\n   "));
+    return sorted;
 }
 exports.constructNamespaceDependency = constructNamespaceDependency;
 //# sourceMappingURL=construct_namespace_dependency.js.map

package/dist/src/nodeset_tools/construct_namespace_dependency.js.map

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

package/dist/src/nodeset_tools/nodeset_to_xml.d.ts

@@ -1,6 +1,4 @@
-import { BaseNode, INamespace } from "node-opcua-address-space-base";
-import { ITranslationTable } from "../../source/xml_writer";
-export declare function constructNamespaceTranslationTable(dependency: INamespace[]): ITranslationTable;
+import { BaseNode } from "node-opcua-address-space-base";
 export declare function sortByBrowseName(x: BaseNode, y: BaseNode): number;
 declare type NodeIdString = string;
 export interface BuildAliasesData {

package/dist/src/nodeset_tools/nodeset_to_xml.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByBrowseName = exports.constructNamespaceTranslationTable = void 0;
+exports.sortByBrowseName = void 0;
 /* eslint-disable complexity */
 /**
  * @module node-opcua-address-space
@@ -33,6 +33,7 @@ const XMLWriter = require("xml-writer");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
 const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
 const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
+const doDebug = false;
 function _hash(node) {
     return node.nodeId.toString();
 }
@@ -1045,14 +1046,24 @@ function writeAliases(xw, aliases) {
     }
     xw.endElement();
 }
-function constructNamespaceTranslationTable(dependency) {
+function constructNamespaceTranslationTable(dependency, exportedNamespace) {
     const translationTable = {};
-    for (let i = 0; i < dependency.length; i++) {
-        translationTable[dependency[i].index] = i;
+    (0, node_opcua_assert_1.assert)(dependency[0].namespaceUri === "http://opcfoundation.org/UA/");
+    let counter = 0;
+    translationTable[dependency[0].index] = counter++;
+    //
+    if (exportedNamespace) {
+        translationTable[exportedNamespace.index] = counter++;
+    }
+    for (let i = 1; i < dependency.length; i++) {
+        const dep = dependency[i];
+        if (exportedNamespace && exportedNamespace === dep) {
+            continue;
+        }
+        translationTable[dep.index] = counter++;
     }
     return translationTable;
 }
-exports.constructNamespaceTranslationTable = constructNamespaceTranslationTable;
 function dumpReferenceType(xw, referenceType) {
     _markAsVisited(xw, referenceType);
     xw.startElement("UAReferenceType");
@@ -1113,7 +1124,7 @@ namespace_impl_1.NamespaceImpl.prototype.toNodeset2XML = function () {
     const xw = new XMLWriter(true);
     xw.priorityTable = (0, construct_namespace_dependency_1.constructNamespacePriorityTable)(this);
     const dependency = (0, construct_namespace_dependency_1.constructNamespaceDependency)(this, xw.priorityTable);
-    const translationTable = constructNamespaceTranslationTable(dependency);
+    const translationTable = constructNamespaceTranslationTable(dependency, this);
     xw.translationTable = translationTable;
     xw.startDocument({ encoding: "utf-8", version: "1.0" });
     xw.startElement("UANodeSet");
@@ -1137,10 +1148,13 @@ namespace_impl_1.NamespaceImpl.prototype.toNodeset2XML = function () {
     // xx xw.writeAttribute("Version", "1.02");
     // xx xw.writeAttribute("LastModified", (new Date()).toISOString());
     // ------------- INamespace Uris
-    xw.startElement("NamespaceUris");
     initXmlWriterEx(xw, namespacesMap, namespaceArray);
-    // xx const namespaceArray = namespace.addressSpace.getNamespaceArray();
-    for (const depend of dependency) {
+    xw.startElement("NamespaceUris");
+    // let's sort the dependencies in the same order as the translation table
+    const sortedDependencies = dependency.sort((a, b) => translationTable[a.index] > translationTable[b.index] ? 1 : -1);
+    doDebug && console.log(sortedDependencies.map((a) => a.index + " + " + a.namespaceUri).join("\n"));
+    doDebug && console.log("translation table ", translationTable);
+    for (const depend of sortedDependencies) {
         if (depend.index === 0) {
             continue; // ignore namespace 0
         }
@@ -1156,7 +1170,7 @@ namespace_impl_1.NamespaceImpl.prototype.toNodeset2XML = function () {
         xw.writeAttribute("ModelUri", this.namespaceUri);
         xw.writeAttribute("Version", this.version);
         xw.writeAttribute("PublicationDate", this.publicationDate.toISOString());
-        for (const depend of dependency) {
+        for (const depend of sortedDependencies) {
             if (depend.index === this.index) {
                 continue; // ignore our namespace 0
             }