got that first test running

Author: geelen

src/file-system-loader.js

@@ -20,10 +20,11 @@ const traceKeySorter = ( a, b ) => {
 };
 
 export default class FileSystemLoader {
-  constructor( root ) {
+  constructor( root, plugins ) {
     this.root = root
     this.sources = {}
     this.importNr = 0
+    this.core = new Core(plugins)
   }
 
   fetch( _newPath, relativeTo, _trace ) {
@@ -35,7 +36,7 @@ export default class FileSystemLoader {
 
       fs.readFile( fileRelativePath, "utf-8", ( err, source ) => {
         if ( err ) reject( err )
-        Core.load( source, rootRelativePath, trace, this.fetch.bind( this ) )
+        this.core.load( source, rootRelativePath, trace, this.fetch.bind( this ) )
           .then( ( { injectableSource, exportTokens } ) => {
             this.sources[trace] = injectableSource
             resolve( exportTokens )

src/index.js

@@ -5,18 +5,10 @@ import scope from 'postcss-modules-scope'
 
 import Parser from './parser'
 
-export default {
-  // These three plugins are aliased under this package for simplicity.
-  localByDefault,
-  extractImports,
-  scope,
-
-  // The default set of plugins
-  plugins: [
-    localByDefault,
-    extractImports,
-    scope
-  ],
+export default class Core {
+  constructor( plugins ) {
+    this.plugins = plugins || Core.defaultPlugins
+  }
 
   load( sourceString, sourcePath, trace, pathFetcher ) {
     let parser = new Parser( pathFetcher, trace )
@@ -28,3 +20,10 @@ export default {
       } )
   }
 }
+
+
+// These three plugins are aliased under this package for simplicity.
+Core.localByDefault = localByDefault
+Core.extractImports = extractImports
+Core.scope = scope
+Core.defaultPlugins = [localByDefault, extractImports, scope]

test/test-cases.js

@@ -9,19 +9,26 @@ let normalize = ( str ) => {
   return str.replace( /\r\n?/g, "\n" );
 }
 
-describe( "test-cases", () => {
-  let testDir = path.join( __dirname, "test-cases" )
-  fs.readdirSync( testDir ).forEach( testCase => {
-    if ( fs.existsSync( path.join( testDir, testCase, "source.css" ) ) ) {
-      it( "should " + testCase.replace( /-/g, " " ), done => {
-        let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
-        let loader = new FileSystemLoader( testDir )
-        let expectedTokens = JSON.parse( fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ) )
-        loader.fetch( `${testCase}/source.css`, "/" ).then( tokens => {
-          assert.equal( loader.finalSource, expected )
-          assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
-        } ).then( done, done )
-      } );
-    }
+const pipelines = {
+  "test-cases": undefined,
+  "cssi": []
+}
+
+Object.keys( pipelines ).forEach( dirname => {
+  describe( dirname, () => {
+    let testDir = path.join( __dirname, dirname )
+    fs.readdirSync( testDir ).forEach( testCase => {
+      if ( fs.existsSync( path.join( testDir, testCase, "source.css" ) ) ) {
+        it( "should " + testCase.replace( /-/g, " " ), done => {
+          let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
+          let loader = new FileSystemLoader( testDir, pipelines[dirname] )
+          let expectedTokens = JSON.parse( fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ) )
+          loader.fetch( `${testCase}/source.css`, "/" ).then( tokens => {
+            assert.equal( loader.finalSource, expected )
+            assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
+          } ).then( done, done )
+        } );
+      }
+    } );
   } );
-} );
+} )