node-opcua-address-space 2.169.0 → 2.170.1
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/ua_interface.d.ts +2 -3
- package/dist/source/ua_interface.js +10 -33
- package/dist/source/ua_interface.js.map +1 -1
- package/dist/src/_instantiate_helpers.d.ts +1 -1
- package/dist/src/_instantiate_helpers.js +32 -9
- package/dist/src/_instantiate_helpers.js.map +1 -1
- package/dist/src/_mandatory_child_or_requested_optional_filter.js +3 -3
- package/dist/src/_mandatory_child_or_requested_optional_filter.js.map +1 -1
- package/dist/src/address_space.d.ts +2 -2
- package/dist/src/address_space.js +9 -11
- package/dist/src/address_space.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js.map +1 -1
- package/dist/src/base_node_impl.d.ts +1 -1
- package/dist/src/base_node_private.d.ts +10 -7
- package/dist/src/base_node_private.js +74 -50
- package/dist/src/base_node_private.js.map +1 -1
- package/dist/src/check_value_rank_compatibility.js +1 -1
- package/dist/src/check_value_rank_compatibility.js.map +1 -1
- package/dist/src/event_data.d.ts +8 -21
- package/dist/src/event_data.js +24 -19
- package/dist/src/event_data.js.map +1 -1
- package/dist/src/ua_object_impl.d.ts +6 -5
- package/dist/src/ua_object_impl.js +30 -4
- package/dist/src/ua_object_impl.js.map +1 -1
- package/dist/src/ua_object_type_impl.js +2 -2
- package/dist/src/ua_object_type_impl.js.map +1 -1
- package/dist/src/ua_variable_impl.d.ts +1 -0
- package/dist/src/ua_variable_impl.js +79 -1
- package/dist/src/ua_variable_impl.js.map +1 -1
- package/dist/tsconfig_base.tsbuildinfo +1 -1
- package/distHelpers/get_address_space_fixture.js +14 -14
- package/distHelpers/get_address_space_fixture.js.map +1 -1
- package/distHelpers/index.d.ts +2 -2
- package/distHelpers/index.js +2 -2
- package/distHelpers/index.js.map +1 -1
- package/package.json +18 -18
- package/source/ua_interface.ts +24 -38
- package/src/_instantiate_helpers.ts +67 -24
- package/src/_mandatory_child_or_requested_optional_filter.ts +5 -5
- package/src/address_space.ts +15 -16
- package/src/alarms_and_conditions/condition_snapshot_impl.ts +3 -3
- package/src/base_node_impl.ts +1 -1
- package/src/base_node_private.ts +163 -139
- package/src/check_value_rank_compatibility.ts +1 -1
- package/src/event_data.ts +57 -54
- package/src/ua_object_impl.ts +51 -22
- package/src/ua_object_type_impl.ts +3 -3
- package/src/ua_variable_impl.ts +79 -2
package/dist/src/event_data.js
CHANGED
|
@@ -1,60 +1,65 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EventData = void 0;
|
|
4
2
|
/**
|
|
5
3
|
* @module node-opcua-address-space.Private
|
|
6
4
|
*/
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.EventData = void 0;
|
|
7
7
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
8
8
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
9
9
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
10
10
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
11
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
12
11
|
const node_opcua_utils_1 = require("node-opcua-utils");
|
|
12
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
13
13
|
/**
|
|
14
14
|
*/
|
|
15
15
|
class EventData {
|
|
16
16
|
eventId;
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
#eventDataSource;
|
|
18
|
+
#cache;
|
|
19
19
|
constructor(eventTypeNode) {
|
|
20
|
-
this
|
|
20
|
+
this.#cache = {
|
|
21
21
|
__values: {},
|
|
22
22
|
__nodeIdToNode: {},
|
|
23
23
|
__pathToNodeId: {},
|
|
24
24
|
__nodeIdToFullPath: {}
|
|
25
25
|
};
|
|
26
26
|
this.eventId = new node_opcua_nodeid_1.NodeId();
|
|
27
|
-
this
|
|
27
|
+
this.#eventDataSource = eventTypeNode;
|
|
28
|
+
}
|
|
29
|
+
getEventDataSource() {
|
|
30
|
+
return this.#eventDataSource;
|
|
28
31
|
}
|
|
29
32
|
_createValue(fullBrowsePath, node, variant) {
|
|
30
33
|
const eventData = this;
|
|
31
|
-
(0, node_opcua_assert_1.assert)(!eventData[fullBrowsePath],
|
|
34
|
+
(0, node_opcua_assert_1.assert)(!eventData[fullBrowsePath], `already exists ${fullBrowsePath}`);
|
|
32
35
|
const lowerName = fullBrowsePath.split(".").map(node_opcua_utils_1.lowerFirstLetter).join(".");
|
|
33
36
|
eventData[lowerName] = node_opcua_variant_1.Variant.coerce(variant);
|
|
34
|
-
this
|
|
35
|
-
this
|
|
36
|
-
this
|
|
37
|
-
this
|
|
37
|
+
this.#cache.__pathToNodeId[fullBrowsePath] = node.nodeId;
|
|
38
|
+
this.#cache.__nodeIdToNode[node.nodeId.toString()] = node;
|
|
39
|
+
this.#cache.__nodeIdToFullPath[node.nodeId.toString()] = fullBrowsePath;
|
|
40
|
+
this.#cache.__values[node.nodeId.toString()] = eventData[lowerName];
|
|
38
41
|
}
|
|
39
42
|
_browse(browsePath) {
|
|
40
|
-
if (!(0, node_opcua_nodeid_1.sameNodeId)(browsePath.startingNode, this
|
|
43
|
+
if (!(0, node_opcua_nodeid_1.sameNodeId)(browsePath.startingNode, this.#eventDataSource.nodeId)) {
|
|
41
44
|
return null;
|
|
42
45
|
}
|
|
43
|
-
const fullBrowsePath = (browsePath.relativePath.elements || []).map((b => b.targetName.toString())
|
|
44
|
-
const nodeId = this
|
|
46
|
+
const fullBrowsePath = (browsePath.relativePath.elements || []).map((b) => b.targetName.toString()).join(".");
|
|
47
|
+
const nodeId = this.#cache.__pathToNodeId[fullBrowsePath];
|
|
45
48
|
if (!nodeId)
|
|
46
49
|
return null;
|
|
47
50
|
return new node_opcua_types_1.BrowsePathResult({
|
|
48
51
|
statusCode: node_opcua_status_code_1.StatusCodes.Good,
|
|
49
|
-
targets: [
|
|
52
|
+
targets: [
|
|
53
|
+
{
|
|
50
54
|
remainingPathIndex: 0,
|
|
51
|
-
targetId: (0, node_opcua_nodeid_1.coerceExpandedNodeId)(nodeId)
|
|
52
|
-
}
|
|
55
|
+
targetId: (0, node_opcua_nodeid_1.coerceExpandedNodeId)(nodeId)
|
|
56
|
+
}
|
|
57
|
+
]
|
|
53
58
|
});
|
|
54
59
|
}
|
|
55
60
|
_readValue(nodeId) {
|
|
56
61
|
const key = nodeId.toString();
|
|
57
|
-
const cached_value = this
|
|
62
|
+
const cached_value = this.#cache.__values[key];
|
|
58
63
|
if (cached_value) {
|
|
59
64
|
return cached_value;
|
|
60
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event_data.js","sourceRoot":"","sources":["../../src/event_data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event_data.js","sourceRoot":"","sources":["../../src/event_data.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAGH,yDAA2C;AAC3C,yDAA6E;AAC7E,mEAAqD;AACrD,uDAAqE;AACrE,uDAAoD;AACpD,2DAA+D;AAK/D;GACG;AACH,MAAa,SAAS;IACb,OAAO,CAAS;IACvB,gBAAgB,CAAW;IAC3B,MAAM,CAKJ;IAEF,YAAY,aAAuB;QACjC,IAAI,CAAC,MAAM,GAAG;YACZ,QAAQ,EAAE,EAAE;YACZ,cAAc,EAAE,EAAE;YAClB,cAAc,EAAE,EAAE;YAClB,kBAAkB,EAAE,EAAE;SACvB,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,0BAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC;IACxC,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IACM,YAAY,CAAC,cAAsB,EAAE,IAAc,EAAE,OAAoB;QAC9E,MAAM,SAAS,GAAG,IAA+B,CAAC;QAClD,IAAA,0BAAM,EAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,kBAAkB,cAAc,EAAE,CAAC,CAAC;QAEvE,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,mCAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE5E,SAAS,CAAC,SAAS,CAAC,GAAG,4BAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,cAAc,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,CAAY,CAAC;IACjF,CAAC;IAEM,OAAO,CAAC,UAAsB;QACnC,IAAI,CAAC,IAAA,8BAAU,EAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YACvE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9G,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,OAAO,IAAI,mCAAgB,CAAC;YAC1B,UAAU,EAAE,oCAAW,CAAC,IAAI;YAC5B,OAAO,EAAE;gBACP;oBACE,kBAAkB,EAAE,CAAC;oBACrB,QAAQ,EAAE,IAAA,wCAAoB,EAAC,MAAM,CAAC;iBACvC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAEM,UAAU,CAAC,MAAc;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,8BAiEC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { NodeClass, QualifiedNameLike, QualifiedNameOptions } from "node-opcua-data-model";
|
|
1
|
+
import { NodeClass, type QualifiedNameLike, type QualifiedNameOptions } from "node-opcua-data-model";
|
|
2
2
|
import { AttributeIds } from "node-opcua-data-model";
|
|
3
3
|
import { DataValue } from "node-opcua-data-value";
|
|
4
|
-
import { NumericRange } from "node-opcua-numeric-range";
|
|
5
|
-
import { EventTypeLike, RaiseEventData, ISessionContext, UAMethod, UAObject, UAObjectType, CloneOptions, CloneFilter, CloneExtraInfo, BaseNode, IEventData, EventNotifierFlags } from "node-opcua-address-space-base";
|
|
6
|
-
import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
|
|
7
|
-
import { ConditionRefreshCache } from "./apply_condition_refresh";
|
|
4
|
+
import type { NumericRange } from "node-opcua-numeric-range";
|
|
5
|
+
import { type EventTypeLike, type RaiseEventData, type ISessionContext, type UAMethod, type UAObject, type UAObjectType, type CloneOptions, type CloneFilter, type CloneExtraInfo, type BaseNode, type IEventData, EventNotifierFlags } from "node-opcua-address-space-base";
|
|
6
|
+
import { BaseNodeImpl, type InternalBaseNodeOptions } from "./base_node_impl";
|
|
7
|
+
import { type ConditionRefreshCache } from "./apply_condition_refresh";
|
|
8
8
|
export declare class UAObjectImpl extends BaseNodeImpl implements UAObject {
|
|
9
9
|
private _eventNotifier;
|
|
10
10
|
readonly nodeClass = NodeClass.Object;
|
|
@@ -32,4 +32,5 @@ export declare class UAObjectImpl extends BaseNodeImpl implements UAObject {
|
|
|
32
32
|
_bubble_up_event(eventData: IEventData): void;
|
|
33
33
|
_conditionRefresh(_cache?: ConditionRefreshCache): void;
|
|
34
34
|
toString(): string;
|
|
35
|
+
toJSON(): Record<string, unknown>;
|
|
35
36
|
}
|
|
@@ -116,22 +116,22 @@ class UAObjectImpl extends base_node_impl_1.BaseNodeImpl {
|
|
|
116
116
|
else if (eventType instanceof node_opcua_nodeid_1.NodeId) {
|
|
117
117
|
const eventTypeFound = addressSpace.findNode(eventType);
|
|
118
118
|
if (!eventTypeFound) {
|
|
119
|
-
throw new Error(
|
|
119
|
+
throw new Error(`raiseEvent: eventType cannot find event Type ${eventType.toString()}`);
|
|
120
120
|
}
|
|
121
121
|
eventType = eventTypeFound;
|
|
122
122
|
if (!eventType || eventType.nodeClass !== node_opcua_data_model_1.NodeClass.ObjectType) {
|
|
123
|
-
throw new Error(
|
|
123
|
+
throw new Error(`eventType must exist and be an UAObjectType: ${eventType.toString()}`);
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
eventType = eventType;
|
|
127
127
|
let eventTypeNode = eventType;
|
|
128
128
|
// c8 ignore next
|
|
129
129
|
if (!eventTypeNode) {
|
|
130
|
-
throw new Error(
|
|
130
|
+
throw new Error(`UAObject#raiseEventType : Cannot find event type : ${eventType.toString()}`);
|
|
131
131
|
}
|
|
132
132
|
// coerce EventType
|
|
133
133
|
eventTypeNode = addressSpace.findEventType(eventType);
|
|
134
|
-
const
|
|
134
|
+
const _baseEventType = addressSpace.findEventType("BaseEventType");
|
|
135
135
|
data.$eventDataSource = eventTypeNode;
|
|
136
136
|
data.sourceNode = data.sourceNode || { dataType: node_opcua_variant_1.DataType.NodeId, value: this.nodeId };
|
|
137
137
|
const eventData1 = addressSpace.constructEventData(eventTypeNode, data);
|
|
@@ -181,6 +181,32 @@ class UAObjectImpl extends base_node_impl_1.BaseNodeImpl {
|
|
|
181
181
|
base_node_private_1.UAObject_toString.call(this, options);
|
|
182
182
|
return options.toString();
|
|
183
183
|
}
|
|
184
|
+
toJSON() {
|
|
185
|
+
return {
|
|
186
|
+
...super.toJSON(),
|
|
187
|
+
typeDefinition: this.typeDefinitionObj ? this.typeDefinitionObj.browseName.toString() : undefined,
|
|
188
|
+
eventNotifier: this._eventNotifier
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
[Symbol.for("nodejs.util.inspect.custom")](depth, inspectOptions) {
|
|
192
|
+
const c = inspectOptions?.colors === false ? plainChalk : chalk_1.default;
|
|
193
|
+
const typeName = this.typeDefinitionObj?.browseName.toString() ?? "?";
|
|
194
|
+
const displayName = this.displayName.length ? this.displayName.map((d) => d.text).join(" | ") : "";
|
|
195
|
+
if (depth !== null && depth <= 0) {
|
|
196
|
+
return `${c.cyan("UAObject<")}${c.green(this.browseName.toString())}${c.grey(` ${this.nodeId.toString()}`)}${c.cyan(">")}`;
|
|
197
|
+
}
|
|
198
|
+
const lines = [
|
|
199
|
+
`${c.cyan("UAObject ")}${c.green(this.browseName.toString())}${c.grey(` ${this.nodeId.toString()}`)}`,
|
|
200
|
+
c.yellow(" typeDefinition : ") + typeName,
|
|
201
|
+
c.yellow(" displayName : ") + displayName,
|
|
202
|
+
c.yellow(" eventNotifier : ") + this._eventNotifier
|
|
203
|
+
];
|
|
204
|
+
if (this.description?.text) {
|
|
205
|
+
lines.push(c.yellow(" description : ") + this.description.text);
|
|
206
|
+
}
|
|
207
|
+
return lines.join("\n");
|
|
208
|
+
}
|
|
184
209
|
}
|
|
185
210
|
exports.UAObjectImpl = UAObjectImpl;
|
|
211
|
+
const plainChalk = new Proxy(chalk_1.default, { get: () => (s) => s });
|
|
186
212
|
//# sourceMappingURL=ua_object_impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_object_impl.js","sourceRoot":"","sources":["../../src/ua_object_impl.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,kDAA0B;AAE1B,yDAA2C;AAC3C,mEAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"ua_object_impl.js","sourceRoot":"","sources":["../../src/ua_object_impl.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,kDAA0B;AAE1B,yDAA2C;AAC3C,mEAAqD;AACrD,iEAAqG;AACrG,iEAAqD;AACrD,iEAAsE;AACtE,+DAAuD;AACvD,yDAA2C;AAE3C,mEAAqD;AACrD,2DAA8C;AAC9C,iFAgBuC;AACvC,uDAAiD;AAEjD,qDAA8E;AAC9E,2DAAiF;AACjF,uEAAgG;AAEhG,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C,MAAa,YAAa,SAAQ,6BAAY;IAClC,cAAc,CAAqB;IAC3B,SAAS,GAAG,iCAAS,CAAC,MAAM,CAAC;IAC7C,IAAW,aAAa;QAEpB,yDAAyD;QAEzD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,oCAAoC;YACpC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,GAAG,kDAAkB,CAAC,iBAAiB,CAAC;YACrF,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACe,YAAY,CAAgB;IAE5C,IAAI,iBAAiB;QACjB,iBAAiB;QACjB,IAAI,KAAK,CAAC,iBAAiB,CAAC,SAAS,KAAK,iCAAS,CAAC,UAAU,EAAE,CAAC;YAC7D,MAAM,GAAG,GAAG,mEACR,iCAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAC/C,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5D,QAAQ,CAAC,GAAG,CAAC,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,KAAK,CAAC,iBAAiC,CAAC;IACnD,CAAC;IAED,YAAY,OAA2F;QACnG,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,IAAI,kDAAkB,CAAC,IAAI,CAAC;QACvE,IAAA,0BAAM,EAAC,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ,IAAI,IAAA,oCAAW,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC;IACrD,CAAC;IAEM,aAAa,CAChB,OAA+B,EAC/B,WAAyB,EACzB,UAAyB,EACzB,YAAuC;QAEvC,UAAU,CAAC;QACX,YAAY,CAAC;QACb,MAAM,GAAG,GAAG,IAAA,sCAAe,GAAE,CAAC;QAC9B,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,QAAQ,WAAW,EAAE,CAAC;YAClB,KAAK,oCAAY,CAAC,aAAa;gBAC3B,IAAA,0BAAM,EAAC,IAAA,oCAAW,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;gBACxC,OAAO,CAAC,KAAK,GAAG,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvE,OAAO,CAAC,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC;gBACxC,OAAO,CAAC,iBAAiB,GAAG,GAAG,CAAC,WAAW,CAAC;gBAC5C,OAAO,CAAC,UAAU,GAAG,oCAAW,CAAC,IAAI,CAAC;gBACtC,MAAM;YACV;gBACI,OAAO,6BAAY,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO,IAAI,iCAAS,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,OAAqB,EAAE,cAA4B,EAAE,SAA0B;QACxF,OAAO,GAAG;YACN,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,SAAS;YAC5C,GAAG,OAAO;SACb,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,0BAAM,EACtB,IAAI,EACJ,YAAY,EACZ,OAAO,EACP,cAAc,IAAI,kDAAkB,EACpC,SAAS,IAAI,IAAA,yDAAyB,EAAC,IAAI,CAAC,CACnC,CAAC;QACd,6CAA6C;QAC7C,2CAA2C;QAC3C,OAAO,WAAW,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACxC,CAAC;IAIM,eAAe,CAAC,UAA6B,EAAE,cAAuB;QACzE,OAAO,KAAK,CAAC,eAAe,CAAC,UAAiB,EAAE,cAAc,CAAC,CAAC;IACpE,CAAC;IAEM,UAAU;QACb,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC;IAC9B,CAAC;IAEM,gBAAgB,CAAC,kBAAsC;QAC1D,IAAI,CAAC,cAAc,GAAG,kBAAkB,CAAC;IAC7C,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,SAAmC,EAAE,IAAoB;QACvE,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAEvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC7D,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,SAAS,GAAG,cAAc,CAAC;YAC3B,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,KAAK,iCAAS,CAAC,UAAU,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACnE,CAAC;QACL,CAAC;aAAM,IAAI,SAAS,YAAY,0BAAM,EAAE,CAAC;YACrC,MAAM,cAAc,GAAG,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAa,CAAC;YACpE,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,gDAAgD,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,SAAS,GAAG,cAAe,CAAC;YAC5B,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,KAAK,iCAAS,CAAC,UAAU,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,gDAAgD,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC5F,CAAC;QACL,CAAC;QAED,SAAS,GAAG,SAAwB,CAAC;QAErC,IAAI,aAAa,GAAgB,SAAwB,CAAC;QAC1D,iBAAiB;QACjB,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,sDAAsD,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAClG,CAAC;QAED,mBAAmB;QACnB,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAwB,CAAgB,CAAC;QACpF,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAEnE,IAAI,CAAC,gBAAgB,GAAE,aAAa,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QAEvF,MAAM,UAAU,GAAG,YAAY,CAAC,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAExE,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAEM,gBAAgB,CAAC,SAAqB;QACzC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAEvC,MAAM,KAAK,GAAU,EAAE,CAAC;QACxB,+CAA+C;QAC/C,MAAM,CAAC,GAAQ,EAAE,CAAC;QAElB,+CAA+C;QAC/C,wBAAwB;QACxB,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAa,CAAC;QAE3D,IAAI,MAAM,EAAE,CAAC;YACT,IAAA,0BAAM,EAAC,MAAM,CAAC,aAAa,GAAG,IAAI,EAAE,kCAAkC,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAChC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,MAAM,CAAC;QACzC,CAAC;aAAM,CAAC;YACJ,QAAQ,CACJ,eAAK,CAAC,MAAM,CAAC,WAAW,CAAC;gBACrB,eAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC;gBACjC,eAAK,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAC9D,CAAC;QACN,CAAC;QAED,UAAU,CAAC,IAAI,CAAC,CAAC;QAEjB,SAAS,UAAU,CAAC,GAAa;YAC7B,MAAM,GAAG,GAAW,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBACV,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBACb,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;YACxB,iBAAiB;YACjB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE7B,MAAM,SAAS,GAAG,GAAG,CAAC,sBAAsB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACnE,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAE9B,MAAM,SAAS,GAAG,GAAG,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACtE,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;IACL,CAAC;IACM,iBAAiB,CAAC,MAA8B;QACnD,iDAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEM,QAAQ;QACX,MAAM,OAAO,GAAG,IAAI,mCAAe,EAAE,CAAC;QACtC,qCAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAEM,MAAM;QACT,OAAO;YACH,GAAG,KAAK,CAAC,MAAM,EAAE;YACjB,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;YACjG,aAAa,EAAE,IAAI,CAAC,cAAc;SACrC,CAAC;IACN,CAAC;IAEM,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC,KAAoB,EAAE,cAAoC;QACxG,MAAM,CAAC,GAAG,cAAc,EAAE,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,eAAK,CAAC;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC;QACtE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnG,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/H,CAAC;QACD,MAAM,KAAK,GAAG;YACV,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;YACrG,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,QAAQ;YAC1C,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,WAAW;YAC7C,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,cAAc;SACxD,CAAC;QACF,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CACJ;AAtOD,oCAsOC;AAED,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,eAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAiB,CAAC"}
|
|
@@ -87,8 +87,8 @@ class UAObjectTypeImpl extends base_node_impl_1.BaseNodeImpl {
|
|
|
87
87
|
(0, node_opcua_assert_1.assert)(!this.isAbstract, "cannot instantiate abstract UAObjectType");
|
|
88
88
|
(0, node_opcua_assert_1.assert)(options, "missing option object");
|
|
89
89
|
(0, node_opcua_assert_1.assert)(typeof options.browseName === "string" || (options.browseName !== null && typeof options.browseName === "object"), "expecting a browse name");
|
|
90
|
-
(0, node_opcua_assert_1.assert)(!Object.
|
|
91
|
-
(0, node_opcua_assert_1.assert)(!Object.
|
|
90
|
+
(0, node_opcua_assert_1.assert)(!Object.hasOwn(options, "propertyOf"), "an Object shall not be a PropertyOf an other object");
|
|
91
|
+
(0, node_opcua_assert_1.assert)(!Object.hasOwn(options, "optional"), "do you mean optionals ?");
|
|
92
92
|
(0, ua_variable_type_impl_1.assertUnusedChildBrowseName)(addressSpace, options);
|
|
93
93
|
const baseObjectType = addressSpace.findObjectType("BaseObjectType");
|
|
94
94
|
(0, node_opcua_assert_1.assert)(baseObjectType, "BaseObjectType must be defined in the address space");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_object_type_impl.js","sourceRoot":"","sources":["../../src/ua_object_type_impl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,iEAAkD;AAClD,iEAAqD;AACrD,iEAAiE;AAEjE,mEAAqD;AACrD,uDAAqD;AACrD,2DAA8C;AAU9C,+DAA2D;AAC3D,qDAAgD;AAChD,2DAA6E;AAC7E,yDAA4F;AAE5F,mEAGiC;AAEjC,iEAA8E;AAE9E,MAAa,gBAAiB,SAAQ,6BAAY;IAC9B,SAAS,GAAG,iCAAS,CAAC,UAAU,CAAC;IACjC,UAAU,CAAU;IACpC;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,IAAW,SAAS;QAChB,OAAO,gCAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAGD,IAAW,YAAY;QACnB,OAAO,mCAAgB,CAAC,IAAI,CAAC,IAAI,CAAwB,CAAC;IAC9D,CAAC;IAGM,WAAW,GAAG,IAAA,wCAAqB,EAAe,gBAAgB,CAAC,CAAC;IAC3E,6CAA6C;IACtC,aAAa,GAAG,IAAA,wCAAqB,EAAe,gBAAgB,CAAC,CAAC;IAE7E,YAAY,OAAY;QACpB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,IAAA,oCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IACzF,CAAC;IAEM,aAAa,CAAC,OAAwB,EAAE,WAAyB;QACpE,IAAA,0BAAM,EAAC,OAAO,YAAY,gCAAc,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,QAAQ,WAAW,EAAE,CAAC;YAClB,KAAK,oCAAY,CAAC,UAAU;gBACxB,OAAO,CAAC,KAAK,GAAG;oBACZ,QAAQ,EAAE,6BAAQ,CAAC,OAAO;oBAC1B,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU;iBAC3B,CAAC;gBACF,OAAO,CAAC,UAAU,GAAG,oCAAW,CAAC,IAAI,CAAC;gBACtC,MAAM;YACV;gBACI,OAAO,6BAAY,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,IAAI,iCAAS,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACI,WAAW,CAAC,OAAiC;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAmC,CAAC;QAC9D,IAAA,0BAAM,EAAC,CAAC,IAAI,CAAC,UAAU,EAAE,0CAA0C,CAAC,CAAC;QAErE,IAAA,0BAAM,EAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;QACzC,IAAA,0BAAM,EACF,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,EACjH,yBAAyB,CAC5B,CAAC;QAEF,IAAA,0BAAM,EAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ua_object_type_impl.js","sourceRoot":"","sources":["../../src/ua_object_type_impl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,iEAAkD;AAClD,iEAAqD;AACrD,iEAAiE;AAEjE,mEAAqD;AACrD,uDAAqD;AACrD,2DAA8C;AAU9C,+DAA2D;AAC3D,qDAAgD;AAChD,2DAA6E;AAC7E,yDAA4F;AAE5F,mEAGiC;AAEjC,iEAA8E;AAE9E,MAAa,gBAAiB,SAAQ,6BAAY;IAC9B,SAAS,GAAG,iCAAS,CAAC,UAAU,CAAC;IACjC,UAAU,CAAU;IACpC;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,IAAW,SAAS;QAChB,OAAO,gCAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAGD,IAAW,YAAY;QACnB,OAAO,mCAAgB,CAAC,IAAI,CAAC,IAAI,CAAwB,CAAC;IAC9D,CAAC;IAGM,WAAW,GAAG,IAAA,wCAAqB,EAAe,gBAAgB,CAAC,CAAC;IAC3E,6CAA6C;IACtC,aAAa,GAAG,IAAA,wCAAqB,EAAe,gBAAgB,CAAC,CAAC;IAE7E,YAAY,OAAY;QACpB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,IAAA,oCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IACzF,CAAC;IAEM,aAAa,CAAC,OAAwB,EAAE,WAAyB;QACpE,IAAA,0BAAM,EAAC,OAAO,YAAY,gCAAc,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,QAAQ,WAAW,EAAE,CAAC;YAClB,KAAK,oCAAY,CAAC,UAAU;gBACxB,OAAO,CAAC,KAAK,GAAG;oBACZ,QAAQ,EAAE,6BAAQ,CAAC,OAAO;oBAC1B,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU;iBAC3B,CAAC;gBACF,OAAO,CAAC,UAAU,GAAG,oCAAW,CAAC,IAAI,CAAC;gBACtC,MAAM;YACV;gBACI,OAAO,6BAAY,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,IAAI,iCAAS,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACI,WAAW,CAAC,OAAiC;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAmC,CAAC;QAC9D,IAAA,0BAAM,EAAC,CAAC,IAAI,CAAC,UAAU,EAAE,0CAA0C,CAAC,CAAC;QAErE,IAAA,0BAAM,EAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;QACzC,IAAA,0BAAM,EACF,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,EACjH,yBAAyB,CAC5B,CAAC;QAEF,IAAA,0BAAM,EAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,qDAAqD,CAAC,CAAC;QACrG,IAAA,0BAAM,EAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,yBAAyB,CAAC,CAAC;QAEvE,IAAA,mDAA2B,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC,gBAAgB,CAAiB,CAAC;QACrF,IAAA,0BAAM,EAAC,cAAc,EAAE,qDAAqD,CAAC,CAAC;QAE9E,MAAM,UAAU,GAAkB,EAAE,CAAC;QAErC,MAAM,sBAAsB,GAAG,IAAA,+DAAuC,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAE9F,MAAM,IAAI,GAAqB;YAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;YACtC,WAAW,EAAE,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW;YAChG,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU;YAEV,cAAc,EAAE,IAAI,CAAC,MAAM;YAE3B,MAAM,EAAE,OAAO,CAAC,MAAM;YAEtB,aAAa,EAAE,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa;YAE9E,aAAa,EAAE,OAAO,CAAC,aAAa;SACvC,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC;QAE3E,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,KAAK,CAAC;QACnE,IAAA,2DAAoC,EAChC,QAAQ,EAAE,cAAc,EAAE,IAAI,EAC9B,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAErE,IAAA,0BAAM,EAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtE,QAAQ,CAAC,wBAAwB,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,QAAQ;QACX,MAAM,OAAO,GAAG,IAAI,mCAAe,EAAE,CAAC;QACtC,yCAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;CACJ;AA5ID,4CA4IC"}
|
|
@@ -329,6 +329,7 @@ export declare class UAVariableImpl extends BaseNodeImpl implements UAVariable {
|
|
|
329
329
|
}): ExtensionObject;
|
|
330
330
|
incrementExtensionObjectPartial(path: string | string[]): void;
|
|
331
331
|
toString(): string;
|
|
332
|
+
toJSON(): Record<string, unknown>;
|
|
332
333
|
historyRead(context: ISessionContext, historyReadDetails: HistoryReadDetails | ReadRawModifiedDetails | ReadEventDetails | ReadProcessedDetails | ReadAtTimeDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData): Promise<HistoryReadResult>;
|
|
333
334
|
historyRead(context: ISessionContext, historyReadDetails: HistoryReadDetails | ReadRawModifiedDetails | ReadEventDetails | ReadProcessedDetails | ReadAtTimeDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData, callback: CallbackT<HistoryReadResult>): void;
|
|
334
335
|
_historyReadRaw(context: ISessionContext, historyReadRawModifiedDetails: ReadRawModifiedDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData, callback: CallbackT<HistoryReadResult>): void;
|
|
@@ -40,6 +40,7 @@ const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
|
40
40
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
|
|
41
41
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
42
42
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
43
|
+
const plainChalk = new Proxy(chalk_1.default, { get: () => (s) => s });
|
|
43
44
|
function adjust_accessLevel(accessLevel) {
|
|
44
45
|
accessLevel = (0, node_opcua_utils_1.isNullOrUndefined)(accessLevel) ? "CurrentRead | CurrentWrite" : accessLevel;
|
|
45
46
|
accessLevel = (0, node_opcua_data_model_1.makeAccessLevelFlag)(accessLevel);
|
|
@@ -138,7 +139,10 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
|
|
|
138
139
|
// this could happen in faulty external nodeset and has been seen once
|
|
139
140
|
// in an nano server
|
|
140
141
|
warningLog(super.typeDefinitionObj.toString());
|
|
141
|
-
|
|
142
|
+
const baseVariableType = this.addressSpace.findVariableType("BaseVariableType");
|
|
143
|
+
if (!baseVariableType)
|
|
144
|
+
throw new Error("Cannot find BaseVariableType in address space");
|
|
145
|
+
return baseVariableType;
|
|
142
146
|
}
|
|
143
147
|
return super.typeDefinitionObj;
|
|
144
148
|
}
|
|
@@ -1229,6 +1233,80 @@ class UAVariableImpl extends base_node_impl_1.BaseNodeImpl {
|
|
|
1229
1233
|
base_node_private_1.UAVariable_toString.call(this, options);
|
|
1230
1234
|
return options.toString();
|
|
1231
1235
|
}
|
|
1236
|
+
toJSON() {
|
|
1237
|
+
let value;
|
|
1238
|
+
let statusCode;
|
|
1239
|
+
try {
|
|
1240
|
+
const dv = this.$dataValue;
|
|
1241
|
+
if (dv) {
|
|
1242
|
+
statusCode = dv.statusCode?.toString();
|
|
1243
|
+
if (dv.value && !(dv.value.value instanceof node_opcua_extension_object_1.OpaqueStructure)) {
|
|
1244
|
+
value = dv.value.value;
|
|
1245
|
+
}
|
|
1246
|
+
}
|
|
1247
|
+
}
|
|
1248
|
+
catch {
|
|
1249
|
+
// ignore — value access may fail for bound variables
|
|
1250
|
+
}
|
|
1251
|
+
return {
|
|
1252
|
+
...super.toJSON(),
|
|
1253
|
+
typeDefinition: this.typeDefinitionObj?.browseName.toString(),
|
|
1254
|
+
dataType: this.dataType?.toString(),
|
|
1255
|
+
valueRank: this.valueRank,
|
|
1256
|
+
arrayDimensions: this.arrayDimensions,
|
|
1257
|
+
accessLevel: node_opcua_data_model_1.AccessLevelFlag[this.accessLevel],
|
|
1258
|
+
statusCode,
|
|
1259
|
+
value
|
|
1260
|
+
};
|
|
1261
|
+
}
|
|
1262
|
+
[Symbol.for("nodejs.util.inspect.custom")](depth, inspectOptions) {
|
|
1263
|
+
const c = inspectOptions?.colors === false ? plainChalk : chalk_1.default;
|
|
1264
|
+
const typeName = this.typeDefinitionObj?.browseName.toString() ?? "?";
|
|
1265
|
+
const displayName = this.displayName.length ? this.displayName.map((d) => d.text).join(" | ") : "";
|
|
1266
|
+
if (depth !== null && depth <= 0) {
|
|
1267
|
+
return `${c.cyan("UAVariable<")}${c.green(this.browseName.toString())}${c.grey(` ${this.nodeId.toString()}`)}${c.cyan(">")}`;
|
|
1268
|
+
}
|
|
1269
|
+
const dt = this.dataType?.toString() ?? "?";
|
|
1270
|
+
let valueStr = "";
|
|
1271
|
+
let statusStr = "";
|
|
1272
|
+
try {
|
|
1273
|
+
const dv = this.$dataValue;
|
|
1274
|
+
if (dv) {
|
|
1275
|
+
if (dv.statusCode)
|
|
1276
|
+
statusStr = dv.statusCode.toString();
|
|
1277
|
+
if (dv.value && dv.value.value !== undefined && dv.value.value !== null && !(dv.value.value instanceof node_opcua_extension_object_1.OpaqueStructure)) {
|
|
1278
|
+
const v = dv.value.value;
|
|
1279
|
+
valueStr = typeof v === "object" ? Object.prototype.toString.call(v) : String(v);
|
|
1280
|
+
if (valueStr.length > 80)
|
|
1281
|
+
valueStr = `${valueStr.slice(0, 77)}...`;
|
|
1282
|
+
}
|
|
1283
|
+
}
|
|
1284
|
+
}
|
|
1285
|
+
catch {
|
|
1286
|
+
// ignore
|
|
1287
|
+
}
|
|
1288
|
+
const lines = [
|
|
1289
|
+
`${c.cyan("UAVariable ")}${c.green(this.browseName.toString())}${c.grey(` ${this.nodeId.toString()}`)}`,
|
|
1290
|
+
c.yellow(" typeDefinition : ") + typeName,
|
|
1291
|
+
c.yellow(" displayName : ") + displayName,
|
|
1292
|
+
c.yellow(" dataType : ") + dt,
|
|
1293
|
+
c.yellow(" valueRank : ") + (0, base_node_private_1.valueRankToString)(this.valueRank),
|
|
1294
|
+
c.yellow(" accessLevel : ") + node_opcua_data_model_1.AccessLevelFlag[this.accessLevel]
|
|
1295
|
+
];
|
|
1296
|
+
if (this.arrayDimensions?.length) {
|
|
1297
|
+
lines.push(c.yellow(" arrayDimensions: ") + JSON.stringify(this.arrayDimensions));
|
|
1298
|
+
}
|
|
1299
|
+
if (valueStr) {
|
|
1300
|
+
lines.push(c.yellow(" value : ") + valueStr);
|
|
1301
|
+
}
|
|
1302
|
+
if (statusStr && statusStr !== "Good (0x00000000)") {
|
|
1303
|
+
lines.push(c.yellow(" statusCode : ") + statusStr);
|
|
1304
|
+
}
|
|
1305
|
+
if (this.description?.text) {
|
|
1306
|
+
lines.push(c.yellow(" description : ") + this.description.text);
|
|
1307
|
+
}
|
|
1308
|
+
return lines.join("\n");
|
|
1309
|
+
}
|
|
1232
1310
|
historyRead(context, historyReadDetails, indexRange, dataEncoding, continuationData, callback) {
|
|
1233
1311
|
(0, node_opcua_assert_1.assert)(context instanceof session_context_1.SessionContext);
|
|
1234
1312
|
(0, node_opcua_assert_1.assert)(typeof callback === "function");
|