typescript 5.5.0-dev.20240514 → 5.5.0-dev.20240516

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.20240514`;
+var version = `${versionMajorMinor}.0-dev.20240516`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6732,7 +6732,6 @@ var Diagnostics = {
   Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1: diag(4083, 1 /* Error */, "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083", "Type parameter '{0}' of exported type alias has or is using private name '{1}'."),
   Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2: diag(4084, 1 /* Error */, "Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2_4084", "Exported type alias '{0}' has or is using private name '{1}' from module {2}."),
   Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
-  Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: diag(4090, 1 /* Error */, "Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090", "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
   Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
@@ -13652,7 +13651,8 @@ function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
 }
 function getJSDocCommentRanges(node, text) {
   const commentRanges = node.kind === 169 /* Parameter */ || node.kind === 168 /* TypeParameter */ || node.kind === 218 /* FunctionExpression */ || node.kind === 219 /* ArrowFunction */ || node.kind === 217 /* ParenthesizedExpression */ || node.kind === 260 /* VariableDeclaration */ || node.kind === 281 /* ExportSpecifier */ ? concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) : getLeadingCommentRanges(text, node.pos);
-  return filter(commentRanges, (comment) => text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 3) !== 47 /* slash */);
+  return filter(commentRanges, (comment) => comment.end <= node.end && // Due to parse errors sometime empty parameter may get comments assigned to it that end up not in parameter range
+  text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 3) !== 47 /* slash */);
 }
 var fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)(('[^']*')|("[^"]*")).*?\/>/;
 var fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)(('[^']*')|("[^"]*")).*?\/>/;
@@ -49020,7 +49020,7 @@ function createTypeChecker(host) {
       return { accessibility: 0 /* Accessible */ };
     }
     return symbol && hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) || {
-      accessibility: 1 /* NotAccessible */,
+      accessibility: 3 /* NotResolved */,
       errorSymbolName: getTextOfNode(firstIdentifier),
       errorNode: firstIdentifier
     };
@@ -49158,6 +49158,7 @@ function createTypeChecker(host) {
       if (!nodeIsSynthesized(range) && !(range.flags & 16 /* Synthesized */) && (!context.enclosingFile || context.enclosingFile !== getSourceFileOfNode(range))) {
         range = factory.cloneNode(range);
       }
+      if (range === location) return range;
       if (!location) {
         return range;
       }
@@ -51294,6 +51295,57 @@ function createTypeChecker(host) {
         return updated;
       }
     }
+    function serializeTypeName(context, node, isTypeOf, typeArguments) {
+      const meaning = isTypeOf ? 111551 /* Value */ : 788968 /* Type */;
+      const symbol = resolveEntityName(
+        node,
+        meaning,
+        /*ignoreErrors*/
+        true
+      );
+      if (!symbol) return void 0;
+      const resolvedSymbol = symbol.flags & 2097152 /* Alias */ ? resolveAlias(symbol) : symbol;
+      if (isSymbolAccessible(
+        symbol,
+        context.enclosingDeclaration,
+        meaning,
+        /*shouldComputeAliasesToMakeVisible*/
+        false
+      ).accessibility !== 0 /* Accessible */) return void 0;
+      return symbolToTypeNode(resolvedSymbol, context, meaning, typeArguments);
+    }
+    function canReuseTypeNode(context, existing) {
+      if (isInJSFile(existing)) {
+        if (isLiteralImportTypeNode(existing)) {
+          void getTypeFromImportTypeNode(existing);
+          const nodeSymbol = getNodeLinks(existing).resolvedSymbol;
+          return !nodeSymbol || !// The import type resolved using jsdoc fallback logic
+          (!existing.isTypeOf && !(nodeSymbol.flags & 788968 /* Type */) || // The import type had type arguments autofilled by js fallback logic
+          !(length(existing.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))));
+        }
+      }
+      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;
+        }
+        if (isInJSDoc(existing)) {
+          return existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) && !getIntendedTypeFromJSDocTypeReference(existing) && symbol.flags & 788968 /* Type */;
+        }
+      }
+      if (isTypeOperatorNode(existing) && existing.operator === 158 /* UniqueKeyword */ && existing.type.kind === 155 /* SymbolKeyword */) {
+        const effectiveEnclosingContext = context.enclosingDeclaration && getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
+        return !!findAncestor(existing, (n) => n === effectiveEnclosingContext);
+      }
+      return true;
+    }
+    function serializeExistingTypeNode(context, typeNode) {
+      const type = getTypeFromTypeNode(typeNode);
+      return typeToTypeNodeHelper(type, context);
+    }
     function tryReuseExistingTypeNodeHelper(context, existing) {
       if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
         cancellationToken.throwIfCancellationRequested();
@@ -51303,6 +51355,7 @@ function createTypeChecker(host) {
       if (hadError) {
         return void 0;
       }
+      context.approximateLength += existing.end - existing.pos;
       return transformed;
       function visitExistingNodeTreeSymbols(node) {
         const onExitNewScope = isNewScopeNode(node) ? onEnterNewScope(node) : void 0;
@@ -51402,20 +51455,38 @@ function createTypeChecker(host) {
             );
           }
         }
-        if (isTypeReferenceNode(node) && isInJSDoc(node) && (!existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(node, getTypeFromTypeNode(node)) || getIntendedTypeFromJSDocTypeReference(node) || unknownSymbol === resolveTypeReferenceName(
-          node,
-          788968 /* Type */,
-          /*ignoreErrors*/
-          true
-        ))) {
-          return setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
+        if (isTypeReferenceNode(node)) {
+          if (canReuseTypeNode(context, node)) {
+            const { introducesError, node: newName } = trackExistingEntityName(node.typeName, context);
+            const typeArguments = visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode);
+            if (!introducesError) {
+              const updated = factory.updateTypeReferenceNode(
+                node,
+                newName,
+                typeArguments
+              );
+              return setTextRange2(context, updated, node);
+            } else {
+              const serializedName = serializeTypeName(
+                context,
+                node.typeName,
+                /*isTypeOf*/
+                false,
+                typeArguments
+              );
+              if (serializedName) {
+                return setTextRange2(context, serializedName, node.typeName);
+              }
+            }
+          }
+          return serializeExistingTypeNode(context, node);
         }
         if (isLiteralImportTypeNode(node)) {
           const nodeSymbol = getNodeLinks(node).resolvedSymbol;
           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 setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
+            return setTextRange2(context, typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
           }
           return factory.updateImportTypeNode(
             node,
@@ -51447,13 +51518,48 @@ function createTypeChecker(host) {
           }
           return visited;
         }
-        if (isEntityName(node) || isEntityNameExpression(node)) {
-          if (isDeclarationName(node)) {
-            return node;
+        if (isTypeQueryNode(node)) {
+          const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context);
+          if (introducesError) {
+            const serializedName = serializeTypeName(
+              context,
+              node.exprName,
+              /*isTypeOf*/
+              true
+            );
+            if (serializedName) {
+              return setTextRange2(context, serializedName, node.exprName);
+            }
+            return serializeExistingTypeNode(context, node);
+          }
+          return factory.updateTypeQueryNode(
+            node,
+            exprName,
+            visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode)
+          );
+        }
+        if (isComputedPropertyName(node) && isEntityNameExpression(node.expression)) {
+          const { node: result, introducesError } = trackExistingEntityName(node.expression, context);
+          if (!introducesError) {
+            return factory.updateComputedPropertyName(node, result);
+          } else {
+            const type = getWidenedType(getRegularTypeOfExpression(node.expression));
+            const computedPropertyNameType = typeToTypeNodeHelper(type, context);
+            Debug.assertNode(computedPropertyNameType, isLiteralTypeNode);
+            const literal = computedPropertyNameType.literal;
+            if (literal.kind === 11 /* StringLiteral */ && isIdentifierText(literal.text, getEmitScriptTarget(compilerOptions))) {
+              return factory.createIdentifier(literal.text);
+            }
+            if (literal.kind === 9 /* NumericLiteral */ && !literal.text.startsWith("-")) {
+              return literal;
+            }
+            return factory.updateComputedPropertyName(node, literal);
           }
-          const { introducesError, node: result } = trackExistingEntityName(node, context);
+        }
+        if (isTypePredicateNode(node) && isIdentifier(node.parameterName)) {
+          const { node: result, introducesError } = trackExistingEntityName(node.parameterName, context);
           hadError = hadError || introducesError;
-          return result;
+          return factory.updateTypePredicateNode(node, node.assertsModifier, result, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
         }
         if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
           const visited = visitEachChild(
@@ -51487,6 +51593,11 @@ function createTypeChecker(host) {
             falseType2
           );
         }
+        if (isTypeOperatorNode(node) && node.operator === 158 /* UniqueKeyword */ && node.type.kind === 155 /* SymbolKeyword */) {
+          if (!canReuseTypeNode(context, node)) {
+            return serializeExistingTypeNode(context, node);
+          }
+        }
         return visitEachChild(
           node,
           visitExistingNodeTreeSymbols,
@@ -77452,6 +77563,10 @@ function createTypeChecker(host) {
       texts.push(span.literal.text);
       types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
     }
+    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node).value;
+    if (evaluated) {
+      return getFreshTypeOfLiteralType(getStringLiteralType(evaluated));
+    }
     if (isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType(
       node,
       /*contextFlags*/
@@ -77459,8 +77574,7 @@ function createTypeChecker(host) {
     ) || unknownType, isTemplateLiteralContextualType)) {
       return getTemplateLiteralType(texts, types);
     }
-    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node).value;
-    return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
+    return stringType;
   }
   function isTemplateLiteralContextualType(type) {
     return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) || type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
@@ -110150,7 +110264,7 @@ function transformDeclarations(context) {
           }
         }
       }
-    } else {
+    } else if (symbolAccessibilityResult.accessibility !== 3 /* NotResolved */) {
       const errorInfo = getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
       if (errorInfo) {
         if (errorInfo.typeName) {
@@ -118364,7 +118478,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let reasonToRelatedInfo;
   const cachedBindAndCheckDiagnosticsForFile = {};
   const cachedDeclarationDiagnosticsForFile = {};
-  let resolvedTypeReferenceDirectives = createModeAwareCache();
   let fileProcessingDiagnostics;
   let automaticTypeDirectiveNames;
   let automaticTypeDirectiveResolutions;
@@ -118640,7 +118753,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   resolvedLibProcessing = void 0;
   resolvedModulesProcessing = void 0;
   resolvedTypeReferenceDirectiveNamesProcessing = void 0;
-  resolvedTypeReferenceDirectives = void 0;
   const program = {
     getRootFileNames: () => rootNames,
     getSourceFile,
@@ -120354,53 +120466,19 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     (_b2 = tracing) == null ? void 0 : _b2.pop();
   }
   function processTypeReferenceDirectiveWorker(typeReferenceDirective, mode, resolution, reason) {
-    var _a2;
     addResolutionDiagnostics(resolution);
-    const previousResolution = (_a2 = resolvedTypeReferenceDirectives.get(typeReferenceDirective, mode)) == null ? void 0 : _a2.resolvedTypeReferenceDirective;
-    if (previousResolution && previousResolution.primary) {
-      return;
-    }
-    let saveResolution = true;
     const { resolvedTypeReferenceDirective } = resolution;
     if (resolvedTypeReferenceDirective) {
       if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth++;
-      if (resolvedTypeReferenceDirective.primary) {
-        processSourceFile(
-          resolvedTypeReferenceDirective.resolvedFileName,
-          /*isDefaultLib*/
-          false,
-          /*ignoreNoDefaultLib*/
-          false,
-          resolvedTypeReferenceDirective.packageId,
-          reason
-        );
-      } else {
-        if (previousResolution) {
-          if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
-            const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-            const existingFile = getSourceFile(previousResolution.resolvedFileName);
-            if (otherFileText !== existingFile.text) {
-              addFilePreprocessingFileExplainingDiagnostic(
-                existingFile,
-                reason,
-                Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
-                [typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName]
-              );
-            }
-          }
-          saveResolution = false;
-        } else {
-          processSourceFile(
-            resolvedTypeReferenceDirective.resolvedFileName,
-            /*isDefaultLib*/
-            false,
-            /*ignoreNoDefaultLib*/
-            false,
-            resolvedTypeReferenceDirective.packageId,
-            reason
-          );
-        }
-      }
+      processSourceFile(
+        resolvedTypeReferenceDirective.resolvedFileName,
+        /*isDefaultLib*/
+        false,
+        /*ignoreNoDefaultLib*/
+        false,
+        resolvedTypeReferenceDirective.packageId,
+        reason
+      );
       if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth--;
     } else {
       addFilePreprocessingFileExplainingDiagnostic(
@@ -120411,9 +120489,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         [typeReferenceDirective]
       );
     }
-    if (saveResolution) {
-      resolvedTypeReferenceDirectives.set(typeReferenceDirective, mode, resolution);
-    }
   }
   function pathForLibFile(libFileName) {
     const existing = resolvedLibReferences == null ? void 0 : resolvedLibReferences.get(libFileName);

package/lib/typescript.js

@@ -2368,7 +2368,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240514`;
+var version = `${versionMajorMinor}.0-dev.20240516`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6394,6 +6394,7 @@ var SymbolAccessibility = /* @__PURE__ */ ((SymbolAccessibility2) => {
   SymbolAccessibility2[SymbolAccessibility2["Accessible"] = 0] = "Accessible";
   SymbolAccessibility2[SymbolAccessibility2["NotAccessible"] = 1] = "NotAccessible";
   SymbolAccessibility2[SymbolAccessibility2["CannotBeNamed"] = 2] = "CannotBeNamed";
+  SymbolAccessibility2[SymbolAccessibility2["NotResolved"] = 3] = "NotResolved";
   return SymbolAccessibility2;
 })(SymbolAccessibility || {});
 var SyntheticSymbolKind = /* @__PURE__ */ ((SyntheticSymbolKind2) => {
@@ -10338,7 +10339,6 @@ var Diagnostics = {
   Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1: diag(4083, 1 /* Error */, "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083", "Type parameter '{0}' of exported type alias has or is using private name '{1}'."),
   Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2: diag(4084, 1 /* Error */, "Exported_type_alias_0_has_or_is_using_private_name_1_from_module_2_4084", "Exported type alias '{0}' has or is using private name '{1}' from module {2}."),
   Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
-  Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: diag(4090, 1 /* Error */, "Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090", "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
   Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
@@ -17551,7 +17551,8 @@ function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
 }
 function getJSDocCommentRanges(node, text) {
   const commentRanges = node.kind === 169 /* Parameter */ || node.kind === 168 /* TypeParameter */ || node.kind === 218 /* FunctionExpression */ || node.kind === 219 /* ArrowFunction */ || node.kind === 217 /* ParenthesizedExpression */ || node.kind === 260 /* VariableDeclaration */ || node.kind === 281 /* ExportSpecifier */ ? concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) : getLeadingCommentRanges(text, node.pos);
-  return filter(commentRanges, (comment) => text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 3) !== 47 /* slash */);
+  return filter(commentRanges, (comment) => comment.end <= node.end && // Due to parse errors sometime empty parameter may get comments assigned to it that end up not in parameter range
+  text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ && text.charCodeAt(comment.pos + 3) !== 47 /* slash */);
 }
 var fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)(('[^']*')|("[^"]*")).*?\/>/;
 var fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)(('[^']*')|("[^"]*")).*?\/>/;
@@ -53814,7 +53815,7 @@ function createTypeChecker(host) {
       return { accessibility: 0 /* Accessible */ };
     }
     return symbol && hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) || {
-      accessibility: 1 /* NotAccessible */,
+      accessibility: 3 /* NotResolved */,
       errorSymbolName: getTextOfNode(firstIdentifier),
       errorNode: firstIdentifier
     };
@@ -53952,6 +53953,7 @@ function createTypeChecker(host) {
       if (!nodeIsSynthesized(range) && !(range.flags & 16 /* Synthesized */) && (!context.enclosingFile || context.enclosingFile !== getSourceFileOfNode(range))) {
         range = factory.cloneNode(range);
       }
+      if (range === location) return range;
       if (!location) {
         return range;
       }
@@ -56088,6 +56090,57 @@ function createTypeChecker(host) {
         return updated;
       }
     }
+    function serializeTypeName(context, node, isTypeOf, typeArguments) {
+      const meaning = isTypeOf ? 111551 /* Value */ : 788968 /* Type */;
+      const symbol = resolveEntityName(
+        node,
+        meaning,
+        /*ignoreErrors*/
+        true
+      );
+      if (!symbol) return void 0;
+      const resolvedSymbol = symbol.flags & 2097152 /* Alias */ ? resolveAlias(symbol) : symbol;
+      if (isSymbolAccessible(
+        symbol,
+        context.enclosingDeclaration,
+        meaning,
+        /*shouldComputeAliasesToMakeVisible*/
+        false
+      ).accessibility !== 0 /* Accessible */) return void 0;
+      return symbolToTypeNode(resolvedSymbol, context, meaning, typeArguments);
+    }
+    function canReuseTypeNode(context, existing) {
+      if (isInJSFile(existing)) {
+        if (isLiteralImportTypeNode(existing)) {
+          void getTypeFromImportTypeNode(existing);
+          const nodeSymbol = getNodeLinks(existing).resolvedSymbol;
+          return !nodeSymbol || !// The import type resolved using jsdoc fallback logic
+          (!existing.isTypeOf && !(nodeSymbol.flags & 788968 /* Type */) || // The import type had type arguments autofilled by js fallback logic
+          !(length(existing.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))));
+        }
+      }
+      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;
+        }
+        if (isInJSDoc(existing)) {
+          return existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) && !getIntendedTypeFromJSDocTypeReference(existing) && symbol.flags & 788968 /* Type */;
+        }
+      }
+      if (isTypeOperatorNode(existing) && existing.operator === 158 /* UniqueKeyword */ && existing.type.kind === 155 /* SymbolKeyword */) {
+        const effectiveEnclosingContext = context.enclosingDeclaration && getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
+        return !!findAncestor(existing, (n) => n === effectiveEnclosingContext);
+      }
+      return true;
+    }
+    function serializeExistingTypeNode(context, typeNode) {
+      const type = getTypeFromTypeNode(typeNode);
+      return typeToTypeNodeHelper(type, context);
+    }
     function tryReuseExistingTypeNodeHelper(context, existing) {
       if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
         cancellationToken.throwIfCancellationRequested();
@@ -56097,6 +56150,7 @@ function createTypeChecker(host) {
       if (hadError) {
         return void 0;
       }
+      context.approximateLength += existing.end - existing.pos;
       return transformed;
       function visitExistingNodeTreeSymbols(node) {
         const onExitNewScope = isNewScopeNode(node) ? onEnterNewScope(node) : void 0;
@@ -56196,20 +56250,38 @@ function createTypeChecker(host) {
             );
           }
         }
-        if (isTypeReferenceNode(node) && isInJSDoc(node) && (!existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(node, getTypeFromTypeNode(node)) || getIntendedTypeFromJSDocTypeReference(node) || unknownSymbol === resolveTypeReferenceName(
-          node,
-          788968 /* Type */,
-          /*ignoreErrors*/
-          true
-        ))) {
-          return setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
+        if (isTypeReferenceNode(node)) {
+          if (canReuseTypeNode(context, node)) {
+            const { introducesError, node: newName } = trackExistingEntityName(node.typeName, context);
+            const typeArguments = visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode);
+            if (!introducesError) {
+              const updated = factory.updateTypeReferenceNode(
+                node,
+                newName,
+                typeArguments
+              );
+              return setTextRange2(context, updated, node);
+            } else {
+              const serializedName = serializeTypeName(
+                context,
+                node.typeName,
+                /*isTypeOf*/
+                false,
+                typeArguments
+              );
+              if (serializedName) {
+                return setTextRange2(context, serializedName, node.typeName);
+              }
+            }
+          }
+          return serializeExistingTypeNode(context, node);
         }
         if (isLiteralImportTypeNode(node)) {
           const nodeSymbol = getNodeLinks(node).resolvedSymbol;
           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 setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
+            return setTextRange2(context, typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
           }
           return factory.updateImportTypeNode(
             node,
@@ -56241,13 +56313,48 @@ function createTypeChecker(host) {
           }
           return visited;
         }
-        if (isEntityName(node) || isEntityNameExpression(node)) {
-          if (isDeclarationName(node)) {
-            return node;
+        if (isTypeQueryNode(node)) {
+          const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context);
+          if (introducesError) {
+            const serializedName = serializeTypeName(
+              context,
+              node.exprName,
+              /*isTypeOf*/
+              true
+            );
+            if (serializedName) {
+              return setTextRange2(context, serializedName, node.exprName);
+            }
+            return serializeExistingTypeNode(context, node);
           }
-          const { introducesError, node: result } = trackExistingEntityName(node, context);
+          return factory.updateTypeQueryNode(
+            node,
+            exprName,
+            visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode)
+          );
+        }
+        if (isComputedPropertyName(node) && isEntityNameExpression(node.expression)) {
+          const { node: result, introducesError } = trackExistingEntityName(node.expression, context);
+          if (!introducesError) {
+            return factory.updateComputedPropertyName(node, result);
+          } else {
+            const type = getWidenedType(getRegularTypeOfExpression(node.expression));
+            const computedPropertyNameType = typeToTypeNodeHelper(type, context);
+            Debug.assertNode(computedPropertyNameType, isLiteralTypeNode);
+            const literal = computedPropertyNameType.literal;
+            if (literal.kind === 11 /* StringLiteral */ && isIdentifierText(literal.text, getEmitScriptTarget(compilerOptions))) {
+              return factory.createIdentifier(literal.text);
+            }
+            if (literal.kind === 9 /* NumericLiteral */ && !literal.text.startsWith("-")) {
+              return literal;
+            }
+            return factory.updateComputedPropertyName(node, literal);
+          }
+        }
+        if (isTypePredicateNode(node) && isIdentifier(node.parameterName)) {
+          const { node: result, introducesError } = trackExistingEntityName(node.parameterName, context);
           hadError = hadError || introducesError;
-          return result;
+          return factory.updateTypePredicateNode(node, node.assertsModifier, result, visitNode(node.type, visitExistingNodeTreeSymbols, isTypeNode));
         }
         if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
           const visited = visitEachChild(
@@ -56281,6 +56388,11 @@ function createTypeChecker(host) {
             falseType2
           );
         }
+        if (isTypeOperatorNode(node) && node.operator === 158 /* UniqueKeyword */ && node.type.kind === 155 /* SymbolKeyword */) {
+          if (!canReuseTypeNode(context, node)) {
+            return serializeExistingTypeNode(context, node);
+          }
+        }
         return visitEachChild(
           node,
           visitExistingNodeTreeSymbols,
@@ -82246,6 +82358,10 @@ function createTypeChecker(host) {
       texts.push(span.literal.text);
       types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
     }
+    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node).value;
+    if (evaluated) {
+      return getFreshTypeOfLiteralType(getStringLiteralType(evaluated));
+    }
     if (isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType2(
       node,
       /*contextFlags*/
@@ -82253,8 +82369,7 @@ function createTypeChecker(host) {
     ) || unknownType, isTemplateLiteralContextualType)) {
       return getTemplateLiteralType(texts, types);
     }
-    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node).value;
-    return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
+    return stringType;
   }
   function isTemplateLiteralContextualType(type) {
     return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) || type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
@@ -115126,7 +115241,7 @@ function transformDeclarations(context) {
           }
         }
       }
-    } else {
+    } else if (symbolAccessibilityResult.accessibility !== 3 /* NotResolved */) {
       const errorInfo = getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
       if (errorInfo) {
         if (errorInfo.typeName) {
@@ -123397,7 +123512,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let reasonToRelatedInfo;
   const cachedBindAndCheckDiagnosticsForFile = {};
   const cachedDeclarationDiagnosticsForFile = {};
-  let resolvedTypeReferenceDirectives = createModeAwareCache();
   let fileProcessingDiagnostics;
   let automaticTypeDirectiveNames;
   let automaticTypeDirectiveResolutions;
@@ -123673,7 +123787,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   resolvedLibProcessing = void 0;
   resolvedModulesProcessing = void 0;
   resolvedTypeReferenceDirectiveNamesProcessing = void 0;
-  resolvedTypeReferenceDirectives = void 0;
   const program = {
     getRootFileNames: () => rootNames,
     getSourceFile,
@@ -125387,53 +125500,19 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     (_b2 = tracing) == null ? void 0 : _b2.pop();
   }
   function processTypeReferenceDirectiveWorker(typeReferenceDirective, mode, resolution, reason) {
-    var _a2;
     addResolutionDiagnostics(resolution);
-    const previousResolution = (_a2 = resolvedTypeReferenceDirectives.get(typeReferenceDirective, mode)) == null ? void 0 : _a2.resolvedTypeReferenceDirective;
-    if (previousResolution && previousResolution.primary) {
-      return;
-    }
-    let saveResolution = true;
     const { resolvedTypeReferenceDirective } = resolution;
     if (resolvedTypeReferenceDirective) {
       if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth++;
-      if (resolvedTypeReferenceDirective.primary) {
-        processSourceFile(
-          resolvedTypeReferenceDirective.resolvedFileName,
-          /*isDefaultLib*/
-          false,
-          /*ignoreNoDefaultLib*/
-          false,
-          resolvedTypeReferenceDirective.packageId,
-          reason
-        );
-      } else {
-        if (previousResolution) {
-          if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
-            const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-            const existingFile = getSourceFile(previousResolution.resolvedFileName);
-            if (otherFileText !== existingFile.text) {
-              addFilePreprocessingFileExplainingDiagnostic(
-                existingFile,
-                reason,
-                Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
-                [typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName]
-              );
-            }
-          }
-          saveResolution = false;
-        } else {
-          processSourceFile(
-            resolvedTypeReferenceDirective.resolvedFileName,
-            /*isDefaultLib*/
-            false,
-            /*ignoreNoDefaultLib*/
-            false,
-            resolvedTypeReferenceDirective.packageId,
-            reason
-          );
-        }
-      }
+      processSourceFile(
+        resolvedTypeReferenceDirective.resolvedFileName,
+        /*isDefaultLib*/
+        false,
+        /*ignoreNoDefaultLib*/
+        false,
+        resolvedTypeReferenceDirective.packageId,
+        reason
+      );
       if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth--;
     } else {
       addFilePreprocessingFileExplainingDiagnostic(
@@ -125444,9 +125523,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         [typeReferenceDirective]
       );
     }
-    if (saveResolution) {
-      resolvedTypeReferenceDirectives.set(typeReferenceDirective, mode, resolution);
-    }
   }
   function pathForLibFile(libFileName) {
     const existing = resolvedLibReferences == null ? void 0 : resolvedLibReferences.get(libFileName);

package/package.json

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