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.

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

Jump to bottom

Support tuples #611

Merged
merged 4 commits into from
Jul 25, 2023
Merged

Support tuples #611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift click to select a range
a2f36a3
further type speedup and simplification
koskimas Jul 22, 2023
9a7e39e
Add tuple support
koskimas Jul 23, 2023
bfc04b6
rename tuple to refTuple and valTuple to tuple
koskimas Jul 25, 2023
1f6ea12
improve typings
koskimas Jul 25, 2023
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
Next Next commit
further type speedup and simplification
  • Loading branch information
@koskimas
koskimas committed Jul 25, 2023
commit a2f36a380247f37c5622fcac3071ac559865ecb6
24 changes: 14 additions & 10 deletions src/parser/select-parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 42,13 @@ export type SelectArg<
| ReadonlyArray<SE>
| ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<SE>)

export type Selection<DB, TB extends keyof DB, SE> = {
[A in ExtractAliasFromSelectExpression<SE>]: SelectType<
ExtractTypeFromSelectExpression<DB, TB, SE, A>
>
}
export type Selection<DB, TB extends keyof DB, SE> = [SE] extends [unknown]
koskimas marked this conversation as resolved.
Show resolved Hide resolved
? {
[A in ExtractAliasFromSelectExpression<SE>]: SelectType<
ExtractTypeFromSelectExpression<DB, TB, SE, A>
>
}
: never

type ExtractAliasFromSelectExpression<SE> = SE extends string
? ExtractAliasFromStringSelectExpression<SE>
Expand Down Expand Up @@ -151,11 153,13 @@ type ExtractTypeFromStringSelectExpression<
: never
: never

export type AllSelection<DB, TB extends keyof DB> = Selectable<{
[C in AnyColumn<DB, TB>]: {
[T in TB]: C extends keyof DB[T] ? DB[T][C] : never
}[TB]
}>
export type AllSelection<DB, TB extends keyof DB> = [DB] extends [unknown]
? Selectable<{
[C in AnyColumn<DB, TB>]: {
[T in TB]: C extends keyof DB[T] ? DB[T][C] : never
}[TB]
}>
: never

export function parseSelectArg(
selection: SelectArg<any, any, SelectExpression<any, any>>
Expand Down
28 changes: 17 additions & 11 deletions src/util/column-type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 149,11 @@ export type UpdateKeys<R> = {
* // }
* ```
*/
export type Selectable<R> = {
[K in NonNeverSelectKeys<R>]: SelectType<R[K]>
}
export type Selectable<R> = [R] extends [unknown]
? {
[K in NonNeverSelectKeys<R>]: SelectType<R[K]>
}
: never

/**
* Given a table interface, extracts the insert type from all
Expand All @@ -174,11 176,13 @@ export type Selectable<R> = {
* // }
* ```
*/
export type Insertable<R> = {
[K in NonNullableInsertKeys<R>]: InsertType<R[K]>
} & {
[K in NullableInsertKeys<R>]?: InsertType<R[K]>
}
export type Insertable<R> = [R] extends [unknown]
? {
[K in NonNullableInsertKeys<R>]: InsertType<R[K]>
} & {
[K in NullableInsertKeys<R>]?: InsertType<R[K]>
}
: never

/**
* Given a table interface, extracts the update type from all
Expand All @@ -200,6 204,8 @@ export type Insertable<R> = {
* // }
* ```
*/
export type Updateable<R> = {
[K in UpdateKeys<R>]?: UpdateType<R[K]>
}
export type Updateable<R> = [R] extends [unknown]
? {
[K in UpdateKeys<R>]?: UpdateType<R[K]>
}
: never
22 changes: 13 additions & 9 deletions src/util/type-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 35,23 @@ import { KyselyTypeError } from './type-error.js'
* // Columns == 'id' | 'name' | 'species'
* ```
*/
export type AnyColumn<DB, TB extends keyof DB> = DrainOuterGeneric<
{
[T in TB]: keyof DB[T]
}[TB] &
string
>
export type AnyColumn<DB, TB extends keyof DB> = [DB] extends [unknown]
? {
[T in TB]: keyof DB[T]
}[TB] &
string
: never

/**
* Extracts a column type.
*/
export type ExtractColumnType<DB, TB extends keyof DB, C> = {
[T in TB]: C extends keyof DB[T] ? DB[T][C] : never
}[TB]
export type ExtractColumnType<DB, TB extends keyof DB, C> = [C] extends [
unknown
]
? {
[T in TB]: C extends keyof DB[T] ? DB[T][C] : never
}[TB]
: never

/**
* Given a database type and a union of table names in that db, returns
Expand Down