typescript 5.4.0-dev.20240105 → 5.4.0-dev.20240107

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240105`;
+var version = `${versionMajorMinor}.0-dev.20240107`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -10860,17 +10860,6 @@ function isMethodOrAccessor(node) {
       return false;
   }
 }
-function isNamedClassElement(node) {
-  switch (node.kind) {
-    case 174 /* MethodDeclaration */:
-    case 177 /* GetAccessor */:
-    case 178 /* SetAccessor */:
-    case 172 /* PropertyDeclaration */:
-      return true;
-    default:
-      return false;
-  }
-}
 function isModifierLike(node) {
   return isModifier(node) || isDecorator(node);
 }
@@ -93403,22 +93392,49 @@ function transformESDecorators(context) {
   }
   function createClassInfo(node) {
     const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
-    let instanceExtraInitializersName;
-    let staticExtraInitializersName;
+    let instanceMethodExtraInitializersName;
+    let staticMethodExtraInitializersName;
     let hasStaticInitializers = false;
     let hasNonAmbientInstanceFields = false;
     let hasStaticPrivateClassElements = false;
+    let classThis2;
+    let pendingStaticInitializers;
+    let pendingInstanceInitializers;
+    if (nodeIsDecorated(
+      /*useLegacyDecorators*/
+      false,
+      node
+    )) {
+      const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
+      classThis2 = factory2.createUniqueName(
+        "_classThis",
+        needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
+      );
+    }
     for (const member of node.members) {
-      if (isNamedClassElement(member) && nodeOrChildIsDecorated(
+      if (isMethodOrAccessor(member) && nodeOrChildIsDecorated(
         /*useLegacyDecorators*/
         false,
         member,
         node
       )) {
         if (hasStaticModifier(member)) {
-          staticExtraInitializersName ?? (staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
+          if (!staticMethodExtraInitializersName) {
+            staticMethodExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
+            const initializer = emitHelpers().createRunInitializersHelper(classThis2 ?? factory2.createThis(), staticMethodExtraInitializersName);
+            setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
+            pendingStaticInitializers ?? (pendingStaticInitializers = []);
+            pendingStaticInitializers.push(initializer);
+          }
         } else {
-          instanceExtraInitializersName ?? (instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
+          if (!instanceMethodExtraInitializersName) {
+            instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
+            const initializer = emitHelpers().createRunInitializersHelper(factory2.createThis(), instanceMethodExtraInitializersName);
+            setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
+            pendingInstanceInitializers ?? (pendingInstanceInitializers = []);
+            pendingInstanceInitializers.push(initializer);
+          }
+          instanceMethodExtraInitializersName ?? (instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
         }
       }
       if (isClassStaticBlockDeclaration(member)) {
@@ -93435,18 +93451,21 @@ function transformESDecorators(context) {
       if ((isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member)) {
         hasStaticPrivateClassElements = true;
       }
-      if (staticExtraInitializersName && instanceExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
+      if (staticMethodExtraInitializersName && instanceMethodExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
         break;
       }
     }
     return {
       class: node,
+      classThis: classThis2,
       metadataReference,
-      instanceExtraInitializersName,
-      staticExtraInitializersName,
+      instanceMethodExtraInitializersName,
+      staticMethodExtraInitializersName,
       hasStaticInitializers,
       hasNonAmbientInstanceFields,
-      hasStaticPrivateClassElements
+      hasStaticPrivateClassElements,
+      pendingStaticInitializers,
+      pendingInstanceInitializers
     };
   }
   function transformClassLike(node) {
@@ -93479,11 +93498,7 @@ function transformESDecorators(context) {
       classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
       classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
       classInfo2.classExtraInitializersName = factory2.createUniqueName("_classExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
-      const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
-      classInfo2.classThis = factory2.createUniqueName(
-        "_classThis",
-        needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
-      );
+      Debug.assertIsDefined(classInfo2.classThis);
       classDefinitionStatements.push(
         createLet(classInfo2.classDecoratorsName, factory2.createArrayLiteralExpression(classDecorators)),
         createLet(classInfo2.classDescriptorName),
@@ -93515,7 +93530,9 @@ function transformESDecorators(context) {
     const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
     enterClass(classInfo2);
     leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
-    let members = visitNodes2(node.members, classElementVisitor, isClassElement);
+    let members = node.members;
+    members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? node2 : classElementVisitor(node2), isClassElement);
+    members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? classElementVisitor(node2) : node2, isClassElement);
     if (pendingExpressions) {
       let outerThis;
       for (let expression of pendingExpressions) {
@@ -93540,7 +93557,7 @@ function transformESDecorators(context) {
       pendingExpressions = void 0;
     }
     exitClass();
-    if (classInfo2.instanceExtraInitializersName && !getFirstConstructorWithBody(node)) {
+    if (some(classInfo2.pendingInstanceInitializers) && !getFirstConstructorWithBody(node)) {
       const initializerStatements = prepareConstructor(node, classInfo2);
       if (initializerStatements) {
         const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -93570,14 +93587,14 @@ function transformESDecorators(context) {
         );
       }
     }
-    if (classInfo2.staticExtraInitializersName) {
+    if (classInfo2.staticMethodExtraInitializersName) {
       classDefinitionStatements.push(
-        createLet(classInfo2.staticExtraInitializersName, factory2.createArrayLiteralExpression())
+        createLet(classInfo2.staticMethodExtraInitializersName, factory2.createArrayLiteralExpression())
       );
     }
-    if (classInfo2.instanceExtraInitializersName) {
+    if (classInfo2.instanceMethodExtraInitializersName) {
       classDefinitionStatements.push(
-        createLet(classInfo2.instanceExtraInitializersName, factory2.createArrayLiteralExpression())
+        createLet(classInfo2.instanceMethodExtraInitializersName, factory2.createArrayLiteralExpression())
       );
     }
     if (classInfo2.memberInfos) {
@@ -93587,6 +93604,9 @@ function transformESDecorators(context) {
           if (memberInfo.memberInitializersName) {
             classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
           }
+          if (memberInfo.memberExtraInitializersName) {
+            classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
+          }
           if (memberInfo.memberDescriptorName) {
             classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
           }
@@ -93600,6 +93620,9 @@ function transformESDecorators(context) {
           if (memberInfo.memberInitializersName) {
             classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
           }
+          if (memberInfo.memberExtraInitializersName) {
+            classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
+          }
           if (memberInfo.memberDescriptorName) {
             classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
           }
@@ -93633,11 +93656,13 @@ function transformESDecorators(context) {
       leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
     }
     leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
-    if (classInfo2.staticExtraInitializersName) {
-      const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
-      const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
-      setSourceMapRange(runStaticInitializersStatement, node.name ?? moveRangePastDecorators(node));
-      leadingBlockStatements = append(leadingBlockStatements, runStaticInitializersStatement);
+    if (some(classInfo2.pendingStaticInitializers)) {
+      for (const initializer of classInfo2.pendingStaticInitializers) {
+        const initializerStatement = factory2.createExpressionStatement(initializer);
+        setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
+        trailingBlockStatements = append(trailingBlockStatements, initializerStatement);
+      }
+      classInfo2.pendingStaticInitializers = void 0;
     }
     if (classInfo2.classExtraInitializersName) {
       const runClassInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.classExtraInitializersName);
@@ -93868,16 +93893,14 @@ function transformESDecorators(context) {
     }
   }
   function prepareConstructor(_parent, classInfo2) {
-    if (classInfo2.instanceExtraInitializersName && !classInfo2.hasNonAmbientInstanceFields) {
+    if (some(classInfo2.pendingInstanceInitializers)) {
       const statements = [];
       statements.push(
         factory2.createExpressionStatement(
-          emitHelpers().createRunInitializersHelper(
-            factory2.createThis(),
-            classInfo2.instanceExtraInitializersName
-          )
+          factory2.inlineExpressions(classInfo2.pendingInstanceInitializers)
         )
       );
+      classInfo2.pendingInstanceInitializers = void 0;
       return statements;
     }
   }
@@ -93957,6 +93980,7 @@ function transformESDecorators(context) {
     let referencedName;
     let name;
     let initializersName;
+    let extraInitializersName;
     let thisArg;
     let descriptorName;
     if (!classInfo2) {
@@ -94014,20 +94038,22 @@ function transformESDecorators(context) {
         },
         metadata: classInfo2.metadataReference
       };
-      const extraInitializers = isStatic(member) ? classInfo2.staticExtraInitializersName ?? (classInfo2.staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */)) : classInfo2.instanceExtraInitializersName ?? (classInfo2.instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
       if (isMethodOrAccessor(member)) {
+        const methodExtraInitializersName = isStatic(member) ? classInfo2.staticMethodExtraInitializersName : classInfo2.instanceMethodExtraInitializersName;
+        Debug.assertIsDefined(methodExtraInitializersName);
         let descriptor;
         if (isPrivateIdentifierClassElementDeclaration(member) && createDescriptor) {
           descriptor = createDescriptor(member, visitNodes2(modifiers, (node) => tryCast(node, isAsyncModifier), isModifier));
           memberInfo.memberDescriptorName = descriptorName = createHelperVariable(member, "descriptor");
           descriptor = factory2.createAssignment(descriptorName, descriptor);
         }
-        const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), extraInitializers);
+        const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), methodExtraInitializersName);
         const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
         setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
         statements.push(esDecorateStatement);
       } else if (isPropertyDeclaration(member)) {
         initializersName = memberInfo.memberInitializersName ?? (memberInfo.memberInitializersName = createHelperVariable(member, "initializers"));
+        extraInitializersName = memberInfo.memberExtraInitializersName ?? (memberInfo.memberExtraInitializersName = createHelperVariable(member, "extraInitializers"));
         if (isStatic(member)) {
           thisArg = classInfo2.classThis;
         }
@@ -94047,7 +94073,7 @@ function transformESDecorators(context) {
           memberDecoratorsName,
           context2,
           initializersName,
-          extraInitializers
+          extraInitializersName
         );
         const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
         setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
@@ -94062,7 +94088,7 @@ function transformESDecorators(context) {
     if (!some(modifiers) && (isMethodDeclaration(member) || isPropertyDeclaration(member))) {
       setEmitFlags(name, 1024 /* NoLeadingComments */);
     }
-    return { modifiers, referencedName, name, initializersName, descriptorName, thisArg };
+    return { modifiers, referencedName, name, initializersName, extraInitializersName, descriptorName, thisArg };
   }
   function visitMethodDeclaration(node) {
     enterClassElement(node);
@@ -94135,9 +94161,27 @@ function transformESDecorators(context) {
       result = visitEachChild(node, visitor, context);
       classThis = savedClassThis;
     } else {
-      if (classInfo)
+      node = visitEachChild(node, visitor, context);
+      result = node;
+      if (classInfo) {
         classInfo.hasStaticInitializers = true;
-      result = visitEachChild(node, visitor, context);
+        if (some(classInfo.pendingStaticInitializers)) {
+          const statements = [];
+          for (const initializer of classInfo.pendingStaticInitializers) {
+            const initializerStatement = factory2.createExpressionStatement(initializer);
+            setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
+            statements.push(initializerStatement);
+          }
+          const body = factory2.createBlock(
+            statements,
+            /*multiLine*/
+            true
+          );
+          const staticBlock = factory2.createClassStaticBlockDeclaration(body);
+          result = [staticBlock, result];
+          classInfo.pendingStaticInitializers = void 0;
+        }
+      }
     }
     exitClassElement();
     return result;
@@ -94148,7 +94192,7 @@ function transformESDecorators(context) {
     }
     enterClassElement(node);
     Debug.assert(!isAmbientPropertyDeclaration(node), "Not yet implemented.");
-    const { modifiers, name, initializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
+    const { modifiers, name, initializersName, extraInitializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
     startLexicalEnvironment();
     let initializer = visitNode(node.initializer, visitor, isExpression);
     if (initializersName) {
@@ -94158,17 +94202,6 @@ function transformESDecorators(context) {
         initializer ?? factory2.createVoidZero()
       );
     }
-    if (!isStatic(node) && (classInfo == null ? void 0 : classInfo.instanceExtraInitializersName) && !(classInfo == null ? void 0 : classInfo.hasInjectedInstanceInitializers)) {
-      classInfo.hasInjectedInstanceInitializers = true;
-      initializer ?? (initializer = factory2.createVoidZero());
-      initializer = factory2.createParenthesizedExpression(factory2.createComma(
-        emitHelpers().createRunInitializersHelper(
-          factory2.createThis(),
-          classInfo.instanceExtraInitializersName
-        ),
-        initializer
-      ));
-    }
     if (isStatic(node) && classInfo && initializer) {
       classInfo.hasStaticInitializers = true;
     }
@@ -94179,6 +94212,41 @@ function transformESDecorators(context) {
         factory2.createReturnStatement(initializer)
       ]);
     }
+    if (classInfo) {
+      if (isStatic(node)) {
+        initializer = injectPendingInitializers(
+          classInfo,
+          /*isStatic*/
+          true,
+          initializer
+        );
+        if (extraInitializersName) {
+          classInfo.pendingStaticInitializers ?? (classInfo.pendingStaticInitializers = []);
+          classInfo.pendingStaticInitializers.push(
+            emitHelpers().createRunInitializersHelper(
+              classInfo.classThis ?? factory2.createThis(),
+              extraInitializersName
+            )
+          );
+        }
+      } else {
+        initializer = injectPendingInitializers(
+          classInfo,
+          /*isStatic*/
+          false,
+          initializer
+        );
+        if (extraInitializersName) {
+          classInfo.pendingInstanceInitializers ?? (classInfo.pendingInstanceInitializers = []);
+          classInfo.pendingInstanceInitializers.push(
+            emitHelpers().createRunInitializersHelper(
+              factory2.createThis(),
+              extraInitializersName
+            )
+          );
+        }
+      }
+    }
     exitClassElement();
     if (hasAccessorModifier(node) && descriptorName) {
       const commentRange = getCommentRange(node);
@@ -94593,19 +94661,41 @@ function transformESDecorators(context) {
     const expression = visitNode(node.expression, visitorFunc, isExpression);
     return factory2.updatePartiallyEmittedExpression(node, expression);
   }
-  function injectPendingExpressions(expression) {
-    if (some(pendingExpressions)) {
-      if (isParenthesizedExpression(expression)) {
-        pendingExpressions.push(expression.expression);
-        expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions));
+  function injectPendingExpressionsCommon(pendingExpressions2, expression) {
+    if (some(pendingExpressions2)) {
+      if (expression) {
+        if (isParenthesizedExpression(expression)) {
+          pendingExpressions2.push(expression.expression);
+          expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions2));
+        } else {
+          pendingExpressions2.push(expression);
+          expression = factory2.inlineExpressions(pendingExpressions2);
+        }
       } else {
-        pendingExpressions.push(expression);
-        expression = factory2.inlineExpressions(pendingExpressions);
+        expression = factory2.inlineExpressions(pendingExpressions2);
       }
-      pendingExpressions = void 0;
     }
     return expression;
   }
+  function injectPendingExpressions(expression) {
+    const result = injectPendingExpressionsCommon(pendingExpressions, expression);
+    Debug.assertIsDefined(result);
+    if (result !== expression) {
+      pendingExpressions = void 0;
+    }
+    return result;
+  }
+  function injectPendingInitializers(classInfo2, isStatic2, expression) {
+    const result = injectPendingExpressionsCommon(isStatic2 ? classInfo2.pendingStaticInitializers : classInfo2.pendingInstanceInitializers, expression);
+    if (result !== expression) {
+      if (isStatic2) {
+        classInfo2.pendingStaticInitializers = void 0;
+      } else {
+        classInfo2.pendingInstanceInitializers = void 0;
+      }
+    }
+    return result;
+  }
   function transformAllDecoratorsOfDeclaration(allDecorators) {
     if (!allDecorators) {
       return void 0;

package/lib/tsserver.js

@@ -2341,7 +2341,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240105`;
+var version = `${versionMajorMinor}.0-dev.20240107`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -98302,22 +98302,49 @@ function transformESDecorators(context) {
   }
   function createClassInfo(node) {
     const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
-    let instanceExtraInitializersName;
-    let staticExtraInitializersName;
+    let instanceMethodExtraInitializersName;
+    let staticMethodExtraInitializersName;
     let hasStaticInitializers = false;
     let hasNonAmbientInstanceFields = false;
     let hasStaticPrivateClassElements = false;
+    let classThis2;
+    let pendingStaticInitializers;
+    let pendingInstanceInitializers;
+    if (nodeIsDecorated(
+      /*useLegacyDecorators*/
+      false,
+      node
+    )) {
+      const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
+      classThis2 = factory2.createUniqueName(
+        "_classThis",
+        needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
+      );
+    }
     for (const member of node.members) {
-      if (isNamedClassElement(member) && nodeOrChildIsDecorated(
+      if (isMethodOrAccessor(member) && nodeOrChildIsDecorated(
         /*useLegacyDecorators*/
         false,
         member,
         node
       )) {
         if (hasStaticModifier(member)) {
-          staticExtraInitializersName ?? (staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
+          if (!staticMethodExtraInitializersName) {
+            staticMethodExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
+            const initializer = emitHelpers().createRunInitializersHelper(classThis2 ?? factory2.createThis(), staticMethodExtraInitializersName);
+            setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
+            pendingStaticInitializers ?? (pendingStaticInitializers = []);
+            pendingStaticInitializers.push(initializer);
+          }
         } else {
-          instanceExtraInitializersName ?? (instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
+          if (!instanceMethodExtraInitializersName) {
+            instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
+            const initializer = emitHelpers().createRunInitializersHelper(factory2.createThis(), instanceMethodExtraInitializersName);
+            setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
+            pendingInstanceInitializers ?? (pendingInstanceInitializers = []);
+            pendingInstanceInitializers.push(initializer);
+          }
+          instanceMethodExtraInitializersName ?? (instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
         }
       }
       if (isClassStaticBlockDeclaration(member)) {
@@ -98334,18 +98361,21 @@ function transformESDecorators(context) {
       if ((isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member)) {
         hasStaticPrivateClassElements = true;
       }
-      if (staticExtraInitializersName && instanceExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
+      if (staticMethodExtraInitializersName && instanceMethodExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
         break;
       }
     }
     return {
       class: node,
+      classThis: classThis2,
       metadataReference,
-      instanceExtraInitializersName,
-      staticExtraInitializersName,
+      instanceMethodExtraInitializersName,
+      staticMethodExtraInitializersName,
       hasStaticInitializers,
       hasNonAmbientInstanceFields,
-      hasStaticPrivateClassElements
+      hasStaticPrivateClassElements,
+      pendingStaticInitializers,
+      pendingInstanceInitializers
     };
   }
   function transformClassLike(node) {
@@ -98378,11 +98408,7 @@ function transformESDecorators(context) {
       classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
       classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
       classInfo2.classExtraInitializersName = factory2.createUniqueName("_classExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
-      const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
-      classInfo2.classThis = factory2.createUniqueName(
-        "_classThis",
-        needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
-      );
+      Debug.assertIsDefined(classInfo2.classThis);
       classDefinitionStatements.push(
         createLet(classInfo2.classDecoratorsName, factory2.createArrayLiteralExpression(classDecorators)),
         createLet(classInfo2.classDescriptorName),
@@ -98414,7 +98440,9 @@ function transformESDecorators(context) {
     const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
     enterClass(classInfo2);
     leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
-    let members = visitNodes2(node.members, classElementVisitor, isClassElement);
+    let members = node.members;
+    members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? node2 : classElementVisitor(node2), isClassElement);
+    members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? classElementVisitor(node2) : node2, isClassElement);
     if (pendingExpressions) {
       let outerThis;
       for (let expression of pendingExpressions) {
@@ -98439,7 +98467,7 @@ function transformESDecorators(context) {
       pendingExpressions = void 0;
     }
     exitClass();
-    if (classInfo2.instanceExtraInitializersName && !getFirstConstructorWithBody(node)) {
+    if (some(classInfo2.pendingInstanceInitializers) && !getFirstConstructorWithBody(node)) {
       const initializerStatements = prepareConstructor(node, classInfo2);
       if (initializerStatements) {
         const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -98469,14 +98497,14 @@ function transformESDecorators(context) {
         );
       }
     }
-    if (classInfo2.staticExtraInitializersName) {
+    if (classInfo2.staticMethodExtraInitializersName) {
       classDefinitionStatements.push(
-        createLet(classInfo2.staticExtraInitializersName, factory2.createArrayLiteralExpression())
+        createLet(classInfo2.staticMethodExtraInitializersName, factory2.createArrayLiteralExpression())
       );
     }
-    if (classInfo2.instanceExtraInitializersName) {
+    if (classInfo2.instanceMethodExtraInitializersName) {
       classDefinitionStatements.push(
-        createLet(classInfo2.instanceExtraInitializersName, factory2.createArrayLiteralExpression())
+        createLet(classInfo2.instanceMethodExtraInitializersName, factory2.createArrayLiteralExpression())
       );
     }
     if (classInfo2.memberInfos) {
@@ -98486,6 +98514,9 @@ function transformESDecorators(context) {
           if (memberInfo.memberInitializersName) {
             classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
           }
+          if (memberInfo.memberExtraInitializersName) {
+            classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
+          }
           if (memberInfo.memberDescriptorName) {
             classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
           }
@@ -98499,6 +98530,9 @@ function transformESDecorators(context) {
           if (memberInfo.memberInitializersName) {
             classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
           }
+          if (memberInfo.memberExtraInitializersName) {
+            classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
+          }
           if (memberInfo.memberDescriptorName) {
             classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
           }
@@ -98532,11 +98566,13 @@ function transformESDecorators(context) {
       leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
     }
     leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
-    if (classInfo2.staticExtraInitializersName) {
-      const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
-      const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
-      setSourceMapRange(runStaticInitializersStatement, node.name ?? moveRangePastDecorators(node));
-      leadingBlockStatements = append(leadingBlockStatements, runStaticInitializersStatement);
+    if (some(classInfo2.pendingStaticInitializers)) {
+      for (const initializer of classInfo2.pendingStaticInitializers) {
+        const initializerStatement = factory2.createExpressionStatement(initializer);
+        setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
+        trailingBlockStatements = append(trailingBlockStatements, initializerStatement);
+      }
+      classInfo2.pendingStaticInitializers = void 0;
     }
     if (classInfo2.classExtraInitializersName) {
       const runClassInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.classExtraInitializersName);
@@ -98767,16 +98803,14 @@ function transformESDecorators(context) {
     }
   }
   function prepareConstructor(_parent, classInfo2) {
-    if (classInfo2.instanceExtraInitializersName && !classInfo2.hasNonAmbientInstanceFields) {
+    if (some(classInfo2.pendingInstanceInitializers)) {
       const statements = [];
       statements.push(
         factory2.createExpressionStatement(
-          emitHelpers().createRunInitializersHelper(
-            factory2.createThis(),
-            classInfo2.instanceExtraInitializersName
-          )
+          factory2.inlineExpressions(classInfo2.pendingInstanceInitializers)
         )
       );
+      classInfo2.pendingInstanceInitializers = void 0;
       return statements;
     }
   }
@@ -98856,6 +98890,7 @@ function transformESDecorators(context) {
     let referencedName;
     let name;
     let initializersName;
+    let extraInitializersName;
     let thisArg;
     let descriptorName;
     if (!classInfo2) {
@@ -98913,20 +98948,22 @@ function transformESDecorators(context) {
         },
         metadata: classInfo2.metadataReference
       };
-      const extraInitializers = isStatic(member) ? classInfo2.staticExtraInitializersName ?? (classInfo2.staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */)) : classInfo2.instanceExtraInitializersName ?? (classInfo2.instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
       if (isMethodOrAccessor(member)) {
+        const methodExtraInitializersName = isStatic(member) ? classInfo2.staticMethodExtraInitializersName : classInfo2.instanceMethodExtraInitializersName;
+        Debug.assertIsDefined(methodExtraInitializersName);
         let descriptor;
         if (isPrivateIdentifierClassElementDeclaration(member) && createDescriptor) {
           descriptor = createDescriptor(member, visitNodes2(modifiers, (node) => tryCast(node, isAsyncModifier), isModifier));
           memberInfo.memberDescriptorName = descriptorName = createHelperVariable(member, "descriptor");
           descriptor = factory2.createAssignment(descriptorName, descriptor);
         }
-        const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), extraInitializers);
+        const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), methodExtraInitializersName);
         const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
         setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
         statements.push(esDecorateStatement);
       } else if (isPropertyDeclaration(member)) {
         initializersName = memberInfo.memberInitializersName ?? (memberInfo.memberInitializersName = createHelperVariable(member, "initializers"));
+        extraInitializersName = memberInfo.memberExtraInitializersName ?? (memberInfo.memberExtraInitializersName = createHelperVariable(member, "extraInitializers"));
         if (isStatic(member)) {
           thisArg = classInfo2.classThis;
         }
@@ -98946,7 +98983,7 @@ function transformESDecorators(context) {
           memberDecoratorsName,
           context2,
           initializersName,
-          extraInitializers
+          extraInitializersName
         );
         const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
         setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
@@ -98961,7 +98998,7 @@ function transformESDecorators(context) {
     if (!some(modifiers) && (isMethodDeclaration(member) || isPropertyDeclaration(member))) {
       setEmitFlags(name, 1024 /* NoLeadingComments */);
     }
-    return { modifiers, referencedName, name, initializersName, descriptorName, thisArg };
+    return { modifiers, referencedName, name, initializersName, extraInitializersName, descriptorName, thisArg };
   }
   function visitMethodDeclaration(node) {
     enterClassElement(node);
@@ -99034,9 +99071,27 @@ function transformESDecorators(context) {
       result = visitEachChild(node, visitor, context);
       classThis = savedClassThis;
     } else {
-      if (classInfo)
+      node = visitEachChild(node, visitor, context);
+      result = node;
+      if (classInfo) {
         classInfo.hasStaticInitializers = true;
-      result = visitEachChild(node, visitor, context);
+        if (some(classInfo.pendingStaticInitializers)) {
+          const statements = [];
+          for (const initializer of classInfo.pendingStaticInitializers) {
+            const initializerStatement = factory2.createExpressionStatement(initializer);
+            setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
+            statements.push(initializerStatement);
+          }
+          const body = factory2.createBlock(
+            statements,
+            /*multiLine*/
+            true
+          );
+          const staticBlock = factory2.createClassStaticBlockDeclaration(body);
+          result = [staticBlock, result];
+          classInfo.pendingStaticInitializers = void 0;
+        }
+      }
     }
     exitClassElement();
     return result;
@@ -99047,7 +99102,7 @@ function transformESDecorators(context) {
     }
     enterClassElement(node);
     Debug.assert(!isAmbientPropertyDeclaration(node), "Not yet implemented.");
-    const { modifiers, name, initializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
+    const { modifiers, name, initializersName, extraInitializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
     startLexicalEnvironment();
     let initializer = visitNode(node.initializer, visitor, isExpression);
     if (initializersName) {
@@ -99057,17 +99112,6 @@ function transformESDecorators(context) {
         initializer ?? factory2.createVoidZero()
       );
     }
-    if (!isStatic(node) && (classInfo == null ? void 0 : classInfo.instanceExtraInitializersName) && !(classInfo == null ? void 0 : classInfo.hasInjectedInstanceInitializers)) {
-      classInfo.hasInjectedInstanceInitializers = true;
-      initializer ?? (initializer = factory2.createVoidZero());
-      initializer = factory2.createParenthesizedExpression(factory2.createComma(
-        emitHelpers().createRunInitializersHelper(
-          factory2.createThis(),
-          classInfo.instanceExtraInitializersName
-        ),
-        initializer
-      ));
-    }
     if (isStatic(node) && classInfo && initializer) {
       classInfo.hasStaticInitializers = true;
     }
@@ -99078,6 +99122,41 @@ function transformESDecorators(context) {
         factory2.createReturnStatement(initializer)
       ]);
     }
+    if (classInfo) {
+      if (isStatic(node)) {
+        initializer = injectPendingInitializers(
+          classInfo,
+          /*isStatic*/
+          true,
+          initializer
+        );
+        if (extraInitializersName) {
+          classInfo.pendingStaticInitializers ?? (classInfo.pendingStaticInitializers = []);
+          classInfo.pendingStaticInitializers.push(
+            emitHelpers().createRunInitializersHelper(
+              classInfo.classThis ?? factory2.createThis(),
+              extraInitializersName
+            )
+          );
+        }
+      } else {
+        initializer = injectPendingInitializers(
+          classInfo,
+          /*isStatic*/
+          false,
+          initializer
+        );
+        if (extraInitializersName) {
+          classInfo.pendingInstanceInitializers ?? (classInfo.pendingInstanceInitializers = []);
+          classInfo.pendingInstanceInitializers.push(
+            emitHelpers().createRunInitializersHelper(
+              factory2.createThis(),
+              extraInitializersName
+            )
+          );
+        }
+      }
+    }
     exitClassElement();
     if (hasAccessorModifier(node) && descriptorName) {
       const commentRange = getCommentRange(node);
@@ -99492,19 +99571,41 @@ function transformESDecorators(context) {
     const expression = visitNode(node.expression, visitorFunc, isExpression);
     return factory2.updatePartiallyEmittedExpression(node, expression);
   }
-  function injectPendingExpressions(expression) {
-    if (some(pendingExpressions)) {
-      if (isParenthesizedExpression(expression)) {
-        pendingExpressions.push(expression.expression);
-        expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions));
+  function injectPendingExpressionsCommon(pendingExpressions2, expression) {
+    if (some(pendingExpressions2)) {
+      if (expression) {
+        if (isParenthesizedExpression(expression)) {
+          pendingExpressions2.push(expression.expression);
+          expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions2));
+        } else {
+          pendingExpressions2.push(expression);
+          expression = factory2.inlineExpressions(pendingExpressions2);
+        }
       } else {
-        pendingExpressions.push(expression);
-        expression = factory2.inlineExpressions(pendingExpressions);
+        expression = factory2.inlineExpressions(pendingExpressions2);
       }
-      pendingExpressions = void 0;
     }
     return expression;
   }
+  function injectPendingExpressions(expression) {
+    const result = injectPendingExpressionsCommon(pendingExpressions, expression);
+    Debug.assertIsDefined(result);
+    if (result !== expression) {
+      pendingExpressions = void 0;
+    }
+    return result;
+  }
+  function injectPendingInitializers(classInfo2, isStatic2, expression) {
+    const result = injectPendingExpressionsCommon(isStatic2 ? classInfo2.pendingStaticInitializers : classInfo2.pendingInstanceInitializers, expression);
+    if (result !== expression) {
+      if (isStatic2) {
+        classInfo2.pendingStaticInitializers = void 0;
+      } else {
+        classInfo2.pendingInstanceInitializers = void 0;
+      }
+    }
+    return result;
+  }
   function transformAllDecoratorsOfDeclaration(allDecorators) {
     if (!allDecorators) {
       return void 0;
@@ -139962,11 +140063,9 @@ registerRefactor(refactorName3, {
 function getRangeToExtract(context, considerEmptySpans = true) {
   const { file, startPosition } = context;
   const isJS = isSourceFileJS(file);
-  const current = getTokenAtPosition(file, startPosition);
   const range = createTextRangeFromSpan(getRefactorContextSpan(context));
-  const cursorRequest = range.pos === range.end && considerEmptySpans;
-  const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
-  const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || overlappingRange));
+  const isCursorRequest = range.pos === range.end && considerEmptySpans;
+  const firstType = getFirstTypeAt(file, startPosition, range, isCursorRequest);
   if (!firstType || !isTypeNode(firstType))
     return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
   const checker = context.program.getTypeChecker();
@@ -139992,6 +140091,21 @@ function getRangeToExtract(context, considerEmptySpans = true) {
   const typeElements = flattenTypeLiteralNodeReference(checker, selection);
   return { isJS, selection, enclosingNode, typeParameters, typeElements };
 }
+function getFirstTypeAt(file, startPosition, range, isCursorRequest) {
+  const currentNodes = [
+    () => getTokenAtPosition(file, startPosition),
+    () => getTouchingToken(file, startPosition, () => true)
+  ];
+  for (const f of currentNodes) {
+    const current = f();
+    const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
+    const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (isCursorRequest || overlappingRange));
+    if (firstType) {
+      return firstType;
+    }
+  }
+  return void 0;
+}
 function flattenTypeLiteralNodeReference(checker, selection) {
   if (!selection)
     return void 0;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20240105`;
+      version = `${versionMajorMinor}.0-dev.20240107`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -96262,22 +96262,49 @@ ${lanes.join("\n")}
     }
     function createClassInfo(node) {
       const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
-      let instanceExtraInitializersName;
-      let staticExtraInitializersName;
+      let instanceMethodExtraInitializersName;
+      let staticMethodExtraInitializersName;
       let hasStaticInitializers = false;
       let hasNonAmbientInstanceFields = false;
       let hasStaticPrivateClassElements = false;
+      let classThis2;
+      let pendingStaticInitializers;
+      let pendingInstanceInitializers;
+      if (nodeIsDecorated(
+        /*useLegacyDecorators*/
+        false,
+        node
+      )) {
+        const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
+        classThis2 = factory2.createUniqueName(
+          "_classThis",
+          needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
+        );
+      }
       for (const member of node.members) {
-        if (isNamedClassElement(member) && nodeOrChildIsDecorated(
+        if (isMethodOrAccessor(member) && nodeOrChildIsDecorated(
           /*useLegacyDecorators*/
           false,
           member,
           node
         )) {
           if (hasStaticModifier(member)) {
-            staticExtraInitializersName ?? (staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
+            if (!staticMethodExtraInitializersName) {
+              staticMethodExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
+              const initializer = emitHelpers().createRunInitializersHelper(classThis2 ?? factory2.createThis(), staticMethodExtraInitializersName);
+              setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
+              pendingStaticInitializers ?? (pendingStaticInitializers = []);
+              pendingStaticInitializers.push(initializer);
+            }
           } else {
-            instanceExtraInitializersName ?? (instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
+            if (!instanceMethodExtraInitializersName) {
+              instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
+              const initializer = emitHelpers().createRunInitializersHelper(factory2.createThis(), instanceMethodExtraInitializersName);
+              setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
+              pendingInstanceInitializers ?? (pendingInstanceInitializers = []);
+              pendingInstanceInitializers.push(initializer);
+            }
+            instanceMethodExtraInitializersName ?? (instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
           }
         }
         if (isClassStaticBlockDeclaration(member)) {
@@ -96294,18 +96321,21 @@ ${lanes.join("\n")}
         if ((isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member)) {
           hasStaticPrivateClassElements = true;
         }
-        if (staticExtraInitializersName && instanceExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
+        if (staticMethodExtraInitializersName && instanceMethodExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
           break;
         }
       }
       return {
         class: node,
+        classThis: classThis2,
         metadataReference,
-        instanceExtraInitializersName,
-        staticExtraInitializersName,
+        instanceMethodExtraInitializersName,
+        staticMethodExtraInitializersName,
         hasStaticInitializers,
         hasNonAmbientInstanceFields,
-        hasStaticPrivateClassElements
+        hasStaticPrivateClassElements,
+        pendingStaticInitializers,
+        pendingInstanceInitializers
       };
     }
     function transformClassLike(node) {
@@ -96338,11 +96368,7 @@ ${lanes.join("\n")}
         classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
         classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
         classInfo2.classExtraInitializersName = factory2.createUniqueName("_classExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
-        const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
-        classInfo2.classThis = factory2.createUniqueName(
-          "_classThis",
-          needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
-        );
+        Debug.assertIsDefined(classInfo2.classThis);
         classDefinitionStatements.push(
           createLet(classInfo2.classDecoratorsName, factory2.createArrayLiteralExpression(classDecorators)),
           createLet(classInfo2.classDescriptorName),
@@ -96374,7 +96400,9 @@ ${lanes.join("\n")}
       const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
       enterClass(classInfo2);
       leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
-      let members = visitNodes2(node.members, classElementVisitor, isClassElement);
+      let members = node.members;
+      members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? node2 : classElementVisitor(node2), isClassElement);
+      members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? classElementVisitor(node2) : node2, isClassElement);
       if (pendingExpressions) {
         let outerThis;
         for (let expression of pendingExpressions) {
@@ -96399,7 +96427,7 @@ ${lanes.join("\n")}
         pendingExpressions = void 0;
       }
       exitClass();
-      if (classInfo2.instanceExtraInitializersName && !getFirstConstructorWithBody(node)) {
+      if (some(classInfo2.pendingInstanceInitializers) && !getFirstConstructorWithBody(node)) {
         const initializerStatements = prepareConstructor(node, classInfo2);
         if (initializerStatements) {
           const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -96429,14 +96457,14 @@ ${lanes.join("\n")}
           );
         }
       }
-      if (classInfo2.staticExtraInitializersName) {
+      if (classInfo2.staticMethodExtraInitializersName) {
         classDefinitionStatements.push(
-          createLet(classInfo2.staticExtraInitializersName, factory2.createArrayLiteralExpression())
+          createLet(classInfo2.staticMethodExtraInitializersName, factory2.createArrayLiteralExpression())
         );
       }
-      if (classInfo2.instanceExtraInitializersName) {
+      if (classInfo2.instanceMethodExtraInitializersName) {
         classDefinitionStatements.push(
-          createLet(classInfo2.instanceExtraInitializersName, factory2.createArrayLiteralExpression())
+          createLet(classInfo2.instanceMethodExtraInitializersName, factory2.createArrayLiteralExpression())
         );
       }
       if (classInfo2.memberInfos) {
@@ -96446,6 +96474,9 @@ ${lanes.join("\n")}
             if (memberInfo.memberInitializersName) {
               classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
             }
+            if (memberInfo.memberExtraInitializersName) {
+              classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
+            }
             if (memberInfo.memberDescriptorName) {
               classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
             }
@@ -96459,6 +96490,9 @@ ${lanes.join("\n")}
             if (memberInfo.memberInitializersName) {
               classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
             }
+            if (memberInfo.memberExtraInitializersName) {
+              classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
+            }
             if (memberInfo.memberDescriptorName) {
               classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
             }
@@ -96492,11 +96526,13 @@ ${lanes.join("\n")}
         leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
       }
       leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
-      if (classInfo2.staticExtraInitializersName) {
-        const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
-        const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
-        setSourceMapRange(runStaticInitializersStatement, node.name ?? moveRangePastDecorators(node));
-        leadingBlockStatements = append(leadingBlockStatements, runStaticInitializersStatement);
+      if (some(classInfo2.pendingStaticInitializers)) {
+        for (const initializer of classInfo2.pendingStaticInitializers) {
+          const initializerStatement = factory2.createExpressionStatement(initializer);
+          setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
+          trailingBlockStatements = append(trailingBlockStatements, initializerStatement);
+        }
+        classInfo2.pendingStaticInitializers = void 0;
       }
       if (classInfo2.classExtraInitializersName) {
         const runClassInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.classExtraInitializersName);
@@ -96727,16 +96763,14 @@ ${lanes.join("\n")}
       }
     }
     function prepareConstructor(_parent, classInfo2) {
-      if (classInfo2.instanceExtraInitializersName && !classInfo2.hasNonAmbientInstanceFields) {
+      if (some(classInfo2.pendingInstanceInitializers)) {
         const statements = [];
         statements.push(
           factory2.createExpressionStatement(
-            emitHelpers().createRunInitializersHelper(
-              factory2.createThis(),
-              classInfo2.instanceExtraInitializersName
-            )
+            factory2.inlineExpressions(classInfo2.pendingInstanceInitializers)
           )
         );
+        classInfo2.pendingInstanceInitializers = void 0;
         return statements;
       }
     }
@@ -96816,6 +96850,7 @@ ${lanes.join("\n")}
       let referencedName;
       let name;
       let initializersName;
+      let extraInitializersName;
       let thisArg;
       let descriptorName;
       if (!classInfo2) {
@@ -96873,20 +96908,22 @@ ${lanes.join("\n")}
           },
           metadata: classInfo2.metadataReference
         };
-        const extraInitializers = isStatic(member) ? classInfo2.staticExtraInitializersName ?? (classInfo2.staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */)) : classInfo2.instanceExtraInitializersName ?? (classInfo2.instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
         if (isMethodOrAccessor(member)) {
+          const methodExtraInitializersName = isStatic(member) ? classInfo2.staticMethodExtraInitializersName : classInfo2.instanceMethodExtraInitializersName;
+          Debug.assertIsDefined(methodExtraInitializersName);
           let descriptor;
           if (isPrivateIdentifierClassElementDeclaration(member) && createDescriptor) {
             descriptor = createDescriptor(member, visitNodes2(modifiers, (node) => tryCast(node, isAsyncModifier), isModifier));
             memberInfo.memberDescriptorName = descriptorName = createHelperVariable(member, "descriptor");
             descriptor = factory2.createAssignment(descriptorName, descriptor);
           }
-          const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), extraInitializers);
+          const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), methodExtraInitializersName);
           const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
           setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
           statements.push(esDecorateStatement);
         } else if (isPropertyDeclaration(member)) {
           initializersName = memberInfo.memberInitializersName ?? (memberInfo.memberInitializersName = createHelperVariable(member, "initializers"));
+          extraInitializersName = memberInfo.memberExtraInitializersName ?? (memberInfo.memberExtraInitializersName = createHelperVariable(member, "extraInitializers"));
           if (isStatic(member)) {
             thisArg = classInfo2.classThis;
           }
@@ -96906,7 +96943,7 @@ ${lanes.join("\n")}
             memberDecoratorsName,
             context2,
             initializersName,
-            extraInitializers
+            extraInitializersName
           );
           const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
           setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
@@ -96921,7 +96958,7 @@ ${lanes.join("\n")}
       if (!some(modifiers) && (isMethodDeclaration(member) || isPropertyDeclaration(member))) {
         setEmitFlags(name, 1024 /* NoLeadingComments */);
       }
-      return { modifiers, referencedName, name, initializersName, descriptorName, thisArg };
+      return { modifiers, referencedName, name, initializersName, extraInitializersName, descriptorName, thisArg };
     }
     function visitMethodDeclaration(node) {
       enterClassElement(node);
@@ -96994,9 +97031,27 @@ ${lanes.join("\n")}
         result = visitEachChild(node, visitor, context);
         classThis = savedClassThis;
       } else {
-        if (classInfo)
+        node = visitEachChild(node, visitor, context);
+        result = node;
+        if (classInfo) {
           classInfo.hasStaticInitializers = true;
-        result = visitEachChild(node, visitor, context);
+          if (some(classInfo.pendingStaticInitializers)) {
+            const statements = [];
+            for (const initializer of classInfo.pendingStaticInitializers) {
+              const initializerStatement = factory2.createExpressionStatement(initializer);
+              setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
+              statements.push(initializerStatement);
+            }
+            const body = factory2.createBlock(
+              statements,
+              /*multiLine*/
+              true
+            );
+            const staticBlock = factory2.createClassStaticBlockDeclaration(body);
+            result = [staticBlock, result];
+            classInfo.pendingStaticInitializers = void 0;
+          }
+        }
       }
       exitClassElement();
       return result;
@@ -97007,7 +97062,7 @@ ${lanes.join("\n")}
       }
       enterClassElement(node);
       Debug.assert(!isAmbientPropertyDeclaration(node), "Not yet implemented.");
-      const { modifiers, name, initializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
+      const { modifiers, name, initializersName, extraInitializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
       startLexicalEnvironment();
       let initializer = visitNode(node.initializer, visitor, isExpression);
       if (initializersName) {
@@ -97017,17 +97072,6 @@ ${lanes.join("\n")}
           initializer ?? factory2.createVoidZero()
         );
       }
-      if (!isStatic(node) && (classInfo == null ? void 0 : classInfo.instanceExtraInitializersName) && !(classInfo == null ? void 0 : classInfo.hasInjectedInstanceInitializers)) {
-        classInfo.hasInjectedInstanceInitializers = true;
-        initializer ?? (initializer = factory2.createVoidZero());
-        initializer = factory2.createParenthesizedExpression(factory2.createComma(
-          emitHelpers().createRunInitializersHelper(
-            factory2.createThis(),
-            classInfo.instanceExtraInitializersName
-          ),
-          initializer
-        ));
-      }
       if (isStatic(node) && classInfo && initializer) {
         classInfo.hasStaticInitializers = true;
       }
@@ -97038,6 +97082,41 @@ ${lanes.join("\n")}
           factory2.createReturnStatement(initializer)
         ]);
       }
+      if (classInfo) {
+        if (isStatic(node)) {
+          initializer = injectPendingInitializers(
+            classInfo,
+            /*isStatic*/
+            true,
+            initializer
+          );
+          if (extraInitializersName) {
+            classInfo.pendingStaticInitializers ?? (classInfo.pendingStaticInitializers = []);
+            classInfo.pendingStaticInitializers.push(
+              emitHelpers().createRunInitializersHelper(
+                classInfo.classThis ?? factory2.createThis(),
+                extraInitializersName
+              )
+            );
+          }
+        } else {
+          initializer = injectPendingInitializers(
+            classInfo,
+            /*isStatic*/
+            false,
+            initializer
+          );
+          if (extraInitializersName) {
+            classInfo.pendingInstanceInitializers ?? (classInfo.pendingInstanceInitializers = []);
+            classInfo.pendingInstanceInitializers.push(
+              emitHelpers().createRunInitializersHelper(
+                factory2.createThis(),
+                extraInitializersName
+              )
+            );
+          }
+        }
+      }
       exitClassElement();
       if (hasAccessorModifier(node) && descriptorName) {
         const commentRange = getCommentRange(node);
@@ -97452,19 +97531,41 @@ ${lanes.join("\n")}
       const expression = visitNode(node.expression, visitorFunc, isExpression);
       return factory2.updatePartiallyEmittedExpression(node, expression);
     }
-    function injectPendingExpressions(expression) {
-      if (some(pendingExpressions)) {
-        if (isParenthesizedExpression(expression)) {
-          pendingExpressions.push(expression.expression);
-          expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions));
+    function injectPendingExpressionsCommon(pendingExpressions2, expression) {
+      if (some(pendingExpressions2)) {
+        if (expression) {
+          if (isParenthesizedExpression(expression)) {
+            pendingExpressions2.push(expression.expression);
+            expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions2));
+          } else {
+            pendingExpressions2.push(expression);
+            expression = factory2.inlineExpressions(pendingExpressions2);
+          }
         } else {
-          pendingExpressions.push(expression);
-          expression = factory2.inlineExpressions(pendingExpressions);
+          expression = factory2.inlineExpressions(pendingExpressions2);
         }
-        pendingExpressions = void 0;
       }
       return expression;
     }
+    function injectPendingExpressions(expression) {
+      const result = injectPendingExpressionsCommon(pendingExpressions, expression);
+      Debug.assertIsDefined(result);
+      if (result !== expression) {
+        pendingExpressions = void 0;
+      }
+      return result;
+    }
+    function injectPendingInitializers(classInfo2, isStatic2, expression) {
+      const result = injectPendingExpressionsCommon(isStatic2 ? classInfo2.pendingStaticInitializers : classInfo2.pendingInstanceInitializers, expression);
+      if (result !== expression) {
+        if (isStatic2) {
+          classInfo2.pendingStaticInitializers = void 0;
+        } else {
+          classInfo2.pendingInstanceInitializers = void 0;
+        }
+      }
+      return result;
+    }
     function transformAllDecoratorsOfDeclaration(allDecorators) {
       if (!allDecorators) {
         return void 0;
@@ -138260,11 +138361,9 @@ ${lanes.join("\n")}
   function getRangeToExtract(context, considerEmptySpans = true) {
     const { file, startPosition } = context;
     const isJS = isSourceFileJS(file);
-    const current = getTokenAtPosition(file, startPosition);
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
-    const cursorRequest = range.pos === range.end && considerEmptySpans;
-    const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
-    const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || overlappingRange));
+    const isCursorRequest = range.pos === range.end && considerEmptySpans;
+    const firstType = getFirstTypeAt(file, startPosition, range, isCursorRequest);
     if (!firstType || !isTypeNode(firstType))
       return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
     const checker = context.program.getTypeChecker();
@@ -138290,6 +138389,21 @@ ${lanes.join("\n")}
     const typeElements = flattenTypeLiteralNodeReference(checker, selection);
     return { isJS, selection, enclosingNode, typeParameters, typeElements };
   }
+  function getFirstTypeAt(file, startPosition, range, isCursorRequest) {
+    const currentNodes = [
+      () => getTokenAtPosition(file, startPosition),
+      () => getTouchingToken(file, startPosition, () => true)
+    ];
+    for (const f of currentNodes) {
+      const current = f();
+      const overlappingRange = nodeOverlapsWithStartEnd(current, file, range.pos, range.end);
+      const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (isCursorRequest || overlappingRange));
+      if (firstType) {
+        return firstType;
+      }
+    }
+    return void 0;
+  }
   function flattenTypeLiteralNodeReference(checker, selection) {
     if (!selection)
       return void 0;

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240105`;
+var version = `${versionMajorMinor}.0-dev.20240107`;
 
 // 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.4.0-dev.20240105",
+    "version": "5.4.0-dev.20240107",
     "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": "e44142048305d42ec4fc753457aa561f8e247e4f"
+    "gitHead": "01a51d2d017dd50d487835282b7e4a2a4f7300ab"
 }