r2-shared-js - npm Package Compare versions

Comparing version 1.0.78 to 1.0.79

CHANGELOG.md

 # Next
 
 Git diff:
-* https://github.com/readium/r2-shared-js/compare/v1.0.78...develop
+* https://github.com/readium/r2-shared-js/compare/v1.0.79...develop
 
@@ -9,2 +9,19 @@ Changes:
 
+# 1.0.79
+
+> Build environment: NodeJS `22.11.0`, NPM `11.0.0`
+
+Changes:
+* fix: XML BOM removal before parse
+
+Git revision info:
+* https://unpkg.com/r2-shared-js@1.0.79/dist/gitrev.json
+* https://github.com/edrlab/r2-shared-js-dist/blob/v1.0.79/dist/gitrev.json
+
+Git commit history:
+* https://github.com/readium/r2-shared-js/commits/v1.0.79
+
+Git diff:
+* https://github.com/readium/r2-shared-js/compare/v1.0.78...v1.0.79
+
 # 1.0.78
@@ -11,0 +28,0 @@

dist/es5/src/parser/cbz.js

@@ -17,2 +17,3 @@ "use strict";
 var zipFactory_1 = require("r2-utils-js/dist/es5/src/_utils/zip/zipFactory");
+var bom_1 = require("r2-utils-js/dist/es5/src/_utils/bom");
 var decodeURI_1 = require("../_utils/decodeURI");
@@ -162,3 +163,3 @@ var zipHasEntry_1 = require("../_utils/zipHasEntry");
             case 10:
-                comicXmlStr = comicZipData.toString("utf8");
+                comicXmlStr = (0, bom_1.removeUTF8BOM)(comicZipData.toString("utf8"));
                 comicXmlDoc = new xmldom.DOMParser().parseFromString(comicXmlStr, "application/xml");
@@ -165,0 +166,0 @@ comicMeta = xml_js_mapper_1.XML.deserialize(comicXmlDoc, comicrack_1.ComicInfo);

dist/es5/src/parser/daisy-convert-ncc-to-opf-ncx.js

@@ -12,2 +12,3 @@ "use strict";
 var BufferUtils_1 = require("r2-utils-js/dist/es5/src/_utils/stream/BufferUtils");
+var bom_1 = require("r2-utils-js/dist/es5/src/_utils/bom");
 var zipHasEntry_1 = require("../_utils/zipHasEntry");
@@ -105,3 +106,3 @@ var epub_daisy_common_1 = require("./epub-daisy-common");
             case 10:
-                nccStr = nccZipData.toString("utf8");
+                nccStr = (0, bom_1.removeUTF8BOM)(nccZipData.toString("utf8"));
                 nccDoc = new xmldom.DOMParser().parseFromString(nccStr, "text/html");
@@ -108,0 +109,0 @@ metas = Array.from(nccDoc.getElementsByTagName("meta")).

dist/es5/src/parser/epub.js

@@ -30,2 +30,3 @@ "use strict";
 var zipFactory_1 = require("r2-utils-js/dist/es5/src/_utils/zip/zipFactory");
+var bom_1 = require("r2-utils-js/dist/es5/src/_utils/bom");
 var decodeURI_1 = require("../_utils/decodeURI");
@@ -255,3 +256,3 @@ var zipHasEntry_1 = require("../_utils/zipHasEntry");
                 case 23:
-                    encryptionXmlStr = encryptionXmlZipData.toString("utf8");
+                    encryptionXmlStr = (0, bom_1.removeUTF8BOM)(encryptionXmlZipData.toString("utf8"));
                     encryptionXmlDoc = new xmldom.DOMParser().parseFromString(encryptionXmlStr, "application/xml");
@@ -288,3 +289,3 @@ encryption = xml_js_mapper_1.XML.deserialize(encryptionXmlDoc, encryption_1.Encryption);
                 case 32:
-                    containerXmlStr = containerXmlZipData.toString("utf8");
+                    containerXmlStr = (0, bom_1.removeUTF8BOM)(containerXmlZipData.toString("utf8"));
                     containerXmlDoc = new xmldom.DOMParser().parseFromString(containerXmlStr, "application/xml");
@@ -883,3 +884,3 @@ container = xml_js_mapper_1.XML.deserialize(containerXmlDoc, container_1.Container);
                     try {
-                        displayOptionsStr = displayOptionsZipData.toString("utf8");
+                        displayOptionsStr = (0, bom_1.removeUTF8BOM)(displayOptionsZipData.toString("utf8"));
                         displayOptionsDoc = new xmldom.DOMParser().parseFromString(displayOptionsStr, "application/xml");
@@ -1038,2 +1039,3 @@ displayOptions = xml_js_mapper_1.XML.deserialize(displayOptionsDoc, display_options_1.DisplayOptions);
                 }
+                pageMapContent = (0, bom_1.removeUTF8BOM)(pageMapContent);
                 pageMapXmlDoc = new xmldom.DOMParser().parseFromString(pageMapContent, "application/xml");
@@ -1153,3 +1155,3 @@ pages = pageMapXmlDoc.getElementsByTagName("page");
             case 10:
-                navDocStr = navDocZipData.toString("utf8");
+                navDocStr = (0, bom_1.removeUTF8BOM)(navDocZipData.toString("utf8"));
                 navXmlDoc = new xmldom.DOMParser().parseFromString(navDocStr, "application/xml");
@@ -1156,0 +1158,0 @@ select = xpath.useNamespaces({

dist/es6-es2015/src/parser/cbz.js

@@ -17,2 +17,3 @@ "use strict";
 const zipFactory_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/zip/zipFactory");
+const bom_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/bom");
 const decodeURI_1 = require("../_utils/decodeURI");
@@ -131,3 +132,3 @@ const zipHasEntry_1 = require("../_utils/zipHasEntry");
     }
-    const comicXmlStr = comicZipData.toString("utf8");
+    const comicXmlStr = (0, bom_1.removeUTF8BOM)(comicZipData.toString("utf8"));
     const comicXmlDoc = new xmldom.DOMParser().parseFromString(comicXmlStr, "application/xml");
@@ -134,0 +135,0 @@ const comicMeta = xml_js_mapper_1.XML.deserialize(comicXmlDoc, comicrack_1.ComicInfo);

dist/es6-es2015/src/parser/daisy-convert-ncc-to-opf-ncx.js

@@ -12,2 +12,3 @@ "use strict";
 const BufferUtils_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/stream/BufferUtils");
+const bom_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/bom");
 const zipHasEntry_1 = require("../_utils/zipHasEntry");
@@ -91,3 +92,3 @@ const epub_daisy_common_1 = require("./epub-daisy-common");
     }
-    const nccStr = nccZipData.toString("utf8");
+    const nccStr = (0, bom_1.removeUTF8BOM)(nccZipData.toString("utf8"));
     const nccDoc = new xmldom.DOMParser().parseFromString(nccStr, "text/html");
@@ -94,0 +95,0 @@ const metas = Array.from(nccDoc.getElementsByTagName("meta")).

dist/es6-es2015/src/parser/daisy-convert-to-epub.js

@@ -18,2 +18,3 @@ "use strict";
 const serializable_1 = require("r2-lcp-js/dist/es6-es2015/src/serializable");
+const bom_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/bom");
 const epub_daisy_common_1 = require("./epub-daisy-common");
@@ -202,3 +203,3 @@ const debug = debug_("r2:shared#parser/daisy-convert-to-epub");
                     }
-                    smilDoc = new xmldom.DOMParser().parseFromString(smilStr, "application/xml");
+                    smilDoc = new xmldom.DOMParser().parseFromString((0, bom_1.removeUTF8BOM)(smilStr), "application/xml");
                     if (nccZipEntry) {
@@ -436,2 +437,3 @@ (0, epub_daisy_common_1.flattenDaisy2SmilAudioSeq)(smilPathInZip, smilDoc);
                     }
+                    dtBookStr = (0, bom_1.removeUTF8BOM)(dtBookStr);
                     dtBookStr = dtBookStr.replace(/xmlns=""/, " ");
@@ -438,0 +440,0 @@ dtBookStr = dtBookStr.replace(/<dtbook/, "<dtbook xmlns:epub=\"http://www.idpf.org/2007/ops\" ");

dist/es6-es2015/src/parser/epub.js

@@ -30,2 +30,3 @@ "use strict";
 const zipFactory_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/zip/zipFactory");
+const bom_1 = require("r2-utils-js/dist/es6-es2015/src/_utils/bom");
 const decodeURI_1 = require("../_utils/decodeURI");
@@ -203,3 +204,3 @@ const zipHasEntry_1 = require("../_utils/zipHasEntry");
             }
-            const encryptionXmlStr = encryptionXmlZipData.toString("utf8");
+            const encryptionXmlStr = (0, bom_1.removeUTF8BOM)(encryptionXmlZipData.toString("utf8"));
             const encryptionXmlDoc = new xmldom.DOMParser().parseFromString(encryptionXmlStr, "application/xml");
@@ -227,3 +228,3 @@ encryption = xml_js_mapper_1.XML.deserialize(encryptionXmlDoc, encryption_1.Encryption);
         }
-        const containerXmlStr = containerXmlZipData.toString("utf8");
+        const containerXmlStr = (0, bom_1.removeUTF8BOM)(containerXmlZipData.toString("utf8"));
         const containerXmlDoc = new xmldom.DOMParser().parseFromString(containerXmlStr, "application/xml");
@@ -628,3 +629,3 @@ const container = xml_js_mapper_1.XML.deserialize(containerXmlDoc, container_1.Container);
                         try {
-                            const displayOptionsStr = displayOptionsZipData.toString("utf8");
+                            const displayOptionsStr = (0, bom_1.removeUTF8BOM)(displayOptionsZipData.toString("utf8"));
                             const displayOptionsDoc = new xmldom.DOMParser().parseFromString(displayOptionsStr, "application/xml");
@@ -761,6 +762,7 @@ const displayOptions = xml_js_mapper_1.XML.deserialize(displayOptionsDoc, display_options_1.DisplayOptions);
     }
-    const pageMapContent = yield (0, epub_daisy_common_1.loadFileStrFromZipPath)(l.Href, l.HrefDecoded, zip);
+    let pageMapContent = yield (0, epub_daisy_common_1.loadFileStrFromZipPath)(l.Href, l.HrefDecoded, zip);
     if (!pageMapContent) {
         return;
     }
+    pageMapContent = (0, bom_1.removeUTF8BOM)(pageMapContent);
     const pageMapXmlDoc = new xmldom.DOMParser().parseFromString(pageMapContent, "application/xml");
@@ -862,3 +864,3 @@ const pages = pageMapXmlDoc.getElementsByTagName("page");
     }
-    const navDocStr = navDocZipData.toString("utf8");
+    const navDocStr = (0, bom_1.removeUTF8BOM)(navDocZipData.toString("utf8"));
     const navXmlDoc = new xmldom.DOMParser().parseFromString(navDocStr, "application/xml");
@@ -865,0 +867,0 @@ const select = xpath.useNamespaces({

dist/es7-es2016/src/parser/cbz.js

@@ -17,2 +17,3 @@ "use strict";
 const zipFactory_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/zip/zipFactory");
+const bom_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/bom");
 const decodeURI_1 = require("../_utils/decodeURI");
@@ -131,3 +132,3 @@ const zipHasEntry_1 = require("../_utils/zipHasEntry");
     }
-    const comicXmlStr = comicZipData.toString("utf8");
+    const comicXmlStr = (0, bom_1.removeUTF8BOM)(comicZipData.toString("utf8"));
     const comicXmlDoc = new xmldom.DOMParser().parseFromString(comicXmlStr, "application/xml");
@@ -134,0 +135,0 @@ const comicMeta = xml_js_mapper_1.XML.deserialize(comicXmlDoc, comicrack_1.ComicInfo);

dist/es7-es2016/src/parser/daisy-convert-ncc-to-opf-ncx.js

@@ -12,2 +12,3 @@ "use strict";
 const BufferUtils_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/stream/BufferUtils");
+const bom_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/bom");
 const zipHasEntry_1 = require("../_utils/zipHasEntry");
@@ -91,3 +92,3 @@ const epub_daisy_common_1 = require("./epub-daisy-common");
     }
-    const nccStr = nccZipData.toString("utf8");
+    const nccStr = (0, bom_1.removeUTF8BOM)(nccZipData.toString("utf8"));
     const nccDoc = new xmldom.DOMParser().parseFromString(nccStr, "text/html");
@@ -94,0 +95,0 @@ const metas = Array.from(nccDoc.getElementsByTagName("meta")).

dist/es7-es2016/src/parser/daisy-convert-to-epub.js

@@ -18,2 +18,3 @@ "use strict";
 const serializable_1 = require("r2-lcp-js/dist/es7-es2016/src/serializable");
+const bom_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/bom");
 const epub_daisy_common_1 = require("./epub-daisy-common");
@@ -202,3 +203,3 @@ const debug = debug_("r2:shared#parser/daisy-convert-to-epub");
                     }
-                    smilDoc = new xmldom.DOMParser().parseFromString(smilStr, "application/xml");
+                    smilDoc = new xmldom.DOMParser().parseFromString((0, bom_1.removeUTF8BOM)(smilStr), "application/xml");
                     if (nccZipEntry) {
@@ -436,2 +437,3 @@ (0, epub_daisy_common_1.flattenDaisy2SmilAudioSeq)(smilPathInZip, smilDoc);
                     }
+                    dtBookStr = (0, bom_1.removeUTF8BOM)(dtBookStr);
                     dtBookStr = dtBookStr.replace(/xmlns=""/, " ");
@@ -438,0 +440,0 @@ dtBookStr = dtBookStr.replace(/<dtbook/, "<dtbook xmlns:epub=\"http://www.idpf.org/2007/ops\" ");

dist/es7-es2016/src/parser/epub.js

@@ -30,2 +30,3 @@ "use strict";
 const zipFactory_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/zip/zipFactory");
+const bom_1 = require("r2-utils-js/dist/es7-es2016/src/_utils/bom");
 const decodeURI_1 = require("../_utils/decodeURI");
@@ -203,3 +204,3 @@ const zipHasEntry_1 = require("../_utils/zipHasEntry");
             }
-            const encryptionXmlStr = encryptionXmlZipData.toString("utf8");
+            const encryptionXmlStr = (0, bom_1.removeUTF8BOM)(encryptionXmlZipData.toString("utf8"));
             const encryptionXmlDoc = new xmldom.DOMParser().parseFromString(encryptionXmlStr, "application/xml");
@@ -227,3 +228,3 @@ encryption = xml_js_mapper_1.XML.deserialize(encryptionXmlDoc, encryption_1.Encryption);
         }
-        const containerXmlStr = containerXmlZipData.toString("utf8");
+        const containerXmlStr = (0, bom_1.removeUTF8BOM)(containerXmlZipData.toString("utf8"));
         const containerXmlDoc = new xmldom.DOMParser().parseFromString(containerXmlStr, "application/xml");
@@ -628,3 +629,3 @@ const container = xml_js_mapper_1.XML.deserialize(containerXmlDoc, container_1.Container);
                         try {
-                            const displayOptionsStr = displayOptionsZipData.toString("utf8");
+                            const displayOptionsStr = (0, bom_1.removeUTF8BOM)(displayOptionsZipData.toString("utf8"));
                             const displayOptionsDoc = new xmldom.DOMParser().parseFromString(displayOptionsStr, "application/xml");
@@ -761,6 +762,7 @@ const displayOptions = xml_js_mapper_1.XML.deserialize(displayOptionsDoc, display_options_1.DisplayOptions);
     }
-    const pageMapContent = yield (0, epub_daisy_common_1.loadFileStrFromZipPath)(l.Href, l.HrefDecoded, zip);
+    let pageMapContent = yield (0, epub_daisy_common_1.loadFileStrFromZipPath)(l.Href, l.HrefDecoded, zip);
     if (!pageMapContent) {
         return;
     }
+    pageMapContent = (0, bom_1.removeUTF8BOM)(pageMapContent);
     const pageMapXmlDoc = new xmldom.DOMParser().parseFromString(pageMapContent, "application/xml");
@@ -862,3 +864,3 @@ const pages = pageMapXmlDoc.getElementsByTagName("page");
     }
-    const navDocStr = navDocZipData.toString("utf8");
+    const navDocStr = (0, bom_1.removeUTF8BOM)(navDocZipData.toString("utf8"));
     const navXmlDoc = new xmldom.DOMParser().parseFromString(navDocStr, "application/xml");
@@ -865,0 +867,0 @@ const select = xpath.useNamespaces({

dist/es8-es2017/src/parser/cbz.js

@@ -16,2 +16,3 @@ "use strict";
 const zipFactory_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/zip/zipFactory");
+const bom_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/bom");
 const decodeURI_1 = require("../_utils/decodeURI");
@@ -128,3 +129,3 @@ const zipHasEntry_1 = require("../_utils/zipHasEntry");
     }
-    const comicXmlStr = comicZipData.toString("utf8");
+    const comicXmlStr = (0, bom_1.removeUTF8BOM)(comicZipData.toString("utf8"));
     const comicXmlDoc = new xmldom.DOMParser().parseFromString(comicXmlStr, "application/xml");
@@ -131,0 +132,0 @@ const comicMeta = xml_js_mapper_1.XML.deserialize(comicXmlDoc, comicrack_1.ComicInfo);

dist/es8-es2017/src/parser/daisy-convert-ncc-to-opf-ncx.js

@@ -11,2 +11,3 @@ "use strict";
 const BufferUtils_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/stream/BufferUtils");
+const bom_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/bom");
 const zipHasEntry_1 = require("../_utils/zipHasEntry");
@@ -90,3 +91,3 @@ const epub_daisy_common_1 = require("./epub-daisy-common");
     }
-    const nccStr = nccZipData.toString("utf8");
+    const nccStr = (0, bom_1.removeUTF8BOM)(nccZipData.toString("utf8"));
     const nccDoc = new xmldom.DOMParser().parseFromString(nccStr, "text/html");
@@ -93,0 +94,0 @@ const metas = Array.from(nccDoc.getElementsByTagName("meta")).

dist/es8-es2017/src/parser/daisy-convert-to-epub.js

@@ -17,2 +17,3 @@ "use strict";
 const serializable_1 = require("r2-lcp-js/dist/es8-es2017/src/serializable");
+const bom_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/bom");
 const epub_daisy_common_1 = require("./epub-daisy-common");
@@ -201,3 +202,3 @@ const debug = debug_("r2:shared#parser/daisy-convert-to-epub");
                     }
-                    smilDoc = new xmldom.DOMParser().parseFromString(smilStr, "application/xml");
+                    smilDoc = new xmldom.DOMParser().parseFromString((0, bom_1.removeUTF8BOM)(smilStr), "application/xml");
                     if (nccZipEntry) {
@@ -435,2 +436,3 @@ (0, epub_daisy_common_1.flattenDaisy2SmilAudioSeq)(smilPathInZip, smilDoc);
                     }
+                    dtBookStr = (0, bom_1.removeUTF8BOM)(dtBookStr);
                     dtBookStr = dtBookStr.replace(/xmlns=""/, " ");
@@ -437,0 +439,0 @@ dtBookStr = dtBookStr.replace(/<dtbook/, "<dtbook xmlns:epub=\"http://www.idpf.org/2007/ops\" ");

dist/es8-es2017/src/parser/epub.js

@@ -29,2 +29,3 @@ "use strict";
 const zipFactory_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/zip/zipFactory");
+const bom_1 = require("r2-utils-js/dist/es8-es2017/src/_utils/bom");
 const decodeURI_1 = require("../_utils/decodeURI");
@@ -201,3 +202,3 @@ const zipHasEntry_1 = require("../_utils/zipHasEntry");
         }
-        const encryptionXmlStr = encryptionXmlZipData.toString("utf8");
+        const encryptionXmlStr = (0, bom_1.removeUTF8BOM)(encryptionXmlZipData.toString("utf8"));
         const encryptionXmlDoc = new xmldom.DOMParser().parseFromString(encryptionXmlStr, "application/xml");
@@ -225,3 +226,3 @@ encryption = xml_js_mapper_1.XML.deserialize(encryptionXmlDoc, encryption_1.Encryption);
     }
-    const containerXmlStr = containerXmlZipData.toString("utf8");
+    const containerXmlStr = (0, bom_1.removeUTF8BOM)(containerXmlZipData.toString("utf8"));
     const containerXmlDoc = new xmldom.DOMParser().parseFromString(containerXmlStr, "application/xml");
@@ -621,3 +622,3 @@ const container = xml_js_mapper_1.XML.deserialize(containerXmlDoc, container_1.Container);
                         try {
-                            const displayOptionsStr = displayOptionsZipData.toString("utf8");
+                            const displayOptionsStr = (0, bom_1.removeUTF8BOM)(displayOptionsZipData.toString("utf8"));
                             const displayOptionsDoc = new xmldom.DOMParser().parseFromString(displayOptionsStr, "application/xml");
@@ -754,6 +755,7 @@ const displayOptions = xml_js_mapper_1.XML.deserialize(displayOptionsDoc, display_options_1.DisplayOptions);
     }
-    const pageMapContent = await (0, epub_daisy_common_1.loadFileStrFromZipPath)(l.Href, l.HrefDecoded, zip);
+    let pageMapContent = await (0, epub_daisy_common_1.loadFileStrFromZipPath)(l.Href, l.HrefDecoded, zip);
     if (!pageMapContent) {
         return;
     }
+    pageMapContent = (0, bom_1.removeUTF8BOM)(pageMapContent);
     const pageMapXmlDoc = new xmldom.DOMParser().parseFromString(pageMapContent, "application/xml");
@@ -855,3 +857,3 @@ const pages = pageMapXmlDoc.getElementsByTagName("page");
     }
-    const navDocStr = navDocZipData.toString("utf8");
+    const navDocStr = (0, bom_1.removeUTF8BOM)(navDocZipData.toString("utf8"));
     const navXmlDoc = new xmldom.DOMParser().parseFromString(navDocStr, "application/xml");
@@ -858,0 +860,0 @@ const select = xpath.useNamespaces({

dist/gitrev.json

 {
   "node": "22.11.0",
   "npm": "11.0.0",
-  "short": "df131da",
-  "long": "df131da22ef722930b91631eab925c13d74a9bbb",
+  "short": "751a99c",
+  "long": "751a99c0bf8d9cf95ffaa3519c39ec0d5cb6c121",
   "branch": "develop",
-  "date": "2024-12-30T22:57:09.000Z",
-  "urlHistory": "https://github.com/readium/r2-shared-js/commits/df131da22ef722930b91631eab925c13d74a9bbb",
-  "urlDiff": "https://github.com/readium/r2-shared-js/compare/df131da22ef722930b91631eab925c13d74a9bbb...develop"
+  "date": "2024-12-30T23:40:20.000Z",
+  "urlHistory": "https://github.com/readium/r2-shared-js/commits/751a99c0bf8d9cf95ffaa3519c39ec0d5cb6c121",
+  "urlDiff": "https://github.com/readium/r2-shared-js/compare/751a99c0bf8d9cf95ffaa3519c39ec0d5cb6c121...develop"
 }

package.json

 {
   "name": "r2-shared-js",
-  "version": "1.0.78",
+  "version": "1.0.79",
   "description": "Readium 2 'shared' for NodeJS (TypeScript)",
@@ -5,0 +5,0 @@ "keywords": [

No alert changes

Improved metrics

Total package byte prevSize

5516122

increased by0.13%

Lines of code

45648

increased by0.06%

No dependency changes