feat: support typeRoots, fixes #203

Author: s-panferov

package.json

@@ -64,8 +64,8 @@
     "sinon": "^1.17.4",
     "standard-version": "^2.4.0",
     "temp": "^0.8.3",
-    "tslint": "^3.13.0-dev.0",
-    "typescript": "^2.0.0-dev.20160706",
+    "tslint": "^3.14.0",
+    "typescript": "^2.0.0",
     "webpack": "2.1.0-beta.4"
   }
 }

src/host.ts

@@ -36,6 +36,10 @@ export class Host implements ts.LanguageServiceHost {
         this.state = state;
     }
 
+    getSourceFile(fileName: string) {
+        return this.state.program.getSourceFile(fileName);
+    }
+
     getScriptFileNames() {
         return this.state.allFileNames();
     }
@@ -112,6 +116,7 @@ export class State {
     program: ts.Program;
     fileAnalyzer: FileAnalyzer;
     defaultLib: string;
+    compilerHost: ts.CompilerHost;
 
     constructor(
         loaderConfig: LoaderConfig,
@@ -122,6 +127,7 @@ export class State {
         this.ts = compilerInfo.tsImpl;
         this.compilerInfo = compilerInfo;
         this.host = new Host(this);
+        this.compilerHost = this.ts.createCompilerHost(compilerConfig.options);
         this.services = this.ts.createLanguageService(this.host, this.ts.createDocumentRegistry());
         this.loaderConfig = loaderConfig;
         this.configFilePath = configFilePath;
@@ -138,8 +144,11 @@ export class State {
 
     loadTypesFromConfig() {
         let { options } = this.compilerConfig;
-        if (options.types) {
-            options.types.forEach(type => {
+
+        const directives = this.ts.getAutomaticTypeDirectiveNames(options, [], this.compilerHost);
+
+        if (directives) {
+            directives.forEach(type => {
                 let { resolvedTypeReferenceDirective } = this.ts.resolveTypeReferenceDirective(
                     type,
                     this.configFilePath,

src/test/fixtures/typeRoots/index.ts

@@ -0,0 +1,4 @@
+
+describe('test', () => {
+
+});

src/test/fixtures/typeRoots/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@types/jasmine": "^2.2.31"
+  }
+}

src/test/fixtures/typeRoots/tsconfig.json

@@ -0,0 +1,4 @@
+{
+    "compilerOptions": {
+    }
+}

src/test/typeRoots.ts

@@ -0,0 +1,26 @@
+import {
+    cleanAndCompile, expect,
+    fixturePath, createConfig, chroot
+} from './utils';
+
+describe('main test', function() {
+    it('should compile proejct with typeRoots', async function() {
+        const config = createConfig(
+            {
+                entry: fixturePath(['typeRoots', 'index.ts'])
+            },
+            {
+                loaderQuery: {
+                    tsconfigContent: undefined,
+                    tsconfig: fixturePath(['typeRoots', 'tsconfig.json'])
+                }
+            }
+        );
+
+        let stats = await chroot(fixturePath('typeRoots'), async () => {
+            return await cleanAndCompile(config);
+        });
+
+        expect(stats.compilation.errors.length).eq(0);
+    });
+});

src/test/utils.ts

@@ -93,6 +93,14 @@ export function createConfig(conf, _options: ConfigOptions = defaultOptions) {
     return _.merge(defaultConfig, conf);
 }
 
+export async function chroot<T>(root: string, foo: () => Promise<T>): Promise<T> {
+    let cwd = process.cwd();
+    process.chdir(root);
+    let result = await foo();
+    process.chdir(cwd);
+    return result;
+}
+
 export function expectSource(source: string, fragment: string) {
     expect(source.replace(/\s/g, '')).include(fragment.replace(/\s/g, ''));
 }