typescript 5.0.0-dev.20221207 → 5.0.0-dev.20221208

package/lib/tsserverlibrary.js

@@ -42,7 +42,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20221207`;
+      version = `${versionMajorMinor}.0-dev.20221208`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -40965,8 +40965,9 @@ ${lanes.join("\n")}
     const nonNullUnknownType = createIntrinsicType(2 /* Unknown */, "unknown");
     const undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
     const undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 65536 /* ContainsWideningType */);
+    const missingType = createIntrinsicType(32768 /* Undefined */, "undefined");
+    const undefinedOrMissingType = exactOptionalPropertyTypes ? missingType : undefinedType;
     const optionalType = createIntrinsicType(32768 /* Undefined */, "undefined");
-    const missingType = exactOptionalPropertyTypes ? createIntrinsicType(32768 /* Undefined */, "undefined") : undefinedType;
     const nullType = createIntrinsicType(65536 /* Null */, "null");
     const nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 65536 /* ContainsWideningType */);
     const stringType = createIntrinsicType(4 /* String */, "string");
@@ -51124,7 +51125,7 @@ ${lanes.join("\n")}
       return links.resolvedJSDocType;
     }
     function getSubstitutionType(baseType, constraint) {
-      if (constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType || !isGenericType(baseType) && !isGenericType(constraint)) {
+      if (constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType) {
         return baseType;
       }
       const id = `${getTypeId(baseType)}>${getTypeId(constraint)}`;
@@ -51864,10 +51865,9 @@ ${lanes.join("\n")}
         if (includes & 3 /* AnyOrUnknown */) {
           return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType : includes & 65536 /* Null */ || containsType(typeSet, unknownType) ? unknownType : nonNullUnknownType;
         }
-        if (exactOptionalPropertyTypes && includes & 32768 /* Undefined */) {
-          const missingIndex = binarySearch(typeSet, missingType, getTypeId, compareValues);
-          if (missingIndex >= 0 && containsType(typeSet, undefinedType)) {
-            orderedRemoveItemAt(typeSet, missingIndex);
+        if (includes & 32768 /* Undefined */) {
+          if (typeSet.length >= 2 && typeSet[0] === undefinedType && typeSet[1] === missingType) {
+            orderedRemoveItemAt(typeSet, 1);
           }
         }
         if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
@@ -51992,7 +51992,7 @@ ${lanes.join("\n")}
           if (type === wildcardType)
             includes |= 8388608 /* IncludesWildcard */;
         } else if (strictNullChecks || !(flags & 98304 /* Nullable */)) {
-          if (exactOptionalPropertyTypes && type === missingType) {
+          if (type === missingType) {
             includes |= 262144 /* IncludesMissingType */;
             type = undefinedType;
           }
@@ -52142,9 +52142,9 @@ ${lanes.join("\n")}
           if (intersectUnionsOfPrimitiveTypes(typeSet)) {
             result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
           } else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
-            const undefinedOrMissingType = exactOptionalPropertyTypes && some(typeSet, (t) => containsType(t.types, missingType)) ? missingType : undefinedType;
+            const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
             removeFromEach(typeSet, 32768 /* Undefined */);
-            result = getUnionType([getIntersectionType(typeSet), undefinedOrMissingType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+            result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
           } else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
             removeFromEach(typeSet, 65536 /* Null */);
             result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
@@ -52563,7 +52563,7 @@ ${lanes.join("\n")}
             errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, numberType));
             return mapType(objectType, (t) => {
               const restType = getRestTypeOfTupleType(t) || undefinedType;
-              return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([restType, undefinedType]) : restType;
+              return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([restType, missingType]) : restType;
             });
           }
         }
@@ -52583,11 +52583,11 @@ ${lanes.join("\n")}
           if (accessNode && indexInfo.keyType === stringType && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
             const indexNode = getIndexNodeForAccessExpression(accessNode);
             error(indexNode, Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
-            return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
+            return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([indexInfo.type, missingType]) : indexInfo.type;
           }
           errorIfWritingToReadonlyIndex(indexInfo);
           if (accessFlags & 1 /* IncludeUndefined */ && !(objectType.symbol && objectType.symbol.flags & (256 /* RegularEnum */ | 128 /* ConstEnum */) && (indexType.symbol && indexType.flags & 1024 /* EnumLiteral */ && getParentOfSymbol(indexType.symbol) === objectType.symbol))) {
-            return getUnionType([indexInfo.type, undefinedType]);
+            return getUnionType([indexInfo.type, missingType]);
           }
           return indexInfo.type;
         }
@@ -57048,8 +57048,8 @@ ${lanes.join("\n")}
     }
     function getOptionalType(type, isProperty = false) {
       Debug.assert(strictNullChecks);
-      const missingOrUndefined = isProperty ? missingType : undefinedType;
-      return type.flags & 32768 /* Undefined */ || type.flags & 1048576 /* Union */ && type.types[0] === missingOrUndefined ? type : getUnionType([type, missingOrUndefined]);
+      const missingOrUndefined = isProperty ? undefinedOrMissingType : undefinedType;
+      return type === missingOrUndefined || type.flags & 1048576 /* Union */ && type.types[0] === missingOrUndefined ? type : getUnionType([type, missingOrUndefined]);
     }
     function getGlobalNonNullableTypeInstantiation(type) {
       if (!deferredGlobalNonNullableTypeAlias) {
@@ -57076,7 +57076,7 @@ ${lanes.join("\n")}
       return exactOptionalPropertyTypes && isOptional ? removeType(type, missingType) : type;
     }
     function containsMissingType(type) {
-      return exactOptionalPropertyTypes && (type === missingType || type.flags & 1048576 /* Union */ && containsType(type.types, missingType));
+      return type === missingType || !!(type.flags & 1048576 /* Union */) && type.types[0] === missingType;
     }
     function removeMissingOrUndefinedType(type) {
       return exactOptionalPropertyTypes ? removeType(type, missingType) : getTypeWithFacts(type, 524288 /* NEUndefined */);
@@ -57176,7 +57176,7 @@ ${lanes.join("\n")}
       if (cached) {
         return cached;
       }
-      const result = createSymbolWithType(prop, missingType);
+      const result = createSymbolWithType(prop, undefinedOrMissingType);
       result.flags |= 16777216 /* Optional */;
       undefinedProperties.set(prop.escapedName, result);
       return result;
@@ -58226,7 +58226,7 @@ ${lanes.join("\n")}
       }
     }
     function isTypeOrBaseIdenticalTo(s, t) {
-      return exactOptionalPropertyTypes && t === missingType ? s === t : isTypeIdenticalTo(s, t) || !!(t.flags & 4 /* String */ && s.flags & 128 /* StringLiteral */ || t.flags & 8 /* Number */ && s.flags & 256 /* NumberLiteral */);
+      return t === missingType ? s === t : isTypeIdenticalTo(s, t) || !!(t.flags & 4 /* String */ && s.flags & 128 /* StringLiteral */ || t.flags & 8 /* Number */ && s.flags & 256 /* NumberLiteral */);
     }
     function isTypeCloselyMatchedBy(s, t) {
       return !!(s.flags & 524288 /* Object */ && t.flags & 524288 /* Object */ && s.symbol && s.symbol === t.symbol || s.aliasSymbol && s.aliasTypeArguments && s.aliasSymbol === t.aliasSymbol);
@@ -58755,7 +58755,7 @@ ${lanes.join("\n")}
     function includeUndefinedInIndexSignature(type) {
       if (!type)
         return type;
-      return compilerOptions.noUncheckedIndexedAccess ? getUnionType([type, undefinedType]) : type;
+      return compilerOptions.noUncheckedIndexedAccess ? getUnionType([type, missingType]) : type;
     }
     function getTypeOfDestructuredSpreadExpression(type) {
       return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, void 0) || errorType);
@@ -59520,7 +59520,7 @@ ${lanes.join("\n")}
         if (bypassFlow) {
           const flowType = getTypeAtFlowNode(bypassFlow);
           const type = getTypeFromFlowType(flowType);
-          if (!contains(antecedentTypes, type) && !isExhaustiveSwitchStatement(bypassFlow.switchStatement)) {
+          if (!(type.flags & 131072 /* Never */) && !contains(antecedentTypes, type) && !isExhaustiveSwitchStatement(bypassFlow.switchStatement)) {
             if (type === declaredType && declaredType === initialType) {
               return type;
             }
@@ -61659,7 +61659,7 @@ ${lanes.join("\n")}
           }
         } else if (exactOptionalPropertyTypes && e.kind === 229 /* OmittedExpression */) {
           hasOmittedExpression = true;
-          elementTypes.push(missingType);
+          elementTypes.push(undefinedOrMissingType);
           elementFlags.push(2 /* Optional */);
         } else {
           const elementContextualType = getContextualTypeForElementExpression(contextualType, elementTypes.length);
@@ -62806,7 +62806,7 @@ ${lanes.join("\n")}
         if (indexInfo.isReadonly && (isAssignmentTarget(node) || isDeleteTarget(node))) {
           error(node, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(apparentType));
         }
-        propType = compilerOptions.noUncheckedIndexedAccess && !isAssignmentTarget(node) ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
+        propType = compilerOptions.noUncheckedIndexedAccess && !isAssignmentTarget(node) ? getUnionType([indexInfo.type, missingType]) : indexInfo.type;
         if (compilerOptions.noPropertyAccessFromIndexSignature && isPropertyAccessExpression(node)) {
           error(right, Diagnostics.Property_0_comes_from_an_index_signature_so_it_must_be_accessed_with_0, unescapeLeadingUnderscores(right.escapedText));
         }
@@ -65008,6 +65008,7 @@ ${lanes.join("\n")}
     }
     function checkExpressionWithTypeArguments(node) {
       checkGrammarExpressionWithTypeArguments(node);
+      forEach(node.typeArguments, checkSourceElement);
       const exprType = node.kind === 230 /* ExpressionWithTypeArguments */ ? checkExpression(node.expression) : isThisIdentifier(node.exprName) ? checkThisExpression(node.exprName) : checkExpression(node.exprName);
       const typeArguments = node.typeArguments;
       if (exprType === silentNeverType || isErrorType(exprType) || !some(typeArguments)) {
@@ -100793,6 +100794,7 @@ ${lanes.join("\n")}
       getSymlinkCache,
       realpath: (_o = host.realpath) == null ? void 0 : _o.bind(host),
       useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
+      getCanonicalFileName,
       getFileIncludeReasons: () => fileReasons,
       structureIsReused,
       writeFile: writeFile2
@@ -103509,14 +103511,13 @@ ${lanes.join("\n")}
           const referencedMap = options.module !== 0 /* None */ && !isOutFile ? createManyToManyPathMap() : void 0;
           const exportedModulesMap = referencedMap ? createManyToManyPathMap() : void 0;
           const useOldState = canReuseOldState(referencedMap, oldState);
-          const getCanonicalFileName = createGetCanonicalFileName(newProgram.useCaseSensitiveFileNames());
           newProgram.getTypeChecker();
           for (const sourceFile of newProgram.getSourceFiles()) {
             const version2 = Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
             const oldUncommittedSignature = useOldState ? (_a2 = oldState.oldSignatures) == null ? void 0 : _a2.get(sourceFile.resolvedPath) : void 0;
             const signature = oldUncommittedSignature === void 0 ? useOldState ? (_b = oldState.fileInfos.get(sourceFile.resolvedPath)) == null ? void 0 : _b.signature : void 0 : oldUncommittedSignature || void 0;
             if (referencedMap) {
-              const newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
+              const newReferences = getReferencedFiles(newProgram, sourceFile, newProgram.getCanonicalFileName);
               if (newReferences) {
                 referencedMap.set(sourceFile.resolvedPath, newReferences);
               }
@@ -103906,7 +103907,6 @@ ${lanes.join("\n")}
     if (!diagnostics.length)
       return emptyArray;
     let buildInfoDirectory;
-    let getCanonicalFileName;
     return diagnostics.map((diagnostic) => {
       const result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3);
       result.reportsUnnecessary = diagnostic.reportsUnnecessary;
@@ -103919,7 +103919,7 @@ ${lanes.join("\n")}
     });
     function toPath3(path) {
       buildInfoDirectory != null ? buildInfoDirectory : buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
-      return toPath(path, buildInfoDirectory, getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(newProgram.useCaseSensitiveFileNames()));
+      return toPath(path, buildInfoDirectory, newProgram.getCanonicalFileName);
     }
   }
   function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3) {
@@ -104217,7 +104217,6 @@ ${lanes.join("\n")}
   function getBuildInfo2(state, bundle) {
     var _a2, _b, _c;
     const currentDirectory = Debug.checkDefined(state.program).getCurrentDirectory();
-    const getCanonicalFileName = createGetCanonicalFileName(state.program.useCaseSensitiveFileNames());
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory));
     const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : void 0;
     const fileNames = [];
@@ -104335,7 +104334,7 @@ ${lanes.join("\n")}
       return relativeToBuildInfo(getNormalizedAbsolutePath(path, currentDirectory));
     }
     function relativeToBuildInfo(path) {
-      return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+      return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, state.program.getCanonicalFileName));
     }
     function toFileId(path) {
       let fileId = fileNameToFileId.get(path);
@@ -104438,7 +104437,6 @@ ${lanes.join("\n")}
   }
   function computeSignatureWithDiagnostics(program, sourceFile, text, host, data) {
     var _a2, _b;
-    let getCanonicalFileName;
     text = getTextHandlingSourceMapForSignature(text, data);
     let sourceFileDirectory;
     if ((_a2 = data == null ? void 0 : data.diagnostics) == null ? void 0 : _a2.length) {
@@ -104458,7 +104456,7 @@ ${lanes.join("\n")}
       return `${ensurePathIsNonModuleName(getRelativePathFromDirectory(
         sourceFileDirectory,
         diagnostic.file.resolvedPath,
-        getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames())
+        program.getCanonicalFileName
       ))}(${diagnostic.start},${diagnostic.length})`;
     }
   }
@@ -105892,8 +105890,7 @@ ${lanes.join("\n")}
   function explainFiles(program, write) {
     var _a2, _b;
     const reasons = program.getFileIncludeReasons();
-    const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());
-    const relativeFileName = (fileName) => convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName);
+    const relativeFileName = (fileName) => convertToRelativePath(fileName, program.getCurrentDirectory(), program.getCanonicalFileName);
     for (const file of program.getSourceFiles()) {
       write(`${toFileName(file, relativeFileName)}`);
       (_a2 = reasons.get(file.path)) == null ? void 0 : _a2.forEach((reason) => write(`  ${fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText}`));
@@ -105951,10 +105948,9 @@ ${lanes.join("\n")}
     const configFile = program.getCompilerOptions().configFile;
     if (!((_a2 = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _a2.validatedFilesSpec))
       return void 0;
-    const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());
-    const filePath = getCanonicalFileName(fileName);
+    const filePath = program.getCanonicalFileName(fileName);
     const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-    return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+    return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
   }
   function getMatchedIncludeSpec(program, fileName) {
     var _a2, _b;
@@ -107161,8 +107157,6 @@ ${lanes.join("\n")}
   function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options, baseWatchOptions) {
     const host = hostOrHostWithWatch;
     const hostWithWatch = hostOrHostWithWatch;
-    const currentDirectory = host.getCurrentDirectory();
-    const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
     const baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
     const compilerHost = createCompilerHostFromProgramHost(host, () => state.projectCompilerOptions);
     setGetSourceFileAsHashVersioned(compilerHost);
@@ -107174,7 +107168,7 @@ ${lanes.join("\n")}
     compilerHost.getModuleResolutionCache = maybeBind(host, host.getModuleResolutionCache);
     let moduleResolutionCache, typeReferenceDirectiveResolutionCache;
     if (!compilerHost.resolveModuleNameLiterals && !compilerHost.resolveModuleNames) {
-      moduleResolutionCache = createModuleResolutionCache(currentDirectory, getCanonicalFileName);
+      moduleResolutionCache = createModuleResolutionCache(compilerHost.getCurrentDirectory(), compilerHost.getCanonicalFileName);
       compilerHost.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options2, containingSourceFile) => loadWithModeAwareCache(
         moduleNames,
         containingFile,
@@ -107188,7 +107182,7 @@ ${lanes.join("\n")}
       compilerHost.getModuleResolutionCache = () => moduleResolutionCache;
     }
     if (!compilerHost.resolveTypeReferenceDirectiveReferences && !compilerHost.resolveTypeReferenceDirectives) {
-      typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, void 0, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
+      typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(compilerHost.getCurrentDirectory(), compilerHost.getCanonicalFileName, void 0, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
       compilerHost.resolveTypeReferenceDirectiveReferences = (typeDirectiveNames, containingFile, redirectedReference, options2, containingSourceFile) => loadWithModeAwareCache(
         typeDirectiveNames,
         containingFile,
@@ -107205,8 +107199,6 @@ ${lanes.join("\n")}
     const state = {
       host,
       hostWithWatch,
-      currentDirectory,
-      getCanonicalFileName,
       parseConfigFileHost: parseConfigHostFromCompilerHostLike(host),
       write: maybeBind(host, host.trace),
       options,
@@ -107250,7 +107242,7 @@ ${lanes.join("\n")}
     return state;
   }
   function toPath2(state, fileName) {
-    return toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    return toPath(fileName, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
   }
   function toResolvedConfigFilePath(state, fileName) {
     const { resolvedConfigFilePaths } = state;
@@ -107293,7 +107285,7 @@ ${lanes.join("\n")}
     return parsed;
   }
   function resolveProjectName(state, name) {
-    return resolveConfigFileProjectName(resolvePath(state.currentDirectory, name));
+    return resolveConfigFileProjectName(resolvePath(state.compilerHost.getCurrentDirectory(), name));
   }
   function createBuildOrder(state, roots) {
     const temporaryMarks = /* @__PURE__ */ new Map();
@@ -107496,7 +107488,7 @@ ${lanes.join("\n")}
       projectPath,
       buildOrder,
       getCompilerOptions: () => config.options,
-      getCurrentDirectory: () => state.currentDirectory,
+      getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
       updateOutputFileStatmps: () => {
         updateOutputTimestamps(state, config, projectPath);
         updateOutputFileStampsPending = false;
@@ -107521,7 +107513,7 @@ ${lanes.join("\n")}
       projectPath,
       buildOrder,
       getCompilerOptions: () => config.options,
-      getCurrentDirectory: () => state.currentDirectory,
+      getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
       getBuilderProgram: () => withProgramOrUndefined(identity),
       getProgram: () => withProgramOrUndefined(
         (program2) => program2.getProgramOrUndefined()
@@ -107577,7 +107569,7 @@ ${lanes.join("\n")}
       projectPath,
       buildOrder,
       getCompilerOptions: () => config.options,
-      getCurrentDirectory: () => state.currentDirectory,
+      getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
       emit: (writeFile2, customTransformers) => {
         if (step !== 4 /* EmitBundle */)
           return invalidatedProjectOfBundle;
@@ -108684,7 +108676,7 @@ ${lanes.join("\n")}
             fileOrDirectory,
             fileOrDirectoryPath: toPath2(state, fileOrDirectory),
             configFileName: resolved,
-            currentDirectory: state.currentDirectory,
+            currentDirectory: state.compilerHost.getCurrentDirectory(),
             options: parsed.options,
             program: state.builderPrograms.get(resolvedPath) || ((_a2 = getCachedParsedConfigFile(state, resolvedPath)) == null ? void 0 : _a2.fileNames),
             useCaseSensitiveFileNames: state.parseConfigFileHost.useCaseSensitiveFileNames,
@@ -108789,7 +108781,7 @@ ${lanes.join("\n")}
     };
   }
   function relName(state, path) {
-    return convertToRelativePath(path, state.currentDirectory, (f) => state.getCanonicalFileName(f));
+    return convertToRelativePath(path, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
   }
   function reportStatus(state, message, ...args) {
     state.host.reportSolutionBuilderStatus(createCompilerDiagnostic(message, ...args));