Make sure commandline options are absolute paths so they dont conflict with tsbuildinfo paths

Fixes #33667

Author: sheetalkamat

src/compiler/builder.ts

@@ -1118,7 +1118,7 @@ namespace ts {
 
         const state: ReusableBuilderProgramState = {
             fileInfos,
-            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            compilerOptions: convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath),
             referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
             exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => toPath(isString(value) ? value : value[0]), value => isString(value) ? emptyArray : value[1]),
@@ -1156,40 +1156,6 @@ namespace ts {
         }
     }
 
-    function convertFromReusableCompilerOptions(options: CompilerOptions, toAbsolutePath: (path: string) => string) {
-        const result: CompilerOptions = {};
-        const optionsNameMap = getOptionNameMap().optionNameMap;
-
-        for (const name in options) {
-            if (hasProperty(options, name)) {
-                result[name] = convertFromReusableCompilerOptionValue(
-                    optionsNameMap.get(name.toLowerCase()),
-                    options[name] as CompilerOptionsValue,
-                    toAbsolutePath
-                );
-            }
-        }
-        if (result.configFilePath) {
-            result.configFilePath = toAbsolutePath(result.configFilePath);
-        }
-        return result;
-    }
-
-    function convertFromReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, toAbsolutePath: (path: string) => string) {
-        if (option) {
-            if (option.type === "list") {
-                const values = value as readonly (string | number)[];
-                if (option.element.isFilePath && values.length) {
-                    return values.map(toAbsolutePath);
-                }
-            }
-            else if (option.isFilePath) {
-                return toAbsolutePath(value as string);
-            }
-        }
-        return value;
-    }
-
     export function createRedirectedBuilderProgram(state: { program: Program | undefined; compilerOptions: CompilerOptions; }, configFileParsingDiagnostics: readonly Diagnostic[]): BuilderProgram {
         return {
             getState: notImplemented,

src/compiler/commandLineParser.ts

@@ -2041,6 +2041,41 @@ namespace ts {
         }
     }
 
+    /* @internal */
+    export function convertToOptionsWithAbsolutePaths(options: CompilerOptions, toAbsolutePath: (path: string) => string) {
+        const result: CompilerOptions = {};
+        const optionsNameMap = getOptionNameMap().optionNameMap;
+
+        for (const name in options) {
+            if (hasProperty(options, name)) {
+                result[name] = convertToOptionValueWithAbsolutePaths(
+                    optionsNameMap.get(name.toLowerCase()),
+                    options[name] as CompilerOptionsValue,
+                    toAbsolutePath
+                );
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+
+    function convertToOptionValueWithAbsolutePaths(option: CommandLineOption | undefined, value: CompilerOptionsValue, toAbsolutePath: (path: string) => string) {
+        if (option) {
+            if (option.type === "list") {
+                const values = value as readonly (string | number)[];
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value as string);
+            }
+        }
+        return value;
+    }
+
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param json The contents of the config file to parse

src/testRunner/unittests/tsc/helpers.ts

@@ -50,8 +50,15 @@ namespace ts {
 
         Debug.assert(commandLine.fileNames.length !== 0 || !!configFileName);
 
+        const currentDirectory = sys.getCurrentDirectory();
+        const getCanonicalFileName = createGetCanonicalFileName(sys.useCaseSensitiveFileNames);
+        const commandLineOptions = convertToOptionsWithAbsolutePaths(
+            commandLine.options,
+            fileName => toPath(fileName, currentDirectory, getCanonicalFileName)
+        );
+
         if (configFileName) {
-            const configParseResult = Debug.assertDefined(parseConfigFileWithSystem(configFileName, commandLine.options, sys, reportDiagnostic));
+            const configParseResult = Debug.assertDefined(parseConfigFileWithSystem(configFileName, commandLineOptions, sys, reportDiagnostic));
             if (isIncrementalCompilation(configParseResult.options)) {
                 performIncrementalCompilation(sys, configParseResult);
             }
@@ -61,10 +68,16 @@ namespace ts {
         }
         else {
             if (isIncrementalCompilation(commandLine.options)) {
-                performIncrementalCompilation(sys, commandLine);
+                performIncrementalCompilation(sys, {
+                    ...commandLine,
+                    options: commandLineOptions
+                });
             }
             else {
-                performCompilation(sys, commandLine);
+                performCompilation(sys, {
+                    ...commandLine,
+                    options: commandLineOptions
+                });
             }
         }
     }

src/tsc/tsc.ts

@@ -120,7 +120,12 @@ namespace ts {
             return sys.exit(ExitStatus.Success);
         }
 
-        const commandLineOptions = commandLine.options;
+        const currentDirectory = sys.getCurrentDirectory();
+        const getCanonicalFileName = createGetCanonicalFileName(sys.useCaseSensitiveFileNames);
+        const commandLineOptions = convertToOptionsWithAbsolutePaths(
+            commandLine.options,
+            fileName => toPath(fileName, currentDirectory, getCanonicalFileName)
+        );
         if (configFileName) {
             const configParseResult = parseConfigFileWithSystem(configFileName, commandLineOptions, sys, reportDiagnostic)!; // TODO: GH#18217
             if (commandLineOptions.showConfig) {
@@ -148,7 +153,7 @@ namespace ts {
         else {
             if (commandLineOptions.showConfig) {
                 // eslint-disable-next-line no-null/no-null
-                sys.write(JSON.stringify(convertToTSConfig(commandLine, combinePaths(sys.getCurrentDirectory(), "tsconfig.json"), sys), null, 4) + sys.newLine);
+                sys.write(JSON.stringify(convertToTSConfig(commandLine, combinePaths(currentDirectory, "tsconfig.json"), sys), null, 4) + sys.newLine);
                 return sys.exit(ExitStatus.Success);
             }
             updateReportDiagnostic(commandLineOptions);
@@ -157,7 +162,10 @@ namespace ts {
                 createWatchOfFilesAndCompilerOptions(commandLine.fileNames, commandLineOptions);
             }
             else if (isIncrementalCompilation(commandLineOptions)) {
-                performIncrementalCompilation(commandLine);
+                performIncrementalCompilation({
+                    ...commandLine,
+                    options: commandLineOptions
+                });
             }
             else {
                 performCompilation(commandLine.fileNames, /*references*/ undefined, commandLineOptions);

tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-passing-filename-for-buildinfo-on-commandline.js

@@ -4,4 +4,3 @@ exitCode:: 0
 
 
 //// [/src/project/.tsbuildinfo] file written with same contents
-//// [/src/project/src/main.js] file written with same contents