typescript 5.6.0-dev.20240708 → 5.6.0-dev.20240710

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240708`;
+var version = `${versionMajorMinor}.0-dev.20240710`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -12745,7 +12745,7 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
   }
   if (isJSDocNode(node) || node.kind === 12 /* JsxText */) {
     return skipTrivia(
-      (sourceFile || getSourceFileOfNode(node)).text,
+      (sourceFile ?? getSourceFileOfNode(node)).text,
       node.pos,
       /*stopAfterLineBreak*/
       false,
@@ -12757,13 +12757,14 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
     return getTokenPosOfNode(node.jsDoc[0], sourceFile);
   }
   if (node.kind === 352 /* SyntaxList */) {
-    const first2 = firstOrUndefined(getNodeChildren(node));
+    sourceFile ?? (sourceFile = getSourceFileOfNode(node));
+    const first2 = firstOrUndefined(getNodeChildren(node, sourceFile));
     if (first2) {
       return getTokenPosOfNode(first2, sourceFile, includeJsDoc);
     }
   }
   return skipTrivia(
-    (sourceFile || getSourceFileOfNode(node)).text,
+    (sourceFile ?? getSourceFileOfNode(node)).text,
     node.pos,
     /*stopAfterLineBreak*/
     false,
@@ -23511,7 +23512,7 @@ function createNodeFactory(flags, baseFactory2) {
   }
   function createSyntaxList(children) {
     const node = createBaseNode(352 /* SyntaxList */);
-    setNodeChildren(node, children);
+    node._children = children;
     return node;
   }
   function createNotEmittedStatement(original) {
@@ -26287,17 +26288,31 @@ function isJSDocImportTag(node) {
 }
 
 // src/compiler/factory/nodeChildren.ts
-var nodeChildren = /* @__PURE__ */ new WeakMap();
-function getNodeChildren(node) {
-  if (!isNodeKind(node.kind)) return emptyArray;
-  return nodeChildren.get(node);
+var sourceFileToNodeChildren = /* @__PURE__ */ new WeakMap();
+function getNodeChildren(node, sourceFile) {
+  var _a;
+  const kind = node.kind;
+  if (!isNodeKind(kind)) {
+    return emptyArray;
+  }
+  if (kind === 352 /* SyntaxList */) {
+    return node._children;
+  }
+  return (_a = sourceFileToNodeChildren.get(sourceFile)) == null ? void 0 : _a.get(node);
 }
-function setNodeChildren(node, children) {
-  nodeChildren.set(node, children);
-  return children;
+function unsetNodeChildren(node, origSourceFile) {
+  var _a;
+  if (node.kind === 352 /* SyntaxList */) {
+    Debug.fail("Did not expect to unset the children of a SyntaxList.");
+  }
+  (_a = sourceFileToNodeChildren.get(origSourceFile)) == null ? void 0 : _a.delete(node);
 }
-function unsetNodeChildren(node) {
-  nodeChildren.delete(node);
+function transferSourceFileChildren(sourceFile, targetSourceFile) {
+  const map2 = sourceFileToNodeChildren.get(sourceFile);
+  if (map2 !== void 0) {
+    sourceFileToNodeChildren.delete(sourceFile);
+    sourceFileToNodeChildren.set(targetSourceFile, map2);
+  }
 }
 
 // src/compiler/factory/utilities.ts
@@ -34887,6 +34902,7 @@ var IncrementalParser;
       aggressiveChecks
     );
     result.impliedNodeFormat = sourceFile.impliedNodeFormat;
+    transferSourceFileChildren(sourceFile, result);
     return result;
   }
   IncrementalParser2.updateSourceFile = updateSourceFile;
@@ -34922,7 +34938,7 @@ var IncrementalParser;
       }
     }
   }
-  function moveElementEntirelyPastChangeRange(element, isArray2, delta, oldText, newText, aggressiveChecks) {
+  function moveElementEntirelyPastChangeRange(element, origSourceFile, isArray2, delta, oldText, newText, aggressiveChecks) {
     if (isArray2) {
       visitArray2(element);
     } else {
@@ -34934,7 +34950,7 @@ var IncrementalParser;
       if (aggressiveChecks && shouldCheckNode(node)) {
         text = oldText.substring(node.pos, node.end);
       }
-      unsetNodeChildren(node);
+      unsetNodeChildren(node, origSourceFile);
       setTextRangePosEnd(node, node.pos + delta, node.end + delta);
       if (aggressiveChecks && shouldCheckNode(node)) {
         Debug.assert(text === newText.substring(node.pos, node.end));
@@ -35008,6 +35024,7 @@ var IncrementalParser;
       if (child.pos > changeRangeOldEnd) {
         moveElementEntirelyPastChangeRange(
           child,
+          sourceFile,
           /*isArray*/
           false,
           delta,
@@ -35020,7 +35037,7 @@ var IncrementalParser;
       const fullEnd = child.end;
       if (fullEnd >= changeStart) {
         markAsIntersectingIncrementalChange(child);
-        unsetNodeChildren(child);
+        unsetNodeChildren(child, sourceFile);
         adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
         forEachChild(child, visitNode3, visitArray2);
         if (hasJSDocNodes(child)) {
@@ -35038,6 +35055,7 @@ var IncrementalParser;
       if (array.pos > changeRangeOldEnd) {
         moveElementEntirelyPastChangeRange(
           array,
+          sourceFile,
           /*isArray*/
           true,
           delta,
@@ -51422,9 +51440,9 @@ function createTypeChecker(host) {
       const typePredicate = getTypePredicateOfSignature(signature);
       const type = getReturnTypeOfSignature(signature);
       if (context.enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */) && signature.declaration && !nodeIsSynthesized(signature.declaration)) {
-        const annotation = signature.declaration && getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
-        if (annotation && getTypeFromTypeNode2(context, annotation) === type) {
-          const result = tryReuseExistingTypeNodeHelper(context, annotation);
+        const annotation = getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
+        if (annotation) {
+          const result = tryReuseExistingTypeNode(context, annotation, type, context.enclosingDeclaration);
           if (result) {
             return result;
           }
@@ -51918,7 +51936,10 @@ function createTypeChecker(host) {
           );
         }
         if (isNamedDeclaration(node) && node.name.kind === 167 /* ComputedPropertyName */ && !isLateBindableName(node.name)) {
-          if (!(context.flags & 1 /* AllowUnresolvedNames */ && hasDynamicName(node) && isEntityNameExpression(node.name.expression) && checkComputedPropertyName(node.name).flags & 1 /* Any */)) {
+          if (!hasDynamicName(node)) {
+            return visitEachChild2(node, visitExistingNodeTreeSymbols);
+          }
+          if (!(context.flags & 1 /* AllowUnresolvedNames */ && isEntityNameExpression(node.name.expression) && checkComputedPropertyName(node.name).flags & 1 /* Any */)) {
             return void 0;
           }
         }
@@ -58009,7 +58030,7 @@ function createTypeChecker(host) {
     );
   }
   function createSignatureTypeMapper(signature, typeArguments) {
-    return createTypeMapper(signature.typeParameters, typeArguments);
+    return createTypeMapper(sameMap(signature.typeParameters, (tp) => tp.mapper ? instantiateType(tp, tp.mapper) : tp), typeArguments);
   }
   function getErasedSignature(signature) {
     return signature.typeParameters ? signature.erasedSignatureCache || (signature.erasedSignatureCache = createErasedSignature(signature)) : signature;
@@ -110974,6 +110995,7 @@ function transformDeclarations(context) {
   }
   function reportInferenceFallback(node) {
     if (!isolatedDeclarations || isSourceFileJS(currentSourceFile)) return;
+    if (getSourceFileOfNode(node) !== currentSourceFile) return;
     if (isVariableDeclaration(node) && resolver.isExpandoFunctionDeclaration(node)) {
       reportExpandoFunctionErrors(node);
     } else {
@@ -119475,7 +119497,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       const newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
       if (shouldCreateNewSourceFile || !newFile || newFile.impliedNodeFormat !== oldSourceFile.impliedNodeFormat || // old file wasn't redirect but new file is
       oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path) {
-        host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
+        host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path), newFile);
       }
     }
     if (!host.getParsedCommandLine) {
@@ -119485,7 +119507,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
             resolvedProjectReference.sourceFile,
             oldProgram.getCompilerOptions(),
             /*hasSourceFileByPath*/
-            false
+            false,
+            /*newSourceFileByResolvedPath*/
+            void 0
           );
         }
       });
@@ -125180,11 +125204,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         );
       } else if (packageDirWatcher.isSymlink !== isSymlink) {
         packageDirWatcher.dirPathToWatcher.forEach((watcher) => {
-          removeDirectoryWatcher(
-            packageDirWatcher.isSymlink ? packageDirPath : dirPath,
-            /*syncDirWatcherRemove*/
-            false
-          );
+          removeDirectoryWatcher(packageDirWatcher.isSymlink ? packageDirPath : dirPath);
           watcher.watcher = createDirPathToWatcher();
         });
         packageDirWatcher.isSymlink = isSymlink;
@@ -125224,7 +125244,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     return dirWatcher;
   }
-  function stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot, syncDirWatcherRemove) {
+  function stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot) {
     const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
     const toWatch = getDirectoryToWatchFailedLookupLocation(
       failedLookupLocation,
@@ -125244,7 +125264,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         const forDirPath = packageDirWatcher.dirPathToWatcher.get(dirPath);
         forDirPath.refCount--;
         if (forDirPath.refCount === 0) {
-          removeDirectoryWatcher(packageDirWatcher.isSymlink ? packageDirPath : dirPath, syncDirWatcherRemove);
+          removeDirectoryWatcher(packageDirWatcher.isSymlink ? packageDirPath : dirPath);
           packageDirWatcher.dirPathToWatcher.delete(dirPath);
           if (packageDirWatcher.isSymlink) {
             const refCount = dirPathToSymlinkPackageRefCount.get(dirPath) - 1;
@@ -125254,15 +125274,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
               dirPathToSymlinkPackageRefCount.set(dirPath, refCount);
             }
           }
-          if (syncDirWatcherRemove) closePackageDirWatcher(packageDirWatcher, packageDirPath);
         }
       } else {
-        removeDirectoryWatcher(dirPath, syncDirWatcherRemove);
+        removeDirectoryWatcher(dirPath);
       }
     }
     return removeAtRoot;
   }
-  function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName, syncDirWatcherRemove) {
+  function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
     Debug.checkDefined(resolution.files).delete(filePath);
     if (resolution.files.size) return;
     resolution.files = void 0;
@@ -125277,11 +125296,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       let removeAtRoot = false;
       if (failedLookupLocations) {
         for (const failedLookupLocation of failedLookupLocations) {
-          removeAtRoot = stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot, syncDirWatcherRemove);
+          removeAtRoot = stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot);
         }
       }
-      if (alternateResult) removeAtRoot = stopWatchFailedLookupLocation(alternateResult, removeAtRoot, syncDirWatcherRemove);
-      if (removeAtRoot) removeDirectoryWatcher(rootPath, syncDirWatcherRemove);
+      if (alternateResult) removeAtRoot = stopWatchFailedLookupLocation(alternateResult, removeAtRoot);
+      if (removeAtRoot) removeDirectoryWatcher(rootPath);
     } else if (affectingLocations == null ? void 0 : affectingLocations.length) {
       resolutionsWithOnlyAffectingLocations.delete(resolution);
     }
@@ -125289,14 +125308,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       for (const affectingLocation of affectingLocations) {
         const watcher = fileWatchesOfAffectingLocations.get(affectingLocation);
         watcher.resolutions--;
-        if (syncDirWatcherRemove) closeFileWatcherOfAffectingLocation(watcher, affectingLocation);
       }
     }
   }
-  function removeDirectoryWatcher(dirPath, syncDirWatcherRemove) {
+  function removeDirectoryWatcher(dirPath) {
     const dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);
     dirWatcher.refCount--;
-    if (syncDirWatcherRemove) closeDirectoryWatchesOfFailedLookup(dirWatcher, dirPath);
   }
   function createDirectoryWatcher(directory, dirPath, nonRecursive) {
     return resolutionHost.watchDirectoryOfFailedLookupLocation(directory, (fileOrDirectory) => {
@@ -125307,15 +125324,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath);
     }, nonRecursive ? 0 /* None */ : 1 /* Recursive */);
   }
-  function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName, syncDirWatcherRemove) {
+  function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName) {
     const resolutions = cache.get(filePath);
     if (resolutions) {
       resolutions.forEach(
         (resolution) => stopWatchFailedLookupLocationOfResolution(
           resolution,
           filePath,
-          getResolutionWithResolvedFileName,
-          syncDirWatcherRemove
+          getResolutionWithResolvedFileName
         )
       );
       cache.delete(filePath);
@@ -125329,9 +125345,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!resolvedProjectReference) return;
     resolvedProjectReference.commandLine.fileNames.forEach((f) => removeResolutionsOfFile(resolutionHost.toPath(f)));
   }
-  function removeResolutionsOfFile(filePath, syncDirWatcherRemove) {
-    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModuleFromResolution, syncDirWatcherRemove);
-    removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirectiveFromResolution, syncDirWatcherRemove);
+  function removeResolutionsOfFile(filePath) {
+    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModuleFromResolution);
+    removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirectiveFromResolution);
   }
   function invalidateResolutions(resolutions, canInvalidate) {
     if (!resolutions) return false;

package/lib/typescript.js

@@ -2143,6 +2143,7 @@ __export(typescript_exports, {
   trace: () => trace,
   tracing: () => tracing,
   tracingEnabled: () => tracingEnabled,
+  transferSourceFileChildren: () => transferSourceFileChildren,
   transform: () => transform,
   transformClassFields: () => transformClassFields,
   transformDeclarations: () => transformDeclarations,
@@ -2250,7 +2251,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240708`;
+var version = `${versionMajorMinor}.0-dev.20240710`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -16357,7 +16358,7 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
   }
   if (isJSDocNode(node) || node.kind === 12 /* JsxText */) {
     return skipTrivia(
-      (sourceFile || getSourceFileOfNode(node)).text,
+      (sourceFile ?? getSourceFileOfNode(node)).text,
       node.pos,
       /*stopAfterLineBreak*/
       false,
@@ -16369,13 +16370,14 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
     return getTokenPosOfNode(node.jsDoc[0], sourceFile);
   }
   if (node.kind === 352 /* SyntaxList */) {
-    const first2 = firstOrUndefined(getNodeChildren(node));
+    sourceFile ?? (sourceFile = getSourceFileOfNode(node));
+    const first2 = firstOrUndefined(getNodeChildren(node, sourceFile));
     if (first2) {
       return getTokenPosOfNode(first2, sourceFile, includeJsDoc);
     }
   }
   return skipTrivia(
-    (sourceFile || getSourceFileOfNode(node)).text,
+    (sourceFile ?? getSourceFileOfNode(node)).text,
     node.pos,
     /*stopAfterLineBreak*/
     false,
@@ -27606,7 +27608,7 @@ function createNodeFactory(flags, baseFactory2) {
   }
   function createSyntaxList3(children) {
     const node = createBaseNode(352 /* SyntaxList */);
-    setNodeChildren(node, children);
+    node._children = children;
     return node;
   }
   function createNotEmittedStatement(original) {
@@ -30507,17 +30509,43 @@ function isSyntaxList(n) {
 }
 
 // src/compiler/factory/nodeChildren.ts
-var nodeChildren = /* @__PURE__ */ new WeakMap();
-function getNodeChildren(node) {
-  if (!isNodeKind(node.kind)) return emptyArray;
-  return nodeChildren.get(node);
+var sourceFileToNodeChildren = /* @__PURE__ */ new WeakMap();
+function getNodeChildren(node, sourceFile) {
+  var _a;
+  const kind = node.kind;
+  if (!isNodeKind(kind)) {
+    return emptyArray;
+  }
+  if (kind === 352 /* SyntaxList */) {
+    return node._children;
+  }
+  return (_a = sourceFileToNodeChildren.get(sourceFile)) == null ? void 0 : _a.get(node);
 }
-function setNodeChildren(node, children) {
-  nodeChildren.set(node, children);
+function setNodeChildren(node, sourceFile, children) {
+  if (node.kind === 352 /* SyntaxList */) {
+    Debug.fail("Should not need to re-set the children of a SyntaxList.");
+  }
+  let map2 = sourceFileToNodeChildren.get(sourceFile);
+  if (map2 === void 0) {
+    map2 = /* @__PURE__ */ new WeakMap();
+    sourceFileToNodeChildren.set(sourceFile, map2);
+  }
+  map2.set(node, children);
   return children;
 }
-function unsetNodeChildren(node) {
-  nodeChildren.delete(node);
+function unsetNodeChildren(node, origSourceFile) {
+  var _a;
+  if (node.kind === 352 /* SyntaxList */) {
+    Debug.fail("Did not expect to unset the children of a SyntaxList.");
+  }
+  (_a = sourceFileToNodeChildren.get(origSourceFile)) == null ? void 0 : _a.delete(node);
+}
+function transferSourceFileChildren(sourceFile, targetSourceFile) {
+  const map2 = sourceFileToNodeChildren.get(sourceFile);
+  if (map2 !== void 0) {
+    sourceFileToNodeChildren.delete(sourceFile);
+    sourceFileToNodeChildren.set(targetSourceFile, map2);
+  }
 }
 
 // src/compiler/factory/utilities.ts
@@ -39126,6 +39154,7 @@ var IncrementalParser;
       aggressiveChecks
     );
     result.impliedNodeFormat = sourceFile.impliedNodeFormat;
+    transferSourceFileChildren(sourceFile, result);
     return result;
   }
   IncrementalParser2.updateSourceFile = updateSourceFile2;
@@ -39161,7 +39190,7 @@ var IncrementalParser;
       }
     }
   }
-  function moveElementEntirelyPastChangeRange(element, isArray2, delta, oldText, newText, aggressiveChecks) {
+  function moveElementEntirelyPastChangeRange(element, origSourceFile, isArray2, delta, oldText, newText, aggressiveChecks) {
     if (isArray2) {
       visitArray2(element);
     } else {
@@ -39173,7 +39202,7 @@ var IncrementalParser;
       if (aggressiveChecks && shouldCheckNode(node)) {
         text = oldText.substring(node.pos, node.end);
       }
-      unsetNodeChildren(node);
+      unsetNodeChildren(node, origSourceFile);
       setTextRangePosEnd(node, node.pos + delta, node.end + delta);
       if (aggressiveChecks && shouldCheckNode(node)) {
         Debug.assert(text === newText.substring(node.pos, node.end));
@@ -39247,6 +39276,7 @@ var IncrementalParser;
       if (child.pos > changeRangeOldEnd) {
         moveElementEntirelyPastChangeRange(
           child,
+          sourceFile,
           /*isArray*/
           false,
           delta,
@@ -39259,7 +39289,7 @@ var IncrementalParser;
       const fullEnd = child.end;
       if (fullEnd >= changeStart) {
         markAsIntersectingIncrementalChange(child);
-        unsetNodeChildren(child);
+        unsetNodeChildren(child, sourceFile);
         adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
         forEachChild(child, visitNode3, visitArray2);
         if (hasJSDocNodes(child)) {
@@ -39277,6 +39307,7 @@ var IncrementalParser;
       if (array.pos > changeRangeOldEnd) {
         moveElementEntirelyPastChangeRange(
           array,
+          sourceFile,
           /*isArray*/
           true,
           delta,
@@ -56010,9 +56041,9 @@ function createTypeChecker(host) {
       const typePredicate = getTypePredicateOfSignature(signature);
       const type = getReturnTypeOfSignature(signature);
       if (context.enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */) && signature.declaration && !nodeIsSynthesized(signature.declaration)) {
-        const annotation = signature.declaration && getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
-        if (annotation && getTypeFromTypeNode2(context, annotation) === type) {
-          const result = tryReuseExistingTypeNodeHelper(context, annotation);
+        const annotation = getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
+        if (annotation) {
+          const result = tryReuseExistingTypeNode(context, annotation, type, context.enclosingDeclaration);
           if (result) {
             return result;
           }
@@ -56506,7 +56537,10 @@ function createTypeChecker(host) {
           );
         }
         if (isNamedDeclaration(node) && node.name.kind === 167 /* ComputedPropertyName */ && !isLateBindableName(node.name)) {
-          if (!(context.flags & 1 /* AllowUnresolvedNames */ && hasDynamicName(node) && isEntityNameExpression(node.name.expression) && checkComputedPropertyName(node.name).flags & 1 /* Any */)) {
+          if (!hasDynamicName(node)) {
+            return visitEachChild2(node, visitExistingNodeTreeSymbols);
+          }
+          if (!(context.flags & 1 /* AllowUnresolvedNames */ && isEntityNameExpression(node.name.expression) && checkComputedPropertyName(node.name).flags & 1 /* Any */)) {
             return void 0;
           }
         }
@@ -62597,7 +62631,7 @@ function createTypeChecker(host) {
     );
   }
   function createSignatureTypeMapper(signature, typeArguments) {
-    return createTypeMapper(signature.typeParameters, typeArguments);
+    return createTypeMapper(sameMap(signature.typeParameters, (tp) => tp.mapper ? instantiateType(tp, tp.mapper) : tp), typeArguments);
   }
   function getErasedSignature(signature) {
     return signature.typeParameters ? signature.erasedSignatureCache || (signature.erasedSignatureCache = createErasedSignature(signature)) : signature;
@@ -115744,6 +115778,7 @@ function transformDeclarations(context) {
   }
   function reportInferenceFallback(node) {
     if (!isolatedDeclarations || isSourceFileJS(currentSourceFile)) return;
+    if (getSourceFileOfNode(node) !== currentSourceFile) return;
     if (isVariableDeclaration(node) && resolver.isExpandoFunctionDeclaration(node)) {
       reportExpandoFunctionErrors(node);
     } else {
@@ -124299,7 +124334,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       const newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
       if (shouldCreateNewSourceFile || !newFile || newFile.impliedNodeFormat !== oldSourceFile.impliedNodeFormat || // old file wasn't redirect but new file is
       oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path) {
-        host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
+        host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path), newFile);
       }
     }
     if (!host.getParsedCommandLine) {
@@ -124309,7 +124344,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
             resolvedProjectReference.sourceFile,
             oldProgram.getCompilerOptions(),
             /*hasSourceFileByPath*/
-            false
+            false,
+            /*newSourceFileByResolvedPath*/
+            void 0
           );
         }
       });
@@ -130065,11 +130102,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         );
       } else if (packageDirWatcher.isSymlink !== isSymlink) {
         packageDirWatcher.dirPathToWatcher.forEach((watcher) => {
-          removeDirectoryWatcher(
-            packageDirWatcher.isSymlink ? packageDirPath : dirPath,
-            /*syncDirWatcherRemove*/
-            false
-          );
+          removeDirectoryWatcher(packageDirWatcher.isSymlink ? packageDirPath : dirPath);
           watcher.watcher = createDirPathToWatcher();
         });
         packageDirWatcher.isSymlink = isSymlink;
@@ -130109,7 +130142,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     return dirWatcher;
   }
-  function stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot, syncDirWatcherRemove) {
+  function stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot) {
     const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
     const toWatch = getDirectoryToWatchFailedLookupLocation(
       failedLookupLocation,
@@ -130129,7 +130162,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         const forDirPath = packageDirWatcher.dirPathToWatcher.get(dirPath);
         forDirPath.refCount--;
         if (forDirPath.refCount === 0) {
-          removeDirectoryWatcher(packageDirWatcher.isSymlink ? packageDirPath : dirPath, syncDirWatcherRemove);
+          removeDirectoryWatcher(packageDirWatcher.isSymlink ? packageDirPath : dirPath);
           packageDirWatcher.dirPathToWatcher.delete(dirPath);
           if (packageDirWatcher.isSymlink) {
             const refCount = dirPathToSymlinkPackageRefCount.get(dirPath) - 1;
@@ -130139,15 +130172,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
               dirPathToSymlinkPackageRefCount.set(dirPath, refCount);
             }
           }
-          if (syncDirWatcherRemove) closePackageDirWatcher(packageDirWatcher, packageDirPath);
         }
       } else {
-        removeDirectoryWatcher(dirPath, syncDirWatcherRemove);
+        removeDirectoryWatcher(dirPath);
       }
     }
     return removeAtRoot;
   }
-  function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName, syncDirWatcherRemove) {
+  function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
     Debug.checkDefined(resolution.files).delete(filePath);
     if (resolution.files.size) return;
     resolution.files = void 0;
@@ -130162,11 +130194,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       let removeAtRoot = false;
       if (failedLookupLocations) {
         for (const failedLookupLocation of failedLookupLocations) {
-          removeAtRoot = stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot, syncDirWatcherRemove);
+          removeAtRoot = stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot);
         }
       }
-      if (alternateResult) removeAtRoot = stopWatchFailedLookupLocation(alternateResult, removeAtRoot, syncDirWatcherRemove);
-      if (removeAtRoot) removeDirectoryWatcher(rootPath, syncDirWatcherRemove);
+      if (alternateResult) removeAtRoot = stopWatchFailedLookupLocation(alternateResult, removeAtRoot);
+      if (removeAtRoot) removeDirectoryWatcher(rootPath);
     } else if (affectingLocations == null ? void 0 : affectingLocations.length) {
       resolutionsWithOnlyAffectingLocations.delete(resolution);
     }
@@ -130174,14 +130206,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       for (const affectingLocation of affectingLocations) {
         const watcher = fileWatchesOfAffectingLocations.get(affectingLocation);
         watcher.resolutions--;
-        if (syncDirWatcherRemove) closeFileWatcherOfAffectingLocation(watcher, affectingLocation);
       }
     }
   }
-  function removeDirectoryWatcher(dirPath, syncDirWatcherRemove) {
+  function removeDirectoryWatcher(dirPath) {
     const dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);
     dirWatcher.refCount--;
-    if (syncDirWatcherRemove) closeDirectoryWatchesOfFailedLookup(dirWatcher, dirPath);
   }
   function createDirectoryWatcher(directory, dirPath, nonRecursive) {
     return resolutionHost.watchDirectoryOfFailedLookupLocation(directory, (fileOrDirectory) => {
@@ -130192,15 +130222,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath);
     }, nonRecursive ? 0 /* None */ : 1 /* Recursive */);
   }
-  function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName, syncDirWatcherRemove) {
+  function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName) {
     const resolutions = cache.get(filePath);
     if (resolutions) {
       resolutions.forEach(
         (resolution) => stopWatchFailedLookupLocationOfResolution(
           resolution,
           filePath,
-          getResolutionWithResolvedFileName,
-          syncDirWatcherRemove
+          getResolutionWithResolvedFileName
         )
       );
       cache.delete(filePath);
@@ -130214,9 +130243,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!resolvedProjectReference) return;
     resolvedProjectReference.commandLine.fileNames.forEach((f) => removeResolutionsOfFile(resolutionHost.toPath(f)));
   }
-  function removeResolutionsOfFile(filePath, syncDirWatcherRemove) {
-    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModuleFromResolution, syncDirWatcherRemove);
-    removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirectiveFromResolution, syncDirWatcherRemove);
+  function removeResolutionsOfFile(filePath) {
+    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModuleFromResolution);
+    removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirectiveFromResolution);
   }
   function invalidateResolutions(resolutions, canInvalidate) {
     if (!resolutions) return false;
@@ -148116,9 +148145,9 @@ var NodeObject = class {
   getChildAt(index, sourceFile) {
     return this.getChildren(sourceFile)[index];
   }
-  getChildren(sourceFile) {
+  getChildren(sourceFile = getSourceFileOfNode(this)) {
     this.assertHasRealPosition("Node without a real position cannot be scanned and thus has no token nodes - use forEachChild and collect the result if that's fine");
-    return getNodeChildren(this) ?? setNodeChildren(this, createChildren(this, sourceFile));
+    return getNodeChildren(this, sourceFile) ?? setNodeChildren(this, sourceFile, createChildren(this, sourceFile));
   }
   getFirstToken(sourceFile) {
     this.assertHasRealPosition();
@@ -148199,7 +148228,7 @@ function createSyntaxList(nodes, parent2) {
     pos = node.end;
   }
   addSyntheticNodes(children, pos, nodes.end, parent2);
-  setNodeChildren(list, children);
+  list._children = children;
   return list;
 }
 var TokenOrIdentifierObject = class {
@@ -149138,13 +149167,18 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       if (host.getParsedCommandLine) {
         (_a3 = host.onReleaseParsedCommandLine) == null ? void 0 : _a3.call(host, configFileName, oldResolvedRef, oldOptions);
       } else if (oldResolvedRef) {
-        onReleaseOldSourceFile(oldResolvedRef.sourceFile, oldOptions);
+        releaseOldSourceFile(oldResolvedRef.sourceFile, oldOptions);
       }
     }
-    function onReleaseOldSourceFile(oldSourceFile, oldOptions) {
+    function releaseOldSourceFile(oldSourceFile, oldOptions) {
       const oldSettingsKey = documentRegistry.getKeyForCompilationSettings(oldOptions);
       documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, oldSettingsKey, oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
     }
+    function onReleaseOldSourceFile(oldSourceFile, oldOptions, hasSourceFileByPath, newSourceFileByResolvedPath) {
+      var _a3;
+      releaseOldSourceFile(oldSourceFile, oldOptions);
+      (_a3 = host.onReleaseOldSourceFile) == null ? void 0 : _a3.call(host, oldSourceFile, oldOptions, hasSourceFileByPath, newSourceFileByResolvedPath);
+    }
     function getOrCreateSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) {
       return getOrCreateSourceFileByPath(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), languageVersionOrOptions, onError, shouldCreateNewSourceFile);
     }
@@ -167947,7 +167981,7 @@ function getContainingModuleSymbol(importer, checker) {
   return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
 }
 function getSourceFileLikeForImportDeclaration(node) {
-  if (node.kind === 213 /* CallExpression */) {
+  if (node.kind === 213 /* CallExpression */ || node.kind === 351 /* JSDocImportTag */) {
     return node.getSourceFile();
   }
   const { parent: parent2 } = node;
@@ -178404,8 +178438,9 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
     const { pos, end } = pasteLocations[i];
     newText = actualPastedText ? newText.slice(0, pos) + actualPastedText[0] + newText.slice(end) : newText.slice(0, pos) + pastedText[i] + newText.slice(end);
   }
+  let importAdder;
   Debug.checkDefined(host.runWithTemporaryFileUpdate).call(host, targetFile.fileName, newText, (updatedProgram, originalProgram, updatedFile) => {
-    const importAdder = ts_codefix_exports.createImportAdder(updatedFile, updatedProgram, preferences, host);
+    importAdder = ts_codefix_exports.createImportAdder(updatedFile, updatedProgram, preferences, host);
     if (copiedFrom == null ? void 0 : copiedFrom.range) {
       Debug.assert(copiedFrom.range.length === pastedText.length);
       copiedFrom.range.forEach((copy) => {
@@ -178452,6 +178487,9 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
     }
     importAdder.writeFixes(changes, getQuotePreference(copiedFrom ? copiedFrom.file : targetFile, preferences));
   });
+  if (!importAdder.hasFixes()) {
+    return;
+  }
   pasteLocations.forEach((paste, i) => {
     changes.replaceRangeWithText(
       targetFile,
@@ -180571,6 +180609,7 @@ __export(ts_exports2, {
   trace: () => trace,
   tracing: () => tracing,
   tracingEnabled: () => tracingEnabled,
+  transferSourceFileChildren: () => transferSourceFileChildren,
   transform: () => transform,
   transformClassFields: () => transformClassFields,
   transformDeclarations: () => transformDeclarations,
@@ -183084,6 +183123,12 @@ var Project2 = class _Project {
     this.hasAddedOrRemovedSymlinks = true;
   }
   /** @internal */
+  onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath, newSourceFileByResolvedPath) {
+    if (!newSourceFileByResolvedPath || oldSourceFile.resolvedPath === oldSourceFile.path && newSourceFileByResolvedPath.resolvedPath !== oldSourceFile.path) {
+      this.detachScriptInfoFromProject(oldSourceFile.fileName, hasSourceFileByPath);
+    }
+  }
+  /** @internal */
   updateFromProject() {
     updateProjectIfDirty(this);
   }
@@ -183267,30 +183312,6 @@ var Project2 = class _Project {
     let hasNewProgram = false;
     if (this.program && (!oldProgram || this.program !== oldProgram && this.program.structureIsReused !== 2 /* Completely */)) {
       hasNewProgram = true;
-      if (oldProgram) {
-        for (const f of oldProgram.getSourceFiles()) {
-          const newFile = this.program.getSourceFileByPath(f.resolvedPath);
-          if (!newFile || f.resolvedPath === f.path && newFile.resolvedPath !== f.path) {
-            this.detachScriptInfoFromProject(
-              f.fileName,
-              !!this.program.getSourceFileByPath(f.path),
-              /*syncDirWatcherRemove*/
-              true
-            );
-          }
-        }
-        oldProgram.forEachResolvedProjectReference((resolvedProjectReference) => {
-          if (!this.program.getResolvedProjectReferenceByPath(resolvedProjectReference.sourceFile.path)) {
-            this.detachScriptInfoFromProject(
-              resolvedProjectReference.sourceFile.fileName,
-              /*noRemoveResolution*/
-              void 0,
-              /*syncDirWatcherRemove*/
-              true
-            );
-          }
-        });
-      }
       this.rootFilesMap.forEach((value, path) => {
         var _a2;
         const file = this.program.getSourceFileByPath(path);
@@ -183415,12 +183436,12 @@ var Project2 = class _Project {
   sendPerformanceEvent(kind, durationMs) {
     this.projectService.sendPerformanceEvent(kind, durationMs);
   }
-  detachScriptInfoFromProject(uncheckedFileName, noRemoveResolution, syncDirWatcherRemove) {
+  detachScriptInfoFromProject(uncheckedFileName, noRemoveResolution) {
     const scriptInfoToDetach = this.projectService.getScriptInfo(uncheckedFileName);
     if (scriptInfoToDetach) {
       scriptInfoToDetach.detachFromProject(this);
       if (!noRemoveResolution) {
-        this.resolutionCache.removeResolutionsOfFile(scriptInfoToDetach.path, syncDirWatcherRemove);
+        this.resolutionCache.removeResolutionsOfFile(scriptInfoToDetach.path);
       }
     }
   }
@@ -194946,6 +194967,7 @@ if (typeof console !== "undefined") {
   trace,
   tracing,
   tracingEnabled,
+  transferSourceFileChildren,
   transform,
   transformClassFields,
   transformDeclarations,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240708",
+    "version": "5.6.0-dev.20240710",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -68,7 +68,7 @@
         "globals": "^13.24.0",
         "hereby": "^1.8.9",
         "jsonc-parser": "^3.3.1",
-        "knip": "^5.23.1",
+        "knip": "^5.25.1",
         "minimist": "^1.2.8",
         "mocha": "^10.5.2",
         "mocha-fivemat-progress-reporter": "^0.1.0",
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "3163fe7e3898c1f48cd9bc097b96e3426cd2a453"
+    "gitHead": "a6a0f4ad58fc0d1a66c4a844dbeb53a855c13ab5"
 }