@readium/navigator-html-injectables 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/index.js

@@ -1,5 +1,5 @@
-const nt = Math.pow(2, 32), ge = () => Math.round(Math.random() * nt).toString(36), ot = () => `${Math.round(performance.now())}-${ge()}-${ge()}`, k = 1;
-class at {
+const at = Math.pow(2, 32), ve = () => Math.round(Math.random() * at).toString(36), lt = () => `${Math.round(performance.now())}-${ve()}-${ve()}`, V = 1;
+class ht {
   constructor(e) {
     this.destination = null, this.registrar = /* @__PURE__ */ new Map(), this.origin = "", this.channelId = "", this.receiver = this.receive.bind(this), this.preLog = [], this.wnd = e, e.addEventListener("message", this.receiver);
   }
@@ -12,8 +12,8 @@ class at {
     if (!(!("_readium" in t) || !t._readium || t._readium <= 0)) {
       if (t.key === "_ping") {
         if (!this.destination) {
-          if (this.destination = e.source, this.origin = e.origin, this.channelId = t._channel, t._readium !== k) {
-            t._readium > k ? this.send("error", `received comms version ${t._readium} higher than ${k}`) : this.send("error", `received comms version ${t._readium} lower than ${k}`), this.destination = null, this.origin = "", this.channelId = "";
+          if (this.destination = e.source, this.origin = e.origin, this.channelId = t._channel, t._readium !== V) {
+            t._readium > V ? this.send("error", `received comms version ${t._readium} higher than ${V}`) : this.send("error", `received comms version ${t._readium} lower than ${V}`), this.destination = null, this.origin = "", this.channelId = "";
             return;
           }
           this.send("_pong", void 0), this.preLog.forEach((i) => this.send("log", i)), this.preLog = [];
@@ -41,7 +41,7 @@ class at {
     Array.isArray(e) || (e = [e]), e.forEach((s) => {
       const n = this.registrar.get(s);
       if (n && n.length >= 0) {
-        if (n.find((a) => a.module === t))
+        if (n.find((l) => l.module === t))
           throw new Error(`Trying to register another callback for combination of event ${s} and module ${t}`);
         n.push({
           cb: i,
@@ -76,9 +76,9 @@ class at {
     if (!this.destination)
       throw Error("Attempted to send comms message before destination has been initialized");
     const n = {
-      _readium: k,
+      _readium: V,
       _channel: this.channelId,
-      id: i ?? ot(),
+      id: i ?? lt(),
       // scrict,
       key: e,
       data: t
@@ -95,34 +95,41 @@ class at {
     }
   }
 }
-class ie {
-  /**
-   * Creates a [Encryption].
-   */
+const L = class B {
   constructor(e) {
-    this.algorithm = e.algorithm, this.compression = e.compression, this.originalLength = e.originalLength, this.profile = e.profile, this.scheme = e.scheme;
+    if (typeof e == "string") {
+      if (!B.VALID_MODES.has(e.toLowerCase()))
+        return;
+      this.value = e.toLowerCase();
+    } else {
+      const t = e.filter(
+        (i) => B.VALID_MODES.has(i.toLowerCase())
+      );
+      if (t.length === 0)
+        return;
+      this.value = Array.from(new Set(t));
+    }
   }
-  /**
-   * Parses a [Encryption] from its RWPM JSON representation.
-   */
   static deserialize(e) {
-    if (e && e.algorithm)
-      return new ie({
-        algorithm: e.algorithm,
-        compression: e.compression,
-        originalLength: e.originalLength,
-        profile: e.profile,
-        scheme: e.scheme
-      });
+    if (!e)
+      return;
+    if (typeof e == "string")
+      return new B(e);
+    if (!Array.isArray(e))
+      return;
+    const t = e.filter((i) => i ? B.VALID_MODES.has(i.toLowerCase()) : !1);
+    if (t.length !== 0)
+      return new B(t);
   }
-  /**
-   * Serializes a [Encryption] to its RWPM JSON representation.
-   */
   serialize() {
-    const e = { algorithm: this.algorithm };
-    return this.compression !== void 0 && (e.compression = this.compression), this.originalLength !== void 0 && (e.originalLength = this.originalLength), this.profile !== void 0 && (e.profile = this.profile), this.scheme !== void 0 && (e.scheme = this.scheme), e;
+    return this.value;
   }
-}
+};
+L.VALID_MODES = /* @__PURE__ */ new Set(["auditory", "tactile", "textual", "visual"]);
+L.AUDITORY = new L("auditory");
+L.TACTILE = new L("tactile");
+L.TEXTUAL = new L("textual");
+L.VISUAL = new L("visual");
 class E {
   constructor(e) {
     this.otherProperties = e;
@@ -150,18 +157,13 @@ class E {
     return new E(t);
   }
 }
-Object.defineProperty(E.prototype, "encryption", {
-  get: function() {
-    return ie.deserialize(this.otherProperties.encrypted);
-  }
-});
 E.prototype.getContains = function() {
   return new Set(this.otherProperties.contains || []);
 };
 E.prototype.getLayout = function() {
   return this.otherProperties.layout;
 };
-class l {
+class a {
   /** Creates a MediaType object. */
   constructor(e) {
     let t, i, s = e.mediaType.replace(/\s/g, "").split(";");
@@ -179,18 +181,18 @@ class l {
         o[g] = m;
       }
     }
-    const a = {}, c = Object.keys(o);
-    c.sort((d, f) => d.localeCompare(f)), c.forEach((d) => a[d] = o[d]);
+    const l = {}, c = Object.keys(o);
+    c.sort((d, f) => d.localeCompare(f)), c.forEach((d) => l[d] = o[d]);
     let h = "";
-    for (const d in a) {
-      const f = a[d];
+    for (const d in l) {
+      const f = l[d];
       h += `;${d}=${f}`;
     }
-    const u = `${t}/${i}${h}`, p = a.encoding;
-    this.string = u, this.type = t, this.subtype = i, this.parameters = a, this.encoding = p, this.name = e.name, this.fileExtension = e.fileExtension;
+    const u = `${t}/${i}${h}`, p = l.encoding;
+    this.string = u, this.type = t, this.subtype = i, this.parameters = l, this.encoding = p, this.name = e.name, this.fileExtension = e.fileExtension;
   }
   static parse(e) {
-    return new l(e);
+    return new a(e);
   }
   /** Structured syntax suffix, e.g. `+zip` in `application/epub+zip`.
    *  Gives a hint on the underlying structure of this media type.
@@ -220,7 +222,7 @@ class l {
    *  - Wildcards are supported, meaning that `image/*` contains `image/png`
    */
   contains(e) {
-    const t = typeof e == "string" ? l.parse({ mediaType: e }) : e;
+    const t = typeof e == "string" ? a.parse({ mediaType: e }) : e;
     if (!((this.type === "*" || this.type === t.type) && (this.subtype === "*" || this.subtype === t.subtype)))
       return !1;
     const i = new Set(
@@ -239,7 +241,7 @@ class l {
    *  doesn't. This is basically like `contains`, but working in both direction.
    */
   matches(e) {
-    const t = typeof e == "string" ? l.parse({ mediaType: e }) : e;
+    const t = typeof e == "string" ? a.parse({ mediaType: e }) : e;
     return this.contains(t) || t.contains(this);
   }
   /**
@@ -258,38 +260,38 @@ class l {
   /** Returns whether this media type is structured as a ZIP archive. */
   get isZIP() {
     return this.matchesAny(
-      l.ZIP,
-      l.LCP_PROTECTED_AUDIOBOOK,
-      l.LCP_PROTECTED_PDF
+      a.ZIP,
+      a.LCP_PROTECTED_AUDIOBOOK,
+      a.LCP_PROTECTED_PDF
     ) || this.structuredSyntaxSuffix === "+zip";
   }
   /** Returns whether this media type is structured as a JSON file. */
   get isJSON() {
-    return this.matchesAny(l.JSON) || this.structuredSyntaxSuffix === "+json";
+    return this.matchesAny(a.JSON) || this.structuredSyntaxSuffix === "+json";
   }
   /** Returns whether this media type is of an OPDS feed. */
   get isOPDS() {
     return this.matchesAny(
-      l.OPDS1,
-      l.OPDS1_ENTRY,
-      l.OPDS2,
-      l.OPDS2_PUBLICATION,
-      l.OPDS_AUTHENTICATION
+      a.OPDS1,
+      a.OPDS1_ENTRY,
+      a.OPDS2,
+      a.OPDS2_PUBLICATION,
+      a.OPDS_AUTHENTICATION
     ) || this.structuredSyntaxSuffix === "+json";
   }
   /** Returns whether this media type is of an HTML document. */
   get isHTML() {
-    return this.matchesAny(l.HTML, l.XHTML);
+    return this.matchesAny(a.HTML, a.XHTML);
   }
   /** Returns whether this media type is of a bitmap image, so excluding vectorial formats. */
   get isBitmap() {
     return this.matchesAny(
-      l.BMP,
-      l.GIF,
-      l.JPEG,
-      l.PNG,
-      l.TIFF,
-      l.WEBP
+      a.BMP,
+      a.GIF,
+      a.JPEG,
+      a.PNG,
+      a.TIFF,
+      a.WEBP
     );
   }
   /** Returns whether this media type is of an audio clip. */
@@ -303,320 +305,320 @@ class l {
   /** Returns whether this media type is of a Readium Web Publication Manifest. */
   get isRWPM() {
     return this.matchesAny(
-      l.READIUM_AUDIOBOOK_MANIFEST,
-      l.DIVINA_MANIFEST,
-      l.READIUM_WEBPUB_MANIFEST
+      a.READIUM_AUDIOBOOK_MANIFEST,
+      a.DIVINA_MANIFEST,
+      a.READIUM_WEBPUB_MANIFEST
     );
   }
   /** Returns whether this media type is of a publication file. */
   get isPublication() {
     return this.matchesAny(
-      l.READIUM_AUDIOBOOK,
-      l.READIUM_AUDIOBOOK_MANIFEST,
-      l.CBZ,
-      l.DIVINA,
-      l.DIVINA_MANIFEST,
-      l.EPUB,
-      l.LCP_PROTECTED_AUDIOBOOK,
-      l.LCP_PROTECTED_PDF,
-      l.LPF,
-      l.PDF,
-      l.W3C_WPUB_MANIFEST,
-      l.READIUM_WEBPUB,
-      l.READIUM_WEBPUB_MANIFEST,
-      l.ZAB
+      a.READIUM_AUDIOBOOK,
+      a.READIUM_AUDIOBOOK_MANIFEST,
+      a.CBZ,
+      a.DIVINA,
+      a.DIVINA_MANIFEST,
+      a.EPUB,
+      a.LCP_PROTECTED_AUDIOBOOK,
+      a.LCP_PROTECTED_PDF,
+      a.LPF,
+      a.PDF,
+      a.W3C_WPUB_MANIFEST,
+      a.READIUM_WEBPUB,
+      a.READIUM_WEBPUB_MANIFEST,
+      a.ZAB
     );
   }
   // Known Media Types
   static get AAC() {
-    return l.parse({ mediaType: "audio/aac", fileExtension: "aac" });
+    return a.parse({ mediaType: "audio/aac", fileExtension: "aac" });
   }
   static get ACSM() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/vnd.adobe.adept+xml",
       name: "Adobe Content Server Message",
       fileExtension: "acsm"
     });
   }
   static get AIFF() {
-    return l.parse({ mediaType: "audio/aiff", fileExtension: "aiff" });
+    return a.parse({ mediaType: "audio/aiff", fileExtension: "aiff" });
   }
   static get AVI() {
-    return l.parse({
+    return a.parse({
       mediaType: "video/x-msvideo",
       fileExtension: "avi"
     });
   }
   static get BINARY() {
-    return l.parse({ mediaType: "application/octet-stream" });
+    return a.parse({ mediaType: "application/octet-stream" });
   }
   static get BMP() {
-    return l.parse({ mediaType: "image/bmp", fileExtension: "bmp" });
+    return a.parse({ mediaType: "image/bmp", fileExtension: "bmp" });
   }
   static get CBZ() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/vnd.comicbook+zip",
       name: "Comic Book Archive",
       fileExtension: "cbz"
     });
   }
   static get CSS() {
-    return l.parse({ mediaType: "text/css", fileExtension: "css" });
+    return a.parse({ mediaType: "text/css", fileExtension: "css" });
   }
   static get DIVINA() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/divina+zip",
       name: "Digital Visual Narratives",
       fileExtension: "divina"
     });
   }
   static get DIVINA_MANIFEST() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/divina+json",
       name: "Digital Visual Narratives",
       fileExtension: "json"
     });
   }
   static get EPUB() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/epub+zip",
       name: "EPUB",
       fileExtension: "epub"
     });
   }
   static get GIF() {
-    return l.parse({ mediaType: "image/gif", fileExtension: "gif" });
+    return a.parse({ mediaType: "image/gif", fileExtension: "gif" });
   }
   static get GZ() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/gzip",
       fileExtension: "gz"
     });
   }
   static get HTML() {
-    return l.parse({ mediaType: "text/html", fileExtension: "html" });
+    return a.parse({ mediaType: "text/html", fileExtension: "html" });
   }
   static get JAVASCRIPT() {
-    return l.parse({
+    return a.parse({
       mediaType: "text/javascript",
       fileExtension: "js"
     });
   }
   static get JPEG() {
-    return l.parse({ mediaType: "image/jpeg", fileExtension: "jpeg" });
+    return a.parse({ mediaType: "image/jpeg", fileExtension: "jpeg" });
   }
   static get JSON() {
-    return l.parse({ mediaType: "application/json" });
+    return a.parse({ mediaType: "application/json" });
   }
   static get LCP_LICENSE_DOCUMENT() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/vnd.readium.lcp.license.v1.0+json",
       name: "LCP License",
       fileExtension: "lcpl"
     });
   }
   static get LCP_PROTECTED_AUDIOBOOK() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/audiobook+lcp",
       name: "LCP Protected Audiobook",
       fileExtension: "lcpa"
     });
   }
   static get LCP_PROTECTED_PDF() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/pdf+lcp",
       name: "LCP Protected PDF",
       fileExtension: "lcpdf"
     });
   }
   static get LCP_STATUS_DOCUMENT() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/vnd.readium.license.status.v1.0+json"
     });
   }
   static get LPF() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/lpf+zip",
       fileExtension: "lpf"
     });
   }
   static get MP3() {
-    return l.parse({ mediaType: "audio/mpeg", fileExtension: "mp3" });
+    return a.parse({ mediaType: "audio/mpeg", fileExtension: "mp3" });
   }
   static get MPEG() {
-    return l.parse({ mediaType: "video/mpeg", fileExtension: "mpeg" });
+    return a.parse({ mediaType: "video/mpeg", fileExtension: "mpeg" });
   }
   static get NCX() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/x-dtbncx+xml",
       fileExtension: "ncx"
     });
   }
   static get OGG() {
-    return l.parse({ mediaType: "audio/ogg", fileExtension: "oga" });
+    return a.parse({ mediaType: "audio/ogg", fileExtension: "oga" });
   }
   static get OGV() {
-    return l.parse({ mediaType: "video/ogg", fileExtension: "ogv" });
+    return a.parse({ mediaType: "video/ogg", fileExtension: "ogv" });
   }
   static get OPDS1() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/atom+xml;profile=opds-catalog"
     });
   }
   static get OPDS1_ENTRY() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/atom+xml;type=entry;profile=opds-catalog"
     });
   }
   static get OPDS2() {
-    return l.parse({ mediaType: "application/opds+json" });
+    return a.parse({ mediaType: "application/opds+json" });
   }
   static get OPDS2_PUBLICATION() {
-    return l.parse({ mediaType: "application/opds-publication+json" });
+    return a.parse({ mediaType: "application/opds-publication+json" });
   }
   static get OPDS_AUTHENTICATION() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/opds-authentication+json"
     });
   }
   static get OPUS() {
-    return l.parse({ mediaType: "audio/opus", fileExtension: "opus" });
+    return a.parse({ mediaType: "audio/opus", fileExtension: "opus" });
   }
   static get OTF() {
-    return l.parse({ mediaType: "font/otf", fileExtension: "otf" });
+    return a.parse({ mediaType: "font/otf", fileExtension: "otf" });
   }
   static get PDF() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/pdf",
       name: "PDF",
       fileExtension: "pdf"
     });
   }
   static get PNG() {
-    return l.parse({ mediaType: "image/png", fileExtension: "png" });
+    return a.parse({ mediaType: "image/png", fileExtension: "png" });
   }
   static get READIUM_AUDIOBOOK() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/audiobook+zip",
       name: "Readium Audiobook",
       fileExtension: "audiobook"
     });
   }
   static get READIUM_AUDIOBOOK_MANIFEST() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/audiobook+json",
       name: "Readium Audiobook",
       fileExtension: "json"
     });
   }
   static get READIUM_CONTENT_DOCUMENT() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/vnd.readium.content+json",
       name: "Readium Content Document",
       fileExtension: "json"
     });
   }
   static get READIUM_GUIDED_NAVIGATION_DOCUMENT() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/guided-navigation+json",
       name: "Readium Guided Navigation Document",
       fileExtension: "json"
     });
   }
   static get READIUM_POSITION_LIST() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/vnd.readium.position-list+json",
       name: "Readium Position List",
       fileExtension: "json"
     });
   }
   static get READIUM_WEBPUB() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/webpub+zip",
       name: "Readium Web Publication",
       fileExtension: "webpub"
     });
   }
   static get READIUM_WEBPUB_MANIFEST() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/webpub+json",
       name: "Readium Web Publication",
       fileExtension: "json"
     });
   }
   static get SMIL() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/smil+xml",
       fileExtension: "smil"
     });
   }
   static get SVG() {
-    return l.parse({
+    return a.parse({
       mediaType: "image/svg+xml",
       fileExtension: "svg"
     });
   }
   static get TEXT() {
-    return l.parse({ mediaType: "text/plain", fileExtension: "txt" });
+    return a.parse({ mediaType: "text/plain", fileExtension: "txt" });
   }
   static get TIFF() {
-    return l.parse({ mediaType: "image/tiff", fileExtension: "tiff" });
+    return a.parse({ mediaType: "image/tiff", fileExtension: "tiff" });
   }
   static get TTF() {
-    return l.parse({ mediaType: "font/ttf", fileExtension: "ttf" });
+    return a.parse({ mediaType: "font/ttf", fileExtension: "ttf" });
   }
   static get W3C_WPUB_MANIFEST() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/x.readium.w3c.wpub+json",
       name: "Web Publication",
       fileExtension: "json"
     });
   }
   static get WAV() {
-    return l.parse({ mediaType: "audio/wav", fileExtension: "wav" });
+    return a.parse({ mediaType: "audio/wav", fileExtension: "wav" });
   }
   static get WEBM_AUDIO() {
-    return l.parse({ mediaType: "audio/webm", fileExtension: "webm" });
+    return a.parse({ mediaType: "audio/webm", fileExtension: "webm" });
   }
   static get WEBM_VIDEO() {
-    return l.parse({ mediaType: "video/webm", fileExtension: "webm" });
+    return a.parse({ mediaType: "video/webm", fileExtension: "webm" });
   }
   static get WEBP() {
-    return l.parse({ mediaType: "image/webp", fileExtension: "webp" });
+    return a.parse({ mediaType: "image/webp", fileExtension: "webp" });
   }
   static get WOFF() {
-    return l.parse({ mediaType: "font/woff", fileExtension: "woff" });
+    return a.parse({ mediaType: "font/woff", fileExtension: "woff" });
   }
   static get WOFF2() {
-    return l.parse({ mediaType: "font/woff2", fileExtension: "woff2" });
+    return a.parse({ mediaType: "font/woff2", fileExtension: "woff2" });
   }
   static get XHTML() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/xhtml+xml",
       fileExtension: "xhtml"
     });
   }
   static get XML() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/xml",
       fileExtension: "xml"
     });
   }
   static get ZAB() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/x.readium.zab+zip",
       name: "Zipped Audio Book",
       fileExtension: "zab"
     });
   }
   static get ZIP() {
-    return l.parse({
+    return a.parse({
       mediaType: "application/zip",
       fileExtension: "zip"
     });
   }
 }
-class ye {
+class Ee {
   constructor(e) {
     this.uri = e, this.parameters = this.getParameters(e);
   }
@@ -638,28 +640,28 @@ class ye {
       const o = e[n];
       return o ? encodeURIComponent(o) : "";
     }).join(","), i = (s) => "?" + s.split(",").map((n) => {
-      const o = n.split("=")[0], a = e[o];
-      return a ? `${o}=${encodeURIComponent(a)}` : "";
+      const o = n.split("=")[0], l = e[o];
+      return l ? `${o}=${encodeURIComponent(l)}` : "";
     }).join("&");
     return this.uri.replace(/\{(\??)([^}]+)\}/g, (...s) => s[1] ? i(s[2]) : t(s[2]));
   }
 }
-function lt(r) {
+function ct(r) {
   return r && r instanceof Array ? r : void 0;
 }
-function We(r) {
-  return r && typeof r == "string" ? [r] : lt(r);
+function Ue(r) {
+  return r && typeof r == "string" ? [r] : ct(r);
 }
-function ve(r) {
+function be(r) {
   return typeof r == "string" ? new Date(r) : void 0;
 }
-function j(r) {
+function q(r) {
   return isNaN(r) ? void 0 : r;
 }
 function C(r) {
-  return j(r) !== void 0 && Math.sign(r) >= 0 ? r : void 0;
+  return q(r) !== void 0 && Math.sign(r) >= 0 ? r : void 0;
 }
-function ht(r) {
+function ut(r) {
   const e = new Array();
   return r.forEach((t) => e.push(t)), e;
 }
@@ -676,17 +678,17 @@ class x {
   static deserialize(e) {
     if (!e)
       return;
-    const t = j(e.progression), i = j(e.totalProgression), s = j(e.position), n = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set([
+    const t = q(e.progression), i = q(e.totalProgression), s = q(e.position), n = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set([
       "fragment",
       "fragments",
       "progression",
       "totalProgression",
       "position"
     ]);
-    return Object.entries(e).forEach(([a, c]) => {
-      o.has(a) || n.set(a, c);
+    return Object.entries(e).forEach(([l, c]) => {
+      o.has(l) || n.set(l, c);
     }), new x({
-      fragments: We(e.fragments || e.fragment),
+      fragments: Ue(e.fragments || e.fragment),
       progression: t !== void 0 && t >= 0 && t <= 1 ? t : void 0,
       totalProgression: i !== void 0 && i >= 0 && i <= 1 ? i : void 0,
       position: s !== void 0 && s > 0 ? s : void 0,
@@ -701,7 +703,7 @@ class x {
     return this.fragments && (e.fragments = this.fragments), this.progression !== void 0 && (e.progression = this.progression), this.totalProgression !== void 0 && (e.totalProgression = this.totalProgression), this.position !== void 0 && (e.position = this.position), this.otherLocations && this.otherLocations.forEach((t, i) => e[i] = t), e;
   }
 }
-class U {
+class k {
   /**
    * Creates a [Text].
    */
@@ -713,7 +715,7 @@ class U {
    */
   static deserialize(e) {
     if (e)
-      return new U({
+      return new k({
         after: e.after,
         before: e.before,
         highlight: e.highlight
@@ -727,7 +729,7 @@ class U {
     return this.after !== void 0 && (e.after = this.after), this.before !== void 0 && (e.before = this.before), this.highlight !== void 0 && (e.highlight = this.highlight), e;
   }
 }
-class D {
+class W {
   /**
    * Creates a [Locator].
    */
@@ -739,12 +741,12 @@ class D {
    */
   static deserialize(e) {
     if (e && e.href && e.type)
-      return new D({
+      return new W({
         href: e.href,
         type: e.type,
         title: e.title,
         locations: x.deserialize(e.locations),
-        text: U.deserialize(e.text)
+        text: k.deserialize(e.text)
       });
   }
   /**
@@ -758,7 +760,7 @@ class D {
    * Shortcut to get a copy of the [Locator] with different [Locations] sub-properties.
    */
   copyWithLocations(e) {
-    return new D({
+    return new W({
       href: this.href,
       type: this.type,
       title: this.title,
@@ -767,7 +769,7 @@ class D {
     });
   }
 }
-class B {
+class $ {
   /**
    * Creates a [Link].
    */
@@ -778,8 +780,8 @@ class B {
    * Parses a [Link] from its RWPM JSON representation.
    */
   static deserialize(e) {
-    if (e && e.href && typeof e.href == "string")
-      return new B({
+    if (!(!e || typeof e.href != "string"))
+      return new $({
         href: e.href,
         templated: e.templated,
         type: e.type,
@@ -790,9 +792,9 @@ class B {
         width: C(e.width),
         duration: C(e.duration),
         bitrate: C(e.bitrate),
-        languages: We(e.language),
-        alternates: V.deserialize(e.alternate),
-        children: V.deserialize(e.children)
+        languages: Ue(e.language),
+        alternates: _.deserialize(e.alternate),
+        children: _.deserialize(e.children)
       });
   }
   /**
@@ -800,11 +802,11 @@ class B {
    */
   serialize() {
     const e = { href: this.href };
-    return this.templated !== void 0 && (e.templated = this.templated), this.type !== void 0 && (e.type = this.type), this.title !== void 0 && (e.title = this.title), this.rels && (e.rel = ht(this.rels)), this.properties && (e.properties = this.properties.serialize()), this.height !== void 0 && (e.height = this.height), this.width !== void 0 && (e.width = this.width), this.duration !== void 0 && (e.duration = this.duration), this.bitrate !== void 0 && (e.bitrate = this.bitrate), this.languages && (e.language = this.languages), this.alternates && (e.alternate = this.alternates.serialize()), this.children && (e.children = this.children.serialize()), e;
+    return this.templated !== void 0 && (e.templated = this.templated), this.type !== void 0 && (e.type = this.type), this.title !== void 0 && (e.title = this.title), this.rels && (e.rel = ut(this.rels)), this.properties && (e.properties = this.properties.serialize()), this.height !== void 0 && (e.height = this.height), this.width !== void 0 && (e.width = this.width), this.duration !== void 0 && (e.duration = this.duration), this.bitrate !== void 0 && (e.bitrate = this.bitrate), this.languages && (e.language = this.languages), this.alternates && (e.alternate = this.alternates.serialize()), this.children && (e.children = this.children.serialize()), e;
   }
   /** MediaType of the linked resource. */
   get mediaType() {
-    return this.type !== void 0 ? l.parse({ mediaType: this.type }) : l.BINARY;
+    return this.type !== void 0 ? a.parse({ mediaType: this.type }) : a.BINARY;
   }
   /** Computes an absolute URL to the link, relative to the given `baseURL`.
    *  If the link's `href` is already absolute, the `baseURL` is ignored.
@@ -818,14 +820,14 @@ class B {
   }
   /** List of URI template parameter keys, if the `Link` is templated. */
   get templateParameters() {
-    return this.templated ? new ye(this.href).parameters : /* @__PURE__ */ new Set();
+    return this.templated ? new Ee(this.href).parameters : /* @__PURE__ */ new Set();
   }
   /** Expands the `Link`'s HREF by replacing URI template variables by the given parameters.
    *  See RFC 6570 on URI template: https://tools.ietf.org/html/rfc6570
    */
   expandTemplate(e) {
-    return new B({
-      href: new ye(this.href).expand(e),
+    return new $({
+      href: new Ee(this.href).expand(e),
       templated: !1
     });
   }
@@ -834,7 +836,7 @@ class B {
    */
   addProperties(e) {
     var t;
-    const i = B.deserialize(this.serialize());
+    const i = $.deserialize(this.serialize());
     return i.properties = i.properties ? (t = i.properties) == null ? void 0 : t.add(e) : new E(e), i;
   }
   /**
@@ -842,7 +844,7 @@ class B {
    */
   get locator() {
     let e = this.href.split("#");
-    return new D({
+    return new W({
       href: e.length > 0 && e[0] !== void 0 ? e[0] : this.href,
       type: this.type ?? "",
       title: this.title,
@@ -852,7 +854,7 @@ class B {
     });
   }
 }
-class V {
+class _ {
   /**
    * Creates a [Links].
    */
@@ -864,8 +866,8 @@ class V {
    */
   static deserialize(e) {
     if (e && e instanceof Array)
-      return new V(
-        e.map((t) => B.deserialize(t)).filter((t) => t !== void 0)
+      return new _(
+        e.map((t) => $.deserialize(t)).filter((t) => t !== void 0)
       );
   }
   /**
@@ -946,7 +948,40 @@ class V {
     return this.items.filter((e) => e.type);
   }
 }
-class q {
+class se {
+  /**
+   * Creates a [Encryption].
+   */
+  constructor(e) {
+    this.algorithm = e.algorithm, this.compression = e.compression, this.originalLength = e.originalLength, this.profile = e.profile, this.scheme = e.scheme;
+  }
+  /**
+   * Parses a [Encryption] from its RWPM JSON representation.
+   */
+  static deserialize(e) {
+    if (e && e.algorithm)
+      return new se({
+        algorithm: e.algorithm,
+        compression: e.compression,
+        originalLength: e.originalLength,
+        profile: e.profile,
+        scheme: e.scheme
+      });
+  }
+  /**
+   * Serializes a [Encryption] to its RWPM JSON representation.
+   */
+  serialize() {
+    const e = { algorithm: this.algorithm };
+    return this.compression !== void 0 && (e.compression = this.compression), this.originalLength !== void 0 && (e.originalLength = this.originalLength), this.profile !== void 0 && (e.profile = this.profile), this.scheme !== void 0 && (e.scheme = this.scheme), e;
+  }
+}
+Object.defineProperty(E.prototype, "encryption", {
+  get: function() {
+    return se.deserialize(this.otherProperties.encrypted);
+  }
+});
+class X {
   /**
    * Creates a [DomRange].
    */
@@ -963,7 +998,7 @@ class q {
     if (t === void 0)
       return;
     let i = C(e.charOffset);
-    return i === void 0 && (i = C(e.offset)), new q({
+    return i === void 0 && (i = C(e.offset)), new X({
       cssSelector: e.cssSelector,
       textNodeIndex: t,
       charOffset: i
@@ -980,7 +1015,7 @@ class q {
     return this.charOffset !== void 0 && (e.charOffset = this.charOffset), e;
   }
 }
-class re {
+class ne {
   /**
    * Creates a [DomRange].
    */
@@ -993,11 +1028,11 @@ class re {
   static deserialize(e) {
     if (!e)
       return;
-    let t = q.deserialize(e.start);
+    let t = X.deserialize(e.start);
     if (t)
-      return new re({
+      return new ne({
         start: t,
-        end: q.deserialize(e.end)
+        end: X.deserialize(e.end)
       });
   }
   /**
@@ -1018,7 +1053,7 @@ x.prototype.getPartialCfi = function() {
 };
 x.prototype.getDomRange = function() {
   var r;
-  return re.deserialize((r = this.otherLocations) == null ? void 0 : r.get("domRange"));
+  return ne.deserialize((r = this.otherLocations) == null ? void 0 : r.get("domRange"));
 };
 x.prototype.fragmentParameters = function() {
   return new Map(
@@ -1056,7 +1091,7 @@ x.prototype.space = function() {
   if (e.length === 4 && !e.some(isNaN))
     return e;
 };
-class se {
+class oe {
   /** Creates a [Price]. */
   constructor(e) {
     this.currency = e.currency, this.value = e.value;
@@ -1072,7 +1107,7 @@ class se {
       return;
     let i = C(e.value);
     if (i !== void 0)
-      return new se({ currency: t, value: i });
+      return new oe({ currency: t, value: i });
   }
   /**
    * Serializes a [Price] to its RWPM JSON representation.
@@ -1081,7 +1116,7 @@ class se {
     return { currency: this.currency, value: this.value };
   }
 }
-class H {
+class j {
   /** Creates a [Acquisition]. */
   constructor(e) {
     this.type = e.type, this.children = e.children;
@@ -1091,14 +1126,14 @@ class H {
    */
   static deserialize(e) {
     if (e && e.type)
-      return new H({
+      return new j({
         type: e.type,
-        children: H.deserializeArray(e.children)
+        children: j.deserializeArray(e.children)
       });
   }
   static deserializeArray(e) {
     if (e instanceof Array)
-      return e.map((t) => H.deserialize(t)).filter((t) => t !== void 0);
+      return e.map((t) => j.deserialize(t)).filter((t) => t !== void 0);
   }
   /**
    * Serializes a [Acquisition] to its RWPM JSON representation.
@@ -1108,7 +1143,7 @@ class H {
     return this.children && (e.children = this.children.map((t) => t.serialize())), e;
   }
 }
-class ne {
+class ae {
   /** Creates a [Price]. */
   constructor(e) {
     this.total = e.total, this.position = e.position;
@@ -1118,7 +1153,7 @@ class ne {
    */
   static deserialize(e) {
     if (e)
-      return new ne({
+      return new ae({
         total: C(e.total),
         position: C(e.position)
       });
@@ -1131,7 +1166,7 @@ class ne {
     return this.total !== void 0 && (e.total = this.total), this.position !== void 0 && (e.position = this.position), e;
   }
 }
-class oe {
+class le {
   /** Creates a [Copies]. */
   constructor(e) {
     this.total = e.total, this.available = e.available;
@@ -1141,7 +1176,7 @@ class oe {
    */
   static deserialize(e) {
     if (e)
-      return new oe({
+      return new le({
         total: C(e.total),
         available: C(e.available)
       });
@@ -1154,7 +1189,7 @@ class oe {
     return this.total !== void 0 && (e.total = this.total), this.available !== void 0 && (e.available = this.available), e;
   }
 }
-class ae {
+class he {
   /** Creates a [Availability]. */
   constructor(e) {
     this.state = e.state, this.since = e.since, this.until = e.until;
@@ -1164,10 +1199,10 @@ class ae {
    */
   static deserialize(e) {
     if (e && e.state)
-      return new ae({
+      return new he({
         state: e.state,
-        since: ve(e.since),
-        until: ve(e.until)
+        since: be(e.since),
+        until: be(e.until)
       });
   }
   /**
@@ -1182,24 +1217,24 @@ E.prototype.getNumberOfItems = function() {
   return C(this.otherProperties.numberOfItems);
 };
 E.prototype.getPrice = function() {
-  return se.deserialize(this.otherProperties.price);
+  return oe.deserialize(this.otherProperties.price);
 };
 E.prototype.getIndirectAcquisitions = function() {
   const r = this.otherProperties.indirectAcquisition;
   if (r && r instanceof Array)
-    return r.map((e) => H.deserialize(e)).filter((e) => e !== void 0);
+    return r.map((e) => j.deserialize(e)).filter((e) => e !== void 0);
 };
 E.prototype.getHolds = function() {
-  return ne.deserialize(this.otherProperties.holds);
+  return ae.deserialize(this.otherProperties.holds);
 };
 E.prototype.getCopies = function() {
-  return oe.deserialize(this.otherProperties.copies);
+  return le.deserialize(this.otherProperties.copies);
 };
 E.prototype.getAvailability = function() {
-  return ae.deserialize(this.otherProperties.availability);
+  return he.deserialize(this.otherProperties.availability);
 };
 E.prototype.getAuthenticate = function() {
-  return B.deserialize(this.otherProperties.authenticate);
+  return $.deserialize(this.otherProperties.authenticate);
 };
 E.prototype.getClipped = function() {
   return this.otherProperties.clipped;
@@ -1219,78 +1254,78 @@ E.prototype.getPage = function() {
 E.prototype.getSpread = function() {
   return this.otherProperties.spread || void 0;
 };
-var R;
+var D;
 (function(r) {
   r.NONE = "none", r.DESCENDANT = "descendant", r.CHILD = "child";
-})(R || (R = {}));
-var P;
+})(D || (D = {}));
+var A;
 (function(r) {
   r.id = "id", r.class = "class", r.tag = "tag", r.attribute = "attribute", r.nthchild = "nthchild", r.nthoftype = "nthoftype";
-})(P || (P = {}));
-const ct = "CssSelectorGenerator";
-function Ee(r = "unknown problem", ...e) {
-  console.warn(`${ct}: ${r}`, ...e);
+})(A || (A = {}));
+const dt = "CssSelectorGenerator";
+function xe(r = "unknown problem", ...e) {
+  console.warn(`${dt}: ${r}`, ...e);
 }
-P.id, P.class, P.tag, P.attribute, Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY;
-function ut(r) {
+A.id, A.class, A.tag, A.attribute, Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY;
+function pt(r) {
   return r instanceof RegExp;
 }
-function dt(r) {
+function ft(r) {
   return r.replace(/[|\\{}()[\]^$+?.]/g, "\\$&").replace(/\*/g, ".+");
 }
-function pt(r) {
+function mt(r) {
   const e = r.map((t) => {
-    if (ut(t))
+    if (pt(t))
       return (i) => t.test(i);
     if (typeof t == "function")
       return (i) => {
         const s = t(i);
-        return typeof s != "boolean" ? (Ee("pattern matcher function invalid", "Provided pattern matching function does not return boolean. It's result will be ignored.", t), !1) : s;
+        return typeof s != "boolean" ? (xe("pattern matcher function invalid", "Provided pattern matching function does not return boolean. It's result will be ignored.", t), !1) : s;
       };
     if (typeof t == "string") {
-      const i = new RegExp("^" + dt(t) + "$");
+      const i = new RegExp("^" + ft(t) + "$");
       return (s) => i.test(s);
     }
-    return Ee("pattern matcher invalid", "Pattern matching only accepts strings, regular expressions and/or functions. This item is invalid and will be ignored.", t), () => !1;
+    return xe("pattern matcher invalid", "Pattern matching only accepts strings, regular expressions and/or functions. This item is invalid and will be ignored.", t), () => !1;
   });
   return (t) => e.some((i) => i(t));
 }
-const ft = "", mt = " > ", gt = " ";
-R.NONE + "", R.NONE, R.DESCENDANT + "", R.DESCENDANT, R.CHILD + "", R.CHILD;
-P.nthoftype, P.tag, P.id, P.class, P.attribute, P.nthchild;
-pt([
+const gt = "", yt = " > ", vt = " ";
+D.NONE + "", D.NONE, D.DESCENDANT + "", D.DESCENDANT, D.CHILD + "", D.CHILD;
+A.nthoftype, A.tag, A.id, A.class, A.attribute, A.nthchild;
+mt([
   "class",
   "id",
   // Angular attributes
   "ng-*"
 ]);
-class Y {
+class K {
 }
-function be(r) {
+function Se(r) {
   return r.split("").reverse().join("");
 }
-function yt(r, e, t) {
-  const i = be(e);
+function Et(r, e, t) {
+  const i = Se(e);
   return t.map((s) => {
-    const n = Math.max(0, s.end - e.length - s.errors), o = be(r.slice(n, s.end));
+    const n = Math.max(0, s.end - e.length - s.errors), o = Se(r.slice(n, s.end));
     return {
-      start: Fe(o, i, s.errors).reduce((c, h) => s.end - h.end < c ? s.end - h.end : c, s.end),
+      start: Be(o, i, s.errors).reduce((c, h) => s.end - h.end < c ? s.end - h.end : c, s.end),
       end: s.end,
       errors: s.errors
     };
   });
 }
-function Z(r) {
+function Q(r) {
   return (r | -r) >> 31 & 1;
 }
-function xe(r, e, t, i) {
+function we(r, e, t, i) {
   let s = r.P[t], n = r.M[t];
-  const o = i >>> 31, a = e[t] | o, c = a | n, h = (a & s) + s ^ s | a;
+  const o = i >>> 31, l = e[t] | o, c = l | n, h = (l & s) + s ^ s | l;
   let u = n | ~(h | s), p = s & h;
-  const d = Z(u & r.lastRowMask[t]) - Z(p & r.lastRowMask[t]);
-  return u <<= 1, p <<= 1, p |= o, u |= Z(i) - o, s = p | ~(c | u), n = u & c, r.P[t] = s, r.M[t] = n, d;
+  const d = Q(u & r.lastRowMask[t]) - Q(p & r.lastRowMask[t]);
+  return u <<= 1, p <<= 1, p |= o, u |= Q(i) - o, s = p | ~(c | u), n = u & c, r.P[t] = s, r.M[t] = n, d;
 }
-function Fe(r, e, t) {
+function Be(r, e, t) {
   if (e.length === 0)
     return [];
   t = Math.min(t, e.length);
@@ -1300,9 +1335,9 @@ function Fe(r, e, t) {
     lastRowMask: new Uint32Array(n + 1)
   };
   o.lastRowMask.fill(1 << 31), o.lastRowMask[n] = 1 << (e.length - 1) % s;
-  const a = new Uint32Array(n + 1), c = /* @__PURE__ */ new Map(), h = [];
+  const l = new Uint32Array(n + 1), c = /* @__PURE__ */ new Map(), h = [];
   for (let d = 0; d < 256; d++)
-    h.push(a);
+    h.push(l);
   for (let d = 0; d < e.length; d += 1) {
     const f = e.charCodeAt(d);
     if (c.has(f))
@@ -1329,10 +1364,10 @@ function Fe(r, e, t) {
   for (let d = 0; d < r.length; d += 1) {
     const f = r.charCodeAt(d);
     let g;
-    f < h.length ? g = h[f] : (g = c.get(f), typeof g > "u" && (g = a));
+    f < h.length ? g = h[f] : (g = c.get(f), typeof g > "u" && (g = l));
     let m = 0;
     for (let v = 0; v <= u; v += 1)
-      m = xe(o, g, v, m), p[v] += m;
+      m = we(o, g, v, m), p[v] += m;
     if (p[u] - m <= t && u < n && (g[u + 1] & 1 || m < 0)) {
       u += 1, o.P[u] = -1, o.M[u] = 0;
       let v;
@@ -1341,7 +1376,7 @@ function Fe(r, e, t) {
         v = S === 0 ? s : S;
       } else
         v = s;
-      p[u] = p[u - 1] + v - m + xe(o, g, u, m);
+      p[u] = p[u - 1] + v - m + we(o, g, u, m);
     } else
       for (; u > 0 && p[u] >= t + s; )
         u -= 1;
@@ -1353,11 +1388,11 @@ function Fe(r, e, t) {
   }
   return i;
 }
-function vt(r, e, t) {
-  const i = Fe(r, e, t);
-  return yt(r, e, i);
+function bt(r, e, t) {
+  const i = Be(r, e, t);
+  return Et(r, e, i);
 }
-function Be(r, e, t) {
+function $e(r, e, t) {
   let i = 0;
   const s = [];
   for (; i !== -1; )
@@ -1366,40 +1401,40 @@ function Be(r, e, t) {
       end: i + e.length,
       errors: 0
     }), i += 1);
-  return s.length > 0 ? s : vt(r, e, t);
+  return s.length > 0 ? s : bt(r, e, t);
 }
-function Se(r, e) {
-  return e.length === 0 || r.length === 0 ? 0 : 1 - Be(r, e, e.length)[0].errors / e.length;
+function Te(r, e) {
+  return e.length === 0 || r.length === 0 ? 0 : 1 - $e(r, e, e.length)[0].errors / e.length;
 }
-function Et(r, e, t = {}) {
+function xt(r, e, t = {}) {
   if (e.length === 0)
     return null;
-  const i = Math.min(256, e.length / 2), s = Be(r, e, i);
+  const i = Math.min(256, e.length / 2), s = $e(r, e, i);
   if (s.length === 0)
     return null;
-  const n = (a) => {
-    const d = 1 - a.errors / e.length, f = t.prefix ? Se(
+  const n = (l) => {
+    const d = 1 - l.errors / e.length, f = t.prefix ? Te(
       r.slice(
-        Math.max(0, a.start - t.prefix.length),
-        a.start
+        Math.max(0, l.start - t.prefix.length),
+        l.start
       ),
       t.prefix
-    ) : 1, g = t.suffix ? Se(
-      r.slice(a.end, a.end + t.suffix.length),
+    ) : 1, g = t.suffix ? Te(
+      r.slice(l.end, l.end + t.suffix.length),
       t.suffix
     ) : 1;
     let m = 1;
-    typeof t.hint == "number" && (m = 1 - Math.abs(a.start - t.hint) / r.length);
+    typeof t.hint == "number" && (m = 1 - Math.abs(l.start - t.hint) / r.length);
     const v = 50 * d + 20 * f + 20 * g + 2 * m, S = 50 + 20 + 20 + 2;
     return v / S;
-  }, o = s.map((a) => ({
-    start: a.start,
-    end: a.end,
-    score: n(a)
+  }, o = s.map((l) => ({
+    start: l.start,
+    end: l.end,
+    score: n(l)
   }));
-  return o.sort((a, c) => c.score - a.score), o[0];
+  return o.sort((l, c) => c.score - l.score), o[0];
 }
-function J(r, e, t) {
+function ee(r, e, t) {
   const i = t === 1 ? e : e - 1;
   if (r.charAt(i).trim() !== "")
     return e;
@@ -1409,7 +1444,7 @@ function J(r, e, t) {
   const o = s.length - n.length;
   return t === 2 ? e - o : e + o;
 }
-function we(r, e) {
+function Ce(r, e) {
   const t = r.commonAncestorContainer.ownerDocument.createNodeIterator(
     r.commonAncestorContainer,
     NodeFilter.SHOW_TEXT
@@ -1419,19 +1454,19 @@ function we(r, e) {
     n = t.nextNode();
   e === 2 && (n = t.previousNode());
   let o = -1;
-  const a = () => {
+  const l = () => {
     if (n = e === 1 ? t.nextNode() : t.previousNode(), n) {
       const c = n.textContent, h = e === 1 ? 0 : c.length;
-      o = J(c, h, e);
+      o = ee(c, h, e);
     }
   };
   for (; n && o === -1 && n !== s; )
-    a();
+    l();
   if (n && o >= 0)
     return { node: n, offset: o };
   throw new RangeError("No text nodes with non-whitespace text found in range");
 }
-function bt(r) {
+function St(r) {
   if (!r.toString().trim().length)
     throw new RangeError("Range contains no non-whitespace text");
   if (r.startContainer.nodeType !== Node.TEXT_NODE)
@@ -1441,13 +1476,13 @@ function bt(r) {
   const e = r.cloneRange();
   let t = !1, i = !1;
   const s = {
-    start: J(
+    start: ee(
       r.startContainer.textContent,
       r.startOffset,
       1
       /* Forwards */
     ),
-    end: J(
+    end: ee(
       r.endContainer.textContent,
       r.endOffset,
       2
@@ -1457,7 +1492,7 @@ function bt(r) {
   if (s.start >= 0 && (e.setStart(r.startContainer, s.start), t = !0), s.end > 0 && (e.setEnd(r.endContainer, s.end), i = !0), t && i)
     return e;
   if (!t) {
-    const { node: n, offset: o } = we(
+    const { node: n, offset: o } = Ce(
       e,
       1
       /* Forwards */
@@ -1465,7 +1500,7 @@ function bt(r) {
     n && o >= 0 && e.setStart(n, o);
   }
   if (!i) {
-    const { node: n, offset: o } = we(
+    const { node: n, offset: o } = Ce(
       e,
       2
       /* Backwards */
@@ -1474,7 +1509,7 @@ function bt(r) {
   }
   return e;
 }
-function Ue(r) {
+function ke(r) {
   var e;
   switch (r.nodeType) {
     case Node.ELEMENT_NODE:
@@ -1484,28 +1519,28 @@ function Ue(r) {
       return 0;
   }
 }
-function Te(r) {
+function Pe(r) {
   let e = r.previousSibling, t = 0;
   for (; e; )
-    t += Ue(e), e = e.previousSibling;
+    t += ke(e), e = e.previousSibling;
   return t;
 }
-function ke(r, ...e) {
+function Ve(r, ...e) {
   let t = e.shift();
   const i = r.ownerDocument.createNodeIterator(
     r,
     NodeFilter.SHOW_TEXT
   ), s = [];
-  let n = i.nextNode(), o, a = 0;
+  let n = i.nextNode(), o, l = 0;
   for (; t !== void 0 && n; )
-    o = n, a + o.data.length > t ? (s.push({ node: o, offset: t - a }), t = e.shift()) : (n = i.nextNode(), a += o.data.length);
-  for (; t !== void 0 && o && a === t; )
+    o = n, l + o.data.length > t ? (s.push({ node: o, offset: t - l }), t = e.shift()) : (n = i.nextNode(), l += o.data.length);
+  for (; t !== void 0 && o && l === t; )
     s.push({ node: o, offset: o.data.length }), t = e.shift();
   if (t !== void 0)
     throw new RangeError("Offset exceeds text length");
   return s;
 }
-class M {
+class N {
   constructor(e, t) {
     if (t < 0)
       throw new Error("Offset is invalid");
@@ -1522,8 +1557,8 @@ class M {
       throw new Error("Parent is not an ancestor of current element");
     let t = this.element, i = this.offset;
     for (; t !== e; )
-      i += Te(t), t = t.parentElement;
-    return new M(t, i);
+      i += Pe(t), t = t.parentElement;
+    return new N(t, i);
   }
   /**
    * Resolve the position to a specific text node and offset within that node.
@@ -1544,7 +1579,7 @@ class M {
    */
   resolve(e = {}) {
     try {
-      return ke(this.element, this.offset)[0];
+      return Ve(this.element, this.offset)[0];
     } catch (t) {
       if (this.offset === 0 && e.direction !== void 0) {
         const i = document.createTreeWalker(
@@ -1567,9 +1602,9 @@ class M {
   static fromCharOffset(e, t) {
     switch (e.nodeType) {
       case Node.TEXT_NODE:
-        return M.fromPoint(e, t);
+        return N.fromPoint(e, t);
       case Node.ELEMENT_NODE:
-        return new M(e, t);
+        return new N(e, t);
       default:
         throw new Error("Node is not an element or text node");
     }
@@ -1587,16 +1622,16 @@ class M {
           throw new Error("Text node offset is out of range");
         if (!e.parentElement)
           throw new Error("Text node has no parent");
-        const i = Te(e) + t;
-        return new M(e.parentElement, i);
+        const i = Pe(e) + t;
+        return new N(e.parentElement, i);
       }
       case Node.ELEMENT_NODE: {
         if (t < 0 || t > e.childNodes.length)
           throw new Error("Child node offset is out of range");
         let i = 0;
         for (let s = 0; s < t; s++)
-          i += Ue(e.childNodes[s]);
-        return new M(e, i);
+          i += ke(e.childNodes[s]);
+        return new N(e, i);
       }
       default:
         throw new Error("Point is not in an element or text node");
@@ -1629,7 +1664,7 @@ class z {
    */
   toRange() {
     let e, t;
-    this.start.element === this.end.element && this.start.offset <= this.end.offset ? [e, t] = ke(
+    this.start.element === this.end.element && this.start.offset <= this.end.offset ? [e, t] = Ve(
       this.start.element,
       this.start.offset,
       this.end.offset
@@ -1647,10 +1682,10 @@ class z {
    * Create a TextRange from a (DOM) Range
    */
   static fromRange(e) {
-    const t = M.fromPoint(
+    const t = N.fromPoint(
       e.startContainer,
       e.startOffset
-    ), i = M.fromPoint(e.endContainer, e.endOffset);
+    ), i = N.fromPoint(e.endContainer, e.endOffset);
     return new z(t, i);
   }
   /**
@@ -1659,8 +1694,8 @@ class z {
    */
   static fromOffsets(e, t, i) {
     return new z(
-      new M(e, t),
-      new M(e, i)
+      new N(e, t),
+      new N(e, i)
     );
   }
   /**
@@ -1668,23 +1703,23 @@ class z {
    * whitespace
    */
   static trimmedRange(e) {
-    return bt(z.fromRange(e).toRange());
+    return St(z.fromRange(e).toRange());
   }
 }
-class _ {
+class G {
   constructor(e, t, i) {
     this.root = e, this.start = t, this.end = i;
   }
   static fromRange(e, t) {
     const i = z.fromRange(t).relativeTo(e);
-    return new _(
+    return new G(
       e,
       i.start.offset,
       i.end.offset
     );
   }
   static fromSelector(e, t) {
-    return new _(e, t.start, t.end);
+    return new G(e, t.start, t.end);
   }
   toSelector() {
     return {
@@ -1697,7 +1732,7 @@ class _ {
     return z.fromOffsets(this.root, this.start, this.end).toRange();
   }
 }
-class X {
+class Y {
   /**
    * @param root - A root element from which to anchor.
    */
@@ -1710,15 +1745,15 @@ class X {
    * Will throw if `range` does not contain any text nodes.
    */
   static fromRange(e, t) {
-    const i = e.textContent, s = z.fromRange(t).relativeTo(e), n = s.start.offset, o = s.end.offset, a = 32;
-    return new X(e, i.slice(n, o), {
-      prefix: i.slice(Math.max(0, n - a), n),
-      suffix: i.slice(o, Math.min(i.length, o + a))
+    const i = e.textContent, s = z.fromRange(t).relativeTo(e), n = s.start.offset, o = s.end.offset, l = 32;
+    return new Y(e, i.slice(n, o), {
+      prefix: i.slice(Math.max(0, n - l), n),
+      suffix: i.slice(o, Math.min(i.length, o + l))
     });
   }
   static fromSelector(e, t) {
     const { prefix: i, suffix: s } = t;
-    return new X(e, t.exact, { prefix: i, suffix: s });
+    return new Y(e, t.exact, { prefix: i, suffix: s });
   }
   toSelector() {
     return {
@@ -1732,26 +1767,26 @@ class X {
     return this.toPositionAnchor(e).toRange();
   }
   toPositionAnchor(e = {}) {
-    const t = this.root.textContent, i = Et(t, this.exact, {
+    const t = this.root.textContent, i = xt(t, this.exact, {
       ...this.context,
       hint: e.hint
     });
     if (!i)
       throw new Error("Quote not found");
-    return new _(this.root, i.start, i.end);
+    return new G(this.root, i.start, i.end);
   }
 }
-function xt(r) {
+function wt(r) {
   const e = r.tagName.toUpperCase();
   return e === "IMG" || e === "VIDEO" || e === "AUDIO" || e === "IFRAME" || e === "OBJECT" || e === "EMBED" || e === "CANVAS";
 }
-function le(r, e) {
+function ce(r, e) {
   try {
     const t = e.locations, i = e.text;
     if (i && i.highlight) {
       let s;
       t && t.getCssSelector() && (s = r.querySelector(t.getCssSelector())), s || (s = r.body);
-      const n = new X(s, i.highlight, {
+      const n = new Y(s, i.highlight, {
         prefix: i.before,
         suffix: i.after
       });
@@ -1770,7 +1805,7 @@ function le(r, e) {
       }
       if (s) {
         const n = r.createRange();
-        return s.childNodes.length === 0 || xt(s) ? (n.selectNode(s), n) : (n.setStartBefore(s), n.setEndAfter(s), n);
+        return s.childNodes.length === 0 || wt(s) ? (n.selectNode(s), n) : (n.setStartBefore(s), n.setEndAfter(s), n);
       }
     }
   } catch (t) {
@@ -1778,7 +1813,7 @@ function le(r, e) {
   }
   return null;
 }
-function St(r, e) {
+function Tt(r, e) {
   let t = r.getClientRects();
   t.length || r.commonAncestorContainer.nodeType === Node.ELEMENT_NODE && (t = r.commonAncestorContainer.getClientRects());
   const i = 1, s = [];
@@ -1791,31 +1826,31 @@ function St(r, e) {
       top: h.top,
       width: h.width
     });
-  const n = He(
+  const n = je(
     s,
     i,
     e
-  ), o = Tt(n, i), a = $e(o), c = 2 * 2;
-  for (let h = a.length - 1; h >= 0; h--) {
-    const u = a[h];
+  ), o = Pt(n, i), l = He(o), c = 2 * 2;
+  for (let h = l.length - 1; h >= 0; h--) {
+    const u = l[h];
     if (!(u.width * u.height > c))
-      if (a.length > 1)
-        a.splice(h, 1);
+      if (l.length > 1)
+        l.splice(h, 1);
       else
         break;
   }
-  return a;
+  return l;
 }
-function He(r, e, t) {
+function je(r, e, t) {
   for (let i = 0; i < r.length; i++)
     for (let s = i + 1; s < r.length; s++) {
       const n = r[i], o = r[s];
       if (n === o)
         continue;
-      const a = N(n.top, o.top, e) && N(n.bottom, o.bottom, e), c = N(n.left, o.left, e) && N(n.right, o.right, e);
-      if ((c && !t || a && !c) && je(n, o, e)) {
-        const d = r.filter((g) => g !== n && g !== o), f = wt(n, o);
-        return d.push(f), He(
+      const l = M(n.top, o.top, e) && M(n.bottom, o.bottom, e), c = M(n.left, o.left, e) && M(n.right, o.right, e);
+      if ((c && !t || l && !c) && qe(n, o, e)) {
+        const d = r.filter((g) => g !== n && g !== o), f = Ct(n, o);
+        return d.push(f), je(
           d,
           e,
           t
@@ -1824,7 +1859,7 @@ function He(r, e, t) {
     }
   return r;
 }
-function wt(r, e) {
+function Ct(r, e) {
   const t = Math.min(r.left, e.left), i = Math.max(r.right, e.right), s = Math.min(r.top, e.top), n = Math.max(r.bottom, e.bottom);
   return {
     bottom: n,
@@ -1835,7 +1870,7 @@ function wt(r, e) {
     width: i - t
   };
 }
-function Tt(r, e) {
+function Pt(r, e) {
   const t = new Set(r);
   for (const i of r) {
     if (!(i.width > 1 && i.height > 1)) {
@@ -1843,40 +1878,40 @@ function Tt(r, e) {
       continue;
     }
     for (const n of r)
-      if (i !== n && t.has(n) && Ct(n, i, e)) {
+      if (i !== n && t.has(n) && At(n, i, e)) {
         t.delete(i);
         break;
       }
   }
   return Array.from(t);
 }
-function Ct(r, e, t) {
-  return $(r, e.left, e.top, t) && $(r, e.right, e.top, t) && $(r, e.left, e.bottom, t) && $(r, e.right, e.bottom, t);
+function At(r, e, t) {
+  return H(r, e.left, e.top, t) && H(r, e.right, e.top, t) && H(r, e.left, e.bottom, t) && H(r, e.right, e.bottom, t);
 }
-function $(r, e, t, i) {
-  return (r.left < e || N(r.left, e, i)) && (r.right > e || N(r.right, e, i)) && (r.top < t || N(r.top, t, i)) && (r.bottom > t || N(r.bottom, t, i));
+function H(r, e, t, i) {
+  return (r.left < e || M(r.left, e, i)) && (r.right > e || M(r.right, e, i)) && (r.top < t || M(r.top, t, i)) && (r.bottom > t || M(r.bottom, t, i));
 }
-function $e(r) {
+function He(r) {
   for (let e = 0; e < r.length; e++)
     for (let t = e + 1; t < r.length; t++) {
       const i = r[e], s = r[t];
-      if (i !== s && je(i, s, -1)) {
+      if (i !== s && qe(i, s, -1)) {
         let n = [], o;
-        const a = Ce(i, s);
-        if (a.length === 1)
-          n = a, o = i;
+        const l = Ae(i, s);
+        if (l.length === 1)
+          n = l, o = i;
         else {
-          const h = Ce(s, i);
-          a.length < h.length ? (n = a, o = i) : (n = h, o = s);
+          const h = Ae(s, i);
+          l.length < h.length ? (n = l, o = i) : (n = h, o = s);
         }
         const c = r.filter((h) => h !== o);
-        return Array.prototype.push.apply(c, n), $e(c);
+        return Array.prototype.push.apply(c, n), He(c);
       }
     }
   return r;
 }
-function Ce(r, e) {
-  const t = Pt(e, r);
+function Ae(r, e) {
+  const t = Mt(e, r);
   if (t.height === 0 || t.width === 0)
     return [r];
   const i = [];
@@ -1926,7 +1961,7 @@ function Ce(r, e) {
   }
   return i;
 }
-function Pt(r, e) {
+function Mt(r, e) {
   const t = Math.max(r.left, e.left), i = Math.min(r.right, e.right), s = Math.max(r.top, e.top), n = Math.min(r.bottom, e.bottom);
   return {
     bottom: n,
@@ -1937,36 +1972,36 @@ function Pt(r, e) {
     width: Math.max(0, i - t)
   };
 }
-function je(r, e, t) {
-  return (r.left < e.right || t >= 0 && N(r.left, e.right, t)) && (e.left < r.right || t >= 0 && N(e.left, r.right, t)) && (r.top < e.bottom || t >= 0 && N(r.top, e.bottom, t)) && (e.top < r.bottom || t >= 0 && N(e.top, r.bottom, t));
+function qe(r, e, t) {
+  return (r.left < e.right || t >= 0 && M(r.left, e.right, t)) && (e.left < r.right || t >= 0 && M(e.left, r.right, t)) && (r.top < e.bottom || t >= 0 && M(r.top, e.bottom, t)) && (e.top < r.bottom || t >= 0 && M(e.top, r.bottom, t));
 }
-function N(r, e, t) {
+function M(r, e, t) {
   return Math.abs(r - e) <= t;
 }
-function Ve(r) {
+function _e(r) {
   const e = {}, t = r.document.documentElement.style;
   for (const i in r.document.documentElement.style)
     Object.hasOwn(t, i) && !Number.isNaN(Number.parseInt(i)) && (e[t[i]] = t.getPropertyValue(t[i]));
   return e;
 }
 function Nt(r, e) {
-  const t = Ve(r);
+  const t = _e(r);
   Object.keys(t).forEach((i) => {
-    e.hasOwnProperty(i) || he(r, i);
+    e.hasOwnProperty(i) || ue(r, i);
   }), Object.entries(e).forEach(([i, s]) => {
-    t[i] !== s && G(r, i, s);
+    t[i] !== s && Z(r, i, s);
   });
 }
-function Pe(r, e) {
+function Me(r, e) {
   return r.document.documentElement.style.getPropertyValue(e);
 }
-function G(r, e, t) {
+function Z(r, e, t) {
   r.document.documentElement.style.setProperty(e, t);
 }
-function he(r, e) {
+function ue(r, e) {
   r.document.documentElement.style.removeProperty(e);
 }
-const At = (r) => {
+const Ot = (r) => {
   if (r.startsWith("rgb")) {
     const e = r.match(/rgb\((\d+),\s(\d+),\s(\d+)(?:,\s(\d+))?\)/);
     if (e)
@@ -1994,20 +2029,20 @@ const At = (r) => {
       };
   }
   return { r: 0, g: 0, b: 0, a: 1 };
-}, Mt = (r) => 0.2126 * r.r * r.a + 0.7152 * r.g * r.a + 0.0722 * r.b * r.a, Ot = (r) => {
-  const e = At(r);
-  return Mt(e) < 128;
+}, It = (r) => 0.2126 * r.r * r.a + 0.7152 * r.g * r.a + 0.0722 * r.b * r.a, Lt = (r) => {
+  const e = Ot(r);
+  return It(e) < 128;
 };
-var It = /* @__PURE__ */ ((r) => (r.Wrap = "wrap", r.Viewport = "viewport", r.Bounds = "bounds", r.Page = "page", r))(It || {}), Lt = /* @__PURE__ */ ((r) => (r.Boxes = "boxes", r.Bounds = "bounds", r))(Lt || {});
-const Rt = () => "Highlight" in window, Ne = ["IMG", "IMAGE", "AUDIO", "VIDEO", "SVG"];
-class zt {
+var Rt = /* @__PURE__ */ ((r) => (r.Wrap = "wrap", r.Viewport = "viewport", r.Bounds = "bounds", r.Page = "page", r))(Rt || {}), Dt = /* @__PURE__ */ ((r) => (r.Boxes = "boxes", r.Bounds = "bounds", r))(Dt || {});
+const zt = () => "Highlight" in window, Ne = ["IMG", "IMAGE", "AUDIO", "VIDEO", "SVG"];
+class Wt {
   /**
    * Creates a DecorationGroup object
    * @param id Unique HTML ID-adhering name of the group
    * @param name Human-readable name of the group
    */
   constructor(e, t, i, s) {
-    this.wnd = e, this.comms = t, this.id = i, this.name = s, this.items = [], this.lastItemId = 0, this.container = void 0, this.activateable = !1, this.experimentalHighlights = !1, this.currentRender = 0, Rt() && (this.experimentalHighlights = !0, this.notTextFlag = /* @__PURE__ */ new Map());
+    this.wnd = e, this.comms = t, this.id = i, this.name = s, this.items = [], this.lastItemId = 0, this.container = void 0, this.activateable = !1, this.experimentalHighlights = !1, this.currentRender = 0, zt() && (this.experimentalHighlights = !0, this.notTextFlag = /* @__PURE__ */ new Map());
   }
   get activeable() {
     return this.activateable;
@@ -2020,14 +2055,14 @@ class zt {
    * @param decoration Decoration to add
    */
   add(e) {
-    var o, a, c, h;
-    const t = `${this.id}-${this.lastItemId++}`, i = le(this.wnd.document, e.locator);
+    var o, l, c, h;
+    const t = `${this.id}-${this.lastItemId++}`, i = ce(this.wnd.document, e.locator);
     if (!i) {
       this.comms.log("Can't locate DOM range for decoration", e);
       return;
     }
     const s = i.commonAncestorContainer;
-    s.nodeType !== Node.TEXT_NODE && this.experimentalHighlights && (Ne.includes(s.nodeName.toUpperCase()) && ((o = this.notTextFlag) == null || o.set(t, !0)), s.querySelector(Ne.join(", ").toLowerCase()) && ((a = this.notTextFlag) == null || a.set(t, !0)), (((c = s.textContent) == null ? void 0 : c.trim()) || "").length === 0 && ((h = this.notTextFlag) == null || h.set(t, !0)));
+    s.nodeType !== Node.TEXT_NODE && this.experimentalHighlights && (Ne.includes(s.nodeName.toUpperCase()) && ((o = this.notTextFlag) == null || o.set(t, !0)), s.querySelector(Ne.join(", ").toLowerCase()) && ((l = this.notTextFlag) == null || l.set(t, !0)), (((c = s.textContent) == null ? void 0 : c.trim()) || "").length === 0 && ((h = this.notTextFlag) == null || h.set(t, !0)));
     const n = {
       decoration: e,
       id: t,
@@ -2095,23 +2130,23 @@ class zt {
       getComputedStyle(this.wnd.document.documentElement).getPropertyValue(
         "column-count"
       )
-    ), n = i / (s || 1), o = this.wnd.document.scrollingElement, a = o.scrollLeft, c = o.scrollTop, h = (y, b, I) => {
-      var ce, ue, de, pe, fe, me;
-      if (y.style.position = "absolute", ((ue = (ce = e.decoration) == null ? void 0 : ce.style) == null ? void 0 : ue.width) === "viewport") {
+    ), n = i / (s || 1), o = this.wnd.document.scrollingElement, l = o.scrollLeft, c = o.scrollTop, h = (y, b, I) => {
+      var de, pe, fe, me, ge, ye;
+      if (y.style.position = "absolute", ((pe = (de = e.decoration) == null ? void 0 : de.style) == null ? void 0 : pe.width) === "viewport") {
         y.style.width = `${i}px`, y.style.height = `${b.height}px`;
-        let K = Math.floor(b.left / i) * i;
-        y.style.left = `${K + a}px`, y.style.top = `${b.top + c}px`;
-      } else if (((pe = (de = e.decoration) == null ? void 0 : de.style) == null ? void 0 : pe.width) === "bounds")
-        y.style.width = `${I.width}px`, y.style.height = `${b.height}px`, y.style.left = `${I.left + a}px`, y.style.top = `${b.top + c}px`;
-      else if (((me = (fe = e.decoration) == null ? void 0 : fe.style) == null ? void 0 : me.width) === "page") {
+        let J = Math.floor(b.left / i) * i;
+        y.style.left = `${J + l}px`, y.style.top = `${b.top + c}px`;
+      } else if (((me = (fe = e.decoration) == null ? void 0 : fe.style) == null ? void 0 : me.width) === "bounds")
+        y.style.width = `${I.width}px`, y.style.height = `${b.height}px`, y.style.left = `${I.left + l}px`, y.style.top = `${b.top + c}px`;
+      else if (((ye = (ge = e.decoration) == null ? void 0 : ge.style) == null ? void 0 : ye.width) === "page") {
         y.style.width = `${n}px`, y.style.height = `${b.height}px`;
-        let K = Math.floor(b.left / n) * n;
-        y.style.left = `${K + a}px`, y.style.top = `${b.top + c}px`;
+        let J = Math.floor(b.left / n) * n;
+        y.style.left = `${J + l}px`, y.style.top = `${b.top + c}px`;
       } else
-        y.style.width = `${b.width}px`, y.style.height = `${b.height}px`, y.style.left = `${b.left + a}px`, y.style.top = `${b.top + c}px`;
+        y.style.width = `${b.width}px`, y.style.height = `${b.height}px`, y.style.left = `${b.left + l}px`, y.style.top = `${b.top + c}px`;
     }, u = e.range.getBoundingClientRect();
     let p = this.wnd.document.createElement("template");
-    const d = Pe(this.wnd, "--USER__appearance") === "readium-night-on" || Ot(Pe(this.wnd, "--USER__backgroundColor"));
+    const d = Me(this.wnd, "--USER__appearance") === "readium-night-on" || Lt(Me(this.wnd, "--USER__backgroundColor"));
     p.innerHTML = `
         <div
             class="r2-highlight-0"
@@ -2130,7 +2165,7 @@ class zt {
       const y = f.cloneNode(!0);
       y.style.setProperty("pointer-events", "none"), h(y, u, u), t.append(y);
     } else {
-      let y = St(
+      let y = Tt(
         e.range,
         !0
         // doNotMergeHorizontallyAlignedRects
@@ -2175,7 +2210,7 @@ class zt {
     this.experimentalHighlights && this.wnd.CSS.highlights.delete(this.id), this.container && (this.container.remove(), this.container = void 0);
   }
 }
-const qe = class Q extends Y {
+const Xe = class te extends K {
   constructor() {
     super(...arguments), this.resizeFrame = 0, this.lastGroupId = 0, this.groups = /* @__PURE__ */ new Map(), this.handleResizer = this.handleResize.bind(this);
   }
@@ -2190,9 +2225,9 @@ const qe = class Q extends Y {
     }, 50);
   }
   mount(e, t) {
-    return this.wnd = e, t.register("decorate", Q.moduleName, (i, s) => {
+    return this.wnd = e, t.register("decorate", te.moduleName, (i, s) => {
       const n = i;
-      n.decoration && n.decoration.locator && (n.decoration.locator = D.deserialize(n.decoration.locator)), this.groups.has(n.group) || this.groups.set(n.group, new zt(
+      n.decoration && n.decoration.locator && (n.decoration.locator = W.deserialize(n.decoration.locator)), this.groups.has(n.group) || this.groups.set(n.group, new Wt(
         e,
         t,
         `readium-decoration-${this.lastGroupId++}`,
@@ -2217,12 +2252,12 @@ const qe = class Q extends Y {
     }), this.resizeObserver = new ResizeObserver(() => e.requestAnimationFrame(() => this.handleResize())), this.resizeObserver.observe(e.document.body), e.addEventListener("orientationchange", this.handleResizer), e.addEventListener("resize", this.handleResizer), t.log("Decorator Mounted"), !0;
   }
   unmount(e, t) {
-    return e.removeEventListener("orientationchange", this.handleResizer), e.removeEventListener("resize", this.handleResizer), t.unregisterAll(Q.moduleName), this.resizeObserver.disconnect(), this.cleanup(), t.log("Decorator Unmounted"), !0;
+    return e.removeEventListener("orientationchange", this.handleResizer), e.removeEventListener("resize", this.handleResizer), t.unregisterAll(te.moduleName), this.resizeObserver.disconnect(), this.cleanup(), t.log("Decorator Unmounted"), !0;
   }
 };
-qe.moduleName = "decorator";
-let Dt = qe;
-const Ae = "readium-snapper-style", _e = class ee extends Y {
+Xe.moduleName = "decorator";
+let Ft = Xe;
+const Oe = "readium-snapper-style", Ge = class ie extends K {
   constructor() {
     super(...arguments), this.protected = !1;
   }
@@ -2235,56 +2270,60 @@ const Ae = "readium-snapper-style", _e = class ee extends Y {
   }
   mount(e, t) {
     const i = e.document.createElement("style");
-    return i.dataset.readium = "true", i.id = Ae, i.textContent = this.buildStyles(), e.document.head.appendChild(i), t.register("protect", ee.moduleName, (s, n) => {
+    return i.dataset.readium = "true", i.id = Oe, i.textContent = this.buildStyles(), e.document.head.appendChild(i), t.register("protect", ie.moduleName, (s, n) => {
       this.protected = !0, i.textContent = this.buildStyles(), n(!0);
-    }), t.register("unprotect", ee.moduleName, (s, n) => {
+    }), t.register("unprotect", ie.moduleName, (s, n) => {
       this.protected = !1, i.textContent = this.buildStyles(), n(!0);
     }), t.log("Snapper Mounted"), !0;
   }
   unmount(e, t) {
     var i;
-    return (i = e.document.getElementById(Ae)) == null || i.remove(), t.log("Snapper Unmounted"), !0;
+    return (i = e.document.getElementById(Oe)) == null || i.remove(), t.log("Snapper Unmounted"), !0;
   }
 };
-_e.moduleName = "snapper";
-let Xe = _e;
-function W(r) {
+Ge.moduleName = "snapper";
+let Ye = Ge;
+function F(r) {
   return r.document.body.dir.toLowerCase() === "rtl";
 }
-function Ge(r) {
+function Ze(r) {
   return parseInt(
     r.getComputedStyle(
       r.document.documentElement
     ).getPropertyValue("column-count")
   );
 }
-function Me(r) {
+function Ie(r) {
   const e = getComputedStyle(r), t = parseFloat(e.paddingTop || "0"), i = parseFloat(e.paddingBottom || "0");
   return r.clientHeight - t - i;
 }
-function Oe(r) {
-  const e = Ge(r);
+function Le(r) {
+  const e = Ze(r);
   if (!e)
     return !1;
   const t = r.document.querySelectorAll("div[id^='readium-virtual-page']");
   for (const h of t)
     h.remove();
-  const i = t.length, s = r.document.scrollingElement.scrollWidth, n = r.visualViewport.width, a = Math.round(s / n * e) % e, c = e === 1 || a === 0 ? 0 : e - a;
+  const i = t.length, s = r.document.scrollingElement.scrollWidth, n = r.visualViewport.width, l = Math.round(s / n * e) % e, c = e === 1 || l === 0 ? 0 : e - l;
   if (c > 0)
     for (let h = 0; h < c; h++) {
       const u = r.document.createElement("div");
-      u.setAttribute("id", `readium-virtual-page-${h}`), u.dataset.readium = "true", CSS.supports("break-before", "column") ? u.style.breakBefore = "column" : (CSS.supports("break-inside", "avoid-column") && (u.style.breakInside = "avoid-column"), u.style.height = Me(r.document.documentElement) + "px"), u.innerHTML = "&#8203;", r.document.body.appendChild(u);
+      u.setAttribute("id", `readium-virtual-page-${h}`), u.dataset.readium = "true", CSS.supports("break-before", "column") ? u.style.breakBefore = "column" : (CSS.supports("break-inside", "avoid-column") && (u.style.breakInside = "avoid-column"), u.style.height = Ie(r.document.documentElement) + "px"), u.innerHTML = "&#8203;", r.document.body.appendChild(u);
     }
   return i !== c;
 }
-function Wt(r) {
+function Ut(r) {
+  const e = r.document.createElement("style");
+  e.appendChild(r.document.createTextNode("*{}")), r.document.body.appendChild(e), r.document.body.removeChild(e);
+}
+function Bt(r) {
   return r < 0.5 ? 2 * r * r : -1 + (4 - 2 * r) * r;
 }
 function w(r) {
   const e = r.getSelection();
   e && e.removeAllRanges();
 }
-const Ft = [
+const $t = [
   "a",
   "audio",
   "button",
@@ -2298,15 +2337,15 @@ const Ft = [
   "textarea",
   "video"
 ];
-function Ye(r) {
+function Ke(r) {
   var e;
-  return Ft.indexOf(r.nodeName.toLowerCase()) !== -1 || r.hasAttribute("contenteditable") && ((e = r.getAttribute("contenteditable")) == null ? void 0 : e.toLowerCase()) !== "false" ? r : r.parentElement ? Ye(r.parentElement) : null;
+  return $t.indexOf(r.nodeName.toLowerCase()) !== -1 || r.hasAttribute("contenteditable") && ((e = r.getAttribute("contenteditable")) == null ? void 0 : e.toLowerCase()) !== "false" ? r : r.parentElement ? Ke(r.parentElement) : null;
 }
-function Ke(r, e) {
-  const t = Ze(r, r.document.body, e), i = r._readium_cssSelectorGenerator.getCssSelector(t, {
+function Je(r, e) {
+  const t = Qe(r, r.document.body, e), i = r._readium_cssSelectorGenerator.getCssSelector(t, {
     selectors: ["tag", "id", "class", "nthchild", "nthoftype", "attribute"]
   });
-  return new D({
+  return new W({
     href: "#",
     type: "application/xhtml+xml",
     locations: new x({
@@ -2314,20 +2353,20 @@ function Ke(r, e) {
         ["cssSelector", i]
       ])
     }),
-    text: new U({
+    text: new k({
       highlight: t.textContent || void 0
     })
   });
 }
-function Ze(r, e, t) {
+function Qe(r, e, t) {
   for (var i = 0; i < e.children.length; i++) {
     const s = e.children[i];
-    if (!kt(s) && Bt(r, s, t))
-      return Ut(r, s) ? s : Ze(r, s, t);
+    if (!jt(s) && kt(r, s, t))
+      return Vt(r, s) ? s : Qe(r, s, t);
   }
   return e;
 }
-function Bt(r, e, t) {
+function kt(r, e, t) {
   if (e === document.body || e === document.documentElement)
     return !0;
   if (!document || !document.documentElement || !document.body)
@@ -2335,11 +2374,11 @@ function Bt(r, e, t) {
   const i = e.getBoundingClientRect();
   return t ? i.bottom > 0 && i.top < r.innerHeight : i.right > 0 && i.left < r.innerWidth;
 }
-function Ut(r, e) {
+function Vt(r, e) {
   const t = e.getBoundingClientRect();
   return t.top >= 0 && t.left >= 0 && t.bottom <= r.innerHeight && t.right <= r.innerWidth;
 }
-function kt(r) {
+function jt(r) {
   const e = getComputedStyle(r);
   if (e) {
     const t = e.getPropertyValue("display");
@@ -2348,7 +2387,7 @@ function kt(r) {
   }
   return !1;
 }
-const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
+const Re = "readium-column-snapper-style", Ht = 200, et = class T extends Ye {
   constructor() {
     super(...arguments), this.shakeTimeout = 0, this.snappingCancelled = !1, this.alreadyScrollLeft = 0, this.overscroll = 0, this.cachedScrollWidth = 0, this.touchState = 0, this.startingX = void 0, this.endingX = void 0, this.onTouchStarter = this.onTouchStart.bind(this), this.onTouchEnder = this.onTouchEnd.bind(this), this.onWidthChanger = this.onWidthChange.bind(this), this.onTouchMover = this.onTouchMove.bind(this);
   }
@@ -2359,17 +2398,21 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
     return this.doc().scrollLeft > 0 ? this.doc().scrollLeft : this.alreadyScrollLeft;
   }
   snapOffset(e) {
-    const t = e + (W(this.wnd) ? -1 : 1);
+    const t = e + (F(this.wnd) ? -1 : 1);
     return t - t % this.wnd.innerWidth;
   }
   reportProgress() {
-    this.comms.send("progress", { progress: this.wnd.scrollX / this.cachedScrollWidth, reference: this.wnd.innerWidth / this.doc().scrollWidth });
+    const e = this.wnd.scrollX, t = this.cachedScrollWidth, i = Math.max(0, Math.min(1, e / t)), s = Math.max(0, Math.min(1, (e + this.wnd.innerWidth) / t));
+    this.comms.send("progress", {
+      start: i,
+      end: s
+    });
   }
   shake() {
     if (this.overscroll !== 0 || this.shakeTimeout !== 0)
       return;
     const e = this.doc();
-    e.classList.add(W(this.wnd) ? "readium-bounce-l" : "readium-bounce-r");
+    e.classList.add(F(this.wnd) ? "readium-bounce-l" : "readium-bounce-r");
     const t = this.scrollOffset();
     this.shakeTimeout = this.wnd.setTimeout(() => {
       e.classList.remove("readium-bounce-l"), e.classList.remove("readium-bounce-r"), this.shakeTimeout = 0, this.doc().scrollLeft = t;
@@ -2384,13 +2427,13 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
   }
   // Snaps the current offset to the page width.
   snapCurrentOffset(e = !1, t = !1) {
-    const i = this.wnd.scrollX > 0 ? this.wnd.scrollX : this.alreadyScrollLeft, s = this.doc(), n = this.dragOffset(), o = Ge(this.wnd), a = Math.min(Math.max(0, i), this.cachedScrollWidth), c = W(this.wnd) ? -1 : 1, h = (
+    const i = this.wnd.scrollX > 0 ? this.wnd.scrollX : this.alreadyScrollLeft, s = this.doc(), n = this.dragOffset(), o = Ze(this.wnd), l = Math.min(Math.max(0, i), this.cachedScrollWidth), c = F(this.wnd) ? -1 : 1, h = (
       // The hurdle to overcome in order to change pages
       c * (this.wnd.innerWidth / 3) * (c * n > 0 ? 2 : 1)
-    ), u = this.snapOffset(a + h);
+    ), u = this.snapOffset(l + h);
     if (e && u !== this.scrollOffset()) {
       this.snappingCancelled = !1;
-      const p = (m, v, S, O) => S > O ? v : m + (v - m) * Wt(S / O), d = (
+      const p = (m, v, S, O) => S > O ? v : m + (v - m) * Bt(S / O), d = (
         /*Math.abs(startX - (this.useTransform ? currentOffset : 0)) < 10 ? 1 : */
         Ht * o
       );
@@ -2450,7 +2493,7 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
       return !1;
     e.navigator.epubReadingSystem.layoutStyle = "paginated";
     const i = e.document.createElement("style");
-    i.dataset.readium = "true", i.id = Ie, i.textContent = `
+    i.dataset.readium = "true", i.id = Re, i.textContent = `
         @keyframes readium-bounce-l-animation {
             0%, 100% {transform: translate3d(0, 0, 0);}
             50% {transform: translate3d(-50px, 0, 0);}
@@ -2486,14 +2529,14 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
         }
         `, e.document.head.appendChild(i), this.resizeObserver = new ResizeObserver(() => {
       e.requestAnimationFrame(() => {
-        e && Oe(e);
+        e && Le(e);
       }), this.onWidthChange();
     }), this.resizeObserver.observe(e.document.body), this.mutationObserver = new MutationObserver((n) => {
       for (const o of n)
         if (o.target === this.wnd.document.documentElement) {
-          const a = o.oldValue, c = o.target.getAttribute("style"), h = /transform\s*:\s*([^;]+)/, u = a == null ? void 0 : a.match(h), p = c == null ? void 0 : c.match(h);
+          const l = o.oldValue, c = o.target.getAttribute("style"), h = /transform\s*:\s*([^;]+)/, u = l == null ? void 0 : l.match(h), p = c == null ? void 0 : c.match(h);
           (!u && !p || u && !p || u && p && u[1] !== p[1]) && (e.requestAnimationFrame(() => {
-            e && Oe(e);
+            e && Le(e);
           }), this.onWidthChange());
         } else
           e.requestAnimationFrame(() => this.cachedScrollWidth = this.doc().scrollWidth);
@@ -2503,8 +2546,8 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
       return this.doc().scrollLeft = this.snapOffset(n), o !== this.doc().scrollLeft;
     };
     return e.addEventListener("orientationchange", this.onWidthChanger), e.addEventListener("resize", this.onWidthChanger), e.requestAnimationFrame(() => this.cachedScrollWidth = this.doc().scrollWidth), t.register("go_progression", T.moduleName, (n, o) => {
-      const a = n;
-      if (a < 0 || a > 1) {
+      const l = n;
+      if (l < 0 || l > 1) {
         t.send("error", {
           message: "go_progression must be given a position from 0.0 to 1.0"
         }), o(!1);
@@ -2512,28 +2555,28 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
       }
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const c = this.cachedScrollWidth, h = W(e) ? -1 : 1, u = c * a * h;
+        const c = this.cachedScrollWidth, h = F(e) ? -1 : 1, u = c * l * h;
         this.doc().scrollLeft = this.snapOffset(u), this.reportProgress(), w(this.wnd), o(!0);
       });
     }), t.register("go_id", T.moduleName, (n, o) => {
-      const a = e.document.getElementById(n);
-      if (!a) {
+      const l = e.document.getElementById(n);
+      if (!l) {
         o(!1);
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollLeft = this.snapOffset(a.getBoundingClientRect().left + e.scrollX), this.reportProgress(), w(this.wnd), o(!0);
+        this.doc().scrollLeft = this.snapOffset(l.getBoundingClientRect().left + e.scrollX), this.reportProgress(), w(this.wnd), o(!0);
       });
     }), t.register("go_text", T.moduleName, (n, o) => {
-      let a;
-      Array.isArray(n) && (n.length > 1 && (a = n[1]), n = n[0]);
-      const c = U.deserialize(n), h = le(this.wnd.document, new D({
+      let l;
+      Array.isArray(n) && (n.length > 1 && (l = n[1]), n = n[0]);
+      const c = k.deserialize(n), h = ce(this.wnd.document, new W({
         href: e.location.href,
         type: "text/html",
         text: c,
-        locations: a ? new x({
+        locations: l ? new x({
           otherLocations: /* @__PURE__ */ new Map([
-            ["cssSelector", a]
+            ["cssSelector", l]
           ])
         }) : void 0
       }));
@@ -2545,10 +2588,10 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
         this.doc().scrollLeft = this.snapOffset(h.getBoundingClientRect().left + e.scrollX), this.reportProgress(), w(this.wnd), o(!0);
       });
     }), t.register("go_end", T.moduleName, (n, o) => {
-      const a = W(e) ? -1 : 1;
+      const l = F(e) ? -1 : 1;
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const c = this.cachedScrollWidth * a;
+        const c = this.cachedScrollWidth * l;
         if (this.doc().scrollLeft === c)
           return o(!1);
         this.doc().scrollLeft = this.snapOffset(c), this.reportProgress(), w(this.wnd), o(!0);
@@ -2562,13 +2605,13 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
     }), t.register("go_prev", T.moduleName, (n, o) => {
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const a = e.scrollX - e.innerWidth, c = W(e) ? -(this.cachedScrollWidth - e.innerWidth) : 0, h = s(Math.max(a, c));
+        const l = e.scrollX - e.innerWidth, c = F(e) ? -(this.cachedScrollWidth - e.innerWidth) : 0, h = s(Math.max(l, c));
         h && (this.reportProgress(), w(this.wnd)), o(h);
       });
     }), t.register("go_next", T.moduleName, (n, o) => {
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const a = e.scrollX + e.innerWidth, c = W(e) ? 0 : this.cachedScrollWidth - e.innerWidth, h = s(Math.min(a, c));
+        const l = e.scrollX + e.innerWidth, c = F(e) ? 0 : this.cachedScrollWidth - e.innerWidth, h = s(Math.min(l, c));
         h && (this.reportProgress(), w(this.wnd)), o(h);
       });
     }), t.register("unfocus", T.moduleName, (n, o) => {
@@ -2580,37 +2623,40 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
         this.cachedScrollWidth = this.doc().scrollWidth, this.snapCurrentOffset(!1, !0), this.reportProgress(), o(!0);
       });
     }), t.register("first_visible_locator", T.moduleName, (n, o) => {
-      const a = Ke(e, !1);
-      this.comms.send("first_visible_locator", a.serialize()), o(!0);
+      const l = Je(e, !1);
+      this.comms.send("first_visible_locator", l.serialize()), o(!0);
     }), e.addEventListener("touchstart", this.onTouchStarter, { passive: !0 }), e.addEventListener("touchend", this.onTouchEnder, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMover, { passive: !0 }), e.document.addEventListener("touchstart", () => {
     }), t.log("ColumnSnapper Mounted"), !0;
   }
   unmount(e, t) {
     var i;
-    return this.snappingCancelled = !0, t.unregisterAll(T.moduleName), this.resizeObserver.disconnect(), this.mutationObserver.disconnect(), e.removeEventListener("touchstart", this.onTouchStarter), e.removeEventListener("touchend", this.onTouchEnder), e.removeEventListener("touchmove", this.onTouchMover), e.removeEventListener("orientationchange", this.onWidthChanger), e.removeEventListener("resize", this.onWidthChanger), (i = e.document.getElementById(Ie)) == null || i.remove(), t.log("ColumnSnapper Unmounted"), super.unmount(e, t);
+    return this.snappingCancelled = !0, t.unregisterAll(T.moduleName), this.resizeObserver.disconnect(), this.mutationObserver.disconnect(), e.removeEventListener("touchstart", this.onTouchStarter), e.removeEventListener("touchend", this.onTouchEnder), e.removeEventListener("touchmove", this.onTouchMover), e.removeEventListener("orientationchange", this.onWidthChanger), e.removeEventListener("resize", this.onWidthChanger), (i = e.document.getElementById(Re)) == null || i.remove(), t.log("ColumnSnapper Unmounted"), super.unmount(e, t);
   }
 };
-Je.moduleName = "column_snapper";
-let $t = Je;
-const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
+et.moduleName = "column_snapper";
+let qt = et;
+const De = "readium-scroll-snapper-style", tt = class P extends Ye {
   constructor() {
     super(...arguments), this.isScrolling = !1, this.handleScroll = () => {
       this.isScrolling || (this.isScrolling = !0, this.wnd.requestAnimationFrame(() => {
-        const e = this.doc().scrollTop / this.doc().offsetHeight;
-        this.reportProgress({ progress: e, reference: this.wnd.innerHeight / this.doc().scrollHeight }), this.isScrolling = !1;
+        this.reportProgress(), this.isScrolling = !1;
       }));
     };
   }
   doc() {
     return this.wnd.document.scrollingElement;
   }
-  reportProgress(e) {
-    this.comms.send("progress", e);
+  reportProgress() {
+    const e = this.doc().scrollTop, t = this.doc().scrollHeight, i = Math.max(0, Math.min(1, e / t)), s = Math.max(0, Math.min(1, (e + this.wnd.innerHeight) / t));
+    this.comms.send("progress", {
+      start: i,
+      end: s
+    });
   }
   mount(e, t) {
     this.wnd = e, this.comms = t, e.navigator.epubReadingSystem.layoutStyle = "scrolling";
     const i = e.document.createElement("style");
-    return i.dataset.readium = "true", i.id = Le, i.textContent = `
+    return i.dataset.readium = "true", i.id = De, i.textContent = `
         * {
             scrollbar-width: none; /* for Firefox */
         }
@@ -2622,7 +2668,11 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
       this.comms.ready && this.handleScroll();
     }), this.resizeObserver.observe(e.document.body), e.addEventListener("scroll", this.handleScroll, {
       passive: !0
-    }), t.register("go_progression", A.moduleName, (s, n) => {
+    }), t.register("force_webkit_recalc", P.moduleName, () => {
+      Ut(this.wnd);
+      const s = this.doc().scrollTop;
+      this.doc().scrollTop = s + 1, this.doc().scrollTop = s;
+    }), t.register("go_progression", P.moduleName, (s, n) => {
       const o = s;
       if (o < 0 || o > 1) {
         t.send("error", {
@@ -2631,26 +2681,24 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollTop = this.doc().offsetHeight * o, this.reportProgress({ progress: o, reference: this.wnd.innerHeight / this.doc().scrollHeight }), w(this.wnd), n(!0);
+        this.doc().scrollTop = this.doc().offsetHeight * o, this.reportProgress(), w(this.wnd), n(!0);
       });
-    }), t.register("go_id", A.moduleName, (s, n) => {
+    }), t.register("go_id", P.moduleName, (s, n) => {
       const o = e.document.getElementById(s);
       if (!o) {
         n(!1);
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollTop = o.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2;
-        const a = this.doc().scrollTop / this.doc().offsetHeight;
-        this.reportProgress({ progress: a, reference: this.wnd.innerHeight / this.doc().scrollHeight }), w(this.wnd), n(!0);
+        this.doc().scrollTop = o.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2, this.reportProgress(), w(this.wnd), n(!0);
       });
-    }), t.register("go_text", A.moduleName, (s, n) => {
+    }), t.register("go_text", P.moduleName, (s, n) => {
       let o;
       Array.isArray(s) && (s.length > 1 && (o = s[1]), s = s[0]);
-      const a = U.deserialize(s), c = le(this.wnd.document, new D({
+      const l = k.deserialize(s), c = ce(this.wnd.document, new W({
         href: e.location.href,
         type: "text/html",
-        text: a,
+        text: l,
         locations: o ? new x({
           otherLocations: /* @__PURE__ */ new Map([
             ["cssSelector", o]
@@ -2662,44 +2710,41 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollTop = c.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2;
-        const h = this.doc().scrollTop / this.doc().offsetHeight;
-        this.reportProgress({ progress: h, reference: this.wnd.innerHeight / this.doc().scrollHeight }), w(this.wnd), n(!0);
+        this.doc().scrollTop = c.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2, this.reportProgress(), w(this.wnd), n(!0);
       });
-    }), t.register("go_start", A.moduleName, (s, n) => {
+    }), t.register("go_start", P.moduleName, (s, n) => {
       if (this.doc().scrollTop === 0)
         return n(!1);
-      this.doc().scrollTop = 0, this.reportProgress({ progress: 0, reference: this.wnd.innerHeight / this.doc().scrollHeight }), n(!0);
-    }), t.register("go_end", A.moduleName, (s, n) => {
-      if (this.doc().scrollTop === 0)
+      this.doc().scrollTop = 0, this.reportProgress(), n(!0);
+    }), t.register("go_end", P.moduleName, (s, n) => {
+      if (this.doc().scrollTop === this.doc().scrollHeight - this.doc().offsetHeight)
         return n(!1);
-      this.doc().scrollTop = 0, this.reportProgress({ progress: 0, reference: this.wnd.innerHeight / this.doc().scrollHeight }), n(!0);
-    }), t.register("unfocus", A.moduleName, (s, n) => {
+      this.doc().scrollTop = this.doc().scrollHeight - this.doc().offsetHeight, this.reportProgress(), n(!0);
+    }), t.register("unfocus", P.moduleName, (s, n) => {
       w(this.wnd), n(!0);
     }), t.register([
       "go_next",
       "go_prev"
-    ], A.moduleName, (s, n) => n(!1)), t.register("focus", A.moduleName, (s, n) => {
-      const o = this.doc().scrollTop / this.doc().offsetHeight;
-      this.reportProgress({ progress: o, reference: this.wnd.innerHeight / this.doc().scrollHeight }), n(!0);
-    }), t.register("first_visible_locator", A.moduleName, (s, n) => {
-      const o = Ke(e, !0);
+    ], P.moduleName, (s, n) => n(!1)), t.register("focus", P.moduleName, (s, n) => {
+      this.reportProgress(), n(!0);
+    }), t.register("first_visible_locator", P.moduleName, (s, n) => {
+      const o = Je(e, !0);
       this.comms.send("first_visible_locator", o.serialize()), n(!0);
     }), t.log("ScrollSnapper Mounted"), !0;
   }
   unmount(e, t) {
     var i;
-    return t.unregisterAll(A.moduleName), this.resizeObserver.disconnect(), this.handleScroll && e.removeEventListener("scroll", this.handleScroll), (i = e.document.getElementById(Le)) == null || i.remove(), t.log("ScrollSnapper Unmounted"), !0;
+    return t.unregisterAll(P.moduleName), this.resizeObserver.disconnect(), this.handleScroll && e.removeEventListener("scroll", this.handleScroll), (i = e.document.getElementById(De)) == null || i.remove(), t.log("ScrollSnapper Unmounted"), !0;
   }
 };
-Qe.moduleName = "scroll_snapper";
-let jt = Qe;
-class et extends Y {
+tt.moduleName = "scroll_snapper";
+let _t = tt;
+class it extends K {
   constructor() {
     super(...arguments), this.pointerMoved = !1, this.onPointerUp = this.onPointUp.bind(this), this.onPointerMove = this.onPointMove.bind(this), this.onPointerDown = this.onPointDown.bind(this), this.onContextMenu = this.onContext.bind(this), this.onClicker = this.onClick.bind(this);
   }
   onPointUp(e) {
-    var s, n, o, a, c;
+    var s, n, o, l, c;
     const t = this.wnd.getSelection();
     if (t && ((s = t.toString()) == null ? void 0 : s.length) > 0) {
       const h = (n = t.getRangeAt(0)) == null ? void 0 : n.getClientRects();
@@ -2711,7 +2756,7 @@ class et extends Y {
         y: u.y,
         width: u.width,
         height: u.height,
-        targetFrameSrc: (a = (o = this.wnd) == null ? void 0 : o.location) == null ? void 0 : a.href
+        targetFrameSrc: (l = (o = this.wnd) == null ? void 0 : o.location) == null ? void 0 : l.href
       };
       this.comms.send("text_selected", p);
     }
@@ -2728,7 +2773,7 @@ class et extends Y {
       y: e.clientY * i,
       targetFrameSrc: this.wnd.location.href,
       targetElement: e.target.outerHTML,
-      interactiveElement: (c = Ye(e.target)) == null ? void 0 : c.outerHTML,
+      interactiveElement: (c = Ke(e.target)) == null ? void 0 : c.outerHTML,
       cssSelector: this.wnd._readium_cssSelectorGenerator.getCssSelector(e.target)
     }), this.pointerMoved = !1;
   }
@@ -2764,8 +2809,8 @@ class et extends Y {
     return e.document.removeEventListener("pointerdown", this.onPointerDown), e.document.removeEventListener("pointerup", this.onPointerUp), e.document.removeEventListener("contextmenu", this.onContextMenu), e.document.removeEventListener("pointermove", this.onPointerMove), e.document.removeEventListener("click", this.onClicker), t.log("Peripherals Unmounted"), !0;
   }
 }
-et.moduleName = "peripherals";
-const tt = class te extends Y {
+it.moduleName = "peripherals";
+const rt = class re extends K {
   constructor() {
     super(...arguments), this.mediaPlayingCount = 0, this.allAnimations = /* @__PURE__ */ new Set();
   }
@@ -2819,7 +2864,7 @@ const tt = class te extends Y {
     ), Reflect.defineProperty(e.navigator, "epubReadingSystem", {
       value: {
         name: "readium-ts-toolkit",
-        version: "2.0.0-beta.3",
+        version: "2.0.0-beta.4",
         hasFeature: (s, n = "") => {
           switch (s) {
             case "dom-manipulation":
@@ -2844,11 +2889,11 @@ const tt = class te extends Y {
       writable: !1
     }), "getAnimations" in e.document && e.document.getAnimations().forEach((s) => {
       s.cancel(), this.allAnimations.add(s);
-    }), t.register("activate", te.moduleName, (s, n) => {
+    }), t.register("activate", re.moduleName, (s, n) => {
       this.allAnimations.forEach((o) => {
         o.cancel(), o.play();
       }), n(!0);
-    }), t.register("unfocus", te.moduleName, (s, n) => {
+    }), t.register("unfocus", re.moduleName, (s, n) => {
       this.pauseAllMedia(e), this.allAnimations.forEach((o) => o.pause()), n(!0);
     });
     const i = e.document.querySelectorAll("audio,video");
@@ -2866,49 +2911,49 @@ const tt = class te extends Y {
     return e.removeEventListener("error", this.wndOnErr), e.removeEventListener("play", this.onMediaPlayEvent), e.removeEventListener("pause", this.onMediaPauseEvent), this.allAnimations.forEach((i) => i.cancel()), this.allAnimations.clear(), t.log("Setup Unmounted"), !0;
   }
 };
-tt.moduleName = "setup";
-let it = tt;
-const Re = "readium-viewport", rt = class F extends it {
+rt.moduleName = "setup";
+let st = rt;
+const ze = "readium-viewport", nt = class U extends st {
   onViewportWidthChanged(e) {
     const t = e.target;
-    G(t, "--RS__viewportWidth", `${t.innerWidth}px`);
+    Z(t, "--RS__viewportWidth", `${t.innerWidth}px`);
   }
   mount(e, t) {
     if (!super.mount(e, t))
       return !1;
     const i = e.document.createElement("meta");
-    return i.dataset.readium = "true", i.setAttribute("name", "viewport"), i.setAttribute("id", Re), i.setAttribute(
+    return i.dataset.readium = "true", i.setAttribute("name", "viewport"), i.setAttribute("id", ze), i.setAttribute(
       "content",
       "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no"
     ), e.document.head.appendChild(i), e.addEventListener("orientationchange", this.onViewportWidthChanged), e.addEventListener("resize", this.onViewportWidthChanged), this.onViewportWidthChanged({
       target: e
-    }), t.register("get_properties", F.moduleName, (s, n) => {
-      Ve(e), n(!0);
-    }), t.register("update_properties", F.moduleName, (s, n) => {
+    }), t.register("get_properties", U.moduleName, (s, n) => {
+      _e(e), n(!0);
+    }), t.register("update_properties", U.moduleName, (s, n) => {
       s["--RS__viewportWidth"] = `${e.innerWidth}px`, Nt(e, s), n(!0);
-    }), t.register("set_property", F.moduleName, (s, n) => {
+    }), t.register("set_property", U.moduleName, (s, n) => {
       const o = s;
-      G(e, o[0], o[1]), n(!0);
-    }), t.register("remove_property", F.moduleName, (s, n) => {
-      he(e, s), n(!0);
-    }), t.register("activate", F.moduleName, (s, n) => {
+      Z(e, o[0], o[1]), n(!0);
+    }), t.register("remove_property", U.moduleName, (s, n) => {
+      ue(e, s), n(!0);
+    }), t.register("activate", U.moduleName, (s, n) => {
       this.unblock(e), n(!0);
     }), t.log("ReflowableSetup Mounted"), !0;
   }
   unmount(e, t) {
     var i;
-    return t.unregisterAll(F.moduleName), (i = e.document.head.querySelector(`#${Re}`)) == null || i.remove(), e.removeEventListener("orientationchange", this.onViewportWidthChanged), t.log("ReflowableSetup Unmounted"), super.unmount(e, t);
+    return t.unregisterAll(U.moduleName), (i = e.document.head.querySelector(`#${ze}`)) == null || i.remove(), e.removeEventListener("orientationchange", this.onViewportWidthChanged), t.log("ReflowableSetup Unmounted"), super.unmount(e, t);
   }
 };
-rt.moduleName = "reflowable_setup";
-let Vt = rt;
-const ze = "readium-fixed-style", st = class L extends it {
+nt.moduleName = "reflowable_setup";
+let Xt = nt;
+const We = "readium-fixed-style", ot = class R extends st {
   mount(e, t) {
     if (!super.mount(e, t))
       return !1;
     e.navigator.epubReadingSystem.layoutStyle = "paginated";
     const i = e.document.createElement("style");
-    return i.id = ze, i.dataset.readium = "true", i.textContent = `
+    return i.id = We, i.dataset.readium = "true", i.textContent = `
         html, body {
             text-size-adjust: none;
             -ms-text-size-adjust: none;
@@ -2920,12 +2965,12 @@ const ze = "readium-fixed-style", st = class L extends it {
             min-height: 100%;
 
             /*cursor: var() TODO*/
-        }`, e.document.head.appendChild(i), t.register("set_property", L.moduleName, (s, n) => {
+        }`, e.document.head.appendChild(i), t.register("set_property", R.moduleName, (s, n) => {
       const o = s;
-      G(e, o[0], o[1]), n(!0);
-    }), t.register("remove_property", L.moduleName, (s, n) => {
-      he(e, s), n(!0);
-    }), t.register("first_visible_locator", L.moduleName, (s, n) => n(!1)), t.register("unfocus", L.moduleName, (s, n) => {
+      Z(e, o[0], o[1]), n(!0);
+    }), t.register("remove_property", R.moduleName, (s, n) => {
+      ue(e, s), n(!0);
+    }), t.register("first_visible_locator", R.moduleName, (s, n) => n(!1)), t.register("unfocus", R.moduleName, (s, n) => {
       w(e), n(!0);
     }), t.register([
       "focus",
@@ -2936,43 +2981,43 @@ const ze = "readium-fixed-style", st = class L extends it {
       "go_start",
       "go_text",
       "go_progression"
-    ], L.moduleName, (s, n) => n(!0)), t.register("activate", L.moduleName, (s, n) => {
+    ], R.moduleName, (s, n) => n(!0)), t.register("activate", R.moduleName, (s, n) => {
       this.unblock(e), n(!0);
     }), t.log("FixedSetup Mounted"), !0;
   }
   unmount(e, t) {
     var i;
-    return t.unregisterAll(L.moduleName), (i = e.document.getElementById(ze)) == null || i.remove(), t.log("FixedSetup Unmounted"), super.unmount(e, t);
+    return t.unregisterAll(R.moduleName), (i = e.document.getElementById(We)) == null || i.remove(), t.log("FixedSetup Unmounted"), super.unmount(e, t);
   }
 };
-st.moduleName = "fixed_setup";
-let qt = st;
-const _t = [
+ot.moduleName = "fixed_setup";
+let Gt = ot;
+const Yt = [
   "fixed_setup",
   "decorator",
   "peripherals"
-], Xt = [
+], Zt = [
   "reflowable_setup",
   "decorator",
   "peripherals",
   "column_snapper",
   "scroll_snapper"
-], De = new Map([
+], Fe = new Map([
   // All modules go here
+  Gt,
+  Xt,
+  it,
+  Ft,
   qt,
-  Vt,
-  et,
-  Dt,
-  $t,
-  jt
+  _t
 ].map((r) => [r.moduleName, r]));
-class Gt {
+class Kt {
   /**
    * @param wnd Window instance to operate on
    * @param initialModules List of initial modules to load
    */
   constructor(e = window, t = []) {
-    this.loadedModules = [], this.wnd = e, this.comms = new at(e);
+    this.loadedModules = [], this.wnd = e, this.comms = new ht(e);
     const i = [...new Set(t)];
     if (i.length) {
       if (typeof e > "u")
@@ -2985,7 +3030,7 @@ class Gt {
     }
   }
   loadModule(e) {
-    const t = De.get(e);
+    const t = Fe.get(e);
     return t === void 0 ? (this.comms.log(`Module "${name}" does not exist in the library`), t) : new t();
   }
   /**
@@ -3003,7 +3048,7 @@ class Gt {
    * @returns Success
    */
   removeModule(e) {
-    const t = De.get(e);
+    const t = Fe.get(e);
     if (t === void 0)
       return this.comms.log(`Module "${e}" does not exist in the library`), !1;
     const i = this.loadedModules.findIndex((s) => s instanceof t);
@@ -3017,16 +3062,16 @@ class Gt {
   }
 }
 export {
-  k as COMMS_VERSION,
-  at as Comms,
-  Dt as Decorator,
-  _t as FXLModules,
-  Lt as Layout,
-  Gt as Loader,
-  Y as Module,
-  De as ModuleLibrary,
-  et as Peripherals,
-  Xt as ReflowableModules,
-  It as Width,
-  ot as mid
+  V as COMMS_VERSION,
+  ht as Comms,
+  Ft as Decorator,
+  Yt as FXLModules,
+  Dt as Layout,
+  Kt as Loader,
+  K as Module,
+  Fe as ModuleLibrary,
+  it as Peripherals,
+  Zt as ReflowableModules,
+  Rt as Width,
+  lt as mid
 };