fix(setup): preserve hook file paths in monorepos

Author: chenjiahan

packages/rstack/src/setup/hooks.ts

@@ -54,6 +54,21 @@ if ! command -v node >/dev/null 2>&1 && [ -x "$rs_node_fallback" ]; then
   PATH="\${PATH:+$PATH:}\${rs_node_fallback%/*}"
 fi
 
+# Keep message file paths valid after changing to the owning project.
+case "$rs_name" in
+  *-msg)
+    [ -n "\${1-}" ] || exit 1
+    case "$1" in
+      /*|[A-Za-z]:/*) ;;
+      *)
+        rs_file=$1
+        shift
+        set -- "$rs_root/$rs_file" "$@"
+        ;;
+    esac
+    ;;
+esac
+
 cd "$rs_root/$rs_project_path" || exit 1
 export PATH="node_modules/.bin\${PATH:+:$PATH}"
 

packages/rstack/tests/setup/helpers.ts

@@ -70,6 +70,9 @@ export const writeInit = (cwd: string, content: string): void => {
 export const runHook = (cwd: string, value?: string): SpawnSyncReturns<string> =>
   git(cwd, ['hook', 'run', 'pre-commit'], hookEnv(cwd, value));
 
+export const runGitHook = (cwd: string, name: string, args: string[]): SpawnSyncReturns<string> =>
+  git(cwd, ['hook', 'run', name, '--', ...args], hookEnv(cwd));
+
 export const withRepository = (callback: (cwd: string) => void): void =>
   withDirectory((cwd) => {
     const globalConfig = process.env.GIT_CONFIG_GLOBAL;

packages/rstack/tests/setup/runtime.test.ts

@@ -2,7 +2,7 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'n
 import path from 'node:path';
 import { expect, test } from 'rstack/test';
 import { installHooks } from '../../src/setup/install.ts';
-import { runHook, withRepository, writeHook, writeInit } from './helpers.ts';
+import { runGitHook, runHook, withRepository, writeHook, writeInit } from './helpers.ts';
 
 test('loads user init and project binaries', () => {
   withRepository((cwd) => {
@@ -35,6 +35,26 @@ rstack-hook-command
   });
 });
 
+test('preserves file arguments for hooks owned by a nested project', () => {
+  withRepository((cwd) => {
+    const projectDirectory = path.join(cwd, 'frontend');
+    const messagePath = '.git/COMMIT_EDITMSG';
+    mkdirSync(projectDirectory);
+    writeFileSync(path.join(cwd, messagePath), 'commit message\n');
+
+    expect(installHooks({ cwd: projectDirectory }).status).toBe('installed');
+
+    for (const name of ['applypatch-msg', 'commit-msg', 'prepare-commit-msg']) {
+      writeFileSync(path.join(cwd, '.rstack', 'hooks', name), 'cat "$1"\n');
+
+      expect(runGitHook(cwd, name, [messagePath])).toMatchObject({
+        status: 0,
+        stderr: 'commit message\n',
+      });
+    }
+  });
+});
+
 test('skips user hooks when disabled by the environment or init', () => {
   withRepository((cwd) => {
     writeHook(cwd, 'echo ran >> hook-ran\n');

scripts/dictionary.txt

@@ -3,7 +3,9 @@ applypatch
 cdpath
 clippy
 dirents
+editmsg
 errexit
+esac
 extglob
 fnames
 huskyrc