@gkalpak/aliases 0.13.1 → 0.13.3

package/bin/config/cfgbash.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfgbash.wsl.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfggit.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Run the following commands:
 
   git config --global commit.gpgSign true
   git config --global core.editor "vim"
   git config --global credential.helper "manager"
+  git config --global init.defaultBranch "main"
   git config --global merge.tool "kdiff3"
   git config --global mergetool.kdiff3.path "/path/to/kdiff3"
   git config --global mergetool.kdiff3.trustExitCode "false"

package/bin/config/cfggit.win32.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Run the following commands:
 
   git config --global commit.gpgSign true
   git config --global core.editor "vim"
   git config --global credential.helper "manager"
+  git config --global init.defaultBranch "main"
   git config --global merge.tool "kdiff3"
   git config --global mergetool.kdiff3.path "C:/Program Files/KDiff3/bin/kdiff3.exe"
   git config --global mergetool.kdiff3.trustExitCode "false"

package/bin/config/cfggit.wsl.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Run the following commands:
 
   git config --global commit.gpgSign true
   git config --global core.editor "vim"
   git config --global credential.helper "/mnt/c/Program\\ Files/Git/mingw64/bin/git-credential-manager.exe"
+  git config --global init.defaultBranch "main"
   git config --global merge.tool "kdiff3"
   git config --global mergetool.kdiff3.path "/mnt/c/Program Files/KDiff3/bin/kdiff3.exe"
   git config --global mergetool.kdiff3.trustExitCode "false"

package/bin/config/cfggpg.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Copy the following into '~/.gnupg/gpg-agent.conf':
 
   default-cache-ttl 86400

package/bin/config/cfgssh.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Copy the following into '~/.ssh/config':
 
   IdentityFile ~/.ssh/id-rsa-gkalpak.ppk

package/bin/config/cfgvim.js

@@ -2,6 +2,6 @@
 import {readFileSync} from 'node:fs';
 import {fileURLToPath} from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
-console.log('""" [Generated by: @gkalpak/aliases v0.13.1]');
+console.log('""" [Generated by: @gkalpak/aliases v0.13.3]');
 console.log('""" Copy the following into \'~/.vimrc\':\n');
 console.log(readFileSync(`${__dirname}/../../lib/assets/vimrc.txt`, 'utf8').trim() + '\n');

package/bin/config/cfgwsl.wsl.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Copy the following into a root-owned, 600-mode '/etc/resolv.conf' file:
 
   # Cloudflare
@@ -14,7 +14,7 @@ console.log(stripIndentation(`
 
   -----
 
-  ### [Generated by: @gkalpak/aliases v0.13.1]
+  ### [Generated by: @gkalpak/aliases v0.13.3]
   ### Copy the following into a root-owned, 600-mode '/etc/wsl.conf' file:
 
   [network]

package/bin/git/gba.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git branch --all $*';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gbdio.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git branch --delete --force ${1:::__g-pick-branch --gkcu-returnOutput=1} && git push --delete origin ${1:::__g-pick-branch --gkcu-returnOutput=1}';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gbdr.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git push --delete ${*:::__g-pick-branch --remote --gkcu-returnOutput=1}';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gshg.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git show ${0:::__g-pick-commit --filter-commits="$1" --gkcu-returnOutput=1}';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gshng.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git show --name-only ${0:::__g-pick-commit --filter-commits="$1" --gkcu-returnOutput=1}';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/misc/alv.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-console.log('@gkalpak/aliases v0.13.1');
+console.log('@gkalpak/aliases v0.13.3');

package/lib/alias-scripts/g-pick-branch.js

@@ -5,6 +5,11 @@ import {importWithEnv} from '../utils.js';
 
 
 // Constants
+const branchNameSuffices = {
+  '': '',
+  '*': ' (current)',
+  '+': ' (other worktree)',
+};
 const internal = {
   _gPickBranch,
 };
@@ -15,12 +20,16 @@ export {
    * @function gPickBranch
    *
    * @description
-   * Prompt the user to pick one of the available git branches via an interactive list.
+   * Prompt the user to pick one of the available git branches via an interactive list. By default, local branches are
+   * shown, but this can be optionally switched to remote branches only. Supported runtime arguments:
+   * - `--remote` [flag]: Only show remote branches when present (otherwise only show local branches).
    *
+   * @param {string[]} [runtimeArgs=[]] - The runtime arguments.
    * @param {IRunConfig} [config={}] - A configuration object. See {@link commandUtils#IRunConfig} for more details.
    *
    * @return {Promise<void|string>} - A promise that resolves to either `undefined` or the selected branch (depending on
-   *     the value of `config.returnOutput`).
+   *     the value of `config.returnOutput`). When switched to remote branches only the selected branch consists of the
+   *     remote name, followed by a space, followed by the actual branch name (for example, `origin some-branch`).
    */
   gPickBranch,
 
@@ -31,16 +40,18 @@ export {
 };
 
 // Helpers
-async function _gPickBranch(config) {
+async function _gPickBranch(runtimeArgs = [], config = {}) {
   const gbConfig = Object.assign({}, config, {returnOutput: true});
+  const branchType = runtimeArgs.includes('--remote') ? 'remote' : 'local';
 
   if (config.dryrun) {
-    console.log('Pick one from a list of branches.');
+    console.log(`Pick one from a list of ${branchType} branches.`);
     return;
   }
 
-  const branchOutput = await commandUtils.run('git branch', [], gbConfig);
-  const branch = await pickBranch(branchOutput);
+  const branchOutput = await commandUtils.run('git branch --all', [], gbConfig);
+  const branches = processBranches(branchOutput).filter(({remote}) => remote === (branchType === 'remote'));
+  const branch = await pickBranch(branchType, branches);
 
   if (config.returnOutput) {
     return branch;
@@ -49,49 +60,19 @@ async function _gPickBranch(config) {
   console.log(branch);
 }
 
-function gPickBranch(config) {
-  return internal._gPickBranch(config);
+function gPickBranch(runtimeArgs, config) {
+  return internal._gPickBranch(runtimeArgs, config);
 }
 
-function main(_runtimeArgs, config) {
-  return gPickBranch(config);
+function main(runtimeArgs, config) {
+  return gPickBranch(runtimeArgs, config);
 }
 
-async function pickBranch(branchesStr) {
+async function pickBranch(branchType, branches) {
   // Ensure colors are always used (even when running with `returnOutput: <number>`).
   const {default: inquirer} = await importWithEnv(() => import('inquirer'), {FORCE_COLOR: '1'});
 
-  let currentBranchIdx = 0;
-  const branches = branchesStr.
-    split('\n').
-    map(line => line.trim()).
-    filter(Boolean).
-    map((branch, i) => {
-      const [, specialSymbol = '', branchName] = /^(?:([*+])\s*)?(\S.*)$/.exec(branch);
-      let displayName = branchName.replace(/^(gcoghpr)-(.*)$/, '[$1] $2');
-
-      switch (specialSymbol) {
-        case '':
-          break;
-        case '*':
-          currentBranchIdx = i;
-          displayName += ' (current)';
-          break;
-        case '+':
-          displayName += ' (other worktree)';
-          break;
-        default:
-          throw new Error(`Unexpected branch prefix symbol: ${specialSymbol}`);
-      }
-
-      return {
-        name: displayName,
-        value: branchName,
-        short: branchName,
-      };
-    }).
-    sort((a, b) => (a.name > b.name) ? 1 : -1).
-    concat(new inquirer.Separator());
+  const currentBranchIdx = Math.max(0, branches.findIndex(({name}) => name.endsWith(branchNameSuffices['*'])));
 
   const unlisten = processUtils.doOnExit(process, code => {
     if (code === 0) {
@@ -107,8 +88,8 @@ async function pickBranch(branchesStr) {
       {
         type: 'list',
         name: 'branch',
-        message: 'Pick a branch:',
-        choices: branches,
+        message: `Pick a ${branchType} branch:`,
+        choices: branches.concat(new inquirer.Separator()),
         default: currentBranchIdx,
       },
     ]);
@@ -118,3 +99,30 @@ async function pickBranch(branchesStr) {
     unlisten();
   }
 }
+
+function processBranches(branchesStr) {
+  return branchesStr.
+    split('\n').
+    map(line => line.trim()).
+    // Filter out empty lines and `HEAD` "aliases".
+    filter(line => (line.length > 0) && !line.includes('/HEAD -> ')).
+    map(branch => {
+      const [, specialSymbol = '', remote = false, branchName] = /^(?:([*+])\s*)?(remotes\/)?(\S.*)$/.exec(branch);
+      const branchNameSuffix = branchNameSuffices[specialSymbol];
+
+      if (branchNameSuffix === undefined) {
+        throw new Error(`Unexpected branch prefix symbol: ${specialSymbol}`);
+      }
+
+      const displayName = branchName.replace(/^(gcoghpr)-(.*)$/, '[$1] $2') + branchNameSuffix;
+      const isRemote = remote !== false;
+
+      return {
+        name: displayName,
+        short: branchName,
+        value: isRemote ? branchName.replace('/', ' ') : branchName,
+        remote: isRemote,
+      };
+    }).
+    sort((a, b) => (a.name > b.name) ? 1 : -1);
+}

package/lib/alias-scripts/g-pick-commit.js

@@ -15,8 +15,11 @@ export {
    * @function gPickCommit
    *
    * @description
-   * Prompt the user to pick one of the available git commits via an interactive list.
+   * Prompt the user to pick one of the available git commits via an interactive list. Optionally, filter the commits
+   * based on the commit message. Supported runtime arguments:
+   * - `--filter-commits` [string]: A basic pattern to filter commit messages (case-sensitive).
    *
+   * @param {string[]} [runtimeArgs=[]] - The runtime arguments.
    * @param {IRunConfig} [config={}] - A configuration object. See {@link commandUtils#IRunConfig} for more details.
    *
    * @return {Promise<void|string>} - A promise that resolves to either `undefined` or the selected commit (depending on
@@ -31,15 +34,29 @@ export {
 };
 
 // Helpers
-async function _gPickCommit(config) {
+async function _gPickCommit(runtimeArgs = [], config = {}) {
+  const maxCommits = 50;
   const glConfig = Object.assign({}, config, {returnOutput: true});
+  let glCmd = 'git log --oneline';
+
+  const filterCommitsPattern =
+      (runtimeArgs.find((_arg, idx, arr) => (idx > 0) && (arr[idx - 1] === '--filter-commits')) ??
+      runtimeArgs.find(arg => arg.startsWith('--filter-commits='))?.slice('--filter-commits='.length))?.
+        replace(/^(['"])(.*)\1$/, '$2');
+  if (filterCommitsPattern !== undefined) {
+    glCmd += ` | grep "${filterCommitsPattern}"`;
+  }
+
+  glCmd += ` --max-count=${maxCommits}`;  // `--max-count` works both for `git log` and `grep`.
 
   if (config.dryrun) {
-    console.log('Pick one from a list of commits.');
+    console.log(
+        `Pick one from the first ${maxCommits} commits` +
+        `${(filterCommitsPattern === undefined) ? '' : ` whose header matches '${filterCommitsPattern}'`}.`);
     return;
   }
 
-  const commitOutput = await commandUtils.run('git log --oneline -50', [], glConfig);
+  const commitOutput = await commandUtils.run(glCmd, [], glConfig);
   const commit = await pickCommit(commitOutput);
 
   if (config.returnOutput) {
@@ -49,12 +66,12 @@ async function _gPickCommit(config) {
   console.log(commit);
 }
 
-function gPickCommit(config) {
-  return internal._gPickCommit(config);
+function gPickCommit(runtimeArgs, config) {
+  return internal._gPickCommit(runtimeArgs, config);
 }
 
-function main(_runtimeArgs, config) {
-  return gPickCommit(config);
+function main(runtimeArgs, config) {
+  return gPickCommit(runtimeArgs, config);
 }
 
 async function pickCommit(commitsStr) {

package/lib/constants.js

@@ -38,8 +38,10 @@ const DESC_REPLACEMENTS = {
   [AliasUnknown.DESCRIPTION]: '???',
   '::gdefb': '<default-branch>',
   '::__a-builds-dir': '(<.../angular/aio/aio-builds-setup>)',
-  '::__g-pick-branch --gkcu-returnOutput=1': '(interactively pick a branch)',
+  '::__g-pick-branch --gkcu-returnOutput=1': '(interactively pick a local branch)',
+  '::__g-pick-branch --remote --gkcu-returnOutput=1': '(interactively pick a remote branch)',
   '::__g-pick-commit --gkcu-returnOutput=1': '(interactively pick a commit)',
+  '::__g-pick-commit --filter-commits="$1" --gkcu-returnOutput=1': '(interactively pick a filtered commit)',
 };
 
 const DEF_CODE = AliasSpecDefault.DEF_CODE = (cmd, cfg = {}) => stripIndentation(`
@@ -104,6 +106,7 @@ const CFGGIT_SPEC = (credHelper, kdiff3Path) => new AliasSpec(
         git config --global commit.gpgSign true
         git config --global core.editor "vim"
         git config --global credential.helper "${credHelper}"
+        git config --global init.defaultBranch "main"
         git config --global merge.tool "kdiff3"
         git config --global mergetool.kdiff3.path "${kdiff3Path}"
         git config --global mergetool.kdiff3.trustExitCode "false"
@@ -258,7 +261,9 @@ const ALIASES = {
     gl1: new AliasDefault('git log --decorate --oneline $* || true'),
     gl1g: new AliasDefault('git log --decorate --oneline | grep $*'),
     gsh: new AliasDefault('git show ${*:::__g-pick-commit --gkcu-returnOutput=1}'),
+    gshg: new AliasDefault('git show ${0:::__g-pick-commit --filter-commits="$1" --gkcu-returnOutput=1}'),
     gshn: new AliasDefault('git show --name-only ${*:::__g-pick-commit --gkcu-returnOutput=1}'),
+    gshng: new AliasDefault('git show --name-only ${0:::__g-pick-commit --filter-commits="$1" --gkcu-returnOutput=1}'),
     gd: new AliasDefault('ngm-diff-wh $*'),
     gdn: new AliasDefault('ngm-diff-wh --name-only $*'),
     gdh: new AliasDefault('ngm-diff-wh HEAD $*'),
@@ -310,10 +315,15 @@ const ALIASES = {
 
     // BRANCH
     gb: new AliasDefault('git branch $*'),
+    gba: new AliasDefault('git branch --all $*'),
     gbc: new AliasDefault(GIT_CREATE_BRANCH_CMD('${2:HEAD}')),
     gbcd: new AliasDefault(GIT_CREATE_BRANCH_CMD('${0:::gdefb}')),
     gbco: new AliasDefault(`git fetch origin $1 && ${GIT_CREATE_BRANCH_CMD('origin/$1')}`),
     gbd: new AliasDefault('git branch --delete --force ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
+    gbdr: new AliasDefault('git push --delete ${*:::__g-pick-branch --remote --gkcu-returnOutput=1}'),
+    gbdio: new AliasDefault(
+        'git branch --delete --force ${1:::__g-pick-branch --gkcu-returnOutput=1} && ' +
+        'git push --delete origin ${1:::__g-pick-branch --gkcu-returnOutput=1}'),
 
     // PULL(-REBASE)
     gpr: new AliasDefault('git pull --rebase $*'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -31,150 +31,155 @@
     "~~test-unit": "jasmine test/unit/**/*.spec.js"
   },
   "bin": {
-    "__a-builds-dir": "./bin/aio/__a-builds-dir.js",
-    "__g-pick-branch": "./bin/git/__g-pick-branch.js",
-    "__g-pick-commit": "./bin/git/__g-pick-commit.js",
-    "aioall": "./bin/aio/aioall.js",
-    "aioatt": "./bin/aio/aioatt.js",
-    "aiobd": "./bin/aio/aiobd.js",
-    "aiord": "./bin/aio/aiord.js",
-    "aiorm": "./bin/aio/aiorm.js",
-    "alv": "./bin/misc/alv.js",
-    "cfgbash": "./bin/config/cfgbash.js",
-    "cfggit": "./bin/config/cfggit.js",
-    "cfggpg": "./bin/config/cfggpg.js",
-    "cfgssh": "./bin/config/cfgssh.js",
-    "cfgvim": "./bin/config/cfgvim.js",
-    "cfgwsl": "./bin/config/cfgwsl.js",
-    "dkrall": "./bin/docker/dkrall.js",
-    "dkratt": "./bin/docker/dkratt.js",
-    "dkrbd": "./bin/docker/dkrbd.js",
-    "dkrrd": "./bin/docker/dkrrd.js",
-    "dkrrm": "./bin/docker/dkrrm.js",
-    "gaa": "./bin/git/gaa.js",
-    "gb": "./bin/git/gb.js",
-    "gbc": "./bin/git/gbc.js",
-    "gbcd": "./bin/git/gbcd.js",
-    "gbco": "./bin/git/gbco.js",
-    "gbd": "./bin/git/gbd.js",
-    "gcl": "./bin/git/gcl.js",
-    "gcm": "./bin/git/gcm.js",
-    "gcma": "./bin/git/gcma.js",
-    "gcmane": "./bin/git/gcmane.js",
-    "gcmf": "./bin/git/gcmf.js",
-    "gcmfc": "./bin/git/gcmfc.js",
-    "gcmfs": "./bin/git/gcmfs.js",
-    "gcmi": "./bin/git/gcmi.js",
-    "gcmia": "./bin/git/gcmia.js",
-    "gcmiane": "./bin/git/gcmiane.js",
-    "gcmif": "./bin/git/gcmif.js",
-    "gcmifc": "./bin/git/gcmifc.js",
-    "gcmifs": "./bin/git/gcmifs.js",
-    "gco": "./bin/git/gco.js",
-    "gcod": "./bin/git/gcod.js",
-    "gcoghpr": "./bin/git/gcoghpr.js",
-    "gcoghpr-cleanup": "./bin/git/gcoghpr-cleanup.js",
-    "gcopr": "./bin/git/gcopr.js",
-    "gcp": "./bin/git/gcp.js",
-    "gcpa": "./bin/git/gcpa.js",
-    "gcpc": "./bin/git/gcpc.js",
-    "gcpx": "./bin/git/gcpx.js",
-    "gcpxl": "./bin/git/gcpxl.js",
-    "gd": "./bin/git/gd.js",
-    "gd1": "./bin/git/gd1.js",
-    "gdn": "./bin/git/gdn.js",
-    "gdefb": "./bin/git/gdefb.js",
-    "gdn1": "./bin/git/gdn1.js",
-    "gdnh": "./bin/git/gdnh.js",
-    "gdh": "./bin/git/gdh.js",
-    "gl": "./bin/git/gl.js",
-    "gl1": "./bin/git/gl1.js",
-    "gl1g": "./bin/git/gl1g.js",
-    "gmt": "./bin/git/gmt.js",
-    "gngprh": "./bin/git/gngprh.js",
-    "gngprm": "./bin/git/gngprm.js",
-    "gp": "./bin/git/gp.js",
-    "gp1": "./bin/git/gp1.js",
-    "gpf": "./bin/git/gpf.js",
-    "gpr": "./bin/git/gpr.js",
-    "gpro": "./bin/git/gpro.js",
-    "gprod": "./bin/git/gprod.js",
-    "gpru": "./bin/git/gpru.js",
-    "gprud": "./bin/git/gprud.js",
-    "grb": "./bin/git/grb.js",
-    "grba": "./bin/git/grba.js",
-    "grbc": "./bin/git/grbc.js",
-    "grbd": "./bin/git/grbd.js",
-    "grbi": "./bin/git/grbi.js",
-    "grbia": "./bin/git/grbia.js",
-    "grbin": "./bin/git/grbin.js",
-    "grs": "./bin/git/grs.js",
-    "grs1": "./bin/git/grs1.js",
-    "gs": "./bin/git/gs.js",
-    "gsh": "./bin/git/gsh.js",
-    "gshn": "./bin/git/gshn.js",
-    "gst": "./bin/git/gst.js",
-    "gstk": "./bin/git/gstk.js",
-    "gstl": "./bin/git/gstl.js",
-    "gstm": "./bin/git/gstm.js",
-    "gstp": "./bin/git/gstp.js",
-    "gsync": "./bin/git/gsync.js",
-    "halp": "./bin/misc/halp.js",
-    "ll": "./bin/misc/ll.js",
-    "lla": "./bin/misc/lla.js",
-    "nad": "./bin/node/nad.js",
-    "naga": "./bin/node/naga.js",
-    "nap": "./bin/node/nap.js",
-    "niin": "./bin/node/niin.js",
-    "nls": "./bin/node/nls.js",
-    "nls1": "./bin/node/nls1.js",
-    "nlsg": "./bin/node/nlsg.js",
-    "nlsg1": "./bin/node/nlsg1.js",
-    "nr": "./bin/node/nr.js",
-    "nrd": "./bin/node/nrd.js",
-    "nrin": "./bin/node/nrin.js",
-    "nrp": "./bin/node/nrp.js",
-    "nrx": "./bin/node/nrx.js",
-    "ns": "./bin/node/ns.js",
-    "nsin": "./bin/node/nsin.js",
-    "nsx": "./bin/node/nsx.js",
-    "nt": "./bin/node/nt.js",
-    "ntin": "./bin/node/ntin.js",
-    "ntx": "./bin/node/ntx.js",
-    "nua": "./bin/node/nua.js",
-    "nud": "./bin/node/nud.js",
-    "nup": "./bin/node/nup.js",
-    "nv": "./bin/node/nv.js",
-    "nvls": "./bin/node/nvls.js",
-    "nvlsa": "./bin/node/nvlsa.js",
-    "nvmup": "./bin/node/nvmup.js",
-    "nvu": "./bin/node/nvu.js",
-    "osv": "./bin/misc/osv.js",
-    "salfup": "./bin/misc/salfup.js",
-    "srv": "./bin/node/srv.js",
-    "srvw": "./bin/node/srvw.js",
-    "yad": "./bin/node/yad.js",
-    "yaga": "./bin/node/yaga.js",
-    "yap": "./bin/node/yap.js",
-    "yiin": "./bin/node/yiin.js",
-    "yls": "./bin/node/yls.js",
-    "yls1": "./bin/node/yls1.js",
-    "ylsg": "./bin/node/ylsg.js",
-    "ylsg1": "./bin/node/ylsg1.js",
-    "yr": "./bin/node/yr.js",
-    "yrd": "./bin/node/yrd.js",
-    "yrin": "./bin/node/yrin.js",
-    "yrp": "./bin/node/yrp.js",
-    "yrx": "./bin/node/yrx.js",
-    "ys": "./bin/node/ys.js",
-    "ysin": "./bin/node/ysin.js",
-    "ysx": "./bin/node/ysx.js",
-    "yt": "./bin/node/yt.js",
-    "ytin": "./bin/node/ytin.js",
-    "ytx": "./bin/node/ytx.js",
-    "yua": "./bin/node/yua.js",
-    "yud": "./bin/node/yud.js",
-    "yup": "./bin/node/yup.js"
+    "__a-builds-dir": "bin/aio/__a-builds-dir.js",
+    "__g-pick-branch": "bin/git/__g-pick-branch.js",
+    "__g-pick-commit": "bin/git/__g-pick-commit.js",
+    "aioall": "bin/aio/aioall.js",
+    "aioatt": "bin/aio/aioatt.js",
+    "aiobd": "bin/aio/aiobd.js",
+    "aiord": "bin/aio/aiord.js",
+    "aiorm": "bin/aio/aiorm.js",
+    "alv": "bin/misc/alv.js",
+    "cfgbash": "bin/config/cfgbash.js",
+    "cfggit": "bin/config/cfggit.js",
+    "cfggpg": "bin/config/cfggpg.js",
+    "cfgssh": "bin/config/cfgssh.js",
+    "cfgvim": "bin/config/cfgvim.js",
+    "cfgwsl": "bin/config/cfgwsl.js",
+    "dkrall": "bin/docker/dkrall.js",
+    "dkratt": "bin/docker/dkratt.js",
+    "dkrbd": "bin/docker/dkrbd.js",
+    "dkrrd": "bin/docker/dkrrd.js",
+    "dkrrm": "bin/docker/dkrrm.js",
+    "gaa": "bin/git/gaa.js",
+    "gb": "bin/git/gb.js",
+    "gba": "bin/git/gba.js",
+    "gbc": "bin/git/gbc.js",
+    "gbcd": "bin/git/gbcd.js",
+    "gbco": "bin/git/gbco.js",
+    "gbd": "bin/git/gbd.js",
+    "gbdio": "bin/git/gbdio.js",
+    "gbdr": "bin/git/gbdr.js",
+    "gcl": "bin/git/gcl.js",
+    "gcm": "bin/git/gcm.js",
+    "gcma": "bin/git/gcma.js",
+    "gcmane": "bin/git/gcmane.js",
+    "gcmf": "bin/git/gcmf.js",
+    "gcmfc": "bin/git/gcmfc.js",
+    "gcmfs": "bin/git/gcmfs.js",
+    "gcmi": "bin/git/gcmi.js",
+    "gcmia": "bin/git/gcmia.js",
+    "gcmiane": "bin/git/gcmiane.js",
+    "gcmif": "bin/git/gcmif.js",
+    "gcmifc": "bin/git/gcmifc.js",
+    "gcmifs": "bin/git/gcmifs.js",
+    "gco": "bin/git/gco.js",
+    "gcod": "bin/git/gcod.js",
+    "gcoghpr": "bin/git/gcoghpr.js",
+    "gcoghpr-cleanup": "bin/git/gcoghpr-cleanup.js",
+    "gcopr": "bin/git/gcopr.js",
+    "gcp": "bin/git/gcp.js",
+    "gcpa": "bin/git/gcpa.js",
+    "gcpc": "bin/git/gcpc.js",
+    "gcpx": "bin/git/gcpx.js",
+    "gcpxl": "bin/git/gcpxl.js",
+    "gd": "bin/git/gd.js",
+    "gd1": "bin/git/gd1.js",
+    "gdn": "bin/git/gdn.js",
+    "gdefb": "bin/git/gdefb.js",
+    "gdn1": "bin/git/gdn1.js",
+    "gdnh": "bin/git/gdnh.js",
+    "gdh": "bin/git/gdh.js",
+    "gl": "bin/git/gl.js",
+    "gl1": "bin/git/gl1.js",
+    "gl1g": "bin/git/gl1g.js",
+    "gmt": "bin/git/gmt.js",
+    "gngprh": "bin/git/gngprh.js",
+    "gngprm": "bin/git/gngprm.js",
+    "gp": "bin/git/gp.js",
+    "gp1": "bin/git/gp1.js",
+    "gpf": "bin/git/gpf.js",
+    "gpr": "bin/git/gpr.js",
+    "gpro": "bin/git/gpro.js",
+    "gprod": "bin/git/gprod.js",
+    "gpru": "bin/git/gpru.js",
+    "gprud": "bin/git/gprud.js",
+    "grb": "bin/git/grb.js",
+    "grba": "bin/git/grba.js",
+    "grbc": "bin/git/grbc.js",
+    "grbd": "bin/git/grbd.js",
+    "grbi": "bin/git/grbi.js",
+    "grbia": "bin/git/grbia.js",
+    "grbin": "bin/git/grbin.js",
+    "grs": "bin/git/grs.js",
+    "grs1": "bin/git/grs1.js",
+    "gs": "bin/git/gs.js",
+    "gsh": "bin/git/gsh.js",
+    "gshg": "bin/git/gshg.js",
+    "gshn": "bin/git/gshn.js",
+    "gshng": "bin/git/gshng.js",
+    "gst": "bin/git/gst.js",
+    "gstk": "bin/git/gstk.js",
+    "gstl": "bin/git/gstl.js",
+    "gstm": "bin/git/gstm.js",
+    "gstp": "bin/git/gstp.js",
+    "gsync": "bin/git/gsync.js",
+    "halp": "bin/misc/halp.js",
+    "ll": "bin/misc/ll.js",
+    "lla": "bin/misc/lla.js",
+    "nad": "bin/node/nad.js",
+    "naga": "bin/node/naga.js",
+    "nap": "bin/node/nap.js",
+    "niin": "bin/node/niin.js",
+    "nls": "bin/node/nls.js",
+    "nls1": "bin/node/nls1.js",
+    "nlsg": "bin/node/nlsg.js",
+    "nlsg1": "bin/node/nlsg1.js",
+    "nr": "bin/node/nr.js",
+    "nrd": "bin/node/nrd.js",
+    "nrin": "bin/node/nrin.js",
+    "nrp": "bin/node/nrp.js",
+    "nrx": "bin/node/nrx.js",
+    "ns": "bin/node/ns.js",
+    "nsin": "bin/node/nsin.js",
+    "nsx": "bin/node/nsx.js",
+    "nt": "bin/node/nt.js",
+    "ntin": "bin/node/ntin.js",
+    "ntx": "bin/node/ntx.js",
+    "nua": "bin/node/nua.js",
+    "nud": "bin/node/nud.js",
+    "nup": "bin/node/nup.js",
+    "nv": "bin/node/nv.js",
+    "nvls": "bin/node/nvls.js",
+    "nvlsa": "bin/node/nvlsa.js",
+    "nvmup": "bin/node/nvmup.js",
+    "nvu": "bin/node/nvu.js",
+    "osv": "bin/misc/osv.js",
+    "salfup": "bin/misc/salfup.js",
+    "srv": "bin/node/srv.js",
+    "srvw": "bin/node/srvw.js",
+    "yad": "bin/node/yad.js",
+    "yaga": "bin/node/yaga.js",
+    "yap": "bin/node/yap.js",
+    "yiin": "bin/node/yiin.js",
+    "yls": "bin/node/yls.js",
+    "yls1": "bin/node/yls1.js",
+    "ylsg": "bin/node/ylsg.js",
+    "ylsg1": "bin/node/ylsg1.js",
+    "yr": "bin/node/yr.js",
+    "yrd": "bin/node/yrd.js",
+    "yrin": "bin/node/yrin.js",
+    "yrp": "bin/node/yrp.js",
+    "yrx": "bin/node/yrx.js",
+    "ys": "bin/node/ys.js",
+    "ysin": "bin/node/ysin.js",
+    "ysx": "bin/node/ysx.js",
+    "yt": "bin/node/yt.js",
+    "ytin": "bin/node/ytin.js",
+    "ytx": "bin/node/ytx.js",
+    "yua": "bin/node/yua.js",
+    "yud": "bin/node/yud.js",
+    "yup": "bin/node/yup.js"
   },
   "type": "module",
   "license": "Unlicense",
@@ -195,17 +200,27 @@
   "dependencies": {
     "@gkalpak/cli-utils": "^0.2.0",
     "chalk": "^5.3.0",
-    "inquirer": "^9.3.4",
+    "inquirer": "^10.1.8",
     "is-wsl": "^3.1.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jasmine": "^4.2.0",
-    "jasmine": "^5.1.0",
+    "eslint-plugin-jasmine": "^4.2.1",
+    "jasmine": "^5.2.0",
     "npm-run-all": "^4.1.5",
     "shelljs": "^0.8.5",
     "strip-ansi": "^7.1.0",
     "watch": "^1.0.2"
+  },
+  "overrides-comments": {
+    "watch": {
+      "exec-sh": "Fix vulnerability in transitive dependency `merge` (see https://github.com/gkalpak/aliases/security/dependabot/1)."
+    }
+  },
+  "overrides": {
+    "watch": {
+      "exec-sh": "0.4.0"
+    }
   }
 }

package/scripts/test-pkg.js

@@ -30,7 +30,7 @@ function aliasesToBin(aliases) {
 
   Object.keys(aliases).forEach(groupName =>
     Object.keys(aliases[groupName]).forEach(name => {
-      bin[name] = `./bin/${groupName}/${name}.js`;
+      bin[name] = `bin/${groupName}/${name}.js`;
     })
   );