fix(diffing-broccoli-plugin): wrapped trees are always stable

caitp · IgorMinar · commit 7611f92f5bb9 · 2015-06-08T23:35:32.000-07:00
diff --git a/tools/broccoli/broccoli.d.ts b/tools/broccoli/broccoli.d.ts
@@ -53,6 +53,12 @@ interface BroccoliTree {
   inputTree?: BroccoliTree;
   inputTrees?: BroccoliTree[];
 
+  /**
+   * Trees which implement the rebuild api are wrapped automatically for api compat,
+   * and `newStyleTree` keeps a reference to the original unwrapped tree.
+   */
+  newStyleTree?: BroccoliTree;
+
   /**
    * Description or name of the plugin used for reporting.
    *
diff --git a/tools/broccoli/diffing-broccoli-plugin.ts b/tools/broccoli/diffing-broccoli-plugin.ts
@@ -62,7 +62,6 @@ class DiffingPluginWrapper implements BroccoliTree {
     this.description = this.pluginClass.name;
   }
 
-
   private calculateDiff(firstRun: boolean): (DiffResult | DiffResult[]) {
     // TODO(caitp): optionally log trees based on environment variable or
     // command line option. It may be worth logging for trees where elapsed
@@ -146,6 +145,11 @@ class DiffingPluginWrapper implements BroccoliTree {
     // Ignore all DiffingPlugins as they are already stable, for others we don't know for sure
     // so we need to stabilize them.
     // Since it's not safe to use instanceof operator in node, we are checking the constructor.name.
-    return (tree.constructor['name'] === 'DiffingPluginWrapper') ? tree : stabilizeTree(tree);
+    //
+    // New-styler/rebuild trees should always be stable.
+    let isNewStyleTree = !!(tree['newStyleTree'] || typeof tree.rebuild === 'function' ||
+                            tree['isReadAPICompatTree'] || tree.constructor['name'] === 'Funnel');
+
+    return isNewStyleTree ? tree : stabilizeTree(tree);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ class DiffingPluginWrapper implements BroccoliTree {`
`62`	`62`	`this.description = this.pluginClass.name;`
`63`	`63`	`}`
`64`	`64`
`65`		`-`
`66`	`65`	`private calculateDiff(firstRun: boolean): (DiffResult \| DiffResult[]) {`
`67`	`66`	`// TODO(caitp): optionally log trees based on environment variable or`
`68`	`67`	`// command line option. It may be worth logging for trees where elapsed`
`@@ -146,6 +145,11 @@ class DiffingPluginWrapper implements BroccoliTree {`
`146`	`145`	`// Ignore all DiffingPlugins as they are already stable, for others we don't know for sure`
`147`	`146`	`// so we need to stabilize them.`
`148`	`147`	`// Since it's not safe to use instanceof operator in node, we are checking the constructor.name.`
`149`		`- return (tree.constructor['name'] === 'DiffingPluginWrapper') ? tree : stabilizeTree(tree);`
	`148`	`+ //`
	`149`	`+ // New-styler/rebuild trees should always be stable.`
	`150`	`+ let isNewStyleTree = !!(tree['newStyleTree'] \|\| typeof tree.rebuild === 'function' \|\|`
	`151`	`+ tree['isReadAPICompatTree'] \|\| tree.constructor['name'] === 'Funnel');`
	`152`	`+`
	`153`	`+ return isNewStyleTree ? tree : stabilizeTree(tree);`
`150`	`154`	`}`
`151`	`155`	`}`