diff --git a/.env.example b/.env.example index f4870c0..db292c0 100644 --- a/.env.example +++ b/.env.example @@ -2,4 +2,6 @@ PORT=3333 HOST=0.0.0.0 NODE_ENV=production APP_KEY=NZu-mbqukZjV_65cT3ckDB21exh17-ws -DRIVE_DISK=local \ No newline at end of file +DRIVE_DISK=local +NMRIUM_DEV_URL=https://nmriumdev.nmrxiv.org +NMRIUM_PROD_URL=https://nmrium.nmrxiv.org/ \ No newline at end of file diff --git a/.env.test b/.env.test index 2c87534..ba76b1a 100644 --- a/.env.test +++ b/.env.test @@ -1 +1,3 @@ NODE_ENV=test +NMRIUM_DEV_URL=https://nmriumdev.nmrxiv.org +NMRIUM_PROD_URL=https://nmrium.nmrxiv.org/ diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index c5f695c..0182682 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -28,4 +28,4 @@ jobs: release-type: node package-name: release-please-action token: ${{ secrets.GITHUB_TOKEN }} - prerelease: true \ No newline at end of file + prerelease: false \ No newline at end of file diff --git a/app/Controllers/Http/SpectraController.ts b/app/Controllers/Http/SpectraController.ts index 4f0ec53..4ac9ee0 100644 --- a/app/Controllers/Http/SpectraController.ts +++ b/app/Controllers/Http/SpectraController.ts @@ -54,8 +54,8 @@ export default class SpectraController { private generateNMRiumURL() { const baseURL = Env.get('NODE_ENV') === 'development' - ? 'https://nmriumdev.nmrxiv.org' - : 'https://nmrium.nmrxiv.org/' + ? Env.get('NMRIUM_DEV_URL') + : Env.get('NMRIUM_PROD_URL') const url = new URL(baseURL) const preferences = JSON.stringify({ diff --git a/env.ts b/env.ts index 3ac1661..3a68b7c 100644 --- a/env.ts +++ b/env.ts @@ -21,4 +21,6 @@ export default Env.rules({ APP_NAME: Env.schema.string(), DRIVE_DISK: Env.schema.enum(['local'] as const), NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const), + NMRIUM_DEV_URL: Env.schema.string(), + NMRIUM_PROD_URL: Env.schema.string(), }) diff --git a/package-lock.json b/package-lock.json index 5775390..ada1f3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@adonisjs/core": "^5.9.0", "@adonisjs/repl": "^3.1.11", "adonis5-swagger": "^1.4.1", - "nmr-load-save": "^0.23.2", + "nmr-load-save": "^0.27.3", "playwright": "^1.39.0", "proxy-addr": "^2.0.7", "reflect-metadata": "^0.1.13", @@ -1263,14 +1263,14 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" }, "node_modules/@types/lodash": { - "version": "4.14.195", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz", - "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==" + "version": "4.14.202", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" }, "node_modules/@types/lodash.merge": { - "version": "4.6.7", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.7.tgz", - "integrity": "sha512-OwxUJ9E50gw3LnAefSHJPHaBLGEKmQBQ7CZe/xflHkyy/wH2zVyEIAKReHvVrrn7zKdF58p16We9kMfh7v0RRQ==", + "version": "4.6.9", + "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", + "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", "dependencies": { "@types/lodash": "*" } @@ -2148,7 +2148,8 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true }, "node_modules/atob": { "version": "2.1.2", @@ -2374,16 +2375,16 @@ } }, "node_modules/brukerconverter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.1.tgz", - "integrity": "sha512-ri6uQYfsoRBoTnBj7bv0Fm6vao80nm/f/ODj0acYMMqjK/YP79JmDjHSS3if5zukgWPlGVWYyShrJEIJjYeX4A==", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.5.tgz", + "integrity": "sha512-gyuC9jN3FPq84UbDlGTR5Bg6ALa3fxexp5ukfn6pfLpUQOvnnx8/AqRQHlRJR1xxnIj4/UEFu42zaaDr59ai0g==", "dependencies": { "cheminfo-types": "^1.5.0", "filelist-utils": "^1.8.0", "iobuffer": "^5.3.2", "is-any-array": "^2.0.0", - "jcampconverter": "^9.1.0", - "ml-spectra-processing": "^12.0.0" + "jcampconverter": "^9.5.1", + "ml-spectra-processing": "^12.10.1" } }, "node_modules/buffer": { @@ -2899,6 +2900,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -3394,6 +3396,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, "engines": { "node": ">=0.4.0" } @@ -4219,9 +4222,9 @@ } }, "node_modules/filelist-utils": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/filelist-utils/-/filelist-utils-1.10.2.tgz", - "integrity": "sha512-E4wIKXIXEyON7i6Z/7+hjytm53S0GSE/b+lvPlE5jAbHRV8thv7a4G+aLLFeOPYQK01MCH1l+ti6jHQ3tl/7bg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/filelist-utils/-/filelist-utils-1.11.0.tgz", + "integrity": "sha512-POCfHquP6jw2aPjfs7UWyywfWkSsLFsXquPNEchrFkc7ffxlz42IiJHeqc7SweMccSF4tV2Kgr1yzPAA/z/iPg==", "dependencies": { "cheminfo-types": "^1.7.2", "cross-fetch": "^4.0.0", @@ -4319,6 +4322,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -4598,9 +4602,9 @@ "dev": true }, "node_modules/gyromagnetic-ratio": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gyromagnetic-ratio/-/gyromagnetic-ratio-1.0.0.tgz", - "integrity": "sha512-s55NtJPxoplsW/8OnM1C7tNWd2gEXXt+roF3NPNDKFb7YchBy9JXdxmzztf3d4JL1zCiQz5cn6HSC8M0osN78w==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gyromagnetic-ratio/-/gyromagnetic-ratio-1.1.1.tgz", + "integrity": "sha512-M1y9bAhK11moqAPRZ5oUoDCEIQCogjKYXDMlkXJiSjkLFmOAp1qevrjThF+6KrtwkSpmT7Vgy8C/mgBlIdZPSg==" }, "node_modules/has": { "version": "1.0.3", @@ -5316,14 +5320,14 @@ } }, "node_modules/jcampconverter": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-9.2.2.tgz", - "integrity": "sha512-+mZK6QzbwnDBorK6lzccFuBNiTSGgwQGKczdhxNzpYjKS1osEQwtmgPJVEp9JGqbI7ClxXJU6IAyxivIBN/jLA==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-9.6.1.tgz", + "integrity": "sha512-j7zx3G2KMRCfATo8+fP+3assk/8G4UODZCUuwbCAy+S7xHy2cZuY0gkMb3RLE2VBGm9PRqTAIUEm62HYG8XDIA==", "dependencies": { "cheminfo-types": "^1.7.2", "dynamic-typing": "^1.0.0", "ensure-string": "^1.2.0", - "gyromagnetic-ratio": "^1.0.0", + "gyromagnetic-ratio": "^1.1.1", "ml-array-median": "^1.1.6" } }, @@ -6157,9 +6161,9 @@ } }, "node_modules/ml-airpls": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ml-airpls/-/ml-airpls-1.0.2.tgz", - "integrity": "sha512-LbQu28am8XUHr54TWOh8Rz6edC6KRA5pjJ83F6J6/0a5QrZrh0ioEukfv3d9WeeUDzdczNLbdkU5hJvICCVacA==", + "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==", "dependencies": { "cuthill-mckee": "^1.0.0" } @@ -6215,6 +6219,23 @@ "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==", + "dependencies": { + "ml-matrix": "^6.8.0", + "ml-regression-base": "^2.1.3" + } + }, "node_modules/ml-direct": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/ml-direct/-/ml-direct-0.1.3.tgz", @@ -6253,16 +6274,30 @@ } }, "node_modules/ml-gsd": { - "version": "12.1.3", - "resolved": "https://registry.npmjs.org/ml-gsd/-/ml-gsd-12.1.3.tgz", - "integrity": "sha512-9qTIc3reKSifJ4EpxdFl+9C4pfvm/XKuM+JXBfHdd2hhfD1ZQ9CcrPxm5OBTcZVqJ4e9pKsUDvJnjePX2Yb5YA==", + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/ml-gsd/-/ml-gsd-12.1.4.tgz", + "integrity": "sha512-jo9U3ITEoo/pGdNvKqGaT0aIXt63aQ/zFfFxTATbUNfbjdJxsvGPYRBqoQ6dGfz7W2vuSxdecGfBVek7fvK3ig==", "dependencies": { "@lukeed/uuid": "^2.0.0", "cheminfo-types": "^1.4.0", "ml-peak-shape-generator": "^4.1.2", "ml-savitzky-golay-generalized": "^4.0.1", "ml-spectra-fitting": "^4.2.1", - "ml-spectra-processing": "^12.0.0" + "ml-spectra-processing": "^14.0.0" + } + }, + "node_modules/ml-gsd/node_modules/ml-spectra-processing": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.1.1.tgz", + "integrity": "sha512-PaYJDtJOvIfJPOHZsTlDN6+w78ksPZ2Rhk3dY68JgI+x7Q7gBfNbBQNBIu1vWHaJhJTsVD+OcTULM16r4l3kTA==", + "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.11.0", + "ml-xsadd": "^2.0.0", + "spline-interpolator": "^1.0.0" } }, "node_modules/ml-hash-table": { @@ -6295,9 +6330,9 @@ } }, "node_modules/ml-matrix": { - "version": "6.10.7", - "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.10.7.tgz", - "integrity": "sha512-v0AciHOXnCEYz8Dq4r5TeA+BFyIabBwng9y/rFVF43mhh3Ho2jDhJ6UZ0IUPRiedmfNcJDmI1j7YFdY30mHAcQ==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.11.0.tgz", + "integrity": "sha512-7jr9NmFRkaUxbKslfRu3aZOjJd2LkSitCGv+QH9PF0eJoEG7jIpjXra1Vw8/kgao8+kHCSsJONG6vfWmXQ+/Eg==", "dependencies": { "is-any-array": "^2.0.1", "ml-array-rescale": "^1.3.7" @@ -6329,20 +6364,22 @@ } }, "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==", + "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==", "dependencies": { - "is-any-array": "^2.0.0" + "cheminfo-types": "^1.7.2", + "is-any-array": "^2.0.1" } }, "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": "3.0.0", + "resolved": "https://registry.npmjs.org/ml-regression-polynomial/-/ml-regression-polynomial-3.0.0.tgz", + "integrity": "sha512-8agLNJZzuVpdthMDUkaamiQnfHx7y1T9LrbCiAPHnhklVrg7O7tzClEZ7XMh48AZMNhKl1ewGvn2VLrI6AD+wA==", "dependencies": { - "ml-matrix": "^6.8.0", - "ml-regression-base": "^2.1.3" + "cheminfo-types": "^1.7.2", + "ml-matrix": "^6.10.5", + "ml-regression-base": "^3.0.0" } }, "node_modules/ml-rolling-ball-baseline": { @@ -6389,28 +6426,42 @@ } }, "node_modules/ml-spectra-fitting": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ml-spectra-fitting/-/ml-spectra-fitting-4.2.1.tgz", - "integrity": "sha512-vZI98eSK5HKeZTgh8omskRHB8QdnDTaTw1rbMPWTkfBH+6FgEgPvMRqH18BAaSHtxJHrqE6c4tQq9L9J8iYebg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/ml-spectra-fitting/-/ml-spectra-fitting-4.2.2.tgz", + "integrity": "sha512-xhUFBDantDHoXaH/Bjr5DcywP536ijyjDAkN6QA5BOiMgZB8DsTmI/9l684nStp4KaaJOlNjB2NF/Haz+LV3ZQ==", "dependencies": { - "cheminfo-types": "^1.4.0", + "cheminfo-types": "^1.7.2", "ml-array-max": "^1.2.4", - "ml-direct": "^0.1.1", - "ml-levenberg-marquardt": "^4.1.0", + "ml-direct": "^0.1.3", + "ml-levenberg-marquardt": "^4.1.3", "ml-peak-shape-generator": "^4.1.2", - "ml-spectra-processing": "^12.0.0" + "ml-spectra-processing": "^14.0.0" + } + }, + "node_modules/ml-spectra-fitting/node_modules/ml-spectra-processing": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.1.1.tgz", + "integrity": "sha512-PaYJDtJOvIfJPOHZsTlDN6+w78ksPZ2Rhk3dY68JgI+x7Q7gBfNbBQNBIu1vWHaJhJTsVD+OcTULM16r4l3kTA==", + "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.11.0", + "ml-xsadd": "^2.0.0", + "spline-interpolator": "^1.0.0" } }, "node_modules/ml-spectra-processing": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-12.6.0.tgz", - "integrity": "sha512-AwvWndgKa5rUsNGfp/WxIunQ4Il3MXKYGyBgNZQ679C8dytKNEfU9e5QGly7pKDxQYiI0ptxWCHPzIjc2JJtqA==", + "version": "12.11.0", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-12.11.0.tgz", + "integrity": "sha512-kMQ/6oMf4YZn1ThWZ1nz7TH/Ns7fsPMGgD4dvCiDdUu+oDJ9shwxytG467Leq0DsYDwmWD9wqfCQfe48zG/L7A==", "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-matrix": "^6.11.0", "ml-xsadd": "^2.0.0", "spline-interpolator": "^1.0.0" } @@ -6625,69 +6676,67 @@ } }, "node_modules/nmr-load-save": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.23.2.tgz", - "integrity": "sha512-QSBYdjENOAhznJoZWYzn8aLQc3Df24xSWzwn/maK5dHd015XKy35p4+O5u2KmGW6lmyF8KysWemjmiKHUXdv7Q==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.27.3.tgz", + "integrity": "sha512-AjJDAChUqo1CzIcAB8LeOWn0ikTIyoDjPxcTI6YRfNEyvd6BuwhRyGnqz0whgeAMwwICGsVfpmWiimdAM4mj9w==", "dependencies": { "@lukeed/uuid": "^2.0.1", - "@types/lodash.merge": "^4.6.7", - "brukerconverter": "^6.3.1", + "@types/lodash.merge": "^4.6.9", + "brukerconverter": "^6.3.5", "cheminfo-types": "^1.7.2", "convert-to-jcamp": "^5.4.9", - "filelist-utils": "^1.10.2", - "gyromagnetic-ratio": "^1.0.0", + "filelist-utils": "^1.11.0", + "gyromagnetic-ratio": "^1.1.1", "is-any-array": "^2.0.1", - "jcampconverter": "^9.2.2", + "jcampconverter": "^9.6.1", "jeolconverter": "^1.0.2", "lodash.merge": "^4.6.2", - "ml-spectra-processing": "^12.5.1", + "ml-spectra-processing": "^12.9.0", "nmr-correlation": "^2.3.3", - "nmr-processing": "^11.5.0", - "nmredata": "^0.9.7", - "openchemlib": "^8.7.0", - "openchemlib-utils": "^5.4.0", + "nmr-processing": "^11.10.1", + "nmredata": "^0.9.9", + "openchemlib": "^8.7.2", + "openchemlib-utils": "^5.7.0", "sdf-parser": "^6.0.1", - "varian-converter": "^0.3.3" + "varian-converter": "^0.3.5" } }, "node_modules/nmr-processing": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-11.5.0.tgz", - "integrity": "sha512-WnrHPd6aYmiBW2a2bk743Id6XD9UJ3uLZSL7HDYrFhfjGzAiNK2d+SMn8fm7PmuKGV7Q6SChxb5Zdthgqo//dQ==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-11.11.0.tgz", + "integrity": "sha512-d4sPcL/WUgAQoGwOoIkbZySVWvWRi9AjdkLRRg6DkS4OZb6mDKgkOmSx5l3X89JerlU82uDaN6BzpmUw/SuhIQ==", "dependencies": { "@lukeed/uuid": "^2.0.1", "binary-search": "^1.3.6", - "cross-fetch": "^4.0.0", - "form-data": "^4.0.0", - "gyromagnetic-ratio": "^1.0.0", + "gyromagnetic-ratio": "^1.1.1", "is-any-array": "^2.0.1", "linear-sum-assignment": "^1.0.5", "lodash.omit": "^4.5.0", - "ml-airpls": "^1.0.2", - "ml-baseline-correction-regression": "^1.0.2", + "ml-airpls": "^1.0.3", "ml-direct": "^0.1.3", "ml-gsd": "^12.1.3", "ml-hclust": "^3.1.0", "ml-levenberg-marquardt": "^4.1.3", - "ml-matrix": "^6.10.7", + "ml-matrix": "^6.11.0", "ml-matrix-convolution": "^1.0.0", "ml-matrix-peaks-finder": "^1.0.0", "ml-peak-shape-generator": "^4.1.2", + "ml-regression-polynomial": "^3.0.0", "ml-signal-processing": "^1.0.3", "ml-simple-clustering": "^0.1.0", "ml-sparse-matrix": "^2.1.0", - "ml-spectra-processing": "^12.6.0", + "ml-spectra-processing": "^12.10.2", "ml-tree-set": "^0.1.1", "nmr-correlation": "^2.3.3", "numeral": "^2.0.6", - "openchemlib-utils": "^5.4.0", - "spectrum-generator": "^8.0.8" + "openchemlib-utils": "^5.8.0", + "spectrum-generator": "^8.0.9" } }, "node_modules/nmredata": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/nmredata/-/nmredata-0.9.7.tgz", - "integrity": "sha512-Lp2Pjts420voq++NZevDcnCuv2b6qCb0haKoUAHSWAyQ6YUrCNZSqJuDPcX4FAC/pim7gsqM5peex7d+tWgNhA==", + "version": "0.9.9", + "resolved": "https://registry.npmjs.org/nmredata/-/nmredata-0.9.9.tgz", + "integrity": "sha512-FhqSIN3p37RE/e/8Lf8OG/bpAuT35WtKrhjo6W9YQ1ZvC6QV7xP/1IUYOfOjmMqafaMC8xdzED9aSgHnlE5VUA==", "dependencies": { "filelist-utils": "^1.2.0", "jszip": "^3.10.1", @@ -6995,25 +7044,25 @@ "dev": true }, "node_modules/openchemlib": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.7.1.tgz", - "integrity": "sha512-skzgPw0F5ZxLe3y0Td4uyegNi8N2P3jj9EumIdki8eGzs4QhBtpOibkejcy9lLcItsnxwrO1se5cuaJWRB5MiQ==" + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.9.0.tgz", + "integrity": "sha512-8Bb7batm6XvNHg9SWBJDYrkJj5bsq72D5dClpN5yO6BnxxNxtRP1+e6egHwoMwGhd4dyb+eBX7Kr/hdUqMN1Dw==" }, "node_modules/openchemlib-utils": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-5.4.0.tgz", - "integrity": "sha512-9DSgbhYWWBA+EgGQDXFJkuMoIF5oheQoU5teiF4E4FYKKsM42C7VCoMpYTZFQkIdgHYMlmEMOqofT8LHbHRVyg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-5.11.0.tgz", + "integrity": "sha512-ml4WOKkAyN+8TRFnnhMrNtoXIRUGDAmRIqQi9Pp/CTIW5EP6boCvk8nc6noosWjcaq/l2v/QgaQuITqdyyONdw==", "dependencies": { "atom-sorter": "^2.0.0", "ensure-string": "^1.2.0", "get-value": "^3.0.1", "ml-floyd-warshall": "^3.0.1", - "ml-matrix": "^6.10.5", + "ml-matrix": "^6.11.0", "papaparse": "^5.4.1", "sdf-parser": "^6.0.1" }, "peerDependencies": { - "openchemlib": ">=8.5.0" + "openchemlib": ">=8.6.2" } }, "node_modules/openchemlib-utils/node_modules/get-value": { @@ -8589,12 +8638,12 @@ "dev": true }, "node_modules/spectrum-generator": { - "version": "8.0.8", - "resolved": "https://registry.npmjs.org/spectrum-generator/-/spectrum-generator-8.0.8.tgz", - "integrity": "sha512-CRCW/ByC9lyRqssRz+S84l/xHhU+p2BzAIQc2OwLqRpmt89bzzr2u8h3WT1GDtXtMnTyDQEH2Yhnpb3PJeZ79Q==", + "version": "8.0.9", + "resolved": "https://registry.npmjs.org/spectrum-generator/-/spectrum-generator-8.0.9.tgz", + "integrity": "sha512-mfYyhnrsWsjmpaLrzEDe0Feyf3k10ZYRQTkTmxZ7xqw6ULJJypQHbaPHkYELGSIjOFvWE8Ha9zWbRPlmM2Agvw==", "dependencies": { "ml-peak-shape-generator": "^4.1.2", - "ml-spectra-processing": "^12.5.0" + "ml-spectra-processing": "^12.9.0" } }, "node_modules/spline-interpolator": { @@ -9445,9 +9494,9 @@ } }, "node_modules/varian-converter": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/varian-converter/-/varian-converter-0.3.3.tgz", - "integrity": "sha512-pu2WVuXeqtoy/RC1XIga6E1A4/4m+XhQSVzFdPjxlX2ih53qpHV3fl/g/UVvvJ9m9GQdOExEGKIK3JG4up8Upg==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/varian-converter/-/varian-converter-0.3.5.tgz", + "integrity": "sha512-4qQxgC763UtTK8q52OlXk9ia0R7xMckRsNepgMC3yASpt9RdBKLF4l7BID1lqU8hQ2EWfcTsnmDMBhJmVhcWTA==", "dependencies": { "filelist-utils": "^1.10.2", "iobuffer": "^5.3.2", @@ -10672,14 +10721,14 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" }, "@types/lodash": { - "version": "4.14.195", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz", - "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==" + "version": "4.14.202", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" }, "@types/lodash.merge": { - "version": "4.6.7", - "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.7.tgz", - "integrity": "sha512-OwxUJ9E50gw3LnAefSHJPHaBLGEKmQBQ7CZe/xflHkyy/wH2zVyEIAKReHvVrrn7zKdF58p16We9kMfh7v0RRQ==", + "version": "4.6.9", + "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", + "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", "requires": { "@types/lodash": "*" } @@ -11313,7 +11362,8 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true }, "atob": { "version": "2.1.2", @@ -11484,16 +11534,16 @@ } }, "brukerconverter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.1.tgz", - "integrity": "sha512-ri6uQYfsoRBoTnBj7bv0Fm6vao80nm/f/ODj0acYMMqjK/YP79JmDjHSS3if5zukgWPlGVWYyShrJEIJjYeX4A==", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-6.3.5.tgz", + "integrity": "sha512-gyuC9jN3FPq84UbDlGTR5Bg6ALa3fxexp5ukfn6pfLpUQOvnnx8/AqRQHlRJR1xxnIj4/UEFu42zaaDr59ai0g==", "requires": { "cheminfo-types": "^1.5.0", "filelist-utils": "^1.8.0", "iobuffer": "^5.3.2", "is-any-array": "^2.0.0", - "jcampconverter": "^9.1.0", - "ml-spectra-processing": "^12.0.0" + "jcampconverter": "^9.5.1", + "ml-spectra-processing": "^12.10.1" } }, "buffer": { @@ -11888,6 +11938,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -12262,7 +12313,8 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true }, "depd": { "version": "2.0.0", @@ -12886,9 +12938,9 @@ } }, "filelist-utils": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/filelist-utils/-/filelist-utils-1.10.2.tgz", - "integrity": "sha512-E4wIKXIXEyON7i6Z/7+hjytm53S0GSE/b+lvPlE5jAbHRV8thv7a4G+aLLFeOPYQK01MCH1l+ti6jHQ3tl/7bg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/filelist-utils/-/filelist-utils-1.11.0.tgz", + "integrity": "sha512-POCfHquP6jw2aPjfs7UWyywfWkSsLFsXquPNEchrFkc7ffxlz42IiJHeqc7SweMccSF4tV2Kgr1yzPAA/z/iPg==", "requires": { "cheminfo-types": "^1.7.2", "cross-fetch": "^4.0.0", @@ -12962,6 +13014,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -13172,9 +13225,9 @@ "dev": true }, "gyromagnetic-ratio": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gyromagnetic-ratio/-/gyromagnetic-ratio-1.0.0.tgz", - "integrity": "sha512-s55NtJPxoplsW/8OnM1C7tNWd2gEXXt+roF3NPNDKFb7YchBy9JXdxmzztf3d4JL1zCiQz5cn6HSC8M0osN78w==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gyromagnetic-ratio/-/gyromagnetic-ratio-1.1.1.tgz", + "integrity": "sha512-M1y9bAhK11moqAPRZ5oUoDCEIQCogjKYXDMlkXJiSjkLFmOAp1qevrjThF+6KrtwkSpmT7Vgy8C/mgBlIdZPSg==" }, "has": { "version": "1.0.3", @@ -13705,14 +13758,14 @@ "integrity": "sha512-mJtsQGFfAphKdVuRitEpc0eon4v5fuaB6v9ZJIrLnIyybh02sIIwJ2RQbLMp6UICVCfquezllupZIVcqzGzCPg==" }, "jcampconverter": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-9.2.2.tgz", - "integrity": "sha512-+mZK6QzbwnDBorK6lzccFuBNiTSGgwQGKczdhxNzpYjKS1osEQwtmgPJVEp9JGqbI7ClxXJU6IAyxivIBN/jLA==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-9.6.1.tgz", + "integrity": "sha512-j7zx3G2KMRCfATo8+fP+3assk/8G4UODZCUuwbCAy+S7xHy2cZuY0gkMb3RLE2VBGm9PRqTAIUEm62HYG8XDIA==", "requires": { "cheminfo-types": "^1.7.2", "dynamic-typing": "^1.0.0", "ensure-string": "^1.2.0", - "gyromagnetic-ratio": "^1.0.0", + "gyromagnetic-ratio": "^1.1.1", "ml-array-median": "^1.1.6" } }, @@ -14371,9 +14424,9 @@ } }, "ml-airpls": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ml-airpls/-/ml-airpls-1.0.2.tgz", - "integrity": "sha512-LbQu28am8XUHr54TWOh8Rz6edC6KRA5pjJ83F6J6/0a5QrZrh0ioEukfv3d9WeeUDzdczNLbdkU5hJvICCVacA==", + "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==", "requires": { "cuthill-mckee": "^1.0.0" } @@ -14427,6 +14480,25 @@ "integrity": "sha512-dRKbGx49gXhHyvpb9/6OpqySY7cEm8rz0LaQWyAsaMALr3aKHXvtPsjADh5afkzsYRw53QPgwccCo0XTvT3M8w==", "requires": { "ml-regression-polynomial": "^2.2.0" + }, + "dependencies": { + "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==", + "requires": { + "is-any-array": "^2.0.0" + } + }, + "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==", + "requires": { + "ml-matrix": "^6.8.0", + "ml-regression-base": "^2.1.3" + } + } } }, "ml-direct": { @@ -14467,16 +14539,32 @@ } }, "ml-gsd": { - "version": "12.1.3", - "resolved": "https://registry.npmjs.org/ml-gsd/-/ml-gsd-12.1.3.tgz", - "integrity": "sha512-9qTIc3reKSifJ4EpxdFl+9C4pfvm/XKuM+JXBfHdd2hhfD1ZQ9CcrPxm5OBTcZVqJ4e9pKsUDvJnjePX2Yb5YA==", + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/ml-gsd/-/ml-gsd-12.1.4.tgz", + "integrity": "sha512-jo9U3ITEoo/pGdNvKqGaT0aIXt63aQ/zFfFxTATbUNfbjdJxsvGPYRBqoQ6dGfz7W2vuSxdecGfBVek7fvK3ig==", "requires": { "@lukeed/uuid": "^2.0.0", "cheminfo-types": "^1.4.0", "ml-peak-shape-generator": "^4.1.2", "ml-savitzky-golay-generalized": "^4.0.1", "ml-spectra-fitting": "^4.2.1", - "ml-spectra-processing": "^12.0.0" + "ml-spectra-processing": "^14.0.0" + }, + "dependencies": { + "ml-spectra-processing": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.1.1.tgz", + "integrity": "sha512-PaYJDtJOvIfJPOHZsTlDN6+w78ksPZ2Rhk3dY68JgI+x7Q7gBfNbBQNBIu1vWHaJhJTsVD+OcTULM16r4l3kTA==", + "requires": { + "binary-search": "^1.3.6", + "cheminfo-types": "^1.7.2", + "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" + } + } } }, "ml-hash-table": { @@ -14509,9 +14597,9 @@ } }, "ml-matrix": { - "version": "6.10.7", - "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.10.7.tgz", - "integrity": "sha512-v0AciHOXnCEYz8Dq4r5TeA+BFyIabBwng9y/rFVF43mhh3Ho2jDhJ6UZ0IUPRiedmfNcJDmI1j7YFdY30mHAcQ==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.11.0.tgz", + "integrity": "sha512-7jr9NmFRkaUxbKslfRu3aZOjJd2LkSitCGv+QH9PF0eJoEG7jIpjXra1Vw8/kgao8+kHCSsJONG6vfWmXQ+/Eg==", "requires": { "is-any-array": "^2.0.1", "ml-array-rescale": "^1.3.7" @@ -14543,20 +14631,22 @@ } }, "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==", + "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==", "requires": { - "is-any-array": "^2.0.0" + "cheminfo-types": "^1.7.2", + "is-any-array": "^2.0.1" } }, "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": "3.0.0", + "resolved": "https://registry.npmjs.org/ml-regression-polynomial/-/ml-regression-polynomial-3.0.0.tgz", + "integrity": "sha512-8agLNJZzuVpdthMDUkaamiQnfHx7y1T9LrbCiAPHnhklVrg7O7tzClEZ7XMh48AZMNhKl1ewGvn2VLrI6AD+wA==", "requires": { - "ml-matrix": "^6.8.0", - "ml-regression-base": "^2.1.3" + "cheminfo-types": "^1.7.2", + "ml-matrix": "^6.10.5", + "ml-regression-base": "^3.0.0" } }, "ml-rolling-ball-baseline": { @@ -14603,28 +14693,44 @@ } }, "ml-spectra-fitting": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ml-spectra-fitting/-/ml-spectra-fitting-4.2.1.tgz", - "integrity": "sha512-vZI98eSK5HKeZTgh8omskRHB8QdnDTaTw1rbMPWTkfBH+6FgEgPvMRqH18BAaSHtxJHrqE6c4tQq9L9J8iYebg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/ml-spectra-fitting/-/ml-spectra-fitting-4.2.2.tgz", + "integrity": "sha512-xhUFBDantDHoXaH/Bjr5DcywP536ijyjDAkN6QA5BOiMgZB8DsTmI/9l684nStp4KaaJOlNjB2NF/Haz+LV3ZQ==", "requires": { - "cheminfo-types": "^1.4.0", + "cheminfo-types": "^1.7.2", "ml-array-max": "^1.2.4", - "ml-direct": "^0.1.1", - "ml-levenberg-marquardt": "^4.1.0", + "ml-direct": "^0.1.3", + "ml-levenberg-marquardt": "^4.1.3", "ml-peak-shape-generator": "^4.1.2", - "ml-spectra-processing": "^12.0.0" + "ml-spectra-processing": "^14.0.0" + }, + "dependencies": { + "ml-spectra-processing": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-14.1.1.tgz", + "integrity": "sha512-PaYJDtJOvIfJPOHZsTlDN6+w78ksPZ2Rhk3dY68JgI+x7Q7gBfNbBQNBIu1vWHaJhJTsVD+OcTULM16r4l3kTA==", + "requires": { + "binary-search": "^1.3.6", + "cheminfo-types": "^1.7.2", + "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" + } + } } }, "ml-spectra-processing": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-12.6.0.tgz", - "integrity": "sha512-AwvWndgKa5rUsNGfp/WxIunQ4Il3MXKYGyBgNZQ679C8dytKNEfU9e5QGly7pKDxQYiI0ptxWCHPzIjc2JJtqA==", + "version": "12.11.0", + "resolved": "https://registry.npmjs.org/ml-spectra-processing/-/ml-spectra-processing-12.11.0.tgz", + "integrity": "sha512-kMQ/6oMf4YZn1ThWZ1nz7TH/Ns7fsPMGgD4dvCiDdUu+oDJ9shwxytG467Leq0DsYDwmWD9wqfCQfe48zG/L7A==", "requires": { "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-matrix": "^6.11.0", "ml-xsadd": "^2.0.0", "spline-interpolator": "^1.0.0" } @@ -14802,69 +14908,67 @@ } }, "nmr-load-save": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.23.2.tgz", - "integrity": "sha512-QSBYdjENOAhznJoZWYzn8aLQc3Df24xSWzwn/maK5dHd015XKy35p4+O5u2KmGW6lmyF8KysWemjmiKHUXdv7Q==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.27.3.tgz", + "integrity": "sha512-AjJDAChUqo1CzIcAB8LeOWn0ikTIyoDjPxcTI6YRfNEyvd6BuwhRyGnqz0whgeAMwwICGsVfpmWiimdAM4mj9w==", "requires": { "@lukeed/uuid": "^2.0.1", - "@types/lodash.merge": "^4.6.7", - "brukerconverter": "^6.3.1", + "@types/lodash.merge": "^4.6.9", + "brukerconverter": "^6.3.5", "cheminfo-types": "^1.7.2", "convert-to-jcamp": "^5.4.9", - "filelist-utils": "^1.10.2", - "gyromagnetic-ratio": "^1.0.0", + "filelist-utils": "^1.11.0", + "gyromagnetic-ratio": "^1.1.1", "is-any-array": "^2.0.1", - "jcampconverter": "^9.2.2", + "jcampconverter": "^9.6.1", "jeolconverter": "^1.0.2", "lodash.merge": "^4.6.2", - "ml-spectra-processing": "^12.5.1", + "ml-spectra-processing": "^12.9.0", "nmr-correlation": "^2.3.3", - "nmr-processing": "^11.5.0", - "nmredata": "^0.9.7", - "openchemlib": "^8.7.0", - "openchemlib-utils": "^5.4.0", + "nmr-processing": "^11.10.1", + "nmredata": "^0.9.9", + "openchemlib": "^8.7.2", + "openchemlib-utils": "^5.7.0", "sdf-parser": "^6.0.1", - "varian-converter": "^0.3.3" + "varian-converter": "^0.3.5" } }, "nmr-processing": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-11.5.0.tgz", - "integrity": "sha512-WnrHPd6aYmiBW2a2bk743Id6XD9UJ3uLZSL7HDYrFhfjGzAiNK2d+SMn8fm7PmuKGV7Q6SChxb5Zdthgqo//dQ==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-11.11.0.tgz", + "integrity": "sha512-d4sPcL/WUgAQoGwOoIkbZySVWvWRi9AjdkLRRg6DkS4OZb6mDKgkOmSx5l3X89JerlU82uDaN6BzpmUw/SuhIQ==", "requires": { "@lukeed/uuid": "^2.0.1", "binary-search": "^1.3.6", - "cross-fetch": "^4.0.0", - "form-data": "^4.0.0", - "gyromagnetic-ratio": "^1.0.0", + "gyromagnetic-ratio": "^1.1.1", "is-any-array": "^2.0.1", "linear-sum-assignment": "^1.0.5", "lodash.omit": "^4.5.0", - "ml-airpls": "^1.0.2", - "ml-baseline-correction-regression": "^1.0.2", + "ml-airpls": "^1.0.3", "ml-direct": "^0.1.3", "ml-gsd": "^12.1.3", "ml-hclust": "^3.1.0", "ml-levenberg-marquardt": "^4.1.3", - "ml-matrix": "^6.10.7", + "ml-matrix": "^6.11.0", "ml-matrix-convolution": "^1.0.0", "ml-matrix-peaks-finder": "^1.0.0", "ml-peak-shape-generator": "^4.1.2", + "ml-regression-polynomial": "^3.0.0", "ml-signal-processing": "^1.0.3", "ml-simple-clustering": "^0.1.0", "ml-sparse-matrix": "^2.1.0", - "ml-spectra-processing": "^12.6.0", + "ml-spectra-processing": "^12.10.2", "ml-tree-set": "^0.1.1", "nmr-correlation": "^2.3.3", "numeral": "^2.0.6", - "openchemlib-utils": "^5.4.0", - "spectrum-generator": "^8.0.8" + "openchemlib-utils": "^5.8.0", + "spectrum-generator": "^8.0.9" } }, "nmredata": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/nmredata/-/nmredata-0.9.7.tgz", - "integrity": "sha512-Lp2Pjts420voq++NZevDcnCuv2b6qCb0haKoUAHSWAyQ6YUrCNZSqJuDPcX4FAC/pim7gsqM5peex7d+tWgNhA==", + "version": "0.9.9", + "resolved": "https://registry.npmjs.org/nmredata/-/nmredata-0.9.9.tgz", + "integrity": "sha512-FhqSIN3p37RE/e/8Lf8OG/bpAuT35WtKrhjo6W9YQ1ZvC6QV7xP/1IUYOfOjmMqafaMC8xdzED9aSgHnlE5VUA==", "requires": { "filelist-utils": "^1.2.0", "jszip": "^3.10.1", @@ -15098,20 +15202,20 @@ "dev": true }, "openchemlib": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.7.1.tgz", - "integrity": "sha512-skzgPw0F5ZxLe3y0Td4uyegNi8N2P3jj9EumIdki8eGzs4QhBtpOibkejcy9lLcItsnxwrO1se5cuaJWRB5MiQ==" + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/openchemlib/-/openchemlib-8.9.0.tgz", + "integrity": "sha512-8Bb7batm6XvNHg9SWBJDYrkJj5bsq72D5dClpN5yO6BnxxNxtRP1+e6egHwoMwGhd4dyb+eBX7Kr/hdUqMN1Dw==" }, "openchemlib-utils": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-5.4.0.tgz", - "integrity": "sha512-9DSgbhYWWBA+EgGQDXFJkuMoIF5oheQoU5teiF4E4FYKKsM42C7VCoMpYTZFQkIdgHYMlmEMOqofT8LHbHRVyg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/openchemlib-utils/-/openchemlib-utils-5.11.0.tgz", + "integrity": "sha512-ml4WOKkAyN+8TRFnnhMrNtoXIRUGDAmRIqQi9Pp/CTIW5EP6boCvk8nc6noosWjcaq/l2v/QgaQuITqdyyONdw==", "requires": { "atom-sorter": "^2.0.0", "ensure-string": "^1.2.0", "get-value": "^3.0.1", "ml-floyd-warshall": "^3.0.1", - "ml-matrix": "^6.10.5", + "ml-matrix": "^6.11.0", "papaparse": "^5.4.1", "sdf-parser": "^6.0.1" }, @@ -16319,12 +16423,12 @@ "dev": true }, "spectrum-generator": { - "version": "8.0.8", - "resolved": "https://registry.npmjs.org/spectrum-generator/-/spectrum-generator-8.0.8.tgz", - "integrity": "sha512-CRCW/ByC9lyRqssRz+S84l/xHhU+p2BzAIQc2OwLqRpmt89bzzr2u8h3WT1GDtXtMnTyDQEH2Yhnpb3PJeZ79Q==", + "version": "8.0.9", + "resolved": "https://registry.npmjs.org/spectrum-generator/-/spectrum-generator-8.0.9.tgz", + "integrity": "sha512-mfYyhnrsWsjmpaLrzEDe0Feyf3k10ZYRQTkTmxZ7xqw6ULJJypQHbaPHkYELGSIjOFvWE8Ha9zWbRPlmM2Agvw==", "requires": { "ml-peak-shape-generator": "^4.1.2", - "ml-spectra-processing": "^12.5.0" + "ml-spectra-processing": "^12.9.0" } }, "spline-interpolator": { @@ -16971,9 +17075,9 @@ "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==" }, "varian-converter": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/varian-converter/-/varian-converter-0.3.3.tgz", - "integrity": "sha512-pu2WVuXeqtoy/RC1XIga6E1A4/4m+XhQSVzFdPjxlX2ih53qpHV3fl/g/UVvvJ9m9GQdOExEGKIK3JG4up8Upg==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/varian-converter/-/varian-converter-0.3.5.tgz", + "integrity": "sha512-4qQxgC763UtTK8q52OlXk9ia0R7xMckRsNepgMC3yASpt9RdBKLF4l7BID1lqU8hQ2EWfcTsnmDMBhJmVhcWTA==", "requires": { "filelist-utils": "^1.10.2", "iobuffer": "^5.3.2", diff --git a/package.json b/package.json index de8d37a..c9ca7ca 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@adonisjs/core": "^5.9.0", "@adonisjs/repl": "^3.1.11", "adonis5-swagger": "^1.4.1", - "nmr-load-save": "^0.23.2", + "nmr-load-save": "^0.27.3", "playwright": "^1.39.0", "proxy-addr": "^2.0.7", "reflect-metadata": "^0.1.13",