[Refactor] since default doesn’t do anything, ensure that defaults …

…are correct
jsx-eslint · Feb 24, 2018 · df6ec46 · df6ec46
1 parent 9b16cab
commit df6ec46
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/lib/rules/button-has-type.js b/lib/rules/button-has-type.js
@@ -23,6 +23,12 @@ function isCreateElement(node) {
 // Rule Definition
 // ------------------------------------------------------------------------------
 
+const optionDefaults = {
+  button: true,
+  submit: true,
+  reset: true
+};
+
 module.exports = {
   meta: {
     docs: {
@@ -35,15 +41,15 @@ module.exports = {
       type: 'object',
       properties: {
         button: {
-          default: true,
+          default: optionDefaults.button,
           type: 'boolean'
         },
         submit: {
-          default: true,
+          default: optionDefaults.submit,
           type: 'boolean'
         },
         reset: {
-          default: true,
+          default: optionDefaults.reset,
           type: 'boolean'
         }
       },
@@ -52,11 +58,7 @@ module.exports = {
   },
 
   create: function(context) {
-    const configuration = Object.assign({
-      button: true,
-      submit: true,
-      reset: true
-    }, context.options[0]);
+    const configuration = Object.assign({}, optionDefaults, context.options[0]);
 
     function reportMissing(node) {
       context.report({

diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
@@ -44,8 +44,8 @@ module.exports = {
           {
             type: 'object',
             properties: {
-              props: {enum: OPTION_VALUES, default: OPTION_NEVER},
-              children: {enum: OPTION_VALUES, default: OPTION_NEVER}
+              props: {enum: OPTION_VALUES, default: DEFAULT_CONFIG.props},
+              children: {enum: OPTION_VALUES, default: DEFAULT_CONFIG.children}
             },
             additionalProperties: false
           },

diff --git a/lib/rules/jsx-tag-spacing.js b/lib/rules/jsx-tag-spacing.js
@@ -4,7 +4,6 @@
  */
 'use strict';
 
-const has = require('has');
 const getTokenBeforeClosingBracket = require('../util/getTokenBeforeClosingBracket');
 const docsUrl = require('../util/docsUrl');
 
@@ -219,6 +218,13 @@ function validateBeforeClosing(context, node, option) {
 // Rule Definition
 // ------------------------------------------------------------------------------
 
+const optionDefaults = {
+  closingSlash: 'never',
+  beforeSelfClosing: 'always',
+  afterOpening: 'never',
+  beforeClosing: 'allow'
+};
+
 module.exports = {
   meta: {
     docs: {
@@ -245,28 +251,13 @@ module.exports = {
             enum: ['always', 'never', 'allow']
           }
         },
-        default: {
-          closingSlash: 'never',
-          beforeSelfClosing: 'always',
-          afterOpening: 'never',
-          beforeClosing: 'allow'
-        },
+        default: optionDefaults,
         additionalProperties: false
       }
     ]
   },
   create: function (context) {
-    const options = {
-      closingSlash: 'never',
-      beforeSelfClosing: 'always',
-      afterOpening: 'never',
-      beforeClosing: 'allow'
-    };
-    for (const key in options) {
-      if (has(options, key) && has(context.options[0] || {}, key)) {
-        options[key] = context.options[0][key];
-      }
-    }
+    const options = Object.assign({}, optionDefaults, context.options[0]);
 
     return {
       JSXOpeningElement: function (node) {

diff --git a/lib/rules/self-closing-comp.js b/lib/rules/self-closing-comp.js
@@ -10,6 +10,8 @@ const docsUrl = require('../util/docsUrl');
 // Rule Definition
 // ------------------------------------------------------------------------------
 
+const optionDefaults = {component: true, html: true};
+
 module.exports = {
   meta: {
     docs: {
@@ -24,11 +26,11 @@ module.exports = {
       type: 'object',
       properties: {
         component: {
-          default: true,
+          default: optionDefaults.component,
           type: 'boolean'
         },
         html: {
-          default: true,
+          default: optionDefaults.html,
           type: 'boolean'
         }
       },
@@ -58,7 +60,7 @@ module.exports = {
     }
 
     function isShouldBeSelfClosed(node) {
-      const configuration = context.options[0] || {component: true, html: true};
+      const configuration = Object.assign({}, optionDefaults, context.options[0]);
       return (
         configuration.component && isComponent(node) ||
         configuration.html && isTagName(node.name.name)