🙊

Author: dfreeman

index.js

@@ -123,7 +123,7 @@ module.exports = {
       let TemplateCompiler = require('./lib/preprocessors/markdown-template-compiler');
       let ContentExtractor = require('./lib/preprocessors/hbs-content-extractor');
       registry.add('template', new TemplateCompiler());
-      registry.add('template', this.contentExtractor = new ContentExtractor());
+      registry.add('template', new ContentExtractor(this.getBroccoliBridge()));
     }
   },
 
@@ -197,15 +197,29 @@ module.exports = {
 
     let docsTree = new MergeTrees(docsTrees);
 
-    let templateContentsTree = this.contentExtractor.getTemplateContentsTree();
-    let searchIndexTree = new SearchIndexer(new MergeTrees([docsTree, templateContentsTree]), {
+    let searchIndexInput = new MergeTrees([docsTree]);
+    let searchIndexTree = new SearchIndexer(searchIndexInput, {
       outputFile: 'ember-cli-addon-docs/search-index.json',
       config: this.project.config(EmberApp.env())
     });
 
+    this.getBroccoliBridge().register({
+      name: 'search-index-input',
+      tree: searchIndexInput,
+      dependencies: ['template-contents']
+    });
+
     return new MergeTrees([ defaultTree, docsTree, searchIndexTree ]);
   },
 
+  getBroccoliBridge() {
+    if (!this._broccoliBridge) {
+      const Bridge = require('./lib/broccoli/bridge');
+      this._broccoliBridge = new Bridge();
+    }
+    return this._broccoliBridge;
+  },
+
   _lunrTree() {
     return new Funnel(path.dirname(require.resolve('lunr/package.json')), { destDir: 'lunr' });
   },

lib/broccoli/bridge.js

@@ -0,0 +1,54 @@
+module.exports = class Bridge {
+  constructor() {
+    this._members = new Map();
+  }
+
+  register({ name, tree, dependencies = [] }) {
+    if (this._members.has(name)) {
+      throw new Error(`Duplicate tree '${name}' in bridge.`);
+    }
+
+    let newMember = new Member(name, tree, dependencies);
+
+    for (let existingMember of this._members.values()) {
+      newMember.link(existingMember);
+      existingMember.link(newMember);
+    }
+
+    this._members.set(name, newMember);
+    this._patchBuild(name, tree);
+  }
+
+  _patchBuild(name, tree) {
+    if (typeof tree.build !== 'function') return;
+
+    let { dependencies } = this._members.get(name);
+    let oldBuild = tree.build.bind(tree);
+    tree.build = () => {
+      if (dependencies.size > 0) {
+        throw new Error(`Tree '${name}' is missing dependencies: ${[...dependencies].join(',')}`);
+      }
+
+      return oldBuild();
+    };
+  }
+}
+
+class Member {
+  constructor(name, tree, dependencies) {
+    this.name = name;
+    this.tree = tree;
+    this.dependencies = new Set(dependencies);
+  }
+
+  needs(dep) {
+    return this.dependencies.has(dep.name);
+  }
+
+  link(dep) {
+    if (this.needs(dep)) {
+      this.dependencies.delete(dep.name);
+      this.tree._inputNodes.push(dep.tree);
+    }
+  }
+}

lib/preprocessors/hbs-content-extractor.js

@@ -3,21 +3,18 @@
 const HBSContentFilter = require('../broccoli/hbs-content-filter');
 
 module.exports = class HBSContentExtractor {
-  constructor() {
+  constructor(bridge) {
     this.name = 'hbs-content-extractor';
     this.ext = ['hbs'];
-    this._contentsTree = null;
-  }
-
-  getTemplateContentsTree() {
-    if (!this._contentsTree) {
-      throw new Error(`Templates contents haven't been extracted yet`);
-    }
-    return this._contentsTree;
+    this._bridge = bridge;
   }
 
   toTree(tree) {
-    this._contentsTree = new HBSContentFilter(tree);
+    this._bridge.register({
+      name: 'template-contents',
+      tree: new HBSContentFilter(tree),
+    });
+
     return tree;
   }
 };