Avoid allocation for normalized absolute paths.

src/compiler/builder.ts

@@ -62,6 +62,7 @@ import {
     isNumber,
     isString,
     map,
+    mapDefined,
     mapDefinedIterator,
     maybeBind,
     noop,
@@ -1236,7 +1237,7 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): BuildInfo {
     const currentDirectory = state.program.getCurrentDirectory();
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions)!, currentDirectory));
     // Convert the file name to Path here if we set the fileName instead to optimize multiple d.ts file emits and having to compute Canonical path
-    const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : undefined;
+    const latestChangedDtsFile = state.latestChangedDtsFile ? relativePathToBuildInfo(state.latestChangedDtsFile) : undefined;
     const fileNames: string[] = [];
     const fileNameToFileId = new Map<string, IncrementalBuildInfoFileId>();
     const rootFileNames = new Set(state.program.getRootFileNames().map(f => toPath(f, currentDirectory, state.program.getCanonicalFileName)));
@@ -1377,10 +1378,17 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): BuildInfo {
     };
     return buildInfo;
 
-    function relativeToBuildInfoEnsuringAbsolutePath(path: string) {
+    function relativePathToBuildInfo(path: string) {
         return relativeToBuildInfo(getNormalizedAbsolutePath(path, currentDirectory));
     }
 
+    function relativePathToBuildInfoOrOriginalValue(path: unknown): string | undefined {
+        if (typeof path === "string") {
+            return relativePathToBuildInfo(path);
+        }
+        return undefined;
+    }
+
     function relativeToBuildInfo(path: string) {
         return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, state.program.getCanonicalFileName));
     }
@@ -1457,13 +1465,13 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): BuildInfo {
         if (option) {
             Debug.assert(option.type !== "listOrElement");
             if (option.type === "list") {
-                const values = value as readonly string[];
+                const values = value as readonly unknown[];
                 if (option.element.isFilePath && values.length) {
-                    return values.map(relativeToBuildInfoEnsuringAbsolutePath);
+                    return mapDefined(values, relativePathToBuildInfoOrOriginalValue);
                 }
             }
             else if (option.isFilePath) {
-                return relativeToBuildInfoEnsuringAbsolutePath(value as string);
+                return relativePathToBuildInfoOrOriginalValue(value);
             }
         }
         return value;

src/compiler/moduleSpecifiers.ts

@@ -594,7 +594,9 @@ function getLocalModuleSpecifier(moduleFileName: string, info: Info, compilerOpt
         return pathsOnly ? undefined : relativePath;
     }
 
-    const baseDirectory = getNormalizedAbsolutePath(getPathsBasePath(compilerOptions, host) || baseUrl!, host.getCurrentDirectory());
+    const currentDirectory = host.getCurrentDirectory();
+    const basePath = getPathsBasePath(compilerOptions, host) ?? baseUrl ?? currentDirectory;
+    const baseDirectory = getNormalizedAbsolutePath(basePath, currentDirectory);
     const relativeToBaseUrl = getRelativePathIfInSameVolume(moduleFileName, baseDirectory, getCanonicalFileName);
     if (!relativeToBaseUrl) {
         return pathsOnly ? undefined : relativePath;

src/compiler/path.ts

@@ -625,7 +625,28 @@ export function getNormalizedPathComponents(path: string, currentDirectory: stri
 
 /** @internal */
 export function getNormalizedAbsolutePath(fileName: string, currentDirectory: string | undefined): string {
-    return getPathFromPathComponents(getNormalizedPathComponents(fileName, currentDirectory));
+    fileName = normalizeSlashes(fileName);
+
+    if (isNotNormalizedOrAbsolute(fileName)) {
+        return getPathFromPathComponents(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+
+    return fileName;
+}
+
+function isNotNormalizedOrAbsolute(s: string) {
+    if (getEncodedRootLength(s) === 0) {
+        // An absolute path must have a root component.
+        return true;
+    }
+
+    const lastChar = s.charCodeAt(s.length - 1);
+    if (lastChar === CharacterCodes.slash) {
+        // A normalized path cannot end in a trailing separator.
+        return true;
+    }
+
+    return relativePathSegmentRegExp.test(s);
 }
 
 /** @internal */

src/services/stringCompletions.ts

@@ -986,7 +986,7 @@ function getCompletionEntriesForNonRelativeModules(
     }
 
     if (paths) {
-        const absolute = getPathsBasePath(compilerOptions, host)!;
+        const absolute = getPathsBasePath(compilerOptions, host)!; // Always defined when 'paths' is defined
         addCompletionEntriesFromPaths(result, fragment, absolute, extensionOptions, program, host, moduleSpecifierResolutionHost, paths);
     }
 

src/testRunner/unittests/paths.ts

@@ -269,6 +269,110 @@ describe("unittests:: core paths", () => {
         assert.strictEqual(ts.resolvePath("a", "b", "/c"), "/c");
         assert.strictEqual(ts.resolvePath("a", "b", "../c"), "a/c");
     });
+    it("getNormalizedAbsolutePath", () => {
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/.", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/./", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/../", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a", ""), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/", ""), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/.", ""), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/foo.", ""), "/a/foo.");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/./", ""), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/./b", ""), "/a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/./b/", ""), "/a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/..", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/../", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/../", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/../b", ""), "/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/../b/", ""), "/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/..", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/..", "/"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/..", "b/"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/..", "/b"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/.", "b"), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/.", "."), "/a");
+
+        // Tests as above, but with backslashes.
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\.", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\.\\", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\..\\", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\.\\", ""), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\.\\b", ""), "/a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\.\\b\\", ""), "/a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..\\", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..\\", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..\\b", ""), "/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..\\b\\", ""), "/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..", ""), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..", "\\"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..", "b\\"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\..", "\\b"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\.", "b"), "/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\.", "."), "/a");
+
+        // Relative paths on an empty currentDirectory.
+        assert.strictEqual(ts.getNormalizedAbsolutePath("", ""), "");
+        assert.strictEqual(ts.getNormalizedAbsolutePath(".", ""), "");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("./", ""), "");
+        // Strangely, these do not normalize to the empty string.
+        assert.strictEqual(ts.getNormalizedAbsolutePath("..", ""), "..");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("../", ""), "..");
+
+        // Interaction between relative paths and currentDirectory.
+        assert.strictEqual(ts.getNormalizedAbsolutePath("", "/home"), "/home");
+        assert.strictEqual(ts.getNormalizedAbsolutePath(".", "/home"), "/home");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("./", "/home"), "/home");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("..", "/home"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("../", "/home"), "/");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a", "b"), "b/a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a", "b/c"), "b/c/a");
+
+        // Base names starting or ending with a dot do not affect normalization.
+        assert.strictEqual(ts.getNormalizedAbsolutePath(".a", ""), ".a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("..a", ""), "..a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a.", ""), "a.");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a..", ""), "a..");
+
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/./.a", ""), "/base/.a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/../.a", ""), "/.a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/./..a", ""), "/base/..a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/../..a", ""), "/..a");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/./..a/b", ""), "/base/..a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/../..a/b", ""), "/..a/b");
+
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/./a.", ""), "/base/a.");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/../a.", ""), "/a.");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/./a..", ""), "/base/a..");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/../a..", ""), "/a..");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/./a../b", ""), "/base/a../b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/base/../a../b", ""), "/a../b");
+
+        // Consecutive intermediate slashes are normalized to a single slash.
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a//b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a///b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a/b//c", ""), "a/b/c");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("/a/b//c", ""), "/a/b/c");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("//a/b//c", ""), "//a/b/c");
+
+        // Backslashes are converted to slashes,
+        // and then consecutive intermediate slashes are normalized to a single slash
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a\\\\b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a\\\\\\b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a\\b\\\\c", ""), "a/b/c");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\b\\\\c", ""), "/a/b/c");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\\\a\\b\\\\c", ""), "//a/b/c");
+
+        // The same occurs for mixed slashes.
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a/\\b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a\\/b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a\\/\\b", ""), "a/b");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("a\\b//c", ""), "a/b/c");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\a\\b\\\\c", ""), "/a/b/c");
+        assert.strictEqual(ts.getNormalizedAbsolutePath("\\\\a\\b\\\\c", ""), "//a/b/c");
+    });
     it("getPathRelativeTo", () => {
         assert.strictEqual(ts.getRelativePathFromDirectory("/", "/", /*ignoreCase*/ false), "");
         assert.strictEqual(ts.getRelativePathFromDirectory("/a", "/a", /*ignoreCase*/ false), "");

tests/baselines/reference/tsbuild/javascriptProjectEmit/loads-js-based-projects-with-non-moved-json-files-and-emits-them-correctly.js

@@ -144,7 +144,7 @@ export = x;
 
 
 //// [/home/src/workspaces/solution/common/tsconfig.tsbuildinfo]
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./obj.json","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-32082413277-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };\ninterface SymbolConstructor {\n    readonly species: symbol;\n    readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n    readonly [Symbol.toStringTag]: string;\n}\n","affectsGlobalScope":true},"2353615672-{\n  \"val\": 42\n}","-5032674136-import x = require(\"./obj.json\");\nexport = x;\n"],"root":[2,3],"options":{"allowJs":true,"checkJs":true,"composite":true,"declaration":true,"esModuleInterop":true,"outDir":"..","rootDir":"..","skipLibCheck":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./obj.json","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"-32082413277-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };\ninterface SymbolConstructor {\n    readonly species: symbol;\n    readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n    readonly [Symbol.toStringTag]: string;\n}\n","affectsGlobalScope":true},"2353615672-{\n  \"val\": 42\n}","-5032674136-import x = require(\"./obj.json\");\nexport = x;\n"],"root":[2,3],"options":{"allowJs":true,"checkJs":true,"composite":true,"declaration":true,"esModuleInterop":true,"rootDir":"..","skipLibCheck":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/common/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -193,7 +193,6 @@ export = x;
     "composite": true,
     "declaration": true,
     "esModuleInterop": true,
-    "outDir": "..",
     "rootDir": "..",
     "skipLibCheck": true
   },
@@ -204,7 +203,7 @@ export = x;
   },
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1148
+  "size": 1134
 }
 
 //// [/home/src/workspaces/out/sub-project/index.js]