typescript 5.4.0-dev.20231203 → 5.4.0-dev.20231205

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231203`;
+var version = `${versionMajorMinor}.0-dev.20231205`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/lib/tsserver.js

@@ -2332,7 +2332,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231203`;
+var version = `${versionMajorMinor}.0-dev.20231205`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -159553,7 +159553,7 @@ function getContextualType(previousToken, position, sourceFile, checker) {
     case 19 /* OpenBraceToken */:
       return isJsxExpression(parent2) && !isJsxElement(parent2.parent) && !isJsxFragment(parent2.parent) ? checker.getContextualTypeForJsxAttribute(parent2.parent) : void 0;
     default:
-      const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile);
+      const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker);
       return argInfo ? (
         // At `,`, treat this as the next argument after the comma.
         checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === 28 /* CommaToken */ ? 1 : 0))
@@ -161680,7 +161680,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
     case 214 /* NewExpression */:
     case 291 /* JsxAttribute */:
       if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
-        const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 291 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
+        const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 291 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile, typeChecker);
         return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */);
       }
     case 272 /* ImportDeclaration */:
@@ -164576,7 +164576,7 @@ var Core;
         if (isStringLiteralLike(ref) && ref.text === node.text) {
           if (type) {
             const refType = getContextualTypeFromParentOrAncestorTypeNode(ref, checker);
-            if (type !== checker.getStringType() && type === refType) {
+            if (type !== checker.getStringType() && (type === refType || isStringLiteralPropertyReference(ref, checker))) {
               return nodeEntry(ref, 2 /* StringLiteral */);
             }
           } else {
@@ -164590,6 +164590,11 @@ var Core;
       references
     }];
   }
+  function isStringLiteralPropertyReference(node, checker) {
+    if (isPropertySignature(node.parent)) {
+      return checker.getPropertyOfType(checker.getTypeAtLocation(node.parent.parent), node.text);
+    }
+  }
   function populateSearchSymbolSet(symbol, location, checker, isForRename, providePrefixAndSuffixText, implementations) {
     const result = [];
     forEachRelatedSymbol(
@@ -167783,19 +167788,20 @@ function containsPrecedingToken(startingToken, sourceFile, container) {
   }
   return Debug.fail("Could not find preceding token");
 }
-function getArgumentInfoForCompletions(node, position, sourceFile) {
-  const info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
+function getArgumentInfoForCompletions(node, position, sourceFile, checker) {
+  const info = getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker);
   return !info || info.isTypeParameterList || info.invocation.kind !== 0 /* Call */ ? void 0 : { invocation: info.invocation.node, argumentCount: info.argumentCount, argumentIndex: info.argumentIndex };
 }
-function getArgumentOrParameterListInfo(node, position, sourceFile) {
-  const info = getArgumentOrParameterListAndIndex(node, sourceFile);
+function getArgumentOrParameterListInfo(node, position, sourceFile, checker) {
+  const info = getArgumentOrParameterListAndIndex(node, sourceFile, checker);
   if (!info)
     return void 0;
   const { list, argumentIndex } = info;
   const argumentCount = getArgumentCount(
     list,
     /*ignoreTrailingComma*/
-    isInString(sourceFile, position, node)
+    isInString(sourceFile, position, node),
+    checker
   );
   if (argumentIndex !== 0) {
     Debug.assertLessThan(argumentIndex, argumentCount);
@@ -167803,19 +167809,19 @@ function getArgumentOrParameterListInfo(node, position, sourceFile) {
   const argumentsSpan = getApplicableSpanForArguments(list, sourceFile);
   return { list, argumentIndex, argumentCount, argumentsSpan };
 }
-function getArgumentOrParameterListAndIndex(node, sourceFile) {
+function getArgumentOrParameterListAndIndex(node, sourceFile, checker) {
   if (node.kind === 30 /* LessThanToken */ || node.kind === 21 /* OpenParenToken */) {
     return { list: getChildListThatStartsWithOpenerToken(node.parent, node, sourceFile), argumentIndex: 0 };
   } else {
     const list = findContainingList(node);
-    return list && { list, argumentIndex: getArgumentIndex(list, node) };
+    return list && { list, argumentIndex: getArgumentIndex(list, node, checker) };
   }
 }
-function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
+function getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker) {
   const { parent: parent2 } = node;
   if (isCallOrNewExpression(parent2)) {
     const invocation = parent2;
-    const info = getArgumentOrParameterListInfo(node, position, sourceFile);
+    const info = getArgumentOrParameterListInfo(node, position, sourceFile, checker);
     if (!info)
       return void 0;
     const { list, argumentIndex, argumentCount, argumentsSpan } = info;
@@ -167873,7 +167879,7 @@ function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
   }
 }
 function getImmediatelyContainingArgumentOrContextualParameterInfo(node, position, sourceFile, checker) {
-  return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile);
+  return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker);
 }
 function getHighestBinary(b) {
   return isBinaryExpression(b.parent) ? getHighestBinary(b.parent) : b;
@@ -167915,7 +167921,7 @@ function getContextualSignatureLocationInfo(node, sourceFile, position, checker)
     case 174 /* MethodDeclaration */:
     case 218 /* FunctionExpression */:
     case 219 /* ArrowFunction */:
-      const info = getArgumentOrParameterListInfo(node, position, sourceFile);
+      const info = getArgumentOrParameterListInfo(node, position, sourceFile, checker);
       if (!info)
         return void 0;
       const { argumentIndex, argumentCount, argumentsSpan } = info;
@@ -167938,21 +167944,45 @@ function chooseBetterSymbol(s) {
     return isFunctionTypeNode(d) ? (_a = tryCast(d.parent, canHaveSymbol)) == null ? void 0 : _a.symbol : void 0;
   }) || s : s;
 }
-function getArgumentIndex(argumentsList, node) {
+function getArgumentIndex(argumentsList, node, checker) {
+  const args = argumentsList.getChildren();
   let argumentIndex = 0;
-  for (const child of argumentsList.getChildren()) {
+  for (let pos = 0; pos < length(args); pos++) {
+    const child = args[pos];
     if (child === node) {
       break;
     }
-    if (child.kind !== 28 /* CommaToken */) {
-      argumentIndex++;
+    if (isSpreadElement(child)) {
+      argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0);
+    } else {
+      if (child.kind !== 28 /* CommaToken */) {
+        argumentIndex++;
+      }
     }
   }
   return argumentIndex;
 }
-function getArgumentCount(argumentsList, ignoreTrailingComma) {
+function getSpreadElementCount(node, checker) {
+  const spreadType = checker.getTypeAtLocation(node.expression);
+  if (checker.isTupleType(spreadType)) {
+    const { elementFlags, fixedLength } = spreadType.target;
+    if (fixedLength === 0) {
+      return 0;
+    }
+    const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
+    return firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+  }
+  return 0;
+}
+function getArgumentCount(argumentsList, ignoreTrailingComma, checker) {
   const listChildren = argumentsList.getChildren();
-  let argumentCount = countWhere(listChildren, (arg) => arg.kind !== 28 /* CommaToken */);
+  let argumentCount = 0;
+  for (const child of listChildren) {
+    if (isSpreadElement(child)) {
+      argumentCount = argumentCount + getSpreadElementCount(child, checker);
+    }
+  }
+  argumentCount = argumentCount + countWhere(listChildren, (arg) => arg.kind !== 28 /* CommaToken */);
   if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === 28 /* CommaToken */) {
     argumentCount++;
   }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231203`;
+      version = `${versionMajorMinor}.0-dev.20231205`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -158765,7 +158765,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 19 /* OpenBraceToken */:
         return isJsxExpression(parent2) && !isJsxElement(parent2.parent) && !isJsxFragment(parent2.parent) ? checker.getContextualTypeForJsxAttribute(parent2.parent) : void 0;
       default:
-        const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile);
+        const argInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(previousToken, position, sourceFile, checker);
         return argInfo ? (
           // At `,`, treat this as the next argument after the comma.
           checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === 28 /* CommaToken */ ? 1 : 0))
@@ -160945,7 +160945,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 214 /* NewExpression */:
       case 291 /* JsxAttribute */:
         if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
-          const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 291 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
+          const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 291 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile, typeChecker);
           return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */);
         }
       case 272 /* ImportDeclaration */:
@@ -163876,7 +163876,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
               if (isStringLiteralLike(ref) && ref.text === node.text) {
                 if (type) {
                   const refType = getContextualTypeFromParentOrAncestorTypeNode(ref, checker);
-                  if (type !== checker.getStringType() && type === refType) {
+                  if (type !== checker.getStringType() && (type === refType || isStringLiteralPropertyReference(ref, checker))) {
                     return nodeEntry(ref, 2 /* StringLiteral */);
                   }
                 } else {
@@ -163890,6 +163890,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             references
           }];
         }
+        function isStringLiteralPropertyReference(node, checker) {
+          if (isPropertySignature(node.parent)) {
+            return checker.getPropertyOfType(checker.getTypeAtLocation(node.parent.parent), node.text);
+          }
+        }
         function populateSearchSymbolSet(symbol, location, checker, isForRename, providePrefixAndSuffixText, implementations) {
           const result = [];
           forEachRelatedSymbol(
@@ -167189,19 +167194,20 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     return Debug.fail("Could not find preceding token");
   }
-  function getArgumentInfoForCompletions(node, position, sourceFile) {
-    const info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
+  function getArgumentInfoForCompletions(node, position, sourceFile, checker) {
+    const info = getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker);
     return !info || info.isTypeParameterList || info.invocation.kind !== 0 /* Call */ ? void 0 : { invocation: info.invocation.node, argumentCount: info.argumentCount, argumentIndex: info.argumentIndex };
   }
-  function getArgumentOrParameterListInfo(node, position, sourceFile) {
-    const info = getArgumentOrParameterListAndIndex(node, sourceFile);
+  function getArgumentOrParameterListInfo(node, position, sourceFile, checker) {
+    const info = getArgumentOrParameterListAndIndex(node, sourceFile, checker);
     if (!info)
       return void 0;
     const { list, argumentIndex } = info;
     const argumentCount = getArgumentCount(
       list,
       /*ignoreTrailingComma*/
-      isInString(sourceFile, position, node)
+      isInString(sourceFile, position, node),
+      checker
     );
     if (argumentIndex !== 0) {
       Debug.assertLessThan(argumentIndex, argumentCount);
@@ -167209,19 +167215,19 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const argumentsSpan = getApplicableSpanForArguments(list, sourceFile);
     return { list, argumentIndex, argumentCount, argumentsSpan };
   }
-  function getArgumentOrParameterListAndIndex(node, sourceFile) {
+  function getArgumentOrParameterListAndIndex(node, sourceFile, checker) {
     if (node.kind === 30 /* LessThanToken */ || node.kind === 21 /* OpenParenToken */) {
       return { list: getChildListThatStartsWithOpenerToken(node.parent, node, sourceFile), argumentIndex: 0 };
     } else {
       const list = findContainingList(node);
-      return list && { list, argumentIndex: getArgumentIndex(list, node) };
+      return list && { list, argumentIndex: getArgumentIndex(list, node, checker) };
     }
   }
-  function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
+  function getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker) {
     const { parent: parent2 } = node;
     if (isCallOrNewExpression(parent2)) {
       const invocation = parent2;
-      const info = getArgumentOrParameterListInfo(node, position, sourceFile);
+      const info = getArgumentOrParameterListInfo(node, position, sourceFile, checker);
       if (!info)
         return void 0;
       const { list, argumentIndex, argumentCount, argumentsSpan } = info;
@@ -167279,7 +167285,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function getImmediatelyContainingArgumentOrContextualParameterInfo(node, position, sourceFile, checker) {
-    return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile);
+    return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile, checker);
   }
   function getHighestBinary(b) {
     return isBinaryExpression(b.parent) ? getHighestBinary(b.parent) : b;
@@ -167321,7 +167327,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 174 /* MethodDeclaration */:
       case 218 /* FunctionExpression */:
       case 219 /* ArrowFunction */:
-        const info = getArgumentOrParameterListInfo(node, position, sourceFile);
+        const info = getArgumentOrParameterListInfo(node, position, sourceFile, checker);
         if (!info)
           return void 0;
         const { argumentIndex, argumentCount, argumentsSpan } = info;
@@ -167344,21 +167350,45 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return isFunctionTypeNode(d) ? (_a = tryCast(d.parent, canHaveSymbol)) == null ? void 0 : _a.symbol : void 0;
     }) || s : s;
   }
-  function getArgumentIndex(argumentsList, node) {
+  function getArgumentIndex(argumentsList, node, checker) {
+    const args = argumentsList.getChildren();
     let argumentIndex = 0;
-    for (const child of argumentsList.getChildren()) {
+    for (let pos = 0; pos < length(args); pos++) {
+      const child = args[pos];
       if (child === node) {
         break;
       }
-      if (child.kind !== 28 /* CommaToken */) {
-        argumentIndex++;
+      if (isSpreadElement(child)) {
+        argumentIndex = argumentIndex + getSpreadElementCount(child, checker) + (pos > 0 ? pos : 0);
+      } else {
+        if (child.kind !== 28 /* CommaToken */) {
+          argumentIndex++;
+        }
       }
     }
     return argumentIndex;
   }
-  function getArgumentCount(argumentsList, ignoreTrailingComma) {
+  function getSpreadElementCount(node, checker) {
+    const spreadType = checker.getTypeAtLocation(node.expression);
+    if (checker.isTupleType(spreadType)) {
+      const { elementFlags, fixedLength } = spreadType.target;
+      if (fixedLength === 0) {
+        return 0;
+      }
+      const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
+      return firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+    }
+    return 0;
+  }
+  function getArgumentCount(argumentsList, ignoreTrailingComma, checker) {
     const listChildren = argumentsList.getChildren();
-    let argumentCount = countWhere(listChildren, (arg) => arg.kind !== 28 /* CommaToken */);
+    let argumentCount = 0;
+    for (const child of listChildren) {
+      if (isSpreadElement(child)) {
+        argumentCount = argumentCount + getSpreadElementCount(child, checker);
+      }
+    }
+    argumentCount = argumentCount + countWhere(listChildren, (arg) => arg.kind !== 28 /* CommaToken */);
     if (!ignoreTrailingComma && listChildren.length > 0 && last(listChildren).kind === 28 /* CommaToken */) {
       argumentCount++;
     }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231203`;
+var version = `${versionMajorMinor}.0-dev.20231205`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20231203",
+    "version": "5.4.0-dev.20231205",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "670815f768afb613ff2651b16dc4258aeb33a036"
+    "gitHead": "6c0687e493e23bfd054bf9ae1fc37a7cb75229ad"
 }