Library references WIP

Author: RyanCavanaugh

src/compiler/program.ts

@@ -13,10 +13,10 @@ namespace ts {
     const emptyArray: any[] = [];
 
     const defaultLibrarySearchPaths = [
-        './',
-        './typings/',
-        './node_modules/',
-        './node_modules/@types/',
+        "",
+        "typings/",
+        "node_modules/",
+        "node_modules/@types/",
     ];
 
     export const version = "1.9.0";
@@ -1489,13 +1489,12 @@ namespace ts {
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
 
                 const basePath = getDirectoryPath(fileName);
+                const libraryBasePath = options.rootDir || options.configFilePath || getDirectoryPath(file.fileName);
                 if (!options.noResolve) {
                     processReferencedFiles(file, basePath);
-                }
-
-                const libraryRoot = computeCommonSourceDirectory(files);
 
-                processReferencedLibraries(file, libraryRoot);
+                    processReferencedLibraries(file, libraryBasePath);
+                }
 
                 // always process imported modules to record module name resolutions
                 processImportedModules(file, basePath);
@@ -1521,12 +1520,34 @@ namespace ts {
         function processReferencedLibraries(file: SourceFile, compilationRoot: string) {
             const searchPaths = getEffectiveLibrarySearchPaths();
             for (const ref of file.referencedLibraries) {
+                let foundIt = false;
+
                 for (const path of searchPaths) {
-                    const combinedPath = combinePaths(path, ref.fileName);
+                    let typingFilename = "index.d.ts";
+                    const searchPath = combinePaths(combinePaths(compilationRoot, path), ref.fileName);
+                    const packageJsonPath = combinePaths(searchPath, "package.json");
+                    console.log('Check for ' + packageJsonPath);
+                    if (host.fileExists(packageJsonPath)) {
+                        let package: { typings?: string } = {};
+                        try {
+                            package = JSON.parse(host.readFile(packageJsonPath));
+                        } catch (e) { }
+
+                        if (package.typings) {
+                            typingFilename = package.typings;
+                        }
+                    }
+
+                    const combinedPath = normalizePath(combinePaths(compilationRoot, combinePaths(combinePaths(path, ref.fileName), typingFilename)));
                     if (host.fileExists(combinedPath)) {
-                        processSourceFile(combinedPath, false, file, ref.pos, ref.end);
+                        processSourceFile(combinedPath, /*isDefaultLib*/ false, /*isReference*/ true, file, ref.pos, ref.end);
+                        foundIt = true;
+                        break;
                     }
                 }
+                if (!foundIt) {
+                    fileProcessingDiagnostics.add(createFileDiagnostic(file, ref.pos, ref.end - ref.pos, Diagnostics.Cannot_find_name_0, ref.fileName));
+                }
             }
         }
 

tests/cases/conformance/references/library-reference-1.ts

@@ -0,0 +1,9 @@
+// @noImplicitReferences: true
+
+// @filename: typings/jquery/index.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: consumer.ts
+/// <reference library="jquery" />
+$.foo();

tests/cases/conformance/references/library-reference-2.ts

@@ -0,0 +1,14 @@
+// @noImplicitReferences: true
+
+// @filename: typings/jquery/package.json
+{
+	"typings": "jquery.d.ts"
+}
+
+// @filename: typings/jquery/jquery.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: consumer.ts
+/// <reference library="jquery" />
+$.foo();