Merge pull request microsoft#7775 from Microsoft/libraryDirectives-2

Library directives support

Author: vladima

src/compiler/commandLineParser.ts

@@ -317,9 +317,32 @@ namespace ts {
  }
  },
  {
- name: "traceModuleResolution",
+ name: "typesSearchPaths",
+ type: "list",
+ isTSConfigOnly: true,
+ element: {
+ name: "typesSearchPaths",
+ type: "string",
+ isFilePath: true
+ }
+ },
+ {
+ name: "typesRoot",
+ type: "string"
+ },
+ {
+ name: "types",
+ type: "list",
+ element: {
+ name: "types",
+ type: "string"
+ },
+ description: Diagnostics.Type_declaration_files_to_be_included_in_compilation
+ },
+ {
+ name: "traceResolution",
  type: "boolean",
- description: Diagnostics.Enable_tracing_of_the_module_resolution_process
+ description: Diagnostics.Enable_tracing_of_the_name_resolution_process
  },
  {
  name: "allowJs",
@@ -641,6 +664,7 @@ namespace ts {
  const compilerOptions: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
  const options = extend(existingOptions, compilerOptions);
  const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+ options.configFilePath = configFileName;
 
  const fileNames = getFileNames(errors);
 

src/compiler/diagnosticMessages.json

@@ -1903,10 +1903,10 @@
  "category": "Error",
  "code": 2684
  },
- "The 'this' types of each signature are incompatible.": {
- "category": "Error",
- "code": 2685
- },
+ "The 'this' types of each signature are incompatible.": {
+ "category": "Error",
+ "code": 2685
+ },
  "Import declaration '{0}' is using private name '{1}'.": {
  "category": "Error",
  "code": 4000
@@ -2187,6 +2187,11 @@
  "category": "Error",
  "code": 4082
  },
+ "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict.": {
+ "category": "Message",
+ "code": 4090
+ },
+
  "The current host does not support the '{0}' option.": {
  "category": "Error",
  "code": 5001
@@ -2540,7 +2545,7 @@
  "category": "Message",
  "code": 6084
  },
- "Enable tracing of the module resolution process.": {
+ "Enable tracing of the name resolution process.": {
  "category": "Message",
  "code": 6085
  },
@@ -2588,7 +2593,7 @@
  "category": "Message",
  "code": 6096
  },
- "File '{0}' exist - use it as a module resolution result.": {
+ "File '{0}' exist - use it as a name resolution result.": {
  "category": "Message",
  "code": 6097
  },
@@ -2600,11 +2605,11 @@
  "category": "Message",
  "code": 6099
  },
- "'package.json' does not have 'typings' field.": {
+ "'package.json' does not have 'types' field.": {
  "category": "Message",
  "code": 6100
  },
- "'package.json' has 'typings' field '{0}' that references '{1}'.": {
+ "'package.json' has '{0}' field '{1}' that references '{2}'.": {
  "category": "Message",
  "code": 6101
  },
@@ -2620,7 +2625,7 @@
  "category": "Message",
  "code": 6104
  },
- "Expected type of 'typings' field in 'package.json' to be 'string', got '{0}'.": {
+ "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'.": {
  "category": "Message",
  "code": 6105
  },
@@ -2662,8 +2667,60 @@
  },
  "Raise error on 'this' expressions with an implied 'any' type.": {
  "category": "Message",
- "code": 6115
- },
+ "code": 6115
+ },
+ "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========": {
+ "category": "Message",
+ "code": 6116
+ },
+ "Resolving using primary search paths...": {
+ "category": "Message",
+ "code": 6117
+ },
+ "Resolving from node_modules folder...": {
+ "category": "Message",
+ "code": 6118
+ },
+ "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========": {
+ "category": "Message",
+ "code": 6119
+ },
+ "======== Type reference directive '{0}' was not resolved. ========": {
+ "category": "Message",
+ "code": 6120
+ },
+ "Resolving with primary search path '{0}'": {
+ "category": "Message",
+ "code": 6121
+ },
+ "Root directory cannot be determined, skipping primary search paths.": {
+ "category": "Message",
+ "code": 6122
+ },
+ "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========": {
+ "category": "Message",
+ "code": 6123
+ },
+ "Type declaration files to be included in compilation.": {
+ "category": "Message",
+ "code": 6124
+ },
+ "Looking up in 'node_modules' folder, initial location '{0}'": {
+ "category": "Message",
+ "code": 6125
+ },
+ "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder.": {
+ "category": "Message",
+ "code": 6126
+ },
+ "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========": {
+ "category": "Message",
+ "code": 6127
+ },
+ "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========": {
+ "category": "Message",
+ "code": 6128
+ },
  "Variable '{0}' implicitly has an '{1}' type.": {
  "category": "Error",
  "code": 7005

src/compiler/parser.ts

@@ -5509,6 +5509,7 @@ namespace ts {
  function processReferenceComments(sourceFile: SourceFile): void {
  const triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, LanguageVariant.Standard, sourceText);
  const referencedFiles: FileReference[] = [];
+ const typeReferenceDirectives: FileReference[] = [];
  const amdDependencies: { path: string; name: string }[] = [];
  let amdModuleName: string;
 
@@ -5535,7 +5536,12 @@ namespace ts {
  sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
  const diagnosticMessage = referencePathMatchResult.diagnosticMessage;
  if (fileReference) {
- referencedFiles.push(fileReference);
+ if (referencePathMatchResult.isTypeReferenceDirective) {
+ typeReferenceDirectives.push(fileReference);
+ }
+ else {
+ referencedFiles.push(fileReference);
+ }
  }
  if (diagnosticMessage) {
  parseDiagnostics.push(createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
@@ -5567,6 +5573,7 @@ namespace ts {
  }
 
  sourceFile.referencedFiles = referencedFiles;
+ sourceFile.typeReferenceDirectives = typeReferenceDirectives;
  sourceFile.amdDependencies = amdDependencies;
  sourceFile.moduleName = amdModuleName;
  }