hexo-component-inferno 4.2.2 → 5.1.0

package/lib/core/schema.js

@@ -4,12 +4,14 @@
  */
 const Ajv = require('ajv');
 const path = require('path');
-const yaml = require('../util/yaml');
-
-/**
- * A magic string for reformating comment lines in the YAML output.
- */
-const MAGIC = 'c823d4d4';
+const {
+  MAGIC
+} = require('./commented_yaml');
+const DefaultValue = require('./default_value');
+const {
+  typeOf,
+  hasOwnProperty
+} = require('./schema_util');
 
 /**
  * Deep copy a value of a JSON schema definition, so that changing a default value does not change the
@@ -33,15 +35,6 @@ const PRIMITIVE_DEFAULTS = {
   array: [],
   object: {}
 };
-const typeOf = value => {
-  if (value === undefined) {
-    return 'undefined';
-  }
-  return Object.prototype.toString.call(value).replace(/^\[object\s+([a-z]+)\]$/i, '$1').toLowerCase();
-};
-const hasOwnProperty = (obj, prop) => {
-  return obj === null || typeOf(obj) === 'undefined' ? false : Object.prototype.hasOwnProperty.call(obj, prop);
-};
 function traverseObj(obj, targetKey, handler) {
   if (typeOf(obj) === 'array') {
     for (const child of obj) {
@@ -58,187 +51,6 @@ function traverseObj(obj, targetKey, handler) {
   }
 }
 
-/**
- * The default value wrapper class.
- */
-class DefaultValue {
-  /**
-   * @param {any} value The wrapped default value.
-   * @param {string} description A description of the contained value. Used to produce
-   * the comment string.
-   */
-  constructor(value, description) {
-    this.value = value;
-    this.description = description;
-  }
-
-  /**
-   * Duplicate the current default value.
-   * <p>
-   * Wrapped value will be shallow copied.
-   *
-   * @returns {module:core/schema~DefaultValue} A new instance of the current default value.
-   */
-  clone() {
-    const result = new DefaultValue(this.value, this.description);
-    if (result.value instanceof DefaultValue) {
-      result.value = result.value.clone();
-    } else if (typeOf(result.value) === 'array') {
-      result.value = [].concat(result.value);
-    } else if (typeOf(result.value) === 'object') {
-      result.value = Object.assign({}, result.value);
-    }
-    return result;
-  }
-
-  /**
-   * Unwrap current {module:core/schema~DefaultValue} if its wrapped value is also a
-   * {module:core/schema~DefaultValue}.
-   * <p>
-   * The description will also be replaced with wrapped value description, if exists.
-   */
-  flatten() {
-    if (this.value instanceof DefaultValue) {
-      this.value.flatten();
-      if (hasOwnProperty(this.value, 'description') && this.value.description) {
-        this.description = this.value.description;
-      }
-      this.value = this.value.value;
-    }
-  }
-
-  /**
-   * Merge current default value with another default value.
-   *
-   * @param {module:core/schema~DefaultValue} source The input object to be merged with. Should have the
-   * same wrapped value type as current wrapped default value.
-   */
-  merge(source) {
-    if (hasOwnProperty(source, 'value') && source.value !== null) {
-      this.flatten();
-      if (source.value instanceof DefaultValue) {
-        source = source.clone();
-        source.flatten();
-      }
-      if (typeOf(source.value) === typeOf(this.value)) {
-        if (typeOf(this.value) === 'array') {
-          this.value = this.value.concat(source.value);
-        } else if (typeOf(this.value) === 'object') {
-          Object.keys(source.value).forEach(key => {
-            this.value[key] = source.value[key];
-          });
-        } else {
-          this.value = source.value;
-        }
-      } else if (typeOf(this.value) === 'undefined' || typeOf(this.value) === 'null') {
-        this.value = source.value;
-      }
-    }
-    if (hasOwnProperty(source, 'description') && source.description) {
-      this.description = source.description;
-    }
-  }
-
-  /**
-   * Create a new array with comments inserted as new elements right before each child element.
-   * <p>
-   * If current wrapped value is an array and some of its elements are instances of
-   * {@link module:core/schema~DefaultValue}, the element's description will be inserted as a new child
-   * right before the element.
-   * The element itself will also be converted into its commented version using the <code>toCommented</code>
-   * method.
-   *
-   * @returns {Array} A new array with comments and the original elements in the commented form.
-   */
-  toCommentedArray() {
-    return [].concat(...this.value.map(item => {
-      if (item instanceof DefaultValue) {
-        if (typeOf(item.description) !== 'string' || !item.description.trim()) {
-          return [item.toCommented()];
-        }
-        return item.description.split('\n').map((line, i) => {
-          return MAGIC + i + ': ' + line;
-        }).concat(item.toCommented());
-      } else if (typeOf(item) === 'array' || typeOf(item) === 'object') {
-        return new DefaultValue(item).toCommented();
-      }
-      return [item];
-    }));
-  }
-
-  /**
-   * Create a new object with comments inserted as new properties right before every original properties.
-   * <p>
-   * Works similar to {@link module:core/schema~DefaultValue#toCommentedArray}.
-   *
-   * @returns {Object} A new object with comments and the original property values in the commented form.
-   */
-  toCommentedObject() {
-    if (this.value instanceof DefaultValue) {
-      return this.value.toCommented();
-    }
-    const result = {};
-    for (const key in this.value) {
-      const item = this.value[key];
-      if (item instanceof DefaultValue) {
-        if (typeOf(item.description) === 'string' && item.description.trim()) {
-          item.description.split('\n').forEach((line, i) => {
-            result[MAGIC + key + i] = line;
-          });
-        }
-        result[key] = item.toCommented();
-      } else if (typeOf(item) === 'array' || typeOf(item) === 'object') {
-        result[key] = new DefaultValue(item).toCommented();
-      } else {
-        result[key] = item;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Call {@link module:core/schema~DefaultValue#toCommentedArray} or
-   * {@link module:core/schema~DefaultValue#toCommentedObject} based on the type of the wrapped value.
-   * <p>
-   * If neither applies, directly return the wrapped value.
-   *
-   * @returns {any} The commented object/array, or the original wrapped value.
-   */
-  toCommented() {
-    if (typeOf(this.value) === 'array') {
-      return this.toCommentedArray();
-    } else if (typeOf(this.value) === 'object') {
-      return this.toCommentedObject();
-    }
-    return this.value;
-  }
-
-  /**
-   * Create the YAML string with all the comments from current default value.
-   *
-   * @returns {string} The formatted YAML string.
-   */
-  toYaml() {
-    // Comments are written as properties or array elements, whose values the YAML writer may quote.
-    // Read them back with the YAML parser, rather than removing the quotes by hand.
-    const property = new RegExp(`^(\\s*)(['"]?)${MAGIC}.*?\\2: (.*)$`);
-    const element = new RegExp(`^(\\s*)- (.*${MAGIC}.*)$`);
-    const comment = (indent, text) => `${indent}# ${text === null || text === undefined ? '' : text}`;
-    return yaml.stringify(this.toCommented()).split('\n').map(line => {
-      let match = property.exec(line);
-      if (match) {
-        return comment(match[1], yaml.parse(match[3]));
-      }
-      match = element.exec(line);
-      if (match) {
-        const text = String(yaml.parse(match[2]));
-        return comment(match[1], text.slice(text.indexOf(': ') + 2));
-      }
-      return line;
-    }).join('\n');
-  }
-}
-
 /* eslint-disable no-use-before-define */
 /**
  * A class that can resolving referenced JSON schemas and create {@link module:core/schema~DefaultValue}s.

package/lib/core/schema_util.js

@@ -0,0 +1,14 @@
+/** @private Helpers shared by schema inference and default value wrappers. */
+const typeOf = value => {
+  if (value === undefined) {
+    return 'undefined';
+  }
+  return Object.prototype.toString.call(value).replace(/^\[object\s+([a-z]+)\]$/i, '$1').toLowerCase();
+};
+const hasOwnProperty = (obj, prop) => {
+  return obj === null || typeOf(obj) === 'undefined' ? false : Object.prototype.hasOwnProperty.call(obj, prop);
+};
+module.exports = {
+  typeOf,
+  hasOwnProperty
+};

package/lib/hexo/helper/cdn.js

@@ -4,50 +4,11 @@
  * @module hexo/helper/cdn
  */
 
-/**
- * @private
- */
-const PROVIDERS = {
-  LIBRARY: {
-    cdnjs: '[cdnjs]https://cdnjs.cloudflare.com/ajax/libs/${ package }/${ version }/${ filename }',
-    loli: '[cdnjs]https://cdnjs.loli.net/ajax/libs/${ package }/${ version }/${ filename }',
-    jsdelivr: 'https://cdn.jsdelivr.net/npm/${ package }@${ version }/${ filename }',
-    unpkg: 'https://unpkg.com/${ package }@${ version }/${ filename }'
-  },
-  FONT: {
-    google: 'https://fonts.googleapis.com/${ type }?family=${ fontname }',
-    loli: 'https://fonts.loli.net/${ type }?family=${ fontname }',
-    fontim: 'https://fonts.font.im/${ type }?family=${ fontname }',
-    ustc: 'https://fonts.lug.ustc.edu.cn/${ type }?family=${ fontname }'
-  },
-  ICON: {
-    loli: 'https://cdnjs.loli.net/ajax/libs/font-awesome/6.0.0/css/all.min.css',
-    fontawesome: 'https://use.fontawesome.com/releases/v6.0.0/css/all.css'
-  }
-};
-
-/**
- * Convert npm library path to CDN.js path
- * @private
- */
-const CDNJS_FIXTURES = {
-  moment: (ver, fname) => ['moment.js', ver, fname.startsWith('min/') ? fname.substr(4) : fname],
-  outdatedbrowser: (ver, fname) => ['outdated-browser', ver, fname.startsWith('outdatedbrowser/') ? fname.substr(16) : fname],
-  'highlight.js': (ver, fname) => ['highlight.js', ver, fname.endsWith('.css') && fname.indexOf('.min.') === -1 ? fname.substr(0, fname.length - 4) + '.min.css' : fname],
-  mathjax: (ver, fname) => ['mathjax', ver, (() => {
-    fname = fname.startsWith('unpacked/') ? fname.substr(9) : fname;
-    return fname.indexOf('.min.') > -1 ? fname.replace(/\.min\./gi, '.') : fname;
-  })()],
-  katex: (ver, fname) => ['KaTeX', ver, fname],
-  'pace-js': (ver, fname) => ['pace', ver, fname],
-  clipboard: (ver, fname) => ['clipboard.js', ver, fname],
-  cookieconsent: (ver, fname) => ['cookieconsent', ver, fname.startsWith('build/') ? fname.substr(6) : fname],
-  '@waline/client': (ver, fname) => ['waline', ver, fname]
-};
-const UNPKG_FIXTURES = {
-  mathjax: (ver, fname) => ['mathjax', ver, fname.indexOf('.min.') > -1 ? fname.replace(/\.min\./gi, '.') : fname],
-  disqusjs: (ver, fname) => ['disqusjs', ver, fname.indexOf('.min.') > -1 ? fname.replace(/\.min\./gi, '.') : fname]
-};
+const {
+  resolveCdn,
+  resolveFontCdn,
+  resolveIconCdn
+} = require('../../util/cdn');
 
 /**
  * Register the Hexo helper functions for resolving the URL of static files of JavaScript libraries,
@@ -73,64 +34,16 @@ const UNPKG_FIXTURES = {
  * // -> https://use.fontawesome.com/releases/v6.0.0/css/all.css
  */
 module.exports = function (hexo) {
-  function applyFixture(fixture, _package, version, filename) {
-    if (Object.prototype.hasOwnProperty.call(fixture, _package)) {
-      const result = fixture[_package](version, filename);
-      // package is not hosted on the given CDN
-      if (!result.length) {
-        throw new Error();
-      }
-      return result;
-    }
-    return [_package, version, filename];
-  }
   hexo.extend.helper.register('cdn', function (_package, version, filename) {
     const providers = typeof this.config.providers === 'object' ? this.config.providers : {};
-    const {
-      cdn_overrides: overrides
-    } = providers;
-    // A package can use a different provider or URL than the rest in providers.cdn_overrides
-    const cdn = typeof overrides === 'object' && overrides !== null && overrides[_package] ? overrides[_package] : providers.cdn || 'jsdelivr';
-    let _cdn = cdn;
-    if (_cdn in PROVIDERS.LIBRARY) {
-      _cdn = PROVIDERS.LIBRARY[_cdn];
-    }
-    // cdn.js does not follow a GitHub npm style like jsdeliver and unpkg do. Patch it!
-    if (_cdn.startsWith('[cdnjs]')) {
-      _cdn = _cdn.substr(7);
-      try {
-        [_package, version, filename] = applyFixture(CDNJS_FIXTURES, _package, version, filename);
-        if (filename.startsWith('dist/')) {
-          filename = filename.substr(5);
-        }
-      } catch (e) {
-        _cdn = PROVIDERS.LIBRARY.jsdelivr;
-      }
-    } else if (cdn === 'unpkg') {
-      try {
-        [_package, version, filename] = applyFixture(UNPKG_FIXTURES, _package, version, filename);
-      } catch (e) {
-        _cdn = PROVIDERS.LIBRARY.jsdelivr;
-      }
-    }
-    return _cdn.replace(/\${\s*package\s*}/gi, _package).replace(/\${\s*version\s*}/gi, version).replace(/\${\s*filename\s*}/gi, filename);
+    return resolveCdn(providers, _package, version, filename);
   });
   hexo.extend.helper.register('fontcdn', function (fontName, type = 'css') {
-    let {
-      fontcdn = 'google'
-    } = typeof this.config.providers === 'object' ? this.config.providers : {};
-    if (fontcdn in PROVIDERS.FONT) {
-      fontcdn = PROVIDERS.FONT[fontcdn];
-    }
-    return fontcdn.replace(/\${\s*fontname\s*}/gi, fontName).replace(/\${\s*type\s*}/gi, type);
+    const providers = typeof this.config.providers === 'object' ? this.config.providers : {};
+    return resolveFontCdn(providers, fontName, type);
   });
   hexo.extend.helper.register('iconcdn', function () {
-    let {
-      iconcdn = 'fontawesome'
-    } = typeof this.config.providers === 'object' ? this.config.providers : {};
-    if (iconcdn in PROVIDERS.ICON) {
-      iconcdn = PROVIDERS.ICON[iconcdn];
-    }
-    return iconcdn;
+    const providers = typeof this.config.providers === 'object' ? this.config.providers : {};
+    return resolveIconCdn(providers);
   });
 };

package/lib/hexo/tag/tabs.js

@@ -3,15 +3,10 @@
  * @module hexo/tag/tabs
  */
 
-/**
- * Split a tag option at its first colon, so that the value can contain colons, as in
- * <code>'title:Step 1: Install'</code>.
- * @private
- */
-function splitOption(option) {
-  const index = option.indexOf(':');
-  return index === -1 ? [option] : [option.slice(0, index), option.slice(index + 1)];
-}
+const {
+  splitOption,
+  splitTabOptions
+} = require('../../util/tab-options');
 
 /**
  * Register custom Hexo tag {% tabs %}.
@@ -86,81 +81,6 @@ function splitOption(option) {
  * {% endtabs %}
  */
 module.exports = function (hexo) {
-  function splitTabOptions(s) {
-    const options = [];
-    const EOL = -1;
-    let i = 0;
-    let state = 1;
-    let begin = 0;
-    while (i <= s.length) {
-      const c = i < s.length ? s.charAt(i) : '';
-      switch (state) {
-        case 1:
-          if (c === ' ') {
-            state = 1;
-            begin = i + 1;
-          } else if (c === '"') {
-            state = 2;
-            begin = i + 1;
-          } else if (c === "'") {
-            state = 4;
-            begin = i + 1;
-          } else if (c === '') {
-            state = EOL;
-          } else {
-            state = 7;
-          }
-          break;
-        case 2:
-          if (c === '\\') {
-            state = 3;
-          } else if (c === '"') {
-            state = 6;
-          }
-          break;
-        case 3:
-          state = 2;
-          break;
-        case 4:
-          if (c === '\\') {
-            state = 5;
-          } else if (c === "'") {
-            state = 6;
-          }
-          break;
-        case 5:
-          state = 4;
-          break;
-        case 6:
-          options.push(s.substring(begin, i - 1));
-          begin = i + 1;
-          if (c === ' ') {
-            state = 1;
-          } else if (c === '') {
-            state = EOL;
-          } else {
-            throw new Error(`malformatted tab options: ${s}`);
-          }
-          break;
-        case 7:
-          if (c === ' ') {
-            options.push(s.substring(begin, i));
-            begin = i + 1;
-            state = 1;
-          } else if (c === '') {
-            options.push(s.substring(begin, i));
-            begin = i + 1;
-            state = EOL;
-          }
-          break;
-      }
-      i++;
-    }
-    if (state !== EOL) {
-      throw new Error(`malformatted tab options: ${s}`);
-    }
-    return options;
-  }
   let tabCount = 0;
   function processTag(options, content) {
     let classes = '';

package/lib/schema/comment/artalk.json

@@ -27,9 +27,15 @@
       "description": "Language of Artalk, e.g., en, zh-CN, or auto",
       "nullable": true
     },
+    "prefer_remote_conf": {
+      "type": "boolean",
+      "default": false,
+      "description": "Prefer server settings over local options",
+      "nullable": true
+    },
     "dark_mode": {
       "type": ["boolean", "string"],
-      "description": "Dark mode: true, false, or 'auto' to follow the system color scheme. Follows the appearance of the theme (the data-appearance attribute of <html>) if not set",
+      "description": "Dark mode: true, false, or auto; follows page appearance when unset",
       "nullable": true
     }
   },

package/lib/schema/comment/cusdis.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/cusdis.json",
-  "description": "Cusdis comment plugin configurations\nhttps://cusdis.com/doc",
+  "description": "Cusdis comment plugin configurations\nDEPRECATED: Cusdis was archived on July 17, 2026. Use another comment system instead.\nhttps://cusdis.com/doc",
   "type": "object",
   "properties": {
     "type": {

package/lib/schema/comment/facebook.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/facebook.json",
-  "description": "Facebook comment plugin configurations",
+  "description": "Facebook Comments (discontinued)",
   "type": "object",
   "properties": {
     "type": {

package/lib/schema/comment/gitalk.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/gitalk.json",
-  "description": "Gitalk comment plugin configurations",
+  "description": "Gitalk 2 comment plugin configurations",
   "type": "object",
   "properties": {
     "type": {
@@ -14,12 +14,29 @@
     },
     "client_secret": {
       "type": "string",
-      "description": "GitHub application client secret"
+      "description": "Legacy option, ignored; configure the secret on your proxy"
     },
     "repo": {
       "type": "string",
       "description": "GitHub repository"
     },
+    "backend": {
+      "type": "string",
+      "enum": ["issues", "discussions"],
+      "default": "issues",
+      "description": "Comment storage backend"
+    },
+    "number": {
+      "type": "integer",
+      "minimum": 1,
+      "description": "Issue or Discussion number; overrides page ID lookup",
+      "nullable": true
+    },
+    "category": {
+      "type": "string",
+      "description": "Discussion category name or slug",
+      "nullable": true
+    },
     "owner": {
       "type": "string",
       "description": "GitHub repository owner. Can be personal user or organization"
@@ -52,17 +69,17 @@
     "create_issue_manually": {
       "type": "boolean",
       "description": "Create GitHub issues manually for each page",
-      "default": false,
+      "default": true,
       "nullable": true
     },
     "proxy": {
       "type": "string",
-      "description": "GitHub oauth request reverse proxy for CORS",
+      "description": "Your Gitalk 2 proxy origin",
       "nullable": true
     },
     "flip_move_options": {
       "type": "object",
-      "description": "Comment list animation",
+      "description": "Legacy animation option, ignored",
       "nullable": true
     },
     "enable_hotkey": {
@@ -77,5 +94,5 @@
       "nullable": true
     }
   },
-  "required": ["type", "client_id", "client_secret", "repo", "owner", "admin"]
+  "required": ["type", "client_id", "proxy", "repo", "owner", "admin"]
 }

package/lib/schema/comment/gitment.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/gitment.json",
-  "description": "Gitment comment plugin configurations\nDEPRECATED: Gitment is no longer maintained, and the GitHub sign-in proxy it uses no longer works. Use Giscus, Utterances or Gitalk instead.",
+  "description": "Gitment comment plugin configurations (deprecated)",
   "type": "object",
   "properties": {
     "type": {

package/lib/schema/comment/livere.json

@@ -1,17 +1,23 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "/comment/livere.json",
-  "description": "Livere comment plugin configurations",
+  "description": "Livere comment plugin configurations\nhttps://admin.livere.org/",
   "type": "object",
   "properties": {
     "type": {
       "type": "string",
       "const": "livere"
     },
+    "client_id": {
+      "type": "string",
+      "description": "Client ID in the installation code of LiveRe (the client-id attribute of <livere-comment>)"
+    },
     "uid": {
       "type": "string",
-      "description": "LiveRe comment service UID"
+      "description": "UID of the legacy LiveRe City installation code (the data-uid attribute). Ignored if client_id is set",
+      "nullable": true
     }
   },
-  "required": ["type", "uid"]
+  "required": ["type"],
+  "anyOf": [{ "required": ["client_id"] }, { "required": ["uid"] }]
 }

package/lib/schema/comment/twikoo.json

@@ -10,16 +10,16 @@
     },
     "env_id": {
       "type": "string",
-      "description": "envId from Tencent CloudBase or Vercel URL"
+      "description": "CloudBase environment ID or backend URL"
     },
     "region": {
       "type": "string",
-      "description": "Region of Tencent CloudBase",
+      "description": "CloudBase region",
       "nullable": true
     },
     "lang": {
       "type": "string",
-      "description": "i18n support",
+      "description": "Comment UI language; defaults to the page or site language",
       "default": "zh-CN",
       "nullable": true
     }

package/lib/schema/comment/waline.json

@@ -19,7 +19,32 @@
     "lang": {
       "type": "string",
       "description": "Display language.",
-      "enum": ["zh", "zh-CN", "zh-TW", "en", "en-US", "jp", "jp-JP", "pt-BR", "ru", "ru-RU", null],
+      "enum": [
+        "zh",
+        "zh-CN",
+        "zh-TW",
+        "en",
+        "en-US",
+        "jp",
+        "jp-JP",
+        "pt-BR",
+        "ru",
+        "ru-RU",
+        "fr",
+        "fr-FR",
+        "es",
+        "es-MX",
+        "de",
+        "id",
+        "id-ID",
+        "it",
+        "it-IT",
+        "ko",
+        "ko-KR",
+        "vi",
+        "vi-VN",
+        null
+      ],
       "default": "zh-CN",
       "nullable": true
     },
@@ -29,7 +54,7 @@
       "nullable": true
     },
     "emoji": {
-      "type": "array",
+      "type": ["array", "boolean"],
       "items": {
         "oneOf": [
           {
@@ -167,7 +192,7 @@
     },
     "copyright": {
       "type": "boolean",
-      "description": "Whether show copyright and version in footer.",
+      "description": "Show copyright and version in the footer",
       "default": true,
       "nullable": true
     }