Skip to content

[experiment] trying to short circuit relations in more places #59086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jake Bailey (jakebailey) wants to merge 2 commits into from
Closed

[experiment] trying to short circuit relations in more places #59086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf0b786
hacking on short circuit literal relation
jakebailey Jun 30, 2024
17d02d9
isTriviallyRelated
jakebailey Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 63 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20530,6 +20530,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// TYPE CHECKING

function isTypeIdenticalTo(source: Type, target: Type): boolean {
// const potentiallyRelated = isTypePotentiallyRelated(source, target);
// if (potentiallyRelated !== Ternary.Maybe) return !!potentiallyRelated;
return isTypeRelatedTo(source, target, identityRelation);
}

Expand Down Expand Up @@ -20557,6 +20559,25 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return isTypeRelatedTo(source, target, assignableRelation);
}

// function isTypePotentiallyRelated(source: Type, target: Type): Ternary {
// if (source === target) return Ternary.True;

// if (
// source.flags & TypeFlags.Literal
// && (source.flags & TypeFlags.Literal) === (target.flags & TypeFlags.Literal)
// && !(source.flags & TypeFlags.EnumLiteral && target.flags & TypeFlags.EnumLiteral)
// ) {
// if (source.flags & TypeFlags.BooleanLiteral) {
// const sourceIsTrue = source === trueType || source === regularTrueType;
// const targetIsTrue = target === trueType || target === regularTrueType;
// return sourceIsTrue === targetIsTrue ? Ternary.True : Ternary.False;
// }
// return (source as LiteralType).value === (target as LiteralType).value ? Ternary.True : Ternary.False;
// }

// return Ternary.Maybe;
// }

// An object type S is considered to be derived from an object type T if
// S is a union type and every constituent of S is derived from T,
// T is a union type and S is derived from at least one constituent of T, or
Expand All @@ -20568,6 +20589,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// Note that this check ignores type parameters and only considers the
// inheritance hierarchy.
function isTypeDerivedFrom(source: Type, target: Type): boolean {
const triviallyRelated = isTriviallyRelated(source, target);
if (triviallyRelated !== Ternary.Maybe) {
return triviallyRelated === Ternary.True;
}
return source.flags & TypeFlags.Union ? every((source as UnionType).types, t => isTypeDerivedFrom(t, target)) :
target.flags & TypeFlags.Union ? some((target as UnionType).types, t => isTypeDerivedFrom(source, t)) :
source.flags & TypeFlags.Intersection ? some((source as IntersectionType).types, t => isTypeDerivedFrom(t, target)) :
Expand Down Expand Up @@ -21544,7 +21569,31 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return false;
}

function isTriviallyRelated(source: Type, target: Type): Ternary {
if (source === target) {
return Ternary.True;
}
if (
source.flags & TypeFlags.Literal
&& (source.flags & TypeFlags.Literal) === (target.flags & TypeFlags.Literal)
&& !(source.flags & TypeFlags.EnumLiteral && target.flags & TypeFlags.EnumLiteral)
) {
if (source.flags & TypeFlags.BooleanLiteral) {
const sourceIsTrue = source === trueType || source === regularTrueType;
const targetIsTrue = target === trueType || target === regularTrueType;
return sourceIsTrue === targetIsTrue ? Ternary.True : Ternary.False;
}
return (source as LiteralType).value === (target as LiteralType).value ? Ternary.True : Ternary.False;
}
return Ternary.Maybe;
}

function isTypeRelatedTo(source: Type, target: Type, relation: Map<string, RelationComparisonResult>) {
const triviallyRelated = isTriviallyRelated(source, target);
if (triviallyRelated !== Ternary.Maybe) {
return triviallyRelated === Ternary.True;
}

if (isFreshLiteralType(source)) {
source = (source as FreshableType).regularType;
}
Expand Down Expand Up @@ -29263,8 +29312,20 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const directlyRelated = mapType(
matching || type,
checkDerived ?
t => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType :
t => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType,
t => {
const triviallyRelated = isTriviallyRelated(t, c);
if (triviallyRelated !== Ternary.Maybe) {
return triviallyRelated === Ternary.True ? t : neverType;
}
return isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType;
} :
t => {
const triviallyRelated = isTriviallyRelated(t, c);
if (triviallyRelated !== Ternary.Maybe) {
return triviallyRelated === Ternary.True ? t : neverType;
}
return isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType;
},
);
// If no constituents are directly related, create intersections for any generic constituents that
// are related by constraint.
Expand Down