node-opcua-convert-nodeset-to-javascript 2.178.0 → 2.180.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/_dataType.d.ts +4 -4
- package/dist/_dataType.js +33 -14
- package/dist/_dataType.js.map +1 -1
- package/dist/convert_namespace_to_typescript.d.ts +2 -2
- package/dist/convert_namespace_to_typescript.js +50 -52
- package/dist/convert_namespace_to_typescript.js.map +1 -1
- package/dist/convert_to_typescript.d.ts +16 -8
- package/dist/convert_to_typescript.js +122 -90
- package/dist/convert_to_typescript.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/main.js +4 -3
- package/dist/main.js.map +1 -1
- package/dist/private/cache.d.ts +4 -4
- package/dist/private/cache.js +16 -11
- package/dist/private/cache.js.map +1 -1
- package/dist/private/fs_retry.js +3 -1
- package/dist/private/fs_retry.js.map +1 -1
- package/dist/private/get_corresponding_data_type.d.ts +4 -4
- package/dist/private/get_corresponding_data_type.js +9 -10
- package/dist/private/get_corresponding_data_type.js.map +1 -1
- package/dist/private/to_filename.js.map +1 -1
- package/dist/private/utils.d.ts +5 -5
- package/dist/private/utils.js +28 -10
- package/dist/private/utils.js.map +1 -1
- package/dist/remove_unused.js +36 -7
- package/dist/remove_unused.js.map +1 -1
- package/dist/update_parent_tsconfig.js +14 -17
- package/dist/update_parent_tsconfig.js.map +1 -1
- package/dist/walk_through.d.ts +1 -1
- package/dist/walk_through.js.map +1 -1
- package/package.json +17 -17
- package/source/_dataType.ts +47 -27
- package/source/convert_namespace_to_typescript.ts +20 -25
- package/source/convert_to_typescript.ts +166 -138
- package/source/index.ts +2 -2
- package/source/main.ts +4 -3
- package/source/private/cache.ts +23 -16
- package/source/private/fs_retry.ts +3 -1
- package/source/private/get_corresponding_data_type.ts +29 -26
- package/source/private/to_filename.ts +1 -1
- package/source/private/utils.ts +41 -19
- package/source/private-stuff.ts +0 -2
- package/source/remove_unused.ts +38 -8
- package/source/update_parent_tsconfig.ts +27 -16
- package/source/walk_through.ts +3 -3
package/dist/main.js
CHANGED
|
@@ -31,7 +31,7 @@ async function main() {
|
|
|
31
31
|
const session = new node_opcua_address_space_1.PseudoSession(addressSpace);
|
|
32
32
|
const options = {
|
|
33
33
|
baseFolder: node_path_1.default.join(__dirname, "../../"),
|
|
34
|
-
prefix: "node-opcua-nodeset-"
|
|
34
|
+
prefix: "node-opcua-nodeset-"
|
|
35
35
|
};
|
|
36
36
|
// const nodesetCatalog2 = nodesetCatalog.filter((meta) => meta.name == "scales");
|
|
37
37
|
// Phase 1: convert each namespace sequentially.
|
|
@@ -47,14 +47,15 @@ async function main() {
|
|
|
47
47
|
}
|
|
48
48
|
await (0, convert_namespace_to_typescript_1.convertNamespaceTypeToTypescript)(session, index, {
|
|
49
49
|
...options,
|
|
50
|
-
nsName: meta.name
|
|
50
|
+
nsName: meta.name
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
// Phase 2: clean up imports in every nodeset package that actually has a
|
|
54
54
|
// source/ folder on disk. This covers cases where a catalog entry name
|
|
55
55
|
// doesn't line up with its package folder (e.g. catalog "standard" writes
|
|
56
56
|
// into node-opcua-nodeset-ua).
|
|
57
|
-
const folders = node_fs_1.default
|
|
57
|
+
const folders = node_fs_1.default
|
|
58
|
+
.readdirSync(options.baseFolder)
|
|
58
59
|
.filter((name) => name.startsWith(options.prefix))
|
|
59
60
|
.map((name) => node_path_1.default.join(options.baseFolder, name))
|
|
60
61
|
.filter((p) => node_fs_1.default.existsSync(node_path_1.default.join(p, "source")));
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../source/main.ts"],"names":[],"mappings":";;;;;AAAA,sDAAyB;AACzB,sDAAyB;AACzB,0DAA6B;AAE7B,uEAAuE;AACvE,4DAAuE;AACvE,6DAA+E;AAE/E,uFAAqF;AACrF,mDAA0D;AAC1D,qEAAgE;AAEhE,KAAK,UAAU,kBAAkB,CAAI,KAAU,EAAE,KAAa,EAAE,EAA8B;IAC1F,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,IAAI,EAAE;QACrD,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;YACrB,IAAI,GAAG,IAAI,KAAK,CAAC,MAAM;gBAAE,OAAO;YAChC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,IAAI;IACf,MAAM,YAAY,GAAG,uCAAY,CAAC,MAAM,EAAE,CAAC;IAE3C,MAAM,QAAQ,GAAG,oCAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,8CAAwB,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACpF,MAAM,IAAA,6BAAoB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAG,IAAI,wCAAa,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG;QACZ,UAAU,EAAE,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;QAC1C,MAAM,EAAE,qBAAqB;KAChC,CAAC;IACF,kFAAkF;IAElF,gDAAgD;IAChD,qEAAqE;IACrE,qEAAqE;IACrE,wEAAwE;IACxE,+DAA+D;IAC/D,KAAK,MAAM,IAAI,IAAI,oCAAc,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,SAAS;QACb,CAAC;QACD,MAAM,IAAA,kEAAgC,EAAC,OAAO,EAAE,KAAK,EAAE;YACnD,GAAG,OAAO;YACV,MAAM,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC,CAAC;IACP,CAAC;IAED,yEAAyE;IACzE,uEAAuE;IACvE,0EAA0E;IAC1E,+BAA+B;IAC/B,MAAM,OAAO,GAAG,iBAAE,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../source/main.ts"],"names":[],"mappings":"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"}
|
package/dist/private/cache.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { NodeClass, QualifiedName } from "node-opcua-data-model";
|
|
2
|
-
import { NodeId } from "node-opcua-nodeid";
|
|
3
|
-
import { IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
4
|
-
import { DataTypeDefinition } from "node-opcua-types";
|
|
5
|
-
import { Options } from "../options";
|
|
2
|
+
import { type NodeId } from "node-opcua-nodeid";
|
|
3
|
+
import type { IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
4
|
+
import { type DataTypeDefinition } from "node-opcua-types";
|
|
5
|
+
import type { Options } from "../options";
|
|
6
6
|
export interface Import {
|
|
7
7
|
name: string;
|
|
8
8
|
module: string;
|
package/dist/private/cache.js
CHANGED
|
@@ -9,15 +9,15 @@ exports.referenceExtensionObject = referenceExtensionObject;
|
|
|
9
9
|
exports.referenceEnumeration = referenceEnumeration;
|
|
10
10
|
exports.constructCache = constructCache;
|
|
11
11
|
exports.makeTypeNameNew = makeTypeNameNew;
|
|
12
|
-
const
|
|
12
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
13
|
+
const case_anything_1 = require("case-anything");
|
|
13
14
|
const node_opcua_assert_1 = __importDefault(require("node-opcua-assert"));
|
|
14
15
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
15
16
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
16
17
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
17
|
-
const case_anything_1 = require("case-anything");
|
|
18
18
|
const utils_1 = require("./utils");
|
|
19
19
|
function makeName2(name) {
|
|
20
|
-
return
|
|
20
|
+
return `U${name}`;
|
|
21
21
|
// if (name === "EUInformation") {
|
|
22
22
|
// return "EUInformation2";
|
|
23
23
|
// }
|
|
@@ -41,7 +41,7 @@ class Cache {
|
|
|
41
41
|
"node-opcua-variant": {
|
|
42
42
|
DataType: 1,
|
|
43
43
|
Variant: 1,
|
|
44
|
-
VariantOptions: 1
|
|
44
|
+
VariantOptions: 1
|
|
45
45
|
},
|
|
46
46
|
"node-opcua-data-model": {
|
|
47
47
|
LocalizedText: 1,
|
|
@@ -102,10 +102,11 @@ class Cache {
|
|
|
102
102
|
{
|
|
103
103
|
const sourceFolder = this.namespace[namespaceIndex]?.sourceFolder;
|
|
104
104
|
if (!sourceFolder) {
|
|
105
|
-
throw new Error(
|
|
105
|
+
throw new Error(`Cannot find namespace ${namespaceIndex}`);
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
-
|
|
108
|
+
this.namespace[namespaceIndex].symbols = this.namespace[namespaceIndex].symbols || {};
|
|
109
|
+
const symbols = this.namespace[namespaceIndex].symbols;
|
|
109
110
|
symbols[typeName] = (symbols[typeName] || 0) + 1;
|
|
110
111
|
const ns = this.requestedSymbols.namespace[namespaceIndex] || { symbols: {} };
|
|
111
112
|
this.requestedSymbols.namespace[namespaceIndex] = ns;
|
|
@@ -113,7 +114,8 @@ class Cache {
|
|
|
113
114
|
if (!mainTypeName) {
|
|
114
115
|
mainTypeName = typeName;
|
|
115
116
|
}
|
|
116
|
-
|
|
117
|
+
ns.symbols[mainTypeName] = ns.symbols[mainTypeName] || { subSymbols: {} };
|
|
118
|
+
const subs = ns.symbols[mainTypeName];
|
|
117
119
|
subs.subSymbols[typeName] = (subs.subSymbols[typeName] || 0) + 1;
|
|
118
120
|
}
|
|
119
121
|
ensureImported(i) {
|
|
@@ -131,8 +133,8 @@ function getSourceFolderForNamespace(browseName, options, cache) {
|
|
|
131
133
|
const n = cache.namespaceArray[ns].split("/").filter((s) => s.length !== 0);
|
|
132
134
|
const nn = (n[n.length - 1] !== "UA" && n[n.length - 2] !== "UA" ? n[n.length - 2] : "") + n[n.length - 1];
|
|
133
135
|
const module = options.prefix + (0, case_anything_1.kebabCase)(nn);
|
|
134
|
-
const namespaceFolder =
|
|
135
|
-
const sourceFolder =
|
|
136
|
+
const namespaceFolder = node_path_1.default.join(options.baseFolder, module);
|
|
137
|
+
const sourceFolder = node_path_1.default.join(namespaceFolder);
|
|
136
138
|
return { sourceFolder, module };
|
|
137
139
|
}
|
|
138
140
|
async function referenceExtensionObject(session, extensionObjectDataType) {
|
|
@@ -176,6 +178,9 @@ function makeBasicTypeImport(name) {
|
|
|
176
178
|
}
|
|
177
179
|
function makeTypeNameNew(nodeClass, definition, browseName, suffix) {
|
|
178
180
|
(0, node_opcua_assert_1.default)(browseName && !!browseName.name, "expecting a class name here");
|
|
181
|
+
if (!browseName.name) {
|
|
182
|
+
throw new Error("expecting a class name here");
|
|
183
|
+
}
|
|
179
184
|
const typeName = browseName.name.toString();
|
|
180
185
|
if (typeName === "EUInformation") {
|
|
181
186
|
return makeBasicTypeImport("EUInformation");
|
|
@@ -201,7 +206,7 @@ function makeTypeNameNew(nodeClass, definition, browseName, suffix) {
|
|
|
201
206
|
case node_opcua_data_model_1.NodeClass.Object:
|
|
202
207
|
case node_opcua_data_model_1.NodeClass.VariableType:
|
|
203
208
|
case node_opcua_data_model_1.NodeClass.ObjectType:
|
|
204
|
-
name = `UA${typeName.replace(/Type$/, "")}
|
|
209
|
+
name = `UA${typeName.replace(/Type$/, "")}${suffix || ""}`;
|
|
205
210
|
break;
|
|
206
211
|
case node_opcua_data_model_1.NodeClass.DataType:
|
|
207
212
|
if (definition instanceof node_opcua_types_1.EnumDefinition) {
|
|
@@ -213,7 +218,7 @@ function makeTypeNameNew(nodeClass, definition, browseName, suffix) {
|
|
|
213
218
|
break;
|
|
214
219
|
}
|
|
215
220
|
if (name === "") {
|
|
216
|
-
throw new Error(
|
|
221
|
+
throw new Error(`Internal Error ${node_opcua_data_model_1.NodeClass[nodeClass]} ${typeName}browseName = ${browseName.toString()}`);
|
|
217
222
|
}
|
|
218
223
|
return { name, module: name, namespace: browseName.namespaceIndex };
|
|
219
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../source/private/cache.ts"],"names":[],"mappings":";;;;;;AAkCA,8BAMC;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../source/private/cache.ts"],"names":[],"mappings":";;;;;;AAkCA,8BAMC;AAyHD,4DAQC;AAED,oDAKC;AAMD,wCA2BC;AAKD,0CA6CC;AAnQD,0DAA6B;AAC7B,iDAA0C;AAC1C,0EAAuC;AACvC,iEAA+E;AAC/E,yDAA+D;AAE/D,uDAA2E;AAE3E,mCAAuD;AA0BvD,SAAgB,SAAS,CAAC,IAAY;IAClC,OAAO,IAAI,IAAI,EAAE,CAAC;IAClB,kCAAkC;IAClC,+BAA+B;IAC/B,IAAI;IACJ,8EAA8E;AAClF,CAAC;AACD,MAAa,KAAK;IACd,SAAS,GAA8B,EAAE,CAAC;IAC1C,gBAAgB,GAAoB,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IACtD,mBAAmB,GAA8B,EAAE,CAAC;IACpD,OAAO,GAAiD,EAAE,CAAC;IAC3D;QACI,IAAI,CAAC,OAAO,GAAG;YACX,+BAA+B,EAAE;gBAC7B,QAAQ,EAAE,CAAC;gBACX,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,CAAC;gBACd,QAAQ,EAAE,CAAC;gBACX,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;aAChB;YACD,oBAAoB,EAAE;gBAClB,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;gBACV,cAAc,EAAE,CAAC;aACpB;YACD,uBAAuB,EAAE;gBACrB,aAAa,EAAE,CAAC;gBAChB,aAAa,EAAE,CAAC;gBAChB,cAAc,EAAE,CAAC;aACpB;YACD,wBAAwB,EAAE;gBACtB,aAAa,EAAE,CAAC;aACnB;YACD,mBAAmB,EAAE;gBACjB,MAAM,EAAE,CAAC;gBACT,cAAc,EAAE,CAAC;aACpB;YACD,wBAAwB,EAAE;gBACtB,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,CAAC;aACjB;YACD,wBAAwB,EAAE;gBACtB,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;gBACT,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;aACV;YACD,uBAAuB,EAAE;gBACrB,SAAS,EAAE,CAAC;aACf;YACD,kBAAkB,EAAE;gBAChB,aAAa,EAAE,CAAC;aACnB;YACD,6BAA6B,EAAE;gBAC3B,eAAe,EAAE,CAAC;aACrB;YACD,0BAA0B;YAC1B,yBAAyB;YACzB,IAAI;SACP,CAAC;IACN,CAAC;IACD,YAAY;QACR,IAAI,CAAC,gBAAgB,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,kBAAkB,CAAC,SAAiB;QAChC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,cAAsB,EAAE,QAAgB,EAAE,YAAqB;QACtE,IAAI,cAAc,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAClC,OAAO;QACX,CAAC;QACD,CAAC;YACG,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC;YAClE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,cAAc,EAAE,CAAC,CAAC;YAChE,CAAC;QACL,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;QACtF,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC;QACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAEjD,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAC9E,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;QAErD,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,YAAY,GAAG,QAAQ,CAAC;QAC5B,CAAC;QACD,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAC1E,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IAED,cAAc,CAAC,CAAS;QACpB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;CACJ;AA5GD,sBA4GC;AAED,SAAS,2BAA2B,CAAC,UAAyB,EAAE,OAAgB,EAAE,KAAa;IAC3F,MAAM,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC;IACrC,MAAM,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IACpF,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3G,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAA,yBAAS,EAAC,EAAE,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAChD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;AACpC,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAC1C,OAAqC,EACrC,uBAA+B;IAE/B,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IACzE,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IACzE,MAAM,kBAAkB,GAAG,eAAe,CAAC,iCAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACvF,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAEM,KAAK,UAAU,oBAAoB,CAAC,OAAqC,EAAE,mBAA2B;IACzG,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrE,MAAM,kBAAkB,GAAG,eAAe,CAAC,iCAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACvF,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED,MAAa,MAAO,SAAQ,KAAK;IACtB,cAAc,GAAa,EAAE,CAAC;CACxC;AAFD,wBAEC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAqC,EAAE,OAAgB;IACxF,MAAM,KAAK,GAAG,IAAI,MAAM,EAAE,CAAC;IAE3B,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM;QAC9C,CAAC,CAAC,KAAK,CAAC,cAAc;QACtB,CAAC,CAAC,CACI,MAAM,OAAO,CAAC,IAAI,CAAC;YACf,MAAM,EAAE,IAAA,iCAAa,EAAC,uBAAuB,CAAC;YAC9C,WAAW,EAAE,oCAAY,CAAC,KAAK;SAClC,CAAC,CACL,CAAC,KAAK,CAAC,KAAK,CAAC;IAEpB,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC;QAC1F,MAAM,YAAY,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAC1D,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,2BAA2B,CACxD,IAAI,qCAAa,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC,EACzD,OAAO,EACP,KAAK,CACR,CAAC;QACF,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YACjB,YAAY;YACZ,YAAY;YACZ,MAAM;YACN,OAAO,EAAE,EAAE;SACd,CAAC,CAAC;IACP,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY;IACrC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;AACxD,CAAC;AACD,SAAgB,eAAe,CAC3B,SAAoB,EACpB,UAAqC,EACrC,UAAyB,EACzB,MAAe;IAEf,IAAA,2BAAM,EAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;IACvE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC5C,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;QAC/B,OAAO,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;QACpC,OAAO,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;QACvC,OAAO,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;SAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QACzC,OAAO,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;QACrC,OAAO,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACJ,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,QAAQ,SAAS,EAAE,CAAC;YAChB,KAAK,iCAAS,CAAC,MAAM;gBACjB,OAAO,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,iCAAS,CAAC,QAAQ,CAAC;YACxB,KAAK,iCAAS,CAAC,MAAM,CAAC;YACtB,KAAK,iCAAS,CAAC,YAAY,CAAC;YAC5B,KAAK,iCAAS,CAAC,UAAU;gBACrB,IAAI,GAAG,KAAK,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,MAAM,IAAI,EAAE,EAAE,CAAC;gBAC3D,MAAM;YACV,KAAK,iCAAS,CAAC,QAAQ;gBACnB,IAAI,UAAU,YAAY,iCAAc,EAAE,CAAC;oBACvC,IAAI,GAAG,OAAO,QAAQ,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,EAAE,CAAC;gBACzE,CAAC;qBAAM,CAAC;oBACJ,IAAI,GAAG,KAAK,QAAQ,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,EAAE,CAAC;gBACvE,CAAC;gBACD,MAAM;QACd,CAAC;QACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,iCAAS,CAAC,SAAS,CAAC,IAAI,QAAQ,gBAAgB,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC;IACxE,CAAC;AACL,CAAC"}
|
package/dist/private/fs_retry.js
CHANGED
|
@@ -29,7 +29,9 @@ function retryOnTransientWrite(write, attempts = 6) {
|
|
|
29
29
|
if (!isTransientWriteError(err) || i === attempts - 1)
|
|
30
30
|
throw err;
|
|
31
31
|
const until = Date.now() + 50 * (i + 1);
|
|
32
|
-
while (Date.now() < until) {
|
|
32
|
+
while (Date.now() < until) {
|
|
33
|
+
/* spin */
|
|
34
|
+
}
|
|
33
35
|
}
|
|
34
36
|
}
|
|
35
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs_retry.js","sourceRoot":"","sources":["../../source/private/fs_retry.ts"],"names":[],"mappings":";;;;;AAiBA,
|
|
1
|
+
{"version":3,"file":"fs_retry.js","sourceRoot":"","sources":["../../source/private/fs_retry.ts"],"names":[],"mappings":";;;;;AAiBA,sDAYC;AAED,gDAEC;AAjCD,sDAAyB;AAEzB,kFAAkF;AAClF,qEAAqE;AACrE,wEAAwE;AACxE,EAAE;AACF,mFAAmF;AACnF,iFAAiF;AACjF,gFAAgF;AAChF,6EAA6E;AAC7E,SAAS,qBAAqB,CAAC,GAAY;IACvC,MAAM,IAAI,GAAI,GAA6B,CAAC,IAAI,CAAC;IACjD,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,CAAC;AACtE,CAAC;AAED,6EAA6E;AAC7E,+EAA+E;AAC/E,SAAgB,qBAAqB,CAAI,KAAc,EAAE,QAAQ,GAAG,CAAC;IACjE,KAAK,IAAI,CAAC,GAAG,CAAC,GAAI,CAAC,EAAE,EAAE,CAAC;QACpB,IAAI,CAAC;YACD,OAAO,KAAK,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,GAAG,CAAC;gBAAE,MAAM,GAAG,CAAC;YACjE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;gBACxB,UAAU;YACd,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAAC,QAAgB,EAAE,OAAe,EAAE,QAAQ,GAAG,CAAC;IAC9E,qBAAqB,CAAC,GAAG,EAAE,CAAC,iBAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { NodeId } from "node-opcua-nodeid";
|
|
2
|
-
import { IBasicSessionBrowseAsyncSimple, IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
1
|
+
import type { NodeId } from "node-opcua-nodeid";
|
|
2
|
+
import type { IBasicSessionBrowseAsyncSimple, IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
3
3
|
import { DataType } from "node-opcua-variant";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import type { Cache } from "./cache";
|
|
5
|
+
import { type Import } from "./cache";
|
|
6
6
|
export declare function getCorrespondingJavascriptType2(session: IBasicSessionReadAsyncSimple & IBasicSessionBrowseAsyncSimple, nodeId: NodeId, dataTypeNodeId: NodeId, cache: Cache, importCollect?: (t: Import) => void): Promise<{
|
|
7
7
|
dataType: DataType;
|
|
8
8
|
jtype: string;
|
|
@@ -10,7 +10,7 @@ async function getCorrespondingJavascriptType2(session, nodeId, dataTypeNodeId,
|
|
|
10
10
|
const valueRank = await (0, utils_1.getValueRank)(session, nodeId);
|
|
11
11
|
let jtype2 = "";
|
|
12
12
|
if (valueRank >= 0) {
|
|
13
|
-
jtype2 = jtype
|
|
13
|
+
jtype2 = `${jtype}[]`;
|
|
14
14
|
}
|
|
15
15
|
else if (valueRank === -1) {
|
|
16
16
|
jtype2 = jtype;
|
|
@@ -24,34 +24,33 @@ async function getCorrespondingJavascriptType2(session, nodeId, dataTypeNodeId,
|
|
|
24
24
|
jtype2 = `(${jtype} | ${jtype}[])`;
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
throw new Error(
|
|
27
|
+
throw new Error(`Invalid valueRank ${valueRank}`);
|
|
28
28
|
}
|
|
29
29
|
return { dataType: dataType, jtype: jtype2, dataTypeCombination, type };
|
|
30
30
|
}
|
|
31
|
-
// eslint-disable-next-line complexity
|
|
32
31
|
async function getCorrespondingJavascriptType(session, dataTypeNodeId, cache, importCollect) {
|
|
33
32
|
const info = await (0, utils_1._convertNodeIdToDataTypeAsync)(session, dataTypeNodeId);
|
|
34
33
|
const { type } = info;
|
|
35
|
-
if (type
|
|
34
|
+
if (type === "enum" && info.enumerationType) {
|
|
36
35
|
// we have a enmeration name here
|
|
37
36
|
const jtypeImport = await (0, cache_1.referenceEnumeration)(session, dataTypeNodeId);
|
|
38
37
|
const jtype = jtypeImport.name;
|
|
39
|
-
importCollect
|
|
38
|
+
importCollect?.(jtypeImport);
|
|
40
39
|
return { dataType: info.dataType, jtype, type };
|
|
41
40
|
}
|
|
42
|
-
if (type
|
|
41
|
+
if (type === "basic" && info.dataType === node_opcua_variant_1.DataType.ExtensionObject) {
|
|
43
42
|
const jtypeImport = await (0, cache_1.referenceExtensionObject)(session, dataTypeNodeId);
|
|
44
43
|
const jtype = jtypeImport.name;
|
|
45
|
-
importCollect
|
|
44
|
+
importCollect?.(jtypeImport);
|
|
46
45
|
return { dataType: info.dataType, jtype, type };
|
|
47
46
|
}
|
|
48
47
|
const referenceBasicType = (name) => {
|
|
49
48
|
const t = { name, namespace: -1, module: "BasicType" };
|
|
50
|
-
importCollect
|
|
49
|
+
importCollect?.(t);
|
|
51
50
|
cache.ensureImported(t);
|
|
52
51
|
return t.name;
|
|
53
52
|
};
|
|
54
|
-
if (type
|
|
53
|
+
if (type === "genericNumber") {
|
|
55
54
|
const { dataTypeCombination } = info;
|
|
56
55
|
return { dataType: node_opcua_variant_1.DataType.Variant, jtype: "number", type, dataTypeCombination };
|
|
57
56
|
}
|
|
@@ -109,7 +108,7 @@ async function getCorrespondingJavascriptType(session, dataTypeNodeId, cache, im
|
|
|
109
108
|
case node_opcua_variant_1.DataType.XmlElement:
|
|
110
109
|
return { dataType, jtype: referenceBasicType("String"), type };
|
|
111
110
|
default:
|
|
112
|
-
throw new Error(
|
|
111
|
+
throw new Error(`Unsupported ${dataType} ${node_opcua_variant_1.DataType[dataType]}`);
|
|
113
112
|
}
|
|
114
113
|
}
|
|
115
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_corresponding_data_type.js","sourceRoot":"","sources":["../../source/private/get_corresponding_data_type.ts"],"names":[],"mappings":";;AAOA,
|
|
1
|
+
{"version":3,"file":"get_corresponding_data_type.js","sourceRoot":"","sources":["../../source/private/get_corresponding_data_type.ts"],"names":[],"mappings":";;AAOA,0EA6BC;AAED,wEA+FC;AAnID,2DAA8C;AAE9C,mCAAsF;AACtF,mCAAsE;AAE/D,KAAK,UAAU,+BAA+B,CACjD,OAAsE,EACtE,MAAc,EACd,cAAsB,EACtB,KAAY,EACZ,aAAmC;IAEnC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,GAAG,MAAM,8BAA8B,CACvF,OAAO,EACP,cAAc,EACd,KAAK,EACL,aAAa,CAChB,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,KAAK,IAAI,CAAC;IAC1B,CAAC;SAAM,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1B,MAAM,GAAG,KAAK,CAAC;IACnB,CAAC;SAAM,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1B,wEAAwE;QACxE,MAAM,GAAG,IAAI,KAAK,MAAM,KAAK,KAAK,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1B,oFAAoF;QACpF,MAAM,GAAG,IAAI,KAAK,MAAM,KAAK,KAAK,CAAC;IACvC,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,qBAAqB,SAAS,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC;AAC5E,CAAC;AAEM,KAAK,UAAU,8BAA8B,CAChD,OAAsE,EACtE,cAAsB,EACtB,KAAY,EACZ,aAAmC;IAQnC,MAAM,IAAI,GAAG,MAAM,IAAA,qCAA6B,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAEtB,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QAC1C,iCAAiC;QACjC,MAAM,WAAW,GAAG,MAAM,IAAA,4BAAoB,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;QAC/B,aAAa,EAAE,CAAC,WAAW,CAAC,CAAC;QAC7B,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,QAAQ,KAAK,6BAAQ,CAAC,eAAe,EAAE,CAAC;QACjE,MAAM,WAAW,GAAG,MAAM,IAAA,gCAAwB,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;QAC/B,aAAa,EAAE,CAAC,WAAW,CAAC,CAAC;QAC7B,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC;IACD,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAU,EAAE;QAChD,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QACvD,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QACnB,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACxB,OAAO,CAAC,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC;IACF,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;QAC3B,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;QACrC,OAAO,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;IACtF,CAAC;SAAM,CAAC;QACJ,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAC1B,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,6BAAQ,CAAC,IAAI;gBACd,OAAO,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,CAAC;YAC7F,KAAK,6BAAQ,CAAC,OAAO;gBACjB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YAChD,KAAK,6BAAQ,CAAC,IAAI;gBACd,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC;YACjE,KAAK,6BAAQ,CAAC,UAAU;gBACpB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/C,KAAK,6BAAQ,CAAC,SAAS;gBACnB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC;YACtE,KAAK,6BAAQ,CAAC,QAAQ;gBAClB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YAC7C,KAAK,6BAAQ,CAAC,cAAc;gBACxB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,CAAC;YAC3E,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/C,KAAK,6BAAQ,CAAC,KAAK;gBACf,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/C,KAAK,6BAAQ,CAAC,IAAI;gBACd,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC;YACjE,KAAK,6BAAQ,CAAC,KAAK;gBACf,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;YAClE,KAAK,6BAAQ,CAAC,KAAK;gBACf,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;YAClE,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;YACnE,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;YACnE,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;YACnE,KAAK,6BAAQ,CAAC,KAAK;gBACf,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;YAClE,KAAK,6BAAQ,CAAC,aAAa;gBACvB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC;YAC1E,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;YACnE,KAAK,6BAAQ,CAAC,cAAc;gBACxB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,CAAC;YAC3E,KAAK,6BAAQ,CAAC,aAAa;gBACvB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC;YAC1E,KAAK,6BAAQ,CAAC,KAAK;gBACf,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC;YAClE,KAAK,6BAAQ,CAAC,UAAU;gBACpB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC;YACvE,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC;YACrE,KAAK,6BAAQ,CAAC,OAAO;gBACjB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;YACpE,KAAK,6BAAQ,CAAC,UAAU;gBACpB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;YACnE;gBACI,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,IAAI,6BAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"to_filename.js","sourceRoot":"","sources":["../../source/private/to_filename.ts"],"names":[],"mappings":";;AAEA,gCAGC;AALD,iDAA0C;AAE1C,SAAgB,UAAU,CAAC,GAAW;IAClC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"to_filename.js","sourceRoot":"","sources":["../../source/private/to_filename.ts"],"names":[],"mappings":";;AAEA,gCAGC;AALD,iDAA0C;AAE1C,SAAgB,UAAU,CAAC,GAAW;IAClC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChF,OAAO,IAAA,yBAAS,EAAC,GAAG,CAAC,CAAC;AAC1B,CAAC"}
|
package/dist/private/utils.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import type { ModellingRuleType } from "node-opcua-address-space-base";
|
|
2
|
+
import { type LocalizedText, NodeClass, QualifiedName } from "node-opcua-data-model";
|
|
3
|
+
import { type NodeId } from "node-opcua-nodeid";
|
|
4
|
+
import type { IBasicSessionBrowseAsyncSimple, IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
5
|
+
import { type DataTypeDefinition, ReferenceDescription } from "node-opcua-types";
|
|
6
6
|
import { DataType } from "node-opcua-variant";
|
|
7
7
|
export declare function getDefinition(session: IBasicSessionReadAsyncSimple, nodeId: NodeId): Promise<DataTypeDefinition | null>;
|
|
8
8
|
export declare function getBrowseName(session: IBasicSessionReadAsyncSimple, nodeId: NodeId): Promise<QualifiedName>;
|
package/dist/private/utils.js
CHANGED
|
@@ -19,13 +19,14 @@ exports.getTypeDefinition = getTypeDefinition;
|
|
|
19
19
|
exports._convertNodeIdToDataTypeAsync = _convertNodeIdToDataTypeAsync;
|
|
20
20
|
exports.getChildrenOrFolderElements = getChildrenOrFolderElements;
|
|
21
21
|
exports.getValueRank = getValueRank;
|
|
22
|
+
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
22
23
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
24
|
+
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
23
25
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
24
|
-
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
25
26
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
26
27
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
27
|
-
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
28
28
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
29
|
+
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
29
30
|
async function getDefinition(session, nodeId) {
|
|
30
31
|
const dataValue = await session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition });
|
|
31
32
|
return dataValue.value.value || null;
|
|
@@ -84,7 +85,11 @@ async function getModellingRule(session, nodeId) {
|
|
|
84
85
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
85
86
|
return null;
|
|
86
87
|
}
|
|
87
|
-
|
|
88
|
+
const modellingRuleName = browseResult.references[0].browseName.name;
|
|
89
|
+
if (!modellingRuleName) {
|
|
90
|
+
throw new Error(`HasModellingRule reference for ${nodeId.toString()} has no browseName`);
|
|
91
|
+
}
|
|
92
|
+
return modellingRuleName;
|
|
88
93
|
}
|
|
89
94
|
async function isExtensionObject(session, nodeId) {
|
|
90
95
|
const n = nodeId;
|
|
@@ -95,6 +100,9 @@ async function isExtensionObject(session, nodeId) {
|
|
|
95
100
|
return false;
|
|
96
101
|
}
|
|
97
102
|
const r = await getSubtypeNodeIdIfAny(session, nodeId);
|
|
103
|
+
if (!r) {
|
|
104
|
+
throw new Error(`cannot find SuperType of ${nodeId.toString()}`);
|
|
105
|
+
}
|
|
98
106
|
return await isExtensionObject(session, r.nodeId);
|
|
99
107
|
}
|
|
100
108
|
async function isEnumeration(session, nodeId) {
|
|
@@ -106,6 +114,9 @@ async function isEnumeration(session, nodeId) {
|
|
|
106
114
|
return false;
|
|
107
115
|
}
|
|
108
116
|
const r = await getSubtypeNodeIdIfAny(session, nodeId);
|
|
117
|
+
if (!r) {
|
|
118
|
+
throw new Error(`cannot find SuperType of ${nodeId.toString()}`);
|
|
119
|
+
}
|
|
109
120
|
return await isEnumeration(session, r.nodeId);
|
|
110
121
|
}
|
|
111
122
|
async function extractBasicDataType(session, dataTypeNodeId) {
|
|
@@ -114,6 +125,9 @@ async function extractBasicDataType(session, dataTypeNodeId) {
|
|
|
114
125
|
return dataTypeNodeId.value;
|
|
115
126
|
}
|
|
116
127
|
const r = await getSubtypeNodeIdIfAny(session, dataTypeNodeId);
|
|
128
|
+
if (!r) {
|
|
129
|
+
throw new Error(`cannot find SuperType of ${dataTypeNodeId.toString()}`);
|
|
130
|
+
}
|
|
117
131
|
return await extractBasicDataType(session, r.nodeId);
|
|
118
132
|
}
|
|
119
133
|
async function getSubtypeNodeIdIfAny(session, nodeId) {
|
|
@@ -174,7 +188,8 @@ async function getTypeDefinition(session, nodeId) {
|
|
|
174
188
|
resultMask: 0xffff
|
|
175
189
|
});
|
|
176
190
|
if (!browseResult.references || browseResult.references.length === 0) {
|
|
177
|
-
|
|
191
|
+
// c8 ignore next
|
|
192
|
+
doDebug && debugLog("no subtype", nodeId.toString());
|
|
178
193
|
throw new Error("No subtype");
|
|
179
194
|
}
|
|
180
195
|
return browseResult.references[0];
|
|
@@ -231,16 +246,19 @@ async function _convertNodeIdToDataTypeAsync(session, dataTypeId) {
|
|
|
231
246
|
referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype"),
|
|
232
247
|
resultMask: 0xff
|
|
233
248
|
};
|
|
234
|
-
// tslint:disable:no-shadowed-variable
|
|
235
249
|
const browseResult = await session.browse(nodeToBrowse);
|
|
236
|
-
const references = browseResult
|
|
237
|
-
if (
|
|
238
|
-
throw new Error(
|
|
250
|
+
const references = browseResult?.references;
|
|
251
|
+
if (references?.length !== 1) {
|
|
252
|
+
throw new Error(`cannot find SuperType of ${dataTypeName.toString()}`);
|
|
239
253
|
}
|
|
240
254
|
const nodeId = references[0].nodeId;
|
|
241
255
|
const info = await _convertNodeIdToDataTypeAsync(session, nodeId);
|
|
242
|
-
if (info.type
|
|
243
|
-
|
|
256
|
+
if (info.type === "enum" && info.enumerationId) {
|
|
257
|
+
const enumerationType = dataTypeName.name;
|
|
258
|
+
if (!enumerationType) {
|
|
259
|
+
throw new Error(`cannot find name for enumeration dataType ${dataTypeId.toString()}`);
|
|
260
|
+
}
|
|
261
|
+
return { ...info, enumerationId: dataTypeId, enumerationType };
|
|
244
262
|
}
|
|
245
263
|
return info;
|
|
246
264
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/remove_unused.js
CHANGED
|
@@ -10,11 +10,37 @@ const ts_morph_1 = require("ts-morph");
|
|
|
10
10
|
const fs_retry_1 = require("./private/fs_retry");
|
|
11
11
|
const dryRun = false;
|
|
12
12
|
const NODE_BUILTINS = new Set([
|
|
13
|
-
"assert",
|
|
14
|
-
"
|
|
15
|
-
"
|
|
16
|
-
"
|
|
17
|
-
"
|
|
13
|
+
"assert",
|
|
14
|
+
"async_hooks",
|
|
15
|
+
"buffer",
|
|
16
|
+
"child_process",
|
|
17
|
+
"cluster",
|
|
18
|
+
"console",
|
|
19
|
+
"crypto",
|
|
20
|
+
"dgram",
|
|
21
|
+
"dns",
|
|
22
|
+
"events",
|
|
23
|
+
"fs",
|
|
24
|
+
"http",
|
|
25
|
+
"http2",
|
|
26
|
+
"https",
|
|
27
|
+
"net",
|
|
28
|
+
"os",
|
|
29
|
+
"path",
|
|
30
|
+
"perf_hooks",
|
|
31
|
+
"process",
|
|
32
|
+
"querystring",
|
|
33
|
+
"readline",
|
|
34
|
+
"stream",
|
|
35
|
+
"string_decoder",
|
|
36
|
+
"tls",
|
|
37
|
+
"tty",
|
|
38
|
+
"url",
|
|
39
|
+
"util",
|
|
40
|
+
"v8",
|
|
41
|
+
"vm",
|
|
42
|
+
"worker_threads",
|
|
43
|
+
"zlib"
|
|
18
44
|
]);
|
|
19
45
|
function importGroup(spec) {
|
|
20
46
|
if (spec.startsWith("node:") || NODE_BUILTINS.has(spec))
|
|
@@ -155,7 +181,10 @@ function tidyEmptyInterfaces(file) {
|
|
|
155
181
|
// Rule only fires when there's no extends clause.
|
|
156
182
|
if (iface.getExtends().length !== 0)
|
|
157
183
|
continue;
|
|
158
|
-
const leading = iface
|
|
184
|
+
const leading = iface
|
|
185
|
+
.getLeadingCommentRanges()
|
|
186
|
+
.map((c) => c.getText())
|
|
187
|
+
.join("\n");
|
|
159
188
|
if (leading.includes("biome-ignore lint/suspicious/noEmptyInterface"))
|
|
160
189
|
continue;
|
|
161
190
|
positions.push(iface.getStart());
|
|
@@ -227,7 +256,7 @@ async function cleanUpTypescriptModule(moduleFolder) {
|
|
|
227
256
|
const project = new ts_morph_1.Project({
|
|
228
257
|
skipAddingFilesFromTsConfig: true,
|
|
229
258
|
skipFileDependencyResolution: true,
|
|
230
|
-
skipLoadingLibFiles: true
|
|
259
|
+
skipLoadingLibFiles: true
|
|
231
260
|
});
|
|
232
261
|
const dirFiles = await node_fs_1.default.promises.readdir(sourceFolder);
|
|
233
262
|
for (const f of dirFiles) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove_unused.js","sourceRoot":"","sources":["../source/remove_unused.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"remove_unused.js","sourceRoot":"","sources":["../source/remove_unused.ts"],"names":[],"mappings":"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"}
|