fix: Fix ESLint errors

jsx-eslint · May 18, 2020 · e2665f6 · e2665f6
1 parent b039d1a
commit e2665f6
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 25 deletions.
diff --git a/__tests__/src/eventHandlers-test.js b/__tests__/src/eventHandlers-test.js
@@ -75,7 +75,7 @@ describe('eventHandlers', () => {
       'onAnimationEnd',
       'onAnimationIteration',
       'onTransitionEnd',
-    ].every(handlerName => includes(eventHandlers, handlerName)));
+    ].every((handlerName) => includes(eventHandlers, handlerName)));
   });
 });
 
@@ -96,6 +96,6 @@ describe('eventHandlersByType', () => {
       'image',
       'animation',
       'transition',
-    ].every(type => !!eventHandlersByType[type]));
+    ].every((type) => !!eventHandlersByType[type]));
   });
 });
diff --git a/__tests__/src/getProp-parser-test.js b/__tests__/src/getProp-parser-test.js
@@ -162,11 +162,11 @@ function adjustNodeLocations(node, { startOffset, endOffset }) {
 
 function adjustLocationsRecursively(node, { startOffset, endOffset }) {
   if (Array.isArray(node)) {
-    return node.map(x => adjustLocationsRecursively(x, { startOffset, endOffset }));
+    return node.map((x) => adjustLocationsRecursively(x, { startOffset, endOffset }));
   }
   if (node && typeof node === 'object') {
     return adjustNodeLocations(
-      mapValues(node, x => adjustLocationsRecursively(x, { startOffset, endOffset })),
+      mapValues(node, (x) => adjustLocationsRecursively(x, { startOffset, endOffset })),
       { startOffset, endOffset },
     );
   }

diff --git a/__tests__/src/getPropLiteralValue-babelparser-test.js b/__tests__/src/getPropLiteralValue-babelparser-test.js
@@ -488,7 +488,7 @@ describe('getLiteralPropValue', () => {
 
   describeIfNotBabylon('Typescript', () => {
     beforeEach(() => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript non-null assertion', () => {
@@ -510,7 +510,7 @@ describe('getLiteralPropValue', () => {
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript type coercion', () => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
       const prop = extractProp('<div foo={bar as any} />');
 
       const expected = null;

diff --git a/__tests__/src/getPropLiteralValue-flowparser-test.js b/__tests__/src/getPropLiteralValue-flowparser-test.js
@@ -488,7 +488,7 @@ describe('getLiteralPropValue', () => {
 
   describeIfNotBabylon('Typescript', () => {
     beforeEach(() => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript non-null assertion', () => {
@@ -510,7 +510,7 @@ describe('getLiteralPropValue', () => {
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript type coercion', () => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
       const prop = extractProp('<div foo={bar as any} />');
 
       const expected = null;

diff --git a/__tests__/src/getPropValue-babelparser-test.js b/__tests__/src/getPropValue-babelparser-test.js
@@ -922,7 +922,7 @@ describe('getPropValue', () => {
 
   describeIfNotBabylon('Typescript', () => {
     beforeEach(() => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript non-null assertion', () => {
@@ -944,7 +944,7 @@ describe('getPropValue', () => {
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript type coercion', () => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
       const prop = extractProp('<div foo={bar as any} />');
 
       const expected = 'bar';

diff --git a/__tests__/src/getPropValue-flowparser-test.js b/__tests__/src/getPropValue-flowparser-test.js
@@ -904,7 +904,7 @@ describe('getPropValue', () => {
 
   describeIfNotBabylon('Typescript', () => {
     beforeEach(() => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript non-null assertion', () => {
@@ -926,7 +926,7 @@ describe('getPropValue', () => {
     });
 
     it('should return string representation of variable identifier wrapped in a Typescript type coercion', () => {
-      changePlugins(pls => [...pls, 'typescript']);
+      changePlugins((pls) => [...pls, 'typescript']);
       const prop = extractProp('<div foo={bar as any} />');
 
       const expected = 'bar';

diff --git a/__tests__/src/index-test.js b/__tests__/src/index-test.js
@@ -5,8 +5,8 @@ import assert from 'assert';
 import core from '../../src/index';
 
 const src = fs.readdirSync(path.resolve(__dirname, '../../src'))
-  .filter(f => f.indexOf('.js') >= 0)
-  .map(f => path.basename(f, '.js'));
+  .filter((f) => f.indexOf('.js') >= 0)
+  .map((f) => path.basename(f, '.js'));
 
 describe('main export', () => {
   it('should export an object', () => {
@@ -16,7 +16,7 @@ describe('main export', () => {
     assert.equal(expected, actual);
   });
 
-  src.filter(f => f !== 'index').forEach((f) => {
+  src.filter((f) => f !== 'index').forEach((f) => {
     it(`should export ${f}`, () => {
       assert.equal(
         core[f],

diff --git a/src/hasProp.js b/src/hasProp.js
@@ -33,7 +33,7 @@ export default function hasProp(props = [], prop = '', options = DEFAULT_OPTIONS
 export function hasAnyProp(nodeProps = [], props = [], options = DEFAULT_OPTIONS) {
   const propsToCheck = typeof props === 'string' ? props.split(' ') : props;
 
-  return propsToCheck.some(prop => hasProp(nodeProps, prop, options));
+  return propsToCheck.some((prop) => hasProp(nodeProps, prop, options));
 }
 
 /**
@@ -43,5 +43,5 @@ export function hasAnyProp(nodeProps = [], props = [], options = DEFAULT_OPTIONS
 export function hasEveryProp(nodeProps = [], props = [], options = DEFAULT_OPTIONS) {
   const propsToCheck = typeof props === 'string' ? props.split(' ') : props;
 
-  return propsToCheck.every(prop => hasProp(nodeProps, prop, options));
+  return propsToCheck.every((prop) => hasProp(nodeProps, prop, options));
 }
diff --git a/src/values/expressions/ArrayExpression.js b/src/values/expressions/ArrayExpression.js
@@ -7,5 +7,5 @@
 export default function extractValueFromArrayExpression(value) {
   // eslint-disable-next-line global-require
   const getValue = require('./index.js').default;
-  return value.elements.map(element => getValue(element));
+  return value.elements.map((element) => getValue(element));
 }
diff --git a/src/values/expressions/ObjectExpression.js b/src/values/expressions/ObjectExpression.js
@@ -10,7 +10,7 @@ export default function extractValueFromObjectExpression(value) {
   // eslint-disable-next-line global-require
   const getValue = require('./index.js').default;
   return value.properties.reduce((obj, property) => {
-    const object = Object.assign({}, obj);
+    const object = { ...obj };
     // Support types: SpreadProperty and ExperimentalSpreadProperty
     if (/^(?:Experimental)?Spread(?:Property|Element)$/.test(property.type)) {
       if (property.argument.type === 'ObjectExpression') {

diff --git a/src/values/expressions/index.js b/src/values/expressions/index.js
@@ -48,7 +48,7 @@ const TYPES = {
 
 const noop = () => null;
 
-const errorMessage = expression => `The prop value with an expression type of ${expression} could not be resolved. Please file issue to get this fixed immediately.`;
+const errorMessage = (expression) => `The prop value with an expression type of ${expression} could not be resolved. Please file issue to get this fixed immediately.`;
 
 /**
  * This function maps an AST value node
@@ -91,7 +91,8 @@ export default function extract(value) {
 }
 
 // Composition map of types to their extractor functions to handle literals.
-const LITERAL_TYPES = Object.assign({}, TYPES, {
+const LITERAL_TYPES = {
+  ...TYPES,
   Literal: (value) => {
     const extractedVal = TYPES.Literal.call(undefined, value);
     const isNull = extractedVal === null;
@@ -125,14 +126,14 @@ const LITERAL_TYPES = Object.assign({}, TYPES, {
   NewExpression: noop,
   ArrayExpression: (value) => {
     const extractedVal = TYPES.ArrayExpression.call(undefined, value);
-    return extractedVal.filter(val => val !== null);
+    return extractedVal.filter((val) => val !== null);
   },
   BindExpression: noop,
   SpreadElement: noop,
   TSNonNullExpression: noop,
   TSAsExpression: noop,
   TypeCastExpression: noop,
-});
+};
 
 /**
  * This function maps an AST value node

diff --git a/src/values/index.js b/src/values/index.js
@@ -10,10 +10,11 @@ const TYPES = {
 };
 
 // Composition map of types to their extractor functions to handle literals.
-const LITERAL_TYPES = Object.assign({}, TYPES, {
+const LITERAL_TYPES = {
+  ...TYPES,
   JSXElement: () => null,
   JSXExpressionContainer: extractLiteral,
-});
+};
 
 /**
  * This function maps an AST value node