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

package/bin/git/gbcd.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git checkout ${0:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1';
+const cmd = 'git checkout ${0:::gdefb --gkcu-returnOutput} -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/gcod.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git checkout ${0:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} $*';
+const cmd = 'git checkout ${0:::gdefb --gkcu-returnOutput} $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/gprod.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git pull --rebase origin ${0:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} $*';
+const cmd = 'git pull --rebase origin ${0:::gdefb --gkcu-returnOutput} $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/gprud.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git pull --rebase upstream ${0:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} $*';
+const cmd = 'git pull --rebase upstream ${0:::gdefb --gkcu-returnOutput} $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/grbd.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git rebase --ignore-date ${0:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} $*';
+const cmd = 'git rebase --ignore-date ${0:::gdefb --gkcu-returnOutput} $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/gsync.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git checkout ${1:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} && git pull upstream ${1:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"} && git push origin ${1:::node --eval "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); const print = msg => process.stdout.write(msg); try { print(exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').trim().slice(rem.length + 1)); } catch { print(exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\').trim()); }"}';
+const cmd = 'git checkout ${1:::gdefb --gkcu-returnOutput} && git pull upstream ${1:::gdefb --gkcu-returnOutput} && git push origin ${1:::gdefb --gkcu-returnOutput}';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/misc/alv.js

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

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

@@ -59,7 +59,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

@@ -59,7 +59,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/constants.js

@@ -18,21 +18,6 @@ const PR_REMOTE_ALIAS_PREFIX = 'gcoghpr';
 const PR_LOCAL_BRANCH_PREFIX = 'gcoghpr';
 
 const SOURCE_NVM_CMD = '. $NVM_DIR/nvm.sh';
-const GIT_GET_DEFAULT_BRANCH_CMD =
-    stripIndentation(`
-      node --eval "
-        const rem = 'origin';
-        const exec = cmd => child_process.execSync(cmd, {encoding: 'utf8', stdio: 'pipe'});
-        const print = msg => process.stdout.write(msg);
-        try {
-          print(exec('git rev-parse --abbrev-ref ' + rem + '/HEAD').trim().slice(rem.length + 1));
-        } catch {
-          print(exec(['main', 'master'].
-            map(b => '(git show-ref --heads --quiet ' + b + ' && echo ' + b + ')').
-            join(' || ') +
-            ' || echo unknown-branch').trim());
-        }"
-    `).replace(/([;{+])(\n)/g, '$1 $2').replace(/\n\s*/g, '');
 const GLOBAL_NPM_PACKAGES = [
   '@angular/cli',
   '@gkalpak/aliases',
@@ -51,7 +36,7 @@ const GLOBAL_NPM_PACKAGES = [
 
 const DESC_REPLACEMENTS = {
   [AliasUnknown.DESCRIPTION]: '???',
-  [`::${GIT_GET_DEFAULT_BRANCH_CMD}`]: '<default-branch>',
+  '::gdefb': '<default-branch>',
   '::__a-builds-dir': '(<.../angular/aio/aio-builds-setup>)',
   '::__g-pick-branch --gkcu-returnOutput=1': '(interactively pick a branch)',
   '::__g-pick-commit --gkcu-returnOutput=1': '(interactively pick a commit)',
@@ -254,7 +239,21 @@ const ALIASES = {
   git: {
     // STATUS
     gs: new AliasDefault('git status $*'),
-    gdefb: new AliasDefault(GIT_GET_DEFAULT_BRANCH_CMD),
+    gdefb: new AliasDefault(
+        stripIndentation(`
+          node --eval "
+            const rem = 'origin';
+            const exec = cmd => child_process.execSync(cmd, {encoding: 'utf8', stdio: 'pipe'});
+            const print = msg => process.stdout.write(msg);
+            try {
+              print(exec('git rev-parse --abbrev-ref ' + rem + '/HEAD').trim().slice(rem.length + 1));
+            } catch {
+              print(exec(['main', 'master'].
+                map(b => '(git show-ref --heads --quiet ' + b + ' && echo ' + b + ')').
+                join(' || ') +
+                ' || echo unknown-branch').trim());
+            }"
+        `).replace(/([;{+])(\n)/g, '$1 $2').replace(/\n\s*/g, '')),
     gl: new AliasDefault('git log --decorate $* || true'),
     gl1: new AliasDefault('git log --decorate --oneline $* || true'),
     gl1g: new AliasDefault('git log --decorate --oneline | grep $*'),
@@ -276,7 +275,7 @@ const ALIASES = {
 
     // CHECKOUT
     gco: new AliasDefault('git checkout ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
-    gcod: new AliasDefault(`git checkout \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    gcod: new AliasDefault('git checkout ${0:::gdefb --gkcu-returnOutput} $*'),
     gcopr: new AliasDefault('git fetch upstream pull/$1/head && git checkout FETCH_HEAD'),
     gcoghpr: SCRIPT_BACKED_ALIAS('gcoghpr', 'Check out a GitHub pull request as a local branch.'),
     'gcoghpr-cleanup': new AliasDefault(
@@ -312,29 +311,29 @@ const ALIASES = {
     // BRANCH
     gb: new AliasDefault('git branch $*'),
     gbc: new AliasDefault(GIT_CREATE_BRANCH_CMD('${2:HEAD}')),
-    gbcd: new AliasDefault(GIT_CREATE_BRANCH_CMD(`\${0:::${GIT_GET_DEFAULT_BRANCH_CMD}}`)),
+    gbcd: new AliasDefault(GIT_CREATE_BRANCH_CMD('${0:::gdefb --gkcu-returnOutput}')),
     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}'),
 
     // PULL(-REBASE)
     gpr: new AliasDefault('git pull --rebase $*'),
     gpro: new AliasDefault('git pull --rebase origin ${*:::git rev-parse --abbrev-ref HEAD}'),
-    gprod: new AliasDefault(`git pull --rebase origin \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    gprod: new AliasDefault('git pull --rebase origin ${0:::gdefb --gkcu-returnOutput} $*'),
     gpru: new AliasDefault('git pull --rebase upstream ${*:::git rev-parse --abbrev-ref HEAD}'),
-    gprud: new AliasDefault(`git pull --rebase upstream \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    gprud: new AliasDefault('git pull --rebase upstream ${0:::gdefb --gkcu-returnOutput} $*'),
 
     // SYNC DEFAULT BRANCH
     gsync: new AliasDefault(
-        `git checkout \${1:::${GIT_GET_DEFAULT_BRANCH_CMD}} && ` +
-        `git pull upstream \${1:::${GIT_GET_DEFAULT_BRANCH_CMD}} && ` +
-        `git push origin \${1:::${GIT_GET_DEFAULT_BRANCH_CMD}}`),
+        'git checkout ${1:::gdefb --gkcu-returnOutput} && ' +
+        'git pull upstream ${1:::gdefb --gkcu-returnOutput} && ' +
+        'git push origin ${1:::gdefb --gkcu-returnOutput}'),
 
 
     // REBASE
     grb: new AliasDefault('git rebase ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
     grba: new AliasDefault('git rebase --abort'),
     grbc: new AliasDefault('git rebase --continue'),
-    grbd: new AliasDefault(`git rebase --ignore-date \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    grbd: new AliasDefault('git rebase --ignore-date ${0:::gdefb --gkcu-returnOutput} $*'),
     grbi: new AliasDefault('git rebase --interactive HEAD~$1'),
     grbia: new AliasDefault('git rebase --autosquash --interactive HEAD~$1'),
     grbin: new AliasDefault('git rebase --no-autosquash --interactive HEAD~$1'),

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.1",
+  "version": "0.12.3",
   "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",