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

package/lib/tsserver.js

@@ -2645,7 +2645,7 @@ __export(ts_server_exports3, {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20221207`;
+var version = `${versionMajorMinor}.0-dev.20221208`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -43504,8 +43504,9 @@ function createTypeChecker(host) {
   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");
@@ -53663,7 +53664,7 @@ function createTypeChecker(host) {
     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)}`;
@@ -54403,10 +54404,9 @@ function createTypeChecker(host) {
       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 */) {
@@ -54531,7 +54531,7 @@ function createTypeChecker(host) {
         if (type === wildcardType)
           includes |= 8388608 /* IncludesWildcard */;
       } else if (strictNullChecks || !(flags & 98304 /* Nullable */)) {
-        if (exactOptionalPropertyTypes && type === missingType) {
+        if (type === missingType) {
           includes |= 262144 /* IncludesMissingType */;
           type = undefinedType;
         }
@@ -54681,9 +54681,9 @@ function createTypeChecker(host) {
         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);
@@ -55102,7 +55102,7 @@ function createTypeChecker(host) {
           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;
           });
         }
       }
@@ -55122,11 +55122,11 @@ function createTypeChecker(host) {
         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;
       }
@@ -59587,8 +59587,8 @@ function createTypeChecker(host) {
   }
   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) {
@@ -59615,7 +59615,7 @@ function createTypeChecker(host) {
     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 */);
@@ -59715,7 +59715,7 @@ function createTypeChecker(host) {
     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;
@@ -60765,7 +60765,7 @@ function createTypeChecker(host) {
     }
   }
   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);
@@ -61294,7 +61294,7 @@ function createTypeChecker(host) {
   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);
@@ -62059,7 +62059,7 @@ function createTypeChecker(host) {
       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;
           }
@@ -64198,7 +64198,7 @@ function createTypeChecker(host) {
         }
       } 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);
@@ -65345,7 +65345,7 @@ function createTypeChecker(host) {
       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));
       }
@@ -67547,6 +67547,7 @@ function createTypeChecker(host) {
   }
   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)) {
@@ -103129,6 +103130,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     getSymlinkCache,
     realpath: (_o = host.realpath) == null ? void 0 : _o.bind(host),
     useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
+    getCanonicalFileName,
     getFileIncludeReasons: () => fileReasons,
     structureIsReused,
     writeFile: writeFile2
@@ -105705,14 +105707,13 @@ var BuilderState;
     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);
         }
@@ -106112,7 +106113,6 @@ function convertToDiagnostics(diagnostics, newProgram) {
   if (!diagnostics.length)
     return emptyArray;
   let buildInfoDirectory;
-  let getCanonicalFileName;
   return diagnostics.map((diagnostic) => {
     const result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3);
     result.reportsUnnecessary = diagnostic.reportsUnnecessary;
@@ -106125,7 +106125,7 @@ function convertToDiagnostics(diagnostics, newProgram) {
   });
   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) {
@@ -106423,7 +106423,6 @@ function isProgramBundleEmitBuildInfo(info) {
 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 = [];
@@ -106541,7 +106540,7 @@ function getBuildInfo2(state, bundle) {
     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);
@@ -106649,7 +106648,6 @@ function getTextHandlingSourceMapForSignature(text, data) {
 }
 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) {
@@ -106669,7 +106667,7 @@ function computeSignatureWithDiagnostics(program, sourceFile, text, host, data)
     return `${ensurePathIsNonModuleName(getRelativePathFromDirectory(
       sourceFileDirectory,
       diagnostic.file.resolvedPath,
-      getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames())
+      program.getCanonicalFileName
     ))}(${diagnostic.start},${diagnostic.length})`;
   }
 }
@@ -108074,8 +108072,7 @@ function listFiles(program, write) {
 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}`));
@@ -108133,10 +108130,9 @@ function getMatchedFileSpec(program, fileName) {
   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;
@@ -109315,8 +109311,6 @@ function createSolutionBuilderWithWatch(host, rootNames, defaultOptions, baseWat
 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);
@@ -109328,7 +109322,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   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,
@@ -109342,7 +109336,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
     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,
@@ -109359,8 +109353,6 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   const state = {
     host,
     hostWithWatch,
-    currentDirectory,
-    getCanonicalFileName,
     parseConfigFileHost: parseConfigHostFromCompilerHostLike(host),
     write: maybeBind(host, host.trace),
     options,
@@ -109404,7 +109396,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   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;
@@ -109447,7 +109439,7 @@ function parseConfigFile(state, configFileName, configFilePath) {
   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();
@@ -109656,7 +109648,7 @@ function createUpdateOutputFileStampsProject(state, project, projectPath, config
     projectPath,
     buildOrder,
     getCompilerOptions: () => config.options,
-    getCurrentDirectory: () => state.currentDirectory,
+    getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
     updateOutputFileStatmps: () => {
       updateOutputTimestamps(state, config, projectPath);
       updateOutputFileStampsPending = false;
@@ -109681,7 +109673,7 @@ function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath,
     projectPath,
     buildOrder,
     getCompilerOptions: () => config.options,
-    getCurrentDirectory: () => state.currentDirectory,
+    getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
     getBuilderProgram: () => withProgramOrUndefined(identity),
     getProgram: () => withProgramOrUndefined(
       (program2) => program2.getProgramOrUndefined()
@@ -109737,7 +109729,7 @@ function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath,
     projectPath,
     buildOrder,
     getCompilerOptions: () => config.options,
-    getCurrentDirectory: () => state.currentDirectory,
+    getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
     emit: (writeFile2, customTransformers) => {
       if (step !== 4 /* EmitBundle */)
         return invalidatedProjectOfBundle;
@@ -110844,7 +110836,7 @@ function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
           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,
@@ -110949,7 +110941,7 @@ function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, opti
   };
 }
 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));