diff --git a/app/scripts/nmr-cli/Dockerfile b/app/scripts/nmr-cli/Dockerfile index 3f2c17a..af129be 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.49.0-jammy +FROM mcr.microsoft.com/playwright:v1.51.0-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 15b098f..201606e 100644 --- a/app/scripts/nmr-cli/package-lock.json +++ b/app/scripts/nmr-cli/package-lock.json @@ -1,28 +1,28 @@ { - "name": "test-node", + "name": "nmr-cli", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "test-node", + "name": "nmr-cli", "version": "1.0.0", "license": "ISC", "dependencies": { - "filelist-utils": "^1.11.2", - "nmr-load-save": "^2.1.0", - "nmr-processing": "^14.0.5", - "playwright": "^1.49.0", + "filelist-utils": "^1.11.3", + "nmr-load-save": "^3.1.3", + "nmr-processing": "^17.0.0", + "playwright": "^1.51.0", "yargs": "^17.7.2" }, "bin": { "nmr-cli": "build/index.js" }, "devDependencies": { - "@types/node": "^22.10.1", + "@types/node": "^22.13.10", "@types/yargs": "^17.0.33", "ts-node": "^10.9.2", - "typescript": "^5.7.2" + "typescript": "^5.8.2" } }, "node_modules/@cspotcode/source-map-support": { @@ -38,18 +38,18 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { @@ -82,9 +82,9 @@ } }, "node_modules/@tsconfig/node10": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", - "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", "dev": true }, "node_modules/@tsconfig/node12": { @@ -119,9 +119,9 @@ } }, "node_modules/@types/lodash": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", - "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==" + "version": "4.17.16", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz", + "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==" }, "node_modules/@types/lodash.merge": { "version": "4.6.9", @@ -132,9 +132,9 @@ } }, "node_modules/@types/node": { - "version": "22.10.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz", - "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "dev": true, "dependencies": { "undici-types": "~6.20.0" @@ -156,9 +156,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -168,10 +168,13 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", - "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, "engines": { "node": ">=0.4.0" } @@ -205,9 +208,9 @@ "dev": true }, "node_modules/atom-sorter": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/atom-sorter/-/atom-sorter-2.1.3.tgz", - "integrity": "sha512-mfITb+18f/9C7xpWTVJVa0vlyak06JwW0XeqzUWpRxhbn5w1Mc4EbGg0vrjtTcNEzRRvp5o3oO16XJ8LhhpnGw==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/atom-sorter/-/atom-sorter-2.2.0.tgz", + "integrity": "sha512-ktg7pvTF22Ox/HPJZjUrw3L0dH1nOZg+CjGR0r1iyZO2LDbQX5GgIxOWq4YthifBrcVxfFMkdKVhp5YJ43g0Vw==" }, "node_modules/baselines": { "version": "1.1.9", @@ -227,16 +230,16 @@ "integrity": "sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==" }, "node_modules/brukerconverter": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-7.0.4.tgz", - "integrity": "sha512-G8Jx2f+hV02Zvkw+nXB1MpTFJaJhsuinrt+XQv/SFjA88rWYCrxw3WIMmHx06Bp19Zw03BYMdHy0YDMpyjplbw==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-8.0.3.tgz", + "integrity": "sha512-SLDPH+fD5zTp9qb9NESTT1xWFI6mN4yWT5tdSROPbdCD6zgv6F8fb4VRbyWw0fHs//HH2/8PRFkPd5LejiXcwg==", "dependencies": { - "cheminfo-types": "^1.7.3", - "filelist-utils": "^1.11.0", + "cheminfo-types": "^1.8.1", + "filelist-utils": "^1.11.2", "iobuffer": "^5.3.2", "is-any-array": "^2.0.1", - "jcampconverter": "^10.0.1", - "ml-spectra-processing": "^14.5.0" + "jcampconverter": "^11.0.1", + "ml-spectra-processing": "^14.9.2" } }, "node_modules/cheminfo-types": { @@ -302,11 +305,6 @@ "resolved": "https://registry.npmjs.org/cuthill-mckee/-/cuthill-mckee-1.0.0.tgz", "integrity": "sha512-ehXCHYXZhZzDZmVQE/P9wQ7XPOn1G3e+pVqcqXvYykBL8Lg7HFm2ewD3TZseOMWiM9bNU0u4UWSV/dAzf+unug==" }, - "node_modules/d3-array": { - "version": "0.7.1", - "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", @@ -349,9 +347,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "engines": { "node": ">=6" } @@ -361,10 +359,19 @@ "resolved": "https://registry.npmjs.org/fft.js/-/fft.js-4.0.4.tgz", "integrity": "sha512-f9c00hphOgeQTlDyavwTtu6RiK8AIFjD6+jvXkNkpeQ7rirK3uFWVpalkoS4LAwbdX7mfZ8aoBfFVQX1Re/8aw==" }, + "node_modules/fifo-logger": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fifo-logger/-/fifo-logger-1.0.0.tgz", + "integrity": "sha512-QLwozqK3u0+8w+J9JPGBYxAvA0tAZhdnhE74OCHAhopGiRltJ7QDvobE15qORPty8qkDBdXhsMaGF35Ry0kwAA==", + "dependencies": { + "@lukeed/uuid": "^2.0.1", + "typescript-event-target": "^1.1.0" + } + }, "node_modules/filelist-utils": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/filelist-utils/-/filelist-utils-1.11.2.tgz", - "integrity": "sha512-e2bUWJLAjyMq+RZU0cEUhjGXQTFe2+TOE+qhHvBl8iPlSnb+iY6ibZaWUsLKRTuVtVVeAvqnJXCIUjXsSk1gKg==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/filelist-utils/-/filelist-utils-1.11.3.tgz", + "integrity": "sha512-KB3d9ruIVHSz53SL1FscfP+QXv1lkPDYE48JoKJ49N1b0AqI6Ux1LLG7ipVCuTlMpBMVW/I1sKEhdvBB4wgsiA==", "dependencies": { "cheminfo-types": "^1.7.3", "jszip": "^3.10.1", @@ -432,9 +439,9 @@ } }, "node_modules/iobuffer": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/iobuffer/-/iobuffer-5.3.2.tgz", - "integrity": "sha512-kO3CjNfLZ9t+tHxAMd+Xk4v3D/31E91rMs1dHrm7ikEQrlZ8mLDbQ4z3tZfDM48zOkReas2jx8MWSAmN9+c8Fw==" + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/iobuffer/-/iobuffer-5.4.0.tgz", + "integrity": "sha512-DRebOWuqDvxunfkNJAlc3IzWIPD5xVxwUNbHr7xKB8E6aLJxIPfNX3CoMJghcFjpv6RWQsrcJbghtEwSPoJqMA==" }, "node_modules/is-any-array": { "version": "2.0.1", @@ -471,21 +478,21 @@ } }, "node_modules/jcampconverter": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-10.0.1.tgz", - "integrity": "sha512-1yQ9Q35K2A64Q5NQ7AN/w6KbooviQAQ33Yo6p4vMFAyntR09n/OzR65CubbCogp3bVCm+pdQ3RCkfrcKqTabRQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-11.0.1.tgz", + "integrity": "sha512-8i01PC5WhUMH9H2AIssOhqSJpgjftJFQ2MUcYSgqKzy3QemQ8D7M960Ab+jba0wO4ThWYSp1xKMBmoL6zuEYQA==", "dependencies": { - "cheminfo-types": "^1.8.0", + "cheminfo-types": "^1.8.1", "dynamic-typing": "^1.0.1", "ensure-string": "^1.2.0", - "gyromagnetic-ratio": "^1.2.0", + "gyromagnetic-ratio": "^1.2.1", "ml-array-median": "^1.1.6" } }, "node_modules/jeolconverter": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/jeolconverter/-/jeolconverter-1.0.3.tgz", - "integrity": "sha512-0ADCau6TYGgZvN3kK2PTKHk7enpgOAUvcHaNbeStGOciTUFyrtmaE53z6Blac9+GzGpT3kU0agfNA2COO+GsOw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/jeolconverter/-/jeolconverter-1.0.4.tgz", + "integrity": "sha512-p4MwOtP5QcBqvdr4jha0fQiOcArRf6K8CwwElpaG7chbmBuEf2FQpZj5QFP9VJQa3I1C3U3tzw5bM+QG388sWQ==", "dependencies": { "iobuffer": "^5.3.2" } @@ -525,21 +532,11 @@ "ml-spectra-processing": "^14.2.2" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, - "node_modules/lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==" - }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -611,6 +608,15 @@ "ml-regression-polynomial": "^3.0.1" } }, + "node_modules/ml-convolution": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ml-convolution/-/ml-convolution-2.0.0.tgz", + "integrity": "sha512-ExW6zVmN2YGuyO3aBiS1ymybme3nVgv2ccCfynSdgtW5sNp4DOHnfow4K/ErTDMQ1s9tINjv7kvzjnVhQHXJBA==", + "dependencies": { + "fft.js": "^4.0.3", + "next-power-of-two": "^1.0.0" + } + }, "node_modules/ml-direct": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ml-direct/-/ml-direct-1.0.0.tgz", @@ -691,9 +697,9 @@ } }, "node_modules/ml-matrix": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.12.0.tgz", - "integrity": "sha512-AGfR+pWaC0GmzjUnB6BfwhndPEUGz0i7QUYdqNuw1zhTov/vSRJ9pP2hs6BoGpaSbtXgrKjZz2zjD1M0xuur6A==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.12.1.tgz", + "integrity": "sha512-TJ+8eOFdp+INvzR4zAuwBQJznDUfktMtOB6g/hUcGh3rcyjxbz4Te57Pgri8Q9bhSQ7Zys4IYOGhFdnlgeB6Lw==", "dependencies": { "is-any-array": "^2.0.1", "ml-array-rescale": "^1.3.7" @@ -818,17 +824,16 @@ } }, "node_modules/ml-spectra-processing": { - "version": "14.7.0", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.7.0.tgz", - "integrity": "sha512-O8ztoPhiKe6U2w7U+Lb7Ft9gE6/o6w4Y6x0QOQM74iP40t4tP7ZDMdTtCCEUuk8l/YWxSBsjXYvD1NL5OW+mBQ==", + "version": "14.10.0", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.10.0.tgz", + "integrity": "sha512-4fyF6tojgVgh6m9nmFvaIlGhrvHq+swn64IxQ44F4k4o7Qkl8xKOJWfQ4EsfoX66GqZn2PFfcn1xUGRNwB8+3w==", "dependencies": { "binary-search": "^1.3.6", "cheminfo-types": "^1.8.1", "fft.js": "^4.0.4", "is-any-array": "^2.0.1", "ml-matrix": "^6.12.0", - "ml-xsadd": "^3.0.1", - "spline-interpolator": "^1.0.0" + "ml-xsadd": "^3.0.1" } }, "node_modules/ml-tree-set": { @@ -841,47 +846,64 @@ "resolved": "https://registry.npmjs.org/ml-xsadd/-/ml-xsadd-3.0.1.tgz", "integrity": "sha512-Fz2q6dwgzGM8wYKGArTUTZDGa4lQFA2Vi6orjGeTVRy22ZnQFKlJuwS9n8NRviqz1KHAHAzdKJwbnYhdo38uYg==" }, + "node_modules/multiplet-analysis": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/multiplet-analysis/-/multiplet-analysis-2.1.5.tgz", + "integrity": "sha512-5+CF7qj/ccP+KZquYI2tDEjkGmRL6w1fciAs0OvTzSbAGsi5mEH7oruUipcXh2O6bgZhrY1TduBQkdFVXGJUwQ==", + "dependencies": { + "cheminfo-types": "^1.8.1", + "fft.js": "^4.0.4", + "ml-airpls": "^2.0.0", + "ml-spectra-processing": "^14.7.0" + } + }, + "node_modules/next-power-of-two": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-power-of-two/-/next-power-of-two-1.0.0.tgz", + "integrity": "sha512-+z6QY1SxkDk6CQJAeaIZKmcNubBCRP7J8DMQUBglz/sSkNsZoJ1kULjqk9skNPPplzs4i9PFhYrvNDdtQleF/A==" + }, "node_modules/nmr-correlation": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/nmr-correlation/-/nmr-correlation-2.3.3.tgz", - "integrity": "sha512-RSdzZGsE2HeitUEhA7Dc1048eu6Web/SH5UjrbFEpddVNwvPGKQUZfQ5uoygcaTpKfq2lTddi2Ln9MDYjfyOgg==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/nmr-correlation/-/nmr-correlation-2.3.5.tgz", + "integrity": "sha512-WmJXckcF+epK0u2DVv+LBahvtlbFiCbTtXQsYmq07fze6i6XLPHnFcE1q6HKtiYYbePd6ks2PMOmWQEDdU2XbA==", "dependencies": { - "cheminfo-types": "^1.4.0", - "lodash": "^4.17.21", + "cheminfo-types": "^1.8.1", "ml-matrix-peaks-finder": "^1.0.0", - "ml-peak-shape-generator": "^4.1.1" + "ml-peak-shape-generator": "^4.1.4" } }, "node_modules/nmr-load-save": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-2.1.0.tgz", - "integrity": "sha512-4QIjH/2W713uhLd4i417v1XuV+pknPDOJcYoeRiRHoFf4rev7/gx+QnYZ/f1g3PXzSvARFq6k70Wgwxckn2KBg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-3.1.3.tgz", + "integrity": "sha512-hkLzOZ2cK3leDs9d6r3rgb1FInDH9KRJ5frrrQUHVFT9NrCd54bJW0Ice6Vfd4tJmg5GJtGlFc+jw+YzxTppIw==", "dependencies": { "@lukeed/uuid": "^2.0.1", "@types/lodash.merge": "^4.6.9", - "brukerconverter": "^7.0.4", + "brukerconverter": "^8.0.3", "cheminfo-types": "^1.8.1", "convert-to-jcamp": "^5.4.11", - "filelist-utils": "^1.11.2", + "fifo-logger": "^1.0.0", + "filelist-utils": "^1.11.3", "gyromagnetic-ratio": "^1.2.1", "is-any-array": "^2.0.1", - "jcampconverter": "^10.0.1", - "jeolconverter": "^1.0.3", + "jcampconverter": "^11.0.1", + "jeolconverter": "^1.0.4", + "linear-sum-assignment": "^1.0.7", "lodash.merge": "^4.6.2", - "ml-spectra-processing": "^14.6.2", - "nmr-correlation": "^2.3.3", - "nmr-processing": "^14.0.2", + "ml-spectra-processing": "^14.10.0", + "nmr-correlation": "^2.3.5", + "nmr-processing": "^17.0.0", "nmredata": "^0.9.11", - "openchemlib": "^8.17.0", - "openchemlib-utils": "^6.4.1", - "sdf-parser": "^6.0.1", - "varian-converter": "^1.0.0" + "openchemlib": "^8.18.1", + "openchemlib-utils": "^6.5.3", + "sdf-parser": "^7.0.4", + "varian-converter": "^2.0.1" } }, "node_modules/nmr-processing": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-14.0.5.tgz", - "integrity": "sha512-172pG4vTvR1mRMGZX9xGNwopf/qJ2oUsq2gmozRMPnR9TpgeqJqYcUxEDAqPh4seVkoxNDCX0uS7TvOTuzudxQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-17.0.0.tgz", + "integrity": "sha512-ZmqnxqNt1gEQkTSVfsSlH073peUvL83A6nWr81ktKixqmVgFn5nQ5Lr4TDKLjXJD08x+6StwZo5UeDVloXIdFA==", "dependencies": { "@lukeed/uuid": "^2.0.1", "@types/d3-color": "^3.1.3", @@ -892,30 +914,31 @@ "gyromagnetic-ratio": "^1.2.1", "is-any-array": "^2.0.1", "linear-sum-assignment": "^1.0.7", - "lodash.omit": "^4.5.0", "ml-airpls": "^2.0.0", + "ml-convolution": "^2.0.0", "ml-direct": "^1.0.0", "ml-gsd": "^12.1.8", "ml-hclust": "^3.1.0", "ml-levenberg-marquardt": "^4.1.3", - "ml-matrix": "^6.11.1", + "ml-matrix": "^6.12.0", "ml-matrix-convolution": "^1.0.0", "ml-matrix-peaks-finder": "^1.0.0", "ml-peak-shape-generator": "^4.1.4", "ml-regression-base": "^4.0.0", - "ml-regression-exponential": "^3.0.1", + "ml-regression-exponential": "^3.0.2", "ml-regression-polynomial": "^3.0.1", "ml-regression-simple-linear": "^3.0.1", "ml-savitzky-golay-generalized": "^4.2.0", - "ml-signal-processing": "^1.1.1", + "ml-signal-processing": "^1.2.0", "ml-simple-clustering": "^0.1.0", "ml-sparse-matrix": "^2.1.0", - "ml-spectra-processing": "^14.6.0", + "ml-spectra-processing": "^14.10.0", "ml-tree-set": "^0.1.1", - "nmr-correlation": "^2.3.3", + "multiplet-analysis": "^2.1.5", + "nmr-correlation": "^2.3.5", "numeral": "^2.0.6", - "openchemlib-utils": "^6.4.1", - "spectrum-generator": "^8.0.11" + "openchemlib-utils": "^6.5.3", + "spectrum-generator": "^8.0.12" } }, "node_modules/nmredata": { @@ -949,26 +972,35 @@ } }, "node_modules/openchemlib": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.17.0.tgz", - "integrity": "sha512-oLtXP5EdD+TDbuKSL7bm5am6GiSK54hCPlrTD7Bq4A2L57aVDeqSY175mcN1Lxo6OJ3i53nKKlNEgQofxcICKg==" + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.18.1.tgz", + "integrity": "sha512-2v9aujHwhlIaCSkpzyDxUmYBtM08OP347aXNa0NwVaxIu2rAmTLHQCsz4FpooW2NZNweiVDp9g2AxZeakqTggA==" }, "node_modules/openchemlib-utils": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-6.4.1.tgz", - "integrity": "sha512-06MimP21cvX3rME/ZFqCaA0nPDuQoiWyfgRBbSHDmJSJJYMmrbTWPxrIXy/dQSZktcDdrh8L3VQF11HWRBwsOw==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-6.6.0.tgz", + "integrity": "sha512-t8tsV0qAB28HE/mnE4F9YZjwlnnGaaqeYTPDjd1m5r2g5pGJEYY9Zt09MI1YWoLU/jNElYdb8LsGkO7zlwLoIQ==", "dependencies": { "@lukeed/uuid": "^2.0.1", - "atom-sorter": "^2.1.1", + "atom-sorter": "^2.2.0", "ensure-string": "^1.2.0", "get-value": "^3.0.1", "ml-floyd-warshall": "^3.0.1", - "ml-matrix": "^6.11.1", - "papaparse": "^5.4.1", + "ml-matrix": "^6.12.0", + "papaparse": "^5.5.2", "sdf-parser": "^6.0.1" }, "peerDependencies": { - "openchemlib": ">=8.14.0" + "openchemlib": ">=8.18.1" + } + }, + "node_modules/openchemlib-utils/node_modules/sdf-parser": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/sdf-parser/-/sdf-parser-6.0.1.tgz", + "integrity": "sha512-QorgjqiqTzodCMmYkWYkYJ9nBnOL3w3mWOE9BB1SATUfkFvLOSxHaeZAnJxrHlRkfI7+q3+FsvZOS2OTN74lNA==", + "dependencies": { + "dynamic-typing": "^1.0.0", + "ensure-string": "^1.2.0" } }, "node_modules/pako": { @@ -977,16 +1009,16 @@ "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" }, "node_modules/papaparse": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz", - "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==" + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.2.tgz", + "integrity": "sha512-PZXg8UuAc4PcVwLosEEDYjPyfWnTEhOrUfdv+3Bx+NuAb+5NhDmXzg5fHWmdCh1mP5p7JAZfFr3IMQfcntNAdA==" }, "node_modules/playwright": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.0.tgz", - "integrity": "sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.0.tgz", + "integrity": "sha512-442pTfGM0xxfCYxuBa/Pu6B2OqxqqaYq39JS8QDMGThUvIOCd6s0ANDog3uwA0cHavVlnTQzGCN7Id2YekDSXA==", "dependencies": { - "playwright-core": "1.49.0" + "playwright-core": "1.51.0" }, "bin": { "playwright": "cli.js" @@ -999,9 +1031,9 @@ } }, "node_modules/playwright-core": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.0.tgz", - "integrity": "sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.0.tgz", + "integrity": "sha512-x47yPE3Zwhlil7wlNU/iktF7t2r/URR3VLbH6EknJd/04Qc/PSJ0EY3CMXipmglLG+zyRxW6HNo2EGbKLHPWMg==", "bin": { "playwright-core": "cli.js" }, @@ -1042,11 +1074,11 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/sdf-parser": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/sdf-parser/-/sdf-parser-6.0.1.tgz", - "integrity": "sha512-QorgjqiqTzodCMmYkWYkYJ9nBnOL3w3mWOE9BB1SATUfkFvLOSxHaeZAnJxrHlRkfI7+q3+FsvZOS2OTN74lNA==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/sdf-parser/-/sdf-parser-7.0.4.tgz", + "integrity": "sha512-j4VIBVTVJqs95Asz0lcIku1VjlVgKKWlwDV2JmCIq1exlI9WOSBT9rQvwvTPwl0v2TTgdQLfhYnBmiRg318LoQ==", "dependencies": { - "dynamic-typing": "^1.0.0", + "dynamic-typing": "^1.0.1", "ensure-string": "^1.2.0" } }, @@ -1056,20 +1088,12 @@ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" }, "node_modules/spectrum-generator": { - "version": "8.0.11", - "resolved": "https://registry.npmjs.org/spectrum-generator/-/spectrum-generator-8.0.11.tgz", - "integrity": "sha512-B68lrg7XFtt+bB6cYnxbiPiD7TrFl5zYKNkKXZcY3LqqShHXQHhq8RKpHi2coEsJQs4nrxmHJ9mfxP6p4QGmMw==", - "dependencies": { - "ml-peak-shape-generator": "^4.1.2", - "ml-spectra-processing": "^14.2.0" - } - }, - "node_modules/spline-interpolator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/spline-interpolator/-/spline-interpolator-1.0.0.tgz", - "integrity": "sha512-s8lowgsWE5wjHGEsk/4VADp7xAHw+pNy3OGp96fYjVTwLSx/83+BBmTFP2wZDRM0kj45q8zSyOV5fUcGn4hLEw==", + "version": "8.0.12", + "resolved": "https://registry.npmjs.org/spectrum-generator/-/spectrum-generator-8.0.12.tgz", + "integrity": "sha512-7CG714g2yANDIqfFu8gj1EZk0qxqjL7L9IQtLMYR5ZybkG+O3TnQkMtXKu3tcm6B4oo2qBTNLgSUOh0NTXHYSw==", "dependencies": { - "d3-array": "^0.7.1" + "ml-peak-shape-generator": "^4.1.4", + "ml-spectra-processing": "^14.8.0" } }, "node_modules/string_decoder": { @@ -1148,9 +1172,9 @@ } }, "node_modules/typescript": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", - "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1160,6 +1184,11 @@ "node": ">=14.17" } }, + "node_modules/typescript-event-target": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/typescript-event-target/-/typescript-event-target-1.1.1.tgz", + "integrity": "sha512-dFSOFBKV6uwaloBCCUhxlD3Pr/P1a/tJdcmPrTXCHlEFD3faj0mztjcGn6VBAhQ0/Bdy8K3VWrrqwbt/ffsYsg==" + }, "node_modules/undici-types": { "version": "6.20.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", @@ -1178,9 +1207,9 @@ "dev": true }, "node_modules/varian-converter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/varian-converter/-/varian-converter-1.0.0.tgz", - "integrity": "sha512-dZrYLrN8llpfXC8EDKzgaeB0foCCTgTnsfjiIr1PH2GChRwkM0yjLzAgco+E+hTFoo6Da3Nvj9Zmud9i0YPlDg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/varian-converter/-/varian-converter-2.0.1.tgz", + "integrity": "sha512-bvOZ74Zs/Hbht7GDCC6Z/jQOrCyczjItfT5KOJsAG4Ty3MQBvjHf16GwuuWpBnmNRUezLjZ2v+bSS/wVyPXYQQ==", "dependencies": { "filelist-utils": "^1.11.0", "iobuffer": "^5.3.2", diff --git a/app/scripts/nmr-cli/package.json b/app/scripts/nmr-cli/package.json index 255d428..2296c01 100644 --- a/app/scripts/nmr-cli/package.json +++ b/app/scripts/nmr-cli/package.json @@ -1,12 +1,12 @@ { - "name": "test-node", + "name": "nmr-cli", "version": "1.0.0", "description": "", "main": "./build/index.js", "scripts": { "build": "tsc", "start": "node build/index.js", - "dev": "ts-node src/index.ts" + "dev": "nmr-cli src/index.ts" }, "keywords": [], "author": "", @@ -15,16 +15,16 @@ "nmr-cli": "./build/index.js" }, "dependencies": { - "filelist-utils": "^1.11.2", - "nmr-load-save": "^2.1.0", - "nmr-processing": "^14.0.5", - "playwright": "^1.49.0", + "filelist-utils": "^1.11.3", + "nmr-load-save": "^3.1.3", + "nmr-processing": "^17.0.0", + "playwright": "^1.51.0", "yargs": "^17.7.2" }, "devDependencies": { - "@types/node": "^22.10.1", + "@types/node": "^22.13.10", "@types/yargs": "^17.0.33", "ts-node": "^10.9.2", - "typescript": "^5.7.2" + "typescript": "^5.8.2" } } \ No newline at end of file diff --git a/app/scripts/nmr-cli/tsconfig.json b/app/scripts/nmr-cli/tsconfig.json index 0f9b561..3365620 100644 --- a/app/scripts/nmr-cli/tsconfig.json +++ b/app/scripts/nmr-cli/tsconfig.json @@ -1,10 +1,9 @@ { "compilerOptions": { - "target": "ES2020", - "module": "CommonJS", + "target": "ES2022", + "module": "NodeNext", "strict": true, "esModuleInterop": true, - "moduleResolution": "node", "outDir": "./build", "skipLibCheck": true, },