got the file path lookup logic actually working

Author: geelen

src/file-system-loader.js

@@ -9,12 +9,15 @@ export default class FileSystemLoader {
     this.seenPaths = new Set()
   }
 
-  fetch( newPath, relativeTo ) {
+  fetch( _newPath, relativeTo ) {
+    let newPath = _newPath.replace( /^["']|["']$/g, "" )
     return new Promise( ( resolve, reject ) => {
-        let fileRelativePath = path.resolve( path.resolve( this.root, relativeTo), newPath ),
-          rootRelativePath = path.relative( this.root, fileRelativePath )
-      console.log(fileRelativePath)
-      console.log(rootRelativePath)
+      let rootRelativePath = path.resolve( path.dirname( relativeTo ), newPath ),
+        fileRelativePath = this.root + rootRelativePath
+      console.log( newPath )
+      console.log( relativeTo )
+      console.log( rootRelativePath )
+      console.log( fileRelativePath )
 
       fs.readFile( fileRelativePath, "utf-8", ( err, source ) => {
         if ( err ) reject( err )

src/parser.js

@@ -20,7 +20,7 @@ export default class Parser {
     let imports = []
     css.each( node => {
       if ( node.type == "rule" && node.selector.match( importRegexp ) ) {
-        imports.push( this.fetchImport( node ) )
+        imports.push( this.fetchImport( node, css.source.input.from ) )
       }
     } )
     return imports
@@ -35,10 +35,10 @@ export default class Parser {
     exportNode.removeSelf()
   }
 
-  fetchImport( importNode ) {
+  fetchImport( importNode, relativeTo ) {
     let file = importNode.selector.match( importRegexp )[1]
-    console.log(file)
-    return this.pathFetcher(file).then(exports => {
+    console.log(file, relativeTo)
+    return this.pathFetcher(file, relativeTo).then(exports => {
       console.log(exports)
     })
   }

test/test-cases.js

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