Upgrade XO

Author: novemberborn

eslint-plugin-helper.js

@@ -49,7 +49,7 @@ function load(projectDir, overrides) {
 let helperPatterns = [];
 if (overrides && overrides.helpers !== undefined) {
 if (!Array.isArray(overrides.helpers) || overrides.helpers.length === 0) {
-throw new Error('The \'helpers\' override must be an array containing glob patterns.');
+throw new Error('The ’helpers’ override must be an array containing glob patterns.');
 }
 
 helperPatterns = normalizePatterns(overrides.helpers);

index.d.ts

@@ -1,11 +1,11 @@
 export interface Subscribable {
 subscribe(observer: {
-error(err: any): void,
-complete(): void,
-}): void
+error(err: any): void;
+complete(): void;
+}): void;
 }
 
-export type Constructor = (new (...args: Array<any>) => any);
+export type Constructor = (new (...args: any[]) => any);
 
 /** Specify one or more expectations the thrown error must satisfy. */
 export type ThrowsExpectation = {
@@ -29,8 +29,8 @@ export type CommitDiscardOptions = {
 /**
  * Whether the logs should be included in those of the parent test.
  */
-retainLogs?: boolean
-}
+retainLogs?: boolean;
+};
 
 /** Options that can be passed to the `t.snapshot()` assertion. */
 export type SnapshotOptions = {
@@ -316,10 +316,10 @@ export interface ExecutionContext<Context = unknown> extends Assertions {
 
 export interface LogFn {
 /** Log one or more values. */
-(...values: Array<any>): void;
+(...values: any[]): void;
 
 /** Skip logging. */
-skip(...values: Array<any>): void;
+skip(...values: any[]): void;
 }
 
 export interface PlanFn {
@@ -354,7 +354,7 @@ export interface TryFn<Context = unknown> {
  * the test will fail. A macro may be provided. The title may help distinguish attempts from
  * one another.
  */
-<Args extends any[]>(title: string, fn: [EitherMacro<Args, Context>, ...EitherMacro<Args, Context>[]], ...args: Args): Promise<TryResult[]>;
+<Args extends any[]>(title: string, fn: [EitherMacro<Args, Context>, ...Array<EitherMacro<Args, Context>>], ...args: Args): Promise<TryResult[]>;
 
 /**
 * Requires opt-in. Attempt to run some assertions. The result must be explicitly committed or discarded or else
@@ -366,7 +366,7 @@ export interface TryFn<Context = unknown> {
 * Requires opt-in. Attempt to run some assertions. The result must be explicitly committed or discarded or else
 * the test will fail. A macro may be provided.
 */
-<Args extends any[]>(fn: [EitherMacro<Args, Context>, ...EitherMacro<Args, Context>[]], ...args: Args): Promise<TryResult[]>;
+<Args extends any[]>(fn: [EitherMacro<Args, Context>, ...Array<EitherMacro<Args, Context>>], ...args: Args): Promise<TryResult[]>;
 }
 
 export interface AssertionError extends Error {}
@@ -427,32 +427,32 @@ export type Macro<Args extends any[], Context = unknown> = UntitledMacro<Args, C
  * the title provided when the test or hook was declared. Also receives the remaining test arguments.
  */
 title?: (providedTitle: string | undefined, ...args: Args) => string;
-}
+};
 
 export type EitherMacro<Args extends any[], Context> = Macro<Args, Context> | UntitledMacro<Args, Context>;
 
 /** Alias for a single macro, or an array of macros. */
-export type OneOrMoreMacros<Args extends any[], Context> = EitherMacro<Args, Context> | [EitherMacro<Args, Context>, ...EitherMacro<Args, Context>[]];
+export type OneOrMoreMacros<Args extends any[], Context> = EitherMacro<Args, Context> | [EitherMacro<Args, Context>, ...Array<EitherMacro<Args, Context>>];
 
 /** A reusable test or hook implementation, for tests & hooks declared with the `.cb` modifier. */
-export type UntitledCbMacro<Args extends any[], Context = unknown> = (t: CbExecutionContext<Context>, ...args: Args) => ImplementationResult
+export type UntitledCbMacro<Args extends any[], Context = unknown> = (t: CbExecutionContext<Context>, ...args: Args) => ImplementationResult;
 
 /** A reusable test or hook implementation, for tests & hooks declared with the `.cb` modifier. */
 export type CbMacro<Args extends any[], Context = unknown> = UntitledCbMacro<Args, Context> & {
 title?: (providedTitle: string | undefined, ...args: Args) => string;
-}
+};
 
 export type EitherCbMacro<Args extends any[], Context> = CbMacro<Args, Context> | UntitledCbMacro<Args, Context>;
 
 /** Alias for a single macro, or an array of macros, used for tests & hooks declared with the `.cb` modifier. */
-export type OneOrMoreCbMacros<Args extends any[], Context> = EitherCbMacro<Args, Context> | [EitherCbMacro<Args, Context>, ...EitherCbMacro<Args, Context>[]];
+export type OneOrMoreCbMacros<Args extends any[], Context> = EitherCbMacro<Args, Context> | [EitherCbMacro<Args, Context>, ...Array<EitherCbMacro<Args, Context>>];
 
 export interface TestInterface<Context = unknown> {
 /** Declare a concurrent test. */
 (title: string, implementation: Implementation<Context>): void;
 
 /** Declare a concurrent test that uses one or more macros. Additional arguments are passed to the macro. */
-<T extends any[]>(title: string, macros: OneOrMoreMacros<T, Context>, ...rest: T): void
+<T extends any[]>(title: string, macros: OneOrMoreMacros<T, Context>, ...rest: T): void;
 
 /** Declare a concurrent test that uses one or more macros. The macro is responsible for generating a unique test title. */
 <T extends any[]>(macros: OneOrMoreMacros<T, Context>, ...rest: T): void;

lib/api.js

@@ -22,7 +22,7 @@ function resolveModules(modules) {
 const modulePath = resolveCwd.silent(name);
 
 if (modulePath === undefined) {
-throw new Error(`Could not resolve required module '${name}'`);
+throw new Error(`Could not resolve required module ’${name}’`);
 }
 
 return modulePath;

lib/assert.js

@@ -29,34 +29,34 @@ function formatPowerAssertValue(value) {
 return concordance.format(value, concordanceOptions);
 }
 
-const hasOwnProperty = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
+const hasOwnProperty = (object, prop) => Object.prototype.hasOwnProperty.call(object, prop);
 const noop = () => {};
 const notImplemented = () => {
 throw new Error('not implemented');
 };
 
 class AssertionError extends Error {
-constructor(opts) {
-super(opts.message || '');
+constructor(options) {
+super(options.message || '');
 this.name = 'AssertionError';
 
-this.assertion = opts.assertion;
-this.fixedSource = opts.fixedSource;
-this.improperUsage = opts.improperUsage || false;
-this.actualStack = opts.actualStack;
-this.operator = opts.operator;
-this.values = opts.values || [];
+this.assertion = options.assertion;
+this.fixedSource = options.fixedSource;
+this.improperUsage = options.improperUsage || false;
+this.actualStack = options.actualStack;
+this.operator = options.operator;
+this.values = options.values || [];
 
 // Raw expected and actual objects are stored for custom reporters
 // (such as wallaby.js), that manage worker processes directly and
 // use the values for custom diff views
-this.raw = opts.raw;
+this.raw = options.raw;
 
 // Reserved for power-assert statements
 this.statements = [];
 
-if (opts.savedError) {
-this.savedError = opts.savedError;
+if (options.savedError) {
+this.savedError = options.savedError;
 } else {
 this.savedError = getErrorWithLongStackTrace();
 }
@@ -72,8 +72,8 @@ function getErrorWithLongStackTrace() {
 return err;
 }
 
-function validateExpectations(assertion, expectations, numArgs) { // eslint-disable-line complexity
-if (numArgs === 1 || expectations === null || expectations === undefined) {
+function validateExpectations(assertion, expectations, numberArgs) { // eslint-disable-line complexity
+if (numberArgs === 1 || expectations === null || expectations === undefined) {
 expectations = {};
 } else if (
 typeof expectations === 'function' ||

lib/cli.js

@@ -106,8 +106,8 @@ exports.run = async () => { // eslint-disable-line complexity
 'strip-aliased': true,
 'unknown-options-as-args': false
 })
-.usage('$0 [<pattern>...]')
-.usage('$0 debug [<pattern>...]')
+.usage('$0 [<pattern>...]') // eslint-disable-line unicorn/string-content
+.usage('$0 debug [<pattern>...]') // eslint-disable-line unicorn/string-content
 .usage('$0 reset-cache')
 .options({
 color: {
@@ -118,13 +118,13 @@ exports.run = async () => { // eslint-disable-line complexity
 description: 'Specific JavaScript file for AVA to read its config from, instead of using package.json or ava.config.* files'
 }
 })
-.command('* [<pattern>...]', 'Run tests', yargs => yargs.options(FLAGS).positional('pattern', {
+.command('* [<pattern>...]', 'Run tests', yargs => yargs.options(FLAGS).positional('pattern', { // eslint-disable-line unicorn/string-content
 array: true,
 describe: 'Glob patterns to select what test files to run. Leave empty if you want AVA to run all test files instead',
 type: 'string'
 }))
 .command(
-'debug [<pattern>...]',
+'debug [<pattern>...]', // eslint-disable-line unicorn/string-content
 'Activate Node.js inspector and run a single test file',
 yargs => yargs.options(FLAGS).options({
 break: {
@@ -156,7 +156,7 @@ exports.run = async () => { // eslint-disable-line complexity
 })
 .command(
 'reset-cache',
-'Reset AVA\'s compilation cache and exit',
+'Reset AVA’s compilation cache and exit',
 yargs => yargs,
 () => {
 resetCache = true;
@@ -249,11 +249,11 @@ exports.run = async () => { // eslint-disable-line complexity
 }
 
 if (Reflect.has(conf, 'helpers')) {
-exit('AVA no longer compiles helpers. Add exclusion patterns to the \'files\' configuration and specify \'compileAsTests\' in the Babel options instead.');
+exit('AVA no longer compiles helpers. Add exclusion patterns to the ’files’ configuration and specify ’compileAsTests’ in the Babel options instead.');
 }
 
 if (Reflect.has(conf, 'sources')) {
-exit('\'sources\' has been removed. Use \'ignoredByWatcher\' to provide glob patterns of files that the watcher should ignore.');
+exit('’sources’ has been removed. Use ’ignoredByWatcher’ to provide glob patterns of files that the watcher should ignore.');
 }
 
 const ciParallelVars = require('ci-parallel-vars');

lib/concordance-options.js

@@ -88,7 +88,7 @@ const colorTheme = {
 string: {
 open: ansiStyles.blue.open,
 close: ansiStyles.blue.close,
-line: {open: forceColor.blue('\''), close: forceColor.blue('\'')},
+line: {open: forceColor.blue('\''), close: forceColor.blue('\'')}, // eslint-disable-line unicorn/string-content
 multiline: {start: forceColor.blue('`'), end: forceColor.blue('`')},
 controlPicture: ansiStyles.grey,
 diff: {

lib/create-chain.js

@@ -11,35 +11,35 @@ function startChain(name, call, defaults) {
 return fn;
 }
 
-function extendChain(prev, name, flag) {
+function extendChain(previous, name, flag) {
 if (!flag) {
 flag = name;
 }
 
 const fn = (...args) => {
-callWithFlag(prev, flag, args);
+callWithFlag(previous, flag, args);
 };
 
-const fullName = `${chainRegistry.get(prev).fullName}.${name}`;
+const fullName = `${chainRegistry.get(previous).fullName}.${name}`;
 Object.defineProperty(fn, 'name', {value: fullName});
-prev[name] = fn;
+previous[name] = fn;
 
-chainRegistry.set(fn, {flag, fullName, prev});
+chainRegistry.set(fn, {flag, fullName, prev: previous});
 return fn;
 }
 
-function callWithFlag(prev, flag, args) {
+function callWithFlag(previous, flag, args) {
 const combinedFlags = {[flag]: true};
 do {
-const step = chainRegistry.get(prev);
+const step = chainRegistry.get(previous);
 if (step.call) {
 step.call({...step.defaults, ...combinedFlags}, args);
-prev = null;
+previous = null;
 } else {
 combinedFlags[step.flag] = true;
-prev = step.prev;
+previous = step.prev;
 }
-} while (prev);
+} while (previous);
 }
 
 function createHookChain(hook, isAfterHook) {

lib/environment-variables.js

@@ -6,7 +6,7 @@ function validateEnvironmentVariables(environmentVariables) {
 
 for (const value of Object.values(environmentVariables)) {
 if (typeof value !== 'string') {
-throw new TypeError('The \'environmentVariables\' configuration must be an object containing string values.');
+throw new TypeError('The ’environmentVariables’ configuration must be an object containing string values.');
 }
 }
 

lib/extensions.js

@@ -21,7 +21,7 @@ module.exports = (configuredExtensions, providers = []) => {
 }
 
 if (duplicates.size > 0) {
-throw new Error(`Unexpected duplicate extensions in options: '${[...duplicates].join('\', \'')}'.`);
+throw new Error(`Unexpected duplicate extensions in options: ’${[...duplicates].join('’, ’')}’.`);
 }
 
 // Unless the default was used by providers, as long as the extensions aren't explicitly set, set the default.

lib/fork.js

@@ -14,7 +14,7 @@ const AVA_PATH = path.resolve(__dirname, '..');
 
 const workerPath = require.resolve('./worker/subprocess');
 
-module.exports = (file, opts, execArgv = process.execArgv) => {
+module.exports = (file, options, execArgv = process.execArgv) => {
 let finished = false;
 
 const emitter = new Emittery();
@@ -24,16 +24,16 @@ module.exports = (file, opts, execArgv = process.execArgv) => {
 }
 };
 
-opts = {
+options = {
 file,
 baseDir: process.cwd(),
-...opts
+...options
 };
 
-const subprocess = childProcess.fork(workerPath, opts.workerArgv, {
-cwd: opts.projectDir,
+const subprocess = childProcess.fork(workerPath, options.workerArgv, {
+cwd: options.projectDir,
 silent: true,
-env: {NODE_ENV: 'test', ...process.env, ...opts.environmentVariables, AVA_PATH},
+env: {NODE_ENV: 'test', ...process.env, ...options.environmentVariables, AVA_PATH},
 execArgv
 });
 
@@ -64,7 +64,7 @@ module.exports = (file, opts, execArgv = process.execArgv) => {
 }
 
 if (message.ava.type === 'ready-for-options') {
-send({type: 'options', options: opts});
+send({type: 'options', options});
 return;
 }