node-opcua-modeler 2.163.1 → 2.164.2
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/addExtensionObjectDataType.js +5 -5
- package/dist/addExtensionObjectDataType.js.map +1 -1
- package/dist/displayNodeElement.js +1 -1
- package/dist/displayNodeElement.js.map +1 -1
- package/dist/promoteToMandatory.js +6 -6
- package/dist/promoteToMandatory.js.map +1 -1
- package/package.json +18 -18
- package/source/addExtensionObjectDataType.ts +5 -5
- package/source/displayNodeElement.ts +1 -1
- package/source/promoteToMandatory.ts +6 -6
|
@@ -20,7 +20,7 @@ const node_opcua_types_1 = require("node-opcua-types");
|
|
|
20
20
|
function getOrCreateDataTypeSystem(namespace) {
|
|
21
21
|
const addressSpace = namespace.addressSpace;
|
|
22
22
|
const opcBinaryTypeSystem = addressSpace.findNode("OPCBinarySchema_TypeSystem");
|
|
23
|
-
/*
|
|
23
|
+
/* c8 ignore next */
|
|
24
24
|
if (!opcBinaryTypeSystem) {
|
|
25
25
|
throw new Error("Cannot find OPCBinarySchema_TypeSystem");
|
|
26
26
|
}
|
|
@@ -32,11 +32,11 @@ async function addExtensionObjectDataType(namespace, options) {
|
|
|
32
32
|
const addressSpace = namespace.addressSpace;
|
|
33
33
|
// encodings
|
|
34
34
|
const dataTypeEncodingType = addressSpace.findObjectType("DataTypeEncodingType");
|
|
35
|
-
/*
|
|
35
|
+
/* c8 ignore next */
|
|
36
36
|
if (!dataTypeEncodingType) {
|
|
37
37
|
throw new Error("Cannot find DataTypeEncodingType");
|
|
38
38
|
}
|
|
39
|
-
/*
|
|
39
|
+
/* c8 ignore next */
|
|
40
40
|
if (!options.browseName.toString().match(/DataType$/)) {
|
|
41
41
|
throw new Error("DataType name must end up with DataType ! " + options.browseName.toString());
|
|
42
42
|
}
|
|
@@ -84,7 +84,7 @@ function addVariableTypeForDataType(namespace, dataType) {
|
|
|
84
84
|
const addressSpace = namespace.addressSpace;
|
|
85
85
|
// get Definition
|
|
86
86
|
const definition = dataType.getStructureDefinition();
|
|
87
|
-
//
|
|
87
|
+
// c8 ignore next
|
|
88
88
|
if (!definition || !(definition instanceof node_opcua_types_1.StructureDefinition)) {
|
|
89
89
|
throw new Error("dataType is not a structure");
|
|
90
90
|
}
|
|
@@ -97,7 +97,7 @@ function addVariableTypeForDataType(namespace, dataType) {
|
|
|
97
97
|
for (const field of definition.fields || []) {
|
|
98
98
|
let typeDefinition = "BaseVariableType";
|
|
99
99
|
const fType = addressSpace.findDataType(field.dataType);
|
|
100
|
-
/*
|
|
100
|
+
/* c8 ignore next */
|
|
101
101
|
if (!fType) {
|
|
102
102
|
throw new Error("Cannot find dataType" + field.dataType.toString());
|
|
103
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExtensionObjectDataType.js","sourceRoot":"","sources":["../source/addExtensionObjectDataType.ts"],"names":[],"mappings":";;;;;AAaA,8DAYC;AAWD,gEAwEC;AAED,gEAgDC;AA9JD,uEAAwH;AACxH,0EAAuC;AACvC,2GAAkI;AAClI,iEAAkG;AAElG,yDAA0D;AAC1D,2DAAoE;AACpE,uDAAmF;AAEnF;;;GAGG;AACH,SAAgB,yBAAyB,CAAC,SAAqB;IAC3D,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;IAE5C,MAAM,mBAAmB,GAAG,YAAY,CAAC,QAAQ,CAAC,4BAA4B,CAAa,CAAC;IAC5F,
|
|
1
|
+
{"version":3,"file":"addExtensionObjectDataType.js","sourceRoot":"","sources":["../source/addExtensionObjectDataType.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ function dumpReference(data, ref, options) {
|
|
|
71
71
|
return; // ignore forward HasSubtype
|
|
72
72
|
}
|
|
73
73
|
// ignore subtype references
|
|
74
|
-
/*
|
|
74
|
+
/* c8 ignore next */
|
|
75
75
|
if (!ref.node) {
|
|
76
76
|
// tslint:disable-next-line: no-console
|
|
77
77
|
console.log(" Halt ", ref.toString({ addressSpace: data.node.addressSpace }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayNodeElement.js","sourceRoot":"","sources":["../source/displayNodeElement.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"displayNodeElement.js","sourceRoot":"","sources":["../source/displayNodeElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function findReferenceToNode(node1, node2) {
|
|
|
15
15
|
return reference.nodeId.toString() === node2.nodeId.toString();
|
|
16
16
|
});
|
|
17
17
|
const ref = r ? r[0] : null;
|
|
18
|
-
/*
|
|
18
|
+
/* c8 ignore next */
|
|
19
19
|
if (!ref) {
|
|
20
20
|
// may be from subtype
|
|
21
21
|
if (node1.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType ||
|
|
@@ -33,25 +33,25 @@ function findReferenceToNode(node1, node2) {
|
|
|
33
33
|
function getChildInTypeOrBaseType(node, propertyName, namespaceIndex) {
|
|
34
34
|
const addressSpace = node.addressSpace;
|
|
35
35
|
const subtypeOf = node.subtypeOfObj;
|
|
36
|
-
/*
|
|
36
|
+
/* c8 ignore next */
|
|
37
37
|
if (!subtypeOf) {
|
|
38
38
|
throw new Error("Expecting a super type");
|
|
39
39
|
}
|
|
40
40
|
const browseResult = addressSpace.browsePath((0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(subtypeOf.nodeId, `.${namespaceIndex}:${propertyName}`));
|
|
41
41
|
const propNodeId = !browseResult.targets || !browseResult.targets[0] ? null : browseResult.targets[0].targetId;
|
|
42
|
-
/*
|
|
42
|
+
/* c8 ignore next */
|
|
43
43
|
if (!propNodeId) {
|
|
44
44
|
(0, displayNodeElement_1.displayNodeElement)(subtypeOf);
|
|
45
45
|
throw new Error("property " + propertyName + " do not exists on " + subtypeOf.browseName.toString() + " or any superType");
|
|
46
46
|
}
|
|
47
47
|
const propInSuperType = addressSpace.findNode(propNodeId);
|
|
48
|
-
/*
|
|
48
|
+
/* c8 ignore next */
|
|
49
49
|
if (!propInSuperType) {
|
|
50
50
|
throw new Error("cannot find " + propNodeId.toString());
|
|
51
51
|
}
|
|
52
52
|
// replicate property
|
|
53
53
|
const reference = findReferenceToNode(subtypeOf, propInSuperType);
|
|
54
|
-
/*
|
|
54
|
+
/* c8 ignore next */
|
|
55
55
|
if (!reference) {
|
|
56
56
|
throw new Error("cannot find reference");
|
|
57
57
|
}
|
|
@@ -61,7 +61,7 @@ function promoteToMandatory(node, propertyName, namespaceIndex) {
|
|
|
61
61
|
// get base node
|
|
62
62
|
const { propInSuperType } = getChildInTypeOrBaseType(node, propertyName, namespaceIndex);
|
|
63
63
|
// check mandatory
|
|
64
|
-
/*
|
|
64
|
+
/* c8 ignore next */
|
|
65
65
|
if (propInSuperType.modellingRule === "Mandatory") {
|
|
66
66
|
warningLog("property " + propertyName + " is already Mandatory in super type");
|
|
67
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promoteToMandatory.js","sourceRoot":"","sources":["../source/promoteToMandatory.ts"],"names":[],"mappings":";;AAkDA,4DAoCC;AAED,gDAaC;AAED,oCA0BC;AArHD,iEAAkD;AAClD,uGAA0E;AAC1E,uDAAmD;AAEnD,6DAA0D;AAE1D,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,oBAAoB,CAAC,CAAC;AAMzD,+CAA+C;AAC/C,SAAS,mBAAmB,CAAC,KAAe,EAAE,KAAe;IACzD,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;IACzC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAsB,EAAE,EAAE;QACnD,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5B,
|
|
1
|
+
{"version":3,"file":"promoteToMandatory.js","sourceRoot":"","sources":["../source/promoteToMandatory.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.164.2",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module modeler",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -14,26 +14,26 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"cli-table3": "0.6.5",
|
|
16
16
|
"csv-parse": "6.1.0",
|
|
17
|
-
"node-opcua-address-space": "2.
|
|
18
|
-
"node-opcua-assert": "2.
|
|
19
|
-
"node-opcua-basic-types": "2.
|
|
20
|
-
"node-opcua-client-dynamic-extension-object": "2.
|
|
17
|
+
"node-opcua-address-space": "2.164.2",
|
|
18
|
+
"node-opcua-assert": "2.164.0",
|
|
19
|
+
"node-opcua-basic-types": "2.164.0",
|
|
20
|
+
"node-opcua-client-dynamic-extension-object": "2.164.2",
|
|
21
21
|
"node-opcua-constants": "2.157.0",
|
|
22
|
-
"node-opcua-data-model": "2.
|
|
23
|
-
"node-opcua-debug": "2.
|
|
24
|
-
"node-opcua-factory": "2.
|
|
25
|
-
"node-opcua-nodeid": "2.
|
|
22
|
+
"node-opcua-data-model": "2.164.0",
|
|
23
|
+
"node-opcua-debug": "2.164.0",
|
|
24
|
+
"node-opcua-factory": "2.164.0",
|
|
25
|
+
"node-opcua-nodeid": "2.164.0",
|
|
26
26
|
"node-opcua-nodesets": "2.163.1",
|
|
27
|
-
"node-opcua-numeric-range": "2.
|
|
28
|
-
"node-opcua-schemas": "2.
|
|
29
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
30
|
-
"node-opcua-status-code": "2.
|
|
31
|
-
"node-opcua-types": "2.
|
|
32
|
-
"node-opcua-variant": "2.
|
|
27
|
+
"node-opcua-numeric-range": "2.164.0",
|
|
28
|
+
"node-opcua-schemas": "2.164.0",
|
|
29
|
+
"node-opcua-service-translate-browse-path": "2.164.0",
|
|
30
|
+
"node-opcua-status-code": "2.164.0",
|
|
31
|
+
"node-opcua-types": "2.164.0",
|
|
32
|
+
"node-opcua-variant": "2.164.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"node-opcua-address-space-base": "2.
|
|
36
|
-
"node-opcua-leak-detector": "2.
|
|
35
|
+
"node-opcua-address-space-base": "2.164.0",
|
|
36
|
+
"node-opcua-leak-detector": "2.164.0"
|
|
37
37
|
},
|
|
38
38
|
"repository": {
|
|
39
39
|
"type": "git",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"internet of things"
|
|
49
49
|
],
|
|
50
50
|
"homepage": "http://node-opcua.github.io/",
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "eb76d34b885c7584785d8eff69ada66f95b55c2e",
|
|
52
52
|
"files": [
|
|
53
53
|
"dist",
|
|
54
54
|
"distNodeJS",
|
|
@@ -15,7 +15,7 @@ export function getOrCreateDataTypeSystem(namespace: INamespace): UAObject {
|
|
|
15
15
|
const addressSpace = namespace.addressSpace;
|
|
16
16
|
|
|
17
17
|
const opcBinaryTypeSystem = addressSpace.findNode("OPCBinarySchema_TypeSystem") as UAObject;
|
|
18
|
-
/*
|
|
18
|
+
/* c8 ignore next */
|
|
19
19
|
if (!opcBinaryTypeSystem) {
|
|
20
20
|
throw new Error("Cannot find OPCBinarySchema_TypeSystem");
|
|
21
21
|
}
|
|
@@ -39,12 +39,12 @@ export async function addExtensionObjectDataType(namespace: INamespace, options:
|
|
|
39
39
|
|
|
40
40
|
// encodings
|
|
41
41
|
const dataTypeEncodingType = addressSpace.findObjectType("DataTypeEncodingType");
|
|
42
|
-
/*
|
|
42
|
+
/* c8 ignore next */
|
|
43
43
|
if (!dataTypeEncodingType) {
|
|
44
44
|
throw new Error("Cannot find DataTypeEncodingType");
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
/*
|
|
47
|
+
/* c8 ignore next */
|
|
48
48
|
if (!options.browseName.toString().match(/DataType$/)) {
|
|
49
49
|
throw new Error("DataType name must end up with DataType ! " + options.browseName.toString());
|
|
50
50
|
}
|
|
@@ -113,7 +113,7 @@ export function addVariableTypeForDataType(namespace: INamespace, dataType: UADa
|
|
|
113
113
|
|
|
114
114
|
// get Definition
|
|
115
115
|
const definition = dataType.getStructureDefinition();
|
|
116
|
-
//
|
|
116
|
+
// c8 ignore next
|
|
117
117
|
if (!definition || !(definition instanceof StructureDefinition)) {
|
|
118
118
|
throw new Error("dataType is not a structure");
|
|
119
119
|
}
|
|
@@ -128,7 +128,7 @@ export function addVariableTypeForDataType(namespace: INamespace, dataType: UADa
|
|
|
128
128
|
for (const field of definition.fields || []) {
|
|
129
129
|
let typeDefinition: UAVariableType | string = "BaseVariableType";
|
|
130
130
|
const fType = addressSpace.findDataType(field.dataType);
|
|
131
|
-
/*
|
|
131
|
+
/* c8 ignore next */
|
|
132
132
|
if (!fType) {
|
|
133
133
|
throw new Error("Cannot find dataType" + field.dataType.toString());
|
|
134
134
|
}
|
|
@@ -102,7 +102,7 @@ function dumpReference(data: Data, ref: UAReference, options: DumpReferenceOptio
|
|
|
102
102
|
return; // ignore forward HasSubtype
|
|
103
103
|
}
|
|
104
104
|
// ignore subtype references
|
|
105
|
-
/*
|
|
105
|
+
/* c8 ignore next */
|
|
106
106
|
if (!ref.node) {
|
|
107
107
|
// tslint:disable-next-line: no-console
|
|
108
108
|
console.log(" Halt ", ref.toString({ addressSpace: data.node.addressSpace }));
|
|
@@ -29,7 +29,7 @@ function findReferenceToNode(node1: BaseNode, node2: BaseNode): UAReference {
|
|
|
29
29
|
return reference.nodeId.toString() === node2.nodeId.toString();
|
|
30
30
|
});
|
|
31
31
|
const ref = r ? r[0] : null;
|
|
32
|
-
/*
|
|
32
|
+
/* c8 ignore next */
|
|
33
33
|
if (!ref) {
|
|
34
34
|
// may be from subtype
|
|
35
35
|
if (
|
|
@@ -56,7 +56,7 @@ export function getChildInTypeOrBaseType(
|
|
|
56
56
|
const addressSpace = node.addressSpace;
|
|
57
57
|
|
|
58
58
|
const subtypeOf = node.subtypeOfObj!;
|
|
59
|
-
/*
|
|
59
|
+
/* c8 ignore next */
|
|
60
60
|
if (!subtypeOf) {
|
|
61
61
|
throw new Error("Expecting a super type");
|
|
62
62
|
}
|
|
@@ -64,7 +64,7 @@ export function getChildInTypeOrBaseType(
|
|
|
64
64
|
const browseResult = addressSpace.browsePath(makeBrowsePath(subtypeOf.nodeId, `.${namespaceIndex}:${propertyName}`));
|
|
65
65
|
const propNodeId = !browseResult.targets || !browseResult.targets[0] ? null : browseResult.targets[0].targetId!;
|
|
66
66
|
|
|
67
|
-
/*
|
|
67
|
+
/* c8 ignore next */
|
|
68
68
|
if (!propNodeId) {
|
|
69
69
|
displayNodeElement(subtypeOf);
|
|
70
70
|
throw new Error("property " + propertyName + " do not exists on " + subtypeOf.browseName.toString() + " or any superType");
|
|
@@ -72,14 +72,14 @@ export function getChildInTypeOrBaseType(
|
|
|
72
72
|
|
|
73
73
|
const propInSuperType = addressSpace.findNode(propNodeId)! as UAVariable | UAMethod | UAObject;
|
|
74
74
|
|
|
75
|
-
/*
|
|
75
|
+
/* c8 ignore next */
|
|
76
76
|
if (!propInSuperType) {
|
|
77
77
|
throw new Error("cannot find " + propNodeId.toString());
|
|
78
78
|
}
|
|
79
79
|
// replicate property
|
|
80
80
|
const reference = findReferenceToNode(subtypeOf, propInSuperType);
|
|
81
81
|
|
|
82
|
-
/*
|
|
82
|
+
/* c8 ignore next */
|
|
83
83
|
if (!reference) {
|
|
84
84
|
throw new Error("cannot find reference");
|
|
85
85
|
}
|
|
@@ -92,7 +92,7 @@ export function promoteToMandatory(node: UAObjectType | UAVariableType, property
|
|
|
92
92
|
const { propInSuperType } = getChildInTypeOrBaseType(node, propertyName, namespaceIndex);
|
|
93
93
|
|
|
94
94
|
// check mandatory
|
|
95
|
-
/*
|
|
95
|
+
/* c8 ignore next */
|
|
96
96
|
if (propInSuperType.modellingRule === "Mandatory") {
|
|
97
97
|
warningLog("property " + propertyName + " is already Mandatory in super type");
|
|
98
98
|
}
|