node-opcua-modeler 2.152.0 → 2.154.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/addExtensionObjectDataType.js +3 -0
- package/dist/addExtensionObjectDataType.js.map +1 -1
- package/dist/displayNodeElement.js +0 -1
- package/dist/displayNodeElement.js.map +1 -1
- package/dist/promoteToMandatory.js +1 -1
- package/dist/promoteToMandatory.js.map +1 -1
- package/dist/tableHelper.js +3 -0
- package/dist/tableHelper.js.map +1 -1
- package/package.json +18 -18
- package/source/addExtensionObjectDataType.ts +3 -3
- package/source/displayNodeElement.ts +1 -1
- package/source/promoteToMandatory.ts +1 -1
- package/source/tableHelper.ts +4 -0
|
@@ -77,6 +77,7 @@ async function addExtensionObjectDataType(namespace, options) {
|
|
|
77
77
|
const cache = {};
|
|
78
78
|
const schema = await (0, node_opcua_client_dynamic_extension_object_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataType.nodeId, className, dataType.getStructureDefinition(), null, dataTypeFactory, isAbstract, cache);
|
|
79
79
|
const Constructor = (0, node_opcua_schemas_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
|
|
80
|
+
Constructor;
|
|
80
81
|
return dataType;
|
|
81
82
|
}
|
|
82
83
|
function addVariableTypeForDataType(namespace, dataType) {
|
|
@@ -111,6 +112,7 @@ function addVariableTypeForDataType(namespace, dataType) {
|
|
|
111
112
|
modellingRule: "Mandatory",
|
|
112
113
|
valueRank: field.valueRank === undefined ? -1 : field.valueRank
|
|
113
114
|
});
|
|
115
|
+
comp;
|
|
114
116
|
}
|
|
115
117
|
else {
|
|
116
118
|
const comp = namespace.addVariable({
|
|
@@ -122,6 +124,7 @@ function addVariableTypeForDataType(namespace, dataType) {
|
|
|
122
124
|
typeDefinition,
|
|
123
125
|
valueRank: field.valueRank === undefined ? -1 : field.valueRank
|
|
124
126
|
});
|
|
127
|
+
comp;
|
|
125
128
|
}
|
|
126
129
|
}
|
|
127
130
|
return variableType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExtensionObjectDataType.js","sourceRoot":"","sources":["../source/addExtensionObjectDataType.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"addExtensionObjectDataType.js","sourceRoot":"","sources":["../source/addExtensionObjectDataType.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
|
6
6
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
7
7
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
8
8
|
const tableHelper_1 = require("./tableHelper");
|
|
9
|
-
const a = "ⓂⓄⓋⓥⓇ❗⟵ ⟶⟷";
|
|
10
9
|
function symbol(nodeClass) {
|
|
11
10
|
switch (nodeClass) {
|
|
12
11
|
case node_opcua_data_model_1.NodeClass.DataType:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayNodeElement.js","sourceRoot":"","sources":["../source/displayNodeElement.ts"],"names":[],"mappings":";;AA6MA,gDA2EC;AAxRD,uEASkC;AAClC,iEAAmE;AACnE,yDAA0D;AAC1D,2DAA8C;AAC9C,+CAA4C;
|
|
1
|
+
{"version":3,"file":"displayNodeElement.js","sourceRoot":"","sources":["../source/displayNodeElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,7 @@ function getChildInTypeOrBaseType(node, propertyName, namespaceIndex) {
|
|
|
59
59
|
}
|
|
60
60
|
function promoteToMandatory(node, propertyName, namespaceIndex) {
|
|
61
61
|
// get base node
|
|
62
|
-
const { propInSuperType
|
|
62
|
+
const { propInSuperType } = getChildInTypeOrBaseType(node, propertyName, namespaceIndex);
|
|
63
63
|
// check mandatory
|
|
64
64
|
/* istanbul ignore next */
|
|
65
65
|
if (propInSuperType.modellingRule === "Mandatory") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promoteToMandatory.js","sourceRoot":"","sources":["../source/promoteToMandatory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"promoteToMandatory.js","sourceRoot":"","sources":["../source/promoteToMandatory.ts"],"names":[],"mappings":"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"}
|
package/dist/tableHelper.js
CHANGED
|
@@ -24,6 +24,9 @@ const chars3 = {
|
|
|
24
24
|
"left": "| ", "left-mid": "", "mid": "-", "mid-mid": " | ",
|
|
25
25
|
"right": " |", "right-mid": "", "middle": " | "
|
|
26
26
|
};
|
|
27
|
+
chars1;
|
|
28
|
+
chars2;
|
|
29
|
+
chars3;
|
|
27
30
|
function toMarkdownTable(table) {
|
|
28
31
|
const t = [];
|
|
29
32
|
t.push("| " + table.head.join(" | ") + " |");
|
package/dist/tableHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableHelper.js","sourceRoot":"","sources":["../source/tableHelper.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEpC,MAAM,MAAM,GAAG;IACX,qDAAqD;IACrD,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG;IAC3D,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG;IACzE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG;IACxD,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;CAClD,CAAC;
|
|
1
|
+
{"version":3,"file":"tableHelper.js","sourceRoot":"","sources":["../source/tableHelper.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.154.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,27 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"cli-table3": "^0.6.5",
|
|
16
16
|
"csv-parse": "5.6.0",
|
|
17
|
-
"node-opcua-address-space": "2.
|
|
18
|
-
"node-opcua-address-space-base": "2.
|
|
17
|
+
"node-opcua-address-space": "2.154.0",
|
|
18
|
+
"node-opcua-address-space-base": "2.154.0",
|
|
19
19
|
"node-opcua-assert": "2.139.0",
|
|
20
|
-
"node-opcua-basic-types": "2.
|
|
21
|
-
"node-opcua-client-dynamic-extension-object": "2.
|
|
20
|
+
"node-opcua-basic-types": "2.154.0",
|
|
21
|
+
"node-opcua-client-dynamic-extension-object": "2.154.0",
|
|
22
22
|
"node-opcua-constants": "2.139.0",
|
|
23
|
-
"node-opcua-data-model": "2.
|
|
24
|
-
"node-opcua-debug": "2.
|
|
25
|
-
"node-opcua-factory": "2.
|
|
26
|
-
"node-opcua-nodeid": "2.
|
|
27
|
-
"node-opcua-nodesets": "2.
|
|
28
|
-
"node-opcua-numeric-range": "2.
|
|
29
|
-
"node-opcua-schemas": "2.
|
|
30
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
31
|
-
"node-opcua-status-code": "2.
|
|
32
|
-
"node-opcua-types": "2.
|
|
33
|
-
"node-opcua-variant": "2.
|
|
23
|
+
"node-opcua-data-model": "2.154.0",
|
|
24
|
+
"node-opcua-debug": "2.153.0",
|
|
25
|
+
"node-opcua-factory": "2.154.0",
|
|
26
|
+
"node-opcua-nodeid": "2.153.0",
|
|
27
|
+
"node-opcua-nodesets": "2.154.0",
|
|
28
|
+
"node-opcua-numeric-range": "2.154.0",
|
|
29
|
+
"node-opcua-schemas": "2.154.0",
|
|
30
|
+
"node-opcua-service-translate-browse-path": "2.154.0",
|
|
31
|
+
"node-opcua-status-code": "2.153.0",
|
|
32
|
+
"node-opcua-types": "2.154.0",
|
|
33
|
+
"node-opcua-variant": "2.154.0",
|
|
34
34
|
"yargs": "15.4.1"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"node-opcua-leak-detector": "2.
|
|
37
|
+
"node-opcua-leak-detector": "2.154.0",
|
|
38
38
|
"should": "^13.2.3"
|
|
39
39
|
},
|
|
40
40
|
"repository": {
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"internet of things"
|
|
51
51
|
],
|
|
52
52
|
"homepage": "http://node-opcua.github.io/",
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "134c73195f93f46c0101b2837bed22754156c916",
|
|
54
54
|
"files": [
|
|
55
55
|
"dist",
|
|
56
56
|
"distNodeJS",
|
|
@@ -104,7 +104,7 @@ export async function addExtensionObjectDataType(namespace: INamespace, options:
|
|
|
104
104
|
cache
|
|
105
105
|
);
|
|
106
106
|
const Constructor = createDynamicObjectConstructor(schema, dataTypeFactory) as ConstructorFuncWithSchema;
|
|
107
|
-
|
|
107
|
+
Constructor;
|
|
108
108
|
return dataType;
|
|
109
109
|
}
|
|
110
110
|
|
|
@@ -142,7 +142,7 @@ export function addVariableTypeForDataType(namespace: INamespace, dataType: UADa
|
|
|
142
142
|
description: field.description,
|
|
143
143
|
modellingRule: "Mandatory",
|
|
144
144
|
valueRank: field.valueRank === undefined ? -1 : field.valueRank
|
|
145
|
-
});
|
|
145
|
+
}); comp;
|
|
146
146
|
} else {
|
|
147
147
|
const comp = namespace.addVariable({
|
|
148
148
|
browseName: field.name!,
|
|
@@ -152,7 +152,7 @@ export function addVariableTypeForDataType(namespace: INamespace, dataType: UADa
|
|
|
152
152
|
modellingRule: "Mandatory",
|
|
153
153
|
typeDefinition,
|
|
154
154
|
valueRank: field.valueRank === undefined ? -1 : field.valueRank
|
|
155
|
-
});
|
|
155
|
+
}); comp;
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
return variableType;
|
|
@@ -13,7 +13,7 @@ import { NodeId, resolveNodeId } from "node-opcua-nodeid";
|
|
|
13
13
|
import { DataType } from "node-opcua-variant";
|
|
14
14
|
import { TableHelper } from "./tableHelper";
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
|
|
17
17
|
function symbol(nodeClass: NodeClass) {
|
|
18
18
|
switch (nodeClass) {
|
|
19
19
|
case NodeClass.DataType:
|
|
@@ -89,7 +89,7 @@ export function getChildInTypeOrBaseType(
|
|
|
89
89
|
export function promoteToMandatory(node: UAObjectType | UAVariableType, propertyName: string, namespaceIndex: number): UAConcrete {
|
|
90
90
|
// get base node
|
|
91
91
|
|
|
92
|
-
const { propInSuperType
|
|
92
|
+
const { propInSuperType } = getChildInTypeOrBaseType(node, propertyName, namespaceIndex);
|
|
93
93
|
|
|
94
94
|
// check mandatory
|
|
95
95
|
/* istanbul ignore next */
|
package/source/tableHelper.ts
CHANGED
|
@@ -8,6 +8,7 @@ const chars1 = {
|
|
|
8
8
|
, "left": "|", "left-mid": "+", "mid": "-", "mid-mid": "+"
|
|
9
9
|
, "right": "|", "right-mid": "+", "middle": "|"
|
|
10
10
|
};
|
|
11
|
+
|
|
11
12
|
const chars2 = {
|
|
12
13
|
// tslint:disable-next-line: object-literal-sort-keys
|
|
13
14
|
"top": " ", "top-mid": " ", "top-left": " ", "top-right": " "
|
|
@@ -22,6 +23,9 @@ const chars3 = {
|
|
|
22
23
|
, "left": "| ", "left-mid": "", "mid": "-", "mid-mid": " | "
|
|
23
24
|
, "right": " |", "right-mid": "", "middle": " | "
|
|
24
25
|
};
|
|
26
|
+
chars1;
|
|
27
|
+
chars2;
|
|
28
|
+
chars3;
|
|
25
29
|
|
|
26
30
|
function toMarkdownTable(table: { head: string[], rows: string[][] }): string {
|
|
27
31
|
|