Skip to content

Commit

Permalink
path mappings now supports rooted disk paths and urls - fixes #13730
Browse files Browse the repository at this point in the history
  • Loading branch information
EECOLOR committed Oct 20, 2018
1 parent 7b5ef64 commit 82e9ef7
Show file tree
Hide file tree
Showing 43 changed files with 1,055 additions and 34 deletions.
28 changes: 18 additions & 10 deletions src/compiler/moduleNameResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,13 @@ namespace ts {
function tryLoadModuleUsingOptionalResolutionSettings(extensions: Extensions, moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader,
state: ModuleResolutionState): Resolved | undefined {

const { baseUrl, paths } = state.compilerOptions;
if (baseUrl && paths && isEligibleForPathMapping(moduleName, paths)) {
if (state.traceEnabled) trace(state.host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
const resolved = tryLoadModuleUsingPaths(extensions, moduleName, baseUrl, paths, loader, /*onlyRecordFailures*/ false, state);
if (resolved) return resolved.value;
}

if (!isExternalModuleNameRelative(moduleName)) {
return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, state);
}
Expand All @@ -683,6 +690,16 @@ namespace ts {
}
}

function isEligibleForPathMapping(moduleName: string, paths: MapLike<string[]>): boolean {
if (isRootedDiskPath(moduleName) || isUrl(moduleName)) {
// check for potential alias otherwise { '*': './src/*' } will match
const root = moduleName.slice(0, getRootLength(moduleName));
const potentialAlias = getOwnKeys(paths).find(path => path.startsWith(root));
return Boolean(potentialAlias);
}
else return !pathIsRelative(moduleName);
}

function tryLoadModuleUsingRootDirs(extensions: Extensions, moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader,
state: ModuleResolutionState): Resolved | undefined {

Expand Down Expand Up @@ -761,22 +778,13 @@ namespace ts {
}

function tryLoadModuleUsingBaseUrl(extensions: Extensions, moduleName: string, loader: ResolutionKindSpecificLoader, state: ModuleResolutionState): Resolved | undefined {
const { baseUrl, paths } = state.compilerOptions;
const { baseUrl } = state.compilerOptions;
if (!baseUrl) {
return undefined;
}
if (state.traceEnabled) {
trace(state.host, Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, baseUrl, moduleName);
}
if (paths) {
if (state.traceEnabled) {
trace(state.host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
}
const resolved = tryLoadModuleUsingPaths(extensions, moduleName, baseUrl, paths, loader, /*onlyRecordFailures*/ false, state);
if (resolved) {
return resolved.value;
}
}
const candidate = normalizePath(combinePaths(baseUrl, moduleName));
if (state.traceEnabled) {
trace(state.host, Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, baseUrl, candidate);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
[
"======== Resolving module 'folder2/file1' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file1'.",
"'paths' option is specified, looking for a pattern to match module name 'folder2/file1'.",
"Module name 'folder2/file1', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'folder2/file1'.",
"File 'c:/root/folder2/file1.ts' exist - use it as a name resolution result.",
"======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========",
"======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder3/file2'.",
"'paths' option is specified, looking for a pattern to match module name 'folder3/file2'.",
"Module name 'folder3/file2', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'folder3/file2'.",
Expand All @@ -18,15 +16,13 @@
"======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========",
"======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'components/file3'.",
"'paths' option is specified, looking for a pattern to match module name 'components/file3'.",
"Module name 'components/file3', matched pattern 'components/*'.",
"Trying substitution 'shared/components/*', candidate module location: 'shared/components/file3'.",
"File 'c:/root/shared/components/file3.ts' exist - use it as a name resolution result.",
"======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3.ts'. ========",
"======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'.",
"'paths' option is specified, looking for a pattern to match module name 'file4'.",
"Module name 'file4', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'file4'.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[
"======== Resolving module 'folder2/file1' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file1'.",
"'paths' option is specified, looking for a pattern to match module name 'folder2/file1'.",
"Module name 'folder2/file1', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'folder2/file1'.",
Expand All @@ -10,7 +9,6 @@
"======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========",
"======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder3/file2'.",
"'paths' option is specified, looking for a pattern to match module name 'folder3/file2'.",
"Module name 'folder3/file2', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'folder3/file2'.",
Expand All @@ -21,7 +19,6 @@
"======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========",
"======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'components/file3'.",
"'paths' option is specified, looking for a pattern to match module name 'components/file3'.",
"Module name 'components/file3', matched pattern 'components/*'.",
"Trying substitution 'shared/components/*', candidate module location: 'shared/components/file3'.",
Expand All @@ -36,7 +33,6 @@
"======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3/index.d.ts'. ========",
"======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'.",
"'paths' option is specified, looking for a pattern to match module name 'file4'.",
"Module name 'file4', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'file4'.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
"======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module3'.",
"'paths' option is specified, looking for a pattern to match module name 'module3'.",
"Module name 'module3', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'module3'.",
Expand All @@ -35,7 +34,6 @@
"======== Module name 'module3' was successfully resolved to 'c:/module3.d.ts'. ========",
"======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module1'.",
"'paths' option is specified, looking for a pattern to match module name 'module1'.",
"Module name 'module1', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'module1'.",
Expand All @@ -49,7 +47,6 @@
"======== Module name 'module1' was successfully resolved to 'c:/shared/module1.d.ts'. ========",
"======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
"Module resolution kind is not specified, using 'Classic'.",
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'templates/module2'.",
"'paths' option is specified, looking for a pattern to match module name 'templates/module2'.",
"Module name 'templates/module2', matched pattern 'templates/*'.",
"Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
"======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module3'.",
"'paths' option is specified, looking for a pattern to match module name 'module3'.",
"Module name 'module3', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'module3'.",
Expand All @@ -40,7 +39,6 @@
"======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3.d.ts'. ========",
"======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'module1'.",
"'paths' option is specified, looking for a pattern to match module name 'module1'.",
"Module name 'module1', matched pattern '*'.",
"Trying substitution '*', candidate module location: 'module1'.",
Expand All @@ -61,7 +59,6 @@
"======== Module name 'module1' was successfully resolved to 'c:/shared/module1/index.d.ts'. ========",
"======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'baseUrl' option is set to 'c:/root/', using this value to resolve non-relative module name 'templates/module2'.",
"'paths' option is specified, looking for a pattern to match module name 'templates/module2'.",
"Module name 'templates/module2', matched pattern 'templates/*'.",
"Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[
"======== Resolving module '@speedy/folder1/testing' from 'c:/root/index.ts'. ========",
"Explicitly specified module resolution kind: 'Classic'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name '@speedy/folder1/testing'.",
"'paths' option is specified, looking for a pattern to match module name '@speedy/folder1/testing'.",
"Module name '@speedy/folder1/testing', matched pattern '@speedy/*/testing'.",
"Trying substitution '*/dist/index.ts', candidate module location: 'folder1/dist/index.ts'.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[
"======== Resolving module '@speedy/folder1/testing' from 'c:/root/index.ts'. ========",
"Explicitly specified module resolution kind: 'NodeJs'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name '@speedy/folder1/testing'.",
"'paths' option is specified, looking for a pattern to match module name '@speedy/folder1/testing'.",
"Module name '@speedy/folder1/testing', matched pattern '@speedy/*/testing'.",
"Trying substitution '*/dist/index.ts', candidate module location: 'folder1/dist/index.ts'.",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts] ////

//// [foo.ts]
export function foo() {}

//// [bar.js]
export function bar() {}

//// [a.ts]
import { foo } from "/foo";
import { bar } from "/bar";


//// [foo.js]
"use strict";
exports.__esModule = true;
function foo() { }
exports.foo = foo;
//// [bar.js]
"use strict";
exports.__esModule = true;
function bar() { }
exports.bar = bar;
//// [a.js]
"use strict";
exports.__esModule = true;
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
=== /root/a.ts ===
import { foo } from "/foo";
>foo : Symbol(foo, Decl(a.ts, 0, 8))

import { bar } from "/bar";
>bar : Symbol(bar, Decl(a.ts, 1, 8))

=== /root/src/foo.ts ===
export function foo() {}
>foo : Symbol(foo, Decl(foo.ts, 0, 0))

=== /root/src/bar.js ===
export function bar() {}
>bar : Symbol(bar, Decl(bar.js, 0, 0))

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[
"======== Resolving module '/foo' from '/root/a.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'paths' option is specified, looking for a pattern to match module name '/foo'.",
"Module name '/foo', matched pattern '/*'.",
"Trying substitution './src/*', candidate module location: './src/foo'.",
"Loading module as file / folder, candidate module location '/root/src/foo', target file type 'TypeScript'.",
"File '/root/src/foo.ts' exist - use it as a name resolution result.",
"======== Module name '/foo' was successfully resolved to '/root/src/foo.ts'. ========",
"======== Resolving module '/bar' from '/root/a.ts'. ========",
"Module resolution kind is not specified, using 'NodeJs'.",
"'paths' option is specified, looking for a pattern to match module name '/bar'.",
"Module name '/bar', matched pattern '/*'.",
"Trying substitution './src/*', candidate module location: './src/bar'.",
"Loading module as file / folder, candidate module location '/root/src/bar', target file type 'TypeScript'.",
"File '/root/src/bar.ts' does not exist.",
"File '/root/src/bar.tsx' does not exist.",
"File '/root/src/bar.d.ts' does not exist.",
"Directory '/root/src/bar' does not exist, skipping all lookups in it.",
"Loading module as file / folder, candidate module location '/bar', target file type 'TypeScript'.",
"File '/bar.ts' does not exist.",
"File '/bar.tsx' does not exist.",
"File '/bar.d.ts' does not exist.",
"Directory '/bar' does not exist, skipping all lookups in it.",
"'paths' option is specified, looking for a pattern to match module name '/bar'.",
"Module name '/bar', matched pattern '/*'.",
"Trying substitution './src/*', candidate module location: './src/bar'.",
"Loading module as file / folder, candidate module location '/root/src/bar', target file type 'JavaScript'.",
"File '/root/src/bar.js' exist - use it as a name resolution result.",
"======== Module name '/bar' was successfully resolved to '/root/src/bar.js'. ========"
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
=== /root/a.ts ===
import { foo } from "/foo";
>foo : () => void

import { bar } from "/bar";
>bar : () => void

=== /root/src/foo.ts ===
export function foo() {}
>foo : () => void

=== /root/src/bar.js ===
export function bar() {}
>bar : () => void

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts] ////

//// [foo.ts]
export function foo() {}

//// [bar.js]
export function bar() {}

//// [a.ts]
import { foo as foo1 } from "/foo";
import { bar as bar1 } from "/bar";
import { foo as foo2 } from "c:/foo";
import { bar as bar2 } from "c:/bar";
import { foo as foo3 } from "c:\\foo";
import { bar as bar3 } from "c:\\bar";
import { foo as foo4 } from "//server/foo";
import { bar as bar4 } from "//server/bar";
import { foo as foo5 } from "\\\\server\\foo";
import { bar as bar5 } from "\\\\server\\bar";
import { foo as foo6 } from "file:///foo";
import { bar as bar6 } from "file:///bar";
import { foo as foo7 } from "file://c:/foo";
import { bar as bar7 } from "file://c:/bar";
import { foo as foo8 } from "file://server/foo";
import { bar as bar8 } from "file://server/bar";
import { foo as foo9 } from "http://server/foo";
import { bar as bar9 } from "http://server/bar";


//// [foo.js]
"use strict";
exports.__esModule = true;
function foo() { }
exports.foo = foo;
//// [bar.js]
"use strict";
exports.__esModule = true;
function bar() { }
exports.bar = bar;
//// [a.js]
"use strict";
exports.__esModule = true;
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
=== /root/a.ts ===
import { foo as foo1 } from "/foo";
>foo : Symbol(foo1, Decl(a.ts, 0, 8))
>foo1 : Symbol(foo1, Decl(a.ts, 0, 8))

import { bar as bar1 } from "/bar";
>bar : Symbol(bar1, Decl(a.ts, 1, 8))
>bar1 : Symbol(bar1, Decl(a.ts, 1, 8))

import { foo as foo2 } from "c:/foo";
>foo : Symbol(foo2, Decl(a.ts, 2, 8))
>foo2 : Symbol(foo2, Decl(a.ts, 2, 8))

import { bar as bar2 } from "c:/bar";
>bar : Symbol(bar2, Decl(a.ts, 3, 8))
>bar2 : Symbol(bar2, Decl(a.ts, 3, 8))

import { foo as foo3 } from "c:\\foo";
>foo : Symbol(foo3, Decl(a.ts, 4, 8))
>foo3 : Symbol(foo3, Decl(a.ts, 4, 8))

import { bar as bar3 } from "c:\\bar";
>bar : Symbol(bar3, Decl(a.ts, 5, 8))
>bar3 : Symbol(bar3, Decl(a.ts, 5, 8))

import { foo as foo4 } from "//server/foo";
>foo : Symbol(foo4, Decl(a.ts, 6, 8))
>foo4 : Symbol(foo4, Decl(a.ts, 6, 8))

import { bar as bar4 } from "//server/bar";
>bar : Symbol(bar4, Decl(a.ts, 7, 8))
>bar4 : Symbol(bar4, Decl(a.ts, 7, 8))

import { foo as foo5 } from "\\\\server\\foo";
>foo : Symbol(foo5, Decl(a.ts, 8, 8))
>foo5 : Symbol(foo5, Decl(a.ts, 8, 8))

import { bar as bar5 } from "\\\\server\\bar";
>bar : Symbol(bar5, Decl(a.ts, 9, 8))
>bar5 : Symbol(bar5, Decl(a.ts, 9, 8))

import { foo as foo6 } from "file:///foo";
>foo : Symbol(foo6, Decl(a.ts, 10, 8))
>foo6 : Symbol(foo6, Decl(a.ts, 10, 8))

import { bar as bar6 } from "file:///bar";
>bar : Symbol(bar6, Decl(a.ts, 11, 8))
>bar6 : Symbol(bar6, Decl(a.ts, 11, 8))

import { foo as foo7 } from "file://c:/foo";
>foo : Symbol(foo7, Decl(a.ts, 12, 8))
>foo7 : Symbol(foo7, Decl(a.ts, 12, 8))

import { bar as bar7 } from "file://c:/bar";
>bar : Symbol(bar7, Decl(a.ts, 13, 8))
>bar7 : Symbol(bar7, Decl(a.ts, 13, 8))

import { foo as foo8 } from "file://server/foo";
>foo : Symbol(foo8, Decl(a.ts, 14, 8))
>foo8 : Symbol(foo8, Decl(a.ts, 14, 8))

import { bar as bar8 } from "file://server/bar";
>bar : Symbol(bar8, Decl(a.ts, 15, 8))
>bar8 : Symbol(bar8, Decl(a.ts, 15, 8))

import { foo as foo9 } from "http://server/foo";
>foo : Symbol(foo9, Decl(a.ts, 16, 8))
>foo9 : Symbol(foo9, Decl(a.ts, 16, 8))

import { bar as bar9 } from "http://server/bar";
>bar : Symbol(bar9, Decl(a.ts, 17, 8))
>bar9 : Symbol(bar9, Decl(a.ts, 17, 8))

=== /root/src/foo.ts ===
export function foo() {}
>foo : Symbol(foo, Decl(foo.ts, 0, 0))

=== /root/src/bar.js ===
export function bar() {}
>bar : Symbol(bar, Decl(bar.js, 0, 0))

Loading

0 comments on commit 82e9ef7

Please sign in to comment.