@gkalpak/aliases 0.9.4 → 0.10.1

package/bin/node/ysin.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'yarn --cwd=$1 start $2*';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'yarn --cwd=$1 start $2*';
+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/node/ysx.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'yarn start $*';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'yarn start $*';
+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,"suppressTbj":true}, config)).catch(onError);

package/bin/node/yt.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'yarn test $*';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'yarn test $*';
+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/node/ytin.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'yarn --cwd=$1 test $2*';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'yarn --cwd=$1 test $2*';
+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/node/ytx.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'yarn test $*';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'yarn test $*';
+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,"suppressTbj":true}, config)).catch(onError);

package/bin/node/yua.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'node --eval "/* Update dependencies. */ const deps = Object.keys(require(\'./package.json\').dependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' dependencies...\'); deps.length && child_process.spawnSync(\'yap\', deps, {shell: true, stdio: \'inherit\'});" && node --eval "/* Update devDependencies. */ const deps = Object.keys(require(\'./package.json\').devDependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' devDependencies...\'); deps.length && child_process.spawnSync(\'yad\', deps, {shell: true, stdio: \'inherit\'});"';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'node --eval "/* Update dependencies. */ const deps = Object.keys(require(\'./package.json\').dependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' dependencies...\'); deps.length && child_process.spawnSync(\'yap\', deps, {shell: true, stdio: \'inherit\'});" && node --eval "/* Update devDependencies. */ const deps = Object.keys(require(\'./package.json\').devDependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' devDependencies...\'); deps.length && child_process.spawnSync(\'yad\', deps, {shell: true, stdio: \'inherit\'});"';
+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/node/yud.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'node --eval "/* Update devDependencies. */ const deps = Object.keys(require(\'./package.json\').devDependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' devDependencies...\'); deps.length && child_process.spawnSync(\'yad\', deps, {shell: true, stdio: \'inherit\'});"';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'node --eval "/* Update devDependencies. */ const deps = Object.keys(require(\'./package.json\').devDependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' devDependencies...\'); deps.length && child_process.spawnSync(\'yad\', deps, {shell: true, stdio: \'inherit\'});"';
+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/node/yup.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-'use strict';
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'node --eval "/* Update dependencies. */ const deps = Object.keys(require(\'./package.json\').dependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' dependencies...\'); deps.length && child_process.spawnSync(\'yap\', deps, {shell: true, stdio: \'inherit\'});"';
-if (require.main === module) {
-  const {commandUtils} = require('@gkalpak/cli-utils');
-  const {onError} = require('../../lib/utils');
+const cmd = 'node --eval "/* Update dependencies. */ const deps = Object.keys(require(\'./package.json\').dependencies || {}).map(x => x + \'@latest\'); console.log(\'\\nUpdating \' + deps.length + \' dependencies...\'); deps.length && child_process.spawnSync(\'yap\', deps, {shell: true, stdio: \'inherit\'});"';
+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/lib/alias-scripts/a-builds-dir.js

@@ -1,12 +1,19 @@
-'use strict';
-
 // Imports
-const fs = require('fs');
-const path = require('path');
-const utils = require('../utils');
+import {stat} from 'node:fs/promises';
+import {resolve as pathResolve} from 'node:path';
+
+import {stripIndentation} from '../utils.js';
+
+
+// Constants
+const internal = {
+  _aBuildsDir,
+  _fsStat,
+  _pathResolve,
+};
 
 // Exports
-const exps = module.exports = {
+export {
   /**
    * @function aBuildsDir
    *
@@ -19,44 +26,49 @@ const exps = module.exports = {
    * @return {Promise<void|string>} - A promise that resolves to either `undefined` or the absolute directory path
    *     (depending on the value of `config.returnOutput`).
    */
-  aBuildsDir: _aBuildsDir,
+  aBuildsDir,
 
-  main: __main,
-};
+  main,
 
-// Functions - Definitions
-function __main(_runtimeArgs, config) {
-  return exps.aBuildsDir(config);
-}
+  // Exposed for testing purposes only.
+  internal as _testing,
+};
 
-function _aBuildsDir(config) {
+// Helpers
+async function _aBuildsDir(config) {
   if (config.dryrun) {
     console.log('Get the absolute path to \'.../angular/aio/aio-builds-setup/\'.');
-    return Promise.resolve();
+    return;
+  }
+
+  const buildsDirPath = await locateBuildsDir(config.debug);
+
+  if (config.returnOutput) {
+    return buildsDirPath;
   }
 
-  return locateBuildsDir(config.debug).
-    then(buildsDirPath => config.returnOutput ? buildsDirPath : console.log(buildsDirPath));
+  console.log(buildsDirPath);
 }
 
-function exists(somePath) {
-  return new Promise(resolve => fs.exists(somePath, resolve));
+function _fsStat(filePath) {
+  return stat(filePath);
 }
 
-function isBuildsDir(candidateAbsPath) {
-  return Promise.resolve(true).
-    then(prev => prev && /[\\/]aio[\\/]aio-builds-setup$/.test(candidateAbsPath)).
-    then(prev => prev && exists(candidateAbsPath)).
-    then(prev => prev && isDirectory(candidateAbsPath));
+function _pathResolve(...paths) {
+  return pathResolve(...paths);
 }
 
-function isDirectory(somePath) {
-  return new Promise((resolve, reject) =>
-    fs.stat(somePath, (err, stats) =>
-      err ? reject(err) : resolve(stats.isDirectory())));
+function aBuildsDir(config) {
+  return internal._aBuildsDir(config);
 }
 
-function locateBuildsDir(debug = false) {
+async function isBuildsDir(candidateAbsPath) {
+  return /[\\/]aio[\\/]aio-builds-setup$/.test(candidateAbsPath) &&
+    await pathExists(candidateAbsPath) &&
+    await pathIsDirectory(candidateAbsPath);
+}
+
+async function locateBuildsDir(debug = false) {
   const candidateRelPaths = [
     'aio/aio-builds-setup', // Run from: angular/
     'aio-builds-setup',     // Run from: angular/aio/
@@ -65,29 +77,37 @@ function locateBuildsDir(debug = false) {
     '../..',                // Run from: angular/aio/aio-builds-setup/dockerbuild/scripts-js/
   ];
 
-  return candidateRelPaths.
-    reduce((prevPromise, p) => prevPromise.then(prevAbsPath => {
-      if (prevAbsPath) return prevAbsPath;
+  for (const p of candidateRelPaths) {
+    const absPath = internal._pathResolve(p);
 
-      const absPath = path.resolve(p);
+    if (debug) {
+      console.log(`Checking '${p}' (resolved to '${absPath}')...`);
+    }
 
+    if (await isBuildsDir(absPath)) {
       if (debug) {
-        console.log(`Checking '${p}' (resolved to '${absPath}')...`);
+        console.log(`Target directory found: ${absPath}`);
       }
 
-      return isBuildsDir(absPath).then(itIs => itIs && absPath);
-    }), Promise.resolve(false)).
-    then(buildsDirPath => {
-      if (debug && buildsDirPath) {
-        console.log(`Target directory found: ${buildsDirPath}`);
-      }
-      return buildsDirPath || notFound();
-    });
-}
+      return absPath;
+    }
+  }
 
-function notFound() {
-  throw new Error(utils.stripIndentation(`
+  throw new Error(stripIndentation(`
     Unable to locate the '.../aio/aio-setup-builds/' directory.
     Make sure you are in a directory between 'angular/' and 'angular/aio/aio-builds-setup/dockerbuild/scripts-js/'.
   `));
 }
+
+function main(_runtimeArgs, config) {
+  return aBuildsDir(config);
+}
+
+function pathExists(somePath) {
+  return internal._fsStat(somePath).then(() => true, () => false);
+}
+
+async function pathIsDirectory(somePath) {
+  const stats = await internal._fsStat(somePath);
+  return stats.isDirectory();
+}

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

@@ -1,14 +1,16 @@
-'use strict';
-
 // Imports
-const {commandUtils, processUtils} = require('@gkalpak/cli-utils');
-const utils = require('../utils');
+import {commandUtils, processUtils} from '@gkalpak/cli-utils';
+
+import {importWithEnv} from '../utils.js';
 
-// Ensure colors are always used (even when running with `returnOutput: <number>`).
-const inquirer = utils.requireWithEnv('inquirer', process.env, {FORCE_COLOR: '1'});
+
+// Constants
+const internal = {
+  _gPickBranch,
+};
 
 // Exports
-const exps = module.exports = {
+export {
   /**
    * @function gPickBranch
    *
@@ -20,30 +22,45 @@ const exps = module.exports = {
    * @return {Promise<void|string>} - A promise that resolves to either `undefined` or the selected branch (depending on
    *     the value of `config.returnOutput`).
    */
-  gPickBranch: _gPickBranch,
+  gPickBranch,
 
-  main: __main,
-};
+  main,
 
-// Functions - Definitions
-function __main(_runtimeArgs, config) {
-  return exps.gPickBranch(config);
-}
+  // Exposed for testing purposes only.
+  internal as _testing,
+};
 
-function _gPickBranch(config) {
+// Helpers
+async function _gPickBranch(config) {
   const gbConfig = Object.assign({}, config, {returnOutput: true});
 
   if (config.dryrun) {
     console.log('Pick one from a list of branches.');
-    return Promise.resolve();
+    return;
+  }
+
+  const branchOutput = await commandUtils.run('git branch', [], gbConfig);
+  const branch = await pickBranch(branchOutput);
+
+  if (config.returnOutput) {
+    return branch;
   }
 
-  return commandUtils.run('git branch', [], gbConfig).
-    then(output => pickBranch(output)).
-    then(branch => config.returnOutput ? branch : console.log(branch));
+  console.log(branch);
+}
+
+function gPickBranch(config) {
+  return internal._gPickBranch(config);
 }
 
-function pickBranch(branchesStr) {
+function main(_runtimeArgs, config) {
+  return gPickBranch(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'});
+
   let currentBranchIdx = 0;
   const branches = branchesStr.
     split('\n').
@@ -85,8 +102,8 @@ function pickBranch(branchesStr) {
     }
   });
 
-  const promise = inquirer.
-    prompt([
+  try {
+    const {branch} = await inquirer.prompt([
       {
         type: 'list',
         name: 'branch',
@@ -94,8 +111,10 @@ function pickBranch(branchesStr) {
         choices: branches,
         default: currentBranchIdx,
       },
-    ]).
-    then(({branch}) => branch);
+    ]);
 
-  return utils.finallyAsPromised(promise, unlisten);
+    return branch;
+  } finally {
+    unlisten();
+  }
 }

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

@@ -1,14 +1,16 @@
-'use strict';
-
 // Imports
-const {commandUtils, processUtils} = require('@gkalpak/cli-utils');
-const utils = require('../utils');
+import {commandUtils, processUtils} from '@gkalpak/cli-utils';
+
+import {importWithEnv} from '../utils.js';
 
-// Ensure colors are always used (even when running with `returnOutput: <number>`).
-const inquirer = utils.requireWithEnv('inquirer', process.env, {FORCE_COLOR: '1'});
+
+// Constants
+const internal = {
+  _gPickCommit,
+};
 
 // Exports
-const exps = module.exports = {
+export {
   /**
    * @function gPickCommit
    *
@@ -20,30 +22,45 @@ const exps = module.exports = {
    * @return {Promise<void|string>} - A promise that resolves to either `undefined` or the selected commit (depending on
    *     the value of `config.returnOutput`).
    */
-  gPickCommit: _gPickCommit,
+  gPickCommit,
 
-  main: __main,
-};
+  main,
 
-// Functions - Definitions
-function __main(_runtimeArgs, config) {
-  return exps.gPickCommit(config);
-}
+  // Exposed for testing purposes only.
+  internal as _testing,
+};
 
-function _gPickCommit(config) {
+// Helpers
+async function _gPickCommit(config) {
   const glConfig = Object.assign({}, config, {returnOutput: true});
 
   if (config.dryrun) {
     console.log('Pick one from a list of commits.');
-    return Promise.resolve();
+    return;
+  }
+
+  const commitOutput = await commandUtils.run('git log --oneline -50', [], glConfig);
+  const commit = await pickCommit(commitOutput);
+
+  if (config.returnOutput) {
+    return commit;
   }
 
-  return commandUtils.run('git log --oneline -50', [], glConfig).
-    then(output => pickCommit(output)).
-    then(commit => config.returnOutput ? commit : console.log(commit));
+  console.log(commit);
+}
+
+function gPickCommit(config) {
+  return internal._gPickCommit(config);
 }
 
-function pickCommit(commitsStr) {
+function main(_runtimeArgs, config) {
+  return gPickCommit(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 commits = commitsStr.
     split('\n').
     map(line => line.trim()).
@@ -59,8 +76,8 @@ function pickCommit(commitsStr) {
     }
   });
 
-  const promise = inquirer.
-    prompt([
+  try {
+    const {commit} = await inquirer.prompt([
       {
         type: 'list',
         name: 'commit',
@@ -68,8 +85,10 @@ function pickCommit(commitsStr) {
         choices: commits,
         default: 0,
       },
-    ]).
-    then(({commit}) => commit.replace(/\s+.*$/, ''));
+    ]);
 
-  return utils.finallyAsPromised(promise, unlisten);
+    return commit.replace(/\s+.*$/, '');
+  } finally {
+    unlisten();
+  }
 }