fix bugs in jsx crawling that were introduced by using promises for file reads.

Author: chriseppstein

Diff for: packages/jsx-analyzer/src/importer/index.ts

@@ -96,7 +96,7 @@ export default function importer(file: JSXTemplate, analysis: Analysis, blockFac
 
       // If this is a jsx or tsx file, parse it with the same analysis object.
       if ( fs.existsSync(absoluteFilePath) && VALID_FILE_EXTENSIONS[parsedPath.ext] ) {
-        parseFileWith(absoluteFilePath, analysis.parent, blockFactory, options);
+        analysis.parent.analysisPromises.push(parseFileWith(absoluteFilePath, analysis.parent, blockFactory, options));
         return;
       }
 

Diff for: packages/jsx-analyzer/src/index.ts

@@ -145,16 +145,17 @@ export function parse(filename: string, data: string, factory: BlockFactory, opt
   let metaAnalysis: MetaAnalysis = new MetaAnalysis();
 
   return Promise.resolve().then(() => {
-    parseWith(template, metaAnalysis, factory, resolvedOpts);
-    return Promise.all(metaAnalysis.analysisPromises).then((analyses) => {
-      analyses.forEach((analysis) => {
-        traverse(analysis.template.ast, analyzer(analysis));
-        metaAnalysis.addAnalysis(analysis);
-        // No need to keep detailed template data anymore!
-        delete analysis.template.ast;
-        delete analysis.template.data;
+    return parseWith(template, metaAnalysis, factory, resolvedOpts).then(analysis => {
+      return Promise.all(metaAnalysis.analysisPromises).then((analyses) => {
+        for (let analysis of (new Set(analyses))) {
+          traverse(analysis.template.ast, analyzer(analysis));
+          metaAnalysis.addAnalysis(analysis);
+          // No need to keep detailed template data anymore!
+          delete analysis.template.ast;
+          delete analysis.template.data;
+        }
+        return metaAnalysis;
       });
-      return metaAnalysis;
     });
   });
 }

Diff for: packages/jsx-analyzer/test/multi-file-discover/multi-file-test.ts

@@ -1,5 +1,5 @@
 import { assert } from 'chai';
-import { suite, test, skip } from 'mocha-typescript';
+import { suite, test} from 'mocha-typescript';
 import { MetaAnalysis } from '../../src/utils/Analysis';
 import { testParseFile as parseFile } from '../util';
 
@@ -8,46 +8,42 @@ const path = require('path');
 @suite('Dependency Tree Crawling')
 export class Test {
 
-  @skip
   @test 'All blocks are discovered in multi-file app from entrypoint'(){
     let base = path.resolve(__dirname, '../../../test/fixtures/basic-multifile');
     return parseFile('index.tsx', { baseDir: base }).then((analysis: MetaAnalysis) => {
       assert.equal(analysis.fileCount(), 2);
       assert.equal(analysis.getAnalysis(0).blockCount(), 1);
       assert.equal(analysis.getAnalysis(1).blockCount(), 1);
-      assert.equal(analysis.styleCount(), 4);
+      assert.equal(analysis.styleCount(), 3);
     });
   }
 
-  @skip
   @test 'Duplicate blocks are only parsed once'(){
     let base = path.resolve(__dirname, '../../../test/fixtures/duplicate-blocks-multifile');
     return parseFile('index.tsx', { baseDir: base }).then((analysis: MetaAnalysis) => {
       assert.equal(analysis.fileCount(), 2);
       assert.equal(analysis.blockCount(), 1);
       assert.equal(analysis.blockPromisesCount(), 1);
-      assert.equal(analysis.styleCount(), 3);
+      assert.equal(analysis.styleCount(), 2);
     });
   }
 
-  @skip
   @test 'Dependency Tree Crawling finds dependents of dependents'(){
     let base = path.resolve(__dirname, '../../../test/fixtures/deep-multifile');
     return parseFile('index.tsx', { baseDir: base }).then((analysis: MetaAnalysis) => {
       assert.equal(analysis.fileCount(), 3);
       assert.equal(analysis.blockCount(), 3);
       assert.equal(analysis.blockPromisesCount(), 3);
-      assert.equal(analysis.styleCount(), 5);
+      assert.equal(analysis.styleCount(), 4);
     });
   }
 
-  @skip
-  @test 'Conflicting local import names don\'t interfere with each other'(){
+  @test "Conflicting local import names don't interfere with each other"(){
     let base = path.resolve(__dirname, '../../../test/fixtures/conflicting-local-multifile');
     return parseFile('index.tsx', { baseDir: base }).then((analysis: MetaAnalysis) => {
       assert.equal(analysis.fileCount(), 2);
       assert.equal(analysis.blockCount(), 2);
-      assert.equal(analysis.styleCount(), 4);
+      assert.equal(analysis.styleCount(), 3);
     });
   }
 }