I think i'm barking up the wrong tree here

Author: geelen

src/file-system-loader.js

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

src/parser.js

@@ -51,9 +51,8 @@ export default class Parser {
     let file = importNode.selector.match( importRegexp )[1]
     console.log("FETCHING " + file)
     return this.pathFetcher.fetch( file, relativeTo )
-      .then( loaderData => ({
-        loaderData,
-        propResolver: exports => {
+      .then( state => {
+        state.propResolver = exports => {
           console.log("RESOLVING " + file)
           importNode.each( decl => {
             if ( decl.type == 'decl' ) {
@@ -62,6 +61,7 @@ export default class Parser {
           } )
           importNode.removeSelf()
         }
-      }) )
+        return state
+      })
   }
 }

test/test-cases.js

@@ -18,7 +18,7 @@ describe( "test-cases", () => {
         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( fetched => loader.load( fetched ) )
+          .then( state => loader.load( state ) )
           .then( tokens => {
             assert.equal( loader.sources.join( "" ), expected )
             assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )