feat: 当分支不存在时支持跳过并继续构建索引

Author: H-Sofie

dist/core/actions/action-runner.d.ts

@@ -1,4 +1,9 @@
+import type { SimpleGit } from 'simple-git';
 import type { ParsedActionInputs } from './input.js';
+export declare class BranchNotFoundError extends Error {
+    readonly branch: string;
+    constructor(branch: string);
+}
 export interface ActionLogger {
     info(message: string): void;
     warn(message: string): void;
@@ -20,5 +25,9 @@ export interface GitHubActionResult {
     readonly pushed: boolean;
     readonly indexBranchExisted: boolean;
 }
+export declare function resolveBranchCommit(git: SimpleGit, branch: string, remote: string): Promise<{
+    commit: string;
+    existsOnRemote: boolean;
+}>;
 export declare function runGitHubAction(options: RunGitHubActionOptions): Promise<GitHubActionResult>;
 //# sourceMappingURL=action-runner.d.ts.map

dist/core/actions/action-runner.d.ts.map

@@ -13,6 +13,16 @@ import type {
 } from '../../types/index.js';
 import type { ParsedActionInputs } from './input.js';
 
+export class BranchNotFoundError extends Error {
+  readonly branch: string;
+
+  constructor(branch: string) {
+    super(`分支 ${branch} 在仓库中不存在，无法生成索引。`);
+    this.name = 'BranchNotFoundError';
+    this.branch = branch;
+  }
+}
+
 export interface ActionLogger {
   info(message: string): void;
   warn(message: string): void;
@@ -142,7 +152,7 @@ function findMatchingIndex(record: ManifestBranchRecord | undefined, artifact: B
   );
 }
 
-async function resolveBranchCommit(
+export async function resolveBranchCommit(
   git: SimpleGit,
   branch: string,
   remote: string,
@@ -153,8 +163,12 @@ async function resolveBranchCommit(
     const commit = (await git.revparse([remoteRef])).trim();
     return { commit, existsOnRemote: true };
   } catch {
-    const commit = (await git.revparse([branch])).trim();
-    return { commit, existsOnRemote: false };
+    try {
+      const commit = (await git.revparse([branch])).trim();
+      return { commit, existsOnRemote: false };
+    } catch {
+      throw new BranchNotFoundError(branch);
+    }
   }
 }
 
@@ -312,9 +326,19 @@ export async function runGitHubAction(options: RunGitHubActionOptions): Promise<
   await baseGit.fetch([inputs.remote, '--prune']).catch(() => undefined);
 
   const artifacts: BranchIndexArtifact[] = [];
+  const missingBranches: string[] = [];
   for (const branch of inputs.branches) {
-    const artifact = await generateBranchArtifact(baseGit, inputs, branch, logger);
-    artifacts.push(artifact);
+    try {
+      const artifact = await generateBranchArtifact(baseGit, inputs, branch, logger);
+      artifacts.push(artifact);
+    } catch (error) {
+      if (error instanceof BranchNotFoundError) {
+        logger.warn(`分支 ${branch} 不存在，跳过索引生成。`);
+        missingBranches.push(branch);
+        continue;
+      }
+      throw error;
+    }
   }
 
   const indexWorktree = await prepareIndexWorktree(baseGit, inputs, logger);
@@ -380,7 +404,10 @@ export async function runGitHubAction(options: RunGitHubActionOptions): Promise<
     }
 
     const updatedBranches = prepared.filter((artifact) => artifact.shouldUpdate).map((artifact) => artifact.branch);
-    const skippedBranches = prepared.filter((artifact) => !artifact.shouldUpdate).map((artifact) => artifact.branch);
+    const skippedBranches = [
+      ...prepared.filter((artifact) => !artifact.shouldUpdate).map((artifact) => artifact.branch),
+      ...missingBranches,
+    ];
 
     return {
       manifestPath,

dist/core/actions/action-runner.js

@@ -0,0 +1,19 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { SimpleGit } from 'simple-git';
+
+import { BranchNotFoundError, resolveBranchCommit } from '../src/core/actions/action-runner.js';
+
+describe('resolveBranchCommit', () => {
+  it('当远程与本地均不存在分支时抛出 BranchNotFoundError', async () => {
+    const revparse = vi.fn()
+      .mockRejectedValueOnce(new Error('missing remote'))
+      .mockRejectedValueOnce(new Error('missing local'));
+
+    const git = { revparse } as unknown as SimpleGit;
+
+    await expect(resolveBranchCommit(git, 'feature/missing', 'origin')).rejects.toBeInstanceOf(BranchNotFoundError);
+    expect(revparse).toHaveBeenCalledTimes(2);
+    expect(revparse).toHaveBeenNthCalledWith(1, ['origin/feature/missing']);
+    expect(revparse).toHaveBeenNthCalledWith(2, ['feature/missing']);
+  });
+});