@solaqua/gji 0.1.0-beta.4 → 0.1.0-beta.6

package/dist/cli.js

@@ -77,6 +77,7 @@ function registerCommands(program) {
     program
         .command('root')
         .description('print the main repository root path')
+        .option('--print', 'print the resolved repository root path explicitly')
         .action(notImplemented('root'));
     program
         .command('status')
@@ -165,9 +166,10 @@ function attachCommandActions(program, options) {
     });
     program.commands
         .find((command) => command.name() === 'root')
-        ?.action(async () => {
+        ?.action(async (commandOptions) => {
         const exitCode = await runRootCommand({
             cwd: options.cwd,
+            print: commandOptions.print,
             stdout: options.stdout,
         });
         if (exitCode !== 0) {

package/dist/go.d.ts

@@ -7,7 +7,6 @@ export interface GoCommandOptions {
     stdout: (chunk: string) => void;
 }
 export interface GoCommandDependencies {
-    promptForCapturedOutputWorktree: (worktrees: WorktreeEntry[]) => Promise<string | null>;
     promptForWorktree: (worktrees: WorktreeEntry[]) => Promise<string | null>;
 }
 export declare function createGoCommand(dependencies?: Partial<GoCommandDependencies>): (options: GoCommandOptions) => Promise<number>;

package/dist/go.js

@@ -1,10 +1,8 @@
-import { SelectPrompt, isCancel as isCoreCancel } from '@clack/core';
+import { writeFile } from 'node:fs/promises';
 import { isCancel, select } from '@clack/prompts';
 import { listWorktrees } from './repo.js';
-const GO_TTY_PROMPT_ENV = 'GJI_GO_TTY_PROMPT';
-const GO_TTY_TARGET_PREFIX = '__GJI_TARGET__:';
+const GO_OUTPUT_FILE_ENV = 'GJI_GO_OUTPUT_FILE';
 export function createGoCommand(dependencies = {}) {
-    const promptForCapturedOutput = dependencies.promptForCapturedOutputWorktree ?? promptForCapturedOutputWorktree;
     const prompt = dependencies.promptForWorktree ?? promptForWorktree;
     return async function runGoCommand(options) {
         const worktrees = await listWorktrees(options.cwd);
@@ -17,17 +15,16 @@ export function createGoCommand(dependencies = {}) {
             options.stdout(`${worktree.path}\n`);
             return 0;
         }
-        const chosenPath = shouldUseCapturedOutputPrompt(options)
-            ? await promptForCapturedOutput(worktrees)
-            : await prompt(worktrees);
+        const chosenPath = await prompt(worktrees);
         if (!chosenPath) {
             options.stderr('Aborted\n');
             return 1;
         }
-        const output = shouldUseCapturedOutputPrompt(options)
-            ? `${GO_TTY_TARGET_PREFIX}${chosenPath}\n`
-            : `${chosenPath}\n`;
-        options.stdout(output);
+        if (process.env[GO_OUTPUT_FILE_ENV]) {
+            await writeFile(process.env[GO_OUTPUT_FILE_ENV], `${chosenPath}\n`, 'utf8');
+            return 0;
+        }
+        options.stdout(`${chosenPath}\n`);
         return 0;
     };
 }
@@ -46,45 +43,3 @@ async function promptForWorktree(worktrees) {
     }
     return choice;
 }
-async function promptForCapturedOutputWorktree(worktrees) {
-    const options = worktrees.map((worktree) => ({
-        value: worktree.path,
-        label: worktree.branch ?? '(detached)',
-        hint: worktree.path,
-    }));
-    const prompt = new SelectPrompt({
-        input: process.stdin,
-        options,
-        output: process.stderr,
-        render() {
-            const lines = ['Choose a worktree'];
-            switch (this.state) {
-                case 'submit': {
-                    const selected = this.options[this.cursor];
-                    lines.push(`> ${selected.label} (${selected.hint})`);
-                    break;
-                }
-                case 'cancel':
-                    lines.push('> canceled');
-                    break;
-                default:
-                    lines.push(...this.options.map((option, index) => {
-                        const prefix = index === this.cursor ? '> ' : '  ';
-                        return `${prefix}${option.label} (${option.hint})`;
-                    }));
-                    break;
-            }
-            return `${lines.join('\n')}\n`;
-        },
-    });
-    const choice = await prompt.prompt();
-    if (isCoreCancel(choice)) {
-        return null;
-    }
-    return choice;
-}
-function shouldUseCapturedOutputPrompt(options) {
-    return (!options.branch &&
-        options.print === true &&
-        process.env[GO_TTY_PROMPT_ENV] === '1');
-}

package/dist/init.js

@@ -34,8 +34,37 @@ function gji --wraps gji --description 'gji shell integration'
             return $status
         end
 
-        set -l target (env GJI_GO_TTY_PROMPT=1 command gji go --print $argv)
-        or return $status
+        set -l output_file (mktemp -t gji-go.XXXXXX)
+        or return 1
+        env GJI_GO_OUTPUT_FILE=$output_file command gji go $argv
+        or begin
+            set -l status_code $status
+            rm -f $output_file
+            return $status_code
+        end
+        set -l target (cat $output_file)
+        rm -f $output_file
+        cd $target
+        return $status
+    end
+
+    if test (count $argv) -gt 0; and test $argv[1] = root
+        set -e argv[1]
+        if test (count $argv) -gt 0; and test $argv[1] = --print
+            command gji root $argv
+            return $status
+        end
+
+        set -l output_file (mktemp -t gji-root.XXXXXX)
+        or return 1
+        env GJI_ROOT_OUTPUT_FILE=$output_file command gji root $argv
+        or begin
+            set -l status_code $status
+            rm -f $output_file
+            return $status_code
+        end
+        set -l target (cat $output_file)
+        rm -f $output_file
         cd $target
         return $status
     end
@@ -56,9 +85,28 @@ gji() {
     fi
 
     local target
-    local output
-    output="$(GJI_GO_TTY_PROMPT=1 command gji go --print "$@")" || return $?
-    target="\${output##*__GJI_TARGET__:}"
+    local output_file
+    output_file="$(mktemp -t gji-go.XXXXXX)" || return 1
+    GJI_GO_OUTPUT_FILE="$output_file" command gji go "$@" || { local status=$?; rm -f "$output_file"; return $status; }
+    target="$(cat "$output_file")"
+    rm -f "$output_file"
+    cd "$target" || return $?
+    return 0
+  fi
+
+  if [ "$1" = "root" ]; then
+    shift
+    if [ "\${1:-}" = "--print" ]; then
+      command gji root "$@"
+      return $?
+    fi
+
+    local target
+    local output_file
+    output_file="$(mktemp -t gji-root.XXXXXX)" || return 1
+    GJI_ROOT_OUTPUT_FILE="$output_file" command gji root "$@" || { local status=$?; rm -f "$output_file"; return $status; }
+    target="$(cat "$output_file")"
+    rm -f "$output_file"
     cd "$target" || return $?
     return 0
   fi

package/dist/root.d.ts

@@ -1,5 +1,6 @@
 export interface RootCommandOptions {
     cwd: string;
+    print?: boolean;
     stdout: (chunk: string) => void;
 }
 export declare function runRootCommand(options: RootCommandOptions): Promise<number>;

package/dist/root.js

@@ -1,6 +1,13 @@
+import { writeFile } from 'node:fs/promises';
 import { detectRepository } from './repo.js';
+const ROOT_OUTPUT_FILE_ENV = 'GJI_ROOT_OUTPUT_FILE';
 export async function runRootCommand(options) {
     const repository = await detectRepository(options.cwd);
-    options.stdout(`${repository.repoRoot}\n`);
+    const output = `${repository.repoRoot}\n`;
+    if (!options.print && process.env[ROOT_OUTPUT_FILE_ENV]) {
+        await writeFile(process.env[ROOT_OUTPUT_FILE_ENV], output, 'utf8');
+        return 0;
+    }
+    options.stdout(output);
     return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solaqua/gji",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.6",
   "description": "Git worktree CLI for fast context switching.",
   "license": "MIT",
   "author": "sjquant",