@prose-reader/streamer 1.110.0 → 1.111.0

package/dist/index.js

@@ -1,96 +1,96 @@
-import $, { XmlDocument as ce } from "xmldoc";
-import { urlJoin as N, isXmlBasedMimeType as de, detectMimeTypeFromName as B } from "@prose-reader/shared";
-import { Subject as I, mergeMap as P, EMPTY as X, from as S, map as v, catchError as k, shareReplay as H, switchMap as C, startWith as le, distinctUntilChanged as pe, withLatestFrom as me, NEVER as fe, timer as ue, of as R, tap as _, merge as q, takeUntil as he, BehaviorSubject as ge, filter as be, ignoreElements as ye, first as we, finalize as G, lastValueFrom as J } from "rxjs";
-let T = !1;
-const y = {
+import x, { XmlDocument as ce } from "xmldoc";
+import { urlJoin as T, isXmlBasedMimeType as de, detectMimeTypeFromName as X } from "@prose-reader/shared";
+import { Subject as P, mergeMap as C, EMPTY as U, from as N, map as $, catchError as W, shareReplay as H, switchMap as R, startWith as le, distinctUntilChanged as pe, withLatestFrom as fe, NEVER as me, timer as ue, of as I, tap as _, merge as q, takeUntil as he, BehaviorSubject as ge, filter as be, ignoreElements as ye, first as we, finalize as G, lastValueFrom as J } from "rxjs";
+let S = !1;
+const w = {
   enable: (e) => {
-    T = e;
+    S = e;
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   log: (...e) => {
-    T && console.log("[prose-reader-streamer]", ...e);
+    S && console.log("[prose-reader-streamer]", ...e);
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   warn: (...e) => {
-    T && console.warn("[prose-reader-streamer]", ...e);
+    S && console.warn("[prose-reader-streamer]", ...e);
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: (...e) => {
     console.error(...e);
   },
   time: (e) => {
-    T && console.time(`[prose-reader-streamer] [metric] ${e}`);
+    S && console.time(`[prose-reader-streamer] [metric] ${e}`);
   },
   timeEnd: (e) => {
-    T && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
+    S && console.timeEnd(`[prose-reader-streamer] [metric] ${e}`);
   },
   metric: (e, n = 1 / 0) => {
-    const s = typeof e == "number" ? e : e.duration;
-    T && (e.duration <= n ? console.log(
+    const a = typeof e == "number" ? e : e.duration;
+    S && (e.duration <= n ? console.log(
       "[prose-reader-streamer] [metric] ",
-      `${e.name} took ${s}ms`
+      `${e.name} took ${a}ms`
     ) : console.warn(
       "[prose-reader-streamer] [metric] ",
       `${e.name} took ${e.duration}ms which is above the ${n}ms target for this function`
     ));
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  measurePerformance: (e, n = 10, s) => (...r) => {
-    const t = performance.now(), a = s(...r);
-    if (a && a.then)
-      return a.then((o) => {
-        const p = performance.now();
-        return y.metric({ name: e, duration: p - t }, n), o;
+  measurePerformance: (e, n = 10, a) => (...r) => {
+    const t = performance.now(), s = a(...r);
+    if (s && s.then)
+      return s.then((o) => {
+        const l = performance.now();
+        return w.metric({ name: e, duration: l - t }, n), o;
       });
     const i = performance.now();
-    return y.metric({ name: e, duration: i - t }, n), a;
+    return w.metric({ name: e, duration: i - t }, n), s;
   }
 }, ve = (e) => {
-  var s;
-  const n = (s = e.descendantWithPath("head")) == null ? void 0 : s.childrenNamed("meta").find((r) => r.attr.name === "calibre:cover");
+  var a;
+  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((r) => r.attr.name === "calibre:cover");
   return !!(n && n.attr.name === "calibre:cover");
 }, $e = (e) => {
-  var n, s, r;
-  return (r = (s = (n = e.descendantWithPath("body")) == null ? void 0 : n.descendantWithPath("div")) == null ? void 0 : s.childrenNamed("svg")) == null ? void 0 : r.find(
+  var n, a, r;
+  return (r = (a = (n = e.descendantWithPath("body")) == null ? void 0 : n.descendantWithPath("div")) == null ? void 0 : a.childrenNamed("svg")) == null ? void 0 : r.find(
     (t) => t.attr.width === "100%" && t.attr.preserveAspectRatio === "none"
   );
-}, xe = ({ archive: e, resourcePath: n }) => async (s) => {
+}, xe = ({ archive: e, resourcePath: n }) => async (a) => {
   const r = Object.values(e.files).find(
     (t) => t.uri === n
   );
   if (r != null && r.basename.endsWith(".xhtml")) {
-    const t = s.body ?? await r.string(), a = new ce(t);
-    if (ve(a)) {
-      const i = $e(a);
+    const t = a.body ?? await r.string(), s = new ce(t);
+    if (ve(s)) {
+      const i = $e(s);
       return i && delete i.attr.preserveAspectRatio, {
-        ...s,
-        body: a == null ? void 0 : a.toString()
+        ...a,
+        body: s == null ? void 0 : s.toString()
       };
     }
   }
-  return s;
-}, Fe = ({ archive: e, resourcePath: n }) => async (s) => xe({ archive: e, resourcePath: n })(s), Te = ({ archive: e, resourcePath: n }) => async (s) => {
+  return a;
+}, Fe = ({ archive: e, resourcePath: n }) => async (a) => xe({ archive: e, resourcePath: n })(a), Se = ({ archive: e, resourcePath: n }) => async (a) => {
   const r = Object.values(e.files).find(
     (t) => t.uri === n
   );
   if (r != null && r.basename.endsWith(".css")) {
-    const a = (s.body ?? await r.string()).replaceAll(
+    const s = (a.body ?? await r.string()).replaceAll(
       "-webkit-writing-mode",
       "writing-mode"
     );
     return {
-      ...s,
-      body: a
+      ...a,
+      body: s
     };
   }
-  return s;
-}, W = (e) => {
-  const s = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
+  return a;
+}, k = (e) => {
+  const a = Object.values(e.files).filter((r) => !r.dir).find((r) => r.uri.endsWith(".opf"));
   return {
-    data: s,
-    basePath: (s == null ? void 0 : s.uri.substring(0, s.uri.lastIndexOf("/"))) || ""
+    data: a,
+    basePath: (a == null ? void 0 : a.uri.substring(0, a.uri.lastIndexOf("/"))) || ""
   };
-}, Q = (e, { opfBasePath: n, baseUrl: s }) => {
+}, Q = (e, { opfBasePath: n, baseUrl: a }) => {
   const r = {
     contents: [],
     path: "",
@@ -99,94 +99,94 @@ const y = {
   };
   let t = e.childNamed("span") || e.childNamed("a");
   r.title = (t == null ? void 0 : t.attr.title) || (t == null ? void 0 : t.val.trim()) || r.title;
-  let a = t == null ? void 0 : t.name;
-  a !== "a" && (t = e.descendantWithPath(`${a}.a`), t && (a = t.name.toLowerCase())), a === "a" && (t != null && t.attr.href) && (r.path = N(n, t.attr.href), r.href = N(s, n, t.attr.href));
+  let s = t == null ? void 0 : t.name;
+  s !== "a" && (t = e.descendantWithPath(`${s}.a`), t && (s = t.name.toLowerCase())), s === "a" && (t != null && t.attr.href) && (r.path = T(n, t.attr.href), r.href = T(a, n, t.attr.href));
   const i = e.childNamed("ol");
   if (i) {
     const o = i.childrenNamed("li");
     o && o.length > 0 && (r.contents = o.map(
-      (p) => Q(p, { opfBasePath: n, baseUrl: s })
+      (l) => Q(l, { opfBasePath: n, baseUrl: a })
     ));
   }
   return r;
-}, Ne = (e, { opfBasePath: n, baseUrl: s }) => {
-  var a, i;
+}, Te = (e, { opfBasePath: n, baseUrl: a }) => {
+  var s, i;
   const r = [];
   let t;
-  return e.descendantWithPath("body.nav.ol") ? t = (a = e.descendantWithPath("body.nav.ol")) == null ? void 0 : a.children : e.descendantWithPath("body.section.nav.ol") && (t = (i = e.descendantWithPath("body.section.nav.ol")) == null ? void 0 : i.children), t && t.length > 0 && t.filter((o) => o.name === "li").forEach(
-    (o) => r.push(Q(o, { opfBasePath: n, baseUrl: s }))
+  return e.descendantWithPath("body.nav.ol") ? t = (s = e.descendantWithPath("body.nav.ol")) == null ? void 0 : s.children : e.descendantWithPath("body.section.nav.ol") && (t = (i = e.descendantWithPath("body.section.nav.ol")) == null ? void 0 : i.children), t && t.length > 0 && t.filter((o) => o.name === "li").forEach(
+    (o) => r.push(Q(o, { opfBasePath: n, baseUrl: a }))
   ), r;
-}, Se = async (e, n, { opfBasePath: s, baseUrl: r }) => {
-  var a;
-  const t = (a = e.childNamed("manifest")) == null ? void 0 : a.childrenNamed("item").find((i) => i.attr.properties === "nav");
+}, Ne = async (e, n, { opfBasePath: a, baseUrl: r }) => {
+  var s;
+  const t = (s = e.childNamed("manifest")) == null ? void 0 : s.childrenNamed("item").find((i) => i.attr.properties === "nav");
   if (t) {
     const i = Object.values(n.files).find(
       (o) => o.uri.endsWith(t.attr.href || "")
     );
     if (i) {
-      const o = new $.XmlDocument(await i.string());
-      return Ne(o, { opfBasePath: s, baseUrl: r });
+      const o = new x.XmlDocument(await i.string());
+      return Te(o, { opfBasePath: a, baseUrl: r });
     }
   }
 }, Z = (e, {
   opfBasePath: n,
-  baseUrl: s,
+  baseUrl: a,
   prefix: r
 }) => {
-  var o, p;
-  const t = ((o = e == null ? void 0 : e.childNamed(`${r}content`)) == null ? void 0 : o.attr.src) || "", a = {
-    title: ((p = e == null ? void 0 : e.descendantWithPath(`${r}navLabel.${r}text`)) == null ? void 0 : p.val) || "",
-    path: N(n, t),
-    href: N(s, n, t),
+  var o, l;
+  const t = ((o = e == null ? void 0 : e.childNamed(`${r}content`)) == null ? void 0 : o.attr.src) || "", s = {
+    title: ((l = e == null ? void 0 : e.descendantWithPath(`${r}navLabel.${r}text`)) == null ? void 0 : l.val) || "",
+    path: T(n, t),
+    href: T(a, n, t),
     contents: []
   }, i = e.childrenNamed(`${r}navPoint`);
-  return i && i.length > 0 && (a.contents = i.map(
-    (u) => Z(u, { opfBasePath: n, baseUrl: s, prefix: r })
-  )), a;
-}, ke = (e, { opfBasePath: n, baseUrl: s }) => {
+  return i && i.length > 0 && (s.contents = i.map(
+    (m) => Z(m, { opfBasePath: n, baseUrl: a, prefix: r })
+  )), s;
+}, We = (e, { opfBasePath: n, baseUrl: a }) => {
   var i;
   const r = [], t = e.name;
-  let a = "";
-  return t.indexOf(":") !== -1 && (a = t.split(":")[0] + ":"), (i = e.childNamed(`${a}navMap`)) == null || i.childrenNamed(`${a}navPoint`).forEach(
-    (o) => r.push(Z(o, { opfBasePath: n, baseUrl: s, prefix: a }))
+  let s = "";
+  return t.indexOf(":") !== -1 && (s = t.split(":")[0] + ":"), (i = e.childNamed(`${s}navMap`)) == null || i.childrenNamed(`${s}navPoint`).forEach(
+    (o) => r.push(Z(o, { opfBasePath: n, baseUrl: a, prefix: s }))
   ), r;
-}, We = async ({
+}, ke = async ({
   opfData: e,
   opfBasePath: n,
-  baseUrl: s,
+  baseUrl: a,
   archive: r
 }) => {
   var i;
-  const t = e.childNamed("spine"), a = t && t.attr.toc;
-  if (a) {
-    const o = (i = e.childNamed("manifest")) == null ? void 0 : i.childrenNamed("item").find((p) => p.attr.id === a);
+  const t = e.childNamed("spine"), s = t && t.attr.toc;
+  if (s) {
+    const o = (i = e.childNamed("manifest")) == null ? void 0 : i.childrenNamed("item").find((l) => l.attr.id === s);
     if (o) {
-      const p = `${n}${n === "" ? "" : "/"}${o.attr.href}`, u = Object.values(r.files).find(
-        (c) => c.uri.endsWith(p)
+      const l = `${n}${n === "" ? "" : "/"}${o.attr.href}`, m = Object.values(r.files).find(
+        (c) => c.uri.endsWith(l)
       );
-      if (u) {
-        const c = new $.XmlDocument(await u.string());
-        return ke(c, { opfBasePath: n, baseUrl: s });
+      if (m) {
+        const c = new x.XmlDocument(await m.string());
+        return We(c, { opfBasePath: n, baseUrl: a });
       }
     }
   }
-}, Ae = async (e, n, { baseUrl: s }) => {
-  const { basePath: r } = W(n) || {}, t = await We({
+}, Le = async (e, n, { baseUrl: a }) => {
+  const { basePath: r } = k(n) || {}, t = await ke({
     opfData: e,
     opfBasePath: r,
     archive: n,
-    baseUrl: s
+    baseUrl: a
   });
-  return t || await Se(e, n, { opfBasePath: r, baseUrl: s });
-}, Le = async (e) => {
+  return t || await Ne(e, n, { opfBasePath: r, baseUrl: a });
+}, Ae = async (e) => {
   const n = {
     renditionLayout: void 0
   };
   return await Promise.all(
-    e.files.map(async (s) => {
+    e.files.map(async (a) => {
       var r, t;
-      if (s.uri.endsWith("com.kobobooks.display-options.xml")) {
-        const i = (r = new $.XmlDocument(await s.string()).childNamed("platform")) == null ? void 0 : r.childNamed("option");
+      if (a.uri.endsWith("com.kobobooks.display-options.xml")) {
+        const i = (r = new x.XmlDocument(await a.string()).childNamed("platform")) == null ? void 0 : r.childNamed("option");
         ((t = i == null ? void 0 : i.attr) == null ? void 0 : t.name) === "fixed-layout" && i.val === "true" && (n.renditionLayout = "pre-paginated");
       }
     })
@@ -194,84 +194,84 @@ const y = {
 }, E = async ({
   archive: e
 }) => {
-  const { data: n, basePath: s } = W(e) || {}, r = await (n == null ? void 0 : n.string());
+  const { data: n, basePath: a } = k(e) || {}, r = await (n == null ? void 0 : n.string());
   if (!r) return [];
-  const t = new $.XmlDocument(r), a = t.childNamed("manifest"), i = t.childNamed("spine"), o = i == null ? void 0 : i.childrenNamed("itemref").map((c) => c.attr.idref), p = (a == null ? void 0 : a.childrenNamed("item").filter((c) => o.includes(c.attr.id || ""))) || [];
-  return e.files.filter((c) => p.find((d) => s ? `${s}/${d.attr.href}` === c.uri : `${d.attr.href}` === c.uri));
+  const t = new x.XmlDocument(r), s = t.childNamed("manifest"), i = t.childNamed("spine"), o = i == null ? void 0 : i.childrenNamed("itemref").map((c) => c.attr.idref), l = (s == null ? void 0 : s.childrenNamed("item").filter((c) => o.includes(c.attr.id || ""))) || [];
+  return e.files.filter((c) => l.find((d) => a ? `${a}/${d.attr.href}` === c.uri : `${d.attr.href}` === c.uri));
 }, ee = (e) => {
-  var s;
+  var a;
   const n = e.childNamed("manifest");
-  return ((s = n == null ? void 0 : n.childrenNamed("item")) == null ? void 0 : s.map((r) => ({
+  return ((a = n == null ? void 0 : n.childrenNamed("item")) == null ? void 0 : a.map((r) => ({
     href: r.attr.href || "",
     id: r.attr.id || "",
     mediaType: r.attr["media-type"]
   }))) || [];
-}, Ie = ({ archive: e, baseUrl: n }) => async (s) => {
+}, Pe = ({ archive: e, baseUrl: n }) => async (a) => {
   var O;
-  const { data: r, basePath: t } = W(e) || {}, a = await Le(e);
+  const { data: r, basePath: t } = k(e) || {}, s = await Ae(e);
   if (!r)
-    return s;
+    return a;
   const i = await r.string();
-  y.log(i, a);
-  const o = new $.XmlDocument(i), p = await Ae(o, e, { baseUrl: n }) || [], u = o.childNamed("metadata"), c = o.childNamed("manifest"), d = o.childNamed("spine"), m = o.childNamed("guide"), b = u == null ? void 0 : u.childNamed("dc:title"), F = (u == null ? void 0 : u.childrenNamed("meta")) || [], g = F.find(
-    (f) => f.attr.property === "rendition:layout"
-  ), h = F.find(
-    (f) => f.attr.property === "rendition:flow"
-  ), A = F.find(
-    (f) => f.attr.property === "rendition:spread"
-  ), D = g == null ? void 0 : g.val, te = h == null ? void 0 : h.val, ne = A == null ? void 0 : A.val, re = (b == null ? void 0 : b.val) || ((O = e.files.find(({ dir: f }) => f)) == null ? void 0 : O.basename) || "", ae = d == null ? void 0 : d.attr["page-progression-direction"], se = (await E({ archive: e })).reduce(
-    (f, l) => l.size + f,
+  w.log(i, s);
+  const o = new x.XmlDocument(i), l = await Le(o, e, { baseUrl: n }) || [], m = o.childNamed("metadata"), c = o.childNamed("manifest"), d = o.childNamed("spine"), p = o.childNamed("guide"), b = m == null ? void 0 : m.childNamed("dc:title"), y = (m == null ? void 0 : m.childrenNamed("meta")) || [], g = y.find(
+    (h) => h.attr.property === "rendition:layout"
+  ), u = y.find(
+    (h) => h.attr.property === "rendition:flow"
+  ), L = y.find(
+    (h) => h.attr.property === "rendition:spread"
+  ), D = g == null ? void 0 : g.val, te = u == null ? void 0 : u.val, ne = L == null ? void 0 : L.val, re = (b == null ? void 0 : b.val) || ((O = e.files.find(({ dir: h }) => h)) == null ? void 0 : O.basename) || "", se = d == null ? void 0 : d.attr["page-progression-direction"], ae = (await E({ archive: e })).reduce(
+    (h, f) => f.size + h,
     0
   );
   return {
     filename: e.filename,
     nav: {
-      toc: p
+      toc: l
     },
-    renditionLayout: D || a.renditionLayout || "reflowable",
+    renditionLayout: D || s.renditionLayout || "reflowable",
     renditionFlow: te || "auto",
     renditionSpread: ne,
     title: re,
-    readingDirection: ae || "ltr",
-    spineItems: (d == null ? void 0 : d.childrenNamed("itemref").map((f) => {
-      var M, V, U;
-      const l = c == null ? void 0 : c.childrenNamed("item").find((w) => w.attr.id === (f == null ? void 0 : f.attr.idref)), ie = (l == null ? void 0 : l.attr.href) || "", L = ((M = f == null ? void 0 : f.attr.properties) == null ? void 0 : M.split(" ")) || [], oe = ((V = e.files.find((w) => w.uri.endsWith(ie))) == null ? void 0 : V.size) || 0, z = n ?? "";
+    readingDirection: se || "ltr",
+    spineItems: (d == null ? void 0 : d.childrenNamed("itemref").map((h) => {
+      var M, V, B;
+      const f = c == null ? void 0 : c.childrenNamed("item").find((v) => v.attr.id === (h == null ? void 0 : h.attr.idref)), ie = (f == null ? void 0 : f.attr.href) || "", A = ((M = h == null ? void 0 : h.attr.properties) == null ? void 0 : M.split(" ")) || [], oe = ((V = e.files.find((v) => v.uri.endsWith(ie))) == null ? void 0 : V.size) || 0, z = n ?? "";
       return {
-        id: (l == null ? void 0 : l.attr.id) || "",
-        href: (U = l == null ? void 0 : l.attr.href) != null && U.startsWith("https://") ? l == null ? void 0 : l.attr.href : t ? `${z}${t}/${l == null ? void 0 : l.attr.href}` : `${z}${l == null ? void 0 : l.attr.href}`,
+        id: (f == null ? void 0 : f.attr.id) || "",
+        href: (B = f == null ? void 0 : f.attr.href) != null && B.startsWith("https://") ? f == null ? void 0 : f.attr.href : t ? `${z}${t}/${f == null ? void 0 : f.attr.href}` : `${z}${f == null ? void 0 : f.attr.href}`,
         renditionLayout: D || "reflowable",
-        ...L.find(
-          (w) => w === "rendition:layout-reflowable"
+        ...A.find(
+          (v) => v === "rendition:layout-reflowable"
         ) && {
           renditionLayout: "reflowable"
         },
-        progressionWeight: oe / se,
-        pageSpreadLeft: L.some((w) => w === "page-spread-left") || void 0,
-        pageSpreadRight: L.some((w) => w === "page-spread-right") || void 0,
+        progressionWeight: oe / ae,
+        pageSpreadLeft: A.some((v) => v === "page-spread-left") || void 0,
+        pageSpreadRight: A.some((v) => v === "page-spread-right") || void 0,
         // size: itemSize
-        mediaType: l == null ? void 0 : l.attr["media-type"]
+        mediaType: f == null ? void 0 : f.attr["media-type"]
       };
     })) || [],
     items: ee(o),
-    guide: m == null ? void 0 : m.childrenNamed("reference").map((f) => ({
-      href: f.attr.href || "",
-      title: f.attr.title || "",
-      type: f.attr.type
+    guide: p == null ? void 0 : p.childrenNamed("reference").map((h) => ({
+      href: h.attr.href || "",
+      title: h.attr.title || "",
+      type: h.attr.type
     }))
   };
-}, Pe = async (e, n) => {
-  var t, a;
-  const r = await ((t = W(e).data) == null ? void 0 : t.string());
+}, Ce = async (e, n) => {
+  var t, s;
+  const r = await ((t = k(e).data) == null ? void 0 : t.string());
   if (r) {
-    const i = new $.XmlDocument(r);
+    const i = new x.XmlDocument(r);
     return {
-      mediaType: (a = ee(i).find((p) => n.endsWith(p.href))) == null ? void 0 : a.mediaType
+      mediaType: (s = ee(i).find((l) => n.endsWith(l.href))) == null ? void 0 : s.mediaType
     };
   }
   return {
-    mediaType: Ce(n)
+    mediaType: Re(n)
   };
-}, Ce = (e) => {
+}, Re = (e) => {
   if (e.endsWith(".css"))
     return "text/css; charset=UTF-8";
   if (e.endsWith(".jpg"))
@@ -282,16 +282,16 @@ const y = {
     return "video/mp4";
   if (e.endsWith(".svg"))
     return "image/svg+xml";
-}, Re = ({ archive: e, resourcePath: n }) => async (s) => {
+}, Ie = ({ archive: e, resourcePath: n }) => async (a) => {
   const r = Object.values(e.files).find(
-    (a) => a.uri === n
+    (s) => s.uri === n
   );
-  if (!r) return s;
-  const t = await Pe(e, n);
+  if (!r) return a;
+  const t = await Ce(e, n);
   return {
-    ...s,
+    ...a,
     params: {
-      ...s.params,
+      ...a.params,
       ...(r == null ? void 0 : r.encodingFormat) && {
         contentType: r.encodingFormat
       },
@@ -351,95 +351,95 @@ const y = {
   "canvas",
   "script",
   "style"
-], je = ({ archive: e, resourcePath: n }) => async (s) => {
+], je = ({ archive: e, resourcePath: n }) => async (a) => {
   const r = Object.values(e.files).find(
     (t) => t.uri === n
   );
   if (r != null && r.basename.endsWith(".xhtml")) {
-    const t = s.body ?? await r.string();
+    const t = a.body ?? await r.string();
     if (!new RegExp(
       `<(${K.join("|")})[\\s/>]`,
       "i"
     ).test(t))
-      return s;
+      return a;
     const i = new RegExp(
       `<(${K.join("|")})(\\s[^>]*)?\\s*/>`,
       "gi"
     ), o = t.replace(
       i,
-      (p, u, c = "") => `<${u} ${c.trim()}></${u}>`
+      (l, m, c = "") => `<${m} ${c.trim()}></${m}>`
     );
     return {
-      ...s,
+      ...a,
       body: o
     };
   }
-  return s;
+  return a;
 }, De = async (e, n) => {
-  const s = Object.values(e.files).find(
-    (a) => a.uri === n
+  const a = Object.values(e.files).find(
+    (s) => s.uri === n
   );
-  if (!s)
+  if (!a)
     throw new Error("no file found");
   const r = {
     params: {}
   }, t = [
-    Re({ archive: e, resourcePath: n }),
+    Ie({ archive: e, resourcePath: n }),
     je({ archive: e, resourcePath: n }),
-    Te({ archive: e, resourcePath: n }),
+    Se({ archive: e, resourcePath: n }),
     Fe({ archive: e, resourcePath: n })
   ];
   try {
-    const a = await t.reduce(async (i, o) => await o(await i), Promise.resolve(r));
-    return y.log("Generated resource", n, a), {
-      ...a,
-      body: a.body ?? await s.blob()
+    const s = await t.reduce(async (i, o) => await o(await i), Promise.resolve(r));
+    return w.log("Generated resource", n, s), {
+      ...s,
+      body: s.body ?? await a.blob()
     };
-  } catch (a) {
-    throw y.error(a), a;
+  } catch (s) {
+    throw w.error(s), s;
   }
 }, Oe = ({ archive: e, baseUrl: n }) => async () => {
   var r;
-  const s = Object.values(e.files).filter((t) => !t.dir);
+  const a = Object.values(e.files).filter((t) => !t.dir);
   return {
     filename: e.filename,
     title: ((r = e.files.find(({ dir: t }) => t)) == null ? void 0 : r.basename.replace(/\/$/, "")) || "",
     renditionLayout: "pre-paginated",
     renditionSpread: "auto",
     readingDirection: "ltr",
-    spineItems: s.filter((t) => !t.basename.endsWith(".db")).map((t, a) => ({
+    spineItems: a.filter((t) => !t.basename.endsWith(".db")).map((t, s) => ({
       // some books such as cbz can have same basename inside different sub folder
       // we need to make sure to have unique index
       // /chap01/01.png, /chap02/01.png, etc
-      id: `${a}.${t.basename}`,
+      id: `${s}.${t.basename}`,
       href: encodeURI(`${n}${t.uri}`),
       renditionLayout: "pre-paginated",
-      progressionWeight: 1 / s.length,
+      progressionWeight: 1 / a.length,
       pageSpreadLeft: void 0,
       pageSpreadRight: void 0,
       mediaType: t.encodingFormat
     })),
-    items: s.map((t, a) => ({
-      id: `${a}.${t.basename}`,
+    items: a.map((t, s) => ({
+      id: `${s}.${t.basename}`,
       href: `${n}${t.uri}`
     }))
   };
 }, ze = ({ archive: e }) => async (n) => {
-  var a;
-  const s = e.files.find(
+  var s;
+  const a = e.files.find(
     (i) => i.basename.toLowerCase() === "comicinfo.xml"
   );
-  if (!s)
+  if (!a)
     return n;
   const r = {
     ...n,
-    spineItems: n.spineItems.filter((i) => !i.id.toLowerCase().endsWith("comicinfo.xml")).map((i, o, p) => ({
+    spineItems: n.spineItems.filter((i) => !i.id.toLowerCase().endsWith("comicinfo.xml")).map((i, o, l) => ({
       ...i,
-      progressionWeight: 1 / p.length
+      progressionWeight: 1 / l.length
     }))
-  }, t = await s.string();
+  }, t = await a.string();
   try {
-    const o = ((a = new $.XmlDocument(t).childNamed("Manga")) == null ? void 0 : a.val) || "unknown";
+    const o = ((s = new x.XmlDocument(t).childNamed("Manga")) == null ? void 0 : s.val) || "unknown";
     return {
       ...r,
       readingDirection: o === "YesAndRightToLeft" ? "rtl" : "ltr"
@@ -449,25 +449,25 @@ const y = {
 `, t), console.error(i), r;
   }
 }, Me = (e) => {
-  var s;
-  const n = (s = e.descendantWithPath("head")) == null ? void 0 : s.childrenNamed("meta").find((r) => r.attr.name === "viewport");
+  var a;
+  const n = (a = e.descendantWithPath("head")) == null ? void 0 : a.childrenNamed("meta").find((r) => r.attr.name === "viewport");
   return !!(n && n.attr.name === "viewport");
-}, Ve = (e) => e.reduce(async (n, s) => {
+}, Ve = (e) => e.reduce(async (n, a) => {
   if (!await n || !de({
-    mimeType: s.encodingFormat,
-    uri: s.uri
+    mimeType: a.encodingFormat,
+    uri: a.uri
   }))
     return !1;
-  const t = await s.string();
-  return t ? Me(new $.XmlDocument(t)) : !1;
-}, Promise.resolve(!0)), Ue = ({ archive: e }) => async (n) => {
+  const t = await a.string();
+  return t ? Me(new x.XmlDocument(t)) : !1;
+}, Promise.resolve(!0)), Be = ({ archive: e }) => async (n) => {
   if (n.renditionLayout === "reflowable" && n.spineItems.every((r) => r.renditionLayout === "reflowable")) {
     const r = await E({ archive: e });
     if (await Ve(r))
       return {
         ...n,
-        spineItems: n.spineItems.map((a) => ({
-          ...a,
+        spineItems: n.spineItems.map((s) => ({
+          ...s,
           renditionLayout: "pre-paginated"
         })),
         renditionLayout: "pre-paginated"
@@ -476,39 +476,81 @@ const y = {
   return n;
 }, j = (e, n) => {
   var t;
-  const s = e.split(/(\d+)/), r = n.split(/(\d+)/);
-  for (let a = 0, i = s.length; a < i; a++)
-    if (s[a] !== r[a])
-      return (t = s[a]) != null && t.match(/\d/) ? +(s[a] || "") - +(r[a] || "") : (s[a] || "").localeCompare(r[a] || "");
+  const a = e.split(/(\d+)/), r = n.split(/(\d+)/);
+  for (let s = 0, i = a.length; s < i; s++)
+    if (a[s] !== r[s])
+      return (t = a[s]) != null && t.match(/\d/) ? +(a[s] || "") - +(r[s] || "") : (a[s] || "").localeCompare(r[s] || "");
   return 1;
-}, Be = ({ archive: e, baseUrl: n }) => async (s) => {
-  if (s.nav) return s;
+}, Xe = ({ archive: e, baseUrl: n }) => async (a) => {
+  if (a.nav) return a;
   const r = [...e.files].sort(
-    (a, i) => j(a.uri, i.uri)
-  ), t = Object.values(
-    r
-  ).reduce(
-    (a, i) => {
-      const o = i.uri.split("/");
-      return !i.dir && o.length > 1 && o.forEach((u, c) => {
-        if (c === o.length - 1) return;
-        a.find(({ title: b }) => b === u) || a.push({
-          contents: [],
-          href: N(n, encodeURI(i.uri)).replace(/\/$/, ""),
-          path: i.uri.replace(/\/$/, ""),
-          title: o[0] ?? ""
-        });
-      }), a;
+    (o, l) => j(o.uri, l.uri)
+  ), t = Object.values(r), s = (o, l, m, c, d) => {
+    const p = o.find((g) => g.title === l), [b, ...y] = m;
+    return p ? b ? [
+      ...o.filter((u) => u != p),
+      {
+        ...p,
+        contents: [
+          ...p.contents,
+          ...s(
+            p.contents,
+            b,
+            y,
+            c,
+            d
+          )
+        ]
+      }
+    ] : p.path.split("/").length > d.split("/").length ? [
+      ...o.filter((u) => u != p),
+      {
+        ...p,
+        path: d,
+        href: c
+      }
+    ] : o : b ? [
+      ...o,
+      {
+        contents: s(
+          [],
+          b,
+          y,
+          c,
+          d
+        ),
+        href: c,
+        path: d,
+        title: l
+      }
+    ] : [
+      ...o,
+      {
+        contents: [],
+        href: c,
+        path: d,
+        title: l
+      }
+    ];
+  }, i = t.reduce(
+    (o, l) => {
+      if (l.dir) return o;
+      const c = l.uri.split("/").slice(0, -1), [d, ...p] = c;
+      if (d) {
+        const b = T(n, encodeURI(l.uri)).replace(/\/$/, ""), y = l.uri.replace(/\/$/, "");
+        return s(o, d, p, b, y);
+      }
+      return o;
     },
     []
   );
-  return t.length === 0 ? s : {
-    ...s,
+  return i.length === 0 ? a : {
+    ...a,
     nav: {
-      toc: t
+      toc: i
     }
   };
-}, Xe = {
+}, Ue = {
   filename: "",
   items: [],
   nav: {
@@ -520,21 +562,21 @@ const y = {
   spineItems: [],
   title: ""
 }, He = async (e, { baseUrl: n = "" } = {}) => {
-  const s = [
+  const a = [
     Oe({ archive: e, baseUrl: n }),
-    Ie({ archive: e, baseUrl: n }),
-    Ue({ archive: e, baseUrl: n }),
+    Pe({ archive: e, baseUrl: n }),
+    Be({ archive: e, baseUrl: n }),
     ze({ archive: e, baseUrl: n }),
-    Be({ archive: e, baseUrl: n })
+    Xe({ archive: e, baseUrl: n })
   ];
   try {
-    const r = await s.reduce(async (t, a) => await a(await t), Promise.resolve(Xe));
-    return y.log("Generated manifest", r), r;
+    const r = await a.reduce(async (t, s) => await s(await t), Promise.resolve(Ue));
+    return w.log("Generated manifest", r), r;
   } catch (r) {
-    throw y.error(r), r;
+    throw w.error(r), r;
   }
-}, x = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Y = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ze = async (e, n) => {
-  const s = `
+}, F = (e) => e.substring(e.lastIndexOf("/") + 1) || e, Y = (e) => e.endsWith("/") ? e.slice(0, -1) : e, Ze = async (e, n) => {
+  const a = `
     <?xml version="1.0" encoding="UTF-8"?><package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="bookid">
       <metadata>
         <meta property="rendition:layout">${n != null && n.useRenditionFlow ? "reflowable" : "pre-paginated"}</meta>
@@ -542,20 +584,20 @@ const y = {
       </metadata>
       <manifest>
         ${e.map(
-    (a) => `<item id="${x(a)}" href="${a}" media-type="${B(a)}"/>`
+    (s) => `<item id="${F(s)}" href="${s}" media-type="${X(s)}"/>`
   ).join(`
 `)}
       </manifest>
       <spine>
-        ${e.map((a) => `<itemref idref="${x(a)}" />`).join(`
+        ${e.map((s) => `<itemref idref="${F(s)}" />`).join(`
 `)}
       </spine>
     </package>
-  `, r = e.map((a) => ({
+  `, r = e.map((s) => ({
     dir: !1,
-    basename: x(a),
-    encodingFormat: B(a),
-    uri: a,
+    basename: F(s),
+    encodingFormat: X(s),
+    uri: s,
     size: 100 / e.length,
     base64: async () => "",
     blob: async () => new Blob(),
@@ -568,21 +610,21 @@ const y = {
       basename: "content.opf",
       uri: "content.opf",
       size: 0,
-      base64: async () => s,
+      base64: async () => a,
       blob: async () => new Blob(),
-      string: async () => s
+      string: async () => a
     }, ...r],
     close: () => Promise.resolve()
   };
 }, _e = async (e) => new Promise((n) => {
-  const s = new FileReader();
-  s.readAsDataURL(e), s.onloadend = function() {
-    const r = s.result;
+  const a = new FileReader();
+  a.readAsDataURL(e), a.onloadend = function() {
+    const r = a.result;
     n(r);
   };
 }), Ee = async (e, {
   mimeType: n,
-  direction: s
+  direction: a
 } = { mimeType: "text/plain" }) => {
   const r = `
       <?xml version="1.0" encoding="UTF-8"?>
@@ -595,7 +637,7 @@ const y = {
         <manifest>
             <item id="p01" href="p01.txt" media-type="text/plain"/>
         </manifest>
-        <spine page-progression-direction="${s ?? "ltr"}">
+        <spine page-progression-direction="${a ?? "ltr"}">
           <itemref idref="p01" />
         </spine>
       </package>
@@ -605,7 +647,7 @@ const y = {
     files: [
       {
         dir: !1,
-        basename: x("generated.opf"),
+        basename: F("generated.opf"),
         uri: "generated.opf",
         blob: async () => new Blob([r]),
         string: async () => r,
@@ -614,7 +656,7 @@ const y = {
       },
       {
         dir: !1,
-        basename: x("p01.txt"),
+        basename: F("p01.txt"),
         uri: "p01.txt",
         blob: async () => typeof e == "string" ? new Blob([e]) : e,
         string: async () => typeof e == "string" ? e : e.text(),
@@ -625,34 +667,34 @@ const y = {
     ],
     close: () => Promise.resolve()
   };
-}, et = async (e, { orderByAlpha: n, name: s } = {}) => {
+}, et = async (e, { orderByAlpha: n, name: a } = {}) => {
   let r = Object.values(e.files);
-  n && (r = r.slice().sort((a, i) => j(a.name, i.name)));
+  n && (r = r.slice().sort((s, i) => j(s.name, i.name)));
   const t = {
-    filename: s || "",
-    files: r.map((a) => ({
-      dir: a.dir,
-      basename: x(a.name),
-      uri: a.name,
-      blob: () => a.async("blob"),
-      string: () => a.async("string"),
-      base64: () => a.async("base64"),
-      ...a.internalStream && {
-        stream: a.internalStream
+    filename: a || "",
+    files: r.map((s) => ({
+      dir: s.dir,
+      basename: F(s.name),
+      uri: s.name,
+      blob: () => s.async("blob"),
+      string: () => s.async("string"),
+      base64: () => s.async("base64"),
+      ...s.internalStream && {
+        stream: s.internalStream
       },
       // this is private API
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      size: a._data.uncompressedSize
+      size: s._data.uncompressedSize
     })),
     close: () => Promise.resolve()
   };
-  return y.log("Generated archive", t), t;
+  return w.log("Generated archive", t), t;
 }, tt = async (e, { name: n } = {}) => {
-  const s = await e.getFilesArray(), r = {
+  const a = await e.getFilesArray(), r = {
     close: () => e.close(),
     filename: n ?? "",
-    files: s.map((t) => ({
+    files: a.map((t) => ({
       dir: !1,
       basename: t.file.name,
       size: t.file.size,
@@ -662,21 +704,21 @@ const y = {
       string: async () => (await t.file.extract()).text()
     }))
   };
-  return y.log("Generated archive", r), r;
-}, nt = async (e, { orderByAlpha: n, name: s } = {}) => {
+  return w.log("Generated archive", r), r;
+}, nt = async (e, { orderByAlpha: n, name: a } = {}) => {
   let r = e;
-  return n && (r = r.slice().sort((t, a) => j(t.name, a.name))), {
-    filename: s || "",
+  return n && (r = r.slice().sort((t, s) => j(t.name, s.name))), {
+    filename: a || "",
     files: r.map((t) => ({
       dir: t.isDir,
-      basename: x(t.name),
+      basename: F(t.name),
       uri: t.name,
       blob: async () => new Blob([await t.data()]),
       string: async () => {
-        const a = await t.data();
+        const s = await t.data();
         return String.fromCharCode.apply(
           null,
-          Array.from(new Uint16Array(a))
+          Array.from(new Uint16Array(s))
         );
       },
       base64: async () => "",
@@ -687,139 +729,139 @@ const y = {
 }, rt = ({
   enableReport: e
 } = {}) => {
-  y.enable(!!e);
+  w.enable(!!e);
 }, qe = ({
   getArchive: e,
   cleanArchiveAfter: n
 }) => {
-  const s = new I(), r = new I(), t = new I(), a = {}, i = s.pipe(
-    P((c) => {
-      const d = a[c];
-      return !d || d.getValue().status !== "idle" ? X : (d.next({
+  const a = new P(), r = new P(), t = new P(), s = {}, i = a.pipe(
+    C((c) => {
+      const d = s[c];
+      return !d || d.getValue().status !== "idle" ? U : (d.next({
         ...d.getValue(),
         status: "loading"
-      }), S(e(c)).pipe(
-        v((m) => (d.next({
+      }), N(e(c)).pipe(
+        $((p) => (d.next({
           ...d.getValue(),
-          archive: m,
+          archive: p,
           status: "success"
         }), { key: c, archiveEntry: d })),
-        k((m) => (d.next({
+        W((p) => (d.next({
           ...d.getValue(),
           status: "error",
-          error: m
-        }), X))
+          error: p
+        }), U))
       ));
     }),
     H()
   ), o = i.pipe(
-    C(({ archiveEntry: c, key: d }) => {
-      const m = c.pipe(v(({ locks: g }) => g)), b = t.pipe(
-        v(() => !0),
+    R(({ archiveEntry: c, key: d }) => {
+      const p = c.pipe($(({ locks: g }) => g)), b = t.pipe(
+        $(() => !0),
         le(!1),
         H()
       );
-      return m.pipe(
-        v((g) => g <= 0),
+      return p.pipe(
+        $((g) => g <= 0),
         pe()
       ).pipe(
-        me(b),
-        C(
-          ([g, h]) => g ? h ? R(null) : ue(n) : fe
+        fe(b),
+        R(
+          ([g, u]) => g ? u ? I(null) : ue(n) : me
         ),
         _(() => {
           var g;
-          delete a[d], (g = c.getValue().archive) == null || g.close();
+          delete s[d], (g = c.getValue().archive) == null || g.close();
         })
       );
     })
-  ), p = (c) => {
+  ), l = (c) => {
     let d = !1;
-    const m = a[c] ?? new ge({
+    const p = s[c] ?? new ge({
       archive: void 0,
       status: "idle",
       locks: 0,
       error: void 0
     });
-    a[c] = m, m.next({
-      ...m.getValue(),
-      locks: m.getValue().locks + 1
+    s[c] = p, p.next({
+      ...p.getValue(),
+      locks: p.getValue().locks + 1
     });
     const b = () => {
-      d || (d = !0, m.next({
-        ...m.getValue(),
-        locks: m.getValue().locks - 1
+      d || (d = !0, p.next({
+        ...p.getValue(),
+        locks: p.getValue().locks - 1
       }));
     };
-    s.next(c);
-    const F = m.pipe(
-      v(({ archive: h }) => h),
-      be((h) => !!h)
-    ), g = m.pipe(
-      _(({ error: h }) => {
-        if (h)
-          throw h;
+    a.next(c);
+    const y = p.pipe(
+      $(({ archive: u }) => u),
+      be((u) => !!u)
+    ), g = p.pipe(
+      _(({ error: u }) => {
+        if (u)
+          throw u;
       }),
       ye()
     );
-    return q(F, g).pipe(
+    return q(y, g).pipe(
       we(),
-      v((h) => ({ archive: h, release: b })),
-      k((h) => {
-        throw b(), h;
+      $((u) => ({ archive: u, release: b })),
+      W((u) => {
+        throw b(), u;
       })
     );
-  }, u = () => {
-    Object.keys(a).forEach((c) => {
-      delete a[c];
+  }, m = () => {
+    Object.keys(s).forEach((c) => {
+      delete s[c];
     }), t.next();
   };
   return q(o, i).pipe(he(r)).subscribe(), {
-    access: p,
-    purge: u
+    access: l,
+    purge: m
   };
 };
 class Ge {
   constructor({
     onError: n,
-    onManifestSuccess: s,
+    onManifestSuccess: a,
     ...r
   }) {
-    this.onError = (t) => new Response(String(t), { status: 500 }), this.epubLoader = qe(r), this.onManifestSuccess = s ?? (({ manifest: t }) => Promise.resolve(t)), this.onError = n ?? this.onError;
+    this.onError = (t) => new Response(String(t), { status: 500 }), this.epubLoader = qe(r), this.onManifestSuccess = a ?? (({ manifest: t }) => Promise.resolve(t)), this.onError = n ?? this.onError;
   }
   accessArchive(n) {
     return this.lastAccessedKey !== n && this.epubLoader.purge(), this.lastAccessedKey = n, this.epubLoader.access(n);
   }
-  fetchManifest({ key: n, baseUrl: s }) {
+  fetchManifest({ key: n, baseUrl: a }) {
     const r = this.accessArchive(n).pipe(
-      P(({ archive: t, release: a }) => S(
-        He(t, { baseUrl: s })
+      C(({ archive: t, release: s }) => N(
+        He(t, { baseUrl: a })
       ).pipe(
-        C(
-          (o) => S(this.onManifestSuccess({ manifest: o, archive: t }))
+        R(
+          (o) => N(this.onManifestSuccess({ manifest: o, archive: t }))
         ),
-        v(
+        $(
           (o) => new Response(JSON.stringify(o), {
             status: 200
           })
         ),
         G(() => {
-          a();
+          s();
         })
       )),
-      k((t) => R(this.onError(t)))
+      W((t) => I(this.onError(t)))
     );
     return J(r);
   }
   fetchResource({
     key: n,
-    resourcePath: s
+    resourcePath: a
   }) {
     const r = this.accessArchive(n).pipe(
-      P(({ archive: t, release: a }) => S(
-        De(t, s)
+      C(({ archive: t, release: s }) => N(
+        De(t, a)
       ).pipe(
-        v(
+        $(
           (o) => new Response(o.body, {
             status: 200,
             headers: {
@@ -830,40 +872,40 @@ class Ge {
           })
         ),
         G(() => {
-          a();
+          s();
         })
       )),
-      k((t) => R(this.onError(t)))
+      W((t) => I(this.onError(t)))
     );
     return J(r);
   }
 }
-class at extends Ge {
+class st extends Ge {
   constructor({
     getUriInfo: n,
-    ...s
+    ...a
   }) {
-    super(s), this.getUriInfo = n, this.fetchEventListener = this.fetchEventListener.bind(this);
+    super(a), this.getUriInfo = n, this.fetchEventListener = this.fetchEventListener.bind(this);
   }
   fetchEventListener(n) {
     try {
-      const s = this.getUriInfo(n);
-      if (!s) return;
-      const r = Y(s.baseUrl), t = n.request.url.substring(
+      const a = this.getUriInfo(n);
+      if (!a) return;
+      const r = Y(a.baseUrl), t = n.request.url.substring(
         r.length + 1
-      ), [a = ""] = t.split("/"), i = decodeURIComponent(
-        Y(t.substring(a.length + 1))
+      ), [s = ""] = t.split("/"), i = decodeURIComponent(
+        Y(t.substring(s.length + 1))
       );
       t.endsWith("/manifest") ? n.respondWith(
-        this.fetchManifest({ key: a, baseUrl: `${r}/${a}/` })
-      ) : n.respondWith(this.fetchResource({ key: a, resourcePath: i }));
-    } catch (s) {
-      n.respondWith(new Response(String(s), { status: 500 }));
+        this.fetchManifest({ key: s, baseUrl: `${r}/${s}/` })
+      ) : n.respondWith(this.fetchResource({ key: s, resourcePath: i }));
+    } catch (a) {
+      n.respondWith(new Response(String(a), { status: 500 }));
     }
   }
 }
 export {
-  at as ServiceWorkerStreamer,
+  st as ServiceWorkerStreamer,
   Ge as Streamer,
   rt as configure,
   nt as createArchiveFromArrayBufferList,
@@ -873,6 +915,6 @@ export {
   Ze as createArchiveFromUrls,
   He as generateManifestFromArchive,
   De as generateResourceFromArchive,
-  W as getArchiveOpfInfo
+  k as getArchiveOpfInfo
 };
 //# sourceMappingURL=index.js.map