typescript 5.5.0-dev.20240523 → 5.5.0-dev.20240524

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240523`;
+var version = `${versionMajorMinor}.0-dev.20240524`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3561,6 +3561,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["TemplateLiteral"] = 134217728] = "TemplateLiteral";
   TypeFlags2[TypeFlags2["StringMapping"] = 268435456] = "StringMapping";
   TypeFlags2[TypeFlags2["Reserved1"] = 536870912] = "Reserved1";
+  TypeFlags2[TypeFlags2["Reserved2"] = 1073741824] = "Reserved2";
   TypeFlags2[TypeFlags2["AnyOrUnknown"] = 3] = "AnyOrUnknown";
   TypeFlags2[TypeFlags2["Nullable"] = 98304] = "Nullable";
   TypeFlags2[TypeFlags2["Literal"] = 2944] = "Literal";
@@ -3599,6 +3600,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
   TypeFlags2[TypeFlags2["IncludesConstrainedTypeVariable"] = 536870912 /* Reserved1 */] = "IncludesConstrainedTypeVariable";
+  TypeFlags2[TypeFlags2["IncludesError"] = 1073741824 /* Reserved2 */] = "IncludesError";
   TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
@@ -46240,7 +46242,12 @@ function createTypeChecker(host) {
         if (resolvedTarget === unknownSymbol) {
           return source;
         }
-        target = cloneSymbol(resolvedTarget);
+        if (!(resolvedTarget.flags & getExcludedSymbolFlags(source.flags)) || (source.flags | resolvedTarget.flags) & 67108864 /* Assignment */) {
+          target = cloneSymbol(resolvedTarget);
+        } else {
+          reportMergeSymbolError(target, source);
+          return source;
+        }
       }
       if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
         target.constEnumOnlyModule = false;
@@ -46270,27 +46277,30 @@ function createTypeChecker(host) {
         );
       }
     } else {
-      const isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
-      const isEitherBlockScoped = !!(target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */);
+      reportMergeSymbolError(target, source);
+    }
+    return target;
+    function reportMergeSymbolError(target2, source2) {
+      const isEitherEnum = !!(target2.flags & 384 /* Enum */ || source2.flags & 384 /* Enum */);
+      const isEitherBlockScoped = !!(target2.flags & 2 /* BlockScopedVariable */ || source2.flags & 2 /* BlockScopedVariable */);
       const message = isEitherEnum ? Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations : isEitherBlockScoped ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
-      const sourceSymbolFile = source.declarations && getSourceFileOfNode(source.declarations[0]);
-      const targetSymbolFile = target.declarations && getSourceFileOfNode(target.declarations[0]);
+      const sourceSymbolFile = source2.declarations && getSourceFileOfNode(source2.declarations[0]);
+      const targetSymbolFile = target2.declarations && getSourceFileOfNode(target2.declarations[0]);
       const isSourcePlainJs = isPlainJsFile(sourceSymbolFile, compilerOptions.checkJs);
       const isTargetPlainJs = isPlainJsFile(targetSymbolFile, compilerOptions.checkJs);
-      const symbolName2 = symbolToString(source);
+      const symbolName2 = symbolToString(source2);
       if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
         const firstFile = comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
         const secondFile = firstFile === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
         const filesDuplicates = getOrUpdate(amalgamatedDuplicates, `${firstFile.path}|${secondFile.path}`, () => ({ firstFile, secondFile, conflictingSymbols: /* @__PURE__ */ new Map() }));
         const conflictingSymbolInfo = getOrUpdate(filesDuplicates.conflictingSymbols, symbolName2, () => ({ isBlockScoped: isEitherBlockScoped, firstFileLocations: [], secondFileLocations: [] }));
-        if (!isSourcePlainJs) addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source);
-        if (!isTargetPlainJs) addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target);
+        if (!isSourcePlainJs) addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source2);
+        if (!isTargetPlainJs) addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target2);
       } else {
-        if (!isSourcePlainJs) addDuplicateDeclarationErrorsForSymbols(source, message, symbolName2, target);
-        if (!isTargetPlainJs) addDuplicateDeclarationErrorsForSymbols(target, message, symbolName2, source);
+        if (!isSourcePlainJs) addDuplicateDeclarationErrorsForSymbols(source2, message, symbolName2, target2);
+        if (!isTargetPlainJs) addDuplicateDeclarationErrorsForSymbols(target2, message, symbolName2, source2);
       }
     }
-    return target;
     function addDuplicateLocations(locs, symbol) {
       if (symbol.declarations) {
         for (const decl of symbol.declarations) {
@@ -49136,6 +49146,9 @@ function createTypeChecker(host) {
   function isClassInstanceSide(type) {
     return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || !!(type.flags & 524288 /* Object */) && !!(getObjectFlags(type) & 16777216 /* IsClassInstanceClone */));
   }
+  function getTypeFromTypeNodeWithoutContext(node) {
+    return getTypeFromTypeNode(node);
+  }
   function createNodeBuilder() {
     return {
       typeToTypeNode: (type, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => typeToTypeNodeHelper(type, context)),
@@ -49164,6 +49177,12 @@ function createTypeChecker(host) {
       symbolTableToDeclarationStatements: (symbolTable, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => symbolTableToDeclarationStatements(symbolTable, context)),
       symbolToNode: (symbol, meaning, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => symbolToNode(symbol, context, meaning))
     };
+    function getTypeFromTypeNode2(context, node, noMappedTypes) {
+      const type = getTypeFromTypeNodeWithoutContext(node);
+      if (!context.mapper) return type;
+      const mappedType = instantiateType(type, context.mapper);
+      return noMappedTypes && mappedType !== type ? void 0 : mappedType;
+    }
     function setTextRange2(context, range, location) {
       if (!nodeIsSynthesized(range) && !(range.flags & 16 /* Synthesized */) && (!context.enclosingFile || context.enclosingFile !== getSourceFileOfNode(range))) {
         range = factory.cloneNode(range);
@@ -49209,7 +49228,7 @@ function createTypeChecker(host) {
       }
       const clone = tryReuseExistingNonParameterTypeNode(context, typeNode, type, host2);
       if (clone) {
-        if (addUndefined && !someType(getTypeFromTypeNode(typeNode), (t) => !!(t.flags & 32768 /* Undefined */))) {
+        if (addUndefined && !someType(getTypeFromTypeNode2(context, typeNode), (t) => !!(t.flags & 32768 /* Undefined */))) {
           return factory.createUnionTypeNode([clone, factory.createKeywordTypeNode(157 /* UndefinedKeyword */)]);
         }
         return clone;
@@ -49222,8 +49241,13 @@ function createTypeChecker(host) {
       }
       return void 0;
     }
-    function tryReuseExistingNonParameterTypeNode(context, existing, type, host2 = context.enclosingDeclaration, annotationType) {
-      if (typeNodeIsEquivalentToType(existing, host2, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
+    function tryReuseExistingNonParameterTypeNode(context, existing, type, host2 = context.enclosingDeclaration, annotationType = getTypeFromTypeNode2(
+      context,
+      existing,
+      /*noMappedTypes*/
+      true
+    )) {
+      if (annotationType && typeNodeIsEquivalentToType(host2, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
         const result = tryReuseExistingTypeNodeHelper(context, existing);
         if (result) {
           return result;
@@ -49271,7 +49295,8 @@ function createTypeChecker(host) {
         mustCreateTypeParametersNamesLookups: true,
         typeParameterNames: void 0,
         typeParameterNamesByText: void 0,
-        typeParameterNamesByTextNextNameCount: void 0
+        typeParameterNamesByTextNextNameCount: void 0,
+        mapper: void 0
       };
       context.tracker = new SymbolTrackerImpl(context, tracker, moduleResolverHost);
       const resultingNode = cb(context);
@@ -49562,8 +49587,8 @@ function createTypeChecker(host) {
           context.inferTypeParameters = type2.root.inferTypeParameters;
           const extendsTypeNode2 = typeToTypeNodeHelper(instantiateType(type2.root.extendsType, newMapper), context);
           context.inferTypeParameters = saveInferTypeParameters2;
-          const trueTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type2.root.node.trueType), newMapper));
-          const falseTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type2.root.node.falseType), newMapper));
+          const trueTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode2(context, type2.root.node.trueType), newMapper));
+          const falseTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode2(context, type2.root.node.falseType), newMapper));
           return factory.createConditionalTypeNode(
             checkTypeNode,
             factory.createInferTypeNode(factory.createTypeParameterDeclaration(
@@ -49646,7 +49671,7 @@ function createTypeChecker(host) {
         context.approximateLength += 10;
         const result = setEmitFlags(mappedTypeNode, 1 /* SingleLine */);
         if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type2) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
-          const originalConstraint = instantiateType(getConstraintOfTypeParameter(getTypeFromTypeNode(type2.declaration.typeParameter.constraint.type)) || unknownType, type2.mapper);
+          const originalConstraint = instantiateType(getConstraintOfTypeParameter(getTypeFromTypeNode2(context, type2.declaration.typeParameter.constraint.type)) || unknownType, type2.mapper);
           return factory.createConditionalTypeNode(
             typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context),
             factory.createInferTypeNode(factory.createTypeParameterDeclaration(
@@ -50273,7 +50298,7 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
-      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters, signature.parameters);
+      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters, signature.parameters, signature.mapper);
       context.approximateLength += 3;
       if (context.flags & 32 /* WriteTypeArgumentsOfSignature */ && signature.target && signature.mapper && signature.target.typeParameters) {
         typeArguments = signature.target.typeParameters.map((parameter) => typeToTypeNodeHelper(instantiateType(parameter, signature.mapper), context));
@@ -50381,11 +50406,15 @@ function createTypeChecker(host) {
     function getParametersInScope(node) {
       return isFunctionLike(node) || isJSDocSignature(node) ? getSignatureFromDeclaration(node).parameters : void 0;
     }
-    function enterNewScope(context, declaration, expandedParams, typeParameters, originalParameters) {
+    function enterNewScope(context, declaration, expandedParams, typeParameters, originalParameters, mapper) {
       const cleanupContext = cloneNodeBuilderContext(context);
       let cleanupParams;
       let cleanupTypeParams;
       const oldEnclosingDecl = context.enclosingDeclaration;
+      const oldMapper = context.mapper;
+      if (mapper) {
+        context.mapper = mapper;
+      }
       if (context.enclosingDeclaration && declaration) {
         let pushFakeScope2 = function(kind, addAll) {
           Debug.assert(context.enclosingDeclaration);
@@ -50484,6 +50513,7 @@ function createTypeChecker(host) {
         cleanupTypeParams == null ? void 0 : cleanupTypeParams();
         cleanupContext();
         context.enclosingDeclaration = oldEnclosingDecl;
+        context.mapper = oldMapper;
       };
     }
     function tryGetThisParameterDeclaration(signature, context) {
@@ -50501,7 +50531,7 @@ function createTypeChecker(host) {
             "this",
             /*questionToken*/
             void 0,
-            typeToTypeNodeHelper(getTypeFromTypeNode(thisTag.typeExpression), context)
+            typeToTypeNodeHelper(getTypeFromTypeNode2(context, thisTag.typeExpression), context)
           );
         }
       }
@@ -51140,10 +51170,10 @@ function createTypeChecker(host) {
       const addUndefined = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration);
       const enclosingDeclaration = context.enclosingDeclaration;
       if (enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */)) {
-        const declWithExistingAnnotation = declaration && getNonlocalEffectiveTypeAnnotationNode(declaration) ? declaration : getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
+        const declWithExistingAnnotation = declaration && getNonlocalEffectiveTypeAnnotationNode(declaration) ? declaration : getDeclarationWithTypeAnnotation(symbol);
         if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
           const existing = getNonlocalEffectiveTypeAnnotationNode(declWithExistingAnnotation);
-          const result2 = tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined);
+          const result2 = !isTypePredicateNode(existing) && tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined);
           if (result2) {
             return result2;
           }
@@ -51163,7 +51193,7 @@ function createTypeChecker(host) {
       context.flags = oldFlags;
       return result;
     }
-    function typeNodeIsEquivalentToType(typeNode, annotatedDeclaration, type, typeFromTypeNode = getTypeFromTypeNode(typeNode)) {
+    function typeNodeIsEquivalentToType(annotatedDeclaration, type, typeFromTypeNode) {
       if (typeFromTypeNode === type) {
         return true;
       }
@@ -51193,13 +51223,10 @@ function createTypeChecker(host) {
     function serializeReturnTypeForSignatureWorker(context, signature) {
       const typePredicate = getTypePredicateOfSignature(signature);
       const type = getReturnTypeOfSignature(signature);
-      if (context.enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */)) {
+      if (context.enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */) && signature.declaration && !nodeIsSynthesized(signature.declaration)) {
         const annotation = signature.declaration && getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
-        const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
-        if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
-          const annotated = getTypeFromTypeNode(annotation);
-          const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
-          const result = tryReuseExistingNonParameterTypeNode(context, annotation, type, signature.declaration, thisInstantiated);
+        if (annotation && getTypeFromTypeNode2(context, annotation) === type) {
+          const result = tryReuseExistingTypeNodeHelper(context, annotation);
           if (result) {
             return result;
           }
@@ -51342,13 +51369,26 @@ function createTypeChecker(host) {
           !(length(existing.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))));
         }
       }
+      if (isThisTypeNode(existing)) {
+        if (context.mapper === void 0) return true;
+        const type = getTypeFromTypeNode2(
+          context,
+          existing,
+          /*noMappedTypes*/
+          true
+        );
+        return !!type;
+      }
       if (isTypeReferenceNode(existing)) {
         if (isConstTypeReference(existing)) return false;
         const type = getTypeFromTypeReference(existing);
         const symbol = getNodeLinks(existing).resolvedSymbol;
         if (!symbol) return false;
         if (symbol.flags & 262144 /* TypeParameter */) {
-          return true;
+          const type2 = getDeclaredTypeOfSymbol(symbol);
+          if (context.mapper && getMappedType(type2, context.mapper) !== type2) {
+            return false;
+          }
         }
         if (isInJSDoc(existing)) {
           return existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) && !getIntendedTypeFromJSDocTypeReference(existing) && symbol.flags & 788968 /* Type */;
@@ -51361,7 +51401,7 @@ function createTypeChecker(host) {
       return true;
     }
     function serializeExistingTypeNode(context, typeNode) {
-      const type = getTypeFromTypeNode(typeNode);
+      const type = getTypeFromTypeNode2(context, typeNode);
       return typeToTypeNodeHelper(type, context);
     }
     function tryReuseExistingTypeNodeHelper(context, existing) {
@@ -51409,8 +51449,8 @@ function createTypeChecker(host) {
         if (isJSDocTypeLiteral(node)) {
           return factory.createTypeLiteralNode(map(node.jsDocPropertyTags, (t) => {
             const name = isIdentifier(t.name) ? t.name : t.name.right;
-            const typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode(node), name.escapedText);
-            const overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode(t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : void 0;
+            const typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode2(context, node), name.escapedText);
+            const overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode2(context, t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : void 0;
             return factory.createPropertySignature(
               /*modifiers*/
               void 0,
@@ -51451,7 +51491,7 @@ function createTypeChecker(host) {
                 /*modifiers*/
                 void 0,
                 getEffectiveDotDotDotForParameter(p),
-                getNameForJSDocFunctionParameter(p, i),
+                setTextRange2(context, factory.createIdentifier(getNameForJSDocFunctionParameter(p, i)), p),
                 p.questionToken,
                 visitNode(p.type, visitExistingNodeTreeSymbols, isTypeNode),
                 /*initializer*/
@@ -51466,7 +51506,7 @@ function createTypeChecker(host) {
                 /*modifiers*/
                 void 0,
                 getEffectiveDotDotDotForParameter(p),
-                getNameForJSDocFunctionParameter(p, i),
+                setTextRange2(context, factory.createIdentifier(getNameForJSDocFunctionParameter(p, i)), p),
                 p.questionToken,
                 visitNode(p.type, visitExistingNodeTreeSymbols, isTypeNode),
                 /*initializer*/
@@ -51476,6 +51516,21 @@ function createTypeChecker(host) {
             );
           }
         }
+        if (isThisTypeNode(node)) {
+          if (canReuseTypeNode(context, node)) {
+            return node;
+          }
+          return serializeExistingTypeNode(context, node);
+        }
+        if (isTypeParameterDeclaration(node)) {
+          return factory.updateTypeParameterDeclaration(
+            node,
+            node.modifiers,
+            setTextRange2(context, typeParameterToName(getDeclaredTypeOfSymbol(getSymbolOfDeclaration(node)), context), node),
+            visitNode(node.constraint, visitExistingNodeTreeSymbols, isTypeNode),
+            visitNode(node.default, visitExistingNodeTreeSymbols, isTypeNode)
+          );
+        }
         if (isTypeReferenceNode(node)) {
           if (canReuseTypeNode(context, node)) {
             const { introducesError, node: newName } = trackExistingEntityName(node.typeName, context);
@@ -51507,7 +51562,7 @@ function createTypeChecker(host) {
           if (isInJSDoc(node) && nodeSymbol && // The import type resolved using jsdoc fallback logic
           (!node.isTypeOf && !(nodeSymbol.flags & 788968 /* Type */) || // The import type had type arguments autofilled by js fallback logic
           !(length(node.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))))) {
-            return setTextRange2(context, typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
+            return setTextRange2(context, typeToTypeNodeHelper(getTypeFromTypeNode2(context, node), context), node);
           }
           return factory.updateImportTypeNode(
             node,
@@ -51577,10 +51632,16 @@ function createTypeChecker(host) {
             return factory.updateComputedPropertyName(node, literal);
           }
         }
-        if (isTypePredicateNode(node) && isIdentifier(node.parameterName)) {
-          const { node: result, introducesError } = trackExistingEntityName(node.parameterName, context);
-          hadError = hadError || introducesError;
-          return factory.updateTypePredicateNode(node, node.assertsModifier, result, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
+        if (isTypePredicateNode(node)) {
+          let parameterName;
+          if (isIdentifier(node.parameterName)) {
+            const { node: result, introducesError } = trackExistingEntityName(node.parameterName, context);
+            hadError = hadError || introducesError;
+            parameterName = result;
+          } else {
+            parameterName = node.parameterName;
+          }
+          return factory.updateTypePredicateNode(node, node.assertsModifier, parameterName, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
         }
         if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
           const visited = visitEachChild(
@@ -52356,7 +52417,7 @@ function createTypeChecker(host) {
           }
           return cleanup(factory.createExpressionWithTypeArguments(
             expr,
-            map(e.typeArguments, (a) => tryReuseExistingNonParameterTypeNode(context, a, getTypeFromTypeNode(a)) || typeToTypeNodeHelper(getTypeFromTypeNode(a), context))
+            map(e.typeArguments, (a) => tryReuseExistingNonParameterTypeNode(context, a, getTypeFromTypeNode2(context, a)) || typeToTypeNodeHelper(getTypeFromTypeNode2(context, a), context))
           ));
           function cleanup(result2) {
             context.enclosingDeclaration = oldEnclosing;
@@ -58900,6 +58961,7 @@ function createTypeChecker(host) {
       if (flags & 465829888 /* Instantiable */) includes |= 33554432 /* IncludesInstantiable */;
       if (flags & 2097152 /* Intersection */ && getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) includes |= 536870912 /* IncludesConstrainedTypeVariable */;
       if (type === wildcardType) includes |= 8388608 /* IncludesWildcard */;
+      if (isErrorType(type)) includes |= 1073741824 /* IncludesError */;
       if (!strictNullChecks && flags & 98304 /* Nullable */) {
         if (!(getObjectFlags(type) & 65536 /* ContainsWideningType */)) includes |= 4194304 /* IncludesNonWideningType */;
       } else {
@@ -59091,7 +59153,7 @@ function createTypeChecker(host) {
     const includes = addTypesToUnion(typeSet, 0, types);
     if (unionReduction !== 0 /* None */) {
       if (includes & 3 /* AnyOrUnknown */) {
-        return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType : unknownType;
+        return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : includes & 1073741824 /* IncludesError */ ? errorType : anyType : unknownType;
       }
       if (includes & 32768 /* Undefined */) {
         if (typeSet.length >= 2 && typeSet[0] === undefinedType && typeSet[1] === missingType) {
@@ -59217,6 +59279,7 @@ function createTypeChecker(host) {
     } else {
       if (flags & 3 /* AnyOrUnknown */) {
         if (type === wildcardType) includes |= 8388608 /* IncludesWildcard */;
+        if (isErrorType(type)) includes |= 1073741824 /* IncludesError */;
       } else if (strictNullChecks || !(flags & 98304 /* Nullable */)) {
         if (type === missingType) {
           includes |= 262144 /* IncludesMissingType */;
@@ -59344,7 +59407,7 @@ function createTypeChecker(host) {
       return neverType;
     }
     if (includes & 1 /* Any */) {
-      return includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType;
+      return includes & 8388608 /* IncludesWildcard */ ? wildcardType : includes & 1073741824 /* IncludesError */ ? errorType : anyType;
     }
     if (!strictNullChecks && includes & 98304 /* Nullable */) {
       return includes & 16777216 /* IncludesEmptyObject */ ? neverType : includes & 32768 /* Undefined */ ? undefinedType : nullType;
@@ -84847,6 +84910,7 @@ function createTypeChecker(host) {
   function getSingleReturnExpression(declaration) {
     let candidateExpr;
     if (declaration && !nodeIsMissing(declaration.body)) {
+      if (getFunctionFlags(declaration) & 3 /* AsyncGenerator */) return void 0;
       const body = declaration.body;
       if (body && isBlock(body)) {
         forEachReturnStatement(body, (s) => {
@@ -92248,10 +92312,9 @@ function transformClassFields(context) {
       }
     }
   }
-  function getClassThis() {
+  function tryGetClassThis() {
     const lex = getClassLexicalEnvironment();
-    const classThis = lex.classThis ?? lex.classConstructor ?? (currentClassContainer == null ? void 0 : currentClassContainer.name);
-    return Debug.checkDefined(classThis);
+    return lex.classThis ?? lex.classConstructor ?? (currentClassContainer == null ? void 0 : currentClassContainer.name);
   }
   function transformAutoAccessor(node) {
     const commentRange = getCommentRange(node);
@@ -92279,7 +92342,7 @@ function transformClassFields(context) {
     setOriginalNode(backingField, node);
     setEmitFlags(backingField, 3072 /* NoComments */);
     setSourceMapRange(backingField, sourceMapRange);
-    const receiver = isStatic(node) ? getClassThis() : factory2.createThis();
+    const receiver = isStatic(node) ? tryGetClassThis() ?? factory2.createThis() : factory2.createThis();
     const getter = createAccessorPropertyGetRedirector(factory2, node, modifiers, getterName, receiver);
     setOriginalNode(getter, node);
     setCommentRange(getter, commentRange);
@@ -92845,7 +92908,7 @@ function transformClassFields(context) {
     var _a;
     let facts = 0 /* None */;
     const original = getOriginalNode(node);
-    if (isClassDeclaration(original) && classOrConstructorParameterIsDecorated(legacyDecorators, original)) {
+    if (isClassLike(original) && classOrConstructorParameterIsDecorated(legacyDecorators, original)) {
       facts |= 1 /* ClassWasDecorated */;
     }
     if (shouldTransformPrivateElementsOrClassStaticBlocks && (classHasClassThisAssignment(node) || classHasExplicitlyAssignedName(node))) {
@@ -129200,6 +129263,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
   function typeFromSingleReturnExpression(declaration, context) {
     let candidateExpr;
     if (declaration && !nodeIsMissing(declaration.body)) {
+      if (getFunctionFlags(declaration) & 3 /* AsyncGenerator */) return void 0;
       const body = declaration.body;
       if (body && isBlock(body)) {
         forEachReturnStatement(body, (s) => {

package/lib/typescript.js

@@ -2370,7 +2370,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240523`;
+var version = `${versionMajorMinor}.0-dev.20240524`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6602,6 +6602,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["TemplateLiteral"] = 134217728] = "TemplateLiteral";
   TypeFlags2[TypeFlags2["StringMapping"] = 268435456] = "StringMapping";
   TypeFlags2[TypeFlags2["Reserved1"] = 536870912] = "Reserved1";
+  TypeFlags2[TypeFlags2["Reserved2"] = 1073741824] = "Reserved2";
   TypeFlags2[TypeFlags2["AnyOrUnknown"] = 3] = "AnyOrUnknown";
   TypeFlags2[TypeFlags2["Nullable"] = 98304] = "Nullable";
   TypeFlags2[TypeFlags2["Literal"] = 2944] = "Literal";
@@ -6640,6 +6641,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
   TypeFlags2[TypeFlags2["IncludesConstrainedTypeVariable"] = 536870912 /* Reserved1 */] = "IncludesConstrainedTypeVariable";
+  TypeFlags2[TypeFlags2["IncludesError"] = 1073741824 /* Reserved2 */] = "IncludesError";
   TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
@@ -51035,7 +51037,12 @@ function createTypeChecker(host) {
         if (resolvedTarget === unknownSymbol) {
           return source;
         }
-        target = cloneSymbol(resolvedTarget);
+        if (!(resolvedTarget.flags & getExcludedSymbolFlags(source.flags)) || (source.flags | resolvedTarget.flags) & 67108864 /* Assignment */) {
+          target = cloneSymbol(resolvedTarget);
+        } else {
+          reportMergeSymbolError(target, source);
+          return source;
+        }
       }
       if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
         target.constEnumOnlyModule = false;
@@ -51065,27 +51072,30 @@ function createTypeChecker(host) {
         );
       }
     } else {
-      const isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
-      const isEitherBlockScoped = !!(target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */);
+      reportMergeSymbolError(target, source);
+    }
+    return target;
+    function reportMergeSymbolError(target2, source2) {
+      const isEitherEnum = !!(target2.flags & 384 /* Enum */ || source2.flags & 384 /* Enum */);
+      const isEitherBlockScoped = !!(target2.flags & 2 /* BlockScopedVariable */ || source2.flags & 2 /* BlockScopedVariable */);
       const message = isEitherEnum ? Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations : isEitherBlockScoped ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
-      const sourceSymbolFile = source.declarations && getSourceFileOfNode(source.declarations[0]);
-      const targetSymbolFile = target.declarations && getSourceFileOfNode(target.declarations[0]);
+      const sourceSymbolFile = source2.declarations && getSourceFileOfNode(source2.declarations[0]);
+      const targetSymbolFile = target2.declarations && getSourceFileOfNode(target2.declarations[0]);
       const isSourcePlainJs = isPlainJsFile(sourceSymbolFile, compilerOptions.checkJs);
       const isTargetPlainJs = isPlainJsFile(targetSymbolFile, compilerOptions.checkJs);
-      const symbolName2 = symbolToString(source);
+      const symbolName2 = symbolToString(source2);
       if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
         const firstFile = comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
         const secondFile = firstFile === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
         const filesDuplicates = getOrUpdate(amalgamatedDuplicates, `${firstFile.path}|${secondFile.path}`, () => ({ firstFile, secondFile, conflictingSymbols: /* @__PURE__ */ new Map() }));
         const conflictingSymbolInfo = getOrUpdate(filesDuplicates.conflictingSymbols, symbolName2, () => ({ isBlockScoped: isEitherBlockScoped, firstFileLocations: [], secondFileLocations: [] }));
-        if (!isSourcePlainJs) addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source);
-        if (!isTargetPlainJs) addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target);
+        if (!isSourcePlainJs) addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source2);
+        if (!isTargetPlainJs) addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target2);
       } else {
-        if (!isSourcePlainJs) addDuplicateDeclarationErrorsForSymbols(source, message, symbolName2, target);
-        if (!isTargetPlainJs) addDuplicateDeclarationErrorsForSymbols(target, message, symbolName2, source);
+        if (!isSourcePlainJs) addDuplicateDeclarationErrorsForSymbols(source2, message, symbolName2, target2);
+        if (!isTargetPlainJs) addDuplicateDeclarationErrorsForSymbols(target2, message, symbolName2, source2);
       }
     }
-    return target;
     function addDuplicateLocations(locs, symbol) {
       if (symbol.declarations) {
         for (const decl of symbol.declarations) {
@@ -53931,6 +53941,9 @@ function createTypeChecker(host) {
   function isClassInstanceSide(type) {
     return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || !!(type.flags & 524288 /* Object */) && !!(getObjectFlags(type) & 16777216 /* IsClassInstanceClone */));
   }
+  function getTypeFromTypeNodeWithoutContext(node) {
+    return getTypeFromTypeNode(node);
+  }
   function createNodeBuilder() {
     return {
       typeToTypeNode: (type, enclosingDeclaration, flags, tracker) => withContext2(enclosingDeclaration, flags, tracker, (context) => typeToTypeNodeHelper(type, context)),
@@ -53959,6 +53972,12 @@ function createTypeChecker(host) {
       symbolTableToDeclarationStatements: (symbolTable, enclosingDeclaration, flags, tracker) => withContext2(enclosingDeclaration, flags, tracker, (context) => symbolTableToDeclarationStatements(symbolTable, context)),
       symbolToNode: (symbol, meaning, enclosingDeclaration, flags, tracker) => withContext2(enclosingDeclaration, flags, tracker, (context) => symbolToNode(symbol, context, meaning))
     };
+    function getTypeFromTypeNode2(context, node, noMappedTypes) {
+      const type = getTypeFromTypeNodeWithoutContext(node);
+      if (!context.mapper) return type;
+      const mappedType = instantiateType(type, context.mapper);
+      return noMappedTypes && mappedType !== type ? void 0 : mappedType;
+    }
     function setTextRange2(context, range, location) {
       if (!nodeIsSynthesized(range) && !(range.flags & 16 /* Synthesized */) && (!context.enclosingFile || context.enclosingFile !== getSourceFileOfNode(range))) {
         range = factory.cloneNode(range);
@@ -54004,7 +54023,7 @@ function createTypeChecker(host) {
       }
       const clone2 = tryReuseExistingNonParameterTypeNode(context, typeNode, type, host2);
       if (clone2) {
-        if (addUndefined && !someType(getTypeFromTypeNode(typeNode), (t) => !!(t.flags & 32768 /* Undefined */))) {
+        if (addUndefined && !someType(getTypeFromTypeNode2(context, typeNode), (t) => !!(t.flags & 32768 /* Undefined */))) {
           return factory.createUnionTypeNode([clone2, factory.createKeywordTypeNode(157 /* UndefinedKeyword */)]);
         }
         return clone2;
@@ -54017,8 +54036,13 @@ function createTypeChecker(host) {
       }
       return void 0;
     }
-    function tryReuseExistingNonParameterTypeNode(context, existing, type, host2 = context.enclosingDeclaration, annotationType) {
-      if (typeNodeIsEquivalentToType(existing, host2, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
+    function tryReuseExistingNonParameterTypeNode(context, existing, type, host2 = context.enclosingDeclaration, annotationType = getTypeFromTypeNode2(
+      context,
+      existing,
+      /*noMappedTypes*/
+      true
+    )) {
+      if (annotationType && typeNodeIsEquivalentToType(host2, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
         const result = tryReuseExistingTypeNodeHelper(context, existing);
         if (result) {
           return result;
@@ -54066,7 +54090,8 @@ function createTypeChecker(host) {
         mustCreateTypeParametersNamesLookups: true,
         typeParameterNames: void 0,
         typeParameterNamesByText: void 0,
-        typeParameterNamesByTextNextNameCount: void 0
+        typeParameterNamesByTextNextNameCount: void 0,
+        mapper: void 0
       };
       context.tracker = new SymbolTrackerImpl(context, tracker, moduleResolverHost);
       const resultingNode = cb(context);
@@ -54357,8 +54382,8 @@ function createTypeChecker(host) {
           context.inferTypeParameters = type2.root.inferTypeParameters;
           const extendsTypeNode2 = typeToTypeNodeHelper(instantiateType(type2.root.extendsType, newMapper), context);
           context.inferTypeParameters = saveInferTypeParameters2;
-          const trueTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type2.root.node.trueType), newMapper));
-          const falseTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type2.root.node.falseType), newMapper));
+          const trueTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode2(context, type2.root.node.trueType), newMapper));
+          const falseTypeNode2 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode2(context, type2.root.node.falseType), newMapper));
           return factory.createConditionalTypeNode(
             checkTypeNode,
             factory.createInferTypeNode(factory.createTypeParameterDeclaration(
@@ -54441,7 +54466,7 @@ function createTypeChecker(host) {
         context.approximateLength += 10;
         const result = setEmitFlags(mappedTypeNode, 1 /* SingleLine */);
         if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type2) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
-          const originalConstraint = instantiateType(getConstraintOfTypeParameter(getTypeFromTypeNode(type2.declaration.typeParameter.constraint.type)) || unknownType, type2.mapper);
+          const originalConstraint = instantiateType(getConstraintOfTypeParameter(getTypeFromTypeNode2(context, type2.declaration.typeParameter.constraint.type)) || unknownType, type2.mapper);
           return factory.createConditionalTypeNode(
             typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context),
             factory.createInferTypeNode(factory.createTypeParameterDeclaration(
@@ -55068,7 +55093,7 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
-      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters, signature.parameters);
+      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters, signature.parameters, signature.mapper);
       context.approximateLength += 3;
       if (context.flags & 32 /* WriteTypeArgumentsOfSignature */ && signature.target && signature.mapper && signature.target.typeParameters) {
         typeArguments = signature.target.typeParameters.map((parameter) => typeToTypeNodeHelper(instantiateType(parameter, signature.mapper), context));
@@ -55176,11 +55201,15 @@ function createTypeChecker(host) {
     function getParametersInScope(node) {
       return isFunctionLike(node) || isJSDocSignature(node) ? getSignatureFromDeclaration(node).parameters : void 0;
     }
-    function enterNewScope(context, declaration, expandedParams, typeParameters, originalParameters) {
+    function enterNewScope(context, declaration, expandedParams, typeParameters, originalParameters, mapper) {
       const cleanupContext = cloneNodeBuilderContext(context);
       let cleanupParams;
       let cleanupTypeParams;
       const oldEnclosingDecl = context.enclosingDeclaration;
+      const oldMapper = context.mapper;
+      if (mapper) {
+        context.mapper = mapper;
+      }
       if (context.enclosingDeclaration && declaration) {
         let pushFakeScope2 = function(kind, addAll) {
           Debug.assert(context.enclosingDeclaration);
@@ -55279,6 +55308,7 @@ function createTypeChecker(host) {
         cleanupTypeParams == null ? void 0 : cleanupTypeParams();
         cleanupContext();
         context.enclosingDeclaration = oldEnclosingDecl;
+        context.mapper = oldMapper;
       };
     }
     function tryGetThisParameterDeclaration(signature, context) {
@@ -55296,7 +55326,7 @@ function createTypeChecker(host) {
             "this",
             /*questionToken*/
             void 0,
-            typeToTypeNodeHelper(getTypeFromTypeNode(thisTag.typeExpression), context)
+            typeToTypeNodeHelper(getTypeFromTypeNode2(context, thisTag.typeExpression), context)
           );
         }
       }
@@ -55935,10 +55965,10 @@ function createTypeChecker(host) {
       const addUndefined = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration);
       const enclosingDeclaration = context.enclosingDeclaration;
       if (enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */)) {
-        const declWithExistingAnnotation = declaration && getNonlocalEffectiveTypeAnnotationNode(declaration) ? declaration : getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
+        const declWithExistingAnnotation = declaration && getNonlocalEffectiveTypeAnnotationNode(declaration) ? declaration : getDeclarationWithTypeAnnotation(symbol);
         if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
           const existing = getNonlocalEffectiveTypeAnnotationNode(declWithExistingAnnotation);
-          const result2 = tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined);
+          const result2 = !isTypePredicateNode(existing) && tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined);
           if (result2) {
             return result2;
           }
@@ -55958,7 +55988,7 @@ function createTypeChecker(host) {
       context.flags = oldFlags;
       return result;
     }
-    function typeNodeIsEquivalentToType(typeNode, annotatedDeclaration, type, typeFromTypeNode = getTypeFromTypeNode(typeNode)) {
+    function typeNodeIsEquivalentToType(annotatedDeclaration, type, typeFromTypeNode) {
       if (typeFromTypeNode === type) {
         return true;
       }
@@ -55988,13 +56018,10 @@ function createTypeChecker(host) {
     function serializeReturnTypeForSignatureWorker(context, signature) {
       const typePredicate = getTypePredicateOfSignature(signature);
       const type = getReturnTypeOfSignature(signature);
-      if (context.enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */)) {
+      if (context.enclosingDeclaration && (!isErrorType(type) || context.flags & 1 /* AllowUnresolvedNames */) && signature.declaration && !nodeIsSynthesized(signature.declaration)) {
         const annotation = signature.declaration && getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
-        const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
-        if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
-          const annotated = getTypeFromTypeNode(annotation);
-          const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
-          const result = tryReuseExistingNonParameterTypeNode(context, annotation, type, signature.declaration, thisInstantiated);
+        if (annotation && getTypeFromTypeNode2(context, annotation) === type) {
+          const result = tryReuseExistingTypeNodeHelper(context, annotation);
           if (result) {
             return result;
           }
@@ -56137,13 +56164,26 @@ function createTypeChecker(host) {
           !(length(existing.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))));
         }
       }
+      if (isThisTypeNode(existing)) {
+        if (context.mapper === void 0) return true;
+        const type = getTypeFromTypeNode2(
+          context,
+          existing,
+          /*noMappedTypes*/
+          true
+        );
+        return !!type;
+      }
       if (isTypeReferenceNode(existing)) {
         if (isConstTypeReference(existing)) return false;
         const type = getTypeFromTypeReference(existing);
         const symbol = getNodeLinks(existing).resolvedSymbol;
         if (!symbol) return false;
         if (symbol.flags & 262144 /* TypeParameter */) {
-          return true;
+          const type2 = getDeclaredTypeOfSymbol(symbol);
+          if (context.mapper && getMappedType(type2, context.mapper) !== type2) {
+            return false;
+          }
         }
         if (isInJSDoc(existing)) {
           return existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) && !getIntendedTypeFromJSDocTypeReference(existing) && symbol.flags & 788968 /* Type */;
@@ -56156,7 +56196,7 @@ function createTypeChecker(host) {
       return true;
     }
     function serializeExistingTypeNode(context, typeNode) {
-      const type = getTypeFromTypeNode(typeNode);
+      const type = getTypeFromTypeNode2(context, typeNode);
       return typeToTypeNodeHelper(type, context);
     }
     function tryReuseExistingTypeNodeHelper(context, existing) {
@@ -56204,8 +56244,8 @@ function createTypeChecker(host) {
         if (isJSDocTypeLiteral(node)) {
           return factory.createTypeLiteralNode(map(node.jsDocPropertyTags, (t) => {
             const name = isIdentifier(t.name) ? t.name : t.name.right;
-            const typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode(node), name.escapedText);
-            const overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode(t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : void 0;
+            const typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode2(context, node), name.escapedText);
+            const overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode2(context, t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : void 0;
             return factory.createPropertySignature(
               /*modifiers*/
               void 0,
@@ -56246,7 +56286,7 @@ function createTypeChecker(host) {
                 /*modifiers*/
                 void 0,
                 getEffectiveDotDotDotForParameter(p),
-                getNameForJSDocFunctionParameter(p, i),
+                setTextRange2(context, factory.createIdentifier(getNameForJSDocFunctionParameter(p, i)), p),
                 p.questionToken,
                 visitNode(p.type, visitExistingNodeTreeSymbols, isTypeNode),
                 /*initializer*/
@@ -56261,7 +56301,7 @@ function createTypeChecker(host) {
                 /*modifiers*/
                 void 0,
                 getEffectiveDotDotDotForParameter(p),
-                getNameForJSDocFunctionParameter(p, i),
+                setTextRange2(context, factory.createIdentifier(getNameForJSDocFunctionParameter(p, i)), p),
                 p.questionToken,
                 visitNode(p.type, visitExistingNodeTreeSymbols, isTypeNode),
                 /*initializer*/
@@ -56271,6 +56311,21 @@ function createTypeChecker(host) {
             );
           }
         }
+        if (isThisTypeNode(node)) {
+          if (canReuseTypeNode(context, node)) {
+            return node;
+          }
+          return serializeExistingTypeNode(context, node);
+        }
+        if (isTypeParameterDeclaration(node)) {
+          return factory.updateTypeParameterDeclaration(
+            node,
+            node.modifiers,
+            setTextRange2(context, typeParameterToName(getDeclaredTypeOfSymbol(getSymbolOfDeclaration(node)), context), node),
+            visitNode(node.constraint, visitExistingNodeTreeSymbols, isTypeNode),
+            visitNode(node.default, visitExistingNodeTreeSymbols, isTypeNode)
+          );
+        }
         if (isTypeReferenceNode(node)) {
           if (canReuseTypeNode(context, node)) {
             const { introducesError, node: newName } = trackExistingEntityName(node.typeName, context);
@@ -56302,7 +56357,7 @@ function createTypeChecker(host) {
           if (isInJSDoc(node) && nodeSymbol && // The import type resolved using jsdoc fallback logic
           (!node.isTypeOf && !(nodeSymbol.flags & 788968 /* Type */) || // The import type had type arguments autofilled by js fallback logic
           !(length(node.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))))) {
-            return setTextRange2(context, typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
+            return setTextRange2(context, typeToTypeNodeHelper(getTypeFromTypeNode2(context, node), context), node);
           }
           return factory.updateImportTypeNode(
             node,
@@ -56372,10 +56427,16 @@ function createTypeChecker(host) {
             return factory.updateComputedPropertyName(node, literal);
           }
         }
-        if (isTypePredicateNode(node) && isIdentifier(node.parameterName)) {
-          const { node: result, introducesError } = trackExistingEntityName(node.parameterName, context);
-          hadError = hadError || introducesError;
-          return factory.updateTypePredicateNode(node, node.assertsModifier, result, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
+        if (isTypePredicateNode(node)) {
+          let parameterName;
+          if (isIdentifier(node.parameterName)) {
+            const { node: result, introducesError } = trackExistingEntityName(node.parameterName, context);
+            hadError = hadError || introducesError;
+            parameterName = result;
+          } else {
+            parameterName = node.parameterName;
+          }
+          return factory.updateTypePredicateNode(node, node.assertsModifier, parameterName, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
         }
         if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
           const visited = visitEachChild(
@@ -57151,7 +57212,7 @@ function createTypeChecker(host) {
           }
           return cleanup(factory.createExpressionWithTypeArguments(
             expr,
-            map(e.typeArguments, (a) => tryReuseExistingNonParameterTypeNode(context, a, getTypeFromTypeNode(a)) || typeToTypeNodeHelper(getTypeFromTypeNode(a), context))
+            map(e.typeArguments, (a) => tryReuseExistingNonParameterTypeNode(context, a, getTypeFromTypeNode2(context, a)) || typeToTypeNodeHelper(getTypeFromTypeNode2(context, a), context))
           ));
           function cleanup(result2) {
             context.enclosingDeclaration = oldEnclosing;
@@ -63695,6 +63756,7 @@ function createTypeChecker(host) {
       if (flags & 465829888 /* Instantiable */) includes |= 33554432 /* IncludesInstantiable */;
       if (flags & 2097152 /* Intersection */ && getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) includes |= 536870912 /* IncludesConstrainedTypeVariable */;
       if (type === wildcardType) includes |= 8388608 /* IncludesWildcard */;
+      if (isErrorType(type)) includes |= 1073741824 /* IncludesError */;
       if (!strictNullChecks && flags & 98304 /* Nullable */) {
         if (!(getObjectFlags(type) & 65536 /* ContainsWideningType */)) includes |= 4194304 /* IncludesNonWideningType */;
       } else {
@@ -63886,7 +63948,7 @@ function createTypeChecker(host) {
     const includes = addTypesToUnion(typeSet, 0, types);
     if (unionReduction !== 0 /* None */) {
       if (includes & 3 /* AnyOrUnknown */) {
-        return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType : unknownType;
+        return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : includes & 1073741824 /* IncludesError */ ? errorType : anyType : unknownType;
       }
       if (includes & 32768 /* Undefined */) {
         if (typeSet.length >= 2 && typeSet[0] === undefinedType && typeSet[1] === missingType) {
@@ -64012,6 +64074,7 @@ function createTypeChecker(host) {
     } else {
       if (flags & 3 /* AnyOrUnknown */) {
         if (type === wildcardType) includes |= 8388608 /* IncludesWildcard */;
+        if (isErrorType(type)) includes |= 1073741824 /* IncludesError */;
       } else if (strictNullChecks || !(flags & 98304 /* Nullable */)) {
         if (type === missingType) {
           includes |= 262144 /* IncludesMissingType */;
@@ -64139,7 +64202,7 @@ function createTypeChecker(host) {
       return neverType;
     }
     if (includes & 1 /* Any */) {
-      return includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType;
+      return includes & 8388608 /* IncludesWildcard */ ? wildcardType : includes & 1073741824 /* IncludesError */ ? errorType : anyType;
     }
     if (!strictNullChecks && includes & 98304 /* Nullable */) {
       return includes & 16777216 /* IncludesEmptyObject */ ? neverType : includes & 32768 /* Undefined */ ? undefinedType : nullType;
@@ -89642,6 +89705,7 @@ function createTypeChecker(host) {
   function getSingleReturnExpression(declaration) {
     let candidateExpr;
     if (declaration && !nodeIsMissing(declaration.body)) {
+      if (getFunctionFlags(declaration) & 3 /* AsyncGenerator */) return void 0;
       const body = declaration.body;
       if (body && isBlock(body)) {
         forEachReturnStatement(body, (s) => {
@@ -97225,10 +97289,9 @@ function transformClassFields(context) {
       }
     }
   }
-  function getClassThis() {
+  function tryGetClassThis() {
     const lex = getClassLexicalEnvironment();
-    const classThis = lex.classThis ?? lex.classConstructor ?? (currentClassContainer == null ? void 0 : currentClassContainer.name);
-    return Debug.checkDefined(classThis);
+    return lex.classThis ?? lex.classConstructor ?? (currentClassContainer == null ? void 0 : currentClassContainer.name);
   }
   function transformAutoAccessor(node) {
     const commentRange = getCommentRange(node);
@@ -97256,7 +97319,7 @@ function transformClassFields(context) {
     setOriginalNode(backingField, node);
     setEmitFlags(backingField, 3072 /* NoComments */);
     setSourceMapRange(backingField, sourceMapRange);
-    const receiver = isStatic(node) ? getClassThis() : factory2.createThis();
+    const receiver = isStatic(node) ? tryGetClassThis() ?? factory2.createThis() : factory2.createThis();
     const getter = createAccessorPropertyGetRedirector(factory2, node, modifiers, getterName, receiver);
     setOriginalNode(getter, node);
     setCommentRange(getter, commentRange);
@@ -97822,7 +97885,7 @@ function transformClassFields(context) {
     var _a;
     let facts = 0 /* None */;
     const original = getOriginalNode(node);
-    if (isClassDeclaration(original) && classOrConstructorParameterIsDecorated(legacyDecorators, original)) {
+    if (isClassLike(original) && classOrConstructorParameterIsDecorated(legacyDecorators, original)) {
       facts |= 1 /* ClassWasDecorated */;
     }
     if (shouldTransformPrivateElementsOrClassStaticBlocks && (classHasClassThisAssignment(node) || classHasExplicitlyAssignedName(node))) {
@@ -134331,6 +134394,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
   function typeFromSingleReturnExpression(declaration, context) {
     let candidateExpr;
     if (declaration && !nodeIsMissing(declaration.body)) {
+      if (getFunctionFlags(declaration) & 3 /* AsyncGenerator */) return void 0;
       const body = declaration.body;
       if (body && isBlock(body)) {
         forEachReturnStatement(body, (s) => {
@@ -142906,7 +142970,7 @@ registerRefactor(refactorNameForMoveToFile, {
     if (!interactiveRefactorArguments) {
       return emptyArray;
     }
-    if (context.endPosition !== void 0) {
+    if (context.triggerReason === "implicit" && context.endPosition !== void 0) {
       const startNodeAncestor = findAncestor(getTokenAtPosition(file, context.startPosition), isBlockLike);
       const endNodeAncestor = findAncestor(getTokenAtPosition(file, context.endPosition), isBlockLike);
       if (startNodeAncestor && !isSourceFile(startNodeAncestor) && endNodeAncestor && !isSourceFile(endNodeAncestor)) {
@@ -143897,11 +143961,19 @@ registerRefactor(refactorName5, {
   kinds: [moveToNewFileAction.kind],
   getAvailableActions: function getRefactorActionsToMoveToNewFile(context) {
     const statements = getStatementsToMove(context);
+    const file = context.file;
+    if (context.triggerReason === "implicit" && context.endPosition !== void 0) {
+      const startNodeAncestor = findAncestor(getTokenAtPosition(file, context.startPosition), isBlockLike);
+      const endNodeAncestor = findAncestor(getTokenAtPosition(file, context.endPosition), isBlockLike);
+      if (startNodeAncestor && !isSourceFile(startNodeAncestor) && endNodeAncestor && !isSourceFile(endNodeAncestor)) {
+        return emptyArray;
+      }
+    }
     if (context.preferences.allowTextChangesInNewFiles && statements) {
-      const file = context.file;
+      const file2 = context.file;
       const affectedTextRange = {
-        start: { line: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).line, offset: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).character },
-        end: { line: getLineAndCharacterOfPosition(file, last(statements.all).end).line, offset: getLineAndCharacterOfPosition(file, last(statements.all).end).character }
+        start: { line: getLineAndCharacterOfPosition(file2, statements.all[0].getStart(file2)).line, offset: getLineAndCharacterOfPosition(file2, statements.all[0].getStart(file2)).character },
+        end: { line: getLineAndCharacterOfPosition(file2, last(statements.all).end).line, offset: getLineAndCharacterOfPosition(file2, last(statements.all).end).character }
       };
       return [{ name: refactorName5, description: description2, actions: [{ ...moveToNewFileAction, range: affectedTextRange }] }];
     }
@@ -173273,7 +173345,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker, symb
             typeChecker,
             resolvedSymbol,
             getSourceFileOfNode(resolvedNode),
-            resolvedNode,
+            enclosingDeclaration,
             declarationName,
             type,
             semanticMeaning,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240523",
+    "version": "5.5.0-dev.20240524",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "ddf43cd0e0091057254b1fcfcaf880140dfb7ea1"
+    "gitHead": "cffc425ad75bd7b1298abb78ce09337d08cc94b9"
 }