@typescript-deploys/pr-build 5.2.0-pr-54657-9 → 5.2.0-pr-54781-9

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.20230626`;
 
 // 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."),
@@ -12915,6 +12916,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) {
@@ -60948,7 +60953,6 @@ function createTypeChecker(host) {
       } else if (targetFlags & 8388608 /* IndexedAccess */) {
         if (sourceFlags & 8388608 /* IndexedAccess */) {
           if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-            instantiateType(source2.objectType, reportUnreliableMapper);
             result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
           }
           if (result2) {
@@ -66037,7 +66041,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 +69052,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 +69188,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 +89791,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;
     }
@@ -107522,6 +107535,21 @@ function transformDeclarations(context) {
     const modifiers = factory2.createModifiersFromModifierFlags(getEffectiveModifierFlags(statement) & (258047 /* All */ ^ 1 /* Export */));
     return factory2.updateModifiers(statement, modifiers);
   }
+  function updateModuleDeclarationAndKeyword(node, modifiers, name, body) {
+    const updated = factory2.updateModuleDeclaration(node, modifiers, name, body);
+    if (isAmbientModule(updated) || updated.flags & 32 /* Namespace */) {
+      return updated;
+    }
+    const fixed = factory2.createModuleDeclaration(
+      updated.modifiers,
+      updated.name,
+      updated.body,
+      updated.flags | 32 /* Namespace */
+    );
+    setOriginalNode(fixed, updated);
+    setTextRange(fixed, updated);
+    return fixed;
+  }
   function transformTopLevelDeclaration(input) {
     if (lateMarkedStatements) {
       while (orderedRemoveItem(lateMarkedStatements, input))
@@ -107709,7 +107737,7 @@ function transformDeclarations(context) {
           needsScopeFixMarker = oldNeedsScopeFix;
           resultHasScopeMarker = oldHasScopeFix;
           const mods = ensureModifiers(input);
-          return cleanup(factory2.updateModuleDeclaration(
+          return cleanup(updateModuleDeclarationAndKeyword(
             input,
             mods,
             isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name,
@@ -107723,7 +107751,7 @@ function transformDeclarations(context) {
           const id = getOriginalNodeId(inner);
           const body = lateStatementReplacementMap.get(id);
           lateStatementReplacementMap.delete(id);
-          return cleanup(factory2.updateModuleDeclaration(
+          return cleanup(updateModuleDeclarationAndKeyword(
             input,
             mods,
             input.name,
@@ -115181,6 +115209,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.20230626`;
 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."),
@@ -16749,6 +16751,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) {
@@ -65623,7 +65629,6 @@ function createTypeChecker(host) {
       } else if (targetFlags & 8388608 /* IndexedAccess */) {
         if (sourceFlags & 8388608 /* IndexedAccess */) {
           if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-            instantiateType(source2.objectType, reportUnreliableMapper);
             result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
           }
           if (result2) {
@@ -70712,7 +70717,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 +73728,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 +73864,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 +94638,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;
     }
@@ -112368,6 +112382,21 @@ function transformDeclarations(context) {
     const modifiers = factory2.createModifiersFromModifierFlags(getEffectiveModifierFlags(statement) & (258047 /* All */ ^ 1 /* Export */));
     return factory2.updateModifiers(statement, modifiers);
   }
+  function updateModuleDeclarationAndKeyword(node, modifiers, name, body) {
+    const updated = factory2.updateModuleDeclaration(node, modifiers, name, body);
+    if (isAmbientModule(updated) || updated.flags & 32 /* Namespace */) {
+      return updated;
+    }
+    const fixed = factory2.createModuleDeclaration(
+      updated.modifiers,
+      updated.name,
+      updated.body,
+      updated.flags | 32 /* Namespace */
+    );
+    setOriginalNode(fixed, updated);
+    setTextRange(fixed, updated);
+    return fixed;
+  }
   function transformTopLevelDeclaration(input) {
     if (lateMarkedStatements) {
       while (orderedRemoveItem(lateMarkedStatements, input))
@@ -112555,7 +112584,7 @@ function transformDeclarations(context) {
           needsScopeFixMarker = oldNeedsScopeFix;
           resultHasScopeMarker = oldHasScopeFix;
           const mods = ensureModifiers(input);
-          return cleanup(factory2.updateModuleDeclaration(
+          return cleanup(updateModuleDeclarationAndKeyword(
             input,
             mods,
             isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name,
@@ -112569,7 +112598,7 @@ function transformDeclarations(context) {
           const id = getOriginalNodeId(inner);
           const body = lateStatementReplacementMap.get(id);
           lateStatementReplacementMap.delete(id);
-          return cleanup(factory2.updateModuleDeclaration(
+          return cleanup(updateModuleDeclarationAndKeyword(
             input,
             mods,
             input.name,
@@ -120092,6 +120121,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
 ]);
@@ -172206,6 +172236,7 @@ __export(ts_exports2, {
   getContainerFlags: () => getContainerFlags,
   getContainerNode: () => getContainerNode,
   getContainingClass: () => getContainingClass,
+  getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
   getContainingClassStaticBlock: () => getContainingClassStaticBlock,
   getContainingFunction: () => getContainingFunction,
   getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,
@@ -186718,6 +186749,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.20230626`;
       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."),
@@ -14530,6 +14531,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) {
@@ -63391,7 +63396,6 @@ ${lanes.join("\n")}
         } else if (targetFlags & 8388608 /* IndexedAccess */) {
           if (sourceFlags & 8388608 /* IndexedAccess */) {
             if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-              instantiateType(source2.objectType, reportUnreliableMapper);
               result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
             }
             if (result2) {
@@ -68480,7 +68484,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 +71495,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 +71631,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 +92594,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;
       }
@@ -110446,6 +110459,21 @@ ${lanes.join("\n")}
       const modifiers = factory2.createModifiersFromModifierFlags(getEffectiveModifierFlags(statement) & (258047 /* All */ ^ 1 /* Export */));
       return factory2.updateModifiers(statement, modifiers);
     }
+    function updateModuleDeclarationAndKeyword(node, modifiers, name, body) {
+      const updated = factory2.updateModuleDeclaration(node, modifiers, name, body);
+      if (isAmbientModule(updated) || updated.flags & 32 /* Namespace */) {
+        return updated;
+      }
+      const fixed = factory2.createModuleDeclaration(
+        updated.modifiers,
+        updated.name,
+        updated.body,
+        updated.flags | 32 /* Namespace */
+      );
+      setOriginalNode(fixed, updated);
+      setTextRange(fixed, updated);
+      return fixed;
+    }
     function transformTopLevelDeclaration(input) {
       if (lateMarkedStatements) {
         while (orderedRemoveItem(lateMarkedStatements, input))
@@ -110633,7 +110661,7 @@ ${lanes.join("\n")}
             needsScopeFixMarker = oldNeedsScopeFix;
             resultHasScopeMarker = oldHasScopeFix;
             const mods = ensureModifiers(input);
-            return cleanup(factory2.updateModuleDeclaration(
+            return cleanup(updateModuleDeclarationAndKeyword(
               input,
               mods,
               isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name,
@@ -110647,7 +110675,7 @@ ${lanes.join("\n")}
             const id = getOriginalNodeId(inner);
             const body = lateStatementReplacementMap.get(id);
             lateStatementReplacementMap.delete(id);
-            return cleanup(factory2.updateModuleDeclaration(
+            return cleanup(updateModuleDeclarationAndKeyword(
               input,
               mods,
               input.name,
@@ -121475,6 +121503,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
       ]);
@@ -183347,6 +183376,7 @@ ${e.message}`;
     getContainerFlags: () => getContainerFlags,
     getContainerNode: () => getContainerNode,
     getContainingClass: () => getContainingClass,
+    getContainingClassExcludingClassDecorators: () => getContainingClassExcludingClassDecorators,
     getContainingClassStaticBlock: () => getContainingClassStaticBlock,
     getContainingFunction: () => getContainingFunction,
     getContainingFunctionDeclaration: () => getContainingFunctionDeclaration,
@@ -185749,6 +185779,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.20230626`;
       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."),
@@ -14530,6 +14531,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) {
@@ -63391,7 +63396,6 @@ ${lanes.join("\n")}
         } else if (targetFlags & 8388608 /* IndexedAccess */) {
           if (sourceFlags & 8388608 /* IndexedAccess */) {
             if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-              instantiateType(source2.objectType, reportUnreliableMapper);
               result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
             }
             if (result2) {
@@ -68480,7 +68484,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 +71495,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 +71631,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 +92594,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;
       }
@@ -110446,6 +110459,21 @@ ${lanes.join("\n")}
       const modifiers = factory2.createModifiersFromModifierFlags(getEffectiveModifierFlags(statement) & (258047 /* All */ ^ 1 /* Export */));
       return factory2.updateModifiers(statement, modifiers);
     }
+    function updateModuleDeclarationAndKeyword(node, modifiers, name, body) {
+      const updated = factory2.updateModuleDeclaration(node, modifiers, name, body);
+      if (isAmbientModule(updated) || updated.flags & 32 /* Namespace */) {
+        return updated;
+      }
+      const fixed = factory2.createModuleDeclaration(
+        updated.modifiers,
+        updated.name,
+        updated.body,
+        updated.flags | 32 /* Namespace */
+      );
+      setOriginalNode(fixed, updated);
+      setTextRange(fixed, updated);
+      return fixed;
+    }
     function transformTopLevelDeclaration(input) {
       if (lateMarkedStatements) {
         while (orderedRemoveItem(lateMarkedStatements, input))
@@ -110633,7 +110661,7 @@ ${lanes.join("\n")}
             needsScopeFixMarker = oldNeedsScopeFix;
             resultHasScopeMarker = oldHasScopeFix;
             const mods = ensureModifiers(input);
-            return cleanup(factory2.updateModuleDeclaration(
+            return cleanup(updateModuleDeclarationAndKeyword(
               input,
               mods,
               isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name,
@@ -110647,7 +110675,7 @@ ${lanes.join("\n")}
             const id = getOriginalNodeId(inner);
             const body = lateStatementReplacementMap.get(id);
             lateStatementReplacementMap.delete(id);
-            return cleanup(factory2.updateModuleDeclaration(
+            return cleanup(updateModuleDeclarationAndKeyword(
               input,
               mods,
               input.name,
@@ -121475,6 +121503,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
       ]);
@@ -171969,6 +171998,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.20230626`;
 
 // 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."),
@@ -30821,6 +30822,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-54781-9",
   "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": "b62f8859ac8428b17034dbf3a821fb772d84955b"
 }