@prose-reader/cfi 1.362.0 → 1.364.0

package/dist/index.js

@@ -17,27 +17,79 @@ var n = /[[\]^,();]/g;
 function r(e) {
 	return e.replace(n, "^$&");
 }
-var i = /^epubcfi\((.*)\)$/, a = (e) => e.nodeType === Node.ELEMENT_NODE, o = (e) => typeof e == "object" && !!e && "nodeType" in e && (e.nodeType === Node.ELEMENT_NODE || e.nodeType === Node.TEXT_NODE), s = (e) => e.nodeType === Node.TEXT_NODE;
-function c(e) {
-	if (l(e)) return !1;
+var i = /^epubcfi\((.*)\)$/, a = (e) => e.nodeType === Node.ELEMENT_NODE, o = (e) => typeof e == "object" && !!e && "nodeType" in e && (e.nodeType === Node.ELEMENT_NODE || e.nodeType === Node.TEXT_NODE || e.nodeType === Node.CDATA_SECTION_NODE), s = (e) => e.nodeType === Node.TEXT_NODE || e.nodeType === Node.CDATA_SECTION_NODE, c = (e) => {
+	let t = e.parentNode, n = 0;
+	for (let r = 0; t && r < t.childNodes.length; r++) {
+		let i = t.childNodes[r];
+		if (!i || (a(i) && n++, i === e)) break;
+	}
+	return n * 2;
+}, l = (e) => {
+	let t = e.parentNode, n = 0, r = 0;
+	for (let i = 0; t && i < t.childNodes.length; i++) {
+		let o = t.childNodes[i];
+		if (!o || o === e) break;
+		a(o) ? (n++, r = 0) : s(o) && (r += o.data.length);
+	}
+	return {
+		step: n * 2 + 1,
+		base: r
+	};
+}, u = (e, t) => {
+	let n = (t - 1) / 2, r = 0, i = 0;
+	for (let t = 0; t < e.childNodes.length; t++) {
+		let o = e.childNodes[t];
+		if (!o) break;
+		if (a(o)) {
+			if (r++, r > n) break;
+			i = t + 1;
+		} else if (r === n && s(o)) return {
+			kind: "node",
+			node: o
+		};
+	}
+	return r < n ? void 0 : {
+		kind: "boundary",
+		parent: e,
+		childIndex: i
+	};
+}, d = (e, t) => {
+	let n = e, r = 0, i = e;
+	for (; i && !a(i);) {
+		if (s(i)) {
+			if (n = i, t < r + i.data.length) return {
+				node: n,
+				offset: t - r
+			};
+			r += i.data.length;
+		}
+		i = i.nextSibling;
+	}
+	return {
+		node: n,
+		offset: t - (r - n.data.length)
+	};
+};
+function f(e) {
+	if (p(e)) return !1;
 	let t = e[e.length - 1];
 	return e.length > 1 && (t === void 0 || t.length === 0);
 }
-function l(e) {
+function p(e) {
 	return typeof e == "object" && !!e && "parent" in e && "start" in e && "end" in e;
 }
 //#endregion
 //#region src/parse.ts
-function u(e) {
+function m(e) {
 	let t = e.match(i);
 	return t && t[1] || e;
 }
-function d(e) {
+function h(e) {
 	let t = [], n = null, r = !1, i = "", a = (e) => {
 		t.push(e), n = null, i = "";
 	}, o = (e) => {
 		i += e, r = !1;
-	}, s = u(e).trim(), c = Array.from(s).concat("");
+	}, s = m(e).trim(), c = Array.from(s).concat("");
 	for (let e = 0; e < c.length; e++) {
 		let t = c[e];
 		if (!t) {
@@ -96,15 +148,15 @@ function d(e) {
 	}
 	return t;
 }
-function f(e, t) {
+function g(e, t) {
 	return e ? e.map((e, n) => e[0] === t ? n : null).filter((e) => e !== null) : [];
 }
-function p(e, t) {
+function _(e, t) {
 	let n = [], r = 0;
 	for (let i of t) n.push(e.slice(r, i)), r = i;
 	return n.push(e.slice(r)), n;
 }
-function m(e) {
+function v(e) {
 	let t = [], n = {}, r = -1;
 	for (let i = 0; i < e.length; i++) {
 		let a = e[i];
@@ -135,16 +187,16 @@ function m(e) {
 	}
 	return t;
 }
-function h(e) {
-	return p(e, f(e, "!")).map(m);
+function y(e) {
+	return _(e, g(e, "!")).map(v);
 }
-function g(e) {
+function b(e) {
 	if (!e) throw Error("CFI string cannot be empty");
-	let t = d(e);
+	let t = h(e);
 	if (!t || t.length === 0) throw Error("Failed to tokenize CFI string");
-	let n = f(t, ",");
-	if (n.length === 0) return h(t);
-	let [r, i, a] = p(t, n);
+	let n = g(t, ",");
+	if (n.length === 0) return y(t);
+	let [r, i, a] = _(t, n);
 	function o(e, t) {
 		if (!t || t.length === 0) return [[]];
 		let n = t.filter((e) => e[0] !== ",");
@@ -156,9 +208,9 @@ function g(e) {
 			}
 			return [[]];
 		}
-		return h(t);
+		return y(t);
 	}
-	let s = h(r || []);
+	let s = y(r || []);
 	return {
 		parent: s,
 		start: o(s, i || []),
@@ -167,15 +219,15 @@ function g(e) {
 }
 //#endregion
 //#region src/compare.ts
-function _(e, t = !1) {
-	return typeof e == "string" ? _(g(e), t) : "parent" in e ? t ? e.parent.concat(e.end) : e.parent.concat(e.start) : e;
+function x(e, t = !1) {
+	return typeof e == "string" ? x(b(e), t) : "parent" in e ? t ? e.parent.concat(e.end) : e.parent.concat(e.start) : e;
 }
-function v(e) {
+function S(e) {
 	return e.offset === void 0 ? e.index === void 0 ? e.temporal !== void 0 || e.spatial !== void 0 ? 3 : 4 : 2 : 1;
 }
-function y(e, t) {
-	let n = typeof e == "string" ? g(e) : e, r = typeof t == "string" ? g(t) : t;
-	if ("parent" in n || "parent" in r) return y(_(n), _(r)) || y(_(n, !0), _(r, !0));
+function C(e, t) {
+	let n = typeof e == "string" ? b(e) : e, r = typeof t == "string" ? b(t) : t;
+	if ("parent" in n || "parent" in r) return C(x(n), x(r)) || C(x(n, !0), x(r, !0));
 	for (let e = 0; e < Math.max(n.length, r.length); e++) {
 		let t = n[e] || [], i = r[e] || [], a = Math.max(t.length, i.length) - 1;
 		for (let e = 0; e <= a; e++) {
@@ -183,7 +235,7 @@ function y(e, t) {
 			if (!n) return -1;
 			if (!r || n.index > r.index) return 1;
 			if (n.index < r.index) return -1;
-			let o = v(n), s = v(r);
+			let o = S(n), s = S(r);
 			if (o !== s) return o - s;
 			let c = n.temporal !== void 0, l = r.temporal !== void 0;
 			if (c && !l) return 1;
@@ -213,10 +265,10 @@ function y(e, t) {
 }
 //#endregion
 //#region src/constants.ts
-var b = 6;
+var w = 6;
 //#endregion
 //#region src/generate.ts
-function x(e, t, n = {}) {
+function T(e, t, n = {}) {
 	if (!e.textContent || e.textContent.trim() === "") return null;
 	let r = e.textContent, i = n.textAssertionLength || 10;
 	if (t !== void 0 && t <= r.length) {
@@ -225,15 +277,15 @@ function x(e, t, n = {}) {
 	}
 	return r.substring(0, Math.min(r.length, i));
 }
-function S(e) {
+function E(e) {
 	let [t, n] = e;
 	return `@${Math.max(0, Math.min(100, t))}:${Math.max(0, Math.min(100, n))}`;
 }
-function C(e, t, n) {
+function D(e, t, n) {
 	let r = e;
-	return t !== void 0 && (r += `~${t}`), n !== void 0 && (r += S(n)), r;
+	return t !== void 0 && (r += `~${t}`), n !== void 0 && (r += E(n)), r;
 }
-function w(e, t, n) {
+function O(e, t, n) {
 	let i = e;
 	if (t && (i += `[${r(t)}]`), n) {
 		let e = n === "before" ? "b" : "a";
@@ -241,90 +293,77 @@ function w(e, t, n) {
 	}
 	return i;
 }
-function T(e, t, n = {}, i) {
-	let o = "", s = e, c = null;
-	if (e?.nodeType === Node.TEXT_NODE) {
-		c = e;
-		let t = e.parentNode;
-		if (!t) throw Error("Text node doesn't have a parent");
-		let n = Array.from(t.childNodes).indexOf(e);
-		if (n === -1) throw Error("Node not found in parent's children");
-		if (o = `/${n + 1}`, a(t) && t.id) {
-			let e = t.id, n = Array.from(t.parentNode?.childNodes || []);
-			o = `/${n.slice(0, n.indexOf(t) + 1).filter((e) => e.nodeType === Node.ELEMENT_NODE).length * 2}[${r(e)}]${o}`, s = t.parentNode;
-		} else s = t;
-	}
-	let l = null;
-	for (c && n.includeTextAssertions && (l = x(c, t, n)); s?.parentNode;) {
-		if (!(c && s === c.parentNode && o.includes(`[${a(s) ? s.id : ""}]`))) {
-			let e = s.parentNode, t = Array.from(e.childNodes), n = t.indexOf(s);
-			if (n === -1) throw Error("Node not found in parent's children");
-			let i = t.slice(0, n + 1).filter((e) => e.nodeType === Node.ELEMENT_NODE), c;
-			c = (s.nodeType, Node.ELEMENT_NODE, i.length);
-			let l = c * 2;
-			o = a(s) && s.id ? `/${l}[${r(s.id)}]${o}` : `/${l}${o}`;
-		}
-		if (s.parentNode.nodeName.toLowerCase() === "html") break;
-		s = s.parentNode;
+function k(e, t, n = {}, i) {
+	let o = "", u = e, d = null, f = t;
+	if (e && !a(e)) {
+		let n = e.parentNode;
+		if (!n) throw Error("Text node doesn't have a parent");
+		let { step: r, base: i } = l(e);
+		o = `/${r}`, d = s(e) ? e : null, f = t === void 0 ? void 0 : i + t, u = n;
 	}
-	return t !== void 0 && (o += `:${t}`), o = C(o, i?.temporal, i?.spatial || n.spatialOffset), o = w(o, l, n.includeSideBias), o = O(o, n.extensions), o;
+	let p = null;
+	for (d && n.includeTextAssertions && (p = T(d, t, n)); u?.parentNode;) {
+		let e = c(u);
+		if (o = a(u) && u.id ? `/${e}[${r(u.id)}]${o}` : `/${e}${o}`, u.parentNode.nodeName.toLowerCase() === "html") break;
+		u = u.parentNode;
+	}
+	return f !== void 0 && (o += `:${f}`), o = D(o, i?.temporal, i?.spatial || n.spatialOffset), o = O(o, p, n.includeSideBias), o = M(o, n.extensions), o;
 }
-function E(e, t, n, i = {}, o) {
+function A(e, t, n, i = {}, o) {
+	let u = a(t) ? 0 : l(t).base;
 	if (e === t) {
-		let e = n === void 0 ? "" : `:${n}`;
-		return e = C(e, o?.temporal, o?.spatial), e;
+		let e = n === void 0 ? "" : `:${u + n}`;
+		return e = D(e, o?.temporal, o?.spatial), e;
 	}
-	let s = [], c = t;
-	for (; c && c !== e;) {
-		let e = c.parentNode;
+	let d = [], f = t;
+	for (; f && f !== e;) {
+		let e = f.parentNode;
 		if (!e) break;
-		let t = Array.from(e.childNodes), n = t.indexOf(c);
-		if (n === -1) throw Error("Node not found in parent's children");
-		let i;
-		i = c.nodeType === Node.ELEMENT_NODE ? (t.filter((e) => e.nodeType === Node.ELEMENT_NODE).indexOf(c) + 1) * 2 : n + 1, a(c) && c.id ? s.unshift(`/${i}[${r(c.id)}]`) : s.unshift(`/${i}`), c = e;
+		let t = a(f) ? c(f) : l(f).step;
+		a(f) && f.id ? d.unshift(`/${t}[${r(f.id)}]`) : d.unshift(`/${t}`), f = e;
 	}
-	let l = s.join("");
-	if (n !== void 0 && (l += `:${n}`), l = C(l, o?.temporal, o?.spatial), i.includeTextAssertions && t.nodeType === Node.TEXT_NODE) {
-		let e = x(t, n, i);
-		l = w(l, e, i.includeSideBias);
+	let p = d.join("");
+	if (n !== void 0 && (p += `:${u + n}`), p = D(p, o?.temporal, o?.spatial), i.includeTextAssertions && s(t)) {
+		let e = T(t, n, i);
+		p = O(p, e, i.includeSideBias);
 	}
-	return l = O(l, i.extensions), l;
+	return p = M(p, i.extensions), p;
 }
-var D = (e) => Object.entries(e).map(([e, t]) => {
+var j = (e) => Object.entries(e).map(([e, t]) => {
 	let n = r(t);
 	return `${e}=${encodeURIComponent(n)}`;
 }).join(";");
-function O(e, t) {
+function M(e, t) {
 	if (!t || Object.keys(t).length === 0) return e;
-	let n = D(t);
+	let n = j(t);
 	if (e.endsWith("]")) {
 		let t = e.lastIndexOf("["), r = e.substring(t + 1, e.length - 1);
 		return r.includes(n) ? e : `${e.substring(0, e.length - 1)}${r.includes(";"), ";"}${n}]`;
 	}
 	return e.endsWith("!") ? e : `${e}[;${n}]`;
 }
-function k(e, n, r, i, a = {}, o, s) {
+function N(e, n, r, i, a = {}, o, s) {
 	let c = t(e, r);
 	if (!c) throw Error("No common ancestor found");
-	let l = T(c, void 0, a), u = E(c, e, n, a, o), d = E(c, r, i, a, s);
-	return a.extensions && Object.keys(a.extensions).length > 0 ? `${O(l, a.extensions)},${O(u, a.extensions)},${O(d, a.extensions)}` : `${l},${u},${d}`;
+	let l = k(c, void 0, a), u = A(c, e, n, a, o), d = A(c, r, i, a, s);
+	return a.extensions && Object.keys(a.extensions).length > 0 ? `${M(l, a.extensions)},${M(u, a.extensions)},${M(d, a.extensions)}` : `${l},${u},${d}`;
 }
-var A = (e, t, n = {}, i) => {
+var P = (e, t, n = {}, i) => {
 	let a = `/6/${(e + 1) * 2}`;
-	return t && (a += `[${r(t)}]`), a = i ? O(a, n.extensions) : a, `${a}!`;
+	return t && (a += `[${r(t)}]`), a = i ? M(a, n.extensions) : a, `${a}!`;
 };
-function j(e, t = {}) {
-	if (o(e)) return `epubcfi(${T(e, void 0, t)})`;
+function F(e, t = {}) {
+	if (o(e)) return `epubcfi(${k(e, void 0, t)})`;
 	let n = "";
-	if (!("start" in e)) return e.spineIndex !== void 0 && (n = A(e.spineIndex, e.spineId, t, !e.node), !e.node) || (n += T(e.node ?? null, e.offset, t, e)), `epubcfi(${n})`;
+	if (!("start" in e)) return e.spineIndex !== void 0 && (n = P(e.spineIndex, e.spineId, t, !e.node), !e.node) || (n += k(e.node ?? null, e.offset, t, e)), `epubcfi(${n})`;
 	let { start: r, end: i } = e;
-	return r.spineIndex !== void 0 && (n = A(r.spineIndex, r.spineId, t, !r.node)), r.node && i.node && (n += k(r.node, r.offset ?? 0, i.node, i.offset ?? 0, t, r, i)), `epubcfi(${n})`;
+	return r.spineIndex !== void 0 && (n = P(r.spineIndex, r.spineId, t, !r.node)), r.node && i.node && (n += N(r.node, r.offset ?? 0, i.node, i.offset ?? 0, t, r, i)), `epubcfi(${n})`;
 }
 //#endregion
 //#region src/resolve.ts
-function M(e, t, n = {}) {
+function I(e, t, n = {}) {
 	try {
-		return N(typeof e == "string" ? g(e) : e, t, n);
+		return L(typeof e == "string" ? b(e) : e, t, n);
 	} catch (e) {
 		if (n.throwOnError) throw e;
 		return {
@@ -333,72 +372,73 @@ function M(e, t, n = {}) {
 		};
 	}
 }
-function N(e, t, n = { asRange: !1 }) {
-	if (l(e)) return P(e, t);
-	if (c(e)) return z(null);
+function L(e, t, n = { asRange: !1 }) {
+	if (p(e)) return R(e, t);
+	if (f(e)) return U(null);
 	let r = e.at(-1);
-	if (r) return U(r, t, n);
+	if (r) return J(r, t, n);
 	throw Error("Invalid CFI structure");
 }
-function P(e, t) {
+function R(e, t) {
 	let n = e.parent, r = e.start[0] || [], i = e.end[0] || [], a = t.documentElement;
 	if (n.length > 0) if (n.length > 1) {
 		let e = n[0];
 		if (e) {
-			let n = U(e, t);
+			let n = J(e, t);
 			o(n.node) && (a = n.node);
 		}
 		if (n.length > 1 && a) {
 			let e = n[1];
 			if (e) {
-				let n = U(e, t);
+				let n = J(e, t);
 				o(n.node) && (a = n.node);
 			}
 		}
 	} else {
 		let e = n[0];
 		if (e) {
-			let n = U(e, t);
+			let n = J(e, t);
 			o(n.node) && (a = n.node);
 		}
 	}
 	if (!a) throw Error("Failed to resolve parent node in CFI range");
-	let s = a.nodeType === Node.TEXT_NODE, c, l, u = 0, d = 0;
-	if (s) {
-		c = a, l = a;
+	let c = s(a), l, u, d = 0, f = 0;
+	if (c) {
+		l = a, u = a;
 		let e = r[r.length - 1], t = i[i.length - 1];
-		u = (Array.isArray(e?.offset) ? e.offset[0] : e?.offset) ?? 0, d = (Array.isArray(t?.offset) ? t.offset[0] : t?.offset) ?? 0;
+		d = (Array.isArray(e?.offset) ? e.offset[0] : e?.offset) ?? 0, f = (Array.isArray(t?.offset) ? t.offset[0] : t?.offset) ?? 0;
 	} else {
 		let e = r.length === 0, t = i.length === 0;
 		if (e) {
 			if (!a) throw Error("Failed to resolve parent node in CFI range (start)");
-			c = a, u = r[0]?.offset ?? 0;
+			l = a, d = r[0]?.offset ?? 0;
 		} else {
-			let e = H(a, r, 0, !0);
+			let e = q(a, r, 0, !0);
 			if (!e) throw Error("Failed to resolve start node in CFI range");
-			c = e;
+			l = e.node;
 			let t = r[r.length - 1];
-			u = (Array.isArray(t?.offset) ? t.offset[0] : t?.offset) ?? 0;
+			d = e.childIndex ?? (Array.isArray(t?.offset) ? t.offset[0] : t?.offset) ?? 0;
 		}
 		if (t) {
 			if (!a) throw Error("Failed to resolve parent node in CFI range (end)");
-			l = a, d = i[0]?.offset ?? 0;
+			u = a, f = i[0]?.offset ?? 0;
 		} else {
-			let e = H(a, i, 0, !0);
+			let e = q(a, i, 0, !0);
 			if (!e) throw Error("Failed to resolve end node in CFI range");
-			l = e;
+			u = e.node;
 			let t = i[i.length - 1];
-			d = (Array.isArray(t?.offset) ? t.offset[0] : t?.offset) ?? 0;
+			f = e.childIndex ?? (Array.isArray(t?.offset) ? t.offset[0] : t?.offset) ?? 0;
 		}
 	}
-	let f = t.createRange();
-	return f.setStart(c, u), f.setEnd(l, d), {
-		...R(r[r.length - 1]),
-		node: f,
-		isRange: !0
+	let p = K(l, d), m = K(u, f), h = t.createRange();
+	return h.setStart(p.node, p.offset ?? 0), h.setEnd(m.node, m.offset ?? 0), {
+		...H(r[r.length - 1]),
+		node: h,
+		isRange: !0,
+		offset: p.offset
 	};
 }
-function F(e) {
+function z(e) {
 	if (e?.side) return e.side;
 	if (e?.text && e.text.length > 0) {
 		let t = e.text[0];
@@ -408,14 +448,14 @@ function F(e) {
 		}
 	}
 }
-function I(e) {
+function B(e) {
 	return e.index % 2 != 0;
 }
-function L(e) {
-	return (l(e) ? e.end : e).at(-1)?.at(-1)?.extensions;
+function V(e) {
+	return (p(e) ? e.end : e).at(-1)?.at(-1)?.extensions;
 }
-function R(e) {
-	let t = F(e), n = e?.extensions;
+function H(e) {
+	let t = z(e), n = e?.extensions;
 	return {
 		offset: e?.offset,
 		temporal: e?.temporal,
@@ -424,21 +464,21 @@ function R(e) {
 		extensions: n
 	};
 }
-function z(e, t) {
+function U(e, t) {
 	return {
 		node: e,
 		isRange: !1,
-		...R(t)
+		...H(t)
 	};
 }
-function B(e, t) {
+function W(e, t) {
 	return {
 		node: e,
 		isRange: !0,
-		...R(t)
+		...H(t)
 	};
 }
-function V(e, t, n) {
+function G(e, t, n) {
 	let r = e.createRange();
 	if (r.selectNodeContents(t), n !== void 0) {
 		let e = Array.isArray(n) ? n[0] : n;
@@ -446,19 +486,37 @@ function V(e, t, n) {
 	}
 	return r;
 }
-function H(e, t, n, r) {
+function K(e, t) {
+	let n = Array.isArray(t) ? t[0] : t;
+	return n === void 0 || !s(e) ? {
+		node: e,
+		offset: n
+	} : d(e, n);
+}
+function q(e, t, n, r) {
 	let i = e;
 	for (let e = n; e < t.length; e++) {
 		let n = t[e];
 		if (!i || !n) break;
-		if (I(n)) {
-			let e = n.index - 1;
-			if (e >= 0 && e < i.childNodes.length) i = i.childNodes[e];
-			else {
-				if (r) throw Error(`Invalid text node index: ${n.index}`);
+		if (B(n)) {
+			let a = u(i, n.index);
+			if (!a) {
+				if (r) throw Error(`No character data chunk: ${n.index}`);
 				i = null;
 				break;
 			}
+			if (a.kind === "boundary") {
+				if (e < t.length - 1) {
+					if (r) throw Error(`Empty character data chunk: ${n.index}`);
+					i = null;
+					break;
+				}
+				return {
+					node: a.parent,
+					childIndex: a.childIndex
+				};
+			}
+			i = a.node;
 		} else {
 			let e = Array.from(i.childNodes).filter((e) => e.nodeType === Node.ELEMENT_NODE), t = Math.floor(n.index / 2) - 1;
 			if (t >= 0 && t < e.length) {
@@ -471,52 +529,59 @@ function H(e, t, n, r) {
 			}
 		}
 	}
-	return i;
+	return i ? { node: i } : null;
 }
-function U(e, t, n = {}) {
+function J(e, t, n = {}) {
 	let { throwOnError: r = !1, asRange: i = !1 } = n;
 	if (!t) {
 		if (r) throw Error("Document is not available");
-		return z(null);
+		return U(null);
 	}
-	let { node: a, remainingPathIndex: o } = W(t, e);
+	let { node: a, remainingPathIndex: o } = te(t, e);
 	if (a && o >= e.length) {
 		let n = e.at(-1);
-		if (n && I(n)) {
-			let e = n.index - 1;
-			if (e >= 0 && e < a.childNodes.length) {
-				let t = a.childNodes[e];
-				return z(t, n);
-			}
-		}
-		return i ? B(V(t, a, n?.offset), n) : z(a, n);
+		return i ? W(G(t, a, n?.offset), n) : U(a, n);
 	}
 	let s = a || t.documentElement, c = a ? o : 0;
 	if (i && e.length > 0) {
 		let n = e[e.length - 1];
-		if (n && !I(n)) {
+		if (n && !B(n)) {
 			if (n.index === 0 && s) {
 				let e = t.createRange();
-				return e.setStart(s, 0), e.setEnd(s, 0), B(e, n);
+				return e.setStart(s, 0), e.setEnd(s, 0), W(e, n);
 			}
-			let i = H(s, e.slice(0, -1), c, r);
+			let i = q(s, e.slice(0, -1), c, r)?.node;
 			if (i) {
 				let e = Array.from(i.childNodes).filter((e) => e.nodeType === Node.ELEMENT_NODE);
 				if (Math.floor(n.index / 2) - 1 === e.length) {
 					let e = t.createRange();
-					return e.selectNodeContents(i), e.collapse(!1), B(e, n);
+					return e.selectNodeContents(i), e.collapse(!1), W(e, n);
 				}
 			}
 		}
 	}
-	if (s = H(s, e, c, r), !s) {
+	let l = q(s, e, c, r);
+	if (!l) {
 		if (r) throw Error("Failed to resolve CFI path");
-		return z(null);
+		return U(null);
 	}
-	let l = e.at(-1);
-	return i ? B(V(t, s, l?.offset), l) : z(s, l);
+	let u = e.at(-1), d = l.childIndex === void 0 ? K(l.node, u?.offset) : {
+		node: l.node,
+		offset: l.childIndex
+	};
+	return i ? {
+		...W(l.childIndex === void 0 ? G(t, d.node, d.offset) : ee(t, l.node, l.childIndex), u),
+		offset: d.offset
+	} : {
+		...U(d.node, u),
+		offset: d.offset
+	};
 }
-function W(e, t) {
+function ee(e, t, n) {
+	let r = e.createRange();
+	return r.setStart(t, n), r.setEnd(t, n), r;
+}
+function te(e, t) {
 	for (let n = t.length - 1; n >= 0; n--) {
 		let r = t[n];
 		if (r?.id) {
@@ -534,7 +599,7 @@ function W(e, t) {
 }
 //#endregion
 //#region src/serialize.ts
-function G(e) {
+function ne(e) {
 	let t = `/${e.index}`;
 	if (e.id) {
 		if (t += `[${r(e.id)}`, e.extensions) for (let [n, i] of Object.entries(e.extensions)) t += `;${n}=${r(i)}`;
@@ -545,44 +610,44 @@ function G(e) {
 	if (e.text && e.text.length > 0 && n.push(e.text.map(r).join(",")), (e.side || e.extensions && !e.id) && (e.side && n.push(`;s=${e.side}`), e.extensions && !e.id)) for (let [t, i] of Object.entries(e.extensions)) n.push(`;${t}=${r(i)}`);
 	return n.length > 0 && (t += `[${n.join("")}]`), t;
 }
-function K(e) {
-	return e.map((e) => G(e)).join("");
+function Y(e) {
+	return e.map((e) => ne(e)).join("");
 }
-function q(e) {
-	return Array.isArray(e) ? `epubcfi(${e.map(K).join("!")})` : `epubcfi(${e.parent.map(K).join("!")},${e.start.map(K).join("!")},${e.end.map(K).join("!")})`;
+function X(e) {
+	return Array.isArray(e) ? `epubcfi(${e.map(Y).join("!")})` : `epubcfi(${e.parent.map(Y).join("!")},${e.start.map(Y).join("!")},${e.end.map(Y).join("!")})`;
 }
 //#endregion
 //#region src/spineItemref.ts
-var J = (e) => (e + 1) * 2, Y = (e) => e / 2 - 1, X = (e) => l(e) ? e.parent[0] : e[0], Z = (e) => {
-	let t = X(e);
+var Z = (e) => (e + 1) * 2, Q = (e) => e / 2 - 1, re = (e) => p(e) ? e.parent[0] : e[0], $ = (e) => {
+	let t = re(e);
 	if (t?.[0]?.index === 6) return t[1];
-}, Q = (e, t) => {
+}, ie = (e, t) => {
 	let n = { ...e };
 	for (let [e, r] of Object.entries(t)) r === void 0 ? delete n[e] : n[e] = r;
 	return Object.keys(n).length > 0 ? n : void 0;
-}, $ = (e) => {
+}, ae = (e) => {
 	if (e.id !== void 0) return e.id;
 	if (!(!e.text || e.text.length === 0)) return e.text.join(",");
-}, ee = (e) => {
+}, oe = (e) => {
 	try {
-		let t = Z(g(e));
+		let t = $(b(e));
 		return t ? {
-			spineIndex: Y(t.index),
-			spineId: $(t),
+			spineIndex: Q(t.index),
+			spineId: ae(t),
 			extensions: t.extensions
 		} : void 0;
 	} catch {
 		return;
 	}
-}, te = (e, t) => {
+}, se = (e, t) => {
 	try {
-		let n = g(e), r = Z(n);
-		return r ? (t.spineIndex !== void 0 && (r.index = J(t.spineIndex)), t.spineId !== void 0 && (r.id = t.spineId, r.text = void 0, r.side = void 0), t.extensions !== void 0 && (r.extensions = Q(r.extensions, t.extensions)), q(n)) : void 0;
+		let n = b(e), r = $(n);
+		return r ? (t.spineIndex !== void 0 && (r.index = Z(t.spineIndex)), t.spineId !== void 0 && (r.id = t.spineId, r.text = void 0, r.side = void 0), t.extensions !== void 0 && (r.extensions = ie(r.extensions, t.extensions)), X(n)) : void 0;
 	} catch {
 		return;
 	}
 };
 //#endregion
-export { b as EPUB_CFI_PACKAGE_SPINE_STEP_INDEX, y as compare, Y as epubCfiItemrefStepIndexToSpineIndex, j as generate, ee as getEpubCfiSpineItemref, c as isIndirectionOnly, l as isParsedCfiRange, g as parse, M as resolve, L as resolveExtensions, q as serialize, J as spineIndexToEpubCfiItemrefStepIndex, te as updateEpubCfiSpineItemref };
+export { w as EPUB_CFI_PACKAGE_SPINE_STEP_INDEX, C as compare, Q as epubCfiItemrefStepIndexToSpineIndex, F as generate, oe as getEpubCfiSpineItemref, f as isIndirectionOnly, p as isParsedCfiRange, b as parse, I as resolve, V as resolveExtensions, X as serialize, Z as spineIndexToEpubCfiItemrefStepIndex, se as updateEpubCfiSpineItemref };
 
 //# sourceMappingURL=index.js.map