node-opcua-address-space 2.168.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/loader/namespace_post_step.js +25 -17
- package/dist/source/loader/namespace_post_step.js.map +1 -1
- package/dist/source/session_context.d.ts +3 -1
- package/dist/source/session_context.js +26 -1
- package/dist/source/session_context.js.map +1 -1
- 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 +15 -12
- package/dist/src/address_space.js +63 -64
- 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/alarms_and_conditions/ua_condition_impl.js +1 -1
- package/dist/src/alarms_and_conditions/ua_condition_impl.js.map +1 -1
- package/dist/src/base_node_impl.d.ts +1 -0
- package/dist/src/base_node_impl.js +11 -0
- package/dist/src/base_node_impl.js.map +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/namespace_impl.d.ts +2 -0
- package/dist/src/namespace_impl.js +13 -0
- package/dist/src/namespace_impl.js.map +1 -1
- package/dist/src/ua_method_impl.d.ts +11 -9
- package/dist/src/ua_method_impl.js +24 -27
- package/dist/src/ua_method_impl.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 +34 -34
- package/source/loader/namespace_post_step.ts +28 -19
- package/source/session_context.ts +30 -1
- 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 +127 -124
- package/src/alarms_and_conditions/condition_snapshot_impl.ts +3 -3
- package/src/alarms_and_conditions/ua_condition_impl.ts +1 -1
- package/src/base_node_impl.ts +13 -0
- 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/namespace_impl.ts +16 -0
- package/src/ua_method_impl.ts +43 -50
- 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
|
@@ -19,26 +19,34 @@ function parentIsObjectOrVariableType(node) {
|
|
|
19
19
|
}
|
|
20
20
|
async function promoteObjectAndVariablesInNamespace(namespace) {
|
|
21
21
|
const namespaceP = namespace;
|
|
22
|
-
|
|
23
|
-
if (a.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
// c8 ignore next
|
|
36
|
-
if (doDebug) {
|
|
37
|
-
debugLog(`promoting ${a.browseName.toString()} from ${before} to ${after}`);
|
|
38
|
-
}
|
|
22
|
+
const promoteNode = (a) => {
|
|
23
|
+
if (a.typeDefinition) {
|
|
24
|
+
const promoter = exports.g_promotableObject.get(a.typeDefinition.toString());
|
|
25
|
+
if (promoter) {
|
|
26
|
+
if (promoter.onInstanceOnly && parentIsObjectOrVariableType(a)) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const before = a.constructor.name;
|
|
30
|
+
promoter.promoter(a);
|
|
31
|
+
const after = a.constructor.name;
|
|
32
|
+
// c8 ignore next
|
|
33
|
+
if (doDebug) {
|
|
34
|
+
debugLog(`promoting ${a.browseName.toString()} from ${before} to ${after}`);
|
|
39
35
|
}
|
|
40
36
|
}
|
|
41
37
|
}
|
|
38
|
+
};
|
|
39
|
+
// Promote variables first so that TwoStateVariables and other variable types
|
|
40
|
+
// are fully promoted before objects (like StateMachines or Alarms) that contain them.
|
|
41
|
+
for (const a of namespaceP.nodeIterator()) {
|
|
42
|
+
if (a.nodeClass === node_opcua_data_model_1.NodeClass.Variable) {
|
|
43
|
+
promoteNode(a);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
for (const a of namespaceP.nodeIterator()) {
|
|
47
|
+
if (a.nodeClass === node_opcua_data_model_1.NodeClass.Object) {
|
|
48
|
+
promoteNode(a);
|
|
49
|
+
}
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
52
|
async function promoteObjectsAndVariables(addressSpace) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace_post_step.js","sourceRoot":"","sources":["../../../source/loader/namespace_post_step.ts"],"names":[],"mappings":";;;AA6BA,
|
|
1
|
+
{"version":3,"file":"namespace_post_step.js","sourceRoot":"","sources":["../../../source/loader/namespace_post_step.ts"],"names":[],"mappings":";;;AA6BA,oFAkCC;AACD,gEAIC;AApED,iEAAkD;AAClD,uDAAiE;AAKjE,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAI9B,QAAA,kBAAkB,GAM3B,IAAI,GAAG,EAAE,CAAC;AAEd,SAAS,4BAA4B,CAAC,IAA2B;IAC7D,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,iCAAS,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,EAAE,SAAS,KAAK,iCAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QACvH,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,4BAA4B,CAAC,IAAI,CAAC,MAA+B,CAAC,CAAC;AAC9E,CAAC;AAEM,KAAK,UAAU,oCAAoC,CAAC,SAAqB;IAC5E,MAAM,UAAU,GAAG,SAA6B,CAAC;IAEjD,MAAM,WAAW,GAAG,CAAC,CAAwB,EAAE,EAAE;QAC7C,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,0BAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;YACrE,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,QAAQ,CAAC,cAAc,IAAI,4BAA4B,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7D,OAAO;gBACX,CAAC;gBACD,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;gBAElC,QAAQ,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC;gBAC5B,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;gBACjC,iBAAiB;gBACjB,IAAI,OAAO,EAAE,CAAC;oBACV,QAAQ,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,MAAM,OAAO,KAAK,EAAE,CAAC,CAAC;gBAChF,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEF,6EAA6E;IAC7E,sFAAsF;IACtF,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC;QACxC,IAAI,CAAC,CAAC,SAAS,KAAK,iCAAS,CAAC,QAAQ,EAAE,CAAC;YACrC,WAAW,CAAC,CAAe,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC;QACxC,IAAI,CAAC,CAAC,SAAS,KAAK,iCAAS,CAAC,MAAM,EAAE,CAAC;YACnC,WAAW,CAAC,CAAa,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;AACL,CAAC;AACM,KAAK,UAAU,0BAA0B,CAAC,YAA2B;IACxE,KAAK,MAAM,SAAS,IAAI,YAAY,CAAC,iBAAiB,EAAE,EAAE,CAAC;QACvD,oCAAoC,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;AACL,CAAC"}
|
|
@@ -87,7 +87,6 @@ export declare class SessionContext implements ISessionContext {
|
|
|
87
87
|
object: UAObject | UAObjectType | undefined;
|
|
88
88
|
currentTime?: PreciseClock;
|
|
89
89
|
continuationPoints: Buffer[];
|
|
90
|
-
userIdentity?: string;
|
|
91
90
|
readonly session?: ISessionBase;
|
|
92
91
|
readonly server?: IServerBase;
|
|
93
92
|
constructor(options?: SessionContextOptions);
|
|
@@ -102,6 +101,9 @@ export declare class SessionContext implements ISessionContext {
|
|
|
102
101
|
* no certificate is available.
|
|
103
102
|
*/
|
|
104
103
|
get clientApplicationUri(): string | null;
|
|
104
|
+
toJSON(): Record<string, string | null>;
|
|
105
|
+
toString(): string;
|
|
106
|
+
getUserName(): string;
|
|
105
107
|
/**
|
|
106
108
|
* getCurrentUserRoles
|
|
107
109
|
*
|
|
@@ -142,7 +142,6 @@ class SessionContext {
|
|
|
142
142
|
object;
|
|
143
143
|
currentTime;
|
|
144
144
|
continuationPoints = [];
|
|
145
|
-
userIdentity;
|
|
146
145
|
session;
|
|
147
146
|
server;
|
|
148
147
|
constructor(options) {
|
|
@@ -178,6 +177,32 @@ class SessionContext {
|
|
|
178
177
|
return null;
|
|
179
178
|
}
|
|
180
179
|
}
|
|
180
|
+
toJSON() {
|
|
181
|
+
return {
|
|
182
|
+
userName: this.getUserName(),
|
|
183
|
+
clientApplicationUri: this.clientApplicationUri,
|
|
184
|
+
session: this.session ? this.session.getSessionId().toString() : null
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
toString() {
|
|
188
|
+
if (this === SessionContext.defaultContext) {
|
|
189
|
+
return "SessionContext({ default })";
|
|
190
|
+
}
|
|
191
|
+
return `SessionContext({ userName: "${this.getUserName()}", session: ${this.session ? this.session.getSessionId().toString() : "none"} })`;
|
|
192
|
+
}
|
|
193
|
+
[Symbol.for("nodejs.util.inspect.custom")]() {
|
|
194
|
+
return this.toString();
|
|
195
|
+
}
|
|
196
|
+
getUserName() {
|
|
197
|
+
if (!this.session) {
|
|
198
|
+
return "<unknown client user id>";
|
|
199
|
+
}
|
|
200
|
+
const userIdentityToken = this.session.userIdentityToken;
|
|
201
|
+
if (!userIdentityToken) {
|
|
202
|
+
return "<unknown client user id>";
|
|
203
|
+
}
|
|
204
|
+
return getUserName(userIdentityToken);
|
|
205
|
+
}
|
|
181
206
|
/**
|
|
182
207
|
* getCurrentUserRoles
|
|
183
208
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session_context.js","sourceRoot":"","sources":["../../source/session_context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session_context.js","sourceRoot":"","sources":["../../source/session_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
import { UAObject, UAObjectType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
|
|
2
|
-
export declare function
|
|
3
|
-
export declare function implementInterface(uaNode: UAObject | UAObjectType | UAVariable | UAVariableType, interfaceType: UAObjectType): void;
|
|
1
|
+
import type { UAObject, UAObjectType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
|
|
2
|
+
export declare function implementInterface(uaNode: UAObject | UAObjectType | UAVariable | UAVariableType, interfaceType: UAObjectType, optionals?: string[], isModellingType?: boolean): void;
|
|
@@ -1,42 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.implementInterfaceBad = implementInterfaceBad;
|
|
4
3
|
exports.implementInterface = implementInterface;
|
|
5
|
-
const
|
|
4
|
+
const node_opcua_types_1 = require("node-opcua-types");
|
|
6
5
|
const _instantiate_helpers_1 = require("../src/_instantiate_helpers");
|
|
7
|
-
function
|
|
8
|
-
|
|
9
|
-
const tmp = interfaceType.instantiate({
|
|
10
|
-
browseName: uaNode.browseName,
|
|
11
|
-
copyAlsoModellingRules: true,
|
|
12
|
-
copyAlsoAllOptionals: true,
|
|
13
|
-
modellingRule: "Mandatory"
|
|
14
|
-
});
|
|
15
|
-
//
|
|
16
|
-
uaNode.addReference({
|
|
17
|
-
nodeId: interfaceType,
|
|
18
|
-
referenceType: "HasInterface"
|
|
19
|
-
});
|
|
20
|
-
const childrenRef = tmp.findReferencesEx("HasChild", node_opcua_data_model_1.BrowseDirection.Forward);
|
|
21
|
-
// transfer children to uaNode
|
|
22
|
-
for (const childRef of childrenRef) {
|
|
23
|
-
tmp.removeReference({
|
|
24
|
-
nodeId: childRef.nodeId,
|
|
25
|
-
referenceType: childRef.referenceType,
|
|
26
|
-
isForward: childRef.isForward
|
|
27
|
-
});
|
|
28
|
-
uaNode.addReference({
|
|
29
|
-
nodeId: childRef.nodeId,
|
|
30
|
-
referenceType: childRef.referenceType,
|
|
31
|
-
isForward: childRef.isForward
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
addressSpace.deleteNode(tmp);
|
|
35
|
-
}
|
|
36
|
-
function implementInterface(uaNode, interfaceType) {
|
|
6
|
+
function implementInterface(uaNode, interfaceType, optionals, isModellingType) {
|
|
7
|
+
optionals = optionals || [];
|
|
37
8
|
const addressSpace = uaNode.addressSpace;
|
|
38
9
|
const topMost = addressSpace.findObjectType("BaseInterfaceType");
|
|
39
|
-
|
|
10
|
+
if (!topMost) {
|
|
11
|
+
throw new Error("cannot find BaseInterfaceType");
|
|
12
|
+
}
|
|
13
|
+
isModellingType = isModellingType === undefined ? uaNode.nodeClass === node_opcua_types_1.NodeClass.ObjectType || uaNode.nodeClass === node_opcua_types_1.NodeClass.VariableType : isModellingType;
|
|
14
|
+
const copyAlsoModellingRules = isModellingType;
|
|
15
|
+
const copyAlsoAllOptionals = isModellingType;
|
|
16
|
+
(0, _instantiate_helpers_1.initialize_properties_and_components)(uaNode, topMost, interfaceType, copyAlsoModellingRules, copyAlsoAllOptionals, optionals);
|
|
40
17
|
uaNode.addReference({
|
|
41
18
|
nodeId: interfaceType,
|
|
42
19
|
referenceType: "HasInterface"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_interface.js","sourceRoot":"","sources":["../../source/ua_interface.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ua_interface.js","sourceRoot":"","sources":["../../source/ua_interface.ts"],"names":[],"mappings":";;AAIA,gDA8BC;AAjCD,uDAA6C;AAC7C,sEAAmF;AAEnF,SAAgB,kBAAkB,CAC9B,MAA6D,EAC7D,aAA2B,EAC3B,SAAoB,EACpB,eAAyB;IAGzB,SAAS,GAAG,SAAS,IAAI,EAAE,CAAC;IAE5B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IACzC,MAAM,OAAO,GAAG,YAAY,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;IACjE,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC;IAED,eAAe,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,4BAAS,CAAC,UAAU,IAAI,MAAM,CAAC,SAAS,KAAK,4BAAS,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC;IAE7J,MAAM,sBAAsB,GAAG,eAAe,CAAC;IAC/C,MAAM,oBAAoB,GAAG,eAAe,CAAC;IAC7C,IAAA,2DAAoC,EAChC,MAA+B,EAC/B,OAAO,EAAE,aAAa,EACtB,sBAAsB,EACtB,oBAAoB,EACpB,SAAS,CACZ,CAAC;IACF,MAAM,CAAC,YAAY,CAAC;QAChB,MAAM,EAAE,aAAa;QACrB,aAAa,EAAE,cAAc;KAChC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { UAMethod, UAObject, UAObjectType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
|
|
1
|
+
import { type UAMethod, type UAObject, type UAObjectType, type UAVariable, type UAVariableType } from "node-opcua-address-space-base";
|
|
2
2
|
export declare function initialize_properties_and_components<B extends UAObject | UAVariable | UAMethod, T extends UAVariableType | UAObjectType>(instance: B, topMostType: T, nodeType: T, copyAlsoModellingRules: boolean, copyAlsoAllOptionals: boolean, optionals?: string[]): void;
|
|
@@ -14,14 +14,15 @@ const node_opcua_address_space_base_1 = require("node-opcua-address-space-base")
|
|
|
14
14
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
15
15
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
16
16
|
const make_optionals_map_1 = require("../source/helpers/make_optionals_map");
|
|
17
|
-
const base_node_private_1 = require("./base_node_private");
|
|
18
17
|
const _mandatory_child_or_requested_optional_filter_1 = require("./_mandatory_child_or_requested_optional_filter");
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const
|
|
18
|
+
const base_node_private_1 = require("./base_node_private");
|
|
19
|
+
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
20
|
+
// const debugLog = make_debugLog("INSTANTIATE");
|
|
21
|
+
// const doDebug = checkDebugFlag("INSTANTIATE");
|
|
22
|
+
const warningLog = (0, node_opcua_debug_1.make_warningLog)("INSTANTIATE");
|
|
23
|
+
const errorLog = (0, node_opcua_debug_1.make_errorLog)("INSTANTIATE");
|
|
23
24
|
// eslint-disable-next-line prefer-const
|
|
24
|
-
|
|
25
|
+
const doTrace = (0, node_opcua_debug_1.checkDebugFlag)("INSTANTIATE");
|
|
25
26
|
const traceLog = errorLog;
|
|
26
27
|
// install properties and components on a instantiated Object
|
|
27
28
|
//
|
|
@@ -37,7 +38,7 @@ function _initialize_properties_and_components(instance, topMostType, typeDefini
|
|
|
37
38
|
warningLog("typeNode =", typeDefinitionNode.browseName.toString());
|
|
38
39
|
warningLog("optionalsMap =", Object.keys(optionalsMap).join(" "));
|
|
39
40
|
const c = typeDefinitionNode.findReferencesEx("Aggregates");
|
|
40
|
-
warningLog("typeDefinition aggregates =", c.map((x) => x.node
|
|
41
|
+
warningLog("typeDefinition aggregates =", c.map((x) => x.node?.browseName.toString()).join(" "));
|
|
41
42
|
}
|
|
42
43
|
optionalsMap = optionalsMap || {};
|
|
43
44
|
if ((0, node_opcua_nodeid_1.sameNodeId)(topMostType.nodeId, typeDefinitionNode.nodeId)) {
|
|
@@ -45,13 +46,13 @@ function _initialize_properties_and_components(instance, topMostType, typeDefini
|
|
|
45
46
|
}
|
|
46
47
|
const filter = new _mandatory_child_or_requested_optional_filter_1.MandatoryChildOrRequestedOptionalFilter(instance, copyAlsoAllOptionals, optionalsMap);
|
|
47
48
|
doTrace &&
|
|
48
|
-
traceLog(chalk_1.default.cyan(extraInfo.pad(), "cloning relevant member of typeDefinition class"), typeDefinitionNode.browseName.toString()
|
|
49
|
+
traceLog(chalk_1.default.cyan(extraInfo.pad(), "cloning relevant member of typeDefinition class"), `${typeDefinitionNode.browseName.toString()}\n optionals${JSON.stringify(optionalsMap)}`);
|
|
49
50
|
(0, base_node_private_1._clone_hierarchical_references)(typeDefinitionNode, instance, copyAlsoModellingRules, filter, extraInfo, browseNameMap);
|
|
50
51
|
// now apply recursion on baseTypeDefinition to get properties and components from base class
|
|
51
52
|
const baseTypeDefinitionNodeId = typeDefinitionNode.subtypeOf;
|
|
52
53
|
const baseTypeDefinition = typeDefinitionNode.subtypeOfObj;
|
|
53
54
|
doTrace &&
|
|
54
|
-
traceLog(chalk_1.default.cyan(extraInfo.pad(), "now apply recursion on baseTypeDefinition to get properties and components from base class"), baseTypeDefinition.browseName.toString());
|
|
55
|
+
traceLog(chalk_1.default.cyan(extraInfo.pad(), "now apply recursion on baseTypeDefinition to get properties and components from base class"), baseTypeDefinition ? baseTypeDefinition.browseName.toString() : "undefined");
|
|
55
56
|
// c8 ignore next
|
|
56
57
|
if (!baseTypeDefinition) {
|
|
57
58
|
throw new Error(chalk_1.default.red("Cannot find object with nodeId ") + baseTypeDefinitionNodeId);
|
|
@@ -73,7 +74,29 @@ function initialize_properties_and_components(instance, topMostType, nodeType, c
|
|
|
73
74
|
const optionalsMap = (0, make_optionals_map_1.makeOptionalsMap)(optionals);
|
|
74
75
|
const browseNameMap = new Set();
|
|
75
76
|
_initialize_properties_and_components(instance, topMostType, nodeType, copyAlsoModellingRules, copyAlsoAllOptionals, optionalsMap, extraInfo, browseNameMap);
|
|
77
|
+
// instantiate optionals from interfaces
|
|
78
|
+
instantiate_interface_children(nodeType, extraInfo, instance, copyAlsoModellingRules, copyAlsoAllOptionals, optionalsMap, browseNameMap);
|
|
76
79
|
(0, node_opcua_address_space_base_1.reconstructFunctionalGroupType)(extraInfo);
|
|
77
80
|
(0, node_opcua_address_space_base_1.reconstructNonHierarchicalReferences)(extraInfo);
|
|
78
81
|
}
|
|
82
|
+
function instantiate_interface_children(nodeType, extraInfo, instance, copyAlsoModellingRules, copyAlsoAllOptionals, optionalsMap, browseNameMap) {
|
|
83
|
+
const interfaces = nodeType.findReferencesEx((0, node_opcua_nodeid_1.resolveNodeId)("HasInterface"), node_opcua_data_model_1.BrowseDirection.Forward);
|
|
84
|
+
if (interfaces.length === 0) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
for (const reference of interfaces) {
|
|
88
|
+
const interfaceType = reference.node || nodeType.addressSpace.findObjectType(reference.nodeId);
|
|
89
|
+
if (!interfaceType) {
|
|
90
|
+
warningLog(" cannot find node ", reference.nodeId.toString());
|
|
91
|
+
continue;
|
|
92
|
+
}
|
|
93
|
+
const topMostTypeBaseInterface = nodeType.addressSpace.findObjectType("BaseInterfaceType");
|
|
94
|
+
if (!topMostTypeBaseInterface) {
|
|
95
|
+
throw new Error("cannot find BaseInterfaceType");
|
|
96
|
+
}
|
|
97
|
+
doTrace &&
|
|
98
|
+
traceLog(chalk_1.default.cyan(extraInfo.pad(), "instantiating optionals from interface"), `${interfaceType.browseName.toString()}`);
|
|
99
|
+
_initialize_properties_and_components(instance, topMostTypeBaseInterface, interfaceType, copyAlsoModellingRules, copyAlsoAllOptionals, optionalsMap, extraInfo, browseNameMap);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
79
102
|
//# sourceMappingURL=_instantiate_helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_instantiate_helpers.js","sourceRoot":"","sources":["../../src/_instantiate_helpers.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"_instantiate_helpers.js","sourceRoot":"","sources":["../../src/_instantiate_helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ class MandatoryChildOrRequestedOptionalFilter {
|
|
|
33
33
|
warningLog(" cannot find node ", r.nodeId.toString());
|
|
34
34
|
return false;
|
|
35
35
|
}
|
|
36
|
-
return n.browseName
|
|
36
|
+
return n.browseName?.name?.toString() === node.browseName?.name?.toString();
|
|
37
37
|
});
|
|
38
38
|
if (alreadyIn.length > 0) {
|
|
39
39
|
(0, node_opcua_assert_1.assert)(alreadyIn.length === 1, "Duplication found ?");
|
|
@@ -62,7 +62,7 @@ class MandatoryChildOrRequestedOptionalFilter {
|
|
|
62
62
|
return true; // keep;
|
|
63
63
|
case "Optional":
|
|
64
64
|
// only if in requested optionals
|
|
65
|
-
return this.copyAlsoAllOptionals || (node.browseName
|
|
65
|
+
return this.copyAlsoAllOptionals || ((node.browseName?.name || "") in this.optionalsMap);
|
|
66
66
|
case "OptionalPlaceholder":
|
|
67
67
|
return false; // ignored
|
|
68
68
|
default:
|
|
@@ -70,7 +70,7 @@ class MandatoryChildOrRequestedOptionalFilter {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
filterFor(childInstance) {
|
|
73
|
-
const browseName = childInstance.browseName.name;
|
|
73
|
+
const browseName = childInstance.browseName.name || "";
|
|
74
74
|
let map = Object.create(null);
|
|
75
75
|
if (browseName in this.optionalsMap) {
|
|
76
76
|
map = this.optionalsMap[browseName];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_mandatory_child_or_requested_optional_filter.js","sourceRoot":"","sources":["../../src/_mandatory_child_or_requested_optional_filter.ts"],"names":[],"mappings":";;;AAAA,yDAA2C;AAC3C,iFAA8H;AAC9H,uDAAiG;AACjG,iEAAwD;AAIxD,8CAA8C;AAC9C,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAC/C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,aAAa,CAAC,CAAC;AAC9C,MAAM,QAAQ,GAAG,QAAQ,CAAC;AAG1B,MAAa,uCAAuC;IAC/B,QAAQ,CAAW;IACnB,YAAY,CAAc;IAC1B,UAAU,CAAgB;IAC1B,oBAAoB,GAAY,KAAK,CAAC;IAEvD,YAAY,QAAkB,EAAE,oBAA6B,EAAE,YAAyB;QACpF,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,yEAAyE;QACzE,IAAA,0BAAM,EAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAC1B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,YAAY,EAAE,uCAAe,CAAC,OAAO,CAAC,CAAC;IACvF,CAAC;IAEM,UAAU,CAAC,IAAc;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAEvC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAc,EAAE,EAAE;YACxD,MAAM,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"_mandatory_child_or_requested_optional_filter.js","sourceRoot":"","sources":["../../src/_mandatory_child_or_requested_optional_filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-address-space
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
4
|
+
import type { AddReferenceOpts, BaseNode, IEventData, IHistoricalDataNodeOptions, ISessionContext, MethodCallInterceptor, ShutdownTask, UADataType, UAEventType, UAMethod, UAObject, UAObjectType, UAReference, UAReferenceType, UAVariable, UAVariableType, UAView } from "node-opcua-address-space-base";
|
|
5
|
+
import type { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object";
|
|
5
6
|
import { NodeClass } from "node-opcua-data-model";
|
|
6
|
-
import { ExtensionObject } from "node-opcua-extension-object";
|
|
7
|
-
import { NodeId, NodeIdLike } from "node-opcua-nodeid";
|
|
7
|
+
import type { ExtensionObject } from "node-opcua-extension-object";
|
|
8
|
+
import { NodeId, type NodeIdLike } from "node-opcua-nodeid";
|
|
8
9
|
import { BrowseResult } from "node-opcua-service-browse";
|
|
9
|
-
import { BrowseDescription,
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import { AddressSpacePrivate } from "./address_space_private";
|
|
10
|
+
import type { BrowseDescription, ModelChangeStructureDataType } from "node-opcua-types";
|
|
11
|
+
import { BrowsePath, BrowsePathResult } from "node-opcua-types";
|
|
12
|
+
import { DataType, type VariantT } from "node-opcua-variant";
|
|
13
|
+
import type { ExtensionObjectConstructorFuncWithSchema } from "../source/interfaces/extension_object_constructor";
|
|
14
|
+
import type { UARootFolder } from "../source/ua_root_folder";
|
|
15
|
+
import type { AddressSpacePrivate } from "./address_space_private";
|
|
15
16
|
import { isNonEmptyQualifiedName } from "./namespace_impl";
|
|
16
|
-
import { NamespacePrivate } from "./namespace_private";
|
|
17
|
+
import type { NamespacePrivate } from "./namespace_private";
|
|
17
18
|
import { ReferenceImpl } from "./reference_impl";
|
|
18
19
|
/**
|
|
19
20
|
* returns true if str matches a nodeID, e.g i=123 or ns=...
|
|
@@ -46,6 +47,8 @@ export declare class AddressSpace implements AddressSpacePrivate {
|
|
|
46
47
|
private _modelChanges;
|
|
47
48
|
_methodCallInterceptors: MethodCallInterceptor[];
|
|
48
49
|
constructor();
|
|
50
|
+
toJSON(): Record<string, string | number | undefined>;
|
|
51
|
+
toString(): string;
|
|
49
52
|
/**
|
|
50
53
|
* @internal
|
|
51
54
|
*/
|
|
@@ -230,7 +233,7 @@ export declare class AddressSpace implements AddressSpacePrivate {
|
|
|
230
233
|
* @return {Variant} dataType: "ByteString"
|
|
231
234
|
*/
|
|
232
235
|
generateEventId(): VariantT<Buffer, DataType.ByteString>;
|
|
233
|
-
constructEventData(eventTypeId: UAEventType,
|
|
236
|
+
constructEventData(eventTypeId: UAEventType, dataInput: Record<string, unknown>): IEventData;
|
|
234
237
|
/**
|
|
235
238
|
* browse some path.
|
|
236
239
|
*
|
|
@@ -308,7 +311,7 @@ export declare class AddressSpace implements AddressSpacePrivate {
|
|
|
308
311
|
* @param modelChange
|
|
309
312
|
* @private
|
|
310
313
|
*/
|
|
311
|
-
_collectModelChange(
|
|
314
|
+
_collectModelChange(_view: UAView | null, modelChange: ModelChangeStructureDataType): void;
|
|
312
315
|
/**
|
|
313
316
|
*
|
|
314
317
|
* walk up the hierarchy of objects until a view is found
|