node-opcua-nodeset-ua 2.74.0 → 2.76.2

package/source/ua_i_ieee_tsn_mac_address.ts

@@ -12,8 +12,8 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeTsnMacAddress_Base extends UABaseInterface_Base {
-    destinationAddress: UABaseDataVariable<Byte[], /*z*/DataType.Byte>;
-    sourceAddress?: UABaseDataVariable<Byte[], /*z*/DataType.Byte>;
+    destinationAddress: UABaseDataVariable<Byte[], DataType.Byte>;
+    sourceAddress?: UABaseDataVariable<Byte[], DataType.Byte>;
 }
 export interface UAIIeeeTsnMacAddress extends UABaseInterface, UAIIeeeTsnMacAddress_Base {
 }

package/source/ua_i_ieee_tsn_vlan_tag.ts

@@ -12,8 +12,8 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIIeeeTsnVlanTag_Base extends UABaseInterface_Base {
-    vlanId: UABaseDataVariable<UInt16, /*z*/DataType.UInt16>;
-    priorityCodePoint: UABaseDataVariable<Byte, /*z*/DataType.Byte>;
+    vlanId: UABaseDataVariable<UInt16, DataType.UInt16>;
+    priorityCodePoint: UABaseDataVariable<Byte, DataType.Byte>;
 }
 export interface UAIIeeeTsnVlanTag extends UABaseInterface, UAIIeeeTsnVlanTag_Base {
 }

package/source/ua_i_ietf_base_network_interface.ts

@@ -17,10 +17,10 @@ import { UAAnalogUnit } from "./ua_analog_unit"
  * |isAbstract      |true                                              |
  */
 export interface UAIIetfBaseNetworkInterface_Base extends UABaseInterface_Base {
-    adminStatus: UABaseDataVariable<EnumInterfaceAdminStatus, /*z*/DataType.Int32>;
-    operStatus: UABaseDataVariable<EnumInterfaceOperStatus, /*z*/DataType.Int32>;
-    physAddress?: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    speed: UAAnalogUnit<UInt64, /*z*/DataType.UInt64>;
+    adminStatus: UABaseDataVariable<EnumInterfaceAdminStatus, DataType.Int32>;
+    operStatus: UABaseDataVariable<EnumInterfaceOperStatus, DataType.Int32>;
+    physAddress?: UABaseDataVariable<UAString, DataType.String>;
+    speed: UAAnalogUnit<UInt64, DataType.UInt64>;
 }
 export interface UAIIetfBaseNetworkInterface extends UABaseInterface, UAIIetfBaseNetworkInterface_Base {
 }

package/source/ua_i_priority_mapping_entry.ts

@@ -12,10 +12,10 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIPriorityMappingEntry_Base extends UABaseInterface_Base {
-    mappingUri: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    priorityLabel: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    priorityValue_PCP?: UABaseDataVariable<Byte, /*z*/DataType.Byte>;
-    priorityValue_DSCP?: UABaseDataVariable<UInt32, /*z*/DataType.UInt32>;
+    mappingUri: UABaseDataVariable<UAString, DataType.String>;
+    priorityLabel: UABaseDataVariable<UAString, DataType.String>;
+    priorityValue_PCP?: UABaseDataVariable<Byte, DataType.Byte>;
+    priorityValue_DSCP?: UABaseDataVariable<UInt32, DataType.UInt32>;
 }
 export interface UAIPriorityMappingEntry extends UABaseInterface, UAIPriorityMappingEntry_Base {
 }

package/source/ua_i_sr_class.ts

@@ -12,9 +12,9 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAISrClass_Base extends UABaseInterface_Base {
-    id: UABaseDataVariable<Byte, /*z*/DataType.Byte>;
-    priority: UABaseDataVariable<Byte, /*z*/DataType.Byte>;
-    vid: UABaseDataVariable<UInt16, /*z*/DataType.UInt16>;
+    id: UABaseDataVariable<Byte, DataType.Byte>;
+    priority: UABaseDataVariable<Byte, DataType.Byte>;
+    vid: UABaseDataVariable<UInt16, DataType.UInt16>;
 }
 export interface UAISrClass extends UABaseInterface, UAISrClass_Base {
 }

package/source/ua_i_vlan_id.ts

@@ -12,7 +12,7 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |true                                              |
  */
 export interface UAIVlanId_Base extends UABaseInterface_Base {
-    vlanId: UABaseDataVariable<UInt16, /*z*/DataType.UInt16>;
+    vlanId: UABaseDataVariable<UInt16, DataType.UInt16>;
 }
 export interface UAIVlanId extends UABaseInterface, UAIVlanId_Base {
 }

package/source/ua_ietf_base_network_interface.ts

@@ -16,10 +16,10 @@ import { UAAnalogUnit } from "./ua_analog_unit"
  * |isAbstract      |false                                             |
  */
 export interface UAIetfBaseNetworkInterface_Base {
-    adminStatus: UABaseDataVariable<EnumInterfaceAdminStatus, /*z*/DataType.Int32>;
-    operStatus: UABaseDataVariable<EnumInterfaceOperStatus, /*z*/DataType.Int32>;
-    physAddress?: UABaseDataVariable<UAString, /*z*/DataType.String>;
-    speed: UAAnalogUnit<UInt64, /*z*/DataType.UInt64>;
+    adminStatus: UABaseDataVariable<EnumInterfaceAdminStatus, DataType.Int32>;
+    operStatus: UABaseDataVariable<EnumInterfaceOperStatus, DataType.Int32>;
+    physAddress?: UABaseDataVariable<UAString, DataType.String>;
+    speed: UAAnalogUnit<UInt64, DataType.UInt64>;
 }
 export interface UAIetfBaseNetworkInterface extends UAObject, UAIetfBaseNetworkInterface_Base {
 }

package/source/ua_image_item.ts

@@ -13,9 +13,9 @@ import { UAArrayItem, UAArrayItem_Base } from "./ua_array_item"
  * |dataType Name   |undefined[] ns=0;i=0                              |
  * |isAbstract      |false                                             |
  */
-export interface UAImageItem_Base<T, DT extends DataType>  extends UAArrayItem_Base<T/*g*/, DT> {
-    xAxisDefinition: UAProperty<DTAxisInformation, /*z*/DataType.ExtensionObject>;
-    yAxisDefinition: UAProperty<DTAxisInformation, /*z*/DataType.ExtensionObject>;
+export interface UAImageItem_Base<T, DT extends DataType>  extends UAArrayItem_Base<T, DT> {
+    xAxisDefinition: UAProperty<DTAxisInformation, DataType.ExtensionObject>;
+    yAxisDefinition: UAProperty<DTAxisInformation, DataType.ExtensionObject>;
 }
-export interface UAImageItem<T, DT extends DataType> extends UAArrayItem<T, /*m*/DT>, UAImageItem_Base<T, DT /*A*/> {
+export interface UAImageItem<T, DT extends DataType> extends UAArrayItem<T, DT>, UAImageItem_Base<T, DT> {
 }

package/source/ua_initial_state.ts

@@ -8,7 +8,6 @@ import { UAState, UAState_Base } from "./ua_state"
  * |typedDefinition |InitialStateType ns=0;i=2309                      |
  * |isAbstract      |false                                             |
  */
-export interface UAInitialState_Base extends UAState_Base {
-}
+export type UAInitialState_Base = UAState_Base;
 export interface UAInitialState extends UAState, UAInitialState_Base {
 }

package/source/ua_instrument_diagnostic_alarm.ts

@@ -8,7 +8,6 @@ import { UAOffNormalAlarm, UAOffNormalAlarm_Base } from "./ua_off_normal_alarm"
  * |typedDefinition |InstrumentDiagnosticAlarmType ns=0;i=18347        |
  * |isAbstract      |false                                             |
  */
-export interface UAInstrumentDiagnosticAlarm_Base extends UAOffNormalAlarm_Base {
-}
+export type UAInstrumentDiagnosticAlarm_Base = UAOffNormalAlarm_Base;
 export interface UAInstrumentDiagnosticAlarm extends UAOffNormalAlarm, UAInstrumentDiagnosticAlarm_Base {
 }

package/source/ua_irdi_dictionary_entry.ts

@@ -8,7 +8,6 @@ import { UADictionaryEntry, UADictionaryEntry_Base } from "./ua_dictionary_entry
  * |typedDefinition |IrdiDictionaryEntryType ns=0;i=17598              |
  * |isAbstract      |false                                             |
  */
-export interface UAIrdiDictionaryEntry_Base extends UADictionaryEntry_Base {
-}
+export type UAIrdiDictionaryEntry_Base = UADictionaryEntry_Base;
 export interface UAIrdiDictionaryEntry extends UADictionaryEntry, UAIrdiDictionaryEntry_Base {
 }

package/source/ua_json_data_set_reader_message.ts

@@ -12,8 +12,8 @@ import { UADataSetReaderMessage, UADataSetReaderMessage_Base } from "./ua_data_s
  * |isAbstract      |false                                             |
  */
 export interface UAJsonDataSetReaderMessage_Base extends UADataSetReaderMessage_Base {
-    networkMessageContentMask: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    dataSetMessageContentMask: UAProperty<UInt32, /*z*/DataType.UInt32>;
+    networkMessageContentMask: UAProperty<UInt32, DataType.UInt32>;
+    dataSetMessageContentMask: UAProperty<UInt32, DataType.UInt32>;
 }
 export interface UAJsonDataSetReaderMessage extends UADataSetReaderMessage, UAJsonDataSetReaderMessage_Base {
 }

package/source/ua_json_data_set_writer_message.ts

@@ -12,7 +12,7 @@ import { UADataSetWriterMessage, UADataSetWriterMessage_Base } from "./ua_data_s
  * |isAbstract      |false                                             |
  */
 export interface UAJsonDataSetWriterMessage_Base extends UADataSetWriterMessage_Base {
-    dataSetMessageContentMask: UAProperty<UInt32, /*z*/DataType.UInt32>;
+    dataSetMessageContentMask: UAProperty<UInt32, DataType.UInt32>;
 }
 export interface UAJsonDataSetWriterMessage extends UADataSetWriterMessage, UAJsonDataSetWriterMessage_Base {
 }

package/source/ua_json_writer_group_message.ts

@@ -12,7 +12,7 @@ import { UAWriterGroupMessage, UAWriterGroupMessage_Base } from "./ua_writer_gro
  * |isAbstract      |false                                             |
  */
 export interface UAJsonWriterGroupMessage_Base extends UAWriterGroupMessage_Base {
-    networkMessageContentMask: UAProperty<UInt32, /*z*/DataType.UInt32>;
+    networkMessageContentMask: UAProperty<UInt32, DataType.UInt32>;
 }
 export interface UAJsonWriterGroupMessage extends UAWriterGroupMessage, UAJsonWriterGroupMessage_Base {
 }

package/source/ua_key_credential_audit_event.ts

@@ -12,7 +12,7 @@ import { UAAuditUpdateMethodEvent, UAAuditUpdateMethodEvent_Base } from "./ua_au
  * |isAbstract      |true                                              |
  */
 export interface UAKeyCredentialAuditEvent_Base extends UAAuditUpdateMethodEvent_Base {
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
+    resourceUri: UAProperty<UAString, DataType.String>;
 }
 export interface UAKeyCredentialAuditEvent extends UAAuditUpdateMethodEvent, UAKeyCredentialAuditEvent_Base {
 }

package/source/ua_key_credential_configuration.ts

@@ -12,10 +12,10 @@ import { UAString } from "node-opcua-basic-types"
  * |isAbstract      |false                                             |
  */
 export interface UAKeyCredentialConfiguration_Base {
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
-    profileUri: UAProperty<UAString, /*z*/DataType.String>;
-    endpointUrls?: UAProperty<UAString[], /*z*/DataType.String>;
-    serviceStatus?: UAProperty<StatusCode, /*z*/DataType.StatusCode>;
+    resourceUri: UAProperty<UAString, DataType.String>;
+    profileUri: UAProperty<UAString, DataType.String>;
+    endpointUrls?: UAProperty<UAString[], DataType.String>;
+    serviceStatus?: UAProperty<StatusCode, DataType.StatusCode>;
     getEncryptingKey?: UAMethod;
     updateCredential?: UAMethod;
     deleteCredential?: UAMethod;

package/source/ua_key_credential_configuration_folder.ts

@@ -14,6 +14,7 @@ import { UAFolder, UAFolder_Base } from "./ua_folder"
  * |isAbstract      |false                                             |
  */
 export interface UAKeyCredentialConfigurationFolder_Base extends UAFolder_Base {
+   // PlaceHolder for $ServiceName$
     createCredential?: UAMethod;
 }
 export interface UAKeyCredentialConfigurationFolder extends UAFolder, UAKeyCredentialConfigurationFolder_Base {

package/source/ua_key_credential_deleted_audit_event.ts

@@ -12,7 +12,7 @@ import { UAKeyCredentialAuditEvent, UAKeyCredentialAuditEvent_Base } from "./ua_
  * |isAbstract      |false                                             |
  */
 export interface UAKeyCredentialDeletedAuditEvent_Base extends UAKeyCredentialAuditEvent_Base {
-    resourceUri: UAProperty<UAString, /*z*/DataType.String>;
+    resourceUri: UAProperty<UAString, DataType.String>;
 }
 export interface UAKeyCredentialDeletedAuditEvent extends Omit<UAKeyCredentialAuditEvent, "resourceUri">, UAKeyCredentialDeletedAuditEvent_Base {
 }

package/source/ua_key_credential_updated_audit_event.ts

@@ -8,7 +8,6 @@ import { UAKeyCredentialAuditEvent, UAKeyCredentialAuditEvent_Base } from "./ua_
  * |typedDefinition |KeyCredentialUpdatedAuditEventType ns=0;i=18029   |
  * |isAbstract      |false                                             |
  */
-export interface UAKeyCredentialUpdatedAuditEvent_Base extends UAKeyCredentialAuditEvent_Base {
-}
+export type UAKeyCredentialUpdatedAuditEvent_Base = UAKeyCredentialAuditEvent_Base;
 export interface UAKeyCredentialUpdatedAuditEvent extends UAKeyCredentialAuditEvent, UAKeyCredentialUpdatedAuditEvent_Base {
 }

package/source/ua_limit_alarm.ts

@@ -12,22 +12,22 @@ import { UAAlarmCondition, UAAlarmCondition_Base } from "./ua_alarm_condition"
  * |isAbstract      |false                                             |
  */
 export interface UALimitAlarm_Base extends UAAlarmCondition_Base {
-    highHighLimit?: UAProperty<number, /*z*/DataType.Double>;
-    highLimit?: UAProperty<number, /*z*/DataType.Double>;
-    lowLimit?: UAProperty<number, /*z*/DataType.Double>;
-    lowLowLimit?: UAProperty<number, /*z*/DataType.Double>;
-    baseHighHighLimit?: UAProperty<number, /*z*/DataType.Double>;
-    baseHighLimit?: UAProperty<number, /*z*/DataType.Double>;
-    baseLowLimit?: UAProperty<number, /*z*/DataType.Double>;
-    baseLowLowLimit?: UAProperty<number, /*z*/DataType.Double>;
-    severityHighHigh?: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    severityHigh?: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    severityLow?: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    severityLowLow?: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    highHighDeadband?: UAProperty<number, /*z*/DataType.Double>;
-    highDeadband?: UAProperty<number, /*z*/DataType.Double>;
-    lowDeadband?: UAProperty<number, /*z*/DataType.Double>;
-    lowLowDeadband?: UAProperty<number, /*z*/DataType.Double>;
+    highHighLimit?: UAProperty<number, DataType.Double>;
+    highLimit?: UAProperty<number, DataType.Double>;
+    lowLimit?: UAProperty<number, DataType.Double>;
+    lowLowLimit?: UAProperty<number, DataType.Double>;
+    baseHighHighLimit?: UAProperty<number, DataType.Double>;
+    baseHighLimit?: UAProperty<number, DataType.Double>;
+    baseLowLimit?: UAProperty<number, DataType.Double>;
+    baseLowLowLimit?: UAProperty<number, DataType.Double>;
+    severityHighHigh?: UAProperty<UInt16, DataType.UInt16>;
+    severityHigh?: UAProperty<UInt16, DataType.UInt16>;
+    severityLow?: UAProperty<UInt16, DataType.UInt16>;
+    severityLowLow?: UAProperty<UInt16, DataType.UInt16>;
+    highHighDeadband?: UAProperty<number, DataType.Double>;
+    highDeadband?: UAProperty<number, DataType.Double>;
+    lowDeadband?: UAProperty<number, DataType.Double>;
+    lowLowDeadband?: UAProperty<number, DataType.Double>;
 }
 export interface UALimitAlarm extends UAAlarmCondition, UALimitAlarm_Base {
 }

package/source/ua_maintenance_condition_class.ts

@@ -8,7 +8,6 @@ import { UABaseConditionClass, UABaseConditionClass_Base } from "./ua_base_condi
  * |typedDefinition |MaintenanceConditionClassType ns=0;i=11165        |
  * |isAbstract      |true                                              |
  */
-export interface UAMaintenanceConditionClass_Base extends UABaseConditionClass_Base {
-}
+export type UAMaintenanceConditionClass_Base = UABaseConditionClass_Base;
 export interface UAMaintenanceConditionClass extends UABaseConditionClass, UAMaintenanceConditionClass_Base {
 }

package/source/ua_multi_state_dictionary_entry_discrete.ts

@@ -13,8 +13,8 @@ import { UAMultiStateDictionaryEntryDiscreteBase, UAMultiStateDictionaryEntryDis
  * |dataType Name   |Variant ns=0;i=26                                 |
  * |isAbstract      |false                                             |
  */
-export interface UAMultiStateDictionaryEntryDiscrete_Base<T, DT extends DataType>  extends UAMultiStateDictionaryEntryDiscreteBase_Base<T/*g*/, DT> {
-    valueAsDictionaryEntries: UAProperty<NodeId[], /*z*/DataType.NodeId>;
+export interface UAMultiStateDictionaryEntryDiscrete_Base<T, DT extends DataType>  extends UAMultiStateDictionaryEntryDiscreteBase_Base<T, DT> {
+    valueAsDictionaryEntries: UAProperty<NodeId[], DataType.NodeId>;
 }
-export interface UAMultiStateDictionaryEntryDiscrete<T, DT extends DataType> extends Omit<UAMultiStateDictionaryEntryDiscreteBase<T, /*m*/DT>, "valueAsDictionaryEntries">, UAMultiStateDictionaryEntryDiscrete_Base<T, DT /*A*/> {
+export interface UAMultiStateDictionaryEntryDiscrete<T, DT extends DataType> extends Omit<UAMultiStateDictionaryEntryDiscreteBase<T, DT>, "valueAsDictionaryEntries">, UAMultiStateDictionaryEntryDiscrete_Base<T, DT> {
 }

package/source/ua_multi_state_dictionary_entry_discrete_base.ts

@@ -13,9 +13,9 @@ import { UAMultiStateValueDiscrete, UAMultiStateValueDiscrete_Base } from "./ua_
  * |dataType Name   |Variant ns=0;i=26                                 |
  * |isAbstract      |false                                             |
  */
-export interface UAMultiStateDictionaryEntryDiscreteBase_Base<T, DT extends DataType>  extends UAMultiStateValueDiscrete_Base<T/*g*/, DT> {
-    enumDictionaryEntries: UAProperty<NodeId[], /*z*/DataType.NodeId>;
-    valueAsDictionaryEntries?: UAProperty<NodeId[], /*z*/DataType.NodeId>;
+export interface UAMultiStateDictionaryEntryDiscreteBase_Base<T, DT extends DataType>  extends UAMultiStateValueDiscrete_Base<T, DT> {
+    enumDictionaryEntries: UAProperty<NodeId[], DataType.NodeId>;
+    valueAsDictionaryEntries?: UAProperty<NodeId[], DataType.NodeId>;
 }
-export interface UAMultiStateDictionaryEntryDiscreteBase<T, DT extends DataType> extends UAMultiStateValueDiscrete<T, /*m*/DT>, UAMultiStateDictionaryEntryDiscreteBase_Base<T, DT /*A*/> {
+export interface UAMultiStateDictionaryEntryDiscreteBase<T, DT extends DataType> extends UAMultiStateValueDiscrete<T, DT>, UAMultiStateDictionaryEntryDiscreteBase_Base<T, DT> {
 }

package/source/ua_multi_state_discrete.ts

@@ -13,8 +13,8 @@ import { UADiscreteItem, UADiscreteItem_Base } from "./ua_discrete_item"
  * |dataType Name   |Variant ns=0;i=28                                 |
  * |isAbstract      |false                                             |
  */
-export interface UAMultiStateDiscrete_Base<T, DT extends DataType>  extends UADiscreteItem_Base<T/*g*/, DT> {
-    enumStrings: UAProperty<LocalizedText[], /*z*/DataType.LocalizedText>;
+export interface UAMultiStateDiscrete_Base<T, DT extends DataType>  extends UADiscreteItem_Base<T, DT> {
+    enumStrings: UAProperty<LocalizedText[], DataType.LocalizedText>;
 }
-export interface UAMultiStateDiscrete<T, DT extends DataType> extends UADiscreteItem<T, /*m*/DT>, UAMultiStateDiscrete_Base<T, DT /*A*/> {
+export interface UAMultiStateDiscrete<T, DT extends DataType> extends UADiscreteItem<T, DT>, UAMultiStateDiscrete_Base<T, DT> {
 }

package/source/ua_multi_state_value_discrete.ts

@@ -14,9 +14,9 @@ import { UADiscreteItem, UADiscreteItem_Base } from "./ua_discrete_item"
  * |dataType Name   |Variant ns=0;i=26                                 |
  * |isAbstract      |false                                             |
  */
-export interface UAMultiStateValueDiscrete_Base<T, DT extends DataType>  extends UADiscreteItem_Base<T/*g*/, DT> {
-    enumValues: UAProperty<DTEnumValue[], /*z*/DataType.ExtensionObject>;
-    valueAsText: UAProperty<LocalizedText, /*z*/DataType.LocalizedText>;
+export interface UAMultiStateValueDiscrete_Base<T, DT extends DataType>  extends UADiscreteItem_Base<T, DT> {
+    enumValues: UAProperty<DTEnumValue[], DataType.ExtensionObject>;
+    valueAsText: UAProperty<LocalizedText, DataType.LocalizedText>;
 }
-export interface UAMultiStateValueDiscrete<T, DT extends DataType> extends UADiscreteItem<T, /*m*/DT>, UAMultiStateValueDiscrete_Base<T, DT /*A*/> {
+export interface UAMultiStateValueDiscrete<T, DT extends DataType> extends UADiscreteItem<T, DT>, UAMultiStateValueDiscrete_Base<T, DT> {
 }

package/source/ua_n_dimension_array_item.ts

@@ -13,8 +13,8 @@ import { UAArrayItem, UAArrayItem_Base } from "./ua_array_item"
  * |dataType Name   |undefined ns=0;i=0                                |
  * |isAbstract      |false                                             |
  */
-export interface UANDimensionArrayItem_Base<T, DT extends DataType>  extends UAArrayItem_Base<T/*g*/, DT> {
-    axisDefinition: UAProperty<DTAxisInformation[], /*z*/DataType.ExtensionObject>;
+export interface UANDimensionArrayItem_Base<T, DT extends DataType>  extends UAArrayItem_Base<T, DT> {
+    axisDefinition: UAProperty<DTAxisInformation[], DataType.ExtensionObject>;
 }
-export interface UANDimensionArrayItem<T, DT extends DataType> extends UAArrayItem<T, /*m*/DT>, UANDimensionArrayItem_Base<T, DT /*A*/> {
+export interface UANDimensionArrayItem<T, DT extends DataType> extends UAArrayItem<T, DT>, UANDimensionArrayItem_Base<T, DT> {
 }

package/source/ua_namespace_metadata.ts

@@ -14,18 +14,18 @@ import { DTRolePermission } from "./dt_role_permission"
  * |isAbstract      |false                                             |
  */
 export interface UANamespaceMetadata_Base {
-    "$namespaceUri": UAProperty<UAString, /*z*/DataType.String>;
-    namespaceVersion: UAProperty<UAString, /*z*/DataType.String>;
-    namespacePublicationDate: UAProperty<Date, /*z*/DataType.DateTime>;
-    isNamespaceSubset: UAProperty<boolean, /*z*/DataType.Boolean>;
-    staticNodeIdTypes: UAProperty<EnumId[], /*z*/DataType.Int32>;
-    staticNumericNodeIdRange: UAProperty<UAString[], /*z*/DataType.String>;
-    staticStringNodeIdPattern: UAProperty<UAString, /*z*/DataType.String>;
+    "$namespaceUri": UAProperty<UAString, DataType.String>;
+    namespaceVersion: UAProperty<UAString, DataType.String>;
+    namespacePublicationDate: UAProperty<Date, DataType.DateTime>;
+    isNamespaceSubset: UAProperty<boolean, DataType.Boolean>;
+    staticNodeIdTypes: UAProperty<EnumId[], DataType.Int32>;
+    staticNumericNodeIdRange: UAProperty<UAString[], DataType.String>;
+    staticStringNodeIdPattern: UAProperty<UAString, DataType.String>;
     namespaceFile?: UAAddressSpaceFile;
-    defaultRolePermissions?: UAProperty<DTRolePermission[], /*z*/DataType.ExtensionObject>;
-    defaultUserRolePermissions?: UAProperty<DTRolePermission[], /*z*/DataType.ExtensionObject>;
-    defaultAccessRestrictions?: UAProperty<UInt16, /*z*/DataType.UInt16>;
-    configurationVersion?: UAProperty<UInt32, /*z*/DataType.UInt32>;
+    defaultRolePermissions?: UAProperty<DTRolePermission[], DataType.ExtensionObject>;
+    defaultUserRolePermissions?: UAProperty<DTRolePermission[], DataType.ExtensionObject>;
+    defaultAccessRestrictions?: UAProperty<UInt16, DataType.UInt16>;
+    configurationVersion?: UAProperty<UInt32, DataType.UInt32>;
 }
 export interface UANamespaceMetadata extends UAObject, UANamespaceMetadata_Base {
 }

package/source/ua_namespaces.ts

@@ -9,6 +9,7 @@ import { UAObject } from "node-opcua-address-space-base"
  * |isAbstract      |false                                             |
  */
 export interface UANamespaces_Base {
+   // PlaceHolder for $NamespaceIdentifier$
 }
 export interface UANamespaces extends UAObject, UANamespaces_Base {
 }

package/source/ua_network_address.ts

@@ -12,7 +12,7 @@ import { UASelectionList } from "./ua_selection_list"
  * |isAbstract      |true                                              |
  */
 export interface UANetworkAddress_Base {
-    networkInterface: UASelectionList<UAString, /*z*/DataType.String>;
+    networkInterface: UASelectionList<UAString, DataType.String>;
 }
 export interface UANetworkAddress extends UAObject, UANetworkAddress_Base {
 }

package/source/ua_network_address_url.ts

@@ -12,7 +12,7 @@ import { UABaseDataVariable } from "./ua_base_data_variable"
  * |isAbstract      |false                                             |
  */
 export interface UANetworkAddressUrl_Base extends UANetworkAddress_Base {
-    url: UABaseDataVariable<UAString, /*z*/DataType.String>;
+    url: UABaseDataVariable<UAString, DataType.String>;
 }
 export interface UANetworkAddressUrl extends UANetworkAddress, UANetworkAddressUrl_Base {
 }

package/source/ua_non_exclusive_deviation_alarm.ts

@@ -12,8 +12,8 @@ import { UANonExclusiveLimitAlarm, UANonExclusiveLimitAlarm_Base } from "./ua_no
  * |isAbstract      |false                                             |
  */
 export interface UANonExclusiveDeviationAlarm_Base extends UANonExclusiveLimitAlarm_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 UANonExclusiveDeviationAlarm extends UANonExclusiveLimitAlarm, UANonExclusiveDeviationAlarm_Base {
 }

package/source/ua_non_exclusive_level_alarm.ts

@@ -8,7 +8,6 @@ import { UANonExclusiveLimitAlarm, UANonExclusiveLimitAlarm_Base } from "./ua_no
  * |typedDefinition |NonExclusiveLevelAlarmType ns=0;i=10060           |
  * |isAbstract      |false                                             |
  */
-export interface UANonExclusiveLevelAlarm_Base extends UANonExclusiveLimitAlarm_Base {
-}
+export type UANonExclusiveLevelAlarm_Base = UANonExclusiveLimitAlarm_Base;
 export interface UANonExclusiveLevelAlarm extends UANonExclusiveLimitAlarm, UANonExclusiveLevelAlarm_Base {
 }

package/source/ua_non_exclusive_rate_of_change_alarm.ts

@@ -12,7 +12,7 @@ import { UANonExclusiveLimitAlarm, UANonExclusiveLimitAlarm_Base } from "./ua_no
  * |isAbstract      |false                                             |
  */
 export interface UANonExclusiveRateOfChangeAlarm_Base extends UANonExclusiveLimitAlarm_Base {
-    engineeringUnits?: UAProperty<EUInformation, /*z*/DataType.ExtensionObject>;
+    engineeringUnits?: UAProperty<EUInformation, DataType.ExtensionObject>;
 }
 export interface UANonExclusiveRateOfChangeAlarm extends UANonExclusiveLimitAlarm, UANonExclusiveRateOfChangeAlarm_Base {
 }

package/source/ua_non_transparent_network_redundancy.ts

@@ -12,7 +12,7 @@ import { UANonTransparentRedundancy, UANonTransparentRedundancy_Base } from "./u
  * |isAbstract      |false                                             |
  */
 export interface UANonTransparentNetworkRedundancy_Base extends UANonTransparentRedundancy_Base {
-    serverNetworkGroups: UAProperty<DTNetworkGroup[], /*z*/DataType.ExtensionObject>;
+    serverNetworkGroups: UAProperty<DTNetworkGroup[], DataType.ExtensionObject>;
 }
 export interface UANonTransparentNetworkRedundancy extends UANonTransparentRedundancy, UANonTransparentNetworkRedundancy_Base {
 }

package/source/ua_non_transparent_redundancy.ts

@@ -12,7 +12,7 @@ import { UAServerRedundancy, UAServerRedundancy_Base } from "./ua_server_redunda
  * |isAbstract      |false                                             |
  */
 export interface UANonTransparentRedundancy_Base extends UAServerRedundancy_Base {
-    serverUriArray: UAProperty<UAString[], /*z*/DataType.String>;
+    serverUriArray: UAProperty<UAString[], DataType.String>;
 }
 export interface UANonTransparentRedundancy extends UAServerRedundancy, UANonTransparentRedundancy_Base {
 }

package/source/ua_off_normal_alarm.ts

@@ -12,7 +12,7 @@ import { UADiscreteAlarm, UADiscreteAlarm_Base } from "./ua_discrete_alarm"
  * |isAbstract      |false                                             |
  */
 export interface UAOffNormalAlarm_Base extends UADiscreteAlarm_Base {
-    normalState: UAProperty<NodeId, /*z*/DataType.NodeId>;
+    normalState: UAProperty<NodeId, DataType.NodeId>;
 }
 export interface UAOffNormalAlarm extends UADiscreteAlarm, UAOffNormalAlarm_Base {
 }

package/source/ua_operation_limits.ts

@@ -12,18 +12,18 @@ import { UAFolder, UAFolder_Base } from "./ua_folder"
  * |isAbstract      |false                                             |
  */
 export interface UAOperationLimits_Base extends UAFolder_Base {
-    maxNodesPerRead?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerHistoryReadData?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerHistoryReadEvents?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerWrite?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerHistoryUpdateData?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerHistoryUpdateEvents?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerMethodCall?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerBrowse?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerRegisterNodes?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerTranslateBrowsePathsToNodeIds?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxNodesPerNodeManagement?: UAProperty<UInt32, /*z*/DataType.UInt32>;
-    maxMonitoredItemsPerCall?: UAProperty<UInt32, /*z*/DataType.UInt32>;
+    maxNodesPerRead?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerHistoryReadData?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerHistoryReadEvents?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerWrite?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerHistoryUpdateData?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerHistoryUpdateEvents?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerMethodCall?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerBrowse?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerRegisterNodes?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerTranslateBrowsePathsToNodeIds?: UAProperty<UInt32, DataType.UInt32>;
+    maxNodesPerNodeManagement?: UAProperty<UInt32, DataType.UInt32>;
+    maxMonitoredItemsPerCall?: UAProperty<UInt32, DataType.UInt32>;
 }
 export interface UAOperationLimits extends UAFolder, UAOperationLimits_Base {
 }

package/source/ua_option_set.ts

@@ -13,9 +13,9 @@ import { UABaseDataVariable, UABaseDataVariable_Base } from "./ua_base_data_vari
  * |dataType Name   |undefined ns=0;i=0                                |
  * |isAbstract      |false                                             |
  */
-export interface UAOptionSet_Base<T, DT extends DataType>  extends UABaseDataVariable_Base<T/*g*/, DT> {
-    optionSetValues: UAProperty<LocalizedText[], /*z*/DataType.LocalizedText>;
-    bitMask?: UAProperty<boolean[], /*z*/DataType.Boolean>;
+export interface UAOptionSet_Base<T, DT extends DataType>  extends UABaseDataVariable_Base<T, DT> {
+    optionSetValues: UAProperty<LocalizedText[], DataType.LocalizedText>;
+    bitMask?: UAProperty<boolean[], DataType.Boolean>;
 }
-export interface UAOptionSet<T, DT extends DataType> extends UABaseDataVariable<T, /*m*/DT>, UAOptionSet_Base<T, DT /*A*/> {
+export interface UAOptionSet<T, DT extends DataType> extends UABaseDataVariable<T, DT>, UAOptionSet_Base<T, DT> {
 }

package/source/ua_ordered_list.ts

@@ -14,7 +14,8 @@ export interface UAOrderedList_$OrderedObject$ extends UAObject { // Object
  * |isAbstract      |false                                             |
  */
 export interface UAOrderedList_Base {
-    nodeVersion?: UAProperty<UAString, /*z*/DataType.String>;
+   // PlaceHolder for $OrderedObject$
+    nodeVersion?: UAProperty<UAString, DataType.String>;
 }
 export interface UAOrderedList extends UAObject, UAOrderedList_Base {
 }

package/source/ua_orientation.ts

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

package/source/ua_priority_mapping_table.ts

@@ -12,7 +12,7 @@ import { DTArgument } from "./dt_argument"
  * |isAbstract      |false                                             |
  */
 export interface UAPriorityMappingTable_Base {
-    priorityMapppingEntries: UAProperty<DTPriorityMappingEntry[], /*z*/DataType.ExtensionObject>;
+    priorityMapppingEntries: UAProperty<DTPriorityMappingEntry[], DataType.ExtensionObject>;
     addPriorityMappingEntry?: UAMethod;
     deletePriorityMappingEntry?: UAMethod;
 }

package/source/ua_process_condition_class.ts

@@ -8,7 +8,6 @@ import { UABaseConditionClass, UABaseConditionClass_Base } from "./ua_base_condi
  * |typedDefinition |ProcessConditionClassType ns=0;i=11164            |
  * |isAbstract      |true                                              |
  */
-export interface UAProcessConditionClass_Base extends UABaseConditionClass_Base {
-}
+export type UAProcessConditionClass_Base = UABaseConditionClass_Base;
 export interface UAProcessConditionClass extends UABaseConditionClass, UAProcessConditionClass_Base {
 }

package/source/ua_program_diagnostic.ts

@@ -16,17 +16,17 @@ import { UABaseDataVariable, UABaseDataVariable_Base } from "./ua_base_data_vari
  * |dataType Name   |DTProgramDiagnostic ns=0;i=894                    |
  * |isAbstract      |false                                             |
  */
-export interface UAProgramDiagnostic_Base<T extends DTProgramDiagnostic/*j*/>  extends UABaseDataVariable_Base<T, /*e*/DataType.ExtensionObject> {
-    createSessionId: UAProperty<NodeId, /*z*/DataType.NodeId>;
-    createClientName: UAProperty<UAString, /*z*/DataType.String>;
-    invocationCreationTime: UAProperty<Date, /*z*/DataType.DateTime>;
-    lastTransitionTime: UAProperty<Date, /*z*/DataType.DateTime>;
-    lastMethodCall: UAProperty<UAString, /*z*/DataType.String>;
-    lastMethodSessionId: UAProperty<NodeId, /*z*/DataType.NodeId>;
+export interface UAProgramDiagnostic_Base<T extends DTProgramDiagnostic>  extends UABaseDataVariable_Base<T, DataType.ExtensionObject> {
+    createSessionId: UAProperty<NodeId, DataType.NodeId>;
+    createClientName: UAProperty<UAString, DataType.String>;
+    invocationCreationTime: UAProperty<Date, DataType.DateTime>;
+    lastTransitionTime: UAProperty<Date, DataType.DateTime>;
+    lastMethodCall: UAProperty<UAString, DataType.String>;
+    lastMethodSessionId: UAProperty<NodeId, DataType.NodeId>;
     lastMethodInputArguments: UAProperty<any, any>;
     lastMethodOutputArguments: UAProperty<any, any>;
-    lastMethodCallTime: UAProperty<Date, /*z*/DataType.DateTime>;
-    lastMethodReturnStatus: UAProperty<DTStatusResult, /*z*/DataType.ExtensionObject>;
+    lastMethodCallTime: UAProperty<Date, DataType.DateTime>;
+    lastMethodReturnStatus: UAProperty<DTStatusResult, DataType.ExtensionObject>;
 }
-export interface UAProgramDiagnostic<T extends DTProgramDiagnostic/*j*/> extends UABaseDataVariable<T, /*n*/DataType.ExtensionObject>, UAProgramDiagnostic_Base<T /*B*/> {
+export interface UAProgramDiagnostic<T extends DTProgramDiagnostic> extends UABaseDataVariable<T, DataType.ExtensionObject>, UAProgramDiagnostic_Base<T> {
 }