hypermod-io · coderaiser · Apr 9, 2022
diff --git a/packages/cli/bin/codeshift-cli.js b/packages/cli/bin/codeshift-cli.js
@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+const tryCatch = require('try-catch');
+const isNumber = a => typeof a === 'number';
 /* eslint-disable */
 
 const fs = require('fs');
@@ -11,10 +13,10 @@ if (dev && !require.extensions['.ts']) {
   require('ts-node').register({ project });
 }
 
-try {
-  require(path.join('..', dev ? 'src/index' : 'dist/codeshift-cli.cjs.js'));
-} catch (error) {
-  if (typeof error === 'number') {
+const [error] = tryCatch(require, path.join('..', dev ? 'src/index' : 'dist/codeshift-cli.cjs.js'));
+
+if (error) {
+  if (isNumber(error)) {
     process.exit(error);
   }
   console.error(error);

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -1,3 +1,4 @@
+import tryToCatch from 'try-to-catch';
 import chalk from 'chalk';
 import { Command, Option, CommanderError } from 'commander';
 
@@ -128,34 +129,32 @@ Examples:
 
 program.exitOverride();
 
-(async function() {
-  try {
-    await program.parseAsync(process.argv);
-  } catch (error) {
-    if (error instanceof CommanderError) {
-      if (
-        error.code === 'commander.helpDisplayed' ||
-        error.code === 'commander.version'
-      ) {
-        return;
-      }
-
-      console.error(chalk.red(error.message));
-      process.exit(error.exitCode);
-    }
+const [error] = await tryToCatch(program.parseAsync, process.argv);
 
-    if (error instanceof InvalidUserInputError) {
-      console.warn(program.help());
-      console.warn(chalk.red(error.message));
-      process.exit(9);
+if (error) {
+  if (error instanceof CommanderError) {
+    if (
+      error.code === 'commander.helpDisplayed' ||
+      error.code === 'commander.version'
+    ) {
+      return;
     }
 
-    if (error instanceof InvalidConfigError) {
-      console.warn(chalk.red(error.message));
-      process.exit(7);
-    }
+    console.error(chalk.red(error.message));
+    process.exit(error.exitCode);
+  }
 
-    console.error(chalk.red(error));
-    process.exit(1);
+  if (error instanceof InvalidUserInputError) {
+    console.warn(program.help());
+    console.warn(chalk.red(error.message));
+    process.exit(9);
   }
-})();
+
+  if (error instanceof InvalidConfigError) {
+    console.warn(chalk.red(error.message));
+    process.exit(7);
+  }
+
+  console.error(chalk.red(error));
+  process.exit(1);
+}
diff --git a/packages/cli/src/init.ts b/packages/cli/src/init.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 import { initDirectory, initTransform } from '@codeshift/initializer';
 
-export default async function init(
+export default function init(
   packageName: string,
   transform?: string,
   preset?: string,

diff --git a/packages/cli/src/list.spec.ts b/packages/cli/src/list.spec.ts
@@ -78,7 +78,7 @@ ${chalk.bold('@foo/bar')}
   it('should return error message a package is not found', async () => {
     (PluginManager as jest.Mock).mockImplementation(() => ({
       install: jest.fn().mockImplementation(() => {
-        throw new Error('404 not found');
+        throw Error('404 not found');
       }),
     }));
 
@@ -93,7 +93,7 @@ ${chalk.bold('@foo/bar')}
   it('should return error message for multiple packages that are not found', async () => {
     (PluginManager as jest.Mock).mockImplementation(() => ({
       install: jest.fn().mockImplementation(() => {
-        throw new Error('404 not found');
+        throw Error('404 not found');
       }),
     }));
 
@@ -113,12 +113,12 @@ ${chalk.bold('@foo/bar')}
       install: jest
         .fn()
         .mockImplementationOnce(() => {
-          throw new Error('404 not found');
+          throw Error('404 not found');
         })
         .mockResolvedValueOnce(undefined)
         .mockResolvedValueOnce(undefined)
         .mockImplementationOnce(() => {
-          throw new Error('404 not found');
+          throw Error('404 not found');
         })
         .mockResolvedValueOnce(undefined)
         .mockResolvedValueOnce(undefined),

diff --git a/packages/cli/src/list.ts b/packages/cli/src/list.ts
@@ -12,7 +12,7 @@ export default async function list(packages: string[]) {
 
     try {
       await packageManager.install(codemodName);
-    } catch (error) {
+    } catch {
       console.warn(
         chalk.red(
           `Unable to find codeshift package: ${chalk.bold(packageName)}.`,
@@ -24,30 +24,32 @@ export default async function list(packages: string[]) {
 
     await packageManager.install(codemodName);
     const pkg = packageManager.require(codemodName);
-    const config: CodeshiftConfig = pkg.default ? pkg.default : pkg;
+    const config: CodeshiftConfig = pkg.default || pkg;
 
     console.log(chalk.bold(packageName));
 
     if (config.transforms) {
-      console.log(`├─ transforms`),
-        Object.keys(config.transforms).forEach((transform, index, array) => {
-          if (index + 1 === array.length) {
-            console.log(`|  └─ ${transform}`);
-            return;
-          }
-          console.log(`|  ├─ ${transform}`);
-        });
+      console.log(`├─ transforms`);
+
+      Object.keys(config.transforms).forEach((transform, index, array) => {
+        if (index + 1 === array.length) {
+          console.log(`|  └─ ${transform}`);
+          return;
+        }
+        console.log(`|  ├─ ${transform}`);
+      });
     }
 
     if (config.presets) {
-      console.log(`└─ presets`),
-        Object.keys(config.presets).forEach((transform, index, array) => {
-          if (index + 1 === array.length) {
-            console.log(`   └─ ${transform}`);
-            return;
-          }
-          console.log(`|  ├─ ${transform}`);
-        });
+      console.log(`└─ presets`);
+
+      Object.keys(config.presets).forEach((transform, index, array) => {
+        if (index + 1 === array.length) {
+          console.log(`   └─ ${transform}`);
+          return;
+        }
+        console.log(`|  ├─ ${transform}`);
+      });
     }
   }
 }
diff --git a/packages/cli/src/main.spec.ts b/packages/cli/src/main.spec.ts
@@ -10,6 +10,8 @@ import * as jscodeshift from 'jscodeshift/src/Runner';
 import { PluginManager } from 'live-plugin-manager';
 import globby from 'globby';
 
+import tryToCatch from 'try-to-catch';
+
 import main from './main';
 
 const mockPath = 'src/pages/home-page/';
@@ -23,9 +25,11 @@ describe('main', () => {
     it('should exit early if file path is not supplied', async () => {
       expect.assertions(1);
 
-      try {
-        await main([], { transform: 'path/to/transform.ts' });
-      } catch (error) {
+      const [error] = await tryToCatch(main, [], {
+        transform: 'path/to/transform.ts',
+      });
+
+      if (error) {
         // @ts-ignore
         expect(error.message).toMatch(
           'No path provided, please specify which files your codemod should modify',
@@ -36,9 +40,9 @@ describe('main', () => {
     it('should exit early if nether a package or transform is supplied', async () => {
       expect.assertions(1);
 
-      try {
-        await main([mockPath], {});
-      } catch (error) {
+      const [error] = await tryToCatch(main, [mockPath], {});
+
+      if (error) {
         // @ts-ignore
         expect(error.message).toMatch(
           'No transform provided, please specify a transform with either the --transform or --packages flags',
@@ -125,7 +129,7 @@ describe('main', () => {
         install: jest.fn().mockResolvedValue(undefined),
         require: jest.fn().mockImplementation((codemodName: string) => {
           if (!codemodName.startsWith('@codeshift')) {
-            throw new Error('Attempted to fetch codemod from npm');
+            throw Error('Attempted to fetch codemod from npm');
           }
 
           return {
@@ -279,13 +283,13 @@ describe('main', () => {
     it('should throw when package format is invalid', async () => {
       expect.assertions(1);
 
-      try {
-        await main([mockPath], {
-          packages: 'mylib@NOT_SEMVER',
-          parser: 'babel',
-          extensions: 'js',
-        });
-      } catch (error) {
+      const [error] = await tryToCatch(main, [mockPath], {
+        packages: 'mylib@NOT_SEMVER',
+        parser: 'babel',
+        extensions: 'js',
+      });
+
+      if (error) {
         // @ts-ignore
         expect(error.message).toMatch(
           'Invalid version provided to the --packages flag. Unable to resolve version "NOT_SEMVER" for package "mylib". Please try: "[scope]/[package]@[version]" for example @mylib/[email protected]',
@@ -296,13 +300,13 @@ describe('main', () => {
     it('should throw when transform is not found', async () => {
       expect.assertions(1);
 
-      try {
-        await main([mockPath], {
-          packages: '[email protected]',
-          parser: 'babel',
-          extensions: 'js',
-        });
-      } catch (error) {
+      const [error] = await tryToCatch(main, [mockPath], {
+        packages: '[email protected]',
+        parser: 'babel',
+        extensions: 'js',
+      });
+
+      if (error) {
         // @ts-ignore
         expect(error.message).toMatch(
           'Invalid version provided to the --packages flag. Unable to resolve version "120.0.0" for package "mylib"',
@@ -386,7 +390,7 @@ describe('main', () => {
         install: jest.fn().mockResolvedValue(undefined),
         require: jest.fn().mockImplementation((codemodName: string) => {
           if (!codemodName.startsWith('@codeshift')) {
-            throw new Error('Attempted to fetch codemod from npm');
+            throw Error('Attempted to fetch codemod from npm');
           }
 
           return {
@@ -473,13 +477,13 @@ describe('main', () => {
     it('should throw when preset is not found', async () => {
       expect.assertions(1);
 
-      try {
-        await main([mockPath], {
-          packages: 'mylib#does-not-exist',
-          parser: 'babel',
-          extensions: 'js',
-        });
-      } catch (error) {
+      const [error] = await tryToCatch(main, [mockPath], {
+        packages: 'mylib#does-not-exist',
+        parser: 'babel',
+        extensions: 'js',
+      });
+
+      if (error) {
         // @ts-ignore
         expect(error.message).toMatch(
           'Invalid preset provided to the --packages flag. Unable to resolve preset "does-not-exist" for package "mylib"',