Path mapping module resolution

src/compiler/commandLineParser.ts

@@ -250,10 +250,12 @@ namespace ts {
             name: "moduleResolution",
             type: {
                 "node": ModuleResolutionKind.NodeJs,
-                "classic": ModuleResolutionKind.Classic
+                "classic": ModuleResolutionKind.Classic,
+                // name is lowercased so we can still use hasProperty(userValue.toLower()) to check if user has entered the right value
+                "baseurl": ModuleResolutionKind.BaseUrl,
             },
             description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,
+            error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_classic_or_baseUrl,
         },
         {
             name: "allowUnusedLabels",
@@ -280,6 +282,31 @@ namespace ts {
             type: "boolean",
             description: Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         },
+        {
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: Diagnostics.Base_directory_to_resolve_relative_module_names
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "rootDirs",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            name: "traceModuleResolution",
+            type: "boolean",
+            description: Diagnostics.Enable_tracing_of_the_module_resolution_process
+        },
         {
             name: "allowJs",
             type: "boolean",
@@ -344,31 +371,36 @@ namespace ts {
                     if (hasProperty(optionNameMap, s)) {
                         const opt = optionNameMap[s];
 
-                        // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
-                        if (!args[i] && opt.type !== "boolean") {
-                            errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                        if (opt.isTSConfigOnly) {
+                            errors.push(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
                         }
+                        else {
+                            // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
 
-                        switch (opt.type) {
-                            case "number":
-                                options[opt.name] = parseInt(args[i++]);
-                                break;
-                            case "boolean":
-                                options[opt.name] = true;
-                                break;
-                            case "string":
-                                options[opt.name] = args[i++] || "";
-                                break;
-                            // If not a primitive, the possible types are specified in what is effectively a map of options.
-                            default:
-                                let map = <Map<number>>opt.type;
-                                let key = (args[i++] || "").toLowerCase();
-                                if (hasProperty(map, key)) {
-                                    options[opt.name] = map[key];
-                                }
-                                else {
-                                    errors.push(createCompilerDiagnostic((<CommandLineOptionOfCustomType>opt).error));
-                                }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i++]);
+                                    break;
+                                case "boolean":
+                                    options[opt.name] = true;
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i++] || "";
+                                    break;
+                                // If not a primitive, the possible types are specified in what is effectively a map of options.
+                                default:
+                                    let map = <Map<number>>opt.type;
+                                    let key = (args[i++] || "").toLowerCase();
+                                    if (hasProperty(map, key)) {
+                                        options[opt.name] = map[key];
+                                    }
+                                    else {
+                                        errors.push(createCompilerDiagnostic((<CommandLineOptionOfCustomType>opt).error));
+                                    }
+                            }
                         }
                     }
                     else {
@@ -471,7 +503,6 @@ namespace ts {
         return output;
     }
 
-
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
@@ -483,12 +514,15 @@ namespace ts {
         const { options: optionsFromJsonConfigFile, errors } = convertCompilerOptionsFromJson(json["compilerOptions"], basePath);
 
         const options = extend(existingOptions, optionsFromJsonConfigFile);
+        // set basePath as inferredBaseUrl so baseUrl module resolution strategy can still work even if user have not specified baseUrl explicity
+        options.inferredBaseUrl = basePath;
+
         return {
             options,
             fileNames: getFileNames(),
             errors
         };
-
+
         function getFileNames(): string[] {
             let fileNames: string[] = [];
             if (hasProperty(json, "files")) {

src/compiler/core.ts

@@ -410,6 +410,17 @@ namespace ts {
         };
     }
 
+    /* internal */
+    export function formatMessage(dummy: any, message: DiagnosticMessage): string {
+        let text = getLocaleSpecificMessage(message);
+
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+
+        return text;
+    }
+
     export function createCompilerDiagnostic(message: DiagnosticMessage, ...args: any[]): Diagnostic;
     export function createCompilerDiagnostic(message: DiagnosticMessage): Diagnostic {
         let text = getLocaleSpecificMessage(message);
@@ -860,4 +871,4 @@ namespace ts {
         }
         return copiedList;
     }
-}
+}

src/compiler/diagnosticMessages.json

@@ -2068,7 +2068,26 @@
         "category": "Error",
         "code": 5056
     },
-
+    "Option '{0}' can only be used when option 'moduleResolution' is 'baseUrl'.": {
+        "category": "Error",
+        "code": 5057
+    },
+    "Pattern '{0}' can have at most one '*' character": {
+        "category": "Error",
+        "code": 5058
+    },
+    "Substitution '{0}' in pattern '{1}' in can have at most one '*' character": {
+        "category": "Error",
+        "code": 5059
+    },
+    "'moduleResolution' kind 'baseUrl' cannot be used without specifying '--baseUrl' option.": {
+        "category": "Error",
+        "code": 5060
+    },
+    "Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option.": {
+        "category": "Error",
+        "code": 5061
+    },
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
@@ -2201,10 +2220,10 @@
         "category": "Error",
         "code": 6046
     },
-  "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'.": {
-    "category": "Error",
-    "code": 6047
-  },
+    "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'.": {
+        "category": "Error",
+        "code": 6047
+    },
     "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'.": {
         "category": "Error",
         "code": 6048
@@ -2261,10 +2280,14 @@
         "category": "Error",
         "code": 6062
     },
-    "Argument for '--moduleResolution' option must be 'node' or 'classic'.": {
+    "Argument for '--moduleResolution' option must be 'node', 'classic' or 'baseUrl'.": {
         "category": "Error",
         "code": 6063
     },
+    "Option '{0}' can only be specified in 'tsconfig.json' file.": {
+        "category": "Error",
+        "code": 6064
+    },
 
     "Enables experimental support for ES7 decorators.": {
         "category": "Message",
@@ -2330,11 +2353,114 @@
         "category": "Error",
         "code": 6082
     },
-    "Allow javascript files to be compiled.": {
+    "Base directory to resolve relative module names.": {
         "category": "Message",
         "code": 6083
     },
-
+    "Enable tracing of the module resolution process.": {
+        "category": "Message",
+        "code": 6084
+    },
+    "======== Resolving module '{0}' from '{1}'. ========": {
+        "category": "Message",
+        "code": 6085
+    },
+    "Explicitly specified module resolution kind: '{0}'.": {
+        "category": "Message",
+        "code": 6086
+    },
+    "Module resolution kind is not specified, using '{0}'.": {
+        "category": "Message",
+        "code": 6087
+    },
+    "======== Module name '{0}' was successfully resolved to '{1}'. ========": {
+        "category": "Message",
+        "code": 6088
+    },
+    "======== Module name '{0}' was not resolved. ========": {
+        "category": "Message",
+        "code": 6089
+    },
+    "Resolving rooted module name '{0}' - use it as a candidate location.": {
+        "category": "Message",
+        "code": 6090
+    },
+    "Resolving relative module name '{0}'.": {
+        "category": "Message",
+        "code": 6091
+    },
+    "Resolving non-relative module name '{0}'.": {
+        "category": "Message",
+        "code": 6092
+    },
+    "Converting relative module name '{0}' to absolute using '{1}' as a base directory => '{2}'.": {
+        "category": "Message",
+        "code": 6093
+    },
+    "'rootDirs' option is specified, searching for a longest matching prefix...": {
+        "category": "Message",
+        "code": 6094
+    },
+    "Found longest matching rootDir '{0}', 'converted relative path '{1}', to non-relative path '{2}'": {
+        "category": "Message",
+        "code": 6095
+    },
+    "'rootDirs' option is not specified, using '{0}' as candidate location.": {
+        "category": "Message",
+        "code": 6096
+    },
+    "'paths' option is specified, looking for a pattern to match module name '{0}'.": {
+        "category": "Message",
+        "code": 6097
+    },
+    "Module name '{0}', matched pattern '{1}'.": {
+        "category": "Message",
+        "code": 6098
+    },
+    "Trying substitution '{0}', candidate module location: '{1}'.": {
+        "category": "Message",
+        "code": 6099
+    },
+    "Resolving module name '{0}' relative to base url '{1}' - '{2}'.": {
+        "category": "Message",
+        "code": 6100
+    },
+    "Loading module '{0}' as file / folder, candidate module location '{1}'.": {
+        "category": "Message",
+        "code": 6101
+    },
+    "File '{0}' does not exist.": {
+        "category": "Message",
+        "code": 6102
+    },
+    "File '{0}' exist - use it as a module resolution result.": {
+        "category": "Message",
+        "code": 6103
+    },
+    "Loading module '{0}' from 'node_modules' folder.": {
+        "category": "Message",
+        "code": 6104
+    },
+    "Found 'package.json' at '{0}'.": {
+        "category": "Message",
+        "code": 6105
+    },
+    "'package.json' does not have 'typings' field.": {
+        "category": "Message",
+        "code": 6106
+    },
+    "'package.json' has 'typings' field '{0}' that references '{1}'.": {
+        "category": "Message",
+        "code": 6107
+    },
+    "Module name '{0}' contains '!' character.": {
+        "category": "Message",
+        "code": 6108
+    },
+    "Allow javascript files to be compiled.": {
+        "category": "Message",
+        "code": 6109
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005