hexo-theme-stellar 1.44.0 → 2.0.0-rc.2

package/scripts/events/lib/notebooks.js

@@ -1,15 +1,207 @@
 /**
- * notebooks.js v1
+ * Notebook v2 two-stage render/listing projections.
  *
- * 笔记本系统构建入口：委托 scripts/lib/notebooks.js 的纯函数，
- * 保持 ctx.theme.config.notebooks 输出结构与旧实现一致。
+ * 笔记本系统构建入口：从唯一 CollectionModel 聚合标签、索引与详情模型。
  */
 
-'use strict';
+"use strict";
 
-const { getNotebooksObject } = require('../../lib/notebooks');
+const {
+  buildNotebookCollectionModel,
+  completeNotebookPageViewModel
+} = require("../../lib/models");
+const {
+  getNotebookViewModelBase,
+  getNotebookViewModelInput,
+  setProfileViewModelInput
+} = require("../../lib/page-view-model-registry");
+const { ensureRuntimeData } = require("../../lib/runtime-data");
+const { sourcePathForData } = require("../../lib/source-config");
+const { deepFreeze } = require("../../schema/schema-utils");
+const {
+  plainTerms,
+  runTwoStage,
+  stableSort
+} = require("../../lib/collection-pipeline/shared");
 
-module.exports = ctx => {
-  const notebooks = getNotebooksObject(ctx);
-  ctx.theme.config.notebooks = notebooks;
+function recordId(record) {
+  return String(record.page?._id || record.page?.source || record.page?.path || "");
+}
+
+function buildTagTree(collection, records) {
+  const tags = new Map();
+  tags.set("", {
+    id: "",
+    name: "",
+    label: "",
+    path: collection.route.baseDir,
+    parentId: null,
+    children: new Set(),
+    itemIds: new Set()
+  });
+  for (const tag of collection.navigation.tags) {
+    tags.set(tag.id, {
+      ...tag,
+      children: new Set(),
+      itemIds: new Set()
+    });
+  }
+  for (const tag of tags.values()) {
+    if (tag.id.length === 0) continue;
+    tags.get(tag.parentId || "")?.children.add(tag.id);
+  }
+  for (const record of records) {
+    const itemId = recordId(record);
+    tags.get("").itemIds.add(itemId);
+    for (const hierarchy of plainTerms(record.config.tags)) {
+      const parts = hierarchy.split("/").filter(Boolean);
+      for (let index = 0; index < parts.length; index += 1) {
+        tags.get(parts.slice(0, index + 1).join("/").toLowerCase())?.itemIds.add(itemId);
+      }
+    }
+  }
+  return Array.from(tags.values()).map(tag => ({
+    ...tag,
+    children: Array.from(tag.children).sort(),
+    itemIds: Array.from(tag.itemIds)
+  }));
+}
+
+function sortNoteItems(items, sort) {
+  const field = sort?.field || "updated";
+  const direction = sort?.direction === "asc" ? 1 : -1;
+  return stableSort(items, (left, right) => (
+    (right.priority - left.priority) ||
+    (String(left[field] || "").localeCompare(String(right[field] || "")) * direction)
+  ));
+}
+
+module.exports = (ctx, pipeline) => {
+  if (!pipeline) throw new TypeError("Stellar v2: Notebook 构建必须由 Collection Pipeline 驱动");
+  const records = pipeline.members("notebook");
+  const collectionConfigs = new Map(pipeline.collections("notebook"));
+  const collectionItems = records.map(record => ({
+    collection: { profile: "notebook", id: record.collectionId },
+    tags: plainTerms(record.config.tags)
+  }));
+  const recordsByCollection = new Map();
+  for (const record of records) {
+    if (!recordsByCollection.has(record.collectionId)) recordsByCollection.set(record.collectionId, []);
+    recordsByCollection.get(record.collectionId).push(record);
+  }
+  const runtimeData = ensureRuntimeData(ctx);
+  const entries = [];
+  const collections = new Map();
+
+  for (const record of records) {
+    const page = record.page;
+    const input = getNotebookViewModelInput(page);
+    const base = getNotebookViewModelBase(page);
+    if (!input || !base) continue;
+    collections.set(base.collection.id, base.collection);
+    entries.push({ page, input, base });
+  }
+  for (const [collectionId, collectionConfig] of collectionConfigs) {
+    if (collections.has(collectionId)) continue;
+    collections.set(collectionId, buildNotebookCollectionModel({
+      collectionSource: sourcePathForData(`notebooks/${collectionId}`),
+      themeSource: pipeline.themeSource,
+      siteConfig: ctx.config,
+      stellarConfig: ctx.stellar?.config,
+      collectionConfig,
+      collectionItems
+    }, collectionId));
+  }
+  const tagTrees = new Map(Array.from(collections, ([collectionId, collection]) => [
+    collectionId,
+    buildTagTree(collection, recordsByCollection.get(collectionId) || [])
+  ]));
+
+  const finalViewModels = runTwoStage(entries, {
+    buildBase(entry) {
+      return completeNotebookPageViewModel({
+        ...entry.input,
+        runtimeData,
+        tagTree: tagTrees.get(entry.base.collection.id)
+      }, entry.base);
+    },
+    aggregate(allEntries, viewModels) {
+      const entriesByCollection = new Map();
+      for (let index = 0; index < allEntries.length; index += 1) {
+        const id = allEntries[index].base.collection.id;
+        if (!entriesByCollection.has(id)) entriesByCollection.set(id, []);
+        entriesByCollection.get(id).push(viewModels[index]);
+      }
+      const projections = [];
+      const collectionMap = {};
+      for (const [collectionId, collection] of collections) {
+        const collectionConfig = collectionConfigs.get(collectionId) || {};
+        const collectionViewModels = entriesByCollection.get(collectionId) || [];
+        const baseDir = collection.route.baseDir;
+        const tags = tagTrees.get(collectionId);
+        const items = sortNoteItems(
+          collectionViewModels.map(viewModel => viewModel.render.listing),
+          collection.listing.sort
+        );
+        const recentItems = stableSort(
+          items.filter(item => item.listed !== false),
+          (left, right) => String(right.updated || right.date || "").localeCompare(String(left.updated || left.date || ""))
+        );
+        const identity = collection.identity;
+        const projection = {
+          id: collectionId,
+          href: baseDir,
+          name: identity.name,
+          headline: identity.headline,
+          description: identity.description,
+          icon: identity.icon || "",
+          order: collection.listing.order,
+          listed: collection.visibility.listed !== false,
+          navigation: {
+            menu: collectionConfig.activeMenu ?? null
+          },
+          layout: {
+            topbar: structuredClone(collectionConfig.topbar || {}),
+            leftbar: structuredClone(collectionConfig.leftbar || {}),
+            rightbar: structuredClone(collectionConfig.rightbar || {}),
+            algoliaFilterPath: baseDir
+          },
+          tags,
+          items,
+          recentItems,
+          perPage: collection.listing.perPage
+        };
+        projections.push(projection);
+        collectionMap[collectionId] = projection;
+      }
+      const orderedCollections = stableSort(projections, (left, right) => left.order - right.order);
+      const recentItems = stableSort(
+        orderedCollections
+          .filter(collection => collection.listed !== false)
+          .flatMap(collection => collection.recentItems),
+        (left, right) => String(right.updated || right.date || "").localeCompare(String(left.updated || left.date || ""))
+      );
+      runtimeData.notebookIndex = deepFreeze({
+        items: orderedCollections,
+        collections: collectionMap,
+        recentItems
+      });
+      return runtimeData.notebookIndex;
+    },
+    complete(entry, viewModel, notebookIndex) {
+      const collection = notebookIndex.collections[entry.base.collection.id];
+      entry.completeInput = Object.freeze({
+        ...entry.input,
+        runtimeData,
+        tagTree: collection.tags,
+        recentItems: collection.recentItems
+      });
+      return completeNotebookPageViewModel(entry.completeInput, entry.base);
+    }
+  });
+
+  for (let index = 0; index < entries.length; index += 1) {
+    entries[index].page.viewModel = finalViewModels[index];
+    setProfileViewModelInput("notebook", entries[index].page, entries[index].completeInput);
+  }
 };

package/scripts/events/lib/utils.js

@@ -72,7 +72,7 @@ module.exports = hexo => {
   };
   hexo.utils = {
     icon: (key, args, inline) => {
-      const { icons } = hexo.theme.config
+      const { icons } = hexo.stellar.data;
       var result = ''
       if (icons[key]) {
         result = icons[key]
@@ -84,14 +84,14 @@ module.exports = hexo => {
       } else if (inline === true) {
         return result
       } else if (result.startsWith('<svg')) {
-        // 非首屏图标：输出占位符，由 /js/icons.js 异步拉取 js/icons/{ns}.json 后原位替换
-        return `<svg class="icon" data-icon="${key}" aria-hidden="true"></svg>`
+        // 非首屏图标：输出占位符，由 deferred-icons Runtime Extension 异步替换
+        return `<svg class="icon" viewBox="0 0 1 1" data-icon="${key}" aria-hidden="true"></svg>`
       } else {
         return result
       }
     },
     iconData: (key) => {
-      const { icons } = hexo.theme.config
+      const { icons } = hexo.stellar.data;
       return icons && icons[key] ? icons[key] : ''
     }
   };

package/scripts/events/lib/version-check.js

@@ -4,6 +4,56 @@ const fs = require('fs');
 const packageName = 'hexo-theme-stellar';
 const cacheFile = path.join(__dirname, '../../.cache/stellar-version.json');
 
+function parseVersion(version) {
+  const match = String(version).trim().match(/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/);
+  if (!match) return null;
+  const prerelease = match[4] ? match[4].split('.') : [];
+  if (prerelease.some(identifier => /^\d+$/.test(identifier) && identifier.length > 1 && identifier.startsWith('0'))) {
+    return null;
+  }
+  return {
+    core: match.slice(1, 4).map(value => BigInt(value)),
+    prerelease
+  };
+}
+
+function comparePrerelease(left, right) {
+  if (left.length === 0 || right.length === 0) {
+    if (left.length === right.length) return 0;
+    return left.length === 0 ? 1 : -1;
+  }
+  const length = Math.max(left.length, right.length);
+  for (let index = 0; index < length; index += 1) {
+    if (left[index] == null) return -1;
+    if (right[index] == null) return 1;
+    const leftNumeric = /^\d+$/.test(left[index]);
+    const rightNumeric = /^\d+$/.test(right[index]);
+    if (leftNumeric && rightNumeric) {
+      const difference = BigInt(left[index]) - BigInt(right[index]);
+      if (difference !== 0n) return difference > 0n ? 1 : -1;
+    } else if (leftNumeric !== rightNumeric) {
+      return leftNumeric ? -1 : 1;
+    } else if (left[index] !== right[index]) {
+      return left[index] > right[index] ? 1 : -1;
+    }
+  }
+  return 0;
+}
+
+function compareVersions(leftVersion, rightVersion) {
+  const left = parseVersion(leftVersion);
+  const right = parseVersion(rightVersion);
+  if (!left || !right) return null;
+  for (let index = 0; index < left.core.length; index += 1) {
+    if (left.core[index] !== right.core[index]) return left.core[index] > right.core[index] ? 1 : -1;
+  }
+  return comparePrerelease(left.prerelease, right.prerelease);
+}
+
+function shouldNotifyUpgrade(localVersion, latestVersion) {
+  return compareVersions(latestVersion, localVersion) > 0;
+}
+
 function getLocalVersion() {
   try {
     return require(path.join(__dirname, '../../../package.json')).version;
@@ -59,7 +109,7 @@ function writeCache(latestVersion) {
   }
 }
 
-module.exports = (ctx, options = { useCache: true }) => {
+function checkVersion(ctx, options = { useCache: true }) {
   if (process.env.STELLAR_VERSION_CHECKED === '1') return;
   process.env.STELLAR_VERSION_CHECKED = '1';
 
@@ -68,7 +118,7 @@ module.exports = (ctx, options = { useCache: true }) => {
 
   fetchLatestVersion((err, latest) => {
     if (err) return;
-    if (localVersion !== latest) {
+    if (shouldNotifyUpgrade(localVersion, latest)) {
       console.log(``);
       const line = '------------------------------------------------';
       ctx.log.warn(`\x1b[33m${line}\x1b[0m`);
@@ -83,4 +133,8 @@ module.exports = (ctx, options = { useCache: true }) => {
     if (options.useCache) writeCache(latest);
   });
 
-};
+}
+
+module.exports = checkVersion;
+module.exports.compareVersions = compareVersions;
+module.exports.shouldNotifyUpgrade = shouldNotifyUpgrade;

package/scripts/filters/index.js

@@ -1,31 +1,6 @@
 'use strict';
 
+hexo.extend.filter.register('after_post_render', require('./lib/page-view-model').attachPageViewModel, 1);
 hexo.extend.filter.register('after_render:html', require('./lib/img_lazyload').processSite);
 hexo.extend.filter.register('after_render:html', require('./lib/img_onerror').processSite);
-hexo.extend.filter.register('after_post_render', require('./lib/md_table').processPost);
-
-function change_image(data) {
-    if (this.theme.config.tag_plugins.image.parse_markdown) {
-      // data.content = data.content.replace(
-      //     /!\[(.*?)\]\((.*?)\s*(?:"(.*?)")?\)/g,
-      //     '{% image $2 $3 %}'
-      // );
-      let splited_content = data.content.split(/(```[\s\S]*?```|{%\s*gallery\s*%}[\s\S]*?{%\s*endgallery\s*%})/g);
-      splited_content = splited_content.map((s) => {
-        let matches_no = s.match(/(```[\s\S]*?```|{%\s*gallery\s*%}[\s\S]*?{%\s*endgallery\s*%})/i);
-        let matches_img = s.match(/!\[(.*?)\]\((.*?)\s*(?:"(.*?)")?\)/i);
-        if (!matches_no && matches_img) {
-          s = s.replace(
-            /!\[(.*?)\]\((.*?)\s*(?:"(.*?)")?\)/g,
-            `{% image $2 $3 %}`
-          );
-        }
-        return s;
-      });
-      data.content = splited_content.join('');
-    }
-    return data;
-}
-
-hexo.extend.filter.register('before_post_render', change_image, 9);
-
+hexo.extend.filter.register('after_post_render', require('./lib/md_table').processPost, 0);

package/scripts/filters/lib/img_lazyload.js

@@ -10,27 +10,12 @@
 
 "use strict";
 
+const { mapImageTags, parseImageAttributes } = require("../../lib/html-images");
+
 // 1×1 透明 PNG：懒加载占位图
 const LOADING_IMG =
   "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABGdBTUEAALGPC/xhBQAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAAaADAAQAAAABAAAAAQAAAADa6r/EAAAAC0lEQVQIHWNgAAIAAAUAAY27m/MAAAAASUVORK5CYII=";
 
-// 解析 <img ...> 标签内部属性，返回 [{name, value, raw, start, end}]
-function parseAttrs(inner) {
-  const attrs = [];
-  const re = /([^\s=/>]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+)))?/g;
-  let m;
-  while ((m = re.exec(inner)) !== null) {
-    attrs.push({
-      name: m[1].toLowerCase(),
-      value: m[2] !== undefined ? m[2] : m[3] !== undefined ? m[3] : m[4] !== undefined ? m[4] : null,
-      raw: m[0],
-      start: m.index,
-      end: m.index + m[0].length,
-    });
-  }
-  return attrs;
-}
-
 // 处理单个 <img> 标签：加 lazy 类并替换 src 为占位图 + data-src
 function processImgTag(imgTag) {
   // 快速跳过：整标签已含懒加载标记 / 原生 srcset / no-lazy（兼容压缩前后写法）
@@ -46,7 +31,7 @@ function processImgTag(imgTag) {
 
   const selfClosing = /\/>$/.test(imgTag);
   const inner = imgTag.slice(4, selfClosing ? imgTag.length - 2 : imgTag.length - 1);
-  const attrs = parseAttrs(inner);
+  const attrs = parseImageAttributes(inner);
   const src = attrs.find((a) => a.name === "src");
   // 无 src / 空 src / 已是占位图（data:image）时不处理
   if (!src || src.value == null || src.value === "" || /^data:image/i.test(src.value)) {
@@ -78,119 +63,12 @@ function processImgTag(imgTag) {
   return out;
 }
 
-// 查找标签结束位置（尊重属性值内的引号，避免把 > 截断进属性值）
-function findTagEnd(html, start) {
-  let j = start;
-  let quote = null;
-  while (j < html.length) {
-    const ch = html[j];
-    if (quote) {
-      if (ch === quote) {
-        quote = null;
-      }
-    } else if (ch === '"' || ch === "'") {
-      quote = ch;
-    } else if (ch === ">") {
-      return j;
-    }
-    j++;
-  }
-  return -1;
-}
-
-function isTagBoundary(html, pos) {
-  if (pos >= html.length) {
-    return true;
-  }
-  const ch = html[pos];
-  return ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === ">" || ch === "/";
-}
-
-// 全页扫描：只在真实 <img> 标签上做懒加载，跳过脚本/样式/注释内容
-function processHtml(html) {
-  const parts = [];
-  let i = 0;
-  const n = html.length;
-  const lower = html.toLowerCase();
-  while (i < n) {
-    const ch = html[i];
-    if (ch !== "<") {
-      parts.push(ch);
-      i++;
-      continue;
-    }
-    // HTML 注释
-    if (html.startsWith("<!--", i)) {
-      const end = html.indexOf("-->", i);
-      if (end === -1) {
-        break;
-      }
-      parts.push(html.slice(i, end + 3));
-      i = end + 3;
-      continue;
-    }
-    // <script>…</script>：整段跳过，避免误处理模板字符串/字符串里的 <img
-    if (lower.startsWith("<script", i) && isTagBoundary(html, i + 7)) {
-      const end = findTagEnd(html, i);
-      if (end === -1) {
-        break;
-      }
-      parts.push(html.slice(i, end + 1));
-      i = end + 1;
-      const close = lower.indexOf("</script", i);
-      if (close === -1) {
-        break;
-      }
-      const closeEnd = html.indexOf(">", close);
-      if (closeEnd === -1) {
-        break;
-      }
-      parts.push(html.slice(i, closeEnd + 1));
-      i = closeEnd + 1;
-      continue;
-    }
-    // <style>…</style>：整段跳过
-    if (lower.startsWith("<style", i) && isTagBoundary(html, i + 6)) {
-      const end = findTagEnd(html, i);
-      if (end === -1) {
-        break;
-      }
-      parts.push(html.slice(i, end + 1));
-      i = end + 1;
-      const close = lower.indexOf("</style", i);
-      if (close === -1) {
-        break;
-      }
-      const closeEnd = html.indexOf(">", close);
-      if (closeEnd === -1) {
-        break;
-      }
-      parts.push(html.slice(i, closeEnd + 1));
-      i = closeEnd + 1;
-      continue;
-    }
-    // <img …>
-    if (lower.startsWith("<img", i) && isTagBoundary(html, i + 4)) {
-      const end = findTagEnd(html, i);
-      if (end === -1) {
-        break;
-      }
-      parts.push(processImgTag(html.slice(i, end + 1)));
-      i = end + 1;
-      continue;
-    }
-    parts.push(ch);
-    i++;
-  }
-  return parts.join("");
-}
-
 function lazyProcess(htmlContent) {
   // 短路：无 <img 的页面（如 404）无需扫描
   if (typeof htmlContent !== "string" || !/<img/i.test(htmlContent)) {
     return htmlContent;
   }
-  return processHtml(htmlContent);
+  return mapImageTags(htmlContent, processImgTag);
 }
 
 module.exports.processSite = function (htmlContent) {

package/scripts/filters/lib/img_onerror.js

@@ -1,26 +1,23 @@
-/**
- * img_onerror.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
- * 发现这个和 img_lazyload 有点冲突，会被 img_lazyload 覆盖
- */
-
 'use strict';
 
+const { escapeHTML } = require('hexo-util');
+const { mapImageTags, parseImageAttributes } = require('../../lib/html-images');
+
 module.exports.processSite = function(htmlContent) {
   // 短路：无 <img 的页面（如 404）无需正则扫描
   if (typeof htmlContent !== 'string' || !/<img/i.test(htmlContent)) {
     return htmlContent;
   }
-  const default_image = this.theme.config.default.image;
-  return htmlContent.replace(/<img(.*?)src="(.*?)"(.*?)>/gi, function(imgTag) {
-    if (/="data:image(.*?)/gi.test(imgTag)) {
-      return imgTag;
-    }
-    if (/onerror/gi.test(imgTag)) {
-      return imgTag;
-    }
-    if (imgTag.includes(' no-lazy ') == false) {
-      return imgTag;
-    }
-    return imgTag.slice(0,imgTag.length-1) + ' onerror="javascript:this.classList.add(\'error\');this.src=\'' + default_image + '\';"' + imgTag.slice(imgTag.length-1);
+  const fallback = this.utils.iconData('image:onerror');
+  const handler = escapeHTML(`this.src=${JSON.stringify(fallback)}`);
+  return mapImageTags(htmlContent, imgTag => {
+    const closing = /\s*\/?\s*>$/.exec(imgTag)[0];
+    const attrs = parseImageAttributes(imgTag.slice(4, -closing.length));
+    if (attrs.some(attr => attr.name === 'onerror')) return imgTag;
+    // data-src 是真实图片；懒加载的 data:image 占位符也需要失败兜底。
+    const source = attrs.find(attr => attr.name === 'data-src')
+      || attrs.find(attr => attr.name === 'src');
+    if (!source?.value || /^data:image/i.test(source.value)) return imgTag;
+    return imgTag.slice(0, -closing.length) + ` onerror="${handler}"` + closing;
   });
 };