bstack 0.0.0 → 0.2.0

package/package.json

@@ -1,37 +1,42 @@
 {
   "name": "bstack",
-  "version": "0.0.0",
+  "version": "0.2.0",
+  "packageManager": "pnpm@11.5.1",
   "description": "Create native GitHub stacked pull requests from a linear series of commits",
   "repository": {
     "type": "git",
-    "url": "https://github.com/wsehl/bstack.git"
+    "url": "git+https://github.com/wsehl/bstack.git"
   },
   "files": [
-    "src"
+    "dist/bstack.js"
   ],
   "bin": {
-    "bstack": "./src/cli.ts"
+    "bstack": "./dist/bstack.js"
   },
   "engines": {
-    "bun": ">=1.3.0"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "module",
   "scripts": {
-    "build": "bun build ./src/cli.ts --compile --outfile ./dist/bstack",
+    "build": "tsdown",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check .",
     "lint": "oxlint .",
-    "start": "bun run src/cli.ts",
-    "test": "bun test",
+    "prepack": "pnpm run build",
+    "prepublishOnly": "pnpm run type-check && pnpm test",
+    "start": "pnpm run build && node dist/bstack.js",
+    "test": "vitest run",
     "type-check": "tsc --noEmit"
   },
   "devDependencies": {
-    "@types/bun": "^1.4.0",
+    "@types/node": "^26.0.0",
     "oxfmt": "^0.64.0",
     "oxlint": "^1.79.0",
-    "typescript": "^7.0.2"
+    "tsdown": "^0.22.14",
+    "typescript": "^7.0.2",
+    "vitest": "^4.0.0"
   }
 }

package/src/checkout.ts

@@ -1,67 +0,0 @@
-import type { GitRepository } from "./git";
-import type { GitHubPlatform } from "./github";
-import type { Reporter } from "./reporter";
-
-export type CheckoutOptions = {
-  reference: string;
-  base: string | undefined;
-  remote: string | undefined;
-  sameBase: boolean;
-  reporter: Reporter;
-};
-
-export type CheckoutResult = {
-  headRef: string;
-  delegated: boolean;
-};
-
-export function checkoutStack(
-  repository: GitRepository,
-  github: GitHubPlatform,
-  options: CheckoutOptions,
-): CheckoutResult {
-  const { reporter } = options;
-  reporter.progress("Checking the repository and GitHub prerequisites");
-  repository.assertReady();
-  github.assertReady();
-
-  const remote = repository.resolveRemote(options.remote);
-  reporter.progress(`Looking up pull request ${options.reference}`);
-  const headRef = github.pullRequestHead(options.reference);
-  if (!headRef.startsWith("bstack/")) {
-    reporter.progress(
-      "This is not a bstack pull request; delegating to gh pr checkout",
-    );
-    github.checkoutPullRequest(options.reference);
-    return { headRef, delegated: true };
-  }
-
-  let currentBase: string | undefined;
-  let remoteBase: string | undefined;
-  if (options.sameBase) {
-    const base = options.base ?? github.defaultBranch();
-    reporter.progress(
-      `Checking that the merge base remains on ${remote}/${base}`,
-    );
-    remoteBase = repository.fetchBase(remote, base);
-    currentBase = repository.mergeBase("HEAD", remoteBase);
-  }
-
-  reporter.progress(`Fetching ${remote}/${headRef}`);
-  const target = repository.fetchRemoteBranch(remote, headRef);
-  if (currentBase && remoteBase) {
-    const targetBase = repository.mergeBase(target, remoteBase);
-    if (currentBase !== targetBase) {
-      throw new Error(
-        `Checkout would change the merge base from ${currentBase.slice(0, 8)} to ${targetBase.slice(0, 8)}`,
-      );
-    }
-  }
-
-  reporter.progress(`Checking out ${remote}/${headRef} in detached HEAD state`);
-  repository.checkout(target);
-  reporter.progress(
-    "Checkout complete; amend the commits and run bstack to publish updates",
-  );
-  return { headRef, delegated: false };
-}

package/src/cli.ts

@@ -1,100 +0,0 @@
-#!/usr/bin/env bun
-
-import { parseArgs } from "node:util";
-import { BunCommandRunner } from "./command";
-import { checkoutStack } from "./checkout";
-import { GitRepository } from "./git";
-import { GhPlatform } from "./github";
-import { ConsoleReporter } from "./reporter";
-import { syncStack } from "./sync";
-
-const help = `bstack - turn a linear commit series into native GitHub stacked PRs
-
-Usage:
-  bstack [sync] [options]
-  bstack checkout <PR-number-or-URL> [options]
-
-Options:
-  --base <branch>    Stack trunk; defaults to the GitHub default branch
-  --remote <name>    Git remote; defaults to remote.pushDefault or origin
-  --open             Create PRs ready for review instead of drafts
-  --dry-run          Inspect the stack without rewriting commits or pushing
-  --quiet            Hide progress logs; the final summary is still printed
-  --same-base        Refuse checkout if it would change the current merge base
-  -h, --help         Show this help
-`;
-
-function main(): void {
-  const { values, positionals } = parseArgs({
-    args: Bun.argv.slice(2),
-    allowPositionals: true,
-    options: {
-      base: { type: "string" },
-      remote: { type: "string" },
-      open: { type: "boolean", default: false },
-      "dry-run": { type: "boolean", default: false },
-      quiet: { type: "boolean", default: false },
-      "same-base": { type: "boolean", default: false },
-      help: { type: "boolean", short: "h", default: false },
-    },
-  });
-
-  if (values.help) {
-    process.stdout.write(help);
-    return;
-  }
-  const runner = new BunCommandRunner();
-  const cwd = process.cwd();
-  const repository = new GitRepository(cwd, runner);
-  const github = new GhPlatform(cwd, runner);
-  const reporter = new ConsoleReporter(!values.quiet);
-  const command = positionals[0] ?? "sync";
-
-  if (command === "checkout") {
-    const reference = positionals[1];
-    if (!reference || positionals.length > 2) {
-      throw new Error(`Usage: bstack checkout <PR-number-or-URL> [options]`);
-    }
-    const result = checkoutStack(repository, github, {
-      reference,
-      base: values.base,
-      remote: values.remote,
-      sameBase: values["same-base"],
-      reporter,
-    });
-    console.log(
-      result.delegated
-        ? `Checked out pull request ${reference}`
-        : `Checked out ${result.headRef} from pull request ${reference}`,
-    );
-    return;
-  }
-
-  if (command !== "sync" || positionals.length > 1) {
-    throw new Error(`Unknown command: ${positionals.join(" ")}\n\n${help}`);
-  }
-
-  const result = syncStack(repository, github, {
-    base: values.base,
-    remote: values.remote,
-    open: values.open,
-    dryRun: values["dry-run"],
-    reporter,
-  });
-
-  console.log(
-    `${values["dry-run"] ? "Would publish" : "Published"} ${result.changes.length} change${result.changes.length === 1 ? "" : "s"} against ${result.base}:`,
-  );
-  for (const change of result.changes) {
-    const destination = change.pullRequest ? ` ${change.pullRequest.url}` : "";
-    console.log(`  ${change.oid.slice(0, 8)}  ${change.subject}${destination}`);
-  }
-}
-
-try {
-  main();
-} catch (error) {
-  const message = error instanceof Error ? error.message : String(error);
-  console.error(`bstack: ${message}`);
-  process.exitCode = 1;
-}

package/src/command.ts

@@ -1,61 +0,0 @@
-export type CommandOptions = {
-  cwd: string;
-  stdin?: string;
-  env?: Record<string, string>;
-  allowFailure?: boolean;
-};
-
-export type CommandResult = {
-  stdout: string;
-  stderr: string;
-  exitCode: number;
-};
-
-export class CommandError extends Error {
-  constructor(
-    readonly command: readonly string[],
-    readonly result: CommandResult,
-  ) {
-    const detail = result.stderr.trim() || result.stdout.trim();
-    super(
-      `${command.join(" ")} failed with exit code ${result.exitCode}${detail ? `\n${detail}` : ""}`,
-    );
-  }
-}
-
-export interface CommandRunner {
-  run(command: readonly string[], options: CommandOptions): CommandResult;
-}
-
-export class BunCommandRunner implements CommandRunner {
-  run(command: readonly string[], options: CommandOptions): CommandResult {
-    const [executable, ...args] = command;
-    if (!executable) {
-      throw new Error("Cannot run an empty command");
-    }
-
-    const result = Bun.spawnSync([executable, ...args], {
-      cwd: options.cwd,
-      stdin:
-        options.stdin === undefined ? undefined : Buffer.from(options.stdin),
-      stdout: "pipe",
-      stderr: "pipe",
-      env:
-        options.env === undefined
-          ? process.env
-          : { ...process.env, ...options.env },
-    });
-
-    const commandResult = {
-      stdout: result.stdout.toString(),
-      stderr: result.stderr.toString(),
-      exitCode: result.exitCode,
-    };
-
-    if (commandResult.exitCode !== 0 && !options.allowFailure) {
-      throw new CommandError(command, commandResult);
-    }
-
-    return commandResult;
-  }
-}

package/src/git.ts

@@ -1,197 +0,0 @@
-import type { CommandRunner } from "./command";
-import {
-  addChangeId,
-  newChangeId,
-  parseRawCommit,
-  rewriteCommit,
-  splitCommitMessage,
-} from "./identity";
-import type { Change, Commit } from "./model";
-
-export class GitRepository {
-  constructor(
-    readonly cwd: string,
-    private readonly runner: CommandRunner,
-  ) {}
-
-  private git(
-    args: readonly string[],
-    options: { stdin?: string; allowFailure?: boolean } = {},
-  ) {
-    return this.runner.run(["git", ...args], { cwd: this.cwd, ...options });
-  }
-
-  assertReady(): void {
-    this.git(["rev-parse", "--show-toplevel"]);
-    const status = this.git(["status", "--porcelain"]).stdout;
-    if (status.trim()) {
-      throw new Error(
-        "The working tree must be clean before bstack rewrites or publishes commits",
-      );
-    }
-  }
-
-  currentBranch(): string {
-    return this.git(["symbolic-ref", "--quiet", "--short", "HEAD"], {
-      allowFailure: true,
-    }).stdout.trim();
-  }
-
-  remotes(): string[] {
-    return this.git(["remote"]).stdout.split("\n").filter(Boolean);
-  }
-
-  configuredPushRemote(): string | undefined {
-    const result = this.git(["config", "--get", "remote.pushDefault"], {
-      allowFailure: true,
-    });
-    return result.exitCode === 0
-      ? result.stdout.trim() || undefined
-      : undefined;
-  }
-
-  resolveRemote(requested?: string): string {
-    if (requested) {
-      if (!this.remotes().includes(requested)) {
-        throw new Error(`Git remote ${requested} does not exist`);
-      }
-      return requested;
-    }
-
-    const configured = this.configuredPushRemote();
-    if (configured) return configured;
-    const remotes = this.remotes();
-    if (remotes.length === 1) return remotes[0]!;
-    if (remotes.includes("origin")) return "origin";
-    throw new Error(
-      "Cannot choose a Git remote. Pass --remote or configure remote.pushDefault",
-    );
-  }
-
-  fetchBase(remote: string, base: string): string {
-    const destination = `refs/remotes/${remote}/${base}`;
-    this.git([
-      "fetch",
-      "--no-tags",
-      remote,
-      `refs/heads/${base}:${destination}`,
-    ]);
-    return destination;
-  }
-
-  fetchRemoteBranch(remote: string, branch: string): string {
-    const destination = `refs/remotes/${remote}/${branch}`;
-    this.git([
-      "fetch",
-      "--no-tags",
-      remote,
-      `+refs/heads/${branch}:${destination}`,
-    ]);
-    return destination;
-  }
-
-  checkout(ref: string): void {
-    this.git(["checkout", "--detach", ref]);
-  }
-
-  mergeBase(left: string, right: string): string {
-    return this.git(["merge-base", left, right]).stdout.trim();
-  }
-
-  commitsSince(baseOid: string): Commit[] {
-    const oids = this.git([
-      "rev-list",
-      "--reverse",
-      "--first-parent",
-      `${baseOid}..HEAD`,
-    ])
-      .stdout.split("\n")
-      .filter(Boolean);
-    return oids.map((oid) =>
-      parseRawCommit(oid, this.git(["cat-file", "commit", oid]).stdout),
-    );
-  }
-
-  ensureChangeIds(commits: readonly Commit[], dryRun: boolean): Change[] {
-    const assigned = commits.map((commit) => commit.changeId ?? newChangeId());
-    const needsRewrite = commits.some(
-      (commit) => commit.changeId === undefined,
-    );
-    let parent = commits[0]?.parent;
-    const rewrittenOids: string[] = [];
-
-    if (needsRewrite && !dryRun) {
-      for (const [index, commit] of commits.entries()) {
-        const changeId = assigned[index]!;
-        const message = commit.changeId
-          ? commit.message
-          : addChangeId(commit.message, changeId);
-        const raw = rewriteCommit(commit, parent!, message);
-        const oid = this.git(["hash-object", "-t", "commit", "-w", "--stdin"], {
-          stdin: raw,
-        }).stdout.trim();
-        rewrittenOids.push(oid);
-        parent = oid;
-      }
-
-      const oldHead = commits.at(-1)!.oid;
-      const newHead = rewrittenOids.at(-1)!;
-      this.git(["update-ref", "HEAD", newHead, oldHead]);
-    }
-
-    return commits.map((commit, index) => {
-      const id = assigned[index]!;
-      const oid = needsRewrite && !dryRun ? rewrittenOids[index]! : commit.oid;
-      const { subject, body } = splitCommitMessage(commit.message);
-      return { id, oid, subject, body, remoteBranch: `bstack/${id}` };
-    });
-  }
-
-  remoteBranchOids(
-    remote: string,
-    branches: readonly string[],
-  ): Map<string, string> {
-    if (branches.length === 0) return new Map();
-    const result = this.git([
-      "ls-remote",
-      "--heads",
-      remote,
-      ...branches.map((branch) => `refs/heads/${branch}`),
-    ]);
-    return new Map(
-      result.stdout
-        .split("\n")
-        .filter(Boolean)
-        .map((line) => {
-          const [oid, ref] = line.split(/\s+/, 2);
-          return [ref!.replace("refs/heads/", ""), oid!] as const;
-        }),
-    );
-  }
-
-  pushChanges(remote: string, changes: readonly Change[]): void {
-    const existing = this.remoteBranchOids(
-      remote,
-      changes.map((change) => change.remoteBranch),
-    );
-    const leases: string[] = [];
-    const refspecs: string[] = [];
-    for (const change of changes) {
-      const expected = existing.get(change.remoteBranch) ?? "";
-      leases.push(
-        `--force-with-lease=refs/heads/${change.remoteBranch}:${expected}`,
-      );
-      refspecs.push(`${change.oid}:refs/heads/${change.remoteBranch}`);
-    }
-    this.git(["push", "--atomic", ...leases, remote, ...refspecs]);
-  }
-
-  statePath(): string {
-    return this.git([
-      "rev-parse",
-      "--path-format=absolute",
-      "--git-path",
-      "bstack/state.json",
-    ]).stdout.trim();
-  }
-}

package/src/github.ts

@@ -1,187 +0,0 @@
-import type { CommandRunner } from "./command";
-import type { Change, PullRequest } from "./model";
-
-type PullRequestJson = {
-  number: number;
-  url: string;
-  state: string;
-  title: string;
-  body: string;
-  isDraft: boolean;
-};
-
-type StackJson = { number: number };
-
-export interface GitHubPlatform {
-  assertReady(): void;
-  defaultBranch(): string;
-  pullRequestForBranch(branch: string): PullRequest | undefined;
-  pullRequest(number: number): PullRequest;
-  createPullRequest(change: Change, base: string, open: boolean): PullRequest;
-  linkStack(
-    branches: readonly string[],
-    base: string,
-    remote: string,
-    open: boolean,
-  ): void;
-  appendToStack(
-    stackNumber: number,
-    branches: readonly string[],
-    remote: string,
-    open: boolean,
-  ): void;
-  editPullRequest(pr: PullRequest, change: Change): void;
-  stackNumberForPullRequest(prNumber: number): number | undefined;
-  pullRequestHead(reference: string): string;
-  checkoutPullRequest(reference: string): void;
-}
-
-export class GhPlatform implements GitHubPlatform {
-  constructor(
-    private readonly cwd: string,
-    private readonly runner: CommandRunner,
-  ) {}
-
-  private gh(args: readonly string[]) {
-    return this.runner.run(["gh", ...args], { cwd: this.cwd });
-  }
-
-  assertReady(): void {
-    this.gh(["auth", "status", "--active"]);
-    this.gh(["stack", "--version"]);
-  }
-
-  defaultBranch(): string {
-    return this.gh([
-      "repo",
-      "view",
-      "--json",
-      "defaultBranchRef",
-      "--jq",
-      ".defaultBranchRef.name",
-    ]).stdout.trim();
-  }
-
-  pullRequestForBranch(branch: string): PullRequest | undefined {
-    const raw = this.gh([
-      "pr",
-      "list",
-      "--head",
-      branch,
-      "--state",
-      "all",
-      "--limit",
-      "20",
-      "--json",
-      "number,url,state,title,body,isDraft",
-    ]).stdout;
-    const candidates = JSON.parse(raw) as PullRequestJson[];
-    const selected =
-      candidates.find((pr) => pr.state === "OPEN") ??
-      candidates.find((pr) => pr.state === "MERGED");
-    return selected ? normalizePullRequest(selected) : undefined;
-  }
-
-  pullRequest(number: number): PullRequest {
-    const raw = this.gh([
-      "pr",
-      "view",
-      String(number),
-      "--json",
-      "number,url,state,title,body,isDraft",
-    ]).stdout;
-    return normalizePullRequest(JSON.parse(raw) as PullRequestJson);
-  }
-
-  createPullRequest(change: Change, base: string, open: boolean): PullRequest {
-    const args = [
-      "pr",
-      "create",
-      "--base",
-      base,
-      "--head",
-      change.remoteBranch,
-      "--title",
-      change.subject,
-      "--body",
-      change.body,
-    ];
-    if (!open) args.push("--draft");
-    this.gh(args);
-    const created = this.pullRequestForBranch(change.remoteBranch);
-    if (!created)
-      throw new Error(
-        `GitHub did not return the PR created for ${change.remoteBranch}`,
-      );
-    return created;
-  }
-
-  linkStack(
-    branches: readonly string[],
-    base: string,
-    remote: string,
-    open: boolean,
-  ): void {
-    const args = ["stack", "link", "--base", base, "--remote", remote];
-    if (open) args.push("--open");
-    args.push(...branches);
-    this.gh(args);
-  }
-
-  appendToStack(
-    stackNumber: number,
-    branches: readonly string[],
-    remote: string,
-    open: boolean,
-  ): void {
-    const args = ["stack", "link", "--remote", remote];
-    if (open) args.push("--open");
-    args.push(String(stackNumber), ...branches);
-    this.gh(args);
-  }
-
-  editPullRequest(pr: PullRequest, change: Change): void {
-    if (pr.title === change.subject && pr.body === change.body) return;
-    this.gh([
-      "pr",
-      "edit",
-      String(pr.number),
-      "--title",
-      change.subject,
-      "--body",
-      change.body,
-    ]);
-  }
-
-  stackNumberForPullRequest(prNumber: number): number | undefined {
-    const raw = this.gh([
-      "api",
-      `repos/{owner}/{repo}/stacks?pull_request=${prNumber}`,
-    ]).stdout;
-    const stacks = JSON.parse(raw) as StackJson[];
-    return stacks[0]?.number;
-  }
-
-  pullRequestHead(reference: string): string {
-    return this.gh([
-      "pr",
-      "view",
-      reference,
-      "--json",
-      "headRefName",
-      "--jq",
-      ".headRefName",
-    ]).stdout.trim();
-  }
-
-  checkoutPullRequest(reference: string): void {
-    this.gh(["pr", "checkout", reference]);
-  }
-}
-
-function normalizePullRequest(pr: PullRequestJson): PullRequest {
-  if (pr.state !== "OPEN" && pr.state !== "CLOSED" && pr.state !== "MERGED") {
-    throw new Error(`GitHub returned an unknown PR state: ${pr.state}`);
-  }
-  return { ...pr, state: pr.state };
-}