node-opcua-nodeset-ua 2.74.0 → 2.76.2

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

@@ -11,7 +11,6 @@ import { UADataItem, UADataItem_Base } from "./ua_data_item"
  * |dataType Name   |undefined 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 {
 }

package/source/ua_exclusive_rate_of_change_alarm.ts

@@ -12,7 +12,7 @@ import { UAExclusiveLimitAlarm, UAExclusiveLimitAlarm_Base } from "./ua_exclusiv
  * |isAbstract      |false                                             |
  */
 export interface UAExclusiveRateOfChangeAlarm_Base extends UAExclusiveLimitAlarm_Base {
-    engineeringUnits?: UAProperty<EUInformation, /*z*/DataType.ExtensionObject>;
+    engineeringUnits?: UAProperty<EUInformation, DataType.ExtensionObject>;
 }
 export interface UAExclusiveRateOfChangeAlarm extends UAExclusiveLimitAlarm, UAExclusiveRateOfChangeAlarm_Base {
 }

package/source/ua_expression_guard_variable.ts

@@ -14,8 +14,8 @@ import { UAGuardVariable, UAGuardVariable_Base } from "./ua_guard_variable"
  * |dataType Name   |LocalizedText ns=0;i=21                           |
  * |isAbstract      |false                                             |
  */
-export interface UAExpressionGuardVariable_Base<T extends LocalizedText/*j*/>  extends UAGuardVariable_Base<T/*h*/> {
-    expression: UAProperty<DTContentFilter, /*z*/DataType.ExtensionObject>;
+export interface UAExpressionGuardVariable_Base<T extends LocalizedText>  extends UAGuardVariable_Base<T> {
+    expression: UAProperty<DTContentFilter, DataType.ExtensionObject>;
 }
-export interface UAExpressionGuardVariable<T extends LocalizedText/*j*/> extends UAGuardVariable<T/*k*/>, UAExpressionGuardVariable_Base<T /*B*/> {
+export interface UAExpressionGuardVariable<T extends LocalizedText> extends UAGuardVariable<T>, UAExpressionGuardVariable_Base<T> {
 }

package/source/ua_extension_fields.ts

@@ -10,6 +10,7 @@ import { DataType } from "node-opcua-variant"
  * |isAbstract      |false                                             |
  */
 export interface UAExtensionFields_Base {
+   // PlaceHolder for $ExtensionFieldName$
     addExtensionField: UAMethod;
     removeExtensionField: UAMethod;
 }

package/source/ua_file.ts

@@ -11,13 +11,13 @@ import { UInt64, UInt32, UInt16, UAString } from "node-opcua-basic-types"
  * |isAbstract      |false                                             |
  */
 export interface UAFile_Base {
-    size: UAProperty<UInt64, /*z*/DataType.UInt64>;
-    writable: UAProperty<boolean, /*z*/DataType.Boolean>;
-    userWritable: UAProperty<boolean, /*z*/DataType.Boolean>;
-    openCount: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    mimeType?: UAProperty<UAString, /*z*/DataType.String>;
-    maxByteStringLength?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    lastModifiedTime?: UAProperty<Date, /*z*/DataType.DateTime>;
+    size: UAProperty<UInt64, DataType.UInt64>;
+    writable: UAProperty<boolean, DataType.Boolean>;
+    userWritable: UAProperty<boolean, DataType.Boolean>;
+    openCount: UAProperty<UInt16, DataType.UInt16>;
+    mimeType?: UAProperty<UAString, DataType.String>;
+    maxByteStringLength?: UAProperty<UInt32, DataType.UInt32>;
+    lastModifiedTime?: UAProperty<Date, DataType.DateTime>;
     open: UAMethod;
     close: UAMethod;
     read: UAMethod;

package/source/ua_file_directory.ts

@@ -17,6 +17,8 @@ export interface UAFileDirectory_Base extends UAFolder_Base {
     createFile: UAMethod;
     delete: UAMethod;
     moveOrCopy: UAMethod;
+   // PlaceHolder for $FileDirectoryName$
+   // PlaceHolder for $FileName$
 }
 export interface UAFileDirectory extends UAFolder, UAFileDirectory_Base {
 }

package/source/ua_finite_state_machine.ts

@@ -17,8 +17,8 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
 export interface UAFiniteStateMachine_Base extends UAStateMachine_Base {
     currentState: UAStateVariable<LocalizedText>;
     lastTransition?: UATransitionVariable<LocalizedText>;
-    availableStates?: UABaseDataVariable<NodeId[], /*z*/DataType.NodeId>;
-    availableTransitions?: UABaseDataVariable<NodeId[], /*z*/DataType.NodeId>;
+    availableStates?: UABaseDataVariable<NodeId[], DataType.NodeId>;
+    availableTransitions?: UABaseDataVariable<NodeId[], DataType.NodeId>;
 }
 export interface UAFiniteStateMachine extends Omit<UAStateMachine, "currentState"|"lastTransition">, UAFiniteStateMachine_Base {
 }

package/source/ua_finite_state_variable.ts

@@ -14,8 +14,8 @@ import { UAStateVariable, UAStateVariable_Base } from "./ua_state_variable"
  * |dataType Name   |LocalizedText ns=0;i=21                           |
  * |isAbstract      |false                                             |
  */
-export interface UAFiniteStateVariable_Base<T extends LocalizedText/*j*/>  extends UAStateVariable_Base<T/*h*/> {
-    id: UAProperty<NodeId, /*z*/DataType.NodeId>;
+export interface UAFiniteStateVariable_Base<T extends LocalizedText>  extends UAStateVariable_Base<T> {
+    id: UAProperty<NodeId, DataType.NodeId>;
 }
-export interface UAFiniteStateVariable<T extends LocalizedText/*j*/> extends Omit<UAStateVariable<T/*k*/>, "id">, UAFiniteStateVariable_Base<T /*B*/> {
+export interface UAFiniteStateVariable<T extends LocalizedText> extends Omit<UAStateVariable<T>, "id">, UAFiniteStateVariable_Base<T> {
 }

package/source/ua_finite_transition_variable.ts

@@ -14,8 +14,8 @@ import { UATransitionVariable, UATransitionVariable_Base } from "./ua_transition
  * |dataType Name   |LocalizedText ns=0;i=21                           |
  * |isAbstract      |false                                             |
  */
-export interface UAFiniteTransitionVariable_Base<T extends LocalizedText/*j*/>  extends UATransitionVariable_Base<T/*h*/> {
-    id: UAProperty<NodeId, /*z*/DataType.NodeId>;
+export interface UAFiniteTransitionVariable_Base<T extends LocalizedText>  extends UATransitionVariable_Base<T> {
+    id: UAProperty<NodeId, DataType.NodeId>;
 }
-export interface UAFiniteTransitionVariable<T extends LocalizedText/*j*/> extends Omit<UATransitionVariable<T/*k*/>, "id">, UAFiniteTransitionVariable_Base<T /*B*/> {
+export interface UAFiniteTransitionVariable<T extends LocalizedText> extends Omit<UATransitionVariable<T>, "id">, UAFiniteTransitionVariable_Base<T> {
 }

package/source/ua_frame.ts

@@ -18,12 +18,12 @@ import { UAOrientation } from "./ua_orientation"
  * |dataType Name   |DTFrame ns=0;i=18813                              |
  * |isAbstract      |true                                              |
  */
-export interface UAFrame_Base<T extends DTFrame/*j*/>  extends UABaseDataVariable_Base<T, /*e*/DataType.ExtensionObject> {
+export interface UAFrame_Base<T extends DTFrame>  extends UABaseDataVariable_Base<T, DataType.ExtensionObject> {
     cartesianCoordinates: UACartesianCoordinates<DTCartesianCoordinates>;
     orientation: UAOrientation<DTOrientation>;
-    constant?: UAProperty<boolean, /*z*/DataType.Boolean>;
-    baseFrame?: UABaseDataVariable<NodeId, /*z*/DataType.NodeId>;
-    fixedBase?: UAProperty<boolean, /*z*/DataType.Boolean>;
+    constant?: UAProperty<boolean, DataType.Boolean>;
+    baseFrame?: UABaseDataVariable<NodeId, DataType.NodeId>;
+    fixedBase?: UAProperty<boolean, DataType.Boolean>;
 }
-export interface UAFrame<T extends DTFrame/*j*/> extends UABaseDataVariable<T, /*n*/DataType.ExtensionObject>, UAFrame_Base<T /*B*/> {
+export interface UAFrame<T extends DTFrame> extends UABaseDataVariable<T, DataType.ExtensionObject>, UAFrame_Base<T> {
 }

package/source/ua_general_model_change_event.ts

@@ -12,7 +12,7 @@ import { UABaseModelChangeEvent, UABaseModelChangeEvent_Base } from "./ua_base_m
  * |isAbstract      |true                                              |
  */
 export interface UAGeneralModelChangeEvent_Base extends UABaseModelChangeEvent_Base {
-    changes: UAProperty<DTModelChangeStructure[], /*z*/DataType.ExtensionObject>;
+    changes: UAProperty<DTModelChangeStructure[], DataType.ExtensionObject>;
 }
 export interface UAGeneralModelChangeEvent extends UABaseModelChangeEvent, UAGeneralModelChangeEvent_Base {
 }

package/source/ua_guard_variable.ts

@@ -12,7 +12,6 @@ import { UABaseDataVariable, UABaseDataVariable_Base } from "./ua_base_data_vari
  * |dataType Name   |LocalizedText ns=0;i=21                           |
  * |isAbstract      |false                                             |
  */
-export interface UAGuardVariable_Base<T extends LocalizedText/*j*/>  extends UABaseDataVariable_Base<T, /*e*/DataType.LocalizedText> {
-}
-export interface UAGuardVariable<T extends LocalizedText/*j*/> extends UABaseDataVariable<T, /*n*/DataType.LocalizedText>, UAGuardVariable_Base<T /*B*/> {
+export type UAGuardVariable_Base<T extends LocalizedText> = UABaseDataVariable_Base<T, DataType.LocalizedText>;
+export interface UAGuardVariable<T extends LocalizedText> extends UABaseDataVariable<T, DataType.LocalizedText>, UAGuardVariable_Base<T> {
 }

package/source/ua_highly_managed_alarm_condition_class.ts

@@ -8,7 +8,6 @@ import { UABaseConditionClass, UABaseConditionClass_Base } from "./ua_base_condi
  * |typedDefinition |HighlyManagedAlarmConditionClassType ns=0;i=17219 |
  * |isAbstract      |true                                              |
  */
-export interface UAHighlyManagedAlarmConditionClass_Base extends UABaseConditionClass_Base {
-}
+export type UAHighlyManagedAlarmConditionClass_Base = UABaseConditionClass_Base;
 export interface UAHighlyManagedAlarmConditionClass extends UABaseConditionClass, UAHighlyManagedAlarmConditionClass_Base {
 }

package/source/ua_historical_data_configuration.ts

@@ -16,15 +16,15 @@ import { UAFolder } from "./ua_folder"
 export interface UAHistoricalDataConfiguration_Base {
     aggregateConfiguration: UAAggregateConfiguration;
     aggregateFunctions?: UAFolder;
-    stepped: UAProperty<boolean, /*z*/DataType.Boolean>;
-    definition?: UAProperty<UAString, /*z*/DataType.String>;
-    maxTimeInterval?: UAProperty<number, /*z*/DataType.Double>;
-    minTimeInterval?: UAProperty<number, /*z*/DataType.Double>;
-    exceptionDeviation?: UAProperty<number, /*z*/DataType.Double>;
-    exceptionDeviationFormat?: UAProperty<EnumExceptionDeviationFormat, /*z*/DataType.Int32>;
-    startOfArchive?: UAProperty<Date, /*z*/DataType.DateTime>;
-    startOfOnlineArchive?: UAProperty<Date, /*z*/DataType.DateTime>;
-    serverTimestampSupported?: UAProperty<boolean, /*z*/DataType.Boolean>;
+    stepped: UAProperty<boolean, DataType.Boolean>;
+    definition?: UAProperty<UAString, DataType.String>;
+    maxTimeInterval?: UAProperty<number, DataType.Double>;
+    minTimeInterval?: UAProperty<number, DataType.Double>;
+    exceptionDeviation?: UAProperty<number, DataType.Double>;
+    exceptionDeviationFormat?: UAProperty<EnumExceptionDeviationFormat, DataType.Int32>;
+    startOfArchive?: UAProperty<Date, DataType.DateTime>;
+    startOfOnlineArchive?: UAProperty<Date, DataType.DateTime>;
+    serverTimestampSupported?: UAProperty<boolean, DataType.Boolean>;
 }
 export interface UAHistoricalDataConfiguration extends UAObject, UAHistoricalDataConfiguration_Base {
 }

package/source/ua_history_server_capabilities.ts

@@ -12,22 +12,22 @@ import { UAFolder } from "./ua_folder"
  * |isAbstract      |false                                             |
  */
 export interface UAHistoryServerCapabilities_Base {
-    accessHistoryDataCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    accessHistoryEventsCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    maxReturnDataValues: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxReturnEventValues: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    insertDataCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    replaceDataCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    updateDataCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    deleteRawCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    deleteAtTimeCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    insertEventCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    replaceEventCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    updateEventCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    deleteEventCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
-    insertAnnotationCapability: UAProperty<boolean, /*z*/DataType.Boolean>;
+    accessHistoryDataCapability: UAProperty<boolean, DataType.Boolean>;
+    accessHistoryEventsCapability: UAProperty<boolean, DataType.Boolean>;
+    maxReturnDataValues: UAProperty<UInt32, DataType.UInt32>;
+    maxReturnEventValues: UAProperty<UInt32, DataType.UInt32>;
+    insertDataCapability: UAProperty<boolean, DataType.Boolean>;
+    replaceDataCapability: UAProperty<boolean, DataType.Boolean>;
+    updateDataCapability: UAProperty<boolean, DataType.Boolean>;
+    deleteRawCapability: UAProperty<boolean, DataType.Boolean>;
+    deleteAtTimeCapability: UAProperty<boolean, DataType.Boolean>;
+    insertEventCapability: UAProperty<boolean, DataType.Boolean>;
+    replaceEventCapability: UAProperty<boolean, DataType.Boolean>;
+    updateEventCapability: UAProperty<boolean, DataType.Boolean>;
+    deleteEventCapability: UAProperty<boolean, DataType.Boolean>;
+    insertAnnotationCapability: UAProperty<boolean, DataType.Boolean>;
     aggregateFunctions: UAFolder;
-    serverTimestampSupported: UAProperty<boolean, /*z*/DataType.Boolean>;
+    serverTimestampSupported: UAProperty<boolean, DataType.Boolean>;
 }
 export interface UAHistoryServerCapabilities extends UAObject, UAHistoryServerCapabilities_Base {
 }

package/source/ua_https_certificate.ts

@@ -8,7 +8,6 @@ import { UACertificate, UACertificate_Base } from "./ua_certificate"
  * |typedDefinition |HttpsCertificateType ns=0;i=12558                 |
  * |isAbstract      |false                                             |
  */
-export interface UAHttpsCertificate_Base extends UACertificate_Base {
-}
+export type UAHttpsCertificate_Base = UACertificate_Base;
 export interface UAHttpsCertificate extends UACertificate, UAHttpsCertificate_Base {
 }

package/source/ua_i_base_ethernet_capabilities.ts

@@ -11,7 +11,7 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIBaseEthernetCapabilities_Base extends UABaseInterface_Base {
-    vlanTagCapable: UABaseDataVariable<boolean, /*z*/DataType.Boolean>;
+    vlanTagCapable: UABaseDataVariable<boolean, DataType.Boolean>;
 }
 export interface UAIBaseEthernetCapabilities extends UABaseInterface, UAIBaseEthernetCapabilities_Base {
 }

package/source/ua_i_ieee_auto_negotiation_status.ts

@@ -12,7 +12,7 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeAutoNegotiationStatus_Base extends UABaseInterface_Base {
-    negotiationStatus: UABaseDataVariable<EnumNegotiationStatus, /*z*/DataType.Int32>;
+    negotiationStatus: UABaseDataVariable<EnumNegotiationStatus, DataType.Int32>;
 }
 export interface UAIIeeeAutoNegotiationStatus extends UABaseInterface, UAIIeeeAutoNegotiationStatus_Base {
 }

package/source/ua_i_ieee_base_ethernet_port.ts

@@ -15,9 +15,9 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeBaseEthernetPort_Base extends UABaseInterface_Base {
-    speed: UAAnalogUnit<UInt64, /*z*/DataType.UInt64>;
-    duplex: UABaseDataVariable<EnumDuplex, /*z*/DataType.Int32>;
-    maxFrameLength: UABaseDataVariable<UInt16, /*z*/DataType.UInt16>;
+    speed: UAAnalogUnit<UInt64, DataType.UInt64>;
+    duplex: UABaseDataVariable<EnumDuplex, DataType.Int32>;
+    maxFrameLength: UABaseDataVariable<UInt16, DataType.UInt16>;
 }
 export interface UAIIeeeBaseEthernetPort extends UABaseInterface, UAIIeeeBaseEthernetPort_Base {
 }

package/source/ua_i_ieee_base_tsn_status_stream.ts

@@ -15,10 +15,10 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeBaseTsnStatusStream_Base extends UABaseInterface_Base {
-    talkerStatus?: UABaseDataVariable<EnumTsnTalkerStatus, /*z*/DataType.Int32>;
-    listenerStatus?: UABaseDataVariable<EnumTsnListenerStatus, /*z*/DataType.Int32>;
-    failureCode: UABaseDataVariable<EnumTsnFailureCode, /*z*/DataType.Int32>;
-    failureSystemIdentifier: UABaseDataVariable<Byte[], /*z*/DataType.Byte>;
+    talkerStatus?: UABaseDataVariable<EnumTsnTalkerStatus, DataType.Int32>;
+    listenerStatus?: UABaseDataVariable<EnumTsnListenerStatus, DataType.Int32>;
+    failureCode: UABaseDataVariable<EnumTsnFailureCode, DataType.Int32>;
+    failureSystemIdentifier: UABaseDataVariable<Byte[], DataType.Byte>;
 }
 export interface UAIIeeeBaseTsnStatusStream extends UABaseInterface, UAIIeeeBaseTsnStatusStream_Base {
 }

package/source/ua_i_ieee_base_tsn_stream.ts

@@ -13,11 +13,11 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeBaseTsnStream_Base extends UABaseInterface_Base {
-    streamId: UABaseDataVariable<Byte[], /*z*/DataType.Byte>;
-    streamName: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    state: UABaseDataVariable<EnumTsnStreamState, /*z*/DataType.Int32>;
-    accumulatedLatency?: UABaseDataVariable<UInt32, /*z*/DataType.UInt32>;
-    srClassId?: UABaseDataVariable<Byte, /*z*/DataType.Byte>;
+    streamId: UABaseDataVariable<Byte[], DataType.Byte>;
+    streamName: UABaseDataVariable<UAString, DataType.String>;
+    state: UABaseDataVariable<EnumTsnStreamState, DataType.Int32>;
+    accumulatedLatency?: UABaseDataVariable<UInt32, DataType.UInt32>;
+    srClassId?: UABaseDataVariable<Byte, DataType.Byte>;
 }
 export interface UAIIeeeBaseTsnStream extends UABaseInterface, UAIIeeeBaseTsnStream_Base {
 }

package/source/ua_i_ieee_base_tsn_traffic_specification.ts

@@ -13,9 +13,9 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeBaseTsnTrafficSpecification_Base extends UABaseInterface_Base {
-    maxIntervalFrames: UABaseDataVariable<UInt16, /*z*/DataType.UInt16>;
-    maxFrameSize: UABaseDataVariable<UInt32, /*z*/DataType.UInt32>;
-    interval: UABaseDataVariable<DTUnsignedRationalNumber, /*z*/DataType.ExtensionObject>;
+    maxIntervalFrames: UABaseDataVariable<UInt16, DataType.UInt16>;
+    maxFrameSize: UABaseDataVariable<UInt32, DataType.UInt32>;
+    interval: UABaseDataVariable<DTUnsignedRationalNumber, DataType.ExtensionObject>;
 }
 export interface UAIIeeeBaseTsnTrafficSpecification extends UABaseInterface, UAIIeeeBaseTsnTrafficSpecification_Base {
 }

package/source/ua_i_ieee_tsn_interface_configuration.ts

@@ -12,8 +12,8 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeTsnInterfaceConfiguration_Base extends UABaseInterface_Base {
-    macAddress: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    interfaceName?: UABaseDataVariable<UAString, /*z*/DataType.String>;
+    macAddress: UABaseDataVariable<UAString, DataType.String>;
+    interfaceName?: UABaseDataVariable<UAString, DataType.String>;
 }
 export interface UAIIeeeTsnInterfaceConfiguration extends UABaseInterface, UAIIeeeTsnInterfaceConfiguration_Base {
 }

package/source/ua_i_ieee_tsn_interface_configuration_listener.ts

@@ -12,7 +12,7 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeTsnInterfaceConfigurationListener_Base extends UAIIeeeTsnInterfaceConfiguration_Base {
-    receiveOffset?: UABaseDataVariable<UInt32, /*z*/DataType.UInt32>;
+    receiveOffset?: UABaseDataVariable<UInt32, DataType.UInt32>;
 }
 export interface UAIIeeeTsnInterfaceConfigurationListener extends UAIIeeeTsnInterfaceConfiguration, UAIIeeeTsnInterfaceConfigurationListener_Base {
 }

package/source/ua_i_ieee_tsn_interface_configuration_talker.ts

@@ -12,7 +12,7 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeTsnInterfaceConfigurationTalker_Base extends UAIIeeeTsnInterfaceConfiguration_Base {
-    timeAwareOffset?: UABaseDataVariable<UInt32, /*z*/DataType.UInt32>;
+    timeAwareOffset?: UABaseDataVariable<UInt32, DataType.UInt32>;
 }
 export interface UAIIeeeTsnInterfaceConfigurationTalker extends UAIIeeeTsnInterfaceConfiguration, UAIIeeeTsnInterfaceConfigurationTalker_Base {
 }