typescript 6.0.0-dev.20251207 → 6.0.0-dev.20251209

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-dev.20251207`;
+var version = `${versionMajorMinor}.0-dev.20251209`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -46585,7 +46585,7 @@ function createTypeChecker(host) {
       if (!node) {
         return void 0;
       }
-      if (contextFlags & 4 /* Completions */) {
+      if (contextFlags & 4 /* IgnoreNodeInferences */) {
         return runWithInferenceBlockedFromSourceNode(node, () => getContextualType(node, contextFlags));
       }
       return getContextualType(node, contextFlags);
@@ -73462,7 +73462,7 @@ function createTypeChecker(host) {
     ), getNameFromImportAttribute(node));
   }
   function getContextualJsxElementAttributesType(node, contextFlags) {
-    if (isJsxOpeningElement(node) && contextFlags !== 4 /* Completions */) {
+    if (isJsxOpeningElement(node) && contextFlags !== 4 /* IgnoreNodeInferences */) {
       const index = findContextualNode(
         node.parent,
         /*includeCaches*/

package/lib/typescript.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-dev.20251207`;
+var version = `${versionMajorMinor}.0-dev.20251209`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6169,7 +6169,7 @@ var ContextFlags = /* @__PURE__ */ ((ContextFlags3) => {
   ContextFlags3[ContextFlags3["None"] = 0] = "None";
   ContextFlags3[ContextFlags3["Signature"] = 1] = "Signature";
   ContextFlags3[ContextFlags3["NoConstraints"] = 2] = "NoConstraints";
-  ContextFlags3[ContextFlags3["Completions"] = 4] = "Completions";
+  ContextFlags3[ContextFlags3["IgnoreNodeInferences"] = 4] = "IgnoreNodeInferences";
   ContextFlags3[ContextFlags3["SkipBindingPatterns"] = 8] = "SkipBindingPatterns";
   return ContextFlags3;
 })(ContextFlags || {});
@@ -51213,7 +51213,7 @@ function createTypeChecker(host) {
       if (!node) {
         return void 0;
       }
-      if (contextFlags & 4 /* Completions */) {
+      if (contextFlags & 4 /* IgnoreNodeInferences */) {
         return runWithInferenceBlockedFromSourceNode(node, () => getContextualType2(node, contextFlags));
       }
       return getContextualType2(node, contextFlags);
@@ -78090,7 +78090,7 @@ function createTypeChecker(host) {
     ), getNameFromImportAttribute(node));
   }
   function getContextualJsxElementAttributesType(node, contextFlags) {
-    if (isJsxOpeningElement(node) && contextFlags !== 4 /* Completions */) {
+    if (isJsxOpeningElement(node) && contextFlags !== 4 /* IgnoreNodeInferences */) {
       const index = findContextualNode(
         node.parent,
         /*includeCaches*/
@@ -168924,7 +168924,7 @@ function getContextualType(previousToken, position, sourceFile, checker) {
       return argInfo ? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
         // completion at `x ===/**/` should be for the right side
         checker.getTypeAtLocation(parent2.left)
-      ) : checker.getContextualType(previousToken, 4 /* Completions */) || checker.getContextualType(previousToken);
+      ) : checker.getContextualType(previousToken, 4 /* IgnoreNodeInferences */) || checker.getContextualType(previousToken);
   }
 }
 function getFirstSymbolInChain(symbol, enclosingDeclaration, checker) {
@@ -169429,7 +169429,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
     const jsxContainer = tryGetContainingJsxElement(contextToken);
     const attrsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes);
     if (!attrsType) return 0 /* Continue */;
-    const completionsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes, 4 /* Completions */);
+    const completionsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes, 4 /* IgnoreNodeInferences */);
     symbols = concatenate(symbols, filterJsxAttributes(getPropertiesForObjectExpression(attrsType, completionsType, jsxContainer.attributes, typeChecker), jsxContainer.attributes.properties));
     setSortTextToOptionalMember();
     completionKind = 3 /* MemberLike */;
@@ -169856,7 +169856,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
         }
         return 0 /* Continue */;
       }
-      const completionsType = typeChecker.getContextualType(objectLikeContainer, 4 /* Completions */);
+      const completionsType = typeChecker.getContextualType(objectLikeContainer, 4 /* IgnoreNodeInferences */);
       const hasStringIndexType = (completionsType || instantiatedType).getStringIndexType();
       const hasNumberIndextype = (completionsType || instantiatedType).getNumberIndexType();
       isNewIdentifierLocation = !!hasStringIndexType || !!hasNumberIndextype;
@@ -171153,7 +171153,15 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, program,
       if (isObjectLiteralExpression(parent2.parent) && parent2.name === node) {
         return stringLiteralCompletionsForObjectLiteral(typeChecker, parent2.parent);
       }
-      return fromContextualType() || fromContextualType(0 /* None */);
+      if (findAncestor(parent2.parent, isCallLikeExpression)) {
+        const uniques2 = /* @__PURE__ */ new Set();
+        const stringLiteralTypes = concatenate(
+          getStringLiteralTypes(typeChecker.getContextualType(node, 0 /* None */), uniques2),
+          getStringLiteralTypes(typeChecker.getContextualType(node, 4 /* IgnoreNodeInferences */), uniques2)
+        );
+        return toStringLiteralCompletionsFromTypes(stringLiteralTypes);
+      }
+      return fromContextualType(0 /* None */);
     case 213 /* ElementAccessExpression */: {
       const { expression, argumentExpression } = parent2;
       if (node === skipParentheses(argumentExpression)) {
@@ -171249,14 +171257,13 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, program,
         return void 0;
     }
   }
-  function fromContextualType(contextFlags = 4 /* Completions */) {
-    const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
-    if (!types.length) {
-      return;
-    }
-    return { kind: 2 /* Types */, types, isNewIdentifier: false };
+  function fromContextualType(contextFlags = 4 /* IgnoreNodeInferences */) {
+    return toStringLiteralCompletionsFromTypes(getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags)));
   }
 }
+function toStringLiteralCompletionsFromTypes(types) {
+  return types.length ? { kind: 2 /* Types */, types, isNewIdentifier: false } : void 0;
+}
 function walkUpParentheses(node) {
   switch (node.kind) {
     case 197 /* ParenthesizedType */:
@@ -171299,7 +171306,7 @@ function stringLiteralCompletionsFromProperties(type) {
 function stringLiteralCompletionsForObjectLiteral(checker, objectLiteralExpression) {
   const contextualType = checker.getContextualType(objectLiteralExpression);
   if (!contextualType) return void 0;
-  const completionsType = checker.getContextualType(objectLiteralExpression, 4 /* Completions */);
+  const completionsType = checker.getContextualType(objectLiteralExpression, 4 /* IgnoreNodeInferences */);
   const symbols = getPropertiesForObjectExpression(
     contextualType,
     completionsType,
@@ -174594,13 +174601,29 @@ function getDefinitionFromObjectLiteralElement(typeChecker, node) {
   if (element) {
     const contextualType = element && typeChecker.getContextualType(element.parent);
     if (contextualType) {
-      return flatMap(getPropertySymbolsFromContextualType(
+      let properties = getPropertySymbolsFromContextualType(
         element,
         typeChecker,
         contextualType,
         /*unionSymbolOk*/
         false
-      ), (propertySymbol) => getDefinitionFromSymbol(typeChecker, propertySymbol, node));
+      );
+      if (some(properties, (p) => !!(p.valueDeclaration && isObjectLiteralExpression(p.valueDeclaration.parent) && isObjectLiteralElementLike(p.valueDeclaration) && p.valueDeclaration.name === node))) {
+        const withoutNodeInferencesType = typeChecker.getContextualType(element.parent, 4 /* IgnoreNodeInferences */);
+        if (withoutNodeInferencesType) {
+          const withoutNodeInferencesProperties = getPropertySymbolsFromContextualType(
+            element,
+            typeChecker,
+            withoutNodeInferencesType,
+            /*unionSymbolOk*/
+            false
+          );
+          if (withoutNodeInferencesProperties.length) {
+            properties = withoutNodeInferencesProperties;
+          }
+        }
+      }
+      return flatMap(properties, (propertySymbol) => getDefinitionFromSymbol(typeChecker, propertySymbol, node));
     }
   }
   return emptyArray;

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "6.0.0-dev.20251207",
+    "version": "6.0.0-dev.20251209",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -115,5 +115,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "38d95c8001300f525fd601dd0ce6d0ff5f12baee"
+    "gitHead": "ab142be459f50e7cf1327b6ab1031074cf7d8e5e"
 }