Eslint --fix for arrow functions

dfilipidisz · dfilipidisz · commit dba095d47de5 · 2017-07-20T11:23:39.000+02:00
diff --git a/lib/rules/default-props-match-prop-types.js b/lib/rules/default-props-match-prop-types.js
@@ -91,7 +91,7 @@ module.exports = {
      * @returns {ASTNode|null} Return null if the variable could not be found, ASTNode otherwise.
      */
     function findVariableByName(name) {
-      const variable = variableUtil.variablesInScope(context).find((item) => item.name === name);
+      const variable = variableUtil.variablesInScope(context).find(item => item.name === name);
 
       if (!variable || !variable.defs[0] || !variable.defs[0].node) {
         return null;
@@ -156,13 +156,11 @@ module.exports = {
     function getPropTypesFromObjectExpression(objectExpression) {
       const props = objectExpression.properties.filter(property => property.type !== 'ExperimentalSpreadProperty');
 
-      return props.map(property => {
-        return {
-          name: property.key.name,
-          isRequired: isRequiredPropType(property.value),
-          node: property
-        };
-      });
+      return props.map(property => ({
+        name: property.key.name,
+        isRequired: isRequiredPropType(property.value),
+        node: property
+      }));
     }
 
     /**
@@ -233,12 +231,10 @@ module.exports = {
         return 'unresolved';
       }
 
-      return objectExpression.properties.map(defaultProp => {
-        return {
-          name: defaultProp.key.name,
-          node: defaultProp
-        };
-      });
+      return objectExpression.properties.map(defaultProp => ({
+        name: defaultProp.key.name,
+        node: defaultProp
+      }));
     }
 
     /**
diff --git a/lib/rules/forbid-foreign-prop-types.js b/lib/rules/forbid-foreign-prop-types.js
@@ -45,9 +45,7 @@ module.exports = {
       },
 
       ObjectPattern: function(node) {
-        const propTypesNode = node.properties.find(property => {
-          return property.type === 'Property' && property.key.name === 'propTypes';
-        });
+        const propTypesNode = node.properties.find(property => property.type === 'Property' && property.key.name === 'propTypes');
 
         if (propTypesNode) {
           context.report({
diff --git a/lib/rules/jsx-boolean-value.js b/lib/rules/jsx-boolean-value.js
@@ -20,7 +20,7 @@ const NEVER = 'never';
 const errorData = new WeakMap();
 function getErrorData(exceptions) {
   if (!errorData.has(exceptions)) {
-    const exceptionProps = Array.from(exceptions, (name) => `\`${name}\``).join(', ');
+    const exceptionProps = Array.from(exceptions, name => `\`${name}\``).join(', ');
     const exceptionsMessage = exceptions.size > 0 ? ` for the following props: ${exceptionProps}` : '';
     errorData.set(exceptions, {exceptionsMessage: exceptionsMessage});
   }
diff --git a/lib/rules/jsx-filename-extension.js b/lib/rules/jsx-filename-extension.js
@@ -64,9 +64,7 @@ module.exports = {
         }
 
         const allowedExtensions = getExtensionsConfig();
-        const isAllowedExtension = allowedExtensions.some(extension => {
-          return filename.slice(-extension.length) === extension;
-        });
+        const isAllowedExtension = allowedExtensions.some(extension => filename.slice(-extension.length) === extension);
 
         if (isAllowedExtension) {
           return;
diff --git a/lib/rules/jsx-no-target-blank.js b/lib/rules/jsx-no-target-blank.js
@@ -15,12 +15,10 @@ function isTargetBlank(attr) {
 }
 
 function hasExternalLink(element) {
-  return element.attributes.some(attr => {
-    return attr.name &&
+  return element.attributes.some(attr => attr.name &&
       attr.name.name === 'href' &&
       attr.value.type === 'Literal' &&
-      /^(?:\w+:|\/\/)/.test(attr.value.value);
-  });
+      /^(?:\w+:|\/\/)/.test(attr.value.value));
 }
 
 function hasSecureRel(element) {
diff --git a/lib/rules/no-direct-mutation-state.js b/lib/rules/no-direct-mutation-state.js
@@ -98,7 +98,7 @@ module.exports = {
       'Program:exit': function () {
         const list = components.list();
 
-        Object.keys(list).forEach((key) => {
+        Object.keys(list).forEach(key => {
           if (!isValid(list[key])) {
             reportMutations(list[key]);
           }
diff --git a/lib/rules/no-unknown-property.js b/lib/rules/no-unknown-property.js
@@ -138,13 +138,11 @@ const tagConvention = /^[a-z][^-]*$/;
 function isTagName(node) {
   if (tagConvention.test(node.parent.name.name)) {
     // http://www.w3.org/TR/custom-elements/#type-extension-semantics
-    return !node.parent.attributes.some(attrNode => {
-      return (
-        attrNode.type === 'JSXAttribute' &&
+    return !node.parent.attributes.some(attrNode => (
+      attrNode.type === 'JSXAttribute' &&
         attrNode.name.type === 'JSXIdentifier' &&
         attrNode.name.name === 'is'
-      );
-    });
+    ));
   }
   return false;
 }
diff --git a/lib/rules/require-default-props.js b/lib/rules/require-default-props.js
@@ -147,13 +147,11 @@ module.exports = {
     function getPropTypesFromObjectExpression(objectExpression) {
       const props = objectExpression.properties.filter(property => property.type !== 'ExperimentalSpreadProperty');
 
-      return props.map(property => {
-        return {
-          name: sourceCode.getText(property.key).replace(QUOTES_REGEX, ''),
-          isRequired: isRequiredPropType(property.value),
-          node: property
-        };
-      });
+      return props.map(property => ({
+        name: sourceCode.getText(property.key).replace(QUOTES_REGEX, ''),
+        isRequired: isRequiredPropType(property.value),
+        node: property
+      }));
     }
 
     /**
diff --git a/lib/rules/sort-comp.js b/lib/rules/sort-comp.js
@@ -361,13 +361,11 @@ module.exports = {
      * @param {Array} properties Array containing all the properties.
      */
     function checkPropsOrder(properties) {
-      const propertiesInfos = properties.map(node => {
-        return {
-          name: getPropertyName(node),
-          static: node.static,
-          typeAnnotation: !!node.typeAnnotation && node.value === null
-        };
-      });
+      const propertiesInfos = properties.map(node => ({
+        name: getPropertyName(node),
+        static: node.static,
+        typeAnnotation: !!node.typeAnnotation && node.value === null
+      }));
 
       let i;
       let j;
diff --git a/lib/rules/style-prop-object.js b/lib/rules/style-prop-object.js
@@ -52,9 +52,7 @@ module.exports = {
           && node.arguments.length > 1
         ) {
           if (node.arguments[1].type === 'ObjectExpression') {
-            const style = node.arguments[1].properties.find(property => {
-              return property.key && property.key.name === 'style' && !property.computed;
-            });
+            const style = node.arguments[1].properties.find(property => property.key && property.key.name === 'style' && !property.computed);
             if (style) {
               if (style.value.type === 'Identifier') {
                 checkIdentifiers(style.value);
diff --git a/lib/rules/void-dom-elements-no-children.js b/lib/rules/void-dom-elements-no-children.js
@@ -56,97 +56,95 @@ module.exports = {
     schema: []
   },
 
-  create: Components.detect((context, components, utils) => {
-    return {
-      JSXElement: function(node) {
-        const elementName = node.openingElement.name.name;
-
-        if (!isVoidDOMElement(elementName)) {
-          // e.g. <div />
-          return;
-        }
-
-        if (node.children.length > 0) {
-          // e.g. <br>Foo</br>
-          context.report({
-            node: node,
-            message: errorMessage(elementName)
-          });
-        }
-
-        const attributes = node.openingElement.attributes;
+  create: Components.detect((context, components, utils) => ({
+    JSXElement: function(node) {
+      const elementName = node.openingElement.name.name;
 
-        const hasChildrenAttributeOrDanger = attributes.some((attribute) => {
-          if (!attribute.name) {
-            return false;
-          }
+      if (!isVoidDOMElement(elementName)) {
+        // e.g. <div />
+        return;
+      }
 
-          return attribute.name.name === 'children' || attribute.name.name === 'dangerouslySetInnerHTML';
+      if (node.children.length > 0) {
+        // e.g. <br>Foo</br>
+        context.report({
+          node: node,
+          message: errorMessage(elementName)
         });
+      }
 
-        if (hasChildrenAttributeOrDanger) {
-          // e.g. <br children="Foo" />
-          context.report({
-            node: node,
-            message: errorMessage(elementName)
-          });
-        }
-      },
+      const attributes = node.openingElement.attributes;
 
-      CallExpression: function(node) {
-        if (node.callee.type !== 'MemberExpression' && node.callee.type !== 'Identifier') {
-          return;
+      const hasChildrenAttributeOrDanger = attributes.some(attribute => {
+        if (!attribute.name) {
+          return false;
         }
 
-        if (!utils.isReactCreateElement(node)) {
-          return;
-        }
+        return attribute.name.name === 'children' || attribute.name.name === 'dangerouslySetInnerHTML';
+      });
 
-        const args = node.arguments;
+      if (hasChildrenAttributeOrDanger) {
+        // e.g. <br children="Foo" />
+        context.report({
+          node: node,
+          message: errorMessage(elementName)
+        });
+      }
+    },
 
-        if (args.length < 1) {
-          // React.createElement() should not crash linter
-          return;
-        }
+    CallExpression: function(node) {
+      if (node.callee.type !== 'MemberExpression' && node.callee.type !== 'Identifier') {
+        return;
+      }
 
-        const elementName = args[0].value;
+      if (!utils.isReactCreateElement(node)) {
+        return;
+      }
 
-        if (!isVoidDOMElement(elementName)) {
-          // e.g. React.createElement('div');
-          return;
-        }
+      const args = node.arguments;
 
-        if (args.length < 2 || args[1].type !== 'ObjectExpression') {
-          return;
-        }
+      if (args.length < 1) {
+        // React.createElement() should not crash linter
+        return;
+      }
 
-        const firstChild = args[2];
-        if (firstChild) {
-          // e.g. React.createElement('br', undefined, 'Foo')
-          context.report({
-            node: node,
-            message: errorMessage(elementName)
-          });
-        }
+      const elementName = args[0].value;
 
-        const props = args[1].properties;
+      if (!isVoidDOMElement(elementName)) {
+        // e.g. React.createElement('div');
+        return;
+      }
 
-        const hasChildrenPropOrDanger = props.some((prop) => {
-          if (!prop.key) {
-            return false;
-          }
+      if (args.length < 2 || args[1].type !== 'ObjectExpression') {
+        return;
+      }
 
-          return prop.key.name === 'children' || prop.key.name === 'dangerouslySetInnerHTML';
+      const firstChild = args[2];
+      if (firstChild) {
+        // e.g. React.createElement('br', undefined, 'Foo')
+        context.report({
+          node: node,
+          message: errorMessage(elementName)
         });
+      }
+
+      const props = args[1].properties;
 
-        if (hasChildrenPropOrDanger) {
-          // e.g. React.createElement('br', { children: 'Foo' })
-          context.report({
-            node: node,
-            message: errorMessage(elementName)
-          });
+      const hasChildrenPropOrDanger = props.some(prop => {
+        if (!prop.key) {
+          return false;
         }
+
+        return prop.key.name === 'children' || prop.key.name === 'dangerouslySetInnerHTML';
+      });
+
+      if (hasChildrenPropOrDanger) {
+        // e.g. React.createElement('br', { children: 'Foo' })
+        context.report({
+          node: node,
+          message: errorMessage(elementName)
+        });
       }
-    };
-  })
+    }
+  }))
 };
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -99,9 +99,7 @@ Components.prototype.list = function() {
       component = this.get(node);
     }
     if (component) {
-      const newUsedProps = (this._list[i].usedPropTypes || []).filter(propType => {
-        return !propType.node || propType.node.kind !== 'init';
-      });
+      const newUsedProps = (this._list[i].usedPropTypes || []).filter(propType => !propType.node || propType.node.kind !== 'init');
 
       const componentId = this._getId(component.node);
       usedPropTypes[componentId] = (usedPropTypes[componentId] || []).concat(newUsedProps);
@@ -195,9 +193,7 @@ function componentRule(rule, context) {
         tags: ['extends', 'augments']
       });
 
-      const relevantTags = commentAst.tags.filter(tag => {
-        return tag.name === 'React.Component' || tag.name === 'React.PureComponent';
-      });
+      const relevantTags = commentAst.tags.filter(tag => tag.name === 'React.Component' || tag.name === 'React.PureComponent');
 
       return relevantTags.length > 0;
     },

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const NEVER = 'never';`
`20`	`20`	`const errorData = new WeakMap();`
`21`	`21`	`function getErrorData(exceptions) {`
`22`	`22`	`if (!errorData.has(exceptions)) {`
`23`		- const exceptionProps = Array.from(exceptions, (name) => `\`${name}\``).join(', ');
	`23`	+ const exceptionProps = Array.from(exceptions, name => `\`${name}\``).join(', ');
`24`	`24`	const exceptionsMessage = exceptions.size > 0 ? ` for the following props: ${exceptionProps}` : '';
`25`	`25`	`errorData.set(exceptions, {exceptionsMessage: exceptionsMessage});`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ module.exports = {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`const allowedExtensions = getExtensionsConfig();`
`67`		`- const isAllowedExtension = allowedExtensions.some(extension => {`
`68`		`- return filename.slice(-extension.length) === extension;`
`69`		`- });`
	`67`	`+ const isAllowedExtension = allowedExtensions.some(extension => filename.slice(-extension.length) === extension);`
`70`	`68`
`71`	`69`	`if (isAllowedExtension) {`
`72`	`70`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,10 @@ function isTargetBlank(attr) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`function hasExternalLink(element) {`
`18`		`- return element.attributes.some(attr => {`
`19`		`- return attr.name &&`
	`18`	`+ return element.attributes.some(attr => attr.name &&`
`20`	`19`	`attr.name.name === 'href' &&`
`21`	`20`	`attr.value.type === 'Literal' &&`
`22`		`- /^(?:\w+:\|\/\/)/.test(attr.value.value);`
`23`		`- });`
	`21`	`+ /^(?:\w+:\|\/\/)/.test(attr.value.value));`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`function hasSecureRel(element) {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ module.exports = {`
`98`	`98`	`'Program:exit': function () {`
`99`	`99`	`const list = components.list();`
`100`	`100`
`101`		`- Object.keys(list).forEach((key) => {`
	`101`	`+ Object.keys(list).forEach(key => {`
`102`	`102`	`if (!isValid(list[key])) {`
`103`	`103`	`reportMutations(list[key]);`
`104`	`104`	`}`