@typescript-deploys/pr-build 5.2.0-pr-54788-8 → 5.2.0-pr-54795-7

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?"),
@@ -46167,7 +46168,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 +46200,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 +46324,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;
@@ -65601,14 +65601,12 @@ function createTypeChecker(host) {
             return narrowTypeByPrivateIdentifierInInExpression(type, expr, assumeTrue);
           }
           const target = getReferenceCandidate(expr.right);
-          const leftType = getTypeOfExpression(expr.left);
-          if (leftType.flags & 8576 /* StringOrNumberLiteralOrUnique */) {
-            if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
-              return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
-            }
-            if (isMatchingReference(reference, target)) {
-              return narrowTypeByInKeyword(type, leftType, assumeTrue);
-            }
+          let leftType;
+          if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */ && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
+            return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
+          }
+          if (isMatchingReference(reference, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */) {
+            return narrowTypeByInKeyword(type, leftType, assumeTrue);
           }
           break;
         case 28 /* CommaToken */:
@@ -66630,17 +66628,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 +115080,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

@@ -2327,7 +2327,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 +11267,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?"),
@@ -50843,7 +50844,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 +50876,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 +51000,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;
@@ -70277,14 +70277,12 @@ function createTypeChecker(host) {
             return narrowTypeByPrivateIdentifierInInExpression(type, expr, assumeTrue);
           }
           const target = getReferenceCandidate(expr.right);
-          const leftType = getTypeOfExpression(expr.left);
-          if (leftType.flags & 8576 /* StringOrNumberLiteralOrUnique */) {
-            if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
-              return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
-            }
-            if (isMatchingReference(reference, target)) {
-              return narrowTypeByInKeyword(type, leftType, assumeTrue);
-            }
+          let leftType;
+          if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */ && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
+            return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
+          }
+          if (isMatchingReference(reference, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */) {
+            return narrowTypeByInKeyword(type, leftType, assumeTrue);
           }
           break;
         case 28 /* CommaToken */:
@@ -71306,17 +71304,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 +119992,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 +138038,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 +156659,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 +157538,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 +157597,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 +158333,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 +158478,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 +159399,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 +159885,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 +159901,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;

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

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230626`;
+      version = `${versionMajorMinor}.0-insiders.20230627`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9050,6 +9050,7 @@ ${lanes.join("\n")}
         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?"),
@@ -48610,7 +48611,6 @@ ${lanes.join("\n")}
       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);
@@ -48643,7 +48643,7 @@ ${lanes.join("\n")}
               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;
@@ -48767,7 +48767,7 @@ ${lanes.join("\n")}
       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;
@@ -68044,14 +68044,12 @@ ${lanes.join("\n")}
               return narrowTypeByPrivateIdentifierInInExpression(type, expr, assumeTrue);
             }
             const target = getReferenceCandidate(expr.right);
-            const leftType = getTypeOfExpression(expr.left);
-            if (leftType.flags & 8576 /* StringOrNumberLiteralOrUnique */) {
-              if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
-                return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
-              }
-              if (isMatchingReference(reference, target)) {
-                return narrowTypeByInKeyword(type, leftType, assumeTrue);
-              }
+            let leftType;
+            if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */ && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
+              return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
+            }
+            if (isMatchingReference(reference, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */) {
+              return narrowTypeByInKeyword(type, leftType, assumeTrue);
             }
             break;
           case 28 /* CommaToken */:
@@ -69073,17 +69071,14 @@ ${lanes.join("\n")}
       }
     }
     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);
@@ -118080,9 +118075,9 @@ ${lanes.join("\n")}
     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;
@@ -136381,7 +136376,10 @@ ${lanes.join("\n")}
     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;
@@ -156772,6 +156770,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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);
@@ -156830,6 +156829,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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);
@@ -157560,7 +157565,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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) {
@@ -157705,6 +157710,21 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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 };
     }
@@ -158602,7 +158622,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function tryGetObjectLikeCompletionSymbols() {
       const symbolsStartIndex = symbols.length;
-      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position, sourceFile);
       if (!objectLikeContainer)
         return 0 /* Continue */;
       completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159088,7 +159108,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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) {
@@ -159103,7 +159124,29 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         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;
@@ -159646,6 +159689,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
         CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
         CompletionSource2["SwitchCases"] = "SwitchCases/";
+        CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
         return CompletionSource2;
       })(CompletionSource || {});
       SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {

package/lib/typescript.d.ts

@@ -5138,7 +5138,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;
         /**
@@ -5451,7 +5451,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

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230626`;
+      version = `${versionMajorMinor}.0-insiders.20230627`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9050,6 +9050,7 @@ ${lanes.join("\n")}
         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?"),
@@ -48610,7 +48611,6 @@ ${lanes.join("\n")}
       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);
@@ -48643,7 +48643,7 @@ ${lanes.join("\n")}
               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;
@@ -48767,7 +48767,7 @@ ${lanes.join("\n")}
       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;
@@ -68044,14 +68044,12 @@ ${lanes.join("\n")}
               return narrowTypeByPrivateIdentifierInInExpression(type, expr, assumeTrue);
             }
             const target = getReferenceCandidate(expr.right);
-            const leftType = getTypeOfExpression(expr.left);
-            if (leftType.flags & 8576 /* StringOrNumberLiteralOrUnique */) {
-              if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
-                return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
-              }
-              if (isMatchingReference(reference, target)) {
-                return narrowTypeByInKeyword(type, leftType, assumeTrue);
-              }
+            let leftType;
+            if (containsMissingType(type) && isAccessExpression(reference) && isMatchingReference(reference.expression, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */ && getAccessedPropertyName(reference) === getPropertyNameFromType(leftType)) {
+              return getTypeWithFacts(type, assumeTrue ? 524288 /* NEUndefined */ : 65536 /* EQUndefined */);
+            }
+            if (isMatchingReference(reference, target) && (leftType = getTypeOfExpression(expr.left)).flags & 8576 /* StringOrNumberLiteralOrUnique */) {
+              return narrowTypeByInKeyword(type, leftType, assumeTrue);
             }
             break;
           case 28 /* CommaToken */:
@@ -69073,17 +69071,14 @@ ${lanes.join("\n")}
       }
     }
     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);
@@ -118080,9 +118075,9 @@ ${lanes.join("\n")}
     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;
@@ -136396,7 +136391,10 @@ ${lanes.join("\n")}
     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;
@@ -156787,6 +156785,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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);
@@ -156845,6 +156844,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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);
@@ -157575,7 +157580,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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) {
@@ -157720,6 +157725,21 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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 };
     }
@@ -158617,7 +158637,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function tryGetObjectLikeCompletionSymbols() {
       const symbolsStartIndex = symbols.length;
-      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position, sourceFile);
       if (!objectLikeContainer)
         return 0 /* Continue */;
       completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159103,7 +159123,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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) {
@@ -159118,7 +159139,29 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         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;
@@ -159661,6 +159704,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
         CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
         CompletionSource2["SwitchCases"] = "SwitchCases/";
+        CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
         return CompletionSource2;
       })(CompletionSource || {});
       SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // 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 = [];
@@ -7120,6 +7120,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?"),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-54788-8",
+  "version": "5.2.0-pr-54795-7",
   "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": "ecdd4e167d65aea78e61a236764d9cf6962f8852"
+  "gitHead": "77b53fe6bf7e4cd647cc4c44affd81f70e7597d9"
 }