rolling back that API change

Author: geelen

src/file-system-loader.js

@@ -1,13 +1,6 @@
 import Core from './index.js'
 import fs from 'fs'
-import pathUtils from 'path'
-
-class LoaderState {
-  constructor() {
-    this.loaderVars = {}
-    this.parserVars = {}
-  }
-}
+import path from 'path'
 
 export default class FileSystemLoader {
   constructor( root ) {
@@ -16,28 +9,20 @@ export default class FileSystemLoader {
     this.seenPaths = new Set()
   }
 
-  fetch( path, relativeTo ) {
-    let state = new LoaderState(), vars = state.loaderVars
-    vars.path = path.replace( /^["']|["']$/g, "" )
+  fetch( _newPath, relativeTo ) {
+    let newPath = _newPath.replace( /^["']|["']$/g, "" )
     return new Promise( ( resolve, reject ) => {
-      vars.rootRelativePath = pathUtils.resolve( pathUtils.dirname( relativeTo ), vars.path )
-      vars.fileRelativePath = this.root + rootRelativePath
+      let rootRelativePath = path.resolve( path.dirname( relativeTo ), newPath ),
+        fileRelativePath = this.root + rootRelativePath
 
       fs.readFile( fileRelativePath, "utf-8", ( err, source ) => {
-        vars.source = source
-        err ? reject( err ) : resolve( state )
+        if ( err ) reject( err )
+        Core.load( source, rootRelativePath, this.fetch.bind( this ) )
+          .then( ( { injectableSource, exportTokens } ) => {
+            this.sources.push( injectableSource )
+            resolve( exportTokens )
+          }, reject )
       } )
     } )
   }
-
-  load( state ) {
-    let { source, rootRelativePath } = state.loaderVars
-    console.log("LOADING " + rootRelativePath)
-    return Core.load( source, rootRelativePath, this )
-      .then( state => {
-        console.log("LOADED " + rootRelativePath)
-        this.sources.push( state.parserVars.injectableSource )
-        return state
-      } )
-  }
 }

src/parser.js

@@ -9,7 +9,7 @@ export default class Parser {
   }
 
   plugin( css, result ) {
-    return this.fetchAllImports( css )
+    return Promise.all( this.fetchAllImports( css ) )
       .then( _ => this.extractExports( css ) )
   }
 
@@ -20,13 +20,7 @@ export default class Parser {
         imports.push( this.fetchImport( node, css.source.input.from ) )
       }
     } )
-    return Promise.all( imports )
-      .then( fetchedState => {
-        return Promise.all( fetchedState.map(
-          ( {loaderData, propResolver} ) =>
-            this.pathFetcher.load( loaderData ).then( propResolver )
-        ) )
-      } )
+    return imports
   }
 
   extractExports( css ) {
@@ -38,8 +32,8 @@ export default class Parser {
   handleExport( exportNode ) {
     exportNode.each( decl => {
       if ( decl.type == 'decl' ) {
-        Object.keys( this.translations ).forEach( translation => {
-          decl.value = decl.value.replace( translation, this.translations[translation] )
+        Object.keys(this.translations).forEach( translation => {
+          decl.value = decl.value.replace(translation, this.translations[translation])
         } )
         this.exportTokens[decl.prop] = decl.value
       }
@@ -49,19 +43,13 @@ export default class Parser {
 
   fetchImport( importNode, relativeTo ) {
     let file = importNode.selector.match( importRegexp )[1]
-    console.log("FETCHING " + file)
-    return this.pathFetcher.fetch( file, relativeTo )
-      .then( state => {
-        state.propResolver = exports => {
-          console.log("RESOLVING " + file)
-          importNode.each( decl => {
-            if ( decl.type == 'decl' ) {
-              this.translations[decl.value] = exports[decl.prop]
-            }
-          } )
-          importNode.removeSelf()
+    return this.pathFetcher( file, relativeTo ).then( exports => {
+      importNode.each( decl => {
+        if ( decl.type == 'decl' ) {
+          this.translations[decl.value] = exports[decl.prop]
         }
-        return state
-      })
+      } )
+      importNode.removeSelf()
+    }, err => console.log( err ) )
   }
 }

test/test-cases.js

@@ -17,12 +17,10 @@ describe( "test-cases", () => {
         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( state => loader.load( state ) )
-          .then( tokens => {
-            assert.equal( loader.sources.join( "" ), expected )
-            assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
-          } ).then( done, done )
+        loader.fetch( `${testCase}/source.css`, "/" ).then( tokens => {
+          assert.equal( loader.sources.join( "" ), expected )
+          assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
+        } ).then( done, done )
       } );
     }
   } );