more tests passing!

Author: geelen

index.js

@@ -14,23 +14,25 @@ var _postcss2 = _interopRequireDefault(_postcss);
 
 var declWhitelist = ['extends'],
     declFilter = new RegExp('^(' + declWhitelist.join('|') + ')$'),
-    matchImports = /^([\w ]+) from "([^"]+)"$/;
+    matchImports = /^([\w ]+) from ("([^"]+)"|'([^']+)')$/;
 
 var processor = function processor(css, result) {
   var imports = {};
   css.eachDecl(declFilter, function (decl) {
     var matches = decl.value.match(matchImports);
     if (matches) {
       (function () {
-        var _matches = _slicedToArray(matches, 3);
+        var _matches = _slicedToArray(matches, 5);
 
         var _ = _matches[0];
         var symbols = _matches[1];
-        var path = _matches[2];
-
+        var _ = _matches[2];
+        var doubleQuotePath = _matches[3];
+        var singleQuotePath = _matches[4];
+        var path = doubleQuotePath || singleQuotePath;
         imports[path] = imports[path] || {};
         var tmpSymbols = symbols.split(' ').map(function (s) {
-          return imports[path][s] = '__tmp-' + processor.getRandomStr();
+          return imports[path][s] = '__tmp_' + s + '_' + processor.getRandomStr();
         });
         decl.value = tmpSymbols.join(' ');
       })();

index.src.js

@@ -2,17 +2,18 @@ import postcss from 'postcss'
 
 const declWhitelist = ['extends'],
   declFilter = new RegExp(`^(${declWhitelist.join('|')})$`),
-  matchImports = /^([\w ]+) from "([^"]+)"$/
+  matchImports = /^([\w ]+) from ("([^"]+)"|'([^']+)')$/
 
 const processor = (css, result) => {
   let imports = {}
   css.eachDecl(declFilter, (decl) => {
     let matches = decl.value.match(matchImports)
     if (matches) {
-      let [_, symbols, path] = matches
+      let [_, symbols, _, doubleQuotePath, singleQuotePath] = matches,
+        path = doubleQuotePath || singleQuotePath
       imports[path] = imports[path] || {}
       let tmpSymbols = symbols.split(' ')
-        .map(s => imports[path][s] = `__tmp-${processor.getRandomStr()}`)
+        .map(s => imports[path][s] = `__tmp_${s}_${processor.getRandomStr()}`)
       decl.value = tmpSymbols.join(' ')
     }
   })

test.js

@@ -14,12 +14,23 @@ describe("processor", () => {
   check(
     "it should extract an import within a :local",
     `:local(.exportName) { extends: importName from "path/library.css"; other: rule; }`,
-    `:import("path/library.css") {importName: __tmp-rand0ml0l0l; }\n:local(.exportName) { extends: __tmp-rand0ml0l0l; other: rule; }`,
+    `:import("path/library.css") {importName: __tmp_importName_rand0ml0l0l; }\n:local(.exportName) { extends: __tmp_importName_rand0ml0l0l; other: rule; }`,
     ["rand0ml0l0l"]
   )
 
-  it("it should not care if single-quotes are used")
-  it("should import multiple classes on a single line")
+  check(
+    "it should not care if single-quotes are used",
+    `:local(.exportName) { extends: importName from 'path/library.css'; other: rule; }`,
+    `:import("path/library.css") {importName: __tmp_importName_rand0ml0l0l; }\n:local(.exportName) { extends: __tmp_importName_rand0ml0l0l; other: rule; }`,
+    ["rand0ml0l0l"]
+  )
+
+  check(
+    "should import multiple classes on a single line",
+    `:local(.exportName) { extends: importName secondImport from 'path/library.css'; other: rule; }`,
+    `:import("path/library.css") {importName: __tmp_importName_rand0ml0l0l;secondImport: __tmp_secondImport_rand0ml1l1l; }\n:local(.exportName) { extends: __tmp_importName_rand0ml0l0l __tmp_secondImport_rand0ml1l1l; other: rule; }`,
+    ["rand0ml0l0l", "rand0ml1l1l"]
+  )
   it("should consolidate imports by file for multiple files and multiple classes")
   it("should ignore imports not inside a :local")
   it("should ignore imports not inside our rule whitelist")