node-opcua-convert-nodeset-to-javascript 2.153.0 → 2.155.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/main.js CHANGED
@@ -18,13 +18,14 @@ async function main() {
18
18
  baseFolder: path_1.default.join(__dirname, "../../"),
19
19
  prefix: "node-opcua-nodeset-",
20
20
  };
21
+ // const nodesetCatalog2 = nodesetCatalog.filter((meta) => meta.name == "scales");
21
22
  await Promise.all(node_opcua_nodesets_1.nodesetCatalog.map((meta) => {
22
23
  const index = addressSpace.getNamespaceIndex(meta.uri);
23
24
  if (index === -1) {
24
25
  console.log("namespace not found", meta.uri);
25
26
  return;
26
27
  }
27
- (0, convert_namespace_to_typescript_1.convertNamespaceTypeToTypescript)(session, index, {
28
+ return (0, convert_namespace_to_typescript_1.convertNamespaceTypeToTypescript)(session, index, {
28
29
  ...options,
29
30
  nsName: meta.name,
30
31
  });
package/dist/main.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../source/main.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,uEAAuE;AACvE,4DAAuE;AACvE,6DAA+E;AAC/E,uFAAqF;AACrF,qEAAgE;AAEhE,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,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;QAC1C,MAAM,EAAE,qBAAqB;KAChC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,oCAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1C,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,OAAO;QACX,CAAC;QACD,IAAA,kEAAgC,EAAC,OAAO,EAAE,KAAK,EAAE;YAC7C,GAAG,OAAO;YACV,MAAM,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC,CAAA;IACN,CAAC,CACA,CAAC,CAAC;IACH,MAAM,IAAA,6CAAoB,GAAE,CAAC;AACjC,CAAC;AACD,KAAK,IAAI,EAAE,CAAC"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../source/main.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,uEAAuE;AACvE,4DAAuE;AACvE,6DAA+E;AAC/E,uFAAqF;AACrF,qEAAgE;AAEhE,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,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;QAC1C,MAAM,EAAE,qBAAqB;KAChC,CAAC;IACF,kFAAkF;IAElF,MAAM,OAAO,CAAC,GAAG,CAAC,oCAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1C,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,OAAO;QACX,CAAC;QACD,OAAO,IAAA,kEAAgC,EAAC,OAAO,EAAE,KAAK,EAAE;YACpD,GAAG,OAAO;YACV,MAAM,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC,CAAA;IACN,CAAC,CACA,CAAC,CAAC;IACH,MAAM,IAAA,6CAAoB,GAAE,CAAC;AACjC,CAAC;AACD,KAAK,IAAI,EAAE,CAAC"}
@@ -16,12 +16,21 @@ const node_opcua_nodesets_1 = require("node-opcua-nodesets");
16
16
  async function updateParentTSConfig() {
17
17
  const packagesFolder = path_1.default.join(__dirname, '..', '..');
18
18
  const parentTSConfigFile = path_1.default.join(packagesFolder, 'tsconfig.json');
19
- const parentTSConfig = JSON.parse(
19
+ console.log(`Updating parent tsconfig.json file: ${parentTSConfigFile}`);
20
+ const content = await readFile(parentTSConfigFile, 'utf8');
20
21
  // Strip out comments to avoid JSON parsing error
22
+ const contentWithoutComments = content.replace(/\/\*.+?\*\//g, '')
23
+ .replace(/\/\/.+?$/g, '');
21
24
  // TODO: Preserve comments automatically
22
- (await readFile(parentTSConfigFile, 'utf8'))
23
- .replace(/\/\*.+?\*\//g, '')
24
- .replace(/\/\/.+?$/g, ''));
25
+ let parentTSConfig = "";
26
+ try {
27
+ parentTSConfig = JSON.parse(contentWithoutComments);
28
+ }
29
+ catch (err) {
30
+ console.log(`Error parsing JSON from ${parentTSConfigFile}:`, err);
31
+ console.log('Content without comments:', contentWithoutComments);
32
+ throw err;
33
+ }
25
34
  const unlistedReferences = [];
26
35
  for (const meta of node_opcua_nodesets_1.nodesetCatalog) {
27
36
  const packageName = `node-opcua-nodeset-${meta.packageName}`;
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"update_parent_tsconfig.js","sourceRoot":"","sources":["../source/update_parent_tsconfig.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-opcua-convert-nodeset-to-javascript",
3
- "version": "2.153.0",
3
+ "version": "2.155.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",
@@ -16,27 +16,27 @@
16
16
  "@types/wordwrap": "^1.0.3",
17
17
  "case-anything": "1.1.5",
18
18
  "chalk": "4.1.2",
19
- "node-opcua-address-space": "2.153.0",
20
- "node-opcua-address-space-base": "2.153.0",
19
+ "node-opcua-address-space": "2.155.0",
20
+ "node-opcua-address-space-base": "2.155.0",
21
21
  "node-opcua-assert": "2.139.0",
22
22
  "node-opcua-constants": "2.139.0",
23
- "node-opcua-data-model": "2.153.0",
23
+ "node-opcua-data-model": "2.155.0",
24
24
  "node-opcua-debug": "2.153.0",
25
- "node-opcua-extension-object": "2.153.0",
25
+ "node-opcua-extension-object": "2.155.0",
26
26
  "node-opcua-nodeid": "2.153.0",
27
- "node-opcua-nodesets": "2.139.0",
28
- "node-opcua-pseudo-session": "2.153.0",
27
+ "node-opcua-nodesets": "2.155.0",
28
+ "node-opcua-pseudo-session": "2.155.0",
29
29
  "node-opcua-status-code": "2.153.0",
30
- "node-opcua-types": "2.153.0",
30
+ "node-opcua-types": "2.155.0",
31
31
  "node-opcua-utils": "2.153.0",
32
- "node-opcua-variant": "2.153.0",
32
+ "node-opcua-variant": "2.155.0",
33
33
  "ts-morph": "25.0.1",
34
34
  "wordwrap": "^1.0.0"
35
35
  },
36
36
  "devDependencies": {
37
- "node-opcua-leak-detector": "2.153.0",
38
- "node-opcua-packet-analyzer": "2.153.0",
39
- "node-opcua-service-translate-browse-path": "2.153.0"
37
+ "node-opcua-leak-detector": "2.154.0",
38
+ "node-opcua-packet-analyzer": "2.155.0",
39
+ "node-opcua-service-translate-browse-path": "2.155.0"
40
40
  },
41
41
  "author": "Etienne Rossignon",
42
42
  "license": "MIT",
@@ -53,7 +53,7 @@
53
53
  "internet of things"
54
54
  ],
55
55
  "homepage": "http://node-opcua.github.io/",
56
- "gitHead": "2193ed025bc9aaded76338c1c76cbc0524b3a37f",
56
+ "gitHead": "3fa553a530bc732ad6c658dc41187769f4995b68",
57
57
  "files": [
58
58
  "dist",
59
59
  "source"
package/source/main.ts CHANGED
@@ -16,13 +16,15 @@ async function main() {
16
16
  baseFolder: path.join(__dirname, "../../"),
17
17
  prefix: "node-opcua-nodeset-",
18
18
  };
19
+ // const nodesetCatalog2 = nodesetCatalog.filter((meta) => meta.name == "scales");
20
+
19
21
  await Promise.all(nodesetCatalog.map((meta) => {
20
22
  const index = addressSpace.getNamespaceIndex(meta.uri);
21
23
  if (index === -1) {
22
24
  console.log("namespace not found", meta.uri);
23
25
  return;
24
26
  }
25
- convertNamespaceTypeToTypescript(session, index, {
27
+ return convertNamespaceTypeToTypescript(session, index, {
26
28
  ...options,
27
29
  nsName: meta.name,
28
30
  })
@@ -13,14 +13,21 @@ import { nodesetCatalog } from "node-opcua-nodesets";
13
13
  export async function updateParentTSConfig() {
14
14
  const packagesFolder = path.join(__dirname, '..', '..');
15
15
  const parentTSConfigFile = path.join(packagesFolder, 'tsconfig.json');
16
- const parentTSConfig = JSON.parse(
17
- // Strip out comments to avoid JSON parsing error
18
- // TODO: Preserve comments automatically
19
- (await readFile(parentTSConfigFile, 'utf8'))
20
- .replace(/\/\*.+?\*\//g, '')
21
- .replace(/\/\/.+?$/g, '')
22
- );
16
+ console.log(`Updating parent tsconfig.json file: ${parentTSConfigFile}`);
17
+ const content = await readFile(parentTSConfigFile, 'utf8');
18
+ // Strip out comments to avoid JSON parsing error
19
+ const contentWithoutComments = content.replace(/\/\*.+?\*\//g, '')
20
+ .replace(/\/\/.+?$/g, '');
21
+ // TODO: Preserve comments automatically
22
+ let parentTSConfig: any = "";
23
+ try {
24
+ parentTSConfig = JSON.parse(contentWithoutComments);
25
+ } catch (err) {
26
+ console.log(`Error parsing JSON from ${parentTSConfigFile}:`, err);
27
+ console.log('Content without comments:', contentWithoutComments);
23
28
 
29
+ throw err;
30
+ }
24
31
  type TSConfigReference = { path: string };
25
32
  const unlistedReferences: TSConfigReference[] = [];
26
33
  for (const meta of nodesetCatalog) {
@@ -48,8 +55,8 @@ export async function updateParentTSConfig() {
48
55
  // Maintain the compact style `{ "path": "node-opcua-X" }` in references section
49
56
  // Also add the comment about Istanbul back
50
57
  const newJSON = JSON.stringify(parentTSConfig, null, " ")
51
- .replace('"removeComments": false', '"removeComments": false /* to prevent Istanbul ignore statements in comments from disappearing */')
52
- .replace(/{\s*"path":\s*"([^"]+)"\s*}/g, '{ "path": "$1" }')
58
+ .replace('"removeComments": false', '"removeComments": false /* to prevent Istanbul ignore statements in comments from disappearing */')
59
+ .replace(/{\s*"path":\s*"([^"]+)"\s*}/g, '{ "path": "$1" }')
53
60
  + '\n';
54
61
  //console.log('Writing updated tsconfig.json file:', newJSON);
55
62
  await writeFile(parentTSConfigFile, newJSON, 'utf8');