@typescript-deploys/pr-build 5.2.0-pr-54657-9 → 5.2.0-pr-52899-20

package/lib/lib.decorators.d.ts

@@ -35,8 +35,10 @@ type DecoratorContext =
     | ClassMemberDecoratorContext
     ;
 
+type DecoratorMetadataObject = Record<PropertyKey, unknown> & object;
+
 type DecoratorMetadata =
-    typeof globalThis extends { Symbol: { readonly metadata: symbol } } ? object : object | undefined;
+    typeof globalThis extends { Symbol: { readonly metadata: symbol } } ? DecoratorMetadataObject : DecoratorMetadataObject | undefined;
 
 /**
  * Context provided to a class decorator.

package/lib/lib.esnext.decorators.d.ts

@@ -17,7 +17,12 @@ and limitations under the License.
 /// <reference no-default-lib="true"/>
 
 /// <reference lib="es2015.symbol" />
+/// <reference lib="decorators" />
 
 interface SymbolConstructor {
     readonly metadata: unique symbol;
 }
+
+interface Function {
+    [Symbol.metadata]: DecoratorMetadata | null;
+}

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.20230622`;
+var version = `${versionMajorMinor}.0-insiders.20230623`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5792,6 +5792,7 @@ var Diagnostics = {
   A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
   Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
   Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+  Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
   A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
   Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
   A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -7747,6 +7748,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?"),
@@ -12915,6 +12917,10 @@ function getContainingClassStaticBlock(node) {
 function getContainingFunctionOrClassStaticBlock(node) {
   return findAncestor(node.parent, isFunctionLikeOrClassStaticBlockDeclaration);
 }
+function getContainingClassExcludingClassDecorators(node) {
+  const decorator = findAncestor(node.parent, (n) => isClassLike(n) ? "quit" : isDecorator(n));
+  return decorator && isClassLike(decorator.parent) ? getContainingClass(decorator.parent) : getContainingClass(decorator ?? node);
+}
 function getThisContainer(node, includeArrowFunctions, includeClassComputedPropertyName) {
   Debug.assert(node.kind !== 312 /* SourceFile */);
   while (true) {
@@ -66037,7 +66043,7 @@ function createTypeChecker(host) {
         location = location.parent;
       }
       if (isExpressionNode(location) && (!isAssignmentTarget(location) || isWriteAccess(location))) {
-        const type = getTypeOfExpression(location);
+        const type = removeOptionalTypeMarker(getTypeOfExpression(location));
         if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
           return type;
         }
@@ -69048,7 +69054,7 @@ function createTypeChecker(host) {
     return isCallOrNewExpression(node.parent) && node.parent.expression === node;
   }
   function lookupSymbolForPrivateIdentifierDeclaration(propName, location) {
-    for (let containingClass = getContainingClass(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
+    for (let containingClass = getContainingClassExcludingClassDecorators(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
       const { symbol } = containingClass;
       const name = getSymbolNameForPrivateIdentifier(symbol, propName);
       const prop = symbol.members && symbol.members.get(name) || symbol.exports && symbol.exports.get(name);
@@ -69184,16 +69190,22 @@ function createTypeChecker(host) {
         if (lexicallyScopedSymbol) {
           return isErrorType(apparentType) ? errorType : apparentType;
         }
-        if (!getContainingClass(right)) {
+        if (getContainingClassExcludingClassDecorators(right) === void 0) {
           grammarErrorOnNode(right, Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
           return anyType;
         }
       }
-      prop = lexicallyScopedSymbol ? getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol) : void 0;
-      if (!prop && checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
-        return errorType;
+      prop = lexicallyScopedSymbol && getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol);
+      if (prop === void 0) {
+        if (checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
+          return errorType;
+        }
+        const containingClass = getContainingClassExcludingClassDecorators(right);
+        if (containingClass && isPlainJsFile(getSourceFileOfNode(containingClass), compilerOptions.checkJs)) {
+          grammarErrorOnNode(right, Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class, idText(right));
+        }
       } else {
-        const isSetonlyAccessor = prop && prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+        const isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
         if (isSetonlyAccessor && assignmentKind !== 1 /* Definite */) {
           error(node, Diagnostics.Private_accessor_was_defined_without_a_getter);
         }
@@ -89781,9 +89793,12 @@ function transformClassFields(context) {
         return getClassLexicalEnvironment().classConstructor = node.emitNode.classThis;
       }
       const classCheckFlags = resolver.getNodeCheckFlags(node);
-      const isClassWithConstructorReference2 = classCheckFlags & 1048576 /* ClassWithConstructorReference */;
       const requiresBlockScopedVar = classCheckFlags & 32768 /* BlockScopedBindingInLoop */;
-      const temp2 = factory2.createTempVariable(requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration, !!isClassWithConstructorReference2);
+      const temp2 = factory2.createTempVariable(
+        requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration,
+        /*reservedInNestedScopes*/
+        true
+      );
       getClassLexicalEnvironment().classConstructor = factory2.cloneNode(temp2);
       return temp2;
     }
@@ -115181,6 +115196,7 @@ var plainJSErrors = /* @__PURE__ */ new Set([
   Diagnostics.Class_constructor_may_not_be_an_accessor.code,
   Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
   Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+  Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
   // Type errors
   Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
 ]);

package/lib/tsserver.js

@@ -693,6 +693,7 @@ __export(server_exports, {
   getContainerFlags: () => getContainerFlags,
   getContainerNode: () => getContainerNode,
   getContainingClass: () => getContainingClass,
+  getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
   getContainingClassStaticBlock: () => getContainingClassStaticBlock,
   getContainingFunction: () => getContainingFunction,
   getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,
@@ -2326,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230622`;
+var version = `${versionMajorMinor}.0-insiders.20230623`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9312,6 +9313,7 @@ var Diagnostics = {
   A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
   Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
   Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+  Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
   A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
   Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
   A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -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?"),
@@ -16749,6 +16752,10 @@ function getContainingClassStaticBlock(node) {
 function getContainingFunctionOrClassStaticBlock(node) {
   return findAncestor(node.parent, isFunctionLikeOrClassStaticBlockDeclaration);
 }
+function getContainingClassExcludingClassDecorators(node) {
+  const decorator = findAncestor(node.parent, (n) => isClassLike(n) ? "quit" : isDecorator(n));
+  return decorator && isClassLike(decorator.parent) ? getContainingClass(decorator.parent) : getContainingClass(decorator ?? node);
+}
 function getThisContainer(node, includeArrowFunctions, includeClassComputedPropertyName) {
   Debug.assert(node.kind !== 312 /* SourceFile */);
   while (true) {
@@ -70712,7 +70719,7 @@ function createTypeChecker(host) {
         location = location.parent;
       }
       if (isExpressionNode(location) && (!isAssignmentTarget(location) || isWriteAccess(location))) {
-        const type = getTypeOfExpression(location);
+        const type = removeOptionalTypeMarker(getTypeOfExpression(location));
         if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
           return type;
         }
@@ -73723,7 +73730,7 @@ function createTypeChecker(host) {
     return isCallOrNewExpression(node.parent) && node.parent.expression === node;
   }
   function lookupSymbolForPrivateIdentifierDeclaration(propName, location) {
-    for (let containingClass = getContainingClass(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
+    for (let containingClass = getContainingClassExcludingClassDecorators(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
       const { symbol } = containingClass;
       const name = getSymbolNameForPrivateIdentifier(symbol, propName);
       const prop = symbol.members && symbol.members.get(name) || symbol.exports && symbol.exports.get(name);
@@ -73859,16 +73866,22 @@ function createTypeChecker(host) {
         if (lexicallyScopedSymbol) {
           return isErrorType(apparentType) ? errorType : apparentType;
         }
-        if (!getContainingClass(right)) {
+        if (getContainingClassExcludingClassDecorators(right) === void 0) {
           grammarErrorOnNode(right, Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
           return anyType;
         }
       }
-      prop = lexicallyScopedSymbol ? getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol) : void 0;
-      if (!prop && checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
-        return errorType;
+      prop = lexicallyScopedSymbol && getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol);
+      if (prop === void 0) {
+        if (checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
+          return errorType;
+        }
+        const containingClass = getContainingClassExcludingClassDecorators(right);
+        if (containingClass && isPlainJsFile(getSourceFileOfNode(containingClass), compilerOptions.checkJs)) {
+          grammarErrorOnNode(right, Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class, idText(right));
+        }
       } else {
-        const isSetonlyAccessor = prop && prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+        const isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
         if (isSetonlyAccessor && assignmentKind !== 1 /* Definite */) {
           error2(node, Diagnostics.Private_accessor_was_defined_without_a_getter);
         }
@@ -94627,9 +94640,12 @@ function transformClassFields(context) {
         return getClassLexicalEnvironment().classConstructor = node.emitNode.classThis;
       }
       const classCheckFlags = resolver.getNodeCheckFlags(node);
-      const isClassWithConstructorReference2 = classCheckFlags & 1048576 /* ClassWithConstructorReference */;
       const requiresBlockScopedVar = classCheckFlags & 32768 /* BlockScopedBindingInLoop */;
-      const temp2 = factory2.createTempVariable(requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration, !!isClassWithConstructorReference2);
+      const temp2 = factory2.createTempVariable(
+        requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration,
+        /*reservedInNestedScopes*/
+        true
+      );
       getClassLexicalEnvironment().classConstructor = factory2.cloneNode(temp2);
       return temp2;
     }
@@ -120092,6 +120108,7 @@ var plainJSErrors = /* @__PURE__ */ new Set([
   Diagnostics.Class_constructor_may_not_be_an_accessor.code,
   Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
   Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+  Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
   // Type errors
   Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
 ]);
@@ -156645,6 +156662,7 @@ var CompletionSource = /* @__PURE__ */ ((CompletionSource2) => {
   CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
   CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
   CompletionSource2["SwitchCases"] = "SwitchCases/";
+  CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
   return CompletionSource2;
 })(CompletionSource || {});
 var SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {
@@ -157523,6 +157541,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);
@@ -157581,6 +157600,10 @@ 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 */ && (isMethodDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, (node) => isPropertyAssignment(node))) == null ? void 0 : _b.getLastToken()) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), 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);
@@ -158311,7 +158334,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) {
@@ -158456,6 +158479,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 };
   }
@@ -159362,7 +159400,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   }
   function tryGetObjectLikeCompletionSymbols() {
     const symbolsStartIndex = symbols.length;
-    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position);
     if (!objectLikeContainer)
       return 0 /* Continue */;
     completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159848,7 +159886,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
     return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
   }
 }
-function tryGetObjectLikeCompletionContainer(contextToken) {
+function tryGetObjectLikeCompletionContainer(contextToken, position) {
   if (contextToken) {
     const { parent: parent2 } = contextToken;
     switch (contextToken.kind) {
@@ -159863,7 +159901,26 @@ 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(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), position).line)) {
+            return contextToken.parent.parent;
+          }
+          const ancestorNode2 = findAncestor(parent2, (node) => isPropertyAssignment(node));
+          if (ancestorNode2 && ancestorNode2.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
+            return ancestorNode2.parent;
+          }
+        }
+        break;
+      default:
+        if (parent2.parent && parent2.parent.parent && isMethodDeclaration(parent2.parent) && isObjectLiteralExpression(parent2.parent.parent)) {
+          return parent2.parent.parent;
+        }
+        const ancestorNode = findAncestor(parent2, (node) => isPropertyAssignment(node));
+        if (contextToken.kind !== 59 /* ColonToken */ && ancestorNode && ancestorNode.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
+          return ancestorNode.parent;
+        }
     }
   }
   return void 0;
@@ -172206,6 +172263,7 @@ __export(ts_exports2, {
   getContainerFlags: () => getContainerFlags,
   getContainerNode: () => getContainerNode,
   getContainingClass: () => getContainingClass,
+  getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
   getContainingClassStaticBlock: () => getContainingClassStaticBlock,
   getContainingFunction: () => getContainingFunction,
   getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,
@@ -186718,6 +186776,7 @@ start(initializeNodeSystem(), require("os").platform());
   getContainerFlags,
   getContainerNode,
   getContainingClass,
+  getContainingClassExcludingClassDecorators,
   getContainingClassStaticBlock,
   getContainingFunction,
   getContainingFunctionDeclaration,

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230622`;
+      version = `${versionMajorMinor}.0-insiders.20230623`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7096,6 +7096,7 @@ ${lanes.join("\n")}
         A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
         Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
         Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+        Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
         A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
         Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
         A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -9051,6 +9052,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?"),
@@ -14530,6 +14532,10 @@ ${lanes.join("\n")}
   function getContainingFunctionOrClassStaticBlock(node) {
     return findAncestor(node.parent, isFunctionLikeOrClassStaticBlockDeclaration);
   }
+  function getContainingClassExcludingClassDecorators(node) {
+    const decorator = findAncestor(node.parent, (n) => isClassLike(n) ? "quit" : isDecorator(n));
+    return decorator && isClassLike(decorator.parent) ? getContainingClass(decorator.parent) : getContainingClass(decorator ?? node);
+  }
   function getThisContainer(node, includeArrowFunctions, includeClassComputedPropertyName) {
     Debug.assert(node.kind !== 312 /* SourceFile */);
     while (true) {
@@ -68480,7 +68486,7 @@ ${lanes.join("\n")}
           location = location.parent;
         }
         if (isExpressionNode(location) && (!isAssignmentTarget(location) || isWriteAccess(location))) {
-          const type = getTypeOfExpression(location);
+          const type = removeOptionalTypeMarker(getTypeOfExpression(location));
           if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
             return type;
           }
@@ -71491,7 +71497,7 @@ ${lanes.join("\n")}
       return isCallOrNewExpression(node.parent) && node.parent.expression === node;
     }
     function lookupSymbolForPrivateIdentifierDeclaration(propName, location) {
-      for (let containingClass = getContainingClass(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
+      for (let containingClass = getContainingClassExcludingClassDecorators(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
         const { symbol } = containingClass;
         const name = getSymbolNameForPrivateIdentifier(symbol, propName);
         const prop = symbol.members && symbol.members.get(name) || symbol.exports && symbol.exports.get(name);
@@ -71627,16 +71633,22 @@ ${lanes.join("\n")}
           if (lexicallyScopedSymbol) {
             return isErrorType(apparentType) ? errorType : apparentType;
           }
-          if (!getContainingClass(right)) {
+          if (getContainingClassExcludingClassDecorators(right) === void 0) {
             grammarErrorOnNode(right, Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
             return anyType;
           }
         }
-        prop = lexicallyScopedSymbol ? getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol) : void 0;
-        if (!prop && checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
-          return errorType;
+        prop = lexicallyScopedSymbol && getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol);
+        if (prop === void 0) {
+          if (checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
+            return errorType;
+          }
+          const containingClass = getContainingClassExcludingClassDecorators(right);
+          if (containingClass && isPlainJsFile(getSourceFileOfNode(containingClass), compilerOptions.checkJs)) {
+            grammarErrorOnNode(right, Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class, idText(right));
+          }
         } else {
-          const isSetonlyAccessor = prop && prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+          const isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
           if (isSetonlyAccessor && assignmentKind !== 1 /* Definite */) {
             error2(node, Diagnostics.Private_accessor_was_defined_without_a_getter);
           }
@@ -92584,9 +92596,12 @@ ${lanes.join("\n")}
           return getClassLexicalEnvironment().classConstructor = node.emitNode.classThis;
         }
         const classCheckFlags = resolver.getNodeCheckFlags(node);
-        const isClassWithConstructorReference2 = classCheckFlags & 1048576 /* ClassWithConstructorReference */;
         const requiresBlockScopedVar = classCheckFlags & 32768 /* BlockScopedBindingInLoop */;
-        const temp2 = factory2.createTempVariable(requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration, !!isClassWithConstructorReference2);
+        const temp2 = factory2.createTempVariable(
+          requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration,
+          /*reservedInNestedScopes*/
+          true
+        );
         getClassLexicalEnvironment().classConstructor = factory2.cloneNode(temp2);
         return temp2;
       }
@@ -121475,6 +121490,7 @@ ${lanes.join("\n")}
         Diagnostics.Class_constructor_may_not_be_an_accessor.code,
         Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
         Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+        Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
         // Type errors
         Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
       ]);
@@ -156757,6 +156773,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);
@@ -156815,6 +156832,10 @@ ${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 */ && (isMethodDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, (node) => isPropertyAssignment(node))) == null ? void 0 : _b.getLastToken()) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), 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);
@@ -157545,7 +157566,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) {
@@ -157690,6 +157711,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 };
     }
@@ -158587,7 +158623,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function tryGetObjectLikeCompletionSymbols() {
       const symbolsStartIndex = symbols.length;
-      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position);
       if (!objectLikeContainer)
         return 0 /* Continue */;
       completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159073,7 +159109,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
     }
   }
-  function tryGetObjectLikeCompletionContainer(contextToken) {
+  function tryGetObjectLikeCompletionContainer(contextToken, position) {
     if (contextToken) {
       const { parent: parent2 } = contextToken;
       switch (contextToken.kind) {
@@ -159088,7 +159124,26 @@ ${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(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), position).line)) {
+              return contextToken.parent.parent;
+            }
+            const ancestorNode2 = findAncestor(parent2, (node) => isPropertyAssignment(node));
+            if (ancestorNode2 && ancestorNode2.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
+              return ancestorNode2.parent;
+            }
+          }
+          break;
+        default:
+          if (parent2.parent && parent2.parent.parent && isMethodDeclaration(parent2.parent) && isObjectLiteralExpression(parent2.parent.parent)) {
+            return parent2.parent.parent;
+          }
+          const ancestorNode = findAncestor(parent2, (node) => isPropertyAssignment(node));
+          if (contextToken.kind !== 59 /* ColonToken */ && ancestorNode && ancestorNode.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
+            return ancestorNode.parent;
+          }
       }
     }
     return void 0;
@@ -159630,6 +159685,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) => {
@@ -183347,6 +183403,7 @@ ${e.message}`;
     getContainerFlags: () => getContainerFlags,
     getContainerNode: () => getContainerNode,
     getContainingClass: () => getContainingClass,
+    getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
     getContainingClassStaticBlock: () => getContainingClassStaticBlock,
     getContainingFunction: () => getContainingFunction,
     getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,
@@ -185749,6 +185806,7 @@ ${e.message}`;
     getContainerFlags: () => getContainerFlags,
     getContainerNode: () => getContainerNode,
     getContainingClass: () => getContainingClass,
+    getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
     getContainingClassStaticBlock: () => getContainingClassStaticBlock,
     getContainingFunction: () => getContainingFunction,
     getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230622`;
+      version = `${versionMajorMinor}.0-insiders.20230623`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7096,6 +7096,7 @@ ${lanes.join("\n")}
         A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
         Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
         Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+        Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
         A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
         Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
         A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -9051,6 +9052,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?"),
@@ -14530,6 +14532,10 @@ ${lanes.join("\n")}
   function getContainingFunctionOrClassStaticBlock(node) {
     return findAncestor(node.parent, isFunctionLikeOrClassStaticBlockDeclaration);
   }
+  function getContainingClassExcludingClassDecorators(node) {
+    const decorator = findAncestor(node.parent, (n) => isClassLike(n) ? "quit" : isDecorator(n));
+    return decorator && isClassLike(decorator.parent) ? getContainingClass(decorator.parent) : getContainingClass(decorator ?? node);
+  }
   function getThisContainer(node, includeArrowFunctions, includeClassComputedPropertyName) {
     Debug.assert(node.kind !== 312 /* SourceFile */);
     while (true) {
@@ -68480,7 +68486,7 @@ ${lanes.join("\n")}
           location = location.parent;
         }
         if (isExpressionNode(location) && (!isAssignmentTarget(location) || isWriteAccess(location))) {
-          const type = getTypeOfExpression(location);
+          const type = removeOptionalTypeMarker(getTypeOfExpression(location));
           if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
             return type;
           }
@@ -71491,7 +71497,7 @@ ${lanes.join("\n")}
       return isCallOrNewExpression(node.parent) && node.parent.expression === node;
     }
     function lookupSymbolForPrivateIdentifierDeclaration(propName, location) {
-      for (let containingClass = getContainingClass(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
+      for (let containingClass = getContainingClassExcludingClassDecorators(location); !!containingClass; containingClass = getContainingClass(containingClass)) {
         const { symbol } = containingClass;
         const name = getSymbolNameForPrivateIdentifier(symbol, propName);
         const prop = symbol.members && symbol.members.get(name) || symbol.exports && symbol.exports.get(name);
@@ -71627,16 +71633,22 @@ ${lanes.join("\n")}
           if (lexicallyScopedSymbol) {
             return isErrorType(apparentType) ? errorType : apparentType;
           }
-          if (!getContainingClass(right)) {
+          if (getContainingClassExcludingClassDecorators(right) === void 0) {
             grammarErrorOnNode(right, Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
             return anyType;
           }
         }
-        prop = lexicallyScopedSymbol ? getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol) : void 0;
-        if (!prop && checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
-          return errorType;
+        prop = lexicallyScopedSymbol && getPrivateIdentifierPropertyOfType(leftType, lexicallyScopedSymbol);
+        if (prop === void 0) {
+          if (checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
+            return errorType;
+          }
+          const containingClass = getContainingClassExcludingClassDecorators(right);
+          if (containingClass && isPlainJsFile(getSourceFileOfNode(containingClass), compilerOptions.checkJs)) {
+            grammarErrorOnNode(right, Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class, idText(right));
+          }
         } else {
-          const isSetonlyAccessor = prop && prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+          const isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
           if (isSetonlyAccessor && assignmentKind !== 1 /* Definite */) {
             error2(node, Diagnostics.Private_accessor_was_defined_without_a_getter);
           }
@@ -92584,9 +92596,12 @@ ${lanes.join("\n")}
           return getClassLexicalEnvironment().classConstructor = node.emitNode.classThis;
         }
         const classCheckFlags = resolver.getNodeCheckFlags(node);
-        const isClassWithConstructorReference2 = classCheckFlags & 1048576 /* ClassWithConstructorReference */;
         const requiresBlockScopedVar = classCheckFlags & 32768 /* BlockScopedBindingInLoop */;
-        const temp2 = factory2.createTempVariable(requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration, !!isClassWithConstructorReference2);
+        const temp2 = factory2.createTempVariable(
+          requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration,
+          /*reservedInNestedScopes*/
+          true
+        );
         getClassLexicalEnvironment().classConstructor = factory2.cloneNode(temp2);
         return temp2;
       }
@@ -121475,6 +121490,7 @@ ${lanes.join("\n")}
         Diagnostics.Class_constructor_may_not_be_an_accessor.code,
         Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
         Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+        Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
         // Type errors
         Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
       ]);
@@ -156772,6 +156788,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 +156847,10 @@ ${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 */ && (isMethodDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, (node) => isPropertyAssignment(node))) == null ? void 0 : _b.getLastToken()) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), 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 +157581,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 +157726,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 +158638,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function tryGetObjectLikeCompletionSymbols() {
       const symbolsStartIndex = symbols.length;
-      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position);
       if (!objectLikeContainer)
         return 0 /* Continue */;
       completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159088,7 +159124,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
     }
   }
-  function tryGetObjectLikeCompletionContainer(contextToken) {
+  function tryGetObjectLikeCompletionContainer(contextToken, position) {
     if (contextToken) {
       const { parent: parent2 } = contextToken;
       switch (contextToken.kind) {
@@ -159103,7 +159139,26 @@ ${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(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), position).line)) {
+              return contextToken.parent.parent;
+            }
+            const ancestorNode2 = findAncestor(parent2, (node) => isPropertyAssignment(node));
+            if (ancestorNode2 && ancestorNode2.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
+              return ancestorNode2.parent;
+            }
+          }
+          break;
+        default:
+          if (parent2.parent && parent2.parent.parent && isMethodDeclaration(parent2.parent) && isObjectLiteralExpression(parent2.parent.parent)) {
+            return parent2.parent.parent;
+          }
+          const ancestorNode = findAncestor(parent2, (node) => isPropertyAssignment(node));
+          if (contextToken.kind !== 59 /* ColonToken */ && ancestorNode && ancestorNode.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
+            return ancestorNode.parent;
+          }
       }
     }
     return void 0;
@@ -159645,6 +159700,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) => {
@@ -171969,6 +172025,7 @@ ${options.prefix}` : "\n" : options.prefix
     getContainerFlags: () => getContainerFlags,
     getContainerNode: () => getContainerNode,
     getContainingClass: () => getContainingClass,
+    getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
     getContainingClassStaticBlock: () => getContainingClassStaticBlock,
     getContainingFunction: () => getContainingFunction,
     getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,

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.20230622`;
+var version = `${versionMajorMinor}.0-insiders.20230623`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5166,6 +5166,7 @@ var Diagnostics = {
   A_return_statement_can_only_be_used_within_a_function_body: diag(1108, 1 /* Error */, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
   Expression_expected: diag(1109, 1 /* Error */, "Expression_expected_1109", "Expression expected."),
   Type_expected: diag(1110, 1 /* Error */, "Type_expected_1110", "Type expected."),
+  Private_field_0_must_be_declared_in_an_enclosing_class: diag(1111, 1 /* Error */, "Private_field_0_must_be_declared_in_an_enclosing_class_1111", "Private field '{0}' must be declared in an enclosing class."),
   A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, 1 /* Error */, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
   Duplicate_label_0: diag(1114, 1 /* Error */, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
   A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, 1 /* Error */, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
@@ -7121,6 +7122,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?"),
@@ -30821,6 +30823,7 @@ var plainJSErrors = /* @__PURE__ */ new Set([
   Diagnostics.Class_constructor_may_not_be_an_accessor.code,
   Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
   Diagnostics.await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+  Diagnostics.Private_field_0_must_be_declared_in_an_enclosing_class.code,
   // Type errors
   Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value.code
 ]);

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-54657-9",
+  "version": "5.2.0-pr-52899-20",
   "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": "79916f02bd30047b93472aff7c02deee805e9fc4"
+  "gitHead": "c1175951e647970ae871beecc7dc204a7daeafb1"
 }