node-opcua-convert-nodeset-to-javascript 2.136.0 → 2.138.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.js +1 -1
- package/dist/_dataType.js.map +1 -1
- package/dist/convert_namespace_to_typescript.js +50 -0
- package/dist/convert_namespace_to_typescript.js.map +1 -1
- package/dist/convert_to_typescript.d.ts +3 -0
- package/dist/convert_to_typescript.js +29 -7
- package/dist/convert_to_typescript.js.map +1 -1
- package/dist/main.js +14 -6
- package/dist/main.js.map +1 -1
- package/dist/private/get_corresponding_data_type.d.ts +4 -0
- package/dist/private/get_corresponding_data_type.js +86 -60
- package/dist/private/get_corresponding_data_type.js.map +1 -1
- package/dist/private/utils.d.ts +12 -2
- package/dist/private/utils.js +23 -3
- package/dist/private/utils.js.map +1 -1
- package/dist/update_parent_tsconfig.js +6 -5
- package/dist/update_parent_tsconfig.js.map +1 -1
- package/package.json +12 -12
- package/source/_dataType.ts +1 -1
- package/source/convert_namespace_to_typescript.ts +60 -1
- package/source/convert_to_typescript.ts +40 -11
- package/source/main.ts +13 -5
- package/source/private/get_corresponding_data_type.ts +90 -63
- package/source/private/utils.ts +36 -5
- package/source/update_parent_tsconfig.ts +7 -6
|
@@ -6,25 +6,44 @@ const node_opcua_variant_1 = require("node-opcua-variant");
|
|
|
6
6
|
const cache_1 = require("./cache");
|
|
7
7
|
const utils_1 = require("./utils");
|
|
8
8
|
async function getCorrespondingJavascriptType2(session, nodeId, dataTypeNodeId, cache, importCollect) {
|
|
9
|
-
const
|
|
9
|
+
const { dataType, jtype, dataTypeCombination, type } = await getCorrespondingJavascriptType(session, dataTypeNodeId, cache, importCollect);
|
|
10
10
|
const valueRank = await (0, utils_1.getValueRank)(session, nodeId);
|
|
11
|
-
|
|
11
|
+
let jtype2 = "";
|
|
12
|
+
if (valueRank >= 0) {
|
|
13
|
+
jtype2 = jtype + "[]";
|
|
14
|
+
}
|
|
15
|
+
else if (valueRank === -1) {
|
|
16
|
+
jtype2 = jtype;
|
|
17
|
+
}
|
|
18
|
+
else if (valueRank === -2) {
|
|
19
|
+
// The value can be a scalar or an array with any number of dimensions.
|
|
20
|
+
jtype2 = `(${jtype} | ${jtype}[])`;
|
|
21
|
+
}
|
|
22
|
+
else if (valueRank === -3) {
|
|
23
|
+
// ScalarOrOneDimension (-3): The value can be a scalar or a one dimensional array.
|
|
24
|
+
jtype2 = `(${jtype} | ${jtype}[])`;
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
throw new Error("Invalid valueRank " + valueRank);
|
|
28
|
+
}
|
|
29
|
+
return { dataType: dataType, jtype: jtype2, dataTypeCombination, type };
|
|
12
30
|
}
|
|
13
31
|
// eslint-disable-next-line complexity
|
|
14
32
|
async function getCorrespondingJavascriptType(session, dataTypeNodeId, cache, importCollect) {
|
|
15
|
-
const
|
|
16
|
-
|
|
33
|
+
const info = await (0, utils_1._convertNodeIdToDataTypeAsync)(session, dataTypeNodeId);
|
|
34
|
+
const { type } = info;
|
|
35
|
+
if (type == "enum" && info.enumerationType) {
|
|
17
36
|
// we have a enmeration name here
|
|
18
37
|
const jtypeImport = await (0, cache_1.referenceEnumeration)(session, dataTypeNodeId);
|
|
19
38
|
const jtype = jtypeImport.name;
|
|
20
39
|
importCollect && importCollect(jtypeImport);
|
|
21
|
-
return { dataType, jtype };
|
|
40
|
+
return { dataType: info.dataType, jtype, type };
|
|
22
41
|
}
|
|
23
|
-
if (dataType === node_opcua_variant_1.DataType.ExtensionObject) {
|
|
42
|
+
if (type == "basic" && info.dataType === node_opcua_variant_1.DataType.ExtensionObject) {
|
|
24
43
|
const jtypeImport = await (0, cache_1.referenceExtensionObject)(session, dataTypeNodeId);
|
|
25
44
|
const jtype = jtypeImport.name;
|
|
26
45
|
importCollect && importCollect(jtypeImport);
|
|
27
|
-
return { dataType, jtype };
|
|
46
|
+
return { dataType: info.dataType, jtype, type };
|
|
28
47
|
}
|
|
29
48
|
const referenceBasicType = (name) => {
|
|
30
49
|
const t = { name, namespace: -1, module: "BasicType" };
|
|
@@ -32,59 +51,66 @@ async function getCorrespondingJavascriptType(session, dataTypeNodeId, cache, im
|
|
|
32
51
|
cache.ensureImported(t);
|
|
33
52
|
return t.name;
|
|
34
53
|
};
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
54
|
+
if (type == "genericNumber") {
|
|
55
|
+
const { dataTypeCombination } = info;
|
|
56
|
+
return { dataType: node_opcua_variant_1.DataType.Variant, jtype: "number", type, dataTypeCombination };
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
const { dataType } = info;
|
|
60
|
+
switch (dataType) {
|
|
61
|
+
case node_opcua_variant_1.DataType.Null:
|
|
62
|
+
return { dataType: node_opcua_variant_1.DataType.Variant, jtype: referenceBasicType("VariantOptions"), type };
|
|
63
|
+
case node_opcua_variant_1.DataType.Boolean:
|
|
64
|
+
return { dataType, jtype: "boolean", type };
|
|
65
|
+
case node_opcua_variant_1.DataType.Byte:
|
|
66
|
+
return { dataType, jtype: referenceBasicType("Byte"), type };
|
|
67
|
+
case node_opcua_variant_1.DataType.ByteString:
|
|
68
|
+
return { dataType, jtype: "Buffer", type };
|
|
69
|
+
case node_opcua_variant_1.DataType.DataValue:
|
|
70
|
+
return { dataType, jtype: referenceBasicType("DataValue"), type };
|
|
71
|
+
case node_opcua_variant_1.DataType.DateTime:
|
|
72
|
+
return { dataType, jtype: "Date", type };
|
|
73
|
+
case node_opcua_variant_1.DataType.DiagnosticInfo:
|
|
74
|
+
return { dataType, jtype: referenceBasicType("DiagnosticInfo"), type };
|
|
75
|
+
case node_opcua_variant_1.DataType.Double:
|
|
76
|
+
return { dataType, jtype: "number", type };
|
|
77
|
+
case node_opcua_variant_1.DataType.Float:
|
|
78
|
+
return { dataType, jtype: "number", type };
|
|
79
|
+
case node_opcua_variant_1.DataType.Guid:
|
|
80
|
+
return { dataType, jtype: referenceBasicType("Guid"), type };
|
|
81
|
+
case node_opcua_variant_1.DataType.Int16:
|
|
82
|
+
return { dataType, jtype: referenceBasicType("Int16"), type };
|
|
83
|
+
case node_opcua_variant_1.DataType.Int32:
|
|
84
|
+
return { dataType, jtype: referenceBasicType("Int32"), type };
|
|
85
|
+
case node_opcua_variant_1.DataType.UInt16:
|
|
86
|
+
return { dataType, jtype: referenceBasicType("UInt16"), type };
|
|
87
|
+
case node_opcua_variant_1.DataType.UInt32:
|
|
88
|
+
return { dataType, jtype: referenceBasicType("UInt32"), type };
|
|
89
|
+
case node_opcua_variant_1.DataType.UInt64:
|
|
90
|
+
return { dataType, jtype: referenceBasicType("UInt64"), type };
|
|
91
|
+
case node_opcua_variant_1.DataType.Int64:
|
|
92
|
+
return { dataType, jtype: referenceBasicType("Int64"), type };
|
|
93
|
+
case node_opcua_variant_1.DataType.LocalizedText:
|
|
94
|
+
return { dataType, jtype: referenceBasicType("LocalizedText"), type };
|
|
95
|
+
case node_opcua_variant_1.DataType.NodeId:
|
|
96
|
+
return { dataType, jtype: referenceBasicType("NodeId"), type };
|
|
97
|
+
case node_opcua_variant_1.DataType.ExpandedNodeId:
|
|
98
|
+
return { dataType, jtype: referenceBasicType("ExpandedNodeId"), type };
|
|
99
|
+
case node_opcua_variant_1.DataType.QualifiedName:
|
|
100
|
+
return { dataType, jtype: referenceBasicType("QualifiedName"), type };
|
|
101
|
+
case node_opcua_variant_1.DataType.SByte:
|
|
102
|
+
return { dataType, jtype: referenceBasicType("SByte"), type };
|
|
103
|
+
case node_opcua_variant_1.DataType.StatusCode:
|
|
104
|
+
return { dataType, jtype: referenceBasicType("StatusCode"), type };
|
|
105
|
+
case node_opcua_variant_1.DataType.String:
|
|
106
|
+
return { dataType, jtype: referenceBasicType("UAString"), type };
|
|
107
|
+
case node_opcua_variant_1.DataType.Variant:
|
|
108
|
+
return { dataType, jtype: referenceBasicType("Variant"), type };
|
|
109
|
+
case node_opcua_variant_1.DataType.XmlElement:
|
|
110
|
+
return { dataType, jtype: referenceBasicType("String"), type };
|
|
111
|
+
default:
|
|
112
|
+
throw new Error("Unsupported " + dataType + " " + node_opcua_variant_1.DataType[dataType]);
|
|
113
|
+
}
|
|
88
114
|
}
|
|
89
115
|
}
|
|
90
116
|
//# sourceMappingURL=get_corresponding_data_type.js.map
|
|
@@ -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":"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"}
|
package/dist/private/utils.d.ts
CHANGED
|
@@ -20,11 +20,21 @@ export declare function getSubtypeNodeIdIfAny(session: IBasicSessionBrowseAsyncS
|
|
|
20
20
|
export declare function getSubtypeNodeId(session: IBasicSessionBrowseAsyncSimple, nodeId: NodeId): Promise<ReferenceDescription>;
|
|
21
21
|
export declare function getTypeDefOrBaseType(session: IBasicSessionBrowseAsyncSimple, nodeId: NodeId): Promise<ReferenceDescription>;
|
|
22
22
|
export declare function getTypeDefinition(session: IBasicSessionBrowseAsyncSimple, nodeId: NodeId): Promise<ReferenceDescription>;
|
|
23
|
-
interface
|
|
23
|
+
interface DataTypeInfoBasic {
|
|
24
|
+
type: "basic";
|
|
24
25
|
dataType: DataType;
|
|
25
|
-
|
|
26
|
+
}
|
|
27
|
+
interface DataTypeInfoEnum {
|
|
28
|
+
type: "enum";
|
|
29
|
+
dataType: DataType.Int32;
|
|
30
|
+
enumerationId: NodeId;
|
|
26
31
|
enumerationType?: string;
|
|
27
32
|
}
|
|
33
|
+
interface DataTypeInfoGenericNumber {
|
|
34
|
+
type: "genericNumber";
|
|
35
|
+
dataTypeCombination: string;
|
|
36
|
+
}
|
|
37
|
+
type DataTypeInfo = DataTypeInfoBasic | DataTypeInfoEnum | DataTypeInfoGenericNumber;
|
|
28
38
|
export declare function _convertNodeIdToDataTypeAsync(session: IBasicSessionReadAsyncSimple & IBasicSessionBrowseAsyncSimple, dataTypeId: NodeId): Promise<DataTypeInfo>;
|
|
29
39
|
export declare function getChildrenOrFolderElements(session: IBasicSessionBrowseAsyncSimple, nodeId: NodeId): Promise<ReferenceDescription[]>;
|
|
30
40
|
export declare function getValueRank(session: IBasicSessionReadAsyncSimple, nodeId: NodeId): Promise<number>;
|
package/dist/private/utils.js
CHANGED
|
@@ -196,12 +196,32 @@ async function readBrowseName(session, nodeId) {
|
|
|
196
196
|
async function _convertNodeIdToDataTypeAsync(session, dataTypeId) {
|
|
197
197
|
const dataTypeName = await readBrowseName(session, dataTypeId);
|
|
198
198
|
let dataType;
|
|
199
|
+
if (dataTypeId.namespace === 0 && dataTypeId.value === node_opcua_constants_1.DataTypeIds.Number) {
|
|
200
|
+
return {
|
|
201
|
+
type: "genericNumber",
|
|
202
|
+
dataTypeCombination: "DataType.Float | DataType.Double | " +
|
|
203
|
+
"DataType.UInt64 | DataType.UInt32 | DataType.UInt16 | DataType.SByte | " +
|
|
204
|
+
"DataType.Int64 | DataType.Int32 | DataType.Int16 | DataType.Byte"
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
if (dataTypeId.namespace === 0 && dataTypeId.value === node_opcua_constants_1.DataTypeIds.Integer) {
|
|
208
|
+
return {
|
|
209
|
+
type: "genericNumber",
|
|
210
|
+
dataTypeCombination: "DataType.Int64 | DataType.Int32 | DataType.Int16 | DataType.SByte"
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
if (dataTypeId.namespace === 0 && dataTypeId.value === node_opcua_constants_1.DataTypeIds.UInteger) {
|
|
214
|
+
return {
|
|
215
|
+
type: "genericNumber",
|
|
216
|
+
dataTypeCombination: "DataType.UInt64 | DataType.UInt32 | DataType.UInt16 | DataType.Byte"
|
|
217
|
+
};
|
|
218
|
+
}
|
|
199
219
|
if (dataTypeId.namespace === 0 && dataTypeId.value === node_opcua_constants_1.DataTypeIds.Enumeration) {
|
|
200
|
-
return { dataType: node_opcua_variant_1.DataType.Int32, enumerationId: dataTypeId };
|
|
220
|
+
return { type: "enum", dataType: node_opcua_variant_1.DataType.Int32, enumerationId: dataTypeId };
|
|
201
221
|
}
|
|
202
222
|
if (dataTypeId.namespace === 0 && node_opcua_variant_1.DataType[dataTypeId.value]) {
|
|
203
223
|
dataType = dataTypeId.value;
|
|
204
|
-
return { dataType };
|
|
224
|
+
return { type: "basic", dataType };
|
|
205
225
|
}
|
|
206
226
|
/// example => Duration (i=290) => Double (i=11)
|
|
207
227
|
// read subTypeOf
|
|
@@ -219,7 +239,7 @@ async function _convertNodeIdToDataTypeAsync(session, dataTypeId) {
|
|
|
219
239
|
}
|
|
220
240
|
const nodeId = references[0].nodeId;
|
|
221
241
|
const info = await _convertNodeIdToDataTypeAsync(session, nodeId);
|
|
222
|
-
if (info.enumerationId) {
|
|
242
|
+
if (info.type == "enum" && info.enumerationId) {
|
|
223
243
|
return { ...info, enumerationId: dataTypeId, enumerationType: dataTypeName.name };
|
|
224
244
|
}
|
|
225
245
|
return info;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":";;AAWA,sCAGC;AACD,sCAGC;AACD,8CAGC;AACD,sCAGC;AACD,wCAGC;AAED,oCAGC;AACD,kCAUC;AACD,8CAUC;AAED,4CAaC;AACD,8CAUC;AAED,sCAUC;AAED,oDAOC;AAED,sDAgBC;AACD,4CAMC;AAED,oDAwBC;AACD,8CAcC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/private/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,15 +23,16 @@ async function updateParentTSConfig() {
|
|
|
23
23
|
.replace(/\/\*.+?\*\//g, '')
|
|
24
24
|
.replace(/\/\/.+?$/g, ''));
|
|
25
25
|
const unlistedReferences = [];
|
|
26
|
-
for (const meta of node_opcua_nodesets_1.
|
|
27
|
-
const
|
|
26
|
+
for (const meta of node_opcua_nodesets_1.nodesetCatalog) {
|
|
27
|
+
const packageName = `node-opcua-nodeset-${meta.packageName}`;
|
|
28
|
+
const nodesetPackageFolder = path_1.default.join(packagesFolder, packageName);
|
|
28
29
|
if (!(0, fs_1.existsSync)(nodesetPackageFolder)) {
|
|
29
30
|
console.log(`Ignoring ${meta.packageName} since package folder does not exist (${nodesetPackageFolder})`);
|
|
30
31
|
continue;
|
|
31
32
|
}
|
|
32
|
-
if (!parentTSConfig.references.some((ref) => ref.path ===
|
|
33
|
-
console.log(`Found nodeset package that was not listed in tsconfig.json: ${
|
|
34
|
-
unlistedReferences.push({ path:
|
|
33
|
+
if (!parentTSConfig.references.some((ref) => ref.path === packageName)) {
|
|
34
|
+
console.log(`Found nodeset package that was not listed in tsconfig.json: ${packageName}`);
|
|
35
|
+
unlistedReferences.push({ path: packageName });
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
function compareByPath(a, b) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update_parent_tsconfig.js","sourceRoot":"","sources":["../source/update_parent_tsconfig.ts"],"names":[],"mappings":";AAAA,6FAA6F;AAC7F,8CAA8C;;;;;AAW9C,
|
|
1
|
+
{"version":3,"file":"update_parent_tsconfig.js","sourceRoot":"","sources":["../source/update_parent_tsconfig.ts"],"names":[],"mappings":";AAAA,6FAA6F;AAC7F,8CAA8C;;;;;AAW9C,oDA4CC;AArDD,2BAAwD;AACxD,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,aAAU,CAAC;AAC3C,gDAAwB;AACxB,4EAA4E;AAC5E,sCAAsC;AACtC,iEAAiE;AAEjE,6DAAqD;AAE9C,KAAK,UAAU,oBAAoB;IACtC,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACtE,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK;IAC7B,iDAAiD;IACjD,wCAAwC;IACxC,CAAC,MAAM,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;SACvC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAChC,CAAC;IAGF,MAAM,kBAAkB,GAAwB,EAAE,CAAC;IACnD,KAAK,MAAM,IAAI,IAAI,oCAAc,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,sBAAsB,IAAI,CAAC,WAAW,EAAE,CAAC;QAC7D,MAAM,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACpE,IAAI,CAAC,IAAA,eAAU,EAAC,oBAAoB,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,WAAW,yCAAyC,oBAAoB,GAAG,CAAC,CAAC;YAC1G,SAAS;QACb,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAsB,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;YACxF,OAAO,CAAC,GAAG,CAAC,+DAA+D,WAAW,EAAE,CAAC,CAAC;YAC1F,kBAAkB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED,SAAS,aAAa,CAAC,CAAoB,EAAE,CAAoB;QAC7D,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAAC,OAAO,CAAC,CAAC,CAAC;QAAC,CAAC;QACnC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAAC,OAAO,CAAC,CAAC;QAAC,CAAC;QAClC,OAAO,CAAC,CAAC;IACb,CAAC;IAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAC;QACtD,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC9C,gFAAgF;QAChF,2CAA2C;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC;aACnD,OAAO,CAAC,yBAAyB,EAAE,mGAAmG,CAAC;aACvI,OAAO,CAAC,8BAA8B,EAAE,kBAAkB,CAAC;cAC9D,IAAI,CAAC;QACX,8DAA8D;QAC9D,MAAM,SAAS,CAAC,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;AACL,CAAC"}
|
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.138.0",
|
|
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",
|
|
@@ -15,26 +15,26 @@
|
|
|
15
15
|
"@types/wordwrap": "^1.0.3",
|
|
16
16
|
"case-anything": "1.1.5",
|
|
17
17
|
"chalk": "4.1.2",
|
|
18
|
-
"node-opcua-address-space": "2.
|
|
19
|
-
"node-opcua-address-space-base": "2.
|
|
18
|
+
"node-opcua-address-space": "2.138.0",
|
|
19
|
+
"node-opcua-address-space-base": "2.138.0",
|
|
20
20
|
"node-opcua-assert": "2.120.0",
|
|
21
21
|
"node-opcua-constants": "2.125.0",
|
|
22
|
-
"node-opcua-data-model": "2.
|
|
22
|
+
"node-opcua-data-model": "2.137.0",
|
|
23
23
|
"node-opcua-debug": "2.133.0",
|
|
24
|
-
"node-opcua-extension-object": "2.
|
|
24
|
+
"node-opcua-extension-object": "2.137.0",
|
|
25
25
|
"node-opcua-nodeid": "2.133.0",
|
|
26
|
-
"node-opcua-nodesets": "2.
|
|
27
|
-
"node-opcua-pseudo-session": "2.
|
|
26
|
+
"node-opcua-nodesets": "2.137.0",
|
|
27
|
+
"node-opcua-pseudo-session": "2.138.0",
|
|
28
28
|
"node-opcua-status-code": "2.133.0",
|
|
29
|
-
"node-opcua-types": "2.
|
|
29
|
+
"node-opcua-types": "2.137.0",
|
|
30
30
|
"node-opcua-utils": "2.133.0",
|
|
31
|
-
"node-opcua-variant": "2.
|
|
31
|
+
"node-opcua-variant": "2.137.0",
|
|
32
32
|
"wordwrap": "^1.0.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"node-opcua-leak-detector": "2.133.0",
|
|
36
|
-
"node-opcua-packet-analyzer": "2.
|
|
37
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
36
|
+
"node-opcua-packet-analyzer": "2.137.0",
|
|
37
|
+
"node-opcua-service-translate-browse-path": "2.137.0"
|
|
38
38
|
},
|
|
39
39
|
"author": "Etienne Rossignon",
|
|
40
40
|
"license": "MIT",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"internet of things"
|
|
52
52
|
],
|
|
53
53
|
"homepage": "http://node-opcua.github.io/",
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "383bbe814f9261b2bc01a5d0fe476813153bb110",
|
|
55
55
|
"files": [
|
|
56
56
|
"dist",
|
|
57
57
|
"source"
|
package/source/_dataType.ts
CHANGED
|
@@ -63,7 +63,7 @@ export async function _exportDataTypeToTypescript(
|
|
|
63
63
|
f.write(` * |-----------|${f2("-")}|`);
|
|
64
64
|
f.write(` * | namespace |${f1(cache.namespace[nodeId.namespace].namespaceUri)}|`);
|
|
65
65
|
f.write(` * | nodeClass |${f1(NodeClass[nodeClass])}|`);
|
|
66
|
-
f.write(` * | name |${f1(browseName.toString())}|`);
|
|
66
|
+
f.write(` * | name |${f1(browseName.name!.toString())}|`);
|
|
67
67
|
f.write(` * | isAbstract|${f1(isAbstract.toString())}|`);
|
|
68
68
|
f.write(` */`);
|
|
69
69
|
|
|
@@ -19,6 +19,23 @@ function getPackageFolder(dependency: string, options: Options) {
|
|
|
19
19
|
}
|
|
20
20
|
return d;
|
|
21
21
|
}
|
|
22
|
+
//
|
|
23
|
+
console.log("cannot find package.json for ", dependency, " : creating it");
|
|
24
|
+
const packageoFolder = path.join(__dirname, "../../", dependency);
|
|
25
|
+
if (!fs.existsSync(packageoFolder)) {
|
|
26
|
+
fs.mkdirSync(packageoFolder);
|
|
27
|
+
}
|
|
28
|
+
const packageJson = path.join(packageoFolder, "package.json");
|
|
29
|
+
if (!fs.existsSync(packageJson)) {
|
|
30
|
+
fs.writeFileSync(packageJson, "{\n \"name\": \"" + dependency + "\"\n}");
|
|
31
|
+
}
|
|
32
|
+
const sourceFolder = path.join(packageoFolder, "source");
|
|
33
|
+
if (!fs.existsSync(sourceFolder)) {
|
|
34
|
+
fs.mkdirSync(sourceFolder);
|
|
35
|
+
}
|
|
36
|
+
return packageJson;
|
|
37
|
+
|
|
38
|
+
|
|
22
39
|
throw new Error("cannot find package.json for " + dependency);
|
|
23
40
|
}
|
|
24
41
|
function getPackageInfo(dependency: string, options: Options) {
|
|
@@ -54,7 +71,6 @@ export async function convertNamespaceTypeToTypescript(
|
|
|
54
71
|
if (reference.nodeId.namespace !== namespaceIndex) {
|
|
55
72
|
return;
|
|
56
73
|
}
|
|
57
|
-
|
|
58
74
|
cache!.resetRequire();
|
|
59
75
|
|
|
60
76
|
if (reference.nodeId.namespace === 0 && reference.nodeId.value === DataTypeIds.Enumeration) {
|
|
@@ -202,6 +218,47 @@ async function _output_tsconfig_json(info: Info, options: Options): Promise<void
|
|
|
202
218
|
const c = getPackageFolder(dep, options);
|
|
203
219
|
return !!c.match(/node_modules/);
|
|
204
220
|
}
|
|
221
|
+
}
|
|
222
|
+
async function _output_licence(info: Info, options: Options): Promise<void> {
|
|
223
|
+
|
|
224
|
+
if (info.module === "node-opcua-nodeset-ua") {
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
const licenseFile = path.join(info.folder, "LICENSE");
|
|
228
|
+
|
|
229
|
+
const content3: string[] = [];
|
|
230
|
+
content3.push(``);
|
|
231
|
+
const year = new Date().getFullYear();
|
|
232
|
+
content3.push(`The MIT License (MIT)
|
|
233
|
+
|
|
234
|
+
Copyright (c) 2022-${year} Sterfive SAS - 833264583 RCS ORLEANS - France (https://www.sterfive.com)
|
|
235
|
+
|
|
236
|
+
Copyright (c) 2014-2022 Etienne Rossignon
|
|
237
|
+
|
|
238
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
239
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
240
|
+
the Software without restriction, including without limitation the rights to
|
|
241
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
|
242
|
+
the Software, and to permit persons to whom the Software is furnished to do so,
|
|
243
|
+
subject to the following conditions:
|
|
244
|
+
|
|
245
|
+
The above copyright notice and this permission notice shall be included in all
|
|
246
|
+
copies or substantial portions of the Software.
|
|
247
|
+
|
|
248
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
249
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
|
250
|
+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
|
251
|
+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
252
|
+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
253
|
+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
254
|
+
`);
|
|
255
|
+
|
|
256
|
+
|
|
257
|
+
// content3.push(fs.readFileSync(path.join(__dirname, "../source/licences/agpl_v3.md"), "utf8"));
|
|
258
|
+
fs.writeFileSync(licenseFile, content3.join("\n"));
|
|
259
|
+
|
|
260
|
+
|
|
261
|
+
|
|
205
262
|
}
|
|
206
263
|
async function outputFiles(infos: { [key: string]: Info }, options: Options) {
|
|
207
264
|
const values = Object.values(infos) as Info[];
|
|
@@ -216,5 +273,7 @@ async function outputFiles(infos: { [key: string]: Info }, options: Options) {
|
|
|
216
273
|
await _output_package_json(info, options);
|
|
217
274
|
|
|
218
275
|
await _output_tsconfig_json(info, options);
|
|
276
|
+
|
|
277
|
+
await _output_licence(info, options);
|
|
219
278
|
}
|
|
220
279
|
}
|