Merge 5bc9f60 into 92d42a3

src/parser.js

@@ -29,16 +29,18 @@ export default class Parser {
    */
   postProcess (data) {
     data = sorter(data)
+    let promises = []
 
     Object.keys(this.annotations.list).forEach(key => {
       let annotation = this.annotations.list[key]
 
       if (annotation.resolve) {
-        annotation.resolve(data)
+        let promise = Promise.resolve(annotation.resolve(data))
+        promises.push(promise)
       }
     })
 
-    return data
+    return Promise.all(promises).then(() => data)
   }
 
   /**
@@ -95,10 +97,11 @@ export default class Parser {
       if (!this.includeUnknownContexts) {
         data = data.filter(item => item.context.type !== 'unknown')
       }
-      data = this.postProcess(data)
-
-      deferred.resolve(data)
-      cb()
+      this.postProcess(data).then(processed => {
+        data = processed;
+        deferred.resolve(data)
+        cb()
+      })
     }
 
     let filter = through.obj(transform, flush)

src/sassdoc.js

@@ -266,6 +266,7 @@ async function baseDocumentize (env) {
 
   try {
     await pipeline()
+    await filter.promise
   } catch (err) {
     env.emit('error', err)
     throw err

test/api/parser.test.js

@@ -73,4 +73,27 @@ describe('#parser', function () {
       assert.equal(data[0].context.type, 'unknown')
     })
   })
+
+  it('should include data from async annotation.resolve fns', function () {
+    var annotation = () => ({
+      name: 'async',
+      parse: raw => raw,
+      resolve: data => {
+        return new Promise((resolve, reject) => {
+          setTimeout(() => {
+            data.foo = 'bar'
+            resolve()
+          }, 10)
+        })
+      }
+    })
+    parser = new Parser(env, [annotation])
+    var parseStream = parser.stream()
+
+    vs('///desc\n///@async\n@function pass(){}', { path: 'fake' }).pipe(parseStream)
+
+    return parseStream.promise.then(data => {
+      assert.equal(data.foo, 'bar')
+    })
+  })
 })