@@ -8432,7 +8432,13 @@ namespace ts {
8432
8432
if (target.flags & TypeFlags.Never) return false;
8433
8433
if (target.flags & TypeFlags.Any || source.flags & TypeFlags.Never) return true;
8434
8434
if (source.flags & TypeFlags.StringLike && target.flags & TypeFlags.String) return true;
8435
+ if (source.flags & TypeFlags.StringLiteral && source.flags & TypeFlags.EnumLiteral &&
8436
+ target.flags & TypeFlags.StringLiteral && !(target.flags & TypeFlags.EnumLiteral) &&
8437
+ (<LiteralType>source).value === (<LiteralType>target).value) return true;
8435
8438
if (source.flags & TypeFlags.NumberLike && target.flags & TypeFlags.Number) return true;
8439
+ if (source.flags & TypeFlags.NumberLiteral && source.flags & TypeFlags.EnumLiteral &&
8440
+ target.flags & TypeFlags.NumberLiteral && !(target.flags & TypeFlags.EnumLiteral) &&
8441
+ (<LiteralType>source).value === (<LiteralType>target).value) return true;
8436
8442
if (source.flags & TypeFlags.BooleanLike && target.flags & TypeFlags.Boolean) return true;
8437
8443
if (source.flags & TypeFlags.Enum && target.flags & TypeFlags.Enum && isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter)) return true;
8438
8444
if (source.flags & TypeFlags.EnumLiteral && target.flags & TypeFlags.EnumLiteral) {
@@ -8446,7 +8452,11 @@ namespace ts {
8446
8452
if (source.flags & TypeFlags.Object && target.flags & TypeFlags.NonPrimitive) return true;
8447
8453
if (relation === assignableRelation || relation === comparableRelation) {
8448
8454
if (source.flags & TypeFlags.Any) return true;
8449
- if (source.flags & (TypeFlags.Number | TypeFlags.NumberLiteral) && !(source.flags & TypeFlags.EnumLiteral) && target.flags & TypeFlags.EnumLike) return true;
8455
+ // Type number or any numeric literal type is assignable to any numeric enum type or any
8456
+ // numeric enum literal type. This rule exists for backwards compatibility reasons because
8457
+ // bit-flag enum types sometimes look like literal enum types with numeric literal values.
8458
+ if (source.flags & (TypeFlags.Number | TypeFlags.NumberLiteral) && !(source.flags & TypeFlags.EnumLiteral) && (
8459
+ target.flags & TypeFlags.Enum || target.flags & TypeFlags.NumberLiteral && target.flags & TypeFlags.EnumLiteral)) return true;
8450
8460
}
8451
8461
return false;
8452
8462
}
0 commit comments