squash: various fixes for ESLint v9

nodejs · May 10, 2024 · d96abc4 · d96abc4
1 parent 0aca65f
commit d96abc4
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 38 deletions.
diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -838,6 +838,7 @@ function guessHandleType(fd) {
 
 class WeakReference {
  #weak = null;
+ // eslint-disable-next-line no-unused-private-class-members
  #strong = null;
  #refCount = 0;
  constructor(object) {

diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -981,6 +981,7 @@ for (const input of inputs) {
 {
 
  assert.throws(() => {
+ // eslint-disable-next-line no-constant-binary-expression
  assert.ok((() => Boolean('' === false))());
  }, {
  message: 'The expression evaluated to a falsy value:\n\n' +

diff --git a/test/parallel/test-eslint-alphabetize-errors.js b/test/parallel/test-eslint-alphabetize-errors.js
@@ -9,10 +9,7 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/alphabetize-errors');
 
-new RuleTester({
- parserOptions: { ecmaVersion: 6 },
- env: { es6: true }
-}).run('alphabetize-errors', rule, {
+new RuleTester().run('alphabetize-errors', rule, {
  valid: [
  { code: `
  E('AAA', 'foo');

diff --git a/test/parallel/test-eslint-alphabetize-primordials.js b/test/parallel/test-eslint-alphabetize-primordials.js
@@ -10,10 +10,7 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/alphabetize-primordials');
 
-new RuleTester({
- parserOptions: { ecmaVersion: 6 },
- env: { es6: true }
-})
+new RuleTester()
  .run('alphabetize-primordials', rule, {
  valid: [
  'new Array()',

diff --git a/test/parallel/test-eslint-async-iife-no-unused-result.js b/test/parallel/test-eslint-async-iife-no-unused-result.js
@@ -11,7 +11,7 @@ const rule = require('../../tools/eslint-rules/async-iife-no-unused-result');
 const message = 'The result of an immediately-invoked async function needs ' +
  'to be used (e.g. with `.then(common.mustCall())`)';
 
-const tester = new RuleTester({ parserOptions: { ecmaVersion: 8 } });
+const tester = new RuleTester();
 tester.run('async-iife-no-unused-result', rule, {
  valid: [
  '(() => {})()',
@@ -27,12 +27,10 @@ tester.run('async-iife-no-unused-result', rule, {
  {
  code: '(async () => {})()',
  errors: [{ message }],
- output: '(async () => {})()',
  },
  {
  code: '(async function() {})()',
  errors: [{ message }],
- output: '(async function() {})()',
  },
  {
  code: "const common = require('../common');(async () => {})()",

diff --git a/test/parallel/test-eslint-avoid-prototype-pollution.js b/test/parallel/test-eslint-avoid-prototype-pollution.js
@@ -10,9 +10,7 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/avoid-prototype-pollution');
 
-new RuleTester({
- parserOptions: { ecmaVersion: 2022 },
-})
+new RuleTester()
  .run('property-descriptor-no-prototype-pollution', rule, {
  valid: [
  'ObjectDefineProperties({}, {})',
@@ -125,19 +123,46 @@ new RuleTester({
  },
  {
  code: 'ObjectDefineProperty({}, "key", ObjectGetOwnPropertyDescriptor({}, "key"))',
- errors: [{ message: /prototype pollution/ }],
+ errors: [{
+ message: /prototype pollution/,
+ suggestions: [{
+ desc: 'Wrap the property descriptor in a null-prototype object',
+ output: 'ObjectDefineProperty({}, "key", { __proto__: null,...ObjectGetOwnPropertyDescriptor({}, "key") })',
+ }],
+ }],
  },
  {
  code: 'ReflectDefineProperty({}, "key", ObjectGetOwnPropertyDescriptor({}, "key"))',
- errors: [{ message: /prototype pollution/ }],
+ errors: [{
+ message: /prototype pollution/,
+ suggestions: [{
+ desc: 'Wrap the property descriptor in a null-prototype object',
+ output:
+ 'ReflectDefineProperty({}, "key", { __proto__: null,...ObjectGetOwnPropertyDescriptor({}, "key") })',
+ }],
+ }],
  },
  {
  code: 'ObjectDefineProperty({}, "key", ReflectGetOwnPropertyDescriptor({}, "key"))',
- errors: [{ message: /prototype pollution/ }],
+ errors: [{
+ message: /prototype pollution/,
+ suggestions: [{
+ desc: 'Wrap the property descriptor in a null-prototype object',
+ output:
+ 'ObjectDefineProperty({}, "key", { __proto__: null,...ReflectGetOwnPropertyDescriptor({}, "key") })',
+ }],
+ }],
  },
  {
  code: 'ReflectDefineProperty({}, "key", ReflectGetOwnPropertyDescriptor({}, "key"))',
- errors: [{ message: /prototype pollution/ }],
+ errors: [{
+ message: /prototype pollution/,
+ suggestions: [{
+ desc: 'Wrap the property descriptor in a null-prototype object',
+ output:
+ 'ReflectDefineProperty({}, "key", { __proto__: null,...ReflectGetOwnPropertyDescriptor({}, "key") })',
+ }],
+ }],
  },
  {
  code: 'ObjectDefineProperty({}, "key", { __proto__: Object.prototype })',
@@ -193,7 +218,13 @@ new RuleTester({
  },
  {
  code: 'RegExpPrototypeTest(/some regex/, "some string")',
- errors: [{ message: /looks up the "exec" property/ }],
+ errors: [{
+ message: /looks up the "exec" property/,
+ suggestions: [{
+ desc: 'Use RegexpPrototypeExec instead',
+ output: 'RegExpPrototypeExec(/some regex/, "some string") !== null',
+ }],
+ }],
  },
  {
  code: 'RegExpPrototypeSymbolMatch(/some regex/, "some string")',

diff --git a/test/parallel/test-eslint-duplicate-requires.js b/test/parallel/test-eslint-duplicate-requires.js
@@ -10,7 +10,11 @@ common.skipIfEslintMissing();
 const { RuleTester } = require('../../tools/node_modules/eslint');
 const rule = require('../../tools/eslint-rules/no-duplicate-requires');
 
-new RuleTester().run('no-duplicate-requires', rule, {
+new RuleTester({
+ languageOptions: {
+ sourceType: 'script',
+ },
+}).run('no-duplicate-requires', rule, {
  valid: [
  {
  code: 'require("a"); require("b"); (function() { require("a"); });',

diff --git a/test/parallel/test-eslint-no-array-destructuring.js b/test/parallel/test-eslint-no-array-destructuring.js
@@ -15,10 +15,7 @@ const USE_OBJ_DESTRUCTURING =
 const USE_ARRAY_METHODS =
  'Use primordials.ArrayPrototypeSlice to avoid unsafe array iteration.';
 
-new RuleTester({
- parserOptions: { ecmaVersion: 2021 },
- env: { es6: true }
-})
+new RuleTester()
  .run('no-array-destructuring', rule, {
  valid: [
  'const first = [1, 2, 3][0];',

diff --git a/test/parallel/test-eslint-prefer-common-mustsucceed.js b/test/parallel/test-eslint-prefer-common-mustsucceed.js
@@ -15,9 +15,7 @@ const msg1 = 'Please use common.mustSucceed instead of ' +
 const msg2 = 'Please use common.mustSucceed instead of ' +
  'common.mustCall with assert.ifError.';
 
-new RuleTester({
- parserOptions: { ecmaVersion: 2015 }
-}).run('prefer-common-mustsucceed', rule, {
+new RuleTester().run('prefer-common-mustsucceed', rule, {
  valid: [
  'foo((err) => assert.ifError(err))',
  'foo(function(err) { assert.ifError(err) })',

diff --git a/test/parallel/test-eslint-prefer-primordials.js b/test/parallel/test-eslint-prefer-primordials.js
@@ -11,8 +11,9 @@ const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/prefer-primordials');
 
 new RuleTester({
- parserOptions: { ecmaVersion: 6 },
- env: { es6: true }
+ languageOptions: {
+ sourceType: 'script',
+ },
 })
  .run('prefer-primordials', rule, {
  valid: [

diff --git a/test/parallel/test-eslint-prefer-proto.js b/test/parallel/test-eslint-prefer-proto.js
@@ -10,9 +10,7 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/prefer-proto');
 
-new RuleTester({
- parserOptions: { ecmaVersion: 2022 }
-}).run('prefer-common-mustsucceed', rule, {
+new RuleTester().run('prefer-common-mustsucceed', rule, {
  valid: [
  '({ __proto__: null })',
  'const x = { __proto__: null };',

diff --git a/test/parallel/test-eslint-prefer-util-format-errors.js b/test/parallel/test-eslint-prefer-util-format-errors.js
@@ -12,7 +12,7 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/prefer-util-format-errors');
 
-new RuleTester({ parserOptions: { ecmaVersion: 6 } })
+new RuleTester()
  .run('prefer-util-format-errors', rule, {
  valid: [
  'E(\'ABC\', \'abc\');',

diff --git a/test/parallel/test-eslint-require-common-first.js b/test/parallel/test-eslint-require-common-first.js
@@ -10,7 +10,11 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/require-common-first');
 
-new RuleTester().run('require-common-first', rule, {
+new RuleTester({
+ languageOptions: {
+ sourceType: 'script',
+ },
+}).run('require-common-first', rule, {
  valid: [
  {
  code: 'require("common")\n' +

diff --git a/test/parallel/test-eslint-required-modules.js b/test/parallel/test-eslint-required-modules.js
@@ -10,7 +10,11 @@ common.skipIfEslintMissing();
 const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
 const rule = require('../../tools/eslint-rules/required-modules');
 
-new RuleTester().run('required-modules', rule, {
+new RuleTester({
+ languageOptions: {
+ sourceType: 'script',
+ },
+}).run('required-modules', rule, {
  valid: [
  {
  code: 'require("common")',

diff --git a/test/parallel/test-runner-mocking.js b/test/parallel/test-runner-mocking.js
@@ -559,6 +559,7 @@ test('mocks a constructor', (t) => {
  }
 
  class MockClazz {
+ // eslint-disable-next-line no-unused-private-class-members
  #privateValue;
 
  constructor(z) {

diff --git a/tools/eslint-rules/avoid-prototype-pollution.js b/tools/eslint-rules/avoid-prototype-pollution.js
@@ -148,9 +148,9 @@ module.exports = {
  suggest: [{
  desc: 'Use RegexpPrototypeExec instead',
  fix(fixer) {
- const testRange = { ...node.range };
- testRange.start = testRange.start + 'RegexpPrototype'.length;
- testRange.end = testRange.start + 'Test'.length;
+ const testRange = [ ...node.range ];
+ testRange[0] = testRange[0] + 'RegexpPrototype'.length;
+ testRange[1] = testRange[0] + 'Test'.length;
  return [
  fixer.replaceTextRange(testRange, 'Exec'),
  fixer.insertTextAfter(node, ' !== null'),