ya-git-jira 2.0.0 → 2.1.1

package/dist/index.js

@@ -717,6 +717,10 @@ async function confluenceApi(endpoint) {
   };
   let request = new Request(uri, options);
   const response = await fetch(request);
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`Confluence API ${endpoint} failed (${response.status}): ${text}`);
+  }
   let link = getNextLink(response.headers.get("Link"));
   const body = await response.json();
   if (!body.results) {
@@ -777,6 +781,10 @@ async function confluenceSearch(cql) {
   while (uri) {
     const request = new Request(uri, options);
     const response = await fetch(request);
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(`Confluence search failed (${response.status}): ${text}`);
+    }
     const body = await response.json();
     if (body.results) {
       allResults = allResults.concat(body.results);
@@ -805,6 +813,10 @@ async function confluenceApiV1(endpoint) {
   };
   const request = new Request(uri, options);
   const response = await fetch(request);
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`Confluence API v1 ${endpoint} failed (${response.status}): ${text}`);
+  }
   const result = await response.json();
   return result;
 }
@@ -817,7 +829,7 @@ async function getGitlabConfig() {
   const host = await hostP || "gitlab.com";
   const user = await gitEmailP2 || await gitlabEmailP;
   if (!user)
-    throw new Error("Neither user.email nor gitlab.email in git config");
+    throw new Error("Neither user.email nor gitlab.user in git config");
   const token = await tokenP;
   if (!token)
     throw new Error("gitlab.token not in git config");
@@ -854,6 +866,10 @@ async function gitlabApi(endpoint) {
   };
   let request = new Request(uri, options);
   const response = await fetch(request);
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`GitLab API ${endpoint} failed (${response.status}): ${text}`);
+  }
   let link = getNextLink2(response.headers.get("Link"));
   let partial = await response.json();
   let result = partial;
@@ -1016,6 +1032,16 @@ function isMain(self) {
   const result = argv1Base === selfBase;
   return result;
 }
+async function runMain(self, create) {
+  if (!isMain(self))
+    return;
+  try {
+    await create().parseAsync(Bun.argv);
+  } catch (err) {
+    console.error(`error: ${err instanceof Error ? err.message : String(err)}`);
+    process.exit(1);
+  }
+}
 // lib/jira.ts
 var gitEmailP3 = getConfig("user.email");
 var jiraEmailP2 = getConfig("jira.user");
@@ -1052,6 +1078,10 @@ async function jiraApi(endpoint) {
   };
   const request = new Request(uri, options);
   const response = await fetch(request);
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`Jira API ${endpoint} failed (${response.status}): ${text}`);
+  }
   const result = await response.json();
   return result;
 }
@@ -1072,6 +1102,7 @@ async function myUnresolvedIssues() {
 export {
   whoami,
   spawn,
+  runMain,
   projectScopedGetText,
   projectScopedGet,
   myUnresolvedIssues,

package/install-docker-gitj.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+IMAGE_NAME="gitj"
+WRAPPER_NAME="gitj"
+
+# --- Find a writable bin directory on PATH under $HOME ---
+
+find_bin_dir() {
+    # Prefer ~/.local/bin if it exists and is on PATH
+    if [ -d "$HOME/.local/bin" ]; then
+        case ":$PATH:" in
+            *":$HOME/.local/bin:"*) echo "$HOME/.local/bin"; return 0 ;;
+        esac
+    fi
+
+    # Search PATH for any directory under $HOME
+    IFS=: read -ra path_dirs <<< "$PATH"
+    for dir in "${path_dirs[@]}"; do
+        case "$dir" in
+            "$HOME"/*)
+                if [ -d "$dir" ] && [ -w "$dir" ]; then
+                    echo "$dir"
+                    return 0
+                fi
+                ;;
+        esac
+    done
+
+    # Fall back to creating ~/.local/bin
+    echo ""
+    return 1
+}
+
+# --- Main ---
+
+echo "Building Docker image '$IMAGE_NAME'..."
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+docker build -t "$IMAGE_NAME" "$SCRIPT_DIR"
+echo ""
+
+BIN_DIR=$(find_bin_dir) || true
+
+if [ -z "$BIN_DIR" ]; then
+    BIN_DIR="$HOME/.local/bin"
+    echo "No bin directory found under \$HOME on your PATH."
+    echo "Creating $BIN_DIR ..."
+    mkdir -p "$BIN_DIR"
+    echo ""
+    echo "WARNING: $BIN_DIR is not on your PATH."
+    echo "Add this to your shell profile (~/.bashrc, ~/.zshrc, etc.):"
+    echo ""
+    echo "    export PATH=\"\$HOME/.local/bin:\$PATH\""
+    echo ""
+fi
+
+WRAPPER="$BIN_DIR/$WRAPPER_NAME"
+
+cat > "$WRAPPER" << 'SCRIPT'
+#!/usr/bin/env bash
+exec docker run --rm \
+  --user "$(id -u):$(id -g)" \
+  -e HOME="$HOME" \
+  -v "$HOME:$HOME" \
+  -v "$(pwd):$(pwd)" -w "$(pwd)" \
+  gitj "$@"
+SCRIPT
+
+chmod +x "$WRAPPER"
+
+echo "Installed $WRAPPER"
+echo ""
+echo "Usage:"
+echo "  gitj --version"
+echo "  gitj jira start BUG-42"
+echo "  gitj lab merge active"
+echo "  gitj --help-all"

package/lib/api.ts

@@ -82,6 +82,18 @@ export async function apiRequest(
 
     const request = new Request(url, fetchOptions)
     const response = await fetch(request)
+
+    if (!response.ok) {
+        const text = await response.text()
+        let body: JSONValue
+        try {
+            body = JSON.parse(text) as JSONValue
+        } catch {
+            throw new Error(`${serviceName} API ${method} ${endpoint} failed (${response.status}): ${text}`)
+        }
+        return { status: response.status, headers: response.headers, body }
+    }
+
     const body = await response.json() as JSONValue
 
     return {
@@ -138,7 +150,13 @@ export async function apiPaginate(
         lastHeaders = response.headers
 
         if (!response.ok) {
-            const body = await response.json() as JSONValue
+            const text = await response.text()
+            let body: JSONValue
+            try {
+                body = JSON.parse(text) as JSONValue
+            } catch {
+                throw new Error(`${serviceName} API paginate ${endpoint} failed (${response.status}): ${text}`)
+            }
             return { status: response.status, headers: response.headers, body }
         }
 

package/lib/confluence/api.ts

@@ -30,6 +30,10 @@ export async function confluenceApi(endpoint: string): Promise<JSONValue> {
     }
     let request = new Request(uri, options)
     const response = await fetch(request)
+    if (!response.ok) {
+        const text = await response.text()
+        throw new Error(`Confluence API ${endpoint} failed (${response.status}): ${text}`)
+    }
     let link = getNextLink(response.headers.get('Link'))
     const body = await response.json() as JSONValue & { results?: Array<JSONValue> }
     if (!body.results) {
@@ -94,6 +98,10 @@ export async function confluenceSearch(cql: string): Promise<JSONValue> {
     while (uri) {
         const request = new Request(uri, options)
         const response = await fetch(request)
+        if (!response.ok) {
+            const text = await response.text()
+            throw new Error(`Confluence search failed (${response.status}): ${text}`)
+        }
         const body = await response.json() as JSONValue & {
             results?: Array<JSONValue>
             _links?: { next?: string }
@@ -127,6 +135,10 @@ export async function confluenceApiV1(endpoint: string): Promise<JSONValue> {
     }
     const request = new Request(uri, options)
     const response = await fetch(request)
+    if (!response.ok) {
+        const text = await response.text()
+        throw new Error(`Confluence API v1 ${endpoint} failed (${response.status}): ${text}`)
+    }
     const result = await response.json()
     return result
 }

package/lib/confluence/config.ts

@@ -15,11 +15,11 @@ const confluenceTokenP = getConfig('confluence.token', { expectQuiet: true })
 
 export async function getConfluenceConfig(): Promise<ConfluenceConfig> {
     const host = await confluenceHostP || await jiraHostP
-    if (!host) throw new Error('confluence.host or jira.host not in git config')
+    if (!host) throw new Error('confluence.host or jira.host not in git config (see: gitj confluence --help)')
     const user = await confluenceEmailP || await jiraEmailP || await gitEmailP
-    if (!user) throw new Error('confluence.user, jira.user, or user.email not in git config')
+    if (!user) throw new Error('confluence.user, jira.user, or user.email not in git config (see: gitj confluence --help)')
     const pat = await confluenceTokenP || await jiraTokenP
-    if (!pat) throw new Error('confluence.token or jira.token not in git config')
+    if (!pat) throw new Error('confluence.token or jira.token not in git config (see: gitj confluence --help)')
     const token = Buffer.from(`${user}:${pat}`).toString('base64')
     return { host, token }
 }

package/lib/gitlab/api.ts

@@ -31,6 +31,10 @@ export async function gitlabApi(endpoint: string): Promise<JSONValue> {
     }
     let request = new Request(uri, options)
     const response = await fetch(request)
+    if (!response.ok) {
+        const text = await response.text()
+        throw new Error(`GitLab API ${endpoint} failed (${response.status}): ${text}`)
+    }
     let link = getNextLink(response.headers.get('Link'))
     let partial = (await response.json()) as Array<JSONValue>
     let result: Array<JSONValue> = partial

package/lib/gitlab/config.ts

@@ -14,8 +14,8 @@ const tokenP = getConfig("gitlab.token")
 export async function getGitlabConfig(): Promise<GitlabConfig> {
     const host = await hostP || 'gitlab.com'
     const user = await gitEmailP || await gitlabEmailP
-    if (!user) throw new Error("Neither user.email nor gitlab.email in git config")
+    if (!user) throw new Error("Neither user.email nor gitlab.user in git config (see: gitj lab --help)")
     const token = await tokenP
-    if (!token) throw new Error("gitlab.token not in git config")
+    if (!token) throw new Error("gitlab.token not in git config (see: gitj lab --help)")
     return { host, user, token }
 }

package/lib/is_main.ts

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import type { Command } from 'commander'
 
 function justBase(filename: string): string {
     const ext = path.extname(filename)
@@ -22,3 +23,13 @@ export function isMain(self: string): boolean {
     // }
     return result
 }
+
+export async function runMain(self: string, create: () => Command): Promise<void> {
+    if (!isMain(self)) return
+    try {
+        await create().parseAsync(Bun.argv)
+    } catch (err) {
+        console.error(`error: ${err instanceof Error ? err.message : String(err)}`)
+        process.exit(1)
+    }
+}

package/lib/jira.ts

@@ -21,11 +21,11 @@ const tokenP = getConfig("jira.token")
 
 export async function getJiraConfig(): Promise<JiraConfig> {
     const host = await hostP
-    if (!host) throw new Error("jira.host not in git config")
+    if (!host) throw new Error("jira.host not in git config (see: gitj jira --help)")
     const user = await jiraEmailP || await gitEmailP
-    if (!user) throw new Error("jira.user or user.email not in git config")
+    if (!user) throw new Error("jira.user or user.email not in git config (see: gitj jira --help)")
     const pat = await tokenP
-    if (!pat) throw new Error("jira.token not in git config")
+    if (!pat) throw new Error("jira.token not in git config (see: gitj jira --help)")
     const token = Buffer.from(`${user}:${pat}`).toString('base64')
     return { host, token }
 }
@@ -48,6 +48,10 @@ export async function jiraApi(endpoint: string): Promise<JSONValue> {
     }
     const request = new Request(uri, options)
     const response = await fetch(request)
+    if (!response.ok) {
+        const text = await response.text()
+        throw new Error(`Jira API ${endpoint} failed (${response.status}): ${text}`)
+    }
     const result = await response.json()
     return result;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ya-git-jira",
   "description": "git extensions for Jira integration. Assumes bun is installed.",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "module": "dist/index.js",
   "type": "module",
   "bin": {