Less clutter when setting the configuration.

gajus · gajus · commit 024cfd6098d4 · 2015-08-30T16:19:22.000+01:00
diff --git a/dist/index.js b/dist/index.js
@@ -6,7 +6,7 @@ Object.defineProperty(exports, '__esModule', {
 
 var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
-var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
+var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -18,10 +18,6 @@ var _linkClass = require('./linkClass');
 
 var _linkClass2 = _interopRequireDefault(_linkClass);
 
-var _makeConfig = require('./makeConfig');
-
-var _makeConfig2 = _interopRequireDefault(_makeConfig);
-
 var decoratorConstructor = undefined,
     functionConstructor = undefined;
 
@@ -33,9 +29,7 @@ var decoratorConstructor = undefined,
  * @param {Object} options {@link https://github.com/gajus/react-css-modules#options}
  * @return {Function}
  */
-functionConstructor = function (Component, styles) {
-    var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
-
+functionConstructor = function (Component, styles, options) {
     return (function (_Component) {
         _inherits(_class, _Component);
 
@@ -48,7 +42,7 @@ functionConstructor = function (Component, styles) {
         _createClass(_class, [{
             key: 'render',
             value: function render() {
-                return (0, _linkClass2['default'])(_get(Object.getPrototypeOf(_class.prototype), 'render', this).call(this), styles, (0, _makeConfig2['default'])(options));
+                return (0, _linkClass2['default'])(_get(Object.getPrototypeOf(_class.prototype), 'render', this).call(this), styles, options);
             }
         }]);
 
diff --git a/dist/linkClass.js b/dist/linkClass.js
@@ -10,39 +10,45 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _makeConfiguration = require('./makeConfiguration');
+
+var _makeConfiguration2 = _interopRequireDefault(_makeConfiguration);
+
 var linkClass = undefined;
 
 /**
  * @param {ReactElement} element
  * @param {Object} styles CSS modules class map.
- * @param {CSSModules~Options} options
+ * @param {CSSModules~Options} userConfiguration
  * @return {ReactElement}
  */
-linkClass = function (element) {
-    var styles = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-    var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+linkClass = function (element, styles, userConfiguration) {
+    if (styles === undefined) styles = {};
 
     var appendClassName = undefined,
         childrenCount = undefined,
         clonedElement = undefined,
+        configuration = undefined,
         newChildren = undefined,
         newProps = undefined,
         styleNames = undefined;
 
+    configuration = (0, _makeConfiguration2['default'])(userConfiguration);
+
     styleNames = element.props.styleName;
 
     if (styleNames) {
         styleNames = styleNames.split(' ');
 
-        if (options.allowMultiple === false && styleNames.length > 1) {
+        if (configuration.allowMultiple === false && styleNames.length > 1) {
             throw new Error('ReactElement styleName property defines multiple module names ("' + element.props.styleName + '").');
         }
 
         appendClassName = styleNames.map(function (styleName) {
             if (styles[styleName]) {
                 return styles[styleName];
             } else {
-                if (options.errorWhenNotFound === true) {
+                if (configuration.errorWhenNotFound === true) {
                     throw new Error('"' + styleName + '" CSS module is undefined.');
                 }
 
@@ -65,13 +71,13 @@ linkClass = function (element) {
         if (childrenCount > 1) {
             newChildren = _react2['default'].Children.map(element.props.children, function (node) {
                 if (_react2['default'].isValidElement(node)) {
-                    return linkClass(node, styles, options);
+                    return linkClass(node, styles, configuration);
                 } else {
                     return node;
                 }
             });
         } else if (childrenCount === 1) {
-            newChildren = linkClass(_react2['default'].Children.only(element.props.children), styles, options);
+            newChildren = linkClass(_react2['default'].Children.only(element.props.children), styles, configuration);
         }
     }
 
diff --git a/dist/makeConfig.js b/dist/makeConfig.js
diff --git a/dist/makeConfiguration.js b/dist/makeConfiguration.js
@@ -0,0 +1,50 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var _utils = require('./utils');
+
+var _utils2 = _interopRequireDefault(_utils);
+
+/**
+ * @typedef CSSModules~Options
+ * @see {@link https://github.com/gajus/react-css-modules#options}
+ * @property {Boolean} allowMultiple
+ * @property {Boolean} errorWhenNotFound
+ */
+
+/**
+ * @param {CSSModules~Options} userConfiguration
+ * @return {CSSModules~Options}
+ */
+
+exports['default'] = function () {
+    var userConfiguration = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+    var configuration = undefined;
+
+    configuration = {
+        allowMultiple: false,
+        errorWhenNotFound: true
+    };
+
+    _utils2['default'].forEach(userConfiguration, function (value, name) {
+        if (typeof configuration[name] === 'undefined') {
+            throw new Error('Unknown configuration property "' + name + '".');
+        }
+
+        if (typeof value !== 'boolean') {
+            throw new Error('"' + name + '" property value must be a boolean.');
+        }
+
+        configuration[name] = value;
+    });
+
+    return configuration;
+};
+
+module.exports = exports['default'];
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,4 @@
 import linkClass from './linkClass';
-import makeConfig from './makeConfig';
 
 let decoratorConstructor,
     functionConstructor;
@@ -12,10 +11,10 @@ let decoratorConstructor,
  * @param {Object} options {@link https://github.com/gajus/react-css-modules#options}
  * @return {Function}
  */
-functionConstructor = (Component, styles, options = {}) => {
+functionConstructor = (Component, styles, options) => {
     return class extends Component {
         render () {
-            return linkClass(super.render(), styles, makeConfig(options));
+            return linkClass(super.render(), styles, options);
         }
     };
 };
diff --git a/src/linkClass.js b/src/linkClass.js
@@ -1,35 +1,39 @@
 import React from 'react';
+import makeConfiguration from './makeConfiguration';
 
 let linkClass;
 
 /**
  * @param {ReactElement} element
  * @param {Object} styles CSS modules class map.
- * @param {CSSModules~Options} options
+ * @param {CSSModules~Options} userConfiguration
  * @return {ReactElement}
  */
-linkClass = (element, styles = {}, options = {}) => {
+linkClass = (element, styles = {}, userConfiguration) => {
     let appendClassName,
         childrenCount,
         clonedElement,
+        configuration,
         newChildren,
         newProps,
         styleNames;
 
+    configuration = makeConfiguration(userConfiguration);
+
     styleNames = element.props.styleName;
 
     if (styleNames) {
         styleNames = styleNames.split(' ');
 
-        if (options.allowMultiple === false && styleNames.length > 1) {
+        if (configuration.allowMultiple === false && styleNames.length > 1) {
             throw new Error(`ReactElement styleName property defines multiple module names ("${element.props.styleName}").`);
         }
 
         appendClassName = styleNames.map((styleName) => {
             if (styles[styleName]) {
                 return styles[styleName];
             } else {
-                if (options.errorWhenNotFound === true) {
+                if (configuration.errorWhenNotFound === true) {
                     throw new Error(`"${styleName}" CSS module is undefined.`);
                 }
 
@@ -52,13 +56,13 @@ linkClass = (element, styles = {}, options = {}) => {
         if (childrenCount > 1) {
             newChildren = React.Children.map(element.props.children, (node) => {
                 if (React.isValidElement(node)) {
-                    return linkClass(node, styles, options);
+                    return linkClass(node, styles, configuration);
                 } else {
                     return node;
                 }
             });
         } else if (childrenCount === 1) {
-            newChildren = linkClass(React.Children.only(element.props.children), styles, options);
+            newChildren = linkClass(React.Children.only(element.props.children), styles, configuration);
         }
     }
 
diff --git a/src/makeConfig.js b/src/makeConfig.js
diff --git a/src/makeConfiguration.js b/src/makeConfiguration.js
@@ -0,0 +1,35 @@
+import _ from './utils';
+
+/**
+ * @typedef CSSModules~Options
+ * @see {@link https://github.com/gajus/react-css-modules#options}
+ * @property {Boolean} allowMultiple
+ * @property {Boolean} errorWhenNotFound
+ */
+
+/**
+ * @param {CSSModules~Options} userConfiguration
+ * @return {CSSModules~Options}
+ */
+export default (userConfiguration = {}) => {
+    let configuration;
+
+    configuration = {
+        allowMultiple: false,
+        errorWhenNotFound: true
+    };
+
+    _.forEach(userConfiguration, (value, name) => {
+        if (typeof configuration[name] === 'undefined') {
+            throw new Error(`Unknown configuration property "${name}".`);
+        }
+
+        if (typeof value !== 'boolean') {
+            throw new Error(`"${name}" property value must be a boolean.`);
+        }
+
+        configuration[name] = value;
+    });
+
+    return configuration;
+};
diff --git a/src/utils.js b/src/utils.js
@@ -1,9 +1,5 @@
-import keys from 'lodash/object/keys';
-import difference from 'lodash/array/difference';
 import forEach from 'lodash/collection/forEach';
 
 export default {
-    keys,
-    difference,
     forEach
 };
diff --git a/test/linkClass.js b/test/linkClass.js
@@ -5,7 +5,7 @@ import {
 import React from 'react';
 import TestUtils from 'react-addons-test-utils';
 import jsdom from 'jsdom';
-import linkClass from './../dist/linkClass';
+import linkClass from './../src/linkClass';
 
 describe('linkClass', () => {
     context('when ReactElement does not define styleName', () => {
diff --git a/test/makeConfig.js b/test/makeConfig.js
diff --git a/test/makeConfiguration.js b/test/makeConfiguration.js
