Merge branch 'jnetterf-remove-extensions'

Author: s-panferov

package.json

@@ -65,7 +65,7 @@
     "standard-version": "^2.4.0",
     "temp": "^0.8.3",
     "tslint": "^3.14.0",
-    "typescript": "^2.0.0",
+    "typescript": "^2.0.2",
     "webpack": "2.1.0-beta.4"
   }
 }

src/deps.ts

@@ -1,4 +1,5 @@
 import { State } from './host';
+import { withoutTypeScriptExtension } from './helpers';
 import * as path from 'path';
 type FileSet = {[fileName: string]: boolean};
 
@@ -74,7 +75,8 @@ export class FileAnalyzer {
         imports.push.apply(imports, info.importedFiles
             .map(file => file.fileName)
             .map(depName => {
-                let { resolvedModule } = ts.resolveModuleName(depName, fileName, options, ts.sys);
+                let moduleName = withoutTypeScriptExtension(depName);
+                let { resolvedModule } = ts.resolveModuleName(moduleName, fileName, options, ts.sys);
                 if (resolvedModule) {
                     deps.addModuleResolution(fileName, depName, resolvedModule);
                     return resolvedModule.resolvedFileName;
@@ -91,7 +93,8 @@ export class FileAnalyzer {
                 return path.resolve(path.dirname(fileName), relative);
             })
             .map(depName => {
-                let { resolvedModule } = ts.resolveModuleName(depName, fileName, options, ts.sys);
+                let moduleName = withoutTypeScriptExtension(depName);
+                let { resolvedModule } = ts.classicNameResolver(moduleName, fileName, options, ts.sys);
                 if (resolvedModule) {
                     deps.addModuleResolution(fileName, depName, resolvedModule);
                     // return non-realpath name (symlinks not resolved)
@@ -123,17 +126,10 @@ export interface IDependencyGraphItem {
 }
 
 export class DependencyManager {
-    dependencies: {[fileName: string]: string[]};
-    moduleResolutions: {[cacheKey: string]: ts.ResolvedModule};
-    typeReferenceResolutions: {[cacheKey: string]: ts.ResolvedTypeReferenceDirective};
-    compiledModules: {[fileName: string]: string[]};
-
-    constructor() {
-        this.dependencies = {};
-        this.compiledModules = {};
-        this.moduleResolutions = {};
-        this.typeReferenceResolutions = {};
-    }
+    dependencies: {[fileName: string]: string[]} = {};
+    moduleResolutions: {[cacheKey: string]: ts.ResolvedModule} = {};
+    typeReferenceResolutions: {[cacheKey: string]: ts.ResolvedTypeReferenceDirective} = {};
+    compiledModules: {[fileName: string]: string[]} = {};
 
     addModuleResolution(fileName: string, depName: string, resolvedModule: ts.ResolvedModule) {
         this.moduleResolutions[`${fileName}::${depName}`] = resolvedModule;

src/helpers.ts

@@ -113,3 +113,9 @@ export function loadLib(moduleId) {
         text: text
     };
 }
+
+const TYPESCRIPT_EXTENSION = /\.(d\.)?(t|j)s$/;
+
+export function withoutTypeScriptExtension(fileName: string): string {
+    return fileName.replace(TYPESCRIPT_EXTENSION, '');
+}

src/host.ts

@@ -86,10 +86,12 @@ export class Host implements ts.LanguageServiceHost {
     }
 
     resolveModuleNames(moduleNames: string[], containingFile: string) {
-        let deps = this.state.fileAnalyzer.dependencies;
-        return moduleNames.map(moduleName => {
+        const deps = this.state.fileAnalyzer.dependencies;
+        const resolvedModules = moduleNames.map(moduleName => {
             return deps.getModuleResolution(containingFile, moduleName);
         });
+
+        return resolvedModules;
     }
 
     getDefaultLibLocation(): string {
@@ -145,7 +147,7 @@ export class State {
     loadTypesFromConfig() {
         let { options } = this.compilerConfig;
 
-        const directives = this.ts.getAutomaticTypeDirectiveNames(options, [], this.compilerHost);
+        const directives = this.ts.getAutomaticTypeDirectiveNames(options, this.compilerHost);
 
         if (directives) {
             directives.forEach(type => {

src/test/fixtures/react/index.tsx

@@ -0,0 +1,4 @@
+import * as React from 'react'
+import { renderToString } from 'react-dom/server'
+
+renderToString(<div />)