@tidal-music/player-web-components 0.2.0 → 0.2.1

package/dist/{index-vp_MoGvy.js → index-DHnVYeec.js}

@@ -6,7 +6,7 @@ let A = Object.freeze({
   outputDevicesEnabled: !1,
   streamingWifiAudioQuality: "LOW"
 });
-function _(r) {
+function C(r) {
   return A[r];
 }
 function B(r) {
@@ -98,32 +98,32 @@ function le() {
     })
   ), Promise.all(e);
 }
-const E = document.createElement("video"), ue = (r) => {
+const k = document.createElement("video"), ue = (r) => {
   r.setAttribute("crossorigin", "anonymous"), r.setAttribute("playsinline", "playsinline");
 };
-ue(E);
-E.id = "video-one";
-const O = "tidal-player-root";
+ue(k);
+k.id = "video-one";
+const L = "tidal-player-root";
 function he() {
-  let r = document.getElementById(O);
+  let r = document.getElementById(L);
   if (!r) {
     const e = document.createElement("template");
-    e.id = O, document.body.appendChild(e), r = document.getElementById(O);
+    e.id = L, document.body.appendChild(e), r = document.getElementById(L);
   }
   return me();
 }
 function me() {
   const r = document.getElementById(
-    O
+    L
   );
-  return r && (E.id in r.children || r.appendChild(E)), le();
+  return r && (k.id in r.children || r.appendChild(k)), le();
 }
 function pe() {
   return new Promise(
     (r) => document.addEventListener(
       "click",
       () => {
-        E.readyState === HTMLMediaElement.HAVE_NOTHING && !E.src && E.load(), r();
+        k.readyState === HTMLMediaElement.HAVE_NOTHING && !k.src && k.load(), r();
       },
       { once: !0 }
     )
@@ -183,7 +183,7 @@ class we extends EventTarget {
     return this.#e;
   }
 }
-class C extends Error {
+class O extends Error {
   errorCode = null;
   errorId = null;
   referenceId;
@@ -211,7 +211,7 @@ async function P() {
 const v = new we(), D = new ye();
 async function be() {
   const r = await P(), e = async () => {
-    const { Pushkin: t } = await Promise.resolve().then(() => gt);
+    const { Pushkin: t } = await Promise.resolve().then(() => ft);
     return t.refresh();
   };
   if (r) {
@@ -346,7 +346,7 @@ class Me {
   }
 }
 const H = new Me();
-class Ee {
+class ke {
   activePlayer;
   preloadPlayer;
   get preloadedMediaProduct() {
@@ -358,11 +358,11 @@ class Ee {
     return this.preloadPlayer?.preloadedStreamingSessionId ?? void 0;
   }
 }
-const p = new Ee();
-let ke;
+const p = new ke();
+let Ee;
 const Pe = [
   {
-    itemTypes: ["track", "video", "demo"],
+    itemTypes: ["track", "video"],
     player: "shaka",
     qualities: ["HIGH", "LOSSLESS", "LOW", "HI_RES_LOSSLESS"]
   }
@@ -384,19 +384,19 @@ async function Te() {
 function Ie(r) {
   r.name !== "nativePlayer" && w.native && w.native.abandon(), p.activePlayer = r;
 }
-function Le() {
-  m.removeEventListener("ended", ke);
+function Ae() {
+  m.removeEventListener("ended", Ee);
 }
-async function Ae() {
-  const { default: r } = await import("./nativePlayer-B3eHKegV-DdXsvi0F.js");
+async function Le() {
+  const { default: r } = await import("./nativePlayer-b92CavhC-CABrQPGS.js");
   return w.native || (w.native = new r()), w.native;
 }
 async function Oe() {
-  const { default: r } = await import("./browserPlayer-HE2uqs17-DJrIq6Jp.js");
+  const { default: r } = await import("./browserPlayer-CXURpXdL-DjOb2ySS.js");
   return w.browser || (w.browser = new r()), w.browser;
 }
 async function Ce() {
-  const { default: r } = await import("./shakaPlayer-CCJQsypf-DHT2kwDp.js");
+  const { default: r } = await import("./shakaPlayer-D0NCOzx8-Dd1YFBoR.js");
   return w.shaka || (w.shaka = new r()), w.shaka;
 }
 async function _e(r, e) {
@@ -414,7 +414,7 @@ async function _e(r, e) {
     case "browser":
       return Oe();
     case "native":
-      return Ae();
+      return Le();
     case "shaka":
       return Ce();
     default:
@@ -437,7 +437,7 @@ function Be() {
       return e.playbackContext;
   }
 }
-function Q() {
+function q() {
   return p.activePlayer?.playbackState ?? "IDLE";
 }
 class xe {
@@ -490,7 +490,7 @@ class xe {
 }
 const R = new xe();
 async function T(r, e) {
-  return _("gatherEvents") ? async (t) => {
+  return C("gatherEvents") ? async (t) => {
     try {
       const s = await R.get({
         name: r,
@@ -534,7 +534,7 @@ const Re = {
   "drm_license_fetch",
   Re
 );
-function Dt(r) {
+function Rt(r) {
   return De(r);
 }
 const He = {
@@ -548,10 +548,10 @@ const He = {
   "playback_info_fetch",
   He
 );
-function N(r) {
+function F(r) {
   return Ue(r);
 }
-function Ht(r) {
+function Dt(r) {
   switch (r) {
     case "bluetooth":
       return "BLUETOOTH";
@@ -606,10 +606,10 @@ const We = {
   "streaming_session_end",
   We
 );
-function Qe(r) {
+function qe(r) {
   return $e(r);
 }
-const Ge = {
+const Qe = {
   "Amazon Silk": "amazon_silk",
   "Android Browser": "android",
   Bada: "bada",
@@ -650,7 +650,7 @@ const Ge = {
   WeChat: "wechat",
   "Yandex Browser": "yandex",
   Roku: "roku"
-}, G = {
+}, Q = {
   amazon_silk: "Amazon Silk",
   android: "Android Browser",
   bada: "Bada",
@@ -979,7 +979,7 @@ class i {
    * @return {string}
    */
   static getBrowserAlias(e) {
-    return Ge[e];
+    return Qe[e];
   }
   /**
    * Get browser name for a short version/alias
@@ -991,10 +991,10 @@ class i {
    * @return {string}
    */
   static getBrowserTypeByAlias(e) {
-    return G[e] || "";
+    return Q[e] || "";
   }
 }
-const l = /version\/(\d+(\.?_?\d+)+)/i, qe = [
+const l = /version\/(\d+(\.?_?\d+)+)/i, Ge = [
   /* Googlebot */
   {
     test: [/googlebot/i],
@@ -1912,7 +1912,7 @@ class W {
    */
   parseBrowser() {
     this.parsedResult.browser = {};
-    const e = i.find(qe, (t) => {
+    const e = i.find(Ge, (t) => {
       if (typeof t.test == "function")
         return t.test(this);
       if (Array.isArray(t.test))
@@ -2219,7 +2219,7 @@ class Je {
     return new W(e).getResult();
   }
   static get BROWSER_MAP() {
-    return G;
+    return Q;
   }
   static get ENGINE_MAP() {
     return S;
@@ -2262,7 +2262,7 @@ async function tt(r) {
   if (await P())
     return r();
 }
-async function q(r) {
+async function G(r) {
   const e = {
     consentCategory: "NECESSARY",
     ..."extras" in r && { extras: r.extras },
@@ -2281,7 +2281,7 @@ async function j(r) {
     for (const e of r)
       if (e) {
         const t = await e;
-        t && await q({
+        t && await G({
           group: "streaming_metrics",
           name: t.name,
           payload: t.payload,
@@ -2297,11 +2297,10 @@ function rt(r = !0) {
     return (t ^ (s ?? 0) & 15 >> t / 4).toString(16);
   });
 }
-const L = {
+const N = {
   BTS: "application/vnd.tidal.bts",
   DASH: "application/dash+xml",
-  EMU: "application/vnd.tidal.emu",
-  HLS: "application/vnd.apple.mpegurl"
+  EMU: "application/vnd.tidal.emu"
 };
 function st(r) {
   return JSON.parse(atob(r));
@@ -2387,7 +2386,7 @@ function dt(r) {
     ),
     type: "trackId" in r ? "track" : "video"
   };
-  if (r.manifestMimeType === L.BTS || r.manifestMimeType === L.EMU) {
+  if (r.manifestMimeType === N.BTS || r.manifestMimeType === N.EMU) {
     const a = st(r.manifest), c = a.urls[0], u = it(
       a,
       "audioQuality" in r ? r.audioQuality : null
@@ -2408,7 +2407,7 @@ function dt(r) {
       expires: r.expires
     };
   }
-  if (r.manifestMimeType === L.DASH) {
+  if (r.manifestMimeType === N.DASH) {
     const a = `data:${r.manifestMimeType};base64,${r.manifest}`, c = atob(r.manifest);
     return {
       ...s,
@@ -2473,7 +2472,7 @@ async function ut(r) {
     mediaProduct: n,
     prefetch: o,
     streamingSessionId: a
-  } = r, c = _("apiUrl"), u = new URL(
+  } = r, c = C("apiUrl"), u = new URL(
     `${c}/${n.productType}s/${n.productId}/playbackinfo`
   ), d = u.searchParams;
   n.productType === "video" ? d.set("videoquality", "HIGH") : d.set("audioquality", t), d.set("playbackmode", "STREAM"), d.set("assetpresentation", "FULL");
@@ -2492,16 +2491,16 @@ async function ut(r) {
       3
     );
   } catch {
-    throw new C("PENetwork", "NPBI0");
+    throw new O("PENetwork", "NPBI0");
   }
   const f = await M.json();
   if ("status" in f) {
     const ae = `A${f.subStatus}`;
-    throw new C(lt(f.status, f.subStatus), ae);
+    throw new O(lt(f.status, f.subStatus), ae);
   }
   const ie = "trackId" in f, ne = "videoId" in f;
   if (!ie && !ne)
-    throw new C("EUnexpected", "B9999");
+    throw new O("EUnexpected", "B9999");
   return {
     ...f,
     // eslint-disable-next-line no-restricted-syntax
@@ -2509,30 +2508,7 @@ async function ut(r) {
     prefetched: o
   };
 }
-function ht(r) {
-  const { mediaProduct: e, streamingSessionId: t } = r;
-  return {
-    assetPresentation: "FULL",
-    audioMode: "STEREO",
-    audioQuality: "LOW",
-    // eslint-disable-next-line no-restricted-syntax
-    expires: Date.now() + 36e5,
-    manifest: btoa(
-      JSON.stringify({
-        mimeType: L.HLS,
-        urls: [
-          `https://fsu.fa.tidal.com/storage/${e.productId}.m3u8`
-        ]
-      })
-    ),
-    manifestMimeType: L.EMU,
-    prefetched: !1,
-    streamType: "ON_DEMAND",
-    streamingSessionId: t,
-    trackId: e.productId
-  };
-}
-async function mt(r) {
+async function ht(r) {
   const { streamingSessionId: e } = r, t = [];
   performance.mark("streaming_metrics:playback_info_fetch:startTimestamp", {
     detail: e,
@@ -2540,9 +2516,9 @@ async function mt(r) {
   });
   try {
     let s;
-    if (r.mediaProduct.productType === "demo" ? s = ht(r) : s = await ut(r), s === void 0)
+    if (s = await ut(r), s === void 0)
       throw new Error("Playback info was fetched, but undefined.");
-    N({
+    F({
       endReason: "COMPLETE",
       streamingSessionId: e
     }).catch(console.error);
@@ -2573,13 +2549,13 @@ async function mt(r) {
     throw performance.mark("streaming_metrics:playback_info_fetch:endTimestamp", {
       detail: e,
       startTime: y.now()
-    }), N({
+    }), F({
       endReason: "ERROR",
       errorCode: s.message,
       errorMessage: s.stack,
       streamingSessionId: e
     }).catch(console.error), t.push(
-      Qe({
+      qe({
         streamingSessionId: e,
         timestamp: y.timestamp(
           "streaming_metrics:playback_info_fetch:endTimestamp"
@@ -2588,7 +2564,7 @@ async function mt(r) {
     ), s;
   } finally {
     t.push(
-      N({
+      F({
         endTimestamp: y.timestamp(
           "streaming_metrics:playback_info_fetch:endTimestamp"
         ),
@@ -2652,15 +2628,15 @@ class Y {
     this.#r || (this.#i = () => this.#o(), this.#t = () => this.#a(), window.addEventListener("offline", this.#t, !1), window.addEventListener("online", this.#i, !1), this.#r = !0);
   }
 }
-const pt = "streaming-privileges-revoked";
-function ft(r) {
-  return new CustomEvent(pt, {
+const mt = "streaming-privileges-revoked";
+function pt(r) {
+  return new CustomEvent(mt, {
     detail: r
   });
 }
-let k;
+let E;
 async function J(r) {
-  const e = _("apiUrl"), t = await fetch(e + "/rt/connect", {
+  const e = C("apiUrl"), t = await fetch(e + "/rt/connect", {
     headers: new Headers({
       Authorization: "Bearer " + r,
       "Content-Type": "application/json"
@@ -2674,7 +2650,7 @@ function X(r) {
     r.addEventListener("open", () => e(), { once: !0 });
   });
 }
-class F {
+class _ {
   #e;
   #r;
   #s;
@@ -2688,7 +2664,7 @@ class F {
    * Call this method to ensure pushkin is running.
    */
   static async ensure() {
-    await P() && (k ? k.connected || await k.reconnect() : k = new F());
+    await P() && (E ? E.connected || await E.reconnect() : E = new _());
   }
   /**
    * Call this method when credentials changes to re-setup pushkin with the new credentials
@@ -2697,7 +2673,7 @@ class F {
     if (!await P())
       return;
     const e = await V();
-    k && e && k.reconnect().catch(console.error);
+    E && e && E.reconnect().catch(console.error);
   }
   async #i() {
     const e = await V();
@@ -2723,7 +2699,7 @@ class F {
     switch (t.type) {
       case "PRIVILEGED_SESSION_NOTIFICATION": {
         m.dispatchEvent(
-          ft(
+          pt(
             String(t.payload.clientDisplayName)
           )
         ), p.activePlayer?.pause();
@@ -2761,19 +2737,19 @@ class F {
     return this.#t && this.#t.readyState === WebSocket.OPEN;
   }
 }
-const gt = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const ft = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  Pushkin: F,
+  Pushkin: _,
   fetchWebSocketURL: J,
   socketOpen: X
 }, Symbol.toStringTag, { value: "Module" }));
-async function yt() {
-  Le(), Y.disable(), await Te();
+async function gt() {
+  Ae(), Y.disable(), await Te();
 }
-function Ut(r, e) {
+function Ht(r, e) {
   return r === "FULL" && e.sourceType !== "PRIVATE_LINK_SHARING";
 }
-const wt = {
+const yt = {
   actions: [],
   actualAssetPresentation: "PREVIEW",
   actualAudioMode: "STEREO",
@@ -2791,9 +2767,9 @@ const wt = {
   startTimestamp: -1
 }, Z = await T(
   "playback_session",
-  wt
+  yt
 );
-async function Vt(r) {
+async function Ut(r) {
   const e = await Z(r);
   if (!e) {
     console.error("reducedData is undefined");
@@ -2807,16 +2783,14 @@ async function Vt(r) {
     streamingSessionId: s
   };
 }
-function zt(r, e) {
+function Vt(r, e) {
   return Z({
     actions: [e],
     streamingSessionId: r
   });
 }
-function Wt(r) {
+function zt(r) {
   switch (r) {
-    case "demo":
-      return "UC";
     case "video":
       return "VIDEO";
     case "track":
@@ -2824,12 +2798,12 @@ function Wt(r) {
       return "TRACK";
   }
 }
-async function $t(r) {
+async function Wt(r) {
   const e = await P();
   for (const t of r)
     if (t) {
       const s = await t;
-      s && await q({
+      s && await G({
         ..."extras" in s && { extras: s.extras },
         group: e ? "play_log" : "play_log_open",
         name: s.name,
@@ -2841,7 +2815,7 @@ async function $t(r) {
 async function ee(r, e = 0, t = !1) {
   if (!D.hasEventSender())
     throw new Error("Playback not allowed without an event sender.");
-  if (await y.synchronize(), F.ensure().catch(console.error), p.activePlayer?.nextItem && p.activePlayer.nextItem.mediaProduct.productId === r.productId) {
+  if (await y.synchronize(), _.ensure().catch(console.error), p.activePlayer?.nextItem && p.activePlayer.nextItem.mediaProduct.productId === r.productId) {
     const f = p.activePlayer;
     return performance.mark(
       "streaming_metrics:playback_statistics:idealStartTimestamp",
@@ -2854,7 +2828,7 @@ async function ee(r, e = 0, t = !1) {
       r
     ), f.skipToPreloadedMediaProduct();
   }
-  const s = yt(), n = rt();
+  const s = gt(), n = rt();
   j([
     et({
       sessionProductId: r.productId,
@@ -2871,10 +2845,10 @@ async function ee(r, e = 0, t = !1) {
       startTime: y.now()
     }
   );
-  const { clientId: o, token: a } = await v.credentialsProvider.getCredentials(), c = _("streamingWifiAudioQuality");
+  const { clientId: o, token: a } = await v.credentialsProvider.getCredentials(), c = C("streamingWifiAudioQuality");
   let u = null;
   try {
-    u = await mt({
+    u = await ht({
       accessToken: a,
       audioQuality: c,
       clientId: o,
@@ -2883,7 +2857,7 @@ async function ee(r, e = 0, t = !1) {
       streamingSessionId: n
     });
   } catch (f) {
-    f instanceof C && m.dispatchError(f), document.location.href.includes("localhost") && console.error(f);
+    f instanceof O && m.dispatchError(f), document.location.href.includes("localhost") && console.error(f);
   }
   if (!u)
     return;
@@ -2912,33 +2886,33 @@ m.addEventListener("load", (r) => {
     ee(t, e).then().catch(console.error);
   }
 });
-function bt() {
+function wt() {
   return p.activePlayer?.pause();
 }
-async function vt() {
+async function bt() {
   await y.synchronize();
   const { activePlayer: r } = p;
   return r ? (m.dispatchEvent(new CustomEvent("user-action")), r.play()) : Promise.reject(new Error("No active player"));
 }
-async function St(r) {
+async function vt(r) {
   const { activePlayer: e } = p;
   return e?.seek(r);
 }
-function Qt(r) {
+function $t(r) {
   v.credentialsProvider = r;
 }
-function Gt(r) {
+function qt(r) {
   D.eventSender = r;
 }
-const Mt = "active-device-changed";
-function qt(r) {
-  return new CustomEvent(Mt, {
+const St = "active-device-changed";
+function Qt(r) {
+  return new CustomEvent(St, {
     detail: r
   });
 }
-const Et = "active-device-mode-changed";
-function jt(r) {
-  return new CustomEvent(Et, {
+const Mt = "active-device-mode-changed";
+function Gt(r) {
+  return new CustomEvent(Mt, {
     detail: r
   });
 }
@@ -2967,7 +2941,7 @@ function kt() {
 he().then().catch(console.error);
 pe().then().catch(console.error);
 kt();
-const U = String.raw, Pt = String.raw;
+const U = String.raw, Et = String.raw;
 function re(r) {
   if (r === void 0)
     return "0:00";
@@ -3000,8 +2974,8 @@ function se(r = 0) {
   };
   return `P${[t, s, n].map(o).join("")}`;
 }
-const Tt = "tidal-current-time";
-class It extends HTMLElement {
+const Pt = "tidal-current-time";
+class Tt extends HTMLElement {
   #e = void 0;
   #r = /* @__PURE__ */ new Set();
   #s;
@@ -3042,8 +3016,8 @@ class It extends HTMLElement {
     this.#e && (this.#e.textContent = re(t), this.#e.setAttribute("datetime", se(t)));
   }
 }
-customElements.define(Tt, It);
-const Lt = "tidal-duration-time";
+customElements.define(Pt, Tt);
+const It = "tidal-duration-time";
 class At extends HTMLElement {
   #e;
   #r = !1;
@@ -3082,9 +3056,9 @@ class At extends HTMLElement {
     this.#e && (this.#e.textContent = re(t), this.#e.setAttribute("datetime", se(t)));
   }
 }
-customElements.define(Lt, At);
-const Ot = "tidal-play-trigger";
-class Ct extends HTMLElement {
+customElements.define(It, At);
+const Lt = "tidal-play-trigger";
+class Ot extends HTMLElement {
   #e;
   #r = !1;
   constructor() {
@@ -3093,7 +3067,7 @@ class Ct extends HTMLElement {
     }, this.#i();
   }
   async #s() {
-    await this.#t(), Q() === "PLAYING" ? bt() : await vt();
+    await this.#t(), q() === "PLAYING" ? wt() : await bt();
   }
   #t() {
     const e = Ne()?.productId ?? void 0;
@@ -3137,8 +3111,8 @@ class Ct extends HTMLElement {
     return ["product-id", "product-type"];
   }
 }
-customElements.define(Ot, Ct);
-const _t = U`
+customElements.define(Lt, Ot);
+const Ct = U`
   :host {
     display: inline-block;
   }
@@ -3162,7 +3136,7 @@ const _t = U`
 `, $ = {
   NO_DURATION: "You need to set duration before you can start/stop the progress bar."
 };
-class Ft extends HTMLElement {
+class _t extends HTMLElement {
   #e;
   #r = 1;
   #s = null;
@@ -3174,7 +3148,7 @@ class Ft extends HTMLElement {
   constructor() {
     super(), this.#t = (e) => {
       const t = e;
-      if (this.duration = t.detail.playbackContext.actualDuration, Q() === "PLAYING")
+      if (this.duration = t.detail.playbackContext.actualDuration, q() === "PLAYING")
         try {
           this.start();
         } catch (s) {
@@ -3203,9 +3177,9 @@ class Ft extends HTMLElement {
   }
   #d() {
     const e = this.attachShadow({ mode: "closed" });
-    e.innerHTML = Pt`
+    e.innerHTML = Et`
       <style>
-        ${_t}
+        ${Ct}
       </style>
       <div id="wrapper">
         <div id="indicator"></div>
@@ -3255,7 +3229,7 @@ class Ft extends HTMLElement {
    */
   handleClick(e) {
     const t = this.getMousePositionAsPercent(e), s = this.#r * t;
-    this.currentTime = s, St(s / 1e3);
+    this.currentTime = s, vt(s / 1e3);
   }
   /**
    * Starts the animation if duration is defined.
@@ -3310,9 +3284,9 @@ class Ft extends HTMLElement {
     this.stop(), this.#e && (this.#e.playbackRate = e), this.start();
   }
 }
-const Nt = "tidal-progress-bar";
-customElements.define(Nt, Ft);
-const Bt = U`
+const Ft = "tidal-progress-bar";
+customElements.define(Ft, _t);
+const Nt = U`
   :host {
     position: relative;
     display: block;
@@ -3329,8 +3303,8 @@ const Bt = U`
     position: relative;
     background-color: black;
   }
-`, xt = "tidal-video-view";
-class Rt extends HTMLElement {
+`, Bt = "tidal-video-view";
+class xt extends HTMLElement {
   #e = !1;
   #r;
   #s;
@@ -3359,7 +3333,7 @@ class Rt extends HTMLElement {
   connectedCallback() {
     this.#t();
     const e = this.attachShadow({ mode: "closed" }), t = document.createElement("style");
-    t.textContent = Bt;
+    t.textContent = Nt;
     const s = document.createElement("slot");
     e.appendChild(t), e.appendChild(s);
   }
@@ -3379,39 +3353,39 @@ class Rt extends HTMLElement {
     e && (this.innerHTML = "", this.appendChild(e));
   }
 }
-customElements.define(xt, Rt);
+customElements.define(Bt, xt);
 export {
-  Ht as C,
-  qt as G,
-  Qt as H,
-  E as I,
-  Dt as L,
+  Qt as $,
+  k as A,
+  Rt as B,
+  Dt as C,
+  j as D,
+  Vt as L,
   H as P,
-  Gt as Q,
-  zt as R,
+  qt as Q,
+  O as R,
   v as S,
-  j as W,
-  me as a,
+  $t as U,
+  Gt as a,
   m as b,
-  fe as c,
-  $t as d,
-  Qe as e,
+  me as c,
+  fe as d,
+  Wt as e,
   oe as f,
-  Wt as g,
-  Ut as h,
-  ee as i,
-  jt as j,
-  _ as k,
+  Ht as g,
+  ee as h,
+  Je as i,
+  qe as j,
+  C as k,
   p as l,
-  Je as m,
-  rt as n,
-  Tt as o,
+  rt as m,
+  Pt as n,
+  It as o,
   Lt as p,
   z as q,
-  Ot as r,
-  Nt as s,
-  xt as t,
-  Vt as w,
-  C as x,
+  Ft as r,
+  Bt as s,
+  Ut as v,
+  zt as w,
   y
 };