node-opcua-address-space 2.183.0 → 2.183.1

package/impl/alarms_and_conditions/deviation_alarm_helper.ts

@@ -61,6 +61,9 @@ export function DeviationAlarmHelper_install_setpoint(this: DeviationStuff, opti
         });
         // install inputNode monitoring for change
         this.setpointNodeNode.on("value_changed", (newDataValue: DataValue) => {
+            // deliberately the deprecated name, for the same reason as _setStateBasedOnInputValue:
+            // an old subclass that overrode `_onSetpointDataValueChange` is still reached, and a
+            // new assignment of the published name is reached through the delegate on the impl.
             this._onSetpointDataValueChange(newDataValue);
         });
     } else {

package/impl/alarms_and_conditions/ua_exclusive_deviation_alarm_impl.ts

@@ -70,10 +70,21 @@ export class UAExclusiveDeviationAlarmImplBase extends UAExclusiveLimitAlarmImpl
         return DeviationAlarmHelper_getSetpointValue.call(this);
     }
 
-    public _onSetpointDataValueChange(dataValue: DataValue): void {
+    /**
+     * What the alarm does when the value of its setpoint node changes: re-evaluate the state
+     * of the alarm against the new setpoint, since the deviation it watches has just moved.
+     */
+    public onSetpointDataValueChange(dataValue: DataValue): void {
         DeviationAlarmHelper_onSetpointDataValueChange.call(this, dataValue);
     }
 
+    /**
+     * @deprecated assign {@link onSetpointDataValueChange} instead; this delegates to it.
+     */
+    public _onSetpointDataValueChange(dataValue: DataValue): void {
+        this.onSetpointDataValueChange(dataValue);
+    }
+
     public _install_setpoint(options: InstallSetPointOptions): void {
         DeviationAlarmHelper_install_setpoint.call(this, options);
     }

package/impl/alarms_and_conditions/ua_non_exclusive_deviation_alarm_impl.ts

@@ -79,10 +79,21 @@ export class UANonExclusiveDeviationAlarmImplBase
         return DeviationAlarmHelper_getSetpointValue.call(this);
     }
 
-    public _onSetpointDataValueChange(dataValue: DataValue): void {
+    /**
+     * What the alarm does when the value of its setpoint node changes: re-evaluate the state
+     * of the alarm against the new setpoint, since the deviation it watches has just moved.
+     */
+    public onSetpointDataValueChange(dataValue: DataValue): void {
         DeviationAlarmHelper_onSetpointDataValueChange.call(this, dataValue);
     }
 
+    /**
+     * @deprecated assign {@link onSetpointDataValueChange} instead; this delegates to it.
+     */
+    public _onSetpointDataValueChange(dataValue: DataValue): void {
+        this.onSetpointDataValueChange(dataValue);
+    }
+
     public _install_setpoint(options: InstallSetPointOptions): void {
         DeviationAlarmHelper_install_setpoint.call(this, options);
     }

package/impl/nodeid_manager.ts

@@ -51,11 +51,17 @@ function _filterAggregates(addressSpace: AddressSpacePartial, references: UARefe
     return [ref.nodeId, ""];
 }
 
+function _declaredParent(options: ConstructNodeIdOptions): NodeId | null {
+    const declared = options.parentNodeId;
+    if (!declared) return null;
+    if (declared instanceof BaseNodeImpl) return declared.nodeId;
+    const nodeId = resolveNodeId(declared as NodeIdLike);
+    return nodeId.isEmpty() ? null : nodeId;
+}
+
 function _findParentNodeId(addressSpace: AddressSpacePartial, options: ConstructNodeIdOptions): [NodeId, Suffix] | null {
-    if (!options.references) {
-        return null;
-    }
-    for (const ref of options.references) {
+    const references = options.references ?? [];
+    for (const ref of references) {
         const _ref = ref as ReferenceImpl;
         _ref._referenceType = addressSpace.findReferenceType(ref.referenceType) ?? undefined;
         /* c8 ignore next */
@@ -64,8 +70,19 @@ function _findParentNodeId(addressSpace: AddressSpacePartial, options: Construct
         }
         _ref.referenceType = _ref._referenceType.nodeId;
     }
+    // A declared parent names the node, whatever reference links the two, as it
+    // is the node's parent: an Organizes-only member of a type is
+    // `<Type>_MachineryBuildingBlocks` in the ModelCompiler's NodeIds.csv, and a
+    // node with two aggregating parents is named after the declared one.
+    const declared = _declaredParent(options);
+    if (declared) {
+        const viaEncoding = references.some(
+            (ref) => !ref.isForward && sameNodeId(ref.nodeId, declared) && sameNodeId(ref.referenceType, hasEncoding)
+        );
+        return [declared, viaEncoding ? "_Encoding" : ""];
+    }
     // find HasComponent, or has Property reverse
-    return _filterAggregates(addressSpace, options.references);
+    return references.length ? _filterAggregates(addressSpace, references) : null;
 }
 
 function prepareName(browseName?: QualifiedName | QualifiedNameOptions): string {
@@ -83,6 +100,11 @@ export interface ConstructNodeIdOptions {
     nodeClass?: NodeClass;
     references?: UAReference[];
     registerSymbolicNames?: boolean;
+    /**
+     * The declared parent (NodeSet `ParentNodeId`, or `parentNodeId` on the add* API).
+     * When present it names the node, as it is the node's parent (see `BaseNode.parent`).
+     */
+    parentNodeId?: NodeIdLike | BaseNode | null;
 }
 export type NodeEntry = [string, number, NodeClass];
 export type NodeEntry1 = [string, number, string /*"Object" | "Variable" etc...*/];

package/impl/ua_object_type_impl.ts

@@ -147,6 +147,7 @@ export class UAObjectTypeImpl extends BaseNodeImpl<BaseNodeEvents> implements UA
             eventSourceOf: options.eventSourceOf,
             notifierOf: options.notifierOf,
             organizedBy: options.organizedBy,
+            parentNodeId: options.parentNodeId,
             addInOf: options.addInOf,
             references,
 

package/impl/ua_variable_type_impl.ts

@@ -331,6 +331,7 @@ export class UAVariableTypeImpl extends BaseNodeImpl<BaseNodeEvents> implements
             nodeId: options.nodeId,
             notifierOf: options.notifierOf,
             organizedBy: options.organizedBy,
+            parentNodeId: options.parentNodeId,
             // see InstantiateOptions.references: created with the node so the
             // NodeIdManager derives the symbolic name from that parent
             references: options.references,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.183.0",
+    "version": "2.183.1",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/api/index.js",
     "types": "./dist/api/index.d.ts",
@@ -22,7 +22,7 @@
         "@types/semver": "7.8.0",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.183.0",
+        "node-opcua-address-space-base": "2.183.1",
         "node-opcua-assert": "2.183.0",
         "node-opcua-basic-types": "2.183.0",
         "node-opcua-binary-stream": "2.183.0",
@@ -38,7 +38,7 @@
         "node-opcua-extension-object": "2.183.0",
         "node-opcua-factory": "2.183.0",
         "node-opcua-nodeid": "2.183.0",
-        "node-opcua-nodeset-ua": "2.183.0",
+        "node-opcua-nodeset-ua": "2.183.1",
         "node-opcua-numeric-range": "2.183.0",
         "node-opcua-object-registry": "2.183.0",
         "node-opcua-pseudo-session": "2.183.0",
@@ -63,7 +63,7 @@
         "node-opcua-nodesets": "2.183.0",
         "node-opcua-packet-analyzer": "2.183.0",
         "node-opcua-schemas": "2.183.0",
-        "node-opcua-service-filter": "2.183.0",
+        "node-opcua-service-filter": "2.183.1",
         "node-opcua-test-fixtures": "2.181.0",
         "node-opcua-test-helpers": "2.183.0"
     },
@@ -82,7 +82,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "d9a9af54d162f0fbb8d287e168aaeeda2d5c38b7",
+    "gitHead": "2326127b73f78cae1f0957788f16850a3be70701",
     "files": [
         "dist",
         "distHelpers",