node-opcua-modeler 2.136.0 → 2.137.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.
|
@@ -13,8 +13,6 @@ export interface ExtensionObjectDefinition {
|
|
|
13
13
|
isAbstract: boolean;
|
|
14
14
|
structureDefinition: StructureDefinitionOptions;
|
|
15
15
|
binaryEncoding?: NodeId;
|
|
16
|
-
xmlEncoding?: NodeId;
|
|
17
|
-
jsonEncoding?: NodeId;
|
|
18
16
|
subtypeOf?: UADataType;
|
|
19
17
|
}
|
|
20
18
|
export declare function addExtensionObjectDataType(namespace: INamespace, options: ExtensionObjectDefinition): Promise<UADataType>;
|
|
@@ -60,6 +60,12 @@ async function addExtensionObjectDataType(namespace, options) {
|
|
|
60
60
|
// nodeId: defaultBinaryEncodingNode,
|
|
61
61
|
});
|
|
62
62
|
(0, node_opcua_assert_1.default)(defaultBinary.browseName.toString() === "Default Binary");
|
|
63
|
+
const defaultXml = dataTypeEncodingType.instantiate({
|
|
64
|
+
browseName: (0, node_opcua_data_model_1.coerceQualifiedName)("0:Default XML"),
|
|
65
|
+
encodingOf: dataType
|
|
66
|
+
// nodeId: defaultXmlEncodingNode,
|
|
67
|
+
});
|
|
68
|
+
(0, node_opcua_assert_1.default)(defaultXml.browseName.toString() === "Default XML");
|
|
63
69
|
dataType.$fullDefinition = new node_opcua_types_1.StructureDefinition(structureDefinition);
|
|
64
70
|
const d = dataType.getStructureDefinition();
|
|
65
71
|
(0, node_opcua_assert_1.default)(!node_opcua_nodeid_1.NodeId.sameNodeId(d.baseDataType, node_opcua_nodeid_1.NodeId.nullNodeId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExtensionObjectDataType.js","sourceRoot":"","sources":["../source/addExtensionObjectDataType.ts"],"names":[],"mappings":";;;;;AAaA,8DAYC;
|
|
1
|
+
{"version":3,"file":"addExtensionObjectDataType.js","sourceRoot":"","sources":["../source/addExtensionObjectDataType.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-modeler",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.137.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module modeler",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -14,27 +14,28 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"cli-table3": "^0.6.5",
|
|
16
16
|
"csv-parse": "5.5.6",
|
|
17
|
-
"node-opcua-address-space": "2.
|
|
18
|
-
"node-opcua-address-space-base": "2.
|
|
17
|
+
"node-opcua-address-space": "2.137.0",
|
|
18
|
+
"node-opcua-address-space-base": "2.137.0",
|
|
19
19
|
"node-opcua-assert": "2.120.0",
|
|
20
20
|
"node-opcua-basic-types": "2.134.0",
|
|
21
|
-
"node-opcua-client-dynamic-extension-object": "2.
|
|
21
|
+
"node-opcua-client-dynamic-extension-object": "2.137.0",
|
|
22
22
|
"node-opcua-constants": "2.125.0",
|
|
23
|
-
"node-opcua-data-model": "2.
|
|
23
|
+
"node-opcua-data-model": "2.137.0",
|
|
24
24
|
"node-opcua-debug": "2.133.0",
|
|
25
|
-
"node-opcua-factory": "2.
|
|
25
|
+
"node-opcua-factory": "2.137.0",
|
|
26
26
|
"node-opcua-nodeid": "2.133.0",
|
|
27
|
-
"node-opcua-nodesets": "2.
|
|
28
|
-
"node-opcua-numeric-range": "2.
|
|
29
|
-
"node-opcua-schemas": "2.
|
|
30
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
27
|
+
"node-opcua-nodesets": "2.137.0",
|
|
28
|
+
"node-opcua-numeric-range": "2.137.0",
|
|
29
|
+
"node-opcua-schemas": "2.137.0",
|
|
30
|
+
"node-opcua-service-translate-browse-path": "2.137.0",
|
|
31
31
|
"node-opcua-status-code": "2.133.0",
|
|
32
|
-
"node-opcua-types": "2.
|
|
33
|
-
"node-opcua-variant": "2.
|
|
32
|
+
"node-opcua-types": "2.137.0",
|
|
33
|
+
"node-opcua-variant": "2.137.0",
|
|
34
34
|
"yargs": "15.4.1"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"node-opcua-leak-detector": "2.133.0"
|
|
37
|
+
"node-opcua-leak-detector": "2.133.0",
|
|
38
|
+
"should": "^13.2.3"
|
|
38
39
|
},
|
|
39
40
|
"repository": {
|
|
40
41
|
"type": "git",
|
|
@@ -49,7 +50,7 @@
|
|
|
49
50
|
"internet of things"
|
|
50
51
|
],
|
|
51
52
|
"homepage": "http://node-opcua.github.io/",
|
|
52
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "e88e4f20d5436dd68084d2a6d447f170330b373d",
|
|
53
54
|
"files": [
|
|
54
55
|
"dist",
|
|
55
56
|
"distNodeJS",
|
|
@@ -31,9 +31,6 @@ export interface ExtensionObjectDefinition {
|
|
|
31
31
|
|
|
32
32
|
structureDefinition: StructureDefinitionOptions;
|
|
33
33
|
binaryEncoding?: NodeId;
|
|
34
|
-
xmlEncoding?: NodeId;
|
|
35
|
-
jsonEncoding?: NodeId;
|
|
36
|
-
|
|
37
34
|
subtypeOf?: UADataType;
|
|
38
35
|
}
|
|
39
36
|
|
|
@@ -59,7 +56,7 @@ export async function addExtensionObjectDataType(namespace: INamespace, options:
|
|
|
59
56
|
}
|
|
60
57
|
const structureDefinition = options.structureDefinition;
|
|
61
58
|
structureDefinition.baseDataType = resolveNodeId(structureDefinition.baseDataType || "Structure");
|
|
62
|
-
|
|
59
|
+
|
|
63
60
|
const isAbstract = options.isAbstract || false;
|
|
64
61
|
|
|
65
62
|
const dataType = namespace.createDataType({
|
|
@@ -76,6 +73,14 @@ export async function addExtensionObjectDataType(namespace: INamespace, options:
|
|
|
76
73
|
})!;
|
|
77
74
|
assert(defaultBinary.browseName.toString() === "Default Binary");
|
|
78
75
|
|
|
76
|
+
const defaultXml = dataTypeEncodingType.instantiate({
|
|
77
|
+
browseName: coerceQualifiedName("0:Default XML"),
|
|
78
|
+
encodingOf: dataType
|
|
79
|
+
// nodeId: defaultXmlEncodingNode,
|
|
80
|
+
})!;
|
|
81
|
+
assert(defaultXml.browseName.toString() === "Default XML");
|
|
82
|
+
|
|
83
|
+
|
|
79
84
|
(dataType as any).$fullDefinition = new StructureDefinition(structureDefinition);
|
|
80
85
|
|
|
81
86
|
const d = dataType.getStructureDefinition();
|