Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@infojunkie
infojunkie committed Oct 13, 2024
1 parent 80c03ea commit 8c2da3f
Show file tree
Hide file tree
Showing 6 changed files with 2,259 additions and 406 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A TypeScript component that loads and plays MusicXML files in the browser using
npm install
npm run build
npm test
npm run demo:develop
npm run demo
```
Then open http://127.0.0.1:8080/
# Theory of operation
Expand Down
49 changes: 26 additions & 23 deletions demo/demo.mjs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as MusicXMLPlayer from './dist/musicxml-player.esm.js';
import iRealMusicXML from 'https://cdn.jsdelivr.net/npm/ireal-musicxml/+esm';
import * as MusicXmlPlayer from './dist/musicxml-player.esm.js';
import iRealMusicXml from 'https://cdn.jsdelivr.net/npm/ireal-musicxml@1.13.4/+esm';
import { setTimingsrc } from 'https://cdn.jsdelivr.net/npm/[email protected]/+esm';

const DEFAULT_RENDERER = 'vrv';
Expand Down Expand Up @@ -73,7 +73,7 @@ async function createPlayer() {
const input = document.getElementById(`renderer-${k}`);
try {
if (typeof v === 'string') {
await MusicXMLPlayer.fetish(base.replace(/\.musicxml$|\.mxl$/, v), { method: 'HEAD' })
await MusicXmlPlayer.fetish(base.replace(/\.musicxml$|\.mxl$/, v), { method: 'HEAD' })
}
input.disabled = false;
}
Expand All @@ -87,14 +87,14 @@ async function createPlayer() {
document.getElementById(`renderer-${renderer}`).setAttribute('checked', 'checked');
for (const [k, v] of Object.entries({
'vrv': true,
'mma': async () => MusicXMLPlayer.fetish(window.location.href + 'mma/', { method: 'HEAD' }),
'mma': async () => MusicXmlPlayer.fetish(window.location.href + 'mma/', { method: 'HEAD' }),
'midi': '.mid',
'mscore': '.mscore.json',
})) {
const input = document.getElementById(`converter-${k}`);
try {
if (typeof v === 'string') {
await MusicXMLPlayer.fetish(base.replace(/\.musicxml$|\.mxl$/, v), { method: 'HEAD' })
await MusicXmlPlayer.fetish(base.replace(/\.musicxml$|\.mxl$/, v), { method: 'HEAD' })
}
else if (typeof v === 'function') {
await v();
Expand All @@ -113,7 +113,7 @@ async function createPlayer() {
// Create new player.
if (g_state.musicXml) {
try {
const player = await MusicXMLPlayer.Player.create({
const player = await MusicXmlPlayer.Player.create({
musicXml: g_state.musicXml,
container: 'sheet-container',
renderer: await createRenderer(renderer, sheet, options),
Expand All @@ -129,7 +129,9 @@ async function createPlayer() {
player.timingObject.addEventListener('change', handleTimingObjectChange);

// Update the UI elements.
document.getElementById('version').textContent = JSON.stringify(player.version);
document.getElementById('version').textContent = JSON.stringify(Object.assign({}, player.version, {
'irealpro': `${iRealMusicXml.Version.name} ${iRealMusicXml.Version.version}`
}));
const filename = player.title.toLowerCase().replace(/[/\\?%*:|"'<>\s]/g, '-') ?? 'untitled';
const a1 = document.createElement('a');
a1.setAttribute('href', URL.createObjectURL(new Blob([player.musicXml], { type: 'text/xml' })));
Expand Down Expand Up @@ -161,11 +163,11 @@ async function createRenderer(renderer, sheet, options) {
});
switch (renderer) {
case 'osmd':
return new MusicXMLPlayer.OpenSheetMusicDisplayRenderer({
return new MusicXmlPlayer.OpenSheetMusicDisplayRenderer({
renderSingleHorizontalStaffline: options.horizontal,
});
case 'vrv':
return new MusicXMLPlayer.VerovioRenderer({
return new MusicXmlPlayer.VerovioRenderer({
breaks: options.horizontal ? 'none' : 'smart',
spacingNonLinear: options.horizontal ? 1.0 : undefined,
spacingLinear: options.horizontal ? 0.04 : undefined,
Expand All @@ -179,7 +181,7 @@ async function createRenderer(renderer, sheet, options) {
document.querySelectorAll('.renderer-option').forEach(element => {
element.disabled = true;
});
return new MusicXMLPlayer.MuseScoreRenderer(base.replace(/\.musicxml$|\.mxl$/, '.mscore.json'));
return new MusicXmlPlayer.MuseScoreRenderer(base.replace(/\.musicxml$|\.mxl$/, '.mscore.json'));
}
}

Expand All @@ -189,22 +191,22 @@ async function createConverter(converter, sheet, groove) {
case 'midi':
try {
const timemap = base.replace(/\.musicxml$|\.mxl$/, '.timemap.json');
await MusicXMLPlayer.fetish(timemap, { method: 'HEAD' });
return new MusicXMLPlayer.FetchConverter(base.replace(/\.musicxml$|\.mxl$/, '.mid'), timemap);
await MusicXmlPlayer.fetish(timemap, { method: 'HEAD' });
return new MusicXmlPlayer.FetchConverter(base.replace(/\.musicxml$|\.mxl$/, '.mid'), timemap);
}
catch {
return new MusicXMLPlayer.FetchConverter(base.replace(/\.musicxml$|\.mxl$/, '.mid'));
return new MusicXmlPlayer.FetchConverter(base.replace(/\.musicxml$|\.mxl$/, '.mid'));
}
case 'vrv':
return new MusicXMLPlayer.VerovioConverter();
return new MusicXmlPlayer.VerovioConverter();
case 'mma':
const parameters = {};
if (groove !== DEFAULT_GROOVE) {
parameters['globalGroove'] = groove;
}
return new MusicXMLPlayer.MmaConverter(window.location.href + 'mma/', parameters);
return new MusicXmlPlayer.MmaConverter(window.location.href + 'mma/', parameters);
case 'mscore':
return new MusicXMLPlayer.MuseScoreConverter(base.replace(/\.musicxml$|\.mxl$/, '.mscore.json'));
return new MusicXmlPlayer.MuseScoreConverter(base.replace(/\.musicxml$|\.mxl$/, '.mscore.json'));
}
}

Expand Down Expand Up @@ -232,7 +234,7 @@ async function populateGrooves() {
const grooves = document.getElementById('grooves');
const groovesList = document.getElementById('grooves-list');
try {
const lines = await (await MusicXMLPlayer.fetish(`${getMmaEndpoint()}/grooves`)).text();
const lines = await (await MusicXmlPlayer.fetish(`${getMmaEndpoint()}/grooves`)).text();
['Default', 'No groove override, just whatever is specified in the score.', 'None', 'No groove, just the chords.'].concat(lines.split('\n')).forEach((line, index, lines) => {
if (index % 2 === 1) {
const option = document.createElement('option');
Expand Down Expand Up @@ -287,7 +289,7 @@ function handlePlayPauseKey(e) {
}

function populateSheets(ireal) {
const playlist = new iRealMusicXML.Playlist(ireal);
const playlist = new iRealMusicXml.Playlist(ireal);
const sheets = document.getElementById('sheets');
sheets.textContent = '';
playlist.songs.forEach(song => {
Expand All @@ -305,14 +307,14 @@ async function handleSampleSelect(e) {
const sheet = e.target.value;
try {
if (sheet.endsWith('.musicxml') || sheet.endsWith('.mxl')) {
const musicXml = await (await MusicXMLPlayer.fetish(sheet)).arrayBuffer();
const musicXml = await (await MusicXmlPlayer.fetish(sheet)).arrayBuffer();
g_state.musicXml = musicXml;
g_state.params.set('sheet', sheet);
g_state.params.set('groove', DEFAULT_GROOVE);
createPlayer();
}
else {
const ireal = await (await MusicXMLPlayer.fetish(sheet)).text();
const ireal = await (await MusicXmlPlayer.fetish(sheet)).text();
populateSheets(ireal);
}
}
Expand All @@ -323,16 +325,17 @@ async function handleSampleSelect(e) {

function handleSheetSelect(e) {
const song = JSON.parse(e.target.value);
g_state.musicXml = iRealMusicXML.MusicXML.convert(song, {
notation: 'rhythmic'
g_state.musicXml = iRealMusicXml.MusicXML.convert(song, {
notation: 'rhythmic',
date: false,
});
g_state.params.set('groove', DEFAULT_GROOVE);
createPlayer();
}

async function handleFileBuffer(buffer) {
try {
const parseResult = await MusicXMLPlayer.parseMusicXML(buffer);
const parseResult = await MusicXmlPlayer.parseMusicXML(buffer);
g_state.musicXml = parseResult.musicXml;
g_state.params.delete('sheet');
createPlayer();
Expand Down
18 changes: 10 additions & 8 deletions dist/musicxml-player.esm.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* musicxml-player v0.19.0
* musicxml-player v0.19.2
* (c) Karim Ratib <[email protected]> (https://github.com/infojunkie)
* Released under the GPL-3.0-only License.
*/
Expand Down Expand Up @@ -1532,7 +1532,6 @@ const _parseSysexEvent = (dataView, offset) => {
const _readVariableLengthQuantity = (dataView, offset) => {
let nextOffset = offset;
let value = 0;
// eslint-disable-next-line no-constant-condition
while (true) {
const byte = dataView.getUint8(nextOffset);
nextOffset += 1;
Expand Down Expand Up @@ -12606,13 +12605,15 @@ const timingObjectConstructor = createTimingObjectConstructor(createCalculateTim
// @todo Expose an isSupported flag which checks for performance.now() support.

var name = "musicxml-player";
var version = "0.19.0";
var version = "0.19.2";
var description = "A simple JavaScript component that loads and plays MusicXML files in the browser using Web Audio and Web MIDI.";
var main = "dist/musicxml-player.esm.js";
var type = "module";
var types = "dist/types/index.d.ts";
var module$1 = "dist/musicxml-player.esm.js";
var devDependencies = {
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.12.0",
"@esm-bundle/chai": "^4.3.4-fix.0",
"@esm-bundle/chai-as-promised": "^7.1.1",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
Expand All @@ -12629,20 +12630,21 @@ var devDependencies = {
"@types/sinon": "^17.0.3",
"@types/verovio": "^3.13.0",
"@types/webmidi": "^2.0.6",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"@web/test-runner": "^0.18.2",
"@web/test-runner-puppeteer": "^0.16.0",
assert: "^2.0.0",
chai: "^5.1.1",
"chai-as-promised": "^7.1.1",
concurrently: "^8.0.1",
eslint: "^8.19.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^5.0.0",
eslint: "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"json-midi-message-encoder": "^4.1.18",
"local-web-server": "^5.3.0",
mocha: "^10.2.0",
"musicxml-midi": "github:infojunkie/musicxml-midi",
nyc: "^15.1.0",
prettier: "^3.2.5",
rollup: "^4.17.2",
Expand Down
2 changes: 1 addition & 1 deletion dist/musicxml-player.esm.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 8c2da3f

Please sign in to comment.