@gkalpak/aliases 0.14.0 → 0.14.1

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.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### 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.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfggit.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### Run the following commands:
 
   git config --global commit.gpgSign "true"

package/bin/config/cfggit.win32.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### Run the following commands:
 
   git config --global commit.gpgSign "true"

package/bin/config/cfggit.wsl.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### Run the following commands:
 
   git config --global commit.gpgSign "true"

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.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### 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.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### Copy the following into '~/.ssh/config':
 
   IdentityFile ~/.ssh/id-rsa-gkalpak.priv

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.14.0]');
+console.log('""" [Generated by: @gkalpak/aliases v0.14.1]');
 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.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### 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.14.0]
+  ### [Generated by: @gkalpak/aliases v0.14.1]
   ### Copy the following into a root-owned, 600-mode '/etc/wsl.conf' file:
 
   [network]

package/bin/misc/alv.js

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

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

@@ -70,7 +70,7 @@ function main(runtimeArgs, config) {
 
 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'});
+  const {default: select, Separator} = await importWithEnv(() => import('@inquirer/select'), {FORCE_COLOR: '1'});
 
   const currentBranchIdx = Math.max(0, branches.findIndex(({name}) => name.endsWith(branchNameSuffices['*'])));
 
@@ -84,17 +84,23 @@ async function pickBranch(branchType, branches) {
   });
 
   try {
-    const {branch} = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'branch',
-        message: `Pick a ${branchType} branch:`,
-        choices: branches.concat(new inquirer.Separator()),
-        default: currentBranchIdx,
-      },
-    ]);
+    const branch = await select({
+      message: `Pick a ${branchType} branch:`,
+      choices: branches.concat(new Separator()),
+      default: branches[currentBranchIdx]?.value,
+    });
 
     return branch;
+  } catch (err) {
+    if (
+      (err instanceof Error) &&
+      (err.name === 'ExitPromptError') &&
+      err.message.startsWith('User force closed the prompt')
+    ) {
+      process.stderr.write('Aborted by user.\n');
+    } else {
+      throw err;
+    }
   } finally {
     unlisten();
   }

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

@@ -76,13 +76,14 @@ function main(runtimeArgs, config) {
 
 async function pickCommit(commitsStr) {
   // Ensure colors are always used (even when running with `returnOutput: <number>`).
-  const {default: inquirer} = await importWithEnv(() => import('inquirer'), {FORCE_COLOR: '1'});
+  const {default: select, Separator} = await importWithEnv(() => import('@inquirer/select'), {FORCE_COLOR: '1'});
 
   const commits = commitsStr.
     split('\n').
     map(line => line.trim()).
     filter(Boolean).
-    concat(new inquirer.Separator());
+    map(line => ({name: line, value: line.replace(/\s+.*$/, '')})).
+    concat(new Separator());
 
   const unlisten = processUtils.doOnExit(process, code => {
     if (code === 0) {
@@ -94,17 +95,23 @@ async function pickCommit(commitsStr) {
   });
 
   try {
-    const {commit} = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'commit',
-        message: 'Pick a commit:',
-        choices: commits,
-        default: 0,
-      },
-    ]);
-
-    return commit.replace(/\s+.*$/, '');
+    const commit = await select({
+      message: 'Pick a commit:',
+      choices: commits,
+      default: commits[0].value,
+    });
+
+    return commit;
+  } catch (err) {
+    if (
+      (err instanceof Error) &&
+      (err.name === 'ExitPromptError') &&
+      err.message.startsWith('User force closed the prompt')
+    ) {
+      process.stderr.write('Aborted by user.\n');
+    } else {
+      throw err;
+    }
   } finally {
     unlisten();
   }

package/lib/utils.js

@@ -13,6 +13,7 @@ const internal = {
   _fsExistsSync,
   _fsRealpathSync,
   _getPlatform,
+  _importWithEnv,
   _onError,
   _wrapLine,
 };
@@ -47,6 +48,24 @@ function _getPlatform() {
   return PLATFORM;
 }
 
+async function _importWithEnv(importFn, tempEnvVars) {
+  const {env} = process;
+
+  const tempEnvVarNames = Object.keys(tempEnvVars);
+  const originalValues = tempEnvVarNames.
+    filter(name => hasOwnProperty(env, name)).
+    reduce((aggr, name) => Object.assign(aggr, {[name]: env[name]}), {});
+
+  try {
+    Object.assign(env, tempEnvVars);
+    return await importFn();
+  } finally {
+    tempEnvVarNames.forEach(name => hasOwnProperty(originalValues, name) ?
+      env[name] = originalValues[name] :
+      delete env[name]);
+  }
+}
+
 async function _onError(err) {
   // NOTE:
   //   Avoid eagerly loading `chalk` at the top of the file to allow for it to be imported (directly
@@ -90,22 +109,8 @@ function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
-async function importWithEnv(importFn, tempEnvVars) {
-  const {env} = process;
-
-  const tempEnvVarNames = Object.keys(tempEnvVars);
-  const originalValues = tempEnvVarNames.
-    filter(name => hasOwnProperty(env, name)).
-    reduce((aggr, name) => Object.assign(aggr, {[name]: env[name]}), {});
-
-  try {
-    Object.assign(env, tempEnvVars);
-    return await importFn();
-  } finally {
-    tempEnvVarNames.forEach(name => hasOwnProperty(originalValues, name) ?
-      env[name] = originalValues[name] :
-      delete env[name]);
-  }
+function importWithEnv(importFn, tempEnvVars) {
+  return internal._importWithEnv(importFn, tempEnvVars);
 }
 
 function isMain(fileUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -199,9 +199,9 @@
     }
   },
   "dependencies": {
-    "@gkalpak/cli-utils": "^0.3.0",
+    "@gkalpak/cli-utils": "^0.3.1",
+    "@inquirer/select": "^5.1.0",
     "chalk": "^5.6.2",
-    "inquirer": "^13.3.0",
     "is-wsl": "^3.1.1"
   },
   "devDependencies": {

package/scripts/platformize-bin.js

@@ -20,7 +20,7 @@ function _main() {
   const defaultScripts = findFiles(BIN_DIR).filter(x => defaultExtRe.test(x));
   defaultScripts.forEach(defaultScriptPath => {
     const activeScriptPath = defaultScriptPath.replace(defaultExtRe, '.js');
-    moveFile(defaultScriptPath, activeScriptPath);
+    renameSync(defaultScriptPath, activeScriptPath);
   });
 
   // "Activate" any platform-specific scripts.
@@ -33,26 +33,27 @@ function _main() {
     const activeScriptMode = statSync(activeScriptPath).mode;
 
     // Back up the default script for future restoration.
-    moveFile(activeScriptPath, defaultScriptPath);
+    renameSync(activeScriptPath, defaultScriptPath);
 
     // Copy the platform-specific script (not move just in case).
-    copyFile(platformScriptPath, activeScriptPath);
+    copyFileSync(platformScriptPath, activeScriptPath);
 
     // Preserve active script mode (including "executability") for the scripts to work on *nix platforms.
     chmodSync(activeScriptPath, activeScriptMode);
   });
 }
 
-function copyFile(fromPath, toPath) {
-  copyFileSync(fromPath, toPath);
-}
-
+/**
+ * @param {string} rootDir
+ * @returns {string[]}
+ */
 function findFiles(rootDir) {
   const unvisitedDirectories = [rootDir];
+  /** @type {string[]} */
   const files = [];
 
   while (unvisitedDirectories.length) {
-    const currentDir = unvisitedDirectories.pop();
+    const currentDir = /** @type {string} */(unvisitedDirectories.pop());
     readdirSync(currentDir).forEach(name => {
       const path = join(currentDir, name);
       const info = statSync(path);
@@ -64,7 +65,3 @@ function findFiles(rootDir) {
 
   return files;
 }
-
-function moveFile(fromPath, toPath) {
-  renameSync(fromPath, toPath);
-}