node-opcua-address-space 2.172.0 → 2.173.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.172.0",
+    "version": "2.173.1",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -21,48 +21,48 @@
         "@types/semver": "7.7.1",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.172.0",
+        "node-opcua-address-space-base": "2.173.0",
         "node-opcua-assert": "2.164.0",
-        "node-opcua-basic-types": "2.172.0",
-        "node-opcua-binary-stream": "2.172.0",
-        "node-opcua-client-dynamic-extension-object": "2.172.0",
+        "node-opcua-basic-types": "2.173.0",
+        "node-opcua-binary-stream": "2.173.0",
+        "node-opcua-client-dynamic-extension-object": "2.173.0",
         "node-opcua-constants": "2.157.0",
         "node-opcua-crypto": "5.3.6",
-        "node-opcua-data-access": "2.172.0",
-        "node-opcua-data-model": "2.172.0",
-        "node-opcua-data-value": "2.172.0",
-        "node-opcua-date-time": "2.172.0",
+        "node-opcua-data-access": "2.173.0",
+        "node-opcua-data-model": "2.173.0",
+        "node-opcua-data-value": "2.173.0",
+        "node-opcua-date-time": "2.173.0",
         "node-opcua-debug": "2.172.0",
-        "node-opcua-enum": "2.172.0",
-        "node-opcua-extension-object": "2.172.0",
-        "node-opcua-factory": "2.172.0",
-        "node-opcua-nodeid": "2.172.0",
-        "node-opcua-nodeset-ua": "2.172.0",
-        "node-opcua-numeric-range": "2.172.0",
+        "node-opcua-enum": "2.173.0",
+        "node-opcua-extension-object": "2.173.0",
+        "node-opcua-factory": "2.173.0",
+        "node-opcua-nodeid": "2.173.0",
+        "node-opcua-nodeset-ua": "2.173.0",
+        "node-opcua-numeric-range": "2.173.0",
         "node-opcua-object-registry": "2.172.0",
-        "node-opcua-pseudo-session": "2.172.0",
-        "node-opcua-service-browse": "2.172.0",
-        "node-opcua-service-call": "2.172.0",
-        "node-opcua-service-history": "2.172.0",
-        "node-opcua-service-translate-browse-path": "2.172.0",
-        "node-opcua-service-write": "2.172.0",
-        "node-opcua-status-code": "2.172.0",
-        "node-opcua-types": "2.172.0",
-        "node-opcua-utils": "2.172.0",
-        "node-opcua-variant": "2.172.0",
-        "node-opcua-xml2json": "2.172.0",
+        "node-opcua-pseudo-session": "2.173.0",
+        "node-opcua-service-browse": "2.173.0",
+        "node-opcua-service-call": "2.173.0",
+        "node-opcua-service-history": "2.173.0",
+        "node-opcua-service-translate-browse-path": "2.173.0",
+        "node-opcua-service-write": "2.173.0",
+        "node-opcua-status-code": "2.173.0",
+        "node-opcua-types": "2.173.0",
+        "node-opcua-utils": "2.173.0",
+        "node-opcua-variant": "2.173.0",
+        "node-opcua-xml2json": "2.173.0",
         "semver": "^7.8.0",
         "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
         "humanize": "0.0.9",
-        "node-opcua-benchmarker": "2.172.0",
+        "node-opcua-benchmarker": "2.173.0",
         "node-opcua-leak-detector": "2.172.0",
         "node-opcua-nodesets": "2.163.1",
-        "node-opcua-packet-analyzer": "2.172.0",
-        "node-opcua-schemas": "2.172.0",
-        "node-opcua-service-filter": "2.172.0",
+        "node-opcua-packet-analyzer": "2.173.0",
+        "node-opcua-schemas": "2.173.0",
+        "node-opcua-service-filter": "2.173.0",
         "node-opcua-test-fixtures": "2.157.0"
     },
     "author": "Etienne Rossignon",
@@ -80,7 +80,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "dfe9993a93b5c3897825e898b5f07b25952c7f45",
+    "gitHead": "f237f07380033d5ee1172c550cc205670d586d86",
     "files": [
         "dist",
         "distHelpers",

package/source/interfaces/alarms_and_conditions/instantiate_limit_alarm_options.ts

@@ -1,5 +1,5 @@
 // import type { UAVariable } from "node-opcua-address-space-base";
-import type { NodeId } from "node-opcua-nodeid/source/nodeid";
+import type { NodeId } from "node-opcua-nodeid";
 import type { UAVariable } from "../..";
 import type { InstantiateAlarmConditionOptions } from "./instantiate_alarm_condition_options";
 

package/src/address_space.ts

@@ -2,7 +2,6 @@
  * @module node-opcua-address-space
  */
 
-import { randomBytes } from "node:crypto";
 import chalk from "chalk";
 import type {
     AddReferenceOpts,
@@ -52,7 +51,7 @@ import type {
     RelativePathElement
 } from "node-opcua-types";
 import { BrowsePath, BrowsePathResult } from "node-opcua-types";
-import { isNullOrUndefined, lowerFirstLetter } from "node-opcua-utils";
+import { isNullOrUndefined, lowerFirstLetter, randomBytes } from "node-opcua-utils";
 import { DataType, Variant, VariantArrayType, type VariantOptions, type VariantT } from "node-opcua-variant";
 import { adjustBrowseDirection } from "../source/helpers/adjust_browse_direction";
 import type { ExtensionObjectConstructorFuncWithSchema } from "../source/interfaces/extension_object_constructor";

package/src/nodeset_tools/construct_namespace_dependency.ts

@@ -209,12 +209,13 @@ export function _getCompleteRequiredModelsFromValuesAndReferences(
         }
     };
 
+    const addressSpace = namespace.addressSpace;
+    const nonHierarchicalReferencesType = addressSpace.findReferenceType("NonHierarchicalReferences");
+
     //const maxIndex = Math.max(...requiredNamespaceIndexes);
     for (const node of namespace_.nodeIterator()) {
         const references = (<BaseNodeImpl>node).allReferences();
         for (const reference of references) {
-            // if (reference.isForward) continue;
-            // only look at backward reference
             // check referenceId
             const namespaceIndexOfReferenceType = getReferenceType(reference)?.nodeId.namespace;
             if (namespaceIndexOfReferenceType !== 0 && namespaceIndexOfReferenceType !== namespace.index) {
@@ -228,6 +229,29 @@ export function _getCompleteRequiredModelsFromValuesAndReferences(
                 const refPriority = priorityList[namespaceIndexOfTargetNode];
                 if (refPriority <= thisPriority) {
                     consider(namespaceIndexOfTargetNode);
+                } else {
+                    const referenceType = getReferenceType(reference);
+                    if (referenceType) {
+                        // For forward NonHierarchicalReferences (e.g. HasInterface),
+                        // always include the target namespace as a dependency
+                        // regardless of priority, since the current node owns
+                        // this relationship.
+                        if (reference.isForward
+                            && nonHierarchicalReferencesType
+                            && referenceType.isSubtypeOf(nonHierarchicalReferencesType)) {
+                            consider(namespaceIndexOfTargetNode);
+                        }
+                        // For inverse HierarchicalReferences (e.g. Organizes),
+                        // always include the target namespace as a dependency
+                        // regardless of priority, since the reference is
+                        // stored on this node (organizedBy pattern).
+                        const hierarchicalReferencesType = addressSpace.findReferenceType("HierarchicalReferences");
+                        if (!reference.isForward
+                            && hierarchicalReferencesType
+                            && referenceType.isSubtypeOf(hierarchicalReferencesType)) {
+                            consider(namespaceIndexOfTargetNode);
+                        }
+                    }
                 }
             }
         }

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -133,11 +133,6 @@ function _dumpReferences(xw: XmlWriter, node: BaseNode) {
     function referenceToKeep(reference: UAReference): boolean {
         const referenceType = (reference as ReferenceImpl)._referenceType!;
         const targetedNamespaceIndex = reference.nodeId.namespace;
-        if (_hasHigherPriorityThan(xw, targetedNamespaceIndex, node.nodeId.namespace)) {
-            // this reference has nothing to do here ! drop it
-            // because the target namespace is higher in the hierarchy
-            return false;
-        }
 
         // get the direct backward reference to a external namespace
         if (referenceType.isSubtypeOf(aggregateReferenceType) && !reference.isForward) {
@@ -152,14 +147,19 @@ function _dumpReferences(xw: XmlWriter, node: BaseNode) {
         }
         // only keep
         if (referenceType.isSubtypeOf(aggregateReferenceType) && reference.isForward) {
+            if (_hasHigherPriorityThan(xw, targetedNamespaceIndex, node.nodeId.namespace)) {
+                return false;
+            }
             return true;
         } else if (referenceType.isSubtypeOf(hasSubtypeReferenceType) && !reference.isForward) {
             return true;
         } else if (referenceType.isSubtypeOf(hasTypeDefinitionReferenceType) && reference.isForward) {
             return true;
         } else if (referenceType.isSubtypeOf(nonHierarchicalReferencesType) && reference.isForward) {
+            // e.g. HasInterface — always keep, the current node owns this reference
             return true;
         } else if (referenceType.isSubtypeOf(organizesReferencesType) && !reference.isForward) {
+            // Organizes inverse — the current node is organized by an external folder
             return true;
         } else if (connectsToReferenceType && referenceType.isSubtypeOf(connectsToReferenceType) && reference.isForward) {
             return true;