typescript 5.2.0-dev.20230530 → 5.2.0-dev.20230601

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-dev.20230530`;
+var version = `${versionMajorMinor}.0-dev.20230601`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -81691,7 +81691,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = resolveSymbol(getSymbol(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                 if (!symbol) {
                   error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                 } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -87813,8 +87813,9 @@ function transformClassFields(context) {
   let pendingStatements;
   let lexicalEnvironment;
   const lexicalEnvironmentMap = /* @__PURE__ */ new Map();
+  const noSubstitution = /* @__PURE__ */ new Set();
   let currentClassContainer;
-  let currentStaticPropertyDeclarationOrStaticBlock;
+  let currentClassElement;
   let shouldSubstituteThisWithClassThis = false;
   let previousShouldSubstituteThisWithClassThis = false;
   return chainBundle(context, transformSourceFile);
@@ -87906,13 +87907,18 @@ function transformClassFields(context) {
         return visitForStatement(node);
       case 261 /* FunctionDeclaration */:
       case 217 /* FunctionExpression */:
+        return setCurrentClassElementAnd(
+          /*classElement*/
+          void 0,
+          fallbackVisitor,
+          node
+        );
       case 175 /* Constructor */:
       case 173 /* MethodDeclaration */:
       case 176 /* GetAccessor */:
       case 177 /* SetAccessor */: {
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           fallbackVisitor,
           node
         );
@@ -88001,25 +88007,31 @@ function transformClassFields(context) {
   function classElementVisitor(node) {
     switch (node.kind) {
       case 175 /* Constructor */:
-        return visitConstructorDeclaration(node);
+        return setCurrentClassElementAnd(
+          node,
+          visitConstructorDeclaration,
+          node
+        );
       case 176 /* GetAccessor */:
       case 177 /* SetAccessor */:
       case 173 /* MethodDeclaration */:
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           visitMethodOrAccessorDeclaration,
           node
         );
       case 171 /* PropertyDeclaration */:
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           visitPropertyDeclaration,
           node
         );
       case 174 /* ClassStaticBlockDeclaration */:
-        return visitClassStaticBlockDeclaration(node);
+        return setCurrentClassElementAnd(
+          node,
+          visitClassStaticBlockDeclaration,
+          node
+        );
       case 166 /* ComputedPropertyName */:
         return visitComputedPropertyName(node);
       case 239 /* SemicolonClassElement */:
@@ -88213,12 +88225,15 @@ function transformClassFields(context) {
     }
     return void 0;
   }
-  function setCurrentStaticPropertyDeclarationOrStaticBlockAnd(current, visitor2, arg) {
-    const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
-    currentStaticPropertyDeclarationOrStaticBlock = current;
-    const result = visitor2(arg);
-    currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
-    return result;
+  function setCurrentClassElementAnd(classElement, visitor2, arg) {
+    if (classElement !== currentClassElement) {
+      const savedCurrentClassElement = currentClassElement;
+      currentClassElement = classElement;
+      const result = visitor2(arg);
+      currentClassElement = savedCurrentClassElement;
+      return result;
+    }
+    return visitor2(arg);
   }
   function getHoistedFunctionName(node) {
     Debug.assert(isPrivateIdentifier(node.name));
@@ -88380,8 +88395,21 @@ function transformClassFields(context) {
     }
     return transformFieldInitializer(node);
   }
+  function shouldForceDynamicThis() {
+    return !!currentClassElement && hasStaticModifier(currentClassElement) && isAccessor(currentClassElement) && isAutoAccessorPropertyDeclaration(getOriginalNode(currentClassElement));
+  }
+  function ensureDynamicThisIfNeeded(node) {
+    if (shouldForceDynamicThis()) {
+      const innerExpression = skipOuterExpressions(node);
+      if (innerExpression.kind === 110 /* ThisKeyword */) {
+        noSubstitution.add(innerExpression);
+      }
+    }
+  }
   function createPrivateIdentifierAccess(info, receiver) {
-    return createPrivateIdentifierAccessHelper(info, visitNode(receiver, visitor, isExpression));
+    receiver = visitNode(receiver, visitor, isExpression);
+    ensureDynamicThisIfNeeded(receiver);
+    return createPrivateIdentifierAccessHelper(info, receiver);
   }
   function createPrivateIdentifierAccessHelper(info, receiver) {
     setCommentRange(receiver, moveRangePos(receiver, -1));
@@ -88426,7 +88454,7 @@ function transformClassFields(context) {
         );
       }
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && isIdentifier(node.name) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isIdentifier(node.name) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -88445,7 +88473,7 @@ function transformClassFields(context) {
     return visitEachChild(node, visitor, context);
   }
   function visitElementAccessExpression(node) {
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -88470,6 +88498,7 @@ function transformClassFields(context) {
         let info;
         if (info = accessPrivateIdentifier2(operand.name)) {
           const receiver = visitNode(operand.expression, visitor, isExpression);
+          ensureDynamicThisIfNeeded(receiver);
           const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
           let expression = createPrivateIdentifierAccess(info, readExpression);
           const temp = isPrefixUnaryExpression(node) || discarded ? void 0 : factory2.createTempVariable(hoistVariableDeclaration);
@@ -88488,7 +88517,7 @@ function transformClassFields(context) {
           }
           return expression;
         }
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(operand) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(operand) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           const expression = visitInvalidSuperProperty(operand);
@@ -88545,6 +88574,9 @@ function transformClassFields(context) {
   }
   function createCopiableReceiverExpr(receiver) {
     const clone2 = nodeIsSynthesized(receiver) ? receiver : factory2.cloneNode(receiver);
+    if (receiver.kind === 110 /* ThisKeyword */ && noSubstitution.has(receiver)) {
+      noSubstitution.add(clone2);
+    }
     if (isSimpleInlineableExpression(receiver)) {
       return { readExpression: clone2, initializeExpression: void 0 };
     }
@@ -88575,7 +88607,7 @@ function transformClassFields(context) {
         [visitNode(thisArg, visitor, isExpression), ...visitNodes2(node.arguments, visitor, isExpression)]
       );
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.expression) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.expression) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
       const invocation = factory2.createFunctionCallCall(
         visitNode(node.expression, visitor, isExpression),
         lexicalEnvironment.data.classConstructor,
@@ -88604,7 +88636,7 @@ function transformClassFields(context) {
         visitNode(node.template, visitor, isTemplateLiteral)
       );
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.tag) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.tag) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
       const invocation = factory2.createFunctionBindCall(
         visitNode(node.tag, visitor, isExpression),
         lexicalEnvironment.data.classConstructor,
@@ -88628,7 +88660,7 @@ function transformClassFields(context) {
     }
     if (shouldTransformPrivateElementsOrClassStaticBlocks) {
       startLexicalEnvironment();
-      let statements = setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
+      let statements = setCurrentClassElementAnd(
         node,
         (statements2) => visitNodes2(statements2, visitor, isStatement),
         node.body.statements
@@ -88690,7 +88722,7 @@ function transformClassFields(context) {
             node
           );
         }
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.left) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.left) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return factory2.updateBinaryExpression(
@@ -88785,6 +88817,7 @@ function transformClassFields(context) {
   function createPrivateIdentifierAssignment(info, receiver, right, operator) {
     receiver = visitNode(receiver, visitor, isExpression);
     right = visitNode(right, visitor, isExpression);
+    ensureDynamicThisIfNeeded(receiver);
     if (isCompoundAssignment(operator)) {
       const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
       receiver = initializeExpression || readExpression;
@@ -89427,7 +89460,7 @@ function transformClassFields(context) {
   }
   function transformProperty(property, receiver) {
     var _a;
-    const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
+    const savedCurrentClassElement = currentClassElement;
     const transformed = transformPropertyWorker(property, receiver);
     if (transformed && hasStaticModifier(property) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.facts)) {
       setOriginalNode(transformed, property);
@@ -89435,7 +89468,7 @@ function transformClassFields(context) {
       setSourceMapRange(transformed, getSourceMapRange(property.name));
       lexicalEnvironmentMap.set(getOriginalNode(property), lexicalEnvironment);
     }
-    currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
+    currentClassElement = savedCurrentClassElement;
     return transformed;
   }
   function transformPropertyWorker(property, receiver) {
@@ -89452,7 +89485,7 @@ function transformClassFields(context) {
     }
     const propertyName = hasAccessorModifier(property) ? factory2.getGeneratedPrivateNameForNode(property.name) : isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression) ? factory2.updateComputedPropertyName(property.name, factory2.getGeneratedNameForNode(property.name)) : property.name;
     if (hasStaticModifier(property)) {
-      currentStaticPropertyDeclarationOrStaticBlock = property;
+      currentClassElement = property;
     }
     const initializerVisitor = referencedName ? (child) => namedEvaluationVisitor(child, referencedName) : visitor;
     if (isPrivateIdentifier(propertyName) && shouldTransformClassElementToWeakMap(property)) {
@@ -89777,7 +89810,7 @@ function transformClassFields(context) {
     }
     if (isPrivateIdentifierPropertyAccessExpression(node)) {
       return wrapPrivateIdentifierForDestructuringTarget(node);
-    } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -89957,7 +89990,7 @@ function transformClassFields(context) {
     return node;
   }
   function substituteThisExpression(node) {
-    if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) && !noSubstitution.has(node)) {
       const { facts, classConstructor, classThis } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */ && legacyDecorators) {
         return factory2.createParenthesizedExpression(factory2.createVoidZero());
@@ -90026,6 +90059,12 @@ function isReservedPrivateName(node) {
 function isPrivateIdentifierInExpression(node) {
   return isPrivateIdentifier(node.left) && node.operatorToken.kind === 103 /* InKeyword */;
 }
+function isStaticPropertyDeclaration2(node) {
+  return isPropertyDeclaration(node) && hasStaticModifier(node);
+}
+function isStaticPropertyDeclarationOrClassStaticBlock(node) {
+  return isClassStaticBlockDeclaration(node) || isStaticPropertyDeclaration2(node);
+}
 
 // src/compiler/transformers/typeSerializer.ts
 function createRuntimeTypeSerializer(context) {

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230530`;
+var version = `${versionMajorMinor}.0-dev.20230601`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -86342,7 +86342,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = resolveSymbol(getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                 if (!symbol) {
                   error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                 } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -92635,8 +92635,9 @@ function transformClassFields(context) {
   let pendingStatements;
   let lexicalEnvironment;
   const lexicalEnvironmentMap = /* @__PURE__ */ new Map();
+  const noSubstitution = /* @__PURE__ */ new Set();
   let currentClassContainer;
-  let currentStaticPropertyDeclarationOrStaticBlock;
+  let currentClassElement;
   let shouldSubstituteThisWithClassThis = false;
   let previousShouldSubstituteThisWithClassThis = false;
   return chainBundle(context, transformSourceFile);
@@ -92728,13 +92729,18 @@ function transformClassFields(context) {
         return visitForStatement(node);
       case 261 /* FunctionDeclaration */:
       case 217 /* FunctionExpression */:
+        return setCurrentClassElementAnd(
+          /*classElement*/
+          void 0,
+          fallbackVisitor,
+          node
+        );
       case 175 /* Constructor */:
       case 173 /* MethodDeclaration */:
       case 176 /* GetAccessor */:
       case 177 /* SetAccessor */: {
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           fallbackVisitor,
           node
         );
@@ -92823,25 +92829,31 @@ function transformClassFields(context) {
   function classElementVisitor(node) {
     switch (node.kind) {
       case 175 /* Constructor */:
-        return visitConstructorDeclaration(node);
+        return setCurrentClassElementAnd(
+          node,
+          visitConstructorDeclaration,
+          node
+        );
       case 176 /* GetAccessor */:
       case 177 /* SetAccessor */:
       case 173 /* MethodDeclaration */:
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           visitMethodOrAccessorDeclaration,
           node
         );
       case 171 /* PropertyDeclaration */:
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           visitPropertyDeclaration,
           node
         );
       case 174 /* ClassStaticBlockDeclaration */:
-        return visitClassStaticBlockDeclaration(node);
+        return setCurrentClassElementAnd(
+          node,
+          visitClassStaticBlockDeclaration,
+          node
+        );
       case 166 /* ComputedPropertyName */:
         return visitComputedPropertyName(node);
       case 239 /* SemicolonClassElement */:
@@ -93035,12 +93047,15 @@ function transformClassFields(context) {
     }
     return void 0;
   }
-  function setCurrentStaticPropertyDeclarationOrStaticBlockAnd(current, visitor2, arg) {
-    const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
-    currentStaticPropertyDeclarationOrStaticBlock = current;
-    const result = visitor2(arg);
-    currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
-    return result;
+  function setCurrentClassElementAnd(classElement, visitor2, arg) {
+    if (classElement !== currentClassElement) {
+      const savedCurrentClassElement = currentClassElement;
+      currentClassElement = classElement;
+      const result = visitor2(arg);
+      currentClassElement = savedCurrentClassElement;
+      return result;
+    }
+    return visitor2(arg);
   }
   function getHoistedFunctionName(node) {
     Debug.assert(isPrivateIdentifier(node.name));
@@ -93202,8 +93217,21 @@ function transformClassFields(context) {
     }
     return transformFieldInitializer(node);
   }
+  function shouldForceDynamicThis() {
+    return !!currentClassElement && hasStaticModifier(currentClassElement) && isAccessor(currentClassElement) && isAutoAccessorPropertyDeclaration(getOriginalNode(currentClassElement));
+  }
+  function ensureDynamicThisIfNeeded(node) {
+    if (shouldForceDynamicThis()) {
+      const innerExpression = skipOuterExpressions(node);
+      if (innerExpression.kind === 110 /* ThisKeyword */) {
+        noSubstitution.add(innerExpression);
+      }
+    }
+  }
   function createPrivateIdentifierAccess(info, receiver) {
-    return createPrivateIdentifierAccessHelper(info, visitNode(receiver, visitor, isExpression));
+    receiver = visitNode(receiver, visitor, isExpression);
+    ensureDynamicThisIfNeeded(receiver);
+    return createPrivateIdentifierAccessHelper(info, receiver);
   }
   function createPrivateIdentifierAccessHelper(info, receiver) {
     setCommentRange(receiver, moveRangePos(receiver, -1));
@@ -93248,7 +93276,7 @@ function transformClassFields(context) {
         );
       }
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && isIdentifier(node.name) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isIdentifier(node.name) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -93267,7 +93295,7 @@ function transformClassFields(context) {
     return visitEachChild(node, visitor, context);
   }
   function visitElementAccessExpression(node) {
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -93292,6 +93320,7 @@ function transformClassFields(context) {
         let info;
         if (info = accessPrivateIdentifier2(operand.name)) {
           const receiver = visitNode(operand.expression, visitor, isExpression);
+          ensureDynamicThisIfNeeded(receiver);
           const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
           let expression = createPrivateIdentifierAccess(info, readExpression);
           const temp = isPrefixUnaryExpression(node) || discarded ? void 0 : factory2.createTempVariable(hoistVariableDeclaration);
@@ -93310,7 +93339,7 @@ function transformClassFields(context) {
           }
           return expression;
         }
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(operand) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(operand) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           const expression = visitInvalidSuperProperty(operand);
@@ -93367,6 +93396,9 @@ function transformClassFields(context) {
   }
   function createCopiableReceiverExpr(receiver) {
     const clone2 = nodeIsSynthesized(receiver) ? receiver : factory2.cloneNode(receiver);
+    if (receiver.kind === 110 /* ThisKeyword */ && noSubstitution.has(receiver)) {
+      noSubstitution.add(clone2);
+    }
     if (isSimpleInlineableExpression(receiver)) {
       return { readExpression: clone2, initializeExpression: void 0 };
     }
@@ -93397,7 +93429,7 @@ function transformClassFields(context) {
         [visitNode(thisArg, visitor, isExpression), ...visitNodes2(node.arguments, visitor, isExpression)]
       );
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.expression) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.expression) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
       const invocation = factory2.createFunctionCallCall(
         visitNode(node.expression, visitor, isExpression),
         lexicalEnvironment.data.classConstructor,
@@ -93426,7 +93458,7 @@ function transformClassFields(context) {
         visitNode(node.template, visitor, isTemplateLiteral)
       );
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.tag) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.tag) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
       const invocation = factory2.createFunctionBindCall(
         visitNode(node.tag, visitor, isExpression),
         lexicalEnvironment.data.classConstructor,
@@ -93450,7 +93482,7 @@ function transformClassFields(context) {
     }
     if (shouldTransformPrivateElementsOrClassStaticBlocks) {
       startLexicalEnvironment();
-      let statements = setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
+      let statements = setCurrentClassElementAnd(
         node,
         (statements2) => visitNodes2(statements2, visitor, isStatement),
         node.body.statements
@@ -93512,7 +93544,7 @@ function transformClassFields(context) {
             node
           );
         }
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.left) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.left) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return factory2.updateBinaryExpression(
@@ -93607,6 +93639,7 @@ function transformClassFields(context) {
   function createPrivateIdentifierAssignment(info, receiver, right, operator) {
     receiver = visitNode(receiver, visitor, isExpression);
     right = visitNode(right, visitor, isExpression);
+    ensureDynamicThisIfNeeded(receiver);
     if (isCompoundAssignment(operator)) {
       const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
       receiver = initializeExpression || readExpression;
@@ -94249,7 +94282,7 @@ function transformClassFields(context) {
   }
   function transformProperty(property, receiver) {
     var _a;
-    const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
+    const savedCurrentClassElement = currentClassElement;
     const transformed = transformPropertyWorker(property, receiver);
     if (transformed && hasStaticModifier(property) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.facts)) {
       setOriginalNode(transformed, property);
@@ -94257,7 +94290,7 @@ function transformClassFields(context) {
       setSourceMapRange(transformed, getSourceMapRange(property.name));
       lexicalEnvironmentMap.set(getOriginalNode(property), lexicalEnvironment);
     }
-    currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
+    currentClassElement = savedCurrentClassElement;
     return transformed;
   }
   function transformPropertyWorker(property, receiver) {
@@ -94274,7 +94307,7 @@ function transformClassFields(context) {
     }
     const propertyName = hasAccessorModifier(property) ? factory2.getGeneratedPrivateNameForNode(property.name) : isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression) ? factory2.updateComputedPropertyName(property.name, factory2.getGeneratedNameForNode(property.name)) : property.name;
     if (hasStaticModifier(property)) {
-      currentStaticPropertyDeclarationOrStaticBlock = property;
+      currentClassElement = property;
     }
     const initializerVisitor = referencedName ? (child) => namedEvaluationVisitor(child, referencedName) : visitor;
     if (isPrivateIdentifier(propertyName) && shouldTransformClassElementToWeakMap(property)) {
@@ -94599,7 +94632,7 @@ function transformClassFields(context) {
     }
     if (isPrivateIdentifierPropertyAccessExpression(node)) {
       return wrapPrivateIdentifierForDestructuringTarget(node);
-    } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -94779,7 +94812,7 @@ function transformClassFields(context) {
     return node;
   }
   function substituteThisExpression(node) {
-    if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) && !noSubstitution.has(node)) {
       const { facts, classConstructor, classThis } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */ && legacyDecorators) {
         return factory2.createParenthesizedExpression(factory2.createVoidZero());
@@ -94848,6 +94881,12 @@ function isReservedPrivateName(node) {
 function isPrivateIdentifierInExpression(node) {
   return isPrivateIdentifier(node.left) && node.operatorToken.kind === 103 /* InKeyword */;
 }
+function isStaticPropertyDeclaration2(node) {
+  return isPropertyDeclaration(node) && hasStaticModifier(node);
+}
+function isStaticPropertyDeclarationOrClassStaticBlock(node) {
+  return isClassStaticBlockDeclaration(node) || isStaticPropertyDeclaration2(node);
+}
 
 // src/compiler/transformers/typeSerializer.ts
 function createRuntimeTypeSerializer(context) {
@@ -153478,8 +153517,7 @@ function createSignatureDeclarationFromCallExpression(kind, context, importAdder
     instanceTypes,
     contextNode,
     scriptTarget,
-    /*flags*/
-    void 0,
+    1 /* NoTruncation */,
     tracker
   );
   const modifiers = modifierFlags ? factory.createNodeArray(factory.createModifiersFromModifierFlags(modifierFlags)) : void 0;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230530`;
+      version = `${versionMajorMinor}.0-dev.20230601`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -84132,7 +84132,7 @@ ${lanes.join("\n")}
                   if (requestedExternalEmitHelperNames.has(name))
                     continue;
                   requestedExternalEmitHelperNames.add(name);
-                  const symbol = getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */);
+                  const symbol = resolveSymbol(getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                   if (!symbol) {
                     error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                   } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -90601,8 +90601,9 @@ ${lanes.join("\n")}
     let pendingStatements;
     let lexicalEnvironment;
     const lexicalEnvironmentMap = /* @__PURE__ */ new Map();
+    const noSubstitution = /* @__PURE__ */ new Set();
     let currentClassContainer;
-    let currentStaticPropertyDeclarationOrStaticBlock;
+    let currentClassElement;
     let shouldSubstituteThisWithClassThis = false;
     let previousShouldSubstituteThisWithClassThis = false;
     return chainBundle(context, transformSourceFile);
@@ -90694,13 +90695,18 @@ ${lanes.join("\n")}
           return visitForStatement(node);
         case 261 /* FunctionDeclaration */:
         case 217 /* FunctionExpression */:
+          return setCurrentClassElementAnd(
+            /*classElement*/
+            void 0,
+            fallbackVisitor,
+            node
+          );
         case 175 /* Constructor */:
         case 173 /* MethodDeclaration */:
         case 176 /* GetAccessor */:
         case 177 /* SetAccessor */: {
-          return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-            /*current*/
-            void 0,
+          return setCurrentClassElementAnd(
+            node,
             fallbackVisitor,
             node
           );
@@ -90789,25 +90795,31 @@ ${lanes.join("\n")}
     function classElementVisitor(node) {
       switch (node.kind) {
         case 175 /* Constructor */:
-          return visitConstructorDeclaration(node);
+          return setCurrentClassElementAnd(
+            node,
+            visitConstructorDeclaration,
+            node
+          );
         case 176 /* GetAccessor */:
         case 177 /* SetAccessor */:
         case 173 /* MethodDeclaration */:
-          return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-            /*current*/
-            void 0,
+          return setCurrentClassElementAnd(
+            node,
             visitMethodOrAccessorDeclaration,
             node
           );
         case 171 /* PropertyDeclaration */:
-          return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-            /*current*/
-            void 0,
+          return setCurrentClassElementAnd(
+            node,
             visitPropertyDeclaration,
             node
           );
         case 174 /* ClassStaticBlockDeclaration */:
-          return visitClassStaticBlockDeclaration(node);
+          return setCurrentClassElementAnd(
+            node,
+            visitClassStaticBlockDeclaration,
+            node
+          );
         case 166 /* ComputedPropertyName */:
           return visitComputedPropertyName(node);
         case 239 /* SemicolonClassElement */:
@@ -91001,12 +91013,15 @@ ${lanes.join("\n")}
       }
       return void 0;
     }
-    function setCurrentStaticPropertyDeclarationOrStaticBlockAnd(current, visitor2, arg) {
-      const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
-      currentStaticPropertyDeclarationOrStaticBlock = current;
-      const result = visitor2(arg);
-      currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
-      return result;
+    function setCurrentClassElementAnd(classElement, visitor2, arg) {
+      if (classElement !== currentClassElement) {
+        const savedCurrentClassElement = currentClassElement;
+        currentClassElement = classElement;
+        const result = visitor2(arg);
+        currentClassElement = savedCurrentClassElement;
+        return result;
+      }
+      return visitor2(arg);
     }
     function getHoistedFunctionName(node) {
       Debug.assert(isPrivateIdentifier(node.name));
@@ -91168,8 +91183,21 @@ ${lanes.join("\n")}
       }
       return transformFieldInitializer(node);
     }
+    function shouldForceDynamicThis() {
+      return !!currentClassElement && hasStaticModifier(currentClassElement) && isAccessor(currentClassElement) && isAutoAccessorPropertyDeclaration(getOriginalNode(currentClassElement));
+    }
+    function ensureDynamicThisIfNeeded(node) {
+      if (shouldForceDynamicThis()) {
+        const innerExpression = skipOuterExpressions(node);
+        if (innerExpression.kind === 110 /* ThisKeyword */) {
+          noSubstitution.add(innerExpression);
+        }
+      }
+    }
     function createPrivateIdentifierAccess(info, receiver) {
-      return createPrivateIdentifierAccessHelper(info, visitNode(receiver, visitor, isExpression));
+      receiver = visitNode(receiver, visitor, isExpression);
+      ensureDynamicThisIfNeeded(receiver);
+      return createPrivateIdentifierAccessHelper(info, receiver);
     }
     function createPrivateIdentifierAccessHelper(info, receiver) {
       setCommentRange(receiver, moveRangePos(receiver, -1));
@@ -91214,7 +91242,7 @@ ${lanes.join("\n")}
           );
         }
       }
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && isIdentifier(node.name) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isIdentifier(node.name) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return visitInvalidSuperProperty(node);
@@ -91233,7 +91261,7 @@ ${lanes.join("\n")}
       return visitEachChild(node, visitor, context);
     }
     function visitElementAccessExpression(node) {
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return visitInvalidSuperProperty(node);
@@ -91258,6 +91286,7 @@ ${lanes.join("\n")}
           let info;
           if (info = accessPrivateIdentifier2(operand.name)) {
             const receiver = visitNode(operand.expression, visitor, isExpression);
+            ensureDynamicThisIfNeeded(receiver);
             const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
             let expression = createPrivateIdentifierAccess(info, readExpression);
             const temp = isPrefixUnaryExpression(node) || discarded ? void 0 : factory2.createTempVariable(hoistVariableDeclaration);
@@ -91276,7 +91305,7 @@ ${lanes.join("\n")}
             }
             return expression;
           }
-        } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(operand) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+        } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(operand) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
           const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
           if (facts & 1 /* ClassWasDecorated */) {
             const expression = visitInvalidSuperProperty(operand);
@@ -91333,6 +91362,9 @@ ${lanes.join("\n")}
     }
     function createCopiableReceiverExpr(receiver) {
       const clone2 = nodeIsSynthesized(receiver) ? receiver : factory2.cloneNode(receiver);
+      if (receiver.kind === 110 /* ThisKeyword */ && noSubstitution.has(receiver)) {
+        noSubstitution.add(clone2);
+      }
       if (isSimpleInlineableExpression(receiver)) {
         return { readExpression: clone2, initializeExpression: void 0 };
       }
@@ -91363,7 +91395,7 @@ ${lanes.join("\n")}
           [visitNode(thisArg, visitor, isExpression), ...visitNodes2(node.arguments, visitor, isExpression)]
         );
       }
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.expression) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.expression) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
         const invocation = factory2.createFunctionCallCall(
           visitNode(node.expression, visitor, isExpression),
           lexicalEnvironment.data.classConstructor,
@@ -91392,7 +91424,7 @@ ${lanes.join("\n")}
           visitNode(node.template, visitor, isTemplateLiteral)
         );
       }
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.tag) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.tag) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
         const invocation = factory2.createFunctionBindCall(
           visitNode(node.tag, visitor, isExpression),
           lexicalEnvironment.data.classConstructor,
@@ -91416,7 +91448,7 @@ ${lanes.join("\n")}
       }
       if (shouldTransformPrivateElementsOrClassStaticBlocks) {
         startLexicalEnvironment();
-        let statements = setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
+        let statements = setCurrentClassElementAnd(
           node,
           (statements2) => visitNodes2(statements2, visitor, isStatement),
           node.body.statements
@@ -91478,7 +91510,7 @@ ${lanes.join("\n")}
               node
             );
           }
-        } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.left) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+        } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.left) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
           const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
           if (facts & 1 /* ClassWasDecorated */) {
             return factory2.updateBinaryExpression(
@@ -91573,6 +91605,7 @@ ${lanes.join("\n")}
     function createPrivateIdentifierAssignment(info, receiver, right, operator) {
       receiver = visitNode(receiver, visitor, isExpression);
       right = visitNode(right, visitor, isExpression);
+      ensureDynamicThisIfNeeded(receiver);
       if (isCompoundAssignment(operator)) {
         const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
         receiver = initializeExpression || readExpression;
@@ -92215,7 +92248,7 @@ ${lanes.join("\n")}
     }
     function transformProperty(property, receiver) {
       var _a;
-      const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
+      const savedCurrentClassElement = currentClassElement;
       const transformed = transformPropertyWorker(property, receiver);
       if (transformed && hasStaticModifier(property) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.facts)) {
         setOriginalNode(transformed, property);
@@ -92223,7 +92256,7 @@ ${lanes.join("\n")}
         setSourceMapRange(transformed, getSourceMapRange(property.name));
         lexicalEnvironmentMap.set(getOriginalNode(property), lexicalEnvironment);
       }
-      currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
+      currentClassElement = savedCurrentClassElement;
       return transformed;
     }
     function transformPropertyWorker(property, receiver) {
@@ -92240,7 +92273,7 @@ ${lanes.join("\n")}
       }
       const propertyName = hasAccessorModifier(property) ? factory2.getGeneratedPrivateNameForNode(property.name) : isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression) ? factory2.updateComputedPropertyName(property.name, factory2.getGeneratedNameForNode(property.name)) : property.name;
       if (hasStaticModifier(property)) {
-        currentStaticPropertyDeclarationOrStaticBlock = property;
+        currentClassElement = property;
       }
       const initializerVisitor = referencedName ? (child) => namedEvaluationVisitor(child, referencedName) : visitor;
       if (isPrivateIdentifier(propertyName) && shouldTransformClassElementToWeakMap(property)) {
@@ -92565,7 +92598,7 @@ ${lanes.join("\n")}
       }
       if (isPrivateIdentifierPropertyAccessExpression(node)) {
         return wrapPrivateIdentifierForDestructuringTarget(node);
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return visitInvalidSuperProperty(node);
@@ -92745,7 +92778,7 @@ ${lanes.join("\n")}
       return node;
     }
     function substituteThisExpression(node) {
-      if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) && !noSubstitution.has(node)) {
         const { facts, classConstructor, classThis } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */ && legacyDecorators) {
           return factory2.createParenthesizedExpression(factory2.createVoidZero());
@@ -92814,6 +92847,12 @@ ${lanes.join("\n")}
   function isPrivateIdentifierInExpression(node) {
     return isPrivateIdentifier(node.left) && node.operatorToken.kind === 103 /* InKeyword */;
   }
+  function isStaticPropertyDeclaration2(node) {
+    return isPropertyDeclaration(node) && hasStaticModifier(node);
+  }
+  function isStaticPropertyDeclarationOrClassStaticBlock(node) {
+    return isClassStaticBlockDeclaration(node) || isStaticPropertyDeclaration2(node);
+  }
   var init_classFields = __esm({
     "src/compiler/transformers/classFields.ts"() {
       "use strict";
@@ -152525,8 +152564,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       instanceTypes,
       contextNode,
       scriptTarget,
-      /*flags*/
-      void 0,
+      1 /* NoTruncation */,
       tracker
     );
     const modifiers = modifierFlags ? factory.createNodeArray(factory.createModifiersFromModifierFlags(modifierFlags)) : void 0;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230530`;
+      version = `${versionMajorMinor}.0-dev.20230601`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -84132,7 +84132,7 @@ ${lanes.join("\n")}
                   if (requestedExternalEmitHelperNames.has(name))
                     continue;
                   requestedExternalEmitHelperNames.add(name);
-                  const symbol = getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */);
+                  const symbol = resolveSymbol(getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                   if (!symbol) {
                     error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                   } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -90601,8 +90601,9 @@ ${lanes.join("\n")}
     let pendingStatements;
     let lexicalEnvironment;
     const lexicalEnvironmentMap = /* @__PURE__ */ new Map();
+    const noSubstitution = /* @__PURE__ */ new Set();
     let currentClassContainer;
-    let currentStaticPropertyDeclarationOrStaticBlock;
+    let currentClassElement;
     let shouldSubstituteThisWithClassThis = false;
     let previousShouldSubstituteThisWithClassThis = false;
     return chainBundle(context, transformSourceFile);
@@ -90694,13 +90695,18 @@ ${lanes.join("\n")}
           return visitForStatement(node);
         case 261 /* FunctionDeclaration */:
         case 217 /* FunctionExpression */:
+          return setCurrentClassElementAnd(
+            /*classElement*/
+            void 0,
+            fallbackVisitor,
+            node
+          );
         case 175 /* Constructor */:
         case 173 /* MethodDeclaration */:
         case 176 /* GetAccessor */:
         case 177 /* SetAccessor */: {
-          return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-            /*current*/
-            void 0,
+          return setCurrentClassElementAnd(
+            node,
             fallbackVisitor,
             node
           );
@@ -90789,25 +90795,31 @@ ${lanes.join("\n")}
     function classElementVisitor(node) {
       switch (node.kind) {
         case 175 /* Constructor */:
-          return visitConstructorDeclaration(node);
+          return setCurrentClassElementAnd(
+            node,
+            visitConstructorDeclaration,
+            node
+          );
         case 176 /* GetAccessor */:
         case 177 /* SetAccessor */:
         case 173 /* MethodDeclaration */:
-          return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-            /*current*/
-            void 0,
+          return setCurrentClassElementAnd(
+            node,
             visitMethodOrAccessorDeclaration,
             node
           );
         case 171 /* PropertyDeclaration */:
-          return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-            /*current*/
-            void 0,
+          return setCurrentClassElementAnd(
+            node,
             visitPropertyDeclaration,
             node
           );
         case 174 /* ClassStaticBlockDeclaration */:
-          return visitClassStaticBlockDeclaration(node);
+          return setCurrentClassElementAnd(
+            node,
+            visitClassStaticBlockDeclaration,
+            node
+          );
         case 166 /* ComputedPropertyName */:
           return visitComputedPropertyName(node);
         case 239 /* SemicolonClassElement */:
@@ -91001,12 +91013,15 @@ ${lanes.join("\n")}
       }
       return void 0;
     }
-    function setCurrentStaticPropertyDeclarationOrStaticBlockAnd(current, visitor2, arg) {
-      const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
-      currentStaticPropertyDeclarationOrStaticBlock = current;
-      const result = visitor2(arg);
-      currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
-      return result;
+    function setCurrentClassElementAnd(classElement, visitor2, arg) {
+      if (classElement !== currentClassElement) {
+        const savedCurrentClassElement = currentClassElement;
+        currentClassElement = classElement;
+        const result = visitor2(arg);
+        currentClassElement = savedCurrentClassElement;
+        return result;
+      }
+      return visitor2(arg);
     }
     function getHoistedFunctionName(node) {
       Debug.assert(isPrivateIdentifier(node.name));
@@ -91168,8 +91183,21 @@ ${lanes.join("\n")}
       }
       return transformFieldInitializer(node);
     }
+    function shouldForceDynamicThis() {
+      return !!currentClassElement && hasStaticModifier(currentClassElement) && isAccessor(currentClassElement) && isAutoAccessorPropertyDeclaration(getOriginalNode(currentClassElement));
+    }
+    function ensureDynamicThisIfNeeded(node) {
+      if (shouldForceDynamicThis()) {
+        const innerExpression = skipOuterExpressions(node);
+        if (innerExpression.kind === 110 /* ThisKeyword */) {
+          noSubstitution.add(innerExpression);
+        }
+      }
+    }
     function createPrivateIdentifierAccess(info, receiver) {
-      return createPrivateIdentifierAccessHelper(info, visitNode(receiver, visitor, isExpression));
+      receiver = visitNode(receiver, visitor, isExpression);
+      ensureDynamicThisIfNeeded(receiver);
+      return createPrivateIdentifierAccessHelper(info, receiver);
     }
     function createPrivateIdentifierAccessHelper(info, receiver) {
       setCommentRange(receiver, moveRangePos(receiver, -1));
@@ -91214,7 +91242,7 @@ ${lanes.join("\n")}
           );
         }
       }
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && isIdentifier(node.name) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isIdentifier(node.name) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return visitInvalidSuperProperty(node);
@@ -91233,7 +91261,7 @@ ${lanes.join("\n")}
       return visitEachChild(node, visitor, context);
     }
     function visitElementAccessExpression(node) {
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return visitInvalidSuperProperty(node);
@@ -91258,6 +91286,7 @@ ${lanes.join("\n")}
           let info;
           if (info = accessPrivateIdentifier2(operand.name)) {
             const receiver = visitNode(operand.expression, visitor, isExpression);
+            ensureDynamicThisIfNeeded(receiver);
             const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
             let expression = createPrivateIdentifierAccess(info, readExpression);
             const temp = isPrefixUnaryExpression(node) || discarded ? void 0 : factory2.createTempVariable(hoistVariableDeclaration);
@@ -91276,7 +91305,7 @@ ${lanes.join("\n")}
             }
             return expression;
           }
-        } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(operand) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+        } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(operand) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
           const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
           if (facts & 1 /* ClassWasDecorated */) {
             const expression = visitInvalidSuperProperty(operand);
@@ -91333,6 +91362,9 @@ ${lanes.join("\n")}
     }
     function createCopiableReceiverExpr(receiver) {
       const clone2 = nodeIsSynthesized(receiver) ? receiver : factory2.cloneNode(receiver);
+      if (receiver.kind === 110 /* ThisKeyword */ && noSubstitution.has(receiver)) {
+        noSubstitution.add(clone2);
+      }
       if (isSimpleInlineableExpression(receiver)) {
         return { readExpression: clone2, initializeExpression: void 0 };
       }
@@ -91363,7 +91395,7 @@ ${lanes.join("\n")}
           [visitNode(thisArg, visitor, isExpression), ...visitNodes2(node.arguments, visitor, isExpression)]
         );
       }
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.expression) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.expression) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
         const invocation = factory2.createFunctionCallCall(
           visitNode(node.expression, visitor, isExpression),
           lexicalEnvironment.data.classConstructor,
@@ -91392,7 +91424,7 @@ ${lanes.join("\n")}
           visitNode(node.template, visitor, isTemplateLiteral)
         );
       }
-      if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.tag) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+      if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.tag) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
         const invocation = factory2.createFunctionBindCall(
           visitNode(node.tag, visitor, isExpression),
           lexicalEnvironment.data.classConstructor,
@@ -91416,7 +91448,7 @@ ${lanes.join("\n")}
       }
       if (shouldTransformPrivateElementsOrClassStaticBlocks) {
         startLexicalEnvironment();
-        let statements = setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
+        let statements = setCurrentClassElementAnd(
           node,
           (statements2) => visitNodes2(statements2, visitor, isStatement),
           node.body.statements
@@ -91478,7 +91510,7 @@ ${lanes.join("\n")}
               node
             );
           }
-        } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.left) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+        } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.left) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
           const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
           if (facts & 1 /* ClassWasDecorated */) {
             return factory2.updateBinaryExpression(
@@ -91573,6 +91605,7 @@ ${lanes.join("\n")}
     function createPrivateIdentifierAssignment(info, receiver, right, operator) {
       receiver = visitNode(receiver, visitor, isExpression);
       right = visitNode(right, visitor, isExpression);
+      ensureDynamicThisIfNeeded(receiver);
       if (isCompoundAssignment(operator)) {
         const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
         receiver = initializeExpression || readExpression;
@@ -92215,7 +92248,7 @@ ${lanes.join("\n")}
     }
     function transformProperty(property, receiver) {
       var _a;
-      const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
+      const savedCurrentClassElement = currentClassElement;
       const transformed = transformPropertyWorker(property, receiver);
       if (transformed && hasStaticModifier(property) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.facts)) {
         setOriginalNode(transformed, property);
@@ -92223,7 +92256,7 @@ ${lanes.join("\n")}
         setSourceMapRange(transformed, getSourceMapRange(property.name));
         lexicalEnvironmentMap.set(getOriginalNode(property), lexicalEnvironment);
       }
-      currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
+      currentClassElement = savedCurrentClassElement;
       return transformed;
     }
     function transformPropertyWorker(property, receiver) {
@@ -92240,7 +92273,7 @@ ${lanes.join("\n")}
       }
       const propertyName = hasAccessorModifier(property) ? factory2.getGeneratedPrivateNameForNode(property.name) : isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression) ? factory2.updateComputedPropertyName(property.name, factory2.getGeneratedNameForNode(property.name)) : property.name;
       if (hasStaticModifier(property)) {
-        currentStaticPropertyDeclarationOrStaticBlock = property;
+        currentClassElement = property;
       }
       const initializerVisitor = referencedName ? (child) => namedEvaluationVisitor(child, referencedName) : visitor;
       if (isPrivateIdentifier(propertyName) && shouldTransformClassElementToWeakMap(property)) {
@@ -92565,7 +92598,7 @@ ${lanes.join("\n")}
       }
       if (isPrivateIdentifierPropertyAccessExpression(node)) {
         return wrapPrivateIdentifierForDestructuringTarget(node);
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return visitInvalidSuperProperty(node);
@@ -92745,7 +92778,7 @@ ${lanes.join("\n")}
       return node;
     }
     function substituteThisExpression(node) {
-      if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) && !noSubstitution.has(node)) {
         const { facts, classConstructor, classThis } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */ && legacyDecorators) {
           return factory2.createParenthesizedExpression(factory2.createVoidZero());
@@ -92814,6 +92847,12 @@ ${lanes.join("\n")}
   function isPrivateIdentifierInExpression(node) {
     return isPrivateIdentifier(node.left) && node.operatorToken.kind === 103 /* InKeyword */;
   }
+  function isStaticPropertyDeclaration2(node) {
+    return isPropertyDeclaration(node) && hasStaticModifier(node);
+  }
+  function isStaticPropertyDeclarationOrClassStaticBlock(node) {
+    return isClassStaticBlockDeclaration(node) || isStaticPropertyDeclaration2(node);
+  }
   var init_classFields = __esm({
     "src/compiler/transformers/classFields.ts"() {
       "use strict";
@@ -152540,8 +152579,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       instanceTypes,
       contextNode,
       scriptTarget,
-      /*flags*/
-      void 0,
+      1 /* NoTruncation */,
       tracker
     );
     const modifiers = modifierFlags ? factory.createNodeArray(factory.createModifiersFromModifierFlags(modifierFlags)) : void 0;

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-dev.20230530`;
+var version = `${versionMajorMinor}.0-dev.20230601`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230530",
+    "version": "5.2.0-dev.20230601",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "4bf047680045a295e505177c5a66c186a48bccc6"
+    "gitHead": "4c01b2f9ee6e65ff9a39e836a99b0b4959bce5fb"
 }