node-opcua-address-space 2.72.1 → 2.73.1

package/src/namespace_impl.ts

@@ -67,30 +67,35 @@ import {
 } from "../source/address_space_ts";
 import { UAStateMachineEx } from "../source/interfaces/state_machine/ua_state_machine_type";
 import { UATransitionEx } from "../source/interfaces/state_machine/ua_transition_ex";
-import { UAAlarmConditionEx, UAAlarmConditionImpl, UATwoStateDiscreteEx, UAYArrayItemEx } from "../source";
+import { UATwoStateDiscreteEx, UAYArrayItemEx } from "../source";
 import { AddAnalogDataItemOptions, AddDataItemOptions } from "../source/namespace_data_access";
 import { UATwoStateVariableEx } from "../source/ua_two_state_variable_ex";
 import { UAMultiStateValueDiscreteEx } from "../source/interfaces/data_access/ua_multistate_value_discrete_ex";
+import { UAAlarmConditionEx } from "../source/interfaces/alarms_and_conditions/ua_alarm_condition_ex";
+import { UADiscreteAlarmEx } from "../source/interfaces/alarms_and_conditions/ua_discrete_alarm_ex";
+import { UAExclusiveDeviationAlarmEx } from "../source/interfaces/alarms_and_conditions/ua_exclusive_deviation_alarm_ex";
+import { UAExclusiveLimitAlarmEx } from "../source/interfaces/alarms_and_conditions/ua_exclusive_limit_alarm_ex";
+import { UALimitAlarmEx } from "../source/interfaces/alarms_and_conditions/ua_limit_alarm_ex";
+import { UANonExclusiveDeviationAlarmEx } from "../source/interfaces/alarms_and_conditions/ua_non_exclusive_deviation_alarm_ex";
+import { UANonExclusiveLimitAlarmEx } from "../source/interfaces/alarms_and_conditions/ua_non_exclusive_limit_alarm_ex";
+import { UAConditionEx } from "../source/interfaces/alarms_and_conditions/ua_condition_ex";
 
 import { _handle_delete_node_model_change_event, _handle_model_change_event } from "./address_space_change_event_tools";
 import { AddressSpacePrivate } from "./address_space_private";
-import { UAConditionEx, UAConditionImpl } from "./alarms_and_conditions/ua_condition_impl";
-import { UADiscreteAlarmEx, UADiscreteAlarmImpl } from "./alarms_and_conditions/ua_discrete_alarm_impl";
+import { UAConditionImpl } from "./alarms_and_conditions/ua_condition_impl";
+import { UADiscreteAlarmImpl } from "./alarms_and_conditions/ua_discrete_alarm_impl";
 import {
-    UAExclusiveDeviationAlarmEx,
     UAExclusiveDeviationAlarmImpl
 } from "./alarms_and_conditions/ua_exclusive_deviation_alarm_impl";
-import { UAExclusiveLimitAlarmEx, UAExclusiveLimitAlarmImpl } from "./alarms_and_conditions/ua_exclusive_limit_alarm_impl";
-import { UALimitAlarmEx, UALimitAlarmImpl } from "./alarms_and_conditions/ua_limit_alarm_impl";
+import {  UAExclusiveLimitAlarmImpl } from "./alarms_and_conditions/ua_exclusive_limit_alarm_impl";
+import {  UALimitAlarmImpl } from "./alarms_and_conditions/ua_limit_alarm_impl";
 import {
-    UANonExclusiveDeviationAlarmEx,
     UANonExclusiveDeviationAlarmImpl
 } from "./alarms_and_conditions/ua_non_exclusive_deviation_alarm_impl";
 import {
-    UANonExclusiveLimitAlarmEx,
     UANonExclusiveLimitAlarmImpl
 } from "./alarms_and_conditions/ua_non_exclusive_limit_alarm_impl";
-import { UAAcknowledgeableConditionImpl } from "./alarms_and_conditions";
+import { UAAcknowledgeableConditionImpl, UAAlarmConditionImpl } from "./alarms_and_conditions";
 import { UAOffNormalAlarmEx, UAOffNormalAlarmImpl } from "./alarms_and_conditions/ua_off_normal_alarm_impl";
 import { add_dataItem_stuff } from "./data_access/add_dataItem_stuff";
 import { UAMultiStateDiscreteImpl, _addMultiStateDiscrete } from "./data_access/ua_multistate_discrete_impl";
@@ -103,7 +108,7 @@ import { BaseNodeImpl } from "./base_node_impl";
 import { UAVariableImpl } from "./ua_variable_impl";
 
 import { ConstructNodeIdOptions, NodeIdManager } from "./nodeid_manager";
-import { _addTwoStateDiscrete } from "./data_access/ua_two_state_discrete";
+import { _addTwoStateDiscrete } from "./data_access/ua_two_state_discrete_impl";
 import { coerceRolePermissions } from "./role_permissions";
 import { UAObjectImpl } from "./ua_object_impl";
 import { UADataTypeImpl } from "./ua_data_type_impl";
@@ -113,7 +118,7 @@ import { UAVariableTypeImpl } from "./ua_variable_type_impl";
 import { UAReferenceTypeImpl } from "./ua_reference_type_impl";
 import { UAViewImpl } from "./ua_view_impl";
 import { UAStateMachineImpl, UATransitionImpl } from "./state_machine/finite_state_machine";
-import { _addMultiStateValueDiscrete } from "./data_access/ua_multistate_value_discrete";
+import { _addMultiStateValueDiscrete } from "./data_access/ua_multistate_value_discrete_impl";
 
 function _makeHashKey(nodeId: NodeId): string | number {
     switch (nodeId.identifierType) {

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -294,8 +294,8 @@ function _dumpVariantInnerValueEnum(xw: XmlWriter, definition: EnumDefinition, v
     if (!definition.fields) {
         return;
     }
-    const field = definition.fields.find((f) => f.value[1] === value);
-    xw.text(`${field?.name}_${value}`);
+    const field = definition.fields.find((f) => f.value[1] === value || f.name === value);
+    xw.text(`${field?.name}_${field?.value[1]}`);
 }
 
 // eslint-disable-next-line complexity
@@ -329,7 +329,6 @@ function _dumpVariantInnerValue(
         case DataType.Boolean:
         case DataType.SByte:
         case DataType.Byte:
-        case DataType.SByte:
         case DataType.Float:
         case DataType.Double:
         case DataType.Int16:
@@ -779,6 +778,16 @@ function _dumpStructureDefinition(
         xw.endElement();
     }
 }
+
+function _dumpEncodings(xw: XmlWriter, uaDataType: UADataType) {
+    const encodings = uaDataType.findReferencesExAsObject("HasEncoding", BrowseDirection.Forward);
+    for (const encoding of encodings) {
+        if (encoding.nodeClass !== NodeClass.Object) {
+            continue;
+        }
+        _dumpUAObject(xw, encoding as UAObject);
+    }
+}
 function _dumpUADataTypeDefinition(xw: XmlWriter, uaDataType: UADataType) {
     const uaDataTypeBase = uaDataType.subtypeOfObj;
 
@@ -824,6 +833,8 @@ function dumpUADataType(xw: XmlWriter, node: UADataType) {
 
     xw.endElement();
 
+    _dumpEncodings(xw, node);
+
     dumpAggregates(xw, node);
 }
 
@@ -927,7 +938,10 @@ function dumpUAVariableType(xw: XmlWriter, node: UAVariableType) {
 
 function dumpUAObject(xw: XmlWriter, node: UAObject) {
     xw.writeComment("Object - " + b(xw, node.browseName) + " {{{{ ");
-
+    _dumpUAObject(xw, node);
+    xw.writeComment("Object - " + b(xw, node.browseName) + " }}}} ");
+}
+function _dumpUAObject(xw: XmlWriter, node: UAObject) {
     xw.visitedNode = xw.visitedNode || {};
     assert(!xw.visitedNode[_hash(node)]);
     xw.visitedNode[_hash(node)] = 1;
@@ -945,8 +959,6 @@ function dumpUAObject(xw: XmlWriter, node: UAObject) {
     dumpAggregates(xw, node);
 
     dumpElementInFolder(xw, node as UAObjectImpl);
-
-    xw.writeComment("Object - " + b(xw, node.browseName) + " }}}} ");
 }
 function dumpElementInFolder(xw: XmlWriter, node: BaseNodeImpl) {
     const aggregates = node

package/src/state_machine/ua_shelving_state_machine_ex.ts

@@ -7,16 +7,17 @@
 // --------------------------------------------------------------------------------------------------
 
 import { assert } from "node-opcua-assert";
-import { Callback, CallbackT, StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
 import { UAProperty, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
-import { UAShelvedStateMachine_Base, UAState } from "node-opcua-nodeset-ua";
+import { UAState, UATransition } from "node-opcua-nodeset-ua";
 import { CallMethodResultOptions } from "node-opcua-service-call";
 import { DataValue } from "node-opcua-data-value";
 
 import { UAAlarmConditionImpl } from "../alarms_and_conditions/ua_alarm_condition_impl";
+import { UAShelvedStateMachineEx } from "../../source/interfaces/state_machine/ua_shelved_state_machine_ex";
 import { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
 
 import { promoteToStateMachine, UAStateMachineImpl } from "./finite_state_machine";
@@ -30,18 +31,9 @@ export interface UAShelvedStateMachineHelper {
     _unshelvedTime: Date;
     _duration: number;
 }
-export interface UAShelvedStateMachineEx
-    extends Omit<
-            UAShelvedStateMachine_Base,
-            | "oneShotShelvedToUnshelved"
-            | "unshelvedToTimedShelved"
-            | "unshelvedToOneShotShelved"
-            | "timedShelvedToUnshelved"
-            | "timedShelvedToOneShotShelved"
-            | "oneShotShelvedToTimedShelved"
-        >,
-        UAShelvedStateMachineHelper {
-    unshelveTime: UAProperty<number, DataType.Double>;
+
+export interface UAShelvedStateMachineExImpl extends UAShelvedStateMachineHelper {
+    unshelveTime: UAProperty<number, /*z*/ DataType.Double>;
     unshelved: UAState;
     timedShelved: UAState;
     oneShotShelved: UAState;
@@ -52,15 +44,19 @@ export interface UAShelvedStateMachineEx
     oneShotShelvedToUnshelved: UATransitionEx;
     oneShotShelvedToTimedShelved: UATransitionEx;
     timedShelve: UAMethod;
+    timedShelve2?: UAMethod;
     unshelve: UAMethod;
+    unshelve2?: UAMethod;
     oneShotShelve: UAMethod;
+    oneShotShelve2?: UAMethod;
 }
-export class UAShelvedStateMachineEx extends UAStateMachineImpl implements UAShelvedStateMachineEx {
+
+export class UAShelvedStateMachineExImpl extends UAStateMachineImpl implements UAShelvedStateMachineEx {
     public static promote(object: UAObject): UAShelvedStateMachineEx {
-        const shelvingState = object as UAShelvedStateMachineEx;
+        const shelvingState = object as UAShelvedStateMachineExImpl;
         promoteToStateMachine(shelvingState);
 
-        Object.setPrototypeOf(shelvingState, UAShelvedStateMachineEx.prototype);
+        Object.setPrototypeOf(shelvingState, UAShelvedStateMachineExImpl.prototype);
         shelvingState._timer = null;
 
         if (shelvingState.unshelve) {
@@ -83,7 +79,7 @@ export class UAShelvedStateMachineEx extends UAStateMachineImpl implements UAShe
             );
         }
 
-        assert(shelvingState instanceof UAShelvedStateMachineEx);
+        assert(shelvingState instanceof UAShelvedStateMachineExImpl);
         return shelvingState;
     }
 }
@@ -106,7 +102,7 @@ function _unshelve_method(inputArguments: VariantLike[], context: ISessionContex
     //     return callback(null, {statusCode: StatusCodes.BadConditionDisabled});
     // }
 
-    const shelvingState = context.object! as UAShelvedStateMachineEx;
+    const shelvingState = context.object! as UAShelvedStateMachineExImpl;
     promoteToStateMachine(shelvingState);
 
     if (shelvingState.getCurrentState() === "Unshelved") {
@@ -126,7 +122,7 @@ function _unshelve_method(inputArguments: VariantLike[], context: ISessionContex
     });
 }
 
-export function _clear_timer_if_any(shelvingState: UAShelvedStateMachineEx): void {
+export function _clear_timer_if_any(shelvingState: UAShelvedStateMachineExImpl): void {
     if (shelvingState._timer) {
         clearTimeout(shelvingState._timer);
         // xx console.log("_clear_timer_if_any shelvingState = ",shelvingState._timer,shelvingState.constructor.name);
@@ -134,7 +130,7 @@ export function _clear_timer_if_any(shelvingState: UAShelvedStateMachineEx): voi
     }
 }
 
-function _automatically_unshelve(shelvingState: UAShelvedStateMachineEx) {
+function _automatically_unshelve(shelvingState: UAShelvedStateMachineExImpl) {
     assert(shelvingState._timer, "expecting timerId to be set");
     shelvingState._timer = null;
 
@@ -152,7 +148,7 @@ function _automatically_unshelve(shelvingState: UAShelvedStateMachineEx) {
     assert(!shelvingState._timer);
 }
 
-function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachineEx, duration: number) {
+function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachineExImpl, duration: number) {
     if (duration < 10 || duration >= Math.pow(2, 31)) {
         throw new Error(" Invalid maxTimeShelved duration: " + duration + "  must be [10,2**31] ");
     }
@@ -199,7 +195,7 @@ function _timedShelve_method(
     if (!context.object) {
         return;
     }
-    const shelvingState = context.object! as UAShelvedStateMachineEx;
+    const shelvingState = context.object! as UAShelvedStateMachineExImpl;
 
     if (shelvingState.getCurrentState() !== "Unshelved") {
         return callback(null, {
@@ -259,7 +255,7 @@ function _oneShotShelve_method(
     callback: CallbackT<CallMethodResultOptions>
 ) {
     assert(inputArguments.length === 0);
-    const shelvingState = context.object! as UAShelvedStateMachineEx;
+    const shelvingState = context.object! as UAShelvedStateMachineExImpl;
     if (shelvingState.getCurrentState() === "OneShotShelved") {
         return callback(null, {
             statusCode: StatusCodes.BadConditionAlreadyShelved
@@ -296,7 +292,7 @@ function _oneShotShelve_method(
 //   TimedShelve Method call.
 // * For the OneShotShelved state the UnshelveTime will be a constant set to the maximum Duration
 //   except if a MaxTimeShelved Property is provided.
-function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineEx): DataValue {
+function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineExImpl): DataValue {
     if (shelvingState.getCurrentState() === "Unshelved") {
         return new DataValue({
             statusCode: StatusCodes.BadConditionNotShelved,
@@ -333,4 +329,3 @@ function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineEx): DataValue {
         }
     });
 }
-

package/src/ua_data_type_impl.ts

@@ -5,7 +5,6 @@ import * as chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
 import { NodeClass, QualifiedNameLike } from "node-opcua-data-model";
-import { EnumerationDefinition, StructuredTypeSchema } from "node-opcua-factory";
 import { AttributeIds } from "node-opcua-data-model";
 import { DataValue, DataValueLike } from "node-opcua-data-value";
 import { ExtensionObject } from "node-opcua-extension-object";
@@ -24,6 +23,7 @@ import {
 import { DataType } from "node-opcua-variant";
 import { UAObject, ISessionContext, UADataType, UAVariable, BaseNode, CreateDataTypeOptions } from "node-opcua-address-space-base";
 import { DataTypeIds } from "node-opcua-constants";
+import { IStructuredTypeSchema } from "node-opcua-factory";
 
 import { SessionContext } from "../source/session_context";
 import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
@@ -35,7 +35,7 @@ import { BaseNode_getCache } from "./base_node_private";
 
 export type ExtensionObjectConstructor = new (options: any) => ExtensionObject;
 export interface ExtensionObjectConstructorFuncWithSchema extends ExtensionObjectConstructor {
-    schema: StructuredTypeSchema;
+    schema: IStructuredTypeSchema;
     possibleFields: string[];
     encodingDefaultBinary: ExpandedNodeId;
     encodingDefaultXml: ExpandedNodeId;
@@ -387,7 +387,11 @@ export function DataType_toString(this: UADataTypeImpl, options: ToStringOption)
             chalk.yellow("          xmlEncodingNodeId   : ") +
             (this.xmlEncodingNodeId ? this.xmlEncodingNodeId.toString() : "<none>")
     );
-
+    options.add(
+        options.padding +
+            chalk.yellow("          jsonEncodingNodeId  : ") +
+            (this.jsonEncodingNodeId ? this.jsonEncodingNodeId.toString() : "<none>")
+    );
     if (this.subtypeOfObj) {
         options.add(
             options.padding +

package/src/ua_variable_impl.ts

@@ -16,12 +16,8 @@ import {
     defaultCloneFilter,
     GetFunc,
     SetFunc,
-    VariableDataValueGetterCallback,
-    VariableDataValueGetterPromise,
     VariableDataValueGetterSync,
-    VariableDataValueSetterWithCallback,
-    VariableDataValueSetterWithPromise
-} from "node-opcua-address-space-base";
+    VariableDataValueSetterWithCallback} from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
 import {
     isValidDataEncoding,
@@ -49,12 +45,9 @@ import {
     ReadEventDetails,
     ReadProcessedDetails,
     ReadRawModifiedDetails,
-    StructureDefinition,
-    StructureField,
     WriteValueOptions
 } from "node-opcua-types";
 import * as utils from "node-opcua-utils";
-import { lowerFirstLetter } from "node-opcua-utils";
 import {
     Variant,
     VariantLike,
@@ -68,7 +61,6 @@ import { StatusCodeCallback } from "node-opcua-status-code";
 import {
     IAddressSpace,
     BindVariableOptions,
-    ContinuationPoint,
     IVariableHistorian,
     TimestampGetFunc,
     TimestampSetFunc,
@@ -81,12 +73,12 @@ import {
     BaseNode,
     UAVariableT
 } from "node-opcua-address-space-base";
-import { EnumFilterOperator, UAHistoricalDataConfiguration } from "node-opcua-nodeset-ua";
+import { UAHistoricalDataConfiguration } from "node-opcua-nodeset-ua";
 
 import { SessionContext } from "../source/session_context";
 import { convertToCallbackFunction1 } from "../source/helpers/multiform_func";
 import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
-import { _clone, ToStringBuilder, UAVariable_toString, valueRankToString } from "./base_node_private";
+import { _clone, ToStringBuilder, UAVariable_toString } from "./base_node_private";
 import { EnumerationInfo, IEnumItem, UADataTypeImpl } from "./ua_data_type_impl";
 import { apply_condition_refresh, ConditionRefreshCache } from "./apply_condition_refresh";
 import {

package/test_helpers/alarms_and_conditions_demo.ts

@@ -2,8 +2,8 @@
  * @module node-opcua-address-space
  */
 import { assert } from "node-opcua-assert";
-import { AddressSpace, UAExclusiveLimitAlarmImpl, UAObject, UAVariable } from "..";
-import { UANonExclusiveLimitAlarmEx, UAExclusiveLimitAlarmEx } from "..";
+import { AddressSpace,UANonExclusiveLimitAlarmEx, UAExclusiveLimitAlarmEx, UAObject, UAVariable } from "..";
+
 
 export interface IAlarmTestData {
     tankLevel: UAVariable;
@@ -70,7 +70,7 @@ export function construct_demo_alarm_in_address_space(test: IAlarmTestData, addr
             "ConfirmedState",
             "Confirm" // confirm state and confirm Method
         ]
-    }) as UAExclusiveLimitAlarmImpl;
+    }) as UAExclusiveLimitAlarmEx;
 
     assert(tankLevelCondition.browseName.toString() === "1:TankLevelCondition");
 

package/test_helpers/create_minimalist_address_space_nodeset.ts

@@ -11,7 +11,7 @@ import { DataTypeIds, ObjectIds, ObjectTypeIds, ReferenceTypeIds, VariableTypeId
 import { NodeClass } from "node-opcua-data-model";
 import { NodeId, resolveNodeId } from "node-opcua-nodeid";
 
-import { AddReferenceOpts, AddressSpace, UAFolder, UAObject, UAReferenceType, UAVariableType, NamespacePrivate } from "..";
+import { AddReferenceOpts, AddressSpace, UAFolder, UAObject, UAReferenceType, UAVariableType } from "..";
 
 const doDebug = false;
 
@@ -46,7 +46,7 @@ function dumpReferencesHierarchy(_addressSpace: AddressSpace) {
 export function create_minimalist_address_space_nodeset(addressSpace: AddressSpace): void {
     const _addressSpace = addressSpace;
 
-    const namespace0 = addressSpace.registerNamespace("http://opcfoundation.org/UA/") as unknown as NamespacePrivate;
+    const namespace0 = addressSpace.registerNamespace("http://opcfoundation.org/UA/");
 
     assert(namespace0.index === 0);
 

package/test_helpers/test_fixtures/datatype_with_allow_subtype.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+
+    <NamespaceUris>
+        <Uri>http://acme</Uri>
+    </NamespaceUris>
+
+    <Aliases>
+        <Alias Alias="UInt32">i=7</Alias>
+        <Alias Alias="Guid">i=14</Alias>
+        <Alias Alias="HasEncoding">i=38</Alias>
+        <Alias Alias="HasDescription">i=39</Alias>
+        <Alias Alias="HasTypeDefinition">i=40</Alias>
+        <Alias Alias="HasSubtype">i=45</Alias>
+        <Alias Alias="HasProperty">i=46</Alias>
+        <Alias Alias="HasComponent">i=47</Alias>
+        <Alias Alias="IdType">i=256</Alias>
+        <Alias Alias="CommunicationLinkConfigurationDataType">ns=1;i=3007</Alias>
+        <Alias Alias="TransmitQosDataType">i=23604</Alias>
+       
+    </Aliases>
+
+    <UADataType NodeId="ns=1;i=1044" BrowseName="1:ConnectionEndpointConfigurationDataType">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+        </References>
+        <Definition Name="1:ConnectionEndpointConfigurationDataType">
+            <Field DataType="Guid" Name="Id"/>
+            <Field AllowSubTypes="true" DataType="CommunicationLinkConfigurationDataType" ValueRank="1" ArrayDimensions="1" Name="CommunicationLinks"/>
+        </Definition>
+    </UADataType>
+
+
+    <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=1141" BrowseName="Default Binary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=1044</Reference>
+        </References>
+    </UAObject>
+ 
+
+    <UADataType IsAbstract="true" NodeId="ns=1;i=3007" BrowseName="1:CommunicationLinkConfigurationDataType">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+        </References>
+        <Definition Name="1:CommunicationLinkConfigurationDataType"/>
+    </UADataType>
+
+    <UADataType NodeId="ns=1;i=1031" BrowseName="1:PubSubCommunicationLinkConfigurationDataType">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=3007</Reference>
+        </References>
+        <Definition Name="1:PubSubCommunicationLinkConfigurationDataType">
+            <Field DataType="UInt32" Name="Field1"/>
+            <Field DataType="UInt32" Name="Field2"/>
+            <Field AllowSubTypes="true" DataType="Number" Name="Field3"/>
+        </Definition>
+    </UADataType>
+    <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=1102" BrowseName="Default Binary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=1031</Reference>
+        </References>
+    </UAObject>
+
+    <UADataType NodeId="ns=1;i=1032" BrowseName="1:OtherCommunicationLinkConfigurationDataType">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=3007</Reference>
+        </References>
+        <Definition Name="1:OtherCommunicationLinkConfigurationDataType">
+            <Field AllowSubTypes="true" DataType="Number" Name="SomeNumber"/>
+        </Definition>
+    </UADataType>
+    <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=1103" BrowseName="Default Binary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=1032</Reference>
+        </References>
+    </UAObject>
+   
+    <UADataType NodeId="ns=1;i=1034" BrowseName="1:Combined">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=3007</Reference>
+        </References>
+        <Definition Name="1:Combined">
+            <Field AllowSubTypes="true" DataType="CommunicationLinkConfigurationDataType" Name="First"/>
+            <Field AllowSubTypes="true" DataType="CommunicationLinkConfigurationDataType" Name="Second"/>
+        </Definition>
+    </UADataType>
+
+    <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=1104" BrowseName="Default Binary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=1034</Reference>
+        </References>
+    </UAObject>
+
+</UANodeSet>

package/test_helpers/test_fixtures/variabletype_with_value.xml

@@ -37,7 +37,7 @@
         <Alias Alias="GasComposition">ns=1;i=48</Alias>
         <Alias Alias="FlowDirection">ns=1;i=49</Alias>
         <Alias Alias="MyEnum">ns=1;i=3002</Alias>
-        <Alias Alias="MyStruct">ns=1;i=3003</Alias>
+        <Alias Alias="MyStructDataType">ns=1;i=3003</Alias>
     </Aliases>
     <Extensions>
     </Extensions>
@@ -272,32 +272,32 @@
         </References>
     </UAObject>
     
-    <UADataType NodeId="ns=1;i=3003" BrowseName="1:MyStruct">
-        <DisplayName>MyStruct</DisplayName>
+    <UADataType NodeId="ns=1;i=3003" BrowseName="1:MyStructDataType">
+        <DisplayName>MyStructDataType</DisplayName>
         <References>
             <Reference ReferenceType="HasEncoding">ns=1;i=5001</Reference>
             <Reference ReferenceType="HasEncoding">ns=1;i=5003</Reference>
             <Reference ReferenceType="HasEncoding">ns=1;i=5002</Reference>
             <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
         </References>
-        <Definition Name="1:MyStruct">
+        <Definition Name="1:MyStructDataType">
             <Field DataType="MyEnum" Name="F1"/>
             <Field DataType="MyEnum" ValueRank="1" ArrayDimensions="0" Name="F2"/>
         </Definition>
     </UADataType>
-    <UAVariable DataType="String" ParentNodeId="ns=1;i=6002" NodeId="ns=1;i=6006" BrowseName="1:MyStruct">
-        <DisplayName>MyStruct</DisplayName>
+    <UAVariable DataType="String" ParentNodeId="ns=1;i=6002" NodeId="ns=1;i=6006" BrowseName="1:MyStructType">
+        <DisplayName>MyStructType</DisplayName>
         <References>
             <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6002</Reference>
             <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
             <Reference ReferenceType="HasDescription" IsForward="false">ns=1;i=5001</Reference>
         </References>
         <Value>
-            <uax:String>MyStruct</uax:String>
+            <uax:String>MyStructDataType</uax:String>
         </Value>
     </UAVariable>
 
-    <UAVariable DataType="MyStruct" NodeId="ns=1;i=6009" BrowseName="1:TestVar" AccessLevel="3">
+    <UAVariable DataType="MyStructDataType" NodeId="ns=1;i=6009" BrowseName="1:TestVar" AccessLevel="3">
         <DisplayName>TestVar</DisplayName>
         <References>
             <Reference ReferenceType="HasTypeDefinition">i=63</Reference>
@@ -309,14 +309,14 @@
                     <uax:Identifier>ns=1;i=5002</uax:Identifier>
                 </uax:TypeId>
                 <uax:Body>
-                    <MyStruct xmlns="http://yourorganisation.org/enumInExtObj/Types.xsd">
+                    <MyStructDataType xmlns="http://yourorganisation.org/enumInExtObj/Types.xsd">
                         <F1>Orange_200</F1>
                         <F2>
                             <MyEnum>Green_100</MyEnum>
                             <MyEnum>Orange_200</MyEnum>
                             <MyEnum>Red_300</MyEnum>
                         </F2>
-                    </MyStruct>
+                    </MyStructDataType>
                 </uax:Body>
             </uax:ExtensionObject>
         </Value>