Merge 6b89761 into 7b25a89

lib/compiler.coffee

@@ -90,7 +90,7 @@ class CompileFile
       .then((o) => @content = o)
       .then(=> sequence(hooks('compile_hooks.before_file'), @))
       .then(each_pass)
-      .tap((o) => @content = o)
+      .tap((o) => @content = o.result)
       .tap(=> @roots.emit('compile', @file))
       .then(=> sequence(hooks('compile_hooks.after_file'), @))
       .then(write_file)
@@ -243,7 +243,7 @@ class CompileFile
 
   each_pass = ->
     pass = new CompilePass(@)
-    pipeline(@adapters.map((a,i) -> pass.run.bind(pass, a, i + 1)), @content)
+    pipeline(@adapters.map((a,i) -> pass.run.bind(pass, a, i + 1)), { result: @content })
 
   ###*
    * Returns the absolute path to the file as requested through the browser,
@@ -292,16 +292,23 @@ class CompilePass
    * @todo is there a way to yield(@content)?
   ###
 
-  run: (@adapter, @index, @content) ->
+  run: (@adapter, @index, @input) ->
     hooks = (cat) => @file.extensions.hooks(cat, @file.category)
 
+    @content = @input.result
+
     sequence(hooks('compile_hooks.before_pass'), @)
       .with(@)
       .tap(=> @opts = configure_options.call(@))
       .then(compile_or_pass)
-      .then((o) => @content = o)
-      .then(=> sequence(hooks('compile_hooks.after_pass'), @))
-      .then(=> @content)
+      .then (o) =>
+        @content = o.result
+        res = { result: @content }
+        if o.sourcemap
+          @sourcemap = o.sourcemap
+          res.sourcemap = @sourcemap
+        return res
+      .tap(=> sequence(hooks('compile_hooks.after_pass'), @))
 
   ###*
    * This function is responsible for getting all the options together for the
@@ -345,5 +352,5 @@ class CompilePass
   ###
 
   compile_or_pass = ->
-    if not @adapter.name then return @content
+    if not @adapter.name then return @input
     @adapter.render(@content, @opts)

package.json

@@ -19,7 +19,7 @@
     "doc": "doc"
   },
   "dependencies": {
-    "accord": "0.12.x",
+    "accord": "0.13.x",
     "argparse": "0.1.x",
     "charge": "0.0.3",
     "chokidar": "0.9.x",