node-opcua-address-space 2.84.0 → 2.85.0

package/src/address_space.ts

@@ -123,7 +123,6 @@ function isNodeIdString(str: unknown): boolean {
     return str.substring(0, 2) === "i=" || str.substring(0, 3) === "ns=";
 }
 
-
 /**
  * `AddressSpace` is a collection of UA nodes.
  *
@@ -423,7 +422,9 @@ export class AddressSpace implements AddressSpacePrivate {
         // +-> Structure
         //       +-> Node
         //            +-> ObjectNode
-        if (dataType instanceof NodeId) {
+        if (dataType instanceof UADataTypeImpl) {
+            return this.findDataType(dataType.nodeId);
+        } else if (dataType instanceof NodeId) {
             return _find_by_node_id<UADataType>(this, dataType!, namespaceIndex);
         }
         if (typeof dataType === "number") {
@@ -1346,29 +1347,16 @@ export class AddressSpace implements AddressSpacePrivate {
                 _nodeId = (_nodeId as any).nodeId as NodeId;
             }
             _nodeId = resolveNodeId(_nodeId);
-            /* istanbul ignore next */
-            if (!(_nodeId instanceof NodeId) || _nodeId.isEmpty()) {
-                // tslint:disable:no-console
-                console.log("xx =>", JSON.stringify(params, null, " "));
-                throw new Error(" Invalid reference nodeId " + _nodeId.toString());
-            }
             params.nodeId = _nodeId;
         }
         return new ReferenceImpl(params);
     }
 
-    /**
-     *
-     * @param references
-     */
     public normalizeReferenceTypes(references: AddReferenceOpts[] | ReferenceImpl[] | null): UAReference[] {
         if (!references || references.length === 0) {
             return [];
         }
-        references = references as UAReference[] | AddReferenceOpts[];
-        assert(Array.isArray(references));
-
-        return (references as any).map((el: UAReference | AddReferenceOpts) => this.normalizeReferenceType(el));
+        return references.map((el) => this.normalizeReferenceType(el));
     }
 
     // -- Historical Node  -----------------------------------------------------------------------------------------

package/src/base_node_private.ts

@@ -40,6 +40,7 @@ import { UANamespace_process_modelling_rule } from "./namespace_private";
 import { ReferenceImpl } from "./reference_impl";
 import { BaseNodeImpl, getReferenceType } from "./base_node_impl";
 import { AddressSpacePrivate } from "./address_space_private";
+import { wipeMemorizedStuff } from "./tool_isSupertypeOf";
 
 // eslint-disable-next-line prefer-const
 let doTrace = checkDebugFlag("INSTANTIATE");
@@ -126,6 +127,7 @@ export function BaseNode_clearCache(node: BaseNode): void {
     if (_private && _private._cache) {
         _private._cache = {};
     }
+    wipeMemorizedStuff(node);
 }
 const hasTypeDefinition_ReferenceTypeNodeId = resolveNodeId("HasTypeDefinition");
 
@@ -681,6 +683,10 @@ function _cloneInterface(
 
     extraInfo = extraInfo || defaultExtraInfo;
     const addressSpace = node.addressSpace;
+
+    if (node.nodeClass !== NodeClass.Object && node.nodeClass !== NodeClass.Variable) {
+        return;
+    }
     const typeDefinitionNode = node.typeDefinitionObj;
     if (!typeDefinitionNode) {
         return;

package/src/namespace_impl.ts

@@ -10,7 +10,7 @@ import { AxisScaleEnumeration } from "node-opcua-data-access";
 import { AccessRestrictionsFlag, coerceLocalizedText, QualifiedNameLike } from "node-opcua-data-model";
 import { QualifiedName } from "node-opcua-data-model";
 import { BrowseDirection } from "node-opcua-data-model";
-import { LocalizedText, NodeClass } from "node-opcua-data-model";
+import { NodeClass } from "node-opcua-data-model";
 import { dumpIf, make_errorLog } from "node-opcua-debug";
 import { NodeIdLike, NodeIdType, resolveNodeId } from "node-opcua-nodeid";
 import { NodeId } from "node-opcua-nodeid";
@@ -124,7 +124,7 @@ import { UAReferenceTypeImpl } from "./ua_reference_type_impl";
 import { UAViewImpl } from "./ua_view_impl";
 import { UAStateMachineImpl, UATransitionImpl } from "./state_machine/finite_state_machine";
 import { _addMultiStateValueDiscrete } from "./data_access/ua_multistate_value_discrete_impl";
-import { notDeepEqual } from "assert";
+
 
 function _makeHashKey(nodeId: NodeId): string | number {
     switch (nodeId.identifierType) {
@@ -615,7 +615,7 @@ export class NamespaceImpl implements NamespacePrivate {
         assert(!Object.prototype.hasOwnProperty.call(options, "nodeClass"));
         assert(Object.prototype.hasOwnProperty.call(options, "browseName"), "must provide a browseName");
 
-        const options1 = options as any;
+        const options1 = options as unknown as { nodeClass: NodeClass; references: AddReferenceOpts[]; subtypeOf: UADataType };
         options1.nodeClass = NodeClass.DataType;
         options1.references = options.references || [];
 
@@ -638,6 +638,9 @@ export class NamespaceImpl implements NamespacePrivate {
             });
         }
         const node = this.internalCreateNode(options) as UADataType;
+
+        node.propagate_back_references();
+        
         return node;
     }
 

package/src/nodeset_tools/construct_namespace_dependency.ts

@@ -1,9 +1,12 @@
 import { INamespace, UADataType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
 import { NodeClass } from "node-opcua-data-model";
 import { StructureField } from "node-opcua-types";
+import { make_warningLog } from "node-opcua-debug";
 import { NamespacePrivate } from "../namespace_private";
 import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
 
+const warningLog = make_warningLog(__filename);
+
 function _constructNamespaceDependency(
     namespace: INamespace,
     dependency: INamespace[],
@@ -43,6 +46,12 @@ function _constructNamespaceDependency(
         if (_visitedDataType.has(dataType.toString())) {
             return;
         }
+        // istanbul ignore next
+        if (dataTypeNode.nodeClass !== NodeClass.DataType) {
+            warningLog("exploreDataTypes! ignoring ",dataTypeNode.toString());
+            return;
+        }
+
         const namespaceIndex = dataType.namespace;
         consider(namespaceIndex);
         if (dataTypeNode.isStructure()) {

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -35,7 +35,6 @@ import { AttributeIds, Int64, minOPCUADate, StatusCode, StatusCodes } from "node
 import { BrowseDescription, EnumDefinition, StructureDefinition, StructureType } from "node-opcua-types";
 
 import { ITranslationTable, XmlWriter } from "../../source/xml_writer";
-import { NamespacePrivate } from "../namespace_private";
 import { ReferenceImpl } from "../reference_impl";
 import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
 import { UAReferenceTypeImpl } from "../ua_reference_type_impl";
@@ -251,6 +250,10 @@ function findXsdNamespaceUri(xw: XmlWriter, nodeId: NodeId): string {
     if (namespace === "http://opcfoundation.org/UA/") {
         return "http://opcfoundation.org/UA/2008/02/Types.xsd";
     }
+    // istanbul ignore next
+    if (!namespace) {
+        return "";
+    }
     return namespace.replace(/\/$/, "") + "/Types.xsd";
 }
 

package/src/tool_isSupertypeOf.ts

@@ -60,6 +60,11 @@ function _slow_isSupertypeOf<T extends UAType>(this: T, Class: typeof BaseNodeIm
 
 export type MemberFuncValue<T, P, R> = (this: T, param: P) => R;
 
+export function wipeMemorizedStuff(node: any) {
+    if (!node.__cache) {
+        node.__cache = undefined;
+    }
+}
 //  http://jsperf.com/underscore-js-memoize-refactor-test
 //  http://addyosmani.com/blog/faster-javascript-memoization/
 function wrap_memoize<T, P, R>(