Merge branch 'master' into customValidatorDetection

Author: CalebMorris

History.md

@@ -1,3 +1,17 @@
+3.0.0 / 2015-07-21
+==================
+
+* add jsx-no-duplicate-props rule ([#161][] @hummlas)
+* add allowMultiline option to the jsx-curly-spacing rule ([#156][] @mathieumg)
+* breaking in jsx-curly-spacing braces spanning multiple lines are now allowed with never option ([#156][] @mathieumg)
+* fix multiple var and destructuring handling in props-types ([#159][])
+* fix crash when retrieving propType name ([#163][])
+
+[#161]: https://github.com/yannickcr/eslint-plugin-react/pull/161
+[#156]: https://github.com/yannickcr/eslint-plugin-react/pull/156
+[#159]: https://github.com/yannickcr/eslint-plugin-react/issues/159
+[#163]: https://github.com/yannickcr/eslint-plugin-react/issues/163
+
 2.7.1 / 2015-07-16
 ==================
 

README.md

@@ -44,6 +44,7 @@ Finally, enable all of the rules that you would like to use.
   "rules": {
     "react/display-name": 1,
     "react/jsx-boolean-value": 1,
+    "react/jsx-no-duplicate-props": 1,
     "react/jsx-no-undef": 1,
     "react/jsx-quotes": 1,
     "react/jsx-sort-prop-types": 1,
@@ -70,6 +71,7 @@ Finally, enable all of the rules that you would like to use.
 * [display-name](docs/rules/display-name.md): Prevent missing displayName in a React component definition
 * [jsx-boolean-value](docs/rules/jsx-boolean-value.md): Enforce boolean attributes notation in JSX
 * [jsx-curly-spacing](docs/rules/jsx-curly-spacing.md): Enforce or disallow spaces inside of curly braces in JSX attributes
+* [jsx-no-duplicate-props](docs/rules/jsx-no-duplicate-props.md): Prevent duplicate props in JSX
 * [jsx-no-undef](docs/rules/jsx-no-undef.md): Disallow undeclared variables in JSX
 * [jsx-quotes](docs/rules/jsx-quotes.md): Enforce quote style for JSX attributes
 * [jsx-sort-prop-types](docs/rules/jsx-sort-prop-types.md): Enforce propTypes declarations alphabetical sorting

docs/rules/jsx-curly-spacing.md

@@ -29,16 +29,16 @@ When `"never"` is set, the following patterns are considered warnings:
 <Hello name={ firstname } />;
 <Hello name={ firstname} />;
 <Hello name={firstname } />;
-<Hello name={
-  firstname
-} />;
 ```
 
 The following patterns are not warnings:
 
 ```js
 <Hello name={firstname} />;
 <Hello name={{ firstname: 'John', lastname: 'Doe' }} />;
+<Hello name={
+  firstname
+} />;
 ```
 
 #### always
@@ -61,6 +61,51 @@ The following patterns are not warnings:
 } />;
 ```
 
+#### Braces spanning multiple lines
+
+By default, braces spanning multiple lines are allowed with either setting. If you want to disallow them you can specify an additional `allowMultiline` property with the value `false`:
+
+```json
+"jsx-curly-spacing": [2, "never", {"allowMultiline": false}]
+```
+
+When `"never"` is used and `allowMultiline` is `false`, the following patterns are considered warnings:
+
+```js
+<Hello name={ firstname } />;
+<Hello name={ firstname} />;
+<Hello name={firstname } />;
+<Hello name={
+  firstname
+} />;
+```
+
+The following patterns are not warnings:
+
+```js
+<Hello name={firstname} />;
+<Hello name={{ firstname: 'John', lastname: 'Doe' }} />;
+```
+
+When `"always"` is used and `allowMultiline` is `false`, the following patterns are considered warnings:
+
+```js
+<Hello name={firstname} />;
+<Hello name={ firstname} />;
+<Hello name={firstname } />;
+<Hello name={
+  firstname
+} />;
+```
+
+The following patterns are not warnings:
+
+```js
+<Hello name={ firstname } />;
+<Hello name={ {firstname: 'John', lastname: 'Doe'} } />;
+```
+
+
 ## When Not To Use It
 
 You can turn this rule off if you are not concerned with the consistency around the spacing inside of JSX attributes.

docs/rules/jsx-no-duplicate-props.md

@@ -0,0 +1,33 @@
+# Prevent duplicate properties in JSX (jsx-no-duplicate-props)
+
+Creating JSX elements with duplicate props can cause unexpected behavior in your application.
+
+## Rule Details
+
+The following patterns are considered warnings:
+
+```js
+<Hello name="John" name="John" />;
+```
+
+The following patterns are not considered warnings:
+
+```js
+<Hello firstname="John" lastname="Doe" />;
+```
+
+## Rule Options
+
+```js
+...
+"jsx-no-duplicate-props": [<enabled>, { "ignoreCase": <boolean> }]
+...
+```
+
+### `ignoreCase`
+
+When `true` the rule ignores the case of the props. Default to `false`.
+
+## When Not To Use It
+
+If you are not using JSX then you can disable this rule.

index.js

@@ -21,7 +21,8 @@ module.exports = {
     'jsx-sort-prop-types': require('./lib/rules/jsx-sort-prop-types'),
     'jsx-boolean-value': require('./lib/rules/jsx-boolean-value'),
     'sort-comp': require('./lib/rules/sort-comp'),
-    'require-extension': require('./lib/rules/require-extension')
+    'require-extension': require('./lib/rules/require-extension'),
+    'jsx-no-duplicate-props': require('./lib/rules/jsx-no-duplicate-props')
   },
   rulesConfig: {
     'jsx-uses-react': 0,
@@ -43,6 +44,7 @@ module.exports = {
     'jsx-sort-prop-types': 0,
     'jsx-boolean-value': 0,
     'sort-comp': 0,
-    'require-extension': 0
+    'require-extension': 0,
+    'jsx-no-duplicate-props': 0
   }
 };

lib/rules/jsx-curly-spacing.js

@@ -10,13 +10,24 @@
 
 module.exports = function(context) {
   var spaced = context.options[0] === 'always';
+  var multiline = context.options[1] ? context.options[1].allowMultiline : true;
 
   // --------------------------------------------------------------------------
   // Helpers
   // --------------------------------------------------------------------------
 
   /**
-   * Determines whether two adjacent tokens are have whitespace between them.
+   * Determines whether two adjacent tokens have a newline between them.
+   * @param {Object} left - The left token object.
+   * @param {Object} right - The right token object.
+   * @returns {boolean} Whether or not there is a newline between the tokens.
+   */
+  function isMultiline(left, right) {
+    return left.loc.start.line !== right.loc.start.line;
+  }
+
+  /**
+   * Determines whether two adjacent tokens have whitespace between them.
    * @param {Object} left - The left token object.
    * @param {Object} right - The right token object.
    * @returns {boolean} Whether or not there is space between the tokens.
@@ -25,6 +36,28 @@ module.exports = function(context) {
     return left.range[1] < right.range[0];
   }
 
+  /**
+  * Reports that there shouldn't be a newline after the first token
+  * @param {ASTNode} node - The node to report in the event of an error.
+  * @param {Token} token - The token to use for the report.
+  * @returns {void}
+  */
+  function reportNoBeginningNewline(node, token) {
+    context.report(node, token.loc.start,
+      'There should be no newline after \'' + token.value + '\'');
+  }
+
+  /**
+  * Reports that there shouldn't be a newline before the last token
+  * @param {ASTNode} node - The node to report in the event of an error.
+  * @param {Token} token - The token to use for the report.
+  * @returns {void}
+  */
+  function reportNoEndingNewline(node, token) {
+    context.report(node, token.loc.start,
+      'There should be no newline before \'' + token.value + '\'');
+  }
+
   /**
   * Reports that there shouldn't be a space after the first token
   * @param {ASTNode} node - The node to report in the event of an error.
@@ -79,16 +112,28 @@ module.exports = function(context) {
    * @returns {void}
    */
   function validateBraceSpacing(node, first, second, penultimate, last) {
-    if (spaced && !isSpaced(first, second)) {
-      reportRequiredBeginningSpace(node, first);
+    if (spaced) {
+      if (!isSpaced(first, second)) {
+        reportRequiredBeginningSpace(node, first);
+      } else if (!multiline && isMultiline(first, second)) {
+        reportNoBeginningNewline(node, first);
+      }
+
+      if (!isSpaced(penultimate, last)) {
+        reportRequiredEndingSpace(node, last);
+      } else if (!multiline && isMultiline(penultimate, last)) {
+        reportNoEndingNewline(node, last);
+      }
+
+      return;
     }
-    if (!spaced && isSpaced(first, second)) {
+
+    // "never" setting if we get here.
+    if (isSpaced(first, second) && !(multiline && isMultiline(first, second))) {
       reportNoBeginningSpace(node, first);
     }
-    if (spaced && !isSpaced(penultimate, last)) {
-      reportRequiredEndingSpace(node, last);
-    }
-    if (!spaced && isSpaced(penultimate, last)) {
+
+    if (isSpaced(penultimate, last) && !(multiline && isMultiline(penultimate, last))) {
       reportNoEndingSpace(node, last);
     }
   }
@@ -111,4 +156,12 @@ module.exports = function(context) {
 
 module.exports.schema = [{
   enum: ['always', 'never']
+}, {
+  type: 'object',
+  properties: {
+    allowMultiline: {
+      type: 'boolean'
+    }
+  },
+  additionalProperties: false
 }];

lib/rules/jsx-no-duplicate-props.js

@@ -0,0 +1,50 @@
+/**
+ * @fileoverview Enforce no duplicate props
+ * @author Markus Ånöstam
+ */
+
+'use strict';
+
+// ------------------------------------------------------------------------------
+// Rule Definition
+// ------------------------------------------------------------------------------
+
+module.exports = function (context) {
+
+  var configuration = context.options[0] || {};
+  var ignoreCase = configuration.ignoreCase || false;
+
+  return {
+    JSXOpeningElement: function (node) {
+      var props = {};
+
+      node.attributes.forEach(function(decl) {
+        if (decl.type === 'JSXSpreadAttribute') {
+          return;
+        }
+
+        var name = decl.name.name;
+
+        if (ignoreCase) {
+          name = name.toLowerCase();
+        }
+
+        if (props.hasOwnProperty(name)) {
+          context.report(decl, 'No duplicate props allowed');
+        } else {
+          props[name] = 1;
+        }
+      });
+    }
+  };
+};
+
+module.exports.schema = [{
+  type: 'object',
+  properties: {
+    ignoreCase: {
+      type: 'boolean'
+    }
+  },
+  additionalProperties: false
+}];

lib/rules/prop-types.js

@@ -480,7 +480,7 @@ module.exports = function(context) {
             propTypes = null;
           }
         }
-        if (propTypes) {
+        if (propTypes && propTypes.property) {
           curDeclaredPropTypes[propTypes.property.name] =
             buildReactDeclarationTypes(propTypes.parent.right);
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react",
-  "version": "2.7.1",
+  "version": "3.0.0",
   "author": "Yannick Croissant <[email protected]>",
   "description": "React specific linting rules for ESLint",
   "main": "index.js",