node-opcua-address-space 2.181.1 → 2.182.2

package/distNodeJS/generate_address_space.js

@@ -55,6 +55,10 @@ const nodeset_image_file_store_js_1 = require("./nodeset_image_file_store.js");
 // a 200 KB image, and in the thread pool, so that the XML hash runs alongside
 const gunzipAsync = (0, node_util_1.promisify)(node_zlib_1.gunzip);
 (0, index_js_1.setImageInflater)(async (image) => (await gunzipAsync(image)).toString("utf8"));
+// and out through zlib at level 9: CompressionStream has no level to ask for, and an image is
+// written once and read many times, so the extra work at build time is free at load time
+const gzipAsync = (0, node_util_1.promisify)(node_zlib_1.gzip);
+(0, index_js_1.setImageDeflater)(async (text) => new Uint8Array(await gzipAsync(Buffer.from(text, "utf8"), { level: 9 })));
 const _doDebug = (0, node_opcua_debug_1.checkDebugFlag)("generate_address_space");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)("generate_address_space");
 const errorLog = (0, node_opcua_debug_1.make_errorLog)("generate_address_space");

package/distNodeJS/generate_address_space.js.map

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

package/impl/_instantiate_helpers.ts

@@ -6,6 +6,7 @@ import {
     CloneHelper,
     reconstructFunctionalGroupType,
     reconstructNonHierarchicalReferences,
+    reconstructSharedHierarchicalReferences,
     type UAMethod,
     type UAObject,
     type UAObjectType,
@@ -153,6 +154,8 @@ export function initialize_properties_and_components<
     reconstructFunctionalGroupType(extraInfo);
 
     reconstructNonHierarchicalReferences(extraInfo);
+
+    reconstructSharedHierarchicalReferences(extraInfo);
 }
 
 function instantiate_interface_children<B extends UAObject | UAVariable | UAMethod>(

package/impl/alarms_and_conditions/ua_alarm_condition_impl.ts

@@ -76,6 +76,16 @@ export class UAAlarmConditionImplBase extends UAAcknowledgeableConditionImplBase
         }
 
         options.optionals = options.optionals || [];
+        // ActiveState is a TwoStateVariable whose texts and transition times an alarm client
+        // expects, as UAConditionImpl requests them for EnabledState. A subtype that re-declares
+        // ActiveState with only Id (ExclusiveLimitAlarmType does) would otherwise get only Id.
+        options.optionals.push(
+            "ActiveState.TrueState",
+            "ActiveState.FalseState",
+            "ActiveState.TransitionTime",
+            "ActiveState.EffectiveTransitionTime",
+            "ActiveState.EffectiveDisplayName"
+        );
         if (Object.hasOwn(options, "maxTimeShelved")) {
             options.optionals.push("MaxTimeShelved");
             assert(Number.isFinite(options.maxTimeShelved));

package/impl/alarms_and_conditions/ua_certificate_expiration_alarm_impl.ts

@@ -72,6 +72,23 @@ class UACertificateExpirationAlarmImplBase extends UASystemOffNormalAlarmImpl im
     }
 
     public updateAlarmState2(isActive: boolean, severity: number, message: string) {
+        // A Condition reports its state *changes* (Part 9 5.5.2). This alarm is re-evaluated on
+        // timers - its own every half hour, push certificate management every minute - and a
+        // re-evaluation that finds the same verdict must stay silent: it used to raise a new
+        // "certificate ... is OK!" event on the Server object at every check, an unsolicited
+        // event every minute on any server with push certificate management installed (FEAT-24:
+        // CTT Subscription Minimum 02 020 subscribes to the Server events and expects none while
+        // it only writes to plain variables).
+        const branch = this.currentBranch();
+        if (
+            branch &&
+            branch.getActiveState() === isActive &&
+            branch.getSeverity() === severity &&
+            (branch.getMessage()?.text || "") === message
+        ) {
+            return;
+        }
+
         isActive ? this.activateAlarm() : this.deactivateAlarm();
 
         this.raiseNewCondition({

package/impl/base_node_impl.ts

@@ -176,6 +176,10 @@ export interface InternalBaseNodeOptions {
      */
     accessRestrictions?: AccessRestrictionsFlag;
     rolePermissions?: RolePermissionTypeOptions[];
+    /** "Draft" or "Deprecated" as the nodeset declared it; see BaseNode.releaseStatus */
+    releaseStatus?: "Draft" | "Deprecated";
+    /** the AccessRestrictions as declared, whatever this loader applies; see BaseNode */
+    declaredAccessRestrictions?: string;
 }
 
 function _is_valid_BrowseDirection(browseDirection: BrowseDirection) {
@@ -216,6 +220,11 @@ export abstract class BaseNodeImpl<T extends BaseNodeEvents & ListenerSignature<
         return makeAttributeEventName(attributeId);
     }
 
+    /** see BaseNode.releaseStatus; only set when the nodeset declared one, so that it costs
+     * nothing on the overwhelming majority of nodes, which are Released */
+    public releaseStatus?: "Draft" | "Deprecated";
+    /** see BaseNode.declaredAccessRestrictions */
+    public declaredAccessRestrictions?: string;
     private _accessRestrictions?: AccessRestrictionsFlag;
     private _rolePermissions?: RolePermissionType[];
 
@@ -431,6 +440,12 @@ export abstract class BaseNodeImpl<T extends BaseNodeEvents & ListenerSignature<
 
         this._accessRestrictions = options.accessRestrictions;
         this._rolePermissions = coerceRolePermissions(options.rolePermissions);
+        if (options.releaseStatus) {
+            this.releaseStatus = options.releaseStatus;
+        }
+        if (options.declaredAccessRestrictions !== undefined) {
+            this.declaredAccessRestrictions = options.declaredAccessRestrictions;
+        }
 
         // make `parent.<thisName>` resolve to this node: through a getter shared by every node when
         // a nodeset is loading (defined in one batch by the loader, see flushSharedChildAccessors),

package/impl/base_node_private.ts

@@ -30,6 +30,7 @@ import {
     type LocalizedText,
     type LocalizedTextLike,
     NodeClass,
+    type QualifiedName,
     ResultMask
 } from "node-opcua-data-model";
 import type { DataValue } from "node-opcua-data-value";
@@ -516,7 +517,7 @@ export function VariableOrVariableType_toString(this: UAVariableType | UAVariabl
 }
 
 /**
- *
+ * A subtype (or an instance) may re-declare a child that its base type already declares:
  *
  *    MyDeriveType  ------------------- -> MyBaseType    --------------> TopologyElementType
  *        |                                   |                                   |
@@ -525,137 +526,71 @@ export function VariableOrVariableType_toString(this: UAVariableType | UAVariabl
  *                  +- Foo1                            |
  *                                                     +- Bar
  *
- *    Instance
- *
- * @param newParent
- * @param node
- * @param copyAlsoModellingRules
- * @param optionalFilter
- * @param extraInfo
- * @param browseNameMap
- * @returns
+ * The instance gets ONE ParameterSet, cloned from the nearest declaration (Foo1), into which the
+ * base declarations are merged (Bar): see _base_declarations_of and _merge_base_declaration.
  */
-function _clone_children_on_template(
-    nodeToClone: UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
-    newParent: BaseNode,
-    node: BaseNode,
-    copyAlsoModellingRules: boolean,
-    optionalFilter: CloneFilter,
-    extraInfo: CloneExtraInfo
-) {
-    /**
-     * the type definition node of the node to clone
-     */
-    const nodeToCloneTypeDefinition =
-        nodeToClone.nodeClass === NodeClass.ObjectType || nodeToClone.nodeClass === NodeClass.VariableType
-            ? nodeToClone.subtypeOfObj
-            : null;
-    if (!nodeToCloneTypeDefinition) return;
-
-    // c8 ignore next
-    doTrace &&
-        traceLog(
-            extraInfo?.pad(),
-            chalk.gray(
-                "-------------------- now cloning children on template ",
-                node.browseName.toString(),
-                node.nodeId.toString(),
-                nodeToCloneTypeDefinition.browseName.toString()
-            )
-        );
-
-    const namespace = newParent.namespace;
-
-    /**
-     * the child node of the new parent that match the node to clone or enrich
-     */
-    const newParentChild = newParent.getChildByName(node.browseName);
-    if (!newParentChild) {
-        return;
+/**
+ * the declarations, on the supertypes of `type`, of the child that `type` declares under
+ * `browseName`, nearest supertype first; none when `type` is not a type
+ */
+function _base_declarations_of(type: BaseNode, browseName: QualifiedName): BaseNode[] {
+    if (type.nodeClass !== NodeClass.ObjectType && type.nodeClass !== NodeClass.VariableType) {
+        return [];
     }
-    // we have found a matching child on the new parent.
-    // the mission is to enrich this child node with components and properties that
-    // exist also in the template
-
-    let typeDefinitionNode: UAVariableType | UAObjectType | null = nodeToCloneTypeDefinition;
-    while (typeDefinitionNode) {
-        // c8 ignore next
-        doTrace &&
-            traceLog(
-                extraInfo?.pad(),
-                chalk.green(
-                    "-------------------- now cloning children on ",
-                    newParentChild.browseName.toString(),
-                    newParentChild.nodeId.toString(),
-                    " (child of ",
-                    node.browseName.toString(),
-                    node.nodeId.toString(),
-                    ") from ",
-                    typeDefinitionNode.browseName.toString()
-                )
-            );
-
-        // Find aggregates with same browseName as node. Do not search children as this includes nodes with HasSubType relation which we do
-        // not want. See issue #1326.
-        const aggregates = typeDefinitionNode.getAggregates().filter((n) => n.browseName.equals(node.browseName));
-        const typeDefinitionChild = aggregates.length > 0 ? aggregates[0] : null;
-        if (typeDefinitionChild) {
-            const references = typeDefinitionChild.findReferencesEx("Aggregates", BrowseDirection.Forward);
-
-            for (const ref of references) {
-                const grandChild = ref.node as UAVariable | UAObject | UAMethod;
-                if (grandChild.modellingRule === "MandatoryPlaceholder" || grandChild.modellingRule === "OptionalPlaceholder")
-                    continue;
-                // if not already node present in new Parent => just ignore
-                const hasAlready = newParentChild.getChildByName(grandChild.browseName) !== null;
-                if (!hasAlready) {
-                    if (optionalFilter && node && !optionalFilter.shouldKeep(node)) {
-                        // c8 ignore next
-                        doTrace &&
-                            traceLog(
-                                extraInfo.pad(),
-                                "skipping optional ",
-                                node.browseName.toString(),
-                                "that doesn't appear in the filter"
-                            );
-                        continue; // skip this node
-                    }
-
-                    const options = {
-                        namespace,
-                        references: [
-                            new ReferenceImpl({
-                                referenceType: ref.referenceType,
-                                isForward: false,
-                                nodeId: newParentChild.nodeId
-                            })
-                        ],
-                        copyAlsoModellingRules
-                    };
-
-                    const alreadyCloned = extraInfo.getCloned({
-                        originalParent: nodeToClone,
-                        clonedParent: newParent,
-                        originalNode: grandChild
-                    });
-                    if (alreadyCloned) {
-                        alreadyCloned.addReference({
-                            referenceType: ref.referenceType,
-                            isForward: false,
-                            nodeId: newParentChild.nodeId
-                        });
-                    } else {
-                        const clonedGrandChild = grandChild.clone(options, optionalFilter, extraInfo);
-                        extraInfo.registerClonedObject({
-                            originalNode: grandChild,
-                            clonedNode: clonedGrandChild
-                        });
-                    }
-                }
-            }
+    const result: BaseNode[] = [];
+    let base = (type as UAObjectType | UAVariableType).subtypeOfObj;
+    while (base) {
+        // aggregates only: a child lookup would also follow HasSubtype (issue #1326)
+        const declaration = base.getAggregates().find((n) => n.browseName.equals(browseName));
+        if (declaration) {
+            result.push(declaration);
         }
-        typeDefinitionNode = typeDefinitionNode.subtypeOfObj;
+        base = base.subtypeOfObj;
     }
+    return result;
+}
+
+/**
+ * record `cloned` as the clone of `original` and, by browse name, each child the clone already
+ * has as the clone of the matching child of `original`, recursively: a later reference to any
+ * of them then lands on the existing node instead of a second copy
+ */
+function _register_existing_children(original: BaseNode, cloned: BaseNode, extraInfo: CloneExtraInfo): void {
+    extraInfo.registerClonedObject({ originalNode: original, clonedNode: cloned });
+    for (const ref of original.findReferencesEx("Aggregates", BrowseDirection.Forward)) {
+        const child = ref.node;
+        if (!child) continue;
+        const existing = cloned.getChildByName(child.browseName);
+        if (!existing) continue;
+        _register_existing_children(child, existing, extraInfo);
+    }
+}
+
+/**
+ * `clonedNode` was cloned from a declaration that shadows `baseDeclaration` (a subtype or an
+ * instance re-declaring a child of a base type). What the clone already has is recorded as the
+ * clone of the base declaration's same-named children; what the base declaration adds is cloned
+ * in, subject to the same filter and the same browse-name guard as the clone's own children.
+ */
+function _merge_base_declaration(
+    baseDeclaration: BaseNode,
+    clonedNode: BaseNode,
+    copyAlsoModellingRules: boolean,
+    optionalFilter: CloneFilter,
+    extraInfo: CloneExtraInfo,
+    browseNameMap: Set<string>
+): void {
+    // c8 ignore next
+    doTrace && traceLog(extraInfo.pad(), "merging base declaration ", fullPath2(baseDeclaration), " into ", fullPath2(clonedNode));
+    _register_existing_children(baseDeclaration, clonedNode, extraInfo);
+    _clone_hierarchical_references(
+        baseDeclaration as UAObject | UAVariable | UAMethod,
+        clonedNode as UAObject | UAVariable | UAMethod,
+        copyAlsoModellingRules,
+        optionalFilter,
+        extraInfo,
+        browseNameMap
+    );
 }
 
 /*
@@ -707,27 +642,31 @@ function _clone_collection_new(
         }
         const key = `${newParent.nodeId.toString()}(${newParent.browseName.toString()})/${node.browseName.toString()}`;
         if (browseNameMap?.has(key)) {
-            _clone_children_on_template(nodeToClone, newParent, node, copyAlsoModellingRules, optionalFilter, extraInfo);
-            doTrace &&
-                traceLog(
-                    extraInfo.pad(),
-                    "skipping required node with same browseName",
-                    fullPath2(node),
-                    "because it has already been cloned",
-                    "key=",
-                    key
+            // a same-named child was cloned already, from a nearer declaration: this one is a
+            // base declaration of it, merge what it adds
+            doTrace && traceLog(extraInfo.pad(), "node with same browseName already cloned, merging", fullPath2(node), "key=", key);
+            const existing = newParent.getChildByName(node.browseName);
+            if (existing) {
+                _merge_base_declaration(
+                    node,
+                    existing,
+                    copyAlsoModellingRules,
+                    optionalFilter.filterFor(existing as UAObject | UAVariable | UAMethod),
+                    extraInfo,
+                    new Set<string>()
                 );
-
+            }
             continue; // skipping node with same browseName
         }
         browseNameMap?.add(key);
 
         // assert(reference.isForward);
         // assert(reference.referenceType instanceof NodeId, "" + reference.referenceType.toString());
-        const options = {
+        const options: CloneOptions = {
             namespace,
             references: [new ReferenceImpl({ referenceType: reference.referenceType, isForward: false, nodeId: newParent.nodeId })],
-            copyAlsoModellingRules
+            copyAlsoModellingRules,
+            baseDeclarations: _base_declarations_of(nodeToClone, node.browseName)
         };
 
         const alreadyCloned = extraInfo.getCloned({ originalParent: nodeToClone, clonedParent: newParent, originalNode: node });
@@ -746,8 +685,10 @@ function _clone_collection_new(
                     fullPath2(newParent)
                 );
 
-            const hasReference =
-                alreadyCloned.findReferencesExAsObject(reference.referenceType, BrowseDirection.Inverse).length > 0;
+            // this parent, not any parent: a shared child may already hang under another one
+            const hasReference = alreadyCloned
+                .findReferences(reference.referenceType, false)
+                .some((r) => sameNodeId(r.nodeId, newParent.nodeId));
             if (!hasReference) {
                 alreadyCloned.addReference({
                     referenceType: reference.referenceType,
@@ -791,10 +732,6 @@ function _clone_collection_new(
                     `${fullPath2(clonedNode)}`
                 );
 
-            extraInfo.level++;
-            _clone_children_on_template(nodeToClone, newParent, node, copyAlsoModellingRules, optionalFilter, extraInfo);
-            extraInfo.level--;
-
             // also clone or instantiate interface members that may be required in the optionals
             extraInfo.level++;
             _cloneInterface(nodeToClone, newParent, node, optionalFilter, extraInfo, browseNameMap);
@@ -1123,6 +1060,20 @@ export function _clone<T extends UAObject | UAVariable | UAMethod, O>(
             browseNameMap
         );
 
+        // what the base types declare under the same name, before the type definition is explored:
+        // the base declaration overrides the type definition's children, so the later walk of the
+        // type definition finds them present instead of cloning them a second time
+        for (const baseDeclaration of options.baseDeclarations || []) {
+            _merge_base_declaration(
+                baseDeclaration,
+                clonedNode,
+                options.copyAlsoModellingRules,
+                newFilter,
+                extraInfo,
+                browseNameMap
+            );
+        }
+
         if (originalNode.nodeClass === NodeClass.Object || originalNode.nodeClass === NodeClass.Variable) {
             let typeDefinitionNode: UAVariableType | UAObjectType | null = originalNode.typeDefinitionObj;
 

package/impl/nodeset_tools/construct_namespace_dependency.ts

@@ -367,7 +367,11 @@ export function _constructNamespaceTranslationTable(dependency: INamespace[], ex
     let counter = 0;
     translationTable.set(dependency[0].index, counter++);
     //
-    if (exportedNamespace) {
+    // the exported namespace goes next, at 1 -- unless it *is* the UA namespace, which the line
+    // above has already placed at 0. Overwriting it there sent every ns0 id to ns=1, an index the
+    // <NamespaceUris> of such a document never declares, which is why exporting the UA namespace
+    // used to produce a document that could not be loaded back
+    if (exportedNamespace && !translationTable.has(exportedNamespace.index)) {
         translationTable.set(exportedNamespace.index, counter++);
     }
     for (let i = 1; i < dependency.length; i++) {

package/impl/nodeset_tools/nodeset_to_records.ts

@@ -75,7 +75,6 @@ import {
 } from "./construct_namespace_dependency.js";
 import {
     _dumpVariantExtensionObjectValue_Body,
-    _isDefaultValue,
     coerceInt64ToInt32,
     initXmlWriterEx,
     makeTypeXsd,
@@ -362,6 +361,9 @@ class RecordExporter {
             browseName: this.tq(node.browseName),
             references: this.referencesOf(node)
         };
+        if (node.releaseStatus) {
+            record.releaseStatus = node.releaseStatus;
+        }
         const parentNode = this.parentOf(node);
         if (parentNode && parentNode.nodeId.namespace <= node.nodeId.namespace) {
             record.parentNodeId = this.t(parentNode.nodeId);
@@ -380,7 +382,10 @@ class RecordExporter {
                 record.userAccessLevel = variable.userAccessLevel.toString();
             }
         }
-        if (node.accessRestrictions !== undefined) record.accessRestrictions = node.accessRestrictions.toString();
+        // the declared spelling first: the loader's accessRestrictions option governs what is
+        // enforced, not what the document said, and only the latter belongs in an export
+        const accessRestrictions = node.declaredAccessRestrictions ?? node.accessRestrictions?.toString();
+        if (accessRestrictions !== undefined) record.accessRestrictions = accessRestrictions;
         if (node.rolePermissions !== undefined && node.rolePermissions.length === 0) record.hasNoPermissions = true;
         if (Object.hasOwn(node, "minimumSamplingInterval")) {
             const minimumSamplingInterval = (node as UAVariable).minimumSamplingInterval;
@@ -517,6 +522,25 @@ class RecordExporter {
     /** the fields as the XML loader's definition parser shapes them: an absent rank is -1, an absent type BaseDataType */
     private definitionOf(node: UADataType): NodesetDataTypeDefinitionRecord | undefined {
         const baseDataType = this.t(resolveNodeId(DataTypeIds.BaseDataType));
+        // an OptionSet is neither an enumeration nor a structure to node-opcua -- it is a plain
+        // UInt16 or UInt32 subtype -- so the only account of it is the one the loader kept
+        const asImpl = node as unknown as {
+            isOptionSetDataType?: boolean;
+            declaredDefinitionFields?: NodesetDefinitionField[];
+            declaredDefinitionName?: string;
+        };
+        // 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 ?? this.b(node.browseName);
+        if (asImpl.isOptionSetDataType && asImpl.declaredDefinitionFields) {
+            const fields = asImpl.declaredDefinitionFields.map((f) => {
+                const field: NodesetDefinitionField = { ...f, allowSubTypes: f.allowSubTypes ?? false };
+                field.valueRank = f.valueRank ?? -1;
+                field.dataType = f.dataType ? this.t(f.dataType as unknown as NodeId) : baseDataType;
+                return field;
+            });
+            return { name: definitionName, isOptionSet: true, fields };
+        }
         if (node.isEnumeration()) {
             const enumDefinition = node.getEnumDefinition();
             const fields: NodesetDefinitionField[] = (enumDefinition.fields || []).map((f) => {
@@ -527,29 +551,38 @@ class RecordExporter {
                 field.dataType = baseDataType;
                 return field;
             });
-            return { name: this.b(node.browseName), fields };
+            return { name: definitionName, fields };
         }
         if (node.isStructure()) {
             const definition = node.getStructureDefinition();
-            const base = node.subtypeOfObj ? (node.subtypeOfObj as UADataType).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 baseNode = node.subtypeOfObj as UADataType | null;
+            const base = baseNode?.isStructure() ? baseNode.getStructureDefinition() : null;
             const nbFieldsInBase = base ? base.fields?.length || 0 : 0;
+            // Part 3 8.51: in a *WithSubtypedValues structure, isOptional does not mean optional --
+            // it is where "subtyping allowed" is held. The document spells that AllowSubTypes, and
+            // says nothing about IsOptional there, so the two must be swapped back on the way out
+            const subtypedValues =
+                definition.structureType === StructureType.StructureWithSubtypedValues ||
+                definition.structureType === StructureType.UnionWithSubtypedValues;
             const fields: NodesetDefinitionField[] = [];
             const all = definition.fields || [];
             for (let index = nbFieldsInBase; index < all.length; index++) {
                 const f = all[index];
                 const field: NodesetDefinitionField = {
                     name: f.name as string,
-                    allowSubTypes: !!(f as unknown as { allowSubTypes?: boolean }).allowSubTypes
+                    allowSubTypes: subtypedValues ? !!f.isOptional : !!(f as unknown as { allowSubTypes?: boolean }).allowSubTypes
                 };
                 if (f.description?.text?.length) field.description = { text: f.description.text } as unknown as string;
                 field.valueRank = f.valueRank === undefined || f.valueRank === -1 ? -1 : f.valueRank;
                 if (f.arrayDimensions && f.arrayDimensions.length > 0) field.arrayDimensions = f.arrayDimensions;
-                if (f.isOptional) field.isOptional = f.isOptional;
+                if (f.isOptional && !subtypedValues) field.isOptional = f.isOptional;
                 if (f.maxStringLength !== undefined && f.maxStringLength !== 0) field.maxStringLength = f.maxStringLength;
                 field.dataType = f.dataType && !f.dataType.isEmpty() ? this.t(f.dataType) : baseDataType;
                 fields.push(field);
             }
-            const record: NodesetDataTypeDefinitionRecord = { name: this.b(node.browseName), fields };
+            const record: NodesetDataTypeDefinitionRecord = { name: definitionName, fields };
             if (definition.structureType === StructureType.Union) record.isUnion = true;
             return record;
         }
@@ -565,7 +598,10 @@ class RecordExporter {
         this.arrayDimensionsOf(node, record);
         if (this.addressSpace.findNode(node.dataType)) record.dataType = this.t(node.dataType);
         const dataValue = (node as UAVariableImpl).$dataValue;
-        if (dataValue?.value && !dataValue.statusCode.equals(StatusCodes.BadWaitingForInitialData)) {
+        // a value the loader made up for a variable the document left unvalued is not the document's
+        // to write back; see valueWasSynthesized in nodeset_record_applier
+        const synthesized = (node as unknown as { valueWasSynthesized?: boolean }).valueWasSynthesized;
+        if (dataValue?.value && !synthesized && !dataValue.statusCode.equals(StatusCodes.BadWaitingForInitialData)) {
             const value = this.valueOf(node, dataValue.value);
             if (value) record.value = value;
         }
@@ -590,8 +626,14 @@ class RecordExporter {
     }
 
     private arrayDimensionsOf(node: UAVariable | UAVariableType, record: NodesetNodeRecord): void {
-        if (!node.arrayDimensions) return;
-        if (node.valueRank === -1 || (node.arrayDimensions.length === 1 && node.arrayDimensions[0] === 0)) return;
+        // 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 as unknown as { arrayDimensionsWereDeclared?: boolean }).arrayDimensionsWereDeclared) return;
         record.arrayDimensions = node.arrayDimensions;
     }
 
@@ -605,7 +647,9 @@ class RecordExporter {
         this.markVisited(node);
         this.dumpReferencedNodes(node);
         const record = this.common(node);
-        if (node.eventNotifier) record.eventNotifier = node.eventNotifier;
+        // typeof, not truthiness: a node with a child called "EventNotifier" resolves the name to that
+        // child through the shared child accessors, so this is a BaseNode there, not the attribute
+        if (typeof node.eventNotifier === "number" && node.eventNotifier !== 0) record.eventNotifier = node.eventNotifier;
         this.records.push(record);
         this.dumpAggregates(node);
     }
@@ -615,8 +659,10 @@ class RecordExporter {
         this.markVisited(node);
         this.dumpReferencedNodes(node);
         const record = this.common(node);
-        const eventNotifier = (node as unknown as { eventNotifier?: number }).eventNotifier;
-        if (eventNotifier) record.eventNotifier = eventNotifier;
+        // typeof, not truthiness: a node with a child called "EventNotifier" resolves the name to that
+        // child through the shared child accessors, so this is a BaseNode there, not the attribute
+        const eventNotifier = (node as unknown as { eventNotifier?: unknown }).eventNotifier;
+        if (typeof eventNotifier === "number" && eventNotifier !== 0) record.eventNotifier = eventNotifier;
         this.records.push(record);
         this.dumpAggregates(node);
         this.section(`ObjectType - ${this.b(node.browseName)} }}}}`);
@@ -634,9 +680,9 @@ class RecordExporter {
     private dumpView(node: BaseNode): void {
         this.markVisited(node);
         const record = this.common(node);
-        const view = node as unknown as { containsNoLoops?: boolean; eventNotifier?: number };
+        const view = node as unknown as { containsNoLoops?: boolean; eventNotifier?: unknown };
         if (view.containsNoLoops) record.containsNoLoops = true;
-        if (view.eventNotifier) record.eventNotifier = view.eventNotifier;
+        if (typeof view.eventNotifier === "number" && view.eventNotifier !== 0) record.eventNotifier = view.eventNotifier;
         this.records.push(record);
         this.dumpAggregates(node);
     }
@@ -675,8 +721,12 @@ class RecordExporter {
     private valueOf(node: UAVariable | UAVariableType, variant: Variant): VariantOptions | undefined {
         if (!(variant instanceof Variant)) return undefined;
         if (variant.dataType === DataType.Null) return undefined;
+        // a null value is nothing to write down, whatever its declared data type
+        if (variant.value === null || variant.value === undefined) return undefined;
         if (!this.addressSpace.findDataType(node.dataType)) return undefined;
-        if (_isDefaultValue(variant)) return undefined;
+        // no _isDefaultValue test here: it dropped every zero and every empty string, which threw
+        // away the ones the document actually declared in order to suppress the ones the loader
+        // made up. valueWasSynthesized now separates the two, so a declared "" survives the trip
         const element = (v: unknown) => this.elementOf(node, variant.dataType, v);
         const out: VariantOptions = { dataType: variant.dataType, arrayType: variant.arrayType };
         if (variant.arrayType === VariantArrayType.Scalar) {