🙈

Author: dfreeman

index.js

@@ -197,18 +197,12 @@ module.exports = {
 
     let docsTree = new MergeTrees(docsTrees);
 
-    let searchIndexInput = new MergeTrees([docsTree]);
-    let searchIndexTree = new SearchIndexer(searchIndexInput, {
+    let templateContentsTree = this.getBroccoliBridge().placeholderFor('template-contents');
+    let searchIndexTree = new SearchIndexer(new MergeTrees([docsTree, templateContentsTree]), {
       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 ]);
   },
 

lib/broccoli/bridge.js

@@ -1,54 +1,60 @@
+const Plugin = require('broccoli-plugin');
+const symlinkOrCopy = require('symlink-or-copy');
+const fs = require('fs-extra');
+
 module.exports = class Bridge {
   constructor() {
     this._members = new Map();
   }
 
-  register({ name, tree, dependencies = [] }) {
+  fulfill(name, tree) {
     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);
+      let existing = this._members.get(name);
+      if (existing instanceof Placeholder) {
+        existing.fulfill(tree);
+      } else {
+        throw new Error(`A tree named '${name}' was already registered with this Bridge instance.`);
+      }
+    } else {
+      this._members.set(name, tree);
     }
-
-    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();
-    };
+  placeholderFor(name) {
+    if (this._members.has(name)) {
+      return this._members.get(name);
+    } else {
+      let placeholder = new Placeholder(name);
+      this._members.set(name, placeholder);
+      return placeholder;
+    }
   }
 }
 
-class Member {
-  constructor(name, tree, dependencies) {
-    this.name = name;
-    this.tree = tree;
-    this.dependencies = new Set(dependencies);
+class Placeholder extends Plugin {
+  constructor(name) {
+    super([]);
+    this.name;
+    this._hasLinked = false;
   }
 
-  needs(dep) {
-    return this.dependencies.has(dep.name);
+  fulfill(tree) {
+    if (this._inputNodes.length) {
+      throw new Error(`BroccoliBridge placeholder '${this.name}' was fulfilled more than once.`);
+    }
+
+    this._inputNodes.push(tree);
   }
 
-  link(dep) {
-    if (this.needs(dep)) {
-      this.dependencies.delete(dep.name);
-      this.tree._inputNodes.push(dep.tree);
+  build() {
+    if (!this._inputNodes.length) {
+      throw new Error(`BroccoliBridge placeholder '${this.name}' was never fulfilled.`);
+    }
+
+    if (!this._hasLinked) {
+      fs.removeSync(this.outputPath);
+      symlinkOrCopy.sync(this.inputPaths[0], this.outputPath);
+      this._hasLinked = true;
     }
   }
 }

lib/preprocessors/hbs-content-extractor.js

@@ -10,11 +10,8 @@ module.exports = class HBSContentExtractor {
   }
 
   toTree(tree) {
-    this._bridge.register({
-      name: 'template-contents',
-      tree: new HBSContentFilter(tree),
-    });
-
+    let contentsTree = new HBSContentFilter(tree);
+    this._bridge.fulfill('template-contents', contentsTree);
     return tree;
   }
 };

package.json

@@ -71,6 +71,7 @@
     "resolve": "^1.5.0",
     "semver": "^5.5.0",
     "striptags": "^3.1.1",
+    "symlink-or-copy": "^1.2.0",
     "walk-sync": "^0.3.2",
     "yuidocjs": "^0.10.2"
   },

yarn.lock

@@ -8620,7 +8620,7 @@ [email protected]:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393"