@gkalpak/aliases 0.12.2 → 0.12.4

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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]');
+console.log('""" [Generated by: @gkalpak/aliases v0.12.4]');
 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2]
+  ### [Generated by: @gkalpak/aliases v0.12.4]
   ### 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.12.2');
+console.log('@gkalpak/aliases v0.12.4');

package/lib/alias-scripts/a-builds-dir.js

@@ -47,7 +47,8 @@ async function _aBuildsDir(config) {
     return buildsDirPath;
   }
 
-  console.log(buildsDirPath);
+  // Log on a new line to ensure nothing is already written on the line (e.g. escape sequences).
+  console.log(`\n${buildsDirPath}`);
 }
 
 function _fsStat(filePath) {

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

@@ -46,7 +46,8 @@ async function _gPickBranch(config) {
     return branch;
   }
 
-  console.log(branch);
+  // Log on a new line to ensure nothing is already written on the line (e.g. escape sequences).
+  console.log(`\n${branch}`);
 }
 
 function gPickBranch(config) {
@@ -59,7 +60,7 @@ function main(_runtimeArgs, config) {
 
 async function pickBranch(branchesStr) {
   // Ensure colors are always used (even when running with `returnOutput: <number>`).
-  const {default: inquirer} = await importWithEnv('inquirer', import.meta.url, {FORCE_COLOR: '1'});
+  const {default: inquirer} = await importWithEnv(() => import('inquirer'), {FORCE_COLOR: '1'});
 
   let currentBranchIdx = 0;
   const branches = branchesStr.

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

@@ -46,7 +46,8 @@ async function _gPickCommit(config) {
     return commit;
   }
 
-  console.log(commit);
+  // Log on a new line to ensure nothing is already written on the line (e.g. escape sequences).
+  console.log(`\n${commit}`);
 }
 
 function gPickCommit(config) {
@@ -59,7 +60,7 @@ function main(_runtimeArgs, config) {
 
 async function pickCommit(commitsStr) {
   // Ensure colors are always used (even when running with `returnOutput: <number>`).
-  const {default: inquirer} = await importWithEnv('inquirer', import.meta.url, {FORCE_COLOR: '1'});
+  const {default: inquirer} = await importWithEnv(() => import('inquirer'), {FORCE_COLOR: '1'});
 
   const commits = commitsStr.
     split('\n').

package/lib/utils.js

@@ -1,7 +1,6 @@
 // Imports
 import {existsSync, readFileSync, realpathSync} from 'node:fs';
-import {createRequire} from 'node:module';
-import {fileURLToPath, pathToFileURL} from 'node:url';
+import {fileURLToPath} from 'node:url';
 
 import isWsl from 'is-wsl';
 
@@ -14,7 +13,6 @@ const internal = {
   _fsExistsSync,
   _fsRealpathSync,
   _getPlatform,
-  _import,
   _onError,
   _wrapLine,
 };
@@ -49,10 +47,6 @@ function _getPlatform() {
   return PLATFORM;
 }
 
-function _import(filePath) {
-  return import(filePath);
-}
-
 async function _onError(err) {
   // NOTE:
   //   Avoid eagerly loading `chalk` at the top of the file to allow for it to be imported (directly
@@ -96,7 +90,7 @@ function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
-async function importWithEnv(targetImportPath, sourceImportMetaUrl, tempEnvVars) {
+async function importWithEnv(importFn, tempEnvVars) {
   const {env} = process;
 
   const tempEnvVarNames = Object.keys(tempEnvVars);
@@ -104,17 +98,9 @@ async function importWithEnv(targetImportPath, sourceImportMetaUrl, tempEnvVars)
     filter(name => hasOwnProperty(env, name)).
     reduce((aggr, name) => Object.assign(aggr, {[name]: env[name]}), {});
 
-  const req = createRequire(sourceImportMetaUrl);
-  const resolvedImportPath = req.resolve(targetImportPath);
-  const resolvedImportUrl = ((resolvedImportPath === targetImportPath) && !/[\\/]/.test(resolvedImportPath)) ?
-    // It's a built-in module: Do not convert to file URL.
-    resolvedImportPath :
-    // It's a relative path: Convert to file URL.
-    pathToFileURL(resolvedImportPath).href;
-
   try {
     Object.assign(env, tempEnvVars);
-    return await internal._import(resolvedImportUrl);
+    return await importFn();
   } finally {
     tempEnvVarNames.forEach(name => hasOwnProperty(originalValues, name) ?
       env[name] = originalValues[name] :

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -195,13 +195,13 @@
   "dependencies": {
     "@gkalpak/cli-utils": "^0.1.10",
     "chalk": "^5.3.0",
-    "inquirer": "^9.2.20",
+    "inquirer": "^9.3.4",
     "is-wsl": "^3.1.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jasmine": "^4.1.3",
+    "eslint-plugin-jasmine": "^4.2.0",
     "jasmine": "^5.1.0",
     "npm-run-all": "^4.1.5",
     "shelljs": "^0.8.5",