@prose-reader/cfi 1.212.0 → 1.213.0

package/dist/generate.d.ts

@@ -10,6 +10,8 @@ export interface CfiPosition {
     offset?: number;
     temporal?: number;
     spatial?: [number, number];
+    spineIndex?: number;
+    spineId?: string;
 }
 export declare function generate(position: Node | CfiPosition | {
     start: CfiPosition;

package/dist/index.js

@@ -1,13 +1,13 @@
-function Z(e) {
+function Q(e) {
   const t = [e];
   let n = e;
   for (; n.parentNode; )
     t.push(n.parentNode), n = n.parentNode;
   return t;
 }
-function ee(e, t) {
+function Z(e, t) {
   if (e === t) return e;
-  const n = Z(e), i = new Set(n);
+  const n = Q(e), i = new Set(n);
   let r = t;
   for (; r; ) {
     if (i.has(r))
@@ -16,23 +16,23 @@ function ee(e, t) {
   }
   return null;
 }
-const ne = /[\[\]\^,();]/g;
+const ee = /[\[\]\^,();]/g;
 function g(e) {
-  return e.replace(ne, "^$&");
+  return e.replace(ee, "^$&");
 }
-const te = /^epubcfi\((.*)\)$/, b = (e) => e.nodeType === Node.ELEMENT_NODE, I = (e) => typeof e == "object" && e !== null && "nodeType" in e && (e.nodeType === Node.ELEMENT_NODE || e.nodeType === Node.TEXT_NODE), re = (e) => e.nodeType === Node.TEXT_NODE;
-function ie(e) {
-  const t = e.match(te);
+const ne = /^epubcfi\((.*)\)$/, w = (e) => e.nodeType === Node.ELEMENT_NODE, b = (e) => typeof e == "object" && e !== null && "nodeType" in e && (e.nodeType === Node.ELEMENT_NODE || e.nodeType === Node.TEXT_NODE), te = (e) => e.nodeType === Node.TEXT_NODE;
+function re(e) {
+  const t = e.match(ne);
   return t && t[1] || e;
 }
-function se(e) {
+function ie(e) {
   const t = [];
   let n = null, i = !1, r = "";
   const o = (c) => {
     t.push(c), n = null, r = "";
   }, l = (c) => {
     r += c, i = !1;
-  }, f = ie(e).trim(), d = Array.from(f).concat("");
+  }, f = re(e).trim(), d = Array.from(f).concat("");
   for (let c = 0; c < d.length; c++) {
     const s = d[c];
     if (!s) {
@@ -113,7 +113,7 @@ function U(e, t) {
     n.push(e.slice(i, r)), i = r;
   return n.push(e.slice(i)), n;
 }
-function oe(e) {
+function se(e) {
   var r;
   const t = [], n = {};
   let i = -1;
@@ -147,32 +147,32 @@ function oe(e) {
         if (d === 0 && u && !l.id)
           l.id = a;
         else if (a !== "") {
-          const h = a.split(",").map((x) => x.trim());
-          l.text = h;
+          const x = a.split(",").map((h) => h.trim());
+          l.text = x;
         }
       }
     }
   }
   return t;
 }
-function T(e) {
+function I(e) {
   const t = H(e, "!");
-  return U(e, t).map(oe);
+  return U(e, t).map(se);
 }
 function p(e) {
   if (!e)
     throw new Error("CFI string cannot be empty");
-  const t = se(e);
+  const t = ie(e);
   if (!t || t.length === 0)
     throw new Error("Failed to tokenize CFI string");
   const n = H(t, ",");
   if (n.length === 0)
-    return T(t);
+    return I(t);
   const [i, r, o] = U(t, n);
   return {
-    parent: T(i || []),
-    start: T(r || []),
-    end: T(o || [])
+    parent: I(i || []),
+    start: I(r || []),
+    end: I(o || [])
   };
 }
 function M(e) {
@@ -196,23 +196,23 @@ function D(e, t, n = { asRange: !1 }) {
     if (i)
       return V(e, t);
     const r = e.start[0] || [];
-    return E(r, t, n);
+    return m(r, t, n);
   }
   if (e[0])
-    return E(e[0], t, n);
+    return m(e[0], t, n);
   throw new Error("Invalid CFI structure");
 }
 function V(e, t) {
   const n = e.parent[0] || [], i = e.start[0] || [], r = e.end[0] || [];
   let o = t.documentElement;
   if (n.length > 0) {
-    const a = E(n, t);
-    I(a.node) && (o = a.node);
+    const a = m(n, t);
+    b(a.node) && (o = a.node);
   }
   if (!o)
     throw new Error("Failed to resolve parent node in CFI range");
-  const l = E(i, t), f = E(r, t);
-  if (!I(l.node) || !I(f.node))
+  const l = m(i, t), f = m(r, t);
+  if (!b(l.node) || !b(f.node))
     throw new Error("Failed to resolve start or end node in CFI range");
   const d = l.node, c = f.node, s = t.createRange();
   return s.setStart(
@@ -227,7 +227,7 @@ function V(e, t) {
     isRange: !0
   };
 }
-function le(e) {
+function oe(e) {
   if (e != null && e.side) return e.side;
   if (e != null && e.text && e.text.length > 0) {
     const t = e.text[0];
@@ -238,7 +238,7 @@ function le(e) {
     }
   }
 }
-function k(e) {
+function S(e) {
   return e.index % 2 !== 0;
 }
 function he(e) {
@@ -246,7 +246,7 @@ function he(e) {
   return i == null ? void 0 : i.extensions;
 }
 function G(e) {
-  const t = le(e), n = e == null ? void 0 : e.extensions;
+  const t = oe(e), n = e == null ? void 0 : e.extensions;
   return {
     offset: e == null ? void 0 : e.offset,
     temporal: e == null ? void 0 : e.temporal,
@@ -255,14 +255,14 @@ function G(e) {
     extensions: n
   };
 }
-function $(e, t) {
+function N(e, t) {
   return {
     node: e,
     isRange: !1,
     ...G(t)
   };
 }
-function v(e, t) {
+function T(e, t) {
   return {
     node: e,
     isRange: !0,
@@ -273,7 +273,7 @@ function W(e, t, n) {
   const i = e.createRange();
   if (i.selectNodeContents(t), n !== void 0) {
     const r = Array.isArray(n) ? n[0] : n;
-    re(t) && i.setStart(t, r || 0);
+    te(t) && i.setStart(t, r || 0);
   }
   return i;
 }
@@ -282,7 +282,7 @@ function X(e, t, n, i) {
   for (let o = n; o < t.length; o++) {
     const l = t[o];
     if (!r || !l) break;
-    if (k(l)) {
+    if (S(l)) {
       const f = l.index - 1;
       if (f >= 0 && f < r.childNodes.length)
         r = r.childNodes[f];
@@ -309,37 +309,37 @@ function X(e, t, n, i) {
   }
   return r;
 }
-function E(e, t, n = {}) {
+function m(e, t, n = {}) {
   const { throwOnError: i = !1, asRange: r = !1 } = n;
   if (!t) {
     if (i)
       throw new Error("Document is not available");
-    return $(null);
+    return N(null);
   }
-  const { node: o, remainingPathIndex: l } = fe(t, e);
+  const { node: o, remainingPathIndex: l } = le(t, e);
   if (o && l >= e.length) {
     const s = e.at(-1);
-    if (s && k(s)) {
+    if (s && S(s)) {
       const a = s.index - 1;
       if (a >= 0 && a < o.childNodes.length) {
         const u = o.childNodes[a];
-        return $(u, s);
+        return N(u, s);
       }
     }
     if (r) {
       const a = W(t, o, s == null ? void 0 : s.offset);
-      return v(a, s);
+      return T(a, s);
     }
-    return $(o, s);
+    return N(o, s);
   }
   let f = o || t.documentElement;
   const d = o ? l : 0;
   if (r && e.length > 0) {
     const s = e[e.length - 1];
-    if (s && !k(s)) {
+    if (s && !S(s)) {
       if (s.index === 0 && f) {
         const u = t.createRange();
-        return u.setStart(f, 0), u.setEnd(f, 0), v(u, s);
+        return u.setStart(f, 0), u.setEnd(f, 0), T(u, s);
       }
       const a = X(
         f,
@@ -349,11 +349,11 @@ function E(e, t, n = {}) {
       );
       if (a) {
         const u = Array.from(a.childNodes).filter(
-          (x) => x.nodeType === Node.ELEMENT_NODE
+          (h) => h.nodeType === Node.ELEMENT_NODE
         );
         if (Math.floor(s.index / 2) - 1 === u.length) {
-          const x = t.createRange();
-          return x.selectNodeContents(a), x.collapse(!1), v(x, s);
+          const h = t.createRange();
+          return h.selectNodeContents(a), h.collapse(!1), T(h, s);
         }
       }
     }
@@ -361,16 +361,16 @@ function E(e, t, n = {}) {
   if (f = X(f, e, d, i), !f) {
     if (i)
       throw new Error("Failed to resolve CFI path");
-    return $(null);
+    return N(null);
   }
   const c = e.at(-1);
   if (r) {
     const s = W(t, f, c == null ? void 0 : c.offset);
-    return v(s, c);
+    return T(s, c);
   }
-  return $(f, c);
+  return N(f, c);
 }
-function fe(e, t) {
+function le(e, t) {
   for (let n = t.length - 1; n >= 0; n--) {
     const i = t[n];
     if (i != null && i.id) {
@@ -390,13 +390,13 @@ function J(e, t, n = {}) {
   }
   return i.substring(0, Math.min(i.length, r));
 }
-function ce(e) {
+function fe(e) {
   const [t, n] = e, i = Math.max(0, Math.min(100, t)), r = Math.max(0, Math.min(100, n));
   return `@${i}:${r}`;
 }
-function S(e, t, n) {
+function j(e, t, n) {
   let i = e;
-  return t !== void 0 && (i += `~${t}`), n !== void 0 && (i += ce(n)), i;
+  return t !== void 0 && (i += `~${t}`), n !== void 0 && (i += fe(n)), i;
 }
 function K(e, t, n) {
   let i = e;
@@ -406,7 +406,7 @@ function K(e, t, n) {
   }
   return i;
 }
-function j(e, t, n = {}, i) {
+function P(e, t, n = {}, i) {
   var d;
   let r = "", o = e, l = null;
   if (e.nodeType === Node.TEXT_NODE) {
@@ -417,38 +417,42 @@ function j(e, t, n = {}, i) {
     const a = Array.from(c.childNodes).indexOf(e);
     if (a === -1)
       throw new Error("Node not found in parent's children");
-    if (r = `/${a + 1}`, b(c) && c.id) {
-      const u = c.id, h = Array.from(((d = c.parentNode) == null ? void 0 : d.childNodes) || []);
-      r = `/${h.slice(0, h.indexOf(c) + 1).filter((y) => y.nodeType === Node.ELEMENT_NODE).length * 2}[${g(u)}]${r}`, o = c.parentNode;
+    if (r = `/${a + 1}`, w(c) && c.id) {
+      const u = c.id, x = Array.from(((d = c.parentNode) == null ? void 0 : d.childNodes) || []);
+      r = `/${x.slice(0, x.indexOf(c) + 1).filter((y) => y.nodeType === Node.ELEMENT_NODE).length * 2}[${g(u)}]${r}`, o = c.parentNode;
     } else
       o = c;
   }
   let f = null;
   for (l && n.includeTextAssertions && (f = J(l, t, n)); o != null && o.parentNode; ) {
-    if (!(l && o === l.parentNode && r.includes(`[${b(o) ? o.id : ""}]`))) {
+    if (!(l && o === l.parentNode && r.includes(`[${w(o) ? o.id : ""}]`))) {
       const c = o.parentNode, s = Array.from(c.childNodes), a = s.indexOf(o);
       if (a === -1)
         throw new Error("Node not found in parent's children");
-      const u = s.slice(0, a + 1).filter((N) => N.nodeType === Node.ELEMENT_NODE);
-      let h;
-      o.nodeType, Node.ELEMENT_NODE, h = u.length;
-      const x = h * 2;
-      b(o) && o.id ? r = `/${x}[${g(o.id)}]${r}` : r = `/${x}${r}`;
+      const u = s.slice(0, a + 1).filter(($) => $.nodeType === Node.ELEMENT_NODE);
+      let x;
+      o.nodeType, Node.ELEMENT_NODE, x = u.length;
+      const h = x * 2;
+      w(o) && o.id ? r = `/${h}[${g(o.id)}]${r}` : r = `/${h}${r}`;
     }
     if (o.parentNode.nodeName.toLowerCase() === "html")
       break;
     o = o.parentNode;
   }
-  return t !== void 0 && (r += `:${t}`), r = S(
+  if (t !== void 0 && (r += `:${t}`), r = j(
     r,
     i == null ? void 0 : i.temporal,
     (i == null ? void 0 : i.spatial) || n.spatialOffset
-  ), r = K(r, f, n.includeSideBias), r = Q(r, n.extensions), r;
+  ), r = K(r, f, n.includeSideBias), n.extensions && Object.keys(n.extensions).length > 0) {
+    const c = O(n.extensions);
+    r.includes("[") ? r = r.replace(/\]$/, `;${c}]`) : r = `${r}[;${c}]`;
+  }
+  return r;
 }
 function z(e, t, n, i = {}, r) {
   if (e === t) {
     let d = n !== void 0 ? `:${n}` : "";
-    return d = S(d, r == null ? void 0 : r.temporal, r == null ? void 0 : r.spatial), d;
+    return d = j(d, r == null ? void 0 : r.temporal, r == null ? void 0 : r.spatial), d;
   }
   const o = [];
   let l = t;
@@ -465,10 +469,10 @@ function z(e, t, n, i = {}, r) {
     if (s === -1)
       throw new Error("Node not found in parent's children");
     const a = s + 1;
-    b(l) && l.id ? o.unshift(`/${a}[${g(l.id)}]`) : o.unshift(`/${a}`), l = d;
+    w(l) && l.id ? o.unshift(`/${a}[${g(l.id)}]`) : o.unshift(`/${a}`), l = d;
   }
   let f = o.join("");
-  if (n !== void 0 && (f += `:${n}`), f = S(f, r == null ? void 0 : r.temporal, r == null ? void 0 : r.spatial), i.includeTextAssertions && t.nodeType === Node.TEXT_NODE) {
+  if (n !== void 0 && (f += `:${n}`), f = j(f, r == null ? void 0 : r.temporal, r == null ? void 0 : r.spatial), i.includeTextAssertions && t.nodeType === Node.TEXT_NODE) {
     const d = J(t, n, i);
     f = K(
       f,
@@ -476,17 +480,17 @@ function z(e, t, n, i = {}, r) {
       i.includeSideBias
     );
   }
-  return f = Q(f, i.extensions), f;
+  return f = ce(f, i.extensions), f;
 }
-const P = (e) => Object.entries(e).map(([t, n]) => `${t}=${encodeURIComponent(g(n))}`).join(";");
-function Q(e, t) {
-  return !t || Object.keys(t).length === 0 ? e : e.endsWith("]") ? `${e.substring(0, e.length - 1)}[;${P(t)}]` : `${e}[;${P(t)}]`;
+const O = (e) => Object.entries(e).map(([t, n]) => `${t}=${encodeURIComponent(g(n))}`).join(";");
+function ce(e, t) {
+  return !t || Object.keys(t).length === 0 ? e : e.endsWith("]") ? `${e.substring(0, e.length - 1)}[;${O(t)}]` : `${e}[;${O(t)}]`;
 }
 function ae(e, t, n, i, r = {}, o, l) {
-  const f = ee(e, n);
+  const f = Z(e, n);
   if (!f)
     throw new Error("No common ancestor found");
-  const d = j(f, void 0, r), c = z(
+  const d = P(f, void 0, r), c = z(
     f,
     e,
     t,
@@ -500,24 +504,22 @@ function ae(e, t, n, i, r = {}, o, l) {
     l
   );
   if (r.extensions && Object.keys(r.extensions).length > 0) {
-    const a = P(r.extensions), u = c.includes("[") ? c.replace(/\]$/, `;${a}]`) : `${c}[;${a}]`, h = s.includes("[") ? s.replace(/\]$/, `;${a}]`) : `${s}[;${a}]`;
-    return `${d},${u},${h}`;
+    const a = O(r.extensions), u = d.includes(`;${a}`) ? d : d.includes("[") ? d.replace(/\]$/, `;${a}]`) : `${d}[;${a}]`, x = c.includes(`;${a}`) ? c : c.includes("[") ? c.replace(/\]$/, `;${a}]`) : `${c}[;${a}]`, h = s.includes(`;${a}`) ? s : s.includes("[") ? s.replace(/\]$/, `;${a}]`) : `${s}[;${a}]`;
+    return `${u},${x},${h}`;
   }
   return `${d},${c},${s}`;
 }
 function xe(e, t = {}) {
-  if (I(e))
-    return `epubcfi(${j(e, void 0, t)})`;
-  if ("node" in e && !("start" in e))
-    return `epubcfi(${j(
-      e.node,
-      e.offset,
-      t,
-      e
-    )})`;
+  if (b(e))
+    return `epubcfi(${P(e, void 0, t)})`;
+  if ("node" in e && !("start" in e)) {
+    let n = "";
+    return e.spineIndex !== void 0 && (n = `/6/${(e.spineIndex + 1) * 2}`, e.spineId && (n += `[${g(e.spineId)}]`), n += "!"), n += P(e.node, e.offset, t, e), `epubcfi(${n})`;
+  }
   if ("start" in e && "end" in e) {
     const { start: n, end: i } = e;
-    return `epubcfi(${ae(
+    let r = "";
+    return n.spineIndex !== void 0 && (r = `/6/${(n.spineIndex + 1) * 2}`, n.spineId && (r += `[${g(n.spineId)}]`), r += "!"), r += ae(
       n.node,
       n.offset ?? 0,
       i.node,
@@ -525,14 +527,14 @@ function xe(e, t = {}) {
       t,
       n,
       i
-    )})`;
+    ), `epubcfi(${r})`;
   }
   throw new Error(
     "Invalid argument: expected Node, CfiPosition, or {start, end} object"
   );
 }
-function m(e, t = !1) {
-  return typeof e == "string" ? m(p(e), t) : "parent" in e ? t ? e.parent.concat(e.end) : e.parent.concat(e.start) : e;
+function E(e, t = !1) {
+  return typeof e == "string" ? E(p(e), t) : "parent" in e ? t ? e.parent.concat(e.end) : e.parent.concat(e.start) : e;
 }
 function Y(e) {
   return e.offset !== void 0 ? 1 : e.index !== void 0 ? 2 : e.temporal !== void 0 || e.spatial !== void 0 ? 3 : 4;
@@ -541,39 +543,39 @@ function q(e, t) {
   var r, o, l, f;
   const n = typeof e == "string" ? p(e) : e, i = typeof t == "string" ? p(t) : t;
   if ("parent" in n || "parent" in i)
-    return q(m(n), m(i)) || q(m(n, !0), m(i, !0));
+    return q(E(n), E(i)) || q(E(n, !0), E(i, !0));
   for (let d = 0; d < Math.max(n.length, i.length); d++) {
     const c = n[d] || [], s = i[d] || [], a = Math.max(c.length, s.length) - 1;
     for (let u = 0; u <= a; u++) {
-      const h = c[u], x = s[u];
-      if (!h) return -1;
-      if (!x) return 1;
-      const N = Y(h), y = Y(x);
-      if (N !== y)
-        return N - y;
-      if (h.index > x.index) return 1;
-      if (h.index < x.index) return -1;
-      const R = h.temporal !== void 0, O = x.temporal !== void 0;
-      if (R && !O) return 1;
-      if (!R && O) return -1;
-      if (R && O) {
-        if ((h.temporal ?? 0) > (x.temporal ?? 0)) return 1;
-        if ((h.temporal ?? 0) < (x.temporal ?? 0)) return -1;
+      const x = c[u], h = s[u];
+      if (!x) return -1;
+      if (!h) return 1;
+      const $ = Y(x), y = Y(h);
+      if ($ !== y)
+        return $ - y;
+      if (x.index > h.index) return 1;
+      if (x.index < h.index) return -1;
+      const R = x.temporal !== void 0, k = h.temporal !== void 0;
+      if (R && !k) return 1;
+      if (!R && k) return -1;
+      if (R && k) {
+        if ((x.temporal ?? 0) > (h.temporal ?? 0)) return 1;
+        if ((x.temporal ?? 0) < (h.temporal ?? 0)) return -1;
       }
-      const A = h.spatial !== void 0, C = x.spatial !== void 0;
+      const A = x.spatial !== void 0, C = h.spatial !== void 0;
       if (A && !C) return 1;
       if (!A && C) return -1;
       if (A && C) {
-        const F = ((r = h.spatial) == null ? void 0 : r[1]) ?? 0, _ = ((o = x.spatial) == null ? void 0 : o[1]) ?? 0;
+        const F = ((r = x.spatial) == null ? void 0 : r[1]) ?? 0, _ = ((o = h.spatial) == null ? void 0 : o[1]) ?? 0;
         if (F > _) return 1;
         if (F < _) return -1;
-        const B = ((l = h.spatial) == null ? void 0 : l[0]) ?? 0, L = ((f = x.spatial) == null ? void 0 : f[0]) ?? 0;
+        const B = ((l = x.spatial) == null ? void 0 : l[0]) ?? 0, L = ((f = h.spatial) == null ? void 0 : f[0]) ?? 0;
         if (B > L) return 1;
         if (B < L) return -1;
       }
       if (u === a) {
-        if ((h.offset ?? 0) > (x.offset ?? 0)) return 1;
-        if ((h.offset ?? 0) < (x.offset ?? 0)) return -1;
+        if ((x.offset ?? 0) > (h.offset ?? 0)) return 1;
+        if ((x.offset ?? 0) < (h.offset ?? 0)) return -1;
       }
     }
   }
@@ -594,13 +596,13 @@ function de(e) {
       n.push(`;${i}=${g(r)}`);
   return n.length > 0 && (t += `[${n.join("")}]`), t;
 }
-function w(e) {
+function v(e) {
   return e.map((t) => de(t)).join("");
 }
 function ge(e) {
   if (Array.isArray(e))
-    return `epubcfi(${e.map(w).join("!")})`;
-  const t = e.parent.map(w).join("!"), n = e.start.map(w).join("!"), i = e.end.map(w).join("!");
+    return `epubcfi(${e.map(v).join("!")})`;
+  const t = e.parent.map(v).join("!"), n = e.start.map(v).join("!"), i = e.end.map(v).join("!");
   return `epubcfi(${t},${n},${i})`;
 }
 export {