Linting fixes

Mafalda-SFU · May 8, 2023 · 8d0bda7 · 8d0bda7
1 parent b266c37
commit 8d0bda7
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 61 deletions.
diff --git a/lib/rule-composer.js b/lib/rule-composer.js
@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * Translates a multi-argument context.report() call into a single object argument call
  * @param {...*} arguments A list of arguments passed to `context.report`
@@ -47,7 +45,6 @@ function normalizeReportLoc(descriptor) {
   return descriptor.node.loc;
 }
 
-
 /**
  * Interpolates data placeholders in report messages
  * @param {MessageDescriptor} descriptor The report message descriptor.
@@ -115,7 +112,7 @@ function getRuleCreateFunc(rule) {
 }
 
 function removeMessageIfMessageIdPresent(reportDescriptor) {
-  const newDescriptor = Object.assign({}, reportDescriptor);
+  const newDescriptor = { ...reportDescriptor };
 
   if (typeof reportDescriptor.messageId === 'string' && typeof reportDescriptor.message === 'string') {
     delete newDescriptor.message;
@@ -148,9 +145,9 @@ module.exports = Object.freeze({
                     }
                   },
                 },
-              }
-            )
-          )
+              },
+            ),
+          ),
         );
       },
       schema: rule.schema,
@@ -178,15 +175,15 @@ module.exports = Object.freeze({
                           getReportNormalizer(rule).apply(null, arguments),
                           {
                             sourceCode, settings, options, filename,
-                          }
-                        )
-                      )
+                          },
+                        ),
+                      ),
                     );
                   },
                 },
-              }
-            )
-          )
+              },
+            ),
+          ),
         );
       },
       schema: rule.schema,
@@ -197,32 +194,32 @@ module.exports = Object.freeze({
     return Object.freeze({
       create(context) {
         return rules
-          .map(rule => getRuleCreateFunc(rule)(context))
+          .map((rule) => getRuleCreateFunc(rule)(context))
           .reduce(
-            (allListeners, ruleListeners) =>
-              Object.keys(ruleListeners).reduce(
-                (combinedListeners, key) => {
-                  const currentListener = combinedListeners[key];
-                  const ruleListener = ruleListeners[key];
-                  if (currentListener) {
-                    return Object.assign({}, combinedListeners, {
-                      [key]() {
-                        currentListener.apply(null, arguments);
-                        ruleListener.apply(null, arguments);
-                      },
-                    });
-                  }
-                  return Object.assign({}, combinedListeners, { [key]: ruleListener });
-                },
-                allListeners
-              ),
-            Object.create(null)
+            (allListeners, ruleListeners) => Object.keys(ruleListeners).reduce(
+              (combinedListeners, key) => {
+                const currentListener = combinedListeners[key];
+                const ruleListener = ruleListeners[key];
+                if (currentListener) {
+                  return {
+                    ...combinedListeners,
+                    [key]() {
+                      currentListener.apply(null, arguments);
+                      ruleListener.apply(null, arguments);
+                    },
+                  };
+                }
+                return { ...combinedListeners, [key]: ruleListener };
+              },
+              allListeners,
+            ),
+            Object.create(null),
           );
       },
       meta: Object.freeze({
         messages: Object.assign.apply(
           null,
-          [Object.create(null)].concat(rules.map(getMessageIds))
+          [Object.create(null)].concat(rules.map(getMessageIds)),
         ),
         fixable: 'code',
       }),

diff --git a/package.json b/package.json
@@ -39,6 +39,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=8.3.0"
   }
 }
diff --git a/tests/lib/rule-composer.js b/tests/lib/rule-composer.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const eslint = require('eslint');
 const assert = require('chai').assert;
 const ruleComposer = require('../..');
@@ -10,7 +8,7 @@ const coreRules = new eslint.Linter().getRules();
 
 ruleTester.run(
   'filterReports',
-  ruleComposer.filterReports(coreRules.get('no-undef'), descriptor => descriptor.node && descriptor.node.name !== 'foo'),
+  ruleComposer.filterReports(coreRules.get('no-undef'), (descriptor) => descriptor.node && descriptor.node.name !== 'foo'),
   {
     valid: [
       'foo;',
@@ -30,7 +28,7 @@ ruleTester.run(
         errors: [{ line: 1, column: 1 }],
       },
     ],
-  }
+  },
 );
 
 // test with settings
@@ -68,7 +66,7 @@ ruleTester.run(
         settings: { tokenWhitelist: ['foo'] },
       },
     ],
-  }
+  },
 );
 
 const ruleWithOptions = ruleComposer.filterReports(coreRules.get('no-undef'), (descriptor, m) => (
@@ -109,7 +107,7 @@ ruleTester.run(
         options: [{ tokenWhitelist: ['foo'] }],
       },
     ],
-  }
+  },
 );
 
 ruleTester.run(
@@ -136,15 +134,15 @@ ruleTester.run(
         filename: 'index.js',
       },
     ],
-  }
+  },
 );
 
 ruleTester.run(
   'joinReports',
   ruleComposer.joinReports([
-    context => ({ Program: node => context.report(node, 'foo') }),
-    context => ({ 'Program:exit': node => context.report(node, 'bar') }),
-    { create: context => ({ 'Program:exit': node => context.report(node, 'baz') }) },
+    (context) => ({ Program: (node) => context.report(node, 'foo') }),
+    (context) => ({ 'Program:exit': (node) => context.report(node, 'bar') }),
+    { create: (context) => ({ 'Program:exit': (node) => context.report(node, 'baz') }) },
   ]),
   {
     valid: [],
@@ -158,14 +156,14 @@ ruleTester.run(
         ],
       },
     ],
-  }
+  },
 );
 
 ruleTester.run(
   'mapReports',
   ruleComposer.mapReports(
-    context => ({ Program: node => context.report({ node, message: 'foo' }) }),
-    descriptor => Object.assign({}, descriptor, { message: descriptor.message.toUpperCase() })
+    (context) => ({ Program: (node) => context.report({ node, message: 'foo' }) }),
+    (descriptor) => ({ ...descriptor, message: descriptor.message.toUpperCase() }),
   ),
   {
     valid: [],
@@ -177,16 +175,16 @@ ruleTester.run(
         ],
       },
     ],
-  }
+  },
 );
 
 // test with settings
 
 ruleTester.run(
   'mapReports - with settings',
   ruleComposer.mapReports(
-    context => ({ Program: node => context.report({ node, message: 'foo' }) }),
-    (descriptor, m) => Object.assign({}, descriptor, { message: descriptor.message[m.settings.method]() })
+    (context) => ({ Program: (node) => context.report({ node, message: 'foo' }) }),
+    (descriptor, m) => ({ ...descriptor, message: descriptor.message[m.settings.method]() }),
   ),
   {
     valid: [],
@@ -199,16 +197,16 @@ ruleTester.run(
         settings: { method: 'toUpperCase' },
       },
     ],
-  }
+  },
 );
 
 // test with settings
 
 ruleTester.run(
   'mapReports - with options',
   ruleComposer.mapReports(
-    context => ({ Program: node => context.report({ node, message: 'foo' }) }),
-    (descriptor, m) => Object.assign({}, descriptor, { message: descriptor.message[m.options[0].method]() })
+    (context) => ({ Program: (node) => context.report({ node, message: 'foo' }) }),
+    (descriptor, m) => ({ ...descriptor, message: descriptor.message[m.options[0].method]() }),
   ),
   {
     valid: [],
@@ -221,14 +219,14 @@ ruleTester.run(
         options: [{ method: 'toUpperCase' }],
       },
     ],
-  }
+  },
 );
 
 ruleTester.run(
   'mapReports with filename',
   ruleComposer.mapReports(
-    context => ({ Program: node => context.report({ node, message: 'foo' }) }),
-    (descriptor, metadata) => Object.assign({}, descriptor, { message: metadata.filename })
+    (context) => ({ Program: (node) => context.report({ node, message: 'foo' }) }),
+    (descriptor, metadata) => ({ ...descriptor, message: metadata.filename }),
   ),
   {
     valid: [],
@@ -241,14 +239,14 @@ ruleTester.run(
         ],
       },
     ],
-  }
+  },
 );
 
 ruleTester.run(
   'checking the first token of the report',
   ruleComposer.filterReports(
     coreRules.get('no-unused-expressions'),
-    (problem, metadata) => metadata.sourceCode.getFirstToken(problem.node).value !== 'expect'
+    (problem, metadata) => metadata.sourceCode.getFirstToken(problem.node).value !== 'expect',
   ),
   {
     valid: [
@@ -261,7 +259,7 @@ ruleTester.run(
         errors: 1,
       },
     ],
-  }
+  },
 );
 
 ruleTester.run(
@@ -304,7 +302,7 @@ ruleTester.run(
       }
 
       return problem.message === 'Foo error.' || problem.messageId === 'baz';
-    }
+    },
   ),
   {
     valid: [],
@@ -317,5 +315,5 @@ ruleTester.run(
         ],
       },
     ],
-  }
+  },
 );