typescript 5.3.0-dev.20231010 → 5.3.0-dev.20231012

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231010`;
+var version = `${versionMajorMinor}.0-dev.20231012`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -36904,7 +36904,7 @@ function resolvedTypeScriptOnly(resolved) {
   Debug.assert(extensionIsTS(resolved.extension));
   return { fileName: resolved.path, packageId: resolved.packageId };
 }
-function createResolvedModuleWithFailedLookupLocationsHandlingSymlink(moduleName, resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state, legacyResult) {
+function createResolvedModuleWithFailedLookupLocationsHandlingSymlink(moduleName, resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state, cache, legacyResult) {
   if (!state.resultFromCache && !state.compilerOptions.preserveSymlinks && resolved && isExternalLibraryImport && !resolved.originalPath && !isExternalModuleNameRelative(moduleName)) {
     const { resolvedFileName, originalPath } = getOriginalAndResolvedFileName(resolved.path, state.host, state.traceEnabled);
     if (originalPath)
@@ -36917,15 +36917,25 @@ function createResolvedModuleWithFailedLookupLocationsHandlingSymlink(moduleName
     affectingLocations,
     diagnostics,
     state.resultFromCache,
+    cache,
     legacyResult
   );
 }
-function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache, legacyResult) {
+function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache, cache, legacyResult) {
   if (resultFromCache) {
-    resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
-    resultFromCache.affectingLocations = updateResolutionField(resultFromCache.affectingLocations, affectingLocations);
-    resultFromCache.resolutionDiagnostics = updateResolutionField(resultFromCache.resolutionDiagnostics, diagnostics);
-    return resultFromCache;
+    if (!(cache == null ? void 0 : cache.isReadonly)) {
+      resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
+      resultFromCache.affectingLocations = updateResolutionField(resultFromCache.affectingLocations, affectingLocations);
+      resultFromCache.resolutionDiagnostics = updateResolutionField(resultFromCache.resolutionDiagnostics, diagnostics);
+      return resultFromCache;
+    } else {
+      return {
+        ...resultFromCache,
+        failedLookupLocations: initializeResolutionFieldForReadonlyCache(resultFromCache.failedLookupLocations, failedLookupLocations),
+        affectingLocations: initializeResolutionFieldForReadonlyCache(resultFromCache.affectingLocations, affectingLocations),
+        resolutionDiagnostics: initializeResolutionFieldForReadonlyCache(resultFromCache.resolutionDiagnostics, diagnostics)
+      };
+    }
   }
   return {
     resolvedModule: resolved && {
@@ -36953,6 +36963,13 @@ function updateResolutionField(to, value) {
   to.push(...value);
   return to;
 }
+function initializeResolutionFieldForReadonlyCache(fromCache, value) {
+  if (!(fromCache == null ? void 0 : fromCache.length))
+    return initializeResolutionField(value);
+  if (!value.length)
+    return fromCache.slice();
+  return [...fromCache, ...value];
+}
 function readPackageJsonField(jsonContent, fieldName, typeOfTag, state) {
   if (!hasProperty(jsonContent, fieldName)) {
     if (state.traceEnabled) {
@@ -37180,15 +37197,15 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
     affectingLocations: initializeResolutionField(affectingLocations),
     resolutionDiagnostics: initializeResolutionField(diagnostics)
   };
-  if (containingDirectory) {
-    cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(
+  if (containingDirectory && cache && !cache.isReadonly) {
+    cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(
       typeReferenceDirectiveName,
       /*mode*/
       resolutionMode,
       result
     );
     if (!isExternalModuleNameRelative(typeReferenceDirectiveName)) {
-      cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(typeReferenceDirectiveName, resolutionMode, redirectedReference).set(containingDirectory, result);
+      cache.getOrCreateCacheForNonRelativeName(typeReferenceDirectiveName, resolutionMode, redirectedReference).set(containingDirectory, result);
     }
   }
   if (traceEnabled)
@@ -37380,7 +37397,8 @@ function createCacheWithRedirects(ownOptions, optionsToRedirectsKey) {
     getMapOfCacheRedirects,
     getOrCreateMapOfCacheRedirects,
     update,
-    clear: clear2
+    clear: clear2,
+    getOwnMap: () => ownMap
   };
   function getMapOfCacheRedirects(redirectedReference) {
     return redirectedReference ? getOrCreateMap(
@@ -37487,7 +37505,8 @@ function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileNam
     getFromDirectoryCache,
     getOrCreateCacheForDirectory,
     clear: clear2,
-    update
+    update,
+    directoryToModuleNameMap
   };
   function clear2() {
     directoryToModuleNameMap.clear();
@@ -37751,9 +37770,11 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
     if (result && result.resolvedModule)
       (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
     (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
-    cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
-    if (!isExternalModuleNameRelative(moduleName)) {
-      cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
+    if (cache && !cache.isReadonly) {
+      cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
+      if (!isExternalModuleNameRelative(moduleName)) {
+        cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
+      }
     }
   }
   if (traceEnabled) {
@@ -38055,6 +38076,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
     affectingLocations,
     diagnostics,
     state,
+    cache,
     legacyResult
   );
   function tryResolve(extensions2, state2) {
@@ -38334,7 +38356,7 @@ function getVersionPathsOfPackageJsonInfo(packageJsonInfo, state) {
   return packageJsonInfo.contents.versionPaths || void 0;
 }
 function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f;
   const { host, traceEnabled } = state;
   const packageJsonPath = combinePaths(packageDirectory, "package.json");
   if (onlyRecordFailures) {
@@ -38362,15 +38384,17 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
       trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
     }
     const result = { packageDirectory, contents: { packageJsonContent, versionPaths: void 0, resolvedEntrypoints: void 0 } };
-    (_e = state.packageJsonInfoCache) == null ? void 0 : _e.setPackageJsonInfo(packageJsonPath, result);
-    (_f = state.affectingLocations) == null ? void 0 : _f.push(packageJsonPath);
+    if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
+      state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, result);
+    (_e = state.affectingLocations) == null ? void 0 : _e.push(packageJsonPath);
     return result;
   } else {
     if (directoryExists && traceEnabled) {
       trace(host, Diagnostics.File_0_does_not_exist, packageJsonPath);
     }
-    (_g = state.packageJsonInfoCache) == null ? void 0 : _g.setPackageJsonInfo(packageJsonPath, directoryExists);
-    (_h = state.failedLookupLocations) == null ? void 0 : _h.push(packageJsonPath);
+    if (state.packageJsonInfoCache && !state.packageJsonInfoCache.isReadonly)
+      state.packageJsonInfoCache.setPackageJsonInfo(packageJsonPath, directoryExists);
+    (_f = state.failedLookupLocations) == null ? void 0 : _f.push(packageJsonPath);
   }
 }
 function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, jsonContent, versionPaths) {
@@ -39160,7 +39184,8 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state
+    state,
+    cache
   );
   function tryResolve(extensions) {
     const resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, state);
@@ -39279,7 +39304,9 @@ function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, hos
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state.resultFromCache
+    state.resultFromCache,
+    /*cache*/
+    void 0
   );
 }
 function toSearchResult(value) {
@@ -73351,8 +73378,20 @@ function createTypeChecker(host) {
     let hasReturnWithNoExpression = functionHasImplicitReturn(func);
     let hasReturnOfTypeNever = false;
     forEachReturnStatement(func.body, (returnStatement) => {
-      const expr = returnStatement.expression;
+      let expr = returnStatement.expression;
       if (expr) {
+        expr = skipParentheses(
+          expr,
+          /*excludeJSDocTypeAssertions*/
+          true
+        );
+        if (functionFlags & 2 /* Async */ && expr.kind === 223 /* AwaitExpression */) {
+          expr = skipParentheses(
+            expr.expression,
+            /*excludeJSDocTypeAssertions*/
+            true
+          );
+        }
         if (expr.kind === 213 /* CallExpression */ && expr.expression.kind === 80 /* Identifier */ && checkExpressionCached(expr.expression).symbol === func.symbol) {
           hasReturnOfTypeNever = true;
           return;
@@ -121000,6 +121039,10 @@ function getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirec
   const normalized = getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory());
   return !isDiskPathRoot(normalized) ? removeTrailingDirectorySeparator(normalized) : normalized;
 }
+function getModuleResolutionHost(resolutionHost) {
+  var _a;
+  return ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
+}
 function createModuleResolutionLoaderUsingGlobalCache(containingFile, redirectedReference, options, resolutionHost, moduleResolutionCache) {
   return {
     nameAndMode: moduleResolutionNameAndModeGetter,
@@ -121015,8 +121058,7 @@ function createModuleResolutionLoaderUsingGlobalCache(containingFile, redirected
   };
 }
 function resolveModuleNameUsingGlobalCache(resolutionHost, moduleResolutionCache, moduleName, containingFile, compilerOptions, redirectedReference, mode) {
-  var _a;
-  const host = ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
+  const host = getModuleResolutionHost(resolutionHost);
   const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
   if (!resolutionHost.getGlobalCache) {
     return primaryResult;
@@ -121187,6 +121229,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     };
   }
   function startCachingPerDirectoryResolution() {
+    moduleResolutionCache.isReadonly = void 0;
+    typeReferenceDirectiveResolutionCache.isReadonly = void 0;
+    libraryResolutionCache.isReadonly = void 0;
+    moduleResolutionCache.getPackageJsonInfoCache().isReadonly = void 0;
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
     typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
     libraryResolutionCache.clearAllExceptPackageJsonInfoCache();
@@ -121244,6 +121290,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     directoryWatchesOfFailedLookups.forEach(closeDirectoryWatchesOfFailedLookup);
     fileWatchesOfAffectingLocations.forEach(closeFileWatcherOfAffectingLocation);
     hasChangedAutomaticTypeDirectiveNames = false;
+    moduleResolutionCache.isReadonly = true;
+    typeReferenceDirectiveResolutionCache.isReadonly = true;
+    libraryResolutionCache.isReadonly = true;
+    moduleResolutionCache.getPackageJsonInfoCache().isReadonly = true;
   }
   function closeDirectoryWatchesOfFailedLookup(watcher, path) {
     if (watcher.refCount === 0) {
@@ -121272,7 +121322,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     shouldRetryResolution,
     logChanges
   }) {
-    var _a;
     const path = resolutionHost.toPath(containingFile);
     const resolutionsInFile = perFileCache.get(path) || perFileCache.set(path, createModeAwareCache()).get(path);
     const resolvedModules = [];
@@ -121304,7 +121353,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           logChanges = false;
         }
       } else {
-        const host = ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
+        const host = getModuleResolutionHost(resolutionHost);
         if (isTraceEnabled(options, host) && !seenNamesInFile.has(name, mode)) {
           const resolved = getResolutionWithResolvedFileName(resolution);
           trace(
@@ -121356,7 +121405,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
   }
   function resolveTypeReferenceDirectiveReferences(typeDirectiveReferences, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
-    var _a;
     return resolveNamesWithLocalCache({
       entries: typeDirectiveReferences,
       containingFile,
@@ -121369,7 +121417,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         containingFile,
         redirectedReference,
         options,
-        ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost,
+        getModuleResolutionHost(resolutionHost),
         typeReferenceDirectiveResolutionCache
       ),
       getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective,
@@ -121401,8 +121449,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     });
   }
   function resolveLibrary2(libraryName, resolveFrom, options, libFileName) {
-    var _a;
-    const host = ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
+    const host = getModuleResolutionHost(resolutionHost);
     let resolution = resolvedLibraries == null ? void 0 : resolvedLibraries.get(libFileName);
     if (!resolution || resolution.isInvalidated) {
       const existingResolution = resolution;
@@ -121436,6 +121483,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     return resolution;
   }
   function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
+    var _a, _b;
     const path = resolutionHost.toPath(containingFile);
     const resolutionsInFile = resolvedModuleNames.get(path);
     const resolution = resolutionsInFile == null ? void 0 : resolutionsInFile.get(
@@ -121445,7 +121493,17 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     );
     if (resolution && !resolution.isInvalidated)
       return resolution;
-    return resolveModuleNameUsingGlobalCache(resolutionHost, moduleResolutionCache, moduleName, containingFile, resolutionHost.getCompilationSettings());
+    const data = (_a = resolutionHost.beforeResolveSingleModuleNameWithoutWatching) == null ? void 0 : _a.call(resolutionHost, moduleResolutionCache);
+    const host = getModuleResolutionHost(resolutionHost);
+    const result = resolveModuleName(
+      moduleName,
+      containingFile,
+      resolutionHost.getCompilationSettings(),
+      host,
+      moduleResolutionCache
+    );
+    (_b = resolutionHost.afterResolveSingleModuleNameWithoutWatching) == null ? void 0 : _b.call(resolutionHost, moduleResolutionCache, moduleName, containingFile, result, data);
+    return result;
   }
   function isNodeModulesAtTypesDirectory(dirPath) {
     return endsWith(dirPath, "/node_modules/@types");