From 0bacbc3deebf7523b7dafd787e3368f6be81f8ea Mon Sep 17 00:00:00 2001 From: Jamund Ferguson Date: Wed, 10 Feb 2021 11:01:00 -0800 Subject: [PATCH] chore: updated prettier --- __tests__/always-return.js | 36 ++++----- __tests__/avoid-new.js | 16 ++-- __tests__/catch-or-return.js | 84 ++++++++++---------- __tests__/no-callback-in-promise.js | 37 ++++----- __tests__/no-native.js | 22 +++--- __tests__/no-nesting.js | 26 +++---- __tests__/no-new-statics.js | 20 ++--- __tests__/no-promise-in-callback.js | 28 +++---- __tests__/no-return-in-finally.js | 18 ++--- __tests__/no-return-wrap.js | 58 +++++++------- __tests__/param-names.js | 18 ++--- __tests__/prefer-await-to-callbacks.js | 30 ++++---- __tests__/prefer-await-to-then.js | 18 ++--- __tests__/valid-params.js | 102 +++++++++++++------------ index.js | 12 +-- package-lock.json | 6 +- package.json | 2 +- rules/always-return.js | 14 ++-- rules/avoid-new.js | 8 +- rules/catch-or-return.js | 12 +-- rules/lib/is-named-callback.js | 4 +- rules/lib/promise-statics.js | 2 +- rules/no-callback-in-promise.js | 14 ++-- rules/no-native.js | 16 ++-- rules/no-nesting.js | 8 +- rules/no-new-statics.js | 10 +-- rules/no-promise-in-callback.js | 10 +-- rules/no-return-in-finally.js | 12 +-- rules/no-return-wrap.js | 12 +-- rules/param-names.js | 10 +-- rules/prefer-await-to-callbacks.js | 12 +-- rules/prefer-await-to-then.js | 12 +-- rules/valid-params.js | 14 ++-- 33 files changed, 356 insertions(+), 347 deletions(-) diff --git a/__tests__/always-return.js b/__tests__/always-return.js index 94ceff98..133678af 100644 --- a/__tests__/always-return.js +++ b/__tests__/always-return.js @@ -4,8 +4,8 @@ const rule = require('../rules/always-return') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const message = 'Each then() should return a value or throw' @@ -41,58 +41,58 @@ ruleTester.run('always-return', rule, { two: x === 2 ? 1 : 0 } }) - })` + })`, ], invalid: [ { code: 'hey.then(x => {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { })', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { }).then(x)', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { }).then(function() { })', - errors: [{ message }, { message }] + errors: [{ message }, { message }], }, { code: 'hey.then(function() { return; }).then(function() { })', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { doSomethingWicked(); })', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { if (x) { return x; } })', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { if (x) { return x; } else { }})', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { if (x) { } else { return x; }})', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function() { if (x) { return you.then(function() { return x; }); } })', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then( x => { x ? x.id : null })', - errors: [{ message }] + errors: [{ message }], }, { code: 'hey.then(function(x) { x ? x.id : null })', - errors: [{ message }] + errors: [{ message }], }, { code: `(function() { @@ -105,7 +105,7 @@ ruleTester.run('always-return', rule, { }) }) })()`, - errors: [{ message }] - } - ] + errors: [{ message }], + }, + ], }) diff --git a/__tests__/avoid-new.js b/__tests__/avoid-new.js index ec8b98f5..55b63af3 100644 --- a/__tests__/avoid-new.js +++ b/__tests__/avoid-new.js @@ -4,8 +4,8 @@ const rule = require('../rules/avoid-new') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const errorMessage = 'Avoid creating new promises.' @@ -17,21 +17,21 @@ ruleTester.run('avoid-new', rule, { 'Promise.all()', 'new Horse()', 'new PromiseLikeThing()', - 'new Promise.resolve()' + 'new Promise.resolve()', ], invalid: [ { code: 'var x = new Promise(function (x, y) {})', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'new Promise()', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'Thing(new Promise(() => {}))', - errors: [{ message: errorMessage }] - } - ] + errors: [{ message: errorMessage }], + }, + ], }) diff --git a/__tests__/catch-or-return.js b/__tests__/catch-or-return.js index 4a16fbad..c9f76ff2 100644 --- a/__tests__/catch-or-return.js +++ b/__tests__/catch-or-return.js @@ -22,7 +22,7 @@ ruleTester.run('catch-or-return', rule, { { code: 'postJSON("/smajobber/api/reportJob.json")\n\t.then(()=>this.setState())\n\t.catch(()=>this.setState())', - parserOptions: { ecmaVersion: 6 } + parserOptions: { ecmaVersion: 6 }, }, // return @@ -34,187 +34,187 @@ ruleTester.run('catch-or-return', rule, { // allowThen - .then(null, fn) { code: 'frank().then(go).then(null, doIt)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(go).then().then().then().then(null, doIt)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(go).then().then(null, function() { /* why bother */ })', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank.then(go).then(to).then(null, jail)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, // allowThen - .then(null, fn) { code: 'frank().then(a, b)', options: [{ allowThen: true }] }, { code: 'frank().then(a).then(b).then(null, c)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(a).then(b).then(c, d)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(a).then(b).then().then().then(null, doIt)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(a).then(b).then(null, function() { /* why bother */ })', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, // allowThen - .then(fn, fn) { code: 'frank().then(go).then(zam, doIt)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(go).then().then().then().then(wham, doIt)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank().then(go).then().then(function() {}, function() { /* why bother */ })', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, { code: 'frank.then(go).then(to).then(pewPew, jail)', - options: [{ allowThen: true }] + options: [{ allowThen: true }], }, // allowFinally - .finally(fn) { code: 'frank().then(go).catch(doIt).finally(fn)', - options: [{ allowFinally: true }] + options: [{ allowFinally: true }], }, { code: 'frank().then(go).then().then().then().catch(doIt).finally(fn)', - options: [{ allowFinally: true }] + options: [{ allowFinally: true }], }, { code: 'frank().then(go).then().catch(function() { /* why bother */ }).finally(fn)', - options: [{ allowFinally: true }] + options: [{ allowFinally: true }], }, // terminationMethod=done - .done(null, fn) { code: 'frank().then(go).done()', - options: [{ terminationMethod: 'done' }] + options: [{ terminationMethod: 'done' }], }, // terminationMethod=[catch, done] - .done(null, fn) { code: 'frank().then(go).catch()', - options: [{ terminationMethod: ['catch', 'done'] }] + options: [{ terminationMethod: ['catch', 'done'] }], }, { code: 'frank().then(go).done()', - options: [{ terminationMethod: ['catch', 'done'] }] + options: [{ terminationMethod: ['catch', 'done'] }], }, { code: 'frank().then(go).finally()', - options: [{ terminationMethod: ['catch', 'finally'] }] - } + options: [{ terminationMethod: ['catch', 'finally'] }], + }, ], invalid: [ // catch failures { code: 'function callPromise(promise, cb) { promise.then(cb) }', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'fetch("http://www.yahoo.com").then(console.log.bind(console))', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'a.then(function() { return "x"; }).then(function(y) { throw y; })', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'Promise.resolve(frank)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().then(to).catch(fn).then(foo)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().finally(fn)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().then(to).finally(fn)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().then(go).catch(doIt).finally(fn)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().then(go).then().then().then().catch(doIt).finally(fn)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().then(go).then().catch(function() { /* why bother */ }).finally(fn)', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, // return failures { code: 'function a() { frank().then(go) }', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'function a() { frank().then(go).then().then().then() }', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'function a() { frank().then(go).then()}', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'function a() { frank.then(go).then(to) }', - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, // allowFinally=true failures { code: 'frank().then(go).catch(doIt).finally(fn).then(foo)', options: [{ allowFinally: true }], - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, { code: 'frank().then(go).catch(doIt).finally(fn).foobar(foo)', options: [{ allowFinally: true }], - errors: [{ message: catchMessage }] + errors: [{ message: catchMessage }], }, // terminationMethod=done - .done(null, fn) { code: 'frank().then(go)', options: [{ terminationMethod: 'done' }], - errors: [{ message: doneMessage }] + errors: [{ message: doneMessage }], }, { code: 'frank().catch(go)', options: [{ terminationMethod: 'done' }], - errors: [{ message: doneMessage }] + errors: [{ message: doneMessage }], }, // assume somePromise.ANYTHING() is a new promise { code: 'frank().catch(go).someOtherMethod()', - errors: [{ message: catchMessage }] - } - ] + errors: [{ message: catchMessage }], + }, + ], }) diff --git a/__tests__/no-callback-in-promise.js b/__tests__/no-callback-in-promise.js index a510994d..8c5cd16d 100644 --- a/__tests__/no-callback-in-promise.js +++ b/__tests__/no-callback-in-promise.js @@ -4,8 +4,8 @@ const rule = require('../rules/no-callback-in-promise') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const errorMessage = 'Avoid calling back inside of a promise.' @@ -24,56 +24,59 @@ ruleTester.run('no-callback-in-promise', rule, { // exceptions test { code: 'a.then(() => next())', - options: [{ exceptions: ['next'] }] - } + options: [{ exceptions: ['next'] }], + }, ], invalid: [ { code: 'a.then(cb)', - errors: [{ message: errorMessage, column: 8 }] + errors: [{ message: errorMessage, column: 8 }], }, { code: 'a.then(() => cb())', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a.then(function(err) { cb(err) })', - errors: [{ message: errorMessage, column: 24 }] + errors: [{ message: errorMessage, column: 24 }], }, { code: 'a.then(function(data) { cb(data) }, function(err) { cb(err) })', errors: [ { column: 25, message: errorMessage }, - { column: 53, message: errorMessage } - ] + { column: 53, message: errorMessage }, + ], }, { code: 'a.catch(function(err) { cb(err) })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, // callback should also complain { code: 'a.then(callback)', - errors: [{ message: errorMessage, column: 8 }] + errors: [{ message: errorMessage, column: 8 }], }, { code: 'a.then(() => callback())', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a.then(function(err) { callback(err) })', - errors: [{ message: errorMessage, column: 24 }] + errors: [{ message: errorMessage, column: 24 }], }, { code: 'a.then(function(data) { callback(data) }, function(err) { callback(err) })', - errors: [{ message: errorMessage }, { column: 59, message: errorMessage }] + errors: [ + { message: errorMessage }, + { column: 59, message: errorMessage }, + ], }, { code: 'a.catch(function(err) { callback(err) })', - errors: [{ message: errorMessage }] - } - ] + errors: [{ message: errorMessage }], + }, + ], }) diff --git a/__tests__/no-native.js b/__tests__/no-native.js index f980de3d..75e14228 100644 --- a/__tests__/no-native.js +++ b/__tests__/no-native.js @@ -5,45 +5,45 @@ const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6, - sourceType: 'module' - } + sourceType: 'module', + }, }) ruleTester.run('no-native', rule, { valid: [ 'var Promise = null; function x() { return Promise.resolve("hi"); }', 'var Promise = window.Promise || require("bluebird"); var x = Promise.reject();', - 'import Promise from "bluebird"; var x = Promise.reject();' + 'import Promise from "bluebird"; var x = Promise.reject();', ], invalid: [ { code: 'new Promise(function(reject, resolve) { })', - errors: [{ message: '"Promise" is not defined.' }] + errors: [{ message: '"Promise" is not defined.' }], }, { code: 'Promise.resolve()', - errors: [{ message: '"Promise" is not defined.' }] + errors: [{ message: '"Promise" is not defined.' }], }, { code: 'new Promise(function(reject, resolve) { })', errors: [{ message: '"Promise" is not defined.' }], - env: { browser: true } + env: { browser: true }, }, { code: 'new Promise(function(reject, resolve) { })', errors: [{ message: '"Promise" is not defined.' }], - env: { node: true } + env: { node: true }, }, { code: 'Promise.resolve()', errors: [{ message: '"Promise" is not defined.' }], - env: { es6: true } + env: { es6: true }, }, { code: 'Promise.resolve()', errors: [{ message: '"Promise" is not defined.' }], - globals: { Promise: true } - } - ] + globals: { Promise: true }, + }, + ], }) diff --git a/__tests__/no-nesting.js b/__tests__/no-nesting.js index 49be1a10..9a4e26af 100644 --- a/__tests__/no-nesting.js +++ b/__tests__/no-nesting.js @@ -4,8 +4,8 @@ const rule = require('../rules/no-nesting') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const errorMessage = 'Avoid nesting promises.' @@ -44,41 +44,41 @@ ruleTester.run('no-nesting', rule, { 'doThing().then(function() { return Promise.all([a,b,c]) })', 'doThing().then(function() { return Promise.resolve(4) })', 'doThing().then(() => Promise.resolve(4))', - 'doThing().then(() => Promise.all([a]))' + 'doThing().then(() => Promise.all([a]))', ], invalid: [ { code: 'doThing().then(function() { a.then() })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(function() { b.catch() })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(function() { return a.then() })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(function() { return b.catch() })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(() => { a.then() })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(() => { b.catch() })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(() => a.then())', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'doThing().then(() => b.catch())', - errors: [{ message: errorMessage }] - } - ] + errors: [{ message: errorMessage }], + }, + ], }) diff --git a/__tests__/no-new-statics.js b/__tests__/no-new-statics.js index 4704490b..0eb9d12f 100644 --- a/__tests__/no-new-statics.js +++ b/__tests__/no-new-statics.js @@ -13,43 +13,43 @@ ruleTester.run('no-new-statics', rule, { 'new Promise(function (resolve, reject) {})', 'new SomeClass()', 'SomeClass.resolve()', - 'new SomeClass.resolve()' + 'new SomeClass.resolve()', ], invalid: [ { code: 'new Promise.resolve()', output: 'Promise.resolve()', - errors: [{ message: "Avoid calling 'new' on 'Promise.resolve()'" }] + errors: [{ message: "Avoid calling 'new' on 'Promise.resolve()'" }], }, { code: 'new Promise.reject()', output: 'Promise.reject()', - errors: [{ message: "Avoid calling 'new' on 'Promise.reject()'" }] + errors: [{ message: "Avoid calling 'new' on 'Promise.reject()'" }], }, { code: 'new Promise.all()', output: 'Promise.all()', - errors: [{ message: "Avoid calling 'new' on 'Promise.all()'" }] + errors: [{ message: "Avoid calling 'new' on 'Promise.all()'" }], }, { code: 'new Promise.race()', output: 'Promise.race()', - errors: [{ message: "Avoid calling 'new' on 'Promise.race()'" }] + errors: [{ message: "Avoid calling 'new' on 'Promise.race()'" }], }, { code: [ 'function foo() {', ' var a = getA()', ' return new Promise.resolve(a)', - '}' + '}', ].join('\n'), output: [ 'function foo() {', ' var a = getA()', ' return Promise.resolve(a)', - '}' + '}', ].join('\n'), - errors: [{ message: "Avoid calling 'new' on 'Promise.resolve()'" }] - } - ] + errors: [{ message: "Avoid calling 'new' on 'Promise.resolve()'" }], + }, + ], }) diff --git a/__tests__/no-promise-in-callback.js b/__tests__/no-promise-in-callback.js index 0a207b8c..61086e15 100644 --- a/__tests__/no-promise-in-callback.js +++ b/__tests__/no-promise-in-callback.js @@ -4,8 +4,8 @@ const rule = require('../rules/no-promise-in-callback') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const errorMessage = 'Avoid using promises inside of callbacks.' @@ -37,49 +37,49 @@ ruleTester.run('no-promise-in-callback', rule, { 'doThing().then(() => Promise.all([a]))', // weird case, we assume it's not a big deal if you return (even though you may be cheating) - 'a(function(err) { return doThing().then(a) })' + 'a(function(err) { return doThing().then(a) })', ], invalid: [ { code: 'a(function(err) { doThing().then(a) })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a(function(error, zup, supa) { doThing().then(a) })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a(function(error) { doThing().then(a) })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, // arrow function { code: 'a((error) => { doThing().then(a) })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a((error) => doThing().then(a))', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a((err, data) => { doThing().then(a) })', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'a((err, data) => doThing().then(a))', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, // function decl. and similar (why not) { code: 'function x(err) { Promise.all() }', - errors: [{ message: errorMessage }] + errors: [{ message: errorMessage }], }, { code: 'let x = (err) => doThingWith(err).then(a)', - errors: [{ message: errorMessage }] - } - ] + errors: [{ message: errorMessage }], + }, + ], }) diff --git a/__tests__/no-return-in-finally.js b/__tests__/no-return-in-finally.js index d401c78f..1e3ca83d 100644 --- a/__tests__/no-return-in-finally.js +++ b/__tests__/no-return-in-finally.js @@ -4,8 +4,8 @@ const RuleTester = require('eslint').RuleTester const rule = require('../rules/no-return-in-finally') const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const message = 'No return in finally' @@ -16,24 +16,24 @@ ruleTester.run('no-return-in-finally', rule, { 'Promise.reject(4).finally(() => { console.log(2) })', 'Promise.reject(4).finally(() => {})', 'myPromise.finally(() => {});', - 'Promise.resolve(1).finally(function () { })' + 'Promise.resolve(1).finally(function () { })', ], invalid: [ { code: 'Promise.resolve(1).finally(() => { return 2 })', - errors: [{ message }] + errors: [{ message }], }, { code: 'Promise.reject(0).finally(() => { return 2 })', - errors: [{ message }] + errors: [{ message }], }, { code: 'myPromise.finally(() => { return 2 });', - errors: [{ message }] + errors: [{ message }], }, { code: 'Promise.resolve(1).finally(function () { return 2 })', - errors: [{ message }] - } - ] + errors: [{ message }], + }, + ], }) diff --git a/__tests__/no-return-wrap.js b/__tests__/no-return-wrap.js index e20ba2db..e5b85178 100644 --- a/__tests__/no-return-wrap.js +++ b/__tests__/no-return-wrap.js @@ -4,8 +4,8 @@ const rule = require('../rules/no-return-wrap') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const rejectMessage = 'Expected throw instead of Promise.reject' @@ -50,7 +50,7 @@ ruleTester.run('no-return-wrap', rule, { // allow reject if specified { code: 'doThing().then(function() { return Promise.reject(4) })', - options: [{ allowReject: true }] + options: [{ allowReject: true }], }, // not function bind @@ -58,7 +58,7 @@ ruleTester.run('no-return-wrap', rule, { { code: 'doThing().then(() => Promise.reject(4))', - options: [{ allowReject: true }] + options: [{ allowReject: true }], }, // Call expressions that aren't Promise.resolve/reject @@ -67,60 +67,60 @@ ruleTester.run('no-return-wrap', rule, { 'doThing().then(() => { return a() })', 'doThing().then(() => { return Promise.a() })', 'doThing().then(() => a())', - 'doThing().then(() => Promise.a())' + 'doThing().then(() => Promise.a())', ], invalid: [ // wrapped resolve is bad { code: 'doThing().then(function() { return Promise.resolve(4) })', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, { code: 'doThing().then(null, function() { return Promise.resolve(4) })', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, { code: 'doThing().catch(function() { return Promise.resolve(4) })', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, // wrapped reject is bad { code: 'doThing().then(function() { return Promise.reject(4) })', - errors: [{ message: rejectMessage }] + errors: [{ message: rejectMessage }], }, { code: 'doThing().then(null, function() { return Promise.reject(4) })', - errors: [{ message: rejectMessage }] + errors: [{ message: rejectMessage }], }, { code: 'doThing().catch(function() { return Promise.reject(4) })', - errors: [{ message: rejectMessage }] + errors: [{ message: rejectMessage }], }, // needs to also look at weird paths { code: 'doThing().then(function(x) { if (x>1) { return Promise.resolve(4) } else { throw "bad" } })', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, { code: 'doThing().then(function(x) { if (x>1) { return Promise.reject(4) } })', - errors: [{ message: rejectMessage }] + errors: [{ message: rejectMessage }], }, { code: 'doThing().then(null, function() { if (true && false) { return Promise.resolve() } })', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, // should do both { code: 'doThing().catch(function(x) {if (x) { return Promise.resolve(4) } else { return Promise.reject() } })', - errors: [{ message: resolveMessage }, { message: rejectMessage }] + errors: [{ message: resolveMessage }, { message: rejectMessage }], }, // should work someday @@ -137,7 +137,7 @@ ruleTester.run('no-return-wrap', rule, { }) return })`, - errors: [{ message: resolveMessage, line: 4 }] + errors: [{ message: resolveMessage, line: 4 }], }, { code: ` @@ -147,7 +147,7 @@ ruleTester.run('no-return-wrap', rule, { }) return })`, - errors: [{ message: resolveMessage, line: 4 }] + errors: [{ message: resolveMessage, line: 4 }], }, { code: ` @@ -158,7 +158,7 @@ ruleTester.run('no-return-wrap', rule, { }) }) })`, - errors: [{ message: resolveMessage, line: 5 }] + errors: [{ message: resolveMessage, line: 5 }], }, { code: ` @@ -172,7 +172,7 @@ ruleTester.run('no-return-wrap', rule, { }) }) })`, - errors: [{ message: resolveMessage, line: 8 }] + errors: [{ message: resolveMessage, line: 8 }], }, // other than "ExpressionStatement" @@ -186,7 +186,7 @@ ruleTester.run('no-return-wrap', rule, { }, } `, - errors: [{ message: resolveMessage, line: 5 }] + errors: [{ message: resolveMessage, line: 5 }], }, { code: ` @@ -196,25 +196,25 @@ ruleTester.run('no-return-wrap', rule, { }) ); `, - errors: [{ message: resolveMessage, line: 4 }] + errors: [{ message: resolveMessage, line: 4 }], }, // function bind { code: 'doThing().then((function() { return Promise.resolve(4) }).bind(this))', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, { code: 'doThing().then((function() { return Promise.resolve(4) }).bind(this).bind(this))', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, // arrow functions and other things { code: 'doThing().then(() => { return Promise.resolve(4) })', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, // issue #150 @@ -226,17 +226,17 @@ ruleTester.run('no-return-wrap', rule, { }) } `, - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, // issue #193 { code: 'doThing().then(() => Promise.resolve(4))', - errors: [{ message: resolveMessage }] + errors: [{ message: resolveMessage }], }, { code: 'doThing().then(() => Promise.reject(4))', - errors: [{ message: rejectMessage }] - } - ] + errors: [{ message: rejectMessage }], + }, + ], }) diff --git a/__tests__/param-names.js b/__tests__/param-names.js index 6d746717..473d51ea 100644 --- a/__tests__/param-names.js +++ b/__tests__/param-names.js @@ -4,8 +4,8 @@ const rule = require('../rules/param-names') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) const message = 'Promise constructor parameters must be named resolve, reject' @@ -16,25 +16,25 @@ ruleTester.run('param-names', rule, { 'new Promise(function(resolve) {})', 'new Promise(resolve => {})', 'new Promise((resolve, reject) => {})', - 'new Promise(() => {})' + 'new Promise(() => {})', ], invalid: [ { code: 'new Promise(function(reject, resolve) {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'new Promise(function(resolve, rej) {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'new Promise(yes => {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'new Promise((yes, no) => {})', - errors: [{ message }] - } - ] + errors: [{ message }], + }, + ], }) diff --git a/__tests__/prefer-await-to-callbacks.js b/__tests__/prefer-await-to-callbacks.js index 3cee507b..cc667ac6 100644 --- a/__tests__/prefer-await-to-callbacks.js +++ b/__tests__/prefer-await-to-callbacks.js @@ -4,8 +4,8 @@ const rule = require('../rules/prefer-await-to-callbacks') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 8 - } + ecmaVersion: 8, + }, }) const message = 'Avoid callbacks. Prefer Async/Await.' @@ -16,49 +16,49 @@ ruleTester.run('prefer-await-to-callbacks', rule, { 'async function hi() { await thing().then() }', 'async function hi() { await thing().catch() }', 'dbConn.on("error", err => { console.error(err) })', - 'dbConn.once("error", err => { console.error(err) })' + 'dbConn.once("error", err => { console.error(err) })', ], invalid: [ { code: 'heart(function(err) {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'heart(err => {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'heart("ball", function(err) {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'function getData(id, callback) {}', - errors: [{ message }] + errors: [{ message }], }, { code: 'const getData = (cb) => {}', - errors: [{ message }] + errors: [{ message }], }, { code: 'var x = function (x, cb) {}', - errors: [{ message }] + errors: [{ message }], }, { code: 'cb()', - errors: [{ message }] + errors: [{ message }], }, { code: 'callback()', - errors: [{ message }] + errors: [{ message }], }, { code: 'heart(error => {})', - errors: [{ message }] + errors: [{ message }], }, { code: 'heart(function(error) {})', - errors: [{ message }] - } - ] + errors: [{ message }], + }, + ], }) diff --git a/__tests__/prefer-await-to-then.js b/__tests__/prefer-await-to-then.js index 4d88a0f8..13036249 100644 --- a/__tests__/prefer-await-to-then.js +++ b/__tests__/prefer-await-to-then.js @@ -4,8 +4,8 @@ const rule = require('../rules/prefer-await-to-then') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 8 - } + ecmaVersion: 8, + }, }) const message = 'Prefer await to then().' @@ -16,26 +16,26 @@ ruleTester.run('prefer-await-to-then', rule, { 'async function hi() { await thing().then() }', 'async function hi() { await thing().catch() }', 'a = async () => (await something())', - 'something().then(async () => await somethingElse())' + 'something().then(async () => await somethingElse())', ], invalid: [ { code: 'function foo() { hey.then(x => {}) }', - errors: [{ message }] + errors: [{ message }], }, { code: 'function foo() { hey.then(function() { }).then() }', - errors: [{ message }, { message }] + errors: [{ message }, { message }], }, { code: 'function foo() { hey.then(function() { }).then(x).catch() }', - errors: [{ message }, { message }] + errors: [{ message }, { message }], }, { code: 'async function a() { hey.then(function() { }).then(function() { }) }', - errors: [{ message }, { message }] - } - ] + errors: [{ message }, { message }], + }, + ], }) diff --git a/__tests__/valid-params.js b/__tests__/valid-params.js index 0b2fe95a..88b406cf 100644 --- a/__tests__/valid-params.js +++ b/__tests__/valid-params.js @@ -4,8 +4,8 @@ const rule = require('../rules/valid-params') const RuleTester = require('eslint').RuleTester const ruleTester = new RuleTester({ parserOptions: { - ecmaVersion: 6 - } + ecmaVersion: 6, + }, }) ruleTester.run('valid-params', rule, { @@ -60,8 +60,8 @@ ruleTester.run('valid-params', rule, { '])', ' .then(console.log)', ' .catch(console.error)', - ' .finally(console.log)' - ].join('\n') + ' .finally(console.log)', + ].join('\n'), ], invalid: [ // invalid Promise.resolve() @@ -69,17 +69,19 @@ ruleTester.run('valid-params', rule, { code: 'Promise.resolve(1, 2)', errors: [ { - message: 'Promise.resolve() requires 0 or 1 arguments, but received 2' - } - ] + message: + 'Promise.resolve() requires 0 or 1 arguments, but received 2', + }, + ], }, { code: 'Promise.resolve({}, function() {}, 1, 2, 3)', errors: [ { - message: 'Promise.resolve() requires 0 or 1 arguments, but received 5' - } - ] + message: + 'Promise.resolve() requires 0 or 1 arguments, but received 5', + }, + ], }, // invalid Promise.reject() @@ -87,119 +89,123 @@ ruleTester.run('valid-params', rule, { code: 'Promise.reject(1, 2, 3)', errors: [ { - message: 'Promise.reject() requires 0 or 1 arguments, but received 3' - } - ] + message: 'Promise.reject() requires 0 or 1 arguments, but received 3', + }, + ], }, { code: 'Promise.reject({}, function() {}, 1, 2)', errors: [ { - message: 'Promise.reject() requires 0 or 1 arguments, but received 4' - } - ] + message: 'Promise.reject() requires 0 or 1 arguments, but received 4', + }, + ], }, // invalid Promise.race() { code: 'Promise.race(1, 2)', errors: [ - { message: 'Promise.race() requires 1 argument, but received 2' } - ] + { message: 'Promise.race() requires 1 argument, but received 2' }, + ], }, { code: 'Promise.race({}, function() {}, 1, 2, 3)', errors: [ - { message: 'Promise.race() requires 1 argument, but received 5' } - ] + { message: 'Promise.race() requires 1 argument, but received 5' }, + ], }, // invalid Promise.all() { code: 'Promise.all(1, 2, 3)', - errors: [{ message: 'Promise.all() requires 1 argument, but received 3' }] + errors: [ + { message: 'Promise.all() requires 1 argument, but received 3' }, + ], }, { code: 'Promise.all({}, function() {}, 1, 2)', - errors: [{ message: 'Promise.all() requires 1 argument, but received 4' }] + errors: [ + { message: 'Promise.all() requires 1 argument, but received 4' }, + ], }, // invalid Promise.then() { code: 'somePromise().then()', errors: [ - { message: 'Promise.then() requires 1 or 2 arguments, but received 0' } - ] + { message: 'Promise.then() requires 1 or 2 arguments, but received 0' }, + ], }, { code: 'somePromise().then(() => {}, () => {}, () => {})', errors: [ - { message: 'Promise.then() requires 1 or 2 arguments, but received 3' } - ] + { message: 'Promise.then() requires 1 or 2 arguments, but received 3' }, + ], }, { code: 'promiseReference.then()', errors: [ - { message: 'Promise.then() requires 1 or 2 arguments, but received 0' } - ] + { message: 'Promise.then() requires 1 or 2 arguments, but received 0' }, + ], }, { code: 'promiseReference.then(() => {}, () => {}, () => {})', errors: [ - { message: 'Promise.then() requires 1 or 2 arguments, but received 3' } - ] + { message: 'Promise.then() requires 1 or 2 arguments, but received 3' }, + ], }, // invalid Promise.catch() { code: 'somePromise().catch()', errors: [ - { message: 'Promise.catch() requires 1 argument, but received 0' } - ] + { message: 'Promise.catch() requires 1 argument, but received 0' }, + ], }, { code: 'somePromise().catch(() => {}, () => {})', errors: [ - { message: 'Promise.catch() requires 1 argument, but received 2' } - ] + { message: 'Promise.catch() requires 1 argument, but received 2' }, + ], }, { code: 'promiseReference.catch()', errors: [ - { message: 'Promise.catch() requires 1 argument, but received 0' } - ] + { message: 'Promise.catch() requires 1 argument, but received 0' }, + ], }, { code: 'promiseReference.catch(() => {}, () => {})', errors: [ - { message: 'Promise.catch() requires 1 argument, but received 2' } - ] + { message: 'Promise.catch() requires 1 argument, but received 2' }, + ], }, // invalid Promise.finally() { code: 'somePromise().finally()', errors: [ - { message: 'Promise.finally() requires 1 argument, but received 0' } - ] + { message: 'Promise.finally() requires 1 argument, but received 0' }, + ], }, { code: 'somePromise().finally(() => {}, () => {})', errors: [ - { message: 'Promise.finally() requires 1 argument, but received 2' } - ] + { message: 'Promise.finally() requires 1 argument, but received 2' }, + ], }, { code: 'promiseReference.finally()', errors: [ - { message: 'Promise.finally() requires 1 argument, but received 0' } - ] + { message: 'Promise.finally() requires 1 argument, but received 0' }, + ], }, { code: 'promiseReference.finally(() => {}, () => {})', errors: [ - { message: 'Promise.finally() requires 1 argument, but received 2' } - ] - } - ] + { message: 'Promise.finally() requires 1 argument, but received 2' }, + ], + }, + ], }) diff --git a/index.js b/index.js index 6be65b45..08008d29 100644 --- a/index.js +++ b/index.js @@ -15,14 +15,14 @@ module.exports = { 'avoid-new': require('./rules/avoid-new'), 'no-new-statics': require('./rules/no-new-statics'), 'no-return-in-finally': require('./rules/no-return-in-finally'), - 'valid-params': require('./rules/valid-params') + 'valid-params': require('./rules/valid-params'), }, rulesConfig: { 'param-names': 1, 'always-return': 1, 'no-return-wrap': 1, 'no-native': 0, - 'catch-or-return': 1 + 'catch-or-return': 1, }, configs: { recommended: { @@ -39,8 +39,8 @@ module.exports = { 'promise/avoid-new': 'off', 'promise/no-new-statics': 'error', 'promise/no-return-in-finally': 'warn', - 'promise/valid-params': 'warn' - } - } - } + 'promise/valid-params': 'warn', + }, + }, + }, } diff --git a/package-lock.json b/package-lock.json index 5a4fe996..cbeb6275 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6503,9 +6503,9 @@ "dev": true }, "prettier": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.2.tgz", - "integrity": "sha512-McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", + "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", "dev": true }, "pretty-format": { diff --git a/package.json b/package.json index 0263a843..4de3200c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "jest": "^26.6.3", "jest-runner-eslint": "^0.8.0", "lint-staged": "^10.2.4", - "prettier": "^1.14.2" + "prettier": "^2.2.1" }, "engines": { "node": ">=6" diff --git a/rules/always-return.js b/rules/always-return.js index 5196d1a1..2d0606e9 100644 --- a/rules/always-return.js +++ b/rules/always-return.js @@ -58,8 +58,8 @@ module.exports = { meta: { type: 'problem', docs: { - url: getDocsUrl('always-return') - } + url: getDocsUrl('always-return'), + }, }, create(context) { // funcInfoStack is a stack representing the stack of currently executing @@ -120,7 +120,7 @@ module.exports = { onCodePathStart() { funcInfoStack.push({ branchIDStack: [], - branchInfoMap: {} + branchInfoMap: {}, }) }, @@ -131,7 +131,7 @@ module.exports = { return } - path.finalSegments.forEach(segment => { + path.finalSegments.forEach((segment) => { const id = segment.id const branch = funcInfo.branchInfoMap[id] if (!branch.good) { @@ -148,11 +148,11 @@ module.exports = { context.report({ message: 'Each then() should return a value or throw', - node: branch.node + node: branch.node, }) } }) - } + }, } - } + }, } diff --git a/rules/avoid-new.js b/rules/avoid-new.js index 1d61f418..e6032f75 100644 --- a/rules/avoid-new.js +++ b/rules/avoid-new.js @@ -11,8 +11,8 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('avoid-new') - } + url: getDocsUrl('avoid-new'), + }, }, create(context) { return { @@ -20,7 +20,7 @@ module.exports = { if (node.callee.name === 'Promise') { context.report({ node, message: 'Avoid creating new promises.' }) } - } + }, } - } + }, } diff --git a/rules/catch-or-return.js b/rules/catch-or-return.js index 4d60a4fa..ba2d6677 100644 --- a/rules/catch-or-return.js +++ b/rules/catch-or-return.js @@ -13,11 +13,11 @@ module.exports = { meta: { type: 'problem', docs: { - url: getDocsUrl('catch-or-return') + url: getDocsUrl('catch-or-return'), }, messages: { - terminationMethod: 'Expected {{ terminationMethod }}() or return' - } + terminationMethod: 'Expected {{ terminationMethod }}() or return', + }, }, create(context) { const options = context.options[0] || {} @@ -88,9 +88,9 @@ module.exports = { context.report({ node, messageId: 'terminationMethod', - data: { terminationMethod } + data: { terminationMethod }, }) - } + }, } - } + }, } diff --git a/rules/lib/is-named-callback.js b/rules/lib/is-named-callback.js index 6b74e55e..59df4fe8 100644 --- a/rules/lib/is-named-callback.js +++ b/rules/lib/is-named-callback.js @@ -4,11 +4,11 @@ let callbacks = ['done', 'cb', 'callback', 'next'] module.exports = function isNamedCallback(potentialCallbackName, exceptions) { for (let i = 0; i < exceptions.length; i++) { - callbacks = callbacks.filter(item => { + callbacks = callbacks.filter((item) => { return item !== exceptions[i] }) } - return callbacks.some(trueCallbackName => { + return callbacks.some((trueCallbackName) => { return potentialCallbackName === trueCallbackName }) } diff --git a/rules/lib/promise-statics.js b/rules/lib/promise-statics.js index e5a877bd..8186ddd1 100644 --- a/rules/lib/promise-statics.js +++ b/rules/lib/promise-statics.js @@ -4,5 +4,5 @@ module.exports = { all: true, race: true, reject: true, - resolve: true + resolve: true, } diff --git a/rules/no-callback-in-promise.js b/rules/no-callback-in-promise.js index eff5c327..5e58f245 100644 --- a/rules/no-callback-in-promise.js +++ b/rules/no-callback-in-promise.js @@ -14,11 +14,11 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('no-callback-in-promise') + url: getDocsUrl('no-callback-in-promise'), }, messages: { - callback: 'Avoid calling back inside of a promise.' - } + callback: 'Avoid calling back inside of a promise.', + }, }, create(context) { return { @@ -39,7 +39,7 @@ module.exports = { ) { context.report({ node: node.arguments[0], - messageId: 'callback' + messageId: 'callback', }) } } @@ -48,10 +48,10 @@ module.exports = { if (context.getAncestors().some(isInsidePromise)) { context.report({ node, - messageId: 'callback' + messageId: 'callback', }) } - } + }, } - } + }, } diff --git a/rules/no-native.js b/rules/no-native.js index 37c16e77..8503231e 100644 --- a/rules/no-native.js +++ b/rules/no-native.js @@ -6,7 +6,7 @@ const getDocsUrl = require('./lib/get-docs-url') function isDeclared(scope, ref) { - return scope.variables.some(variable => { + return scope.variables.some((variable) => { if (variable.name !== ref.identifier.name) { return false } @@ -23,11 +23,11 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('no-native') + url: getDocsUrl('no-native'), }, messages: { - name: '"{{name}}" is not defined.' - } + name: '"{{name}}" is not defined.', + }, }, create(context) { /** @@ -41,7 +41,7 @@ module.exports = { 'Program:exit'() { const scope = context.getScope() - scope.implicit.left.forEach(ref => { + scope.implicit.left.forEach((ref) => { if (ref.identifier.name !== 'Promise') { return } @@ -50,11 +50,11 @@ module.exports = { context.report({ node: ref.identifier, messageId: 'name', - data: { name: ref.identifier.name } + data: { name: ref.identifier.name }, }) } }) - } + }, } - } + }, } diff --git a/rules/no-nesting.js b/rules/no-nesting.js index 12112d8c..98a1750b 100644 --- a/rules/no-nesting.js +++ b/rules/no-nesting.js @@ -13,8 +13,8 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('no-nesting') - } + url: getDocsUrl('no-nesting'), + }, }, create(context) { return { @@ -23,7 +23,7 @@ module.exports = { if (context.getAncestors().some(isInsidePromise)) { context.report({ node, message: 'Avoid nesting promises.' }) } - } + }, } - } + }, } diff --git a/rules/no-new-statics.js b/rules/no-new-statics.js index 6580f0d3..16630811 100644 --- a/rules/no-new-statics.js +++ b/rules/no-new-statics.js @@ -7,9 +7,9 @@ module.exports = { meta: { type: 'problem', docs: { - url: getDocsUrl('no-new-statics') + url: getDocsUrl('no-new-statics'), }, - fixable: 'code' + fixable: 'code', }, create(context) { return { @@ -28,10 +28,10 @@ module.exports = { [node.start, node.start + 'new '.length], '' ) - } + }, }) } - } + }, } - } + }, } diff --git a/rules/no-promise-in-callback.js b/rules/no-promise-in-callback.js index 98af432f..01674236 100644 --- a/rules/no-promise-in-callback.js +++ b/rules/no-promise-in-callback.js @@ -13,8 +13,8 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('no-promise-in-callback') - } + url: getDocsUrl('no-promise-in-callback'), + }, }, create(context) { return { @@ -31,10 +31,10 @@ module.exports = { if (context.getAncestors().some(isInsideCallback)) { context.report({ node: node.callee, - message: 'Avoid using promises inside of callbacks.' + message: 'Avoid using promises inside of callbacks.', }) } - } + }, } - } + }, } diff --git a/rules/no-return-in-finally.js b/rules/no-return-in-finally.js index d3eaa183..bf80ce1c 100644 --- a/rules/no-return-in-finally.js +++ b/rules/no-return-in-finally.js @@ -7,8 +7,8 @@ module.exports = { meta: { type: 'problem', docs: { - url: getDocsUrl('no-return-in-finally') - } + url: getDocsUrl('no-return-in-finally'), + }, }, create(context) { return { @@ -26,19 +26,19 @@ module.exports = { node.arguments[0].body.body ) { if ( - node.arguments[0].body.body.some(statement => { + node.arguments[0].body.body.some((statement) => { return statement.type === 'ReturnStatement' }) ) { context.report({ node: node.callee.property, - message: 'No return in finally' + message: 'No return in finally', }) } } } } - } + }, } - } + }, } diff --git a/rules/no-return-wrap.js b/rules/no-return-wrap.js index 57118c40..1e3af65a 100644 --- a/rules/no-return-wrap.js +++ b/rules/no-return-wrap.js @@ -12,7 +12,7 @@ const isPromise = require('./lib/is-promise') function isInPromise(context) { let functionNode = context .getAncestors() - .filter(node => { + .filter((node) => { return ( node.type === 'ArrowFunctionExpression' || node.type === 'FunctionExpression' @@ -39,12 +39,12 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('no-return-wrap') + url: getDocsUrl('no-return-wrap'), }, messages: { resolve: 'Avoid wrapping return values in Promise.resolve', - reject: 'Expected throw instead of Promise.reject' - } + reject: 'Expected throw instead of Promise.reject', + }, }, create(context) { const options = context.options[0] || {} @@ -77,7 +77,7 @@ module.exports = { }, 'ArrowFunctionExpression > CallExpression'(node) { checkCallExpression(node, node) - } + }, } - } + }, } diff --git a/rules/param-names.js b/rules/param-names.js index 8cb50e4c..fdf1b73b 100644 --- a/rules/param-names.js +++ b/rules/param-names.js @@ -6,8 +6,8 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('param-names') - } + url: getDocsUrl('param-names'), + }, }, create(context) { return { @@ -26,11 +26,11 @@ module.exports = { context.report({ node, message: - 'Promise constructor parameters must be named resolve, reject' + 'Promise constructor parameters must be named resolve, reject', }) } } - } + }, } - } + }, } diff --git a/rules/prefer-await-to-callbacks.js b/rules/prefer-await-to-callbacks.js index 543ad844..03742ff9 100644 --- a/rules/prefer-await-to-callbacks.js +++ b/rules/prefer-await-to-callbacks.js @@ -6,11 +6,11 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('prefer-await-to-callbacks') + url: getDocsUrl('prefer-await-to-callbacks'), }, messages: { - error: 'Avoid callbacks. Prefer Async/Await.' - } + error: 'Avoid callbacks. Prefer Async/Await.', + }, }, create(context) { function checkLastParamsForCallback(node) { @@ -20,7 +20,7 @@ module.exports = { } } function isInsideYieldOrAwait() { - return context.getAncestors().some(parent => { + return context.getAncestors().some((parent) => { return ( parent.type === 'AwaitExpression' || parent.type === 'YieldExpression' ) @@ -63,7 +63,7 @@ module.exports = { }, FunctionDeclaration: checkLastParamsForCallback, FunctionExpression: checkLastParamsForCallback, - ArrowFunctionExpression: checkLastParamsForCallback + ArrowFunctionExpression: checkLastParamsForCallback, } - } + }, } diff --git a/rules/prefer-await-to-then.js b/rules/prefer-await-to-then.js index d9bc6525..6d3c1c7a 100644 --- a/rules/prefer-await-to-then.js +++ b/rules/prefer-await-to-then.js @@ -11,13 +11,13 @@ module.exports = { meta: { type: 'suggestion', docs: { - url: getDocsUrl('prefer-await-to-then') - } + url: getDocsUrl('prefer-await-to-then'), + }, }, create(context) { /** Returns true if node is inside yield or await expression. */ function isInsideYieldOrAwait() { - return context.getAncestors().some(parent => { + return context.getAncestors().some((parent) => { return ( parent.type === 'AwaitExpression' || parent.type === 'YieldExpression' ) @@ -43,10 +43,10 @@ module.exports = { if (node.property && node.property.name === 'then') { context.report({ node: node.property, - message: 'Prefer await to then().' + message: 'Prefer await to then().', }) } - } + }, } - } + }, } diff --git a/rules/valid-params.js b/rules/valid-params.js index 698a0fab..c5ae1219 100644 --- a/rules/valid-params.js +++ b/rules/valid-params.js @@ -9,8 +9,8 @@ module.exports = { docs: { description: 'Ensures the proper number of arguments are passed to Promise functions', - url: getDocsUrl('valid-params') - } + url: getDocsUrl('valid-params'), + }, }, create(context) { return { @@ -30,7 +30,7 @@ module.exports = { node, message: 'Promise.{{ name }}() requires 0 or 1 arguments, but received {{ numArgs }}', - data: { name, numArgs } + data: { name, numArgs }, }) } break @@ -40,7 +40,7 @@ module.exports = { node, message: 'Promise.{{ name }}() requires 1 or 2 arguments, but received {{ numArgs }}', - data: { name, numArgs } + data: { name, numArgs }, }) } break @@ -53,14 +53,14 @@ module.exports = { node, message: 'Promise.{{ name }}() requires 1 argument, but received {{ numArgs }}', - data: { name, numArgs } + data: { name, numArgs }, }) } break default: break } - } + }, } - } + }, }