Skip to content
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.

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

Divide-and-conquer strategy for intersections of unions #57871

Merged
merged 7 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17783,6 +17783,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
removeFromEach(typeSet, TypeFlags.Null);
result = getUnionType([getIntersectionType(typeSet), nullType], UnionReduction.Literal, aliasSymbol, aliasTypeArguments);
}
else if (typeSet.length >= 4) {
// When we have four or more constituents, some of which are unions, we employ a "divide and conquer" strategy
// where A & B & C & D is processed as (A & B) & (C & D). Since intersections of unions often produce far smaller
// unions of intersections than the full cartesian product (due to some intersections becoming `never`), this can
// dramatically reduce the overall work.
const middle = typeSet.length / 2;
gabritto marked this conversation as resolved.
Show resolved Hide resolved
result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
}
else {
// We are attempting to construct a type of the form X & (A | B) & (C | D). Transform this into a type of
// the form X & A & C | X & A & D | X & B & C | X & B & D. If the estimated size of the resulting union type
Expand Down
361 changes: 361 additions & 0 deletions tests/baselines/reference/divideAndConquerIntersections.symbols

Large diffs are not rendered by default.

237 changes: 237 additions & 0 deletions tests/baselines/reference/divideAndConquerIntersections.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
//// [tests/cases/compiler/divideAndConquerIntersections.ts] ////

=== Performance Stats ===
Assignability cache: 100 / 100 (nearest 100)
Type Count: 2,800 / 2,900 (nearest 100)
Instantiation count: 7,500 / 7,500 (nearest 500)
Symbol count: 26,000 / 26,000 (nearest 500)

=== divideAndConquerIntersections.ts ===
type QQ<T extends string[]> =
>QQ : QQ<T>

& ("a" | T[0])
& ("b" | T[1])
& ("c" | T[2])
& ("d" | T[3])
& ("e" | T[4])
& ("f" | T[5])
& ("g" | T[6])
& ("h" | T[7])
& ("i" | T[8])
& ("j" | T[9])
& ("k" | T[10])
& ("l" | T[11])
& ("m" | T[12])
& ("n" | T[13])
& ("q" | T[14])
& ("p" | T[15])
& ("q" | T[16])
& ("r" | T[17])
& ("s" | T[18])
& ("t" | T[19]);

// Repro from #57863

export interface Update {
update_id: number;
>update_id : number

message?: { message: string };
>message : { message: string; } | undefined
>message : string

edited_message?: { edited_message: string };
>edited_message : { edited_message: string; } | undefined
>edited_message : string

channel_post?: { channel_post: string };
>channel_post : { channel_post: string; } | undefined
>channel_post : string

edited_channel_post?: { edited_channel_post: string };
>edited_channel_post : { edited_channel_post: string; } | undefined
>edited_channel_post : string

message_reaction?: { message_reaction: string };
>message_reaction : { message_reaction: string; } | undefined
>message_reaction : string

message_reaction_count?: { message_reaction_count: string };
>message_reaction_count : { message_reaction_count: string; } | undefined
>message_reaction_count : string

inline_query?: { inline_query: string };
>inline_query : { inline_query: string; } | undefined
>inline_query : string

chosen_inline_result?: { chosen_inline_result: string };
>chosen_inline_result : { chosen_inline_result: string; } | undefined
>chosen_inline_result : string

callback_query?: { callback_query: string };
>callback_query : { callback_query: string; } | undefined
>callback_query : string

shipping_query?: { shipping_query: string };
>shipping_query : { shipping_query: string; } | undefined
>shipping_query : string

pre_checkout_query?: { pre_checkout_query: string };
>pre_checkout_query : { pre_checkout_query: string; } | undefined
>pre_checkout_query : string

poll?: { poll: string };
>poll : { poll: string; } | undefined
>poll : string

poll_answer?: { poll_answer: string };
>poll_answer : { poll_answer: string; } | undefined
>poll_answer : string

my_chat_member?: { my_chat_member: string };
>my_chat_member : { my_chat_member: string; } | undefined
>my_chat_member : string

chat_member?: { chat_member: string };
>chat_member : { chat_member: string; } | undefined
>chat_member : string

chat_join_request?: { chat_join_request: string };
>chat_join_request : { chat_join_request: string; } | undefined
>chat_join_request : string

chat_boost?: { chat_boost: string };
>chat_boost : { chat_boost: string; } | undefined
>chat_boost : string

removed_chat_boost?: { removed_chat_boost: string };
>removed_chat_boost : { removed_chat_boost: string; } | undefined
>removed_chat_boost : string
}

type FilterFunction<U extends Update, V extends U> = (up: U) => up is V;
>FilterFunction : FilterFunction<U, V>
>up : U

export function matchFilter<U extends Update, Q extends FilterQuery>(
>matchFilter : <U extends Update, Q extends "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost">(filter: Q | Q[]) => FilterFunction<U, Filter<U, Q>>

filter: Q | Q[],
>filter : Q | Q[]

): FilterFunction<U, Filter<U, Q>> {
// ^ errors out
console.log("Matching", filter);
>console.log("Matching", filter) : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>"Matching" : "Matching"
>filter : "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost" | Q[]

return (up: U): up is Filter<U, Q> => !!up;
>(up: U): up is Filter<U, Q> => !!up : (up: U) => up is PerformQuery<U, Combine<L1Fragment<Q>, Q>>
>up : U
>!!up : true
>!up : false
>up : U
}

/** All valid filter queries (every update key except update_id) */
export type FilterQuery = keyof Omit<Update, "update_id">;
>FilterQuery : "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost"

/** Narrow down an update object based on a filter query */
export type Filter<U extends Update, Q extends FilterQuery> = PerformQuery<
>Filter : Filter<U, Q>

U,
RunQuery<Q>
>;

// generate an object structure that can be intersected with updates to narrow them down
type RunQuery<Q extends string> = Combine<L1Fragment<Q>, Q>;
>RunQuery : RunQuery<Q>

// maps each part of the filter query to Record<"key", object>
type L1Fragment<Q extends string> = Q extends unknown ? Record<Q, object>
>L1Fragment : L1Fragment<Q>

: never;
// define all other fields from query as keys with value `undefined`
type Combine<U, K extends string> = U extends unknown
>Combine : Combine<U, K>

? U & Partial<Record<Exclude<K, keyof U>, undefined>>
: never;

// apply a query result by intersecting it with update,
// and then using these values to override the actual update
type PerformQuery<U extends Update, R extends object> = R extends unknown
>PerformQuery : PerformQuery<U, R>

? FilteredEvent<U, Update & R>
: never;

// narrow down an update by intersecting it with a different update
type FilteredEvent<E extends Update, U extends Update> =
>FilteredEvent : FilteredEvent<E, U>

& E
& Omit<U, "update_id">;

type Middleware<U extends Update> = (ctx: U) => unknown | Promise<unknown>;
>Middleware : Middleware<U>
>ctx : U

class EventHub<U extends Update> {
>EventHub : EventHub<U>

use(...middleware: Array<Middleware<U>>): EventHub<U> {
>use : (...middleware: Array<Middleware<U>>) => EventHub<U>
>middleware : Middleware<U>[]

console.log("Adding", middleware.length, "generic handlers");
>console.log("Adding", middleware.length, "generic handlers") : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>"Adding" : "Adding"
>middleware.length : number
>middleware : Middleware<U>[]
>length : number
>"generic handlers" : "generic handlers"

return this;
>this : this
}
on<Q extends FilterQuery>(
>on : <Q extends "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost">(filter: Q | Q[], ...middleware: Array<Middleware<Filter<U, Q>>>) => EventHub<Filter<U, Q>>

filter: Q | Q[],
>filter : Q | Q[]

...middleware: Array<Middleware<Filter<U, Q>>>
>middleware : Middleware<PerformQuery<U, Combine<L1Fragment<Q>, Q>>>[]

// ^ errors out
): EventHub<Filter<U, Q>> {
console.log("Adding", middleware.length, "handlers for", filter);
>console.log("Adding", middleware.length, "handlers for", filter) : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>"Adding" : "Adding"
>middleware.length : number
>middleware : Middleware<PerformQuery<U, Combine<L1Fragment<Q>, Q>>>[]
>length : number
>"handlers for" : "handlers for"
>filter : "message" | "edited_message" | "channel_post" | "edited_channel_post" | "message_reaction" | "message_reaction_count" | "inline_query" | "chosen_inline_result" | "callback_query" | "shipping_query" | "pre_checkout_query" | "poll" | "poll_answer" | "my_chat_member" | "chat_member" | "chat_join_request" | "chat_boost" | "removed_chat_boost" | Q[]

return new EventHub<Filter<U, Q>>();
>new EventHub<Filter<U, Q>>() : EventHub<PerformQuery<U, Combine<L1Fragment<Q>, Q>>>
>EventHub : typeof EventHub
}
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
//// [tests/cases/compiler/normalizedIntersectionTooComplex.ts] ////

=== Performance Stats ===
Assignability cache: 300 / 300 (nearest 100)
Type Count: 1,500 / 1,500 (nearest 100)
Instantiation count: 500 / 500 (nearest 500)
Symbol count: 25,500 / 25,500 (nearest 500)

=== normalizedIntersectionTooComplex.ts ===
// Repro from #30050

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
=== Performance Stats ===
Identity cache: 200 / 200 (nearest 100)
Assignability cache: 13,300 / 13,500 (nearest 100)
Type Count: 27,200 / 27,600 (nearest 100)
Type Count: 27,300 / 27,600 (nearest 100)
Instantiation count: 374,500 / 375,500 (nearest 500)
Symbol count: 92,000 / 92,000 (nearest 500)

Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/templateLiteralTypes1.types
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

=== Performance Stats ===
Assignability cache: 900 / 900 (nearest 100)
Type Count: 15,000 / 15,000 (nearest 100)
Type Count: 16,100 / 16,100 (nearest 100)
Instantiation count: 3,500 / 3,500 (nearest 500)
Symbol count: 27,000 / 27,500 (nearest 500)

Expand Down
106 changes: 106 additions & 0 deletions tests/cases/compiler/divideAndConquerIntersections.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
// @strict: true
// @noEmit: true

type QQ<T extends string[]> =
& ("a" | T[0])
& ("b" | T[1])
& ("c" | T[2])
& ("d" | T[3])
& ("e" | T[4])
& ("f" | T[5])
& ("g" | T[6])
& ("h" | T[7])
& ("i" | T[8])
& ("j" | T[9])
& ("k" | T[10])
& ("l" | T[11])
& ("m" | T[12])
& ("n" | T[13])
& ("q" | T[14])
& ("p" | T[15])
& ("q" | T[16])
& ("r" | T[17])
& ("s" | T[18])
& ("t" | T[19]);

// Repro from #57863

export interface Update {
update_id: number;

message?: { message: string };
edited_message?: { edited_message: string };
channel_post?: { channel_post: string };
edited_channel_post?: { edited_channel_post: string };
message_reaction?: { message_reaction: string };
message_reaction_count?: { message_reaction_count: string };
inline_query?: { inline_query: string };
chosen_inline_result?: { chosen_inline_result: string };
callback_query?: { callback_query: string };
shipping_query?: { shipping_query: string };
pre_checkout_query?: { pre_checkout_query: string };
poll?: { poll: string };
poll_answer?: { poll_answer: string };
my_chat_member?: { my_chat_member: string };
chat_member?: { chat_member: string };
chat_join_request?: { chat_join_request: string };
chat_boost?: { chat_boost: string };
removed_chat_boost?: { removed_chat_boost: string };
}

type FilterFunction<U extends Update, V extends U> = (up: U) => up is V;

export function matchFilter<U extends Update, Q extends FilterQuery>(
filter: Q | Q[],
): FilterFunction<U, Filter<U, Q>> {
// ^ errors out
console.log("Matching", filter);
return (up: U): up is Filter<U, Q> => !!up;
}

/** All valid filter queries (every update key except update_id) */
export type FilterQuery = keyof Omit<Update, "update_id">;

/** Narrow down an update object based on a filter query */
export type Filter<U extends Update, Q extends FilterQuery> = PerformQuery<
U,
RunQuery<Q>
>;

// generate an object structure that can be intersected with updates to narrow them down
type RunQuery<Q extends string> = Combine<L1Fragment<Q>, Q>;

// maps each part of the filter query to Record<"key", object>
type L1Fragment<Q extends string> = Q extends unknown ? Record<Q, object>
: never;
// define all other fields from query as keys with value `undefined`
type Combine<U, K extends string> = U extends unknown
? U & Partial<Record<Exclude<K, keyof U>, undefined>>
: never;

// apply a query result by intersecting it with update,
// and then using these values to override the actual update
type PerformQuery<U extends Update, R extends object> = R extends unknown
? FilteredEvent<U, Update & R>
: never;

// narrow down an update by intersecting it with a different update
type FilteredEvent<E extends Update, U extends Update> =
& E
& Omit<U, "update_id">;

type Middleware<U extends Update> = (ctx: U) => unknown | Promise<unknown>;
class EventHub<U extends Update> {
use(...middleware: Array<Middleware<U>>): EventHub<U> {
console.log("Adding", middleware.length, "generic handlers");
return this;
}
on<Q extends FilterQuery>(
filter: Q | Q[],
...middleware: Array<Middleware<Filter<U, Q>>>
// ^ errors out
): EventHub<Filter<U, Q>> {
console.log("Adding", middleware.length, "handlers for", filter);
return new EventHub<Filter<U, Q>>();
}
}