Make script code more DRY

scripts/build.ts

@@ -5,25 +5,7 @@ import execa from 'execa';
 import chalk from 'chalk';
 import path from 'path';
 import { runAsyncProcess } from './utils/run-async-process';
-
-type CatchFn<TResult = never> = (reason: any) => TResult | PromiseLike<TResult>;
-
-function handleError<TResult = never>(spinner?: ora.Ora, message?: string): CatchFn<TResult>;
-function handleError<TResult = never>(message?: string): CatchFn<TResult>;
-function handleError<TResult = never>(messageOrSpinner?: ora.Ora | string, message?: string): CatchFn<TResult> {
- return (err: any) => {
- if (messageOrSpinner) {
- if (typeof messageOrSpinner === 'string') {
- console.error(messageOrSpinner);
- } else {
- messageOrSpinner.fail(message);
- }
- }
-
- if (err) console.error(err);
- process.exit(1);
- };
-}
+import { handleError } from './utils/handle-script-error';
 
 async function getTSConfigs() {
  const spinner = ora('Determining TypeScript projects to build...').start();

scripts/clean.ts

@@ -101,10 +101,9 @@ async function main() {
  spinner.fail('Failed!');
  if (err) console.error(err);
  process.exit(1);
- }
+ };
 
- await Promise.all(concurrent.map((p) => p()))
- .catch(handleError)
+ await Promise.all(concurrent.map((p) => p())).catch(handleError);
 
  await new Promise<void>((resolve, reject) => {
  sequential

scripts/dev.ts

@@ -6,25 +6,7 @@ import TscWatchClient from 'tsc-watch/client';
 import chalk from 'chalk';
 import path from 'path';
 import { runAsyncProcess } from './utils/run-async-process';
-
-type CatchFn<TResult = never> = (reason: any) => TResult | PromiseLike<TResult>;
-
-function handleError<TResult = never>(spinner?: ora.Ora, message?: string): CatchFn<TResult>;
-function handleError<TResult = never>(message?: string): CatchFn<TResult>;
-function handleError<TResult = never>(messageOrSpinner?: ora.Ora | string, message?: string): CatchFn<TResult> {
- return (err: any) => {
- if (messageOrSpinner) {
- if (typeof messageOrSpinner === 'string') {
- console.error(messageOrSpinner);
- } else {
- messageOrSpinner.fail(message);
- }
- }
-
- if (err) console.error(err);
- process.exit(1);
- };
-}
+import { handleError } from './utils/handle-script-error';
 
 async function getTSConfigs() {
  const spinner = ora('Determining TypeScript projects to build for development...').start();

scripts/inject-env.ts

@@ -35,4 +35,3 @@ async function main() {
 }
 
 runAsyncProcess(main);
-

scripts/utils/handle-script-error.ts

@@ -0,0 +1,27 @@
+import ora from 'ora';
+
+type CatchFn<TResult = never> = (reason: any) => TResult | PromiseLike<TResult>;
+
+/**
+ * Used to handle errors that occur during script execution.
+ *
+ * Optionally accepts an Ora spinner instance, which will be set to a failed
+ * state with the given `message`. Otherwise, the message is logged to
+ * `process.stderr` and the process exits with a non-zero exit code.
+ */
+export function handleError<TResult = never>(spinner?: ora.Ora, message?: string): CatchFn<TResult>;
+export function handleError<TResult = never>(message?: string): CatchFn<TResult>;
+export function handleError<TResult = never>(messageOrSpinner?: ora.Ora | string, message?: string): CatchFn<TResult> {
+ return (err: any) => {
+ if (messageOrSpinner) {
+ if (typeof messageOrSpinner === 'string') {
+ console.error(messageOrSpinner);
+ } else {
+ messageOrSpinner.fail(message);
+ }
+ }
+
+ if (err) console.error(err);
+ process.exit(1);
+ };
+}

scripts/wsrun/resolve-paths.ts

@@ -1,16 +1,16 @@
 #!/usr/bin/env ts-node-script
 
-import { relative, join } from 'path';
+import path from 'path';
 import { existsSync } from 'fs';
 import { runAsyncProcess } from '../utils/run-async-process';
 
 async function main() {
  const args = process.argv.slice(2);
  if (!args.length) args.push(''); // We need a minimum of one `args` element
 
- const root = join(__dirname, '..', '..');
- const absResults = args.map((a) => join(process.cwd(), a ?? ''));
- const relResults = absResults.map((a) => relative(root, a));
+ const root = path.join(__dirname, '..', '..');
+ const absResults = args.map((a) => path.join(process.cwd(), a ?? ''));
+ const relResults = absResults.map((a) => path.relative(root, a));
 
  relResults.forEach((result, i) => {
  if (existsSync(absResults[i])) console.log(result);