node-opcua-address-space 2.169.0 → 2.172.0

package/src/nodeset_tools/construct_namespace_dependency.ts

@@ -1,18 +1,18 @@
-import { IAddressSpace, INamespace, UADataType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
-import { NodeClass } from "node-opcua-data-model";
-import { StructureField } from "node-opcua-types";
-import { DataType } from "node-opcua-basic-types";
-import { ExtensionObject } from "node-opcua-extension-object";
-import { Variant } from "node-opcua-variant";
+import type { IAddressSpace, INamespace, UADataType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
 import assert from "node-opcua-assert";
+import { DataType } from "node-opcua-basic-types";
+import { NodeClass } from "node-opcua-data-model";
 import { make_debugLog, make_warningLog } from "node-opcua-debug";
-import { NamespacePrivate } from "../namespace_private";
-import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
-import { UAVariableImpl } from "../ua_variable_impl";
-import { TranslationTable } from "../../source/xml_writer";
+import type { ExtensionObject } from "node-opcua-extension-object";
+import type { StructureField } from "node-opcua-types";
+import { Variant } from "node-opcua-variant";
+import type { TranslationTable } from "../../source/xml_writer";
+import { type BaseNodeImpl, getReferenceType } from "../base_node_impl";
+import type { NamespacePrivate } from "../namespace_private";
+import type { UAVariableImpl } from "../ua_variable_impl";
 
 const warningLog = make_warningLog(__filename);
-const debugLog = make_debugLog(__filename);
+const _debugLog = make_debugLog(__filename);
 
 // eslint-disable-next-line max-statements, complexity
 export function _recomputeRequiredModelsFromTypes(
@@ -134,7 +134,7 @@ export function _recomputeRequiredModelsFromTypes(
                     consider(dataTypeNode.nodeId.namespace);
                 } else {
                     // c8 ignore next
-                    if (dataTypeNodeId.value != 0) {
+                    if (dataTypeNodeId.value !== 0) {
                         warningLog("Warning: Cannot find dataType", dataTypeNodeId.toString());
                     }
                 }
@@ -195,7 +195,6 @@ export function _getCompleteRequiredModelsFromValuesAndReferences(
     priorityList: number[],
     cache?: Map<number, { requiredNamespaceIndexes: number[]; nbTypes: number }>
 ): number[] {
-
     const namespace_ = namespace as NamespacePrivate;
 
     const thisPriority = priorityList[namespace.index];
@@ -208,7 +207,7 @@ export function _getCompleteRequiredModelsFromValuesAndReferences(
             requiredModelsSet.add(requiredModel);
             requiredNamespaceIndexes.push(requiredModel);
         }
-    }
+    };
 
     //const maxIndex = Math.max(...requiredNamespaceIndexes);
     for (const node of namespace_.nodeIterator()) {
@@ -217,7 +216,7 @@ export function _getCompleteRequiredModelsFromValuesAndReferences(
             // if (reference.isForward) continue;
             // only look at backward reference
             // check referenceId
-            const namespaceIndexOfReferenceType = getReferenceType(reference)!.nodeId.namespace;
+            const namespaceIndexOfReferenceType = getReferenceType(reference)?.nodeId.namespace;
             if (namespaceIndexOfReferenceType !== 0 && namespaceIndexOfReferenceType !== namespace.index) {
                 const refPriority = priorityList[namespaceIndexOfReferenceType];
                 if (refPriority <= thisPriority) {
@@ -312,7 +311,7 @@ export function constructNamespacePriorityTable(addressSpace: IAddressSpace): {
     return { loadingOrder, priorityTable };
 }
 
-const doDebug = false;
+const _doDebug = false;
 export function constructNamespaceDependency(namespace: INamespace, priorityTable?: number[]): INamespace[] {
     const addressSpace = namespace.addressSpace;
     priorityTable = priorityTable || constructNamespacePriorityTable(addressSpace).priorityTable;

package/src/nodeset_tools/dump_to_bsd.ts

@@ -1,10 +1,10 @@
-import { IAddressSpace, INamespace, UADataType } from "node-opcua-address-space-base";
+import type { IAddressSpace, INamespace, UADataType } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
-import { StructureDefinition, EnumDefinition } from "node-opcua-types";
-import { INodeId, NodeId, NodeIdType } from "node-opcua-nodeid";
-import { AddressSpacePrivate } from "../address_space_private";
-import { XmlWriter } from "../../source/xml_writer";
-import { NamespacePrivate } from "../namespace_private";
+import { type INodeId, NodeId, NodeIdType } from "node-opcua-nodeid";
+import { EnumDefinition, StructureDefinition } from "node-opcua-types";
+import type { XmlWriter } from "../../source/xml_writer";
+import type { AddressSpacePrivate } from "../address_space_private";
+import type { NamespacePrivate } from "../namespace_private";
 import { constructNamespaceDependency } from "./construct_namespace_dependency";
 
 // tslint:disable-next-line: no-var-requires
@@ -23,27 +23,32 @@ function dumpEnumeratedType(xw: XmlWriter, e: EnumDefinition, name: string): voi
     }
     xw.endElement();
 }
-function buildXmlName(addressSpace: AddressSpacePrivate, map: Map<number,string>, nodeId: NodeId): string {
+function buildXmlName(addressSpace: AddressSpacePrivate, map: Map<number, string>, nodeId: NodeId): string {
     if (NodeId.sameNodeId(nodeId, NodeId.nullNodeId)) {
         return "ua:ExtensionObject";
     }
     const node = addressSpace.findNode(nodeId);
     // c8 ignore next
     if (!node) {
-        throw new Error("Cannot find Node for" + nodeId?.toString());
+        throw new Error(`Cannot find Node for${nodeId?.toString()}`);
     }
     const typeName = node.browseName.name!;
 
     const n = node.nodeId as INodeId;
-    const prefix = (n.identifierType === NodeIdType.NUMERIC && n.namespace === 0) ? (n.value <= 15 ? "opc" : "ua") : map.get(node.nodeId.namespace);
-    return prefix + ":" + (typeName === "Structure" && prefix === "ua" ? "ExtensionObject" : typeName);
+    const prefix =
+        n.identifierType === NodeIdType.NUMERIC && n.namespace === 0
+            ? n.value <= 15
+                ? "opc"
+                : "ua"
+            : map.get(node.nodeId.namespace);
+    return `${prefix}:${typeName === "Structure" && prefix === "ua" ? "ExtensionObject" : typeName}`;
 }
 
 // eslint-disable-next-line max-statements
 function dumpDataTypeStructure(
     xw: XmlWriter,
     addressSpace: IAddressSpace,
-    map: Map<number,string>,
+    map: Map<number, string>,
     structureDefinition: StructureDefinition,
     structureDefinitionBase: StructureDefinition | undefined | null,
     name: string,
@@ -68,7 +73,7 @@ function dumpDataTypeStructure(
         const f = fields[index];
         if (f.isOptional) {
             xw.startElement("opc:Field");
-            xw.writeAttribute("Name", f.name + "Specified");
+            xw.writeAttribute("Name", `${f.name}Specified`);
             xw.writeAttribute("TypeName", "opc:Bit");
             xw.endElement();
             optionalsCount++;
@@ -105,10 +110,10 @@ function dumpDataTypeStructure(
 
         if (isArray) {
             xw.startElement("opc:Field");
-            xw.writeAttribute("Name", "NoOf" + f.name!);
+            xw.writeAttribute("Name", `NoOf${f.name!}`);
             xw.writeAttribute("TypeName", "opc:Int32");
             if (f.isOptional) {
-                xw.writeAttribute("SwitchField", f.name + "Specified");
+                xw.writeAttribute("SwitchField", `${f.name}Specified`);
             }
             xw.endElement();
         }
@@ -119,17 +124,17 @@ function dumpDataTypeStructure(
         const typeName = buildXmlName(addressSpace as AddressSpacePrivate, map, f.dataType);
         xw.writeAttribute("TypeName", typeName);
         if (isArray) {
-            xw.writeAttribute("LengthField", "NoOf" + f.name!);
+            xw.writeAttribute("LengthField", `NoOf${f.name!}`);
         }
         if (f.isOptional) {
-            xw.writeAttribute("SwitchField", f.name + "Specified");
+            xw.writeAttribute("SwitchField", `${f.name}Specified`);
         }
         xw.endElement();
     }
     xw.endElement();
 }
 
-function dumpDataTypeToBSD(xw: XmlWriter, dataType: UADataType, map: Map<number,string>) {
+function dumpDataTypeToBSD(xw: XmlWriter, dataType: UADataType, map: Map<number, string>) {
     const addressSpace = dataType.addressSpace;
 
     const name: string = dataType.browseName.name!;
@@ -145,12 +150,12 @@ function dumpDataTypeToBSD(xw: XmlWriter, dataType: UADataType, map: Map<number,
 }
 
 function shortcut(namespace: INamespace) {
-    return "n" + namespace.index;
+    return `n${namespace.index}`;
 }
 export function dumpToBSD(namespace: NamespacePrivate): string {
     const dependency: INamespace[] = constructNamespaceDependency(namespace);
 
-    const addressSpace = namespace.addressSpace;
+    const _addressSpace = namespace.addressSpace;
 
     const xw: XmlWriter = new XMLWriter(true);
 
@@ -163,9 +168,9 @@ export function dumpToBSD(namespace: NamespacePrivate): string {
     xw.writeAttribute("xmlns:ua", "http://opcfoundation.org/UA/");
     xw.writeAttribute("xmlns:tns", namespace.namespaceUri);
 
-    const map: Map<number,string> = new Map();
+    const map: Map<number, string> = new Map();
 
-    map.set(namespace.index,"tns");
+    map.set(namespace.index, "tns");
 
     for (const dependantNamespace of dependency) {
         const namespaceIndex = dependantNamespace.index;
@@ -173,7 +178,7 @@ export function dumpToBSD(namespace: NamespacePrivate): string {
             continue;
         }
         const ns = shortcut(dependantNamespace);
-        map.set(namespaceIndex,ns);
+        map.set(namespaceIndex, ns);
         xw.writeAttribute(`xmlns:${ns}`, dependantNamespace.namespaceUri);
     }