@canyonjs/git-provider 0.0.3 → 0.0.6

package/README.md

@@ -62,15 +62,15 @@ GitHub 仅 token、`base` 固定为 `https://api.github.com`。
 
 ## 开发与脚本
 
-| 脚本                 | 说明                                                      |
-| -------------------- | --------------------------------------------------------- |
-| `pnpm run build`     | 使用 tsdown 产出 `dist`                                   |
-| `pnpm run dev`       | 监听构建                                                  |
-| `pnpm run typecheck` | TypeScript 检查                                           |
-| `pnpm run test`      | Vitest                                                    |
-| `pnpm run debug`     | 本地脚本 `src/debug.ts`（可自行改为写 token、仓库与 ref） |
-
-目录概览：**`src/adapter.ts`** 定义 **`ScmAdapter`**；**`src/gitlab.ts`** / **`src/github.ts`** 为实现；**`src/diff-line.ts`** 为行号计算与扩展名判定；**`src/types.ts`** 为配置与各数据结构类型。
+| 脚本                 | 说明                                                       |
+| -------------------- | ---------------------------------------------------------- |
+| `pnpm run build`     | 使用 tsdown 产出 `dist`                                    |
+| `pnpm run dev`       | 监听构建                                                   |
+| `pnpm run typecheck` | TypeScript 检查                                            |
+| `pnpm run test`      | Vitest                                                     |
+| `pnpm run debug`     | 本地脚本 `scripts/debug/`（`.env` 配置 token、仓库与 ref） |
+
+目录概览：**`src/adapter.ts`** 定义 **`ScmAdapter`**；**`src/gitlab.ts`** / **`src/github.ts`** 为实现；**`src/diff-line.ts`** 为行号计算与扩展名判定；**`src/types.ts`** 为配置与各数据结构类型。**`tests/`** 为 Vitest 测试；**`tests/test-utils/`** 为本机 HTTP mock、fixture JSON 等（不进入 `dist`）。
 
 ## 许可证
 

package/dist/index.d.mts

@@ -34,8 +34,15 @@ interface Compare {
 interface ScmAdapter {
   /** 获取仓库信息（id、pathWithNamespace、description） */
   getRepoInfo(repoID: string): Promise<RepoInfo>;
+  /** 获取 base..head 之间 commit sha 列表（顺序与 GitLab `repository/compare` 返回的 `commits` 一致；无 `commits` 时可能仅有 `commit.id`） */
+  getCommitsBetween(repoID: string, base: string, head: string): Promise<string[]>;
   /** 获取 base...head 之间变更 */
   getCompare(repoID: string, base: string, head: string): Promise<Compare>;
+  /**
+   * 批量获取指定 ref 下多个文件的源码（通过 archive 下载后解压提取，避免逐文件请求）
+   * @returns Map<相对路径, 文件内容 UTF-8 字符串>
+   */
+  getSourceFiles(repoID: string, sha: string, filePaths: string[]): Promise<Map<string, string>>;
 }
 //#endregion
 //#region src/index.d.ts

package/dist/index.mjs

@@ -1,4 +1,7 @@
+import axios from "axios";
 import { diffLines } from "diff";
+/** 统一超时；需要改签名单独在调用里传 `AxiosRequestConfig` */
+const http = axios.create({ timeout: 1e4 });
 var HttpError = class extends Error {
 	status;
 	statusText;
@@ -12,52 +15,24 @@ var HttpError = class extends Error {
 		this.data = data;
 	}
 };
-function mergeSignal(timeoutSignal, userSignal) {
-	if (!userSignal) return timeoutSignal;
-	const any = AbortSignal.any;
-	if (typeof any === "function") return any([userSignal, timeoutSignal]);
-	return timeoutSignal;
+function rethrowAsHttpError(e) {
+	if (axios.isAxiosError(e) && e.response) throw new HttpError(e.response.status, e.response.statusText ?? "", e.response.data);
+	if (e instanceof Error) throw e;
+	throw new Error(String(e));
 }
-async function parseBody(res) {
-	const text = await res.text();
-	if (!text) return void 0;
-	if ((res.headers.get("content-type") ?? "").includes("application/json")) try {
-		return JSON.parse(text);
-	} catch {
-		return text;
-	}
-	return text;
-}
-async function dispatch(url, config) {
-	const timeoutMs = config.timeout ?? 1e4;
-	const controller = new AbortController();
-	const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-	const signal = mergeSignal(controller.signal, config.signal);
+async function get(url, config) {
 	try {
-		const res = await fetch(url, {
-			method: config.method ?? "GET",
-			headers: config.headers,
-			body: config.body,
-			signal
-		});
-		const data = await parseBody(res);
-		if (!res.ok) throw new HttpError(res.status, res.statusText, data);
+		const r = await http.get(url, config);
 		return {
-			data,
-			status: res.status,
-			statusText: res.statusText
+			data: r.data,
+			status: r.status,
+			statusText: r.statusText
 		};
-	} finally {
-		clearTimeout(timeoutId);
+	} catch (e) {
+		rethrowAsHttpError(e);
 	}
 }
-/** 类似 `axios.get`：返回 `{ data, status, statusText }`，非 2xx 抛 `HttpError` */
-function get(url, config = {}) {
-	return dispatch(url, {
-		...config,
-		method: "GET"
-	});
-}
+http.defaults;
 //#endregion
 //#region src/github.ts
 const GITHUB_BASE = "https://api.github.com";
@@ -92,9 +67,15 @@ var GithubAdapter = class {
 			description: data.description ?? ""
 		};
 	}
+	async getCommitsBetween(_repoID, _base, _head) {
+		throw new Error("GitHubAdapter.getCommitsBetween 尚未实现");
+	}
 	async getCompare(_repoID, _base, _head) {
 		throw new Error("GitHubAdapter.getCompare 尚未实现");
 	}
+	async getSourceFiles(repoID, sha, filePaths) {
+		throw new Error("GitHubAdapter.getSourceFiles 尚未实现");
+	}
 };
 //#endregion
 //#region src/diff-line.ts
@@ -187,6 +168,15 @@ async function computeLineBucketsByRef(files, baseRef, headRef, fetchText, concu
 }
 //#endregion
 //#region src/gitlab.ts
+/** 唯一路径数超过该值时用 archive.zip；否则并发请求单文件 raw，避免为少量路径拉整仓 */
+const SOURCE_FILES_ARCHIVE_THRESHOLD = 8;
+/** 提交 id 列表：完全以 compare 响应为准——有 `commits` 则用其顺序；否则用 `commit.id`（同 ref / 无区间时） */
+function commitIdsFromCompare(data) {
+	const ids = (data.commits ?? []).map((c) => c.id).filter((id) => id !== "");
+	if (ids.length > 0) return ids;
+	const tip = data.commit?.id;
+	return tip != null && tip !== "" ? [tip] : [];
+}
 var GitlabAdapter = class {
 	base;
 	token;
@@ -199,39 +189,101 @@ var GitlabAdapter = class {
 	}
 	fileRawUrl(repoID, filePath, ref) {
 		const encodedPath = encodeURIComponent(filePath);
-		return `${this.base}/api/v4/projects/${encodeURIComponent(repoID)}/repository/files/${encodedPath}/raw?ref=${encodeURIComponent(ref)}`;
+		return `${this.base}/projects/${encodeURIComponent(repoID)}/repository/files/${encodedPath}/raw?ref=${encodeURIComponent(ref)}`;
 	}
 	async getRawFileText(repoID, filePath, ref) {
 		const { data } = await get(this.fileRawUrl(repoID, filePath, ref), { headers: this.headers() });
 		return typeof data === "string" ? data : "";
 	}
 	async getRepoInfo(repoID) {
-		const { data } = await get(`${this.base}/api/v4/projects/${encodeURIComponent(repoID)}`, { headers: this.headers() });
+		const { data } = await get(`${this.base}/projects/${encodeURIComponent(repoID)}`, { headers: this.headers() });
 		return {
 			id: String(data.id),
 			pathWithNamespace: data.path_with_namespace,
 			description: data.description ?? ""
 		};
 	}
+	async fetchComparePayload(repoID, base, head) {
+		const { data } = await get(`${this.base}/projects/${encodeURIComponent(repoID)}/repository/compare?from=${encodeURIComponent(base)}&to=${encodeURIComponent(head)}`, { headers: this.headers() });
+		return data;
+	}
+	async getCommitsBetween(repoID, base, head) {
+		return commitIdsFromCompare(await this.fetchComparePayload(repoID, base, head));
+	}
 	async getCompare(repoID, base, head) {
-		const { data } = await get(`${this.base}/api/v4/projects/${encodeURIComponent(repoID)}/repository/compare?from=${encodeURIComponent(base)}&to=${encodeURIComponent(head)}`, { headers: this.headers() });
+		const data = await this.fetchComparePayload(repoID, base, head);
+		const commitList = commitIdsFromCompare(data);
 		const diffRows = data.diffs ?? [];
 		const comparedPaths = diffRows.map(comparedRefsFromGitlabDiff).filter((entry) => entry != null).filter((entry) => pathMatchesLineDiffExtensions(entry.keyPath));
-		const lineBuckets = comparedPaths.length > 1500 ? /* @__PURE__ */ new Map() : await computeLineBucketsByRef(comparedPaths, base, head, (path, ref) => this.getRawFileText(repoID, path, ref));
-		const changedFiles = diffRows.map((d) => {
-			const path = comparedRefsFromGitlabDiff(d)?.keyPath ?? (d.new_path || d.old_path || "");
-			const buckets = lineBuckets.get(path);
-			return {
-				path,
-				additions: buckets?.additions ?? [],
-				deletions: buckets?.deletions ?? []
-			};
-		}).filter((item) => pathMatchesLineDiffExtensions(item.path));
+		let lineBuckets;
+		if (comparedPaths.length === 0 || comparedPaths.length > 1500) lineBuckets = /* @__PURE__ */ new Map();
+		else {
+			const basePaths = [...new Set(comparedPaths.map((p) => p.pathAtBase))];
+			const headPaths = [...new Set(comparedPaths.map((p) => p.pathAtHead))];
+			const [baseTexts, headTexts] = await Promise.all([this.getSourceFiles(repoID, base, basePaths), this.getSourceFiles(repoID, head, headPaths)]);
+			lineBuckets = await computeLineBucketsByRef(comparedPaths, base, head, (path, ref) => Promise.resolve(ref === base ? baseTexts.get(path) ?? "" : ref === head ? headTexts.get(path) ?? "" : ""));
+		}
 		return {
-			commitList: (data.commits ?? []).map((c) => c.id),
-			changedFiles
+			commitList,
+			changedFiles: diffRows.map((d) => {
+				const path = comparedRefsFromGitlabDiff(d)?.keyPath ?? (d.new_path || d.old_path || "");
+				const buckets = lineBuckets.get(path);
+				return {
+					path,
+					additions: buckets?.additions ?? [],
+					deletions: buckets?.deletions ?? []
+				};
+			}).filter((item) => pathMatchesLineDiffExtensions(item.path))
 		};
 	}
+	async getSourceFiles(repoID, sha, filePaths) {
+		const uniquePaths = [...new Set(filePaths)];
+		const wantAllFiles = uniquePaths.length === 0;
+		if (!wantAllFiles && uniquePaths.length <= SOURCE_FILES_ARCHIVE_THRESHOLD) {
+			const settled = await Promise.allSettled(uniquePaths.map((path) => this.getRawFileText(repoID, path, sha).then((text) => ({
+				path,
+				text
+			}))));
+			const result = /* @__PURE__ */ new Map();
+			for (const s of settled) if (s.status === "fulfilled") result.set(s.value.path, s.value.text);
+			return result;
+		}
+		const pid = encodeURIComponent(repoID);
+		const { data } = await get(`${this.base}/projects/${pid}/repository/archive.zip`, {
+			headers: this.headers(),
+			params: { sha },
+			responseType: "arraybuffer",
+			timeout: 6e4
+		});
+		const { default: AdmZip } = await import("adm-zip");
+		const { tmpNameSync } = await import("tmp");
+		const fs = await import("node:fs");
+		const tempZip = tmpNameSync({ postfix: ".zip" });
+		try {
+			const bin = data;
+			const buf = Buffer.isBuffer(bin) ? bin : bin instanceof ArrayBuffer ? Buffer.from(bin) : Buffer.from(bin);
+			fs.writeFileSync(tempZip, buf);
+			const entries = new AdmZip(tempZip).getEntries();
+			const targetSet = wantAllFiles ? null : new Set(uniquePaths);
+			const result = /* @__PURE__ */ new Map();
+			for (const entry of entries) {
+				if (entry.isDirectory) continue;
+				const parts = entry.entryName.split("/");
+				if (parts.length < 2) continue;
+				const relativePath = parts.slice(1).join("/");
+				if (targetSet && !targetSet.has(relativePath)) continue;
+				try {
+					const content = entry.getData().toString("utf8");
+					result.set(relativePath, content);
+				} catch {}
+			}
+			return result;
+		} finally {
+			try {
+				fs.unlinkSync(tempZip);
+			} catch {}
+		}
+	}
 };
 //#endregion
 //#region src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canyonjs/git-provider",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "description": "GitLab provider client with adapter architecture.",
   "keywords": [
     "api",
@@ -28,11 +28,20 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "diff": "^9.0.0"
+    "adm-zip": "^0.5.17",
+    "axios": "^1.16.0",
+    "diff": "^9.0.0",
+    "tmp": "^0.2.5"
   },
   "devDependencies": {
+    "@canyonjs/report": "^1.0.28",
+    "@types/adm-zip": "^0.5.8",
     "@types/node": "^25.5.0",
+    "@types/tmp": "^0.2.6",
     "@typescript/native-preview": "7.0.0-dev.20260505.1",
+    "@vitest/coverage-istanbul": "4.1.5",
+    "@vitest/ui": "4.1.5",
+    "dotenv": "^17.4.2",
     "oxfmt": "^0.48.0",
     "oxlint": "^1.63.0",
     "tsdown": "^0.21.7",
@@ -43,8 +52,9 @@
     "build": "tsdown",
     "dev": "tsdown --watch",
     "test": "vitest run",
+    "test:ui": "vitest --ui",
     "typecheck": "tsgo --noEmit",
-    "debug": "tsx src/debug.ts",
+    "debug": "tsx scripts/debug/index.ts",
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
     "fmt": "oxfmt",