kysely 0.19.3 → 0.19.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/dist/cjs/dialect/sqlite/sqlite-introspector.js +0 -1
  2. package/dist/cjs/index.d.ts +0 -1
  3. package/dist/cjs/index.js +0 -1
  4. package/dist/cjs/operation-node/check-constraint-node.d.ts +1 -1
  5. package/dist/cjs/operation-node/common-table-expression-name-node.d.ts +1 -1
  6. package/dist/cjs/operation-node/create-schema-node.d.ts +1 -1
  7. package/dist/cjs/operation-node/delete-query-node.d.ts +1 -1
  8. package/dist/cjs/operation-node/drop-index-node.d.ts +1 -1
  9. package/dist/cjs/operation-node/drop-schema-node.d.ts +1 -1
  10. package/dist/cjs/operation-node/drop-table-node.d.ts +1 -1
  11. package/dist/cjs/operation-node/foreign-key-constraint-node.d.ts +1 -1
  12. package/dist/cjs/operation-node/insert-query-node.d.ts +1 -1
  13. package/dist/cjs/operation-node/order-by-item-node.d.ts +1 -1
  14. package/dist/cjs/operation-node/primary-constraint-node.d.ts +1 -1
  15. package/dist/cjs/operation-node/select-query-node.d.ts +1 -1
  16. package/dist/cjs/operation-node/unique-constraint-node.d.ts +1 -1
  17. package/dist/cjs/operation-node/update-query-node.d.ts +1 -1
  18. package/dist/cjs/operation-node/with-node.d.ts +1 -1
  19. package/dist/cjs/parser/table-parser.d.ts +2 -11
  20. package/dist/cjs/query-builder/delete-query-builder.d.ts +35 -13
  21. package/dist/cjs/query-builder/select-query-builder.d.ts +34 -13
  22. package/dist/cjs/query-builder/update-query-builder.d.ts +35 -13
  23. package/dist/cjs/util/type-utils.d.ts +3 -0
  24. package/dist/esm/dialect/sqlite/sqlite-introspector.js +0 -1
  25. package/dist/esm/index.d.ts +0 -1
  26. package/dist/esm/index.js +0 -1
  27. package/dist/esm/operation-node/check-constraint-node.d.ts +1 -1
  28. package/dist/esm/operation-node/common-table-expression-name-node.d.ts +1 -1
  29. package/dist/esm/operation-node/create-schema-node.d.ts +1 -1
  30. package/dist/esm/operation-node/delete-query-node.d.ts +1 -1
  31. package/dist/esm/operation-node/drop-index-node.d.ts +1 -1
  32. package/dist/esm/operation-node/drop-schema-node.d.ts +1 -1
  33. package/dist/esm/operation-node/drop-table-node.d.ts +1 -1
  34. package/dist/esm/operation-node/foreign-key-constraint-node.d.ts +1 -1
  35. package/dist/esm/operation-node/insert-query-node.d.ts +1 -1
  36. package/dist/esm/operation-node/order-by-item-node.d.ts +1 -1
  37. package/dist/esm/operation-node/primary-constraint-node.d.ts +1 -1
  38. package/dist/esm/operation-node/select-query-node.d.ts +1 -1
  39. package/dist/esm/operation-node/unique-constraint-node.d.ts +1 -1
  40. package/dist/esm/operation-node/update-query-node.d.ts +1 -1
  41. package/dist/esm/operation-node/with-node.d.ts +1 -1
  42. package/dist/esm/parser/table-parser.d.ts +2 -11
  43. package/dist/esm/query-builder/delete-query-builder.d.ts +35 -13
  44. package/dist/esm/query-builder/select-query-builder.d.ts +34 -13
  45. package/dist/esm/query-builder/update-query-builder.d.ts +35 -13
  46. package/dist/esm/util/type-utils.d.ts +3 -0
  47. package/package.json +10 -10
  48. package/dist/cjs/query-builder/join-interface.d.ts +0 -130
  49. package/dist/cjs/query-builder/join-interface.js +0 -2
  50. package/dist/esm/query-builder/join-interface.d.ts +0 -130
  51. package/dist/esm/query-builder/join-interface.js +0 -2
@@ -37,7 +37,6 @@ class SqliteIntrospector {
37
37
  const columns = await db
38
38
  .selectFrom((0, sql_js_1.sql) `PRAGMA_TABLE_INFO(${table})`.as('table_info'))
39
39
  .select(['name', 'type', 'notnull'])
40
- .castTo()
41
40
  .execute();
42
41
  return {
43
42
  name: table,
@@ -1,7 +1,6 @@
1
1
  export * from './kysely.js';
2
2
  export * from './query-creator.js';
3
3
  export * from './query-builder/where-interface.js';
4
- export * from './query-builder/join-interface.js';
5
4
  export * from './query-builder/returning-interface.js';
6
5
  export * from './query-builder/having-interface.js';
7
6
  export * from './query-builder/select-query-builder.js';
package/dist/cjs/index.js CHANGED
@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./kysely.js"), exports);
18
18
  __exportStar(require("./query-creator.js"), exports);
19
19
  __exportStar(require("./query-builder/where-interface.js"), exports);
20
- __exportStar(require("./query-builder/join-interface.js"), exports);
21
20
  __exportStar(require("./query-builder/returning-interface.js"), exports);
22
21
  __exportStar(require("./query-builder/having-interface.js"), exports);
23
22
  __exportStar(require("./query-builder/select-query-builder.js"), exports);
@@ -11,5 +11,5 @@ export interface CheckConstraintNode extends OperationNode {
11
11
  */
12
12
  export declare const CheckConstraintNode: Readonly<{
13
13
  is(node: OperationNode): node is CheckConstraintNode;
14
- create(expression: RawNode, constraintName?: string | undefined): CheckConstraintNode;
14
+ create(expression: RawNode, constraintName?: string): CheckConstraintNode;
15
15
  }>;
@@ -11,5 +11,5 @@ export interface CommonTableExpressionNameNode extends OperationNode {
11
11
  */
12
12
  export declare const CommonTableExpressionNameNode: Readonly<{
13
13
  is(node: OperationNode): node is CommonTableExpressionNameNode;
14
- create(tableName: string, columnNames?: readonly string[] | undefined): CommonTableExpressionNameNode;
14
+ create(tableName: string, columnNames?: ReadonlyArray<string>): CommonTableExpressionNameNode;
15
15
  }>;
@@ -11,6 +11,6 @@ export interface CreateSchemaNode extends OperationNode {
11
11
  */
12
12
  export declare const CreateSchemaNode: Readonly<{
13
13
  is(node: OperationNode): node is CreateSchemaNode;
14
- create(schema: string, params?: CreateSchemaNodeParams | undefined): CreateSchemaNode;
14
+ create(schema: string, params?: CreateSchemaNodeParams): CreateSchemaNode;
15
15
  cloneWith(createSchema: CreateSchemaNode, params: CreateSchemaNodeParams): CreateSchemaNode;
16
16
  }>;
@@ -23,7 +23,7 @@ export interface DeleteQueryNode extends OperationNode {
23
23
  */
24
24
  export declare const DeleteQueryNode: Readonly<{
25
25
  is(node: OperationNode): node is DeleteQueryNode;
26
- create(fromItem: TableExpressionNode, withNode?: WithNode | undefined): DeleteQueryNode;
26
+ create(fromItem: TableExpressionNode, withNode?: WithNode): DeleteQueryNode;
27
27
  cloneWithOrderByItem(deleteNode: DeleteQueryNode, item: OrderByItemNode): DeleteQueryNode;
28
28
  cloneWithLimit(deleteNode: DeleteQueryNode, limit: LimitNode): DeleteQueryNode;
29
29
  }>;
@@ -13,6 +13,6 @@ export interface DropIndexNode extends OperationNode {
13
13
  */
14
14
  export declare const DropIndexNode: Readonly<{
15
15
  is(node: OperationNode): node is DropIndexNode;
16
- create(name: string, params?: DropIndexNodeProps | undefined): DropIndexNode;
16
+ create(name: string, params?: DropIndexNodeProps): DropIndexNode;
17
17
  cloneWith(dropIndex: DropIndexNode, props: DropIndexNodeProps): DropIndexNode;
18
18
  }>;
@@ -11,6 +11,6 @@ export interface DropSchemaNode extends OperationNode {
11
11
  */
12
12
  export declare const DropSchemaNode: Readonly<{
13
13
  is(node: OperationNode): node is DropSchemaNode;
14
- create(schema: string, params?: DropSchemaNodeParams | undefined): DropSchemaNode;
14
+ create(schema: string, params?: DropSchemaNodeParams): DropSchemaNode;
15
15
  cloneWith(dropSchema: DropSchemaNode, params: DropSchemaNodeParams): DropSchemaNode;
16
16
  }>;
@@ -11,6 +11,6 @@ export interface DropTableNode extends OperationNode {
11
11
  */
12
12
  export declare const DropTableNode: Readonly<{
13
13
  is(node: OperationNode): node is DropTableNode;
14
- create(table: TableNode, params?: DropTablexNodeParams | undefined): DropTableNode;
14
+ create(table: TableNode, params?: DropTablexNodeParams): DropTableNode;
15
15
  cloneWith(dropIndex: DropTableNode, params: DropTablexNodeParams): DropTableNode;
16
16
  }>;
@@ -17,7 +17,7 @@ export interface ForeignKeyConstraintNode extends OperationNode {
17
17
  */
18
18
  export declare const ForeignKeyConstraintNode: Readonly<{
19
19
  is(node: OperationNode): node is ForeignKeyConstraintNode;
20
- create(sourceColumns: ReadonlyArray<ColumnNode>, targetTable: TableNode, targetColumns: ReadonlyArray<ColumnNode>, constraintName?: string | undefined): ForeignKeyConstraintNode;
20
+ create(sourceColumns: ReadonlyArray<ColumnNode>, targetTable: TableNode, targetColumns: ReadonlyArray<ColumnNode>, constraintName?: string): ForeignKeyConstraintNode;
21
21
  cloneWith(node: ForeignKeyConstraintNode, props: ForeignKeyConstraintNodeProps): Readonly<{
22
22
  name?: IdentifierNode | undefined;
23
23
  onDelete?: OnModifyForeignAction | undefined;
@@ -25,6 +25,6 @@ export interface InsertQueryNode extends OperationNode {
25
25
  */
26
26
  export declare const InsertQueryNode: Readonly<{
27
27
  is(node: OperationNode): node is InsertQueryNode;
28
- create(into: TableNode, withNode?: WithNode | undefined): InsertQueryNode;
28
+ create(into: TableNode, withNode?: WithNode): InsertQueryNode;
29
29
  cloneWith(insertQuery: InsertQueryNode, props: InsertQueryNodeProps): InsertQueryNode;
30
30
  }>;
@@ -11,5 +11,5 @@ export interface OrderByItemNode extends OperationNode {
11
11
  */
12
12
  export declare const OrderByItemNode: Readonly<{
13
13
  is(node: OperationNode): node is OrderByItemNode;
14
- create(orderBy: ReferenceExpressionNode, direction?: RawNode | undefined): OrderByItemNode;
14
+ create(orderBy: ReferenceExpressionNode, direction?: RawNode): OrderByItemNode;
15
15
  }>;
@@ -11,5 +11,5 @@ export interface PrimaryKeyConstraintNode extends OperationNode {
11
11
  */
12
12
  export declare const PrimaryConstraintNode: Readonly<{
13
13
  is(node: OperationNode): node is PrimaryKeyConstraintNode;
14
- create(columns: string[], constraintName?: string | undefined): PrimaryKeyConstraintNode;
14
+ create(columns: string[], constraintName?: string): PrimaryKeyConstraintNode;
15
15
  }>;
@@ -36,7 +36,7 @@ export interface SelectQueryNode extends OperationNode {
36
36
  */
37
37
  export declare const SelectQueryNode: Readonly<{
38
38
  is(node: OperationNode): node is SelectQueryNode;
39
- create(fromItems: ReadonlyArray<TableExpressionNode>, withNode?: WithNode | undefined): SelectQueryNode;
39
+ create(fromItems: ReadonlyArray<TableExpressionNode>, withNode?: WithNode): SelectQueryNode;
40
40
  cloneWithSelections(select: SelectQueryNode, selections: ReadonlyArray<SelectionNode>): SelectQueryNode;
41
41
  cloneWithDistinctOnSelections(select: SelectQueryNode, selections: ReadonlyArray<SelectionNode>): SelectQueryNode;
42
42
  cloneWithModifier(select: SelectQueryNode, modifier: SelectModifier): SelectQueryNode;
@@ -11,5 +11,5 @@ export interface UniqueConstraintNode extends OperationNode {
11
11
  */
12
12
  export declare const UniqueConstraintNode: Readonly<{
13
13
  is(node: OperationNode): node is UniqueConstraintNode;
14
- create(columns: string[], constraintName?: string | undefined): UniqueConstraintNode;
14
+ create(columns: string[], constraintName?: string): UniqueConstraintNode;
15
15
  }>;
@@ -24,7 +24,7 @@ export interface UpdateQueryNode extends OperationNode {
24
24
  */
25
25
  export declare const UpdateQueryNode: Readonly<{
26
26
  is(node: OperationNode): node is UpdateQueryNode;
27
- create(table: TableExpressionNode, withNode?: WithNode | undefined): UpdateQueryNode;
27
+ create(table: TableExpressionNode, withNode?: WithNode): UpdateQueryNode;
28
28
  cloneWithFromItems(updateQuery: UpdateQueryNode, fromItems: ReadonlyArray<TableExpressionNode>): UpdateQueryNode;
29
29
  cloneWithUpdates(updateQuery: UpdateQueryNode, updates: ReadonlyArray<ColumnUpdateNode>): UpdateQueryNode;
30
30
  }>;
@@ -11,6 +11,6 @@ export interface WithNode extends OperationNode {
11
11
  */
12
12
  export declare const WithNode: Readonly<{
13
13
  is(node: OperationNode): node is WithNode;
14
- create(expression: CommonTableExpressionNode, params?: WithNodeParams | undefined): WithNode;
14
+ create(expression: CommonTableExpressionNode, params?: WithNodeParams): WithNode;
15
15
  cloneWithExpression(withNode: WithNode, expression: CommonTableExpressionNode): WithNode;
16
16
  }>;
@@ -1,6 +1,6 @@
1
1
  import { AliasedQueryBuilder } from '../query-builder/select-query-builder.js';
2
2
  import { TableNode } from '../operation-node/table-node.js';
3
- import { AnyAliasedRawBuilder, Nullable } from '../util/type-utils.js';
3
+ import { AnyAliasedRawBuilder } from '../util/type-utils.js';
4
4
  import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
5
5
  import { TableExpressionNode } from '../operation-node/operation-node-utils.js';
6
6
  import { AliasedComplexExpression } from './complex-expression-parser.js';
@@ -10,18 +10,9 @@ export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | An
10
10
  export declare type TableExpressionDatabase<DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
11
11
  [C in keyof DB | A]: C extends A ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? DB[C] : never;
12
12
  };
13
- export declare type LeftJoinTableExpressionDatabase<DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
14
- [C in keyof DB | A]: C extends A ? Nullable<ExtractRowTypeFromTableExpression<DB, TE, C>> : C extends keyof DB ? DB[C] : never;
15
- };
16
- export declare type RightJoinTableExpressionDatabase<DB, TB extends keyof DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
17
- [C in keyof DB | A]: C extends A ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? C extends TB ? Nullable<DB[C]> : DB[C] : never;
18
- };
19
- export declare type FullJoinTableExpressionDatabase<DB, TB extends keyof DB, TE, A extends keyof any = ExtractAliasFromTableExpression<DB, TE>> = {
20
- [C in keyof DB | A]: C extends A ? Nullable<ExtractRowTypeFromTableExpression<DB, TE, C>> : C extends keyof DB ? C extends TB ? Nullable<DB[C]> : DB[C] : never;
21
- };
22
13
  export declare type ExtractAliasFromTableExpression<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : TE extends AliasedQueryBuilder<any, any, any, infer QA> ? QA : TE extends (qb: any) => AliasedQueryBuilder<any, any, any, infer QA> ? QA : TE extends AliasedRawBuilder<any, infer RA> ? RA : TE extends (qb: any) => AliasedRawBuilder<any, infer RA> ? RA : never;
23
14
  export declare type TableExpressionTables<DB, TB extends keyof DB, TE> = TB | ExtractAliasFromTableExpression<DB, TE>;
24
- declare type ExtractRowTypeFromTableExpression<DB, TE, A extends keyof any> = TE extends `${infer T} as ${infer TA}` ? TA extends A ? T extends keyof DB ? DB[T] : never : never : TE extends A ? TE extends keyof DB ? DB[TE] : never : TE extends AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O : never : TE extends AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : TE extends (qb: any) => AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : never;
15
+ export declare type ExtractRowTypeFromTableExpression<DB, TE, A extends keyof any> = TE extends `${infer T} as ${infer TA}` ? TA extends A ? T extends keyof DB ? DB[T] : never : never : TE extends A ? TE extends keyof DB ? DB[TE] : never : TE extends AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? O : never : TE extends AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : TE extends (qb: any) => AliasedRawBuilder<infer O, infer RA> ? RA extends A ? O : never : never;
25
16
  declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
26
17
  declare type AnyTable<DB> = keyof DB & string;
27
18
  export declare function parseTableExpressionOrList(table: TableExpressionOrList<any, any>): TableExpressionNode[];
@@ -1,25 +1,26 @@
1
1
  import { OperationNodeSource } from '../operation-node/operation-node-source.js';
2
2
  import { CompiledQuery } from '../query-compiler/compiled-query.js';
3
3
  import { JoinCallbackExpression, JoinReferenceExpression } from '../parser/join-parser.js';
4
- import { TableExpression, TableExpressionDatabase, TableExpressionTables, LeftJoinTableExpressionDatabase, RightJoinTableExpressionDatabase, FullJoinTableExpressionDatabase } from '../parser/table-parser.js';
4
+ import { TableExpression } from '../parser/table-parser.js';
5
5
  import { SelectExpression } from '../parser/select-parser.js';
6
6
  import { ExistsExpression, FilterOperator, FilterValueExpressionOrList, WhereGrouper } from '../parser/filter-parser.js';
7
7
  import { ReturningRow } from '../parser/returning-parser.js';
8
8
  import { ReferenceExpression } from '../parser/reference-parser.js';
9
- import { AnyRawBuilder, MergePartial, SingleResultType } from '../util/type-utils.js';
9
+ import { AnyRawBuilder, MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
10
10
  import { Compilable } from '../util/compilable.js';
11
11
  import { QueryExecutor } from '../query-executor/query-executor.js';
12
12
  import { QueryId } from '../util/query-id.js';
13
13
  import { KyselyPlugin } from '../plugin/kysely-plugin.js';
14
14
  import { WhereInterface } from './where-interface.js';
15
- import { JoinInterface } from './join-interface.js';
16
15
  import { ReturningInterface } from './returning-interface.js';
17
16
  import { NoResultErrorConstructor } from './no-result-error.js';
18
17
  import { DeleteResult } from './delete-result.js';
19
18
  import { DeleteQueryNode } from '../operation-node/delete-query-node.js';
20
19
  import { Selectable } from '../util/column-type.js';
21
20
  import { OrderByDirectionExpression, OrderByExpression } from '../parser/order-by-parser.js';
22
- export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, JoinInterface<DB, TB>, ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
21
+ import { AliasedQueryBuilder } from './select-query-builder.js';
22
+ import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
23
+ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
23
24
  #private;
24
25
  constructor(props: DeleteQueryBuilderProps);
25
26
  /**
@@ -515,23 +516,23 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
515
516
  * on "doggos"."owner_id" = "person"."id"
516
517
  * ```
517
518
  */
518
- innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilder<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
519
- innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilder<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
519
+ innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilderWithInnerJoin<DB, TB, O, TE>;
520
+ innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilderWithInnerJoin<DB, TB, O, TE>;
520
521
  /**
521
- * Just like {@link innerJoin} but adds a left join nstead of an inner join.
522
+ * Just like {@link innerJoin} but adds a left join instead of an inner join.
522
523
  */
523
- leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
524
- leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
524
+ leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilderWithLeftJoin<DB, TB, O, TE>;
525
+ leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilderWithLeftJoin<DB, TB, O, TE>;
525
526
  /**
526
527
  * Just like {@link innerJoin} but adds a right join instead of an inner join.
527
528
  */
528
- rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
529
- rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
529
+ rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilderWithRightJoin<DB, TB, O, TE>;
530
+ rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilderWithRightJoin<DB, TB, O, TE>;
530
531
  /**
531
532
  * Just like {@link innerJoin} but adds a full join instead of an inner join.
532
533
  */
533
- fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
534
- fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
534
+ fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): DeleteQueryBuilderWithFullJoin<DB, TB, O, TE>;
535
+ fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): DeleteQueryBuilderWithFullJoin<DB, TB, O, TE>;
535
536
  /**
536
537
  * Allows you to return data from modified rows.
537
538
  *
@@ -749,3 +750,24 @@ export interface DeleteQueryBuilderProps {
749
750
  readonly queryNode: DeleteQueryNode;
750
751
  readonly executor: QueryExecutor;
751
752
  }
753
+ export declare type DeleteQueryBuilderWithInnerJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? InnerJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? DeleteQueryBuilder<DB, TB | TE, O> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, TB, O, RA, RO> : never;
754
+ declare type InnerJoinedBuilder<DB, TB extends keyof DB, O, A extends string, R> = A extends keyof DB ? DeleteQueryBuilder<InnerJoinedDB<DB, A, R>, TB | A, O> : DeleteQueryBuilder<DB & Record<A, R>, TB | A, O>;
755
+ declare type InnerJoinedDB<DB, A extends string, R> = {
756
+ [C in keyof DB | A]: C extends A ? R : C extends keyof DB ? DB[C] : never;
757
+ };
758
+ export declare type DeleteQueryBuilderWithLeftJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? LeftJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? LeftJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, TB, O, RA, RO> : never;
759
+ declare type LeftJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = A extends keyof DB ? DeleteQueryBuilder<LeftJoinedDB<DB, A, R>, TB | A, O> : DeleteQueryBuilder<DB & Record<A, Nullable<R>>, TB | A, O>;
760
+ declare type LeftJoinedDB<DB, A extends keyof any, R> = {
761
+ [C in keyof DB | A]: C extends A ? Nullable<R> : C extends keyof DB ? DB[C] : never;
762
+ };
763
+ export declare type DeleteQueryBuilderWithRightJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? RightJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? RightJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, TB, O, RA, RO> : never;
764
+ declare type RightJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = DeleteQueryBuilder<RightJoinedDB<DB, TB, A, R>, TB | A, O>;
765
+ declare type RightJoinedDB<DB, TB extends keyof DB, A extends keyof any, R> = {
766
+ [C in keyof DB | A]: C extends A ? R : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
767
+ };
768
+ export declare type DeleteQueryBuilderWithFullJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? OuterJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? OuterJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, TB, O, RA, RO> : never;
769
+ declare type OuterJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = DeleteQueryBuilder<OuterJoinedBuilderDB<DB, TB, A, R>, TB | A, O>;
770
+ declare type OuterJoinedBuilderDB<DB, TB extends keyof DB, A extends keyof any, R> = {
771
+ [C in keyof DB | A]: C extends A ? Nullable<R> : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
772
+ };
773
+ export {};
@@ -2,12 +2,12 @@ import { AliasNode } from '../operation-node/alias-node.js';
2
2
  import { OperationNodeSource } from '../operation-node/operation-node-source.js';
3
3
  import { CompiledQuery } from '../query-compiler/compiled-query.js';
4
4
  import { JoinCallbackExpression, JoinReferenceExpression } from '../parser/join-parser.js';
5
- import { TableExpression, TableExpressionDatabase, TableExpressionTables, LeftJoinTableExpressionDatabase, RightJoinTableExpressionDatabase, FullJoinTableExpressionDatabase } from '../parser/table-parser.js';
5
+ import { TableExpression } from '../parser/table-parser.js';
6
6
  import { SelectExpression, QueryBuilderWithSelection, SelectAllQueryBuilder } from '../parser/select-parser.js';
7
7
  import { ExistsExpression, FilterOperator, FilterValueExpressionOrList, WhereGrouper, HavingGrouper } from '../parser/filter-parser.js';
8
8
  import { ReferenceExpression } from '../parser/reference-parser.js';
9
9
  import { SelectQueryNode } from '../operation-node/select-query-node.js';
10
- import { AnyRawBuilder, MergePartial, SingleResultType } from '../util/type-utils.js';
10
+ import { AnyRawBuilder, MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
11
11
  import { OrderByDirectionExpression, OrderByExpression } from '../parser/order-by-parser.js';
12
12
  import { Compilable } from '../util/compilable.js';
13
13
  import { QueryExecutor } from '../query-executor/query-executor.js';
@@ -15,10 +15,10 @@ import { QueryId } from '../util/query-id.js';
15
15
  import { UnionExpression } from '../parser/union-parser.js';
16
16
  import { KyselyPlugin } from '../plugin/kysely-plugin.js';
17
17
  import { WhereInterface } from './where-interface.js';
18
- import { JoinInterface } from './join-interface.js';
19
18
  import { NoResultErrorConstructor } from './no-result-error.js';
20
19
  import { HavingInterface } from './having-interface.js';
21
- export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, HavingInterface<DB, TB>, JoinInterface<DB, TB>, OperationNodeSource, Compilable {
20
+ import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
21
+ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, HavingInterface<DB, TB>, OperationNodeSource, Compilable {
22
22
  #private;
23
23
  constructor(props: SelectQueryBuilderProps);
24
24
  /**
@@ -856,23 +856,23 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
856
856
  * on "doggos"."owner_id" = "person"."id"
857
857
  * ```
858
858
  */
859
- innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilder<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
860
- innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilder<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
859
+ innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithInnerJoin<DB, TB, O, TE>;
860
+ innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithInnerJoin<DB, TB, O, TE>;
861
861
  /**
862
- * Just like {@link innerJoin} but adds a left join nstead of an inner join.
862
+ * Just like {@link innerJoin} but adds a left join instead of an inner join.
863
863
  */
864
- leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
865
- leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>, O>;
864
+ leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithLeftJoin<DB, TB, O, TE>;
865
+ leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithLeftJoin<DB, TB, O, TE>;
866
866
  /**
867
867
  * Just like {@link innerJoin} but adds a right join instead of an inner join.
868
868
  */
869
- rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
870
- rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
869
+ rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithRightJoin<DB, TB, O, TE>;
870
+ rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithRightJoin<DB, TB, O, TE>;
871
871
  /**
872
872
  * Just like {@link innerJoin} but adds a full join instead of an inner join.
873
873
  */
874
- fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
875
- fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, TableExpressionTables<DB, TB, TE>, O>;
874
+ fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithFullJoin<DB, TB, O, TE>;
875
+ fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithFullJoin<DB, TB, O, TE>;
876
876
  /**
877
877
  * Adds an `order by` clause to the query.
878
878
  *
@@ -1282,3 +1282,24 @@ export declare class AliasedQueryBuilder<DB, TB extends keyof DB, O = undefined,
1282
1282
  protected get alias(): A;
1283
1283
  toOperationNode(): AliasNode;
1284
1284
  }
1285
+ export declare type SelectQueryBuilderWithInnerJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? InnerJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? SelectQueryBuilder<DB, TB | TE, O> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, TB, O, RA, RO> : never;
1286
+ declare type InnerJoinedBuilder<DB, TB extends keyof DB, O, A extends string, R> = A extends keyof DB ? SelectQueryBuilder<InnerJoinedDB<DB, A, R>, TB | A, O> : SelectQueryBuilder<DB & Record<A, R>, TB | A, O>;
1287
+ declare type InnerJoinedDB<DB, A extends string, R> = {
1288
+ [C in keyof DB | A]: C extends A ? R : C extends keyof DB ? DB[C] : never;
1289
+ };
1290
+ export declare type SelectQueryBuilderWithLeftJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? LeftJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? LeftJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, TB, O, RA, RO> : never;
1291
+ declare type LeftJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = A extends keyof DB ? SelectQueryBuilder<LeftJoinedDB<DB, A, R>, TB | A, O> : SelectQueryBuilder<DB & Record<A, Nullable<R>>, TB | A, O>;
1292
+ declare type LeftJoinedDB<DB, A extends keyof any, R> = {
1293
+ [C in keyof DB | A]: C extends A ? Nullable<R> : C extends keyof DB ? DB[C] : never;
1294
+ };
1295
+ export declare type SelectQueryBuilderWithRightJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? RightJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? RightJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, TB, O, RA, RO> : never;
1296
+ declare type RightJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = SelectQueryBuilder<RightJoinedDB<DB, TB, A, R>, TB | A, O>;
1297
+ declare type RightJoinedDB<DB, TB extends keyof DB, A extends keyof any, R> = {
1298
+ [C in keyof DB | A]: C extends A ? R : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
1299
+ };
1300
+ export declare type SelectQueryBuilderWithFullJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? OuterJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? OuterJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, TB, O, RA, RO> : never;
1301
+ declare type OuterJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = SelectQueryBuilder<OuterJoinedBuilderDB<DB, TB, A, R>, TB | A, O>;
1302
+ declare type OuterJoinedBuilderDB<DB, TB extends keyof DB, A extends keyof any, R> = {
1303
+ [C in keyof DB | A]: C extends A ? Nullable<R> : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
1304
+ };
1305
+ export {};
@@ -1,12 +1,12 @@
1
1
  import { OperationNodeSource } from '../operation-node/operation-node-source.js';
2
2
  import { CompiledQuery } from '../query-compiler/compiled-query.js';
3
3
  import { JoinCallbackExpression, JoinReferenceExpression } from '../parser/join-parser.js';
4
- import { TableExpression, TableExpressionDatabase, TableExpressionTables, LeftJoinTableExpressionDatabase, RightJoinTableExpressionDatabase, FullJoinTableExpressionDatabase } from '../parser/table-parser.js';
4
+ import { TableExpression, TableExpressionDatabase, TableExpressionTables } from '../parser/table-parser.js';
5
5
  import { SelectExpression } from '../parser/select-parser.js';
6
6
  import { ExistsExpression, FilterOperator, FilterValueExpressionOrList, WhereGrouper } from '../parser/filter-parser.js';
7
7
  import { ReturningRow } from '../parser/returning-parser.js';
8
8
  import { ReferenceExpression } from '../parser/reference-parser.js';
9
- import { AnyRawBuilder, MergePartial, SingleResultType } from '../util/type-utils.js';
9
+ import { AnyRawBuilder, MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
10
10
  import { UpdateQueryNode } from '../operation-node/update-query-node.js';
11
11
  import { MutationObject } from '../parser/update-set-parser.js';
12
12
  import { Compilable } from '../util/compilable.js';
@@ -15,11 +15,12 @@ import { QueryId } from '../util/query-id.js';
15
15
  import { UpdateResult } from './update-result.js';
16
16
  import { KyselyPlugin } from '../plugin/kysely-plugin.js';
17
17
  import { WhereInterface } from './where-interface.js';
18
- import { JoinInterface } from './join-interface.js';
19
18
  import { ReturningInterface } from './returning-interface.js';
20
19
  import { NoResultErrorConstructor } from './no-result-error.js';
21
20
  import { Selectable } from '../util/column-type.js';
22
- export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, JoinInterface<DB, TB>, ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
21
+ import { AliasedQueryBuilder } from './select-query-builder.js';
22
+ import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
23
+ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
23
24
  #private;
24
25
  constructor(props: UpdateQueryBuilderProps);
25
26
  /**
@@ -544,23 +545,23 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
544
545
  * on "doggos"."owner_id" = "person"."id"
545
546
  * ```
546
547
  */
547
- innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilder<TableExpressionDatabase<DB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
548
- innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilder<TableExpressionDatabase<DB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
548
+ innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithInnerJoin<DB, UT, TB, O, TE>;
549
+ innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithInnerJoin<DB, UT, TB, O, TE>;
549
550
  /**
550
- * Just like {@link innerJoin} but adds a left join nstead of an inner join.
551
+ * Just like {@link innerJoin} but adds a left join instead of an inner join.
551
552
  */
552
- leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
553
- leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilder<LeftJoinTableExpressionDatabase<DB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
553
+ leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithLeftJoin<DB, UT, TB, O, TE>;
554
+ leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithLeftJoin<DB, UT, TB, O, TE>;
554
555
  /**
555
556
  * Just like {@link innerJoin} but adds a right join instead of an inner join.
556
557
  */
557
- rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
558
- rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilder<RightJoinTableExpressionDatabase<DB, TB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
558
+ rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithRightJoin<DB, UT, TB, O, TE>;
559
+ rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithRightJoin<DB, UT, TB, O, TE>;
559
560
  /**
560
561
  * Just like {@link innerJoin} but adds a full join instead of an inner join.
561
562
  */
562
- fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
563
- fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilder<FullJoinTableExpressionDatabase<DB, TB, TE>, UT, TableExpressionTables<DB, TB, TE>, O>;
563
+ fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithFullJoin<DB, UT, TB, O, TE>;
564
+ fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithFullJoin<DB, UT, TB, O, TE>;
564
565
  /**
565
566
  * Sets the values to update for an {@link Kysely.updateTable | update} query.
566
567
  *
@@ -814,3 +815,24 @@ export interface UpdateQueryBuilderProps {
814
815
  readonly queryNode: UpdateQueryNode;
815
816
  readonly executor: QueryExecutor;
816
817
  }
818
+ export declare type UpdateQueryBuilderWithInnerJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? InnerJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? UpdateQueryBuilder<DB, UT, TB | TE, O> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
819
+ declare type InnerJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends string, R> = A extends keyof DB ? UpdateQueryBuilder<InnerJoinedDB<DB, A, R>, UT, TB | A, O> : UpdateQueryBuilder<DB & Record<A, R>, UT, TB | A, O>;
820
+ declare type InnerJoinedDB<DB, A extends string, R> = {
821
+ [C in keyof DB | A]: C extends A ? R : C extends keyof DB ? DB[C] : never;
822
+ };
823
+ export declare type UpdateQueryBuilderWithLeftJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? LeftJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? LeftJoinedBuilder<DB, UT, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
824
+ declare type LeftJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends keyof any, R> = A extends keyof DB ? UpdateQueryBuilder<LeftJoinedDB<DB, A, R>, UT, TB | A, O> : UpdateQueryBuilder<DB & Record<A, Nullable<R>>, UT, TB | A, O>;
825
+ declare type LeftJoinedDB<DB, A extends keyof any, R> = {
826
+ [C in keyof DB | A]: C extends A ? Nullable<R> : C extends keyof DB ? DB[C] : never;
827
+ };
828
+ export declare type UpdateQueryBuilderWithRightJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? RightJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? RightJoinedBuilder<DB, UT, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
829
+ declare type RightJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends keyof any, R> = UpdateQueryBuilder<RightJoinedDB<DB, TB, A, R>, UT, TB | A, O>;
830
+ declare type RightJoinedDB<DB, TB extends keyof DB, A extends keyof any, R> = {
831
+ [C in keyof DB | A]: C extends A ? R : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
832
+ };
833
+ export declare type UpdateQueryBuilderWithFullJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? OuterJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? OuterJoinedBuilder<DB, UT, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
834
+ declare type OuterJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends keyof any, R> = UpdateQueryBuilder<OuterJoinedBuilderDB<DB, TB, A, R>, UT, TB | A, O>;
835
+ declare type OuterJoinedBuilderDB<DB, TB extends keyof DB, A extends keyof any, R> = {
836
+ [C in keyof DB | A]: C extends A ? Nullable<R> : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
837
+ };
838
+ export {};
@@ -111,6 +111,9 @@ export declare type UnknownRow = Record<string, unknown>;
111
111
  export declare type Nullable<T> = {
112
112
  [P in keyof T]: T[P] | null;
113
113
  };
114
+ export declare type NullableValues<T> = {
115
+ [P in keyof T]: Nullable<T[P]>;
116
+ };
114
117
  /**
115
118
  * Takes all properties from T1 and merges all properties from T2
116
119
  * that don't exist in T1 as optional properties.
@@ -35,7 +35,6 @@ export class SqliteIntrospector {
35
35
  const columns = await db
36
36
  .selectFrom(sql `PRAGMA_TABLE_INFO(${table})`.as('table_info'))
37
37
  .select(['name', 'type', 'notnull'])
38
- .castTo()
39
38
  .execute();
40
39
  return {
41
40
  name: table,
@@ -1,7 +1,6 @@
1
1
  export * from './kysely.js';
2
2
  export * from './query-creator.js';
3
3
  export * from './query-builder/where-interface.js';
4
- export * from './query-builder/join-interface.js';
5
4
  export * from './query-builder/returning-interface.js';
6
5
  export * from './query-builder/having-interface.js';
7
6
  export * from './query-builder/select-query-builder.js';
package/dist/esm/index.js CHANGED
@@ -2,7 +2,6 @@
2
2
  export * from './kysely.js';
3
3
  export * from './query-creator.js';
4
4
  export * from './query-builder/where-interface.js';
5
- export * from './query-builder/join-interface.js';
6
5
  export * from './query-builder/returning-interface.js';
7
6
  export * from './query-builder/having-interface.js';
8
7
  export * from './query-builder/select-query-builder.js';
@@ -11,5 +11,5 @@ export interface CheckConstraintNode extends OperationNode {
11
11
  */
12
12
  export declare const CheckConstraintNode: Readonly<{
13
13
  is(node: OperationNode): node is CheckConstraintNode;
14
- create(expression: RawNode, constraintName?: string | undefined): CheckConstraintNode;
14
+ create(expression: RawNode, constraintName?: string): CheckConstraintNode;
15
15
  }>;
@@ -11,5 +11,5 @@ export interface CommonTableExpressionNameNode extends OperationNode {
11
11
  */
12
12
  export declare const CommonTableExpressionNameNode: Readonly<{
13
13
  is(node: OperationNode): node is CommonTableExpressionNameNode;
14
- create(tableName: string, columnNames?: readonly string[] | undefined): CommonTableExpressionNameNode;
14
+ create(tableName: string, columnNames?: ReadonlyArray<string>): CommonTableExpressionNameNode;
15
15
  }>;
@@ -11,6 +11,6 @@ export interface CreateSchemaNode extends OperationNode {
11
11
  */
12
12
  export declare const CreateSchemaNode: Readonly<{
13
13
  is(node: OperationNode): node is CreateSchemaNode;
14
- create(schema: string, params?: CreateSchemaNodeParams | undefined): CreateSchemaNode;
14
+ create(schema: string, params?: CreateSchemaNodeParams): CreateSchemaNode;
15
15
  cloneWith(createSchema: CreateSchemaNode, params: CreateSchemaNodeParams): CreateSchemaNode;
16
16
  }>;
@@ -23,7 +23,7 @@ export interface DeleteQueryNode extends OperationNode {
23
23
  */
24
24
  export declare const DeleteQueryNode: Readonly<{
25
25
  is(node: OperationNode): node is DeleteQueryNode;
26
- create(fromItem: TableExpressionNode, withNode?: WithNode | undefined): DeleteQueryNode;
26
+ create(fromItem: TableExpressionNode, withNode?: WithNode): DeleteQueryNode;
27
27
  cloneWithOrderByItem(deleteNode: DeleteQueryNode, item: OrderByItemNode): DeleteQueryNode;
28
28
  cloneWithLimit(deleteNode: DeleteQueryNode, limit: LimitNode): DeleteQueryNode;
29
29
  }>;
@@ -13,6 +13,6 @@ export interface DropIndexNode extends OperationNode {
13
13
  */
14
14
  export declare const DropIndexNode: Readonly<{
15
15
  is(node: OperationNode): node is DropIndexNode;
16
- create(name: string, params?: DropIndexNodeProps | undefined): DropIndexNode;
16
+ create(name: string, params?: DropIndexNodeProps): DropIndexNode;
17
17
  cloneWith(dropIndex: DropIndexNode, props: DropIndexNodeProps): DropIndexNode;
18
18
  }>;
@@ -11,6 +11,6 @@ export interface DropSchemaNode extends OperationNode {
11
11
  */
12
12
  export declare const DropSchemaNode: Readonly<{
13
13
  is(node: OperationNode): node is DropSchemaNode;
14
- create(schema: string, params?: DropSchemaNodeParams | undefined): DropSchemaNode;
14
+ create(schema: string, params?: DropSchemaNodeParams): DropSchemaNode;
15
15
  cloneWith(dropSchema: DropSchemaNode, params: DropSchemaNodeParams): DropSchemaNode;
16
16
  }>;
@@ -11,6 +11,6 @@ export interface DropTableNode extends OperationNode {
11
11
  */
12
12
  export declare const DropTableNode: Readonly<{
13
13
  is(node: OperationNode): node is DropTableNode;
14
- create(table: TableNode, params?: DropTablexNodeParams | undefined): DropTableNode;
14
+ create(table: TableNode, params?: DropTablexNodeParams): DropTableNode;
15
15
  cloneWith(dropIndex: DropTableNode, params: DropTablexNodeParams): DropTableNode;
16
16
  }>;