musicxml-io 0.5.2 → 0.5.4

package/dist/index.js

@@ -244,7 +244,8 @@ function decodeTree(nodes) {
 }
 var TXML_OPTIONS = { noChildNodes: [] };
 function parse(xmlString) {
-  const parsed = _txml.parse.call(void 0, xmlString, TXML_OPTIONS);
+  const cleanedXml = xmlString.replace(/<\?(?!xml\s)[^?]*\?>/g, "");
+  const parsed = _txml.parse.call(void 0, cleanedXml, TXML_OPTIONS);
   decodeTree(parsed);
   let scorePartwiseVersion;
   let scorePartwise;
@@ -2759,6 +2760,15 @@ function parseCompressed(data) {
 function isCompressed(data) {
   return data.length >= 2 && data[0] === 80 && data[1] === 75;
 }
+function decodeXmlBytes(data) {
+  if (data.length >= 2 && data[0] === 254 && data[1] === 255) {
+    return new TextDecoder("utf-16be").decode(data);
+  }
+  if (data.length >= 2 && data[0] === 255 && data[1] === 254) {
+    return new TextDecoder("utf-16le").decode(data);
+  }
+  return new TextDecoder("utf-8").decode(data);
+}
 function parseAuto(data) {
   if (typeof data === "string") {
     return parse(data);
@@ -2766,7 +2776,7 @@ function parseAuto(data) {
   if (isCompressed(data)) {
     return parseCompressed(data);
   }
-  const xmlString = _fflate.strFromU8.call(void 0, data);
+  const xmlString = decodeXmlBytes(data);
   return parse(xmlString);
 }
 
@@ -7874,10 +7884,10 @@ async function parseFile(filePath) {
 }
 function decodeBuffer(buffer) {
   if (buffer.length >= 2 && buffer[0] === 254 && buffer[1] === 255) {
-    return buffer.swap16().toString("utf-16le");
+    return new TextDecoder("utf-16be").decode(buffer);
   }
   if (buffer.length >= 2 && buffer[0] === 255 && buffer[1] === 254) {
-    return buffer.toString("utf16le");
+    return new TextDecoder("utf-16le").decode(buffer);
   }
   if (buffer.length >= 3 && buffer[0] === 239 && buffer[1] === 187 && buffer[2] === 191) {
     return buffer.toString("utf8", 3);

package/dist/index.mjs

@@ -244,7 +244,8 @@ function decodeTree(nodes) {
 }
 var TXML_OPTIONS = { noChildNodes: [] };
 function parse(xmlString) {
-  const parsed = txmlParse(xmlString, TXML_OPTIONS);
+  const cleanedXml = xmlString.replace(/<\?(?!xml\s)[^?]*\?>/g, "");
+  const parsed = txmlParse(cleanedXml, TXML_OPTIONS);
   decodeTree(parsed);
   let scorePartwiseVersion;
   let scorePartwise;
@@ -2759,6 +2760,15 @@ function parseCompressed(data) {
 function isCompressed(data) {
   return data.length >= 2 && data[0] === 80 && data[1] === 75;
 }
+function decodeXmlBytes(data) {
+  if (data.length >= 2 && data[0] === 254 && data[1] === 255) {
+    return new TextDecoder("utf-16be").decode(data);
+  }
+  if (data.length >= 2 && data[0] === 255 && data[1] === 254) {
+    return new TextDecoder("utf-16le").decode(data);
+  }
+  return new TextDecoder("utf-8").decode(data);
+}
 function parseAuto(data) {
   if (typeof data === "string") {
     return parse(data);
@@ -2766,7 +2776,7 @@ function parseAuto(data) {
   if (isCompressed(data)) {
     return parseCompressed(data);
   }
-  const xmlString = strFromU8(data);
+  const xmlString = decodeXmlBytes(data);
   return parse(xmlString);
 }
 
@@ -7874,10 +7884,10 @@ async function parseFile(filePath) {
 }
 function decodeBuffer(buffer) {
   if (buffer.length >= 2 && buffer[0] === 254 && buffer[1] === 255) {
-    return buffer.swap16().toString("utf-16le");
+    return new TextDecoder("utf-16be").decode(buffer);
   }
   if (buffer.length >= 2 && buffer[0] === 255 && buffer[1] === 254) {
-    return buffer.toString("utf16le");
+    return new TextDecoder("utf-16le").decode(buffer);
   }
   if (buffer.length >= 3 && buffer[0] === 239 && buffer[1] === 187 && buffer[2] === 191) {
     return buffer.toString("utf8", 3);

package/package.json

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