node-opcua-address-space 2.170.1 → 2.173.0

package/dist/src/nodeset_tools/dump_to_bsd.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dumpToBSD = dumpToBSD;
 const node_opcua_assert_1 = require("node-opcua-assert");
-const node_opcua_types_1 = require("node-opcua-types");
 const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_types_1 = require("node-opcua-types");
 const construct_namespace_dependency_1 = require("./construct_namespace_dependency");
 // tslint:disable-next-line: no-var-requires
 const XMLWriter = require("xml-writer");
@@ -27,12 +27,16 @@ function buildXmlName(addressSpace, map, nodeId) {
     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;
-    const prefix = (n.identifierType === node_opcua_nodeid_1.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 === node_opcua_nodeid_1.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, addressSpace, map, structureDefinition, structureDefinitionBase, name, doc) {
@@ -52,7 +56,7 @@ function dumpDataTypeStructure(xw, addressSpace, map, structureDefinition, struc
         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++;
@@ -85,10 +89,10 @@ function dumpDataTypeStructure(xw, addressSpace, map, structureDefinition, struc
         const isArray = f.valueRank > 0 && f.arrayDimensions?.length;
         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();
         }
@@ -97,10 +101,10 @@ function dumpDataTypeStructure(xw, addressSpace, map, structureDefinition, struc
         const typeName = buildXmlName(addressSpace, 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();
     }
@@ -119,11 +123,11 @@ function dumpDataTypeToBSD(xw, dataType, map) {
     }
 }
 function shortcut(namespace) {
-    return "n" + namespace.index;
+    return `n${namespace.index}`;
 }
 function dumpToBSD(namespace) {
     const dependency = (0, construct_namespace_dependency_1.constructNamespaceDependency)(namespace);
-    const addressSpace = namespace.addressSpace;
+    const _addressSpace = namespace.addressSpace;
     const xw = new XMLWriter(true);
     //xx xw.startDocument():// { encoding: "utf-8", version: "1.0" });
     xw.startElement("opc:TypeDictionary");

package/dist/src/nodeset_tools/dump_to_bsd.js.map

@@ -1 +1 @@
-{"version":3,"file":"dump_to_bsd.js","sourceRoot":"","sources":["../../../src/nodeset_tools/dump_to_bsd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dump_to_bsd.js","sourceRoot":"","sources":["../../../src/nodeset_tools/dump_to_bsd.ts"],"names":[],"mappings":"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"}

package/dist/src/nodeset_tools/nodeset_to_xml.d.ts

@@ -1,10 +1,12 @@
-import { BaseNode } from "node-opcua-address-space-base";
+/**
+ * @module node-opcua-address-space
+ */
+import type { BaseNode } from "node-opcua-address-space-base";
 export declare function sortByBrowseName(x: BaseNode, y: BaseNode): number;
 type NodeIdString = string;
 export interface BuildAliasesData {
     aliases: Record<string, NodeIdString>;
     aliases_visited?: Set<string>;
 }
-export interface DumpXMLOptions {
-}
+export type DumpXMLOptions = {};
 export {};

package/dist/src/nodeset_tools/nodeset_to_xml.js

@@ -1,34 +1,34 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByBrowseName = sortByBrowseName;
 /* eslint-disable complexity */
 /**
  * @module node-opcua-address-space
  */
 // produce nodeset xml files
-const util_1 = require("util");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByBrowseName = sortByBrowseName;
+const node_util_1 = require("node:util");
 const node_opcua_assert_1 = require("node-opcua-assert");
+const node_opcua_basic_types_1 = require("node-opcua-basic-types");
 const node_opcua_constants_1 = require("node-opcua-constants");
-const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_types_1 = require("node-opcua-types");
 const node_opcua_utils_1 = require("node-opcua-utils");
 const node_opcua_variant_1 = require("node-opcua-variant");
-const node_opcua_basic_types_1 = require("node-opcua-basic-types");
-const node_opcua_types_1 = require("node-opcua-types");
-const reference_impl_1 = require("../reference_impl");
+const decode_xml_extension_object_1 = require("../../source/loader/decode_xml_extension_object");
 const base_node_impl_1 = require("../base_node_impl");
-const ua_reference_type_impl_1 = require("../ua_reference_type_impl");
-const ua_object_type_impl_1 = require("../ua_object_type_impl");
-const ua_variable_impl_1 = require("../ua_variable_impl");
-const ua_object_impl_1 = require("../ua_object_impl");
+const index_current_1 = require("../index_current");
 const namespace_impl_1 = require("../namespace_impl");
-const ua_method_impl_1 = require("../ua_method_impl");
+const reference_impl_1 = require("../reference_impl");
 const ua_data_type_impl_1 = require("../ua_data_type_impl");
+const ua_method_impl_1 = require("../ua_method_impl");
+const ua_object_impl_1 = require("../ua_object_impl");
+const ua_object_type_impl_1 = require("../ua_object_type_impl");
+const ua_reference_type_impl_1 = require("../ua_reference_type_impl");
+const ua_variable_impl_1 = require("../ua_variable_impl");
 const ua_variable_type_impl_1 = require("../ua_variable_type_impl");
-const index_current_1 = require("../index_current");
 const ua_view_impl_1 = require("../ua_view_impl");
-const decode_xml_extension_object_1 = require("../../source/loader/decode_xml_extension_object");
 const construct_namespace_dependency_1 = require("./construct_namespace_dependency");
 // tslint:disable:no-var-requires
 const XMLWriter = require("xml-writer");
@@ -40,12 +40,12 @@ function _hash(node) {
     return node.nodeId.toString();
 }
 function _dumpDisplayName(xw, node) {
-    if (node.displayName && node.displayName[0]) {
+    if (node.displayName?.[0]) {
         xw.startElement("DisplayName").text(node.displayName[0].text).endElement();
     }
 }
 function _dumpDescription(xw, node) {
-    if (node.description && node.description.text && node.description.text.length) {
+    if (node.description?.text?.length) {
         let desc = node.description.text;
         desc = desc || "";
         xw.startElement("Description").text(desc).endElement();
@@ -94,11 +94,6 @@ function _dumpReferences(xw, node) {
     function referenceToKeep(reference) {
         const referenceType = reference._referenceType;
         const targetedNamespaceIndex = reference.nodeId.namespace;
-        if (_hasHigherPriorityThan(xw, targetedNamespaceIndex, node.nodeId.namespace)) {
-            // this reference has nothing to do here ! drop it
-            // because the target namespace is higher in the hierarchy
-            return false;
-        }
         // get the direct backward reference to a external namespace
         if (referenceType.isSubtypeOf(aggregateReferenceType) && !reference.isForward) {
             if (reference.nodeId.namespace !== node.nodeId.namespace) {
@@ -112,6 +107,9 @@ function _dumpReferences(xw, node) {
         }
         // only keep
         if (referenceType.isSubtypeOf(aggregateReferenceType) && reference.isForward) {
+            if (_hasHigherPriorityThan(xw, targetedNamespaceIndex, node.nodeId.namespace)) {
+                return false;
+            }
             return true;
         }
         else if (referenceType.isSubtypeOf(hasSubtypeReferenceType) && !reference.isForward) {
@@ -121,9 +119,11 @@ function _dumpReferences(xw, node) {
             return true;
         }
         else if (referenceType.isSubtypeOf(nonHierarchicalReferencesType) && reference.isForward) {
+            // e.g. HasInterface — always keep, the current node owns this reference
             return true;
         }
         else if (referenceType.isSubtypeOf(organizesReferencesType) && !reference.isForward) {
+            // Organizes inverse — the current node is organized by an external folder
             return true;
         }
         else if (connectsToReferenceType && referenceType.isSubtypeOf(connectsToReferenceType) && reference.isForward) {
@@ -152,7 +152,7 @@ function _dumpReferences(xw, node) {
 }
 function _dumpLocalizedText(xw, v) {
     const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-    if (v.locale && v.locale.length) {
+    if (v.locale?.length) {
         xw.startElement(`${uax}Locale`);
         xw.text(v.locale);
         xw.endElement();
@@ -199,14 +199,14 @@ function findXsdNamespaceUri(xw, nodeId) {
     if (!namespace) {
         return "";
     }
-    return namespace.replace(/\/$/, "") + "/Types.xsd";
+    return `${namespace.replace(/\/$/, "")}/Types.xsd`;
 }
 function getPrefix(xw, namespace) {
     const xwe = xw;
     if (!xwe.map)
         return "";
     const p = xwe.map[namespace] || "";
-    return p ? p + ":" : "";
+    return p ? `${p}:` : "";
 }
 function restoreDefaultNamespace(xw) {
     const xwe = xw;
@@ -226,8 +226,8 @@ function setDefaultNamespace(xw, namespace) {
     });
     xwe.map[namespace] = "";
 }
-function startElementEx(xw, ns, name, defaultNamespace) {
-    const xwe = xw;
+function startElementEx(xw, _ns, name, defaultNamespace) {
+    const _xwe = xw;
     xw.startElement(name);
     setDefaultNamespace(xw, defaultNamespace);
 }
@@ -269,7 +269,7 @@ function _dumpVariantInnerExtensionObject(xw, definitionMap, definition, address
             const { name, definition } = definitionMap.findDefinition(dataTypeNodeId);
             startElementEx(xw, ns, fieldName, namespaceUri);
             //  xw.startElement(fieldName);
-            let fun = (value) => {
+            let fun = (_value) => {
                 /** */
             };
             if (definition instanceof node_opcua_types_1.StructureDefinition) {
@@ -278,7 +278,7 @@ function _dumpVariantInnerExtensionObject(xw, definitionMap, definition, address
             else if (definition instanceof node_opcua_types_1.EnumDefinition) {
                 fun = _dumpVariantInnerValueEnum.bind(null, xw, definition);
             }
-            else if (definition?.dataType == node_opcua_variant_1.DataType.Variant) {
+            else if (definition?.dataType === node_opcua_variant_1.DataType.Variant) {
                 fun = (value) => {
                     xw.startElement("Value");
                     _dumpVariantValue(xw, field.dataType, value.dataType, addressSpace, value.value);
@@ -304,7 +304,7 @@ function _dumpVariantInnerExtensionObject(xw, definitionMap, definition, address
             }
             catch (err) {
                 // eslint-disable-next-line max-depth
-                if (util_1.types.isNativeError(err)) {
+                if (node_util_1.types.isNativeError(err)) {
                     errorLog("Error in _dumpVariantExtensionObjectValue_Body !!!", err.message);
                 }
                 debugLog(name);
@@ -398,7 +398,7 @@ function _dumpVariantInnerValue(xw, dataType, dataTypeNodeId, definitionMap, add
             _dumpVariantInnerValue(xw, value.dataType, dataTypeNodeId, definitionMap, addressSpace, value.value);
             break;
         default:
-            errorLog("_dumpVariantInnerValue incomplete " + value + " " + "DataType=" + dataType + "=" + node_opcua_variant_1.DataType[dataType]);
+            errorLog(`_dumpVariantInnerValue incomplete ${value} DataType=${dataType}=${node_opcua_variant_1.DataType[dataType]}`);
         //  throw new Error("_dumpVariantInnerValue incomplete " + value + " " + "DataType=" + dataType + "=" + DataType[dataType]);
     }
 }
@@ -435,13 +435,11 @@ function _dumpVariantExtensionObjectValue(xw, dataTypeNodeId, definitionMap, add
     {
         const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
         xw.startElement(`${uax}TypeId`);
-        {
-            // find HasEncoding node
-            // xx var encodingDefaultXml = schema.encodingDefaultXml;
-            xw.startElement(`${uax}Identifier`);
-            xw.text(n(xw, encodingDefaultXml));
-            xw.endElement();
-        }
+        // find HasEncoding node
+        // xx var encodingDefaultXml = schema.encodingDefaultXml;
+        xw.startElement(`${uax}Identifier`);
+        xw.text(n(xw, encodingDefaultXml));
+        xw.endElement();
         xw.endElement();
         startElementEx(xw, uax, "Body", "http://opcfoundation.org/UA/2008/02/Types.xsd");
         _dumpVariantExtensionObjectValue_Body(xw, definitionMap, name, definition, addressSpace, value);
@@ -541,7 +539,7 @@ function _dumpValue(xw, node, variant) {
         debugLog("Cannot find dataType:", node.dataType.toString());
         return;
     }
-    const dataTypeName = dataTypeNode.browseName.name.toString();
+    const dataTypeName = dataTypeNode.browseName.name?.toString();
     const baseDataTypeName = node_opcua_variant_1.DataType[variant.dataType];
     if (baseDataTypeName === "Null") {
         return;
@@ -600,7 +598,7 @@ function _dumpArrayDimensionsAttribute(xw, node) {
         xw.writeAttribute("ArrayDimensions", node.arrayDimensions.join(","));
     }
 }
-function visitUANode(node, data, forward) {
+function _visitUANode(node, data, forward) {
     const addressSpace = node.addressSpace;
     // visit references
     function process_reference(reference) {
@@ -616,7 +614,7 @@ function visitUANode(node, data, forward) {
             data.index_el[k] = 1;
             const o = addressSpace.findNode(k);
             if (o) {
-                visitUANode(o, data, forward);
+                _visitUANode(o, data, forward);
             }
         }
     }
@@ -632,12 +630,12 @@ function dumpReferencedNodes(xw, node, forward) {
     if (!forward) {
         {
             const r = node.findReferencesEx("HasTypeDefinition");
-            if (r && r.length) {
+            if (r?.length) {
                 (0, node_opcua_assert_1.assert)(r.length === 1);
                 const typeDefinitionObj = reference_impl_1.ReferenceImpl.resolveReferenceNode(addressSpace, r[0]);
                 if (!typeDefinitionObj) {
                     warningLog(node.toString());
-                    warningLog("dumpReferencedNodes: Warning : " + node.browseName.toString() + " unknown typeDefinition, ", r[0].toString());
+                    warningLog(`dumpReferencedNodes: Warning : ${node.browseName.toString()} unknown typeDefinition, `, r[0].toString());
                 }
                 else {
                     (0, node_opcua_assert_1.assert)(typeDefinitionObj instanceof base_node_impl_1.BaseNodeImpl);
@@ -653,7 +651,7 @@ function dumpReferencedNodes(xw, node, forward) {
         //
         {
             const r = node.findReferencesEx("HasSubtype", node_opcua_data_model_1.BrowseDirection.Inverse);
-            if (r && r.length) {
+            if (r?.length) {
                 const subTypeOf = reference_impl_1.ReferenceImpl.resolveReferenceNode(addressSpace, r[0]);
                 (0, node_opcua_assert_1.assert)(r.length === 1);
                 if (subTypeOf.nodeId.namespace === node.nodeId.namespace) {
@@ -695,21 +693,21 @@ function dumpCommonAttributes(xw, node) {
             xw.writeAttribute("ParentNodeId", n(xw, parentNode.nodeId));
         }
     }
-    if (Object.prototype.hasOwnProperty.call(node, "symbolicName")) {
+    if (Object.hasOwn(node, "symbolicName")) {
         xw.writeAttribute("SymbolicName", node.symbolicName);
     }
-    if (Object.prototype.hasOwnProperty.call(node, "isAbstract")) {
+    if (Object.hasOwn(node, "isAbstract")) {
         if (node.isAbstract) {
             xw.writeAttribute("IsAbstract", node.isAbstract ? "true" : "false");
         }
     }
-    if (Object.prototype.hasOwnProperty.call(node, "accessLevel")) {
+    if (Object.hasOwn(node, "accessLevel")) {
         // CurrentRead is by default
         if (node.accessLevel !== currentReadFlag) {
             xw.writeAttribute("AccessLevel", node.accessLevel.toString());
         }
     }
-    if (Object.prototype.hasOwnProperty.call(node, "minimumSamplingInterval")) {
+    if (Object.hasOwn(node, "minimumSamplingInterval")) {
         const minimumSamplingInterval = node.minimumSamplingInterval;
         if (minimumSamplingInterval > 0) {
             xw.writeAttribute("MinimumSamplingInterval", minimumSamplingInterval);
@@ -809,7 +807,8 @@ function _dumpUADataTypeDefinition(xw, uaDataType) {
         // in case the namespace is conforming to 1.03 specification the DataTypeDefinition attribute
         // will be not be readable....
         const dataValue = uaDataType.readAttribute(index_current_1.SessionContext.defaultContext, node_opcua_basic_types_1.AttributeIds.DataTypeDefinition);
-        if (true || dataValue.statusCode.isGood()) {
+        const t = true;
+        if (t || dataValue.statusCode.isGood()) {
             const definition = uaDataType.getStructureDefinition();
             const baseDefinition = uaDataTypeBase ? uaDataTypeBase.getStructureDefinition() : null;
             xw.startElement("Definition");
@@ -932,9 +931,9 @@ function dumpUAVariableType(xw, node) {
     dumpAggregates(xw, node);
 }
 function dumpUAObject(xw, node) {
-    xw.writeComment("Object - " + b(xw, node.browseName) + " {{{{ ");
+    xw.writeComment(`Object - ${b(xw, node.browseName)} {{{{ `);
     _dumpUAObject(xw, node);
-    xw.writeComment("Object - " + b(xw, node.browseName) + " }}}} ");
+    xw.writeComment(`Object - ${b(xw, node.browseName)} }}}} `);
 }
 function _dumpUAObject(xw, node) {
     (0, node_opcua_assert_1.assert)(node.nodeClass === node_opcua_data_model_1.NodeClass.Object);
@@ -954,7 +953,7 @@ function _dumpUAObject(xw, node) {
 function dumpElementInFolder(xw, node) {
     const aggregates = node
         .getFolderElements()
-        .sort((x, y) => (x.browseName.name.toString() > y.browseName.name.toString() ? 1 : -1));
+        .sort((x, y) => ((x?.browseName.name?.toString() || 0) > (y?.browseName.name?.toString() || 0) ? 1 : -1));
     for (const aggregate of aggregates.sort(sortByNodeId)) {
         // do not export node that do not belong to our namespace
         if (node.nodeId.namespace !== aggregate.nodeId.namespace) {
@@ -988,7 +987,7 @@ function dumpAggregates(xw, node) {
 function dumpUAObjectType(xw, node) {
     (0, node_opcua_assert_1.assert)(node.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType);
     (0, node_opcua_assert_1.assert)(node instanceof ua_object_type_impl_1.UAObjectTypeImpl);
-    xw.writeComment("ObjectType - " + b(xw, node.browseName) + " {{{{ ");
+    xw.writeComment(`ObjectType - ${b(xw, node.browseName)} {{{{ `);
     _markAsVisited(xw, node);
     // dump SubtypeOf and HasTypeDefinition node if part of the same namespace
     dumpReferencedNodes(xw, node, false);
@@ -997,7 +996,7 @@ function dumpUAObjectType(xw, node) {
     dumpCommonElements(xw, node);
     xw.endElement();
     dumpAggregates(xw, node);
-    xw.writeComment("ObjectType - " + b(xw, node.browseName) + " }}}}");
+    xw.writeComment(`ObjectType - ${b(xw, node.browseName)} }}}}`);
 }
 function dumpUAMethod(xw, node) {
     (0, node_opcua_assert_1.assert)(node.nodeClass === node_opcua_data_model_1.NodeClass.Method);
@@ -1024,7 +1023,7 @@ function resolveDataTypeName(addressSpace, dataType) {
         dataTypeNode = o ? o : null;
     }
     if (!dataTypeNode) {
-        errorLog("resolveDataTypeName: warning cannot find DataType " + dataType.toString());
+        errorLog(`resolveDataTypeName: warning cannot find DataType ${dataType.toString()}`);
         return new node_opcua_data_model_1.QualifiedName({ name: "", namespaceIndex: 0 });
     }
     return dataTypeNode.browseName;
@@ -1099,7 +1098,7 @@ function dumpReferenceType(xw, referenceType) {
     dumpCommonElements(xw, referenceType);
     if (!isSymmetric) {
         xw.startElement("InverseName");
-        xw.text(referenceType.inverseName.text || "");
+        xw.text(referenceType.inverseName?.text || "");
         xw.endElement();
     }
     xw.endElement();
@@ -1143,7 +1142,7 @@ ua_view_impl_1.UAViewImpl.prototype.dumpXML = function (xw) {
     dumpUAView(xw, this);
 };
 function makeTypeXsd(namespaceUri) {
-    return namespaceUri.replace(/\/$/, "") + "/Type.xsd";
+    return `${namespaceUri.replace(/\/$/, "")}/Type.xsd`;
 }
 // eslint-disable-next-line max-statements
 namespace_impl_1.NamespaceImpl.prototype.toNodeset2XML = function () {
@@ -1181,8 +1180,8 @@ namespace_impl_1.NamespaceImpl.prototype.toNodeset2XML = function () {
     initXmlWriterEx(xw, namespacesMap, namespaceArray);
     xw.startElement("NamespaceUris");
     // let's sort the dependencies in the same order as the translation table
-    const sortedDependencies = dependency.sort((a, b) => (translationTable.get(a.index) > translationTable.get(b.index) ? 1 : -1));
-    doDebug && debugLog(sortedDependencies.map((a) => a.index + " + " + a.namespaceUri).join("\n"));
+    const sortedDependencies = dependency.sort((a, b) => translationTable.get(a.index) > translationTable.get(b.index) ? 1 : -1);
+    doDebug && debugLog(sortedDependencies.map((a) => `${a.index} + ${a.namespaceUri}`).join("\n"));
     doDebug && debugLog("translation table ", translationTable.entries());
     for (const depend of sortedDependencies) {
         if (depend.index === 0) {
@@ -1195,24 +1194,22 @@ namespace_impl_1.NamespaceImpl.prototype.toNodeset2XML = function () {
     xw.endElement();
     // ------------- INamespace Uris
     xw.startElement("Models");
-    {
-        xw.startElement("Model");
-        xw.writeAttribute("ModelUri", this.namespaceUri);
-        xw.writeAttribute("Version", this.version);
-        xw.writeAttribute("PublicationDate", this.publicationDate.toISOString());
-        for (const depend of sortedDependencies) {
-            if (depend.index === this.index) {
-                continue; // ignore our namespace 0
-            }
-            xw.startElement("RequiredModel");
-            xw.writeAttribute("ModelUri", depend.namespaceUri);
-            xw.writeAttribute("Version", depend.version);
-            xw.writeAttribute("PublicationDate", depend.publicationDate.toISOString());
-            xw.endElement();
+    xw.startElement("Model");
+    xw.writeAttribute("ModelUri", this.namespaceUri);
+    xw.writeAttribute("Version", this.version);
+    xw.writeAttribute("PublicationDate", this.publicationDate.toISOString());
+    for (const depend of sortedDependencies) {
+        if (depend.index === this.index) {
+            continue; // ignore our namespace 0
         }
+        xw.startElement("RequiredModel");
+        xw.writeAttribute("ModelUri", depend.namespaceUri);
+        xw.writeAttribute("Version", depend.version);
+        xw.writeAttribute("PublicationDate", depend.publicationDate.toISOString());
         xw.endElement();
     }
     xw.endElement();
+    xw.endElement();
     const data = { aliases: {} };
     for (const node of this.nodeIterator()) {
         buildUpAliases(node, xw, data);