feat: use TS's preProcessFile to extract deps, refs #168

Author: s-panferov

package.json

@@ -56,7 +56,7 @@
     "sinon": "^1.17.4",
     "temp": "^0.8.3",
     "tslint": "3.11.0-dev.0",
-    "typescript": "^1.9.0-dev.20160619-1.0",
+    "typescript": "^1.9.0-dev.20160620-1.0",
     "webpack": "2.1.0-beta.4"
   }
 }

src/checker-runtime.ts

@@ -84,14 +84,18 @@ export class Host implements ts.LanguageServiceHost {
     }
 
     getScriptVersion(fileName: string) {
-        if (env.files[fileName]) {
-            return env.files[fileName].version.toString();
+        let fileName_ = path.normalize(fileName);
+        if (env.files[fileName_]) {
+            return env.files[fileName_].version.toString();
         }
     }
 
     getScriptSnapshot(fileName: string) {
         let fileName_ = path.normalize(fileName);
         let file = env.files[fileName_];
+        if (!file) {
+            throw new Error(`Requested file is unknown: ${ fileName_ }`);
+        }
         return env.compiler.ScriptSnapshot.fromString(file.text);
     }
 

src/deps.ts

@@ -19,14 +19,6 @@ export function isTypeDeclaration(fileName: string): boolean {
     return /\.d.ts$/.test(fileName);
 }
 
-function isImportOrExportDeclaration(node: ts.Node) {
-    return !!(<any>node).moduleSpecifier;
-}
-
-function isImportEqualsDeclaration(node: ts.Node) {
-    return !!(<any>node).moduleReference && (<any>node).moduleReference.hasOwnProperty('expression');
-}
-
 export class FileAnalyzer {
     dependencies = new DependencyManager();
     validFiles = new ValidFilesManager();
@@ -74,30 +66,13 @@ export class FileAnalyzer {
 
     findImportDeclarations(fileName: string): ts.ResolvedModule[] {
         let sourceFile = this.state.getSourceFile(fileName);
-        let ts = this.state.ts;
-
-        let imports = [];
-        let visit = (node: ts.Node) => {
-            if (isImportEqualsDeclaration(node)) {
-                // we need this check to ensure that we have an external import
-                let importPath = (<any>node).moduleReference.expression.text;
-                imports.push(importPath);
-            } else if (isImportOrExportDeclaration(node)) {
-                let importPath = (<any>node).moduleSpecifier.text;
-                imports.push(importPath);
-            }
-
-            ts.forEachChild(node, visit);
-        };
-
-        imports.push.apply(imports, sourceFile.referencedFiles.map(file => file.fileName));
-        ts.forEachChild(sourceFile, visit);
-
-        let resolvedImports = imports.map((importPath) => {
-            return this.resolve(fileName, importPath);
-        });
+        let isJavaScript = sourceFile.flags & this.state.ts.NodeFlags.JavaScriptFile;
+        let info = this.state.ts.preProcessFile(sourceFile.text, true, !!isJavaScript);
 
-        return resolvedImports.filter(Boolean);
+        return info.importedFiles
+            .map(file => file.fileName)
+            .map(depName => this.resolve(fileName, depName))
+            .filter(Boolean);
     }
 
     resolve(fileName: string, depName: string): ts.ResolvedModule {
@@ -125,14 +100,6 @@ export class FileAnalyzer {
             this.state.fileAnalyzer.dependencies.addResolution(fileName, depName, resolvedModule);
         }
 
-        if (this.state.compilerConfig.options.traceResolution) {
-            console.log(
-                'Resolve', depName, '\n',
-                'from', fileName,'\n',
-                'resolved', resolvedModule && resolvedModule.resolvedFileName, '\n',
-                'failedLookupLocations', resolution.failedLookupLocations, '\n\n');
-        }
-
         return resolvedModule;
     }
 }

src/host.ts

@@ -40,13 +40,18 @@ export class Host implements ts.LanguageServiceHost {
     }
 
     getScriptVersion(fileName: string) {
-        if (this.state.getFile(fileName)) {
-            return this.state.getFile(fileName).version.toString();
+        let fileName_ = path.normalize(fileName);
+        if (this.state.getFile(fileName_)) {
+            return this.state.getFile(fileName_).version.toString();
         }
     }
 
     getScriptSnapshot(fileName) {
-        let file = this.state.getFile(fileName);
+        let fileName_ = path.normalize(fileName);
+        let file = this.state.getFile(fileName_);
+        if (!file) {
+            throw new Error(`Requested file is unknown: ${ fileName_ }`);
+        }
         return this.state.ts.ScriptSnapshot.fromString(file.text);
     }
 
@@ -67,9 +72,11 @@ export class Host implements ts.LanguageServiceHost {
     }
 
     resolveModuleNames(moduleNames: string[], containingFile: string) {
-        return moduleNames.map(moduleName => {
+        let resolutions = moduleNames.map(moduleName => {
             return this.state.fileAnalyzer.dependencies.getResolution(containingFile, moduleName);
         });
+
+        return resolutions;
     }
 
     getDefaultLibLocation(): string {

src/instance.ts

@@ -140,8 +140,10 @@ export function ensureInstance(webpack: IWebPack, query: QueryOptions, instanceN
     let compilerPath = query.compiler || 'typescript';
 
     let tsImpl: typeof ts;
+    let tsImplPath: string;
     try {
-        tsImpl = require(compilerPath);
+        tsImplPath = require.resolve(compilerPath);
+        tsImpl = require(tsImplPath);
     } catch (e) {
         console.error(e);
         console.error(COMPILER_ERROR);
@@ -155,8 +157,6 @@ export function ensureInstance(webpack: IWebPack, query: QueryOptions, instanceN
 
     let { compilerConfig, loaderConfig } = readConfigFile(process.cwd(), query, tsImpl);
 
-    console.log(compilerConfig, loaderConfig);
-
     applyDefaults(compilerConfig, loaderConfig);
     let babelImpl = setupBabel(loaderConfig);
     let cacheIdentifier = setupCache(loaderConfig, tsImpl, webpack, babelImpl);