@typescript-deploys/pr-build 5.4.0-pr-57362-11 → 5.4.0-pr-57394-2

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
@@ -58761,6 +58761,10 @@ function createTypeChecker(host) {
58761
58761
  }
58762
58762
  return type;
58763
58763
  }
58764
+ function maybeCloneTypeParameter(p) {
58765
+ const constraint = getConstraintOfTypeParameter(p);
58766
+ return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
58767
+ }
58764
58768
  function isSimpleTupleType(node) {
58765
58769
  return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
58766
58770
  }
@@ -58790,19 +58794,27 @@ function createTypeChecker(host) {
58790
58794
  const checkTypeDeferred = isDeferredType(checkType, checkTuples);
58791
58795
  let combinedMapper;
58792
58796
  if (root.inferTypeParameters) {
58797
+ const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
58798
+ const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
58793
58799
  const context = createInferenceContext(
58794
- root.inferTypeParameters,
58800
+ freshParams,
58795
58801
  /*signature*/
58796
58802
  void 0,
58797
58803
  0 /* None */
58798
58804
  );
58799
- if (mapper) {
58800
- context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
58805
+ if (freshMapper) {
58806
+ const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
58807
+ for (let i = 0; i < freshParams.length; i++) {
58808
+ if (freshParams[i] !== root.inferTypeParameters[i]) {
58809
+ freshParams[i].mapper = freshCombinedMapper;
58810
+ }
58811
+ }
58801
58812
  }
58802
58813
  if (!checkTypeDeferred) {
58803
- inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
58814
+ inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
58804
58815
  }
58805
- combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
58816
+ const innerMapper = combineTypeMappers(freshMapper, context.mapper);
58817
+ combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
58806
58818
  }
58807
58819
  const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
58808
58820
  if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
package/lib/tsserver.js CHANGED
@@ -63505,6 +63505,10 @@ function createTypeChecker(host) {
63505
63505
  }
63506
63506
  return type;
63507
63507
  }
63508
+ function maybeCloneTypeParameter(p) {
63509
+ const constraint = getConstraintOfTypeParameter(p);
63510
+ return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
63511
+ }
63508
63512
  function isSimpleTupleType(node) {
63509
63513
  return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
63510
63514
  }
@@ -63534,19 +63538,27 @@ function createTypeChecker(host) {
63534
63538
  const checkTypeDeferred = isDeferredType(checkType, checkTuples);
63535
63539
  let combinedMapper;
63536
63540
  if (root.inferTypeParameters) {
63541
+ const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
63542
+ const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
63537
63543
  const context = createInferenceContext(
63538
- root.inferTypeParameters,
63544
+ freshParams,
63539
63545
  /*signature*/
63540
63546
  void 0,
63541
63547
  0 /* None */
63542
63548
  );
63543
- if (mapper) {
63544
- context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
63549
+ if (freshMapper) {
63550
+ const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
63551
+ for (let i = 0; i < freshParams.length; i++) {
63552
+ if (freshParams[i] !== root.inferTypeParameters[i]) {
63553
+ freshParams[i].mapper = freshCombinedMapper;
63554
+ }
63555
+ }
63545
63556
  }
63546
63557
  if (!checkTypeDeferred) {
63547
- inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
63558
+ inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
63548
63559
  }
63549
- combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
63560
+ const innerMapper = combineTypeMappers(freshMapper, context.mapper);
63561
+ combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
63550
63562
  }
63551
63563
  const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
63552
63564
  if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -162281,7 +162293,7 @@ function isClassMemberCompletionKeyword(kind) {
162281
162293
  }
162282
162294
  }
162283
162295
  function isFunctionLikeBodyKeyword(kind) {
162284
- return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
162296
+ return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 160 /* UsingKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
162285
162297
  }
162286
162298
  function keywordForNode(node) {
162287
162299
  return isIdentifier(node) ? identifierToKeywordKind(node) ?? 0 /* Unknown */ : node.kind;
package/lib/typescript.js CHANGED
@@ -61260,6 +61260,10 @@ ${lanes.join("\n")}
61260
61260
  }
61261
61261
  return type;
61262
61262
  }
61263
+ function maybeCloneTypeParameter(p) {
61264
+ const constraint = getConstraintOfTypeParameter(p);
61265
+ return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
61266
+ }
61263
61267
  function isSimpleTupleType(node) {
61264
61268
  return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
61265
61269
  }
@@ -61289,19 +61293,27 @@ ${lanes.join("\n")}
61289
61293
  const checkTypeDeferred = isDeferredType(checkType, checkTuples);
61290
61294
  let combinedMapper;
61291
61295
  if (root.inferTypeParameters) {
61296
+ const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
61297
+ const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
61292
61298
  const context = createInferenceContext(
61293
- root.inferTypeParameters,
61299
+ freshParams,
61294
61300
  /*signature*/
61295
61301
  void 0,
61296
61302
  0 /* None */
61297
61303
  );
61298
- if (mapper) {
61299
- context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
61304
+ if (freshMapper) {
61305
+ const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
61306
+ for (let i = 0; i < freshParams.length; i++) {
61307
+ if (freshParams[i] !== root.inferTypeParameters[i]) {
61308
+ freshParams[i].mapper = freshCombinedMapper;
61309
+ }
61310
+ }
61300
61311
  }
61301
61312
  if (!checkTypeDeferred) {
61302
- inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
61313
+ inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
61303
61314
  }
61304
- combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
61315
+ const innerMapper = combineTypeMappers(freshMapper, context.mapper);
61316
+ combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
61305
61317
  }
61306
61318
  const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
61307
61319
  if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -161482,7 +161494,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
161482
161494
  }
161483
161495
  }
161484
161496
  function isFunctionLikeBodyKeyword(kind) {
161485
- return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
161497
+ return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 160 /* UsingKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
161486
161498
  }
161487
161499
  function keywordForNode(node) {
161488
161500
  return isIdentifier(node) ? identifierToKeywordKind(node) ?? 0 /* Unknown */ : node.kind;
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-57362-11",
5
+ "version": "5.4.0-pr-57394-2",
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": "6a042d1d41406f745adc233dbbf58577345334b4"
117
+ "gitHead": "ec97d1f0fe2ad4412ae48e3ac505991132949036"
118
118
  }