node-opcua-address-space 2.187.1 → 2.187.3

package/impl/_mandatory_child_or_requested_optional_filter.ts

@@ -26,9 +26,12 @@ export class MandatoryChildOrRequestedOptionalFilter implements CloneFilter {
     private readonly references: UAReference[];
     private readonly copyAlsoAllOptionals: boolean = false;
     /**
-     * the clone is an instance declaration of a type (instantiate() inside a type): the
-     * placeholders its type declares are part of it, as the ModelCompiler emits them
-     * (OPC 10000-100 DI DeviceType/DeviceTypeImage/<ImageIdentifier>). An instance never takes one.
+     * the clone is an instance declaration of a type (instantiate() inside a type): it takes the
+     * placeholders of its type that `optionals` requests, and only those. The ModelCompiler emits
+     * a placeholder in an instance declaration when the design declares it (OPC 10000-100 DI
+     * DeviceType/DeviceTypeImage/<ImageIdentifier>), not every placeholder of the member's type
+     * (DI TopologyElementType/Identification carries no <GroupIdentifier>). An instance never
+     * takes one.
      */
     private readonly keepPlaceholders: boolean = false;
 
@@ -86,7 +89,7 @@ export class MandatoryChildOrRequestedOptionalFilter implements CloneFilter {
                 return this.copyAlsoAllOptionals || (node.browseName?.name || "") in this.optionalsMap;
             case "OptionalPlaceholder":
             case "MandatoryPlaceholder":
-                return this.keepPlaceholders;
+                return this.keepPlaceholders && (node.browseName?.name || "") in this.optionalsMap;
             default:
                 return false; // ignored
         }

package/impl/base_node_private.ts

@@ -590,6 +590,19 @@ function _merge_base_declaration(
     // c8 ignore next
     doTrace && traceLog(extraInfo.pad(), "merging base declaration ", fullPath2(baseDeclaration), " into ", fullPath2(clonedNode));
     _register_existing_children(baseDeclaration, clonedNode, extraInfo);
+    // a member the clone already reaches without aggregating it (OPC 30500 LADS: Operational
+    // organizes its state machine's Stop) is present as well: cloned again from the base
+    // declaration, it was a second Stop, or "already registered" with symbolic names
+    const aggregates = clonedNode.addressSpace.findReferenceType("Aggregates");
+    for (const reference of clonedNode.findReferencesEx("HierarchicalReferences", BrowseDirection.Forward)) {
+        const referenceType = clonedNode.addressSpace.findReferenceType(reference.referenceType);
+        if (!referenceType || (aggregates && referenceType.isSubtypeOf(aggregates))) continue;
+        const member = reference.node ?? clonedNode.addressSpace.findNode(reference.nodeId);
+        if (member)
+            browseNameMap.add(
+                `${clonedNode.nodeId.toString()}(${clonedNode.browseName.toString()})/${member.browseName.toString()}`
+            );
+    }
     _clone_hierarchical_references(
         baseDeclaration as UAObject | UAVariable | UAMethod,
         clonedNode as UAObject | UAVariable | UAMethod,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-opcua-address-space",
     "type": "module",
-    "version": "2.187.1",
+    "version": "2.187.3",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/api/index.js",
     "types": "./dist/api/index.d.ts",
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "706db482c6f77cd5c7c1f98f9f7cf1c5841a0161",
+    "gitHead": "126ee937fe6d49403b6a5a8b84e01d5869be91ab",
     "files": [
         "dist",
         "distHelpers",