Fix some of the baseline to use correct API

Author: sheetalkamat

src/testRunner/unittests/config/configurationExtension.ts

@@ -317,7 +317,7 @@ describe("unittests:: config:: configurationExtension", () => {
                         baseline.push("CompilerOptions::");
                         baseline.push(jsonToReadableText(parsed.options));
                         baseline.push("FileNames::");
-                        baseline.push(parsed.fileNames.join());
+                        baseline.push(...parsed.fileNames);
                     },
                 })),
             skipFs: true,

src/testRunner/unittests/config/helpers.ts

@@ -15,9 +15,9 @@ function getParsedCommandJson(
     return ts.parseJsonConfigFileContent(
         parsed.config,
         host,
-        basePath ?? host.sys.getCurrentDirectory(),
+        basePath ?? ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), host.sys.getCurrentDirectory()),
         existingOptions,
-        configFileName,
+        ts.getNormalizedAbsolutePath(configFileName, host.sys.getCurrentDirectory()),
         /*resolutionStack*/ undefined,
         /*extraFileExtensions*/ undefined,
         /*extendedConfigCache*/ undefined,
@@ -37,9 +37,9 @@ function getParsedCommandJsonSourceFile(
     return ts.parseJsonSourceFileConfigFileContent(
         parsed,
         host,
-        basePath ?? host.sys.getCurrentDirectory(),
+        basePath ?? ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), host.sys.getCurrentDirectory()),
         existingOptions,
-        configFileName,
+        ts.getNormalizedAbsolutePath(configFileName, host.sys.getCurrentDirectory()),
         /*resolutionStack*/ undefined,
         /*extraFileExtensions*/ undefined,
         /*extendedConfigCache*/ undefined,

src/testRunner/unittests/tscWatch/watchApi.ts

@@ -46,7 +46,7 @@ describe("unittests:: tsc-watch:: watchAPI:: tsc-watch with custom module resolu
             system: sys,
             cb,
         });
-        const parsedCommandResult = ts.parseJsonConfigFileContent(configFileJson, sys, config.path);
+        const parsedCommandResult = ts.parseJsonConfigFileContent(configFileJson, sys, ts.getDirectoryPath(config.path));
         host.resolveModuleNames = (moduleNames, containingFile) =>
             moduleNames.map(m => {
                 const result = ts.resolveModuleName(m, containingFile, parsedCommandResult.options, host);

tests/baselines/reference/config/configurationExtension/under a case insensitive host with json api.js

@@ -382,10 +382,11 @@ CompilerOptions::
   "allowJs": true,
   "noImplicitAny": true,
   "strictNullChecks": true,
-  "configFilePath": "tsconfig.json"
+  "configFilePath": "c:/dev/tsconfig.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
 Errors::
 
 
@@ -396,10 +397,11 @@ CompilerOptions::
   "allowJs": true,
   "noImplicitAny": true,
   "strictNullChecks": false,
-  "configFilePath": "tsconfig.nostrictnull.json"
+  "configFilePath": "c:/dev/tsconfig.nostrictnull.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
 Errors::
 
 
@@ -408,10 +410,14 @@ configFileName:: circular.json
 CompilerOptions::
 {
   "module": 2,
-  "configFilePath": "circular.json"
+  "configFilePath": "c:/dev/circular.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS18000: Circularity detected while resolving configuration: c:/dev/circular.json -> c:/dev/circular2.json -> c:/dev/circular.json
 
@@ -421,10 +427,14 @@ configFileName:: missing.json
 CompilerOptions::
 {
   "types": [],
-  "configFilePath": "missing.json"
+  "configFilePath": "c:/dev/missing.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS6053: File './missing2' not found.
 
@@ -434,10 +444,14 @@ configFileName:: failure.json
 CompilerOptions::
 {
   "typeRoots": [],
-  "configFilePath": "failure.json"
+  "configFilePath": "c:/dev/failure.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 failure2.json:2:3 - error TS6114: Unknown option 'excludes'. Did you mean 'exclude'?
 
@@ -449,10 +463,14 @@ can error when 'extends' is not a string or Array
 configFileName:: extends.json
 CompilerOptions::
 {
-  "configFilePath": "extends.json"
+  "configFilePath": "c:/dev/extends.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS5024: Compiler option 'extends' requires a value of type string or Array.
 
@@ -461,10 +479,14 @@ can error when 'extends' is given an empty string
 configFileName:: extends3.json
 CompilerOptions::
 {
-  "configFilePath": "extends3.json"
+  "configFilePath": "c:/dev/extends3.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS18051: Compiler option 'extends' cannot be given an empty string.
 
@@ -473,10 +495,14 @@ can error when 'extends' is given an empty string in an array
 configFileName:: extends4.json
 CompilerOptions::
 {
-  "configFilePath": "extends4.json"
+  "configFilePath": "c:/dev/extends4.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS18051: Compiler option 'extends' cannot be given an empty string.
 
@@ -488,7 +514,7 @@ CompilerOptions::
   "allowJs": true,
   "noImplicitAny": true,
   "strictNullChecks": true,
-  "configFilePath": "configs/third.json"
+  "configFilePath": "c:/dev/configs/third.json"
 }
 FileNames::
 c:/dev/supplemental.ts
@@ -503,10 +529,11 @@ CompilerOptions::
   "noImplicitAny": true,
   "strictNullChecks": true,
   "module": 4,
-  "configFilePath": "configs/fourth.json"
+  "configFilePath": "c:/dev/configs/fourth.json"
 }
 FileNames::
 c:/dev/main.ts
+c:/dev/supplemental.ts
 Errors::
 
 
@@ -518,7 +545,7 @@ CompilerOptions::
   "noImplicitAny": true,
   "strictNullChecks": true,
   "module": 4,
-  "configFilePath": "configs/fifth.json"
+  "configFilePath": "c:/dev/configs/fifth.json"
 }
 FileNames::
 c:/dev/tests/utils.ts
@@ -530,7 +557,7 @@ configFileName:: tsconfig.extendsBox.json
 CompilerOptions::
 {
   "strict": true,
-  "configFilePath": "tsconfig.extendsBox.json"
+  "configFilePath": "c:/dev/tsconfig.extendsBox.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -542,7 +569,7 @@ configFileName:: tsconfig.extendsStrict.json
 CompilerOptions::
 {
   "strict": true,
-  "configFilePath": "tsconfig.extendsStrict.json"
+  "configFilePath": "c:/dev/tsconfig.extendsStrict.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -554,7 +581,7 @@ configFileName:: tsconfig.extendsUnStrict.json
 CompilerOptions::
 {
   "strict": false,
-  "configFilePath": "tsconfig.extendsUnStrict.json"
+  "configFilePath": "c:/dev/tsconfig.extendsUnStrict.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -566,7 +593,7 @@ configFileName:: tsconfig.extendsStrictExtension.json
 CompilerOptions::
 {
   "strict": true,
-  "configFilePath": "tsconfig.extendsStrictExtension.json"
+  "configFilePath": "c:/dev/tsconfig.extendsStrictExtension.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -578,7 +605,7 @@ configFileName:: tsconfig.extendsBoxImplied.json
 CompilerOptions::
 {
   "strict": true,
-  "configFilePath": "tsconfig.extendsBoxImplied.json"
+  "configFilePath": "c:/dev/tsconfig.extendsBoxImplied.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -590,7 +617,7 @@ configFileName:: tsconfig.extendsBoxImpliedUnstrict.json
 CompilerOptions::
 {
   "strict": false,
-  "configFilePath": "tsconfig.extendsBoxImpliedUnstrict.json"
+  "configFilePath": "c:/dev/tsconfig.extendsBoxImpliedUnstrict.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -602,7 +629,7 @@ configFileName:: tsconfig.extendsBoxImpliedUnstrictExtension.json
 CompilerOptions::
 {
   "strict": false,
-  "configFilePath": "tsconfig.extendsBoxImpliedUnstrictExtension.json"
+  "configFilePath": "c:/dev/tsconfig.extendsBoxImpliedUnstrictExtension.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -614,7 +641,7 @@ configFileName:: tsconfig.extendsBoxImpliedPath.json
 CompilerOptions::
 {
   "strict": true,
-  "configFilePath": "tsconfig.extendsBoxImpliedPath.json"
+  "configFilePath": "c:/dev/tsconfig.extendsBoxImpliedPath.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -626,7 +653,7 @@ configFileName:: tsconfig.extendsFoo.json
 CompilerOptions::
 {
   "strict": true,
-  "configFilePath": "tsconfig.extendsFoo.json"
+  "configFilePath": "c:/dev/tsconfig.extendsFoo.json"
 }
 FileNames::
 c:/dev/main.ts
@@ -641,10 +668,10 @@ CompilerOptions::
   "noImplicitAny": false,
   "strictNullChecks": false,
   "module": 4,
-  "configFilePath": "configs/extendsArrayFifth.json"
+  "configFilePath": "c:/dev/configs/extendsArrayFifth.json"
 }
 FileNames::
-
+c:/dev/supplemental.ts
 Errors::
 
 
@@ -653,10 +680,14 @@ configFileName:: extendsArrayFails.json
 CompilerOptions::
 {
   "types": [],
-  "configFilePath": "extendsArrayFails.json"
+  "configFilePath": "c:/dev/extendsArrayFails.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS6053: File './missingFile' not found.
 
@@ -665,10 +696,14 @@ can error when 'extends' is not a string or Array2
 configFileName:: extendsArrayFails2.json
 CompilerOptions::
 {
-  "configFilePath": "extendsArrayFails2.json"
+  "configFilePath": "c:/dev/extendsArrayFails2.json"
 }
 FileNames::
-c:/dev/main.ts,c:/dev/supplemental.ts,c:/dev/tests/utils.ts,c:/dev/tests/baselines/first/output.ts,c:/dev/tests/unit/spec.ts
+c:/dev/main.ts
+c:/dev/supplemental.ts
+c:/dev/tests/utils.ts
+c:/dev/tests/baselines/first/output.ts
+c:/dev/tests/unit/spec.ts
 Errors::
 error TS5024: Compiler option 'extends' requires a value of type string.