Skip to content

Commit 6e4aa90

Browse files
typescript-bottypescript-bot
committed
Bump version to 5.1.6 and LKG
1 parent ac5884a commit 6e4aa90

File tree

7 files changed

+47
-67
lines changed

7 files changed

+47
-67
lines changed

‎lib/tsc.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and limitations under the License.
1818

1919
// src/compiler/corePublic.ts
2020
var versionMajorMinor = "5.1";
21-
var version = "5.1.5";
21+
var version = "5.1.6";
2222

2323
// src/compiler/core.ts
2424
var emptyArray = [];
@@ -52642,19 +52642,13 @@ function createTypeChecker(host) {
5264252642
if (getObjectFlags(type) & 4 /* Reference */) {
5264352643
const target = type.target;
5264452644
const typeArguments = getTypeArguments(type);
52645-
if (length(target.typeParameters) === length(typeArguments)) {
52646-
const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
52647-
return needApparentType ? getApparentType(ref) : ref;
52648-
}
52645+
return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
5264952646
} else if (type.flags & 2097152 /* Intersection */) {
5265052647
const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
5265152648
return types !== type.types ? getIntersectionType(types) : type;
5265252649
}
5265352650
return needApparentType ? getApparentType(type) : type;
5265452651
}
52655-
function getThisArgument(type) {
52656-
return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
52657-
}
5265852652
function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
5265952653
let mapper;
5266052654
let members;
@@ -53720,7 +53714,7 @@ function createTypeChecker(host) {
5372053714
return type.resolvedBaseConstraint;
5372153715
}
5372253716
const stack = [];
53723-
return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
53717+
return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
5372453718
function getImmediateBaseConstraint(t) {
5372553719
if (!t.immediateBaseConstraint) {
5372653720
if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -53812,18 +53806,18 @@ function createTypeChecker(host) {
5381253806
}
5381353807
if (isGenericTupleType(t)) {
5381453808
const newElements = map(getElementTypes(t), (v, i) => {
53815-
const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
53816-
return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
53809+
const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
53810+
return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
5381753811
});
5381853812
return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
5381953813
}
5382053814
return t;
5382153815
}
5382253816
}
53823-
function getApparentTypeOfIntersectionType(type) {
53817+
function getApparentTypeOfIntersectionType(type, thisArgument) {
5382453818
return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
5382553819
type,
53826-
type,
53820+
thisArgument,
5382753821
/*needApparentType*/
5382853822
true
5382953823
));
@@ -53874,8 +53868,9 @@ function createTypeChecker(host) {
5387453868
return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
5387553869
}
5387653870
function getApparentType(type) {
53877-
const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
53878-
return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
53871+
const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
53872+
const objectFlags = getObjectFlags(t);
53873+
return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
5387953874
}
5388053875
function getReducedApparentType(type) {
5388153876
return getReducedType(getApparentType(getReducedType(type)));
@@ -60663,7 +60658,7 @@ function createTypeChecker(host) {
6066360658
return 3 /* Maybe */;
6066460659
}
6066560660
const c = target2;
60666-
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
60661+
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
6066760662
const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
6066860663
const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
6066960664
if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(

‎lib/tsserver.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
23042304

23052305
// src/compiler/corePublic.ts
23062306
var versionMajorMinor = "5.1";
2307-
var version = "5.1.5";
2307+
var version = "5.1.6";
23082308
var Comparison = /* @__PURE__ */ ((Comparison3) => {
23092309
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
23102310
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -57293,19 +57293,13 @@ function createTypeChecker(host) {
5729357293
if (getObjectFlags(type) & 4 /* Reference */) {
5729457294
const target = type.target;
5729557295
const typeArguments = getTypeArguments(type);
57296-
if (length(target.typeParameters) === length(typeArguments)) {
57297-
const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
57298-
return needApparentType ? getApparentType(ref) : ref;
57299-
}
57296+
return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
5730057297
} else if (type.flags & 2097152 /* Intersection */) {
5730157298
const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
5730257299
return types !== type.types ? getIntersectionType(types) : type;
5730357300
}
5730457301
return needApparentType ? getApparentType(type) : type;
5730557302
}
57306-
function getThisArgument(type) {
57307-
return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
57308-
}
5730957303
function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
5731057304
let mapper;
5731157305
let members;
@@ -58371,7 +58365,7 @@ function createTypeChecker(host) {
5837158365
return type.resolvedBaseConstraint;
5837258366
}
5837358367
const stack = [];
58374-
return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
58368+
return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
5837558369
function getImmediateBaseConstraint(t) {
5837658370
if (!t.immediateBaseConstraint) {
5837758371
if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -58463,18 +58457,18 @@ function createTypeChecker(host) {
5846358457
}
5846458458
if (isGenericTupleType(t)) {
5846558459
const newElements = map(getElementTypes(t), (v, i) => {
58466-
const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
58467-
return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
58460+
const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
58461+
return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
5846858462
});
5846958463
return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
5847058464
}
5847158465
return t;
5847258466
}
5847358467
}
58474-
function getApparentTypeOfIntersectionType(type) {
58468+
function getApparentTypeOfIntersectionType(type, thisArgument) {
5847558469
return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
5847658470
type,
58477-
type,
58471+
thisArgument,
5847858472
/*needApparentType*/
5847958473
true
5848058474
));
@@ -58525,8 +58519,9 @@ function createTypeChecker(host) {
5852558519
return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
5852658520
}
5852758521
function getApparentType(type) {
58528-
const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
58529-
return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
58522+
const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
58523+
const objectFlags = getObjectFlags(t);
58524+
return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
5853058525
}
5853158526
function getReducedApparentType(type) {
5853258527
return getReducedType(getApparentType(getReducedType(type)));
@@ -65314,7 +65309,7 @@ function createTypeChecker(host) {
6531465309
return 3 /* Maybe */;
6531565310
}
6531665311
const c = target2;
65317-
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
65312+
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
6531865313
const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
6531965314
const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
6532065315
if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(

‎lib/tsserverlibrary.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var ts = (() => {
3535
"src/compiler/corePublic.ts"() {
3636
"use strict";
3737
versionMajorMinor = "5.1";
38-
version = "5.1.5";
38+
version = "5.1.6";
3939
Comparison = /* @__PURE__ */ ((Comparison3) => {
4040
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
4141
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -55084,19 +55084,13 @@ ${lanes.join("\n")}
5508455084
if (getObjectFlags(type) & 4 /* Reference */) {
5508555085
const target = type.target;
5508655086
const typeArguments = getTypeArguments(type);
55087-
if (length(target.typeParameters) === length(typeArguments)) {
55088-
const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
55089-
return needApparentType ? getApparentType(ref) : ref;
55090-
}
55087+
return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
5509155088
} else if (type.flags & 2097152 /* Intersection */) {
5509255089
const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
5509355090
return types !== type.types ? getIntersectionType(types) : type;
5509455091
}
5509555092
return needApparentType ? getApparentType(type) : type;
5509655093
}
55097-
function getThisArgument(type) {
55098-
return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
55099-
}
5510055094
function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
5510155095
let mapper;
5510255096
let members;
@@ -56162,7 +56156,7 @@ ${lanes.join("\n")}
5616256156
return type.resolvedBaseConstraint;
5616356157
}
5616456158
const stack = [];
56165-
return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
56159+
return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
5616656160
function getImmediateBaseConstraint(t) {
5616756161
if (!t.immediateBaseConstraint) {
5616856162
if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -56254,18 +56248,18 @@ ${lanes.join("\n")}
5625456248
}
5625556249
if (isGenericTupleType(t)) {
5625656250
const newElements = map(getElementTypes(t), (v, i) => {
56257-
const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
56258-
return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
56251+
const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
56252+
return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
5625956253
});
5626056254
return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
5626156255
}
5626256256
return t;
5626356257
}
5626456258
}
56265-
function getApparentTypeOfIntersectionType(type) {
56259+
function getApparentTypeOfIntersectionType(type, thisArgument) {
5626656260
return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
5626756261
type,
56268-
type,
56262+
thisArgument,
5626956263
/*needApparentType*/
5627056264
true
5627156265
));
@@ -56316,8 +56310,9 @@ ${lanes.join("\n")}
5631656310
return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
5631756311
}
5631856312
function getApparentType(type) {
56319-
const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
56320-
return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
56313+
const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
56314+
const objectFlags = getObjectFlags(t);
56315+
return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
5632156316
}
5632256317
function getReducedApparentType(type) {
5632356318
return getReducedType(getApparentType(getReducedType(type)));
@@ -63105,7 +63100,7 @@ ${lanes.join("\n")}
6310563100
return 3 /* Maybe */;
6310663101
}
6310763102
const c = target2;
63108-
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
63103+
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
6310963104
const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
6311063105
const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
6311163106
if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(

0 commit comments

Comments
 (0)