node-opcua-address-space 2.151.0 → 2.153.0

package/src/base_node_private.ts

@@ -35,16 +35,18 @@ import {
     UAReference,
     CloneOptions,
     CloneHelper,
-    fullPath2
+    fullPath2,
+    UAVariableT
 } from "node-opcua-address-space-base";
 import { DataValue } from "node-opcua-data-value";
 import { ObjectTypeIds, VariableTypeIds } from "node-opcua-constants";
 
 import { UANamespace_process_modelling_rule } from "./namespace_private";
-import { ReferenceImpl } from "./reference_impl";
+import { ReferenceImpl, resolveReferenceNode } from "./reference_impl";
 import { BaseNodeImpl, getReferenceType } from "./base_node_impl";
 import { AddressSpacePrivate } from "./address_space_private";
 import { wipeMemorizedStuff } from "./tool_isSubtypeOf";
+import { DataType } from "node-opcua-basic-types";
 
 // eslint-disable-next-line prefer-const
 const errorLog = make_errorLog(__filename);
@@ -57,11 +59,13 @@ const warningLog = make_warningLog(__filename);
 
 interface BaseNodeCacheInner {
     typeDefinition?: NodeId;
-    _childByNameMap?: Map<string, BaseNode>;
     typeDefinitionObj?: UAVariableType | UAObjectType | null;
     _aggregates?: BaseNode[];
     _components?: BaseNode[];
     _properties?: BaseNode[];
+    _children?: BaseNode[];
+    _versionNode?: UAVariableT<string, DataType.String> | null;
+
     _notifiers?: BaseNode[];
     _eventSources?: BaseNode[];
     _methods?: UAMethod[];
@@ -74,23 +78,28 @@ interface BaseNodeCacheInner {
     _subtypeOfObj?: BaseNode | null;
 }
 
+export type UAReferenceWithNodeRef = UAReference & { node: BaseNode };
+export type HierarchicalIndexMap = Map<string, UAReferenceWithNodeRef | UAReferenceWithNodeRef[]>;
+
 interface BaseNodeCache {
+
+    _childByNameMap?: HierarchicalIndexMap;
     __address_space: IAddressSpace | null;
     _browseFilter?: (this: BaseNode, context?: ISessionContext) => boolean;
     _cache: BaseNodeCacheInner;
     _description?: LocalizedText;
     _displayName: LocalizedText[];
     _parent?: BaseNode | null;
-    _back_referenceIdx: { [key: string]: UAReference };
-    _referenceIdx: { [key: string]: UAReference };
+    _back_referenceIdx: Map<string, UAReference>;
+    _referenceIdx: Map<string, UAReference>;
 }
 
 export function BaseNode_initPrivate(self: BaseNode): BaseNodeCache {
     const _private: BaseNodeCache = {
         __address_space: null,
 
-        _referenceIdx: {},
-        _back_referenceIdx: {},
+        _referenceIdx: new Map(),
+        _back_referenceIdx: new Map(),
 
         _browseFilter: undefined,
         _cache: {},
@@ -109,8 +118,8 @@ export function BaseNode_removePrivate(self: BaseNode): void {
     const _private = BaseNode_getPrivate(self);
     _private._cache = {};
     _private.__address_space = null;
-    _private._back_referenceIdx = {};
-    _private._referenceIdx = {};
+    _private._back_referenceIdx = new Map();
+    _private._referenceIdx = new Map();
     _private._description = undefined;
     _private._displayName = [];
 }
@@ -189,8 +198,8 @@ export function BaseNode_toString(this: BaseNode, options: ToStringOption): void
     options.add(options.padding + chalk.yellow("          browseName          : ") + this.browseName.toString());
     options.add(
         options.padding +
-            chalk.yellow("          displayName         : ") +
-            this.displayName.map((f) => f.locale + " " + f.text).join(" | ")
+        chalk.yellow("          displayName         : ") +
+        this.displayName.map((f) => f.locale + " " + f.text).join(" | ")
     );
 
     options.add(
@@ -209,9 +218,9 @@ export function BaseNode_References_toString(this: BaseNode, options: ToStringOp
 
     options.add(
         options.padding +
-            chalk.yellow("    references                : ") +
-            "  length =" +
-            Object.keys(_private._referenceIdx).length
+        chalk.yellow("    references                : ") +
+        "  length =" +
+        _private._referenceIdx.size
     );
 
     function dump_reference(follow: boolean, reference: UAReference | null) {
@@ -250,12 +259,12 @@ export function BaseNode_References_toString(this: BaseNode, options: ToStringOp
             })();
         options.add(
             options.padding +
-                chalk.yellow("      +-> ") +
-                reference.toString(displayOptions) +
-                " " +
-                chalk.cyan(name.padEnd(25, " ")) +
-                " " +
-                chalk.magentaBright(extra)
+            chalk.yellow("      +-> ") +
+            reference.toString(displayOptions) +
+            " " +
+            chalk.cyan(name.padEnd(25, " ")) +
+            " " +
+            chalk.magentaBright(extra)
         );
 
         // ignore HasTypeDefinition as it has been already handled
@@ -278,30 +287,33 @@ export function BaseNode_References_toString(this: BaseNode, options: ToStringOp
     }
 
     // direct reference
-    (Object.values(_private._referenceIdx) as UAReference[]).forEach(dump_reference.bind(null, true));
+    for (var r of _private._referenceIdx.values()) {
+        dump_reference(false, r);
+    }
 
-    const br = Object.values(_private._back_referenceIdx).map((x) => x);
 
     options.add(
         options.padding +
-            chalk.yellow("    back_references                 : ") +
-            chalk.cyan("  length =") +
-            br.length +
-            chalk.grey(" ( references held by other nodes involving this node)")
+        chalk.yellow("    back_references                 : ") +
+        chalk.cyan("  length =") +
+        _private._back_referenceIdx.size +
+        chalk.grey(" ( references held by other nodes involving this node)")
     );
+    for (const r of _private._back_referenceIdx.values()) {
+        dump_reference(false, r);
+    }
     // backward reference
-    br.forEach(dump_reference.bind(null, false));
 }
 
 function _UAType_toString(this: UAReferenceType | UADataType | UAObjectType | UAVariableType, options: ToStringOption): void {
     if (this.subtypeOfObj) {
         options.add(
             options.padding +
-                chalk.yellow("          subtypeOf           : ") +
-                this.subtypeOfObj.browseName.toString() +
-                " (" +
-                this.subtypeOfObj.nodeId.toString() +
-                ")"
+            chalk.yellow("          subtypeOf           : ") +
+            this.subtypeOfObj.browseName.toString() +
+            " (" +
+            this.subtypeOfObj.nodeId.toString() +
+            ")"
         );
     }
 }
@@ -310,11 +322,11 @@ function _UAInstance_toString(this: UAVariable | UAMethod | UAObject, options: T
     if (this.typeDefinitionObj) {
         options.add(
             options.padding +
-                chalk.yellow("          typeDefinition      : ") +
-                this.typeDefinitionObj.browseName.toString() +
-                " (" +
-                this.typeDefinitionObj.nodeId.toString() +
-                ")"
+            chalk.yellow("          typeDefinition      : ") +
+            this.typeDefinitionObj.browseName.toString() +
+            " (" +
+            this.typeDefinitionObj.nodeId.toString() +
+            ")"
         );
     }
 }
@@ -421,9 +433,9 @@ export function VariableOrVariableType_toString(this: UAVariableType | UAVariabl
         if (_dataValue) {
             options.add(
                 options.padding +
-                    chalk.yellow("          value               : ") +
-                    "\n" +
-                    options.indent(_dataValue.toString(), options.padding + "                        | ")
+                chalk.yellow("          value               : ") +
+                "\n" +
+                options.indent(_dataValue.toString(), options.padding + "                        | ")
             );
         }
     }
@@ -440,19 +452,19 @@ export function VariableOrVariableType_toString(this: UAVariableType | UAVariabl
     if (this.minimumSamplingInterval !== undefined) {
         options.add(
             options.padding +
-                chalk.yellow(" minimumSamplingInterval      : ") +
-                " " +
-                this.minimumSamplingInterval.toString() +
-                " ms"
+            chalk.yellow(" minimumSamplingInterval      : ") +
+            " " +
+            this.minimumSamplingInterval.toString() +
+            " ms"
         );
     }
     if (this.arrayDimensions) {
         options.add(
             options.padding +
-                chalk.yellow(" arrayDimension               : ") +
-                " [" +
-                this.arrayDimensions.join(",").toString() +
-                " ]"
+            chalk.yellow(" arrayDimension               : ") +
+            " [" +
+            this.arrayDimensions.join(",").toString() +
+            " ]"
         );
     }
 }
@@ -628,11 +640,11 @@ function _clone_collection_new(
             // tslint:disable-next-line:no-console
             warningLog(
                 chalk.red("Warning : cannot clone node ") +
-                    fullPath2(node) +
-                    " of class " +
-                    NodeClass[node.nodeClass].toString() +
-                    " while cloning " +
-                    fullPath2(newParent)
+                fullPath2(node) +
+                " of class " +
+                NodeClass[node.nodeClass].toString() +
+                " while cloning " +
+                fullPath2(newParent)
             );
             continue;
         }
@@ -1026,7 +1038,7 @@ export function _clone<T extends UAObject | UAVariable | UAMethod>(
             let typeDefinitionNode: UAVariableType | UAObjectType | null = originalNode.typeDefinitionObj;
 
             extraInfo.pushContext({
-                clonedParent : clonedNode,
+                clonedParent: clonedNode,
                 originalParent: originalNode
             });
 
@@ -1070,36 +1082,83 @@ export function _clone<T extends UAObject | UAVariable | UAMethod>(
     return clonedNode;
 }
 
+function _add(_childByNameMap: HierarchicalIndexMap, reference: UAReferenceWithNodeRef)  
+{
+    assert(reference.node);// const targetNode = ReferenceImpl.resolveReferenceNode(addressSpace, reference);
+    const targetNode = reference.node;
+    const hash = targetNode.browseName!.name || "";
+    const existing = _childByNameMap.get(hash);
+    if (existing) {
+        if (Array.isArray(existing)) {
+            existing.push(reference);
+        } else {
+            _childByNameMap.set(hash, [existing, reference as UAReferenceWithNodeRef]);
+        }
+    } else {
+        _childByNameMap.set(hash, reference as UAReferenceWithNodeRef);
+    }
+}
+
+function sameRef(a: UAReference, b: UAReference) {
+    if (a.isForward !=  b.isForward) return false;
+    if (!sameNodeId(a.nodeId, b.nodeId)) return false;
+    if (!sameNodeId(a.referenceType, b.referenceType)) return false;
+    return true;
+}
+function _remove(_childByNameMap: HierarchicalIndexMap, reference: UAReferenceWithNodeRef) {
+
+    const target = reference.node;
+    const hash = target.browseName.name || "";
+    const existing = _childByNameMap.get(hash);
+    if (Array.isArray(existing)) {
+        existing.filter(r=>!sameRef(r, reference));
+    } else {
+        _childByNameMap.delete(hash);
+    }
+}
 export function _handle_HierarchicalReference(node: BaseNode, reference: UAReference): void {
-    const _cache = BaseNode_getCache(node);
+    const _private = BaseNode_getPrivate(node);
     if (!reference.isForward) return;
-    if (_cache._childByNameMap) {
+    if (_private._childByNameMap) {
         const addressSpace = node.addressSpace;
         const referenceType = ReferenceImpl.resolveReferenceType(addressSpace, reference);
 
         if (referenceType) {
             const HierarchicalReferencesType = addressSpace.findReferenceType("HierarchicalReferences");
             if (referenceType.isSubtypeOf(HierarchicalReferencesType!)) {
-                assert(reference.isForward);
-                const targetNode = ReferenceImpl.resolveReferenceNode(addressSpace, reference);
-                _cache._childByNameMap.set(targetNode.browseName!.name!.toString(), targetNode);
+                ReferenceImpl.resolveReferenceNode(addressSpace, reference);
+                _add(_private._childByNameMap, reference as UAReferenceWithNodeRef)
             }
         }
     }
 }
 
-function _remove_HierarchicalReference(node: BaseNode, reference: UAReference) {
-    const _cache = BaseNode_getCache(node);
-    if (_cache._childByNameMap) {
+export function _get_HierarchicalReference(node: BaseNode): HierarchicalIndexMap {
+    const addressSpace = node.addressSpace;
+    const _private = BaseNode_getPrivate(node);
+    if (!_private._childByNameMap) {
+        _private._childByNameMap = new Map();
+        const references = node.findReferencesEx("HierarchicalReferences");
+        for (var reference of references) {
+            ReferenceImpl.resolveReferenceNode(addressSpace, reference);
+            _add(_private._childByNameMap, reference as UAReferenceWithNodeRef);
+        }
+    }
+    return _private._childByNameMap;
+
+}
+export function _remove_HierarchicalReference(node: BaseNodeImpl, reference: UAReference) {
+    const _private = BaseNode_getPrivate(node);
+    if (_private._childByNameMap && reference.isForward) {
         const addressSpace = node.addressSpace;
         const referenceType = ReferenceImpl.resolveReferenceType(addressSpace, reference);
 
         if (referenceType) {
             const HierarchicalReferencesType = addressSpace.findReferenceType("HierarchicalReferences");
             if (referenceType.isSubtypeOf(HierarchicalReferencesType!)) {
-                assert(reference.isForward);
-                const targetNode = ReferenceImpl.resolveReferenceNode(addressSpace, reference);
-                _cache._childByNameMap.delete(targetNode.browseName!.name!.toString());
+                
+                ReferenceImpl.resolveReferenceNode(addressSpace, reference);
+                _remove(_private._childByNameMap, reference as UAReferenceWithNodeRef);
             }
         }
     }
@@ -1151,39 +1210,38 @@ export function _constructReferenceDescription(
     return references.map((reference: UAReference) => _makeReferenceDescription(addressSpace, reference, resultMask));
 }
 
-export function BaseNode_remove_backward_reference(this: BaseNode, reference: UAReference): void {
+export function BaseNode_remove_backward_reference(this: BaseNodeImpl, reference: UAReference): void {
     const _private = BaseNode_getPrivate(this);
     _remove_HierarchicalReference(this, reference);
     const h = (<ReferenceImpl>reference).hash;
-    if (_private._back_referenceIdx && _private._back_referenceIdx[h]) {
+    if (_private._back_referenceIdx?.has(h)) {
         // note : h may not exist in _back_referenceIdx since we are not indexing
         //        _back_referenceIdx to UAObjectType and UAVariableType for performance reasons
-        (<ReferenceImpl>_private._back_referenceIdx[h]).dispose();
-        delete _private._back_referenceIdx[h];
+        (<ReferenceImpl>_private._back_referenceIdx.get(h)).dispose();
+        _private._back_referenceIdx.delete(h);
     }
     (<ReferenceImpl>reference).dispose();
 }
 
-export function BaseNode_add_backward_reference(this: BaseNode, reference: UAReference): void {
+export function BaseNode_add_backward_reference(this: BaseNodeImpl, reference: UAReference): void {
     const _private = BaseNode_getPrivate(this);
-
     const h = (<ReferenceImpl>reference).hash;
     assert(typeof h === "string");
     // istanbul ignore next
-    if (_private._referenceIdx[h]) {
+    if (_private._referenceIdx.has(h)) {
         //  the reference exists already in the forward references
         //  this append for instance when the XML NotSetFile has redundant <UAReference>
         //  in this case there is nothing to do
         return;
     }
     // istanbul ignore next
-    if (_private._back_referenceIdx[h]) {
+    if (_private._back_referenceIdx.has(h)) {
         const opts = { addressSpace: this.addressSpace };
         warningLog(" Warning !", this.browseName.toString());
         warningLog("    ", reference.toString(opts));
         warningLog(" already found in ===>");
         warningLog(
-            (Object.values(_private._back_referenceIdx) as UAReference[]).map((c: UAReference) => c.toString(opts)).join("\n")
+            [..._private._back_referenceIdx.values()].map((c: UAReference) => c.toString(opts)).join("\n")
         );
         // tslint:disable-next-line:no-console
         warningLog("===>");
@@ -1194,7 +1252,7 @@ export function BaseNode_add_backward_reference(this: BaseNode, reference: UARef
         const stop_here = 1;
     }
     //  assert(reference._referenceType instanceof ReferenceType);
-    _private._back_referenceIdx[h] = reference;
+    _private._back_referenceIdx.set(h, reference);
     _handle_HierarchicalReference(this, reference);
-    (this as any)._clear_caches();
+    BaseNode_clearCache(this);
 }

package/src/namespace_impl.ts

@@ -232,7 +232,7 @@ export class NamespaceImpl implements NamespacePrivate {
     private _dataTypeMap: Map<string, UADataType>;
     private _referenceTypeMapInv: Map<string, UAReferenceType>;
     private _nodeIdManager: NodeIdManager;
-    private _nodeid_index: Map<string | number, BaseNode>;
+    private _nodeid_index: Map<string | number| Buffer, BaseNode>;
     private _aliases: Map<string, NodeId>;
     private defaultAccessRestrictions?: AccessRestrictionsFlag;
     private defaultRolePermissions?: RolePermissionType[];
@@ -519,7 +519,7 @@ export class NamespaceImpl implements NamespacePrivate {
         const typeDefinition = options.typeDefinition || "BaseObjectType";
         options.references = options.references || [];
         options.references.push({ referenceType: "HasTypeDefinition", isForward: true, nodeId: typeDefinition });
-        options.eventNotifier = +options.eventNotifier;
+        options.eventNotifier = +(options.eventNotifier || 0);
         const obj = this.createNode(options) as UAObject;
         assert(obj instanceof UAObjectImpl);
         assert(obj.nodeClass === NodeClass.Object);
@@ -537,6 +537,7 @@ export class NamespaceImpl implements NamespacePrivate {
      * @return {BaseNode}
      */
     public addFolder(parentFolder: UAObject, options: AddFolderOptions | string): UAObject {
+        
         if (typeof options === "string") {
             options = { browseName: options };
         }
@@ -551,7 +552,7 @@ export class NamespaceImpl implements NamespacePrivate {
             { referenceType: "HasTypeDefinition", isForward: true, nodeId: typeDefinition },
             { referenceType: "Organizes", isForward: false, nodeId: parentFolder.nodeId }
         ];
-        const node = this.createNode(options) as UAObject;
+        const node = this.createNode(options as CreateNodeOptions) as UAObject;
         return node;
     }
 
@@ -568,7 +569,7 @@ export class NamespaceImpl implements NamespacePrivate {
         const options1 = options as CreateNodeOptions;
         options1.nodeClass = NodeClass.ReferenceType;
         options1.references = options.references || [];
-        options1.nodeId = options.nodeId;
+        options1.nodeId = options.nodeId!;
 
         if (options.subtypeOf) {
             const subtypeOfNodeId = addressSpace._coerceType(options.subtypeOf, "References", NodeClass.ReferenceType);
@@ -1716,7 +1717,7 @@ export class NamespaceImpl implements NamespacePrivate {
         // ? (options.browseName.namespaceIndex === this.index): true,
         // "Expecting browseName to have the same namespaceIndex as the namespace");
 
-        options.description = coerceLocalizedText(options.description);
+        options.description = coerceLocalizedText(options.description)!;
 
         // browseName adjustment
         if (typeof options.browseName === "string") {
@@ -1759,21 +1760,23 @@ export class NamespaceImpl implements NamespacePrivate {
         // ------------- set display name
         if (!options.displayName) {
             assert(typeof options.browseName.name === "string");
-            options.displayName = options.browseName.name;
+            options.displayName = coerceLocalizedText(options.browseName.name)!;
+        }
+        if (!options.nodeClass || options.nodeClass == undefined) {
+            throw new Error("nodeclass must be specified");
         }
-
         // --- nodeId adjustment
-        options.nodeId = this.constructNodeId(options);
+        options.nodeId = this.constructNodeId(options as ConstructNodeIdOptions)
         dumpIf(!options.nodeId, options); // missing node Id
         assert(options.nodeId instanceof NodeId);
 
         // assert(options.browseName.namespaceIndex === this.index,"Expecting browseName to have
         // the same namespaceIndex as the namespace");
 
-        const Constructor = _constructors_map[NodeClass[options.nodeClass]];
+        const Constructor = _constructors_map[NodeClass[options.nodeClass!]];
 
         if (!Constructor) {
-            throw new Error(" missing constructor for NodeClass " + NodeClass[options.nodeClass]);
+            throw new Error(" missing constructor for NodeClass " + NodeClass[options.nodeClass!]);
         }
 
         options.addressSpace = this.addressSpace;
@@ -1863,7 +1866,7 @@ export class NamespaceImpl implements NamespacePrivate {
             browseName: options.browseName,
             displayName: options.displayName,
             description: options.description,
-            eventNotifier: +options.eventNotifier,
+            eventNotifier: +(options.eventNotifier || 0),
             isAbstract: !!options.isAbstract,
             nodeClass,
             nodeId: options.nodeId,
@@ -1874,7 +1877,9 @@ export class NamespaceImpl implements NamespacePrivate {
 
         objectType.install_extra_properties();
 
-        (<BaseNodeImpl>objectType).installPostInstallFunc(options.postInstantiateFunc);
+        if (options.postInstantiateFunc) {
+            (<BaseNodeImpl>objectType).installPostInstallFunc(options.postInstantiateFunc);
+        }
         return objectType;
     }
 
@@ -1981,7 +1986,7 @@ export class NamespaceImpl implements NamespacePrivate {
         assert(typeof options.valueRank === "number" && isFinite(options.valueRank!));
 
         options.arrayDimensions = options.arrayDimensions || null;
-        assert(Array.isArray(options.arrayDimensions) || options.arrayDimensions === null);
+        assert(options.arrayDimensions === null || Array.isArray(options.arrayDimensions));
 
         // -----------------------------------------------------
         const hasGetter = (options: AddVariableOptions2) => {
@@ -2024,7 +2029,7 @@ export class NamespaceImpl implements NamespacePrivate {
 
         options.references = references;
 
-        const variable = this.createNode(options) as UAVariable;
+        const variable = this.createNode(options as CreateNodeOptions) as UAVariable;
         return variable;
     }
 
@@ -2083,7 +2088,7 @@ const _constructors_map: any = {
  */
 function _coerce_parent(
     addressSpace: AddressSpacePrivate,
-    value: null | string | BaseNode,
+    value: null | string | BaseNode| undefined | NodeIdLike,
     coerceFunc: (data: string | NodeId | BaseNode) => BaseNode | null
 ): BaseNode | null {
     assert(typeof coerceFunc === "function");
@@ -2199,7 +2204,7 @@ export function _handle_hierarchy_parent(addressSpace: AddressSpacePrivate, refe
     }
 }
 
-function _copy_reference(reference: UAReference): AddReferenceOpts {
+function _copy_reference(reference: UAReference | AddReferenceOpts): AddReferenceOpts {
     assert(Object.prototype.hasOwnProperty.call(reference, "referenceType"));
     assert(Object.prototype.hasOwnProperty.call(reference, "isForward"));
     assert(Object.prototype.hasOwnProperty.call(reference, "nodeId"));
@@ -2211,12 +2216,12 @@ function _copy_reference(reference: UAReference): AddReferenceOpts {
     };
 }
 
-function _copy_references(references?: UAReference[] | null): AddReferenceOpts[] {
+function _copy_references(references?: UAReference[] | AddReferenceOpts[] | null): AddReferenceOpts[] {
     references = references || [];
     return references.map(_copy_reference);
 }
 
-export function isNonEmptyQualifiedName(browseName?: null | string | QualifiedName): boolean {
+export function isNonEmptyQualifiedName(browseName: QualifiedNameLike): boolean {
     if (!browseName) {
         return false;
     }
@@ -2230,12 +2235,12 @@ export function isNonEmptyQualifiedName(browseName?: null | string | QualifiedNa
     return browseName.name!.length > 0;
 }
 
-function _create_node_version_if_needed(node: BaseNode, options: { nodeVersion: boolean }) {
+function _create_node_version_if_needed(node: BaseNode, options: { nodeVersion?: string }) {
     assert(options);
-    if (options.nodeVersion) {
+    if (typeof options.nodeVersion == "string") {
         assert(node.nodeClass === NodeClass.Variable || node.nodeClass === NodeClass.Object);
         // istanbul ignore next
-        if (node.getChildByName("NodeVersion")) {
+        if (node.getNodeVersion()) {
             return; // already exists
         }
 
@@ -2245,7 +2250,6 @@ function _create_node_version_if_needed(node: BaseNode, options: { nodeVersion:
             dataType: DataType.String,
             propertyOf: node
         });
-        
         const initialValue = typeof options.nodeVersion === "string" ? options.nodeVersion : "0";
         nodeVersion.setValueFromSource({ dataType: "String", value: initialValue });
     }

package/src/namespace_private.ts

@@ -61,7 +61,10 @@ function isValidModellingRule(ruleName: string) {
  * @param modellingRule
  * @private
  */
-export function UANamespace_process_modelling_rule(references: AddReferenceOpts[], modellingRule: ModellingRuleType): void {
+export function UANamespace_process_modelling_rule(
+    references: AddReferenceOpts[], 
+    modellingRule?: ModellingRuleType
+): void {
     if (modellingRule) {
         assert(isValidModellingRule(modellingRule), "expecting a valid modelling rule");
         const modellingRuleName = "ModellingRule_" + modellingRule;

package/src/nodeid_manager.ts

@@ -1,10 +1,10 @@
 /* eslint-disable max-depth */
 /* eslint-disable max-statements */
 import { assert } from "node-opcua-assert";
-import { NodeClass, QualifiedName } from "node-opcua-data-model";
+import { NodeClass, QualifiedName, QualifiedNameLike, QualifiedNameOptions } from "node-opcua-data-model";
 import { makeNodeId, NodeId, NodeIdLike, NodeIdType, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
 import { make_debugLog, make_warningLog } from "node-opcua-debug";
-import { BaseNode, UAReference, UAReferenceType } from "node-opcua-address-space-base";
+import { AddReferenceOpts, BaseNode, UAReference, UAReferenceType } from "node-opcua-address-space-base";
 import { getReferenceType } from "./base_node_impl";
 import { resolveReferenceNode, resolveReferenceType } from "./reference_impl";
 
@@ -69,8 +69,8 @@ function _findParentNodeId(addressSpace: AddressSpacePartial, options: Construct
     return _filterAggregates(addressSpace, options.references);
 }
 
-function prepareName(browseName: QualifiedName): string {
-    const m = browseName.name!.toString().replace(/[ ]/g, "").replace(/(<|>)/g, "");
+function prepareName(browseName?: QualifiedName | QualifiedNameOptions): string {
+    const m = browseName!.name!.toString().replace(/[ ]/g, "").replace(/(<|>)/g, "");
     return m;
 }
 
@@ -79,9 +79,9 @@ export interface AddressSpacePartial {
     findReferenceType(refType: NodeIdLike, namespaceIndex?: number): UAReferenceType | null;
 }
 export interface ConstructNodeIdOptions {
-    nodeId?: string | NodeIdLike | null;
-    browseName: QualifiedName;
-    nodeClass: NodeClass;
+    nodeId?: string | NodeIdLike | BaseNode | null;
+    browseName: QualifiedNameOptions;
+    nodeClass?: NodeClass;
     references?: UAReference[];
     registerSymbolicNames?: boolean;
 }
@@ -148,6 +148,7 @@ export class NodeIdManager {
 
         const compose = (left: string, right: string) => { return right ? (left ? left + '_' + right : right) : left };
 
+        
         const buildUpName2 = (nodeId: NodeId, suffix: string) => {
             const namespaceIndex = nodeId.namespace;
             let name = "";
@@ -167,13 +168,13 @@ export class NodeIdManager {
                 const [parentNodeId, suffix] = parentInfo;
                 fullParentName = buildUpName2(parentNodeId, suffix);
             }
-            const fullName = compose(fullParentName, prepareName(options.browseName));
+            const fullName = compose(fullParentName, prepareName(options.browseName!));
             if (this._cacheSymbolicName[fullName]) {
                 return makeNodeId(this._cacheSymbolicName[fullName][0], this.namespaceIndex);
             }
             const nodeId = this._constructNodeId(options);
             if (nodeId.identifierType === NodeIdType.NUMERIC) {
-                this._cacheSymbolicName[fullName] = [nodeId.value as number, options.nodeClass];
+                this._cacheSymbolicName[fullName] = [nodeId.value as number, options.nodeClass!];
                 this._cacheSymbolicNameRev.add(nodeId.value as number);
             }
             return nodeId;
@@ -183,6 +184,9 @@ export class NodeIdManager {
 
     private _constructNodeId(options: ConstructNodeIdOptions): NodeId {
 
+        const resolveNodeIdEx = (nodeId: BaseNode | NodeIdLike) =>
+            (nodeId && typeof nodeId == "object" && nodeId instanceof BaseNode) ? nodeId.nodeId : resolveNodeId(nodeId);
+
         let nodeId = options.nodeId;
 
         if (!nodeId) {
@@ -214,7 +218,7 @@ export class NodeIdManager {
             assert(nodeId.namespace === this.namespaceIndex);
             return nodeId;
         }
-        nodeId = resolveNodeId(nodeId);
+        nodeId = resolveNodeIdEx(nodeId);
         assert(nodeId.namespace === this.namespaceIndex);
         return nodeId;
     }