From cf4618739e0373d088cb1c325ff7914af8731c2a Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Mon, 18 Mar 2024 14:49:27 +0100 Subject: [PATCH 1/6] chore: update dependencies --- app/scripts/nmr-cli/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/nmr-cli/package-lock.json b/app/scripts/nmr-cli/package-lock.json index ea15b1f..986546f 100644 --- a/app/scripts/nmr-cli/package-lock.json +++ b/app/scripts/nmr-cli/package-lock.json @@ -1424,4 +1424,4 @@ } } } -} +} \ No newline at end of file From 72a3a3323396c866efac2adba06c6f02cd64003c Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Mon, 22 Apr 2024 10:52:48 +0200 Subject: [PATCH 2/6] chore: update dependencies --- app/scripts/nmr-cli/package-lock.json | 32 +++++++++++++-------------- app/scripts/nmr-cli/package.json | 6 ++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/scripts/nmr-cli/package-lock.json b/app/scripts/nmr-cli/package-lock.json index 986546f..62fdc55 100644 --- a/app/scripts/nmr-cli/package-lock.json +++ b/app/scripts/nmr-cli/package-lock.json @@ -12,17 +12,17 @@ "filelist-utils": "^1.11.0", "nmr-load-save": "^0.28.0", "nmr-processing": "^12.0.1", - "playwright": "^1.42.1", + "playwright": "^1.43.1", "yargs": "^17.7.2" }, "bin": { "nmr-cli": "build/index.js" }, "devDependencies": { - "@types/node": "^20.11.28", + "@types/node": "^20.12.7", "@types/yargs": "^17.0.32", "ts-node": "^10.9.2", - "typescript": "^5.4.2" + "typescript": "^5.4.5" } }, "node_modules/@cspotcode/source-map-support": { @@ -119,9 +119,9 @@ } }, "node_modules/@types/node": { - "version": "20.11.28", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.28.tgz", - "integrity": "sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==", + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -1113,11 +1113,11 @@ "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==" }, "node_modules/playwright": { - "version": "1.42.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz", - "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==", + "version": "1.43.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.43.1.tgz", + "integrity": "sha512-V7SoH0ai2kNt1Md9E3Gwas5B9m8KR2GVvwZnAI6Pg0m3sh7UvgiYhRrhsziCmqMJNouPckiOhk8T+9bSAK0VIA==", "dependencies": { - "playwright-core": "1.42.1" + "playwright-core": "1.43.1" }, "bin": { "playwright": "cli.js" @@ -1130,9 +1130,9 @@ } }, "node_modules/playwright-core": { - "version": "1.42.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz", - "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==", + "version": "1.43.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.43.1.tgz", + "integrity": "sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==", "bin": { "playwright-core": "cli.js" }, @@ -1298,9 +1298,9 @@ } }, "node_modules/typescript": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", - "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/app/scripts/nmr-cli/package.json b/app/scripts/nmr-cli/package.json index 73bca57..93ca88b 100644 --- a/app/scripts/nmr-cli/package.json +++ b/app/scripts/nmr-cli/package.json @@ -18,13 +18,13 @@ "filelist-utils": "^1.11.0", "nmr-load-save": "^0.28.0", "nmr-processing": "^12.0.1", - "playwright": "^1.42.1", + "playwright": "^1.43.1", "yargs": "^17.7.2" }, "devDependencies": { - "@types/node": "^20.11.28", + "@types/node": "^20.12.7", "@types/yargs": "^17.0.32", "ts-node": "^10.9.2", - "typescript": "^5.4.2" + "typescript": "^5.4.5" } } \ No newline at end of file From bed41c14dd45897152eb17ad329474a07f7a87dc Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Mon, 22 Apr 2024 10:53:43 +0200 Subject: [PATCH 3/6] feat: update nmr-load-save to version 0.29.3 --- app/scripts/nmr-cli/package-lock.json | 248 +++--------------- app/scripts/nmr-cli/package.json | 4 +- app/scripts/nmr-cli/src/publication-string.ts | 2 +- 3 files changed, 43 insertions(+), 211 deletions(-) diff --git a/app/scripts/nmr-cli/package-lock.json b/app/scripts/nmr-cli/package-lock.json index 62fdc55..487215c 100644 --- a/app/scripts/nmr-cli/package-lock.json +++ b/app/scripts/nmr-cli/package-lock.json @@ -10,8 +10,8 @@ "license": "ISC", "dependencies": { "filelist-utils": "^1.11.0", - "nmr-load-save": "^0.28.0", - "nmr-processing": "^12.0.1", + "nmr-load-save": "^0.29.3", + "nmr-processing": "^12.2.0", "playwright": "^1.43.1", "yargs": "^17.7.2" }, @@ -208,29 +208,15 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/baselines/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/binary-search": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz", "integrity": "sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==" }, "node_modules/brukerconverter": { - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.6.tgz", - "integrity": "sha512-l995nNGSONWv2d4LxHf7qbG1z3vSe+5ksUGw4M5eUypedg2pycItdGeGIipEkP3JTsc+So8d8RshlNm4TbSYVQ==", + "version": "6.3.9", + "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.9.tgz", + "integrity": "sha512-rmzadrmIbBiv4Ihh4G4fTSqXAEM+Z2ai402hAt2KK/AQWRXl9hYzXPpKubYt1Z8qWaqcG2dkvoOmb/yuKGiVOg==", "dependencies": { "cheminfo-types": "^1.7.2", "filelist-utils": "^1.11.0", @@ -240,20 +226,6 @@ "ml-spectra-processing": "^14.1.1" } }, - "node_modules/brukerconverter/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/cheminfo-types": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/cheminfo-types/-/cheminfo-types-1.7.3.tgz", @@ -289,16 +261,16 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/convert-to-jcamp": { - "version": "5.4.9", - "resolved": "https://registry.npmjs.org/convert-to-jcamp/-/convert-to-jcamp-5.4.9.tgz", - "integrity": "sha512-6WZ9Whrk7f4TSqepPbBRovnZ+IV+fjncZ8AYfX1OnnILlDQobciiJYFgxawvqpttwrKdmC3eh8shoAjW7CPKMQ==", + "version": "5.4.10", + "resolved": "https://registry.npmjs.org/convert-to-jcamp/-/convert-to-jcamp-5.4.10.tgz", + "integrity": "sha512-noIRSe+cW1JATYaF0RSMDX6nCdjnzU7pFdDtalI6RA0g8I+3Rt3SV4uc1Pj5KUC1fP04dcemCNGTDdNusfHH0Q==", "dependencies": { - "cheminfo-types": "^1.7.2", + "cheminfo-types": "^1.7.3", "is-any-array": "^2.0.1", "ml-array-max": "^1.2.4", "ml-array-min": "^1.2.3", - "ml-matrix": "^6.10.4", - "ml-spectra-processing": "^12.5.0" + "ml-matrix": "^6.11.0", + "ml-spectra-processing": "^14.2.2" } }, "node_modules/core-util-is": { @@ -415,9 +387,9 @@ } }, "node_modules/gyromagnetic-ratio": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gyromagnetic-ratio/-/gyromagnetic-ratio-1.1.1.tgz", - "integrity": "sha512-M1y9bAhK11moqAPRZ5oUoDCEIQCogjKYXDMlkXJiSjkLFmOAp1qevrjThF+6KrtwkSpmT7Vgy8C/mgBlIdZPSg==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gyromagnetic-ratio/-/gyromagnetic-ratio-1.2.0.tgz", + "integrity": "sha512-Pgo5kU9Wd2WZ5KMChPyfFuimkfOq7CUPsmpmm/wcDBPJD2YOcAd7aCbZ0Xt+80h+yjqAhqVnXBxjQhoqIcAXJw==" }, "node_modules/heap": { "version": "0.2.7", @@ -482,9 +454,9 @@ } }, "node_modules/jcampconverter": { - "version": "9.6.3", - "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-9.6.3.tgz", - "integrity": "sha512-o+VyI5kWHd3w//01FRpI0uKuZrfJq8x6ae15ImxnKgm+/ThVnvqSwcOSaKrvnEcRVh13BClpMrn+JCES9QATXA==", + "version": "9.6.4", + "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-9.6.4.tgz", + "integrity": "sha512-6T8bPCImT2NQudVCBM5h47YFHMtpIAYFlcf6pCV3uP/AdceGtjGLA1iJVukhA2U2WPtzWax67aRvSfdknJEzFg==", "dependencies": { "cheminfo-types": "^1.7.2", "dynamic-typing": "^1.0.0", @@ -494,9 +466,9 @@ } }, "node_modules/jeolconverter": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/jeolconverter/-/jeolconverter-1.0.2.tgz", - "integrity": "sha512-Oqp4VioharhRkQRSc6WkXc+s42DYLOdLWV7eNi16CJbiBvoaSrFf0KQwJJ5JfbpncYRMzrsjilBFYzYTbREC6g==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/jeolconverter/-/jeolconverter-1.0.3.tgz", + "integrity": "sha512-0ADCau6TYGgZvN3kK2PTKHk7enpgOAUvcHaNbeStGOciTUFyrtmaE53z6Blac9+GzGpT3kU0agfNA2COO+GsOw==", "dependencies": { "iobuffer": "^5.3.2" } @@ -536,20 +508,6 @@ "ml-spectra-processing": "^14.2.2" } }, - "node_modules/linear-sum-assignment/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -661,20 +619,6 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/ml-direct/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/ml-disjoint-set": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ml-disjoint-set/-/ml-disjoint-set-1.0.0.tgz", @@ -716,20 +660,6 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/ml-gsd/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/ml-hash-table": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ml-hash-table/-/ml-hash-table-1.0.0.tgz", @@ -821,27 +751,13 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/ml-rolling-ball-baseline/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/ml-savitzky-golay-generalized": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/ml-savitzky-golay-generalized/-/ml-savitzky-golay-generalized-4.0.1.tgz", - "integrity": "sha512-I3z6aEj9f+VaqoqWoTmyXOsIngOCW2JtpcZfoeqnLFFFuIyK4uXOEIRVft3XgQbbtivIvTBJKHpfxyN8sgB5vA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/ml-savitzky-golay-generalized/-/ml-savitzky-golay-generalized-4.2.0.tgz", + "integrity": "sha512-Pcn0URPuFbmxNC75SvukByL1Ct+DYQuyo8O5EfmUcHacx+zeODbIoPRgrWwEWZGvZAJ03aS9avTwV0VUNdtAZQ==", "dependencies": { - "cheminfo-types": "^1.0.0", - "is-any-array": "^2.0.0" + "cheminfo-types": "^1.7.3", + "is-any-array": "^2.0.1" } }, "node_modules/ml-signal-processing": { @@ -856,20 +772,6 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/ml-signal-processing/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/ml-simple-clustering": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/ml-simple-clustering/-/ml-simple-clustering-0.1.0.tgz", @@ -896,10 +798,10 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/ml-spectra-fitting/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", + "node_modules/ml-spectra-processing": { + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.3.0.tgz", + "integrity": "sha512-kY+vP8LMT/IXdyjltm1GG6lsm+FgshYuQkDbTAV6V0anO9VoBBDdJYiJYb4UmAS1AO8GTK5HGr8StODkas39pA==", "dependencies": { "binary-search": "^1.3.6", "cheminfo-types": "^1.7.3", @@ -910,20 +812,6 @@ "spline-interpolator": "^1.0.0" } }, - "node_modules/ml-spectra-processing": { - "version": "12.8.0", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-12.8.0.tgz", - "integrity": "sha512-vu8RiTDWmo9UHUTcaILhH0j61cdsUp2FYiHjvkJQ/JH2ArdOTRJ4KShsiHUgfS4MDLWevcN9kWSalDT5vnwx7g==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.2", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.10.5", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/ml-tree-set": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ml-tree-set/-/ml-tree-set-0.1.1.tgz", @@ -946,24 +834,24 @@ } }, "node_modules/nmr-load-save": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.28.0.tgz", - "integrity": "sha512-w6+34QISiOFMeWHr1aarqd4vlF0RjHH2CkAZSsjbIoOsTwMbDKprV+YjayE1QmraVnWUGUln58E1K1v5Bx2Xew==", + "version": "0.29.3", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.29.3.tgz", + "integrity": "sha512-5RKmXP5UQ0fL3JlBh3PYD4AGvTB/UEvf292tw6gi77nzPK/BPzpa+f4/78UR9QQk6qC3M5BYksD87fJMcwamfw==", "dependencies": { "@lukeed/uuid": "^2.0.1", "@types/lodash.merge": "^4.6.9", - "brukerconverter": "^6.3.6", + "brukerconverter": "^6.3.8", "cheminfo-types": "^1.7.3", - "convert-to-jcamp": "^5.4.9", + "convert-to-jcamp": "^5.4.10", "filelist-utils": "^1.11.0", "gyromagnetic-ratio": "^1.1.1", "is-any-array": "^2.0.1", - "jcampconverter": "^9.6.3", - "jeolconverter": "^1.0.2", + "jcampconverter": "^9.6.4", + "jeolconverter": "^1.0.3", "lodash.merge": "^4.6.2", "ml-spectra-processing": "^14.2.2", "nmr-correlation": "^2.3.3", - "nmr-processing": "^12.0.1", + "nmr-processing": "^12.2.0", "nmredata": "^0.9.9", "openchemlib": "^8.9.0", "openchemlib-utils": "^5.12.1", @@ -971,24 +859,10 @@ "varian-converter": "^1.0.0" } }, - "node_modules/nmr-load-save/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/nmr-processing": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-12.0.1.tgz", - "integrity": "sha512-DqmYAw3hpIWFQlXLeWrOrxnn8VHT9jfMobOENuWhpAg/6MSnmOqkAqhLPFUDhP1mF3z4IXlNyRIWKYsYbisrzA==", + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-12.2.0.tgz", + "integrity": "sha512-03EQxGh3JovKv1l6IXeSj0rm5vuw9iD9QE31cL7O1+NHXbPq/NBkCvSls0LjxIRM5C8hQyddg4/FuJANNlSHjQ==", "dependencies": { "@lukeed/uuid": "^2.0.1", "binary-search": "^1.3.6", @@ -1017,20 +891,6 @@ "spectrum-generator": "^8.0.11" } }, - "node_modules/nmr-processing/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/nmredata": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/nmredata/-/nmredata-0.9.9.tgz", @@ -1195,20 +1055,6 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/spectrum-generator/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/spline-interpolator": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/spline-interpolator/-/spline-interpolator-1.0.0.tgz", @@ -1337,20 +1183,6 @@ "ml-spectra-processing": "^14.2.0" } }, - "node_modules/varian-converter/node_modules/ml-spectra-processing": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.2.2.tgz", - "integrity": "sha512-N4MFs5DW+H+Cu3txjwDNNFlKDTuVVYmrQJhs8qGBZ9KyMunwfBAHcoRS9M7minmxpUDJxJ8UgI72ZKB1SK4ysQ==", - "dependencies": { - "binary-search": "^1.3.6", - "cheminfo-types": "^1.7.3", - "fft.js": "^4.0.4", - "is-any-array": "^2.0.1", - "ml-matrix": "^6.11.0", - "ml-xsadd": "^2.0.0", - "spline-interpolator": "^1.0.0" - } - }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", diff --git a/app/scripts/nmr-cli/package.json b/app/scripts/nmr-cli/package.json index 93ca88b..a90c665 100644 --- a/app/scripts/nmr-cli/package.json +++ b/app/scripts/nmr-cli/package.json @@ -16,8 +16,8 @@ }, "dependencies": { "filelist-utils": "^1.11.0", - "nmr-load-save": "^0.28.0", - "nmr-processing": "^12.0.1", + "nmr-load-save": "^0.29.3", + "nmr-processing": "^12.2.0", "playwright": "^1.43.1", "yargs": "^17.7.2" }, diff --git a/app/scripts/nmr-cli/src/publication-string.ts b/app/scripts/nmr-cli/src/publication-string.ts index f423894..3bd994a 100644 --- a/app/scripts/nmr-cli/src/publication-string.ts +++ b/app/scripts/nmr-cli/src/publication-string.ts @@ -61,7 +61,7 @@ function generateSpectrumFromPublicationString( ) { const { ranges, - experiment: { nucleus, solvent }, + info: { nucleus, solvent = '' }, parts, } = resurrect(publicationString); return generateSpectrumFromRanges( From 913a4d5531245e9dfd7c49f1706be869cc3dc063 Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Mon, 22 Apr 2024 12:52:34 +0200 Subject: [PATCH 4/6] feat: update docker image to playwright:v1.43.1-jammy --- app/scripts/nmr-cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/nmr-cli/Dockerfile b/app/scripts/nmr-cli/Dockerfile index afc252d..c4f2afe 100644 --- a/app/scripts/nmr-cli/Dockerfile +++ b/app/scripts/nmr-cli/Dockerfile @@ -1,7 +1,7 @@ # build the image ` docker build --tag nmr-cli . ` # run the container ` docker run -it nmr-cli bash ` -FROM mcr.microsoft.com/playwright:v1.40.0-jammy +FROM mcr.microsoft.com/playwright:v1.43.1-jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] From ab9ce575001f2481e87108dffcd57100a7bd7894 Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Fri, 7 Jun 2024 10:54:58 +0200 Subject: [PATCH 5/6] chore: update playwright to version 1.44.1 --- app/scripts/nmr-cli/Dockerfile | 2 +- app/scripts/nmr-cli/package-lock.json | 26 +++++++++++++------------- app/scripts/nmr-cli/package.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/scripts/nmr-cli/Dockerfile b/app/scripts/nmr-cli/Dockerfile index c4f2afe..cf1a1b8 100644 --- a/app/scripts/nmr-cli/Dockerfile +++ b/app/scripts/nmr-cli/Dockerfile @@ -1,7 +1,7 @@ # build the image ` docker build --tag nmr-cli . ` # run the container ` docker run -it nmr-cli bash ` -FROM mcr.microsoft.com/playwright:v1.43.1-jammy +FROM mcr.microsoft.com/playwright:v1.44.1-jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/app/scripts/nmr-cli/package-lock.json b/app/scripts/nmr-cli/package-lock.json index 487215c..9bb6ce1 100644 --- a/app/scripts/nmr-cli/package-lock.json +++ b/app/scripts/nmr-cli/package-lock.json @@ -12,14 +12,14 @@ "filelist-utils": "^1.11.0", "nmr-load-save": "^0.29.3", "nmr-processing": "^12.2.0", - "playwright": "^1.43.1", + "playwright": "^1.44.1", "yargs": "^17.7.2" }, "bin": { "nmr-cli": "build/index.js" }, "devDependencies": { - "@types/node": "^20.12.7", + "@types/node": "^20.14.2", "@types/yargs": "^17.0.32", "ts-node": "^10.9.2", "typescript": "^5.4.5" @@ -119,9 +119,9 @@ } }, "node_modules/@types/node": { - "version": "20.12.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", - "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "version": "20.14.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", + "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -973,11 +973,11 @@ "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==" }, "node_modules/playwright": { - "version": "1.43.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.43.1.tgz", - "integrity": "sha512-V7SoH0ai2kNt1Md9E3Gwas5B9m8KR2GVvwZnAI6Pg0m3sh7UvgiYhRrhsziCmqMJNouPckiOhk8T+9bSAK0VIA==", + "version": "1.44.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz", + "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==", "dependencies": { - "playwright-core": "1.43.1" + "playwright-core": "1.44.1" }, "bin": { "playwright": "cli.js" @@ -990,9 +990,9 @@ } }, "node_modules/playwright-core": { - "version": "1.43.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.43.1.tgz", - "integrity": "sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==", + "version": "1.44.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz", + "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==", "bin": { "playwright-core": "cli.js" }, @@ -1256,4 +1256,4 @@ } } } -} \ No newline at end of file +} diff --git a/app/scripts/nmr-cli/package.json b/app/scripts/nmr-cli/package.json index a90c665..d695d2b 100644 --- a/app/scripts/nmr-cli/package.json +++ b/app/scripts/nmr-cli/package.json @@ -18,11 +18,11 @@ "filelist-utils": "^1.11.0", "nmr-load-save": "^0.29.3", "nmr-processing": "^12.2.0", - "playwright": "^1.43.1", + "playwright": "^1.44.1", "yargs": "^17.7.2" }, "devDependencies": { - "@types/node": "^20.12.7", + "@types/node": "^20.14.2", "@types/yargs": "^17.0.32", "ts-node": "^10.9.2", "typescript": "^5.4.5" From eecf2e5df40b7639c68584bb8fe7b1031639070a Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Fri, 7 Jun 2024 10:57:05 +0200 Subject: [PATCH 6/6] feat: update to nmr-load-save version 0.33.1 --- app/scripts/nmr-cli/package-lock.json | 193 +++++++++++++++----------- app/scripts/nmr-cli/package.json | 4 +- 2 files changed, 116 insertions(+), 81 deletions(-) diff --git a/app/scripts/nmr-cli/package-lock.json b/app/scripts/nmr-cli/package-lock.json index 9bb6ce1..cc37305 100644 --- a/app/scripts/nmr-cli/package-lock.json +++ b/app/scripts/nmr-cli/package-lock.json @@ -10,8 +10,8 @@ "license": "ISC", "dependencies": { "filelist-utils": "^1.11.0", - "nmr-load-save": "^0.29.3", - "nmr-processing": "^12.2.0", + "nmr-load-save": "^0.33.1", + "nmr-processing": "^12.3.2", "playwright": "^1.44.1", "yargs": "^17.7.2" }, @@ -105,6 +105,19 @@ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "dev": true }, + "node_modules/@types/d3-color": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", + "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==" + }, + "node_modules/@types/d3-interpolate": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", + "dependencies": { + "@types/d3-color": "*" + } + }, "node_modules/@types/lodash": { "version": "4.17.0", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", @@ -192,20 +205,20 @@ "dev": true }, "node_modules/atom-sorter": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/atom-sorter/-/atom-sorter-2.0.0.tgz", - "integrity": "sha512-30O3ccAH+lmysMykyEkBsfB65BU329GatBeYrgzKjDBhaURgvWT7B2+C9gmBFnVmbMO2HaqvyAuce3eMsICluw==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/atom-sorter/-/atom-sorter-2.0.1.tgz", + "integrity": "sha512-xIM0KiDgCnPfw2ZE6uqIt2FZBCogIslJPtl5lRTpO9OHLRbohWfQYR4ipmqp12AyFWyAIptcnxCCA/aTcnCfYA==" }, "node_modules/baselines": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/baselines/-/baselines-1.1.7.tgz", - "integrity": "sha512-UaZbIovi2Ur0AiKl5lR3OZ8B/CxXhySd7BjDiuv8g9A/bEfstQjUASdjsDFQMBBHC6vzBfwXYGRhPEWX8VvcYQ==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/baselines/-/baselines-1.1.9.tgz", + "integrity": "sha512-dFqZSb0EwzmTUyjI3k0HSfsKMKMDHpCILPTsdysFgLf8roGq5f58KrSYAwa9vODk2dbE8NdKgNnKk8TBwXNWAw==", "dependencies": { - "ml-airpls": "^1.0.3", + "ml-airpls": "^2.0.0", "ml-array-sequential-fill": "^1.1.8", - "ml-baseline-correction-regression": "^1.0.2", + "ml-baseline-correction-regression": "^2.0.1", "ml-rolling-ball-baseline": "^2.0.3", - "ml-spectra-processing": "^14.2.0" + "ml-spectra-processing": "^14.5.0" } }, "node_modules/binary-search": { @@ -214,16 +227,16 @@ "integrity": "sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==" }, "node_modules/brukerconverter": { - "version": "6.3.9", - "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.9.tgz", - "integrity": "sha512-rmzadrmIbBiv4Ihh4G4fTSqXAEM+Z2ai402hAt2KK/AQWRXl9hYzXPpKubYt1Z8qWaqcG2dkvoOmb/yuKGiVOg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-7.0.0.tgz", + "integrity": "sha512-GJczqQleVXtJL7DSeNMvSXmE7JuTQdhSjs4Wc3qM78uJJNKn3pBD73YW2pbCyuf4aelTvnxFJq67F+9850JgUQ==", "dependencies": { - "cheminfo-types": "^1.7.2", + "cheminfo-types": "^1.7.3", "filelist-utils": "^1.11.0", "iobuffer": "^5.3.2", "is-any-array": "^2.0.1", - "jcampconverter": "^9.6.1", - "ml-spectra-processing": "^14.1.1" + "jcampconverter": "^9.6.4", + "ml-spectra-processing": "^14.3.0" } }, "node_modules/cheminfo-types": { @@ -302,6 +315,19 @@ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-0.7.1.tgz", "integrity": "sha512-Ifi3fH46Bco+Lb1mOlTxbFEuF3NdyElEVVD+EmoK327I0JzKAP4x57cl+HoxHqFcVd8F/uXLC+wtY3n/R1uO2w==" }, + "node_modules/d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + }, + "node_modules/d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "dependencies": { + "d3-color": "1 - 2" + } + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -535,11 +561,12 @@ "integrity": "sha512-/QL9ptNuLsdA68qO+2o10TKCyu621zwwTFdLvtu8rzRNKsn8zvuGoq/vDxECPyELFG8wu+BpyoMR9BnsJqfVZQ==" }, "node_modules/ml-airpls": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ml-airpls/-/ml-airpls-1.0.3.tgz", - "integrity": "sha512-U6D0ahNuCxgfu/bb415tJMAXdtC+5cysUNAS3bWZWQCwQR53vNjby9MJN+6muBiDz6XQk0lULkg+PsW1N+OG6g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ml-airpls/-/ml-airpls-2.0.0.tgz", + "integrity": "sha512-dCFbc2UNnzHkU6PAa1SFjdob/cVNZz//BlLh6BF2jHp56+Oahi02PLytrV4v+X3sW20v2l//8hXuqjZCuv88OQ==", "dependencies": { - "cuthill-mckee": "^1.0.0" + "cuthill-mckee": "^1.0.0", + "ml-spectra-processing": "^14.5.0" } }, "node_modules/ml-array-max": { @@ -586,28 +613,11 @@ } }, "node_modules/ml-baseline-correction-regression": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ml-baseline-correction-regression/-/ml-baseline-correction-regression-1.0.2.tgz", - "integrity": "sha512-dRKbGx49gXhHyvpb9/6OpqySY7cEm8rz0LaQWyAsaMALr3aKHXvtPsjADh5afkzsYRw53QPgwccCo0XTvT3M8w==", - "dependencies": { - "ml-regression-polynomial": "^2.2.0" - } - }, - "node_modules/ml-baseline-correction-regression/node_modules/ml-regression-base": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/ml-regression-base/-/ml-regression-base-2.1.6.tgz", - "integrity": "sha512-yTckvEc8szc6VrUTJSgAClShvCoPZdNt8pmyRe8aGsIWGjg6bYFotp9mDUwAB0snvKAbQWd6A4trL/PDCASLug==", - "dependencies": { - "is-any-array": "^2.0.0" - } - }, - "node_modules/ml-baseline-correction-regression/node_modules/ml-regression-polynomial": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ml-regression-polynomial/-/ml-regression-polynomial-2.2.0.tgz", - "integrity": "sha512-WxFsEmi6oLxgq9TeaVoAA+vVUJFp1kGarX6WWClR8OmlanoIW5iLMnaeXfQcYuH8xNq4R1Cax2N9hYYmeWWkLg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ml-baseline-correction-regression/-/ml-baseline-correction-regression-2.0.1.tgz", + "integrity": "sha512-ZPdJogONI5/M7eFuJ4NCrr8NJ1XcSl7OVTUOvZkFr2yjT/o592nd3oqtj+ChyxAJLMO68eFlktNV0OHhvxy1KQ==", "dependencies": { - "ml-matrix": "^6.8.0", - "ml-regression-base": "^2.1.3" + "ml-regression-polynomial": "^3.0.1" } }, "node_modules/ml-direct": { @@ -724,22 +734,40 @@ } }, "node_modules/ml-regression-base": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ml-regression-base/-/ml-regression-base-3.0.0.tgz", - "integrity": "sha512-qkQWvNk8VU1LIytjid/+YHOSx8GnEU9dCUPsAQ8AzCh4saijrsni/XA6x7r+N1UrHMDHeSEUBtRZTsl2syyu/A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ml-regression-base/-/ml-regression-base-4.0.0.tgz", + "integrity": "sha512-V2VjB+K/BcgXaX450xvYw36TLOB+piD9G1pHU3VE+ggQUApsVGkYco6UMQykFOwBydHnDTbOiybH/lwrkqFT4g==", "dependencies": { - "cheminfo-types": "^1.7.2", + "cheminfo-types": "^1.7.3", "is-any-array": "^2.0.1" } }, + "node_modules/ml-regression-exponential": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ml-regression-exponential/-/ml-regression-exponential-3.0.1.tgz", + "integrity": "sha512-oCKda88AooF76M5ocdfl2YZbdU/TpiU/KQ9NSV6nr9r/5r9jCZkak4sH0quKUNnwZcgcdZdryGpmUT9yP8qHpQ==", + "dependencies": { + "ml-regression-base": "^4.0.0", + "ml-regression-simple-linear": "^3.0.0" + } + }, "node_modules/ml-regression-polynomial": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ml-regression-polynomial/-/ml-regression-polynomial-3.0.0.tgz", - "integrity": "sha512-8agLNJZzuVpdthMDUkaamiQnfHx7y1T9LrbCiAPHnhklVrg7O7tzClEZ7XMh48AZMNhKl1ewGvn2VLrI6AD+wA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ml-regression-polynomial/-/ml-regression-polynomial-3.0.1.tgz", + "integrity": "sha512-dNds0VK4nrMyZvwovy9bYo2WaHPstEztPly4EWB8mj+vPcNxyq4a2UiTueR1jwkgLo6/QWDzA+HBsHP7S/0z3A==", "dependencies": { - "cheminfo-types": "^1.7.2", - "ml-matrix": "^6.10.5", - "ml-regression-base": "^3.0.0" + "cheminfo-types": "^1.7.3", + "ml-matrix": "^6.11.0", + "ml-regression-base": "^4.0.0" + } + }, + "node_modules/ml-regression-simple-linear": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ml-regression-simple-linear/-/ml-regression-simple-linear-3.0.1.tgz", + "integrity": "sha512-SF2oxA+034Co9GVQSFuS3vtACaRAFrEwHi9oX6VTaSY/KtXxseL3d4GApj4jWXMoAgrP7VMoIO1PH0RoZaMR1g==", + "dependencies": { + "cheminfo-types": "^1.7.3", + "ml-regression-base": "^4.0.0" } }, "node_modules/ml-rolling-ball-baseline": { @@ -799,9 +827,9 @@ } }, "node_modules/ml-spectra-processing": { - "version": "14.3.0", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.3.0.tgz", - "integrity": "sha512-kY+vP8LMT/IXdyjltm1GG6lsm+FgshYuQkDbTAV6V0anO9VoBBDdJYiJYb4UmAS1AO8GTK5HGr8StODkas39pA==", + "version": "14.5.0", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.5.0.tgz", + "integrity": "sha512-ECXiyrXmWAZ2kndB0J232JdPbGThEnjlV47VNrFtVdRZoCCSsFhRFVvO/aFWbyXNa0MtPnnR3qn8e66vwTkdEw==", "dependencies": { "binary-search": "^1.3.6", "cheminfo-types": "^1.7.3", @@ -834,43 +862,47 @@ } }, "node_modules/nmr-load-save": { - "version": "0.29.3", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.29.3.tgz", - "integrity": "sha512-5RKmXP5UQ0fL3JlBh3PYD4AGvTB/UEvf292tw6gi77nzPK/BPzpa+f4/78UR9QQk6qC3M5BYksD87fJMcwamfw==", + "version": "0.33.1", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.33.1.tgz", + "integrity": "sha512-ksJBJt2/FQZ8l8pNsy6UP1McqJNGlpkpjbwpbeD8LoA7EYWuAHJMM21GLIe9SJT9Dx1pxlY8Gv9drlGDcykq3g==", "dependencies": { "@lukeed/uuid": "^2.0.1", "@types/lodash.merge": "^4.6.9", - "brukerconverter": "^6.3.8", + "brukerconverter": "^7.0.0", "cheminfo-types": "^1.7.3", "convert-to-jcamp": "^5.4.10", "filelist-utils": "^1.11.0", - "gyromagnetic-ratio": "^1.1.1", + "gyromagnetic-ratio": "^1.2.0", "is-any-array": "^2.0.1", "jcampconverter": "^9.6.4", "jeolconverter": "^1.0.3", "lodash.merge": "^4.6.2", - "ml-spectra-processing": "^14.2.2", + "ml-spectra-processing": "^14.5.0", "nmr-correlation": "^2.3.3", - "nmr-processing": "^12.2.0", + "nmr-processing": "^12.3.1", "nmredata": "^0.9.9", - "openchemlib": "^8.9.0", - "openchemlib-utils": "^5.12.1", + "openchemlib": "^8.10.0", + "openchemlib-utils": "^5.19.1", "sdf-parser": "^6.0.1", "varian-converter": "^1.0.0" } }, "node_modules/nmr-processing": { - "version": "12.2.0", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-12.2.0.tgz", - "integrity": "sha512-03EQxGh3JovKv1l6IXeSj0rm5vuw9iD9QE31cL7O1+NHXbPq/NBkCvSls0LjxIRM5C8hQyddg4/FuJANNlSHjQ==", + "version": "12.3.2", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-12.3.2.tgz", + "integrity": "sha512-dCKoFT+U/ASHCxryK6rfwzcv5u6Be78PLFm6+N4jBCL3uMqAU/gzZwHSBWYh0KM8qmmT7wkM+sqzutem+FDD7Q==", "dependencies": { "@lukeed/uuid": "^2.0.1", + "@types/d3-color": "^3.1.3", + "@types/d3-interpolate": "^3.0.4", "binary-search": "^1.3.6", - "gyromagnetic-ratio": "^1.1.1", + "d3-color": "^2.0.0", + "d3-interpolate": "^2.0.1", + "gyromagnetic-ratio": "^1.2.0", "is-any-array": "^2.0.1", - "linear-sum-assignment": "^1.0.5", + "linear-sum-assignment": "^1.0.7", "lodash.omit": "^4.5.0", - "ml-airpls": "^1.0.3", + "ml-airpls": "^2.0.0", "ml-direct": "^1.0.0", "ml-gsd": "^12.1.6", "ml-hclust": "^3.1.0", @@ -879,15 +911,17 @@ "ml-matrix-convolution": "^1.0.0", "ml-matrix-peaks-finder": "^1.0.0", "ml-peak-shape-generator": "^4.1.2", + "ml-regression-base": "^4.0.0", + "ml-regression-exponential": "^3.0.1", "ml-regression-polynomial": "^3.0.0", "ml-signal-processing": "^1.0.4", "ml-simple-clustering": "^0.1.0", "ml-sparse-matrix": "^2.1.0", - "ml-spectra-processing": "^14.2.0", + "ml-spectra-processing": "^14.5.0", "ml-tree-set": "^0.1.1", "nmr-correlation": "^2.3.3", "numeral": "^2.0.6", - "openchemlib-utils": "^5.12.0", + "openchemlib-utils": "^5.19.1", "spectrum-generator": "^8.0.11" } }, @@ -941,16 +975,17 @@ } }, "node_modules/openchemlib": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.9.0.tgz", - "integrity": "sha512-8Bb7batm6XvNHg9SWBJDYrkJj5bsq72D5dClpN5yO6BnxxNxtRP1+e6egHwoMwGhd4dyb+eBX7Kr/hdUqMN1Dw==" + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.13.0.tgz", + "integrity": "sha512-CdE9mNFdiQaZbjThvpplKC2YObyg9w4cKbuZ8nn/dRuTvk35H7+LPl2xylm84OGW3062AanU61ms4HnNZOzoXA==" }, "node_modules/openchemlib-utils": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-5.12.1.tgz", - "integrity": "sha512-zqkr8eScv87qrKELV/i/C5IVxqDcPYq29Rm1KrV993aFcVXlCuBRpAtyQ7BRZlNh8D9SDHOn78V3I+ZyciF2cw==", + "version": "5.21.1", + "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-5.21.1.tgz", + "integrity": "sha512-4Y1O0aITXN9T2V6VsszV26K9WZnlg8OY0CmQ2hdLBQIEwueuroEziKSa0OShkFQNkUIk3qPBGZk2876jR6UqIQ==", "dependencies": { - "atom-sorter": "^2.0.0", + "@lukeed/uuid": "^2.0.1", + "atom-sorter": "^2.0.1", "ensure-string": "^1.2.0", "get-value": "^3.0.1", "ml-floyd-warshall": "^3.0.1", diff --git a/app/scripts/nmr-cli/package.json b/app/scripts/nmr-cli/package.json index d695d2b..84c3ebb 100644 --- a/app/scripts/nmr-cli/package.json +++ b/app/scripts/nmr-cli/package.json @@ -16,8 +16,8 @@ }, "dependencies": { "filelist-utils": "^1.11.0", - "nmr-load-save": "^0.29.3", - "nmr-processing": "^12.2.0", + "nmr-load-save": "^0.33.1", + "nmr-processing": "^12.3.2", "playwright": "^1.44.1", "yargs": "^17.7.2" },