node-opcua-client-dynamic-extension-object 2.120.0 → 2.121.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/convert_data_type_definition_to_structuretype_schema.d.ts +6 -1
- package/dist/convert_data_type_definition_to_structuretype_schema.js +9 -6
- package/dist/convert_data_type_definition_to_structuretype_schema.js.map +1 -1
- package/dist/private/populate_data_type_manager_103.d.ts +10 -0
- package/dist/private/populate_data_type_manager_103.js +31 -7
- package/dist/private/populate_data_type_manager_103.js.map +1 -1
- package/dist/private/populate_data_type_manager_104.js +1 -1
- package/dist/private/populate_data_type_manager_104.js.map +1 -1
- package/package.json +16 -16
- package/source/convert_data_type_definition_to_structuretype_schema.ts +22 -4
- package/source/private/populate_data_type_manager_103.ts +46 -10
- package/source/private/populate_data_type_manager_104.ts +1 -0
|
@@ -2,6 +2,7 @@ import { DataTypeFactory, FieldCategory, IStructuredTypeSchema, TypeDefinition }
|
|
|
2
2
|
import { NodeId } from "node-opcua-nodeid";
|
|
3
3
|
import { IBasicSessionAsync2 } from "node-opcua-pseudo-session";
|
|
4
4
|
import { DataTypeDefinition } from "node-opcua-types";
|
|
5
|
+
import { DataTypeAndEncodingId } from "node-opcua-schemas";
|
|
5
6
|
export interface CacheForFieldResolution {
|
|
6
7
|
fieldTypeName: string;
|
|
7
8
|
schema: TypeDefinition;
|
|
@@ -9,6 +10,10 @@ export interface CacheForFieldResolution {
|
|
|
9
10
|
allowSubType?: boolean;
|
|
10
11
|
dataType?: NodeId;
|
|
11
12
|
}
|
|
12
|
-
export
|
|
13
|
+
export interface IDataTypeDescriptionMini {
|
|
14
|
+
encodings?: DataTypeAndEncodingId;
|
|
15
|
+
isAbstract?: boolean;
|
|
16
|
+
}
|
|
17
|
+
export declare function convertDataTypeDefinitionToStructureTypeSchema(session: IBasicSessionAsync2, dataTypeNodeId: NodeId, name: string, definition: DataTypeDefinition, dataTypeDescription: IDataTypeDescriptionMini | null, dataTypeFactory: DataTypeFactory, isAbstract: boolean, cache: {
|
|
13
18
|
[key: string]: CacheForFieldResolution;
|
|
14
19
|
}): Promise<IStructuredTypeSchema>;
|
|
@@ -146,7 +146,7 @@ async function resolve2(session, dataTypeNodeId, dataTypeFactory, fieldTypeName,
|
|
|
146
146
|
}
|
|
147
147
|
else {
|
|
148
148
|
const isAbstract = false;
|
|
149
|
-
schema = await convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, fieldTypeName, definition, dataTypeFactory, isAbstract, cache);
|
|
149
|
+
schema = await convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, fieldTypeName, definition, null, dataTypeFactory, isAbstract, cache);
|
|
150
150
|
}
|
|
151
151
|
// xx const schema1 = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
|
|
152
152
|
}
|
|
@@ -261,20 +261,23 @@ async function resolveFieldType(session, dataTypeNodeId, dataTypeFactory, cache)
|
|
|
261
261
|
cache[key] = v2;
|
|
262
262
|
return v2;
|
|
263
263
|
}
|
|
264
|
-
async function _setupEncodings(session, dataTypeNodeId, schema) {
|
|
264
|
+
async function _setupEncodings(session, dataTypeNodeId, dataTypeDescription, schema) {
|
|
265
265
|
// read abstract flag
|
|
266
266
|
const isAbstractDV = await session.read({ nodeId: dataTypeNodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract });
|
|
267
267
|
schema.dataTypeNodeId = dataTypeNodeId;
|
|
268
268
|
if (isAbstractDV.statusCode.isGood() && isAbstractDV.value.value === false) {
|
|
269
|
-
const encodings = await (0, find_encodings_1._findEncodings)(session, dataTypeNodeId);
|
|
269
|
+
const encodings = (dataTypeDescription && dataTypeDescription.encodings) || (await (0, find_encodings_1._findEncodings)(session, dataTypeNodeId));
|
|
270
270
|
schema.encodingDefaultBinary = (0, node_opcua_nodeid_2.makeExpandedNodeId)(encodings.binaryEncodingNodeId);
|
|
271
271
|
schema.encodingDefaultXml = (0, node_opcua_nodeid_2.makeExpandedNodeId)(encodings.xmlEncodingNodeId);
|
|
272
272
|
schema.encodingDefaultJson = (0, node_opcua_nodeid_2.makeExpandedNodeId)(encodings.jsonEncodingNodeId);
|
|
273
273
|
}
|
|
274
|
+
else {
|
|
275
|
+
schema.isAbstract = true;
|
|
276
|
+
}
|
|
274
277
|
return schema;
|
|
275
278
|
}
|
|
276
|
-
// eslint-disable-next-line max-statements
|
|
277
|
-
async function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, name, definition, dataTypeFactory, isAbstract, cache) {
|
|
279
|
+
// eslint-disable-next-line max-statements, max-params
|
|
280
|
+
async function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, name, definition, dataTypeDescription, dataTypeFactory, isAbstract, cache) {
|
|
278
281
|
if (definition instanceof node_opcua_types_1.StructureDefinition) {
|
|
279
282
|
let fieldCountToIgnore = 0;
|
|
280
283
|
const structureInfo = dataTypeFactory.getStructureInfoForDataType(definition.baseDataType);
|
|
@@ -351,7 +354,7 @@ async function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeN
|
|
|
351
354
|
name,
|
|
352
355
|
dataTypeFactory
|
|
353
356
|
});
|
|
354
|
-
const structuredTypeSchema = await _setupEncodings(session, dataTypeNodeId, os);
|
|
357
|
+
const structuredTypeSchema = await _setupEncodings(session, dataTypeNodeId, dataTypeDescription, os);
|
|
355
358
|
postActions.forEach((action) => action(structuredTypeSchema));
|
|
356
359
|
return structuredTypeSchema;
|
|
357
360
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert_data_type_definition_to_structuretype_schema.js","sourceRoot":"","sources":["../source/convert_data_type_definition_to_structuretype_schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"convert_data_type_definition_to_structuretype_schema.js","sourceRoot":"","sources":["../source/convert_data_type_definition_to_structuretype_schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,15 @@
|
|
|
1
|
+
import { QualifiedName } from "node-opcua-data-model";
|
|
2
|
+
import { NodeId } from "node-opcua-nodeid";
|
|
1
3
|
import { IBasicSessionAsync2 } from "node-opcua-pseudo-session";
|
|
4
|
+
import { DataTypeAndEncodingId } from "node-opcua-schemas";
|
|
2
5
|
import { ExtraDataTypeManager } from "../extra_data_type_manager";
|
|
6
|
+
export interface IDataTypeDescription {
|
|
7
|
+
browseName: QualifiedName;
|
|
8
|
+
nodeId: NodeId;
|
|
9
|
+
encodings?: DataTypeAndEncodingId;
|
|
10
|
+
symbolicName?: string;
|
|
11
|
+
isAbstract?: boolean;
|
|
12
|
+
}
|
|
3
13
|
/**
|
|
4
14
|
* Extract all custom dataType
|
|
5
15
|
* @param session
|
|
@@ -82,13 +82,12 @@ async function _getDataTypeDescriptions(session, dataTypeDictionaryNodeId) {
|
|
|
82
82
|
}
|
|
83
83
|
async function _enrichWithDescriptionOf(session, dataTypeDescriptions) {
|
|
84
84
|
const nodesToBrowse3 = [];
|
|
85
|
-
for (const
|
|
86
|
-
ref.browseName.toString();
|
|
85
|
+
for (const dataTypeDescription of dataTypeDescriptions) {
|
|
87
86
|
nodesToBrowse3.push({
|
|
88
87
|
browseDirection: node_opcua_service_browse_1.BrowseDirection.Inverse,
|
|
89
88
|
includeSubtypes: false,
|
|
90
89
|
nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object"),
|
|
91
|
-
nodeId:
|
|
90
|
+
nodeId: dataTypeDescription.nodeId.toString(),
|
|
92
91
|
referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasDescription"),
|
|
93
92
|
// resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
|
|
94
93
|
resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId")
|
|
@@ -165,21 +164,28 @@ async function _enrichWithDescriptionOf(session, dataTypeDescriptions) {
|
|
|
165
164
|
for (let i = 0; i < results5.length; i++) {
|
|
166
165
|
const result5 = results5[i];
|
|
167
166
|
const dataTypeDescription = dataTypeDescriptions[i];
|
|
167
|
+
let encodingCounter = 0;
|
|
168
168
|
for (const ref of result5.references || []) {
|
|
169
169
|
switch (ref.browseName.name) {
|
|
170
170
|
case "Default XML":
|
|
171
171
|
dataTypeDescription.encodings.xmlEncodingNodeId = ref.nodeId;
|
|
172
|
+
encodingCounter++;
|
|
172
173
|
break;
|
|
173
174
|
case "Default Binary":
|
|
174
175
|
dataTypeDescription.encodings.binaryEncodingNodeId = ref.nodeId;
|
|
176
|
+
encodingCounter++;
|
|
175
177
|
break;
|
|
176
178
|
case "Default JSON":
|
|
177
179
|
dataTypeDescription.encodings.jsonEncodingNodeId = ref.nodeId;
|
|
180
|
+
encodingCounter++;
|
|
178
181
|
break;
|
|
179
182
|
default:
|
|
180
183
|
errorLog("Cannot handle unknown encoding", ref.browseName.name);
|
|
181
184
|
}
|
|
182
185
|
}
|
|
186
|
+
if (encodingCounter === 0) {
|
|
187
|
+
dataTypeDescription.isAbstract = true;
|
|
188
|
+
}
|
|
183
189
|
}
|
|
184
190
|
return dataTypeNodeIds;
|
|
185
191
|
}
|
|
@@ -214,6 +220,10 @@ function sortStructure(dataTypeDefinitions) {
|
|
|
214
220
|
}
|
|
215
221
|
return dataTypeDefinitionsSorted;
|
|
216
222
|
}
|
|
223
|
+
const readIsAbstract = async (session, nodeId) => {
|
|
224
|
+
const dataValue = await session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract });
|
|
225
|
+
return dataValue.value.value;
|
|
226
|
+
};
|
|
217
227
|
async function _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory) {
|
|
218
228
|
(0, node_opcua_assert_1.assert)(dataTypeFactory, "expecting a dataTypeFactory");
|
|
219
229
|
const dataTypeDescriptions = await _getDataTypeDescriptions(session, dataTypeDictionaryNodeId);
|
|
@@ -237,7 +247,8 @@ async function _extractDataTypeDictionaryFromDefinition(session, dataTypeDiction
|
|
|
237
247
|
const dataTypeDefinition = dataValue.value.value;
|
|
238
248
|
if (dataTypeDefinition && dataTypeDefinition instanceof node_opcua_types_1.StructureDefinition) {
|
|
239
249
|
const className = dataTypeDescription.browseName.name;
|
|
240
|
-
|
|
250
|
+
const isAbstract = await readIsAbstract(session, dataTypeNodeId);
|
|
251
|
+
dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition, isAbstract });
|
|
241
252
|
}
|
|
242
253
|
}
|
|
243
254
|
else {
|
|
@@ -261,13 +272,26 @@ async function _extractDataTypeDictionaryFromDefinition(session, dataTypeDiction
|
|
|
261
272
|
}
|
|
262
273
|
// now fill typeDictionary
|
|
263
274
|
try {
|
|
264
|
-
const
|
|
275
|
+
const dataTypeDescription = dataTypeDescriptions.find((a) => a.nodeId.toString() === dataTypeNodeId.toString());
|
|
276
|
+
if (!dataTypeDefinition) {
|
|
277
|
+
throw new Error("cannot find dataTypeDefinition for " + dataTypeNodeId.toString());
|
|
278
|
+
}
|
|
279
|
+
const schema = await (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, className, dataTypeDefinition, dataTypeDescription, // for encodings
|
|
280
|
+
dataTypeFactory, isAbstract, cache);
|
|
265
281
|
// istanbul ignore next
|
|
266
282
|
if (doDebug) {
|
|
267
283
|
debugLog(chalk_1.default.red("Registering "), chalk_1.default.cyan(className.padEnd(30, " ")), schema.dataTypeNodeId.toString());
|
|
268
284
|
}
|
|
269
|
-
|
|
270
|
-
|
|
285
|
+
if (!isAbstract) {
|
|
286
|
+
const Constructor = (0, node_opcua_schemas_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
|
|
287
|
+
(0, node_opcua_assert_1.assert)(Constructor.schema === schema);
|
|
288
|
+
}
|
|
289
|
+
else {
|
|
290
|
+
// istanbul ignore next
|
|
291
|
+
if (doDebug) {
|
|
292
|
+
debugLog("Ignoring Abstract ", className);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
271
295
|
}
|
|
272
296
|
catch (err) {
|
|
273
297
|
errorLog("Constructor verification err: ", err.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate_data_type_manager_103.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_103.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAmC;AACnC,6BAA6B;AAC7B;;GAEG;AACH,kDAA0B;AAE1B,yDAA2C;AAC3C,iEAAsH;AACtH,uDAAiG;AACjG,2DAA4G;AAC5G,yDAAsF;AACtF,yEAAsH;AACtH,2DAK4B;AAC5B,yEAA0H;AAC1H,uGAA0E;AAE1E,uDAAuF;AAGvF,kIAGiE;AAEjE,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAE/C,WAAW;AACX,SAAS;AACT,SAAS;AACT,iEAAiE;AACjE,8BAA8B;AAC9B,4FAA4F;AAC5F,uDAAuD;AACvD,oFAAoF;AACpF,4EAA4E;AAC5E,8HAA8H;AAC9H,EAAE;AACF,6EAA6E;AAC7E,sEAAsE;AACtE,kGAAkG;AAClG,gCAAgC;AAChC,yFAAyF;AACzF,iFAAiF;AACjF,EAAE;AAEF,KAAK,UAAU,mBAAmB,CAAC,OAA2B,EAAE,kBAA0B;IACtF,MAAM,UAAU,GAAG,IAAA,yDAAc,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACxD,0BAA0B;IAC1B,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,yCAAyC;QACzC,QAAQ,CAAC,yDAAyD,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpG,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,oBAAoB,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACnD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,oCAAY,CAAC,KAAK,EAAE,CAAC,CAAC;IACxG,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;AACjC,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,OAA2B,EAAE,kBAA0B;IAC5F,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,IAAA,yDAAc,EAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC,CAAC;IACjG,0BAA0B;IAC1B,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,6DAA6D,CAAC;IACzE,CAAC;IACD,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,oCAAY,CAAC,KAAK,EAAE,CAAC,CAAC;IACpG,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,WAAW,CAAC;AAChD,CAAC;AASD,KAAK,UAAU,wBAAwB,CAAC,OAA4B,EAAE,wBAAgC;IAClG,MAAM,aAAa,GAA0B;QACzC,eAAe,EAAE,2CAAe,CAAC,OAAO;QACxC,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,IAAA,yCAAiB,EAAC,UAAU,CAAC;QAC5C,MAAM,EAAE,wBAAwB;QAChC,eAAe,EAAE,IAAA,iCAAa,EAAC,cAAc,CAAC;QAC9C,iGAAiG;QACjG,UAAU,EAAE,IAAA,sCAAc,EAAC,qBAAqB,CAAC;KACpD,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACxD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC9C,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAA4B,EAAE,oBAA4C;IAC9G,MAAM,cAAc,GAA+B,EAAE,CAAC;IACtD,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACrC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC1B,cAAc,CAAC,IAAI,CAAC;YAChB,eAAe,EAAE,2CAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,IAAA,yCAAiB,EAAC,QAAQ,CAAC;YAC1C,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC7B,eAAe,EAAE,IAAA,iCAAa,EAAC,gBAAgB,CAAC;YAChD,4GAA4G;YAC5G,UAAU,EAAE,IAAA,sCAAc,EAAC,QAAQ,CAAC;SACvC,CAAC,CAAC;IACP,CAAC;IACD,0BAA0B;IAC1B,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAE1D,MAAM,eAAe,GAAG,EAAE,CAAC;IAC3B,MAAM,qBAAqB,GAA+B,EAAE,CAAC;IAE7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QAEpD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAE9C,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,mEAAmE;YACnE,SAAS;QACb,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,UAAU,CAAC,uDAAuD,EAAE,mBAAmB,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/G,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/B,SAAS;QACb,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,oBAAoB,GAAG,GAAG,CAAC,MAAM,CAAC;YACxC,mBAAmB,CAAC,SAAS,GAAG,mBAAmB,CAAC,SAAS,IAAI;gBAC7D,oBAAoB,EAAE,0BAAM,CAAC,UAAU;gBACvC,cAAc,EAAE,0BAAM,CAAC,UAAU;gBACjC,kBAAkB,EAAE,0BAAM,CAAC,UAAU;gBACrC,iBAAiB,EAAE,0BAAM,CAAC,UAAU;aACvC,CAAC;YACF,mBAAmB,CAAC,SAAS,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;YAC1E,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC3C,qBAAqB,CAAC,IAAI,CAAC;gBACvB,eAAe,EAAE,2CAAe,CAAC,OAAO;gBACxC,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE,qCAAa,CAAC,QAAQ;gBACrC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,eAAe,EAAE,IAAA,iCAAa,EAAC,aAAa,CAAC;gBAC7C,4GAA4G;gBAC5G,UAAU,EAAE,IAAA,sCAAc,EAAC,qBAAqB,CAAC;aACpD,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;YAE9C,0BAA0B;YAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,8BAA8B,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACjH,CAAC;YAED,MAAM,GAAG,GAAG,OAAO,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC;YAClC,eAAe,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC;YACpC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;YACpD,mBAAmB,CAAC,SAAU,CAAC,cAAc,GAAG,cAAc,CAAC;QACnE,CAAC;IACL,CAAC;IAED,MAAM,mBAAmB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QACjE,eAAe,EAAE,2CAAe,CAAC,OAAO;QACxC,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,qCAAa,CAAC,MAAM;QACnC,MAAM,EAAE,cAAc;QACtB,eAAe,EAAE,IAAA,iCAAa,EAAC,aAAa,CAAC;QAC7C,4GAA4G;QAC5G,UAAU,EAAE,IAAA,sCAAc,EAAC,qBAAqB,CAAC;KACpD,CAAC,CAAC,CAAC;IAEJ,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YACzC,QAAQ,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC1B,KAAK,aAAa;oBACd,mBAAmB,CAAC,SAAU,CAAC,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC;oBAC9D,MAAM;gBACV,KAAK,gBAAgB;oBACjB,mBAAmB,CAAC,SAAU,CAAC,oBAAoB,GAAG,GAAG,CAAC,MAAM,CAAC;oBACjE,MAAM;gBACV,KAAK,cAAc;oBACf,mBAAmB,CAAC,SAAU,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC;oBAC/D,MAAM;gBACV;oBACI,QAAQ,CAAC,gCAAgC,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACxE,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAUD,SAAS,aAAa,CAAC,mBAAwC;IAC3D,MAAM,yBAAyB,GAAuB,EAAE,CAAC;IACzD,MAAM,QAAQ,GAAwC,EAAE,CAAC;IACzD,MAAM,IAAI,GAAwC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,SAAS,MAAM,CAAC,CAAmB;QAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjB,OAAO;QACX,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/D,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YAChD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACP,SAAS;YACb,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC;QAED,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAClC,MAAM,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IACD,OAAO,yBAAyB,CAAC;AACrC,CAAC;AAED,KAAK,UAAU,wCAAwC,CACnD,OAA4B,EAC5B,wBAAgC,EAChC,eAAgC;IAEhC,IAAA,0BAAM,EAAC,eAAe,EAAE,6BAA6B,CAAC,CAAC;IAEvD,MAAM,oBAAoB,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;IAC/F,MAAM,eAAe,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAEtF,gHAAgH;IAChH,MAAM,WAAW,GAAyB,eAAe,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC;QAC/E,WAAW,EAAE,oCAAY,CAAC,kBAAkB;QAC5C,MAAM;KACT,CAAC,CAAC,CAAC;IAEJ,MAAM,KAAK,GAA+C,EAAE,CAAC;IAC7D,MAAM,gCAAgC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvG,yDAAyD;IACzD,mFAAmF;IAEnF,MAAM,mBAAmB,GAAwB,EAAE,CAAC;IAEpD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,SAAS,IAAI,gCAAgC,EAAE,CAAC;QACvD,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAExD,0BAA0B;QAC1B,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YAChC,MAAM,kBAAkB,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;YAEjD,IAAI,kBAAkB,IAAI,kBAAkB,YAAY,sCAAmB,EAAE,CAAC;gBAC1E,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,IAAK,CAAC;gBACvD,mBAAmB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;YACnG,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,QAAQ,CACJ,iBAAiB,EACjB,cAAc,CAAC,QAAQ,EAAE,EACzB,uCAAuC,EACvC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAClC,CAAC;QACN,CAAC;QACD,KAAK,EAAE,CAAC;IACZ,CAAC;IACD,6BAA6B;IAC7B,MAAM,yBAAyB,GAAG,aAAa,CAAC,mBAAmB,CAAC,CAAC;IACrE,uBAAuB;IACvB,IAAI,OAAO,EAAE,CAAC;QACV,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACjH,CAAC;IACD,KAAK,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,kBAAkB,EAAE,UAAU,EAAE,IAAI,yBAAyB,EAAE,CAAC;QACpG,uBAAuB;QACvB,IAAI,OAAO,EAAE,CAAC;YACV,QAAQ,CAAC,eAAK,CAAC,MAAM,CAAC,0CAA0C,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7G,CAAC;QACD,IAAI,eAAe,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC;YACpD,SAAS,CAAC,uCAAuC;QACrD,CAAC;QACD,0BAA0B;QAC1B,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAA,qGAA8C,EAC/D,OAAO,EACP,cAAc,EACd,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,UAAU,EACV,KAAK,CACR,CAAC;YAEF,uBAAuB;YACvB,IAAI,OAAO,EAAE,CAAC;gBACV,QAAQ,CAAC,eAAK,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjH,CAAC;YACD,MAAM,WAAW,GAAG,IAAA,mDAA8B,EAAC,MAAM,EAAE,eAAe,CAAyC,CAAC;YACpH,IAAA,0BAAM,EAAC,WAAW,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,QAAQ,CAAC,gCAAgC,EAAU,GAAI,CAAC,OAAO,CAAC,CAAC;YACjE,QAAQ,CAAC,wBAAwB,GAAG,SAAS,GAAG,0BAA0B,CAAC,CAAC;YAC5E,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;IACL,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAC1B,OAA4B,EAC5B,wBAAgC;IAEhC,MAAM,GAAG,GAA6C,EAAE,CAAC;IAEzD,MAAM,oBAAoB,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;IAE/F,8BAA8B;IAC9B,MAAM,wBAAwB,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAE9D,KAAK,MAAM,mBAAmB,IAAI,oBAAoB,EAAE,CAAC;QACrD,GAAG,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,mBAAmB,CAAC,SAAU,CAAC;IAC1F,CAAC;IAED,OAAO;QACH,wBAAwB,CAAC,GAAW;YAChC,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;QAC5B,CAAC;KACJ,CAAC;AACN,CAAC;AAWD,SAAS,wBAAwB,CAAC,CAAqB;IACnD,MAAM,sBAAsB,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAAC,gEAAgE;IACzH,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,yGAAyG;IACxI,OAAO,CAAC,sBAAsB,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC;AAC5D,CAAC;AACD,KAAK,UAAU,0BAA0B,CACrC,OAA4B,EAC5B,CAAqB,EACrB,eAAqC;IAErC,MAAM,wBAAwB,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IAEpD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5G,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;IAErF,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,QAAQ,CACJ,8EAA8E,EAC9E,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EACvC,aAAa,EACb,SAAS,CACZ,CAAC;QACF,QAAQ,CAAC,uFAAuF,CAAC,CAAC;QAElG,qFAAqF;QACrF,MAAM,gBAAgB,GAAG,eAAe,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAChG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACvG,CAAC;QACD,MAAM,wCAAwC,CAAC,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;IACxG,CAAC;SAAM,CAAC;QACJ,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,yGAAyG;QACxI,QAAQ,CAAC,iEAAiE,CAAC,CAAC;QAC5E,4BAA4B;QAC5B,uFAAuF;QACvF,0BAA0B;QAC1B,IAAI,OAAO,EAAE,CAAC;YACV,QAAQ,CAAC,+CAA+C,CAAC,CAAC;YAC1D,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/B,QAAQ,CAAC,+CAA+C,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,eAAe,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAChG,MAAM,IAAA,wCAAmB,EAAC,SAAS,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACvE,CAAC;AACL,CAAC;AAED,KAAK,UAAU,0BAA0B,CACrC,OAA4B,EAC5B,0BAAkC,EAClC,eAAgC,EAChC,UAAoB;IAEpB,MAAM,YAAY,GAA0B;QACxC,eAAe,EAAE,2CAAe,CAAC,OAAO;QACxC,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,IAAA,yCAAiB,EAAC,UAAU,CAAC;QAC5C,MAAM,EAAE,0BAA0B;QAClC,eAAe,EAAE,IAAA,iCAAa,EAAC,cAAc,CAAC;QAC9C,UAAU,EAAE,IAAA,sCAAc,EAAC,qEAAqE,CAAC;KACpG,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAE3C,0BAA0B;IAC1B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,uCAAuC;IACvC,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAyB,EAAE,EAAE;QAChE,OAAO;YACH,eAAe,EAAE,2CAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,IAAA,yCAAiB,EAAC,mBAAmB,CAAC;YACrD,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,eAAe,EAAE,IAAA,iCAAa,EAAC,gBAAgB,CAAC;YAChD,UAAU,EAAE,IAAA,sCAAc,EAAC,kEAAkE,CAAC;SACjG,CAAC;IACN,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAE1D,MAAM,qBAAqB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE;QAC5D,MAAM,UAAU,GAAG,EAAE,CAAC,UAAW,CAAC,MAAM,CAAC,CAAC,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,gBAAgB,CAAC,CAAC;QAEpH,0BAA0B;QAC1B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,kCAAc,CAAC;QAC1B,CAAC;QACD,OAAO,kCAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IACvG,CAAC,CAAC,CAAC;IAEH,2DAA2D;IAE3D,0BAA0B;IAC1B,IAAI,OAAO,EAAE,CAAC;QACV,QAAQ,CAAC,eAAK,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,cAAc,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAChD,MAAM,IAAI,GAAG,GAAG,CAAC,UAAW,CAAC,IAAK,CAAC,QAAQ,EAAE,CAAC;YAC9C,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzE,+CAA+C;YAC/C,IAAI,CAAC;gBACD,MAAM,WAAW,GAAG,eAAe,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC;gBACjF,IAAI,CAAC,WAAW,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,6CAA6C,IAAI,GAAG,CAAC,CAAC;gBAC1E,CAAC;gBACD,uFAAuF;gBACvF,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC;gBACrC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,QAAQ,CAAC,mDAAmD,GAAG,IAAI,CAAC,CAAC;gBACrE,QAAQ,CAAC,WAAW,GAAW,GAAI,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAED,MAAM,6BAA6B,GAAG,qDAAqD,CAAC;AAC5F,SAAS,+BAA+B,CAAC,UAAkB;IACvD,uFAAuF;IACvF,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC3D,IAAI,EAAE,EAAE,CAAC;QACL,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AACD,MAAM,iBAAiB,GAAG,sCAAsC,CAAC;AACjE,SAAS,iBAAiB,CAAC,SAAiB;IACxC,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC7C,IAAI,CAAC,EAAE,CAAC;QACJ,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAW,CAAC;QAC7B,MAAM,SAAS,GAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,0BAA0B,CAAC,OAA4B,EAAE,eAAqC;IAChH,QAAQ,CAAC,gCAAgC,CAAC,CAAC;IAE3C,uBAAuB;IACvB,MAAM,uBAAuB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;QAC/C,WAAW,EAAE,oCAAY,CAAC,KAAK;QAC/B,MAAM,EAAE,IAAA,iCAAa,EAAC,uBAAuB,CAAC;KACjD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAa,uBAAuB,CAAC,KAAK,CAAC,KAAK,CAAC;IAErE,uBAAuB;IACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,QAAQ,CAAC,4CAA4C,CAAC,CAAC;QACvD,4EAA4E;QAC5E,OAAO;IACX,CAAC;IAED,uBAAuB;IACvB,IAAI,OAAO,EAAE,CAAC;QACV,QAAQ,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxH,CAAC;IAED,IAAI,uBAAuB,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7F,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAElD,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC;YACpF,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;gBACtD,MAAM,gBAAgB,GAAG,IAAI,oCAAe,CAAC,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC,CAAC;gBAC7E,eAAe,CAAC,uBAAuB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;YAC9E,CAAC;QACL,CAAC;IACL,CAAC;IAED,8BAA8B;IAC9B,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,KAAK,IAAI,eAAe,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtF,eAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,sBAAsB,GAAG,IAAA,iCAAa,EAAC,wBAAwB,CAAC,CAAC;IACvE,0DAA0D;IAE1D,+BAA+B;IAC/B,MAAM,eAAe,GAAG,IAAA,iCAAa,EAAC,4BAA4B,CAAC,CAAC;IAEpE,2EAA2E;IAC3E,gCAAgC;IAChC,MAAM,YAAY,GAA0B;QACxC,eAAe,EAAE,2CAAe,CAAC,OAAO;QACxC,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,IAAA,yCAAiB,EAAC,UAAU,CAAC;QAC5C,MAAM,EAAE,eAAe;QACvB,eAAe,EAAE,IAAA,iCAAa,EAAC,cAAc,CAAC;QAC9C,UAAU,EAAE,IAAA,sCAAc,EAAC,qEAAqE,CAAC;KACpG,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAEtD,uBAAuB;IACvB,IAAI,OAAO,EAAE,CAAC;QACV,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,sDAAsD;IACtD,4EAA4E;IAC5E,kEAAkE;IAClE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAW,CAAC,MAAM,CACxC,CAAC,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,CAAC,IAAI,IAAA,8BAAU,EAAC,CAAC,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAChH,CAAC;IAEF,QAAQ,CAAC,SAAS,UAAU,CAAC,MAAM,aAAa,CAAC,CAAC;IAElD,KAAK,UAAU,iBAAiB;QAC5B,MAAM,KAAK,GAAyB,EAAE,CAAC;QACvC,MAAM,QAAQ,GAA0C,EAAE,CAAC;QAE3D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,MAAM,wBAAwB,GAAG,SAAS,CAAC,MAAM,CAAC;YAClD,MAAM,sBAAsB,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;YAC5F,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gBAC1C,WAAW,EAAE,oCAAY,CAAC,KAAK;gBAC/B,MAAM,EAAE,wBAAwB;aACnC,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAElG,MAAM,IAAI,GAAuB;gBAC7B,wBAAwB;gBACxB,YAAY,EAAE,EAAE;gBAChB,sBAAsB;gBACtB,SAAS;gBACT,SAAS;gBACT,eAAe,EAAE,EAAE;aACtB,CAAC;YAEF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEjB,IAAI,CAAC,sBAAsB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClD,uBAAuB;gBACvB,IAAI,OAAO,EAAE,CAAC;oBACV,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAClC,CAAC;gBACD,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBAC/D,IAAI,OAAO,EAAE,CAAC;oBACV,iDAAiD;oBACjD,gBAAgB;oBAChB,2BAA2B;oBAC3B,oEAAoE;oBACpE,uEAAuE;oBACvE,yDAAyD;oBACzD,+DAA+D;oBAC/D,iDAAiD;oBACjD,sEAAsE;oBACtE,MAAM,+BAA+B,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBAEnD,IAAI,CAAC,eAAe,GAAG,+BAA+B,CAAC,+BAA+B,CAAC,CAAC;oBAExF,MAAM,cAAc,GAA8B,EAAE,CAAC;oBACrD,KAAK,MAAM,SAAS,IAAI,+BAA+B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;wBACjE,MAAM,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;wBACvC,IAAI,CAAC,EAAE,CAAC;4BACJ,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;4BAC/B,cAAc,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;4BAClC,QAAQ,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;wBAClD,CAAC;oBACL,CAAC;oBACD,IAAI,CAAC,YAAY,GAAG,cAAc,CAAC;oBACnC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;oBACzD,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;gBAC1C,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,gEAAgE;gBAChE,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBAC1E,QAAQ,CAAC,wBAAwB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;gBACzD,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;YAC1C,CAAC;YACD,6CAA6C;QACjD,CAAC;QACD,qCAAqC;QACrC,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,SAAS,OAAO,CAAC,CAAqB;YAClC,IAAI,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC7B,OAAO;YACX,CAAC;YACD,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC;oBAC1D,SAAS;gBACb,CAAC;gBACD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YACjC,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;QAED,QAAQ,CAAC,kBAAkB,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnF,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,MAAM,sBAAsB,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAEzD,qBAAqB;IACrB,MAAM,GAAG,GAA0C,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,IAAI,sBAAsB,EAAE,CAAC;QACrC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAE3B,QAAQ,CACJ,kDAAkD,EAClD,CAAC,CAAC,eAAe,EACjB,UAAU,EACV,CAAC,CAAC,wBAAwB,CAAC,SAAS,CACvC,CAAC;QAEF,MAAM,iBAAiB,GAAsB,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC;QAC5E,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;YACpD,IAAI,SAAS,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC;gBAClC,SAAS;YACb,CAAC;YACD,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,CAAC,eAAe,EAAE,CAAC;gBACnB,SAAS;YACb,CAAC;YACD,MAAM,cAAc,GAAG,eAAe,CAAC,wBAAwB,CAAC,SAAS,CAAC;YAC1E,IAAI,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;gBACrD,MAAM,GAAG,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBAC/D,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5B,QAAQ,CACJ,mBAAmB,EACnB,eAAe,CAAC,eAAe,EAC/B,UAAU,EACV,eAAe,CAAC,wBAAwB,CAAC,SAAS,CACrD,CAAC;YACN,CAAC;QACL,CAAC;QACD,MAAM,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACjG,IAAI,eAAe,EAAE,CAAC;YAClB,eAAe,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IACD,uBAAuB;IAEvB,0CAA0C;IAE1C,KAAK,UAAU,wCAAwC,CAAC,CAAqB;QACzE,QAAQ,CAAC,eAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC;QAEzF,MAAM,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC;QACxB,MAAM,wBAAwB,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;QAEpD,MAAM,0BAA0B,CAAC,OAAO,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;QAC9D,0BAA0B;QAC1B,IAAI,OAAO,EAAE,CAAC;YACV,QAAQ,CACJ,eAAK,CAAC,OAAO,CAAC,8CAA8C,CAAC,EAC7D,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,EACzB,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CACxB,CAAC;QACN,CAAC;QACD,MAAM,eAAe,GAAG,eAAe,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAC3G,MAAM,0BAA0B,CAAC,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;IACzH,CAAC;IAED,oFAAoF;IACpF,KAAK,MAAM,CAAC,IAAI,sBAAsB,EAAE,CAAC;QACrC,IAAI,CAAC;YACD,MAAM,wCAAwC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1D,QAAQ,CAAC,sDAAsD,CAAC,CAAC;gBACjE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC7B,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACZ,OAAO,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,QAAQ,CAAC,eAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,EAAE,GAAG,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IACD,QAAQ,CAAC,iCAAiC,CAAC,CAAC;AAChD,CAAC;AA9OD,gEA8OC"}
|
|
1
|
+
{"version":3,"file":"populate_data_type_manager_103.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_103.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ async function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name,
|
|
|
44
44
|
// it is OK to not have dataTypeDefinition for Abstract type!
|
|
45
45
|
dataTypeDefinition = new node_opcua_types_1.StructureDefinition();
|
|
46
46
|
}
|
|
47
|
-
const schema = await (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, name, dataTypeDefinition, dataTypeFactory, isAbstract, cache);
|
|
47
|
+
const schema = await (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, name, dataTypeDefinition, null, dataTypeFactory, isAbstract, cache);
|
|
48
48
|
if (isAbstract) {
|
|
49
49
|
// cannot construct an abstract structure
|
|
50
50
|
dataTypeFactory.registerAbstractStructure(dataTypeNodeId, name, schema);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":";;;AAAA,iEAAsE;AACtE,uDAAiF;AACjF,2DAAqD;AACrD,yDAA0D;AAC1D,yEAA6L;AAC7L,2DAAiH;AACjH,mEAAqD;AACrD,uDAO0B;AAG1B,kIAGiE;AAEjE,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAExC,KAAK,UAAU,kCAAkC,CACpD,OAA4B,EAC5B,cAAsB,EACtB,IAAY,EACZ,eAAgC,EAChC,KAAiD;IAEjD,IAAI,CAAC;QACD,IAAI,eAAe,CAAC,2BAA2B,CAAC,cAAc,CAAC,EAAE,CAAC;YAC9D,OAAO;QACX,CAAC;QACD,MAAM,CAAC,mBAAmB,EAAE,2BAA2B,CAAC,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAC1E;gBACI,WAAW,EAAE,oCAAY,CAAC,UAAU;gBACpC,MAAM,EAAE,cAAc;aACzB;YACD;gBACI,WAAW,EAAE,oCAAY,CAAC,kBAAkB;gBAC5C,MAAM,EAAE,cAAc;aACzB;SACJ,CAAC,CAAC;QACH,0BAA0B;QAC1B,IAAI,mBAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,kDAAkD,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpG,CAAC;QACD,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAgB,CAAC;QAE9D,IAAI,kBAAkB,GAAuB,2BAA2B,CAAC,KAAK,CAAC,KAA2B,CAAC;QAC3G,0BAA0B;QAC1B,IAAI,2BAA2B,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;YACrD,sCAAsC;YACtC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,UAAU,CAAC,kDAAkD,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC3F,OAAO;YACX,CAAC;YACD,6DAA6D;YAC7D,kBAAkB,GAAG,IAAI,sCAAmB,EAAE,CAAC;QACnD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,qGAA8C,EAC/D,OAAO,EACP,cAAc,EACd,IAAI,EACJ,kBAAkB,EAClB,eAAe,EACf,UAAU,EACV,KAAK,CACR,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YACb,yCAAyC;YACzC,eAAe,CAAC,yBAAyB,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,GAAG,IAAA,mDAAyC,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC3F,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;AACL,CAAC;
|
|
1
|
+
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-client-dynamic-extension-object",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.121.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module client-dynamic-extension-object",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -13,20 +13,20 @@
|
|
|
13
13
|
"chalk": "4.1.2",
|
|
14
14
|
"node-opcua-assert": "2.120.0",
|
|
15
15
|
"node-opcua-binary-stream": "2.120.0",
|
|
16
|
-
"node-opcua-constants": "2.
|
|
17
|
-
"node-opcua-data-model": "2.
|
|
18
|
-
"node-opcua-data-value": "2.
|
|
19
|
-
"node-opcua-debug": "2.
|
|
20
|
-
"node-opcua-extension-object": "2.
|
|
21
|
-
"node-opcua-factory": "2.
|
|
22
|
-
"node-opcua-nodeid": "2.
|
|
23
|
-
"node-opcua-pseudo-session": "2.
|
|
24
|
-
"node-opcua-schemas": "2.
|
|
25
|
-
"node-opcua-service-browse": "2.
|
|
26
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
27
|
-
"node-opcua-status-code": "2.
|
|
28
|
-
"node-opcua-types": "2.
|
|
29
|
-
"node-opcua-variant": "2.
|
|
16
|
+
"node-opcua-constants": "2.121.0",
|
|
17
|
+
"node-opcua-data-model": "2.121.0",
|
|
18
|
+
"node-opcua-data-value": "2.121.0",
|
|
19
|
+
"node-opcua-debug": "2.121.0",
|
|
20
|
+
"node-opcua-extension-object": "2.121.0",
|
|
21
|
+
"node-opcua-factory": "2.121.0",
|
|
22
|
+
"node-opcua-nodeid": "2.121.0",
|
|
23
|
+
"node-opcua-pseudo-session": "2.121.0",
|
|
24
|
+
"node-opcua-schemas": "2.121.0",
|
|
25
|
+
"node-opcua-service-browse": "2.121.0",
|
|
26
|
+
"node-opcua-service-translate-browse-path": "2.121.0",
|
|
27
|
+
"node-opcua-status-code": "2.121.0",
|
|
28
|
+
"node-opcua-types": "2.121.0",
|
|
29
|
+
"node-opcua-variant": "2.121.0"
|
|
30
30
|
},
|
|
31
31
|
"author": "Etienne Rossignon",
|
|
32
32
|
"license": "MIT",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"internet of things"
|
|
44
44
|
],
|
|
45
45
|
"homepage": "http://node-opcua.github.io/",
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "ba93a78eda343ecc0cc20476837347f6dfa259e0",
|
|
47
47
|
"files": [
|
|
48
48
|
"dist",
|
|
49
49
|
"source"
|
|
@@ -16,7 +16,14 @@ import {
|
|
|
16
16
|
TypeDefinition
|
|
17
17
|
} from "node-opcua-factory";
|
|
18
18
|
import { NodeId, makeExpandedNodeId, resolveNodeId, coerceNodeId } from "node-opcua-nodeid";
|
|
19
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
browseAll,
|
|
21
|
+
BrowseDescriptionLike,
|
|
22
|
+
findBasicDataType,
|
|
23
|
+
IBasicSessionAsync,
|
|
24
|
+
IBasicSessionAsync2,
|
|
25
|
+
IBasicSessionBrowseNextAsync
|
|
26
|
+
} from "node-opcua-pseudo-session";
|
|
20
27
|
import {
|
|
21
28
|
EnumDefinition,
|
|
22
29
|
DataTypeDefinition,
|
|
@@ -26,6 +33,7 @@ import {
|
|
|
26
33
|
EnumField
|
|
27
34
|
} from "node-opcua-types";
|
|
28
35
|
import { ExtensionObject } from "node-opcua-extension-object";
|
|
36
|
+
import { DataTypeAndEncodingId } from "node-opcua-schemas";
|
|
29
37
|
//
|
|
30
38
|
import { DataType } from "node-opcua-variant";
|
|
31
39
|
import { _findEncodings } from "./private/find_encodings";
|
|
@@ -206,6 +214,7 @@ async function resolve2(
|
|
|
206
214
|
dataTypeNodeId,
|
|
207
215
|
fieldTypeName,
|
|
208
216
|
definition,
|
|
217
|
+
null,
|
|
209
218
|
dataTypeFactory,
|
|
210
219
|
isAbstract,
|
|
211
220
|
cache
|
|
@@ -343,6 +352,7 @@ async function resolveFieldType(
|
|
|
343
352
|
async function _setupEncodings(
|
|
344
353
|
session: IBasicSessionAsync & IBasicSessionBrowseNextAsync,
|
|
345
354
|
dataTypeNodeId: NodeId,
|
|
355
|
+
dataTypeDescription: IDataTypeDescriptionMini | null,
|
|
346
356
|
schema: IStructuredTypeSchema
|
|
347
357
|
): Promise<IStructuredTypeSchema> {
|
|
348
358
|
// read abstract flag
|
|
@@ -350,20 +360,28 @@ async function _setupEncodings(
|
|
|
350
360
|
schema.dataTypeNodeId = dataTypeNodeId;
|
|
351
361
|
|
|
352
362
|
if (isAbstractDV.statusCode.isGood() && isAbstractDV.value.value === false) {
|
|
353
|
-
const encodings = await _findEncodings(session, dataTypeNodeId);
|
|
363
|
+
const encodings = (dataTypeDescription && dataTypeDescription.encodings) || (await _findEncodings(session, dataTypeNodeId));
|
|
354
364
|
schema.encodingDefaultBinary = makeExpandedNodeId(encodings.binaryEncodingNodeId);
|
|
355
365
|
schema.encodingDefaultXml = makeExpandedNodeId(encodings.xmlEncodingNodeId);
|
|
356
366
|
schema.encodingDefaultJson = makeExpandedNodeId(encodings.jsonEncodingNodeId);
|
|
367
|
+
} else {
|
|
368
|
+
schema.isAbstract = true;
|
|
357
369
|
}
|
|
358
370
|
return schema;
|
|
359
371
|
}
|
|
360
372
|
|
|
361
|
-
|
|
373
|
+
export interface IDataTypeDescriptionMini {
|
|
374
|
+
encodings?: DataTypeAndEncodingId;
|
|
375
|
+
isAbstract?: boolean;
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
// eslint-disable-next-line max-statements, max-params
|
|
362
379
|
export async function convertDataTypeDefinitionToStructureTypeSchema(
|
|
363
380
|
session: IBasicSessionAsync2,
|
|
364
381
|
dataTypeNodeId: NodeId,
|
|
365
382
|
name: string,
|
|
366
383
|
definition: DataTypeDefinition,
|
|
384
|
+
dataTypeDescription: IDataTypeDescriptionMini | null,
|
|
367
385
|
dataTypeFactory: DataTypeFactory,
|
|
368
386
|
isAbstract: boolean,
|
|
369
387
|
cache: { [key: string]: CacheForFieldResolution }
|
|
@@ -463,7 +481,7 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
|
|
|
463
481
|
name,
|
|
464
482
|
dataTypeFactory
|
|
465
483
|
});
|
|
466
|
-
const structuredTypeSchema = await _setupEncodings(session, dataTypeNodeId, os);
|
|
484
|
+
const structuredTypeSchema = await _setupEncodings(session, dataTypeNodeId, dataTypeDescription, os);
|
|
467
485
|
|
|
468
486
|
postActions.forEach((action) => action(structuredTypeSchema));
|
|
469
487
|
|
|
@@ -77,14 +77,18 @@ async function _readNamespaceUriProperty(session: IBasicSessionAsync, dataTypeDi
|
|
|
77
77
|
return dataValue.value.value || "<not set>";
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
interface IDataTypeDescription {
|
|
80
|
+
export interface IDataTypeDescription {
|
|
81
81
|
browseName: QualifiedName;
|
|
82
82
|
nodeId: NodeId;
|
|
83
83
|
encodings?: DataTypeAndEncodingId;
|
|
84
84
|
symbolicName?: string;
|
|
85
|
+
isAbstract?: boolean;
|
|
85
86
|
}
|
|
86
87
|
|
|
87
|
-
async function _getDataTypeDescriptions(
|
|
88
|
+
async function _getDataTypeDescriptions(
|
|
89
|
+
session: IBasicSessionAsync2,
|
|
90
|
+
dataTypeDictionaryNodeId: NodeId
|
|
91
|
+
): Promise<IDataTypeDescription[]> {
|
|
88
92
|
const nodeToBrowse2: BrowseDescriptionLike = {
|
|
89
93
|
browseDirection: BrowseDirection.Forward,
|
|
90
94
|
includeSubtypes: false,
|
|
@@ -99,15 +103,17 @@ async function _getDataTypeDescriptions(session: IBasicSessionAsync2, dataTypeDi
|
|
|
99
103
|
return result2.references.map((r) => ({ nodeId: r.nodeId, browseName: r.browseName }));
|
|
100
104
|
}
|
|
101
105
|
|
|
102
|
-
async function _enrichWithDescriptionOf(
|
|
106
|
+
async function _enrichWithDescriptionOf(
|
|
107
|
+
session: IBasicSessionAsync2,
|
|
108
|
+
dataTypeDescriptions: IDataTypeDescription[]
|
|
109
|
+
): Promise<NodeId[]> {
|
|
103
110
|
const nodesToBrowse3: BrowseDescriptionOptions[] = [];
|
|
104
|
-
for (const
|
|
105
|
-
ref.browseName.toString();
|
|
111
|
+
for (const dataTypeDescription of dataTypeDescriptions) {
|
|
106
112
|
nodesToBrowse3.push({
|
|
107
113
|
browseDirection: BrowseDirection.Inverse,
|
|
108
114
|
includeSubtypes: false,
|
|
109
115
|
nodeClassMask: makeNodeClassMask("Object"),
|
|
110
|
-
nodeId:
|
|
116
|
+
nodeId: dataTypeDescription.nodeId.toString(),
|
|
111
117
|
referenceTypeId: resolveNodeId("HasDescription"),
|
|
112
118
|
// resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
|
|
113
119
|
resultMask: makeResultMask("NodeId")
|
|
@@ -194,21 +200,28 @@ async function _enrichWithDescriptionOf(session: IBasicSessionAsync2, dataTypeDe
|
|
|
194
200
|
for (let i = 0; i < results5.length; i++) {
|
|
195
201
|
const result5 = results5[i];
|
|
196
202
|
const dataTypeDescription = dataTypeDescriptions[i];
|
|
203
|
+
let encodingCounter = 0;
|
|
197
204
|
for (const ref of result5.references || []) {
|
|
198
205
|
switch (ref.browseName.name) {
|
|
199
206
|
case "Default XML":
|
|
200
207
|
dataTypeDescription.encodings!.xmlEncodingNodeId = ref.nodeId;
|
|
208
|
+
encodingCounter++;
|
|
201
209
|
break;
|
|
202
210
|
case "Default Binary":
|
|
203
211
|
dataTypeDescription.encodings!.binaryEncodingNodeId = ref.nodeId;
|
|
212
|
+
encodingCounter++;
|
|
204
213
|
break;
|
|
205
214
|
case "Default JSON":
|
|
206
215
|
dataTypeDescription.encodings!.jsonEncodingNodeId = ref.nodeId;
|
|
216
|
+
encodingCounter++;
|
|
207
217
|
break;
|
|
208
218
|
default:
|
|
209
219
|
errorLog("Cannot handle unknown encoding", ref.browseName.name);
|
|
210
220
|
}
|
|
211
221
|
}
|
|
222
|
+
if (encodingCounter === 0) {
|
|
223
|
+
dataTypeDescription.isAbstract = true;
|
|
224
|
+
}
|
|
212
225
|
}
|
|
213
226
|
return dataTypeNodeIds;
|
|
214
227
|
}
|
|
@@ -257,6 +270,11 @@ function sortStructure(dataTypeDefinitions: DataTypeDefinitions) {
|
|
|
257
270
|
return dataTypeDefinitionsSorted;
|
|
258
271
|
}
|
|
259
272
|
|
|
273
|
+
const readIsAbstract = async (session: IBasicSessionAsync, nodeId: NodeId): Promise<boolean> => {
|
|
274
|
+
const dataValue = await session.read({ nodeId, attributeId: AttributeIds.IsAbstract });
|
|
275
|
+
return dataValue.value.value;
|
|
276
|
+
}
|
|
277
|
+
|
|
260
278
|
async function _extractDataTypeDictionaryFromDefinition(
|
|
261
279
|
session: IBasicSessionAsync2,
|
|
262
280
|
dataTypeDictionaryNodeId: NodeId,
|
|
@@ -292,7 +310,10 @@ async function _extractDataTypeDictionaryFromDefinition(
|
|
|
292
310
|
|
|
293
311
|
if (dataTypeDefinition && dataTypeDefinition instanceof StructureDefinition) {
|
|
294
312
|
const className = dataTypeDescription.browseName.name!;
|
|
295
|
-
|
|
313
|
+
|
|
314
|
+
const isAbstract = await readIsAbstract(session, dataTypeNodeId);
|
|
315
|
+
|
|
316
|
+
dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition, isAbstract });
|
|
296
317
|
}
|
|
297
318
|
} else {
|
|
298
319
|
debugLog(
|
|
@@ -320,11 +341,16 @@ async function _extractDataTypeDictionaryFromDefinition(
|
|
|
320
341
|
}
|
|
321
342
|
// now fill typeDictionary
|
|
322
343
|
try {
|
|
344
|
+
const dataTypeDescription = dataTypeDescriptions.find((a)=>a.nodeId.toString() === dataTypeNodeId.toString());
|
|
345
|
+
if (!dataTypeDefinition) {
|
|
346
|
+
throw new Error("cannot find dataTypeDefinition for "+ dataTypeNodeId.toString());
|
|
347
|
+
}
|
|
323
348
|
const schema = await convertDataTypeDefinitionToStructureTypeSchema(
|
|
324
349
|
session,
|
|
325
350
|
dataTypeNodeId,
|
|
326
351
|
className,
|
|
327
352
|
dataTypeDefinition,
|
|
353
|
+
dataTypeDescription!, // for encodings
|
|
328
354
|
dataTypeFactory,
|
|
329
355
|
isAbstract,
|
|
330
356
|
cache
|
|
@@ -334,8 +360,15 @@ async function _extractDataTypeDictionaryFromDefinition(
|
|
|
334
360
|
if (doDebug) {
|
|
335
361
|
debugLog(chalk.red("Registering "), chalk.cyan(className.padEnd(30, " ")), schema.dataTypeNodeId.toString());
|
|
336
362
|
}
|
|
337
|
-
|
|
338
|
-
|
|
363
|
+
if (!isAbstract) {
|
|
364
|
+
const Constructor = createDynamicObjectConstructor(schema, dataTypeFactory) as unknown as ConstructorFuncWithSchema;
|
|
365
|
+
assert(Constructor.schema === schema);
|
|
366
|
+
} else {
|
|
367
|
+
// istanbul ignore next
|
|
368
|
+
if (doDebug) {
|
|
369
|
+
debugLog("Ignoring Abstract ", className);
|
|
370
|
+
}
|
|
371
|
+
}
|
|
339
372
|
} catch (err) {
|
|
340
373
|
errorLog("Constructor verification err: ", (<Error>err).message);
|
|
341
374
|
errorLog("For this reason class " + className + " has not been registered");
|
|
@@ -520,7 +553,10 @@ function extraNamespaceRef(attribute: string): { xmlns: string; namespace: strin
|
|
|
520
553
|
* @param dataTypeManager
|
|
521
554
|
* @async
|
|
522
555
|
*/
|
|
523
|
-
export async function populateDataTypeManager103(
|
|
556
|
+
export async function populateDataTypeManager103(
|
|
557
|
+
session: IBasicSessionAsync2,
|
|
558
|
+
dataTypeManager: ExtraDataTypeManager
|
|
559
|
+
): Promise<void> {
|
|
524
560
|
debugLog("in ... populateDataTypeManager");
|
|
525
561
|
|
|
526
562
|
// read namespace array
|