@typescript-deploys/pr-build 5.4.0-pr-56859-8 → 5.4.0-pr-56967-3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/tsc.js CHANGED
@@ -10860,17 +10860,6 @@ function isMethodOrAccessor(node) {
10860
10860
  return false;
10861
10861
  }
10862
10862
  }
10863
- function isNamedClassElement(node) {
10864
- switch (node.kind) {
10865
- case 174 /* MethodDeclaration */:
10866
- case 177 /* GetAccessor */:
10867
- case 178 /* SetAccessor */:
10868
- case 172 /* PropertyDeclaration */:
10869
- return true;
10870
- default:
10871
- return false;
10872
- }
10873
- }
10874
10863
  function isModifierLike(node) {
10875
10864
  return isModifier(node) || isDecorator(node);
10876
10865
  }
@@ -73887,9 +73876,6 @@ function createTypeChecker(host) {
73887
73876
  let fallbackReturnType = voidType;
73888
73877
  if (func.body.kind !== 241 /* Block */) {
73889
73878
  returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
73890
- if (isConstContext(func.body)) {
73891
- returnType = getRegularTypeOfLiteralType(returnType);
73892
- }
73893
73879
  if (isAsync) {
73894
73880
  returnType = unwrapAwaitedType(checkAwaitedType(
73895
73881
  returnType,
@@ -74022,10 +74008,7 @@ function createTypeChecker(host) {
74022
74008
  const nextTypes = [];
74023
74009
  const isAsync = (getFunctionFlags(func) & 2 /* Async */) !== 0;
74024
74010
  forEachYieldExpression(func.body, (yieldExpression) => {
74025
- let yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
74026
- if (yieldExpression.expression && isConstContext(yieldExpression.expression)) {
74027
- yieldExpressionType = getRegularTypeOfLiteralType(yieldExpressionType);
74028
- }
74011
+ const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
74029
74012
  pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
74030
74013
  let nextType;
74031
74014
  if (yieldExpression.asteriskToken) {
@@ -74140,7 +74123,7 @@ function createTypeChecker(host) {
74140
74123
  if (type.flags & 131072 /* Never */) {
74141
74124
  hasReturnOfTypeNever = true;
74142
74125
  }
74143
- pushIfUnique(aggregatedTypes, isConstContext(expr) ? getRegularTypeOfLiteralType(type) : type);
74126
+ pushIfUnique(aggregatedTypes, type);
74144
74127
  } else {
74145
74128
  hasReturnWithNoExpression = true;
74146
74129
  }
@@ -93409,22 +93392,49 @@ function transformESDecorators(context) {
93409
93392
  }
93410
93393
  function createClassInfo(node) {
93411
93394
  const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
93412
- let instanceExtraInitializersName;
93413
- let staticExtraInitializersName;
93395
+ let instanceMethodExtraInitializersName;
93396
+ let staticMethodExtraInitializersName;
93414
93397
  let hasStaticInitializers = false;
93415
93398
  let hasNonAmbientInstanceFields = false;
93416
93399
  let hasStaticPrivateClassElements = false;
93400
+ let classThis2;
93401
+ let pendingStaticInitializers;
93402
+ let pendingInstanceInitializers;
93403
+ if (nodeIsDecorated(
93404
+ /*useLegacyDecorators*/
93405
+ false,
93406
+ node
93407
+ )) {
93408
+ const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
93409
+ classThis2 = factory2.createUniqueName(
93410
+ "_classThis",
93411
+ needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
93412
+ );
93413
+ }
93417
93414
  for (const member of node.members) {
93418
- if (isNamedClassElement(member) && nodeOrChildIsDecorated(
93415
+ if (isMethodOrAccessor(member) && nodeOrChildIsDecorated(
93419
93416
  /*useLegacyDecorators*/
93420
93417
  false,
93421
93418
  member,
93422
93419
  node
93423
93420
  )) {
93424
93421
  if (hasStaticModifier(member)) {
93425
- staticExtraInitializersName ?? (staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
93422
+ if (!staticMethodExtraInitializersName) {
93423
+ staticMethodExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
93424
+ const initializer = emitHelpers().createRunInitializersHelper(classThis2 ?? factory2.createThis(), staticMethodExtraInitializersName);
93425
+ setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
93426
+ pendingStaticInitializers ?? (pendingStaticInitializers = []);
93427
+ pendingStaticInitializers.push(initializer);
93428
+ }
93426
93429
  } else {
93427
- instanceExtraInitializersName ?? (instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
93430
+ if (!instanceMethodExtraInitializersName) {
93431
+ instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
93432
+ const initializer = emitHelpers().createRunInitializersHelper(factory2.createThis(), instanceMethodExtraInitializersName);
93433
+ setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
93434
+ pendingInstanceInitializers ?? (pendingInstanceInitializers = []);
93435
+ pendingInstanceInitializers.push(initializer);
93436
+ }
93437
+ instanceMethodExtraInitializersName ?? (instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
93428
93438
  }
93429
93439
  }
93430
93440
  if (isClassStaticBlockDeclaration(member)) {
@@ -93441,18 +93451,21 @@ function transformESDecorators(context) {
93441
93451
  if ((isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member)) {
93442
93452
  hasStaticPrivateClassElements = true;
93443
93453
  }
93444
- if (staticExtraInitializersName && instanceExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
93454
+ if (staticMethodExtraInitializersName && instanceMethodExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
93445
93455
  break;
93446
93456
  }
93447
93457
  }
93448
93458
  return {
93449
93459
  class: node,
93460
+ classThis: classThis2,
93450
93461
  metadataReference,
93451
- instanceExtraInitializersName,
93452
- staticExtraInitializersName,
93462
+ instanceMethodExtraInitializersName,
93463
+ staticMethodExtraInitializersName,
93453
93464
  hasStaticInitializers,
93454
93465
  hasNonAmbientInstanceFields,
93455
- hasStaticPrivateClassElements
93466
+ hasStaticPrivateClassElements,
93467
+ pendingStaticInitializers,
93468
+ pendingInstanceInitializers
93456
93469
  };
93457
93470
  }
93458
93471
  function transformClassLike(node) {
@@ -93485,11 +93498,7 @@ function transformESDecorators(context) {
93485
93498
  classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
93486
93499
  classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
93487
93500
  classInfo2.classExtraInitializersName = factory2.createUniqueName("_classExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
93488
- const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
93489
- classInfo2.classThis = factory2.createUniqueName(
93490
- "_classThis",
93491
- needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
93492
- );
93501
+ Debug.assertIsDefined(classInfo2.classThis);
93493
93502
  classDefinitionStatements.push(
93494
93503
  createLet(classInfo2.classDecoratorsName, factory2.createArrayLiteralExpression(classDecorators)),
93495
93504
  createLet(classInfo2.classDescriptorName),
@@ -93521,7 +93530,9 @@ function transformESDecorators(context) {
93521
93530
  const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
93522
93531
  enterClass(classInfo2);
93523
93532
  leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
93524
- let members = visitNodes2(node.members, classElementVisitor, isClassElement);
93533
+ let members = node.members;
93534
+ members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? node2 : classElementVisitor(node2), isClassElement);
93535
+ members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? classElementVisitor(node2) : node2, isClassElement);
93525
93536
  if (pendingExpressions) {
93526
93537
  let outerThis;
93527
93538
  for (let expression of pendingExpressions) {
@@ -93546,7 +93557,7 @@ function transformESDecorators(context) {
93546
93557
  pendingExpressions = void 0;
93547
93558
  }
93548
93559
  exitClass();
93549
- if (classInfo2.instanceExtraInitializersName && !getFirstConstructorWithBody(node)) {
93560
+ if (some(classInfo2.pendingInstanceInitializers) && !getFirstConstructorWithBody(node)) {
93550
93561
  const initializerStatements = prepareConstructor(node, classInfo2);
93551
93562
  if (initializerStatements) {
93552
93563
  const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -93576,14 +93587,14 @@ function transformESDecorators(context) {
93576
93587
  );
93577
93588
  }
93578
93589
  }
93579
- if (classInfo2.staticExtraInitializersName) {
93590
+ if (classInfo2.staticMethodExtraInitializersName) {
93580
93591
  classDefinitionStatements.push(
93581
- createLet(classInfo2.staticExtraInitializersName, factory2.createArrayLiteralExpression())
93592
+ createLet(classInfo2.staticMethodExtraInitializersName, factory2.createArrayLiteralExpression())
93582
93593
  );
93583
93594
  }
93584
- if (classInfo2.instanceExtraInitializersName) {
93595
+ if (classInfo2.instanceMethodExtraInitializersName) {
93585
93596
  classDefinitionStatements.push(
93586
- createLet(classInfo2.instanceExtraInitializersName, factory2.createArrayLiteralExpression())
93597
+ createLet(classInfo2.instanceMethodExtraInitializersName, factory2.createArrayLiteralExpression())
93587
93598
  );
93588
93599
  }
93589
93600
  if (classInfo2.memberInfos) {
@@ -93593,6 +93604,9 @@ function transformESDecorators(context) {
93593
93604
  if (memberInfo.memberInitializersName) {
93594
93605
  classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
93595
93606
  }
93607
+ if (memberInfo.memberExtraInitializersName) {
93608
+ classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
93609
+ }
93596
93610
  if (memberInfo.memberDescriptorName) {
93597
93611
  classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
93598
93612
  }
@@ -93606,6 +93620,9 @@ function transformESDecorators(context) {
93606
93620
  if (memberInfo.memberInitializersName) {
93607
93621
  classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
93608
93622
  }
93623
+ if (memberInfo.memberExtraInitializersName) {
93624
+ classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
93625
+ }
93609
93626
  if (memberInfo.memberDescriptorName) {
93610
93627
  classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
93611
93628
  }
@@ -93639,11 +93656,13 @@ function transformESDecorators(context) {
93639
93656
  leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
93640
93657
  }
93641
93658
  leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
93642
- if (classInfo2.staticExtraInitializersName) {
93643
- const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
93644
- const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
93645
- setSourceMapRange(runStaticInitializersStatement, node.name ?? moveRangePastDecorators(node));
93646
- leadingBlockStatements = append(leadingBlockStatements, runStaticInitializersStatement);
93659
+ if (some(classInfo2.pendingStaticInitializers)) {
93660
+ for (const initializer of classInfo2.pendingStaticInitializers) {
93661
+ const initializerStatement = factory2.createExpressionStatement(initializer);
93662
+ setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
93663
+ trailingBlockStatements = append(trailingBlockStatements, initializerStatement);
93664
+ }
93665
+ classInfo2.pendingStaticInitializers = void 0;
93647
93666
  }
93648
93667
  if (classInfo2.classExtraInitializersName) {
93649
93668
  const runClassInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.classExtraInitializersName);
@@ -93874,16 +93893,14 @@ function transformESDecorators(context) {
93874
93893
  }
93875
93894
  }
93876
93895
  function prepareConstructor(_parent, classInfo2) {
93877
- if (classInfo2.instanceExtraInitializersName && !classInfo2.hasNonAmbientInstanceFields) {
93896
+ if (some(classInfo2.pendingInstanceInitializers)) {
93878
93897
  const statements = [];
93879
93898
  statements.push(
93880
93899
  factory2.createExpressionStatement(
93881
- emitHelpers().createRunInitializersHelper(
93882
- factory2.createThis(),
93883
- classInfo2.instanceExtraInitializersName
93884
- )
93900
+ factory2.inlineExpressions(classInfo2.pendingInstanceInitializers)
93885
93901
  )
93886
93902
  );
93903
+ classInfo2.pendingInstanceInitializers = void 0;
93887
93904
  return statements;
93888
93905
  }
93889
93906
  }
@@ -93963,6 +93980,7 @@ function transformESDecorators(context) {
93963
93980
  let referencedName;
93964
93981
  let name;
93965
93982
  let initializersName;
93983
+ let extraInitializersName;
93966
93984
  let thisArg;
93967
93985
  let descriptorName;
93968
93986
  if (!classInfo2) {
@@ -94020,20 +94038,22 @@ function transformESDecorators(context) {
94020
94038
  },
94021
94039
  metadata: classInfo2.metadataReference
94022
94040
  };
94023
- 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 */));
94024
94041
  if (isMethodOrAccessor(member)) {
94042
+ const methodExtraInitializersName = isStatic(member) ? classInfo2.staticMethodExtraInitializersName : classInfo2.instanceMethodExtraInitializersName;
94043
+ Debug.assertIsDefined(methodExtraInitializersName);
94025
94044
  let descriptor;
94026
94045
  if (isPrivateIdentifierClassElementDeclaration(member) && createDescriptor) {
94027
94046
  descriptor = createDescriptor(member, visitNodes2(modifiers, (node) => tryCast(node, isAsyncModifier), isModifier));
94028
94047
  memberInfo.memberDescriptorName = descriptorName = createHelperVariable(member, "descriptor");
94029
94048
  descriptor = factory2.createAssignment(descriptorName, descriptor);
94030
94049
  }
94031
- const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), extraInitializers);
94050
+ const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), methodExtraInitializersName);
94032
94051
  const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
94033
94052
  setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
94034
94053
  statements.push(esDecorateStatement);
94035
94054
  } else if (isPropertyDeclaration(member)) {
94036
94055
  initializersName = memberInfo.memberInitializersName ?? (memberInfo.memberInitializersName = createHelperVariable(member, "initializers"));
94056
+ extraInitializersName = memberInfo.memberExtraInitializersName ?? (memberInfo.memberExtraInitializersName = createHelperVariable(member, "extraInitializers"));
94037
94057
  if (isStatic(member)) {
94038
94058
  thisArg = classInfo2.classThis;
94039
94059
  }
@@ -94053,7 +94073,7 @@ function transformESDecorators(context) {
94053
94073
  memberDecoratorsName,
94054
94074
  context2,
94055
94075
  initializersName,
94056
- extraInitializers
94076
+ extraInitializersName
94057
94077
  );
94058
94078
  const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
94059
94079
  setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
@@ -94068,7 +94088,7 @@ function transformESDecorators(context) {
94068
94088
  if (!some(modifiers) && (isMethodDeclaration(member) || isPropertyDeclaration(member))) {
94069
94089
  setEmitFlags(name, 1024 /* NoLeadingComments */);
94070
94090
  }
94071
- return { modifiers, referencedName, name, initializersName, descriptorName, thisArg };
94091
+ return { modifiers, referencedName, name, initializersName, extraInitializersName, descriptorName, thisArg };
94072
94092
  }
94073
94093
  function visitMethodDeclaration(node) {
94074
94094
  enterClassElement(node);
@@ -94141,9 +94161,27 @@ function transformESDecorators(context) {
94141
94161
  result = visitEachChild(node, visitor, context);
94142
94162
  classThis = savedClassThis;
94143
94163
  } else {
94144
- if (classInfo)
94164
+ node = visitEachChild(node, visitor, context);
94165
+ result = node;
94166
+ if (classInfo) {
94145
94167
  classInfo.hasStaticInitializers = true;
94146
- result = visitEachChild(node, visitor, context);
94168
+ if (some(classInfo.pendingStaticInitializers)) {
94169
+ const statements = [];
94170
+ for (const initializer of classInfo.pendingStaticInitializers) {
94171
+ const initializerStatement = factory2.createExpressionStatement(initializer);
94172
+ setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
94173
+ statements.push(initializerStatement);
94174
+ }
94175
+ const body = factory2.createBlock(
94176
+ statements,
94177
+ /*multiLine*/
94178
+ true
94179
+ );
94180
+ const staticBlock = factory2.createClassStaticBlockDeclaration(body);
94181
+ result = [staticBlock, result];
94182
+ classInfo.pendingStaticInitializers = void 0;
94183
+ }
94184
+ }
94147
94185
  }
94148
94186
  exitClassElement();
94149
94187
  return result;
@@ -94154,7 +94192,7 @@ function transformESDecorators(context) {
94154
94192
  }
94155
94193
  enterClassElement(node);
94156
94194
  Debug.assert(!isAmbientPropertyDeclaration(node), "Not yet implemented.");
94157
- const { modifiers, name, initializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
94195
+ const { modifiers, name, initializersName, extraInitializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
94158
94196
  startLexicalEnvironment();
94159
94197
  let initializer = visitNode(node.initializer, visitor, isExpression);
94160
94198
  if (initializersName) {
@@ -94164,17 +94202,6 @@ function transformESDecorators(context) {
94164
94202
  initializer ?? factory2.createVoidZero()
94165
94203
  );
94166
94204
  }
94167
- if (!isStatic(node) && (classInfo == null ? void 0 : classInfo.instanceExtraInitializersName) && !(classInfo == null ? void 0 : classInfo.hasInjectedInstanceInitializers)) {
94168
- classInfo.hasInjectedInstanceInitializers = true;
94169
- initializer ?? (initializer = factory2.createVoidZero());
94170
- initializer = factory2.createParenthesizedExpression(factory2.createComma(
94171
- emitHelpers().createRunInitializersHelper(
94172
- factory2.createThis(),
94173
- classInfo.instanceExtraInitializersName
94174
- ),
94175
- initializer
94176
- ));
94177
- }
94178
94205
  if (isStatic(node) && classInfo && initializer) {
94179
94206
  classInfo.hasStaticInitializers = true;
94180
94207
  }
@@ -94185,6 +94212,41 @@ function transformESDecorators(context) {
94185
94212
  factory2.createReturnStatement(initializer)
94186
94213
  ]);
94187
94214
  }
94215
+ if (classInfo) {
94216
+ if (isStatic(node)) {
94217
+ initializer = injectPendingInitializers(
94218
+ classInfo,
94219
+ /*isStatic*/
94220
+ true,
94221
+ initializer
94222
+ );
94223
+ if (extraInitializersName) {
94224
+ classInfo.pendingStaticInitializers ?? (classInfo.pendingStaticInitializers = []);
94225
+ classInfo.pendingStaticInitializers.push(
94226
+ emitHelpers().createRunInitializersHelper(
94227
+ classInfo.classThis ?? factory2.createThis(),
94228
+ extraInitializersName
94229
+ )
94230
+ );
94231
+ }
94232
+ } else {
94233
+ initializer = injectPendingInitializers(
94234
+ classInfo,
94235
+ /*isStatic*/
94236
+ false,
94237
+ initializer
94238
+ );
94239
+ if (extraInitializersName) {
94240
+ classInfo.pendingInstanceInitializers ?? (classInfo.pendingInstanceInitializers = []);
94241
+ classInfo.pendingInstanceInitializers.push(
94242
+ emitHelpers().createRunInitializersHelper(
94243
+ factory2.createThis(),
94244
+ extraInitializersName
94245
+ )
94246
+ );
94247
+ }
94248
+ }
94249
+ }
94188
94250
  exitClassElement();
94189
94251
  if (hasAccessorModifier(node) && descriptorName) {
94190
94252
  const commentRange = getCommentRange(node);
@@ -94599,19 +94661,41 @@ function transformESDecorators(context) {
94599
94661
  const expression = visitNode(node.expression, visitorFunc, isExpression);
94600
94662
  return factory2.updatePartiallyEmittedExpression(node, expression);
94601
94663
  }
94602
- function injectPendingExpressions(expression) {
94603
- if (some(pendingExpressions)) {
94604
- if (isParenthesizedExpression(expression)) {
94605
- pendingExpressions.push(expression.expression);
94606
- expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions));
94664
+ function injectPendingExpressionsCommon(pendingExpressions2, expression) {
94665
+ if (some(pendingExpressions2)) {
94666
+ if (expression) {
94667
+ if (isParenthesizedExpression(expression)) {
94668
+ pendingExpressions2.push(expression.expression);
94669
+ expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions2));
94670
+ } else {
94671
+ pendingExpressions2.push(expression);
94672
+ expression = factory2.inlineExpressions(pendingExpressions2);
94673
+ }
94607
94674
  } else {
94608
- pendingExpressions.push(expression);
94609
- expression = factory2.inlineExpressions(pendingExpressions);
94675
+ expression = factory2.inlineExpressions(pendingExpressions2);
94610
94676
  }
94611
- pendingExpressions = void 0;
94612
94677
  }
94613
94678
  return expression;
94614
94679
  }
94680
+ function injectPendingExpressions(expression) {
94681
+ const result = injectPendingExpressionsCommon(pendingExpressions, expression);
94682
+ Debug.assertIsDefined(result);
94683
+ if (result !== expression) {
94684
+ pendingExpressions = void 0;
94685
+ }
94686
+ return result;
94687
+ }
94688
+ function injectPendingInitializers(classInfo2, isStatic2, expression) {
94689
+ const result = injectPendingExpressionsCommon(isStatic2 ? classInfo2.pendingStaticInitializers : classInfo2.pendingInstanceInitializers, expression);
94690
+ if (result !== expression) {
94691
+ if (isStatic2) {
94692
+ classInfo2.pendingStaticInitializers = void 0;
94693
+ } else {
94694
+ classInfo2.pendingInstanceInitializers = void 0;
94695
+ }
94696
+ }
94697
+ return result;
94698
+ }
94615
94699
  function transformAllDecoratorsOfDeclaration(allDecorators) {
94616
94700
  if (!allDecorators) {
94617
94701
  return void 0;
package/lib/tsserver.js CHANGED
@@ -78615,9 +78615,6 @@ function createTypeChecker(host) {
78615
78615
  let fallbackReturnType = voidType;
78616
78616
  if (func.body.kind !== 241 /* Block */) {
78617
78617
  returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
78618
- if (isConstContext(func.body)) {
78619
- returnType = getRegularTypeOfLiteralType(returnType);
78620
- }
78621
78618
  if (isAsync) {
78622
78619
  returnType = unwrapAwaitedType(checkAwaitedType(
78623
78620
  returnType,
@@ -78750,10 +78747,7 @@ function createTypeChecker(host) {
78750
78747
  const nextTypes = [];
78751
78748
  const isAsync = (getFunctionFlags(func) & 2 /* Async */) !== 0;
78752
78749
  forEachYieldExpression(func.body, (yieldExpression) => {
78753
- let yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
78754
- if (yieldExpression.expression && isConstContext(yieldExpression.expression)) {
78755
- yieldExpressionType = getRegularTypeOfLiteralType(yieldExpressionType);
78756
- }
78750
+ const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
78757
78751
  pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
78758
78752
  let nextType;
78759
78753
  if (yieldExpression.asteriskToken) {
@@ -78868,7 +78862,7 @@ function createTypeChecker(host) {
78868
78862
  if (type.flags & 131072 /* Never */) {
78869
78863
  hasReturnOfTypeNever = true;
78870
78864
  }
78871
- pushIfUnique(aggregatedTypes, isConstContext(expr) ? getRegularTypeOfLiteralType(type) : type);
78865
+ pushIfUnique(aggregatedTypes, type);
78872
78866
  } else {
78873
78867
  hasReturnWithNoExpression = true;
78874
78868
  }
@@ -98308,22 +98302,49 @@ function transformESDecorators(context) {
98308
98302
  }
98309
98303
  function createClassInfo(node) {
98310
98304
  const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
98311
- let instanceExtraInitializersName;
98312
- let staticExtraInitializersName;
98305
+ let instanceMethodExtraInitializersName;
98306
+ let staticMethodExtraInitializersName;
98313
98307
  let hasStaticInitializers = false;
98314
98308
  let hasNonAmbientInstanceFields = false;
98315
98309
  let hasStaticPrivateClassElements = false;
98310
+ let classThis2;
98311
+ let pendingStaticInitializers;
98312
+ let pendingInstanceInitializers;
98313
+ if (nodeIsDecorated(
98314
+ /*useLegacyDecorators*/
98315
+ false,
98316
+ node
98317
+ )) {
98318
+ const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
98319
+ classThis2 = factory2.createUniqueName(
98320
+ "_classThis",
98321
+ needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
98322
+ );
98323
+ }
98316
98324
  for (const member of node.members) {
98317
- if (isNamedClassElement(member) && nodeOrChildIsDecorated(
98325
+ if (isMethodOrAccessor(member) && nodeOrChildIsDecorated(
98318
98326
  /*useLegacyDecorators*/
98319
98327
  false,
98320
98328
  member,
98321
98329
  node
98322
98330
  )) {
98323
98331
  if (hasStaticModifier(member)) {
98324
- staticExtraInitializersName ?? (staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
98332
+ if (!staticMethodExtraInitializersName) {
98333
+ staticMethodExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
98334
+ const initializer = emitHelpers().createRunInitializersHelper(classThis2 ?? factory2.createThis(), staticMethodExtraInitializersName);
98335
+ setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
98336
+ pendingStaticInitializers ?? (pendingStaticInitializers = []);
98337
+ pendingStaticInitializers.push(initializer);
98338
+ }
98325
98339
  } else {
98326
- instanceExtraInitializersName ?? (instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
98340
+ if (!instanceMethodExtraInitializersName) {
98341
+ instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
98342
+ const initializer = emitHelpers().createRunInitializersHelper(factory2.createThis(), instanceMethodExtraInitializersName);
98343
+ setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
98344
+ pendingInstanceInitializers ?? (pendingInstanceInitializers = []);
98345
+ pendingInstanceInitializers.push(initializer);
98346
+ }
98347
+ instanceMethodExtraInitializersName ?? (instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
98327
98348
  }
98328
98349
  }
98329
98350
  if (isClassStaticBlockDeclaration(member)) {
@@ -98340,18 +98361,21 @@ function transformESDecorators(context) {
98340
98361
  if ((isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member)) {
98341
98362
  hasStaticPrivateClassElements = true;
98342
98363
  }
98343
- if (staticExtraInitializersName && instanceExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
98364
+ if (staticMethodExtraInitializersName && instanceMethodExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
98344
98365
  break;
98345
98366
  }
98346
98367
  }
98347
98368
  return {
98348
98369
  class: node,
98370
+ classThis: classThis2,
98349
98371
  metadataReference,
98350
- instanceExtraInitializersName,
98351
- staticExtraInitializersName,
98372
+ instanceMethodExtraInitializersName,
98373
+ staticMethodExtraInitializersName,
98352
98374
  hasStaticInitializers,
98353
98375
  hasNonAmbientInstanceFields,
98354
- hasStaticPrivateClassElements
98376
+ hasStaticPrivateClassElements,
98377
+ pendingStaticInitializers,
98378
+ pendingInstanceInitializers
98355
98379
  };
98356
98380
  }
98357
98381
  function transformClassLike(node) {
@@ -98384,11 +98408,7 @@ function transformESDecorators(context) {
98384
98408
  classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
98385
98409
  classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
98386
98410
  classInfo2.classExtraInitializersName = factory2.createUniqueName("_classExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
98387
- const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
98388
- classInfo2.classThis = factory2.createUniqueName(
98389
- "_classThis",
98390
- needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
98391
- );
98411
+ Debug.assertIsDefined(classInfo2.classThis);
98392
98412
  classDefinitionStatements.push(
98393
98413
  createLet(classInfo2.classDecoratorsName, factory2.createArrayLiteralExpression(classDecorators)),
98394
98414
  createLet(classInfo2.classDescriptorName),
@@ -98420,7 +98440,9 @@ function transformESDecorators(context) {
98420
98440
  const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
98421
98441
  enterClass(classInfo2);
98422
98442
  leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
98423
- let members = visitNodes2(node.members, classElementVisitor, isClassElement);
98443
+ let members = node.members;
98444
+ members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? node2 : classElementVisitor(node2), isClassElement);
98445
+ members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? classElementVisitor(node2) : node2, isClassElement);
98424
98446
  if (pendingExpressions) {
98425
98447
  let outerThis;
98426
98448
  for (let expression of pendingExpressions) {
@@ -98445,7 +98467,7 @@ function transformESDecorators(context) {
98445
98467
  pendingExpressions = void 0;
98446
98468
  }
98447
98469
  exitClass();
98448
- if (classInfo2.instanceExtraInitializersName && !getFirstConstructorWithBody(node)) {
98470
+ if (some(classInfo2.pendingInstanceInitializers) && !getFirstConstructorWithBody(node)) {
98449
98471
  const initializerStatements = prepareConstructor(node, classInfo2);
98450
98472
  if (initializerStatements) {
98451
98473
  const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -98475,14 +98497,14 @@ function transformESDecorators(context) {
98475
98497
  );
98476
98498
  }
98477
98499
  }
98478
- if (classInfo2.staticExtraInitializersName) {
98500
+ if (classInfo2.staticMethodExtraInitializersName) {
98479
98501
  classDefinitionStatements.push(
98480
- createLet(classInfo2.staticExtraInitializersName, factory2.createArrayLiteralExpression())
98502
+ createLet(classInfo2.staticMethodExtraInitializersName, factory2.createArrayLiteralExpression())
98481
98503
  );
98482
98504
  }
98483
- if (classInfo2.instanceExtraInitializersName) {
98505
+ if (classInfo2.instanceMethodExtraInitializersName) {
98484
98506
  classDefinitionStatements.push(
98485
- createLet(classInfo2.instanceExtraInitializersName, factory2.createArrayLiteralExpression())
98507
+ createLet(classInfo2.instanceMethodExtraInitializersName, factory2.createArrayLiteralExpression())
98486
98508
  );
98487
98509
  }
98488
98510
  if (classInfo2.memberInfos) {
@@ -98492,6 +98514,9 @@ function transformESDecorators(context) {
98492
98514
  if (memberInfo.memberInitializersName) {
98493
98515
  classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
98494
98516
  }
98517
+ if (memberInfo.memberExtraInitializersName) {
98518
+ classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
98519
+ }
98495
98520
  if (memberInfo.memberDescriptorName) {
98496
98521
  classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
98497
98522
  }
@@ -98505,6 +98530,9 @@ function transformESDecorators(context) {
98505
98530
  if (memberInfo.memberInitializersName) {
98506
98531
  classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
98507
98532
  }
98533
+ if (memberInfo.memberExtraInitializersName) {
98534
+ classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
98535
+ }
98508
98536
  if (memberInfo.memberDescriptorName) {
98509
98537
  classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
98510
98538
  }
@@ -98538,11 +98566,13 @@ function transformESDecorators(context) {
98538
98566
  leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
98539
98567
  }
98540
98568
  leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
98541
- if (classInfo2.staticExtraInitializersName) {
98542
- const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
98543
- const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
98544
- setSourceMapRange(runStaticInitializersStatement, node.name ?? moveRangePastDecorators(node));
98545
- leadingBlockStatements = append(leadingBlockStatements, runStaticInitializersStatement);
98569
+ if (some(classInfo2.pendingStaticInitializers)) {
98570
+ for (const initializer of classInfo2.pendingStaticInitializers) {
98571
+ const initializerStatement = factory2.createExpressionStatement(initializer);
98572
+ setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
98573
+ trailingBlockStatements = append(trailingBlockStatements, initializerStatement);
98574
+ }
98575
+ classInfo2.pendingStaticInitializers = void 0;
98546
98576
  }
98547
98577
  if (classInfo2.classExtraInitializersName) {
98548
98578
  const runClassInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.classExtraInitializersName);
@@ -98773,16 +98803,14 @@ function transformESDecorators(context) {
98773
98803
  }
98774
98804
  }
98775
98805
  function prepareConstructor(_parent, classInfo2) {
98776
- if (classInfo2.instanceExtraInitializersName && !classInfo2.hasNonAmbientInstanceFields) {
98806
+ if (some(classInfo2.pendingInstanceInitializers)) {
98777
98807
  const statements = [];
98778
98808
  statements.push(
98779
98809
  factory2.createExpressionStatement(
98780
- emitHelpers().createRunInitializersHelper(
98781
- factory2.createThis(),
98782
- classInfo2.instanceExtraInitializersName
98783
- )
98810
+ factory2.inlineExpressions(classInfo2.pendingInstanceInitializers)
98784
98811
  )
98785
98812
  );
98813
+ classInfo2.pendingInstanceInitializers = void 0;
98786
98814
  return statements;
98787
98815
  }
98788
98816
  }
@@ -98862,6 +98890,7 @@ function transformESDecorators(context) {
98862
98890
  let referencedName;
98863
98891
  let name;
98864
98892
  let initializersName;
98893
+ let extraInitializersName;
98865
98894
  let thisArg;
98866
98895
  let descriptorName;
98867
98896
  if (!classInfo2) {
@@ -98919,20 +98948,22 @@ function transformESDecorators(context) {
98919
98948
  },
98920
98949
  metadata: classInfo2.metadataReference
98921
98950
  };
98922
- 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 */));
98923
98951
  if (isMethodOrAccessor(member)) {
98952
+ const methodExtraInitializersName = isStatic(member) ? classInfo2.staticMethodExtraInitializersName : classInfo2.instanceMethodExtraInitializersName;
98953
+ Debug.assertIsDefined(methodExtraInitializersName);
98924
98954
  let descriptor;
98925
98955
  if (isPrivateIdentifierClassElementDeclaration(member) && createDescriptor) {
98926
98956
  descriptor = createDescriptor(member, visitNodes2(modifiers, (node) => tryCast(node, isAsyncModifier), isModifier));
98927
98957
  memberInfo.memberDescriptorName = descriptorName = createHelperVariable(member, "descriptor");
98928
98958
  descriptor = factory2.createAssignment(descriptorName, descriptor);
98929
98959
  }
98930
- const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), extraInitializers);
98960
+ const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), methodExtraInitializersName);
98931
98961
  const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
98932
98962
  setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
98933
98963
  statements.push(esDecorateStatement);
98934
98964
  } else if (isPropertyDeclaration(member)) {
98935
98965
  initializersName = memberInfo.memberInitializersName ?? (memberInfo.memberInitializersName = createHelperVariable(member, "initializers"));
98966
+ extraInitializersName = memberInfo.memberExtraInitializersName ?? (memberInfo.memberExtraInitializersName = createHelperVariable(member, "extraInitializers"));
98936
98967
  if (isStatic(member)) {
98937
98968
  thisArg = classInfo2.classThis;
98938
98969
  }
@@ -98952,7 +98983,7 @@ function transformESDecorators(context) {
98952
98983
  memberDecoratorsName,
98953
98984
  context2,
98954
98985
  initializersName,
98955
- extraInitializers
98986
+ extraInitializersName
98956
98987
  );
98957
98988
  const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
98958
98989
  setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
@@ -98967,7 +98998,7 @@ function transformESDecorators(context) {
98967
98998
  if (!some(modifiers) && (isMethodDeclaration(member) || isPropertyDeclaration(member))) {
98968
98999
  setEmitFlags(name, 1024 /* NoLeadingComments */);
98969
99000
  }
98970
- return { modifiers, referencedName, name, initializersName, descriptorName, thisArg };
99001
+ return { modifiers, referencedName, name, initializersName, extraInitializersName, descriptorName, thisArg };
98971
99002
  }
98972
99003
  function visitMethodDeclaration(node) {
98973
99004
  enterClassElement(node);
@@ -99040,9 +99071,27 @@ function transformESDecorators(context) {
99040
99071
  result = visitEachChild(node, visitor, context);
99041
99072
  classThis = savedClassThis;
99042
99073
  } else {
99043
- if (classInfo)
99074
+ node = visitEachChild(node, visitor, context);
99075
+ result = node;
99076
+ if (classInfo) {
99044
99077
  classInfo.hasStaticInitializers = true;
99045
- result = visitEachChild(node, visitor, context);
99078
+ if (some(classInfo.pendingStaticInitializers)) {
99079
+ const statements = [];
99080
+ for (const initializer of classInfo.pendingStaticInitializers) {
99081
+ const initializerStatement = factory2.createExpressionStatement(initializer);
99082
+ setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
99083
+ statements.push(initializerStatement);
99084
+ }
99085
+ const body = factory2.createBlock(
99086
+ statements,
99087
+ /*multiLine*/
99088
+ true
99089
+ );
99090
+ const staticBlock = factory2.createClassStaticBlockDeclaration(body);
99091
+ result = [staticBlock, result];
99092
+ classInfo.pendingStaticInitializers = void 0;
99093
+ }
99094
+ }
99046
99095
  }
99047
99096
  exitClassElement();
99048
99097
  return result;
@@ -99053,7 +99102,7 @@ function transformESDecorators(context) {
99053
99102
  }
99054
99103
  enterClassElement(node);
99055
99104
  Debug.assert(!isAmbientPropertyDeclaration(node), "Not yet implemented.");
99056
- const { modifiers, name, initializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
99105
+ const { modifiers, name, initializersName, extraInitializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
99057
99106
  startLexicalEnvironment();
99058
99107
  let initializer = visitNode(node.initializer, visitor, isExpression);
99059
99108
  if (initializersName) {
@@ -99063,17 +99112,6 @@ function transformESDecorators(context) {
99063
99112
  initializer ?? factory2.createVoidZero()
99064
99113
  );
99065
99114
  }
99066
- if (!isStatic(node) && (classInfo == null ? void 0 : classInfo.instanceExtraInitializersName) && !(classInfo == null ? void 0 : classInfo.hasInjectedInstanceInitializers)) {
99067
- classInfo.hasInjectedInstanceInitializers = true;
99068
- initializer ?? (initializer = factory2.createVoidZero());
99069
- initializer = factory2.createParenthesizedExpression(factory2.createComma(
99070
- emitHelpers().createRunInitializersHelper(
99071
- factory2.createThis(),
99072
- classInfo.instanceExtraInitializersName
99073
- ),
99074
- initializer
99075
- ));
99076
- }
99077
99115
  if (isStatic(node) && classInfo && initializer) {
99078
99116
  classInfo.hasStaticInitializers = true;
99079
99117
  }
@@ -99084,6 +99122,41 @@ function transformESDecorators(context) {
99084
99122
  factory2.createReturnStatement(initializer)
99085
99123
  ]);
99086
99124
  }
99125
+ if (classInfo) {
99126
+ if (isStatic(node)) {
99127
+ initializer = injectPendingInitializers(
99128
+ classInfo,
99129
+ /*isStatic*/
99130
+ true,
99131
+ initializer
99132
+ );
99133
+ if (extraInitializersName) {
99134
+ classInfo.pendingStaticInitializers ?? (classInfo.pendingStaticInitializers = []);
99135
+ classInfo.pendingStaticInitializers.push(
99136
+ emitHelpers().createRunInitializersHelper(
99137
+ classInfo.classThis ?? factory2.createThis(),
99138
+ extraInitializersName
99139
+ )
99140
+ );
99141
+ }
99142
+ } else {
99143
+ initializer = injectPendingInitializers(
99144
+ classInfo,
99145
+ /*isStatic*/
99146
+ false,
99147
+ initializer
99148
+ );
99149
+ if (extraInitializersName) {
99150
+ classInfo.pendingInstanceInitializers ?? (classInfo.pendingInstanceInitializers = []);
99151
+ classInfo.pendingInstanceInitializers.push(
99152
+ emitHelpers().createRunInitializersHelper(
99153
+ factory2.createThis(),
99154
+ extraInitializersName
99155
+ )
99156
+ );
99157
+ }
99158
+ }
99159
+ }
99087
99160
  exitClassElement();
99088
99161
  if (hasAccessorModifier(node) && descriptorName) {
99089
99162
  const commentRange = getCommentRange(node);
@@ -99498,19 +99571,41 @@ function transformESDecorators(context) {
99498
99571
  const expression = visitNode(node.expression, visitorFunc, isExpression);
99499
99572
  return factory2.updatePartiallyEmittedExpression(node, expression);
99500
99573
  }
99501
- function injectPendingExpressions(expression) {
99502
- if (some(pendingExpressions)) {
99503
- if (isParenthesizedExpression(expression)) {
99504
- pendingExpressions.push(expression.expression);
99505
- expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions));
99574
+ function injectPendingExpressionsCommon(pendingExpressions2, expression) {
99575
+ if (some(pendingExpressions2)) {
99576
+ if (expression) {
99577
+ if (isParenthesizedExpression(expression)) {
99578
+ pendingExpressions2.push(expression.expression);
99579
+ expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions2));
99580
+ } else {
99581
+ pendingExpressions2.push(expression);
99582
+ expression = factory2.inlineExpressions(pendingExpressions2);
99583
+ }
99506
99584
  } else {
99507
- pendingExpressions.push(expression);
99508
- expression = factory2.inlineExpressions(pendingExpressions);
99585
+ expression = factory2.inlineExpressions(pendingExpressions2);
99509
99586
  }
99510
- pendingExpressions = void 0;
99511
99587
  }
99512
99588
  return expression;
99513
99589
  }
99590
+ function injectPendingExpressions(expression) {
99591
+ const result = injectPendingExpressionsCommon(pendingExpressions, expression);
99592
+ Debug.assertIsDefined(result);
99593
+ if (result !== expression) {
99594
+ pendingExpressions = void 0;
99595
+ }
99596
+ return result;
99597
+ }
99598
+ function injectPendingInitializers(classInfo2, isStatic2, expression) {
99599
+ const result = injectPendingExpressionsCommon(isStatic2 ? classInfo2.pendingStaticInitializers : classInfo2.pendingInstanceInitializers, expression);
99600
+ if (result !== expression) {
99601
+ if (isStatic2) {
99602
+ classInfo2.pendingStaticInitializers = void 0;
99603
+ } else {
99604
+ classInfo2.pendingInstanceInitializers = void 0;
99605
+ }
99606
+ }
99607
+ return result;
99608
+ }
99514
99609
  function transformAllDecoratorsOfDeclaration(allDecorators) {
99515
99610
  if (!allDecorators) {
99516
99611
  return void 0;
@@ -6021,10 +6021,19 @@ declare namespace ts {
6021
6021
  /** @deprecated */
6022
6022
  type AssertionKey = ImportAttributeName;
6023
6023
  /** @deprecated */
6024
- interface AssertEntry extends ImportAttribute {
6024
+ interface AssertEntry extends Node {
6025
+ readonly kind: SyntaxKind.AssertEntry;
6026
+ readonly parent: AssertClause;
6027
+ readonly name: ImportAttributeName;
6028
+ readonly value: Expression;
6025
6029
  }
6026
6030
  /** @deprecated */
6027
- interface AssertClause extends ImportAttributes {
6031
+ interface AssertClause extends Node {
6032
+ readonly token: SyntaxKind.WithKeyword | SyntaxKind.AssertKeyword;
6033
+ readonly kind: SyntaxKind.AssertClause;
6034
+ readonly parent: ImportDeclaration | ExportDeclaration;
6035
+ readonly elements: NodeArray<AssertEntry>;
6036
+ readonly multiLine?: boolean;
6028
6037
  }
6029
6038
  type ImportAttributeName = Identifier | StringLiteral;
6030
6039
  interface ImportAttribute extends Node {
package/lib/typescript.js CHANGED
@@ -76369,9 +76369,6 @@ ${lanes.join("\n")}
76369
76369
  let fallbackReturnType = voidType;
76370
76370
  if (func.body.kind !== 241 /* Block */) {
76371
76371
  returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
76372
- if (isConstContext(func.body)) {
76373
- returnType = getRegularTypeOfLiteralType(returnType);
76374
- }
76375
76372
  if (isAsync) {
76376
76373
  returnType = unwrapAwaitedType(checkAwaitedType(
76377
76374
  returnType,
@@ -76504,10 +76501,7 @@ ${lanes.join("\n")}
76504
76501
  const nextTypes = [];
76505
76502
  const isAsync = (getFunctionFlags(func) & 2 /* Async */) !== 0;
76506
76503
  forEachYieldExpression(func.body, (yieldExpression) => {
76507
- let yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
76508
- if (yieldExpression.expression && isConstContext(yieldExpression.expression)) {
76509
- yieldExpressionType = getRegularTypeOfLiteralType(yieldExpressionType);
76510
- }
76504
+ const yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
76511
76505
  pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
76512
76506
  let nextType;
76513
76507
  if (yieldExpression.asteriskToken) {
@@ -76622,7 +76616,7 @@ ${lanes.join("\n")}
76622
76616
  if (type.flags & 131072 /* Never */) {
76623
76617
  hasReturnOfTypeNever = true;
76624
76618
  }
76625
- pushIfUnique(aggregatedTypes, isConstContext(expr) ? getRegularTypeOfLiteralType(type) : type);
76619
+ pushIfUnique(aggregatedTypes, type);
76626
76620
  } else {
76627
76621
  hasReturnWithNoExpression = true;
76628
76622
  }
@@ -96268,22 +96262,49 @@ ${lanes.join("\n")}
96268
96262
  }
96269
96263
  function createClassInfo(node) {
96270
96264
  const metadataReference = factory2.createUniqueName("_metadata", 16 /* Optimistic */ | 32 /* FileLevel */);
96271
- let instanceExtraInitializersName;
96272
- let staticExtraInitializersName;
96265
+ let instanceMethodExtraInitializersName;
96266
+ let staticMethodExtraInitializersName;
96273
96267
  let hasStaticInitializers = false;
96274
96268
  let hasNonAmbientInstanceFields = false;
96275
96269
  let hasStaticPrivateClassElements = false;
96270
+ let classThis2;
96271
+ let pendingStaticInitializers;
96272
+ let pendingInstanceInitializers;
96273
+ if (nodeIsDecorated(
96274
+ /*useLegacyDecorators*/
96275
+ false,
96276
+ node
96277
+ )) {
96278
+ const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
96279
+ classThis2 = factory2.createUniqueName(
96280
+ "_classThis",
96281
+ needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
96282
+ );
96283
+ }
96276
96284
  for (const member of node.members) {
96277
- if (isNamedClassElement(member) && nodeOrChildIsDecorated(
96285
+ if (isMethodOrAccessor(member) && nodeOrChildIsDecorated(
96278
96286
  /*useLegacyDecorators*/
96279
96287
  false,
96280
96288
  member,
96281
96289
  node
96282
96290
  )) {
96283
96291
  if (hasStaticModifier(member)) {
96284
- staticExtraInitializersName ?? (staticExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
96292
+ if (!staticMethodExtraInitializersName) {
96293
+ staticMethodExtraInitializersName = factory2.createUniqueName("_staticExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
96294
+ const initializer = emitHelpers().createRunInitializersHelper(classThis2 ?? factory2.createThis(), staticMethodExtraInitializersName);
96295
+ setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
96296
+ pendingStaticInitializers ?? (pendingStaticInitializers = []);
96297
+ pendingStaticInitializers.push(initializer);
96298
+ }
96285
96299
  } else {
96286
- instanceExtraInitializersName ?? (instanceExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
96300
+ if (!instanceMethodExtraInitializersName) {
96301
+ instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
96302
+ const initializer = emitHelpers().createRunInitializersHelper(factory2.createThis(), instanceMethodExtraInitializersName);
96303
+ setSourceMapRange(initializer, node.name ?? moveRangePastDecorators(node));
96304
+ pendingInstanceInitializers ?? (pendingInstanceInitializers = []);
96305
+ pendingInstanceInitializers.push(initializer);
96306
+ }
96307
+ instanceMethodExtraInitializersName ?? (instanceMethodExtraInitializersName = factory2.createUniqueName("_instanceExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */));
96287
96308
  }
96288
96309
  }
96289
96310
  if (isClassStaticBlockDeclaration(member)) {
@@ -96300,18 +96321,21 @@ ${lanes.join("\n")}
96300
96321
  if ((isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member)) {
96301
96322
  hasStaticPrivateClassElements = true;
96302
96323
  }
96303
- if (staticExtraInitializersName && instanceExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
96324
+ if (staticMethodExtraInitializersName && instanceMethodExtraInitializersName && hasStaticInitializers && hasNonAmbientInstanceFields && hasStaticPrivateClassElements) {
96304
96325
  break;
96305
96326
  }
96306
96327
  }
96307
96328
  return {
96308
96329
  class: node,
96330
+ classThis: classThis2,
96309
96331
  metadataReference,
96310
- instanceExtraInitializersName,
96311
- staticExtraInitializersName,
96332
+ instanceMethodExtraInitializersName,
96333
+ staticMethodExtraInitializersName,
96312
96334
  hasStaticInitializers,
96313
96335
  hasNonAmbientInstanceFields,
96314
- hasStaticPrivateClassElements
96336
+ hasStaticPrivateClassElements,
96337
+ pendingStaticInitializers,
96338
+ pendingInstanceInitializers
96315
96339
  };
96316
96340
  }
96317
96341
  function transformClassLike(node) {
@@ -96344,11 +96368,7 @@ ${lanes.join("\n")}
96344
96368
  classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
96345
96369
  classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
96346
96370
  classInfo2.classExtraInitializersName = factory2.createUniqueName("_classExtraInitializers", 16 /* Optimistic */ | 32 /* FileLevel */);
96347
- const needsUniqueClassThis = some(node.members, (member) => (isPrivateIdentifierClassElementDeclaration(member) || isAutoAccessorPropertyDeclaration(member)) && hasStaticModifier(member));
96348
- classInfo2.classThis = factory2.createUniqueName(
96349
- "_classThis",
96350
- needsUniqueClassThis ? 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */ : 16 /* Optimistic */ | 32 /* FileLevel */
96351
- );
96371
+ Debug.assertIsDefined(classInfo2.classThis);
96352
96372
  classDefinitionStatements.push(
96353
96373
  createLet(classInfo2.classDecoratorsName, factory2.createArrayLiteralExpression(classDecorators)),
96354
96374
  createLet(classInfo2.classDescriptorName),
@@ -96380,7 +96400,9 @@ ${lanes.join("\n")}
96380
96400
  const renamedClassThis = classInfo2.classThis ?? factory2.createThis();
96381
96401
  enterClass(classInfo2);
96382
96402
  leadingBlockStatements = append(leadingBlockStatements, createMetadata(classInfo2.metadataReference, classInfo2.classSuper));
96383
- let members = visitNodes2(node.members, classElementVisitor, isClassElement);
96403
+ let members = node.members;
96404
+ members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? node2 : classElementVisitor(node2), isClassElement);
96405
+ members = visitNodes2(members, (node2) => isConstructorDeclaration(node2) ? classElementVisitor(node2) : node2, isClassElement);
96384
96406
  if (pendingExpressions) {
96385
96407
  let outerThis;
96386
96408
  for (let expression of pendingExpressions) {
@@ -96405,7 +96427,7 @@ ${lanes.join("\n")}
96405
96427
  pendingExpressions = void 0;
96406
96428
  }
96407
96429
  exitClass();
96408
- if (classInfo2.instanceExtraInitializersName && !getFirstConstructorWithBody(node)) {
96430
+ if (some(classInfo2.pendingInstanceInitializers) && !getFirstConstructorWithBody(node)) {
96409
96431
  const initializerStatements = prepareConstructor(node, classInfo2);
96410
96432
  if (initializerStatements) {
96411
96433
  const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -96435,14 +96457,14 @@ ${lanes.join("\n")}
96435
96457
  );
96436
96458
  }
96437
96459
  }
96438
- if (classInfo2.staticExtraInitializersName) {
96460
+ if (classInfo2.staticMethodExtraInitializersName) {
96439
96461
  classDefinitionStatements.push(
96440
- createLet(classInfo2.staticExtraInitializersName, factory2.createArrayLiteralExpression())
96462
+ createLet(classInfo2.staticMethodExtraInitializersName, factory2.createArrayLiteralExpression())
96441
96463
  );
96442
96464
  }
96443
- if (classInfo2.instanceExtraInitializersName) {
96465
+ if (classInfo2.instanceMethodExtraInitializersName) {
96444
96466
  classDefinitionStatements.push(
96445
- createLet(classInfo2.instanceExtraInitializersName, factory2.createArrayLiteralExpression())
96467
+ createLet(classInfo2.instanceMethodExtraInitializersName, factory2.createArrayLiteralExpression())
96446
96468
  );
96447
96469
  }
96448
96470
  if (classInfo2.memberInfos) {
@@ -96452,6 +96474,9 @@ ${lanes.join("\n")}
96452
96474
  if (memberInfo.memberInitializersName) {
96453
96475
  classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
96454
96476
  }
96477
+ if (memberInfo.memberExtraInitializersName) {
96478
+ classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
96479
+ }
96455
96480
  if (memberInfo.memberDescriptorName) {
96456
96481
  classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
96457
96482
  }
@@ -96465,6 +96490,9 @@ ${lanes.join("\n")}
96465
96490
  if (memberInfo.memberInitializersName) {
96466
96491
  classDefinitionStatements.push(createLet(memberInfo.memberInitializersName, factory2.createArrayLiteralExpression()));
96467
96492
  }
96493
+ if (memberInfo.memberExtraInitializersName) {
96494
+ classDefinitionStatements.push(createLet(memberInfo.memberExtraInitializersName, factory2.createArrayLiteralExpression()));
96495
+ }
96468
96496
  if (memberInfo.memberDescriptorName) {
96469
96497
  classDefinitionStatements.push(createLet(memberInfo.memberDescriptorName));
96470
96498
  }
@@ -96498,11 +96526,13 @@ ${lanes.join("\n")}
96498
96526
  leadingBlockStatements.push(factory2.createExpressionStatement(classReferenceAssignment));
96499
96527
  }
96500
96528
  leadingBlockStatements.push(createSymbolMetadata(renamedClassThis, classInfo2.metadataReference));
96501
- if (classInfo2.staticExtraInitializersName) {
96502
- const runStaticInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.staticExtraInitializersName);
96503
- const runStaticInitializersStatement = factory2.createExpressionStatement(runStaticInitializersHelper);
96504
- setSourceMapRange(runStaticInitializersStatement, node.name ?? moveRangePastDecorators(node));
96505
- leadingBlockStatements = append(leadingBlockStatements, runStaticInitializersStatement);
96529
+ if (some(classInfo2.pendingStaticInitializers)) {
96530
+ for (const initializer of classInfo2.pendingStaticInitializers) {
96531
+ const initializerStatement = factory2.createExpressionStatement(initializer);
96532
+ setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
96533
+ trailingBlockStatements = append(trailingBlockStatements, initializerStatement);
96534
+ }
96535
+ classInfo2.pendingStaticInitializers = void 0;
96506
96536
  }
96507
96537
  if (classInfo2.classExtraInitializersName) {
96508
96538
  const runClassInitializersHelper = emitHelpers().createRunInitializersHelper(renamedClassThis, classInfo2.classExtraInitializersName);
@@ -96733,16 +96763,14 @@ ${lanes.join("\n")}
96733
96763
  }
96734
96764
  }
96735
96765
  function prepareConstructor(_parent, classInfo2) {
96736
- if (classInfo2.instanceExtraInitializersName && !classInfo2.hasNonAmbientInstanceFields) {
96766
+ if (some(classInfo2.pendingInstanceInitializers)) {
96737
96767
  const statements = [];
96738
96768
  statements.push(
96739
96769
  factory2.createExpressionStatement(
96740
- emitHelpers().createRunInitializersHelper(
96741
- factory2.createThis(),
96742
- classInfo2.instanceExtraInitializersName
96743
- )
96770
+ factory2.inlineExpressions(classInfo2.pendingInstanceInitializers)
96744
96771
  )
96745
96772
  );
96773
+ classInfo2.pendingInstanceInitializers = void 0;
96746
96774
  return statements;
96747
96775
  }
96748
96776
  }
@@ -96822,6 +96850,7 @@ ${lanes.join("\n")}
96822
96850
  let referencedName;
96823
96851
  let name;
96824
96852
  let initializersName;
96853
+ let extraInitializersName;
96825
96854
  let thisArg;
96826
96855
  let descriptorName;
96827
96856
  if (!classInfo2) {
@@ -96879,20 +96908,22 @@ ${lanes.join("\n")}
96879
96908
  },
96880
96909
  metadata: classInfo2.metadataReference
96881
96910
  };
96882
- 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 */));
96883
96911
  if (isMethodOrAccessor(member)) {
96912
+ const methodExtraInitializersName = isStatic(member) ? classInfo2.staticMethodExtraInitializersName : classInfo2.instanceMethodExtraInitializersName;
96913
+ Debug.assertIsDefined(methodExtraInitializersName);
96884
96914
  let descriptor;
96885
96915
  if (isPrivateIdentifierClassElementDeclaration(member) && createDescriptor) {
96886
96916
  descriptor = createDescriptor(member, visitNodes2(modifiers, (node) => tryCast(node, isAsyncModifier), isModifier));
96887
96917
  memberInfo.memberDescriptorName = descriptorName = createHelperVariable(member, "descriptor");
96888
96918
  descriptor = factory2.createAssignment(descriptorName, descriptor);
96889
96919
  }
96890
- const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), extraInitializers);
96920
+ const esDecorateExpression = emitHelpers().createESDecorateHelper(factory2.createThis(), descriptor ?? factory2.createNull(), memberDecoratorsName, context2, factory2.createNull(), methodExtraInitializersName);
96891
96921
  const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
96892
96922
  setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
96893
96923
  statements.push(esDecorateStatement);
96894
96924
  } else if (isPropertyDeclaration(member)) {
96895
96925
  initializersName = memberInfo.memberInitializersName ?? (memberInfo.memberInitializersName = createHelperVariable(member, "initializers"));
96926
+ extraInitializersName = memberInfo.memberExtraInitializersName ?? (memberInfo.memberExtraInitializersName = createHelperVariable(member, "extraInitializers"));
96896
96927
  if (isStatic(member)) {
96897
96928
  thisArg = classInfo2.classThis;
96898
96929
  }
@@ -96912,7 +96943,7 @@ ${lanes.join("\n")}
96912
96943
  memberDecoratorsName,
96913
96944
  context2,
96914
96945
  initializersName,
96915
- extraInitializers
96946
+ extraInitializersName
96916
96947
  );
96917
96948
  const esDecorateStatement = factory2.createExpressionStatement(esDecorateExpression);
96918
96949
  setSourceMapRange(esDecorateStatement, moveRangePastDecorators(member));
@@ -96927,7 +96958,7 @@ ${lanes.join("\n")}
96927
96958
  if (!some(modifiers) && (isMethodDeclaration(member) || isPropertyDeclaration(member))) {
96928
96959
  setEmitFlags(name, 1024 /* NoLeadingComments */);
96929
96960
  }
96930
- return { modifiers, referencedName, name, initializersName, descriptorName, thisArg };
96961
+ return { modifiers, referencedName, name, initializersName, extraInitializersName, descriptorName, thisArg };
96931
96962
  }
96932
96963
  function visitMethodDeclaration(node) {
96933
96964
  enterClassElement(node);
@@ -97000,9 +97031,27 @@ ${lanes.join("\n")}
97000
97031
  result = visitEachChild(node, visitor, context);
97001
97032
  classThis = savedClassThis;
97002
97033
  } else {
97003
- if (classInfo)
97034
+ node = visitEachChild(node, visitor, context);
97035
+ result = node;
97036
+ if (classInfo) {
97004
97037
  classInfo.hasStaticInitializers = true;
97005
- result = visitEachChild(node, visitor, context);
97038
+ if (some(classInfo.pendingStaticInitializers)) {
97039
+ const statements = [];
97040
+ for (const initializer of classInfo.pendingStaticInitializers) {
97041
+ const initializerStatement = factory2.createExpressionStatement(initializer);
97042
+ setSourceMapRange(initializerStatement, getSourceMapRange(initializer));
97043
+ statements.push(initializerStatement);
97044
+ }
97045
+ const body = factory2.createBlock(
97046
+ statements,
97047
+ /*multiLine*/
97048
+ true
97049
+ );
97050
+ const staticBlock = factory2.createClassStaticBlockDeclaration(body);
97051
+ result = [staticBlock, result];
97052
+ classInfo.pendingStaticInitializers = void 0;
97053
+ }
97054
+ }
97006
97055
  }
97007
97056
  exitClassElement();
97008
97057
  return result;
@@ -97013,7 +97062,7 @@ ${lanes.join("\n")}
97013
97062
  }
97014
97063
  enterClassElement(node);
97015
97064
  Debug.assert(!isAmbientPropertyDeclaration(node), "Not yet implemented.");
97016
- const { modifiers, name, initializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
97065
+ const { modifiers, name, initializersName, extraInitializersName, descriptorName, thisArg } = partialTransformClassElement(node, classInfo, hasAccessorModifier(node) ? createAccessorPropertyDescriptorObject : void 0);
97017
97066
  startLexicalEnvironment();
97018
97067
  let initializer = visitNode(node.initializer, visitor, isExpression);
97019
97068
  if (initializersName) {
@@ -97023,17 +97072,6 @@ ${lanes.join("\n")}
97023
97072
  initializer ?? factory2.createVoidZero()
97024
97073
  );
97025
97074
  }
97026
- if (!isStatic(node) && (classInfo == null ? void 0 : classInfo.instanceExtraInitializersName) && !(classInfo == null ? void 0 : classInfo.hasInjectedInstanceInitializers)) {
97027
- classInfo.hasInjectedInstanceInitializers = true;
97028
- initializer ?? (initializer = factory2.createVoidZero());
97029
- initializer = factory2.createParenthesizedExpression(factory2.createComma(
97030
- emitHelpers().createRunInitializersHelper(
97031
- factory2.createThis(),
97032
- classInfo.instanceExtraInitializersName
97033
- ),
97034
- initializer
97035
- ));
97036
- }
97037
97075
  if (isStatic(node) && classInfo && initializer) {
97038
97076
  classInfo.hasStaticInitializers = true;
97039
97077
  }
@@ -97044,6 +97082,41 @@ ${lanes.join("\n")}
97044
97082
  factory2.createReturnStatement(initializer)
97045
97083
  ]);
97046
97084
  }
97085
+ if (classInfo) {
97086
+ if (isStatic(node)) {
97087
+ initializer = injectPendingInitializers(
97088
+ classInfo,
97089
+ /*isStatic*/
97090
+ true,
97091
+ initializer
97092
+ );
97093
+ if (extraInitializersName) {
97094
+ classInfo.pendingStaticInitializers ?? (classInfo.pendingStaticInitializers = []);
97095
+ classInfo.pendingStaticInitializers.push(
97096
+ emitHelpers().createRunInitializersHelper(
97097
+ classInfo.classThis ?? factory2.createThis(),
97098
+ extraInitializersName
97099
+ )
97100
+ );
97101
+ }
97102
+ } else {
97103
+ initializer = injectPendingInitializers(
97104
+ classInfo,
97105
+ /*isStatic*/
97106
+ false,
97107
+ initializer
97108
+ );
97109
+ if (extraInitializersName) {
97110
+ classInfo.pendingInstanceInitializers ?? (classInfo.pendingInstanceInitializers = []);
97111
+ classInfo.pendingInstanceInitializers.push(
97112
+ emitHelpers().createRunInitializersHelper(
97113
+ factory2.createThis(),
97114
+ extraInitializersName
97115
+ )
97116
+ );
97117
+ }
97118
+ }
97119
+ }
97047
97120
  exitClassElement();
97048
97121
  if (hasAccessorModifier(node) && descriptorName) {
97049
97122
  const commentRange = getCommentRange(node);
@@ -97458,19 +97531,41 @@ ${lanes.join("\n")}
97458
97531
  const expression = visitNode(node.expression, visitorFunc, isExpression);
97459
97532
  return factory2.updatePartiallyEmittedExpression(node, expression);
97460
97533
  }
97461
- function injectPendingExpressions(expression) {
97462
- if (some(pendingExpressions)) {
97463
- if (isParenthesizedExpression(expression)) {
97464
- pendingExpressions.push(expression.expression);
97465
- expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions));
97534
+ function injectPendingExpressionsCommon(pendingExpressions2, expression) {
97535
+ if (some(pendingExpressions2)) {
97536
+ if (expression) {
97537
+ if (isParenthesizedExpression(expression)) {
97538
+ pendingExpressions2.push(expression.expression);
97539
+ expression = factory2.updateParenthesizedExpression(expression, factory2.inlineExpressions(pendingExpressions2));
97540
+ } else {
97541
+ pendingExpressions2.push(expression);
97542
+ expression = factory2.inlineExpressions(pendingExpressions2);
97543
+ }
97466
97544
  } else {
97467
- pendingExpressions.push(expression);
97468
- expression = factory2.inlineExpressions(pendingExpressions);
97545
+ expression = factory2.inlineExpressions(pendingExpressions2);
97469
97546
  }
97470
- pendingExpressions = void 0;
97471
97547
  }
97472
97548
  return expression;
97473
97549
  }
97550
+ function injectPendingExpressions(expression) {
97551
+ const result = injectPendingExpressionsCommon(pendingExpressions, expression);
97552
+ Debug.assertIsDefined(result);
97553
+ if (result !== expression) {
97554
+ pendingExpressions = void 0;
97555
+ }
97556
+ return result;
97557
+ }
97558
+ function injectPendingInitializers(classInfo2, isStatic2, expression) {
97559
+ const result = injectPendingExpressionsCommon(isStatic2 ? classInfo2.pendingStaticInitializers : classInfo2.pendingInstanceInitializers, expression);
97560
+ if (result !== expression) {
97561
+ if (isStatic2) {
97562
+ classInfo2.pendingStaticInitializers = void 0;
97563
+ } else {
97564
+ classInfo2.pendingInstanceInitializers = void 0;
97565
+ }
97566
+ }
97567
+ return result;
97568
+ }
97474
97569
  function transformAllDecoratorsOfDeclaration(allDecorators) {
97475
97570
  if (!allDecorators) {
97476
97571
  return void 0;
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@typescript-deploys/pr-build",
3
3
  "author": "Microsoft Corp.",
4
4
  "homepage": "https://www.typescriptlang.org/",
5
- "version": "5.4.0-pr-56859-8",
5
+ "version": "5.4.0-pr-56967-3",
6
6
  "license": "Apache-2.0",
7
7
  "description": "TypeScript is a language for application scale JavaScript development",
8
8
  "keywords": [
@@ -114,5 +114,5 @@
114
114
  "node": "20.1.0",
115
115
  "npm": "8.19.4"
116
116
  },
117
- "gitHead": "8f655f85c9fd59b743309dc0ade1e183c9f8ffc2"
117
+ "gitHead": "dc51ab57d755d1bb5f700d7d8eb3ba1f04c33bc5"
118
118
  }