node-opcua-nodeset-ua 2.75.0 → 2.77.0

package/source/ua_broker_connection_transport.ts

@@ -12,8 +12,8 @@ import { UAConnectionTransport, UAConnectionTransport_Base } from "./ua_connecti
  * |isAbstract      |false                                             |
  */
 export interface UABrokerConnectionTransport_Base extends UAConnectionTransport_Base {
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
-    authenticationProfileUri: UAProperty<UAString, /*z*/DataType.String>;
+    resourceUri: UAProperty<UAString, DataType.String>;
+    authenticationProfileUri: UAProperty<UAString, DataType.String>;
 }
 export interface UABrokerConnectionTransport extends UAConnectionTransport, UABrokerConnectionTransport_Base {
 }

package/source/ua_broker_data_set_reader_transport.ts

@@ -13,11 +13,11 @@ import { UADataSetReaderTransport, UADataSetReaderTransport_Base } from "./ua_da
  * |isAbstract      |false                                             |
  */
 export interface UABrokerDataSetReaderTransport_Base extends UADataSetReaderTransport_Base {
-    queueName: UAProperty<UAString, /*z*/DataType.String>;
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
-    authenticationProfileUri: UAProperty<UAString, /*z*/DataType.String>;
-    requestedDeliveryGuarantee: UAProperty<EnumBrokerTransportQualityOfService, /*z*/DataType.Int32>;
-    metaDataQueueName: UAProperty<UAString, /*z*/DataType.String>;
+    queueName: UAProperty<UAString, DataType.String>;
+    resourceUri: UAProperty<UAString, DataType.String>;
+    authenticationProfileUri: UAProperty<UAString, DataType.String>;
+    requestedDeliveryGuarantee: UAProperty<EnumBrokerTransportQualityOfService, DataType.Int32>;
+    metaDataQueueName: UAProperty<UAString, DataType.String>;
 }
 export interface UABrokerDataSetReaderTransport extends UADataSetReaderTransport, UABrokerDataSetReaderTransport_Base {
 }

package/source/ua_broker_data_set_writer_transport.ts

@@ -13,12 +13,12 @@ import { UADataSetWriterTransport, UADataSetWriterTransport_Base } from "./ua_da
  * |isAbstract      |false                                             |
  */
 export interface UABrokerDataSetWriterTransport_Base extends UADataSetWriterTransport_Base {
-    queueName: UAProperty<UAString, /*z*/DataType.String>;
-    metaDataQueueName: UAProperty<UAString, /*z*/DataType.String>;
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
-    authenticationProfileUri: UAProperty<UAString, /*z*/DataType.String>;
-    requestedDeliveryGuarantee: UAProperty<EnumBrokerTransportQualityOfService, /*z*/DataType.Int32>;
-    metaDataUpdateTime: UAProperty<number, /*z*/DataType.Double>;
+    queueName: UAProperty<UAString, DataType.String>;
+    metaDataQueueName: UAProperty<UAString, DataType.String>;
+    resourceUri: UAProperty<UAString, DataType.String>;
+    authenticationProfileUri: UAProperty<UAString, DataType.String>;
+    requestedDeliveryGuarantee: UAProperty<EnumBrokerTransportQualityOfService, DataType.Int32>;
+    metaDataUpdateTime: UAProperty<number, DataType.Double>;
 }
 export interface UABrokerDataSetWriterTransport extends UADataSetWriterTransport, UABrokerDataSetWriterTransport_Base {
 }

package/source/ua_broker_writer_group_transport.ts

@@ -13,10 +13,10 @@ import { UAWriterGroupTransport, UAWriterGroupTransport_Base } from "./ua_writer
  * |isAbstract      |false                                             |
  */
 export interface UABrokerWriterGroupTransport_Base extends UAWriterGroupTransport_Base {
-    queueName: UAProperty<UAString, /*z*/DataType.String>;
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
-    authenticationProfileUri: UAProperty<UAString, /*z*/DataType.String>;
-    requestedDeliveryGuarantee: UAProperty<EnumBrokerTransportQualityOfService, /*z*/DataType.Int32>;
+    queueName: UAProperty<UAString, DataType.String>;
+    resourceUri: UAProperty<UAString, DataType.String>;
+    authenticationProfileUri: UAProperty<UAString, DataType.String>;
+    requestedDeliveryGuarantee: UAProperty<EnumBrokerTransportQualityOfService, DataType.Int32>;
 }
 export interface UABrokerWriterGroupTransport extends UAWriterGroupTransport, UABrokerWriterGroupTransport_Base {
 }

package/source/ua_build_info.ts

@@ -13,13 +13,13 @@ import { DTBuildInfo } from "./dt_build_info"
  * |dataType Name   |DTBuildInfo ns=0;i=338                            |
  * |isAbstract      |false                                             |
  */
-export interface UABuildInfo_Base<T extends DTBuildInfo/*j*/>  extends UABaseDataVariable_Base<T, /*e*/DataType.ExtensionObject> {
-    productUri: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    manufacturerName: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    productName: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    softwareVersion: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    buildNumber: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    buildDate: UABaseDataVariable<Date, /*z*/DataType.DateTime>;
+export interface UABuildInfo_Base<T extends DTBuildInfo>  extends UABaseDataVariable_Base<T, DataType.ExtensionObject> {
+    productUri: UABaseDataVariable<UAString, DataType.String>;
+    manufacturerName: UABaseDataVariable<UAString, DataType.String>;
+    productName: UABaseDataVariable<UAString, DataType.String>;
+    softwareVersion: UABaseDataVariable<UAString, DataType.String>;
+    buildNumber: UABaseDataVariable<UAString, DataType.String>;
+    buildDate: UABaseDataVariable<Date, DataType.DateTime>;
 }
-export interface UABuildInfo<T extends DTBuildInfo/*j*/> extends UABaseDataVariable<T, /*n*/DataType.ExtensionObject>, UABuildInfo_Base<T /*B*/> {
+export interface UABuildInfo<T extends DTBuildInfo> extends UABaseDataVariable<T, DataType.ExtensionObject>, UABuildInfo_Base<T> {
 }

package/source/ua_cartesian_coordinates.ts

@@ -14,8 +14,8 @@ import { UABaseDataVariable, UABaseDataVariable_Base } from "./ua_base_data_vari
  * |dataType Name   |DTCartesianCoordinates ns=0;i=18809               |
  * |isAbstract      |true                                              |
  */
-export interface UACartesianCoordinates_Base<T extends DTCartesianCoordinates/*j*/>  extends UABaseDataVariable_Base<T, /*e*/DataType.ExtensionObject> {
-    lengthUnit?: UAProperty<EUInformation, /*z*/DataType.ExtensionObject>;
+export interface UACartesianCoordinates_Base<T extends DTCartesianCoordinates>  extends UABaseDataVariable_Base<T, DataType.ExtensionObject> {
+    lengthUnit?: UAProperty<EUInformation, DataType.ExtensionObject>;
 }
-export interface UACartesianCoordinates<T extends DTCartesianCoordinates/*j*/> extends UABaseDataVariable<T, /*n*/DataType.ExtensionObject>, UACartesianCoordinates_Base<T /*B*/> {
+export interface UACartesianCoordinates<T extends DTCartesianCoordinates> extends UABaseDataVariable<T, DataType.ExtensionObject>, UACartesianCoordinates_Base<T> {
 }

package/source/ua_certificate_expiration_alarm.ts

@@ -12,10 +12,10 @@ import { UASystemOffNormalAlarm, UASystemOffNormalAlarm_Base } from "./ua_system
  * |isAbstract      |false                                             |
  */
 export interface UACertificateExpirationAlarm_Base extends UASystemOffNormalAlarm_Base {
-    expirationDate: UAProperty<Date, /*z*/DataType.DateTime>;
-    expirationLimit?: UAProperty<number, /*z*/DataType.Double>;
-    certificateType: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    certificate: UAProperty<Buffer, /*z*/DataType.ByteString>;
+    expirationDate: UAProperty<Date, DataType.DateTime>;
+    expirationLimit?: UAProperty<number, DataType.Double>;
+    certificateType: UAProperty<NodeId, DataType.NodeId>;
+    certificate: UAProperty<Buffer, DataType.ByteString>;
 }
 export interface UACertificateExpirationAlarm extends UASystemOffNormalAlarm, UACertificateExpirationAlarm_Base {
 }

package/source/ua_certificate_group.ts

@@ -15,7 +15,7 @@ import { UATrustListOutOfDateAlarm } from "./ua_trust_list_out_of_date_alarm"
  */
 export interface UACertificateGroup_Base {
     trustList: UATrustList;
-    certificateTypes: UAProperty<NodeId[], /*z*/DataType.NodeId>;
+    certificateTypes: UAProperty<NodeId[], DataType.NodeId>;
     getRejectedList?: UAMethod;
     certificateExpired?: UACertificateExpirationAlarm;
     trustListOutOfDate?: UATrustListOutOfDateAlarm;

package/source/ua_certificate_group_folder.ts

@@ -19,6 +19,7 @@ export interface UACertificateGroupFolder_Base extends UAFolder_Base {
     defaultApplicationGroup: UACertificateGroup;
     defaultHttpsGroup?: UACertificateGroup;
     defaultUserTokenGroup?: UACertificateGroup;
+   // PlaceHolder for $AdditionalGroup$
 }
 export interface UACertificateGroupFolder extends UAFolder, UACertificateGroupFolder_Base {
 }

package/source/ua_certificate_updated_audit_event.ts

@@ -12,8 +12,8 @@ import { UAAuditUpdateMethodEvent, UAAuditUpdateMethodEvent_Base } from "./ua_au
  * |isAbstract      |true                                              |
  */
 export interface UACertificateUpdatedAuditEvent_Base extends UAAuditUpdateMethodEvent_Base {
-    certificateGroup: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    certificateType: UAProperty<NodeId, /*z*/DataType.NodeId>;
+    certificateGroup: UAProperty<NodeId, DataType.NodeId>;
+    certificateType: UAProperty<NodeId, DataType.NodeId>;
 }
 export interface UACertificateUpdatedAuditEvent extends UAAuditUpdateMethodEvent, UACertificateUpdatedAuditEvent_Base {
 }

package/source/ua_choice_state.ts

@@ -8,7 +8,6 @@ import { UAState, UAState_Base } from "./ua_state"
  * |typedDefinition |ChoiceStateType ns=0;i=15109                      |
  * |isAbstract      |false                                             |
  */
-export interface UAChoiceState_Base extends UAState_Base {
-}
+export type UAChoiceState_Base = UAState_Base;
 export interface UAChoiceState extends UAState, UAChoiceState_Base {
 }

package/source/ua_condition.ts

@@ -17,18 +17,18 @@ import { UAConditionVariable } from "./ua_condition_variable"
  * |isAbstract      |true                                              |
  */
 export interface UACondition_Base extends UABaseEvent_Base {
-    conditionClassId: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    conditionClassName: UAProperty<LocalizedText, /*z*/DataType.LocalizedText>;
-    conditionSubClassId?: UAProperty<NodeId[], /*z*/DataType.NodeId>;
-    conditionSubClassName?: UAProperty<LocalizedText[], /*z*/DataType.LocalizedText>;
-    conditionName: UAProperty<UAString, /*z*/DataType.String>;
-    branchId: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    retain: UAProperty<boolean, /*z*/DataType.Boolean>;
+    conditionClassId: UAProperty<NodeId, DataType.NodeId>;
+    conditionClassName: UAProperty<LocalizedText, DataType.LocalizedText>;
+    conditionSubClassId?: UAProperty<NodeId[], DataType.NodeId>;
+    conditionSubClassName?: UAProperty<LocalizedText[], DataType.LocalizedText>;
+    conditionName: UAProperty<UAString, DataType.String>;
+    branchId: UAProperty<NodeId, DataType.NodeId>;
+    retain: UAProperty<boolean, DataType.Boolean>;
     enabledState: UATwoStateVariable<LocalizedText>;
-    quality: UAConditionVariable<StatusCode, /*z*/DataType.StatusCode>;
-    lastSeverity: UAConditionVariable<UInt16, /*z*/DataType.UInt16>;
-    comment: UAConditionVariable<LocalizedText, /*z*/DataType.LocalizedText>;
-    clientUserId: UAProperty<UAString, /*z*/DataType.String>;
+    quality: UAConditionVariable<StatusCode, DataType.StatusCode>;
+    lastSeverity: UAConditionVariable<UInt16, DataType.UInt16>;
+    comment: UAConditionVariable<LocalizedText, DataType.LocalizedText>;
+    clientUserId: UAProperty<UAString, DataType.String>;
     disable: UAMethod;
     enable: UAMethod;
     addComment: UAMethod;

package/source/ua_condition_variable.ts

@@ -9,11 +9,11 @@ import { UABaseDataVariable, UABaseDataVariable_Base } from "./ua_base_data_vari
  * |nodeClass       |VariableType                                      |
  * |typedDefinition |ConditionVariableType ns=0;i=9002                 |
  * |dataType        |Null                                              |
- * |dataType Name   |undefined ns=0;i=0                                |
+ * |dataType Name   |VariantOptions ns=0;i=0                           |
  * |isAbstract      |false                                             |
  */
-export interface UAConditionVariable_Base<T, DT extends DataType>  extends UABaseDataVariable_Base<T/*g*/, DT> {
-    sourceTimestamp: UAProperty<Date, /*z*/DataType.DateTime>;
+export interface UAConditionVariable_Base<T, DT extends DataType>  extends UABaseDataVariable_Base<T, DT> {
+    sourceTimestamp: UAProperty<Date, DataType.DateTime>;
 }
-export interface UAConditionVariable<T, DT extends DataType> extends UABaseDataVariable<T, /*m*/DT>, UAConditionVariable_Base<T, DT /*A*/> {
+export interface UAConditionVariable<T, DT extends DataType> extends UABaseDataVariable<T, DT>, UAConditionVariable_Base<T, DT> {
 }

package/source/ua_cube_item.ts

@@ -1,6 +1,6 @@
 // ----- this file has been automatically generated - do not edit
 import { UAProperty } from "node-opcua-address-space-base"
-import { DataType } from "node-opcua-variant"
+import { DataType, VariantOptions } from "node-opcua-variant"
 import { DTAxisInformation } from "./dt_axis_information"
 import { UAArrayItem, UAArrayItem_Base } from "./ua_array_item"
 /**
@@ -10,13 +10,13 @@ import { UAArrayItem, UAArrayItem_Base } from "./ua_array_item"
  * |nodeClass       |VariableType                                      |
  * |typedDefinition |CubeItemType ns=0;i=12057                         |
  * |dataType        |Null                                              |
- * |dataType Name   |undefined[] ns=0;i=0                              |
+ * |dataType Name   |VariantOptions[] ns=0;i=0                         |
  * |isAbstract      |false                                             |
  */
-export interface UACubeItem_Base<T, DT extends DataType>  extends UAArrayItem_Base<T/*g*/, DT> {
-    xAxisDefinition: UAProperty<DTAxisInformation, /*z*/DataType.ExtensionObject>;
-    yAxisDefinition: UAProperty<DTAxisInformation, /*z*/DataType.ExtensionObject>;
-    zAxisDefinition: UAProperty<DTAxisInformation, /*z*/DataType.ExtensionObject>;
+export interface UACubeItem_Base<T, DT extends DataType>  extends UAArrayItem_Base<T, DT> {
+    xAxisDefinition: UAProperty<DTAxisInformation, DataType.ExtensionObject>;
+    yAxisDefinition: UAProperty<DTAxisInformation, DataType.ExtensionObject>;
+    zAxisDefinition: UAProperty<DTAxisInformation, DataType.ExtensionObject>;
 }
-export interface UACubeItem<T, DT extends DataType> extends UAArrayItem<T, /*m*/DT>, UACubeItem_Base<T, DT /*A*/> {
+export interface UACubeItem<T, DT extends DataType> extends UAArrayItem<T, DT>, UACubeItem_Base<T, DT> {
 }

package/source/ua_data_item.ts

@@ -10,12 +10,12 @@ import { UABaseDataVariable, UABaseDataVariable_Base } from "./ua_base_data_vari
  * |nodeClass       |VariableType                                      |
  * |typedDefinition |DataItemType ns=0;i=2365                          |
  * |dataType        |Null                                              |
- * |dataType Name   |undefined ns=0;i=0                                |
+ * |dataType Name   |VariantOptions ns=0;i=0                           |
  * |isAbstract      |false                                             |
  */
-export interface UADataItem_Base<T, DT extends DataType>  extends UABaseDataVariable_Base<T/*g*/, DT> {
-    definition?: UAProperty<UAString, /*z*/DataType.String>;
-    valuePrecision?: UAProperty<number, /*z*/DataType.Double>;
+export interface UADataItem_Base<T, DT extends DataType>  extends UABaseDataVariable_Base<T, DT> {
+    definition?: UAProperty<UAString, DataType.String>;
+    valuePrecision?: UAProperty<number, DataType.Double>;
 }
-export interface UADataItem<T, DT extends DataType> extends UABaseDataVariable<T, /*m*/DT>, UADataItem_Base<T, DT /*A*/> {
+export interface UADataItem<T, DT extends DataType> extends UABaseDataVariable<T, DT>, UADataItem_Base<T, DT> {
 }

package/source/ua_data_set_folder.ts

@@ -1,6 +1,6 @@
 // ----- this file has been automatically generated - do not edit
 import { UAMethod } from "node-opcua-address-space-base"
-import { DataType } from "node-opcua-variant"
+import { DataType, VariantOptions } from "node-opcua-variant"
 import { Guid } from "node-opcua-basic-types"
 import { DTConfigurationVersion } from "./dt_configuration_version"
 import { DTDataSetMeta } from "./dt_data_set_meta"
@@ -15,6 +15,7 @@ import { UAFolder, UAFolder_Base } from "./ua_folder"
  * |isAbstract      |false                                             |
  */
 export interface UADataSetFolder_Base extends UAFolder_Base {
+   // PlaceHolder for $PublishedDataSetName$
     addPublishedDataItems?: UAMethod;
     addPublishedEvents?: UAMethod;
     addPublishedDataItemsTemplate?: UAMethod;
@@ -22,6 +23,7 @@ export interface UADataSetFolder_Base extends UAFolder_Base {
     removePublishedDataSet?: UAMethod;
     addDataSetFolder?: UAMethod;
     removeDataSetFolder?: UAMethod;
+   // PlaceHolder for $DataSetFolderName$
 }
 export interface UADataSetFolder extends UAFolder, UADataSetFolder_Base {
 }

package/source/ua_data_set_reader.ts

@@ -1,6 +1,6 @@
 // ----- this file has been automatically generated - do not edit
 import { UAObject, UAMethod, UAProperty } from "node-opcua-address-space-base"
-import { DataType } from "node-opcua-variant"
+import { DataType, VariantOptions } from "node-opcua-variant"
 import { UInt32, UInt16, UAString } from "node-opcua-basic-types"
 import { DTDataSetMeta } from "./dt_data_set_meta"
 import { EnumMessageSecurityMode } from "./enum_message_security_mode"
@@ -21,17 +21,17 @@ import { UASubscribedDataSet } from "./ua_subscribed_data_set"
  */
 export interface UADataSetReader_Base {
     publisherId: UAProperty<any, any>;
-    writerGroupId: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    dataSetWriterId: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    dataSetMetaData: UAProperty<DTDataSetMeta, /*z*/DataType.ExtensionObject>;
-    dataSetFieldContentMask: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    messageReceiveTimeout: UAProperty<number, /*z*/DataType.Double>;
-    keyFrameCount: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    headerLayoutUri: UAProperty<UAString, /*z*/DataType.String>;
-    securityMode?: UAProperty<EnumMessageSecurityMode, /*z*/DataType.Int32>;
-    securityGroupId?: UAProperty<UAString, /*z*/DataType.String>;
-    securityKeyServices?: UAProperty<DTEndpointDescription[], /*z*/DataType.ExtensionObject>;
-    dataSetReaderProperties: UAProperty<DTKeyValuePair[], /*z*/DataType.ExtensionObject>;
+    writerGroupId: UAProperty<UInt16, DataType.UInt16>;
+    dataSetWriterId: UAProperty<UInt16, DataType.UInt16>;
+    dataSetMetaData: UAProperty<DTDataSetMeta, DataType.ExtensionObject>;
+    dataSetFieldContentMask: UAProperty<UInt32, DataType.UInt32>;
+    messageReceiveTimeout: UAProperty<number, DataType.Double>;
+    keyFrameCount: UAProperty<UInt32, DataType.UInt32>;
+    headerLayoutUri: UAProperty<UAString, DataType.String>;
+    securityMode?: UAProperty<EnumMessageSecurityMode, DataType.Int32>;
+    securityGroupId?: UAProperty<UAString, DataType.String>;
+    securityKeyServices?: UAProperty<DTEndpointDescription[], DataType.ExtensionObject>;
+    dataSetReaderProperties: UAProperty<DTKeyValuePair[], DataType.ExtensionObject>;
     transportSettings?: UADataSetReaderTransport;
     messageSettings?: UADataSetReaderMessage;
     status: UAPubSubStatus;

package/source/ua_data_set_writer.ts

@@ -16,10 +16,10 @@ import { UAPubSubDiagnosticsDataSetWriter } from "./ua_pub_sub_diagnostics_data_
  * |isAbstract      |false                                             |
  */
 export interface UADataSetWriter_Base {
-    dataSetWriterId: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    dataSetFieldContentMask: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    keyFrameCount?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    dataSetWriterProperties: UAProperty<DTKeyValuePair[], /*z*/DataType.ExtensionObject>;
+    dataSetWriterId: UAProperty<UInt16, DataType.UInt16>;
+    dataSetFieldContentMask: UAProperty<UInt32, DataType.UInt32>;
+    keyFrameCount?: UAProperty<UInt32, DataType.UInt32>;
+    dataSetWriterProperties: UAProperty<DTKeyValuePair[], DataType.ExtensionObject>;
     transportSettings?: UADataSetWriterTransport;
     messageSettings?: UADataSetWriterMessage;
     status: UAPubSubStatus;

package/source/ua_datagram_connection_transport.ts

@@ -15,10 +15,10 @@ import { UANetworkAddress } from "./ua_network_address"
  */
 export interface UADatagramConnectionTransport_Base extends UAConnectionTransport_Base {
     discoveryAddress: UANetworkAddress;
-    discoveryAnnounceRate?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    discoveryMaxMessageSize?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    qosCategory?: UAProperty<UAString, /*z*/DataType.String>;
-    datagramQos?: UAProperty<DTQos[], /*z*/DataType.ExtensionObject>;
+    discoveryAnnounceRate?: UAProperty<UInt32, DataType.UInt32>;
+    discoveryMaxMessageSize?: UAProperty<UInt32, DataType.UInt32>;
+    qosCategory?: UAProperty<UAString, DataType.String>;
+    datagramQos?: UAProperty<DTQos[], DataType.ExtensionObject>;
 }
 export interface UADatagramConnectionTransport extends UAConnectionTransport, UADatagramConnectionTransport_Base {
 }

package/source/ua_datagram_data_set_reader_transport.ts

@@ -15,9 +15,9 @@ import { UANetworkAddress } from "./ua_network_address"
  */
 export interface UADatagramDataSetReaderTransport_Base extends UAWriterGroupTransport_Base {
     address?: UANetworkAddress;
-    qosCategory?: UAProperty<UAString, /*z*/DataType.String>;
-    datagramQos?: UAProperty<DTReceiveQos[], /*z*/DataType.ExtensionObject>;
-    topic?: UAProperty<UAString, /*z*/DataType.String>;
+    qosCategory?: UAProperty<UAString, DataType.String>;
+    datagramQos?: UAProperty<DTReceiveQos[], DataType.ExtensionObject>;
+    topic?: UAProperty<UAString, DataType.String>;
 }
 export interface UADatagramDataSetReaderTransport extends UAWriterGroupTransport, UADatagramDataSetReaderTransport_Base {
 }

package/source/ua_datagram_writer_group_transport.ts

@@ -14,13 +14,13 @@ import { UANetworkAddress } from "./ua_network_address"
  * |isAbstract      |false                                             |
  */
 export interface UADatagramWriterGroupTransport_Base extends UAWriterGroupTransport_Base {
-    messageRepeatCount?: UAProperty<Byte, /*z*/DataType.Byte>;
-    messageRepeatDelay?: UAProperty<number, /*z*/DataType.Double>;
+    messageRepeatCount?: UAProperty<Byte, DataType.Byte>;
+    messageRepeatDelay?: UAProperty<number, DataType.Double>;
     address?: UANetworkAddress;
-    qosCategory?: UAProperty<UAString, /*z*/DataType.String>;
-    datagramQos?: UAProperty<DTTransmitQos[], /*z*/DataType.ExtensionObject>;
-    discoveryAnnounceRate?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    topic?: UAProperty<UAString, /*z*/DataType.String>;
+    qosCategory?: UAProperty<UAString, DataType.String>;
+    datagramQos?: UAProperty<DTTransmitQos[], DataType.ExtensionObject>;
+    discoveryAnnounceRate?: UAProperty<UInt32, DataType.UInt32>;
+    topic?: UAProperty<UAString, DataType.String>;
 }
 export interface UADatagramWriterGroupTransport extends UAWriterGroupTransport, UADatagramWriterGroupTransport_Base {
 }

package/source/ua_device_failure_event.ts

@@ -8,7 +8,6 @@ import { UASystemEvent, UASystemEvent_Base } from "./ua_system_event"
  * |typedDefinition |DeviceFailureEventType ns=0;i=2131                |
  * |isAbstract      |true                                              |
  */
-export interface UADeviceFailureEvent_Base extends UASystemEvent_Base {
-}
+export type UADeviceFailureEvent_Base = UASystemEvent_Base;
 export interface UADeviceFailureEvent extends UASystemEvent, UADeviceFailureEvent_Base {
 }

package/source/ua_dialog_condition.ts

@@ -17,12 +17,12 @@ import { UATwoStateVariable } from "./ua_two_state_variable"
 export interface UADialogCondition_Base extends UACondition_Base {
     enabledState: UATwoStateVariable<LocalizedText>;
     dialogState: UATwoStateVariable<LocalizedText>;
-    prompt: UAProperty<LocalizedText, /*z*/DataType.LocalizedText>;
-    responseOptionSet: UAProperty<LocalizedText[], /*z*/DataType.LocalizedText>;
-    defaultResponse: UAProperty<Int32, /*z*/DataType.Int32>;
-    okResponse: UAProperty<Int32, /*z*/DataType.Int32>;
-    cancelResponse: UAProperty<Int32, /*z*/DataType.Int32>;
-    lastResponse: UAProperty<Int32, /*z*/DataType.Int32>;
+    prompt: UAProperty<LocalizedText, DataType.LocalizedText>;
+    responseOptionSet: UAProperty<LocalizedText[], DataType.LocalizedText>;
+    defaultResponse: UAProperty<Int32, DataType.Int32>;
+    okResponse: UAProperty<Int32, DataType.Int32>;
+    cancelResponse: UAProperty<Int32, DataType.Int32>;
+    lastResponse: UAProperty<Int32, DataType.Int32>;
     respond: UAMethod;
     respond2: UAMethod;
 }

package/source/ua_dictionary_entry.ts

@@ -9,6 +9,7 @@ import { UAObject } from "node-opcua-address-space-base"
  * |isAbstract      |true                                              |
  */
 export interface UADictionaryEntry_Base {
+   // PlaceHolder for $DictionaryEntryName$
 }
 export interface UADictionaryEntry extends UAObject, UADictionaryEntry_Base {
 }

package/source/ua_dictionary_folder.ts

@@ -8,7 +8,6 @@ import { UAFolder, UAFolder_Base } from "./ua_folder"
  * |typedDefinition |DictionaryFolderType ns=0;i=17591                 |
  * |isAbstract      |false                                             |
  */
-export interface UADictionaryFolder_Base extends UAFolder_Base {
-}
+export type UADictionaryFolder_Base = UAFolder_Base;
 export interface UADictionaryFolder extends UAFolder, UADictionaryFolder_Base {
 }

package/source/ua_discrepancy_alarm.ts

@@ -12,9 +12,9 @@ import { UAAlarmCondition, UAAlarmCondition_Base } from "./ua_alarm_condition"
  * |isAbstract      |false                                             |
  */
 export interface UADiscrepancyAlarm_Base extends UAAlarmCondition_Base {
-    targetValueNode: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    expectedTime: UAProperty<number, /*z*/DataType.Double>;
-    tolerance?: UAProperty<number, /*z*/DataType.Double>;
+    targetValueNode: UAProperty<NodeId, DataType.NodeId>;
+    expectedTime: UAProperty<number, DataType.Double>;
+    tolerance?: UAProperty<number, DataType.Double>;
 }
 export interface UADiscrepancyAlarm extends UAAlarmCondition, UADiscrepancyAlarm_Base {
 }

package/source/ua_discrete_alarm.ts

@@ -8,7 +8,6 @@ import { UAAlarmCondition, UAAlarmCondition_Base } from "./ua_alarm_condition"
  * |typedDefinition |DiscreteAlarmType ns=0;i=10523                    |
  * |isAbstract      |false                                             |
  */
-export interface UADiscreteAlarm_Base extends UAAlarmCondition_Base {
-}
+export type UADiscreteAlarm_Base = UAAlarmCondition_Base;
 export interface UADiscreteAlarm extends UAAlarmCondition, UADiscreteAlarm_Base {
 }

package/source/ua_discrete_item.ts

@@ -1,5 +1,5 @@
 // ----- this file has been automatically generated - do not edit
-import { DataType } from "node-opcua-variant"
+import { DataType, VariantOptions } from "node-opcua-variant"
 import { UADataItem, UADataItem_Base } from "./ua_data_item"
 /**
  * |                |                                                  |
@@ -8,10 +8,9 @@ import { UADataItem, UADataItem_Base } from "./ua_data_item"
  * |nodeClass       |VariableType                                      |
  * |typedDefinition |DiscreteItemType ns=0;i=2372                      |
  * |dataType        |Null                                              |
- * |dataType Name   |undefined ns=0;i=0                                |
+ * |dataType Name   |VariantOptions ns=0;i=0                           |
  * |isAbstract      |true                                              |
  */
-export interface UADiscreteItem_Base<T, DT extends DataType>  extends UADataItem_Base<T/*g*/, DT> {
-}
-export interface UADiscreteItem<T, DT extends DataType> extends UADataItem<T, /*m*/DT>, UADiscreteItem_Base<T, DT /*A*/> {
+export type UADiscreteItem_Base<T, DT extends DataType> = UADataItem_Base<T, DT>;
+export interface UADiscreteItem<T, DT extends DataType> extends UADataItem<T, DT>, UADiscreteItem_Base<T, DT> {
 }

package/source/ua_ecc_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAApplicationCertificate, UAApplicationCertificate_Base } from "./ua_ap
  * |typedDefinition |EccApplicationCertificateType ns=0;i=23537        |
  * |isAbstract      |false                                             |
  */
-export interface UAEccApplicationCertificate_Base extends UAApplicationCertificate_Base {
-}
+export type UAEccApplicationCertificate_Base = UAApplicationCertificate_Base;
 export interface UAEccApplicationCertificate extends UAApplicationCertificate, UAEccApplicationCertificate_Base {
 }

package/source/ua_ecc_brainpool_p_256_r_1_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAEccApplicationCertificate, UAEccApplicationCertificate_Base } from ".
  * |typedDefinition |EccBrainpoolP256r1ApplicationCertificateType ns=0;i=23540|
  * |isAbstract      |false                                             |
  */
-export interface UAEccBrainpoolP256r1ApplicationCertificate_Base extends UAEccApplicationCertificate_Base {
-}
+export type UAEccBrainpoolP256r1ApplicationCertificate_Base = UAEccApplicationCertificate_Base;
 export interface UAEccBrainpoolP256r1ApplicationCertificate extends UAEccApplicationCertificate, UAEccBrainpoolP256r1ApplicationCertificate_Base {
 }

package/source/ua_ecc_brainpool_p_384_r_1_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAEccApplicationCertificate, UAEccApplicationCertificate_Base } from ".
  * |typedDefinition |EccBrainpoolP384r1ApplicationCertificateType ns=0;i=23541|
  * |isAbstract      |false                                             |
  */
-export interface UAEccBrainpoolP384r1ApplicationCertificate_Base extends UAEccApplicationCertificate_Base {
-}
+export type UAEccBrainpoolP384r1ApplicationCertificate_Base = UAEccApplicationCertificate_Base;
 export interface UAEccBrainpoolP384r1ApplicationCertificate extends UAEccApplicationCertificate, UAEccBrainpoolP384r1ApplicationCertificate_Base {
 }

package/source/ua_ecc_curve_25519_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAEccApplicationCertificate, UAEccApplicationCertificate_Base } from ".
  * |typedDefinition |EccCurve25519ApplicationCertificateType ns=0;i=23542|
  * |isAbstract      |false                                             |
  */
-export interface UAEccCurve25519ApplicationCertificate_Base extends UAEccApplicationCertificate_Base {
-}
+export type UAEccCurve25519ApplicationCertificate_Base = UAEccApplicationCertificate_Base;
 export interface UAEccCurve25519ApplicationCertificate extends UAEccApplicationCertificate, UAEccCurve25519ApplicationCertificate_Base {
 }

package/source/ua_ecc_curve_448_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAEccApplicationCertificate, UAEccApplicationCertificate_Base } from ".
  * |typedDefinition |EccCurve448ApplicationCertificateType ns=0;i=23543|
  * |isAbstract      |false                                             |
  */
-export interface UAEccCurve448ApplicationCertificate_Base extends UAEccApplicationCertificate_Base {
-}
+export type UAEccCurve448ApplicationCertificate_Base = UAEccApplicationCertificate_Base;
 export interface UAEccCurve448ApplicationCertificate extends UAEccApplicationCertificate, UAEccCurve448ApplicationCertificate_Base {
 }

package/source/ua_ecc_nist_p_256_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAEccApplicationCertificate, UAEccApplicationCertificate_Base } from ".
  * |typedDefinition |EccNistP256ApplicationCertificateType ns=0;i=23538|
  * |isAbstract      |false                                             |
  */
-export interface UAEccNistP256ApplicationCertificate_Base extends UAEccApplicationCertificate_Base {
-}
+export type UAEccNistP256ApplicationCertificate_Base = UAEccApplicationCertificate_Base;
 export interface UAEccNistP256ApplicationCertificate extends UAEccApplicationCertificate, UAEccNistP256ApplicationCertificate_Base {
 }

package/source/ua_ecc_nist_p_384_application_certificate.ts

@@ -8,7 +8,6 @@ import { UAEccApplicationCertificate, UAEccApplicationCertificate_Base } from ".
  * |typedDefinition |EccNistP384ApplicationCertificateType ns=0;i=23539|
  * |isAbstract      |false                                             |
  */
-export interface UAEccNistP384ApplicationCertificate_Base extends UAEccApplicationCertificate_Base {
-}
+export type UAEccNistP384ApplicationCertificate_Base = UAEccApplicationCertificate_Base;
 export interface UAEccNistP384ApplicationCertificate extends UAEccApplicationCertificate, UAEccNistP384ApplicationCertificate_Base {
 }

package/source/ua_else_guard_variable.ts

@@ -12,7 +12,6 @@ import { UAGuardVariable, UAGuardVariable_Base } from "./ua_guard_variable"
  * |dataType Name   |LocalizedText ns=0;i=21                           |
  * |isAbstract      |false                                             |
  */
-export interface UAElseGuardVariable_Base<T extends LocalizedText/*j*/>  extends UAGuardVariable_Base<T/*h*/> {
-}
-export interface UAElseGuardVariable<T extends LocalizedText/*j*/> extends UAGuardVariable<T/*k*/>, UAElseGuardVariable_Base<T /*B*/> {
+export type UAElseGuardVariable_Base<T extends LocalizedText> = UAGuardVariable_Base<T>;
+export interface UAElseGuardVariable<T extends LocalizedText> extends UAGuardVariable<T>, UAElseGuardVariable_Base<T> {
 }

package/source/ua_event_queue_overflow_event.ts

@@ -8,7 +8,6 @@ import { UABaseEvent, UABaseEvent_Base } from "./ua_base_event"
  * |typedDefinition |EventQueueOverflowEventType ns=0;i=3035           |
  * |isAbstract      |true                                              |
  */
-export interface UAEventQueueOverflowEvent_Base extends UABaseEvent_Base {
-}
+export type UAEventQueueOverflowEvent_Base = UABaseEvent_Base;
 export interface UAEventQueueOverflowEvent extends UABaseEvent, UAEventQueueOverflowEvent_Base {
 }

package/source/ua_exclusive_deviation_alarm.ts

@@ -12,8 +12,8 @@ import { UAExclusiveLimitAlarm, UAExclusiveLimitAlarm_Base } from "./ua_exclusiv
  * |isAbstract      |false                                             |
  */
 export interface UAExclusiveDeviationAlarm_Base extends UAExclusiveLimitAlarm_Base {
-    setpointNode: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    baseSetpointNode?: UAProperty<NodeId, /*z*/DataType.NodeId>;
+    setpointNode: UAProperty<NodeId, DataType.NodeId>;
+    baseSetpointNode?: UAProperty<NodeId, DataType.NodeId>;
 }
 export interface UAExclusiveDeviationAlarm extends UAExclusiveLimitAlarm, UAExclusiveDeviationAlarm_Base {
 }

package/source/ua_exclusive_level_alarm.ts

@@ -8,7 +8,6 @@ import { UAExclusiveLimitAlarm, UAExclusiveLimitAlarm_Base } from "./ua_exclusiv
  * |typedDefinition |ExclusiveLevelAlarmType ns=0;i=9482               |
  * |isAbstract      |false                                             |
  */
-export interface UAExclusiveLevelAlarm_Base extends UAExclusiveLimitAlarm_Base {
-}
+export type UAExclusiveLevelAlarm_Base = UAExclusiveLimitAlarm_Base;
 export interface UAExclusiveLevelAlarm extends UAExclusiveLimitAlarm, UAExclusiveLevelAlarm_Base {
 }