node-opcua-address-space 2.181.1 → 2.182.2

package/dist/impl/nodeset_tools/nodeset_to_xml.js

@@ -7,12 +7,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initXmlWriterEx = initXmlWriterEx;
+exports.makeTypeXsd = exports.initXmlWriterEx = exports.coerceInt64ToInt32 = void 0;
 exports._dumpVariantExtensionObjectValue_Body = _dumpVariantExtensionObjectValue_Body;
 exports._isDefaultValue = _isDefaultValue;
-exports.coerceInt64ToInt32 = coerceInt64ToInt32;
 exports.sortByBrowseName = sortByBrowseName;
-exports.makeTypeXsd = makeTypeXsd;
 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");
@@ -20,11 +18,13 @@ const node_opcua_constants_1 = require("node-opcua-constants");
 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_status_code_1 = require("node-opcua-status-code");
 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 xml_writer_1 = __importDefault(require("xml-writer"));
 const decode_xml_extension_object_js_1 = require("../../api/loader/decode_xml_extension_object.js");
+const nodeset_xml_primitives_js_1 = require("../../api/loader/nodeset_xml_primitives.js");
 const session_context_js_1 = require("../../api/session_context.js");
 const base_node_impl_js_1 = require("../base_node_impl.js");
 const namespace_impl_js_1 = require("../namespace_impl.js");
@@ -35,6 +35,10 @@ const ua_object_type_impl_js_1 = require("../ua_object_type_impl.js");
 const ua_variable_impl_js_1 = require("../ua_variable_impl.js");
 const construct_namespace_dependency_js_1 = require("./construct_namespace_dependency.js");
 const nodeset_to_records_js_1 = require("./nodeset_to_records.js");
+var nodeset_xml_primitives_js_2 = require("../../api/loader/nodeset_xml_primitives.js");
+Object.defineProperty(exports, "coerceInt64ToInt32", { enumerable: true, get: function () { return nodeset_xml_primitives_js_2.coerceInt64ToInt32; } });
+Object.defineProperty(exports, "initXmlWriterEx", { enumerable: true, get: function () { return nodeset_xml_primitives_js_2.initXmlWriterEx; } });
+Object.defineProperty(exports, "makeTypeXsd", { enumerable: true, get: function () { return nodeset_xml_primitives_js_2.makeTypeXsd; } });
 const debugLog = (0, node_opcua_debug_1.make_debugLog)("nodeset_to_xml");
 const warningLog = (0, node_opcua_debug_1.make_warningLog)("nodeset_to_xml");
 const errorLog = (0, node_opcua_debug_1.make_errorLog)("nodeset_to_xml");
@@ -56,24 +60,6 @@ function _dumpDescription(xw, node) {
         xw.startElement("Description").text(desc).endElement();
     }
 }
-function translateNodeId(xw, nodeId) {
-    (0, node_opcua_assert_1.assert)(nodeId instanceof node_opcua_nodeid_1.NodeId);
-    const nn = xw.translationTable.get(nodeId.namespace);
-    const translatedNode = new node_opcua_nodeid_1.NodeId(nodeId.identifierType, nodeId.value, nn);
-    return translatedNode;
-}
-function n(xw, nodeId) {
-    return translateNodeId(xw, nodeId).toString().replace("ns=0;", "");
-}
-function translateBrowseName(xw, browseName) {
-    (0, node_opcua_assert_1.assert)(browseName instanceof node_opcua_data_model_1.QualifiedName);
-    const nn = xw.translationTable.get(browseName.namespaceIndex);
-    const translatedBrowseName = new node_opcua_data_model_1.QualifiedName({ namespaceIndex: nn, name: browseName.name });
-    return translatedBrowseName;
-}
-function b(xw, browseName) {
-    return translateBrowseName(xw, browseName).toString().replace("ns=0;", "");
-}
 function hasHigherPriorityThan(namespaceIndex1, namespaceIndex2, priorityTable) {
     const order1 = priorityTable[namespaceIndex1];
     const order2 = priorityTable[namespaceIndex2];
@@ -106,6 +92,7 @@ function _dumpReferences(xw, node) {
     // below already tolerates it being absent.
     const connectsToReferenceType = addressSpace.findReferenceType("ConnectsTo");
     const hasEventSourceReferenceType = _mustFindReferenceType(addressSpace, "HasEventSource");
+    const hierarchicalReferencesType = _mustFindReferenceType(addressSpace, "HierarchicalReferences");
     function referenceToKeep(reference) {
         // resolved here: a reference nobody has looked at since the load carries only the NodeId of its type
         const referenceType = reference_impl_js_1.ReferenceImpl.resolveReferenceType(addressSpace, reference);
@@ -145,12 +132,30 @@ function _dumpReferences(xw, node) {
             // Organizes inverse — the current node is organized by an external folder
             return true;
         }
+        else if (referenceType.isSubtypeOf(organizesReferencesType) && reference.isForward) {
+            // Organizes forward into another namespace: the target lives in a document this export
+            // does not write, so nothing else will ever declare this reference and dropping it
+            // loses it outright. Within our own namespace the target declares the inverse and this
+            // end stays silent, exactly as the Aggregates branch above decides it
+            return targetedNamespaceIndex !== node.nodeId.namespace;
+        }
         else if (connectsToReferenceType && referenceType.isSubtypeOf(connectsToReferenceType) && reference.isForward) {
             return true;
         }
         else if (referenceType.isSubtypeOf(hasEventSourceReferenceType) && reference.isForward) {
             return true;
         }
+        else if (referenceType.isSubtypeOf(hierarchicalReferencesType)) {
+            // a hierarchical reference type the branches above do not name: a companion
+            // specification's own, such as Robotics' Requires, Controls and HasSafetyStates. Those
+            // fell through to `return false` and were dropped in both directions, so a nodeset that
+            // defines its own hierarchical reference type lost every reference that used it.
+            // Decided the way Aggregates is decided just above: this end writes the reference
+            // unless the other end has the higher priority and will write it instead
+            return reference.isForward
+                ? !_hasHigherPriorityThan(xw, targetedNamespaceIndex, node.nodeId.namespace)
+                : targetedNamespaceIndex !== node.nodeId.namespace;
+        }
         return false;
     }
     const allReferences = node.allReferences();
@@ -160,105 +165,32 @@ function _dumpReferences(xw, node) {
             continue;
         }
         xw.startElement("Reference");
-        xw.writeAttribute("ReferenceType", b(xw, (0, base_node_impl_js_1.getReferenceType)(reference).browseName));
+        xw.writeAttribute("ReferenceType", (0, nodeset_xml_primitives_js_1.b)(xw, (0, base_node_impl_js_1.getReferenceType)(reference).browseName));
         if (!reference.isForward) {
             xw.writeAttribute("IsForward", reference.isForward ? "true" : "false");
         }
-        xw.text(n(xw, reference.nodeId));
-        xw.endElement();
-    }
-    xw.endElement();
-}
-function _dumpLocalizedText(xw, v) {
-    const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-    if (v.locale?.length) {
-        xw.startElement(`${uax}Locale`);
-        xw.text(v.locale);
+        xw.text((0, nodeset_xml_primitives_js_1.n)(xw, reference.nodeId));
         xw.endElement();
     }
-    xw.startElement(`${uax}Text`);
-    if (v.text) {
-        xw.text(v.text);
-    }
-    xw.endElement();
-}
-function _dumpQualifiedName(xw, v) {
-    const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-    const t = translateBrowseName(xw, v);
-    if (t.name) {
-        xw.startElement(`${uax}Name`);
-        xw.text(t.name);
-        xw.endElement();
-    }
-    if (t.namespaceIndex) {
-        xw.startElement(`${uax}NamespaceIndex`);
-        xw.text(t.namespaceIndex.toString());
-        xw.endElement();
-    }
-}
-function _dumpXmlElement(xw, v) {
-    xw.text(v);
-}
-function initXmlWriterEx(xw, map, namespaceArray) {
-    const xwe = xw;
-    xwe.map = map;
-    xwe.stackMap = [];
-    xwe.namespaceArray = namespaceArray;
-}
-function findXsdNamespaceUri(xw, nodeId) {
-    const xwe = xw;
-    if (!xwe.namespaceArray) {
-        return "";
-    }
-    const namespace = xwe.namespaceArray[nodeId.namespace];
-    if (namespace === "http://opcfoundation.org/UA/") {
-        return "http://opcfoundation.org/UA/2008/02/Types.xsd";
-    }
-    // c8 ignore next
-    if (!namespace) {
-        return "";
-    }
-    return `${namespace.replace(/\/$/, "")}/Types.xsd`;
-}
-function getPrefix(xw, namespace) {
-    const xwe = xw;
-    if (!xwe.map)
-        return "";
-    const p = xwe.map[namespace] || "";
-    return p ? `${p}:` : "";
-}
-function restoreDefaultNamespace(xw) {
-    const xwe = xw;
-    if (!xwe.map)
-        return;
-    const previousMap = xwe.stackMap.pop();
-    if (previousMap) {
-        xwe.map = previousMap;
-    }
-}
-function setDefaultNamespace(xw, namespace) {
-    const xwe = xw;
-    if (!xwe.map)
-        return;
-    if (xwe.map[namespace] !== "") {
-        xw.writeAttribute("xmlns", namespace);
-    }
-    xwe.stackMap.push({
-        ...xwe.map
-    });
-    xwe.map[namespace] = "";
-}
-function startElementEx(xw, _ns, name, defaultNamespace) {
-    const _xwe = xw;
-    xw.startElement(name);
-    setDefaultNamespace(xw, defaultNamespace);
-}
-function _dumpNodeId(xw, v) {
-    const xmlns = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-    xw.startElement(`${xmlns}Identifier`);
-    xw.text(n(xw, v));
     xw.endElement();
 }
+/*
+<uax:ExtensionObject>
+    <uax:TypeId>
+        <uax:Identifier>i=339</uax:Identifier>
+    </uax:TypeId>
+    <uax:Body>
+        <BuildInfo xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+            <ProductUri></ProductUri>
+            <ManufacturerName></ManufacturerName>
+            <ProductName></ProductName>
+            <SoftwareVersion></SoftwareVersion>
+            <BuildNumber></BuildNumber>
+            <BuildDate>1900-01-01T00:00:00Z</BuildDate>
+        </BuildInfo>
+    </uax:Body>
+</uax:ExtensionObject>
+*/
 function _dumpVariantValue(xw, dataTypeNodeId, dataType, addressSpace, value) {
     if (value === undefined || value === null) {
         return;
@@ -266,15 +198,15 @@ function _dumpVariantValue(xw, dataTypeNodeId, dataType, addressSpace, value) {
     if (dataType === node_opcua_variant_1.DataType.Null) {
         return;
     }
-    const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+    const uax = (0, nodeset_xml_primitives_js_1.getPrefix)(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
     xw.startElement(`${uax}${node_opcua_variant_1.DataType[dataType]}`);
     const definitionMap = (0, decode_xml_extension_object_js_1.makeDefinitionMap)(addressSpace);
     _dumpVariantInnerValue(xw, dataType, dataTypeNodeId, definitionMap, addressSpace, value);
     xw.endElement();
 }
 function _dumpVariantInnerExtensionObject(xw, definitionMap, definition, addressSpace, value) {
-    const namespaceUri = findXsdNamespaceUri(xw, definition.defaultEncodingId);
-    const ns = getPrefix(xw, namespaceUri);
+    const namespaceUri = (0, nodeset_xml_primitives_js_1.findXsdNamespaceUri)(xw, definition.defaultEncodingId);
+    const ns = (0, nodeset_xml_primitives_js_1.getPrefix)(xw, namespaceUri);
     const isUnion = definition.structureType === node_opcua_types_1.StructureType.Union || definition.structureType === node_opcua_types_1.StructureType.UnionWithSubtypedValues;
     for (const field of definition.fields || []) {
         const dataTypeNodeId = field.dataType;
@@ -289,7 +221,7 @@ function _dumpVariantInnerExtensionObject(xw, definitionMap, definition, address
                 continue; // ns=0;i=0 is reserved
             }
             const { name, definition } = definitionMap.findDefinition(dataTypeNodeId);
-            startElementEx(xw, ns, fieldName, namespaceUri);
+            (0, nodeset_xml_primitives_js_1.startElementEx)(xw, ns, fieldName, namespaceUri);
             //  xw.startElement(fieldName);
             let fun = (_value) => {
                 /** */
@@ -336,14 +268,14 @@ function _dumpVariantInnerExtensionObject(xw, definitionMap, definition, address
                 }
                 // throw err;
             }
-            restoreDefaultNamespace(xw);
+            (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
             xw.endElement();
         }
         else {
             if (!isUnion && !field.isOptional) {
                 // field is mandatory but is null=> provide an empty array
-                startElementEx(xw, ns, fieldName, namespaceUri);
-                restoreDefaultNamespace(xw);
+                (0, nodeset_xml_primitives_js_1.startElementEx)(xw, ns, fieldName, namespaceUri);
+                (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
                 xw.endElement();
             }
         }
@@ -357,26 +289,26 @@ function _dumpVariantInnerValueEnum(xw, definition, value) {
     xw.text(`${field?.name}_${field?.value[1]}`);
 }
 function _dumpVariantInnerValue(xw, dataType, dataTypeNodeId, definitionMap, addressSpace, value) {
-    const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+    const uax = (0, nodeset_xml_primitives_js_1.getPrefix)(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
     switch (dataType) {
         case null:
         case node_opcua_variant_1.DataType.Null:
             break;
         case node_opcua_variant_1.DataType.LocalizedText:
-            _dumpLocalizedText(xw, value);
+            (0, nodeset_xml_primitives_js_1._dumpLocalizedText)(xw, value);
             break;
         case node_opcua_variant_1.DataType.QualifiedName:
-            _dumpQualifiedName(xw, value);
+            (0, nodeset_xml_primitives_js_1._dumpQualifiedName)(xw, value);
             break;
         case node_opcua_variant_1.DataType.NodeId:
-            _dumpNodeId(xw, value);
+            (0, nodeset_xml_primitives_js_1._dumpNodeId)(xw, value);
             break;
         case node_opcua_variant_1.DataType.DateTime:
             xw.text(value.toISOString());
             break;
         case node_opcua_variant_1.DataType.Int64:
         case node_opcua_variant_1.DataType.UInt64:
-            xw.text(value[1].toString());
+            xw.text((0, nodeset_xml_primitives_js_1.int64ToDecimalString)(value, dataType === node_opcua_variant_1.DataType.Int64));
             break;
         case node_opcua_variant_1.DataType.Boolean:
         case node_opcua_variant_1.DataType.SByte:
@@ -414,7 +346,7 @@ function _dumpVariantInnerValue(xw, dataType, dataTypeNodeId, definitionMap, add
             _dumpVariantExtensionObjectValue(xw, dataTypeNodeId, definitionMap, addressSpace, value);
             break;
         case node_opcua_variant_1.DataType.XmlElement:
-            _dumpXmlElement(xw, value);
+            (0, nodeset_xml_primitives_js_1._dumpXmlElement)(xw, value);
             break;
         case node_opcua_variant_1.DataType.StatusCode:
             xw.text(value.value.toString());
@@ -438,13 +370,13 @@ function _dumpVariantInnerValue(xw, dataType, dataTypeNodeId, definitionMap, add
  */
 function _dumpVariantExtensionObjectValue_Body(xw, definitionMap, name, definition, addressSpace, value) {
     if (value) {
-        const namespaceUri = findXsdNamespaceUri(xw, definition.defaultEncodingId);
-        const ns = getPrefix(xw, namespaceUri);
-        startElementEx(xw, ns, `${name}`, namespaceUri);
+        const namespaceUri = (0, nodeset_xml_primitives_js_1.findXsdNamespaceUri)(xw, definition.defaultEncodingId);
+        const ns = (0, nodeset_xml_primitives_js_1.getPrefix)(xw, namespaceUri);
+        (0, nodeset_xml_primitives_js_1.startElementEx)(xw, ns, `${name}`, namespaceUri);
         if (value) {
             _dumpVariantInnerExtensionObject(xw, definitionMap, definition, addressSpace, value);
         }
-        restoreDefaultNamespace(xw);
+        (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
         xw.endElement();
     }
 }
@@ -457,23 +389,23 @@ function _dumpVariantExtensionObjectValue(xw, dataTypeNodeId, definitionMap, add
         // throw new Error("Extension Object doesn't provide a XML ");
         return;
     }
-    const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-    startElementEx(xw, uax, `ExtensionObject`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+    const uax = (0, nodeset_xml_primitives_js_1.getPrefix)(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+    (0, nodeset_xml_primitives_js_1.startElementEx)(xw, uax, `ExtensionObject`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
     {
-        const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+        const uax = (0, nodeset_xml_primitives_js_1.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.text((0, nodeset_xml_primitives_js_1.n)(xw, encodingDefaultXml));
         xw.endElement();
         xw.endElement();
-        startElementEx(xw, uax, "Body", "http://opcfoundation.org/UA/2008/02/Types.xsd");
+        (0, nodeset_xml_primitives_js_1.startElementEx)(xw, uax, "Body", "http://opcfoundation.org/UA/2008/02/Types.xsd");
         _dumpVariantExtensionObjectValue_Body(xw, definitionMap, name, definition, addressSpace, value);
-        restoreDefaultNamespace(xw);
+        (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
         xw.endElement();
     }
-    restoreDefaultNamespace(xw);
+    (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
     xw.endElement();
 }
 function _dumpVariantExtensionObjectValue2(xw, addressSpace, value) {
@@ -526,7 +458,7 @@ function _isDefaultValue(value) {
                 break;
             case node_opcua_variant_1.DataType.Int64:
             case node_opcua_variant_1.DataType.UInt64:
-                if (0 === coerceInt64ToInt32(value.value)) {
+                if (0 === (0, nodeset_xml_primitives_js_1.coerceInt64ToInt32)(value.value)) {
                     return true;
                 }
                 break;
@@ -565,7 +497,6 @@ function _dumpValue(xw, node, variant) {
         doDebug && debugLog("Cannot find dataType:", node.dataType.toString());
         return;
     }
-    const dataTypeName = dataTypeNode.browseName.name?.toString();
     const baseDataTypeName = node_opcua_variant_1.DataType[variant.dataType];
     if (baseDataTypeName === "Null") {
         return;
@@ -573,19 +504,22 @@ function _dumpValue(xw, node, variant) {
     (0, node_opcua_assert_1.assert)(typeof baseDataTypeName === "string");
     // determine if dataTypeName is a ExtensionObject
     const isExtensionObject = variant.dataType === node_opcua_variant_1.DataType.ExtensionObject;
-    if (_isDefaultValue(variant)) {
+    // nothing to serialize: a scalar with no value, or an array that is null rather than empty.
+    // This is the one thing _isDefaultValue used to catch here that still needs catching -- it is
+    // a test for the absence of a value, not for a value that happens to equal a type's default
+    if (variant.value === null || variant.value === undefined) {
         return;
     }
     xw.startElement("Value");
-    const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+    const uax = (0, nodeset_xml_primitives_js_1.getPrefix)(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
     if (isExtensionObject) {
         const encodeXml = _dumpVariantExtensionObjectValue2.bind(null, xw, node.addressSpace);
         switch (variant.arrayType) {
             case node_opcua_variant_1.VariantArrayType.Matrix:
             case node_opcua_variant_1.VariantArrayType.Array:
-                startElementEx(xw, uax, `ListOf${baseDataTypeName}`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+                (0, nodeset_xml_primitives_js_1.startElementEx)(xw, uax, `ListOf${baseDataTypeName}`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
                 variant.value.forEach(encodeXml);
-                restoreDefaultNamespace(xw);
+                (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
                 xw.endElement();
                 break;
             case node_opcua_variant_1.VariantArrayType.Scalar:
@@ -601,9 +535,13 @@ function _dumpValue(xw, node, variant) {
         switch (variant.arrayType) {
             case node_opcua_variant_1.VariantArrayType.Matrix:
             case node_opcua_variant_1.VariantArrayType.Array:
-                startElementEx(xw, uax, `ListOf${dataTypeName}`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
+                // the built-in type, not the DataType's browse name: the uax schema defines
+                // ListOfInt32 and ListOfString, and nothing named after a nodeset's own DataType.
+                // A `ListOfIdType` is not an element any reader knows, so the reader that meets it
+                // walks straight past into the first child and takes the array for a scalar
+                (0, nodeset_xml_primitives_js_1.startElementEx)(xw, uax, `ListOf${baseDataTypeName}`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
                 variant.value.forEach(encodeXml);
-                restoreDefaultNamespace(xw);
+                (0, nodeset_xml_primitives_js_1.restoreDefaultNamespace)(xw);
                 xw.endElement();
                 break;
             case node_opcua_variant_1.VariantArrayType.Scalar:
@@ -617,12 +555,17 @@ function _dumpValue(xw, node, variant) {
     xw.endElement();
 }
 function _dumpArrayDimensionsAttribute(xw, node) {
-    if (node.arrayDimensions) {
-        if (node.valueRank === -1 || (node.arrayDimensions.length === 1 && node.arrayDimensions[0] === 0)) {
-            return;
-        }
-        xw.writeAttribute("ArrayDimensions", node.arrayDimensions.join(","));
-    }
+    // ArrayDimensions="0" is written only when the document declared it: node-opcua synthesizes [0]
+    // on the variables it generates, so writing it unconditionally would invent the attribute on
+    // every generated node. See arrayDimensionsWereDeclared in nodeset_record_applier
+    if (!node.arrayDimensions || node.valueRank <= 0)
+        return;
+    // all-zero dimensions are what node-opcua synthesizes when nobody declared any, at whatever
+    // rank: [0] for a one-dimensional value, [0,0] for a matrix
+    const degenerate = node.arrayDimensions.every((d) => d === 0);
+    if (degenerate && !node.arrayDimensionsWereDeclared)
+        return;
+    xw.writeAttribute("ArrayDimensions", node.arrayDimensions.join(","));
 }
 function getParent(node) {
     if (node instanceof ua_variable_impl_js_1.UAVariableImpl || node instanceof ua_method_impl_js_1.UAMethodImpl || node instanceof ua_object_impl_js_1.UAObjectImpl) {
@@ -632,17 +575,21 @@ function getParent(node) {
 }
 const currentReadFlag = (0, node_opcua_data_model_1.makeAccessLevelFlag)("CurrentRead");
 function dumpCommonAttributes(xw, node) {
-    xw.writeAttribute("NodeId", n(xw, node.nodeId));
-    xw.writeAttribute("BrowseName", b(xw, node.browseName));
+    xw.writeAttribute("NodeId", (0, nodeset_xml_primitives_js_1.n)(xw, node.nodeId));
+    xw.writeAttribute("BrowseName", (0, nodeset_xml_primitives_js_1.b)(xw, node.browseName));
     const parentNode = getParent(node);
     if (parentNode) {
         if (parentNode.nodeId.namespace <= node.nodeId.namespace) {
-            xw.writeAttribute("ParentNodeId", n(xw, parentNode.nodeId));
+            xw.writeAttribute("ParentNodeId", (0, nodeset_xml_primitives_js_1.n)(xw, parentNode.nodeId));
         }
     }
     if (Object.hasOwn(node, "symbolicName")) {
         xw.writeAttribute("SymbolicName", node.symbolicName);
     }
+    // Released is the default and is left unwritten; the other two the document declared
+    if (node.releaseStatus) {
+        xw.writeAttribute("ReleaseStatus", node.releaseStatus);
+    }
     if (Object.hasOwn(node, "isAbstract")) {
         const isAbstract = node.isAbstract;
         if (isAbstract) {
@@ -667,8 +614,11 @@ function dumpCommonAttributes(xw, node) {
     }
     // access policy: undefined means "inherit from the namespace", an empty rolePermissions array
     // means "this node deliberately grants nothing".
-    if (node.accessRestrictions !== undefined) {
-        xw.writeAttribute("AccessRestrictions", node.accessRestrictions.toString());
+    // what the document declared, which survives whatever the loader was asked to enforce; the
+    // enforced flag is the fallback for a node built in code rather than loaded
+    const accessRestrictions = node.declaredAccessRestrictions ?? node.accessRestrictions?.toString();
+    if (accessRestrictions !== undefined) {
+        xw.writeAttribute("AccessRestrictions", accessRestrictions);
     }
     if (node.rolePermissions !== undefined && node.rolePermissions.length === 0) {
         xw.writeAttribute("HasNoPermissions", "true");
@@ -679,6 +629,19 @@ function dumpCommonAttributes(xw, node) {
             xw.writeAttribute("MinimumSamplingInterval", minimumSamplingInterval);
         }
     }
+    // EventNotifier lives on UAObject, UAObjectType and UAView in the XSD. 0 is the default and is
+    // left unwritten; anything else the document declared. It was written nowhere at all until now,
+    // so every node that declared one lost it on the way out
+    if (node.nodeClass === node_opcua_data_model_1.NodeClass.Object || node.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType || node.nodeClass === node_opcua_data_model_1.NodeClass.View) {
+        // typeof, not truthiness: a node with a child called "EventNotifier" resolves the name to
+        // that child through the shared child accessors, so `node.eventNotifier` is a BaseNode
+        // there and not the attribute. PublishedEventsType is one, and stringifying it wrote a
+        // whole node dump into the attribute
+        const eventNotifier = node.eventNotifier;
+        if (typeof eventNotifier === "number" && eventNotifier !== 0) {
+            xw.writeAttribute("EventNotifier", eventNotifier.toString());
+        }
+    }
     // Historizing exists in the XSD on UAVariable only: UAVariableType is restricted to
     // DataType/ValueRank/ArrayDimensions. UAVariableTypeImpl nevertheless owns a `historizing`
     // property, so the node class must be tested here rather than the presence of the property.
@@ -699,7 +662,7 @@ function _dumpRolePermissions(xw, node) {
     for (const rolePermission of rolePermissions) {
         xw.startElement("RolePermission");
         xw.writeAttribute("Permissions", rolePermission.permissions.toString());
-        xw.text(n(xw, rolePermission.roleId));
+        xw.text((0, nodeset_xml_primitives_js_1.n)(xw, rolePermission.roleId));
         xw.endElement();
     }
     xw.endElement();
@@ -710,25 +673,13 @@ function dumpCommonElements(xw, node) {
     _dumpReferences(xw, node);
     _dumpRolePermissions(xw, node);
 }
-function coerceInt64ToInt32(int64) {
-    if (typeof int64 === "number") {
-        return int64;
-    }
-    if (int64[0] === 0xffffffff && int64[1] === 0xffffffff) {
-        return 0xffffffff;
-    }
-    if (int64[0] !== 0) {
-        warningLog("coerceInt64ToInt32 , loosing high word in conversion");
-    }
-    return int64[1];
-}
 function _dumpEnumDefinition(xw, enumDefinition) {
     enumDefinition.fields = enumDefinition.fields || [];
     for (const defItem of enumDefinition.fields) {
         xw.startElement("Field");
         xw.writeAttribute("Name", defItem.name);
         if (!(0, node_opcua_utils_1.isNullOrUndefined)(defItem.value)) {
-            xw.writeAttribute("Value", coerceInt64ToInt32(defItem.value));
+            xw.writeAttribute("Value", (0, nodeset_xml_primitives_js_1.coerceInt64ToInt32)(defItem.value));
         }
         _dumpDescription(xw, defItem);
         xw.endElement();
@@ -744,6 +695,11 @@ function _dumpStructureDefinition(xw, structureDefinition, baseStructureDefiniti
     // do not repeat elements that are already defined in base structure in the xml ouput!
     const fields = structureDefinition.fields || [];
     const nbFieldsInBase = baseStructureDefinition ? baseStructureDefinition.fields?.length || 0 : 0;
+    // Part 3 8.51: in a *WithSubtypedValues structure, isOptional is where "subtyping allowed" is
+    // held, and the document spells that AllowSubTypes. Written as IsOptional it said the opposite
+    // of what it meant, and the AllowSubTypes the document had was simply gone
+    const subtypedValues = structureDefinition.structureType === node_opcua_types_1.StructureType.StructureWithSubtypedValues ||
+        structureDefinition.structureType === node_opcua_types_1.StructureType.UnionWithSubtypedValues;
     for (let index = nbFieldsInBase; index < fields.length; index++) {
         const defItem = fields[index];
         xw.startElement("Field");
@@ -754,8 +710,8 @@ function _dumpStructureDefinition(xw, structureDefinition, baseStructureDefiniti
         if (defItem.valueRank !== undefined && defItem.valueRank !== -1) {
             xw.writeAttribute("ValueRank", defItem.valueRank);
         }
-        if (defItem.isOptional /* && defItem.isOptional !== false */) {
-            xw.writeAttribute("IsOptional", defItem.isOptional.toString());
+        if (defItem.isOptional) {
+            xw.writeAttribute(subtypedValues ? "AllowSubTypes" : "IsOptional", "true");
         }
         if (defItem.maxStringLength !== undefined && defItem.maxStringLength !== 0) {
             xw.writeAttribute("MaxStringLength", defItem.maxStringLength);
@@ -763,7 +719,7 @@ function _dumpStructureDefinition(xw, structureDefinition, baseStructureDefiniti
         // todo : SymbolicName ( see AutoId )
         if (defItem.dataType) {
             // todo : namespace translation !
-            xw.writeAttribute("DataType", n(xw, defItem.dataType));
+            xw.writeAttribute("DataType", (0, nodeset_xml_primitives_js_1.n)(xw, defItem.dataType));
         }
         _dumpDescription(xw, defItem);
         xw.endElement();
@@ -771,9 +727,32 @@ function _dumpStructureDefinition(xw, structureDefinition, baseStructureDefiniti
 }
 function _dumpUADataTypeDefinition(xw, uaDataType) {
     const uaDataTypeBase = uaDataType.subtypeOfObj;
+    // an OptionSet first: node-opcua builds neither an enumeration nor a structure for one, so
+    // neither branch below would fire and the whole <Definition> would be dropped. The fields are
+    // the ones the loader kept, see UADataTypeImpl.isOptionSetDataType
+    const asImpl = uaDataType;
+    // what the document called this definition, or -- for a DataType built here, which never had a
+    // declaration -- the browse name, which is the only name available
+    const definitionName = asImpl.declaredDefinitionName ?? (0, nodeset_xml_primitives_js_1.b)(xw, uaDataType.browseName);
+    if (asImpl.isOptionSetDataType && asImpl.declaredDefinitionFields) {
+        xw.startElement("Definition");
+        xw.writeAttribute("Name", definitionName);
+        xw.writeAttribute("IsOptionSet", "true");
+        for (const field of asImpl.declaredDefinitionFields) {
+            xw.startElement("Field");
+            xw.writeAttribute("Name", field.name || "");
+            if (field.value !== undefined && field.value !== null) {
+                xw.writeAttribute("Value", field.value);
+            }
+            _dumpDescription(xw, field);
+            xw.endElement();
+        }
+        xw.endElement();
+        return;
+    }
     if (uaDataType.isEnumeration()) {
         xw.startElement("Definition");
-        xw.writeAttribute("Name", b(xw, uaDataType.browseName));
+        xw.writeAttribute("Name", definitionName);
         _dumpEnumDefinition(xw, uaDataType.getEnumDefinition());
         xw.endElement();
         return;
@@ -785,9 +764,11 @@ function _dumpUADataTypeDefinition(xw, uaDataType) {
         const t = true;
         if (t || dataValue.statusCode.isGood()) {
             const definition = uaDataType.getStructureDefinition();
-            const baseDefinition = uaDataTypeBase ? uaDataTypeBase.getStructureDefinition() : null;
+            // a structure's supertype need not be a structure: `Structure` itself subtypes BaseDataType,
+            // which has no definition at all. Asking it for one threw, and took the whole export with it
+            const baseDefinition = uaDataTypeBase?.isStructure() ? uaDataTypeBase.getStructureDefinition() : null;
             xw.startElement("Definition");
-            xw.writeAttribute("Name", b(xw, uaDataType.browseName));
+            xw.writeAttribute("Name", definitionName);
             if (definition.structureType === node_opcua_types_1.StructureType.Union) {
                 xw.writeAttribute("IsUnion", "true");
             }
@@ -800,16 +781,16 @@ function _dumpUADataTypeDefinition(xw, uaDataType) {
 function dumpUAView(xw, node) {
     _markAsVisited(xw, node);
     xw.startElement("UAView");
-    xw.writeAttribute("NodeId", n(xw, node.nodeId));
-    xw.writeAttribute("BrowseName", b(xw, node.browseName));
+    xw.writeAttribute("NodeId", (0, nodeset_xml_primitives_js_1.n)(xw, node.nodeId));
+    xw.writeAttribute("BrowseName", (0, nodeset_xml_primitives_js_1.b)(xw, node.browseName));
     dumpCommonElements(xw, node);
     xw.endElement();
 }
 function dumpUADataType(xw, node) {
     _markAsVisited(xw, node);
     xw.startElement("UADataType");
-    xw.writeAttribute("NodeId", n(xw, node.nodeId));
-    xw.writeAttribute("BrowseName", b(xw, node.browseName));
+    xw.writeAttribute("NodeId", (0, nodeset_xml_primitives_js_1.n)(xw, node.nodeId));
+    xw.writeAttribute("BrowseName", (0, nodeset_xml_primitives_js_1.b)(xw, node.browseName));
     if (node.symbolicName !== node.browseName.name) {
         xw.writeAttribute("SymbolicName", node.symbolicName);
     }
@@ -845,15 +826,21 @@ function dumpUAVariable(xw, node) {
         if (dataTypeNode) {
             // verify that data Type is in alias
             // xx const dataTypeName = dataTypeNode.browseName.toString();
-            const dataTypeName = b(xw, resolveDataTypeName(addressSpace, dataTypeNode.nodeId));
+            const dataTypeName = (0, nodeset_xml_primitives_js_1.b)(xw, resolveDataTypeName(addressSpace, dataTypeNode.nodeId));
             xw.writeAttribute("DataType", dataTypeName);
         }
     }
     {
         // sub elements
         dumpCommonElements(xw, node);
-        const value = node.$dataValue.value;
-        if (value) {
+        // a value the loader made up for a variable the document left unvalued is not written
+        // back out; see valueWasSynthesized in nodeset_record_applier. What used to stand here was
+        // _isDefaultValue, which dropped every zero and every empty string alike -- suppressing the
+        // made-up ones at the cost of the ones the document really did declare
+        const synthesized = node.valueWasSynthesized;
+        const dataValue = node.$dataValue;
+        const value = dataValue.value;
+        if (value && !synthesized && !dataValue.statusCode.equals(node_opcua_status_code_1.StatusCodes.BadWaitingForInitialData)) {
             _dumpValue(xw, node, value);
         }
     }
@@ -885,7 +872,7 @@ function dumpUAVariableType(xw, node) {
                     node.nodeId.toString());
         }
         else {
-            const dataTypeName = b(xw, resolveDataTypeName(addressSpace, dataTypeNode.nodeId));
+            const dataTypeName = (0, nodeset_xml_primitives_js_1.b)(xw, resolveDataTypeName(addressSpace, dataTypeNode.nodeId));
             xw.writeAttribute("DataType", dataTypeName);
         }
     }
@@ -928,7 +915,7 @@ function dumpUAMethod(xw, node) {
     xw.startElement("UAMethod");
     dumpCommonAttributes(xw, node);
     if (node.methodDeclarationId) {
-        xw.writeAttribute("MethodDeclarationId", n(xw, node.methodDeclarationId));
+        xw.writeAttribute("MethodDeclarationId", (0, nodeset_xml_primitives_js_1.n)(xw, node.methodDeclarationId));
     }
     dumpCommonElements(xw, node);
     xw.endElement();
@@ -1056,9 +1043,6 @@ base_node_impl_js_1.BaseNodeImpl.prototype.dumpXML = function (xw) {
     xw.translationTable = xw.translationTable || translationTable;
     writeWalkEvents(xw, this.addressSpace, translationTable, events);
 };
-function makeTypeXsd(namespaceUri) {
-    return `${namespaceUri.replace(/\/$/, "")}/Type.xsd`;
-}
 namespace_impl_js_1.NamespaceImpl.prototype.toNodeset2XML = function () {
     const namespaceArrayNode = this.addressSpace.findNode(node_opcua_constants_1.VariableIds.Server_NamespaceArray);
     const namespaceArray = namespaceArrayNode
@@ -1091,10 +1075,10 @@ namespace_impl_js_1.NamespaceImpl.prototype.toNodeset2XML = function () {
         }
         const translatedIndex = translationTable.get(namespace.index);
         const smallName = `ns${translatedIndex}`;
-        xw.writeAttribute(`xmlns:${smallName}`, makeTypeXsd(namespace.namespaceUri));
+        xw.writeAttribute(`xmlns:${smallName}`, (0, nodeset_xml_primitives_js_1.makeTypeXsd)(namespace.namespaceUri));
         namespacesMap[namespace.namespaceUri] = smallName;
     }
-    initXmlWriterEx(xw, namespacesMap, namespaceArray);
+    (0, nodeset_xml_primitives_js_1.initXmlWriterEx)(xw, namespacesMap, namespaceArray);
     xw.startElement("NamespaceUris");
     for (const namespaceUri of header.namespaceUris) {
         xw.startElement("Uri");