From e4bdd061820341a29a140eaf8e4fc2671d754b41 Mon Sep 17 00:00:00 2001
From: hypercross <helios.tnak@gmail.com>
Date: Thu, 26 Feb 2026 15:40:58 +0800
Subject: [PATCH] refactor: path handling

---
 src/components/md-link.tsx | 13 +++----------
 src/components/table.tsx   | 11 ++---------
 src/utils/index.ts         |  1 +
 src/utils/path.ts          | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 src/utils/index.ts
 create mode 100644 src/utils/path.ts

diff --git a/src/components/md-link.tsx b/src/components/md-link.tsx
index 16cb63d..9892941 100644
--- a/src/components/md-link.tsx
+++ b/src/components/md-link.tsx
@@ -2,6 +2,7 @@ import { customElement, noShadowDOM } from "solid-element";
 import { createSignal, onCleanup } from "solid-js";
 import { render } from "solid-js/web";
 import { Article } from "./Article";
+import { resolvePath } from "../utils/path";
 
 customElement("md-link", {}, (props, { element }) => {
   noShadowDOM();
@@ -12,7 +13,7 @@ customElement("md-link", {}, (props, { element }) => {
 
   // 从 element 的 textContent 获取链接目标（支持 path#section 语法）
   const rawLinkSrc = element?.textContent?.trim() || "";
-  
+
   // 解析 section（支持 path#section 语法）
   const hashIndex = rawLinkSrc.indexOf('#');
   const path = hashIndex >= 0 ? rawLinkSrc.slice(0, hashIndex) : rawLinkSrc;
@@ -27,15 +28,7 @@ customElement("md-link", {}, (props, { element }) => {
   const articleEl = element?.closest('article[data-src]');
   const articlePath = articleEl?.getAttribute('data-src') || '';
 
-  // 解析相对路径（相对于 markdown 文件所在目录）
-  const resolvePath = (base: string, relative: string): string => {
-    if (relative.startsWith('/')) {
-      return relative;
-    }
-    const baseDir = base.substring(0, base.lastIndexOf('/') + 1);
-    return baseDir + relative;
-  };
-
+  // 解析相对路径
   const linkSrc = resolvePath(articlePath, path);
 
   // 查找包含此元素的 p 标签
diff --git a/src/components/table.tsx b/src/components/table.tsx
index 4fceb5b..3b4b508 100644
--- a/src/components/table.tsx
+++ b/src/components/table.tsx
@@ -2,6 +2,7 @@ import { customElement, noShadowDOM } from 'solid-element';
 import { createSignal, For, Show, createEffect, createMemo, createResource } from 'solid-js';
 import { parse } from 'csv-parse/browser/esm/sync';
 import { marked } from '../markdown';
+import { resolvePath } from '../utils/path';
 
 interface TableRow {
   label: string;
@@ -32,15 +33,7 @@ customElement('md-table', { roll: false, remix: false }, (props, { element }) =>
   const articleEl = element?.closest('article[data-src]');
   const articlePath = articleEl?.getAttribute('data-src') || '';
 
-  // 解析相对路径（相对于 markdown 文件所在目录）
-  const resolvePath = (base: string, relative: string): string => {
-    if (relative.startsWith('/')) {
-      return relative;
-    }
-    const baseDir = base.substring(0, base.lastIndexOf('/') + 1);
-    return baseDir + relative;
-  };
-
+  // 解析相对路径
   const resolvedSrc = resolvePath(articlePath, src);
 
   // 加载 CSV 文件的函数
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..394aa53
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1 @@
+export { resolvePath } from './path';
diff --git a/src/utils/path.ts b/src/utils/path.ts
new file mode 100644
index 0000000..6d82cc8
--- /dev/null
+++ b/src/utils/path.ts
@@ -0,0 +1,35 @@
+/**
+ * 解析相对路径为绝对路径
+ * 支持 ./ 和 ../ 语法
+ * @param base - 基准路径（通常是当前 markdown 文件的路径）
+ * @param relative - 相对路径或绝对路径
+ * @returns 解析后的路径
+ */
+export function resolvePath(base: string, relative: string): string {
+  if (relative.startsWith('/')) {
+    return relative;
+  }
+
+  const baseParts = base.split('/').filter(Boolean);
+  // 移除文件名，保留目录路径
+  if (baseParts.length > 0 && !base.endsWith('/')) {
+    baseParts.pop();
+  }
+
+  const relativeParts = relative.split('/');
+
+  for (const part of relativeParts) {
+    if (part === '.' || part === '') {
+      // 跳过 . 和空字符串
+      continue;
+    } else if (part === '..') {
+      // 向上一级
+      baseParts.pop();
+    } else {
+      // 普通路径段
+      baseParts.push(part);
+    }
+  }
+
+  return '/' + baseParts.join('/');
+}