node-opcua-convert-nodeset-to-javascript 2.180.0 → 2.181.1
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 +2 -2
- package/dist/_dataType.js +27 -27
- package/dist/_dataType.js.map +1 -1
- package/dist/convert_namespace_to_typescript.d.ts +1 -1
- package/dist/convert_namespace_to_typescript.js +15 -14
- package/dist/convert_namespace_to_typescript.js.map +1 -1
- package/dist/convert_to_typescript.d.ts +4 -2
- package/dist/convert_to_typescript.js +79 -57
- package/dist/convert_to_typescript.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/main.js +31 -7
- package/dist/main.js.map +1 -1
- package/dist/package_root.d.ts +4 -0
- package/dist/package_root.js +25 -0
- package/dist/package_root.js.map +1 -0
- package/dist/private/cache.d.ts +1 -1
- package/dist/private/cache.js +5 -5
- package/dist/private/cache.js.map +1 -1
- package/dist/private/get_corresponding_data_type.d.ts +2 -2
- package/dist/private/get_corresponding_data_type.js +6 -6
- package/dist/private/get_corresponding_data_type.js.map +1 -1
- package/dist/private/utils.js +2 -2
- package/dist/private/utils.js.map +1 -1
- package/dist/private-stuff.d.ts +4 -4
- package/dist/private-stuff.js +4 -4
- package/dist/private-stuff.js.map +1 -1
- package/dist/remove_unused.js +8 -3
- package/dist/remove_unused.js.map +1 -1
- package/dist/update_parent_tsconfig.js +3 -6
- package/dist/update_parent_tsconfig.js.map +1 -1
- package/dist/utils2.d.ts +15 -1
- package/dist/utils2.js +27 -22
- package/dist/utils2.js.map +1 -1
- package/package.json +17 -16
- package/source/_dataType.ts +5 -5
- package/source/convert_namespace_to_typescript.ts +10 -9
- package/source/convert_to_typescript.ts +35 -10
- package/source/index.ts +3 -3
- package/source/main.ts +30 -5
- package/source/package_root.ts +21 -0
- package/source/private/cache.ts +2 -2
- package/source/private/get_corresponding_data_type.ts +3 -3
- package/source/private/utils.ts +2 -2
- package/source/private-stuff.ts +4 -4
- package/source/remove_unused.ts +7 -2
- package/source/update_parent_tsconfig.ts +2 -4
- package/source/utils2.ts +40 -22
package/dist/private/cache.js
CHANGED
|
@@ -15,7 +15,7 @@ const node_opcua_assert_1 = __importDefault(require("node-opcua-assert"));
|
|
|
15
15
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
16
16
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
17
17
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
18
|
-
const
|
|
18
|
+
const utils_js_1 = require("./utils.js");
|
|
19
19
|
function makeName2(name) {
|
|
20
20
|
return `U${name}`;
|
|
21
21
|
// if (name === "EUInformation") {
|
|
@@ -138,14 +138,14 @@ function getSourceFolderForNamespace(browseName, options, cache) {
|
|
|
138
138
|
return { sourceFolder, module };
|
|
139
139
|
}
|
|
140
140
|
async function referenceExtensionObject(session, extensionObjectDataType) {
|
|
141
|
-
const browseName = await (0,
|
|
142
|
-
const definition = await (0,
|
|
141
|
+
const browseName = await (0, utils_js_1.getBrowseName)(session, extensionObjectDataType);
|
|
142
|
+
const definition = await (0, utils_js_1.getDefinition)(session, extensionObjectDataType);
|
|
143
143
|
const dataTypeNameImport = makeTypeNameNew(node_opcua_data_model_1.NodeClass.DataType, definition, browseName);
|
|
144
144
|
return dataTypeNameImport;
|
|
145
145
|
}
|
|
146
146
|
async function referenceEnumeration(session, enumerationDataType) {
|
|
147
|
-
const browseName = await (0,
|
|
148
|
-
const definition = await (0,
|
|
147
|
+
const browseName = await (0, utils_js_1.getBrowseName)(session, enumerationDataType);
|
|
148
|
+
const definition = await (0, utils_js_1.getDefinition)(session, enumerationDataType);
|
|
149
149
|
const dataTypeNameImport = makeTypeNameNew(node_opcua_data_model_1.NodeClass.DataType, definition, browseName);
|
|
150
150
|
return dataTypeNameImport;
|
|
151
151
|
}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../source/private/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { NodeId } from "node-opcua-nodeid";
|
|
2
2
|
import type { IBasicSessionBrowseAsyncSimple, IBasicSessionReadAsyncSimple } from "node-opcua-pseudo-session";
|
|
3
3
|
import { DataType } from "node-opcua-variant";
|
|
4
|
-
import type { Cache } from "./cache";
|
|
5
|
-
import { type Import } from "./cache";
|
|
4
|
+
import type { Cache } from "./cache.js";
|
|
5
|
+
import { type Import } from "./cache.js";
|
|
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;
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getCorrespondingJavascriptType2 = getCorrespondingJavascriptType2;
|
|
4
4
|
exports.getCorrespondingJavascriptType = getCorrespondingJavascriptType;
|
|
5
5
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const cache_js_1 = require("./cache.js");
|
|
7
|
+
const utils_js_1 = require("./utils.js");
|
|
8
8
|
async function getCorrespondingJavascriptType2(session, nodeId, dataTypeNodeId, cache, importCollect) {
|
|
9
9
|
const { dataType, jtype, dataTypeCombination, type } = await getCorrespondingJavascriptType(session, dataTypeNodeId, cache, importCollect);
|
|
10
|
-
const valueRank = await (0,
|
|
10
|
+
const valueRank = await (0, utils_js_1.getValueRank)(session, nodeId);
|
|
11
11
|
let jtype2 = "";
|
|
12
12
|
if (valueRank >= 0) {
|
|
13
13
|
jtype2 = `${jtype}[]`;
|
|
@@ -29,17 +29,17 @@ async function getCorrespondingJavascriptType2(session, nodeId, dataTypeNodeId,
|
|
|
29
29
|
return { dataType: dataType, jtype: jtype2, dataTypeCombination, type };
|
|
30
30
|
}
|
|
31
31
|
async function getCorrespondingJavascriptType(session, dataTypeNodeId, cache, importCollect) {
|
|
32
|
-
const info = await (0,
|
|
32
|
+
const info = await (0, utils_js_1._convertNodeIdToDataTypeAsync)(session, dataTypeNodeId);
|
|
33
33
|
const { type } = info;
|
|
34
34
|
if (type === "enum" && info.enumerationType) {
|
|
35
35
|
// we have a enmeration name here
|
|
36
|
-
const jtypeImport = await (0,
|
|
36
|
+
const jtypeImport = await (0, cache_js_1.referenceEnumeration)(session, dataTypeNodeId);
|
|
37
37
|
const jtype = jtypeImport.name;
|
|
38
38
|
importCollect?.(jtypeImport);
|
|
39
39
|
return { dataType: info.dataType, jtype, type };
|
|
40
40
|
}
|
|
41
41
|
if (type === "basic" && info.dataType === node_opcua_variant_1.DataType.ExtensionObject) {
|
|
42
|
-
const jtypeImport = await (0,
|
|
42
|
+
const jtypeImport = await (0, cache_js_1.referenceExtensionObject)(session, dataTypeNodeId);
|
|
43
43
|
const jtype = jtypeImport.name;
|
|
44
44
|
importCollect?.(jtypeImport);
|
|
45
45
|
return { dataType: info.dataType, jtype, type };
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"get_corresponding_data_type.js","sourceRoot":"","sources":["../../source/private/get_corresponding_data_type.ts"],"names":[],"mappings":"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"}
|
package/dist/private/utils.js
CHANGED
|
@@ -25,8 +25,8 @@ const node_opcua_debug_1 = require("node-opcua-debug");
|
|
|
25
25
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
26
26
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
27
27
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
28
|
-
const debugLog = (0, node_opcua_debug_1.make_debugLog)(
|
|
29
|
-
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(
|
|
28
|
+
const debugLog = (0, node_opcua_debug_1.make_debugLog)("utils");
|
|
29
|
+
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("utils");
|
|
30
30
|
async function getDefinition(session, nodeId) {
|
|
31
31
|
const dataValue = await session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition });
|
|
32
32
|
return dataValue.value.value || null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":";;AAYA,sCAGC;AACD,sCAGC;AACD,8CAGC;AACD,sCAGC;AACD,wCAGC;AAED,oCAGC;AACD,kCAUC;AACD,8CAUC;AAED,4CAiBC;AACD,8CAaC;AAED,sCAaC;AAED,oDAUC;AAED,sDAmBC;AACD,4CAMC;AAED,oDAwBC;AACD,8CAeC;AAiCD,sEA+DC;AAED,kEAOC;AACD,oCAGC;AAxSD,+DAAmD;AACnD,iEAAmI;AACnI,uDAAiE;AACjE,yDAAyF;AAEzF,uDAAoG;AACpG,2DAA8C;AAE9C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/private-stuff.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from "./index";
|
|
2
|
-
export * from "./options";
|
|
3
|
-
export * from "./private/cache";
|
|
4
|
-
export * from "./private/utils";
|
|
1
|
+
export * from "./index.js";
|
|
2
|
+
export * from "./options.js";
|
|
3
|
+
export * from "./private/cache.js";
|
|
4
|
+
export * from "./private/utils.js";
|
package/dist/private-stuff.js
CHANGED
|
@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./index"), exports);
|
|
18
|
-
__exportStar(require("./options"), exports);
|
|
19
|
-
__exportStar(require("./private/cache"), exports);
|
|
20
|
-
__exportStar(require("./private/utils"), exports);
|
|
17
|
+
__exportStar(require("./index.js"), exports);
|
|
18
|
+
__exportStar(require("./options.js"), exports);
|
|
19
|
+
__exportStar(require("./private/cache.js"), exports);
|
|
20
|
+
__exportStar(require("./private/utils.js"), exports);
|
|
21
21
|
//# sourceMappingURL=private-stuff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private-stuff.js","sourceRoot":"","sources":["../source/private-stuff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"private-stuff.js","sourceRoot":"","sources":["../source/private-stuff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,+CAA6B;AAC7B,qDAAmC;AACnC,qDAAmC"}
|
package/dist/remove_unused.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.cleanUpTypescriptModule = cleanUpTypescriptModule;
|
|
|
7
7
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
9
|
const ts_morph_1 = require("ts-morph");
|
|
10
|
-
const
|
|
10
|
+
const fs_retry_js_1 = require("./private/fs_retry.js");
|
|
11
11
|
const dryRun = false;
|
|
12
12
|
const NODE_BUILTINS = new Set([
|
|
13
13
|
"assert",
|
|
@@ -138,7 +138,12 @@ function regroupImports(file) {
|
|
|
138
138
|
const gb = importGroup(b.moduleSpecifier);
|
|
139
139
|
if (ga !== gb)
|
|
140
140
|
return ga - gb;
|
|
141
|
-
|
|
141
|
+
// Code point, not localeCompare. Two reasons. localeCompare is locale-dependent,
|
|
142
|
+
// so generated output committed from one machine could differ on another, and
|
|
143
|
+
// this output is committed and drift-checked. And its collation ranks "." after
|
|
144
|
+
// "_", which flips "./x.js" past "./x_y.js" the moment extensions are added,
|
|
145
|
+
// disagreeing with biome's ordering and taking the lint gate red.
|
|
146
|
+
return a.moduleSpecifier < b.moduleSpecifier ? -1 : a.moduleSpecifier > b.moduleSpecifier ? 1 : 0;
|
|
142
147
|
});
|
|
143
148
|
file.insertImportDeclarations(0, structures);
|
|
144
149
|
const reinserted = file.getImportDeclarations();
|
|
@@ -237,7 +242,7 @@ function fixFile(file) {
|
|
|
237
242
|
}
|
|
238
243
|
});
|
|
239
244
|
if (!dryRun) {
|
|
240
|
-
(0,
|
|
245
|
+
(0, fs_retry_js_1.retryOnTransientWrite)(() => file.saveSync());
|
|
241
246
|
}
|
|
242
247
|
}
|
|
243
248
|
async function cleanUpTypescriptModule(moduleFolder) {
|
|
@@ -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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"}
|
|
@@ -9,13 +9,10 @@ exports.updateParentTSConfig = updateParentTSConfig;
|
|
|
9
9
|
const node_fs_1 = require("node:fs");
|
|
10
10
|
const { readFile, writeFile } = node_fs_1.promises;
|
|
11
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
-
// Uncomment the following to get __dirname equivalent when compiling to ESM
|
|
13
|
-
//import { fileURLToPath } from 'url';
|
|
14
|
-
//const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
15
12
|
const node_opcua_nodesets_1 = require("node-opcua-nodesets");
|
|
13
|
+
const package_root_js_1 = require("./package_root.js");
|
|
16
14
|
async function updateParentTSConfig() {
|
|
17
|
-
const
|
|
18
|
-
const parentTSConfigFile = node_path_1.default.join(packagesFolder, "tsconfig.json");
|
|
15
|
+
const parentTSConfigFile = node_path_1.default.join(package_root_js_1.packagesFolder, "tsconfig.json");
|
|
19
16
|
console.log(`Updating parent tsconfig.json file: ${parentTSConfigFile}`);
|
|
20
17
|
const content = await readFile(parentTSConfigFile, "utf8");
|
|
21
18
|
// Strip out comments to avoid JSON parsing error
|
|
@@ -32,7 +29,7 @@ async function updateParentTSConfig() {
|
|
|
32
29
|
const unlistedReferences = [];
|
|
33
30
|
for (const meta of node_opcua_nodesets_1.nodesetCatalog) {
|
|
34
31
|
const packageName = `node-opcua-nodeset-${meta.packageName}`;
|
|
35
|
-
const nodesetPackageFolder = node_path_1.default.join(packagesFolder, packageName);
|
|
32
|
+
const nodesetPackageFolder = node_path_1.default.join(package_root_js_1.packagesFolder, packageName);
|
|
36
33
|
if (!(0, node_fs_1.existsSync)(nodesetPackageFolder)) {
|
|
37
34
|
console.log(`Ignoring ${meta.packageName} since package folder does not exist (${nodesetPackageFolder})`);
|
|
38
35
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update_parent_tsconfig.js","sourceRoot":"","sources":["../source/update_parent_tsconfig.ts"],"names":[],"mappings":";AAAA,6FAA6F;AAC7F,8CAA8C;;;;;
|
|
1
|
+
{"version":3,"file":"update_parent_tsconfig.js","sourceRoot":"","sources":["../source/update_parent_tsconfig.ts"],"names":[],"mappings":"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"}
|
package/dist/utils2.d.ts
CHANGED
|
@@ -1,6 +1,20 @@
|
|
|
1
|
+
import type { NodeClass } from "node-opcua-data-model";
|
|
1
2
|
export declare function toComment(prefix: string, description: string): string;
|
|
2
|
-
|
|
3
|
+
/**
|
|
4
|
+
* the names under which the runtime never exposes a child of a node of the given class, by the
|
|
5
|
+
* rule node-opcua-address-space applies (`childAccessorNamesShadowedBy`); registered by main()
|
|
6
|
+
* once the address space is loaded, absent in a unit test
|
|
7
|
+
*/
|
|
8
|
+
export type ChildAccessorShadowing = (parentNodeClass: NodeClass) => ReadonlySet<string> | undefined;
|
|
9
|
+
export declare function setChildAccessorShadowing(provider: ChildAccessorShadowing | undefined): void;
|
|
10
|
+
/**
|
|
11
|
+
* the TypeScript property name of a child: its browse name lower-cased the way the runtime does,
|
|
12
|
+
* and `$`-prefixed when the runtime could not expose it under that name on a node of
|
|
13
|
+
* `parentNodeClass` (a child named NamespaceUri, DataType on a variable, Then on anything)
|
|
14
|
+
*/
|
|
15
|
+
export declare function toJavascritPropertyName(childName: string, { ignoreConflictingName, parentNodeClass }: {
|
|
3
16
|
ignoreConflictingName: boolean;
|
|
17
|
+
parentNodeClass?: NodeClass;
|
|
4
18
|
}): string;
|
|
5
19
|
export declare function quotifyIfNecessary(s: string): string;
|
|
6
20
|
export declare const f2: (str: string) => string;
|
package/dist/utils2.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.f1 = exports.f2 = void 0;
|
|
7
7
|
exports.toComment = toComment;
|
|
8
|
+
exports.setChildAccessorShadowing = setChildAccessorShadowing;
|
|
8
9
|
exports.toJavascritPropertyName = toJavascritPropertyName;
|
|
9
10
|
exports.quotifyIfNecessary = quotifyIfNecessary;
|
|
10
11
|
const node_opcua_utils_1 = require("node-opcua-utils");
|
|
@@ -17,30 +18,34 @@ function toComment(prefix, description) {
|
|
|
17
18
|
.map((x) => prefix + x)
|
|
18
19
|
.join("\n");
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
-
function
|
|
21
|
+
let childAccessorShadowing;
|
|
22
|
+
function setChildAccessorShadowing(provider) {
|
|
23
|
+
childAccessorShadowing = provider;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* the names the generated interfaces have always escaped: kept whatever the runtime rule says, so
|
|
27
|
+
* that an interface published under one of them does not change under its users
|
|
28
|
+
*/
|
|
29
|
+
const historicallyEscaped = new Set([
|
|
30
|
+
"namespaceUri",
|
|
31
|
+
"rolePermissions",
|
|
32
|
+
"displayName",
|
|
33
|
+
"eventNotifier",
|
|
34
|
+
"description",
|
|
35
|
+
"decode",
|
|
36
|
+
"encode"
|
|
37
|
+
]);
|
|
38
|
+
/**
|
|
39
|
+
* the TypeScript property name of a child: its browse name lower-cased the way the runtime does,
|
|
40
|
+
* and `$`-prefixed when the runtime could not expose it under that name on a node of
|
|
41
|
+
* `parentNodeClass` (a child named NamespaceUri, DataType on a variable, Then on anything)
|
|
42
|
+
*/
|
|
43
|
+
function toJavascritPropertyName(childName, { ignoreConflictingName, parentNodeClass }) {
|
|
22
44
|
childName = (0, node_opcua_utils_1.lowerFirstLetter)(childName);
|
|
23
45
|
if (ignoreConflictingName) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
if (childName === "rolePermissions") {
|
|
28
|
-
childName = "$rolePermissions";
|
|
29
|
-
}
|
|
30
|
-
if (childName === "displayName") {
|
|
31
|
-
childName = "$displayName";
|
|
32
|
-
}
|
|
33
|
-
if (childName === "eventNotifier") {
|
|
34
|
-
childName = "$eventNotifier";
|
|
35
|
-
}
|
|
36
|
-
if (childName === "description") {
|
|
37
|
-
childName = "$description";
|
|
38
|
-
}
|
|
39
|
-
if (childName === "decode") {
|
|
40
|
-
childName = "$decode";
|
|
41
|
-
}
|
|
42
|
-
if (childName === "encode") {
|
|
43
|
-
childName = "$encode";
|
|
46
|
+
const shadowed = parentNodeClass === undefined ? undefined : childAccessorShadowing?.(parentNodeClass);
|
|
47
|
+
if (historicallyEscaped.has(childName) || shadowed?.has(childName)) {
|
|
48
|
+
childName = `$${childName}`;
|
|
44
49
|
}
|
|
45
50
|
}
|
|
46
51
|
return childName.replace(/</g, "$").replace(/>/g, "$").replace(/ |\./g, "_").replace(/#/g, "_");
|
package/dist/utils2.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils2.js","sourceRoot":"","sources":["../source/utils2.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"utils2.js","sourceRoot":"","sources":["../source/utils2.ts"],"names":[],"mappings":";;;;;;AAMA,8BAMC;AAWD,8DAEC;AAqBD,0DAaC;AAED,gDAQC;AApED,uDAAoD;AACpD,wDAA4B;AAE5B,MAAM,QAAQ,GAAG,IAAA,kBAAI,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAE7B,SAAgB,SAAS,CAAC,MAAc,EAAE,WAAmB;IACzD,MAAM,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAChC,OAAO,CAAC;SACH,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACtB,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC;AASD,IAAI,sBAA0D,CAAC;AAE/D,SAAgB,yBAAyB,CAAC,QAA4C;IAClF,sBAAsB,GAAG,QAAQ,CAAC;AACtC,CAAC;AAED;;;GAGG;AACH,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAChC,cAAc;IACd,iBAAiB;IACjB,aAAa;IACb,eAAe;IACf,aAAa;IACb,QAAQ;IACR,QAAQ;CACX,CAAC,CAAC;AAEH;;;;GAIG;AACH,SAAgB,uBAAuB,CACnC,SAAiB,EACjB,EAAE,qBAAqB,EAAE,eAAe,EAAmE;IAE3G,SAAS,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,CAAC;IAExC,IAAI,qBAAqB,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,eAAe,CAAC,CAAC;QACvG,IAAI,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACjE,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAChC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACpG,CAAC;AAED,SAAgB,kBAAkB,CAAC,CAAS;IACxC,IAAI,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC;QACpB,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAEM,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAA1C,QAAA,EAAE,MAAwC;AAChD,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAA1C,QAAA,EAAE,MAAwC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-convert-nodeset-to-javascript",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.181.1",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module convert-nodeset-to-javascript",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -16,26 +16,27 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"case-anything": "1.1.5",
|
|
18
18
|
"chalk": "4.1.2",
|
|
19
|
-
"node-opcua-address-space": "2.
|
|
20
|
-
"node-opcua-address-space-base": "2.
|
|
19
|
+
"node-opcua-address-space": "2.181.1",
|
|
20
|
+
"node-opcua-address-space-base": "2.181.0",
|
|
21
21
|
"node-opcua-assert": "2.179.0",
|
|
22
|
-
"node-opcua-constants": "2.
|
|
23
|
-
"node-opcua-data-model": "2.
|
|
24
|
-
"node-opcua-debug": "2.
|
|
25
|
-
"node-opcua-nodeid": "2.
|
|
26
|
-
"node-opcua-nodesets": "2.
|
|
27
|
-
"node-opcua-pseudo-session": "2.
|
|
28
|
-
"node-opcua-types": "2.
|
|
29
|
-
"node-opcua-utils": "2.
|
|
30
|
-
"node-opcua-variant": "2.
|
|
22
|
+
"node-opcua-constants": "2.181.0",
|
|
23
|
+
"node-opcua-data-model": "2.181.0",
|
|
24
|
+
"node-opcua-debug": "2.181.0",
|
|
25
|
+
"node-opcua-nodeid": "2.181.0",
|
|
26
|
+
"node-opcua-nodesets": "2.181.0",
|
|
27
|
+
"node-opcua-pseudo-session": "2.181.1",
|
|
28
|
+
"node-opcua-types": "2.181.0",
|
|
29
|
+
"node-opcua-utils": "2.181.0",
|
|
30
|
+
"node-opcua-variant": "2.181.0",
|
|
31
31
|
"ts-morph": "28.0.0",
|
|
32
32
|
"typescript": "5.9.3",
|
|
33
33
|
"wordwrap": "^1.0.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"node-opcua-leak-detector": "2.
|
|
37
|
-
"node-opcua-packet-analyzer": "2.
|
|
38
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
36
|
+
"node-opcua-leak-detector": "2.181.0",
|
|
37
|
+
"node-opcua-packet-analyzer": "2.181.0",
|
|
38
|
+
"node-opcua-service-translate-browse-path": "2.181.0",
|
|
39
|
+
"node-opcua-test-helpers": "2.181.0"
|
|
39
40
|
},
|
|
40
41
|
"author": "Etienne Rossignon",
|
|
41
42
|
"license": "MIT",
|
|
@@ -52,7 +53,7 @@
|
|
|
52
53
|
"internet of things"
|
|
53
54
|
],
|
|
54
55
|
"homepage": "http://node-opcua.github.io/",
|
|
55
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "b3b762ed8259fb8eaec07b8f1e19f920a78e85ca",
|
|
56
57
|
"files": [
|
|
57
58
|
"dist",
|
|
58
59
|
"source"
|
package/source/_dataType.ts
CHANGED
|
@@ -4,9 +4,9 @@ import type { IBasicSessionBrowseAsyncSimple, IBasicSessionReadAsyncSimple } fro
|
|
|
4
4
|
import { EnumDefinition, StructureDefinition, type StructureField } from "node-opcua-types";
|
|
5
5
|
import { LineFile } from "node-opcua-utils";
|
|
6
6
|
import { DataType } from "node-opcua-variant";
|
|
7
|
-
import type { Type } from "./convert_to_typescript";
|
|
8
|
-
import { type Cache, makeName2 } from "./private/cache";
|
|
9
|
-
import { getCorrespondingJavascriptType } from "./private/get_corresponding_data_type";
|
|
7
|
+
import type { Type } from "./convert_to_typescript.js";
|
|
8
|
+
import { type Cache, makeName2 } from "./private/cache.js";
|
|
9
|
+
import { getCorrespondingJavascriptType } from "./private/get_corresponding_data_type.js";
|
|
10
10
|
import {
|
|
11
11
|
getBrowseName,
|
|
12
12
|
getDefinition,
|
|
@@ -15,8 +15,8 @@ import {
|
|
|
15
15
|
getSubtypeNodeId,
|
|
16
16
|
type Import,
|
|
17
17
|
makeTypeNameNew
|
|
18
|
-
} from "./private-stuff";
|
|
19
|
-
import { f1, f2, quotifyIfNecessary, toComment, toJavascritPropertyName } from "./utils2";
|
|
18
|
+
} from "./private-stuff.js";
|
|
19
|
+
import { f1, f2, quotifyIfNecessary, toComment, toJavascritPropertyName } from "./utils2.js";
|
|
20
20
|
|
|
21
21
|
function requireFieldName(field: { name?: string | null }): string {
|
|
22
22
|
if (!field.name) {
|
|
@@ -2,20 +2,21 @@ import fs from "node:fs";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { DataTypeIds } from "node-opcua-constants";
|
|
4
4
|
import type { IBasicSessionAsync } from "node-opcua-pseudo-session";
|
|
5
|
-
import { convertTypeToTypescript } from "./convert_to_typescript";
|
|
6
|
-
import type { Options } from "./options";
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
5
|
+
import { convertTypeToTypescript } from "./convert_to_typescript.js";
|
|
6
|
+
import type { Options } from "./options.js";
|
|
7
|
+
import { packageRoot } from "./package_root.js";
|
|
8
|
+
import { constructCache } from "./private/cache.js";
|
|
9
|
+
import { writeFileSyncRetry } from "./private/fs_retry.js";
|
|
9
10
|
import {
|
|
10
11
|
type ReferenceDescriptionEx,
|
|
11
12
|
walkThroughDataTypes,
|
|
12
13
|
walkThroughObjectTypes,
|
|
13
14
|
walkThroughVariableTypes
|
|
14
|
-
} from "./walk_through";
|
|
15
|
+
} from "./walk_through.js";
|
|
15
16
|
|
|
16
17
|
function findPackageJson(dependency: string, options: Options): string | undefined {
|
|
17
18
|
const l = [...(options.lookupFolders || [])];
|
|
18
|
-
l.push(
|
|
19
|
+
l.push(options.baseFolder);
|
|
19
20
|
for (const folder of l) {
|
|
20
21
|
const d = path.join(folder, `${dependency}/package.json`);
|
|
21
22
|
if (!fs.existsSync(d)) {
|
|
@@ -33,7 +34,7 @@ function getPackageFolder(dependency: string, options: Options) {
|
|
|
33
34
|
}
|
|
34
35
|
//
|
|
35
36
|
console.log("cannot find package.json for ", dependency, " : creating it");
|
|
36
|
-
const packageoFolder = path.join(
|
|
37
|
+
const packageoFolder = path.join(options.baseFolder, dependency);
|
|
37
38
|
if (!fs.existsSync(packageoFolder)) {
|
|
38
39
|
fs.mkdirSync(packageoFolder);
|
|
39
40
|
}
|
|
@@ -88,7 +89,7 @@ function getGeneratedPackageVersion(info: Info, options: Options): string {
|
|
|
88
89
|
// Monorepo release version (lerna.json), used only to seed a package that has no
|
|
89
90
|
// version of its own yet.
|
|
90
91
|
function getReleaseVersion(options: Options): string {
|
|
91
|
-
let folder =
|
|
92
|
+
let folder = packageRoot;
|
|
92
93
|
for (let i = 0; i < 6; i++) {
|
|
93
94
|
if (path.basename(folder) === "node_modules") {
|
|
94
95
|
// installed as a dependency: the lerna.json above us belongs to someone else.
|
|
@@ -194,7 +195,7 @@ async function _output_index_ts_file(info: Info): Promise<void> {
|
|
|
194
195
|
if (file.match(/^enum_eration/)) {
|
|
195
196
|
continue;
|
|
196
197
|
}
|
|
197
|
-
content.push(`export * from "./${file.replace(".ts", "")}";`);
|
|
198
|
+
content.push(`export * from "./${file.replace(".ts", "")}.js";`);
|
|
198
199
|
}
|
|
199
200
|
fs.writeFileSync(index, content.join("\n"));
|
|
200
201
|
// create package.json
|