ember-scoped-css 0.2.4 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-scoped-css",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "",
   "type": "commonjs",
   "main": "index.js",

package/src/renameClass.js

@@ -1,6 +1,7 @@
-module.exports = function (className, postfix, classesInCss) {
+const getPostfix = require('./getPostfix');
+
+module.exports = function (className, projectCssPath) {
   const classes = className.split(/\s+/);
-  return classes
-    .map((c) => (!classesInCss || classesInCss.has(c) ? c + '_' + postfix : c))
-    .join(' ');
+  const postfix = getPostfix(projectCssPath);
+  return classes.map((c) => c + '_' + postfix).join(' ');
 };

package/src/replaceScopedClass.js

@@ -1,12 +1,11 @@
 const recast = require('ember-template-recast');
 const renameClass = require('./renameClass');
-const getPostfix = require('./getPostfix');
 
 module.exports = function (hbs, templatePath, basePath) {
   let ast = recast.parse(hbs);
   let stack = [];
   const cssPath = templatePath.replace(/(\.hbs)?\.js$/, '.css');
-  const postfix = getPostfix(cssPath);
+  const projectCssPath = cssPath; // cssPath.replace(basePath, '');
 
   recast.traverse(ast, {
     All: {
@@ -37,7 +36,9 @@ module.exports = function (hbs, templatePath, basePath) {
       }
 
       if (cssClass) {
-        const textNode = recast.builders.text(renameClass(cssClass, postfix));
+        const textNode = recast.builders.text(
+          renameClass(cssClass, projectCssPath)
+        );
         const parent = stack[stack.length - 1];
         if (parent.type === 'AttrNode') {
           parent.quoteType = '"';
@@ -54,7 +55,7 @@ module.exports = function (hbs, templatePath, basePath) {
         const cssClass = node.params[0].value;
         const textNode = recast.builders.literal(
           'StringLiteral',
-          renameClass(cssClass, postfix)
+          renameClass(cssClass, projectCssPath)
         );
         return textNode;
       }

package/src/rewriteHbs.js

@@ -1,5 +1,4 @@
 const recast = require('ember-template-recast');
-const renameClass = require('./renameClass');
 
 module.exports = function rewriteHbs(hbs, classes, tags, postfix) {
   let ast = recast.parse(hbs);
@@ -8,13 +7,26 @@ module.exports = function rewriteHbs(hbs, classes, tags, postfix) {
     AttrNode(node) {
       if (node.name === 'class') {
         if (node.value.type === 'TextNode' && node.value.chars) {
-          const renamedClass = renameClass(node.value.chars, postfix, classes);
-          node.value.chars = renamedClass;
+          const newClasses = node.value.chars.split(' ').map((c) => {
+            if (c.trim() && classes.has(c.trim())) {
+              return c.trim() + '_' + postfix;
+            } else {
+              return c;
+            }
+          });
+
+          node.value.chars = newClasses.join(' ');
         } else if (node.value.type === 'ConcatStatement') {
           for (let part of node.value.parts) {
             if (part.type === 'TextNode' && part.chars) {
-              const renamedClass = renameClass(part.chars, postfix, classes);
-              part.chars = renamedClass;
+              const newClasses = part.chars.split(' ').map((c) => {
+                if (c.trim() && classes.has(c.trim())) {
+                  return c.trim() + '_' + postfix;
+                } else {
+                  return c;
+                }
+              });
+              part.chars = newClasses.join(' ');
             }
           }
         }
@@ -35,25 +47,6 @@ module.exports = function rewriteHbs(hbs, classes, tags, postfix) {
         }
       }
     },
-
-    HashPair(node) {
-      if (node.key === 'class') {
-        if (
-          node.value.type === 'SubExpression' &&
-          node.value.path.original === 'concat'
-        ) {
-          for (let part of node.value.params) {
-            if (part.type === 'StringLiteral') {
-              const renamedClass = renameClass(part.value, postfix, classes);
-              part.value = renamedClass;
-            }
-          }
-        } else if (node.value.type === 'StringLiteral') {
-          const renamedClass = renameClass(node.value.value, postfix, classes);
-          node.value.value = renamedClass;
-        }
-      }
-    },
   });
 
   let result = recast.print(ast);