node-opcua-address-space 2.56.2 → 2.57.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (178) hide show
  1. package/LICENSE +20 -20
  2. package/dist/source/loader/load_nodeset2.js +29 -3
  3. package/dist/source/loader/load_nodeset2.js.map +1 -1
  4. package/dist/source/session_context.js +2 -2
  5. package/dist/source/session_context.js.map +1 -1
  6. package/dist/src/address_space.d.ts +2 -3
  7. package/dist/src/address_space.js +1 -1
  8. package/dist/src/address_space.js.map +1 -1
  9. package/dist/src/address_space_private.d.ts +2 -3
  10. package/dist/src/namespace_impl.d.ts +2 -2
  11. package/dist/src/namespace_impl.js +6 -6
  12. package/dist/src/namespace_impl.js.map +1 -1
  13. package/dist/src/nodeset_tools/nodeset_to_xml.js +1 -1
  14. package/dist/src/nodeset_tools/nodeset_to_xml.js.map +1 -1
  15. package/generate.js +1 -1
  16. package/nodeJS.d.ts +1 -1
  17. package/package.json +27 -27
  18. package/source/loader/load_nodeset2.ts +39 -3
  19. package/source/session_context.ts +1 -1
  20. package/source_nodejs/index.ts +1 -1
  21. package/src/address_space.ts +6 -5
  22. package/src/address_space_private.ts +3 -3
  23. package/src/namespace_impl.ts +4 -4
  24. package/src/nodeset_tools/nodeset_to_xml.ts +2 -2
  25. package/testHelpers.d.ts +1 -1
  26. package/test_helpers/test_fixtures/dataType_in_separateNamespace.xml +150 -150
  27. package/test_helpers/test_fixtures/dataType_in_separateNamespace_basic.xml +57 -57
  28. package/test_helpers/test_fixtures/dataType_in_separateNamespace_mix.xml +135 -135
  29. package/test_helpers/test_fixtures/dataType_withEnumeration.xml +82 -82
  30. package/test_helpers/test_fixtures/dataType_with_isOptionSet.xml +194 -194
  31. package/test_helpers/test_fixtures/dataType_with_union.xml +1 -1
  32. package/test_helpers/test_fixtures/fixture_empty_nodeset2.xml +106 -106
  33. package/test_helpers/test_fixtures/fixture_simple_statemachine_nodeset2.xml +1303 -1303
  34. package/test_helpers/test_fixtures/fixuture_nodeset_objects_with_some_methods.xml +362 -362
  35. package/test_helpers/test_fixtures/issue_846.xml +3172 -3172
  36. package/test_helpers/test_fixtures/issue_899_variable_with_nodeid_value.xml +32 -32
  37. package/test_helpers/test_fixtures/mini.nodeset.withVariousVariables.xml +194 -194
  38. package/test_helpers/test_fixtures/minimalist_nodeset_with_models.xml +8 -8
  39. package/test_helpers/test_fixtures/minimalist_nodeset_with_models_more_complex.xml +16 -16
  40. package/test_helpers/test_fixtures/nodeset_with_analog_items.xml +45 -45
  41. package/dist/source/interfaces/alarms_and_conditions/ua_condition_base_i.d.ts +0 -23
  42. package/dist/source/interfaces/alarms_and_conditions/ua_condition_base_i.js +0 -3
  43. package/dist/source/interfaces/alarms_and_conditions/ua_condition_base_i.js.map +0 -1
  44. package/dist/source/interfaces/data_access/ua_discrete_item.d.ts +0 -6
  45. package/dist/source/interfaces/data_access/ua_discrete_item.js +0 -3
  46. package/dist/source/interfaces/data_access/ua_discrete_item.js.map +0 -1
  47. package/dist/source/interfaces/data_access/ua_multistate_discrete.d.ts +0 -25
  48. package/dist/source/interfaces/data_access/ua_multistate_discrete.js +0 -3
  49. package/dist/source/interfaces/data_access/ua_multistate_discrete.js.map +0 -1
  50. package/dist/source/interfaces/data_access/ua_multistate_value_discrete.d.ts +0 -27
  51. package/dist/source/interfaces/data_access/ua_multistate_value_discrete.js +0 -3
  52. package/dist/source/interfaces/data_access/ua_multistate_value_discrete.js.map +0 -1
  53. package/dist/source/interfaces/data_access/ua_two_state_discrete.d.ts +0 -17
  54. package/dist/source/interfaces/data_access/ua_two_state_discrete.js +0 -3
  55. package/dist/source/interfaces/data_access/ua_two_state_discrete.js.map +0 -1
  56. package/dist/source/interfaces/data_access/ua_y_array_item.d.ts +0 -19
  57. package/dist/source/interfaces/data_access/ua_y_array_item.js +0 -3
  58. package/dist/source/interfaces/data_access/ua_y_array_item.js.map +0 -1
  59. package/dist/source/interfaces/state_machine/exclusive_limit_state_machine.d.ts +0 -11
  60. package/dist/source/interfaces/state_machine/exclusive_limit_state_machine.js +0 -3
  61. package/dist/source/interfaces/state_machine/exclusive_limit_state_machine.js.map +0 -1
  62. package/dist/source/interfaces/state_machine/finite_state_machine.d.ts +0 -70
  63. package/dist/source/interfaces/state_machine/finite_state_machine.js +0 -3
  64. package/dist/source/interfaces/state_machine/finite_state_machine.js.map +0 -1
  65. package/dist/source/interfaces/state_machine/program_finite_state_machine.d.ts +0 -74
  66. package/dist/source/interfaces/state_machine/program_finite_state_machine.js +0 -3
  67. package/dist/source/interfaces/state_machine/program_finite_state_machine.js.map +0 -1
  68. package/dist/source/interfaces/state_machine/state_machine.d.ts +0 -342
  69. package/dist/source/interfaces/state_machine/state_machine.js +0 -3
  70. package/dist/source/interfaces/state_machine/state_machine.js.map +0 -1
  71. package/dist/source/interfaces/state_machine/ua_finite_state_variable.d.ts +0 -18
  72. package/dist/source/interfaces/state_machine/ua_finite_state_variable.js +0 -3
  73. package/dist/source/interfaces/state_machine/ua_finite_state_variable.js.map +0 -1
  74. package/dist/source/interfaces/state_machine/ua_state_variable.d.ts +0 -29
  75. package/dist/source/interfaces/state_machine/ua_state_variable.js +0 -3
  76. package/dist/source/interfaces/state_machine/ua_state_variable.js.map +0 -1
  77. package/dist/source/interfaces/state_machine/ua_two_state_variable.d.ts +0 -26
  78. package/dist/source/interfaces/state_machine/ua_two_state_variable.js +0 -3
  79. package/dist/source/interfaces/state_machine/ua_two_state_variable.js.map +0 -1
  80. package/dist/source/interfaces/subscription_diagnostics_variable.d.ts +0 -41
  81. package/dist/source/interfaces/subscription_diagnostics_variable.js +0 -3
  82. package/dist/source/interfaces/subscription_diagnostics_variable.js.map +0 -1
  83. package/dist/src/alarms_and_conditions/base_event_type.d.ts +0 -26
  84. package/dist/src/alarms_and_conditions/base_event_type.js +0 -41
  85. package/dist/src/alarms_and_conditions/base_event_type.js.map +0 -1
  86. package/dist/src/alarms_and_conditions/shelving_state_machine.d.ts +0 -22
  87. package/dist/src/alarms_and_conditions/shelving_state_machine.js +0 -241
  88. package/dist/src/alarms_and_conditions/shelving_state_machine.js.map +0 -1
  89. package/dist/src/alarms_and_conditions/trip_alarm.d.ts +0 -16
  90. package/dist/src/alarms_and_conditions/trip_alarm.js +0 -21
  91. package/dist/src/alarms_and_conditions/trip_alarm.js.map +0 -1
  92. package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_base.d.ts +0 -54
  93. package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_base.js +0 -255
  94. package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_base.js.map +0 -1
  95. package/dist/src/alarms_and_conditions/ua_alarm_condition_base.d.ts +0 -138
  96. package/dist/src/alarms_and_conditions/ua_alarm_condition_base.js +0 -460
  97. package/dist/src/alarms_and_conditions/ua_alarm_condition_base.js.map +0 -1
  98. package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm.d.ts +0 -35
  99. package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm.js +0 -32
  100. package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm.js.map +0 -1
  101. package/dist/src/alarms_and_conditions/ua_condition_base.d.ts +0 -191
  102. package/dist/src/alarms_and_conditions/ua_condition_base.js +0 -1029
  103. package/dist/src/alarms_and_conditions/ua_condition_base.js.map +0 -1
  104. package/dist/src/alarms_and_conditions/ua_discrete_alarm.d.ts +0 -11
  105. package/dist/src/alarms_and_conditions/ua_discrete_alarm.js +0 -58
  106. package/dist/src/alarms_and_conditions/ua_discrete_alarm.js.map +0 -1
  107. package/dist/src/alarms_and_conditions/ua_exclusive_deviation_alarm.d.ts +0 -24
  108. package/dist/src/alarms_and_conditions/ua_exclusive_deviation_alarm.js +0 -59
  109. package/dist/src/alarms_and_conditions/ua_exclusive_deviation_alarm.js.map +0 -1
  110. package/dist/src/alarms_and_conditions/ua_exclusive_level_alarm.d.ts +0 -14
  111. package/dist/src/alarms_and_conditions/ua_exclusive_level_alarm.js +0 -17
  112. package/dist/src/alarms_and_conditions/ua_exclusive_level_alarm.js.map +0 -1
  113. package/dist/src/alarms_and_conditions/ua_exclusive_limit_alarm.d.ts +0 -22
  114. package/dist/src/alarms_and_conditions/ua_exclusive_limit_alarm.js +0 -87
  115. package/dist/src/alarms_and_conditions/ua_exclusive_limit_alarm.js.map +0 -1
  116. package/dist/src/alarms_and_conditions/ua_exclusive_rate_of_change_alarm.d.ts +0 -6
  117. package/dist/src/alarms_and_conditions/ua_exclusive_rate_of_change_alarm.js +0 -11
  118. package/dist/src/alarms_and_conditions/ua_exclusive_rate_of_change_alarm.js.map +0 -1
  119. package/dist/src/alarms_and_conditions/ua_limit_alarm.d.ts +0 -76
  120. package/dist/src/alarms_and_conditions/ua_limit_alarm.js +0 -237
  121. package/dist/src/alarms_and_conditions/ua_limit_alarm.js.map +0 -1
  122. package/dist/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm.d.ts +0 -27
  123. package/dist/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm.js +0 -62
  124. package/dist/src/alarms_and_conditions/ua_non_exclusive_deviation_alarm.js.map +0 -1
  125. package/dist/src/alarms_and_conditions/ua_non_exclusive_limit_alarm.d.ts +0 -49
  126. package/dist/src/alarms_and_conditions/ua_non_exclusive_limit_alarm.js +0 -176
  127. package/dist/src/alarms_and_conditions/ua_non_exclusive_limit_alarm.js.map +0 -1
  128. package/dist/src/alarms_and_conditions/ua_off_normal_alarm.d.ts +0 -47
  129. package/dist/src/alarms_and_conditions/ua_off_normal_alarm.js +0 -151
  130. package/dist/src/alarms_and_conditions/ua_off_normal_alarm.js.map +0 -1
  131. package/dist/src/alarms_and_conditions/ua_system_off_normal_alarm.d.ts +0 -16
  132. package/dist/src/alarms_and_conditions/ua_system_off_normal_alarm.js +0 -18
  133. package/dist/src/alarms_and_conditions/ua_system_off_normal_alarm.js.map +0 -1
  134. package/dist/src/base_node.d.ts +0 -289
  135. package/dist/src/base_node.js +0 -1345
  136. package/dist/src/base_node.js.map +0 -1
  137. package/dist/src/data_access/ua_analog_item.d.ts +0 -13
  138. package/dist/src/data_access/ua_analog_item.js +0 -37
  139. package/dist/src/data_access/ua_analog_item.js.map +0 -1
  140. package/dist/src/data_access/ua_data_item.d.ts +0 -16
  141. package/dist/src/data_access/ua_data_item.js +0 -66
  142. package/dist/src/data_access/ua_data_item.js.map +0 -1
  143. package/dist/src/data_access/ua_multistate_discrete.d.ts +0 -24
  144. package/dist/src/data_access/ua_multistate_discrete.js +0 -132
  145. package/dist/src/data_access/ua_multistate_discrete.js.map +0 -1
  146. package/dist/src/namespace.d.ts +0 -472
  147. package/dist/src/namespace.js +0 -1751
  148. package/dist/src/namespace.js.map +0 -1
  149. package/dist/src/reference.d.ts +0 -43
  150. package/dist/src/reference.js +0 -138
  151. package/dist/src/reference.js.map +0 -1
  152. package/dist/src/session_context.d.ts +0 -4
  153. package/dist/src/session_context.js +0 -9
  154. package/dist/src/session_context.js.map +0 -1
  155. package/dist/src/ua_data_type.d.ts +0 -83
  156. package/dist/src/ua_data_type.js +0 -289
  157. package/dist/src/ua_data_type.js.map +0 -1
  158. package/dist/src/ua_method.d.ts +0 -41
  159. package/dist/src/ua_method.js +0 -202
  160. package/dist/src/ua_method.js.map +0 -1
  161. package/dist/src/ua_object.d.ts +0 -28
  162. package/dist/src/ua_object.js +0 -153
  163. package/dist/src/ua_object.js.map +0 -1
  164. package/dist/src/ua_object_type.d.ts +0 -49
  165. package/dist/src/ua_object_type.js +0 -123
  166. package/dist/src/ua_object_type.js.map +0 -1
  167. package/dist/src/ua_reference_type.d.ts +0 -42
  168. package/dist/src/ua_reference_type.js +0 -138
  169. package/dist/src/ua_reference_type.js.map +0 -1
  170. package/dist/src/ua_variable.d.ts +0 -339
  171. package/dist/src/ua_variable.js +0 -1706
  172. package/dist/src/ua_variable.js.map +0 -1
  173. package/dist/src/ua_variable_type.d.ts +0 -57
  174. package/dist/src/ua_variable_type.js +0 -530
  175. package/dist/src/ua_variable_type.js.map +0 -1
  176. package/dist/src/ua_view.d.ts +0 -16
  177. package/dist/src/ua_view.js +0 -42
  178. package/dist/src/ua_view.js.map +0 -1
@@ -442,8 +442,17 @@ export function makeStuff(addressSpace: IAddressSpace): any {
442
442
  this.obj.browseName = convertQualifiedName(attrs.BrowseName);
443
443
  this.obj.eventNotifier = ec.coerceByte(attrs.EventNotifier) || 0;
444
444
  this.obj.symbolicName = attrs.SymbolicName || null;
445
+
446
+ this.isDraft = attrs.ReleaseStatus === "Draft";
447
+ this.obj.isDeprecated = attrs.ReleaseStatus === "Deprecated";
448
+
445
449
  },
446
450
  finish(this: any) {
451
+ if (this.isDraft || this.isDeprecated) {
452
+ // ignore Draft or Deprecated element
453
+ debugLog("Ignoring Draft/Deprecated UAObject =", this.obj.browseName.toString());
454
+ return;
455
+ }
447
456
  _internal_createNode(this.obj);
448
457
  },
449
458
  parser: {
@@ -537,13 +546,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
537
546
  this.obj.displayName = "";
538
547
  this.obj.description = "";
539
548
  this.obj.symbolicName = attrs.SymbolicName;
549
+
540
550
  this.isDraft = attrs.ReleaseStatus === "Draft";
551
+ this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
552
+
541
553
  this.definitionFields = [];
542
554
  },
543
555
  finish(this: any) {
544
- if (this.isDraft) {
545
- // ignore Draft element
546
- debugLog("Ignoring Draft dataType =", this.obj.browseName.toString());
556
+ if (this.isDraft || this.isDeprecated) {
557
+ // ignore Draft or Deprecated element
558
+ debugLog("Ignoring Draft/Deprecated dataType =", this.obj.browseName.toString());
547
559
  return;
548
560
  }
549
561
  let definitionFields = this.definitionFields;
@@ -1274,8 +1286,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
1274
1286
 
1275
1287
  this.obj.accessLevel = convertAccessLevel(attrs.AccessLevel);
1276
1288
  this.obj.userAccessLevel = this.obj.accessLevel; // convertAccessLevel(attrs.UserAccessLevel || attrs.AccessLevel);
1289
+
1290
+ this.isDraft = attrs.ReleaseStatus === "Draft";
1291
+ this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
1292
+
1277
1293
  },
1278
1294
  finish(this: any) {
1295
+ if (this.isDraft || this.isDeprecated) {
1296
+ debugLog("Ignoring Draft/Deprecated UAVariable =", this.obj.browseName.toString());
1297
+ return;
1298
+ }
1279
1299
  /*
1280
1300
  // set default value based on obj data Type
1281
1301
  if (this.obj.value === undefined) {
@@ -1351,8 +1371,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
1351
1371
 
1352
1372
  this.obj.historizing = false;
1353
1373
  this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
1374
+
1375
+ this.isDraft = attrs.ReleaseStatus === "Draft";
1376
+ this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
1377
+
1354
1378
  },
1355
1379
  finish(this: any) {
1380
+ if (this.isDraft || this.isDeprecated) {
1381
+ debugLog("Ignoring Draft/Deprecated UAVariableType =", this.obj.browseName.toString());
1382
+ return;
1383
+ }
1356
1384
  try {
1357
1385
  _internal_createNode(this.obj);
1358
1386
  } /* istanbul ignore next */ catch (err) {
@@ -1389,8 +1417,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
1389
1417
  this.obj.parentNodeId = attrs.ParentNodeId || null;
1390
1418
  this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
1391
1419
  this.obj.methodDeclarationId = attrs.MethodDeclarationId ? _translateNodeId(attrs.MethodDeclarationId) : null;
1420
+
1421
+ this.isDraft = attrs.ReleaseStatus === "Draft";
1422
+ this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
1423
+
1392
1424
  },
1393
1425
  finish(this: any) {
1426
+ if (this.isDraft || this.isDeprecated) {
1427
+ debugLog("Ignoring Draft/Deprecated UAMethod =", this.obj.browseName.toString());
1428
+ return;
1429
+ }
1394
1430
  _internal_createNode(this.obj);
1395
1431
  },
1396
1432
  parser: {
@@ -3,7 +3,7 @@
3
3
  */
4
4
 
5
5
  import { assert } from "node-opcua-assert";
6
- import { CertificateInternals, exploreCertificate } from "node-opcua-crypto/dist/source/crypto_explore_certificate";
6
+ import { CertificateInternals, exploreCertificate } from "node-opcua-crypto";
7
7
  import { AccessRestrictionsFlag, allPermissions, AttributeIds, PermissionFlag } from "node-opcua-data-model";
8
8
  import { PreciseClock } from "node-opcua-date-time";
9
9
  import { NodeId, NodeIdLike, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
@@ -1 +1 @@
1
- export * from "./generate_address_space";
1
+ export * from "./generate_address_space";
@@ -47,12 +47,13 @@ import {
47
47
 
48
48
  import { adjustBrowseDirection } from "../source/helpers/adjust_browse_direction";
49
49
  import { UARootFolder } from "../source/ua_root_folder";
50
+ import { Namespace } from "../source/namespace";
50
51
 
51
52
  import { AddressSpacePrivate } from "./address_space_private";
52
53
  import { UAAcknowledgeableConditionImpl, UAConditionImpl } from "./alarms_and_conditions";
53
54
  import { EventData } from "./event_data";
54
55
  import { AddressSpace_installHistoricalDataNode } from "./historical_access/address_space_historical_data_node";
55
- import { UANamespace } from "./namespace_impl";
56
+ import { NamespaceImpl } from "./namespace_impl";
56
57
  import { isNonEmptyQualifiedName } from "./namespace_impl";
57
58
  import { NamespacePrivate } from "./namespace_private";
58
59
  import { ExtensionObjectConstructorFuncWithSchema, UADataTypeImpl } from "./ua_data_type_impl";
@@ -153,7 +154,7 @@ export class AddressSpace implements AddressSpacePrivate {
153
154
 
154
155
  public readonly isNodeIdString = isNodeIdString;
155
156
  private readonly _private_namespaceIndex: number;
156
- private readonly _namespaceArray: UANamespace[];
157
+ private readonly _namespaceArray: NamespacePrivate[];
157
158
  private _shutdownTask: ShutdownTask[] = [];
158
159
  private _modelChangeTransactionCounter = 0;
159
160
  private _modelChanges: ModelChangeStructureDataType[] = [];
@@ -186,7 +187,7 @@ export class AddressSpace implements AddressSpacePrivate {
186
187
  * @param {string|number} namespace index or namespace uri.
187
188
  * @return {NameSpace} the namespace
188
189
  */
189
- public getNamespace(namespaceIndexOrName: string | number): UANamespace {
190
+ public getNamespace(namespaceIndexOrName: string | number): NamespacePrivate {
190
191
  if (typeof namespaceIndexOrName === "number") {
191
192
  const namespaceIndex = namespaceIndexOrName;
192
193
  assert(namespaceIndex >= 0 && namespaceIndex < this._namespaceArray.length, "invalid namespace index ( out of bound)");
@@ -241,7 +242,7 @@ export class AddressSpace implements AddressSpacePrivate {
241
242
  * @param namespaceUri {string}
242
243
  * @returns {Namespace}
243
244
  */
244
- public registerNamespace(namespaceUri: string): UANamespace {
245
+ public registerNamespace(namespaceUri: string): NamespacePrivate {
245
246
  let index = this._namespaceArray.findIndex((ns) => ns.namespaceUri === namespaceUri);
246
247
  if (index !== -1) {
247
248
  assert((this._namespaceArray[index].addressSpace as any) === (this as any));
@@ -249,7 +250,7 @@ export class AddressSpace implements AddressSpacePrivate {
249
250
  }
250
251
  index = this._namespaceArray.length;
251
252
  this._namespaceArray.push(
252
- new UANamespace({
253
+ new NamespaceImpl({
253
254
  addressSpace: this,
254
255
  index,
255
256
  namespaceUri,
@@ -27,7 +27,7 @@ import { UARootFolder } from "../source/ua_root_folder";
27
27
 
28
28
  import { NamespacePrivate } from "./namespace_private";
29
29
  import { ExtensionObjectConstructorFuncWithSchema } from "./ua_data_type_impl";
30
- import { UANamespace } from "./namespace_impl";
30
+ import { NamespaceImpl } from "./namespace_impl";
31
31
 
32
32
  export interface AddressSpacePrivate extends IAddressSpace {
33
33
  rootFolder: UARootFolder;
@@ -52,9 +52,9 @@ export interface AddressSpacePrivate extends IAddressSpace {
52
52
 
53
53
  getOwnNamespace(): NamespacePrivate;
54
54
 
55
- getNamespace(indexOrName: number | string): UANamespace;
55
+ getNamespace(indexOrName: number | string): NamespacePrivate;
56
56
 
57
- registerNamespace(namespaceUri: string): UANamespace;
57
+ registerNamespace(namespaceUri: string): NamespacePrivate;
58
58
 
59
59
  getNamespaceArray(): NamespacePrivate[];
60
60
 
@@ -194,7 +194,7 @@ function detachNode(node: BaseNode) {
194
194
  * @params options.publicationDate="" {Date}
195
195
  *
196
196
  */
197
- export class UANamespace implements NamespacePrivate {
197
+ export class NamespaceImpl implements NamespacePrivate {
198
198
  public static _handle_hierarchy_parent = _handle_hierarchy_parent;
199
199
  public static isNonEmptyQualifiedName = isNonEmptyQualifiedName;
200
200
 
@@ -237,8 +237,8 @@ export class UANamespace implements NamespacePrivate {
237
237
  this._nodeIdManager = new NodeIdManager(this.index, this.addressSpace);
238
238
  }
239
239
 
240
- public getDefaultNamespace(): UANamespace {
241
- return this.index === 0 ? this : (this.addressSpace.getDefaultNamespace() as UANamespace);
240
+ public getDefaultNamespace(): NamespacePrivate {
241
+ return this.index === 0 ? this : (this.addressSpace.getDefaultNamespace());
242
242
  }
243
243
 
244
244
  public dispose(): void {
@@ -1814,7 +1814,7 @@ export class UANamespace implements NamespacePrivate {
1814
1814
  }
1815
1815
  const references: UAReference[] = [];
1816
1816
 
1817
- function process_subtypeOf_options(this: UANamespace, options2: any, references1: AddReferenceOpts[]) {
1817
+ function process_subtypeOf_options(this: NamespaceImpl, options2: any, references1: AddReferenceOpts[]) {
1818
1818
  // check common misspelling mistake
1819
1819
  assert(!options2.subTypeOf, "misspell error : it should be 'subtypeOf' instead");
1820
1820
  if (Object.prototype.hasOwnProperty.call(options2, "hasTypeDefinition")) {
@@ -51,7 +51,7 @@ import { UAReferenceTypeImpl } from "../ua_reference_type_impl";
51
51
  import { UAObjectTypeImpl } from "../ua_object_type_impl";
52
52
  import { UAVariableImpl } from "../ua_variable_impl";
53
53
  import { UAObjectImpl } from "../ua_object_impl";
54
- import { UANamespace } from "../namespace_impl";
54
+ import { NamespaceImpl } from "../namespace_impl";
55
55
  import { UAMethodImpl } from "../ua_method_impl";
56
56
  import { UADataTypeImpl } from "../ua_data_type_impl";
57
57
  import { UAVariableTypeImpl } from "../ua_variable_type_impl";
@@ -1199,7 +1199,7 @@ UADataTypeImpl.prototype.dumpXML = function (xw: XmlWriter) {
1199
1199
  dumpUADataType(xw, this);
1200
1200
  };
1201
1201
 
1202
- UANamespace.prototype.toNodeset2XML = function (this: UANamespace) {
1202
+ NamespaceImpl.prototype.toNodeset2XML = function (this: NamespaceImpl) {
1203
1203
  const dependency = constructNamespaceDependency(this);
1204
1204
  const translationTable = constructNamespaceTranslationTable(dependency);
1205
1205
 
package/testHelpers.d.ts CHANGED
@@ -1 +1 @@
1
- export * from "./distHelpers";
1
+ export * from "./distHelpers";
@@ -1,150 +1,150 @@
1
- <?xml version="1.0" encoding="utf-8" ?>
2
- <UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema"
3
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2019-05-01T00:00:00Z"
4
- xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
5
- <NamespaceUris>
6
- <Uri>http://opcfoundation.org/UA/DI/</Uri>
7
- </NamespaceUris>
8
- <Models>
9
- <Model ModelUri="http://opcfoundation.org/UA/DI/" Version="1.02" PublicationDate="2019-05-01T00:00:00Z">
10
- <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04.4" PublicationDate="2020-01-08T00:00:00Z" />
11
- </Model>
12
- </Models>
13
- <Aliases>
14
- <Alias Alias="Boolean">i=1</Alias>
15
- <Alias Alias="SByte">i=2</Alias>
16
- <Alias Alias="Byte">i=3</Alias>
17
- <Alias Alias="Int16">i=4</Alias>
18
- <Alias Alias="UInt16">i=5</Alias>
19
- <Alias Alias="Int32">i=6</Alias>
20
- <Alias Alias="UInt32">i=7</Alias>
21
- <Alias Alias="Int64">i=8</Alias>
22
- <Alias Alias="UInt64">i=9</Alias>
23
- <Alias Alias="Float">i=10</Alias>
24
- <Alias Alias="Double">i=11</Alias>
25
- <Alias Alias="DateTime">i=13</Alias>
26
- <Alias Alias="String">i=12</Alias>
27
- <Alias Alias="ByteString">i=15</Alias>
28
- <Alias Alias="Guid">i=14</Alias>
29
- <Alias Alias="XmlElement">i=16</Alias>
30
- <Alias Alias="NodeId">i=17</Alias>
31
- <Alias Alias="ExpandedNodeId">i=18</Alias>
32
- <Alias Alias="QualifiedName">i=20</Alias>
33
- <Alias Alias="LocalizedText">i=21</Alias>
34
- <Alias Alias="StatusCode">i=19</Alias>
35
- <Alias Alias="Structure">i=22</Alias>
36
- <Alias Alias="Number">i=26</Alias>
37
- <Alias Alias="Integer">i=27</Alias>
38
- <Alias Alias="UInteger">i=28</Alias>
39
- <Alias Alias="HasComponent">i=47</Alias>
40
- <Alias Alias="HasProperty">i=46</Alias>
41
- <Alias Alias="Organizes">i=35</Alias>
42
- <Alias Alias="HasEventSource">i=36</Alias>
43
- <Alias Alias="HasNotifier">i=48</Alias>
44
- <Alias Alias="HasSubtype">i=45</Alias>
45
- <Alias Alias="HasTypeDefinition">i=40</Alias>
46
- <Alias Alias="HasModellingRule">i=37</Alias>
47
- <Alias Alias="HasEncoding">i=38</Alias>
48
- <Alias Alias="HasDescription">i=39</Alias>
49
- </Aliases>
50
- <UADataType NodeId="ns=1;i=6522" BrowseName="1:FetchResultDataType" IsAbstract="true">
51
- <DisplayName>FetchResultDataType</DisplayName>
52
- <References>
53
- <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
54
- </References>
55
- </UADataType>
56
- <UADataType NodeId="ns=1;i=6525" BrowseName="1:ParameterResultDataType">
57
- <DisplayName>ParameterResultDataType</DisplayName>
58
- <References>
59
- <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
60
- </References>
61
- <Definition Name="1:ParameterResultDataType">
62
- <Field Name="NodePath" DataType="i=20" ValueRank="1" />
63
- <Field Name="StatusCode" DataType="i=19" />
64
- <Field Name="Diagnostics" DataType="i=25" />
65
- </Definition>
66
- </UADataType>
67
- <UADataType NodeId="ns=1;i=15889" BrowseName="1:TransferResultDataDataType">
68
- <DisplayName>TransferResultDataDataType</DisplayName>
69
- <References>
70
- <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=6522</Reference>
71
- </References>
72
- <Definition Name="1:TransferResultDataDataType">
73
- <Field Name="SequenceNumber" DataType="i=6" />
74
- <Field Name="EndOfResults" DataType="i=1" />
75
- <Field Name="ParameterDefs" DataType="ns=1;i=6525" ValueRank="1" />
76
- </Definition>
77
- </UADataType>
78
- <!-- A -->
79
- <UAObject NodeId="ns=1;i=6554" BrowseName="Default Binary" SymbolicName="DefaultBinary">
80
- <DisplayName>Default Binary</DisplayName>
81
- <References>
82
- <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=6525</Reference>
83
- <Reference ReferenceType="HasDescription">ns=1;i=6564</Reference>
84
- <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
85
- </References>
86
- </UAObject>
87
- <UAVariable NodeId="ns=1;i=6564" BrowseName="1:ParameterResultDataType" ParentNodeId="ns=1;i=6435" DataType="String">
88
- <DisplayName>ParameterResultDataType</DisplayName>
89
- <References>
90
- <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
91
- <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
92
- </References>
93
- <Value>
94
- <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">ParameterResultDataType</String>
95
- </Value>
96
- </UAVariable>
97
- <!-- B-->
98
- <UAObject NodeId="ns=1;i=15892" BrowseName="Default Binary" SymbolicName="DefaultBinary">
99
- <DisplayName>Default Binary</DisplayName>
100
- <References>
101
- <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=15889</Reference>
102
- <Reference ReferenceType="HasDescription">ns=1;i=15897</Reference>
103
- <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
104
- </References>
105
- </UAObject>
106
- <UAVariable NodeId="ns=1;i=15897" BrowseName="1:TransferResultDataDataType" ParentNodeId="ns=1;i=6435" DataType="String">
107
- <DisplayName>TransferResultDataDataType</DisplayName>
108
- <References>
109
- <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
110
- <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
111
- </References>
112
- <Value>
113
- <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">TransferResultDataDataType</String>
114
- </Value>
115
- </UAVariable>
116
- <!-- C -->
117
- <UAVariable NodeId="ns=1;i=6435" BrowseName="1:Opc.Ua.Di" SymbolicName="OpcUaDi_BinarySchema" DataType="ByteString">
118
- <DisplayName>Opc.Ua.Di</DisplayName>
119
- <References>
120
- <Reference ReferenceType="HasProperty">ns=1;i=6437</Reference>
121
- <Reference ReferenceType="HasProperty">ns=1;i=15893</Reference>
122
-
123
- <Reference ReferenceType="HasComponent">ns=1;i=15897</Reference>
124
- <Reference ReferenceType="HasComponent">ns=1;i=6564</Reference>
125
- <Reference ReferenceType="HasComponent" IsForward="false">i=93</Reference>
126
- <Reference ReferenceType="HasTypeDefinition">i=72</Reference>
127
- </References>
128
- <Value/>
129
- </UAVariable>
130
- <UAVariable NodeId="ns=1;i=6437" BrowseName="NamespaceUri" ParentNodeId="ns=1;i=6435" DataType="String">
131
- <DisplayName>NamespaceUri</DisplayName>
132
- <References>
133
- <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
134
- <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
135
- </References>
136
- <Value>
137
- <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">http://opcfoundation.org/UA/DI/</String>
138
- </Value>
139
- </UAVariable>
140
- <UAVariable NodeId="ns=1;i=15893" BrowseName="Deprecated" ParentNodeId="ns=1;i=6435" DataType="Boolean">
141
- <DisplayName>Deprecated</DisplayName>
142
- <References>
143
- <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
144
- <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
145
- </References>
146
- <Value>
147
- <Boolean xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">true</Boolean>
148
- </Value>
149
- </UAVariable>
150
- </UANodeSet>
1
+ <?xml version="1.0" encoding="utf-8" ?>
2
+ <UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema"
3
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2019-05-01T00:00:00Z"
4
+ xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
5
+ <NamespaceUris>
6
+ <Uri>http://opcfoundation.org/UA/DI/</Uri>
7
+ </NamespaceUris>
8
+ <Models>
9
+ <Model ModelUri="http://opcfoundation.org/UA/DI/" Version="1.02" PublicationDate="2019-05-01T00:00:00Z">
10
+ <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04.4" PublicationDate="2020-01-08T00:00:00Z" />
11
+ </Model>
12
+ </Models>
13
+ <Aliases>
14
+ <Alias Alias="Boolean">i=1</Alias>
15
+ <Alias Alias="SByte">i=2</Alias>
16
+ <Alias Alias="Byte">i=3</Alias>
17
+ <Alias Alias="Int16">i=4</Alias>
18
+ <Alias Alias="UInt16">i=5</Alias>
19
+ <Alias Alias="Int32">i=6</Alias>
20
+ <Alias Alias="UInt32">i=7</Alias>
21
+ <Alias Alias="Int64">i=8</Alias>
22
+ <Alias Alias="UInt64">i=9</Alias>
23
+ <Alias Alias="Float">i=10</Alias>
24
+ <Alias Alias="Double">i=11</Alias>
25
+ <Alias Alias="DateTime">i=13</Alias>
26
+ <Alias Alias="String">i=12</Alias>
27
+ <Alias Alias="ByteString">i=15</Alias>
28
+ <Alias Alias="Guid">i=14</Alias>
29
+ <Alias Alias="XmlElement">i=16</Alias>
30
+ <Alias Alias="NodeId">i=17</Alias>
31
+ <Alias Alias="ExpandedNodeId">i=18</Alias>
32
+ <Alias Alias="QualifiedName">i=20</Alias>
33
+ <Alias Alias="LocalizedText">i=21</Alias>
34
+ <Alias Alias="StatusCode">i=19</Alias>
35
+ <Alias Alias="Structure">i=22</Alias>
36
+ <Alias Alias="Number">i=26</Alias>
37
+ <Alias Alias="Integer">i=27</Alias>
38
+ <Alias Alias="UInteger">i=28</Alias>
39
+ <Alias Alias="HasComponent">i=47</Alias>
40
+ <Alias Alias="HasProperty">i=46</Alias>
41
+ <Alias Alias="Organizes">i=35</Alias>
42
+ <Alias Alias="HasEventSource">i=36</Alias>
43
+ <Alias Alias="HasNotifier">i=48</Alias>
44
+ <Alias Alias="HasSubtype">i=45</Alias>
45
+ <Alias Alias="HasTypeDefinition">i=40</Alias>
46
+ <Alias Alias="HasModellingRule">i=37</Alias>
47
+ <Alias Alias="HasEncoding">i=38</Alias>
48
+ <Alias Alias="HasDescription">i=39</Alias>
49
+ </Aliases>
50
+ <UADataType NodeId="ns=1;i=6522" BrowseName="1:FetchResultDataType" IsAbstract="true">
51
+ <DisplayName>FetchResultDataType</DisplayName>
52
+ <References>
53
+ <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
54
+ </References>
55
+ </UADataType>
56
+ <UADataType NodeId="ns=1;i=6525" BrowseName="1:ParameterResultDataType">
57
+ <DisplayName>ParameterResultDataType</DisplayName>
58
+ <References>
59
+ <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
60
+ </References>
61
+ <Definition Name="1:ParameterResultDataType">
62
+ <Field Name="NodePath" DataType="i=20" ValueRank="1" />
63
+ <Field Name="StatusCode" DataType="i=19" />
64
+ <Field Name="Diagnostics" DataType="i=25" />
65
+ </Definition>
66
+ </UADataType>
67
+ <UADataType NodeId="ns=1;i=15889" BrowseName="1:TransferResultDataDataType">
68
+ <DisplayName>TransferResultDataDataType</DisplayName>
69
+ <References>
70
+ <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=6522</Reference>
71
+ </References>
72
+ <Definition Name="1:TransferResultDataDataType">
73
+ <Field Name="SequenceNumber" DataType="i=6" />
74
+ <Field Name="EndOfResults" DataType="i=1" />
75
+ <Field Name="ParameterDefs" DataType="ns=1;i=6525" ValueRank="1" />
76
+ </Definition>
77
+ </UADataType>
78
+ <!-- A -->
79
+ <UAObject NodeId="ns=1;i=6554" BrowseName="Default Binary" SymbolicName="DefaultBinary">
80
+ <DisplayName>Default Binary</DisplayName>
81
+ <References>
82
+ <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=6525</Reference>
83
+ <Reference ReferenceType="HasDescription">ns=1;i=6564</Reference>
84
+ <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
85
+ </References>
86
+ </UAObject>
87
+ <UAVariable NodeId="ns=1;i=6564" BrowseName="1:ParameterResultDataType" ParentNodeId="ns=1;i=6435" DataType="String">
88
+ <DisplayName>ParameterResultDataType</DisplayName>
89
+ <References>
90
+ <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
91
+ <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
92
+ </References>
93
+ <Value>
94
+ <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">ParameterResultDataType</String>
95
+ </Value>
96
+ </UAVariable>
97
+ <!-- B-->
98
+ <UAObject NodeId="ns=1;i=15892" BrowseName="Default Binary" SymbolicName="DefaultBinary">
99
+ <DisplayName>Default Binary</DisplayName>
100
+ <References>
101
+ <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=15889</Reference>
102
+ <Reference ReferenceType="HasDescription">ns=1;i=15897</Reference>
103
+ <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
104
+ </References>
105
+ </UAObject>
106
+ <UAVariable NodeId="ns=1;i=15897" BrowseName="1:TransferResultDataDataType" ParentNodeId="ns=1;i=6435" DataType="String">
107
+ <DisplayName>TransferResultDataDataType</DisplayName>
108
+ <References>
109
+ <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
110
+ <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
111
+ </References>
112
+ <Value>
113
+ <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">TransferResultDataDataType</String>
114
+ </Value>
115
+ </UAVariable>
116
+ <!-- C -->
117
+ <UAVariable NodeId="ns=1;i=6435" BrowseName="1:Opc.Ua.Di" SymbolicName="OpcUaDi_BinarySchema" DataType="ByteString">
118
+ <DisplayName>Opc.Ua.Di</DisplayName>
119
+ <References>
120
+ <Reference ReferenceType="HasProperty">ns=1;i=6437</Reference>
121
+ <Reference ReferenceType="HasProperty">ns=1;i=15893</Reference>
122
+
123
+ <Reference ReferenceType="HasComponent">ns=1;i=15897</Reference>
124
+ <Reference ReferenceType="HasComponent">ns=1;i=6564</Reference>
125
+ <Reference ReferenceType="HasComponent" IsForward="false">i=93</Reference>
126
+ <Reference ReferenceType="HasTypeDefinition">i=72</Reference>
127
+ </References>
128
+ <Value/>
129
+ </UAVariable>
130
+ <UAVariable NodeId="ns=1;i=6437" BrowseName="NamespaceUri" ParentNodeId="ns=1;i=6435" DataType="String">
131
+ <DisplayName>NamespaceUri</DisplayName>
132
+ <References>
133
+ <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
134
+ <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
135
+ </References>
136
+ <Value>
137
+ <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">http://opcfoundation.org/UA/DI/</String>
138
+ </Value>
139
+ </UAVariable>
140
+ <UAVariable NodeId="ns=1;i=15893" BrowseName="Deprecated" ParentNodeId="ns=1;i=6435" DataType="Boolean">
141
+ <DisplayName>Deprecated</DisplayName>
142
+ <References>
143
+ <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
144
+ <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
145
+ </References>
146
+ <Value>
147
+ <Boolean xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">true</Boolean>
148
+ </Value>
149
+ </UAVariable>
150
+ </UANodeSet>