@typescript-deploys/pr-build 5.0.0-pr-52728-17 → 5.0.0-pr-52807-23

package/lib/tsc.js

@@ -42585,7 +42585,6 @@ function createTypeChecker(host) {
   let inlineLevel = 0;
   let currentNode;
   let varianceTypeParameter;
-  let isInferencePartiallyBlocked = false;
   const emptySymbols = createSymbolTable();
   const arrayVariances = [1 /* Covariant */];
   const compilerOptions = host.getCompilerOptions();
@@ -43017,9 +43016,7 @@ function createTypeChecker(host) {
         toMarkSkip = toMarkSkip.parent;
       } while (toMarkSkip && toMarkSkip !== containingCall);
     }
-    isInferencePartiallyBlocked = true;
     const result = runWithoutResolvedSignatureCaching(node, fn);
-    isInferencePartiallyBlocked = false;
     if (containingCall) {
       let toMarkSkip = node;
       do {
@@ -61837,6 +61834,17 @@ function createTypeChecker(host) {
   function getBaseTypeOfLiteralTypeForComparison(type) {
     return type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ? stringType : type.flags & (256 /* NumberLiteral */ | 32 /* Enum */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 512 /* BooleanLiteral */ ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getBaseTypeOfLiteralTypeForComparison) : type;
   }
+  function getValueOfResult(type) {
+    const valueOf = getPropertyOfType(type, "valueOf");
+    if (valueOf) {
+      const signatures = getSignaturesOfType(getTypeOfSymbol(valueOf), 0 /* Call */);
+      if (signatures && signatures.length > 0) {
+        const returnType = getReturnTypeOfSignature(signatures[0]);
+        return returnType;
+      }
+    }
+    return type;
+  }
   function getWidenedLiteralType(type) {
     return type.flags & 1056 /* EnumLike */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLikeType(type) : type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType : type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType : type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType : type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getWidenedLiteralType) : type;
   }
@@ -69661,7 +69669,7 @@ function createTypeChecker(host) {
     const isTaggedTemplate = node.kind === 212 /* TaggedTemplateExpression */;
     const isDecorator2 = node.kind === 167 /* Decorator */;
     const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
-    const reportErrors2 = !isInferencePartiallyBlocked && !candidatesOutArray;
+    const reportErrors2 = !candidatesOutArray;
     let typeArguments;
     if (!isDecorator2 && !isSuperCall(node)) {
       typeArguments = node.typeArguments;
@@ -72908,9 +72916,17 @@ function createTypeChecker(host) {
             if (isTypeAny(left2) || isTypeAny(right2)) {
               return true;
             }
+            if (!(left2.flags & 134348796 /* Primitive */))
+              left2 = getValueOfResult(left2);
+            if (!(right2.flags & 134348796 /* Primitive */))
+              right2 = getValueOfResult(right2);
             const leftAssignableToNumber = isTypeAssignableTo(left2, numberOrBigIntType);
-            const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
-            return leftAssignableToNumber && rightAssignableToNumber || !leftAssignableToNumber && !rightAssignableToNumber && areTypesComparable(left2, right2);
+            if (leftAssignableToNumber) {
+              const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
+              if (rightAssignableToNumber)
+                return true;
+            }
+            return isTypeAssignableTo(left2, stringType) && isTypeAssignableTo(right2, stringType);
           });
         }
         return booleanType;
@@ -87640,7 +87656,16 @@ function transformClassFields(context) {
         visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
       );
     }
-    return visitEachChild(node, visitor, context);
+    return factory2.updatePropertyDeclaration(
+      node,
+      visitNodes2(node.modifiers, modifierVisitor, isModifier),
+      visitNode(node.name, propertyNameVisitor, isPropertyName),
+      /*questionOrExclamationToken*/
+      void 0,
+      /*type*/
+      void 0,
+      visitNode(node.initializer, visitor, isExpression)
+    );
   }
   function transformPublicFieldInitializer(node) {
     if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {

package/lib/tsserver.js

@@ -47161,7 +47161,6 @@ function createTypeChecker(host) {
   let inlineLevel = 0;
   let currentNode;
   let varianceTypeParameter;
-  let isInferencePartiallyBlocked = false;
   const emptySymbols = createSymbolTable();
   const arrayVariances = [1 /* Covariant */];
   const compilerOptions = host.getCompilerOptions();
@@ -47593,9 +47592,7 @@ function createTypeChecker(host) {
         toMarkSkip = toMarkSkip.parent;
       } while (toMarkSkip && toMarkSkip !== containingCall);
     }
-    isInferencePartiallyBlocked = true;
     const result = runWithoutResolvedSignatureCaching(node, fn);
-    isInferencePartiallyBlocked = false;
     if (containingCall) {
       let toMarkSkip = node;
       do {
@@ -66413,6 +66410,17 @@ function createTypeChecker(host) {
   function getBaseTypeOfLiteralTypeForComparison(type) {
     return type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ? stringType : type.flags & (256 /* NumberLiteral */ | 32 /* Enum */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 512 /* BooleanLiteral */ ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getBaseTypeOfLiteralTypeForComparison) : type;
   }
+  function getValueOfResult(type) {
+    const valueOf = getPropertyOfType(type, "valueOf");
+    if (valueOf) {
+      const signatures = getSignaturesOfType(getTypeOfSymbol(valueOf), 0 /* Call */);
+      if (signatures && signatures.length > 0) {
+        const returnType = getReturnTypeOfSignature(signatures[0]);
+        return returnType;
+      }
+    }
+    return type;
+  }
   function getWidenedLiteralType(type) {
     return type.flags & 1056 /* EnumLike */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLikeType(type) : type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType : type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType : type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType : type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getWidenedLiteralType) : type;
   }
@@ -74237,7 +74245,7 @@ function createTypeChecker(host) {
     const isTaggedTemplate = node.kind === 212 /* TaggedTemplateExpression */;
     const isDecorator2 = node.kind === 167 /* Decorator */;
     const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
-    const reportErrors2 = !isInferencePartiallyBlocked && !candidatesOutArray;
+    const reportErrors2 = !candidatesOutArray;
     let typeArguments;
     if (!isDecorator2 && !isSuperCall(node)) {
       typeArguments = node.typeArguments;
@@ -77484,9 +77492,17 @@ function createTypeChecker(host) {
             if (isTypeAny(left2) || isTypeAny(right2)) {
               return true;
             }
+            if (!(left2.flags & 134348796 /* Primitive */))
+              left2 = getValueOfResult(left2);
+            if (!(right2.flags & 134348796 /* Primitive */))
+              right2 = getValueOfResult(right2);
             const leftAssignableToNumber = isTypeAssignableTo(left2, numberOrBigIntType);
-            const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
-            return leftAssignableToNumber && rightAssignableToNumber || !leftAssignableToNumber && !rightAssignableToNumber && areTypesComparable(left2, right2);
+            if (leftAssignableToNumber) {
+              const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
+              if (rightAssignableToNumber)
+                return true;
+            }
+            return isTypeAssignableTo(left2, stringType) && isTypeAssignableTo(right2, stringType);
           });
         }
         return booleanType;
@@ -92387,7 +92403,16 @@ function transformClassFields(context) {
         visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
       );
     }
-    return visitEachChild(node, visitor, context);
+    return factory2.updatePropertyDeclaration(
+      node,
+      visitNodes2(node.modifiers, modifierVisitor, isModifier),
+      visitNode(node.name, propertyNameVisitor, isPropertyName),
+      /*questionOrExclamationToken*/
+      void 0,
+      /*type*/
+      void 0,
+      visitNode(node.initializer, visitor, isExpression)
+    );
   }
   function transformPublicFieldInitializer(node) {
     if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {
@@ -135434,7 +135459,8 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       options.triggerCharacter,
       options.triggerKind,
       cancellationToken,
-      formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host)
+      formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host),
+      options.includeSymbol
     );
   }
   function getCompletionEntryDetails2(fileName, position, name, formattingOptions, source, preferences = emptyOptions, data) {
@@ -148262,7 +148288,7 @@ function resolvingModuleSpecifiers(logPrefix, host, resolver, program, position,
     return result2 || (needsFullResolution ? "failed" : "skipped");
   }
 }
-function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext) {
+function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
   var _a2;
   const { previousToken } = getRelevantTokens(position, sourceFile);
   if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -148284,7 +148310,7 @@ function getCompletionsAtPosition(host, program, log, sourceFile, position, pref
   } else {
     incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
   }
-  const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+  const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences, includeSymbol);
   if (stringCompletions) {
     return stringCompletions;
   }
@@ -148309,7 +148335,7 @@ function getCompletionsAtPosition(host, program, log, sourceFile, position, pref
   }
   switch (completionData.kind) {
     case 0 /* Data */:
-      const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
+      const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol);
       if (response == null ? void 0 : response.isIncomplete) {
         incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
       }
@@ -148439,7 +148465,7 @@ function keywordFiltersFromSyntaxKind(keywordCompletion) {
 function getOptionalReplacementSpan(location) {
   return (location == null ? void 0 : location.kind) === 79 /* Identifier */ ? createTextSpanFromNode(location) : void 0;
 }
-function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
+function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol) {
   const {
     symbols,
     contextToken,
@@ -148513,7 +148539,8 @@ function completionInfoFromData(sourceFile, host, program, compilerOptions, log,
     symbolToOriginInfoMap,
     symbolToSortTextMap,
     isJsxIdentifierExpected,
-    isRightOfOpenTag
+    isRightOfOpenTag,
+    includeSymbol
   );
   if (keywordFilters !== 0 /* None */) {
     for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -148762,7 +148789,7 @@ function completionNameForLiteral(sourceFile, preferences, literal) {
 function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
   return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
 }
-function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
   let insertText;
   let replacementSpan = getReplacementSpanForContextToken(replacementToken);
   let data;
@@ -148876,7 +148903,8 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
     isSnippet,
     isPackageJsonImport: originIsPackageJsonImport(origin) || void 0,
     isImportStatementCompletion: !!importStatementCompletion || void 0,
-    data
+    data,
+    ...includeSymbol ? { symbol } : void 0
   };
 }
 function isClassLikeMemberCompletion(symbol, location, sourceFile) {
@@ -149346,7 +149374,7 @@ function getSourceFromOrigin(origin) {
     return "TypeOnlyAlias/" /* TypeOnlyAlias */;
   }
 }
-function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
   var _a2;
   const start2 = timestamp();
   const variableDeclaration = getVariableDeclaration(location);
@@ -149386,7 +149414,8 @@ function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, con
       kind,
       formatContext,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (!entry) {
       continue;
@@ -151585,7 +151614,7 @@ function createNameAndKindSet() {
     values: map2.values.bind(map2)
   };
 }
-function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
+function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
   if (isInReferenceComment(sourceFile, position)) {
     const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
     return entries && convertPathCompletions(entries);
@@ -151594,10 +151623,10 @@ function getStringLiteralCompletions(sourceFile, position, contextToken, options
     if (!contextToken || !isStringLiteralLike(contextToken))
       return void 0;
     const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-    return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position);
+    return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol);
   }
 }
-function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position) {
+function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol) {
   if (completion === void 0) {
     return void 0;
   }
@@ -151623,7 +151652,28 @@ function convertStringLiteralCompletions(completion, contextToken, sourceFile, h
         preferences,
         options,
         /*formatContext*/
-        void 0
+        void 0,
+        /*isTypeOnlyLocation */
+        void 0,
+        /*propertyAccessToConvert*/
+        void 0,
+        /*jsxIdentifierExpected*/
+        void 0,
+        /*isJsxInitializer*/
+        void 0,
+        /*importStatementCompletion*/
+        void 0,
+        /*recommendedCompletion*/
+        void 0,
+        /*symbolToOriginInfoMap*/
+        void 0,
+        /*symbolToSortTextMap*/
+        void 0,
+        /*isJsxIdentifierExpected*/
+        void 0,
+        /*isRightOfOpenTag*/
+        void 0,
+        includeSymbol
       );
       return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
     }

package/lib/tsserverlibrary.d.ts

@@ -10073,6 +10073,13 @@ declare namespace ts {
          */
         triggerCharacter?: CompletionsTriggerCharacter;
         triggerKind?: CompletionTriggerKind;
+        /**
+         * Include a `symbol` property on each completion entry object.
+         * Symbols reference cyclic data structures and sometimes an entire TypeChecker instance,
+         * so use caution when serializing or retaining completion entries retrieved with this option.
+         * @default false
+         */
+        includeSymbol?: boolean;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -10630,6 +10637,12 @@ declare namespace ts {
         isFromUncheckedFile?: true;
         isPackageJsonImport?: true;
         isImportStatementCompletion?: true;
+        /**
+         * For API purposes.
+         * Included for non-string completions only when `includeSymbol: true` option is passed to `getCompletionsAtPosition`.
+         * @example Get declaration of completion: `symbol.valueDeclaration`
+         */
+        symbol?: Symbol;
         /**
          * A property to be sent back to TS Server in the CompletionDetailsRequest, along with `name`,
          * that allows TS Server to look up the symbol represented by the completion item, disambiguating

package/lib/tsserverlibrary.js

@@ -44970,7 +44970,6 @@ ${lanes.join("\n")}
     let inlineLevel = 0;
     let currentNode;
     let varianceTypeParameter;
-    let isInferencePartiallyBlocked = false;
     const emptySymbols = createSymbolTable();
     const arrayVariances = [1 /* Covariant */];
     const compilerOptions = host.getCompilerOptions();
@@ -45402,9 +45401,7 @@ ${lanes.join("\n")}
           toMarkSkip = toMarkSkip.parent;
         } while (toMarkSkip && toMarkSkip !== containingCall);
       }
-      isInferencePartiallyBlocked = true;
       const result = runWithoutResolvedSignatureCaching(node, fn);
-      isInferencePartiallyBlocked = false;
       if (containingCall) {
         let toMarkSkip = node;
         do {
@@ -64222,6 +64219,17 @@ ${lanes.join("\n")}
     function getBaseTypeOfLiteralTypeForComparison(type) {
       return type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ? stringType : type.flags & (256 /* NumberLiteral */ | 32 /* Enum */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 512 /* BooleanLiteral */ ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getBaseTypeOfLiteralTypeForComparison) : type;
     }
+    function getValueOfResult(type) {
+      const valueOf = getPropertyOfType(type, "valueOf");
+      if (valueOf) {
+        const signatures = getSignaturesOfType(getTypeOfSymbol(valueOf), 0 /* Call */);
+        if (signatures && signatures.length > 0) {
+          const returnType = getReturnTypeOfSignature(signatures[0]);
+          return returnType;
+        }
+      }
+      return type;
+    }
     function getWidenedLiteralType(type) {
       return type.flags & 1056 /* EnumLike */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLikeType(type) : type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType : type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType : type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType : type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getWidenedLiteralType) : type;
     }
@@ -72046,7 +72054,7 @@ ${lanes.join("\n")}
       const isTaggedTemplate = node.kind === 212 /* TaggedTemplateExpression */;
       const isDecorator2 = node.kind === 167 /* Decorator */;
       const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
-      const reportErrors2 = !isInferencePartiallyBlocked && !candidatesOutArray;
+      const reportErrors2 = !candidatesOutArray;
       let typeArguments;
       if (!isDecorator2 && !isSuperCall(node)) {
         typeArguments = node.typeArguments;
@@ -75293,9 +75301,17 @@ ${lanes.join("\n")}
               if (isTypeAny(left2) || isTypeAny(right2)) {
                 return true;
               }
+              if (!(left2.flags & 134348796 /* Primitive */))
+                left2 = getValueOfResult(left2);
+              if (!(right2.flags & 134348796 /* Primitive */))
+                right2 = getValueOfResult(right2);
               const leftAssignableToNumber = isTypeAssignableTo(left2, numberOrBigIntType);
-              const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
-              return leftAssignableToNumber && rightAssignableToNumber || !leftAssignableToNumber && !rightAssignableToNumber && areTypesComparable(left2, right2);
+              if (leftAssignableToNumber) {
+                const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
+                if (rightAssignableToNumber)
+                  return true;
+              }
+              return isTypeAssignableTo(left2, stringType) && isTypeAssignableTo(right2, stringType);
             });
           }
           return booleanType;
@@ -90372,7 +90388,16 @@ ${lanes.join("\n")}
           visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
         );
       }
-      return visitEachChild(node, visitor, context);
+      return factory2.updatePropertyDeclaration(
+        node,
+        visitNodes2(node.modifiers, modifierVisitor, isModifier),
+        visitNode(node.name, propertyNameVisitor, isPropertyName),
+        /*questionOrExclamationToken*/
+        void 0,
+        /*type*/
+        void 0,
+        visitNode(node.initializer, visitor, isExpression)
+      );
     }
     function transformPublicFieldInitializer(node) {
       if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {
@@ -133202,7 +133227,8 @@ ${lanes.join("\n")}
         options.triggerCharacter,
         options.triggerKind,
         cancellationToken,
-        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host)
+        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host),
+        options.includeSymbol
       );
     }
     function getCompletionEntryDetails2(fileName, position, name, formattingOptions, source, preferences = emptyOptions, data) {
@@ -147317,7 +147343,7 @@ ${lanes.join("\n")}
       return result2 || (needsFullResolution ? "failed" : "skipped");
     }
   }
-  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext) {
+  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
     var _a2;
     const { previousToken } = getRelevantTokens(position, sourceFile);
     if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -147339,7 +147365,7 @@ ${lanes.join("\n")}
     } else {
       incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
     }
-    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences, includeSymbol);
     if (stringCompletions) {
       return stringCompletions;
     }
@@ -147364,7 +147390,7 @@ ${lanes.join("\n")}
     }
     switch (completionData.kind) {
       case 0 /* Data */:
-        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
+        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol);
         if (response == null ? void 0 : response.isIncomplete) {
           incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
         }
@@ -147494,7 +147520,7 @@ ${lanes.join("\n")}
   function getOptionalReplacementSpan(location) {
     return (location == null ? void 0 : location.kind) === 79 /* Identifier */ ? createTextSpanFromNode(location) : void 0;
   }
-  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
+  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol) {
     const {
       symbols,
       contextToken,
@@ -147568,7 +147594,8 @@ ${lanes.join("\n")}
       symbolToOriginInfoMap,
       symbolToSortTextMap,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (keywordFilters !== 0 /* None */) {
       for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -147817,7 +147844,7 @@ ${lanes.join("\n")}
   function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
     return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
   }
-  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
     let insertText;
     let replacementSpan = getReplacementSpanForContextToken(replacementToken);
     let data;
@@ -147931,7 +147958,8 @@ ${lanes.join("\n")}
       isSnippet,
       isPackageJsonImport: originIsPackageJsonImport(origin) || void 0,
       isImportStatementCompletion: !!importStatementCompletion || void 0,
-      data
+      data,
+      ...includeSymbol ? { symbol } : void 0
     };
   }
   function isClassLikeMemberCompletion(symbol, location, sourceFile) {
@@ -148401,7 +148429,7 @@ ${lanes.join("\n")}
       return "TypeOnlyAlias/" /* TypeOnlyAlias */;
     }
   }
-  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
     var _a2;
     const start = timestamp();
     const variableDeclaration = getVariableDeclaration(location);
@@ -148441,7 +148469,8 @@ ${lanes.join("\n")}
         kind,
         formatContext,
         isJsxIdentifierExpected,
-        isRightOfOpenTag
+        isRightOfOpenTag,
+        includeSymbol
       );
       if (!entry) {
         continue;
@@ -150682,7 +150711,7 @@ ${lanes.join("\n")}
       values: map2.values.bind(map2)
     };
   }
-  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
+  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
     if (isInReferenceComment(sourceFile, position)) {
       const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
       return entries && convertPathCompletions(entries);
@@ -150691,10 +150720,10 @@ ${lanes.join("\n")}
       if (!contextToken || !isStringLiteralLike(contextToken))
         return void 0;
       const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position);
+      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol);
     }
   }
-  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position) {
+  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol) {
     if (completion === void 0) {
       return void 0;
     }
@@ -150720,7 +150749,28 @@ ${lanes.join("\n")}
           preferences,
           options,
           /*formatContext*/
-          void 0
+          void 0,
+          /*isTypeOnlyLocation */
+          void 0,
+          /*propertyAccessToConvert*/
+          void 0,
+          /*jsxIdentifierExpected*/
+          void 0,
+          /*isJsxInitializer*/
+          void 0,
+          /*importStatementCompletion*/
+          void 0,
+          /*recommendedCompletion*/
+          void 0,
+          /*symbolToOriginInfoMap*/
+          void 0,
+          /*symbolToSortTextMap*/
+          void 0,
+          /*isJsxIdentifierExpected*/
+          void 0,
+          /*isRightOfOpenTag*/
+          void 0,
+          includeSymbol
         );
         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
       }

package/lib/typescript.d.ts

@@ -6171,6 +6171,13 @@ declare namespace ts {
          */
         triggerCharacter?: CompletionsTriggerCharacter;
         triggerKind?: CompletionTriggerKind;
+        /**
+         * Include a `symbol` property on each completion entry object.
+         * Symbols reference cyclic data structures and sometimes an entire TypeChecker instance,
+         * so use caution when serializing or retaining completion entries retrieved with this option.
+         * @default false
+         */
+        includeSymbol?: boolean;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -6728,6 +6735,12 @@ declare namespace ts {
         isFromUncheckedFile?: true;
         isPackageJsonImport?: true;
         isImportStatementCompletion?: true;
+        /**
+         * For API purposes.
+         * Included for non-string completions only when `includeSymbol: true` option is passed to `getCompletionsAtPosition`.
+         * @example Get declaration of completion: `symbol.valueDeclaration`
+         */
+        symbol?: Symbol;
         /**
          * A property to be sent back to TS Server in the CompletionDetailsRequest, along with `name`,
          * that allows TS Server to look up the symbol represented by the completion item, disambiguating

package/lib/typescript.js

@@ -44970,7 +44970,6 @@ ${lanes.join("\n")}
     let inlineLevel = 0;
     let currentNode;
     let varianceTypeParameter;
-    let isInferencePartiallyBlocked = false;
     const emptySymbols = createSymbolTable();
     const arrayVariances = [1 /* Covariant */];
     const compilerOptions = host.getCompilerOptions();
@@ -45402,9 +45401,7 @@ ${lanes.join("\n")}
           toMarkSkip = toMarkSkip.parent;
         } while (toMarkSkip && toMarkSkip !== containingCall);
       }
-      isInferencePartiallyBlocked = true;
       const result = runWithoutResolvedSignatureCaching(node, fn);
-      isInferencePartiallyBlocked = false;
       if (containingCall) {
         let toMarkSkip = node;
         do {
@@ -64222,6 +64219,17 @@ ${lanes.join("\n")}
     function getBaseTypeOfLiteralTypeForComparison(type) {
       return type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ? stringType : type.flags & (256 /* NumberLiteral */ | 32 /* Enum */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 512 /* BooleanLiteral */ ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getBaseTypeOfLiteralTypeForComparison) : type;
     }
+    function getValueOfResult(type) {
+      const valueOf = getPropertyOfType(type, "valueOf");
+      if (valueOf) {
+        const signatures = getSignaturesOfType(getTypeOfSymbol(valueOf), 0 /* Call */);
+        if (signatures && signatures.length > 0) {
+          const returnType = getReturnTypeOfSignature(signatures[0]);
+          return returnType;
+        }
+      }
+      return type;
+    }
     function getWidenedLiteralType(type) {
       return type.flags & 1056 /* EnumLike */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLikeType(type) : type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType : type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType : type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType : type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getWidenedLiteralType) : type;
     }
@@ -72046,7 +72054,7 @@ ${lanes.join("\n")}
       const isTaggedTemplate = node.kind === 212 /* TaggedTemplateExpression */;
       const isDecorator2 = node.kind === 167 /* Decorator */;
       const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
-      const reportErrors2 = !isInferencePartiallyBlocked && !candidatesOutArray;
+      const reportErrors2 = !candidatesOutArray;
       let typeArguments;
       if (!isDecorator2 && !isSuperCall(node)) {
         typeArguments = node.typeArguments;
@@ -75293,9 +75301,17 @@ ${lanes.join("\n")}
               if (isTypeAny(left2) || isTypeAny(right2)) {
                 return true;
               }
+              if (!(left2.flags & 134348796 /* Primitive */))
+                left2 = getValueOfResult(left2);
+              if (!(right2.flags & 134348796 /* Primitive */))
+                right2 = getValueOfResult(right2);
               const leftAssignableToNumber = isTypeAssignableTo(left2, numberOrBigIntType);
-              const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
-              return leftAssignableToNumber && rightAssignableToNumber || !leftAssignableToNumber && !rightAssignableToNumber && areTypesComparable(left2, right2);
+              if (leftAssignableToNumber) {
+                const rightAssignableToNumber = isTypeAssignableTo(right2, numberOrBigIntType);
+                if (rightAssignableToNumber)
+                  return true;
+              }
+              return isTypeAssignableTo(left2, stringType) && isTypeAssignableTo(right2, stringType);
             });
           }
           return booleanType;
@@ -90372,7 +90388,16 @@ ${lanes.join("\n")}
           visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
         );
       }
-      return visitEachChild(node, visitor, context);
+      return factory2.updatePropertyDeclaration(
+        node,
+        visitNodes2(node.modifiers, modifierVisitor, isModifier),
+        visitNode(node.name, propertyNameVisitor, isPropertyName),
+        /*questionOrExclamationToken*/
+        void 0,
+        /*type*/
+        void 0,
+        visitNode(node.initializer, visitor, isExpression)
+      );
     }
     function transformPublicFieldInitializer(node) {
       if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {
@@ -133216,7 +133241,8 @@ ${lanes.join("\n")}
         options.triggerCharacter,
         options.triggerKind,
         cancellationToken,
-        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host)
+        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host),
+        options.includeSymbol
       );
     }
     function getCompletionEntryDetails2(fileName, position, name, formattingOptions, source, preferences = emptyOptions, data) {
@@ -147331,7 +147357,7 @@ ${lanes.join("\n")}
       return result2 || (needsFullResolution ? "failed" : "skipped");
     }
   }
-  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext) {
+  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
     var _a2;
     const { previousToken } = getRelevantTokens(position, sourceFile);
     if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -147353,7 +147379,7 @@ ${lanes.join("\n")}
     } else {
       incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
     }
-    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences, includeSymbol);
     if (stringCompletions) {
       return stringCompletions;
     }
@@ -147378,7 +147404,7 @@ ${lanes.join("\n")}
     }
     switch (completionData.kind) {
       case 0 /* Data */:
-        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
+        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol);
         if (response == null ? void 0 : response.isIncomplete) {
           incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
         }
@@ -147508,7 +147534,7 @@ ${lanes.join("\n")}
   function getOptionalReplacementSpan(location) {
     return (location == null ? void 0 : location.kind) === 79 /* Identifier */ ? createTextSpanFromNode(location) : void 0;
   }
-  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
+  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol) {
     const {
       symbols,
       contextToken,
@@ -147582,7 +147608,8 @@ ${lanes.join("\n")}
       symbolToOriginInfoMap,
       symbolToSortTextMap,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (keywordFilters !== 0 /* None */) {
       for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -147831,7 +147858,7 @@ ${lanes.join("\n")}
   function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
     return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
   }
-  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
     let insertText;
     let replacementSpan = getReplacementSpanForContextToken(replacementToken);
     let data;
@@ -147945,7 +147972,8 @@ ${lanes.join("\n")}
       isSnippet,
       isPackageJsonImport: originIsPackageJsonImport(origin) || void 0,
       isImportStatementCompletion: !!importStatementCompletion || void 0,
-      data
+      data,
+      ...includeSymbol ? { symbol } : void 0
     };
   }
   function isClassLikeMemberCompletion(symbol, location, sourceFile) {
@@ -148415,7 +148443,7 @@ ${lanes.join("\n")}
       return "TypeOnlyAlias/" /* TypeOnlyAlias */;
     }
   }
-  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
     var _a2;
     const start = timestamp();
     const variableDeclaration = getVariableDeclaration(location);
@@ -148455,7 +148483,8 @@ ${lanes.join("\n")}
         kind,
         formatContext,
         isJsxIdentifierExpected,
-        isRightOfOpenTag
+        isRightOfOpenTag,
+        includeSymbol
       );
       if (!entry) {
         continue;
@@ -150696,7 +150725,7 @@ ${lanes.join("\n")}
       values: map2.values.bind(map2)
     };
   }
-  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
+  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
     if (isInReferenceComment(sourceFile, position)) {
       const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
       return entries && convertPathCompletions(entries);
@@ -150705,10 +150734,10 @@ ${lanes.join("\n")}
       if (!contextToken || !isStringLiteralLike(contextToken))
         return void 0;
       const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position);
+      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol);
     }
   }
-  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position) {
+  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol) {
     if (completion === void 0) {
       return void 0;
     }
@@ -150734,7 +150763,28 @@ ${lanes.join("\n")}
           preferences,
           options,
           /*formatContext*/
-          void 0
+          void 0,
+          /*isTypeOnlyLocation */
+          void 0,
+          /*propertyAccessToConvert*/
+          void 0,
+          /*jsxIdentifierExpected*/
+          void 0,
+          /*isJsxInitializer*/
+          void 0,
+          /*importStatementCompletion*/
+          void 0,
+          /*recommendedCompletion*/
+          void 0,
+          /*symbolToOriginInfoMap*/
+          void 0,
+          /*symbolToSortTextMap*/
+          void 0,
+          /*isJsxIdentifierExpected*/
+          void 0,
+          /*isRightOfOpenTag*/
+          void 0,
+          includeSymbol
         );
         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
       }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.0.0-pr-52728-17",
+  "version": "5.0.0-pr-52807-23",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [