musicxml-io 0.7.5 → 0.8.1

package/dist/index.js

@@ -617,7 +617,7 @@ function parseSystemLayout(elements) {
 }
 function parseCredits(elements) {
   const credits = collectElements(elements, "credit", (content, attrs) => {
-    const credit = { _id: _chunkKJXV3TD4js.generateId.call(void 0, ) };
+    const credit = { _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ) };
     if (attrs["page"]) credit.page = parseInt(attrs["page"], 10);
     const types = collectElements(content, "credit-type", (c) => extractText(c));
     const words = collectElements(content, "credit-words", (c, a) => {
@@ -760,7 +760,7 @@ function parsePartList(elements) {
       const attrs = el.attributes;
       const content = el.children;
       const group = {
-        _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+        _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
         type: "part-group",
         groupType: attrs["type"] === "stop" ? "stop" : "start"
       };
@@ -816,7 +816,7 @@ function parseParts(elements) {
 }
 function parseMeasure(elements, attrs) {
   const measure = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     number: attrs["number"] || "0",
     // Keep as string per MusicXML spec (token type)
     entries: []
@@ -828,12 +828,12 @@ function parseMeasure(elements, attrs) {
   for (const el of elements) {
     if (typeof el === "string") continue;
     if (el.tagName === "attributes") {
-      const parsedAttrs = parseAttributes(el.children);
+      const parsedAttrs = parseAttributes(el.children, el.attributes);
       if (!hasSeenNote && !measure.attributes) {
         measure.attributes = parsedAttrs;
       } else {
         const attrEntry = {
-          _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+          _id: el.attributes["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
           type: "attributes",
           attributes: parsedAttrs
         };
@@ -845,7 +845,7 @@ function parseMeasure(elements, attrs) {
     } else if (el.tagName === "backup") {
       measure.entries.push(parseBackup(el.children));
     } else if (el.tagName === "forward") {
-      measure.entries.push(parseForward(el.children));
+      measure.entries.push(parseForward(el.children, el.attributes));
     } else if (el.tagName === "direction") {
       measure.entries.push(parseDirection(el.children, el.attributes));
     } else if (el.tagName === "barline") {
@@ -914,8 +914,8 @@ function parsePrint(elements, attrs) {
   if (pad) print.partAbbreviationDisplay = pad;
   return print;
 }
-function parseAttributes(elements) {
-  const attrs = { _id: _chunkKJXV3TD4js.generateId.call(void 0, ) };
+function parseAttributes(elements, xmlAttrs = {}) {
+  const attrs = { _id: xmlAttrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ) };
   const divisions = getElementTextAsInt(elements, "divisions");
   if (divisions !== void 0) attrs.divisions = divisions;
   const staves = getElementTextAsInt(elements, "staves");
@@ -1081,7 +1081,7 @@ function parseTranspose(elements) {
 }
 function parseNote(elements, attrs) {
   const note = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     type: "note",
     duration: 0
   };
@@ -1837,9 +1837,9 @@ function parseBackup(elements) {
     duration: parseInt(getElementText(elements, "duration") || "0", 10)
   };
 }
-function parseForward(elements) {
+function parseForward(elements, attrs = {}) {
   const forward = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     type: "forward",
     duration: parseInt(getElementText(elements, "duration") || "0", 10)
   };
@@ -1851,7 +1851,7 @@ function parseForward(elements) {
 }
 function parseDirection(elements, attrs) {
   const direction = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     type: "direction",
     directionTypes: []
   };
@@ -2276,7 +2276,7 @@ function parseDirectionTypes(elements) {
 }
 function parseBarline(elements, attrs) {
   const location = attrs["location"] || "right";
-  const barline = { _id: _chunkKJXV3TD4js.generateId.call(void 0, ), location };
+  const barline = { _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ), location };
   const barStyle = getElementText(elements, "bar-style");
   if (barStyle && isValidBarStyle(barStyle)) {
     barline.barStyle = barStyle;
@@ -2508,7 +2508,7 @@ function parseMeasureStyle(elements, attrs) {
 }
 function parseHarmony(elements, attrs) {
   const harmony = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     type: "harmony",
     root: { rootStep: "C" },
     kind: "major"
@@ -2648,7 +2648,7 @@ function parseHarmony(elements, attrs) {
 }
 function parseFiguredBass(elements, attrs) {
   const fb = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     type: "figured-bass",
     figures: []
   };
@@ -2697,7 +2697,7 @@ function parseFiguredBass(elements, attrs) {
 }
 function parseSound(elements, attrs) {
   const sound = {
-    _id: _chunkKJXV3TD4js.generateId.call(void 0, ),
+    _id: attrs["id"] || _chunkKJXV3TD4js.generateId.call(void 0, ),
     type: "sound"
   };
   if (attrs["tempo"]) sound.tempo = parseFloat(attrs["tempo"]);
@@ -5021,7 +5021,7 @@ function serializeMeasure(measure, indent, out) {
     serializePrint(measure.print, indent + "  ", out);
   }
   if (measure.attributes) {
-    serializeAttributes(measure.attributes, indent + "  ", out);
+    serializeAttributes(measure.attributes, indent + "  ", out, measure.attributes._id);
   }
   for (const entry of measure.entries) {
     serializeEntry(entry, indent + "  ", out);

package/dist/index.mjs

@@ -617,7 +617,7 @@ function parseSystemLayout(elements) {
 }
 function parseCredits(elements) {
   const credits = collectElements(elements, "credit", (content, attrs) => {
-    const credit = { _id: generateId() };
+    const credit = { _id: attrs["id"] || generateId() };
     if (attrs["page"]) credit.page = parseInt(attrs["page"], 10);
     const types = collectElements(content, "credit-type", (c) => extractText(c));
     const words = collectElements(content, "credit-words", (c, a) => {
@@ -760,7 +760,7 @@ function parsePartList(elements) {
       const attrs = el.attributes;
       const content = el.children;
       const group = {
-        _id: generateId(),
+        _id: attrs["id"] || generateId(),
         type: "part-group",
         groupType: attrs["type"] === "stop" ? "stop" : "start"
       };
@@ -816,7 +816,7 @@ function parseParts(elements) {
 }
 function parseMeasure(elements, attrs) {
   const measure = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     number: attrs["number"] || "0",
     // Keep as string per MusicXML spec (token type)
     entries: []
@@ -828,12 +828,12 @@ function parseMeasure(elements, attrs) {
   for (const el of elements) {
     if (typeof el === "string") continue;
     if (el.tagName === "attributes") {
-      const parsedAttrs = parseAttributes(el.children);
+      const parsedAttrs = parseAttributes(el.children, el.attributes);
       if (!hasSeenNote && !measure.attributes) {
         measure.attributes = parsedAttrs;
       } else {
         const attrEntry = {
-          _id: generateId(),
+          _id: el.attributes["id"] || generateId(),
           type: "attributes",
           attributes: parsedAttrs
         };
@@ -845,7 +845,7 @@ function parseMeasure(elements, attrs) {
     } else if (el.tagName === "backup") {
       measure.entries.push(parseBackup(el.children));
     } else if (el.tagName === "forward") {
-      measure.entries.push(parseForward(el.children));
+      measure.entries.push(parseForward(el.children, el.attributes));
     } else if (el.tagName === "direction") {
       measure.entries.push(parseDirection(el.children, el.attributes));
     } else if (el.tagName === "barline") {
@@ -914,8 +914,8 @@ function parsePrint(elements, attrs) {
   if (pad) print.partAbbreviationDisplay = pad;
   return print;
 }
-function parseAttributes(elements) {
-  const attrs = { _id: generateId() };
+function parseAttributes(elements, xmlAttrs = {}) {
+  const attrs = { _id: xmlAttrs["id"] || generateId() };
   const divisions = getElementTextAsInt(elements, "divisions");
   if (divisions !== void 0) attrs.divisions = divisions;
   const staves = getElementTextAsInt(elements, "staves");
@@ -1081,7 +1081,7 @@ function parseTranspose(elements) {
 }
 function parseNote(elements, attrs) {
   const note = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     type: "note",
     duration: 0
   };
@@ -1837,9 +1837,9 @@ function parseBackup(elements) {
     duration: parseInt(getElementText(elements, "duration") || "0", 10)
   };
 }
-function parseForward(elements) {
+function parseForward(elements, attrs = {}) {
   const forward = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     type: "forward",
     duration: parseInt(getElementText(elements, "duration") || "0", 10)
   };
@@ -1851,7 +1851,7 @@ function parseForward(elements) {
 }
 function parseDirection(elements, attrs) {
   const direction = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     type: "direction",
     directionTypes: []
   };
@@ -2276,7 +2276,7 @@ function parseDirectionTypes(elements) {
 }
 function parseBarline(elements, attrs) {
   const location = attrs["location"] || "right";
-  const barline = { _id: generateId(), location };
+  const barline = { _id: attrs["id"] || generateId(), location };
   const barStyle = getElementText(elements, "bar-style");
   if (barStyle && isValidBarStyle(barStyle)) {
     barline.barStyle = barStyle;
@@ -2508,7 +2508,7 @@ function parseMeasureStyle(elements, attrs) {
 }
 function parseHarmony(elements, attrs) {
   const harmony = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     type: "harmony",
     root: { rootStep: "C" },
     kind: "major"
@@ -2648,7 +2648,7 @@ function parseHarmony(elements, attrs) {
 }
 function parseFiguredBass(elements, attrs) {
   const fb = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     type: "figured-bass",
     figures: []
   };
@@ -2697,7 +2697,7 @@ function parseFiguredBass(elements, attrs) {
 }
 function parseSound(elements, attrs) {
   const sound = {
-    _id: generateId(),
+    _id: attrs["id"] || generateId(),
     type: "sound"
   };
   if (attrs["tempo"]) sound.tempo = parseFloat(attrs["tempo"]);
@@ -5021,7 +5021,7 @@ function serializeMeasure(measure, indent, out) {
     serializePrint(measure.print, indent + "  ", out);
   }
   if (measure.attributes) {
-    serializeAttributes(measure.attributes, indent + "  ", out);
+    serializeAttributes(measure.attributes, indent + "  ", out, measure.attributes._id);
   }
   for (const entry of measure.entries) {
     serializeEntry(entry, indent + "  ", out);

package/package.json

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