From 1a9c20949e42400e55194dbd1516c2eac6257275 Mon Sep 17 00:00:00 2001 From: EECOLOR Date: Fri, 19 Oct 2018 00:10:13 +0200 Subject: [PATCH] path mappings now supports rooted disk paths and urls - fixes #13730 --- src/compiler/moduleNameResolver.ts | 25 +- src/services/stringCompletions.ts | 27 +- src/testRunner/unittests/moduleResolution.ts | 8 + ...duleResolution_rootImport_aliasWithRoot.js | 26 ++ ...esolution_rootImport_aliasWithRoot.symbols | 15 + ...lution_rootImport_aliasWithRoot.trace.json | 34 +++ ...eResolution_rootImport_aliasWithRoot.types | 15 + ...Import_aliasWithRoot_differentRootTypes.js | 42 +++ ...t_aliasWithRoot_differentRootTypes.symbols | 81 ++++++ ...liasWithRoot_differentRootTypes.trace.json | 270 ++++++++++++++++++ ...ort_aliasWithRoot_differentRootTypes.types | 81 ++++++ ...ootImport_aliasWithRoot_multipleAliases.js | 26 ++ ...port_aliasWithRoot_multipleAliases.symbols | 15 + ...t_aliasWithRoot_multipleAliases.trace.json | 31 ++ ...Import_aliasWithRoot_multipleAliases.types | 15 + ...n_rootImport_aliasWithRoot_realRootFile.js | 26 ++ ...tImport_aliasWithRoot_realRootFile.symbols | 15 + ...port_aliasWithRoot_realRootFile.trace.json | 32 +++ ...ootImport_aliasWithRoot_realRootFile.types | 15 + ...leResolution_rootImport_noAliasWithRoot.js | 26 ++ ...olution_rootImport_noAliasWithRoot.symbols | 15 + ...tion_rootImport_noAliasWithRoot.trace.json | 34 +++ ...esolution_rootImport_noAliasWithRoot.types | 15 + ...rootImport_noAliasWithRoot_failedLookup.js | 26 ++ ...mport_noAliasWithRoot_failedLookup.symbols | 15 + ...rt_noAliasWithRoot_failedLookup.trace.json | 34 +++ ...tImport_noAliasWithRoot_failedLookup.types | 15 + ...rootImport_noAliasWithRoot_realRootFile.js | 26 ++ ...mport_noAliasWithRoot_realRootFile.symbols | 15 + ...rt_noAliasWithRoot_realRootFile.trace.json | 32 +++ ...tImport_noAliasWithRoot_realRootFile.types | 15 + ...duleResolution_rootImport_aliasWithRoot.ts | 25 ++ ...Import_aliasWithRoot_differentRootTypes.ts | 49 ++++ ...ootImport_aliasWithRoot_multipleAliases.ts | 26 ++ ...n_rootImport_aliasWithRoot_realRootFile.ts | 25 ++ ...leResolution_rootImport_noAliasWithRoot.ts | 25 ++ ...rootImport_noAliasWithRoot_realRootFile.ts | 25 ++ ...tionForStringLiteralNonrelativeImport14.ts | 28 ++ ...tionForStringLiteralNonrelativeImport15.ts | 28 ++ .../TypeScript-Node-Starter | 2 +- 40 files changed, 1276 insertions(+), 24 deletions(-) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts create mode 100644 tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts create mode 100644 tests/cases/fourslash/completionForStringLiteralNonrelativeImport15.ts diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 4d32cae86f..b8aa9fa2df 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -730,6 +730,9 @@ namespace ts { function tryLoadModuleUsingOptionalResolutionSettings(extensions: Extensions, moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader, state: ModuleResolutionState): Resolved | undefined { + const resolved = tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state); + if (resolved) return resolved.value; + if (!isExternalModuleNameRelative(moduleName)) { return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, state); } @@ -738,6 +741,17 @@ namespace ts { } } + function tryLoadModuleUsingPathsIfEligible(extensions: Extensions, moduleName: string, loader: ResolutionKindSpecificLoader, state: ModuleResolutionState) { + const { baseUrl, paths } = state.compilerOptions; + if (baseUrl && paths && !pathIsRelative(moduleName)) { + 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); + trace(state.host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName); + } + return tryLoadModuleUsingPaths(extensions, moduleName, baseUrl, paths, loader, /*onlyRecordFailures*/ false, state); + } + } + function tryLoadModuleUsingRootDirs(extensions: Extensions, moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader, state: ModuleResolutionState): Resolved | undefined { @@ -816,22 +830,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); diff --git a/src/services/stringCompletions.ts b/src/services/stringCompletions.ts index 4726e06ec4..7e60edc03d 100644 --- a/src/services/stringCompletions.ts +++ b/src/services/stringCompletions.ts @@ -247,19 +247,9 @@ namespace ts.Completions.StringCompletions { const scriptPath = sourceFile.path; const scriptDirectory = getDirectoryPath(scriptPath); - const extensionOptions = getExtensionOptions(compilerOptions); - if (isPathRelativeToScript(literalValue) || isRootedDiskPath(literalValue)) { - if (compilerOptions.rootDirs) { - return getCompletionEntriesForDirectoryFragmentWithRootDirs( - compilerOptions.rootDirs, literalValue, scriptDirectory, extensionOptions, compilerOptions, host, scriptPath); - } - else { - return getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath); - } - } - else { - return getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, compilerOptions, host, typeChecker); - } + return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && (isRootedDiskPath(literalValue) || isUrl(literalValue)) + ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath) + : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, compilerOptions, host, typeChecker); } interface ExtensionOptions { @@ -269,6 +259,17 @@ namespace ts.Completions.StringCompletions { function getExtensionOptions(compilerOptions: CompilerOptions, includeExtensions = false): ExtensionOptions { return { extensions: getSupportedExtensionsForModuleResolution(compilerOptions), includeExtensions }; } + function getCompletionEntriesForRelativeModules(literalValue: string, scriptDirectory: string, compilerOptions: CompilerOptions, host: LanguageServiceHost, scriptPath: Path) { + const extensionOptions = getExtensionOptions(compilerOptions); + if (compilerOptions.rootDirs) { + return getCompletionEntriesForDirectoryFragmentWithRootDirs( + compilerOptions.rootDirs, literalValue, scriptDirectory, extensionOptions, compilerOptions, host, scriptPath); + } + else { + return getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath); + } + } + function getSupportedExtensionsForModuleResolution(compilerOptions: CompilerOptions): ReadonlyArray { const extensions = getSupportedExtensions(compilerOptions); return compilerOptions.resolveJsonModule && getEmitModuleResolutionKind(compilerOptions) === ModuleResolutionKind.NodeJs ? diff --git a/src/testRunner/unittests/moduleResolution.ts b/src/testRunner/unittests/moduleResolution.ts index 27331d6d00..05e1738497 100644 --- a/src/testRunner/unittests/moduleResolution.ts +++ b/src/testRunner/unittests/moduleResolution.ts @@ -757,6 +757,9 @@ import b = require("./moduleB"); ], "somefolder/*": [ "someanotherfolder/*" + ], + "/rooted/*": [ + "generated/*" ] } }; @@ -773,6 +776,7 @@ import b = require("./moduleB"); "/root/folder1/file2/index.d.ts", // then first attempt on 'generated/*' was successful ]); + check("/rooted/folder1/file2", file2, []); check("folder2/file3", file3, [ // first try '*' "/root/folder2/file3.ts", @@ -900,6 +904,9 @@ import b = require("./moduleB"); ], "somefolder/*": [ "someanotherfolder/*" + ], + "/rooted/*": [ + "generated/*" ] } }; @@ -911,6 +918,7 @@ import b = require("./moduleB"); "/root/folder1/file2.d.ts", // success when using 'generated/*' ]); + check("/rooted/folder1/file2", file2, []); check("folder1/file3", file3, [ // first try '*' "/root/folder1/file3.ts", diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js new file mode 100644 index 0000000000..b880a69fe2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js @@ -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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols new file mode 100644 index 0000000000..3509e873a6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols @@ -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)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json new file mode 100644 index 0000000000..3a06918309 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json @@ -0,0 +1,34 @@ +[ + "======== Resolving module '/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/foo'.", + "'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'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types new file mode 100644 index 0000000000..67c03269af --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types @@ -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 + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js new file mode 100644 index 0000000000..a7e74a35a4 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js @@ -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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols new file mode 100644 index 0000000000..5572ccfb5d --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols @@ -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)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json new file mode 100644 index 0000000000..f00e7ffab8 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json @@ -0,0 +1,270 @@ +[ + "======== Resolving module '/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/foo'.", + "'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'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'. ========", + "======== Resolving module 'c:/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'c:/foo'.", + "'paths' option is specified, looking for a pattern to match module name 'c:/foo'.", + "Module name 'c:/foo', matched pattern 'c:/*'.", + "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 'c:/foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module 'c:/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'c:/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'c:/bar'.", + "Module name 'c:/bar', matched pattern 'c:/*'.", + "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 'c:/bar', target file type 'TypeScript'.", + "Directory 'c:/' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'c:/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'c:/bar'.", + "Module name 'c:/bar', matched pattern 'c:/*'.", + "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 'c:/bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module 'c:\\foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'c:\\foo'.", + "'paths' option is specified, looking for a pattern to match module name 'c:\\foo'.", + "Module name 'c:\\foo', matched pattern 'c:\\*'.", + "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 'c:\\foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module 'c:\\bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'c:\\bar'.", + "'paths' option is specified, looking for a pattern to match module name 'c:\\bar'.", + "Module name 'c:\\bar', matched pattern 'c:\\*'.", + "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 'c:/bar', target file type 'TypeScript'.", + "Directory 'c:/' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'c:\\bar'.", + "'paths' option is specified, looking for a pattern to match module name 'c:\\bar'.", + "Module name 'c:\\bar', matched pattern 'c:\\*'.", + "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 'c:\\bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module '//server/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '//server/foo'.", + "'paths' option is specified, looking for a pattern to match module name '//server/foo'.", + "Module name '//server/foo', matched pattern '//server/*'.", + "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 '//server/foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module '//server/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '//server/bar'.", + "'paths' option is specified, looking for a pattern to match module name '//server/bar'.", + "Module name '//server/bar', matched pattern '//server/*'.", + "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 '//server/bar', target file type 'TypeScript'.", + "Directory '//server/' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '//server/bar'.", + "'paths' option is specified, looking for a pattern to match module name '//server/bar'.", + "Module name '//server/bar', matched pattern '//server/*'.", + "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 '//server/bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module '\\\\server\\foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '\\\\server\\foo'.", + "'paths' option is specified, looking for a pattern to match module name '\\\\server\\foo'.", + "Module name '\\\\server\\foo', matched pattern '\\\\server\\*'.", + "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 '\\\\server\\foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module '\\\\server\\bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '\\\\server\\bar'.", + "'paths' option is specified, looking for a pattern to match module name '\\\\server\\bar'.", + "Module name '\\\\server\\bar', matched pattern '\\\\server\\*'.", + "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 '//server/bar', target file type 'TypeScript'.", + "Directory '//server/' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '\\\\server\\bar'.", + "'paths' option is specified, looking for a pattern to match module name '\\\\server\\bar'.", + "Module name '\\\\server\\bar', matched pattern '\\\\server\\*'.", + "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 '\\\\server\\bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module 'file:///foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file:///foo'.", + "'paths' option is specified, looking for a pattern to match module name 'file:///foo'.", + "Module name 'file:///foo', matched pattern 'file:///*'.", + "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 'file:///foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module 'file:///bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file:///bar'.", + "'paths' option is specified, looking for a pattern to match module name 'file:///bar'.", + "Module name 'file:///bar', matched pattern 'file:///*'.", + "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 'file:///bar' from 'node_modules' folder, target file type 'TypeScript'.", + "Directory '/root/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file:///bar'.", + "'paths' option is specified, looking for a pattern to match module name 'file:///bar'.", + "Module name 'file:///bar', matched pattern 'file:///*'.", + "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 'file:///bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module 'file://c:/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file://c:/foo'.", + "'paths' option is specified, looking for a pattern to match module name 'file://c:/foo'.", + "Module name 'file://c:/foo', matched pattern 'file://c:/*'.", + "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 'file://c:/foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module 'file://c:/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file://c:/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'file://c:/bar'.", + "Module name 'file://c:/bar', matched pattern 'file://c:/*'.", + "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 'file://c:/bar' from 'node_modules' folder, target file type 'TypeScript'.", + "Directory '/root/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file://c:/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'file://c:/bar'.", + "Module name 'file://c:/bar', matched pattern 'file://c:/*'.", + "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 'file://c:/bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module 'file://server/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file://server/foo'.", + "'paths' option is specified, looking for a pattern to match module name 'file://server/foo'.", + "Module name 'file://server/foo', matched pattern 'file://server/*'.", + "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 'file://server/foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module 'file://server/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file://server/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'file://server/bar'.", + "Module name 'file://server/bar', matched pattern 'file://server/*'.", + "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 'file://server/bar' from 'node_modules' folder, target file type 'TypeScript'.", + "Directory '/root/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'file://server/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'file://server/bar'.", + "Module name 'file://server/bar', matched pattern 'file://server/*'.", + "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 'file://server/bar' was successfully resolved to '/root/src/bar.js'. ========", + "======== Resolving module 'http://server/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'http://server/foo'.", + "'paths' option is specified, looking for a pattern to match module name 'http://server/foo'.", + "Module name 'http://server/foo', matched pattern 'http://server/*'.", + "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 'http://server/foo' was successfully resolved to '/root/src/foo.ts'. ========", + "======== Resolving module 'http://server/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'http://server/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'http://server/bar'.", + "Module name 'http://server/bar', matched pattern 'http://server/*'.", + "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 'http://server/bar' from 'node_modules' folder, target file type 'TypeScript'.", + "Directory '/root/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name 'http://server/bar'.", + "'paths' option is specified, looking for a pattern to match module name 'http://server/bar'.", + "Module name 'http://server/bar', matched pattern 'http://server/*'.", + "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 'http://server/bar' was successfully resolved to '/root/src/bar.js'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types new file mode 100644 index 0000000000..17c00ec2cc --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types @@ -0,0 +1,81 @@ +=== /root/a.ts === +import { foo as foo1 } from "/foo"; +>foo : () => void +>foo1 : () => void + +import { bar as bar1 } from "/bar"; +>bar : () => void +>bar1 : () => void + +import { foo as foo2 } from "c:/foo"; +>foo : () => void +>foo2 : () => void + +import { bar as bar2 } from "c:/bar"; +>bar : () => void +>bar2 : () => void + +import { foo as foo3 } from "c:\\foo"; +>foo : () => void +>foo3 : () => void + +import { bar as bar3 } from "c:\\bar"; +>bar : () => void +>bar3 : () => void + +import { foo as foo4 } from "//server/foo"; +>foo : () => void +>foo4 : () => void + +import { bar as bar4 } from "//server/bar"; +>bar : () => void +>bar4 : () => void + +import { foo as foo5 } from "\\\\server\\foo"; +>foo : () => void +>foo5 : () => void + +import { bar as bar5 } from "\\\\server\\bar"; +>bar : () => void +>bar5 : () => void + +import { foo as foo6 } from "file:///foo"; +>foo : () => void +>foo6 : () => void + +import { bar as bar6 } from "file:///bar"; +>bar : () => void +>bar6 : () => void + +import { foo as foo7 } from "file://c:/foo"; +>foo : () => void +>foo7 : () => void + +import { bar as bar7 } from "file://c:/bar"; +>bar : () => void +>bar7 : () => void + +import { foo as foo8 } from "file://server/foo"; +>foo : () => void +>foo8 : () => void + +import { bar as bar8 } from "file://server/bar"; +>bar : () => void +>bar8 : () => void + +import { foo as foo9 } from "http://server/foo"; +>foo : () => void +>foo9 : () => void + +import { bar as bar9 } from "http://server/bar"; +>bar : () => void +>bar9 : () => void + +=== /root/src/foo.ts === +export function foo() {} +>foo : () => void + +=== /root/src/bar.js === +export function bar() {} +>bar : () => void + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js new file mode 100644 index 0000000000..59b7c08567 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts] //// + +//// [foo.ts] +export function foo() {} + +//// [bar.js] +export function bar() {} + +//// [a.ts] +import { foo } from "/import/foo"; +import { bar } from "/client/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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols new file mode 100644 index 0000000000..a088f80ad3 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols @@ -0,0 +1,15 @@ +=== /root/src/a.ts === +import { foo } from "/import/foo"; +>foo : Symbol(foo, Decl(a.ts, 0, 8)) + +import { bar } from "/client/bar"; +>bar : Symbol(bar, Decl(a.ts, 1, 8)) + +=== /root/import/foo.ts === +export function foo() {} +>foo : Symbol(foo, Decl(foo.ts, 0, 0)) + +=== /root/client/bar.js === +export function bar() {} +>bar : Symbol(bar, Decl(bar.js, 0, 0)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json new file mode 100644 index 0000000000..9ee9c816b6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json @@ -0,0 +1,31 @@ +[ + "======== Resolving module '/import/foo' from '/root/src/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/import/foo'.", + "'paths' option is specified, looking for a pattern to match module name '/import/foo'.", + "Module name '/import/foo', matched pattern '/import/*'.", + "Trying substitution './import/*', candidate module location: './import/foo'.", + "Loading module as file / folder, candidate module location '/root/import/foo', target file type 'TypeScript'.", + "File '/root/import/foo.ts' exist - use it as a name resolution result.", + "======== Module name '/import/foo' was successfully resolved to '/root/import/foo.ts'. ========", + "======== Resolving module '/client/bar' from '/root/src/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/client/bar'.", + "'paths' option is specified, looking for a pattern to match module name '/client/bar'.", + "Module name '/client/bar', matched pattern '/client/*'.", + "Trying substitution './client/*', candidate module location: './client/bar'.", + "Loading module as file / folder, candidate module location '/root/client/bar', target file type 'TypeScript'.", + "File '/root/client/bar.ts' does not exist.", + "File '/root/client/bar.tsx' does not exist.", + "File '/root/client/bar.d.ts' does not exist.", + "Directory '/root/client/bar' does not exist, skipping all lookups in it.", + "Loading module as file / folder, candidate module location '/client/bar', target file type 'TypeScript'.", + "Directory '/client' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/client/bar'.", + "'paths' option is specified, looking for a pattern to match module name '/client/bar'.", + "Module name '/client/bar', matched pattern '/client/*'.", + "Trying substitution './client/*', candidate module location: './client/bar'.", + "Loading module as file / folder, candidate module location '/root/client/bar', target file type 'JavaScript'.", + "File '/root/client/bar.js' exist - use it as a name resolution result.", + "======== Module name '/client/bar' was successfully resolved to '/root/client/bar.js'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types new file mode 100644 index 0000000000..556f6fbb1c --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types @@ -0,0 +1,15 @@ +=== /root/src/a.ts === +import { foo } from "/import/foo"; +>foo : () => void + +import { bar } from "/client/bar"; +>bar : () => void + +=== /root/import/foo.ts === +export function foo() {} +>foo : () => void + +=== /root/client/bar.js === +export function bar() {} +>bar : () => void + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js new file mode 100644 index 0000000000..aa8645bc40 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols new file mode 100644 index 0000000000..e3abb84bf6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols @@ -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)) + +=== /foo.ts === +export function foo() {} +>foo : Symbol(foo, Decl(foo.ts, 0, 0)) + +=== /bar.js === +export function bar() {} +>bar : Symbol(bar, Decl(bar.js, 0, 0)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json new file mode 100644 index 0000000000..1b2d42bacd --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json @@ -0,0 +1,32 @@ +[ + "======== Resolving module '/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/foo'.", + "'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'.", + "Loading module as file / folder, candidate module location '/foo', target file type 'TypeScript'.", + "File '/foo.ts' exist - use it as a name resolution result.", + "======== Module name '/foo' was successfully resolved to '/foo.ts'. ========", + "======== Resolving module '/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'.", + "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.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'.", + "Loading module as file / folder, candidate module location '/bar', target file type 'JavaScript'.", + "File '/bar.js' exist - use it as a name resolution result.", + "======== Module name '/bar' was successfully resolved to '/bar.js'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types new file mode 100644 index 0000000000..538b612723 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types @@ -0,0 +1,15 @@ +=== /root/a.ts === +import { foo } from "/foo"; +>foo : () => void + +import { bar } from "/bar"; +>bar : () => void + +=== /foo.ts === +export function foo() {} +>foo : () => void + +=== /bar.js === +export function bar() {} +>bar : () => void + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js new file mode 100644 index 0000000000..bce7220d62 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols new file mode 100644 index 0000000000..3509e873a6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols @@ -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)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json new file mode 100644 index 0000000000..7eaac73acb --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json @@ -0,0 +1,34 @@ +[ + "======== Resolving module '/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/foo'.", + "'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'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types new file mode 100644 index 0000000000..67c03269af --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types @@ -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 + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.js new file mode 100644 index 0000000000..87217a9c32 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.symbols new file mode 100644 index 0000000000..3509e873a6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.symbols @@ -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)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.trace.json new file mode 100644 index 0000000000..7eaac73acb --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.trace.json @@ -0,0 +1,34 @@ +[ + "======== Resolving module '/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/foo'.", + "'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'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.types new file mode 100644 index 0000000000..67c03269af --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_failedLookup.types @@ -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 + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js new file mode 100644 index 0000000000..23dd9fb91e --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.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; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols new file mode 100644 index 0000000000..e3abb84bf6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols @@ -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)) + +=== /foo.ts === +export function foo() {} +>foo : Symbol(foo, Decl(foo.ts, 0, 0)) + +=== /bar.js === +export function bar() {} +>bar : Symbol(bar, Decl(bar.js, 0, 0)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json new file mode 100644 index 0000000000..505871d8f3 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json @@ -0,0 +1,32 @@ +[ + "======== Resolving module '/foo' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/foo'.", + "'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'.", + "Loading module as file / folder, candidate module location '/foo', target file type 'TypeScript'.", + "File '/foo.ts' exist - use it as a name resolution result.", + "======== Module name '/foo' was successfully resolved to '/foo.ts'. ========", + "======== Resolving module '/bar' from '/root/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'.", + "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.", + "'baseUrl' option is set to '/root', using this value to resolve non-relative module name '/bar'.", + "'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'.", + "Loading module as file / folder, candidate module location '/bar', target file type 'JavaScript'.", + "File '/bar.js' exist - use it as a name resolution result.", + "======== Module name '/bar' was successfully resolved to '/bar.js'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types new file mode 100644 index 0000000000..538b612723 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types @@ -0,0 +1,15 @@ +=== /root/a.ts === +import { foo } from "/foo"; +>foo : () => void + +import { bar } from "/bar"; +>bar : () => void + +=== /foo.ts === +export function foo() {} +>foo : () => void + +=== /bar.js === +export function bar() {} +>bar : () => void + diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts new file mode 100644 index 0000000000..9af12c71a9 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts @@ -0,0 +1,25 @@ +// @noImplicitReferences: true +// @traceResolution: true +// @allowJs: true + +// @filename: /root/src/foo.ts +export function foo() {} + +// @filename: /root/src/bar.js +export function bar() {} + +// @filename: /root/a.ts +import { foo } from "/foo"; +import { bar } from "/bar"; + +// @filename: /root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "/*": ["./src/*"] + }, + "allowJs": true, + "outDir": "bin" + } +} diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts new file mode 100644 index 0000000000..a9fd2cde5b --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts @@ -0,0 +1,49 @@ +// @noImplicitReferences: true +// @traceResolution: true +// @allowJs: true + +// @filename: /root/src/foo.ts +export function foo() {} + +// @filename: /root/src/bar.js +export function bar() {} + +// @filename: /root/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"; + +// @filename: /root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "/*": ["./src/*"], + "c:/*": ["./src/*"], + "c:\\*": ["./src/*"], + "//server/*": ["./src/*"], + "\\\\server\\*": ["./src/*"], + "file:///*": ["./src/*"], + "file://c:/*": ["./src/*"], + "file://server/*": ["./src/*"], + "http://server/*": ["./src/*"] + }, + "allowJs": true, + "outDir": "bin" + } +} diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts new file mode 100644 index 0000000000..5225f1dbd0 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts @@ -0,0 +1,26 @@ +// @noImplicitReferences: true +// @traceResolution: true +// @allowJs: true + +// @filename: /root/import/foo.ts +export function foo() {} + +// @filename: /root/client/bar.js +export function bar() {} + +// @filename: /root/src/a.ts +import { foo } from "/import/foo"; +import { bar } from "/client/bar"; + +// @filename: /root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "/client/*": ["./client/*"], + "/import/*": ["./import/*"] + }, + "allowJs": true, + "outDir": "bin" + } +} diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts new file mode 100644 index 0000000000..e45a25b1e1 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts @@ -0,0 +1,25 @@ +// @noImplicitReferences: true +// @traceResolution: true +// @allowJs: true + +// @filename: /foo.ts +export function foo() {} + +// @filename: /bar.js +export function bar() {} + +// @filename: /root/a.ts +import { foo } from "/foo"; +import { bar } from "/bar"; + +// @filename: /root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "/*": ["./src/*"] + }, + "allowJs": true, + "outDir": "bin" + } +} diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts new file mode 100644 index 0000000000..d05ea12b25 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts @@ -0,0 +1,25 @@ +// @noImplicitReferences: true +// @traceResolution: true +// @allowJs: true + +// @filename: /root/src/foo.ts +export function foo() {} + +// @filename: /root/src/bar.js +export function bar() {} + +// @filename: /root/a.ts +import { foo } from "/foo"; +import { bar } from "/bar"; + +// @filename: /root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "*": ["./src/*"] + }, + "allowJs": true, + "outDir": "bin" + } +} diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts new file mode 100644 index 0000000000..eb552c73c8 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts @@ -0,0 +1,25 @@ +// @noImplicitReferences: true +// @traceResolution: true +// @allowJs: true + +// @filename: /foo.ts +export function foo() {} + +// @filename: /bar.js +export function bar() {} + +// @filename: /root/a.ts +import { foo } from "/foo"; +import { bar } from "/bar"; + +// @filename: /root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "*": ["./src/*"] + }, + "allowJs": true, + "outDir": "bin" + } +} diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts new file mode 100644 index 0000000000..dac27a6c30 --- /dev/null +++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport14.ts @@ -0,0 +1,28 @@ +/// + +// Should give completions for modules referenced via baseUrl and paths compiler options with explicit name mappings + +// @Filename: tsconfig.json +//// { +//// "compilerOptions": { +//// "baseUrl": "./modules", +//// "paths": { +//// "/module1": ["some/path/whatever.ts"], +//// "/module2": ["some/other/path.ts"] +//// } +//// } +//// } + + +// @Filename: tests/test0.ts +//// import * as foo1 from "//*import_as0*/ +//// import foo2 = require("//*import_equals0*/ +//// var foo3 = require("//*require0*/ + +// @Filename: some/path/whatever.ts +//// export var x = 9; + +// @Filename: some/other/path.ts +//// export var y = 10; + +verify.completions({ marker: test.markerNames(), exact: ["lib", "tests", "/module1", "/module2"], isNewIdentifierLocation: true }); diff --git a/tests/cases/fourslash/completionForStringLiteralNonrelativeImport15.ts b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport15.ts new file mode 100644 index 0000000000..170fdd01be --- /dev/null +++ b/tests/cases/fourslash/completionForStringLiteralNonrelativeImport15.ts @@ -0,0 +1,28 @@ +/// + +// Should give completions for modules referenced via baseUrl and paths compiler options with explicit name mappings + +// @Filename: tsconfig.json +//// { +//// "compilerOptions": { +//// "baseUrl": "./modules", +//// "paths": { +//// "/module1": ["some/path/whatever.ts"], +//// "/module2": ["some/other/path.ts"] +//// } +//// } +//// } + + +// @Filename: tests/test0.ts +//// import * as foo1 from "//m*import_as0*/ +//// import foo2 = require("//m*import_equals0*/ +//// var foo3 = require("//m*require0*/ + +// @Filename: some/path/whatever.ts +//// export var x = 9; + +// @Filename: some/other/path.ts +//// export var y = 10; + +verify.completions({ marker: test.markerNames(), exact: ["/module1", "/module2"], isNewIdentifierLocation: true }); diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter index 40bdb4eada..4779cb7e18 160000 --- a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter +++ b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter @@ -1 +1 @@ -Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6 +Subproject commit 4779cb7e182cf41d5c62289bb80d2850e0265b71