vitepress-allyouneed 0.5.4 → 0.5.6

package/CHANGELOG.md

@@ -2,9 +2,20 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/);版本号遵循 [SemVer](https://semver.org/lang/zh-CN/)。
 
+
 ## [Unreleased]
 
 ### Fixed
+- **`==highlight==` 在 CJK、粗体、链接或公式旁跨段错配**:高亮规则不再套用为 `*`/`_` 设计的 delimiter flanking 语义,改为原子解析成对 `==` 并递归解析内部 Markdown。`指==**重点**运行==的`、连续多个粗体高亮及高亮内公式/链接现在稳定输出 `<mark>`，不再残留原始 `==`。
+
+## [0.5.5] - 2026-06-20
+
+### Added
+- **目录可由 dirIndex 排序**:`index.md`、`README.md` 或同名目录页现在是该文件夹 group 的排序锚点。默认 `sortBy: 'order-then-title'` 下,给目录页写 `order: 1` 即可控制目录位置;嵌套目录、`per-folder` 根侧栏和 `autoNav` 均一致生效,无需给文件夹名添加数字前缀。顶级 `groupOrder` 仍具有最高优先级。
+
+### Fixed
+- **嵌套 `index.md` 生成错误的无尾斜杠 URL**:`cleanUrls: true` 下目录页现在输出 `/guide/` 而不是 `/guide`;与 VitePress 的 `guide/index.html` 路由及 dead-link validator 保持一致。
+- **`scanWikilinks` 把合法 `[[folder/]]` 误报为死链**:启动预扫不再维护遗漏 `folderLinkOrder` 的简化解析器,改为与渲染阶段共用 `resolveWikilink`;目录 index、相对路径、自引用锚点和冲突策略现在只有一套解析语义。
 - **同名页面跨 locale / 区域解析错误**:`[[Gravitationsphysik]]` 这类 basename-only Wikilink 不再直接使用全局 `onConflict`。解析器现在先按源页面的同目录和最长共同路径前缀收窄候选(例如 `zh/themen/*` 优先于 `zh/selfcheck/*`,二者都优先于其它 locale),仍有歧义时才执行 `shortest` / `first` / `error`。
 - 强化当前源页面定位:relativePath 精确匹配先于后缀兜底,且后缀存在多个 locale 命中时不再取扫描顺序中的第一个。
 

package/dist/index.cjs

@@ -594,7 +594,8 @@ function computeUrl(rel, options) {
   } else if (!options.cleanUrls) {
     segments.push("index.html");
   }
-  return buildUrl("/", segments);
+  const url = buildUrl("/", segments);
+  return isIndex && options.cleanUrls ? url + "/" : url;
 }
 function pushToArrayMap(m, k, v) {
   const arr = m.get(k);
@@ -1784,79 +1785,49 @@ function registerCallouts(md) {
 
 // src/modules/highlight/rule.ts
 var EQ = 61;
-function tokenize(state, silent) {
-  if (silent) return false;
-  const start = state.pos;
-  const marker = state.src.charCodeAt(start);
-  if (marker !== EQ) return false;
-  const scanned = state.scanDelims(state.pos, true);
-  let len = scanned.length;
-  const ch = String.fromCharCode(marker);
-  if (len < 2) return false;
-  let token;
-  if (len % 2) {
-    token = state.push("text", "", 0);
-    token.content = ch;
-    len -= 1;
-  }
-  for (let i = 0; i < len; i += 2) {
-    token = state.push("text", "", 0);
-    token.content = ch + ch;
-    const delims = state.delimiters;
-    delims.push({
-      marker,
-      length: 0,
-      // 关掉 emphasis 用的 "rule of 3"
-      jump: i / 2,
-      // 1 delimiter = 2 chars
-      token: state.tokens.length - 1,
-      end: -1,
-      open: scanned.can_open,
-      close: scanned.can_close
-    });
+var BACKSLASH = 92;
+function findClosingMarker(src, from) {
+  for (let pos = from; pos < src.length - 1; pos += 1) {
+    if (src.charCodeAt(pos) === BACKSLASH) {
+      pos += 1;
+      continue;
+    }
+    if (src.charCodeAt(pos) === EQ && src.charCodeAt(pos + 1) === EQ) {
+      return pos;
+    }
   }
-  state.pos += scanned.length;
-  return true;
+  return -1;
 }
-function postProcess(state) {
-  const delimiters = state.delimiters;
-  const loneMarkers = [];
-  const max = delimiters.length;
-  for (let i = 0; i < max; i++) {
-    const startDelim = delimiters[i];
-    if (startDelim.marker !== EQ) continue;
-    if (startDelim.end === -1) continue;
-    const endDelim = delimiters[startDelim.end];
-    let token = state.tokens[startDelim.token];
-    token.type = "mark_open";
-    token.tag = "mark";
-    token.nesting = 1;
-    token.markup = "==";
-    token.content = "";
-    token = state.tokens[endDelim.token];
-    token.type = "mark_close";
-    token.tag = "mark";
-    token.nesting = -1;
-    token.markup = "==";
-    token.content = "";
-    const prev = state.tokens[endDelim.token - 1];
-    if (prev && prev.type === "text" && prev.content === "=") {
-      loneMarkers.push(endDelim.token - 1);
-    }
+function tokenize(state, silent) {
+  const start = state.pos;
+  if (state.src.charCodeAt(start) !== EQ || state.src.charCodeAt(start + 1) !== EQ) {
+    return false;
   }
-  while (loneMarkers.length > 0) {
-    const i = loneMarkers.pop();
-    let j = i + 1;
-    while (j < state.tokens.length && state.tokens[j].type === "mark_close") {
-      j += 1;
-    }
-    j -= 1;
-    if (i !== j) {
-      const tmp = state.tokens[j];
-      state.tokens[j] = state.tokens[i];
-      state.tokens[i] = tmp;
-    }
+  const close = findClosingMarker(state.src, start + 2);
+  if (close < 0 || close === start + 2) return false;
+  const end = close + 2;
+  if (silent) {
+    state.pos = end;
+    return true;
   }
+  const open = state.push("mark_open", "mark", 1);
+  open.markup = "==";
+  const inner = [];
+  state.md.inline.parse(
+    state.src.slice(start + 2, close),
+    state.md,
+    state.env,
+    inner
+  );
+  const levelOffset = state.level;
+  for (const token of inner) {
+    token.level += levelOffset;
+    state.tokens.push(token);
+  }
+  const closeToken = state.push("mark_close", "mark", -1);
+  closeToken.markup = "==";
+  state.pos = end;
+  return true;
 }
 function registerHighlightInline(md) {
   try {
@@ -1864,27 +1835,6 @@ function registerHighlightInline(md) {
   } catch {
     md.inline.ruler.before("emphasis", "allyouneed_highlight", tokenize);
   }
-  md.inline.ruler2.before(
-    "emphasis",
-    "allyouneed_highlight",
-    function highlightPostProcess(state) {
-      const tokens_meta = state.tokens_meta;
-      const curr = state.delimiters;
-      if (curr) postProcess(state);
-      if (tokens_meta) {
-        for (const m of tokens_meta) {
-          if (m && m.delimiters) {
-            const proxy = {
-              ...state,
-              delimiters: m.delimiters
-            };
-            postProcess(proxy);
-          }
-        }
-      }
-      return false;
-    }
-  );
 }
 
 // src/modules/highlight/index.ts
@@ -2401,7 +2351,7 @@ function renderTemplate(v) {
 // src/core/views/generate-data.ts
 var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
-var PLUGIN_VERSION = true ? "0.5.4" : "0.0.0-dev";
+var PLUGIN_VERSION = true ? "0.5.6" : "0.0.0-dev";
 var WIKILINK_RE = /(!?)\[\[([^\]\n]+)\]\]/g;
 var DEFAULT_BODY_TAG_RE = /(?:^|[\s([{,;。,;])#([\p{L}_][\p{L}\p{N}_/-]*)/gu;
 function buildBodyTagRe(userPattern) {
@@ -3453,8 +3403,27 @@ function shouldLinkGroup(opts, isTopLevel) {
 }
 function sortChildKeys(node, opts, isTopLevel) {
   const keys = [...node.children.keys()];
+  const collateOpts = { numeric: true, sensitivity: "base" };
+  const compareFolderKeys = (a, b) => {
+    const aNode = node.children.get(a);
+    const bNode = node.children.get(b);
+    const aAnchor = pickTitleSourceCandidate(aNode);
+    const bAnchor = pickTitleSourceCandidate(bNode);
+    if (opts.sortBy === "mtime-desc") {
+      const am = aAnchor?.mtime ?? Number.NEGATIVE_INFINITY;
+      const bm = bAnchor?.mtime ?? Number.NEGATIVE_INFINITY;
+      if (am !== bm) return bm - am;
+    } else if (opts.sortBy === "order-then-title") {
+      const ao = aAnchor ? readOrder(aAnchor, opts.orderKey) : Number.POSITIVE_INFINITY;
+      const bo = bAnchor ? readOrder(bAnchor, opts.orderKey) : Number.POSITIVE_INFINITY;
+      if (ao !== bo) return ao - bo;
+    }
+    const at = computeGroupText(aNode.path, aAnchor, opts);
+    const bt = computeGroupText(bNode.path, bAnchor, opts);
+    return at.localeCompare(bt, void 0, collateOpts);
+  };
   if (!isTopLevel || opts.groupOrder.length === 0) {
-    return keys.sort();
+    return keys.sort(compareFolderKeys);
   }
   const orderMap = /* @__PURE__ */ new Map();
   opts.groupOrder.forEach((name, i) => {
@@ -3490,7 +3459,7 @@ function sortChildKeys(node, opts, isTopLevel) {
     const ob = orderMap.has(b) ? orderMap.get(b) : orderMap.get(tb);
     return oa - ob;
   });
-  rest.sort();
+  rest.sort(compareFolderKeys);
   return [...indexed, ...rest];
 }
 function toFlatSidebar(root, opts) {
@@ -3540,7 +3509,12 @@ function toPerFolderSidebar(root, opts, options, index) {
   for (const f of sortedRootFiles) {
     rootItems.push({ text: opts.formatItemTitle(f), link: f.url });
   }
-  const topKeys = [...root.children.keys()].sort();
+  const topKeys = sortChildKeys(
+    root,
+    opts,
+    /* isTopLevel */
+    true
+  );
   for (const key of topKeys) {
     const child = root.children.get(key);
     const childWinner = resolveFolderLink(
@@ -3617,7 +3591,12 @@ function generateNav(index, options, autoOptions = {}) {
   const root = buildTree2(visible);
   const base = options.base.endsWith("/") ? options.base : options.base + "/";
   const out = [{ text: opts.homeNavText, link: "/" }];
-  const topKeys = [...root.children.keys()].sort();
+  const topKeys = sortChildKeys(
+    root,
+    opts,
+    /* isTopLevel */
+    true
+  );
   for (const key of topKeys) {
     const child = root.children.get(key);
     const winner = resolveFolderLink(
@@ -3909,9 +3888,14 @@ function scanWikilinks(index, options) {
           if (isAsset) continue;
         }
       }
-      const isSelfAnchor = !rawTarget && !!headingPart;
-      const found = isSelfAnchor || resolveSimple(rawTarget, index, options, f.relativePath);
-      if (!found) {
+      const resolved = resolveWikilink(
+        rawTargetFull,
+        index,
+        options,
+        isEmbed ? "transclusion" : "page",
+        f.absolutePath
+      );
+      if (resolved.isDead) {
         dead.push({
           source: f.relativePath,
           target: rawTarget,
@@ -3920,7 +3904,7 @@ function scanWikilinks(index, options) {
         continue;
       }
       if (scanAmbig && headingPart) {
-        const targetEntry = isSelfAnchor ? f : resolveSimpleEntry(rawTarget, index, options, f.relativePath);
+        const targetEntry = resolved.target;
         if (!targetEntry) continue;
         const matches2 = findAmbiguousLeadingNumberMatches(targetEntry, headingPart);
         if (matches2.length > 1) {
@@ -3942,27 +3926,6 @@ function scanWikilinks(index, options) {
   }
   return { total, dead, ambiguous };
 }
-function resolveSimpleEntry(raw, index, options, currentSourceRel) {
-  const target = stripMarkdownExt(toPosix(raw));
-  if (!target) return void 0;
-  if (target.includes("/")) {
-    const e = index.byRelativePath.get(target) ?? index.byRelativePath.get(target + ".md") ?? index.byRelativePath.get(target + ".markdown");
-    if (e) return e;
-    if (currentSourceRel) {
-      const curDir = currentSourceRel.split("/").slice(0, -1).join("/");
-      if (curDir) {
-        return index.byRelativePath.get(`${curDir}/${target}`) ?? index.byRelativePath.get(`${curDir}/${target}.md`) ?? index.byRelativePath.get(`${curDir}/${target}.markdown`);
-      }
-    }
-    return void 0;
-  }
-  const aliasKey = options.caseSensitive ? target : target.toLowerCase();
-  const aliased = index.byAlias.get(aliasKey);
-  if (aliased) return aliased;
-  const map = options.caseSensitive ? index.byBasename : index.byBasenameLower;
-  const key = options.caseSensitive ? target : target.toLowerCase();
-  return map.get(key)?.[0];
-}
 function logDeadLinks(report, deadLink) {
   if (deadLink === "silent") return;
   if (report.dead.length > 0) {
@@ -4011,27 +3974,6 @@ function extractExt3(target) {
   if (dot <= 0) return "";
   return cleaned.slice(dot + 1).toLowerCase();
 }
-function resolveSimple(raw, index, options, currentSourceRel) {
-  const target = stripMarkdownExt(toPosix(raw));
-  if (!target) return false;
-  if (target.includes("/")) {
-    if (index.byRelativePath.has(target) || index.byRelativePath.has(target + ".md") || index.byRelativePath.has(target + ".markdown")) {
-      return true;
-    }
-    if (currentSourceRel) {
-      const curDir = currentSourceRel.split("/").slice(0, -1).join("/");
-      if (curDir) {
-        return index.byRelativePath.has(`${curDir}/${target}`) || index.byRelativePath.has(`${curDir}/${target}.md`) || index.byRelativePath.has(`${curDir}/${target}.markdown`);
-      }
-    }
-    return false;
-  }
-  const aliasKey = options.caseSensitive ? target : target.toLowerCase();
-  if (index.byAlias.has(aliasKey)) return true;
-  const map = options.caseSensitive ? index.byBasename : index.byBasenameLower;
-  const key = options.caseSensitive ? target : target.toLowerCase();
-  return (map.get(key)?.length ?? 0) > 0;
-}
 
 // src/vitepress.ts
 var autoFolderIndexWarned = false;