Merge pull request #2 from css-modules/tests-and-fixes

Tests and fixes

Author: sokra

src/index.js

@@ -2,7 +2,7 @@ import postcss from 'postcss';
 
 const declWhitelist = ['extends'],
   declFilter = new RegExp(`^(${declWhitelist.join('|')})$`),
-  matchImports = /^([\w ]+) from (?:"([^"]+)"|'([^']+)')$/;
+  matchImports = /^([\w\s]+?)\s+from\s+(?:"([^"]+)"|'([^']+)')$/;
 
 const processor = (css) => {
   let imports = {};
@@ -14,18 +14,23 @@ const processor = (css) => {
       let [/*match*/, symbols, doubleQuotePath, singleQuotePath] = matches;
       let path = doubleQuotePath || singleQuotePath;
       imports[path] = imports[path] || {};
-      let tmpSymbols = symbols.split(' ')
-        .map(s => imports[path][s] = `__tmp_${s}_${processor.getRandomStr()}`);
+      let tmpSymbols = symbols.split(/\s+/)
+        .map(s => {
+          if(!imports[path][s]) {
+            imports[path][s] = `__tmp_${s}_${processor.getRandomStr()}`;
+          }
+          return imports[path][s];
+        });
       decl.value = tmpSymbols.join(' ');
     }
   });
 
   // If we've found any imports, insert :import rules
-  Object.keys(imports).forEach(path => {
+  Object.keys(imports).reverse().forEach(path => {
     let pathImports = imports[path];
     css.prepend(postcss.rule({
       selector: `:import("${path}")`,
-      before: "\n",
+      after: "\n",
       nodes: Object.keys(pathImports).map(importedSymbol => postcss.decl({
         prop: importedSymbol,
         value: pathImports[importedSymbol],

test/test-cases/import-comment/expected.css

@@ -0,0 +1,6 @@
+/*
+:local(.exportName) {
+  extends: importName from "path/library.css";
+  other: rule;
+}
+*/

test/test-cases/import-comment/source.css

@@ -0,0 +1,6 @@
+/*
+:local(.exportName) {
+  extends: importName from "path/library.css";
+  other: rule;
+}
+*/

test/test-cases/import-consolidate/expected.css

@@ -1,12 +1,11 @@
-
-:import("path/other-lib.css") {
-  otherLibImport: __tmp_otherLibImport_rand3;
-}
 :import("path/library.css") {
   importName: __tmp_importName_rand0;
   secondImport: __tmp_secondImport_rand1;
   thirdImport: __tmp_thirdImport_rand2;
 }
+:import("path/other-lib.css") {
+  otherLibImport: __tmp_otherLibImport_rand3;
+}
 :local(.exportName) {
   extends: __tmp_importName_rand0 __tmp_secondImport_rand1;
   other: rule;

test/test-cases/import-media/expected.css

@@ -0,0 +1,17 @@
+:import("path/library.css") {
+  importName: __tmp_importName_rand0;
+  importName2: __tmp_importName2_rand1;
+}
+
+@media screen {
+  :local(.exportName) {
+    extends: __tmp_importName_rand0;
+    extends: __tmp_importName2_rand1;
+    other: rule2;
+  }
+}
+
+:local(.exportName) {
+  extends: __tmp_importName_rand0;
+  other: rule;
+}

test/test-cases/import-media/source.css

@@ -0,0 +1,12 @@
+@media screen {
+  :local(.exportName) {
+    extends: importName from "path/library.css";
+    extends: importName2 from "path/library.css";
+    other: rule2;
+  }
+}
+
+:local(.exportName) {
+  extends: importName from "path/library.css";
+  other: rule;
+}

test/test-cases/import-multiple-classes/expected.css

@@ -1,5 +1,5 @@
-
 :import("path/library.css") {
   importName: __tmp_importName_rand0;
-  secondImport: __tmp_secondImport_rand1; }
+  secondImport: __tmp_secondImport_rand1;
+}
 :local(.exportName) { extends: __tmp_importName_rand0 __tmp_secondImport_rand1; other: rule; }

test/test-cases/import-multiple-references/expected.css

@@ -0,0 +1,17 @@
+:import("path/library.css") {
+  importName: __tmp_importName_rand0;
+  secondImport: __tmp_secondImport_rand1;
+  importName2: __tmp_importName2_rand3;
+}
+:import("path/library2.css") {
+  importName: __tmp_importName_rand2;
+}
+:local(.exportName) {
+  extends: __tmp_importName_rand0 __tmp_secondImport_rand1;
+  extends: __tmp_importName_rand2;
+  extends: __tmp_importName2_rand3;
+}
+:local(.exportName2) {
+  extends: __tmp_secondImport_rand1;
+  extends: __tmp_secondImport_rand1;
+}

test/test-cases/import-multiple-references/source.css

@@ -0,0 +1,9 @@
+:local(.exportName) {
+  extends: importName secondImport from 'path/library.css';
+  extends: importName from 'path/library2.css';
+  extends: importName2 from 'path/library.css';
+}
+:local(.exportName2) {
+  extends: secondImport from 'path/library.css';
+  extends: secondImport from 'path/library.css';
+}

test/test-cases/import-single-quotes/expected.css

@@ -1,4 +1,3 @@
-
 :import("path/library.css") {
   importName: __tmp_importName_rand0;
 }