@percy/cli-command 1.1.2 → 1.2.0

package/dist/command.js

@@ -1,6 +1,7 @@
 import logger from '@percy/logger';
 import PercyConfig from '@percy/config';
 import { set, del } from '@percy/config/utils';
+import { generatePromise, AbortController, AbortError } from '@percy/core/utils';
 import * as CoreConfig from '@percy/core/config';
 import * as builtInFlags from './flags.js';
 import formatHelp from './help.js';
@@ -42,45 +43,6 @@ function withBuiltIns(definition) {
   }
 
   return def;
-} // Calls the provided callback and handles callback cancelation when process signals are
-// triggered. If the provided callback returns a generator, it will automatically run and throw
-// an error when canceled to be able to gracefully handle it's own cancelation.
-
-
-async function handleProcessSignals(callback) {
-  let signals = ['SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGINT', 'SIGHUP'];
-  let signalError; // keep track of signal handlers for cleanup
-
-  let signalHandlers = signals.map(signal => {
-    let handler = () => {
-      signalError = Object.assign(new Error(signal), {
-        canceled: true,
-        exitCode: 0,
-        signal
-      });
-    };
-
-    process.on(signal, handler);
-    return [signal, handler];
-  });
-
-  try {
-    // maybe async function
-    let gen = await callback(); // run any returned generator
-
-    if (typeof (gen === null || gen === void 0 ? void 0 : gen.next) === 'function' && (typeof gen[Symbol.iterator] === 'function' || typeof gen[Symbol.asyncIterator] === 'function')) {
-      let result = await gen.next();
-
-      while (!result.done) {
-        result = signalError ? await gen.throw(signalError) : await gen.next(result.value);
-      }
-    }
-  } finally {
-    // always cleanup
-    for (let [signal, handler] of signalHandlers) {
-      process.off(signal, handler);
-    }
-  }
 } // Helper to throw an error with an exit code and optional reason message
 
 
@@ -139,10 +101,27 @@ async function runCommandWithContext(parsed) {
       }
 
     });
-  } // wrap and bind the parsed command callback
+  } // process signals will abort
+
+
+  let ctrl = new AbortController();
+  let signals = ['SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGINT', 'SIGHUP'].map(signal => {
+    let handler = () => ctrl.abort(new AbortError(signal, {
+      signal,
+      exitCode: 0
+    }));
 
+    handler.off = () => process.off(signal, handler);
 
-  await handleProcessSignals(command.callback.bind(null, context));
+    process.on(signal, handler);
+    return handler;
+  }); // run the command callback with context and cleanup handlers after
+
+  await generatePromise(command.callback(context), ctrl.signal, error => {
+    for (let handler of signals) handler.off();
+
+    if (error) throw error;
+  });
 } // Returns a command runner function that when run will parse provided command-line options and run
 // the parsed command callback. The returned runner will automatically output version and help
 // information when requested, and handle any thrown errors exiting when appropriate.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/cli-command",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -34,9 +34,9 @@
     "test:coverage": "yarn test --coverage"
   },
   "dependencies": {
-    "@percy/config": "1.1.2",
-    "@percy/core": "1.1.2",
-    "@percy/logger": "1.1.2"
+    "@percy/config": "1.2.0",
+    "@percy/core": "1.2.0",
+    "@percy/logger": "1.2.0"
   },
-  "gitHead": "1232b3fe054c7bd73879fd85ca109a723dbfb5b6"
+  "gitHead": "ab7652e08dab49b3efbe2968339c5a70391ed4ff"
 }