@gkalpak/aliases 0.10.0 → 0.10.2

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.10.0]
+  ### [Generated by: @gkalpak/aliases v0.10.2]
   ### 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.10.0]
+  ### [Generated by: @gkalpak/aliases v0.10.2]
   ### 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.10.0]
+  ### [Generated by: @gkalpak/aliases v0.10.2]
   ### 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.10.0]
+  ### [Generated by: @gkalpak/aliases v0.10.2]
   ### Run the following commands:
 
   git config --global commit.gpgSign true

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.10.0]');
+console.log('""" [Generated by: @gkalpak/aliases v0.10.2]');
 console.log('""" Copy the following into \'~/.vimrc\':\n');
 console.log(readFileSync(`${__dirname}/../../lib/assets/vimrc.txt`, 'utf8').trim() + '\n');

package/bin/git/gbco.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 fetch origin $1 && git checkout origin/$1 -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));
+  // 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.10.0');
+console.log('@gkalpak/aliases v0.10.2');

package/lib/constants.js

@@ -115,6 +115,10 @@ const CFGGIT_SPEC_WITH_CRED_HELPER = credHelper => new AliasSpec(
     `),
     'Show configuration instructions for `git`.');
 
+const GIT_CREATE_BRANCH_CMD = srcBranchArg =>
+  `git checkout ${srcBranchArg} -b $1 && git config branch.$1.remote origin && ` +
+  'git config branch.$1.merge refs/heads/$1';
+
 const SCRIPT_BACKED_CODE = (scriptName, desc) => stripIndentation(`
   #!/usr/bin/env node
   import {commandUtils} from '@gkalpak/cli-utils';
@@ -262,12 +266,9 @@ const ALIASES = {
 
     // BRANCH
     gb: new AliasDefault('git branch $*'),
-    gbc: new AliasDefault(
-        'git checkout ${2:HEAD} -b $1 && git config branch.$1.remote origin && ' +
-        'git config branch.$1.merge refs/heads/$1'),
-    gbcm: new AliasDefault(
-        `git checkout \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} -b $1 && git config branch.$1.remote origin && ` +
-        'git config branch.$1.merge refs/heads/$1'),
+    gbc: new AliasDefault(GIT_CREATE_BRANCH_CMD('${2:HEAD}')),
+    gbcm: new AliasDefault(GIT_CREATE_BRANCH_CMD(`\${0:::${GIT_GET_DEFAULT_BRANCH_CMD}}`)),
+    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)

package/lib/utils.js

@@ -1,5 +1,5 @@
 // Imports
-import {readFileSync} from 'node:fs';
+import {existsSync, readFileSync, realpathSync} from 'node:fs';
 import {createRequire} from 'node:module';
 import {fileURLToPath, pathToFileURL} from 'node:url';
 
@@ -11,6 +11,8 @@ const LINE_LIMIT = 75;
 const INDENT_PER_LEVEL = 2;
 const PLATFORM = isWsl ? 'wsl' : process.platform;
 const internal = {
+  _fsExistsSync,
+  _fsRealpathSync,
   _getPlatform,
   _import,
   _onError,
@@ -35,6 +37,14 @@ export {
 };
 
 // Helpers
+function _fsExistsSync(path) {
+  return existsSync(path);
+}
+
+function _fsRealpathSync(path) {
+  return realpathSync(path);
+}
+
 function _getPlatform() {
   return PLATFORM;
 }
@@ -113,17 +123,11 @@ async function importWithEnv(targetImportPath, sourceImportMetaUrl, tempEnvVars)
 }
 
 function isMain(fileUrl) {
-  const extRe = /\.[cm]?js$/;
-
+  const mainExt = ['', '.js'].find(ext => internal._fsExistsSync(`${process.argv[1]}${ext}`)) ?? '';
+  const mainPath = internal._fsRealpathSync(`${process.argv[1]}${mainExt}`);
   const filePath = fileURLToPath(fileUrl);
-  const mainPath = process.argv[1];
-
-  const filePathExt = extRe.exec(filePath)?.[0];
-  const mainPathExt = extRe.exec(mainPath)?.[0];
 
-  return (filePath === mainPath) ||
-    ((filePathExt !== null) && (filePath === `${mainPath}${filePathExt}`)) ||
-    ((mainPathExt !== null) && (`${filePath}${mainPathExt}` === mainPath));
+  return filePath === mainPath;
 }
 
 function loadJson(filePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -52,6 +52,7 @@
     "gb": "./bin/git/gb.js",
     "gbc": "./bin/git/gbc.js",
     "gbcm": "./bin/git/gbcm.js",
+    "gbco": "./bin/git/gbco.js",
     "gbd": "./bin/git/gbd.js",
     "gcl": "./bin/git/gcl.js",
     "gcm": "./bin/git/gcm.js",