@fileverse-dev/ddoc 7.0.2 → 7.1.0

package/dist/tab-utils-Cvs3qmhi.mjs

@@ -0,0 +1,340 @@
+import { fromUint8Array as L, toUint8Array as B } from "js-base64";
+import * as h from "yjs";
+const R = "default", j = "Tab 1", U = "ddocTabs", N = "tabs_order", C = "tabs_name_registry", b = "tabs_emoji_registry", z = "tabs_state", K = "tabs_delete_registry", O = "activeTabId", k = "tabs_parent_registry", P = 3, re = (e) => Math.min(Math.max(e.depth ?? 1, 1), P);
+function E(e) {
+  return {
+    order: e.getArray(N),
+    nameById: e.getMap(C),
+    emojiById: e.getMap(b),
+    tabState: e.getMap(z),
+    // Soft-deleted tabs keep their fragment for undo and late peer updates.
+    // This tombstone stops self-heal from resurrecting deleted tabs from stale tab metadata.
+    deletedById: e.getMap(K),
+    // Reading a root that was never written adds nothing to the doc, so a doc
+    // without subtabs stays byte-for-byte the same.
+    parentById: e.getMap(k)
+  };
+}
+function v(e, t) {
+  if (e)
+    try {
+      if (Array.isArray(e)) {
+        const n = e.map((r) => B(r));
+        h.applyUpdate(t, h.mergeUpdates(n), "self");
+        return;
+      }
+      h.applyUpdate(t, B(e), "self");
+    } catch (n) {
+      console.log(n);
+    }
+}
+function M(e) {
+  return e ? e.toArray().filter((t) => typeof t == "string") : [];
+}
+function X(e) {
+  const t = e.getMap(U), n = t.get("order"), r = t.get("tabs"), s = t.get("activeTabId"), c = M(
+    n instanceof h.Array ? n : null
+  ), o = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Map();
+  return r instanceof h.Map && r.forEach((m, a) => {
+    if (!(m instanceof h.Map) || typeof a != "string") return;
+    const i = m.get("name"), l = m.get("emoji");
+    typeof i == "string" && o.set(a, i), (typeof l == "string" || l === null) && f.set(a, l);
+  }), {
+    order: c,
+    names: o,
+    emojis: f,
+    activeTabId: s instanceof h.Text && s.toString() || null,
+    deletedIds: /* @__PURE__ */ new Set(),
+    hasData: c.length > 0 || o.size > 0 || f.size > 0 || s instanceof h.Text && s.length > 0
+  };
+}
+function V(e) {
+  const t = E(e), n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Set();
+  t.nameById.forEach((f, m) => {
+    typeof f == "string" && n.set(m, f);
+  }), t.emojiById.forEach((f, m) => {
+    (typeof f == "string" || f === null) && r.set(m, f);
+  }), t.deletedById.forEach((f, m) => {
+    f === !0 && s.add(m);
+  });
+  const c = t.tabState.get(O), o = typeof c == "string" ? c : null;
+  return {
+    order: M(t.order),
+    names: n,
+    emojis: r,
+    activeTabId: o,
+    deletedIds: s,
+    hasData: t.order.length > 0 || t.nameById.size > 0 || t.emojiById.size > 0 || t.deletedById.size > 0 || o !== null
+  };
+}
+function S(e) {
+  const t = /* @__PURE__ */ new Set(), n = [];
+  return e.forEach((r) => {
+    t.has(r) || (t.add(r), n.push(r));
+  }), n;
+}
+function Y(e) {
+  return e === 0 ? j : `Tab ${e + 1}`;
+}
+function W(e, t) {
+  return S([
+    ...e.order,
+    ...t.order,
+    ...Array.from(e.names.keys()),
+    ...Array.from(e.emojis.keys()),
+    ...Array.from(t.names.keys()),
+    ...Array.from(t.emojis.keys())
+  ]);
+}
+function G(e, t) {
+  const n = new Set(e.deletedIds);
+  t.forEach((a) => {
+    a.deletedIds.forEach((i) => n.add(i));
+  });
+  const r = /* @__PURE__ */ new Set(), s = [];
+  e.order.forEach((a) => {
+    !n.has(a) && !r.has(a) && (r.add(a), s.push(a));
+  });
+  const c = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map();
+  e.names.forEach((a, i) => {
+    n.has(i) || c.set(i, a);
+  }), e.emojis.forEach((a, i) => {
+    n.has(i) || o.set(i, a);
+  }), t.forEach((a) => {
+    a.order.forEach((i) => {
+      n.has(i) || (r.has(i) || (r.add(i), s.push(i)), !c.has(i) && a.names.has(i) && c.set(i, a.names.get(i) ?? j), o.has(i) || o.set(
+        i,
+        a.emojis.has(i) ? a.emojis.get(i) ?? null : null
+      ));
+    });
+  }), s.forEach((a, i) => {
+    c.has(a) || c.set(a, Y(i)), (!o.has(a) || o.get(a) === void 0) && o.set(a, null);
+  });
+  const m = [
+    e.activeTabId,
+    ...t.map((a) => a.activeTabId)
+  ].find(
+    (a) => !!a && r.has(a) && !n.has(a)
+  ) ?? s[0] ?? null;
+  return {
+    order: s,
+    names: c,
+    emojis: o,
+    activeTabId: m,
+    deletedIds: n
+  };
+}
+function H(e, t, n) {
+  const r = (n == null ? void 0 : n.createDefaultTabIfMissing) ?? !1, s = new Set(e.deletedIds), c = W(
+    e,
+    t
+  ).filter((l) => !s.has(l)), o = S([
+    ...e.order,
+    ...t.order
+  ]);
+  c.forEach((l) => {
+    o.includes(l) || o.push(l);
+  }), o.length === 0 && r && o.push(R);
+  const f = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
+  o.forEach((l, y) => {
+    const p = e.names.get(l) ?? t.names.get(l) ?? Y(y), A = e.emojis.has(l) ? e.emojis.get(l) ?? null : t.emojis.has(l) ? t.emojis.get(l) ?? null : null;
+    f.set(l, p), m.set(l, A);
+  });
+  const i = [
+    e.activeTabId,
+    t.activeTabId
+  ].find(
+    (l) => !!l && o.includes(l)
+  ) ?? o[0] ?? null;
+  return {
+    order: o,
+    names: f,
+    emojis: m,
+    activeTabId: i,
+    deletedIds: s
+  };
+}
+function q(e, t) {
+  return e.length !== t.length ? !1 : e.every((n, r) => n === t[r]);
+}
+function J(e, t) {
+  const n = M(e);
+  return q(n, t) ? !1 : (e.length > 0 && e.delete(0, e.length), t.length > 0 && e.insert(0, t), !0);
+}
+function $(e, t, n) {
+  const r = e.get(t);
+  return n === null ? r === void 0 ? !1 : (e.delete(t), !0) : r === n ? !1 : (e.set(t, n), !0);
+}
+function _(e, t) {
+  let n = !1;
+  return Array.from(e.keys()).forEach((r) => {
+    t.has(r) || (e.delete(r), n = !0);
+  }), t.forEach((r, s) => {
+    e.get(s) !== r && (e.set(s, r), n = !0);
+  }), n;
+}
+function F(e, t, n = "self") {
+  const r = E(e);
+  let s = !1;
+  const c = new Map(
+    Array.from(t.deletedIds, (o) => [o, !0])
+  );
+  return e.transact(() => {
+    t.order.forEach((o) => {
+      e.getXmlFragment(o);
+    }), s = J(r.order, t.order) || s, s = _(r.nameById, t.names) || s, s = _(r.emojiById, t.emojis) || s, s = $(
+      r.tabState,
+      O,
+      t.activeTabId
+    ) || s, s = _(r.deletedById, c) || s;
+  }, n), s;
+}
+function w(e, t) {
+  const n = V(e), r = X(e), s = H(
+    n,
+    r,
+    t
+  );
+  return {
+    tabSnapshotV2: n,
+    legacySnapshot: r,
+    resolvedTabState: s
+  };
+}
+function I(e, t, n = "self") {
+  const { resolvedTabState: r } = w(e, t);
+  return F(e, r, n);
+}
+function se(e, t, n) {
+  v(e, t);
+  const r = I(t, {
+    ...n,
+    createDefaultTabIfMissing: (n == null ? void 0 : n.createDefaultTabIfMissing) ?? !0
+  }), s = E(t), c = x(s), o = Q(s) || R;
+  return {
+    tabList: c,
+    // A stored open tab that is not shown (under a deleted tab) opens the
+    // first tab instead.
+    activeTabId: c.length === 0 || c.some((f) => f.id === o) ? o : c[0].id,
+    didWrite: r
+  };
+}
+function ae(e) {
+  return E(e);
+}
+function oe(e, t, n = "self") {
+  const r = I(e, t, n);
+  return {
+    ...E(e),
+    didWrite: r
+  };
+}
+function ie(e, t) {
+  const n = e.map((o) => {
+    const f = new h.Doc();
+    return v(o, f), w(f, t).resolvedTabState;
+  }), r = new h.Doc();
+  v(e, r);
+  const { resolvedTabState: s } = w(
+    r,
+    t
+  ), c = G(
+    s,
+    n
+  );
+  return F(r, c), L(h.encodeStateAsUpdate(r));
+}
+function Q(e) {
+  const t = e.tabState.get(O);
+  return typeof t == "string" ? t : null;
+}
+function Z(e, t) {
+  return e.nameById.has(t) ? {
+    name: e.nameById.get(t) ?? j,
+    emoji: e.emojiById.has(t) ? e.emojiById.get(t) ?? null : null
+  } : null;
+}
+function x(e) {
+  const t = te(e), n = e.parentById;
+  return !n || n.size === 0 ? t : ee(t, n, e.deletedById);
+}
+function ee(e, t, n) {
+  const r = new Set(e.map((u) => u.id)), s = /* @__PURE__ */ new Set();
+  n == null || n.forEach((u, d) => {
+    u === !0 && !r.has(d) && s.add(d);
+  });
+  const c = (u) => {
+    const d = t.get(u);
+    return typeof d == "string" && d !== u ? d : null;
+  }, o = (u) => {
+    const d = /* @__PURE__ */ new Set([u]);
+    let g = c(u);
+    for (; g && !d.has(g); ) {
+      if (s.has(g)) return !0;
+      d.add(g), g = c(g);
+    }
+    return !1;
+  }, f = e.filter((u) => !o(u.id)), m = f.length > 0 ? f : e, a = new Set(m.map((u) => u.id)), i = (u) => {
+    const d = c(u);
+    if (!d || !a.has(d)) return null;
+    const g = /* @__PURE__ */ new Set();
+    let T = d;
+    for (; T && a.has(T) && !g.has(T); ) {
+      if (T === u) return null;
+      g.add(T), T = c(T);
+    }
+    return d;
+  }, l = "", y = /* @__PURE__ */ new Map();
+  m.forEach((u) => {
+    const d = i(u.id) ?? l, g = y.get(d);
+    g ? g.push(u) : y.set(d, [u]);
+  });
+  const p = [], A = (u, d) => {
+    var g;
+    (g = y.get(u)) == null || g.forEach((T) => {
+      var D;
+      p.push({
+        ...T,
+        parentId: u === l ? null : u,
+        depth: d,
+        hasChildren: (((D = y.get(T.id)) == null ? void 0 : D.length) ?? 0) > 0
+      }), A(T.id, d + 1);
+    });
+  };
+  return A(l, 1), p;
+}
+function te(e) {
+  const t = /* @__PURE__ */ new Set();
+  return M(e.order).filter((n) => t.has(n) ? !1 : (t.add(n), !0)).map((n) => {
+    const r = Z(
+      e,
+      n
+    );
+    return r ? {
+      id: n,
+      name: r.name,
+      emoji: r.emoji
+    } : null;
+  }).filter((n) => n !== null);
+}
+function ce(e) {
+  return e.toArray().map((t) => t instanceof h.XmlElement || t instanceof h.XmlText ? t.clone() : null).filter((t) => t !== null);
+}
+export {
+  O as A,
+  R as D,
+  U as L,
+  P as M,
+  N as O,
+  z as S,
+  ae as a,
+  x as b,
+  Z as c,
+  Q as d,
+  ce as e,
+  se as f,
+  re as g,
+  j as h,
+  ie as m,
+  oe as s
+};

package/dist/{use-headless-editor-CbMBM1S_.mjs → use-headless-editor-Bs_4LOHk.mjs}

@@ -40,7 +40,7 @@ import SC from "katex";
 import { List as TC } from "react-window";
 import { create as My, useStore as AC, createStore as EC } from "zustand";
 import { fromUint8Array as fn, toUint8Array as yp } from "js-base64";
-import { D as Hr, O as MC, L as NC, m as bp, g as OC, A as DC } from "./tab-utils-BNFvrUAj.mjs";
+import { D as Hr, O as MC, L as NC, m as bp, a as OC, A as DC } from "./tab-utils-Cvs3qmhi.mjs";
 import { getAddressName as IC } from "@fileverse/ens";
 import RC from "embla-carousel-react";
 import { useMediaQuery as Ny, useOnClickOutside as LC } from "usehooks-ts";
@@ -39983,7 +39983,7 @@ ${u}
             f = h.showLoader(), p = h.removeLoader;
           }
           try {
-            const h = await a.arrayBuffer(), { default: m } = await import("./index-DzUWhgai.mjs").then((v) => v.i), { value: g } = await m.convertToHtml(
+            const h = await a.arrayBuffer(), { default: m } = await import("./index-C27hDm2f.mjs").then((v) => v.i), { value: g } = await m.convertToHtml(
               { arrayBuffer: h },
               {
                 styleMap: hk,
@@ -44301,7 +44301,7 @@ const G5 = (t, e) => {
   async function d(f, p, h) {
     if (f.type === "application/vnd.openxmlformats-officedocument.wordprocessingml.document" || f.name.endsWith(".docx"))
       try {
-        const m = await f.arrayBuffer(), { default: g } = await import("./index-DzUWhgai.mjs").then((C) => C.i), { value: y } = await g.convertToHtml(
+        const m = await f.arrayBuffer(), { default: g } = await import("./index-C27hDm2f.mjs").then((C) => C.i), { value: y } = await g.convertToHtml(
           { arrayBuffer: m },
           {
             styleMap: hk,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/ddoc",
   "private": false,
   "description": "DDoc",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fileverse/fileverse-ddocs.git"
@@ -205,4 +205,4 @@
     "vitest": "^2.1.0",
     "yjs": "13.6.30"
   }
-}
+}

package/dist/tab-utils-BNFvrUAj.mjs

@@ -1,284 +0,0 @@
-import { fromUint8Array as R, toUint8Array as p } from "js-base64";
-import * as d from "yjs";
-const M = "default", E = "Tab 1", Y = "ddocTabs", F = "tabs_order", S = "tabs_name_registry", N = "tabs_emoji_registry", U = "tabs_state", L = "tabs_delete_registry", A = "activeTabId";
-function m(e) {
-  return {
-    order: e.getArray(F),
-    nameById: e.getMap(S),
-    emojiById: e.getMap(N),
-    tabState: e.getMap(U),
-    // Soft-deleted tabs keep their fragment for undo and late peer updates.
-    // This tombstone stops self-heal from resurrecting deleted tabs from stale tab metadata.
-    deletedById: e.getMap(L)
-  };
-}
-function h(e, t) {
-  if (e)
-    try {
-      if (Array.isArray(e)) {
-        const n = e.map((r) => p(r));
-        d.applyUpdate(t, d.mergeUpdates(n), "self");
-        return;
-      }
-      d.applyUpdate(t, p(e), "self");
-    } catch (n) {
-      console.log(n);
-    }
-}
-function g(e) {
-  return e ? e.toArray().filter((t) => typeof t == "string") : [];
-}
-function C(e) {
-  const t = e.getMap(Y), n = t.get("order"), r = t.get("tabs"), s = t.get("activeTabId"), l = g(
-    n instanceof d.Array ? n : null
-  ), o = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Map();
-  return r instanceof d.Map && r.forEach((u, a) => {
-    if (!(u instanceof d.Map) || typeof a != "string") return;
-    const i = u.get("name"), c = u.get("emoji");
-    typeof i == "string" && o.set(a, i), (typeof c == "string" || c === null) && f.set(a, c);
-  }), {
-    order: l,
-    names: o,
-    emojis: f,
-    activeTabId: s instanceof d.Text && s.toString() || null,
-    deletedIds: /* @__PURE__ */ new Set(),
-    hasData: l.length > 0 || o.size > 0 || f.size > 0 || s instanceof d.Text && s.length > 0
-  };
-}
-function I(e) {
-  const t = m(e), n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Set();
-  t.nameById.forEach((f, u) => {
-    typeof f == "string" && n.set(u, f);
-  }), t.emojiById.forEach((f, u) => {
-    (typeof f == "string" || f === null) && r.set(u, f);
-  }), t.deletedById.forEach((f, u) => {
-    f === !0 && s.add(u);
-  });
-  const l = t.tabState.get(A), o = typeof l == "string" ? l : null;
-  return {
-    order: g(t.order),
-    names: n,
-    emojis: r,
-    activeTabId: o,
-    deletedIds: s,
-    hasData: t.order.length > 0 || t.nameById.size > 0 || t.emojiById.size > 0 || t.deletedById.size > 0 || o !== null
-  };
-}
-function _(e) {
-  const t = /* @__PURE__ */ new Set(), n = [];
-  return e.forEach((r) => {
-    t.has(r) || (t.add(r), n.push(r));
-  }), n;
-}
-function j(e) {
-  return e === 0 ? E : `Tab ${e + 1}`;
-}
-function K(e, t) {
-  return _([
-    ...e.order,
-    ...t.order,
-    ...Array.from(e.names.keys()),
-    ...Array.from(e.emojis.keys()),
-    ...Array.from(t.names.keys()),
-    ...Array.from(t.emojis.keys())
-  ]);
-}
-function b(e, t) {
-  const n = new Set(e.deletedIds);
-  t.forEach((a) => {
-    a.deletedIds.forEach((i) => n.add(i));
-  });
-  const r = /* @__PURE__ */ new Set(), s = [];
-  e.order.forEach((a) => {
-    !n.has(a) && !r.has(a) && (r.add(a), s.push(a));
-  });
-  const l = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map();
-  e.names.forEach((a, i) => {
-    n.has(i) || l.set(i, a);
-  }), e.emojis.forEach((a, i) => {
-    n.has(i) || o.set(i, a);
-  }), t.forEach((a) => {
-    a.order.forEach((i) => {
-      n.has(i) || (r.has(i) || (r.add(i), s.push(i)), !l.has(i) && a.names.has(i) && l.set(i, a.names.get(i) ?? E), o.has(i) || o.set(
-        i,
-        a.emojis.has(i) ? a.emojis.get(i) ?? null : null
-      ));
-    });
-  }), s.forEach((a, i) => {
-    l.has(a) || l.set(a, j(i)), (!o.has(a) || o.get(a) === void 0) && o.set(a, null);
-  });
-  const u = [
-    e.activeTabId,
-    ...t.map((a) => a.activeTabId)
-  ].find(
-    (a) => !!a && r.has(a) && !n.has(a)
-  ) ?? s[0] ?? null;
-  return {
-    order: s,
-    names: l,
-    emojis: o,
-    activeTabId: u,
-    deletedIds: n
-  };
-}
-function z(e, t, n) {
-  const r = (n == null ? void 0 : n.createDefaultTabIfMissing) ?? !1, s = new Set(e.deletedIds), l = K(
-    e,
-    t
-  ).filter((c) => !s.has(c)), o = _([
-    ...e.order,
-    ...t.order
-  ]);
-  l.forEach((c) => {
-    o.includes(c) || o.push(c);
-  }), o.length === 0 && r && o.push(M);
-  const f = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Map();
-  o.forEach((c, D) => {
-    const B = e.names.get(c) ?? t.names.get(c) ?? j(D), O = e.emojis.has(c) ? e.emojis.get(c) ?? null : t.emojis.has(c) ? t.emojis.get(c) ?? null : null;
-    f.set(c, B), u.set(c, O);
-  });
-  const i = [
-    e.activeTabId,
-    t.activeTabId
-  ].find(
-    (c) => !!c && o.includes(c)
-  ) ?? o[0] ?? null;
-  return {
-    order: o,
-    names: f,
-    emojis: u,
-    activeTabId: i,
-    deletedIds: s
-  };
-}
-function k(e, t) {
-  return e.length !== t.length ? !1 : e.every((n, r) => n === t[r]);
-}
-function V(e, t) {
-  const n = g(e);
-  return k(n, t) ? !1 : (e.length > 0 && e.delete(0, e.length), t.length > 0 && e.insert(0, t), !0);
-}
-function W(e, t, n) {
-  const r = e.get(t);
-  return n === null ? r === void 0 ? !1 : (e.delete(t), !0) : r === n ? !1 : (e.set(t, n), !0);
-}
-function T(e, t) {
-  let n = !1;
-  return Array.from(e.keys()).forEach((r) => {
-    t.has(r) || (e.delete(r), n = !0);
-  }), t.forEach((r, s) => {
-    e.get(s) !== r && (e.set(s, r), n = !0);
-  }), n;
-}
-function v(e, t, n = "self") {
-  const r = m(e);
-  let s = !1;
-  const l = new Map(
-    Array.from(t.deletedIds, (o) => [o, !0])
-  );
-  return e.transact(() => {
-    t.order.forEach((o) => {
-      e.getXmlFragment(o);
-    }), s = V(r.order, t.order) || s, s = T(r.nameById, t.names) || s, s = T(r.emojiById, t.emojis) || s, s = W(
-      r.tabState,
-      A,
-      t.activeTabId
-    ) || s, s = T(r.deletedById, l) || s;
-  }, n), s;
-}
-function y(e, t) {
-  const n = I(e), r = C(e), s = z(
-    n,
-    r,
-    t
-  );
-  return {
-    tabSnapshotV2: n,
-    legacySnapshot: r,
-    resolvedTabState: s
-  };
-}
-function w(e, t, n = "self") {
-  const { resolvedTabState: r } = y(e, t);
-  return v(e, r, n);
-}
-function P(e, t, n) {
-  h(e, t);
-  const r = w(t, {
-    ...n,
-    createDefaultTabIfMissing: (n == null ? void 0 : n.createDefaultTabIfMissing) ?? !0
-  }), s = m(t);
-  return {
-    tabList: q(s),
-    activeTabId: X(s) || M,
-    didWrite: r
-  };
-}
-function $(e) {
-  return m(e);
-}
-function H(e, t, n = "self") {
-  const r = w(e, t, n);
-  return {
-    ...m(e),
-    didWrite: r
-  };
-}
-function Q(e, t) {
-  const n = e.map((o) => {
-    const f = new d.Doc();
-    return h(o, f), y(f, t).resolvedTabState;
-  }), r = new d.Doc();
-  h(e, r);
-  const { resolvedTabState: s } = y(
-    r,
-    t
-  ), l = b(
-    s,
-    n
-  );
-  return v(r, l), R(d.encodeStateAsUpdate(r));
-}
-function X(e) {
-  const t = e.tabState.get(A);
-  return typeof t == "string" ? t : null;
-}
-function G(e, t) {
-  return e.nameById.has(t) ? {
-    name: e.nameById.get(t) ?? E,
-    emoji: e.emojiById.has(t) ? e.emojiById.get(t) ?? null : null
-  } : null;
-}
-function q(e) {
-  const t = /* @__PURE__ */ new Set();
-  return g(e.order).filter((n) => t.has(n) ? !1 : (t.add(n), !0)).map((n) => {
-    const r = G(
-      e,
-      n
-    );
-    return r ? {
-      id: n,
-      name: r.name,
-      emoji: r.emoji
-    } : null;
-  }).filter((n) => n !== null);
-}
-function Z(e) {
-  return e.toArray().map((t) => t instanceof d.XmlElement || t instanceof d.XmlText ? t.clone() : null).filter((t) => t !== null);
-}
-export {
-  A,
-  M as D,
-  Y as L,
-  F as O,
-  U as S,
-  G as a,
-  X as b,
-  Z as c,
-  P as d,
-  q as e,
-  E as f,
-  $ as g,
-  Q as m,
-  H as s
-};