@typescript-deploys/pr-build 5.3.0-pr-56131-2 → 5.3.0-pr-56140-8

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
@@ -18,7 +18,7 @@ and limitations under the License.
18
18
 
19
19
  // src/compiler/corePublic.ts
20
20
  var versionMajorMinor = "5.3";
21
- var version = `${versionMajorMinor}.0-insiders.20231016`;
21
+ var version = `${versionMajorMinor}.0-insiders.20231017`;
22
22
 
23
23
  // src/compiler/core.ts
24
24
  var emptyArray = [];
@@ -61099,13 +61099,13 @@ function createTypeChecker(host) {
61099
61099
  if (recursionFlags & 1 /* Source */) {
61100
61100
  sourceStack[sourceDepth] = source2;
61101
61101
  sourceDepth++;
61102
- if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth))
61102
+ if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth, 5))
61103
61103
  expandingFlags |= 1 /* Source */;
61104
61104
  }
61105
61105
  if (recursionFlags & 2 /* Target */) {
61106
61106
  targetStack[targetDepth] = target2;
61107
61107
  targetDepth++;
61108
- if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth))
61108
+ if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth, 5))
61109
61109
  expandingFlags |= 2 /* Target */;
61110
61110
  }
61111
61111
  let originalHandler;
@@ -62724,7 +62724,7 @@ function createTypeChecker(host) {
62724
62724
  function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
62725
62725
  return forEachProperty(prop, (p) => getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ? !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? void 0 : checkClass;
62726
62726
  }
62727
- function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
62727
+ function isDeeplyNestedType(type, stack, depth, maxDepth) {
62728
62728
  if (depth >= maxDepth) {
62729
62729
  if (type.flags & 2097152 /* Intersection */) {
62730
62730
  return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
package/lib/tsserver.js CHANGED
@@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(server_exports);
2328
2328
 
2329
2329
  // src/compiler/corePublic.ts
2330
2330
  var versionMajorMinor = "5.3";
2331
- var version = `${versionMajorMinor}.0-insiders.20231016`;
2331
+ var version = `${versionMajorMinor}.0-insiders.20231017`;
2332
2332
  var Comparison = /* @__PURE__ */ ((Comparison3) => {
2333
2333
  Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
2334
2334
  Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -65811,13 +65811,13 @@ function createTypeChecker(host) {
65811
65811
  if (recursionFlags & 1 /* Source */) {
65812
65812
  sourceStack[sourceDepth] = source2;
65813
65813
  sourceDepth++;
65814
- if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth))
65814
+ if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth, 5))
65815
65815
  expandingFlags |= 1 /* Source */;
65816
65816
  }
65817
65817
  if (recursionFlags & 2 /* Target */) {
65818
65818
  targetStack[targetDepth] = target2;
65819
65819
  targetDepth++;
65820
- if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth))
65820
+ if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth, 5))
65821
65821
  expandingFlags |= 2 /* Target */;
65822
65822
  }
65823
65823
  let originalHandler;
@@ -67436,7 +67436,7 @@ function createTypeChecker(host) {
67436
67436
  function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
67437
67437
  return forEachProperty2(prop, (p) => getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ? !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? void 0 : checkClass;
67438
67438
  }
67439
- function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
67439
+ function isDeeplyNestedType(type, stack, depth, maxDepth) {
67440
67440
  if (depth >= maxDepth) {
67441
67441
  if (type.flags & 2097152 /* Intersection */) {
67442
67442
  return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
@@ -138605,46 +138605,26 @@ function getRangeToExtract(context, considerEmptySpans = true) {
138605
138605
  const current = getTokenAtPosition(file, startPosition);
138606
138606
  const range = createTextRangeFromSpan(getRefactorContextSpan(context));
138607
138607
  const cursorRequest = range.pos === range.end && considerEmptySpans;
138608
- const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
138609
- if (!firstType || !isTypeNode(firstType))
138608
+ const selection = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
138609
+ if (!selection || !isTypeNode(selection))
138610
138610
  return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
138611
138611
  const checker = context.program.getTypeChecker();
138612
- const enclosingNode = getEnclosingNode(firstType, isJS);
138612
+ const enclosingNode = getEnclosingNode(selection, isJS);
138613
138613
  if (enclosingNode === void 0)
138614
138614
  return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
138615
- const typeList = [];
138616
- if ((isUnionTypeNode(firstType.parent) || isIntersectionTypeNode(firstType.parent)) && range.end > firstType.end) {
138617
- addRange(
138618
- typeList,
138619
- firstType.parent.types.filter((type) => {
138620
- return type.getStart() >= range.pos && type.getEnd() <= range.end;
138621
- })
138622
- );
138623
- }
138624
- const selection = typeList.length > 1 ? typeList : firstType;
138625
138615
  const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
138626
138616
  if (!typeParameters)
138627
138617
  return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
138628
138618
  const typeElements = flattenTypeLiteralNodeReference(checker, selection);
138629
138619
  return { isJS, selection, enclosingNode, typeParameters, typeElements };
138630
138620
  }
138631
- function flattenTypeLiteralNodeReference(checker, selection) {
138632
- if (!selection)
138621
+ function flattenTypeLiteralNodeReference(checker, node) {
138622
+ if (!node)
138633
138623
  return void 0;
138634
- if (isArray(selection)) {
138635
- const result = [];
138636
- for (const type of selection) {
138637
- const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
138638
- if (!flattenedTypeMembers)
138639
- return void 0;
138640
- addRange(result, flattenedTypeMembers);
138641
- }
138642
- return result;
138643
- }
138644
- if (isIntersectionTypeNode(selection)) {
138624
+ if (isIntersectionTypeNode(node)) {
138645
138625
  const result = [];
138646
138626
  const seen = /* @__PURE__ */ new Map();
138647
- for (const type of selection.types) {
138627
+ for (const type of node.types) {
138648
138628
  const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
138649
138629
  if (!flattenedTypeMembers || !flattenedTypeMembers.every((type2) => type2.name && addToSeen(seen, getNameFromPropertyName(type2.name)))) {
138650
138630
  return void 0;
@@ -138652,30 +138632,18 @@ function flattenTypeLiteralNodeReference(checker, selection) {
138652
138632
  addRange(result, flattenedTypeMembers);
138653
138633
  }
138654
138634
  return result;
138655
- } else if (isParenthesizedTypeNode(selection)) {
138656
- return flattenTypeLiteralNodeReference(checker, selection.type);
138657
- } else if (isTypeLiteralNode(selection)) {
138658
- return selection.members;
138635
+ } else if (isParenthesizedTypeNode(node)) {
138636
+ return flattenTypeLiteralNodeReference(checker, node.type);
138637
+ } else if (isTypeLiteralNode(node)) {
138638
+ return node.members;
138659
138639
  }
138660
138640
  return void 0;
138661
138641
  }
138662
138642
  function rangeContainsSkipTrivia(r1, node, file) {
138663
- const r1Range = arrayToNode(r1);
138664
- const nodeRange = arrayToNode(node);
138665
- return rangeContainsStartEnd(r1Range, skipTrivia(file.text, nodeRange.pos), nodeRange.end);
138666
- function arrayToNode(rangeOrArray) {
138667
- return isArray(rangeOrArray) ? { pos: rangeOrArray[0].pos, end: rangeOrArray[rangeOrArray.length - 1].end } : rangeOrArray;
138668
- }
138643
+ return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
138669
138644
  }
138670
138645
  function collectTypeParameters(checker, selection, enclosingNode, file) {
138671
138646
  const result = [];
138672
- if (isArray(selection)) {
138673
- selection.forEach((t) => {
138674
- if (!visitor(t))
138675
- return void 0;
138676
- });
138677
- return result;
138678
- }
138679
138647
  return visitor(selection) ? void 0 : result;
138680
138648
  function visitor(node) {
138681
138649
  if (isTypeReferenceNode(node)) {
@@ -138736,62 +138704,32 @@ function collectTypeParameters(checker, selection, enclosingNode, file) {
138736
138704
  }
138737
138705
  function doTypeAliasChange(changes, file, name, info) {
138738
138706
  const { enclosingNode, selection, typeParameters } = info;
138739
- if (isArray(selection)) {
138740
- const newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
138741
- const newTypeDeclaration = factory.createTypeAliasDeclaration(
138742
- /*modifiers*/
138743
- void 0,
138744
- name,
138745
- typeParameters.map((id) => factory.updateTypeParameterDeclaration(
138746
- id,
138747
- id.modifiers,
138748
- id.name,
138749
- id.constraint,
138750
- /*defaultType*/
138751
- void 0
138752
- )),
138753
- newTypeValue
138754
- );
138755
- changes.insertNodeBefore(
138756
- file,
138757
- enclosingNode,
138758
- ignoreSourceNewlines(newTypeDeclaration),
138759
- /*blankLineBetween*/
138760
- true
138761
- );
138762
- changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138763
- id.name,
138764
- /*typeArguments*/
138765
- void 0
138766
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
138767
- } else {
138768
- const newTypeNode = factory.createTypeAliasDeclaration(
138769
- /*modifiers*/
138770
- void 0,
138771
- name,
138772
- typeParameters.map((id) => factory.updateTypeParameterDeclaration(
138773
- id,
138774
- id.modifiers,
138775
- id.name,
138776
- id.constraint,
138777
- /*defaultType*/
138778
- void 0
138779
- )),
138780
- selection
138781
- );
138782
- changes.insertNodeBefore(
138783
- file,
138784
- enclosingNode,
138785
- ignoreSourceNewlines(newTypeNode),
138786
- /*blankLineBetween*/
138787
- true
138788
- );
138789
- changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138707
+ const newTypeNode = factory.createTypeAliasDeclaration(
138708
+ /*modifiers*/
138709
+ void 0,
138710
+ name,
138711
+ typeParameters.map((id) => factory.updateTypeParameterDeclaration(
138712
+ id,
138713
+ id.modifiers,
138790
138714
  id.name,
138791
- /*typeArguments*/
138715
+ id.constraint,
138716
+ /*defaultType*/
138792
138717
  void 0
138793
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
138794
- }
138718
+ )),
138719
+ selection
138720
+ );
138721
+ changes.insertNodeBefore(
138722
+ file,
138723
+ enclosingNode,
138724
+ ignoreSourceNewlines(newTypeNode),
138725
+ /*blankLineBetween*/
138726
+ true
138727
+ );
138728
+ changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138729
+ id.name,
138730
+ /*typeArguments*/
138731
+ void 0
138732
+ ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
138795
138733
  }
138796
138734
  function doInterfaceChange(changes, file, name, info) {
138797
138735
  var _a;
@@ -138813,36 +138751,19 @@ function doInterfaceChange(changes, file, name, info) {
138813
138751
  /*blankLineBetween*/
138814
138752
  true
138815
138753
  );
138816
- if (isArray(selection)) {
138817
- changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138818
- id.name,
138819
- /*typeArguments*/
138820
- void 0
138821
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
138822
- } else {
138823
- changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138824
- id.name,
138825
- /*typeArguments*/
138826
- void 0
138827
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
138828
- }
138754
+ changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138755
+ id.name,
138756
+ /*typeArguments*/
138757
+ void 0
138758
+ ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
138829
138759
  }
138830
138760
  function doTypedefChange(changes, context, file, name, info) {
138831
138761
  var _a;
138832
138762
  const { enclosingNode, selection, typeParameters } = info;
138833
- let newTypeValue;
138834
- if (isArray(selection)) {
138835
- selection.forEach((typeNode) => {
138836
- setEmitFlags(typeNode, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
138837
- });
138838
- newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
138839
- } else {
138840
- setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
138841
- newTypeValue = selection;
138842
- }
138763
+ setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
138843
138764
  const node = factory.createJSDocTypedefTag(
138844
138765
  factory.createIdentifier("typedef"),
138845
- factory.createJSDocTypeExpression(newTypeValue),
138766
+ factory.createJSDocTypeExpression(selection),
138846
138767
  factory.createIdentifier(name)
138847
138768
  );
138848
138769
  const templates = [];
@@ -138880,19 +138801,11 @@ function doTypedefChange(changes, context, file, name, info) {
138880
138801
  true
138881
138802
  );
138882
138803
  }
138883
- if (isArray(selection)) {
138884
- changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138885
- id.name,
138886
- /*typeArguments*/
138887
- void 0
138888
- ))));
138889
- } else {
138890
- changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138891
- id.name,
138892
- /*typeArguments*/
138893
- void 0
138894
- ))));
138895
- }
138804
+ changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
138805
+ id.name,
138806
+ /*typeArguments*/
138807
+ void 0
138808
+ ))));
138896
138809
  }
138897
138810
  function getEnclosingNode(node, isJS) {
138898
138811
  return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);
package/lib/typescript.js CHANGED
@@ -35,7 +35,7 @@ var ts = (() => {
35
35
  "src/compiler/corePublic.ts"() {
36
36
  "use strict";
37
37
  versionMajorMinor = "5.3";
38
- version = `${versionMajorMinor}.0-insiders.20231016`;
38
+ version = `${versionMajorMinor}.0-insiders.20231017`;
39
39
  Comparison = /* @__PURE__ */ ((Comparison3) => {
40
40
  Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
41
41
  Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -63578,13 +63578,13 @@ ${lanes.join("\n")}
63578
63578
  if (recursionFlags & 1 /* Source */) {
63579
63579
  sourceStack[sourceDepth] = source2;
63580
63580
  sourceDepth++;
63581
- if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth))
63581
+ if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source2, sourceStack, sourceDepth, 5))
63582
63582
  expandingFlags |= 1 /* Source */;
63583
63583
  }
63584
63584
  if (recursionFlags & 2 /* Target */) {
63585
63585
  targetStack[targetDepth] = target2;
63586
63586
  targetDepth++;
63587
- if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth))
63587
+ if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target2, targetStack, targetDepth, 5))
63588
63588
  expandingFlags |= 2 /* Target */;
63589
63589
  }
63590
63590
  let originalHandler;
@@ -65203,7 +65203,7 @@ ${lanes.join("\n")}
65203
65203
  function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
65204
65204
  return forEachProperty2(prop, (p) => getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ? !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? void 0 : checkClass;
65205
65205
  }
65206
- function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
65206
+ function isDeeplyNestedType(type, stack, depth, maxDepth) {
65207
65207
  if (depth >= maxDepth) {
65208
65208
  if (type.flags & 2097152 /* Intersection */) {
65209
65209
  return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
@@ -136916,46 +136916,26 @@ ${lanes.join("\n")}
136916
136916
  const current = getTokenAtPosition(file, startPosition);
136917
136917
  const range = createTextRangeFromSpan(getRefactorContextSpan(context));
136918
136918
  const cursorRequest = range.pos === range.end && considerEmptySpans;
136919
- const firstType = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
136920
- if (!firstType || !isTypeNode(firstType))
136919
+ const selection = findAncestor(current, (node) => node.parent && isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && (cursorRequest || nodeOverlapsWithStartEnd(current, file, range.pos, range.end)));
136920
+ if (!selection || !isTypeNode(selection))
136921
136921
  return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
136922
136922
  const checker = context.program.getTypeChecker();
136923
- const enclosingNode = getEnclosingNode(firstType, isJS);
136923
+ const enclosingNode = getEnclosingNode(selection, isJS);
136924
136924
  if (enclosingNode === void 0)
136925
136925
  return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
136926
- const typeList = [];
136927
- if ((isUnionTypeNode(firstType.parent) || isIntersectionTypeNode(firstType.parent)) && range.end > firstType.end) {
136928
- addRange(
136929
- typeList,
136930
- firstType.parent.types.filter((type) => {
136931
- return type.getStart() >= range.pos && type.getEnd() <= range.end;
136932
- })
136933
- );
136934
- }
136935
- const selection = typeList.length > 1 ? typeList : firstType;
136936
136926
  const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
136937
136927
  if (!typeParameters)
136938
136928
  return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
136939
136929
  const typeElements = flattenTypeLiteralNodeReference(checker, selection);
136940
136930
  return { isJS, selection, enclosingNode, typeParameters, typeElements };
136941
136931
  }
136942
- function flattenTypeLiteralNodeReference(checker, selection) {
136943
- if (!selection)
136932
+ function flattenTypeLiteralNodeReference(checker, node) {
136933
+ if (!node)
136944
136934
  return void 0;
136945
- if (isArray(selection)) {
136946
- const result = [];
136947
- for (const type of selection) {
136948
- const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
136949
- if (!flattenedTypeMembers)
136950
- return void 0;
136951
- addRange(result, flattenedTypeMembers);
136952
- }
136953
- return result;
136954
- }
136955
- if (isIntersectionTypeNode(selection)) {
136935
+ if (isIntersectionTypeNode(node)) {
136956
136936
  const result = [];
136957
136937
  const seen = /* @__PURE__ */ new Map();
136958
- for (const type of selection.types) {
136938
+ for (const type of node.types) {
136959
136939
  const flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type);
136960
136940
  if (!flattenedTypeMembers || !flattenedTypeMembers.every((type2) => type2.name && addToSeen(seen, getNameFromPropertyName(type2.name)))) {
136961
136941
  return void 0;
@@ -136963,30 +136943,18 @@ ${lanes.join("\n")}
136963
136943
  addRange(result, flattenedTypeMembers);
136964
136944
  }
136965
136945
  return result;
136966
- } else if (isParenthesizedTypeNode(selection)) {
136967
- return flattenTypeLiteralNodeReference(checker, selection.type);
136968
- } else if (isTypeLiteralNode(selection)) {
136969
- return selection.members;
136946
+ } else if (isParenthesizedTypeNode(node)) {
136947
+ return flattenTypeLiteralNodeReference(checker, node.type);
136948
+ } else if (isTypeLiteralNode(node)) {
136949
+ return node.members;
136970
136950
  }
136971
136951
  return void 0;
136972
136952
  }
136973
136953
  function rangeContainsSkipTrivia(r1, node, file) {
136974
- const r1Range = arrayToNode(r1);
136975
- const nodeRange = arrayToNode(node);
136976
- return rangeContainsStartEnd(r1Range, skipTrivia(file.text, nodeRange.pos), nodeRange.end);
136977
- function arrayToNode(rangeOrArray) {
136978
- return isArray(rangeOrArray) ? { pos: rangeOrArray[0].pos, end: rangeOrArray[rangeOrArray.length - 1].end } : rangeOrArray;
136979
- }
136954
+ return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
136980
136955
  }
136981
136956
  function collectTypeParameters(checker, selection, enclosingNode, file) {
136982
136957
  const result = [];
136983
- if (isArray(selection)) {
136984
- selection.forEach((t) => {
136985
- if (!visitor(t))
136986
- return void 0;
136987
- });
136988
- return result;
136989
- }
136990
136958
  return visitor(selection) ? void 0 : result;
136991
136959
  function visitor(node) {
136992
136960
  if (isTypeReferenceNode(node)) {
@@ -137047,62 +137015,32 @@ ${lanes.join("\n")}
137047
137015
  }
137048
137016
  function doTypeAliasChange(changes, file, name, info) {
137049
137017
  const { enclosingNode, selection, typeParameters } = info;
137050
- if (isArray(selection)) {
137051
- const newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
137052
- const newTypeDeclaration = factory.createTypeAliasDeclaration(
137053
- /*modifiers*/
137054
- void 0,
137055
- name,
137056
- typeParameters.map((id) => factory.updateTypeParameterDeclaration(
137057
- id,
137058
- id.modifiers,
137059
- id.name,
137060
- id.constraint,
137061
- /*defaultType*/
137062
- void 0
137063
- )),
137064
- newTypeValue
137065
- );
137066
- changes.insertNodeBefore(
137067
- file,
137068
- enclosingNode,
137069
- ignoreSourceNewlines(newTypeDeclaration),
137070
- /*blankLineBetween*/
137071
- true
137072
- );
137073
- changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137074
- id.name,
137075
- /*typeArguments*/
137076
- void 0
137077
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
137078
- } else {
137079
- const newTypeNode = factory.createTypeAliasDeclaration(
137080
- /*modifiers*/
137081
- void 0,
137082
- name,
137083
- typeParameters.map((id) => factory.updateTypeParameterDeclaration(
137084
- id,
137085
- id.modifiers,
137086
- id.name,
137087
- id.constraint,
137088
- /*defaultType*/
137089
- void 0
137090
- )),
137091
- selection
137092
- );
137093
- changes.insertNodeBefore(
137094
- file,
137095
- enclosingNode,
137096
- ignoreSourceNewlines(newTypeNode),
137097
- /*blankLineBetween*/
137098
- true
137099
- );
137100
- changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137018
+ const newTypeNode = factory.createTypeAliasDeclaration(
137019
+ /*modifiers*/
137020
+ void 0,
137021
+ name,
137022
+ typeParameters.map((id) => factory.updateTypeParameterDeclaration(
137023
+ id,
137024
+ id.modifiers,
137101
137025
  id.name,
137102
- /*typeArguments*/
137026
+ id.constraint,
137027
+ /*defaultType*/
137103
137028
  void 0
137104
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
137105
- }
137029
+ )),
137030
+ selection
137031
+ );
137032
+ changes.insertNodeBefore(
137033
+ file,
137034
+ enclosingNode,
137035
+ ignoreSourceNewlines(newTypeNode),
137036
+ /*blankLineBetween*/
137037
+ true
137038
+ );
137039
+ changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137040
+ id.name,
137041
+ /*typeArguments*/
137042
+ void 0
137043
+ ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
137106
137044
  }
137107
137045
  function doInterfaceChange(changes, file, name, info) {
137108
137046
  var _a;
@@ -137124,36 +137062,19 @@ ${lanes.join("\n")}
137124
137062
  /*blankLineBetween*/
137125
137063
  true
137126
137064
  );
137127
- if (isArray(selection)) {
137128
- changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137129
- id.name,
137130
- /*typeArguments*/
137131
- void 0
137132
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
137133
- } else {
137134
- changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137135
- id.name,
137136
- /*typeArguments*/
137137
- void 0
137138
- ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
137139
- }
137065
+ changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137066
+ id.name,
137067
+ /*typeArguments*/
137068
+ void 0
137069
+ ))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
137140
137070
  }
137141
137071
  function doTypedefChange(changes, context, file, name, info) {
137142
137072
  var _a;
137143
137073
  const { enclosingNode, selection, typeParameters } = info;
137144
- let newTypeValue;
137145
- if (isArray(selection)) {
137146
- selection.forEach((typeNode) => {
137147
- setEmitFlags(typeNode, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
137148
- });
137149
- newTypeValue = isUnionTypeNode(selection[0].parent) ? factory.createUnionTypeNode(selection) : factory.createIntersectionTypeNode(selection);
137150
- } else {
137151
- setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
137152
- newTypeValue = selection;
137153
- }
137074
+ setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
137154
137075
  const node = factory.createJSDocTypedefTag(
137155
137076
  factory.createIdentifier("typedef"),
137156
- factory.createJSDocTypeExpression(newTypeValue),
137077
+ factory.createJSDocTypeExpression(selection),
137157
137078
  factory.createIdentifier(name)
137158
137079
  );
137159
137080
  const templates = [];
@@ -137191,19 +137112,11 @@ ${lanes.join("\n")}
137191
137112
  true
137192
137113
  );
137193
137114
  }
137194
- if (isArray(selection)) {
137195
- changes.replaceNodeRange(file, selection[0], selection[selection.length - 1], factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137196
- id.name,
137197
- /*typeArguments*/
137198
- void 0
137199
- ))));
137200
- } else {
137201
- changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137202
- id.name,
137203
- /*typeArguments*/
137204
- void 0
137205
- ))));
137206
- }
137115
+ changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(
137116
+ id.name,
137117
+ /*typeArguments*/
137118
+ void 0
137119
+ ))));
137207
137120
  }
137208
137121
  function getEnclosingNode(node, isJS) {
137209
137122
  return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);
@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
54
54
 
55
55
  // src/compiler/corePublic.ts
56
56
  var versionMajorMinor = "5.3";
57
- var version = `${versionMajorMinor}.0-insiders.20231016`;
57
+ var version = `${versionMajorMinor}.0-insiders.20231017`;
58
58
 
59
59
  // src/compiler/core.ts
60
60
  var emptyArray = [];
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.3.0-pr-56131-2",
5
+ "version": "5.3.0-pr-56140-8",
6
6
  "license": "Apache-2.0",
7
7
  "description": "TypeScript is a language for application scale JavaScript development",
8
8
  "keywords": [
@@ -115,5 +115,5 @@
115
115
  "node": "20.1.0",
116
116
  "npm": "8.19.4"
117
117
  },
118
- "gitHead": "e200ac3a5a2ed19564bf2d945bff492fa5a9576f"
118
+ "gitHead": "d733d4564db3eaab91f3d0f37b66f160dd8746b2"
119
119
  }