Merge pull request #8 from GitScrum/master

maltsev · web-flow · commit ebc1b49db5a7 · 2017-03-24T20:15:20.000+02:00
[feat]: add multiple classes
diff --git a/lib/cssModules.es6 b/lib/cssModules.es6
@@ -35,14 +35,18 @@ function getCssClassName(cssModulesPath, cssModuleName) {
     }
 
     const cssModules = getCssModules(path.resolve(cssModulesPath));
-    const cssClassName = _get(cssModules, cssModuleName);
-    if (! cssClassName) {
-        throw getError('CSS module "' + cssModuleName + '" is not found');
-    } else if (typeof cssClassName !== 'string') {
-        throw getError('CSS module "' + cssModuleName + '" is not a string');
-    }
 
-    return cssClassName;
+    return cssModuleName.split(' ')
+        .map(cssModuleName => {
+            const cssClassName = _get(cssModules, cssModuleName);
+            if (! cssClassName) {
+                throw getError('CSS module "' + cssModuleName + '" is not found');
+            } else if (typeof cssClassName !== 'string') {
+                throw getError('CSS module "' + cssModuleName + '" is not a string');
+            }    
+            return cssClassName;
+        })
+        .join(' ');
 }
 
 
diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
     "babel-preset-es2015": "^6.3.13",
     "eslint": "^2.0.0",
     "expect": "^1.14.0",
-    "mocha": "^2.4.5",
-    "posthtml": "^0.8.2",
+    "mocha": "^3.2.0",
+    "posthtml": "^0.9.2",
     "rimraf": "^2.5.2"
   },
   "repository": {
diff --git a/test/classes.json b/test/classes.json
@@ -1,5 +1,6 @@
 {
     "title": "__title __heading",
+    "color": "__color",
     "user": {
         "profile": {
             "photo": "__user__profile__photo"
diff --git a/test/cssModules.js b/test/cssModules.js
@@ -25,6 +25,14 @@ describe('posthtml-css-modules', () => {
         );
     });
 
+    it('should inline CSS module from the file (multiple classes)', () => {
+        return init(
+            '<div class="foob" css-module="title color"></div>',
+            '<div class="foob __title __heading __color"></div>',
+            classesPath
+        );
+    });
+
 
     it('should inline CSS module from the directory', () => {
         return init(

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"title": "__title __heading",`
	`3`	`+ "color": "__color",`
`3`	`4`	`"user": {`
`4`	`5`	`"profile": {`
`5`	`6`	`"photo": "__user__profile__photo"`