artalk 2.7.0 → 2.7.1

package/dist/Artalk.es.js

@@ -565,13 +565,13 @@ function getDefaultExportFromCjs(x) {
     }
     var Request = NativeRequest;
     if (Request && !Request.prototype.hasOwnProperty("signal") || __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL) {
-      Request = function Request2(input, init) {
+      Request = function Request2(input, init2) {
         var signal;
-        if (init && init.signal) {
-          signal = init.signal;
-          delete init.signal;
+        if (init2 && init2.signal) {
+          signal = init2.signal;
+          delete init2.signal;
         }
-        var request = new NativeRequest(input, init);
+        var request = new NativeRequest(input, init2);
         if (signal) {
           Object.defineProperty(request, "signal", {
             writable: false,
@@ -585,8 +585,8 @@ function getDefaultExportFromCjs(x) {
       Request.prototype = NativeRequest.prototype;
     }
     var realFetch = fetch2;
-    var abortableFetch = function abortableFetch2(input, init) {
-      var signal = Request && Request.prototype.isPrototypeOf(input) ? input.signal : init ? init.signal : void 0;
+    var abortableFetch = function abortableFetch2(input, init2) {
+      var signal = Request && Request.prototype.isPrototypeOf(input) ? input.signal : init2 ? init2.signal : void 0;
       if (signal) {
         var abortError;
         try {
@@ -605,12 +605,12 @@ function getDefaultExportFromCjs(x) {
             once: true
           });
         });
-        if (init && init.signal) {
-          delete init.signal;
+        if (init2 && init2.signal) {
+          delete init2.signal;
         }
-        return Promise.race([cancellation, realFetch(input, init)]);
+        return Promise.race([cancellation, realFetch(input, init2)]);
       }
-      return realFetch(input, init);
+      return realFetch(input, init2);
     };
     return {
       fetch: abortableFetch,
@@ -757,7 +757,10 @@ const en = {
   deleting: "Deleting",
   deleteFail: "Delete Failed",
   reqGot: "Request got",
-  reqAborted: "Request timed out or terminated unexpectedly"
+  reqAborted: "Request timed out or terminated unexpectedly",
+  updateMsg: "Please update Artalk {name} to get the full experience",
+  currentVersion: "Current Version",
+  ignore: "Ignore"
 };
 const zhCN = {
   /* Editor */
@@ -832,7 +835,10 @@ const zhCN = {
   deleting: "删除中",
   deleteFail: "删除失败",
   reqGot: "请求响应",
-  reqAborted: "请求超时或意外终止"
+  reqAborted: "请求超时或意外终止",
+  updateMsg: "请更新 Artalk {name} 以获得完整体验",
+  currentVersion: "当前版本",
+  ignore: "忽略"
 };
 const GLOBAL_LOCALES_KEY = "ArtalkI18n";
 const internal = {
@@ -866,15 +872,15 @@ function t(key, args = {}) {
   str = str.replace(/\{\s*(\w+?)\s*\}/g, (_, token) => args[token] || "");
   return str;
 }
-function Fetch$1(opts, input, init, timeout) {
+function Fetch$1(opts, input, init2, timeout) {
   return __async(this, null, function* () {
     var _a, _b;
     if (UserInstance.data.token) {
-      const headers = new Headers(init.headers);
+      const headers = new Headers(init2.headers);
       headers.set("Authorization", `Bearer ${UserInstance.data.token}`);
-      init.headers = headers;
+      init2.headers = headers;
     }
-    const resp = yield timeoutFetch(input, timeout || opts.timeout || 15e3, init);
+    const resp = yield timeoutFetch(input, timeout || opts.timeout || 15e3, init2);
     const respHttpCode = resp.status;
     const noAccessCodes = [401, 400];
     const isNoAccess = noAccessCodes.includes(respHttpCode);
@@ -882,7 +888,7 @@ function Fetch$1(opts, input, init, timeout) {
       throw new Error(`${t("reqGot")} ${respHttpCode}`);
     let json = yield resp.json();
     const recall = (resolve, reject) => {
-      Fetch$1(opts, input, init).then((d) => {
+      Fetch$1(opts, input, init2).then((d) => {
         resolve(d);
       }).catch((e) => {
         reject(e);
@@ -919,12 +925,12 @@ function Fetch$1(opts, input, init, timeout) {
 }
 function POST(opts, url, data) {
   return __async(this, null, function* () {
-    const init = {
+    const init2 = {
       method: "POST"
     };
     data = __spreadValues({ site_name: opts.siteName || "" }, data || {});
-    init.body = ToFormData(data);
-    const json = yield Fetch$1(opts, url, init);
+    init2.body = ToFormData(data);
+    const json = yield Fetch$1(opts, url, init2);
     return json.data || {};
   });
 }
@@ -958,9 +964,9 @@ class ApiBase {
       return POST(this.options, this.options.baseURL + path, data);
     });
   }
-  Fetch(path, init, timeout) {
+  Fetch(path, init2, timeout) {
     return __async(this, null, function* () {
-      return Fetch$1(this.options, this.options.baseURL + path, init, timeout);
+      return Fetch$1(this.options, this.options.baseURL + path, init2, timeout);
     });
   }
 }
@@ -1366,11 +1372,11 @@ class UploadApi extends ApiBase {
       };
       const form = ToFormData(params);
       form.set("file", file);
-      const init = {
+      const init2 = {
         method: "POST",
         body: form
       };
-      const json = yield this.Fetch("/img-upload", init);
+      const json = yield this.Fetch("/img-upload", init2);
       return json.data || {};
     });
   }
@@ -8292,7 +8298,7 @@ function extractCommentID() {
   }
   return commentId || null;
 }
-const version = "2.7.0";
+const version = "2.7.1";
 const Copyright = (ctx) => {
   ctx.on("conf-loaded", () => {
     const list = ctx.get("list");
@@ -8566,12 +8572,15 @@ function initCountWidget(opt) {
     if (opt.countEl && document.querySelector(opt.countEl)) {
       refreshStatCount(opt, { query: "page_comment", numEl: opt.countEl });
     }
-    const curtPagePvNum = opt.pvAdd ? yield opt.getApi().page.pv() : NaN;
+    const initialData = opt.pvAdd ? {
+      [opt.pageKey]: yield opt.getApi().page.pv()
+      // pv+1 and get pv count
+    } : void 0;
     if (opt.pvEl && document.querySelector(opt.pvEl)) {
       refreshStatCount(opt, {
         query: "page_pv",
         numEl: opt.pvEl,
-        data: { [opt.pageKey]: curtPagePvNum }
+        data: initialData
       });
     }
   });
@@ -8579,10 +8588,10 @@ function initCountWidget(opt) {
 function refreshStatCount(opt, args) {
   return __async(this, null, function* () {
     let data = args.data || {};
-    let pageKeys = Array.from(document.querySelectorAll(args.numEl)).map((e) => e.getAttribute("data-page-key") || opt.pageKey).filter((e) => Number.isNaN(data[e]));
-    pageKeys = [...new Set(pageKeys)];
-    if (pageKeys.length > 0) {
-      const res = yield opt.getApi().page.stat(args.query, pageKeys);
+    let queryPageKeys = Array.from(document.querySelectorAll(args.numEl)).map((e) => e.getAttribute("data-page-key") || opt.pageKey).filter((k) => typeof data[k] !== "number");
+    queryPageKeys = [...new Set(queryPageKeys)];
+    if (queryPageKeys.length > 0) {
+      const res = yield opt.getApi().page.stat(args.query, queryPageKeys);
       data = __spreadValues(__spreadValues({}, data), res);
     }
     applyCountData(args.numEl, data, data[opt.pageKey]);
@@ -8609,9 +8618,9 @@ function versionCheck(list, feVer, beVer) {
   if (sameVer)
     return;
   const errEl = createElement(
-    `<div>请更新 Artalk ${comp < 0 ? t("frontend") : t("backend")}以获得完整体验 (<a href="https://artalk.js.org/" target="_blank">帮助文档</a>)<br/><br/><span style="color: var(--at-color-meta);">当前版本：${t("frontend")} ${feVer} / ${t("backend")} ${beVer}</span><br/><br/></div>`
+    `<div>${t("updateMsg", { name: comp < 0 ? t("frontend") : t("backend") })}<br/><br/><span style="color: var(--at-color-meta);">${t("currentVersion")}: ${t("frontend")} ${feVer} / ${t("backend")} ${beVer}</span><br/><br/></div>`
   );
-  const ignoreBtn = createElement('<span style="cursor:pointer">忽略</span>');
+  const ignoreBtn = createElement(`<span style="cursor:pointer">${t("ignore")}</span>`);
   ignoreBtn.onclick = () => {
     setError(list.$el.parentElement, null);
     IgnoreVersionCheck = true;
@@ -8693,7 +8702,7 @@ const DefaultPlugins = [
   DarkMode
 ];
 const GlobalPlugins = [...DefaultPlugins];
-const _Artalk = class _Artalk {
+class Artalk {
   constructor(conf) {
     __publicField(this, "conf");
     __publicField(this, "ctx");
@@ -8745,9 +8754,12 @@ const _Artalk = class _Artalk {
   setDarkMode(darkMode) {
     this.ctx.setDarkMode(darkMode);
   }
+  // ===========================
+  //       Static Members
+  // ===========================
   /** Init Artalk */
   static init(conf) {
-    return new _Artalk(conf);
+    return new Artalk(conf);
   }
   /** Use plugin, the plugin will be used when Artalk.init */
   static use(plugin) {
@@ -8766,17 +8778,18 @@ const _Artalk = class _Artalk {
       pvAdd: false
     });
   }
-};
-// ===========================
-//       Static Members
-// ===========================
-/** Default Configs */
-__publicField(_Artalk, "defaults", defaults);
-let Artalk = _Artalk;
+}
 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
+  Artalk as default,
+  init,
+  loadCountWidget,
+  use
 };
+//# sourceMappingURL=Artalk.es.js.map