ya-git-jira 1.3.0 → 1.5.0

package/bin/git-lab-project.ts

@@ -0,0 +1,28 @@
+#!/usr/bin/env bun
+
+import { Command } from 'commander'
+import { getPackageVersion } from '../lib/package'
+import { isMain } from '../lib/is_main'
+import list from './git-lab-project-list'
+import whereami from './git-lab-project-whereami'
+const version = await getPackageVersion()
+
+export function create(): Command {
+    const program: Command = new Command()
+    program
+        .version(version)
+        .name('projects')
+        .description('Commands for working with GitLab projects')
+        .addCommand(list())
+        .addCommand(whereami())
+        .action(() => {
+            program.help()
+        })
+    return program
+}
+
+export default create
+
+if (isMain('git-lab-project')) {
+    await create().parseAsync(Bun.argv)
+}

package/bin/git-lab-whoami.ts

@@ -1,12 +1,15 @@
-#!/usr/bin/env bun run
+#!/usr/bin/env bun
 
 import { Command } from 'commander'
-import { whoami, type User } from "../lib/gitlab"
+import { getPackageVersion } from '../lib/package'
+import { whoami, type User } from "../lib/gitlab/user"
 import { isMain } from '../lib/is_main'
+const version = await getPackageVersion()
 
 export function create(): Command {
-    const program = new Command()
+    const program: Command = new Command()
     program
+        .version(version)
         .name('whoami')
         .description('get GitLab user information for current user')
         .option('-v, --verbose', 'Verbose output')
@@ -27,8 +30,8 @@ export function create(): Command {
     return program
 }
 
+export default create
+
 if (isMain('git-lab-whoami')) {
     await create().parseAsync(Bun.argv)
 }
-
-export default create

package/bin/git-lab.ts

@@ -1,22 +1,32 @@
-#!/usr/bin/env bun run
+#!/usr/bin/env bun
 
 import { Command } from 'commander'
+import { getPackageVersion } from '../lib/package'
 import { isMain } from '../lib/is_main'
+import groups from './git-lab-group'
+import merges from './git-lab-merge'
+import namespaces from './git-lab-namespace'
+import projects from './git-lab-project'
 import whoami from './git-lab-whoami'
-import projects from './git-lab-projects'
+const version = await getPackageVersion()
 
 export function create(): Command {
-    const program = new Command()
+    const program: Command = new Command()
     program
+        .version(version)
         .name('lab')
-        .description('A set of commands for working with GitLab')
-        .addCommand(whoami())
+        .description('Commands for working with GitLab')
+        .addCommand(groups())
+        .addCommand(merges())
+        .addCommand(namespaces())
         .addCommand(projects())
+        .addCommand(whoami())
+        .action(() => program.help())
     return program
 }
 
-if (isMain('git-jira')) {
+export default create
+
+if (isMain('git-lab')) {
     await create().parseAsync(Bun.argv)
 }
-
-export default create

package/bin/gitj.ts

@@ -1,8 +1,4 @@
-#!/usr/bin/env bun run
-
-import bump from './git-bump'
-import jira from './git-jira'
-import lab from './git-lab'
+#!/usr/bin/env bun
 
 // This is the root of the CLI. It's a proxy for git and not strictly
 // necessary, but it's useful to have for testing
@@ -10,10 +6,16 @@ import lab from './git-lab'
 // from the command line and then call the appropriate subcommand.
 
 import { Command } from 'commander'
+import { getPackageVersion } from '../lib/package'
+import bump from './git-bump'
+import jira from './git-jira'
+import lab from './git-lab'
+const version = await getPackageVersion()
 
 export function create(): Command {
     const program: Command = new Command()
     program
+        .version(version)
         .addCommand(bump())
         .addCommand(jira())
         .addCommand(lab())

package/build.ts

@@ -4,7 +4,7 @@ import { glob } from 'glob'
 const result: BuildOutput = await Bun.build({
     entrypoints: ['./index.ts', ...glob.sync('./bin/*.ts')],
     outdir: './dist',
-    target: 'bun'
+    target: 'bun',
 })
 
 if (result.success) {

package/dist/bin/git-bump.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun run
+#!/usr/bin/env bun
 // @bun
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -21,7 +21,7 @@ var __require = (id) => {
   return import.meta.require(id);
 };
 
-// node_modules/commander/lib/error.js
+// bine_modules/commander/lib/suggestS
 var require_error = __commonJS((exports) => {
   class CommanderError extends Error {
     constructor(exitCode, code, message) {
@@ -45,7 +45,7 @@ var require_error = __commonJS((exports) => {
   exports.InvalidArgumentError = InvalidArgumentError;
 });
 
-// node_modules/commander/lib/argument.js
+// bine_modules/commander/lib/suggestSimi
 var require_argument = __commonJS((exports) => {
   var humanReadableArgName = function(arg) {
     const nameOutput = arg.name() + (arg.variadic === true ? "..." : "");
@@ -124,7 +124,7 @@ var require_argument = __commonJS((exports) => {
   exports.humanReadableArgName = humanReadableArgName;
 });
 
-// node_modules/commander/lib/help.js
+// bine_modules/commander/lib/suggest
 var require_help = __commonJS((exports) => {
   var { humanReadableArgName } = require_argument();
 
@@ -364,7 +364,7 @@ var require_help = __commonJS((exports) => {
   exports.Help = Help;
 });
 
-// node_modules/commander/lib/option.js
+// bine_modules/commander/lib/suggestSi
 var require_option = __commonJS((exports) => {
   var camelcase = function(str) {
     return str.split("-").reduce((str2, word) => {
@@ -516,7 +516,7 @@ var require_option = __commonJS((exports) => {
   exports.DualOptions = DualOptions;
 });
 
-// node_modules/commander/lib/suggestSimilar.js
+// bine_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS((exports) => {
   var editDistance = function(a, b) {
     if (Math.abs(a.length - b.length) > maxDistance)
@@ -587,7 +587,7 @@ var require_suggestSimilar = __commonJS((exports) => {
   exports.suggestSimilar = suggestSimilar;
 });
 
-// node_modules/commander/lib/command.js
+// bine_modules/commander/lib/suggestSim
 var require_command = __commonJS((exports) => {
   var outputHelpIfRequested = function(cmd, args) {
     const helpOption = cmd._hasHelpOption && args.find((arg) => arg === cmd._helpLongFlag || arg === cmd._helpShortFlag);
@@ -1765,7 +1765,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.Command = Command;
 });
 
-// node_modules/commander/index.js
+// bine_modules/commander/lib/sugg
 var require_commander = __commonJS((exports, module) => {
   var { Argument } = require_argument();
   var { Command } = require_command();
@@ -1783,7 +1783,7 @@ var require_commander = __commonJS((exports, module) => {
   exports.Option = Option;
 });
 
-// lib/spawn.ts
+// bine_modules
 async function spawn(args, options = defaultOptions) {
   const proc = Bun.spawn(args, { stdout: "pipe", stderr: "pipe" });
   const stdout = new Response(proc.stdout);
@@ -1808,7 +1808,7 @@ var defaultOptions = {
   expectQuiet: false
 };
 
-// lib/git.ts
+// bine_modul
 async function getConfig(key) {
   return doCommand(["git", "config", "--get", key]);
 }
@@ -1822,7 +1822,7 @@ async function getRemote() {
   return doCommand(["git", "ls-remote", "--get-url", "origin"]);
 }
 
-// node_modules/commander/esm.mjs
+// bine_modules/commander/lib/sug
 var import_ = __toESM(require_commander(), 1);
 var {
   program,
@@ -1838,17 +1838,54 @@ var {
   Help
 } = import_.default;
 
-// lib/is_main.ts
+// bine_modules/c
 import path from "path";
+import fs from "fs";
+function findPackageJson() {
+  const cwd = import.meta.dir;
+  let dir = cwd;
+  while (dir !== "/") {
+    const packageJson = path.join(dir, "package.json");
+    if (fs.existsSync(packageJson)) {
+      return packageJson;
+    }
+    dir = path.dirname(dir);
+  }
+  return null;
+}
+async function getPackageJson() {
+  const packagePath = findPackageJson();
+  if (!packagePath) {
+    throw new Error(`No package.json found in ${import.meta.dir} or any parent directory`);
+  }
+  const packageJsonText = fs.readFileSync(packagePath, "utf8");
+  return JSON.parse(packageJsonText);
+}
+async function getPackageVersion() {
+  const packageJson = await packageJsonPromise;
+  return packageJson.version;
+}
+var packageJsonPromise = getPackageJson();
+
+// bine_modules/c
+import path2 from "path";
+var justBase = function(filename) {
+  const ext = path2.extname(filename);
+  const base = path2.basename(filename, ext);
+  return base;
+};
 function isMain(self) {
-  const exe = path.basename(Bun.argv[1]).split(".")[0];
-  return exe == self || import.meta.main;
+  const arg1 = Bun.argv[1];
+  const argv1Base = justBase(arg1);
+  const selfBase = justBase(self);
+  const result = argv1Base === selfBase;
+  return result;
 }
 
-// bin/git-bump.ts
+// bine_modules/co
 function create() {
   const program2 = new Command;
-  program2.name("bump").description("Bump the version number in the current branch").action(async () => {
+  program2.version(version).name("bump").description("Bump the version number in the current branch").action(async () => {
     const currentBranch = await getCurrentBranch();
     let stem = currentBranch;
     let version = 1;
@@ -1862,10 +1899,11 @@ function create() {
   });
   return program2;
 }
+var version = await getPackageVersion();
+var git_bump_default = create;
 if (isMain("git-bump")) {
   await create().parseAsync(Bun.argv);
 }
-var git_bump_default = create;
 export {
   git_bump_default as default,
   create

package/dist/bin/{git-jira-issues.js → git-jira-issue-list.js}

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun run
+#!/usr/bin/env bun
 // @bun
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -21,7 +21,7 @@ var __require = (id) => {
   return import.meta.require(id);
 };
 
-// node_modules/commander/lib/error.js
+// bine_modules/commander/lib/suggestS
 var require_error = __commonJS((exports) => {
   class CommanderError extends Error {
     constructor(exitCode, code, message) {
@@ -45,7 +45,7 @@ var require_error = __commonJS((exports) => {
   exports.InvalidArgumentError = InvalidArgumentError;
 });
 
-// node_modules/commander/lib/argument.js
+// bine_modules/commander/lib/suggestSimi
 var require_argument = __commonJS((exports) => {
   var humanReadableArgName = function(arg) {
     const nameOutput = arg.name() + (arg.variadic === true ? "..." : "");
@@ -124,7 +124,7 @@ var require_argument = __commonJS((exports) => {
   exports.humanReadableArgName = humanReadableArgName;
 });
 
-// node_modules/commander/lib/help.js
+// bine_modules/commander/lib/suggest
 var require_help = __commonJS((exports) => {
   var { humanReadableArgName } = require_argument();
 
@@ -364,7 +364,7 @@ var require_help = __commonJS((exports) => {
   exports.Help = Help;
 });
 
-// node_modules/commander/lib/option.js
+// bine_modules/commander/lib/suggestSi
 var require_option = __commonJS((exports) => {
   var camelcase = function(str) {
     return str.split("-").reduce((str2, word) => {
@@ -516,7 +516,7 @@ var require_option = __commonJS((exports) => {
   exports.DualOptions = DualOptions;
 });
 
-// node_modules/commander/lib/suggestSimilar.js
+// bine_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS((exports) => {
   var editDistance = function(a, b) {
     if (Math.abs(a.length - b.length) > maxDistance)
@@ -587,7 +587,7 @@ var require_suggestSimilar = __commonJS((exports) => {
   exports.suggestSimilar = suggestSimilar;
 });
 
-// node_modules/commander/lib/command.js
+// bine_modules/commander/lib/suggestSim
 var require_command = __commonJS((exports) => {
   var outputHelpIfRequested = function(cmd, args) {
     const helpOption = cmd._hasHelpOption && args.find((arg) => arg === cmd._helpLongFlag || arg === cmd._helpShortFlag);
@@ -1765,7 +1765,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.Command = Command;
 });
 
-// node_modules/commander/index.js
+// bine_modules/commander/lib/sugg
 var require_commander = __commonJS((exports, module) => {
   var { Argument } = require_argument();
   var { Command } = require_command();
@@ -1783,7 +1783,7 @@ var require_commander = __commonJS((exports, module) => {
   exports.Option = Option;
 });
 
-// node_modules/commander/esm.mjs
+// bine_modules/commander/lib/sug
 var import_ = __toESM(require_commander(), 1);
 var {
   program,
@@ -1799,7 +1799,36 @@ var {
   Help
 } = import_.default;
 
-// lib/spawn.ts
+// bine_modules/c
+import path from "path";
+import fs from "fs";
+function findPackageJson() {
+  const cwd = import.meta.dir;
+  let dir = cwd;
+  while (dir !== "/") {
+    const packageJson = path.join(dir, "package.json");
+    if (fs.existsSync(packageJson)) {
+      return packageJson;
+    }
+    dir = path.dirname(dir);
+  }
+  return null;
+}
+async function getPackageJson() {
+  const packagePath = findPackageJson();
+  if (!packagePath) {
+    throw new Error(`No package.json found in ${import.meta.dir} or any parent directory`);
+  }
+  const packageJsonText = fs.readFileSync(packagePath, "utf8");
+  return JSON.parse(packageJsonText);
+}
+async function getPackageVersion() {
+  const packageJson = await packageJsonPromise;
+  return packageJson.version;
+}
+var packageJsonPromise = getPackageJson();
+
+// bine_modules
 async function spawn(args, options = defaultOptions) {
   const proc = Bun.spawn(args, { stdout: "pipe", stderr: "pipe" });
   const stdout = new Response(proc.stdout);
@@ -1824,7 +1853,7 @@ var defaultOptions = {
   expectQuiet: false
 };
 
-// lib/git.ts
+// bine_modul
 async function getConfig(key) {
   return doCommand(["git", "config", "--get", key]);
 }
@@ -1838,7 +1867,7 @@ async function getRemote() {
   return doCommand(["git", "ls-remote", "--get-url", "origin"]);
 }
 
-// lib/jira.ts
+// bine_module
 async function getJiraConfig() {
   const host = await getConfig("jira.host");
   if (!host)
@@ -1852,11 +1881,14 @@ async function getJiraConfig() {
   const token = Buffer.from(`${user}:${pat}`).toString("base64");
   return { host, token };
 }
-async function get(endpoint) {
+async function jiraApi(endpoint) {
+  if (endpoint.startsWith("/")) {
+    console.warn(`jiraApi: endpoint ${endpoint} starts with /`);
+    endpoint = endpoint.slice(1);
+  }
   const method = "GET";
   const { host, token } = await getJiraConfig();
-  const base = `https://${host}/rest/api/3`;
-  const uri = `${base}/${endpoint}`;
+  const uri = `https://${host}/rest/api/3/${endpoint}`;
   const auth = `Basic ${token}`;
   const headers = new Headers;
   headers.append("Authorization", auth);
@@ -1867,33 +1899,43 @@ async function get(endpoint) {
   };
   const request = new Request(uri, options);
   const response = await fetch(request);
-  return await response.json();
+  const result = await response.json();
+  return result;
 }
 async function getIssue(issue) {
-  return await get(`/issue/${issue}`);
+  const result = await jiraApi(`issue/${issue}`);
+  return result;
 }
 async function getMyself() {
-  return await get("/myself");
+  return await jiraApi("/myself");
 }
 async function myUnresolvedIssues() {
   const myself = await getMyself();
   const myselfId = myself.accountId;
   const jql = `assignee = ${myselfId} AND resolution = Unresolved`;
-  const issues = await get(`/search?jql=${encodeURIComponent(jql)}`);
+  const issues = await jiraApi(`/search?jql=${encodeURIComponent(jql)}`);
   return issues.issues;
 }
 
-// lib/is_main.ts
-import path from "path";
+// bine_modules/c
+import path2 from "path";
+var justBase = function(filename) {
+  const ext = path2.extname(filename);
+  const base = path2.basename(filename, ext);
+  return base;
+};
 function isMain(self) {
-  const exe = path.basename(Bun.argv[1]).split(".")[0];
-  return exe == self || import.meta.main;
+  const arg1 = Bun.argv[1];
+  const argv1Base = justBase(arg1);
+  const selfBase = justBase(self);
+  const result = argv1Base === selfBase;
+  return result;
 }
 
-// bin/git-jira-issues.ts
+// bine_modules/commander/lib
 function create() {
   const program2 = new Command;
-  program2.name("issues").description("List your unresolved issues").action(async (options) => {
+  program2.version(version).name("list").description("List your unresolved issues").action(async () => {
     const issues = await myUnresolvedIssues();
     console.log(`You have ${issues.length} unresolved issues`);
     issues.forEach((issue) => {
@@ -1902,11 +1944,12 @@ function create() {
   });
   return program2;
 }
-if (isMain("git-jira-issues")) {
+var version = await getPackageVersion();
+var git_jira_issue_list_default = create;
+if (isMain("git-jira-issue-list")) {
   await create().parseAsync(Bun.argv);
 }
-var git_jira_issues_default = create;
 export {
-  git_jira_issues_default as default,
+  git_jira_issue_list_default as default,
   create
 };