Merge pull request #30 from mohsenshafiei/dev

Dev
mohsenshafiei · Jun 3, 2019 · 862e117 · 862e117
2 parents 4e7b4b3 + 0550ff6
commit 862e117
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/plugins/postcss-module-composer.js b/src/plugins/postcss-module-composer.js
@@ -9,6 +9,7 @@ const {
   isGlobal,
   removeSpace,
   removeNotGlobals,
+  shouldSkip,
 } = require('./utils');
 
 const mainDist = path.resolve(__dirname, '../../dist/quark-loader-output.css');
@@ -21,7 +22,7 @@ module.exports = postcss.plugin('postcss-module-composer', () => (root) => {
     const identifier = rule.selector;
     let once = false;
     identifier.split(',').forEach((selector) => {
-      if (!isGlobal(removeSpace(selector))) {
+      if (!isGlobal(removeSpace(selector)) && !shouldSkip(removeSpace(selector))) {
         composerString += `${removeSpace(selector)} {\n`;
         rule.walkDecls((decl) => {
           composerString += createModuleComposer(decl.prop, decl.value);
@@ -32,9 +33,11 @@ module.exports = postcss.plugin('postcss-module-composer', () => (root) => {
         });
         composerString += '}\n';
       } else if (once === false) {
+        const globals = !shouldSkip(rule.selector)
+          ? removeNotGlobals(rule.selector) : rule.selector;
+        composerString += `${globals} {\n`;
         rule.walkDecls((decl) => {
-          const globals = removeNotGlobals(rule.selector);
-          composerString += `${globals} {\n${createModuleDeclaration(decl.prop, decl.value)}`;
+          composerString += `${createModuleDeclaration(decl.prop, decl.value)}`;
           hashmap.set(
             createModuleSelector(decl.prop, decl.value),
             createModuleDeclaration(decl.prop, decl.value),

diff --git a/src/plugins/utils/index.js b/src/plugins/utils/index.js
@@ -1,7 +1,7 @@
 const globalSelector = require('./global');
 
 const regex = /\(|\)|%|\.|#|,|\+|:|"|\/|\/|`|'/g;
-
+const unvalid = /^[\w\s.,]+$/;
 const createModuleComposer = (property, value) => (`\tcomposes: ${property}--${value.replace(/ /g, '-').replace(regex, '')};\n`);
 
 const createModuleDeclaration = (property, value) => (`\t${property}: ${value};\n`);
@@ -12,6 +12,8 @@ const isGlobal = selector => globalSelector.includes(selector);
 
 const removeSpace = str => str.trim();
 
+const shouldSkip = str => str.search(unvalid);
+
 const removeNotGlobals = (str) => {
   let result = '';
   str.split(',').forEach((item) => {
@@ -28,4 +30,5 @@ module.exports = {
   removeSpace,
   removeNotGlobals,
   isGlobal,
+  shouldSkip,
 };