@typescript-deploys/pr-build 5.2.0-pr-54788-8 → 5.2.0-pr-52493-8

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230626`;
+var version = `${versionMajorMinor}.0-insiders.20230627`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7746,6 +7746,7 @@ var Diagnostics = {
   Inline_variable: diag(95184, 3 /* Message */, "Inline_variable_95184", "Inline variable"),
   Could_not_find_variable_to_inline: diag(95185, 3 /* Message */, "Could_not_find_variable_to_inline_95185", "Could not find variable to inline."),
   Variables_with_multiple_declarations_cannot_be_inlined: diag(95186, 3 /* Message */, "Variables_with_multiple_declarations_cannot_be_inlined_95186", "Variables with multiple declarations cannot be inlined."),
+  Add_missing_comma_for_object_member_completion_0: diag(95187, 3 /* Message */, "Add_missing_comma_for_object_member_completion_0_95187", "Add missing comma for object member completion '{0}'."),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -13286,8 +13287,8 @@ function isInExpressionContext(node) {
       return forStatement.initializer === node && forStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forStatement.condition === node || forStatement.incrementor === node;
     case 249 /* ForInStatement */:
     case 250 /* ForOfStatement */:
-      const forInStatement = parent;
-      return forInStatement.initializer === node && forInStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInStatement.expression === node;
+      const forInOrOfStatement = parent;
+      return forInOrOfStatement.initializer === node && forInOrOfStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInOrOfStatement.expression === node;
     case 216 /* TypeAssertionExpression */:
     case 234 /* AsExpression */:
       return node === parent.expression;
@@ -13948,20 +13949,23 @@ function getTypeParameterFromJsDoc(node) {
   const { typeParameters } = node.parent.parent.parent;
   return typeParameters && find(typeParameters, (p) => p.name.escapedText === name);
 }
-function getAssignmentTargetKind(node) {
+function getAssignmentTarget(node) {
   let parent = node.parent;
   while (true) {
     switch (parent.kind) {
       case 226 /* BinaryExpression */:
-        const binaryOperator = parent.operatorToken.kind;
-        return isAssignmentOperator(binaryOperator) && parent.left === node ? binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */;
+        const binaryExpression = parent;
+        const binaryOperator = binaryExpression.operatorToken.kind;
+        return isAssignmentOperator(binaryOperator) && binaryExpression.left === node ? binaryExpression : void 0;
       case 224 /* PrefixUnaryExpression */:
       case 225 /* PostfixUnaryExpression */:
-        const unaryOperator = parent.operator;
-        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
+        const unaryExpression = parent;
+        const unaryOperator = unaryExpression.operator;
+        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? unaryExpression : void 0;
       case 249 /* ForInStatement */:
       case 250 /* ForOfStatement */:
-        return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
+        const forInOrOfStatement = parent;
+        return forInOrOfStatement.initializer === node ? forInOrOfStatement : void 0;
       case 217 /* ParenthesizedExpression */:
       case 209 /* ArrayLiteralExpression */:
       case 230 /* SpreadElement */:
@@ -13973,24 +13977,53 @@ function getAssignmentTargetKind(node) {
         break;
       case 304 /* ShorthandPropertyAssignment */:
         if (parent.name !== node) {
-          return 0 /* None */;
+          return void 0;
         }
         node = parent.parent;
         break;
       case 303 /* PropertyAssignment */:
         if (parent.name === node) {
-          return 0 /* None */;
+          return void 0;
         }
         node = parent.parent;
         break;
       default:
-        return 0 /* None */;
+        return void 0;
     }
     parent = node.parent;
   }
 }
+function getAssignmentTargetKind(node) {
+  const target = getAssignmentTarget(node);
+  if (!target) {
+    return 0 /* None */;
+  }
+  switch (target.kind) {
+    case 226 /* BinaryExpression */:
+      const binaryOperator = target.operatorToken.kind;
+      return binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */;
+    case 224 /* PrefixUnaryExpression */:
+    case 225 /* PostfixUnaryExpression */:
+      return 2 /* Compound */;
+    case 249 /* ForInStatement */:
+    case 250 /* ForOfStatement */:
+      return 1 /* Definite */;
+  }
+}
 function isAssignmentTarget(node) {
-  return getAssignmentTargetKind(node) !== 0 /* None */;
+  return !!getAssignmentTarget(node);
+}
+function isCompoundLikeAssignment(assignment) {
+  const right = skipParentheses(assignment.right);
+  return right.kind === 226 /* BinaryExpression */ && isShiftOperatorOrHigher(right.operatorToken.kind);
+}
+function isInCompoundLikeAssignment(node) {
+  const target = getAssignmentTarget(node);
+  return !!target && isAssignmentExpression(
+    target,
+    /*excludeCompoundAssignment*/
+    true
+  ) && isCompoundLikeAssignment(target);
 }
 function isNodeWithPossibleHoistedDeclaration(node) {
   switch (node.kind) {
@@ -46167,7 +46200,6 @@ function createTypeChecker(host) {
     const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = findAncestor(location, isImportCall)) == null ? void 0 : _a.arguments[0]) || ((_b = findAncestor(location, isImportDeclaration)) == null ? void 0 : _b.moduleSpecifier) || ((_c = findAncestor(location, isExternalModuleImportEqualsDeclaration)) == null ? void 0 : _c.moduleReference.expression) || ((_d = findAncestor(location, isExportDeclaration)) == null ? void 0 : _d.moduleSpecifier) || ((_e = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _e.name) || ((_f = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _f.argument.literal);
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
-    const moduleKind2 = getEmitModuleKind(compilerOptions);
     const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode);
     const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
@@ -46200,7 +46232,7 @@ function createTypeChecker(host) {
             moduleReference
           );
         }
-        if (100 /* Node16 */ <= moduleKind2 && moduleKind2 <= 199 /* NodeNext */) {
+        if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
           const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_h = overrideClauseHost.assertions) == null ? void 0 : _h.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
@@ -46324,7 +46356,7 @@ function createTypeChecker(host) {
     return void 0;
     function getSuggestedImportSource(tsExtension) {
       const importSourceWithoutExtension = removeExtension(moduleReference, tsExtension);
-      if (emitModuleKindIsNonNodeESM(moduleKind2) || mode === 99 /* ESNext */) {
+      if (emitModuleKindIsNonNodeESM(moduleKind) || mode === 99 /* ESNext */) {
         const preferTs = isDeclarationFileName(moduleReference) && shouldAllowImportingTsExtension(compilerOptions);
         const ext = tsExtension === ".mts" /* Mts */ || tsExtension === ".d.mts" /* Dmts */ ? preferTs ? ".mts" : ".mjs" : tsExtension === ".cts" /* Cts */ || tsExtension === ".d.mts" /* Dmts */ ? preferTs ? ".cts" : ".cjs" : preferTs ? ".ts" : ".js";
         return importSourceWithoutExtension + ext;
@@ -65171,10 +65203,11 @@ function createTypeChecker(host) {
           const assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow));
           return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
         }
-        if (declaredType.flags & 1048576 /* Union */) {
-          return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow));
+        const t = isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(declaredType) : declaredType;
+        if (t.flags & 1048576 /* Union */) {
+          return getAssignmentReducedType(t, getInitialOrAssignedType(flow));
         }
-        return declaredType;
+        return t;
       }
       if (containsMatchingReference(reference, node)) {
         if (!isReachableFlowNode(flow)) {
@@ -66303,7 +66336,7 @@ function createTypeChecker(host) {
     const isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
     if (localOrExportSymbol.flags & 3 /* Variable */) {
       if (assignmentKind === 1 /* Definite */) {
-        return type;
+        return isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(type) : type;
       }
     } else if (isAlias) {
       declaration = getDeclarationOfAliasSymbol(symbol);
@@ -66630,17 +66663,14 @@ function createTypeChecker(host) {
     }
   }
   function getTypeForThisExpressionFromJSDoc(node) {
-    const jsdocType = getJSDocType(node);
-    if (jsdocType && jsdocType.kind === 324 /* JSDocFunctionType */) {
-      const jsDocFunctionType = jsdocType;
-      if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].name && jsDocFunctionType.parameters[0].name.escapedText === "this" /* This */) {
-        return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
-      }
-    }
     const thisTag = getJSDocThisTag(node);
     if (thisTag && thisTag.typeExpression) {
       return getTypeFromTypeNode(thisTag.typeExpression);
     }
+    const signature = getSignatureOfTypeTag(node);
+    if (signature) {
+      return getThisTypeOfSignature(signature);
+    }
   }
   function isInConstructorArgumentInitializer(node, constructorDecl) {
     return !!findAncestor(node, (n) => isFunctionLikeDeclaration(n) ? "quit" : n.kind === 169 /* Parameter */ && n.parent === constructorDecl);
@@ -115085,9 +115115,9 @@ function getConfigFileParsingDiagnostics(configFileParseResult) {
   return configFileParseResult.options.configFile ? [...configFileParseResult.options.configFile.parseDiagnostics, ...configFileParseResult.errors] : configFileParseResult.errors;
 }
 function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host, options) {
-  switch (getEmitModuleKind(options)) {
-    case 100 /* Node16 */:
-    case 199 /* NodeNext */:
+  switch (getEmitModuleResolutionKind(options)) {
+    case 3 /* Node16 */:
+    case 99 /* NodeNext */:
       return fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".mjs" /* Mjs */]) ? 99 /* ESNext */ : fileExtensionIsOneOf(fileName, [".d.cts" /* Dcts */, ".cts" /* Cts */, ".cjs" /* Cjs */]) ? 1 /* CommonJS */ : fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]) ? lookupFromPackageJson() : void 0;
     default:
       return void 0;

package/lib/tsserver.js

@@ -1414,6 +1414,7 @@ __export(server_exports, {
   isImportTypeNode: () => isImportTypeNode,
   isImportableFile: () => isImportableFile,
   isInComment: () => isInComment,
+  isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
   isInExpressionContext: () => isInExpressionContext,
   isInJSDoc: () => isInJSDoc,
   isInJSFile: () => isInJSFile,
@@ -1706,6 +1707,7 @@ __export(server_exports, {
   isSetAccessor: () => isSetAccessor,
   isSetAccessorDeclaration: () => isSetAccessorDeclaration,
   isShebangTrivia: () => isShebangTrivia,
+  isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
   isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
   isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
   isSignedNumericLiteral: () => isSignedNumericLiteral,
@@ -2327,7 +2329,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230626`;
+var version = `${versionMajorMinor}.0-insiders.20230627`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11267,6 +11269,7 @@ var Diagnostics = {
   Inline_variable: diag(95184, 3 /* Message */, "Inline_variable_95184", "Inline variable"),
   Could_not_find_variable_to_inline: diag(95185, 3 /* Message */, "Could_not_find_variable_to_inline_95185", "Could not find variable to inline."),
   Variables_with_multiple_declarations_cannot_be_inlined: diag(95186, 3 /* Message */, "Variables_with_multiple_declarations_cannot_be_inlined_95186", "Variables with multiple declarations cannot be inlined."),
+  Add_missing_comma_for_object_member_completion_0: diag(95187, 3 /* Message */, "Add_missing_comma_for_object_member_completion_0_95187", "Add missing comma for object member completion '{0}'."),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -17124,8 +17127,8 @@ function isInExpressionContext(node) {
       return forStatement.initializer === node && forStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forStatement.condition === node || forStatement.incrementor === node;
     case 249 /* ForInStatement */:
     case 250 /* ForOfStatement */:
-      const forInStatement = parent2;
-      return forInStatement.initializer === node && forInStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInStatement.expression === node;
+      const forInOrOfStatement = parent2;
+      return forInOrOfStatement.initializer === node && forInOrOfStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInOrOfStatement.expression === node;
     case 216 /* TypeAssertionExpression */:
     case 234 /* AsExpression */:
       return node === parent2.expression;
@@ -17821,20 +17824,23 @@ var AssignmentKind = /* @__PURE__ */ ((AssignmentKind2) => {
   AssignmentKind2[AssignmentKind2["Compound"] = 2] = "Compound";
   return AssignmentKind2;
 })(AssignmentKind || {});
-function getAssignmentTargetKind(node) {
+function getAssignmentTarget(node) {
   let parent2 = node.parent;
   while (true) {
     switch (parent2.kind) {
       case 226 /* BinaryExpression */:
-        const binaryOperator = parent2.operatorToken.kind;
-        return isAssignmentOperator(binaryOperator) && parent2.left === node ? binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */;
+        const binaryExpression = parent2;
+        const binaryOperator = binaryExpression.operatorToken.kind;
+        return isAssignmentOperator(binaryOperator) && binaryExpression.left === node ? binaryExpression : void 0;
       case 224 /* PrefixUnaryExpression */:
       case 225 /* PostfixUnaryExpression */:
-        const unaryOperator = parent2.operator;
-        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
+        const unaryExpression = parent2;
+        const unaryOperator = unaryExpression.operator;
+        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? unaryExpression : void 0;
       case 249 /* ForInStatement */:
       case 250 /* ForOfStatement */:
-        return parent2.initializer === node ? 1 /* Definite */ : 0 /* None */;
+        const forInOrOfStatement = parent2;
+        return forInOrOfStatement.initializer === node ? forInOrOfStatement : void 0;
       case 217 /* ParenthesizedExpression */:
       case 209 /* ArrayLiteralExpression */:
       case 230 /* SpreadElement */:
@@ -17846,24 +17852,53 @@ function getAssignmentTargetKind(node) {
         break;
       case 304 /* ShorthandPropertyAssignment */:
         if (parent2.name !== node) {
-          return 0 /* None */;
+          return void 0;
         }
         node = parent2.parent;
         break;
       case 303 /* PropertyAssignment */:
         if (parent2.name === node) {
-          return 0 /* None */;
+          return void 0;
         }
         node = parent2.parent;
         break;
       default:
-        return 0 /* None */;
+        return void 0;
     }
     parent2 = node.parent;
   }
 }
+function getAssignmentTargetKind(node) {
+  const target = getAssignmentTarget(node);
+  if (!target) {
+    return 0 /* None */;
+  }
+  switch (target.kind) {
+    case 226 /* BinaryExpression */:
+      const binaryOperator = target.operatorToken.kind;
+      return binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */;
+    case 224 /* PrefixUnaryExpression */:
+    case 225 /* PostfixUnaryExpression */:
+      return 2 /* Compound */;
+    case 249 /* ForInStatement */:
+    case 250 /* ForOfStatement */:
+      return 1 /* Definite */;
+  }
+}
 function isAssignmentTarget(node) {
-  return getAssignmentTargetKind(node) !== 0 /* None */;
+  return !!getAssignmentTarget(node);
+}
+function isCompoundLikeAssignment(assignment) {
+  const right = skipParentheses(assignment.right);
+  return right.kind === 226 /* BinaryExpression */ && isShiftOperatorOrHigher(right.operatorToken.kind);
+}
+function isInCompoundLikeAssignment(node) {
+  const target = getAssignmentTarget(node);
+  return !!target && isAssignmentExpression(
+    target,
+    /*excludeCompoundAssignment*/
+    true
+  ) && isCompoundLikeAssignment(target);
 }
 function isNodeWithPossibleHoistedDeclaration(node) {
   switch (node.kind) {
@@ -50843,7 +50878,6 @@ function createTypeChecker(host) {
     const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = findAncestor(location, isImportCall)) == null ? void 0 : _a.arguments[0]) || ((_b = findAncestor(location, isImportDeclaration)) == null ? void 0 : _b.moduleSpecifier) || ((_c = findAncestor(location, isExternalModuleImportEqualsDeclaration)) == null ? void 0 : _c.moduleReference.expression) || ((_d = findAncestor(location, isExportDeclaration)) == null ? void 0 : _d.moduleSpecifier) || ((_e = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _e.name) || ((_f = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _f.argument.literal);
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
-    const moduleKind2 = getEmitModuleKind(compilerOptions);
     const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode);
     const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
@@ -50876,7 +50910,7 @@ function createTypeChecker(host) {
             moduleReference
           );
         }
-        if (100 /* Node16 */ <= moduleKind2 && moduleKind2 <= 199 /* NodeNext */) {
+        if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
           const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_h = overrideClauseHost.assertions) == null ? void 0 : _h.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
@@ -51000,7 +51034,7 @@ function createTypeChecker(host) {
     return void 0;
     function getSuggestedImportSource(tsExtension) {
       const importSourceWithoutExtension = removeExtension(moduleReference, tsExtension);
-      if (emitModuleKindIsNonNodeESM(moduleKind2) || mode === 99 /* ESNext */) {
+      if (emitModuleKindIsNonNodeESM(moduleKind) || mode === 99 /* ESNext */) {
         const preferTs = isDeclarationFileName(moduleReference) && shouldAllowImportingTsExtension(compilerOptions);
         const ext = tsExtension === ".mts" /* Mts */ || tsExtension === ".d.mts" /* Dmts */ ? preferTs ? ".mts" : ".mjs" : tsExtension === ".cts" /* Cts */ || tsExtension === ".d.mts" /* Dmts */ ? preferTs ? ".cts" : ".cjs" : preferTs ? ".ts" : ".js";
         return importSourceWithoutExtension + ext;
@@ -69847,10 +69881,11 @@ function createTypeChecker(host) {
           const assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow));
           return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
         }
-        if (declaredType.flags & 1048576 /* Union */) {
-          return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow));
+        const t = isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(declaredType) : declaredType;
+        if (t.flags & 1048576 /* Union */) {
+          return getAssignmentReducedType(t, getInitialOrAssignedType(flow));
         }
-        return declaredType;
+        return t;
       }
       if (containsMatchingReference(reference, node)) {
         if (!isReachableFlowNode(flow)) {
@@ -70979,7 +71014,7 @@ function createTypeChecker(host) {
     const isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
     if (localOrExportSymbol.flags & 3 /* Variable */) {
       if (assignmentKind === 1 /* Definite */) {
-        return type;
+        return isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(type) : type;
       }
     } else if (isAlias) {
       declaration = getDeclarationOfAliasSymbol(symbol);
@@ -71306,17 +71341,14 @@ function createTypeChecker(host) {
     }
   }
   function getTypeForThisExpressionFromJSDoc(node) {
-    const jsdocType = getJSDocType(node);
-    if (jsdocType && jsdocType.kind === 324 /* JSDocFunctionType */) {
-      const jsDocFunctionType = jsdocType;
-      if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].name && jsDocFunctionType.parameters[0].name.escapedText === "this" /* This */) {
-        return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
-      }
-    }
     const thisTag = getJSDocThisTag(node);
     if (thisTag && thisTag.typeExpression) {
       return getTypeFromTypeNode(thisTag.typeExpression);
     }
+    const signature = getSignatureOfTypeTag(node);
+    if (signature) {
+      return getThisTypeOfSignature(signature);
+    }
   }
   function isInConstructorArgumentInitializer(node, constructorDecl) {
     return !!findAncestor(node, (n) => isFunctionLikeDeclaration(n) ? "quit" : n.kind === 169 /* Parameter */ && n.parent === constructorDecl);
@@ -119997,9 +120029,9 @@ function getImpliedNodeFormatForFile(fileName, packageJsonInfoCache, host, optio
   return typeof result === "object" ? result.impliedNodeFormat : result;
 }
 function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host, options) {
-  switch (getEmitModuleKind(options)) {
-    case 100 /* Node16 */:
-    case 199 /* NodeNext */:
+  switch (getEmitModuleResolutionKind(options)) {
+    case 3 /* Node16 */:
+    case 99 /* NodeNext */:
       return fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".mjs" /* Mjs */]) ? 99 /* ESNext */ : fileExtensionIsOneOf(fileName, [".d.cts" /* Dcts */, ".cts" /* Cts */, ".cjs" /* Cjs */]) ? 1 /* CommonJS */ : fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]) ? lookupFromPackageJson() : void 0;
     default:
       return void 0;
@@ -138043,7 +138075,10 @@ function getReplacementExpression(reference, replacement) {
   if (isExpression(parent2) && (getExpressionPrecedence(replacement) < getExpressionPrecedence(parent2) || needsParentheses(parent2))) {
     return factory.createParenthesizedExpression(replacement);
   }
-  if (isFunctionLike(replacement) && isCallLikeExpression(parent2)) {
+  if (isFunctionLike(replacement) && (isCallLikeExpression(parent2) || isPropertyAccessExpression(parent2))) {
+    return factory.createParenthesizedExpression(replacement);
+  }
+  if (isPropertyAccessExpression(parent2) && (isNumericLiteral(replacement) || isObjectLiteralExpression(replacement))) {
     return factory.createParenthesizedExpression(replacement);
   }
   return replacement;
@@ -156661,6 +156696,7 @@ var CompletionSource = /* @__PURE__ */ ((CompletionSource2) => {
   CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
   CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
   CompletionSource2["SwitchCases"] = "SwitchCases/";
+  CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
   return CompletionSource2;
 })(CompletionSource || {});
 var SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {
@@ -157539,6 +157575,7 @@ 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, includeSymbol) {
+  var _a, _b;
   let insertText;
   let filterText;
   let replacementSpan = getReplacementSpanForContextToken(replacementToken);
@@ -157597,6 +157634,12 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
   if ((origin == null ? void 0 : origin.kind) === 64 /* TypeOnlyAlias */) {
     hasAction = true;
   }
+  if (completionKind === 0 /* ObjectPropertyDeclaration */ && contextToken && ((_a = findPrecedingToken(contextToken.pos, sourceFile, contextToken)) == null ? void 0 : _a.kind) !== 28 /* CommaToken */) {
+    if (isMethodDeclaration(contextToken.parent.parent) || isGetAccessorDeclaration(contextToken.parent.parent) || isSetAccessorDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, isPropertyAssignment)) == null ? void 0 : _b.getLastToken(sourceFile)) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line) {
+      source = "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */;
+      hasAction = true;
+    }
+  }
   if (preferences.includeCompletionsWithClassMemberSnippets && preferences.includeCompletionsWithInsertText && completionKind === 3 /* MemberLike */ && isClassLikeMemberCompletion(symbol, location, sourceFile)) {
     let importAdder;
     const memberCompletionEntry = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext);
@@ -158327,7 +158370,7 @@ function getSymbolCompletionFromEntryId(program, log, sourceFile, position, entr
   return firstDefined(symbols, (symbol, index) => {
     const origin = symbolToOriginInfoMap[index];
     const info = getCompletionEntryDisplayNameForSymbol(symbol, getEmitScriptTarget(compilerOptions), origin, completionKind, completionData.isJsxIdentifierExpected);
-    return info && info.name === entryId.name && (entryId.source === "ClassMemberSnippet/" /* ClassMemberSnippet */ && symbol.flags & 106500 /* ClassMember */ || entryId.source === "ObjectLiteralMethodSnippet/" /* ObjectLiteralMethodSnippet */ && symbol.flags & (4 /* Property */ | 8192 /* Method */) || getSourceFromOrigin(origin) === entryId.source) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
+    return info && info.name === entryId.name && (entryId.source === "ClassMemberSnippet/" /* ClassMemberSnippet */ && symbol.flags & 106500 /* ClassMember */ || entryId.source === "ObjectLiteralMethodSnippet/" /* ObjectLiteralMethodSnippet */ && symbol.flags & (4 /* Property */ | 8192 /* Method */) || getSourceFromOrigin(origin) === entryId.source || entryId.source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
   }) || { type: "none" };
 }
 function getCompletionEntryDetails(program, log, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
@@ -158472,6 +158515,21 @@ function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextTo
     Debug.assertIsDefined(codeAction2, "Expected to have a code action for promoting type-only alias");
     return { codeActions: [codeAction2], sourceDisplay: void 0 };
   }
+  if (source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */ && contextToken) {
+    const changes = ts_textChanges_exports.ChangeTracker.with(
+      { host, formatContext, preferences },
+      (tracker) => tracker.insertText(sourceFile, contextToken.end, ",")
+    );
+    if (changes) {
+      return {
+        sourceDisplay: void 0,
+        codeActions: [{
+          changes,
+          description: diagnosticToString([Diagnostics.Add_missing_comma_for_object_member_completion_0, name])
+        }]
+      };
+    }
+  }
   if (!origin || !(originIsExport(origin) || originIsResolvedExport(origin))) {
     return { codeActions: void 0, sourceDisplay: void 0 };
   }
@@ -159378,7 +159436,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   }
   function tryGetObjectLikeCompletionSymbols() {
     const symbolsStartIndex = symbols.length;
-    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position, sourceFile);
     if (!objectLikeContainer)
       return 0 /* Continue */;
     completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159864,7 +159922,8 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
     return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
   }
 }
-function tryGetObjectLikeCompletionContainer(contextToken) {
+function tryGetObjectLikeCompletionContainer(contextToken, position, sourceFile) {
+  var _a;
   if (contextToken) {
     const { parent: parent2 } = contextToken;
     switch (contextToken.kind) {
@@ -159879,7 +159938,29 @@ function tryGetObjectLikeCompletionContainer(contextToken) {
       case 134 /* AsyncKeyword */:
         return tryCast(parent2.parent, isObjectLiteralExpression);
       case 80 /* Identifier */:
-        return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
+        if (contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent)) {
+          return contextToken.parent.parent;
+        } else {
+          if (isObjectLiteralExpression(contextToken.parent.parent) && (isSpreadAssignment(contextToken.parent) || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line)) {
+            return contextToken.parent.parent;
+          }
+          const ancestorNode2 = findAncestor(parent2, isPropertyAssignment);
+          if ((ancestorNode2 == null ? void 0 : ancestorNode2.getLastToken(sourceFile)) === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
+            return ancestorNode2.parent;
+          }
+        }
+        break;
+      default:
+        if (((_a = parent2.parent) == null ? void 0 : _a.parent) && (isMethodDeclaration(parent2.parent) || isGetAccessorDeclaration(parent2.parent) || isSetAccessorDeclaration(parent2.parent)) && isObjectLiteralExpression(parent2.parent.parent)) {
+          return parent2.parent.parent;
+        }
+        if (isSpreadAssignment(parent2) && isObjectLiteralExpression(parent2.parent)) {
+          return parent2.parent;
+        }
+        const ancestorNode = findAncestor(parent2, isPropertyAssignment);
+        if (contextToken.kind !== 59 /* ColonToken */ && (ancestorNode == null ? void 0 : ancestorNode.getLastToken(sourceFile)) === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
+          return ancestorNode.parent;
+        }
     }
   }
   return void 0;
@@ -172944,6 +173025,7 @@ __export(ts_exports2, {
   isImportTypeNode: () => isImportTypeNode,
   isImportableFile: () => isImportableFile,
   isInComment: () => isInComment,
+  isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
   isInExpressionContext: () => isInExpressionContext,
   isInJSDoc: () => isInJSDoc,
   isInJSFile: () => isInJSFile,
@@ -173236,6 +173318,7 @@ __export(ts_exports2, {
   isSetAccessor: () => isSetAccessor,
   isSetAccessorDeclaration: () => isSetAccessorDeclaration,
   isShebangTrivia: () => isShebangTrivia,
+  isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
   isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
   isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
   isSignedNumericLiteral: () => isSignedNumericLiteral,
@@ -187457,6 +187540,7 @@ start(initializeNodeSystem(), require("os").platform());
   isImportTypeNode,
   isImportableFile,
   isInComment,
+  isInCompoundLikeAssignment,
   isInExpressionContext,
   isInJSDoc,
   isInJSFile,
@@ -187749,6 +187833,7 @@ start(initializeNodeSystem(), require("os").platform());
   isSetAccessor,
   isSetAccessorDeclaration,
   isShebangTrivia,
+  isShiftOperatorOrHigher,
   isShorthandAmbientModuleSymbol,
   isShorthandPropertyAssignment,
   isSignedNumericLiteral,

package/lib/tsserverlibrary.d.ts

@@ -9191,7 +9191,7 @@ declare namespace ts {
         /**
          * Controls the format the file is detected as - this can be derived from only the path
          * and files on disk, but needs to be done with a module resolution cache in scope to be performant.
-         * This is usually `undefined` for compilations that do not have `module` values of `node16` or `nodenext`.
+         * This is usually `undefined` for compilations that do not have `moduleResolution` values of `node16` or `nodenext`.
          */
         impliedNodeFormat?: ResolutionMode;
         /**
@@ -9504,7 +9504,7 @@ declare namespace ts {
      * Calculates the final resolution mode for a given module reference node. This is generally the explicitly provided resolution mode, if
      * one exists, or the mode of the containing source file. (Excepting import=require, which is always commonjs, and dynamic import, which is always esm).
      * Notably, this function always returns `undefined` if the containing file has an `undefined` `impliedNodeFormat` - this field is only set when
-     * `module` is `node16`+.
+     * `moduleResolution` is `node16`+.
      * @param file The file the import or import-like reference is contained within
      * @param usage The module reference string
      * @returns The final resolution mode of the import