epub2md 1.6.1 → 1.6.2

package/lib/convert/convert.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Converter = void 0;
 var _nodePath = require("node:path");
+var _posix = require("node:path/posix");
 var _logger = _interopRequireDefault(require("../logger.cjs"));
 var iteratorHelpersPolyfill = _interopRequireWildcard(require("iterator-helpers-polyfill"));
 var _parseEpub = _interopRequireDefault(require("../epub/parseEpub.cjs"));
@@ -79,7 +80,7 @@ class Converter {
           let validPath = (0, _helper.sanitizeFileName)((0, _nodePath.extname)(internalNavName) ? internalNavName : internalNavName + ".md");
           const file = structures.find(file2 => file2.id === sectionId);
           if (file) validPath = (0, _nodePath.basename)(clearOutpath(file, this.epub.structure.toc).outPath);
-          const toId = this.epub.structure.opf.manifest.getItemId((0, _nodePath.join)((0, _nodePath.dirname)(filepath), url));
+          const toId = this.epub.structure.opf.manifest.getItemId((0, _posix.join)((0, _posix.dirname)(filepath), url));
           return this.options.shouldMerge ? linkStartSep + toId + (hash ? "#" + hash : "") : linkStartSep + validPath + `${hash ? "#" + hash : ""}`;
         } else {
           if (link.startsWith("http")) {

package/lib/convert/convert.mjs

@@ -1,4 +1,5 @@
 import { basename, dirname, extname, join } from "node:path";
+import { join as posixJoin, dirname as posixDirname } from "node:path/posix";
 import logger from "../logger.mjs";
 import * as iteratorHelpersPolyfill from "iterator-helpers-polyfill";
 iteratorHelpersPolyfill.installIntoGlobal();
@@ -57,7 +58,9 @@ export class Converter {
           );
           const file = structures.find((file2) => file2.id === sectionId);
           if (file) validPath = basename(clearOutpath(file, this.epub.structure.toc).outPath);
-          const toId = this.epub.structure.opf.manifest.getItemId(join(dirname(filepath), url));
+          const toId = this.epub.structure.opf.manifest.getItemId(
+            posixJoin(posixDirname(filepath), url)
+          );
           return this.options.shouldMerge ? linkStartSep + toId + (hash ? "#" + hash : "") : linkStartSep + validPath + `${hash ? "#" + hash : ""}`;
         } else {
           if (link.startsWith("http")) {

package/lib/epub/parseEpub.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.Epub = void 0;
 module.exports = parse;
 exports.defaultOptions = void 0;
-var _nodePath = _interopRequireDefault(require("node:path"));
+var _posix = _interopRequireDefault(require("node:path/posix"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _parseSection = _interopRequireDefault(require("../parseSection.cjs"));
 var _options = require("./options.cjs");
@@ -29,7 +29,7 @@ class Epub {
   sections;
   getFile(filePath) {
     const isAbsolute = filePath.startsWith("/");
-    const absolutePath = isAbsolute ? filePath.slice(1) : _nodePath.default.join(this.structure.contentRoot, filePath);
+    const absolutePath = isAbsolute ? filePath.slice(1) : _posix.default.join(this.structure.contentRoot, filePath);
     const file = this.zip.getFile(absolutePath);
     return file;
   }

package/lib/epub/parseEpub.mjs

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "node:path/posix";
 import _ from "lodash";
 import parseSection from "../parseSection.mjs";
 import { parseOptions } from "./options.mjs";

package/lib/epub/zip.cjs

@@ -11,7 +11,17 @@ class Zip {
     this.zip = (0, _fflate.unzipSync)(fileContent);
   }
   getFile(path) {
-    const normalisedPath = decodeURI(path).replace(/^\//, "");
+    let decoded;
+    try {
+      decoded = decodeURIComponent(path);
+    } catch {
+      try {
+        decoded = decodeURI(path);
+      } catch {
+        decoded = path;
+      }
+    }
+    const normalisedPath = decoded.replace(/\\/g, "/").replace(/^\//, "");
     const file = this.zip[normalisedPath];
     if (!file) throw new Error(`Error in epub. File not found: ${normalisedPath}`);
     return {

package/lib/epub/zip.mjs

@@ -5,10 +5,19 @@ export class Zip {
     this.zip = unzipSync(fileContent);
   }
   getFile(path) {
-    const normalisedPath = decodeURI(path).replace(/^\//, "");
+    let decoded;
+    try {
+      decoded = decodeURIComponent(path);
+    } catch {
+      try {
+        decoded = decodeURI(path);
+      } catch {
+        decoded = path;
+      }
+    }
+    const normalisedPath = decoded.replace(/\\/g, "/").replace(/^\//, "");
     const file = this.zip[normalisedPath];
-    if (!file)
-      throw new Error(`Error in epub. File not found: ${normalisedPath}`);
+    if (!file) throw new Error(`Error in epub. File not found: ${normalisedPath}`);
     return {
       asText: () => toString(file),
       asNodeBuffer: () => Buffer.from(file)

package/lib/parseLink.cjs

@@ -7,7 +7,11 @@ module.exports = parseHref;
 var _last2 = _interopRequireDefault(require("lodash/last"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function parseHref(href, decode = false) {
-  if (decode) href = decodeURIComponent(href);
+  if (decode) {
+    try {
+      href = decodeURIComponent(href);
+    } catch {}
+  }
   const hash = href.split("#")[1];
   const url = href.split("#")[0];
   const prefix = url.split("/").slice(0, -1).join("/");

package/lib/parseLink.mjs

@@ -1,6 +1,11 @@
 import _last from "lodash/last";
 export default function parseHref(href, decode = false) {
-  if (decode) href = decodeURIComponent(href);
+  if (decode) {
+    try {
+      href = decodeURIComponent(href);
+    } catch {
+    }
+  }
   const hash = href.split("#")[1];
   const url = href.split("#")[0];
   const prefix = url.split("/").slice(0, -1).join("/");

package/lib/xml/index.cjs

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "TocItem", {
   }
 });
 exports.parseStructure = parseStructure;
-var _nodePath = _interopRequireDefault(require("node:path"));
+var _posix = _interopRequireDefault(require("node:path/posix"));
 var _metaContainer = require("./meta-container.cjs");
 var _opf = require("./opf.cjs");
 var _toc = require("./toc.cjs");
@@ -52,7 +52,7 @@ class Parse {
   toc(opf, contentRoot) {
     const relativePath = opf.manifest.getById("ncx")?.href;
     if (!relativePath) return;
-    const fullPath = _nodePath.default.join(contentRoot, relativePath);
+    const fullPath = _posix.default.join(contentRoot, relativePath);
     const string = this.zip.getFile(fullPath).asText();
     return (0, _toc.parseToc)(string, href => opf.manifest.getItemId(href));
   }

package/lib/xml/index.mjs

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "node:path/posix";
 import { parseMetaContainer } from "./meta-container.mjs";
 import { parseOpf } from "./opf.mjs";
 import { parseToc } from "./toc.mjs";

package/lib/xml/meta-container.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.parseMetaContainer = parseMetaContainer;
-var _path = _interopRequireDefault(require("path"));
+var _posix = _interopRequireDefault(require("node:path/posix"));
 var _parseXml = require("./parseXml.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function parseMetaContainer(text) {
@@ -17,7 +17,7 @@ function parseMetaContainer(text) {
   };
 }
 function getContentRoot(opfPath) {
-  let root = _path.default.dirname(opfPath);
+  let root = _posix.default.dirname(opfPath);
   if (root === ".") return "";
   if (!root.endsWith("/")) root += "/";
   if (root.startsWith("/")) root = root.slice(1);

package/lib/xml/meta-container.mjs

@@ -1,4 +1,4 @@
-import path from "path";
+import path from "node:path/posix";
 import { parseXml } from "./parseXml.mjs";
 export function parseMetaContainer(text) {
   const object = parseXml(text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epub2md",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "A epub parser that also can convert epub to markdown using the command line",
   "type": "module",
   "main": "lib/index.cjs",