Improving type handling for compiler

*.d.ts

@@ -5,7 +5,9 @@ declare module "babel-types" {
   function isLiteral(node: any): boolean
 }
 declare module "babel-traverse"
-declare module "babel-generator"
+declare module "babel-generator" {
+  export default function(ast: any, options?: any, text?: string): any
+}
 declare module "babylon" {
   function parse(text: string, options?: any): any
 }

.gitignore

@@ -28,5 +28,5 @@ node_modules
 
 # Build artifacts
 *.cpuprofile
-typings/*
+typings
 *.js

compiler/compiler.ts

@@ -18,7 +18,7 @@ import {postcssAstDependencies} from './postcss_ast_dependencies';
 import {parse5AstDependencies, rewriteParse5AstDependencies} from './parse5_ast_dependencies';
 import {GraphOutput} from "../cyclic_dependency_graph/graph";
 
-class File {
+export class File {
   fileName: string;
   baseDirectory: string;
   ext: string;
@@ -34,7 +34,7 @@ class File {
   }
 }
 
-class FileScan {
+export class FileScan {
   file: File;
   identifiers: string[];
   ast: any;
@@ -43,7 +43,7 @@ class FileScan {
   }
 }
 
-class FileDependencies {
+export class FileDependencies {
   scan: FileScan;
   resolved: string[];
   resolvedByIdentifier: any;
@@ -52,7 +52,7 @@ class FileDependencies {
   }
 }
 
-class FileBuild {
+export class FileBuild {
   file: File;
   scan: FileScan;
   content: string | Buffer;
@@ -64,15 +64,13 @@ class FileBuild {
   }
 }
 
-interface buildOutput {
+export interface buildOutput {
   graph: Graph,
   files: ImmutableMap<string, File>
   scans: ImmutableMap<string, FileScan>
   built: ImmutableMap<string, FileBuild>
 }
 
-const NODE_MODULES = /node_modules/;
-
 export class Compiler {
   fileSystemCache = new FileSystemCache();
   graph: CyclicDependencyGraph;
@@ -158,7 +156,7 @@ export class Compiler {
       .then(([text, textHash]) => {
         file.content = text;
         file.hash = textHash;
-        const sourceType = NODE_MODULES.test(fileName) ? 'script' : 'module';
+        const sourceType = fileName.indexOf('node_modules') !== -1 ? 'script' : 'module';
         const ast = babylon.parse(text, {
           sourceType
         });
@@ -245,7 +243,7 @@ export class Compiler {
             sourceFileName: sourceUrl,
             sourceMapTarget: outputUrl
           },
-          file.content
+          file.content as string
         );
         const build = new FileBuild(file, scan);
         build.url = outputUrl;

compiler/tests/test_compiler_internals.ts

@@ -1,6 +1,6 @@
 import test from 'ava';
 import { Subject } from 'rxjs';
-import { Compiler } from '../compiler';
+import { Compiler, buildOutput } from '../compiler';
 import { handleCompilerErrors } from './utils';
 import { createVirtualFileSystemCache } from '../../file_system/test_utils';
 
@@ -21,7 +21,7 @@ test('should produce urls to the output of the assets', (t) => {
   });
   const obs = new Subject();
   handleCompilerErrors(compiler, obs);
-  compiler.complete.subscribe(data => {
+  compiler.complete.subscribe((data: buildOutput) => {
     const htmlFile = data.files.get('/foo/index.html');
     const jsFile = data.files.get('/foo/bar/script.js');
     const cssFile = data.files.get('/woz/styles.css');