added a test case to cover dashes and other chars in imported classes

Author: geelen

src/index.js

@@ -1,47 +1,47 @@
 import postcss from 'postcss';
 
 const declWhitelist = ['composes'],
-  declFilter = new RegExp(`^(${declWhitelist.join('|')})$`),
-  matchImports = /^([\w\s]+?)\s+from\s+(?:"([^"]+)"|'([^']+)')$/;
+  declFilter = new RegExp( `^(${declWhitelist.join( '|' )})$` ),
+  matchImports = /^(.+?)\s+from\s+(?:"([^"]+)"|'([^']+)')$/;
 
-const processor = postcss.plugin('modules-extract-imports', function(options) {
-  return (css) => {
-    let imports = {};
-    let importIndex = 0;
-    let createImportedName = options && options.createImportedName || ((importName/*, path*/) => `i__imported_${importName}_${importIndex++}`);
+const processor = postcss.plugin( 'modules-extract-imports', function ( options ) {
+  return ( css ) => {
+    let imports = {},
+      importIndex = 0,
+      createImportedName = options && options.createImportedName || (( importName/*, path*/ ) => `i__imported_${importName.replace( /\W/g, '_' )}_${importIndex++}`);
 
     // Find any declaration that supports imports
-    css.eachDecl(declFilter, (decl) => {
-      let matches = decl.value.match(matchImports);
-      if (matches) {
+    css.eachDecl( declFilter, ( decl ) => {
+      let matches = decl.value.match( matchImports );
+      if ( matches ) {
         let [/*match*/, symbols, doubleQuotePath, singleQuotePath] = matches;
         let path = doubleQuotePath || singleQuotePath;
         imports[path] = imports[path] || {};
-        let tmpSymbols = symbols.split(/\s+/)
-          .map(s => {
-            if(!imports[path][s]) {
-              imports[path][s] = createImportedName(s, path);
+        let tmpSymbols = symbols.split( /\s+/ )
+          .map( s => {
+            if ( !imports[path][s] ) {
+              imports[path][s] = createImportedName( s, path );
             }
             return imports[path][s];
-          });
-        decl.value = tmpSymbols.join(' ');
+          } );
+        decl.value = tmpSymbols.join( ' ' );
       }
-    });
+    } );
 
     // If we've found any imports, insert :import rules
-    Object.keys(imports).reverse().forEach(path => {
+    Object.keys( imports ).reverse().forEach( path => {
       let pathImports = imports[path];
-      css.prepend(postcss.rule({
+      css.prepend( postcss.rule( {
         selector: `:import("${path}")`,
         after: "\n",
-        nodes: Object.keys(pathImports).map(importedSymbol => postcss.decl({
+        nodes: Object.keys( pathImports ).map( importedSymbol => postcss.decl( {
           value: importedSymbol,
           prop: pathImports[importedSymbol],
           before: "\n  "
-        }))
-      }));
-    });
+        } ) )
+      } ) );
+    } );
   };
-});
+} );
 
 export default processor;

test/test-cases/valid-characters/expected.css

@@ -0,0 +1,16 @@
+:import("path/library.css") {
+  i__imported_a_0: a;
+  i__imported__b_1: -b;
+  i__imported___c_2: --c;
+  i__imported__d_3: _d;
+}
+:import("path/library2.css") {
+  i__imported_a__4: a_;
+  i__imported_b__5: b-;
+  i__imported_c___6: c--;
+  i__imported_d___7: d\%;
+}
+:local(.exportName) {
+  composes: i__imported_a_0 i__imported__b_1 i__imported___c_2 i__imported__d_3;
+  composes: i__imported_a__4 i__imported_b__5 i__imported_c___6 i__imported_d___7;
+}

test/test-cases/valid-characters/source.css

@@ -0,0 +1,4 @@
+:local(.exportName) {
+  composes: a -b --c _d from "path/library.css";
+  composes: a_ b- c-- d\% from "path/library2.css";
+}