node-opcua-address-space 2.77.0 → 2.79.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.
- package/dist/source/continuation_points/continuation_point_manager.d.ts +59 -0
- package/dist/source/continuation_points/continuation_point_manager.js +6 -6
- package/dist/source/continuation_points/continuation_point_manager.js.map +1 -1
- package/dist/source/index.d.ts +1 -0
- package/dist/source/index.js +1 -0
- package/dist/source/index.js.map +1 -1
- package/dist/source/loader/ensure_datatype_extracted.js +25 -0
- package/dist/source/loader/ensure_datatype_extracted.js.map +1 -1
- package/dist/source/loader/generateAddressSpaceRaw.d.ts +2 -1
- package/dist/source/loader/generateAddressSpaceRaw.js +2 -2
- package/dist/source/loader/generateAddressSpaceRaw.js.map +1 -1
- package/dist/source/loader/load_nodeset2.d.ts +7 -3
- package/dist/source/loader/load_nodeset2.js +66 -31
- package/dist/source/loader/load_nodeset2.js.map +1 -1
- package/dist/source/xml_writer.d.ts +5 -0
- package/dist/src/alarms_and_conditions/ua_limit_alarm_impl.d.ts +1 -1
- package/dist/src/base_node_impl.d.ts +1 -0
- package/dist/src/base_node_impl.js +30 -3
- package/dist/src/base_node_impl.js.map +1 -1
- package/dist/src/base_node_private.js +5 -0
- package/dist/src/base_node_private.js.map +1 -1
- package/dist/src/historical_access/address_space_historical_data_node.js +14 -3
- package/dist/src/historical_access/address_space_historical_data_node.js.map +1 -1
- package/dist/src/index_current.d.ts +2 -1
- package/dist/src/index_current.js +3 -2
- package/dist/src/index_current.js.map +1 -1
- package/dist/src/namespace_impl.d.ts +2 -0
- package/dist/src/namespace_impl.js +11 -1
- package/dist/src/namespace_impl.js.map +1 -1
- package/dist/src/namespace_private.d.ts +1 -0
- package/dist/src/namespace_private.js.map +1 -1
- package/dist/src/nodeid_manager.d.ts +1 -0
- package/dist/src/nodeid_manager.js +14 -2
- package/dist/src/nodeid_manager.js.map +1 -1
- package/dist/src/nodeset_tools/{typedictionary_to_xml.d.ts → dump_to_bsd.d.ts} +1 -1
- package/dist/src/nodeset_tools/{typedictionary_to_xml.js → dump_to_bsd.js} +14 -5
- package/dist/src/nodeset_tools/dump_to_bsd.js.map +1 -0
- package/dist/src/nodeset_tools/nodeset_to_xml.d.ts +9 -1
- package/dist/src/nodeset_tools/nodeset_to_xml.js +220 -89
- package/dist/src/nodeset_tools/nodeset_to_xml.js.map +1 -1
- package/dist/src/tool_isSupertypeOf.js +12 -2
- package/dist/src/tool_isSupertypeOf.js.map +1 -1
- package/dist/src/ua_data_type_impl.js +10 -5
- package/dist/src/ua_data_type_impl.js.map +1 -1
- package/dist/src/ua_method_impl.d.ts +2 -1
- package/dist/src/ua_method_impl.js +9 -1
- package/dist/src/ua_method_impl.js.map +1 -1
- package/dist/src/ua_object_impl.js +8 -1
- package/dist/src/ua_object_impl.js.map +1 -1
- package/dist/src/ua_variable_impl.d.ts +5 -0
- package/dist/src/ua_variable_impl.js +36 -2
- package/dist/src/ua_variable_impl.js.map +1 -1
- package/dist/src/ua_variable_impl_ext_obj.js +1 -1
- package/dist/src/ua_variable_impl_ext_obj.js.map +1 -1
- package/distHelpers/get_mini_address_space.js +1 -1
- package/distHelpers/get_mini_address_space.js.map +1 -1
- package/distNodeJS/generate_address_space.d.ts +3 -1
- package/distNodeJS/generate_address_space.js +13 -2
- package/distNodeJS/generate_address_space.js.map +1 -1
- package/package.json +26 -26
- package/source/continuation_points/continuation_point_manager.ts +13 -12
- package/source/index.ts +1 -0
- package/source/loader/ensure_datatype_extracted.ts +38 -3
- package/source/loader/generateAddressSpaceRaw.ts +4 -3
- package/source/loader/load_nodeset2.ts +86 -33
- package/source/xml_writer.ts +3 -0
- package/source_nodejs/generate_address_space.ts +27 -5
- package/src/alarms_and_conditions/ua_limit_alarm_impl.ts +1 -1
- package/src/base_node_impl.ts +34 -3
- package/src/base_node_private.ts +6 -0
- package/src/historical_access/address_space_historical_data_node.ts +18 -3
- package/src/index_current.ts +3 -1
- package/src/namespace_impl.ts +24 -1
- package/src/namespace_private.ts +2 -0
- package/src/nodeid_manager.ts +14 -5
- package/src/nodeset_tools/{typedictionary_to_xml.ts → dump_to_bsd.ts} +24 -14
- package/src/nodeset_tools/nodeset_to_xml.ts +278 -77
- package/src/tool_isSupertypeOf.ts +14 -2
- package/src/ua_data_type_impl.ts +11 -7
- package/src/ua_method_impl.ts +9 -3
- package/src/ua_object_impl.ts +12 -2
- package/src/ua_variable_impl.ts +42 -4
- package/src/ua_variable_impl_ext_obj.ts +1 -1
- package/test_helpers/get_mini_address_space.ts +1 -1
- package/test_helpers/test_fixtures/mini.Node.Set2.xml +207 -0
- package/test_helpers/test_fixtures/nodeset_no_aliases.xml +30 -0
- package/test_helpers/test_fixtures/nodeset_no_aliases_with_aliases.xml +31 -0
- package/dist/source/helpers/check_event_clause.d.ts +0 -17
- package/dist/source/helpers/check_event_clause.js +0 -53
- package/dist/source/helpers/check_event_clause.js.map +0 -1
- package/dist/src/alarms_and_conditions/check_where_clause.d.ts +0 -4
- package/dist/src/alarms_and_conditions/check_where_clause.js +0 -110
- package/dist/src/alarms_and_conditions/check_where_clause.js.map +0 -1
- package/dist/src/alarms_and_conditions/condition_info.d.ts +0 -27
- package/dist/src/alarms_and_conditions/condition_info.js +0 -55
- package/dist/src/alarms_and_conditions/condition_info.js.map +0 -1
- package/dist/src/alarms_and_conditions/condition_snapshot.d.ts +0 -233
- package/dist/src/alarms_and_conditions/condition_snapshot.js +0 -667
- package/dist/src/alarms_and_conditions/condition_snapshot.js.map +0 -1
- package/dist/src/alarms_and_conditions/extract_event_fields.d.ts +0 -10
- package/dist/src/alarms_and_conditions/extract_event_fields.js +0 -90
- package/dist/src/alarms_and_conditions/extract_event_fields.js.map +0 -1
- package/dist/src/data_access/ua_multistate_value_discrete.d.ts +0 -51
- package/dist/src/data_access/ua_multistate_value_discrete.js +0 -250
- package/dist/src/data_access/ua_multistate_value_discrete.js.map +0 -1
- package/dist/src/data_access/ua_two_state_discrete.d.ts +0 -25
- package/dist/src/data_access/ua_two_state_discrete.js +0 -154
- package/dist/src/data_access/ua_two_state_discrete.js.map +0 -1
- package/dist/src/nodeset_tools/typedictionary_to_xml.js.map +0 -1
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodeIdManager = exports.NamespaceOptions = void 0;
|
|
4
|
+
/* eslint-disable max-depth */
|
|
5
|
+
/* eslint-disable max-statements */
|
|
4
6
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
5
7
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
6
8
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
@@ -82,14 +84,12 @@ class NodeIdManager {
|
|
|
82
84
|
}
|
|
83
85
|
constructNodeId(options) {
|
|
84
86
|
function prepareName(browseName) {
|
|
85
|
-
(0, node_opcua_assert_1.assert)(browseName instanceof node_opcua_data_model_1.QualifiedName);
|
|
86
87
|
const m = browseName.name.toString().replace(/[ ]/g, "").replace(/(<|>)/g, "");
|
|
87
88
|
return m;
|
|
88
89
|
}
|
|
89
90
|
let nodeId = options.nodeId;
|
|
90
91
|
const nodeClass = options.nodeClass;
|
|
91
92
|
if (!nodeId) {
|
|
92
|
-
// console.log("xx constructNodeId", options.browseName.toString());
|
|
93
93
|
const parentInfo = this.findParentNodeId(options);
|
|
94
94
|
if (parentInfo) {
|
|
95
95
|
const [parentNodeId, linkName] = parentInfo;
|
|
@@ -114,6 +114,18 @@ class NodeIdManager {
|
|
|
114
114
|
return this._getOrCreateFromName(newName, nodeClass);
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
|
+
else {
|
|
118
|
+
if (options.registerSymbolicNames) {
|
|
119
|
+
const newName = name;
|
|
120
|
+
const nodeIdValueInCache = this._cache[newName];
|
|
121
|
+
if (nodeIdValueInCache) {
|
|
122
|
+
return new node_opcua_nodeid_1.NodeId(node_opcua_nodeid_1.NodeIdType.NUMERIC, nodeIdValueInCache, this.namespaceIndex);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
return this._getOrCreateFromName(newName, nodeClass);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
117
129
|
}
|
|
118
130
|
// }} has parent ...
|
|
119
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeid_manager.js","sourceRoot":"","sources":["../../src/nodeid_manager.ts"],"names":[],"mappings":";;;AAAA,yDAA2C;AAC3C,iEAAiE;AACjE,yDAA0G;AAC1G,uDAAiD;AAGjD,qDAAoD;AAEpD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE9B,QAAA,gBAAgB,GAAG;IAC5B,mBAAmB,EAAE,GAAG;CAC3B,CAAC;AACF,SAAS,gBAAgB,CAAC,SAAoB;IAC1C,OAAO,OAAQ,iCAAiB,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC;AAC7D,CAAC;AAED,MAAM,OAAO,GAAG,aAAa,CAAC;AAC9B,MAAM,OAAO,GAAG,uBAAuB,CAAC;AACxC,MAAM,gBAAgB,GAAG,IAAA,iCAAa,EAAC,aAAa,CAAC,CAAC;AACtD,MAAM,iBAAiB,GAAG,IAAA,iCAAa,EAAC,cAAc,CAAC,CAAC;AACxD,MAAM,WAAW,GAAG,IAAA,iCAAa,EAAC,aAAa,CAAC,CAAC;AAEjD,SAAS,0BAA0B,CAAC,UAAyB;IACzD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAc,EAAE,EAAE;QACpD,OAAO,CACH,CAAC,CAAC,CAAC,SAAS;YACZ,CAAC,IAAA,8BAAU,EAAC,CAAC,CAAC,aAAa,EAAE,iBAAiB,CAAC;gBAC3C,IAAA,8BAAU,EAAC,CAAC,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC7C,IAAA,8BAAU,EAAC,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAChD,CAAC;IACN,CAAC,CAAC,CAAC;IACH,IAAA,0BAAM,EAAC,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAC/B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACf;IACD,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,IAAA,8BAAU,EAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE;QAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;KACpC;IACD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"nodeid_manager.js","sourceRoot":"","sources":["../../src/nodeid_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { NamespacePrivate } from "../namespace_private";
|
|
2
|
-
export declare function dumpToBSD(namespace: NamespacePrivate):
|
|
2
|
+
export declare function dumpToBSD(namespace: NamespacePrivate): string;
|
|
@@ -126,16 +126,17 @@ function dumpToBSD(namespace) {
|
|
|
126
126
|
const dependency = (0, construct_namespace_dependency_1.constructNamespaceDependency)(namespace);
|
|
127
127
|
const addressSpace = namespace.addressSpace;
|
|
128
128
|
const xw = new XMLWriter(true);
|
|
129
|
-
xw.startDocument({ encoding: "utf-8", version: "1.0" });
|
|
129
|
+
//xx xw.startDocument():// { encoding: "utf-8", version: "1.0" });
|
|
130
130
|
xw.startElement("opc:TypeDictionary");
|
|
131
131
|
xw.writeAttribute("xmlns:opc", "http://opcfoundation.org/BinarySchema/");
|
|
132
132
|
xw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
|
|
133
133
|
xw.writeAttribute("xmlns:ua", "http://opcfoundation.org/UA/");
|
|
134
|
+
xw.writeAttribute("xmlns:tns", namespace.namespaceUri);
|
|
134
135
|
const map = {};
|
|
136
|
+
map[namespace.index] = "tns";
|
|
135
137
|
for (const dependantNamespace of dependency) {
|
|
136
138
|
const namespaceIndex = dependantNamespace.index;
|
|
137
|
-
if (namespaceIndex === 0) {
|
|
138
|
-
//|| namespaceIndex === namespace.index) {
|
|
139
|
+
if (namespaceIndex === 0 || namespaceIndex === namespace.index) {
|
|
139
140
|
continue;
|
|
140
141
|
}
|
|
141
142
|
const ns = shortcut(dependantNamespace);
|
|
@@ -144,12 +145,20 @@ function dumpToBSD(namespace) {
|
|
|
144
145
|
}
|
|
145
146
|
xw.writeAttribute("DefaultByteOrder", "LittleEndian");
|
|
146
147
|
xw.writeAttribute("TargetNamespace", namespace.namespaceUri);
|
|
148
|
+
// <opc:Import Namespace="http://opcfoundation.org/UA/"/>
|
|
149
|
+
for (const dependantNamespace of dependency) {
|
|
150
|
+
if (dependantNamespace.index === namespace.index) {
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
xw.startElement("opc:Import").writeAttribute("Namespace", dependantNamespace.namespaceUri).endElement();
|
|
154
|
+
}
|
|
155
|
+
//
|
|
147
156
|
for (const dataType of namespace._dataTypeIterator()) {
|
|
148
157
|
dumpDataTypeToBSD(xw, dataType, map);
|
|
149
158
|
}
|
|
150
159
|
xw.endElement();
|
|
151
|
-
xw.endDocument();
|
|
160
|
+
// xw.endDocument();
|
|
152
161
|
return xw.toString();
|
|
153
162
|
}
|
|
154
163
|
exports.dumpToBSD = dumpToBSD;
|
|
155
|
-
//# sourceMappingURL=
|
|
164
|
+
//# sourceMappingURL=dump_to_bsd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dump_to_bsd.js","sourceRoot":"","sources":["../../../src/nodeset_tools/dump_to_bsd.ts"],"names":[],"mappings":";;;AACA,yDAA2C;AAC3C,uDAAuE;AACvE,yDAA2C;AAI3C,qFAAgF;AAEhF,4CAA4C;AAC5C,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAExC,SAAS,kBAAkB,CAAC,EAAa,EAAE,CAAiB,EAAE,IAAY;IACtE,EAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IACtC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,EAAE,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACxC,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE;QAC5B,EAAE,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC;QACvC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,IAAK,CAAC,CAAC;QACnC,IAAA,0BAAM,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,4BAA4B,CAAC,CAAC;QACvD,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,EAAE,CAAC,UAAU,EAAE,CAAC;KACnB;IACD,EAAE,CAAC,UAAU,EAAE,CAAC;AACpB,CAAC;AACD,SAAS,YAAY,CAAC,YAAiC,EAAE,GAA8B,EAAE,MAAc;IACnG,IAAI,0BAAM,CAAC,UAAU,CAAC,MAAM,EAAE,0BAAM,CAAC,UAAU,CAAC,EAAE;QAC9C,OAAO,oBAAoB,CAAC;KAC/B;IACD,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3C,uBAAuB;IACvB,IAAI,CAAC,IAAI,EAAE;QACP,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAA,CAAC,CAAC;KAChE;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAK,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,IAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClH,OAAO,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,KAAK,WAAW,IAAI,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AACvG,CAAC;AAED,0CAA0C;AAC1C,SAAS,qBAAqB,CAC1B,EAAa,EACb,YAA2B,EAC3B,GAA8B,EAC9B,mBAAwC,EACxC,uBAA+D,EAC/D,IAAY,EACZ,GAAY;;IAEZ,EAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IACtC,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,YAAmC,EAAE,GAAG,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC;IAExH,IAAI,GAAG,EAAE;QACL,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QACrC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,EAAE,CAAC,UAAU,EAAE,CAAC;KACnB;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,IAAI,EAAE,CAAC;IAChD,iBAAiB;IACjB,MAAM,cAAc,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAA,MAAA,uBAAuB,CAAC,MAAM,0CAAE,MAAM,KAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjG,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,KAAK,IAAI,KAAK,GAAG,cAAc,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7D,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,CAAC,UAAU,EAAE;YACd,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC7B,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC,CAAC;YAChD,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACzC,EAAE,CAAC,UAAU,EAAE,CAAC;YAChB,cAAc,EAAE,CAAC;SACpB;KACJ;IAED,uBAAuB;IACvB,IAAI,cAAc,IAAI,EAAE,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAChD;IAED,IAAI,cAAc,EAAE;QAChB;;;;;;;UAOE;QACF,MAAM,OAAO,GAAG,EAAE,GAAG,cAAc,CAAC;QACpC,IAAI,OAAO,KAAK,CAAC,EAAE;YACf,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC7B,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YACvC,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACzC,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChD,EAAE,CAAC,UAAU,EAAE,CAAC;SACnB;KACJ;IACD,KAAK,IAAI,KAAK,GAAG,cAAc,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7D,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAExB,MAAM,OAAO,GAAG,CAAC,CAAC,SAAS,GAAG,CAAC,KAAI,MAAA,CAAC,CAAC,eAAe,0CAAE,MAAM,CAAA,CAAC;QAE7D,IAAI,OAAO,EAAE;YACT,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC7B,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,IAAK,CAAC,CAAC;YAC5C,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAC3C,IAAI,CAAC,CAAC,UAAU,EAAE;gBACd,EAAE,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC,CAAC;aAC1D;YACD,EAAE,CAAC,UAAU,EAAE,CAAC;SACnB;QAED,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC7B,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,IAAK,CAAC,CAAC;QAEnC,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAmC,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;QACpF,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxC,IAAI,OAAO,EAAE;YACT,EAAE,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,CAAC,IAAK,CAAC,CAAC;SACtD;QACD,IAAI,CAAC,CAAC,UAAU,EAAE;YACd,EAAE,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC,CAAC;SAC1D;QACD,EAAE,CAAC,UAAU,EAAE,CAAC;KACnB;IACD,EAAE,CAAC,UAAU,EAAE,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,EAAa,EAAE,QAAoB,EAAE,GAA8B;;IAC1F,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;IAE3C,MAAM,IAAI,GAAW,QAAQ,CAAC,UAAU,CAAC,IAAK,CAAC;IAE/C,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;IAC5C,IAAI,UAAU,YAAY,sCAAmB,EAAE;QAC3C,MAAM,uBAAuB,GAAG,MAAA,QAAQ,CAAC,YAAY,0CAAE,sBAAsB,EAAE,CAAC;QAChF,qBAAqB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC;KAC3F;IACD,IAAI,UAAU,YAAY,iCAAc,EAAE;QACtC,kBAAkB,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;KAC5C;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,SAAqB;IACnC,OAAO,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC;AACjC,CAAC;AACD,SAAgB,SAAS,CAAC,SAA2B;IACjD,MAAM,UAAU,GAAiB,IAAA,6DAA4B,EAAC,SAAS,CAAC,CAAC;IAEzE,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;IAE5C,MAAM,EAAE,GAAc,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;IAE1C,kEAAkE;IAElE,EAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAEtC,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,wCAAwC,CAAC,CAAC;IACzE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,2CAA2C,CAAC,CAAC;IAC5E,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,8BAA8B,CAAC,CAAC;IAC9D,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAEvD,MAAM,GAAG,GAA8B,EAAE,CAAC;IAE1C,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;IAE7B,KAAK,MAAM,kBAAkB,IAAI,UAAU,EAAE;QACzC,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAChD,IAAI,cAAc,KAAK,CAAC,IAAI,cAAc,KAAK,SAAS,CAAC,KAAK,EAAE;YAC5D,SAAS;SACZ;QACD,MAAM,EAAE,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACxC,GAAG,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;QACzB,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;KACrE;IAED,EAAE,CAAC,cAAc,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACtD,EAAE,CAAC,cAAc,CAAC,iBAAiB,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAE7D,yDAAyD;IACzD,KAAK,MAAM,kBAAkB,IAAI,UAAU,EAAE;QACzC,IAAI,kBAAkB,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,EAAE;YAC9C,SAAS;SACZ;QACD,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,UAAU,EAAE,CAAC;KAC3G;IACD,EAAE;IACF,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,iBAAiB,EAAE,EAAE;QAClD,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;KACxC;IACD,EAAE,CAAC,UAAU,EAAE,CAAC;IACpB,uBAAuB;IAEnB,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAhDD,8BAgDC"}
|
|
@@ -1,2 +1,10 @@
|
|
|
1
1
|
import { BaseNode } from "node-opcua-address-space-base";
|
|
2
|
-
|
|
2
|
+
declare type NodeIdString = string;
|
|
3
|
+
export interface BuildAliasesData {
|
|
4
|
+
aliases: Record<string, NodeIdString>;
|
|
5
|
+
aliases_visited?: Record<string, unknown>;
|
|
6
|
+
}
|
|
7
|
+
export interface DumpXMLOptions {
|
|
8
|
+
}
|
|
9
|
+
export declare function dumpXml(node: BaseNode, options: DumpXMLOptions): void;
|
|
10
|
+
export {};
|