diff --git a/package-lock.json b/package-lock.json index f80c02f..8c42dda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "tonal-midi": "^0.69.7" + "@tonaljs/midi": "^4.9.0" }, "devDependencies": { "@babel/core": "^7.9.6", @@ -2043,6 +2043,19 @@ "rollup": "^1.20.0||^2.0.0" } }, + "node_modules/@tonaljs/core": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@tonaljs/core/-/core-4.10.0.tgz", + "integrity": "sha512-+AH7NP9iiAGil+X7NlKGlQvls/KByQmxR51d5O+y6IjHltOkVUXk74oZuxW7zF0IsKchFn8Okr0sxqFmgsQmpA==" + }, + "node_modules/@tonaljs/midi": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@tonaljs/midi/-/midi-4.9.0.tgz", + "integrity": "sha512-zi6lK2OC2EA8E1Nl011erWAZgOSlrfstJMgnrbm4/nLDegotg5ALbMnfX/s+SIfSSFcXn/Og1d8xwPeAwoaUyg==", + "dependencies": { + "@tonaljs/core": "^4.8.0" + } + }, "node_modules/@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -5296,11 +5309,6 @@ "node": ">=0.10.0" } }, - "node_modules/note-parser": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/note-parser/-/note-parser-2.0.1.tgz", - "integrity": "sha1-JDj9V6RolLQCs6IHF5hmASnI+8E=" - }, "node_modules/nyc": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", @@ -6466,14 +6474,6 @@ "node": ">=8.0" } }, - "node_modules/tonal-midi": { - "version": "0.69.7", - "resolved": "https://registry.npmjs.org/tonal-midi/-/tonal-midi-0.69.7.tgz", - "integrity": "sha1-51Tsk/Pb2yim051CRXwzrSRf+kc=", - "dependencies": { - "note-parser": "^2.0.1" - } - }, "node_modules/tsconfig-paths": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz", @@ -8299,6 +8299,19 @@ "picomatch": "^2.2.2" } }, + "@tonaljs/core": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@tonaljs/core/-/core-4.10.0.tgz", + "integrity": "sha512-+AH7NP9iiAGil+X7NlKGlQvls/KByQmxR51d5O+y6IjHltOkVUXk74oZuxW7zF0IsKchFn8Okr0sxqFmgsQmpA==" + }, + "@tonaljs/midi": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@tonaljs/midi/-/midi-4.9.0.tgz", + "integrity": "sha512-zi6lK2OC2EA8E1Nl011erWAZgOSlrfstJMgnrbm4/nLDegotg5ALbMnfX/s+SIfSSFcXn/Og1d8xwPeAwoaUyg==", + "requires": { + "@tonaljs/core": "^4.8.0" + } + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -10670,11 +10683,6 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "note-parser": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/note-parser/-/note-parser-2.0.1.tgz", - "integrity": "sha1-JDj9V6RolLQCs6IHF5hmASnI+8E=" - }, "nyc": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", @@ -11544,14 +11552,6 @@ "is-number": "^7.0.0" } }, - "tonal-midi": { - "version": "0.69.7", - "resolved": "https://registry.npmjs.org/tonal-midi/-/tonal-midi-0.69.7.tgz", - "integrity": "sha1-51Tsk/Pb2yim051CRXwzrSRf+kc=", - "requires": { - "note-parser": "^2.0.1" - } - }, "tsconfig-paths": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz", diff --git a/package.json b/package.json index c538a0c..e8b00e3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "build/index.js", "types": "types.d.ts", "dependencies": { - "tonal-midi": "^0.69.7" + "@tonaljs/midi": "^4.9.0" }, "devDependencies": { "@babel/core": "^7.9.6", diff --git a/src/utils.ts b/src/utils.ts index 476e86a..ca6b22f 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,5 +1,5 @@ import {Constants} from './constants'; -import {toMidi} from 'tonal-midi'; +import {toMidi} from '@tonaljs/midi'; /** * Static utility functions used throughout the library. @@ -40,7 +40,7 @@ class Utils { * @param {string} middleC * @return {number} */ - static getPitch(pitch: (string|string[]|number|number[]), middleC = 'C4'): number { + static getPitch(pitch: any, middleC = 'C4'): number { return 60 - toMidi(middleC) + toMidi(pitch); }