Skip to content

Commit 7f022c5

Browse files
andrewbranchandrewbranch
authored
Correctly resolve imports ending with "." and ".." (microsoft#47850)
1 parent 73506f3 commit 7f022c5

File tree

22 files changed

+136
-55
lines changed

22 files changed

+136
-55
lines changed

‎src/compiler/moduleNameResolver.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ namespace ts {
417417
result = searchResult && searchResult.value;
418418
}
419419
else {
420-
const { path: candidate } = normalizePathAndParts(combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName));
420+
const { path: candidate } = normalizePathForCJSResolution(initialLocationForSecondaryLookup, typeReferenceDirectiveName);
421421
result = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
422422
}
423423
return resolvedTypeScriptOnly(result);
@@ -1329,12 +1329,26 @@ namespace ts {
13291329
return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
13301330
}
13311331
else {
1332-
const { path: candidate, parts } = normalizePathAndParts(combinePaths(containingDirectory, moduleName));
1332+
const { path: candidate, parts } = normalizePathForCJSResolution(containingDirectory, moduleName);
13331333
const resolved = nodeLoadModuleByRelativeName(extensions, candidate, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/ true);
13341334
// Treat explicit "node_modules" import as an external library import.
13351335
return resolved && toSearchResult({ resolved, isExternalLibraryImport: contains(parts, "node_modules") });
13361336
}
13371337
}
1338+
1339+
}
1340+
1341+
// If you import from "." inside a containing directory "/foo", the result of `normalizePath`
1342+
// would be "/foo", but this loses the information that `foo` is a directory and we intended
1343+
// to look inside of it. The Node CommonJS resolution algorithm doesn't call this out
1344+
// (https://nodejs.org/api/modules.html#all-together), but it seems that module paths ending
1345+
// in `.` are actually normalized to `./` before proceeding with the resolution algorithm.
1346+
function normalizePathForCJSResolution(containingDirectory: string, moduleName: string) {
1347+
const combined = combinePaths(containingDirectory, moduleName);
1348+
const parts = getPathComponents(combined);
1349+
const lastPart = lastOrUndefined(parts);
1350+
const path = lastPart === "." || lastPart === ".." ? ensureTrailingDirectorySeparator(normalizePath(combined)) : normalizePath(combined);
1351+
return { path, parts };
13381352
}
13391353

13401354
function realPath(path: string, host: ModuleResolutionHost, traceEnabled: boolean): string {

‎src/compiler/path.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -585,18 +585,6 @@ namespace ts {
585585
return getCanonicalFileName(nonCanonicalizedPath) as Path;
586586
}
587587

588-
export function normalizePathAndParts(path: string): { path: string, parts: string[] } {
589-
path = normalizeSlashes(path);
590-
const [root, ...parts] = reducePathComponents(getPathComponents(path));
591-
if (parts.length) {
592-
const joinedParts = root + parts.join(directorySeparator);
593-
return { path: hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts };
594-
}
595-
else {
596-
return { path: root, parts };
597-
}
598-
}
599-
600588
//// Path Mutation
601589

602590
/**

‎tests/baselines/reference/importFromDot.errors.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
tests/cases/conformance/moduleResolution/a/b.ts(1,20): error TS2305: Module '"."' has no exported member 'rootA'.
2+
3+
4+
==== tests/cases/conformance/moduleResolution/a.ts (0 errors) ====
5+
export const rootA = 0;
6+
7+
==== tests/cases/conformance/moduleResolution/a/index.ts (0 errors) ====
8+
export const indexInA = 0;
9+
10+
==== tests/cases/conformance/moduleResolution/a/b.ts (1 errors) ====
11+
import { indexInA, rootA } from ".";
12+
~~~~~
13+
!!! error TS2305: Module '"."' has no exported member 'rootA'.
14+

‎tests/baselines/reference/importFromDot.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//// [tests/cases/conformance/moduleResolution/importFromDot.ts] ////
2+
3+
//// [a.ts]
4+
export const rootA = 0;
5+
6+
//// [index.ts]
7+
export const indexInA = 0;
8+
9+
//// [b.ts]
10+
import { indexInA, rootA } from ".";
11+
12+
13+
//// [a.js]
14+
"use strict";
15+
exports.__esModule = true;
16+
exports.rootA = void 0;
17+
exports.rootA = 0;
18+
//// [index.js]
19+
"use strict";
20+
exports.__esModule = true;
21+
exports.indexInA = void 0;
22+
exports.indexInA = 0;
23+
//// [b.js]
24+
"use strict";
25+
exports.__esModule = true;

‎tests/baselines/reference/importFromDot.symbols‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
=== tests/cases/conformance/moduleResolution/a.ts ===
2+
export const rootA = 0;
3+
>rootA : Symbol(rootA, Decl(a.ts, 0, 12))
4+
5+
=== tests/cases/conformance/moduleResolution/a/index.ts ===
6+
export const indexInA = 0;
7+
>indexInA : Symbol(indexInA, Decl(index.ts, 0, 12))
8+
9+
=== tests/cases/conformance/moduleResolution/a/b.ts ===
10+
import { indexInA, rootA } from ".";
11+
>indexInA : Symbol(indexInA, Decl(b.ts, 0, 8))
12+
>rootA : Symbol(rootA, Decl(b.ts, 0, 18))
13+

‎tests/baselines/reference/importFromDot.types‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
=== tests/cases/conformance/moduleResolution/a.ts ===
2+
export const rootA = 0;
3+
>rootA : 0
4+
>0 : 0
5+
6+
=== tests/cases/conformance/moduleResolution/a/index.ts ===
7+
export const indexInA = 0;
8+
>indexInA : 0
9+
>0 : 0
10+
11+
=== tests/cases/conformance/moduleResolution/a/b.ts ===
12+
import { indexInA, rootA } from ".";
13+
>indexInA : 0
14+
>rootA : any
15+

‎tests/baselines/reference/importWithTrailingSlash.errors.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/a/b/test.ts(3,3): error TS2339: Property 'a' does not exist on type '{ aIndex: number; }'.
2+
/a/test.ts(3,3): error TS2339: Property 'a' does not exist on type '{ aIndex: number; }'.
3+
4+
5+
==== /a.ts (0 errors) ====
6+
export default { a: 0 };
7+
8+
==== /a/index.ts (0 errors) ====
9+
export default { aIndex: 0 };
10+
11+
==== /a/test.ts (1 errors) ====
12+
import a from ".";
13+
import aIndex from "./";
14+
a.a;
15+
~
16+
!!! error TS2339: Property 'a' does not exist on type '{ aIndex: number; }'.
17+
aIndex.aIndex;
18+
19+
==== /a/b/test.ts (1 errors) ====
20+
import a from "..";
21+
import aIndex from "../";
22+
a.a;
23+
~
24+
!!! error TS2339: Property 'a' does not exist on type '{ aIndex: number; }'.
25+
aIndex.aIndex;
26+

‎tests/baselines/reference/importWithTrailingSlash.symbols‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import aIndex from "./";
1414
>aIndex : Symbol(aIndex, Decl(test.ts, 1, 6))
1515

1616
a.a;
17-
>a.a : Symbol(a, Decl(a.ts, 0, 16))
1817
>a : Symbol(a, Decl(test.ts, 0, 6))
19-
>a : Symbol(a, Decl(a.ts, 0, 16))
2018

2119
aIndex.aIndex;
2220
>aIndex.aIndex : Symbol(aIndex, Decl(index.ts, 0, 16))
@@ -31,9 +29,7 @@ import aIndex from "../";
3129
>aIndex : Symbol(aIndex, Decl(test.ts, 1, 6))
3230

3331
a.a;
34-
>a.a : Symbol(a, Decl(a.ts, 0, 16))
3532
>a : Symbol(a, Decl(test.ts, 0, 6))
36-
>a : Symbol(a, Decl(a.ts, 0, 16))
3733

3834
aIndex.aIndex;
3935
>aIndex.aIndex : Symbol(aIndex, Decl(index.ts, 0, 16))

‎tests/baselines/reference/importWithTrailingSlash.trace.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
[
22
"======== Resolving module '.' from '/a/test.ts'. ========",
33
"Explicitly specified module resolution kind: 'NodeJs'.",
4-
"Loading module as file / folder, candidate module location '/a', target file type 'TypeScript'.",
5-
"File '/a.ts' exist - use it as a name resolution result.",
6-
"======== Module name '.' was successfully resolved to '/a.ts'. ========",
4+
"Loading module as file / folder, candidate module location '/a/', target file type 'TypeScript'.",
5+
"File '/a/package.json' does not exist.",
6+
"File '/a/index.ts' exist - use it as a name resolution result.",
7+
"======== Module name '.' was successfully resolved to '/a/index.ts'. ========",
78
"======== Resolving module './' from '/a/test.ts'. ========",
89
"Explicitly specified module resolution kind: 'NodeJs'.",
910
"Loading module as file / folder, candidate module location '/a/', target file type 'TypeScript'.",
10-
"File '/a/package.json' does not exist.",
11+
"File '/a/package.json' does not exist according to earlier cached lookups.",
1112
"File '/a/index.ts' exist - use it as a name resolution result.",
1213
"======== Module name './' was successfully resolved to '/a/index.ts'. ========",
1314
"======== Resolving module '..' from '/a/b/test.ts'. ========",
1415
"Explicitly specified module resolution kind: 'NodeJs'.",
15-
"Loading module as file / folder, candidate module location '/a', target file type 'TypeScript'.",
16-
"File '/a.ts' exist - use it as a name resolution result.",
17-
"======== Module name '..' was successfully resolved to '/a.ts'. ========",
16+
"Loading module as file / folder, candidate module location '/a/', target file type 'TypeScript'.",
17+
"File '/a/package.json' does not exist according to earlier cached lookups.",
18+
"File '/a/index.ts' exist - use it as a name resolution result.",
19+
"======== Module name '..' was successfully resolved to '/a/index.ts'. ========",
1820
"======== Resolving module '../' from '/a/b/test.ts'. ========",
1921
"Explicitly specified module resolution kind: 'NodeJs'.",
2022
"Loading module as file / folder, candidate module location '/a/', target file type 'TypeScript'.",

‎tests/baselines/reference/importWithTrailingSlash.types‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ export default { aIndex: 0 };
1212

1313
=== /a/test.ts ===
1414
import a from ".";
15-
>a : { a: number; }
15+
>a : { aIndex: number; }
1616

1717
import aIndex from "./";
1818
>aIndex : { aIndex: number; }
1919

2020
a.a;
21-
>a.a : number
22-
>a : { a: number; }
23-
>a : number
21+
>a.a : any
22+
>a : { aIndex: number; }
23+
>a : any
2424

2525
aIndex.aIndex;
2626
>aIndex.aIndex : number
@@ -29,15 +29,15 @@ aIndex.aIndex;
2929

3030
=== /a/b/test.ts ===
3131
import a from "..";
32-
>a : { a: number; }
32+
>a : { aIndex: number; }
3333

3434
import aIndex from "../";
3535
>aIndex : { aIndex: number; }
3636

3737
a.a;
38-
>a.a : number
39-
>a : { a: number; }
40-
>a : number
38+
>a.a : any
39+
>a : { aIndex: number; }
40+
>a : any
4141

4242
aIndex.aIndex;
4343
>aIndex.aIndex : number

0 commit comments

Comments
 (0)