artalk 2.7.2 → 2.7.3

package/dist/{Artalk.es.js → Artalk.mjs}

@@ -223,24 +223,6 @@ function getURLBasedOnApi(opts) {
 function getURLBasedOn(baseURL, path) {
   return `${baseURL.replace(/\/$/, "")}/${path.replace(/^\//, "")}`;
 }
-function mergeDeep(target, source) {
-  const isObject = (obj) => obj && typeof obj === "object";
-  if (!isObject(target) || !isObject(source)) {
-    return source;
-  }
-  Object.keys(source).forEach((key) => {
-    const targetValue = target[key];
-    const sourceValue = source[key];
-    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
-      target[key] = targetValue.concat(sourceValue);
-    } else if (isObject(targetValue) && isObject(sourceValue)) {
-      target[key] = mergeDeep(__spreadValues({}, targetValue), sourceValue);
-    } else {
-      target[key] = sourceValue;
-    }
-  });
-  return target;
-}
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -3695,12 +3677,12 @@ function parser$1(html, handler) {
     }
   }
   function parseComment() {
-    var index2 = html.indexOf("-->");
-    if (index2 >= 0) {
+    var index = html.indexOf("-->");
+    if (index >= 0) {
       if (handler.comment) {
-        handler.comment(html.substring(4, index2));
+        handler.comment(html.substring(4, index));
       }
-      html = html.substring(index2 + 3);
+      html = html.substring(index + 3);
       chars = false;
     }
   }
@@ -3709,10 +3691,10 @@ function parser$1(html, handler) {
       return;
     }
     var text;
-    var index2 = html.indexOf("<");
-    if (index2 >= 0) {
-      text = html.substring(0, index2);
-      html = html.substring(index2);
+    var index = html.indexOf("<");
+    if (index >= 0) {
+      text = html.substring(0, index);
+      html = html.substring(index);
     } else {
       text = html;
       html = "";
@@ -4063,13 +4045,13 @@ var hanabi$1 = { exports: {} };
       };
     });
     var defaultColors = ["23AC69", "91C132", "F19726", "E8552D", "1AAB8E", "E1147F", "2980C1", "1BA1E6", "9FA0A0", "F19726", "E30B20", "E30B20", "A3338B"];
-    var index2 = function(input, ref) {
+    var index = function(input, ref) {
       if (ref === void 0)
         ref = {};
       var colors = ref.colors;
       if (colors === void 0)
         colors = defaultColors;
-      var index3 = 0;
+      var index2 = 0;
       var cache = {};
       var wordRe = /[\u4E00-\u9FFF\u3400-\u4dbf\uf900-\ufaff\u3040-\u309f\uac00-\ud7af\u0400-\u04FF]+|\w+/;
       var leftAngleRe = /</;
@@ -4085,18 +4067,18 @@ var hanabi$1 = { exports: {} };
         if (cache[word]) {
           color = cache[word];
         } else {
-          color = colors[index3];
+          color = colors[index2];
           cache[word] = color;
         }
         var out = '<span style="color: #' + color + '">' + word + "</span>";
-        index3 = ++index3 % colors.length;
+        index2 = ++index2 % colors.length;
         return out;
       });
     };
     function toComment(cm) {
       return '<span style="color: slategray">' + cm + "</span>";
     }
-    return index2;
+    return index;
   });
 })(hanabi$1);
 var hanabiExports = hanabi$1.exports;
@@ -4175,6 +4157,26 @@ function marked(src) {
 function simpleMarked(src) {
   return src.replace(/```\s*([^]+?.*?[^]+?[^]+?)```/g, (_, code) => `<pre><code>${renderCode(code)}</code></pre>`).replace(/!\[(.*?)\]\((.*?)\)/g, (_, alt, imgSrc) => `<img src="${imgSrc}" alt="${alt}" />`).replace(/\[(.*?)\]\((.*?)\)/g, (_, text, link) => `<a href="${link}" target="_blank">${text}</a>`).replace(/\n/g, "<br>");
 }
+function mergeDeep(...objects) {
+  const isObject = (obj) => obj && typeof obj === "object" && obj.constructor === Object;
+  return objects.reduce((prev, obj) => {
+    Object.keys(obj != null ? obj : {}).forEach((key) => {
+      if (key === "__proto__" || key === "constructor" || key === "prototype") {
+        return;
+      }
+      const pVal = prev[key];
+      const oVal = obj[key];
+      if (Array.isArray(pVal) && Array.isArray(oVal)) {
+        prev[key] = pVal.concat(...oVal);
+      } else if (isObject(pVal) && isObject(oVal)) {
+        prev[key] = mergeDeep(pVal, oVal);
+      } else {
+        prev[key] = oVal;
+      }
+    });
+    return prev;
+  }, {});
+}
 class DataManager {
   constructor(events) {
     __publicField(this, "loading", false);
@@ -4332,11 +4334,9 @@ const defaults = {
   useBackendConf: true,
   locale: "zh-CN"
 };
-function handelCustomConf(customConf) {
-  const conf = mergeDeep(defaults, customConf);
-  if (customConf.el)
-    conf.el = customConf.el;
-  if (typeof conf.el === "string" && !!conf.el) {
+function handelCustomConf(customConf, full = false) {
+  const conf = full ? mergeDeep(defaults, customConf) : customConf;
+  if (conf.el && typeof conf.el === "string") {
     try {
       const findEl = document.querySelector(conf.el);
       if (!findEl)
@@ -4347,20 +4347,18 @@ function handelCustomConf(customConf) {
       throw new Error("Please check your Artalk `el` config.");
     }
   }
-  conf.server = conf.server.replace(/\/$/, "").replace(/\/api\/?$/, "");
-  if (!conf.pageKey) {
+  if (conf.pageKey === "")
     conf.pageKey = `${window.location.pathname}`;
-  }
-  if (!conf.pageTitle) {
+  if (conf.pageTitle === "")
     conf.pageTitle = `${document.title}`;
-  }
-  if (conf.locale === "auto") {
+  if (conf.server)
+    conf.server = conf.server.replace(/\/$/, "").replace(/\/api\/?$/, "");
+  if (conf.locale === "auto")
     conf.locale = navigator.language;
-  }
-  if (conf.flatMode === true || Number(conf.nestMax) <= 1)
-    conf.flatMode = true;
   if (conf.flatMode === "auto")
     conf.flatMode = window.matchMedia("(max-width: 768px)").matches;
+  if (typeof conf.nestMax === "number" && Number(conf.nestMax) <= 1)
+    conf.flatMode = true;
   return conf;
 }
 function handleConfFormServer(conf) {
@@ -4423,7 +4421,7 @@ function convertApiOptions(conf, ctx) {
   };
 }
 class Context {
-  constructor(conf, $root) {
+  constructor(conf) {
     /* 运行参数 */
     __publicField(this, "conf");
     __publicField(this, "data");
@@ -4431,7 +4429,7 @@ class Context {
     /* Event Manager */
     __publicField(this, "events", new EventManager());
     this.conf = conf;
-    this.$root = $root || document.createElement("div");
+    this.$root = conf.el;
     this.$root.classList.add("artalk");
     this.$root.innerHTML = "";
     this.data = new DataManager(this.events);
@@ -4509,9 +4507,15 @@ class Context {
     this.events.trigger("dark-mode-changed", darkMode);
   }
   updateConf(nConf) {
-    this.conf = mergeDeep(this.conf, handelCustomConf(nConf));
+    this.conf = mergeDeep(this.conf, handelCustomConf(nConf, false));
     this.events.trigger("conf-loaded", this.conf);
   }
+  getConf() {
+    return this.conf;
+  }
+  getEl() {
+    return this.$root;
+  }
   getMarked() {
     return getInstance();
   }
@@ -7042,6 +7046,11 @@ function showErrorDialog(opts) {
 }
 const ConfRemoter = (ctx) => {
   ctx.on("inited", () => {
+    if (ctx.conf.immediateFetch === false)
+      return;
+    ctx.trigger("conf-fetch");
+  });
+  ctx.on("conf-fetch", () => {
     loadConf(ctx);
   });
 };
@@ -7613,7 +7622,7 @@ class Emoticons extends EditorPlug {
         data.push(grp);
       };
       const remoteLoad = (d) => __async(this, null, function* () {
-        yield Promise.all(d.map((grp, index2) => __async(this, null, function* () {
+        yield Promise.all(d.map((grp, index) => __async(this, null, function* () {
           if (typeof grp === "object" && !Array.isArray(grp)) {
             pushGrp(grp);
           } else if (Array.isArray(grp)) {
@@ -7666,9 +7675,9 @@ class Emoticons extends EditorPlug {
   /** 避免表情 item.key 为 null 的情况 */
   solveNullKey(data) {
     data.forEach((grp) => {
-      grp.items.forEach((item, index2) => {
+      grp.items.forEach((item, index) => {
         if (!item.key)
-          item.key = `${grp.name} ${index2 + 1}`;
+          item.key = `${grp.name} ${index + 1}`;
       });
     });
   }
@@ -7701,14 +7710,14 @@ class Emoticons extends EditorPlug {
     const dest = [];
     Object.entries(owoData).forEach(([grpName, grp]) => {
       const nGrp = { name: grpName, type: grp.type, items: [] };
-      grp.container.forEach((item, index2) => {
+      grp.container.forEach((item, index) => {
         const iconStr = item.icon;
         if (/<(img|IMG)/.test(iconStr)) {
           const find = /src=["'](.*?)["']/.exec(iconStr);
           if (find && find.length > 1)
             item.icon = find[1];
         }
-        nGrp.items.push({ key: item.text || `${grpName} ${index2 + 1}`, val: item.icon });
+        nGrp.items.push({ key: item.text || `${grpName} ${index + 1}`, val: item.icon });
       });
       dest.push(nGrp);
     });
@@ -7718,10 +7727,10 @@ class Emoticons extends EditorPlug {
   initEmoticonsList() {
     this.$grpWrap = createElement(`<div class="atk-grp-wrap"></div>`);
     this.$panel.append(this.$grpWrap);
-    this.emoticons.forEach((grp, index2) => {
+    this.emoticons.forEach((grp, index) => {
       const $grp = createElement(`<div class="atk-grp" style="display: none;"></div>`);
       this.$grpWrap.append($grp);
-      $grp.setAttribute("data-index", String(index2));
+      $grp.setAttribute("data-index", String(index));
       $grp.setAttribute("data-grp-name", grp.name);
       $grp.setAttribute("data-type", grp.type);
       grp.items.forEach((item) => {
@@ -7749,11 +7758,11 @@ class Emoticons extends EditorPlug {
     if (this.emoticons.length > 1) {
       this.$grpSwitcher = createElement(`<div class="atk-grp-switcher"></div>`);
       this.$panel.append(this.$grpSwitcher);
-      this.emoticons.forEach((grp, index2) => {
+      this.emoticons.forEach((grp, index) => {
         const $item = createElement("<span />");
         $item.innerText = grp.name;
-        $item.setAttribute("data-index", String(index2));
-        $item.onclick = () => this.openGrp(index2);
+        $item.setAttribute("data-index", String(index));
+        $item.onclick = () => this.openGrp(index);
         this.$grpSwitcher.append($item);
       });
     }
@@ -7761,18 +7770,18 @@ class Emoticons extends EditorPlug {
       this.openGrp(0);
   }
   /** 打开一个表情组 */
-  openGrp(index2) {
+  openGrp(index) {
     var _a, _b, _c;
     Array.from(this.$grpWrap.children).forEach((item) => {
       const el = item;
-      if (el.getAttribute("data-index") !== String(index2)) {
+      if (el.getAttribute("data-index") !== String(index)) {
         el.style.display = "none";
       } else {
         el.style.display = "";
       }
     });
     (_a = this.$grpSwitcher) == null ? void 0 : _a.querySelectorAll("span.active").forEach((item) => item.classList.remove("active"));
-    (_c = (_b = this.$grpSwitcher) == null ? void 0 : _b.querySelector(`span[data-index="${index2}"]`)) == null ? void 0 : _c.classList.add("active");
+    (_c = (_b = this.$grpSwitcher) == null ? void 0 : _b.querySelector(`span[data-index="${index}"]`)) == null ? void 0 : _c.classList.add("active");
     this.changeListHeight();
   }
   changeListHeight() {
@@ -7784,7 +7793,7 @@ class Emoticons extends EditorPlug {
     this.emoticons.forEach((grp) => {
       if (grp.type !== "image")
         return;
-      Object.entries(grp.items).forEach(([index2, item]) => {
+      Object.entries(grp.items).forEach(([index, item]) => {
         text = text.split(`:[${item.key}]`).join(`<img src="${item.val}" atk-emoticon="${item.key}">`);
       });
     });
@@ -8300,7 +8309,7 @@ function extractCommentID() {
   }
   return commentId || null;
 }
-const version = "2.7.2";
+const version = "2.7.3";
 const Copyright = (ctx) => {
   ctx.on("conf-loaded", () => {
     const list = ctx.get("list");
@@ -8712,15 +8721,11 @@ const DefaultPlugins = [
 const GlobalPlugins = [...DefaultPlugins];
 class Artalk {
   constructor(conf) {
-    __publicField(this, "conf");
     __publicField(this, "ctx");
-    __publicField(this, "$root");
     /** Plugins */
     __publicField(this, "plugins", [...GlobalPlugins]);
-    this.conf = handelCustomConf(conf);
-    if (this.conf.el instanceof HTMLElement)
-      this.$root = this.conf.el;
-    this.ctx = new Context(this.conf, this.$root);
+    const handledConf = handelCustomConf(conf, true);
+    this.ctx = new Context(handledConf);
     Object.entries(services).forEach(([name, initService]) => {
       const obj = initService(this.ctx);
       if (obj)
@@ -8732,6 +8737,14 @@ class Artalk {
     });
     this.ctx.trigger("inited");
   }
+  /** Get the config of Artalk */
+  getConf() {
+    return this.ctx.getConf();
+  }
+  /** Get the root element of Artalk */
+  getEl() {
+    return this.ctx.$root;
+  }
   /** Update config of Artalk */
   update(conf) {
     this.ctx.updateConf(conf);
@@ -8744,7 +8757,7 @@ class Artalk {
   /** Destroy instance of Artalk */
   destroy() {
     this.ctx.trigger("destroy");
-    this.$root.remove();
+    this.ctx.$root.remove();
   }
   /** Add an event listener */
   on(name, handler) {
@@ -8777,7 +8790,7 @@ class Artalk {
   }
   /** Load count widget */
   static loadCountWidget(c) {
-    const conf = handelCustomConf(c);
+    const conf = handelCustomConf(c, true);
     initCountWidget({
       getApi: () => new Api(convertApiOptions(conf)),
       pageKey: conf.pageKey,
@@ -8786,18 +8799,25 @@ class Artalk {
       pvAdd: false
     });
   }
+  // ===========================
+  //         Deprecated
+  // ===========================
+  /** @deprecated Please use `getEl()` instead */
+  get $root() {
+    return this.ctx.$root;
+  }
+  /** @description Please use `getConf()` instead */
+  get conf() {
+    return this.ctx.getConf();
+  }
 }
-const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null
-}, Symbol.toStringTag, { value: "Module" }));
 const init = Artalk.init;
 const use = Artalk.use;
 const loadCountWidget = Artalk.loadCountWidget;
 export {
-  index as ArtalkType,
   Artalk as default,
   init,
   loadCountWidget,
   use
 };
-//# sourceMappingURL=Artalk.es.js.map
+//# sourceMappingURL=Artalk.mjs.map