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

package/scripts/lib/contribution-registry.js

@@ -0,0 +1,429 @@
+/* global hexo */
+
+"use strict";
+
+const { defineContributions } = require("./contribution-contract");
+const INTERNAL = require("./internal-constants");
+const { heroEffectRuntimeConfig } = require("./hero-effect-registry");
+
+const FEATURE_ENTRY = "/js/runtime/extensions/feature.js";
+const PLUGIN_SYSTEM_DOC = "docs/knowledge/07-外部集成/plugin-system.md";
+const RUNTIME_TEST = "test/browser-runtime-manifest.test.js";
+const RUNTIME_CONSUMPTION_TEST = "test/browser-runtime-consumption.test.js";
+const CONFIG_OWNER = path => `_config.yml#${path}`;
+
+function featureEntry() {
+  return { type: "browser-module", path: FEATURE_ENTRY, adapter: "feature" };
+}
+
+function runtimeEntry(path, adapter) {
+  return { type: "browser-module", path, ...(adapter ? { adapter } : {}) };
+}
+
+function selector(value) {
+  return { type: "selector", value };
+}
+
+function configResult(config, when) {
+  return { config, ...(when ? { when } : {}) };
+}
+
+const CONTRIBUTIONS = defineContributions([
+  {
+    id: "runtime-bootstrap",
+    kind: "component",
+    entry: { type: "template", path: "layout/_partial/scripts/runtime.ejs" },
+    resources: ["runtime.bootstrap"],
+    activation: { type: "always" },
+    schema: null,
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST],
+    defaultsOwner: null,
+    project: null
+  },
+  {
+    id: "color-scheme-switch",
+    kind: "feature",
+    entry: runtimeEntry(INTERNAL.assets.runtime.colorSchemeSwitch),
+    resources: ["runtime.colorSchemeSwitch"],
+    activation: { type: "always" },
+    schema: "features.color_scheme_switch.enabled",
+    i18n: {
+      namespace: "color-scheme-switch",
+      keys: [
+        "message.color_scheme_switched.light",
+        "message.color_scheme_switched.dark",
+        "message.color_scheme_switched.auto"
+      ]
+    },
+    docs: { category: "Extensions", path: "docs/knowledge/05-前端交互/client-side-overview.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.color_scheme_switch.enabled"),
+    project(context) {
+      if (context.features.colorSchemeSwitch?.enabled !== true) return null;
+      return configResult({
+        messages: context.plainObject(context.messages.colorScheme, "messages.colorScheme")
+      });
+    }
+  },
+  {
+    id: "search",
+    kind: "extension",
+    entry: runtimeEntry("/js/runtime/extensions/search.js"),
+    resources: ["search"],
+    activation: selector(".search-input"),
+    schema: "search.provider",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("search.provider"),
+    project(context) {
+      const search = context.plainObject(context.extensions.search, "extensions.search");
+      if (typeof search.provider !== "string" || search.provider.length === 0) return null;
+      const provider = context.plainObject(search[search.provider], `search.${search.provider}`);
+      return configResult({
+        provider: search.provider,
+        options: provider,
+        assets: {
+          client: search.provider === "algolia" ? context.assets.search?.algolia || null : null,
+          provider: context.assets.search?.providers?.[search.provider] || null,
+          shortcut: context.assets.search?.shortcut || null
+        }
+      });
+    }
+  },
+  {
+    id: "hero-effect",
+    kind: "feature",
+    entry: runtimeEntry(INTERNAL.assets.runtime.heroEffect),
+    resources: ["runtime.heroEffect", "heroEffects"],
+    activation: selector("canvas[data-hero-effect]"),
+    schema: null,
+    i18n: null,
+    docs: { category: "Components", path: "docs/knowledge/03-内容系统/wiki-docs.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: () => configResult({ effects: heroEffectRuntimeConfig() })
+  },
+  {
+    id: "lazy-loading",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["dependencies.lazyLoading"],
+    activation: selector(".lazy, .data-service, [class*='ds-']"),
+    schema: "features.lazy_loading.transition",
+    i18n: null,
+    docs: { category: "Extensions", path: "docs/knowledge/07-外部集成/lazy-loading-images.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.lazy_loading.transition"),
+    project: context => configResult({ asset: context.assets.dependencies?.lazyLoading || null })
+  },
+  {
+    id: "deferred-icons",
+    kind: "component",
+    entry: runtimeEntry(INTERNAL.assets.runtime.deferredIcons),
+    resources: ["runtime.deferredIcons"],
+    activation: selector("svg.icon[data-icon]"),
+    schema: null,
+    i18n: null,
+    docs: { category: "Components", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: () => configResult({})
+  },
+  {
+    id: "dropdown",
+    kind: "component",
+    entry: runtimeEntry(INTERNAL.assets.runtime.dropdown),
+    resources: ["runtime.dropdown"],
+    activation: selector("details.dropdown"),
+    schema: null,
+    i18n: null,
+    docs: { category: "Components", path: "docs/knowledge/04-标签插件/note-container-tags.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: () => configResult({})
+  },
+  {
+    id: "services",
+    kind: "extension",
+    entry: runtimeEntry("/js/runtime/extensions/services.js"),
+    resources: ["services", "dependencies.marked"],
+    activation: selector(".data-service, [class*='ds-'], a[cardlink], .site-card [data-siteinfo-api], .voice>audio, .video>video, .chat-file"),
+    schema: "services.site_info.provider",
+    i18n: null,
+    docs: { category: "Extensions", path: "docs/knowledge/06-数据服务与组件/data-service-apis.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("services.site_info.provider"),
+    project(context) {
+      const siteInfo = context.resolveServiceProvider(context.extensions.services?.siteInfo);
+      return configResult({
+        services: context.assets.services || {},
+        siteInfoEndpoint: siteInfo?.endpoint || null,
+        marked: context.assets.dependencies?.marked || null
+      });
+    }
+  },
+  {
+    id: "comments",
+    kind: "extension",
+    entry: runtimeEntry("/js/runtime/extensions/comments.js"),
+    resources: ["comments"],
+    activation: selector("#comments"),
+    schema: "comments.provider",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("comments.provider"),
+    project(context) {
+      if (context.comments.enabled !== true || typeof context.comments.service !== "string" || context.comments.service.length === 0) return null;
+      return configResult({
+        provider: context.comments.service,
+        options: context.comments.options || {},
+        pageTitle: context.comments.pageTitle || "",
+        assets: context.assets.comments?.[context.comments.service] || {}
+      });
+    }
+  },
+  {
+    id: "settings",
+    kind: "component",
+    entry: runtimeEntry(INTERNAL.assets.runtime.settings),
+    resources: ["runtime.settings"],
+    activation: selector(".settings-page"),
+    schema: null,
+    i18n: null,
+    docs: { category: "Components", path: "docs/knowledge/02-布局系统/sidebar-system.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: context => configResult({})
+  },
+  {
+    id: "link-prefetch",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.linkPrefetch"],
+    activation: { type: "always" },
+    schema: "features.link_prefetch.enabled",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.link_prefetch.enabled"),
+    project(context) {
+      if (context.features.linkPrefetch?.enabled !== true) return null;
+      return configResult({ asset: context.assets.features?.linkPrefetch || null });
+    }
+  },
+  {
+    id: "lightbox",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.lightbox"],
+    activation: selector("[data-fancybox]:not(.error), .with-fancybox, .ds-memos"),
+    schema: "features.lightbox.enabled",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.lightbox.enabled"),
+    project(context) {
+      if (context.features.lightbox?.enabled !== true) return null;
+      const dynamicSelector = [this.activation.value, context.features.lightbox?.selector].filter(Boolean).join(", ");
+      return configResult(Object.assign({}, context.features.lightbox, {
+        assets: context.assets.features?.lightbox || {}
+      }), { selector: dynamicSelector });
+    }
+  },
+  {
+    id: "reveal",
+    kind: "feature",
+    entry: runtimeEntry(INTERNAL.assets.runtime.reveal),
+    resources: ["runtime.reveal"],
+    activation: selector(".slide-up"),
+    schema: "features.reveal.enabled",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.reveal.enabled"),
+    project(context) {
+      if (context.features.reveal?.enabled !== true) return null;
+      return configResult(Object.assign({}, context.features.reveal));
+    }
+  },
+  {
+    id: "mathjax",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.mathjax"],
+    activation: selector(".has-jax, script[type^='math/tex']"),
+    schema: "features.math.provider",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.math.provider"),
+    project(context) {
+      const provider = context.render.math || context.features.math?.provider;
+      if (provider !== "mathjax") return null;
+      return configResult({
+        options: context.features.math?.mathjax || {},
+        asset: context.assets.features?.mathjax || null
+      });
+    }
+  },
+  {
+    id: "katex-stylesheet",
+    kind: "component",
+    entry: { type: "template", path: "layout/_partial/scripts/runtime.ejs" },
+    resources: ["features.katexCss"],
+    activation: { type: "server", value: "render.math or features.math.provider is katex" },
+    schema: "features.math.provider",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST],
+    defaultsOwner: CONFIG_OWNER("features.math.provider"),
+    project: null
+  },
+  {
+    id: "diagrams",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.diagrams"],
+    activation: selector(".mermaid"),
+    schema: "features.diagrams.provider",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.diagrams.provider"),
+    project(context) {
+      const override = context.render.diagrams;
+      const provider = override === false
+        ? null
+        : typeof override === "string"
+          ? override
+          : (override && typeof override === "object" ? "mermaid" : context.features.diagrams?.provider);
+      if (provider !== "mermaid") return null;
+      const options = override && typeof override === "object" ? override : {};
+      return configResult(Object.assign({}, context.features.diagrams?.mermaid, options, {
+        provider,
+        assets: context.assets.features?.diagrams || {},
+        colorScheme: context.colorScheme || "auto"
+      }));
+    }
+  },
+  {
+    id: "code-copy",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.codeCopy"],
+    activation: selector(".code"),
+    schema: null,
+    i18n: {
+      namespace: "copy-code",
+      keys: ["btn.copy", "message.copied", "message.copy_denied", "message.copy_unsupported"]
+    },
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: context => configResult({
+      assets: context.assets.features?.codeCopy || {},
+      messages: context.plainObject(context.messages.copy, "messages.copy")
+    })
+  },
+  {
+    id: "adaptive-text",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.adaptiveText"],
+    activation: selector("[data-text-adaptive]"),
+    schema: null,
+    i18n: null,
+    docs: { category: "Components", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: context => configResult({ assets: context.assets.features?.adaptiveText || {} })
+  },
+  {
+    id: "card-hover",
+    kind: "feature",
+    entry: runtimeEntry("/js/runtime/extensions/card-hover.js"),
+    resources: ["features.cardHover"],
+    activation: selector(".card-hover"),
+    schema: "features.card_hover.enabled",
+    i18n: null,
+    docs: { category: "Components", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.card_hover.enabled"),
+    project(context) {
+      if (context.features.cardHover?.enabled !== true) return null;
+      return configResult({ assets: context.assets.features?.cardHover || {} });
+    }
+  },
+  {
+    id: "heti",
+    kind: "feature",
+    entry: featureEntry(),
+    resources: ["features.heti"],
+    activation: selector(".heti"),
+    schema: "features.heti.enabled",
+    i18n: null,
+    docs: { category: "Extensions", path: PLUGIN_SYSTEM_DOC },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: CONFIG_OWNER("features.heti.enabled"),
+    project(context) {
+      if (context.features.heti?.enabled !== true) return null;
+      return configResult({ assets: context.assets.features?.heti || {} });
+    }
+  },
+  {
+    id: "swiper",
+    kind: "component",
+    entry: featureEntry(),
+    resources: ["features.swiper"],
+    activation: selector("#swiper-api"),
+    schema: null,
+    i18n: null,
+    docs: { category: "Components", path: "docs/knowledge/04-标签插件/timeline-media-tags.md" },
+    tests: [RUNTIME_TEST, RUNTIME_CONSUMPTION_TEST],
+    defaultsOwner: null,
+    project: context => configResult({ assets: context.assets.features?.swiper || {} })
+  }
+]);
+
+function activationWhen(activation) {
+  if (activation.type === "always") return { always: true };
+  if (activation.type === "selector") return { selector: activation.value };
+  throw new TypeError(`[stellar contributions] ${activation.type} activation cannot be projected to Runtime Manifest`);
+}
+
+function buildContributionEntries(context) {
+  const entries = [];
+  for (const contribution of CONTRIBUTIONS) {
+    if (contribution.project === null) continue;
+    const projected = contribution.project.call(contribution, context);
+    if (projected === null) continue;
+    const config = contribution.entry.adapter === "feature"
+      ? Object.assign({ feature: contribution.id }, projected.config || {})
+      : (projected.config || {});
+    entries.push({
+      id: contribution.id,
+      module: contribution.entry.path,
+      when: projected.when || activationWhen(contribution.activation),
+      config
+    });
+  }
+  return entries;
+}
+
+function contributionSchemaIds(prefix) {
+  const head = `${prefix}.`;
+  return [...new Set(CONTRIBUTIONS
+    .map(contribution => contribution.schema)
+    .filter(schema => typeof schema === "string" && schema.startsWith(head))
+    .map(schema => schema.slice(head.length).split(".")[0]))];
+}
+
+module.exports = {
+  CONTRIBUTIONS,
+  buildContributionEntries,
+  contributionSchemaIds
+};

package/scripts/lib/doc_tree.js

@@ -2,7 +2,7 @@
  * doc_tree.js v2 | https://github.com/xaoxuu/hexo-theme-stellar/
  *
  * Wiki 文档树构建（纯函数，供 events/lib/doc_tree.js 调用与单测覆盖）。
- * 与旧实现的输出语义保持一致，仅把重复的 filter/some 遍历改为单遍 Map 索引：
+ * 使用 v2 collection/route/listing 结构，并把重复的 filter/some 遍历改为单遍 Map 索引：
  * - 页面按 wiki 分组一次（O(W+P) 替代 O(W*P)）；
  * - 项目内按 path_key 分组一次，首页解析与 sections 组装改走索引查询；
  * - all_tags / relatedItems 用 Set/Map 去重，输出顺序不变。
@@ -11,16 +11,19 @@
 'use strict';
 
 const { normalize_path } = require('./path_utils');
+const { getCollectionId, isListed } = require('./content-config');
+const { profilePath } = require("./layout-config");
 
 class WikiPage {
-  constructor(page) {
+  constructor(page, config) {
     this.id = page._id;
-    this.wiki = page.wiki;
+    this.collectionId = getCollectionId(config, "wiki");
     this.title = page.title;
     this.path = page.path;
     this.path_key = normalize_path(page.path);
     this.layout = page.layout;
     this.updated = page.updated;
+    this.listed = isListed(config);
   }
 }
 
@@ -34,30 +37,26 @@ function getWikiObject(data) {
     if (key.includes('wiki/') && key.length > 5) {
       let newKey = key.replace('wiki/', '');
       let obj = data[key];
-      if ((typeof obj.tags == 'string') && obj.tags.constructor == String) {
-        obj.tags = [obj.tags];
-      }
-      if ((typeof obj.tree == 'object') && obj.tree.constructor == Array) {
-        obj.tree = { '': obj.tree };
+      const tree = obj.navigation?.tree;
+      if ((typeof tree == "object") && tree.constructor == Array) {
+        obj.navigation.tree = { "": tree };
       }
       obj.id = newKey;
-      if (obj.sort == null) {
-        obj.sort = 0;
-      }
-      if (obj.base_dir) {
-        if (obj.base_dir.startsWith('/')) {
-          obj.base_dir = obj.base_dir.substring(1);
+      obj.listing ||= {};
+      obj.listing.order ??= 0;
+      const baseDir = obj.route?.path || "";
+      if (baseDir) {
+        if (baseDir.startsWith('/')) {
+          obj.route.path = baseDir.substring(1);
         }
-        if (obj.base_dir.length > 1 && obj.base_dir.endsWith('/') == false) {
-          obj.base_dir = obj.base_dir + '/';
+        if (obj.route.path.length > 1 && obj.route.path.endsWith("/") == false) {
+          obj.route.path = obj.route.path + "/";
         }
-      } else {
-        obj.base_dir = '';
       }
       list.push(obj);
     }
   }
-  list = list.sort((p1, p2) => p2.sort - p1.sort);
+  list = list.sort((p1, p2) => p2.listing.order - p1.listing.order);
   for (let item of list) {
     wiki.tree[item.id] = item;
   }
@@ -69,22 +68,25 @@ function getWikiObject(data) {
  * @param {Object} options
  * @param {Object} options.data 站点 _data（含 wiki/ 前缀的 YAML 数据）
  * @param {Array|Object} options.pages 站点 pages（warehouse Query 或数组）
+ * @param {Map} options.pageConfigs 页面对象到冻结 Front Matter 配置的映射
  * @param {Array} options.shelf 上架项目 id 列表
- * @param {Object} options.siteTree 主题配置 site_tree（取 index_wiki.base_dir）
+ * @param {string} options.wikiIndexPath 冻结的 Wiki Index Profile 路径
  */
-function buildWikiTree({ data, pages, shelf, siteTree }) {
+function buildWikiTree({ data, pages, pageConfigs, shelf, wikiIndexPath }) {
   // wiki 配置
   var wiki = getWikiObject(data);
   // wiki 所有页面
-  const wiki_pages = pages.filter(p => (p.wiki != null)).map(p => new WikiPage(p));
+  const allWikiPages = pages
+    .filter(page => getCollectionId(pageConfigs.get(page), "wiki") != null)
+    .map(page => new WikiPage(page, pageConfigs.get(page)));
 
   // 单遍分组：wiki id → WikiPage[]（保持 wiki_pages 原始顺序）
   const pagesByWiki = new Map();
-  for (const wp of wiki_pages) {
-    let arr = pagesByWiki.get(wp.wiki);
+  for (const wp of allWikiPages) {
+    let arr = pagesByWiki.get(wp.collectionId);
     if (arr == null) {
       arr = [];
-      pagesByWiki.set(wp.wiki, arr);
+      pagesByWiki.set(wp.collectionId, arr);
     }
     arr.push(wp);
   }
@@ -114,23 +116,24 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
   for (let id of wiki_list) {
     let item = wiki.tree[id];
     item.id = id;
-    if (item.title == undefined || item.title.length === 0) {
-      item.title = id;
-    }
     if (item.name == undefined || item.name.length == 0) {
       item.name = id;
     }
+    if (item.headline == undefined || item.headline.length === 0) {
+      item.headline = item.name;
+    }
   }
 
   // 数据整合：每个项目的子页面
   for (let i = 0; i < wiki_list.length; i++) {
     let id = wiki_list[i];
     let item = wiki.tree[id];
-    let sub_pages = pagesByWiki.get(id) || [];
+    const projectPages = pagesByWiki.get(id) || [];
+    let sub_pages = projectPages.filter(page => page.listed);
 
     // 单遍 path_key 索引：同一 path_key 可能对应多个页面，保持数组与顺序
     const pagesByPathKey = new Map();
-    for (const p of sub_pages) {
+    for (const p of projectPages) {
       let arr = pagesByPathKey.get(p.path_key);
       if (arr == null) {
         arr = [];
@@ -142,11 +145,11 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
     // 首页
     // 未特别指定首页时，获取TOC第一页作为首页
     var homepage = item.homepage;
-    if (homepage == null && item.tree != null) {
-      for (let tid of Object.keys(item.tree)) {
-        const sec = item.tree[tid];
+    if (homepage == null && item.navigation?.tree != null) {
+      for (let tid of Object.keys(item.navigation.tree)) {
+        const sec = item.navigation.tree[tid];
         for (let key of sec) {
-          const hs = pagesByPathKey.get(normalize_path(item.base_dir + key)) || [];
+          const hs = pagesByPathKey.get(normalize_path((item.route?.path || "") + key)) || [];
           if (hs.length > 0) {
             homepage = hs[0];
             break;
@@ -158,7 +161,7 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
       }
     }
     if (homepage == null) {
-      homepage = sub_pages[0];
+      homepage = projectPages[0];
     }
     if (typeof homepage == 'string') {
       homepage = { path: homepage };
@@ -169,14 +172,14 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
     // 内页分组
     var sections = [];
     var others = sub_pages;
-    if (item.tree) {
+    if (item.navigation?.tree) {
       // 根据配置设置顺序
       const assignedPathKeys = new Set();
-      for (let title of Object.keys(item.tree)) {
+      for (let title of Object.keys(item.navigation.tree)) {
         var sec = { title: title, pages: [] };
-        for (let key of item.tree[title]) {
-          const pagePathKey = normalize_path(item.base_dir + key);
-          const matched = pagesByPathKey.get(pagePathKey) || [];
+        for (let key of item.navigation.tree[title]) {
+          const pagePathKey = normalize_path((item.route?.path || "") + key);
+          const matched = (pagesByPathKey.get(pagePathKey) || []).filter(page => page.listed);
           sec.pages = sec.pages.concat(matched);
           if (matched.length > 0) {
             assignedPathKeys.add(pagePathKey);
@@ -214,7 +217,6 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
   var all_tags = {};
   all_tag_name.forEach((tag_name, i) => {
     var items = [];
-    // 与旧实现 items.includes(tag_name) 判定等价（项目 id 恰等于标签名时的去重行为）
     var itemsSet = new Set();
     for (let id of wiki_list) {
       let item = wiki.tree[id];
@@ -226,14 +228,14 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
       if (!wiki.shelf.includes(item.id)) {
         continue;
       }
-      if (item.tags && item.tags.includes(tag_name) === true && itemsSet.has(tag_name) === false) {
+      if (item.tags && item.tags.includes(tag_name) === true && itemsSet.has(item.id) === false) {
         itemsSet.add(item.id);
         items.push(item.id);
       }
     }
     all_tags[tag_name] = {
       name: tag_name,
-      path: (siteTree.index_wiki.base_dir) + '/tags/' + tag_name + '/index.html',
+      path: profilePath(wikiIndexPath) + "/tags/" + tag_name + "/index.html",
       items: items
     };
   });
@@ -257,7 +259,7 @@ function buildWikiTree({ data, pages, shelf, siteTree }) {
   }
 
   wiki.all_tags = all_tags;
-  wiki.all_pages = wiki_pages;
+  wiki.all_pages = allWikiPages.filter(page => page.listed);
   return wiki;
 }