musicxml-io 0.5.0 → 0.5.1

package/dist/index.js

@@ -214,9 +214,14 @@ var _chunkVE2KCZMAjs = require('./chunk-VE2KCZMA.js');
 
 // src/importers/musicxml.ts
 var _txml = require('txml');
+var _entityMap = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'" };
+var _entityRegex = /&(?:(amp|lt|gt|quot|apos)|#(\d+)|#x([0-9a-fA-F]+));/g;
 function decodeXmlEntities(s) {
   if (s.indexOf("&") === -1) return s;
-  return s.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&#(\d+);/g, (_, num) => String.fromCharCode(parseInt(num, 10))).replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
+  return s.replace(
+    _entityRegex,
+    (_, named, dec, hex) => named ? _entityMap[named] : dec ? String.fromCharCode(parseInt(dec, 10)) : String.fromCharCode(parseInt(hex, 16))
+  );
 }
 function decodeTree(nodes) {
   for (let i = 0; i < nodes.length; i++) {
@@ -1040,12 +1045,8 @@ function parseNote(elements, attrs) {
   const note = {
     _id: _chunkKABVHR2Pjs.generateId.call(void 0, ),
     type: "note",
-    duration: getElementTextAsInt(elements, "duration", 0)
+    duration: 0
   };
-  const voiceValue = getElementText(elements, "voice");
-  if (voiceValue !== void 0 && voiceValue !== "") {
-    note.voice = voiceValue;
-  }
   if (attrs["default-x"]) note.defaultX = parseFloat(attrs["default-x"]);
   if (attrs["default-y"]) note.defaultY = parseFloat(attrs["default-y"]);
   if (attrs["relative-x"]) note.relativeX = parseFloat(attrs["relative-x"]);
@@ -1056,149 +1057,183 @@ function parseNote(elements, attrs) {
   if (attrs["print-dot"] === "yes") note.printDot = true;
   if (attrs["print-spacing"] === "yes") note.printSpacing = true;
   if (attrs["print-spacing"] === "no") note.printSpacing = false;
-  if (hasElement(elements, "cue")) {
-    note.cue = true;
-  }
-  const instData = parseFirstElement(elements, "instrument", (_, attrs2) => attrs2["id"]);
-  if (instData) note.instrument = instData;
-  const pitch = getElementContent(elements, "pitch");
-  if (pitch) {
-    note.pitch = parsePitch(pitch);
-  }
-  for (const el of elements) {
+  let dotCount = 0;
+  let notationsIndex = 0;
+  let tieElements;
+  let beams;
+  let allNotations;
+  let lyrics;
+  let hasGrace = false;
+  for (let i = 0; i < elements.length; i++) {
+    const el = elements[i];
     if (typeof el === "string") continue;
-    if (el.tagName === "rest") {
-      const restContent = el.children;
-      const restInfo = {};
-      const restAttrs = el.attributes;
-      if (restAttrs["measure"] === "yes") restInfo.measure = true;
-      const displayStep = getElementText(restContent, "display-step");
-      if (displayStep) restInfo.displayStep = displayStep;
-      const displayOctave = getElementText(restContent, "display-octave");
-      if (displayOctave) restInfo.displayOctave = parseInt(displayOctave, 10);
-      note.rest = restInfo;
-      break;
+    const tag = el.tagName;
+    const elAttrs = el.attributes;
+    const c = el.children;
+    switch (tag) {
+      case "duration": {
+        const text = extractText(c);
+        if (text) note.duration = parseInt(text, 10) || 0;
+        break;
+      }
+      case "voice": {
+        const text = extractText(c);
+        if (text) note.voice = text;
+        break;
+      }
+      case "cue":
+        note.cue = true;
+        break;
+      case "chord":
+        note.chord = true;
+        break;
+      case "dot":
+        dotCount++;
+        break;
+      case "instrument":
+        if (elAttrs["id"]) note.instrument = elAttrs["id"];
+        break;
+      case "pitch":
+        note.pitch = parsePitch(c);
+        break;
+      case "rest": {
+        const restInfo = {};
+        if (elAttrs["measure"] === "yes") restInfo.measure = true;
+        const displayStep = getElementText(c, "display-step");
+        if (displayStep) restInfo.displayStep = displayStep;
+        const displayOctave = getElementText(c, "display-octave");
+        if (displayOctave) restInfo.displayOctave = parseInt(displayOctave, 10);
+        note.rest = restInfo;
+        break;
+      }
+      case "unpitched": {
+        note.unpitched = {};
+        const displayStep = getElementText(c, "display-step");
+        if (displayStep) note.unpitched.displayStep = displayStep;
+        const displayOctave = getElementText(c, "display-octave");
+        if (displayOctave) note.unpitched.displayOctave = parseInt(displayOctave, 10);
+        break;
+      }
+      case "staff": {
+        const text = extractText(c);
+        if (text) {
+          const v = parseInt(text, 10);
+          if (!isNaN(v)) note.staff = v;
+        }
+        break;
+      }
+      case "type": {
+        const noteType = extractText(c);
+        if (isValidNoteType(noteType)) note.noteType = noteType;
+        if (elAttrs["size"]) note.noteTypeSize = elAttrs["size"];
+        break;
+      }
+      case "accidental": {
+        const accValue = extractText(c);
+        if (isValidAccidental(accValue)) {
+          const accInfo = { value: accValue };
+          if (elAttrs["cautionary"] === "yes") accInfo.cautionary = true;
+          if (elAttrs["editorial"] === "yes") accInfo.editorial = true;
+          if (elAttrs["parentheses"] === "yes") accInfo.parentheses = true;
+          if (elAttrs["bracket"] === "yes") accInfo.bracket = true;
+          if (elAttrs["relative-x"]) accInfo.relativeX = parseFloat(elAttrs["relative-x"]);
+          if (elAttrs["relative-y"]) accInfo.relativeY = parseFloat(elAttrs["relative-y"]);
+          if (elAttrs["color"]) accInfo.color = elAttrs["color"];
+          if (elAttrs["size"]) accInfo.size = elAttrs["size"];
+          if (elAttrs["font-size"]) accInfo.fontSize = elAttrs["font-size"];
+          note.accidental = accInfo;
+        }
+        break;
+      }
+      case "stem": {
+        const stemValue = extractText(c);
+        if (stemValue === "up" || stemValue === "down" || stemValue === "none" || stemValue === "double") {
+          note.stem = { value: stemValue };
+          if (elAttrs["default-x"]) note.stem.defaultX = parseFloat(elAttrs["default-x"]);
+          if (elAttrs["default-y"]) note.stem.defaultY = parseFloat(elAttrs["default-y"]);
+        }
+        break;
+      }
+      case "notehead": {
+        const nhValue = extractText(c);
+        if (isValidNotehead(nhValue)) {
+          const nhInfo = { value: nhValue };
+          if (elAttrs["filled"] === "yes") nhInfo.filled = true;
+          else if (elAttrs["filled"] === "no") nhInfo.filled = false;
+          if (elAttrs["parentheses"] === "yes") nhInfo.parentheses = true;
+          note.notehead = nhInfo;
+        }
+        break;
+      }
+      case "tie": {
+        const t = elAttrs["type"];
+        if (t === "start" || t === "stop" || t === "continue") {
+          if (!tieElements) tieElements = [];
+          tieElements.push({ type: t });
+        }
+        break;
+      }
+      case "beam": {
+        if (!beams) beams = [];
+        beams.push(parseBeam(c, elAttrs));
+        break;
+      }
+      case "notations": {
+        const parsedNotations = parseNotations(c, notationsIndex);
+        if (parsedNotations.length > 0) {
+          if (!allNotations) allNotations = [];
+          for (let j = 0; j < parsedNotations.length; j++) allNotations.push(parsedNotations[j]);
+        }
+        notationsIndex++;
+        break;
+      }
+      case "lyric": {
+        if (!lyrics) lyrics = [];
+        lyrics.push(parseLyric(c, elAttrs));
+        break;
+      }
+      case "grace": {
+        hasGrace = true;
+        note.grace = {};
+        if (elAttrs["slash"] === "yes") note.grace.slash = true;
+        else if (elAttrs["slash"] === "no") note.grace.slash = false;
+        if (elAttrs["steal-time-previous"]) {
+          note.grace.stealTimePrevious = parseFloat(elAttrs["steal-time-previous"]);
+        }
+        if (elAttrs["steal-time-following"]) {
+          note.grace.stealTimeFollowing = parseFloat(elAttrs["steal-time-following"]);
+        }
+        break;
+      }
+      case "time-modification": {
+        const actualNotes = getElementText(c, "actual-notes");
+        const normalNotes = getElementText(c, "normal-notes");
+        const normalType = getElementText(c, "normal-type");
+        note.timeModification = {
+          actualNotes: parseInt(actualNotes || "3", 10),
+          normalNotes: parseInt(normalNotes || "2", 10)
+        };
+        if (normalType && isValidNoteType(normalType)) {
+          note.timeModification.normalType = normalType;
+        }
+        let ndCount = 0;
+        for (const tm of c) {
+          if (typeof tm !== "string" && tm.tagName === "normal-dot") ndCount++;
+        }
+        if (ndCount > 0) note.timeModification.normalDots = ndCount;
+        break;
+      }
     }
   }
-  parseFirstElement(elements, "unpitched", (c) => {
-    note.unpitched = {};
-    const displayStep = getElementText(c, "display-step");
-    if (displayStep) note.unpitched.displayStep = displayStep;
-    const displayOctave = getElementText(c, "display-octave");
-    if (displayOctave) note.unpitched.displayOctave = parseInt(displayOctave, 10);
-  });
-  const staff = getElementTextAsInt(elements, "staff");
-  if (staff !== void 0) note.staff = staff;
-  if (hasElement(elements, "chord")) {
-    note.chord = true;
-  }
-  parseFirstElement(elements, "type", (c, a) => {
-    const noteType = extractText(c);
-    if (isValidNoteType(noteType)) note.noteType = noteType;
-    if (a["size"]) note.noteTypeSize = a["size"];
-  });
-  const dotCount = elements.filter((el) => typeof el !== "string" && el.tagName === "dot").length;
   if (dotCount > 0) note.dots = dotCount;
-  parseFirstElement(elements, "accidental", (c, a) => {
-    const accValue = extractText(c);
-    if (isValidAccidental(accValue)) {
-      const accInfo = { value: accValue };
-      if (a["cautionary"] === "yes") accInfo.cautionary = true;
-      if (a["editorial"] === "yes") accInfo.editorial = true;
-      if (a["parentheses"] === "yes") accInfo.parentheses = true;
-      if (a["bracket"] === "yes") accInfo.bracket = true;
-      if (a["relative-x"]) accInfo.relativeX = parseFloat(a["relative-x"]);
-      if (a["relative-y"]) accInfo.relativeY = parseFloat(a["relative-y"]);
-      if (a["color"]) accInfo.color = a["color"];
-      if (a["size"]) accInfo.size = a["size"];
-      if (a["font-size"]) accInfo.fontSize = a["font-size"];
-      note.accidental = accInfo;
-    }
-  });
-  parseFirstElement(elements, "stem", (c, a) => {
-    const stemValue = extractText(c);
-    if (stemValue === "up" || stemValue === "down" || stemValue === "none" || stemValue === "double") {
-      note.stem = { value: stemValue };
-      if (a["default-x"]) note.stem.defaultX = parseFloat(a["default-x"]);
-      if (a["default-y"]) note.stem.defaultY = parseFloat(a["default-y"]);
-    }
-  });
-  parseFirstElement(elements, "notehead", (c, a) => {
-    const nhValue = extractText(c);
-    if (isValidNotehead(nhValue)) {
-      const nhInfo = { value: nhValue };
-      if (a["filled"] === "yes") nhInfo.filled = true;
-      else if (a["filled"] === "no") nhInfo.filled = false;
-      if (a["parentheses"] === "yes") nhInfo.parentheses = true;
-      note.notehead = nhInfo;
-    }
-  });
-  const tieElements = collectElements(elements, "tie", (_, a) => {
-    const t = a["type"];
-    return t === "start" || t === "stop" || t === "continue" ? { type: t } : null;
-  }).filter((t) => t !== null);
-  if (tieElements.length > 0) {
+  if (tieElements) {
     note.tie = tieElements[0];
     if (tieElements.length > 1) note.ties = tieElements;
   }
-  const beams = collectElements(elements, "beam", (c, a) => parseBeam(c, a));
-  if (beams.length > 0) note.beam = beams;
-  const allNotations = [];
-  let notationsIndex = 0;
-  for (const el of elements) {
-    if (typeof el === "string") continue;
-    if (el.tagName === "notations") {
-      const parsedNotations = parseNotations(el.children, notationsIndex);
-      allNotations.push(...parsedNotations);
-      notationsIndex++;
-    }
-  }
-  if (allNotations.length > 0) {
-    note.notations = allNotations;
-  }
-  const lyrics = [];
-  for (const el of elements) {
-    if (typeof el === "string") continue;
-    if (el.tagName === "lyric") {
-      lyrics.push(parseLyric(el.children, el.attributes));
-    }
-  }
-  if (lyrics.length > 0) note.lyrics = lyrics;
-  for (const el of elements) {
-    if (typeof el === "string") continue;
-    if (el.tagName === "grace") {
-      const graceAttrs = el.attributes;
-      note.grace = {};
-      if (graceAttrs["slash"] === "yes") note.grace.slash = true;
-      else if (graceAttrs["slash"] === "no") note.grace.slash = false;
-      if (graceAttrs["steal-time-previous"]) {
-        note.grace.stealTimePrevious = parseFloat(graceAttrs["steal-time-previous"]);
-      }
-      if (graceAttrs["steal-time-following"]) {
-        note.grace.stealTimeFollowing = parseFloat(graceAttrs["steal-time-following"]);
-      }
-      note.duration = 0;
-      break;
-    }
-  }
-  const timeMod = getElementContent(elements, "time-modification");
-  if (timeMod) {
-    const actualNotes = getElementText(timeMod, "actual-notes");
-    const normalNotes = getElementText(timeMod, "normal-notes");
-    const normalType = getElementText(timeMod, "normal-type");
-    note.timeModification = {
-      actualNotes: parseInt(actualNotes || "3", 10),
-      normalNotes: parseInt(normalNotes || "2", 10)
-    };
-    if (normalType && isValidNoteType(normalType)) {
-      note.timeModification.normalType = normalType;
-    }
-    let dotCount2 = 0;
-    for (const tm of timeMod) {
-      if (typeof tm !== "string" && tm.tagName === "normal-dot") dotCount2++;
-    }
-    if (dotCount2 > 0) note.timeModification.normalDots = dotCount2;
-  }
+  if (beams) note.beam = beams;
+  if (allNotations) note.notations = allNotations;
+  if (lyrics) note.lyrics = lyrics;
+  if (hasGrace) note.duration = 0;
   return note;
 }
 function parsePitch(elements) {

package/dist/index.mjs

@@ -214,9 +214,14 @@ import {
 
 // src/importers/musicxml.ts
 import { parse as txmlParse } from "txml";
+var _entityMap = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'" };
+var _entityRegex = /&(?:(amp|lt|gt|quot|apos)|#(\d+)|#x([0-9a-fA-F]+));/g;
 function decodeXmlEntities(s) {
   if (s.indexOf("&") === -1) return s;
-  return s.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&#(\d+);/g, (_, num) => String.fromCharCode(parseInt(num, 10))).replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
+  return s.replace(
+    _entityRegex,
+    (_, named, dec, hex) => named ? _entityMap[named] : dec ? String.fromCharCode(parseInt(dec, 10)) : String.fromCharCode(parseInt(hex, 16))
+  );
 }
 function decodeTree(nodes) {
   for (let i = 0; i < nodes.length; i++) {
@@ -1040,12 +1045,8 @@ function parseNote(elements, attrs) {
   const note = {
     _id: generateId(),
     type: "note",
-    duration: getElementTextAsInt(elements, "duration", 0)
+    duration: 0
   };
-  const voiceValue = getElementText(elements, "voice");
-  if (voiceValue !== void 0 && voiceValue !== "") {
-    note.voice = voiceValue;
-  }
   if (attrs["default-x"]) note.defaultX = parseFloat(attrs["default-x"]);
   if (attrs["default-y"]) note.defaultY = parseFloat(attrs["default-y"]);
   if (attrs["relative-x"]) note.relativeX = parseFloat(attrs["relative-x"]);
@@ -1056,149 +1057,183 @@ function parseNote(elements, attrs) {
   if (attrs["print-dot"] === "yes") note.printDot = true;
   if (attrs["print-spacing"] === "yes") note.printSpacing = true;
   if (attrs["print-spacing"] === "no") note.printSpacing = false;
-  if (hasElement(elements, "cue")) {
-    note.cue = true;
-  }
-  const instData = parseFirstElement(elements, "instrument", (_, attrs2) => attrs2["id"]);
-  if (instData) note.instrument = instData;
-  const pitch = getElementContent(elements, "pitch");
-  if (pitch) {
-    note.pitch = parsePitch(pitch);
-  }
-  for (const el of elements) {
+  let dotCount = 0;
+  let notationsIndex = 0;
+  let tieElements;
+  let beams;
+  let allNotations;
+  let lyrics;
+  let hasGrace = false;
+  for (let i = 0; i < elements.length; i++) {
+    const el = elements[i];
     if (typeof el === "string") continue;
-    if (el.tagName === "rest") {
-      const restContent = el.children;
-      const restInfo = {};
-      const restAttrs = el.attributes;
-      if (restAttrs["measure"] === "yes") restInfo.measure = true;
-      const displayStep = getElementText(restContent, "display-step");
-      if (displayStep) restInfo.displayStep = displayStep;
-      const displayOctave = getElementText(restContent, "display-octave");
-      if (displayOctave) restInfo.displayOctave = parseInt(displayOctave, 10);
-      note.rest = restInfo;
-      break;
+    const tag = el.tagName;
+    const elAttrs = el.attributes;
+    const c = el.children;
+    switch (tag) {
+      case "duration": {
+        const text = extractText(c);
+        if (text) note.duration = parseInt(text, 10) || 0;
+        break;
+      }
+      case "voice": {
+        const text = extractText(c);
+        if (text) note.voice = text;
+        break;
+      }
+      case "cue":
+        note.cue = true;
+        break;
+      case "chord":
+        note.chord = true;
+        break;
+      case "dot":
+        dotCount++;
+        break;
+      case "instrument":
+        if (elAttrs["id"]) note.instrument = elAttrs["id"];
+        break;
+      case "pitch":
+        note.pitch = parsePitch(c);
+        break;
+      case "rest": {
+        const restInfo = {};
+        if (elAttrs["measure"] === "yes") restInfo.measure = true;
+        const displayStep = getElementText(c, "display-step");
+        if (displayStep) restInfo.displayStep = displayStep;
+        const displayOctave = getElementText(c, "display-octave");
+        if (displayOctave) restInfo.displayOctave = parseInt(displayOctave, 10);
+        note.rest = restInfo;
+        break;
+      }
+      case "unpitched": {
+        note.unpitched = {};
+        const displayStep = getElementText(c, "display-step");
+        if (displayStep) note.unpitched.displayStep = displayStep;
+        const displayOctave = getElementText(c, "display-octave");
+        if (displayOctave) note.unpitched.displayOctave = parseInt(displayOctave, 10);
+        break;
+      }
+      case "staff": {
+        const text = extractText(c);
+        if (text) {
+          const v = parseInt(text, 10);
+          if (!isNaN(v)) note.staff = v;
+        }
+        break;
+      }
+      case "type": {
+        const noteType = extractText(c);
+        if (isValidNoteType(noteType)) note.noteType = noteType;
+        if (elAttrs["size"]) note.noteTypeSize = elAttrs["size"];
+        break;
+      }
+      case "accidental": {
+        const accValue = extractText(c);
+        if (isValidAccidental(accValue)) {
+          const accInfo = { value: accValue };
+          if (elAttrs["cautionary"] === "yes") accInfo.cautionary = true;
+          if (elAttrs["editorial"] === "yes") accInfo.editorial = true;
+          if (elAttrs["parentheses"] === "yes") accInfo.parentheses = true;
+          if (elAttrs["bracket"] === "yes") accInfo.bracket = true;
+          if (elAttrs["relative-x"]) accInfo.relativeX = parseFloat(elAttrs["relative-x"]);
+          if (elAttrs["relative-y"]) accInfo.relativeY = parseFloat(elAttrs["relative-y"]);
+          if (elAttrs["color"]) accInfo.color = elAttrs["color"];
+          if (elAttrs["size"]) accInfo.size = elAttrs["size"];
+          if (elAttrs["font-size"]) accInfo.fontSize = elAttrs["font-size"];
+          note.accidental = accInfo;
+        }
+        break;
+      }
+      case "stem": {
+        const stemValue = extractText(c);
+        if (stemValue === "up" || stemValue === "down" || stemValue === "none" || stemValue === "double") {
+          note.stem = { value: stemValue };
+          if (elAttrs["default-x"]) note.stem.defaultX = parseFloat(elAttrs["default-x"]);
+          if (elAttrs["default-y"]) note.stem.defaultY = parseFloat(elAttrs["default-y"]);
+        }
+        break;
+      }
+      case "notehead": {
+        const nhValue = extractText(c);
+        if (isValidNotehead(nhValue)) {
+          const nhInfo = { value: nhValue };
+          if (elAttrs["filled"] === "yes") nhInfo.filled = true;
+          else if (elAttrs["filled"] === "no") nhInfo.filled = false;
+          if (elAttrs["parentheses"] === "yes") nhInfo.parentheses = true;
+          note.notehead = nhInfo;
+        }
+        break;
+      }
+      case "tie": {
+        const t = elAttrs["type"];
+        if (t === "start" || t === "stop" || t === "continue") {
+          if (!tieElements) tieElements = [];
+          tieElements.push({ type: t });
+        }
+        break;
+      }
+      case "beam": {
+        if (!beams) beams = [];
+        beams.push(parseBeam(c, elAttrs));
+        break;
+      }
+      case "notations": {
+        const parsedNotations = parseNotations(c, notationsIndex);
+        if (parsedNotations.length > 0) {
+          if (!allNotations) allNotations = [];
+          for (let j = 0; j < parsedNotations.length; j++) allNotations.push(parsedNotations[j]);
+        }
+        notationsIndex++;
+        break;
+      }
+      case "lyric": {
+        if (!lyrics) lyrics = [];
+        lyrics.push(parseLyric(c, elAttrs));
+        break;
+      }
+      case "grace": {
+        hasGrace = true;
+        note.grace = {};
+        if (elAttrs["slash"] === "yes") note.grace.slash = true;
+        else if (elAttrs["slash"] === "no") note.grace.slash = false;
+        if (elAttrs["steal-time-previous"]) {
+          note.grace.stealTimePrevious = parseFloat(elAttrs["steal-time-previous"]);
+        }
+        if (elAttrs["steal-time-following"]) {
+          note.grace.stealTimeFollowing = parseFloat(elAttrs["steal-time-following"]);
+        }
+        break;
+      }
+      case "time-modification": {
+        const actualNotes = getElementText(c, "actual-notes");
+        const normalNotes = getElementText(c, "normal-notes");
+        const normalType = getElementText(c, "normal-type");
+        note.timeModification = {
+          actualNotes: parseInt(actualNotes || "3", 10),
+          normalNotes: parseInt(normalNotes || "2", 10)
+        };
+        if (normalType && isValidNoteType(normalType)) {
+          note.timeModification.normalType = normalType;
+        }
+        let ndCount = 0;
+        for (const tm of c) {
+          if (typeof tm !== "string" && tm.tagName === "normal-dot") ndCount++;
+        }
+        if (ndCount > 0) note.timeModification.normalDots = ndCount;
+        break;
+      }
     }
   }
-  parseFirstElement(elements, "unpitched", (c) => {
-    note.unpitched = {};
-    const displayStep = getElementText(c, "display-step");
-    if (displayStep) note.unpitched.displayStep = displayStep;
-    const displayOctave = getElementText(c, "display-octave");
-    if (displayOctave) note.unpitched.displayOctave = parseInt(displayOctave, 10);
-  });
-  const staff = getElementTextAsInt(elements, "staff");
-  if (staff !== void 0) note.staff = staff;
-  if (hasElement(elements, "chord")) {
-    note.chord = true;
-  }
-  parseFirstElement(elements, "type", (c, a) => {
-    const noteType = extractText(c);
-    if (isValidNoteType(noteType)) note.noteType = noteType;
-    if (a["size"]) note.noteTypeSize = a["size"];
-  });
-  const dotCount = elements.filter((el) => typeof el !== "string" && el.tagName === "dot").length;
   if (dotCount > 0) note.dots = dotCount;
-  parseFirstElement(elements, "accidental", (c, a) => {
-    const accValue = extractText(c);
-    if (isValidAccidental(accValue)) {
-      const accInfo = { value: accValue };
-      if (a["cautionary"] === "yes") accInfo.cautionary = true;
-      if (a["editorial"] === "yes") accInfo.editorial = true;
-      if (a["parentheses"] === "yes") accInfo.parentheses = true;
-      if (a["bracket"] === "yes") accInfo.bracket = true;
-      if (a["relative-x"]) accInfo.relativeX = parseFloat(a["relative-x"]);
-      if (a["relative-y"]) accInfo.relativeY = parseFloat(a["relative-y"]);
-      if (a["color"]) accInfo.color = a["color"];
-      if (a["size"]) accInfo.size = a["size"];
-      if (a["font-size"]) accInfo.fontSize = a["font-size"];
-      note.accidental = accInfo;
-    }
-  });
-  parseFirstElement(elements, "stem", (c, a) => {
-    const stemValue = extractText(c);
-    if (stemValue === "up" || stemValue === "down" || stemValue === "none" || stemValue === "double") {
-      note.stem = { value: stemValue };
-      if (a["default-x"]) note.stem.defaultX = parseFloat(a["default-x"]);
-      if (a["default-y"]) note.stem.defaultY = parseFloat(a["default-y"]);
-    }
-  });
-  parseFirstElement(elements, "notehead", (c, a) => {
-    const nhValue = extractText(c);
-    if (isValidNotehead(nhValue)) {
-      const nhInfo = { value: nhValue };
-      if (a["filled"] === "yes") nhInfo.filled = true;
-      else if (a["filled"] === "no") nhInfo.filled = false;
-      if (a["parentheses"] === "yes") nhInfo.parentheses = true;
-      note.notehead = nhInfo;
-    }
-  });
-  const tieElements = collectElements(elements, "tie", (_, a) => {
-    const t = a["type"];
-    return t === "start" || t === "stop" || t === "continue" ? { type: t } : null;
-  }).filter((t) => t !== null);
-  if (tieElements.length > 0) {
+  if (tieElements) {
     note.tie = tieElements[0];
     if (tieElements.length > 1) note.ties = tieElements;
   }
-  const beams = collectElements(elements, "beam", (c, a) => parseBeam(c, a));
-  if (beams.length > 0) note.beam = beams;
-  const allNotations = [];
-  let notationsIndex = 0;
-  for (const el of elements) {
-    if (typeof el === "string") continue;
-    if (el.tagName === "notations") {
-      const parsedNotations = parseNotations(el.children, notationsIndex);
-      allNotations.push(...parsedNotations);
-      notationsIndex++;
-    }
-  }
-  if (allNotations.length > 0) {
-    note.notations = allNotations;
-  }
-  const lyrics = [];
-  for (const el of elements) {
-    if (typeof el === "string") continue;
-    if (el.tagName === "lyric") {
-      lyrics.push(parseLyric(el.children, el.attributes));
-    }
-  }
-  if (lyrics.length > 0) note.lyrics = lyrics;
-  for (const el of elements) {
-    if (typeof el === "string") continue;
-    if (el.tagName === "grace") {
-      const graceAttrs = el.attributes;
-      note.grace = {};
-      if (graceAttrs["slash"] === "yes") note.grace.slash = true;
-      else if (graceAttrs["slash"] === "no") note.grace.slash = false;
-      if (graceAttrs["steal-time-previous"]) {
-        note.grace.stealTimePrevious = parseFloat(graceAttrs["steal-time-previous"]);
-      }
-      if (graceAttrs["steal-time-following"]) {
-        note.grace.stealTimeFollowing = parseFloat(graceAttrs["steal-time-following"]);
-      }
-      note.duration = 0;
-      break;
-    }
-  }
-  const timeMod = getElementContent(elements, "time-modification");
-  if (timeMod) {
-    const actualNotes = getElementText(timeMod, "actual-notes");
-    const normalNotes = getElementText(timeMod, "normal-notes");
-    const normalType = getElementText(timeMod, "normal-type");
-    note.timeModification = {
-      actualNotes: parseInt(actualNotes || "3", 10),
-      normalNotes: parseInt(normalNotes || "2", 10)
-    };
-    if (normalType && isValidNoteType(normalType)) {
-      note.timeModification.normalType = normalType;
-    }
-    let dotCount2 = 0;
-    for (const tm of timeMod) {
-      if (typeof tm !== "string" && tm.tagName === "normal-dot") dotCount2++;
-    }
-    if (dotCount2 > 0) note.timeModification.normalDots = dotCount2;
-  }
+  if (beams) note.beam = beams;
+  if (allNotations) note.notations = allNotations;
+  if (lyrics) note.lyrics = lyrics;
+  if (hasGrace) note.duration = 0;
   return note;
 }
 function parsePitch(elements) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musicxml-io",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Parse and serialize MusicXML (.xml/.mxl) and ABC notation with high round-trip fidelity",
   "author": "tan-z-tan",
   "license": "MIT",