Skip to content

Commit 1c5e03a

Browse files
committed
fix jsdocs.
1 parent f348dfb commit 1c5e03a

File tree

4 files changed

+82
-37
lines changed

4 files changed

+82
-37
lines changed

deno.check.d.ts

+6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ import type {
1010
} from './dist/esm'
1111

1212
export interface Database {
13+
audit: AuditTable
1314
person: PersonTable
1415
pet: PetTable
1516
toy: ToyTable
1617
wine: WineTable
1718
wine_stock_change: WineStockChangeTable
1819
}
1920

21+
interface AuditTable {
22+
action: string
23+
}
24+
2025
interface PersonTable {
2126
id: Generated<number>
2227
address: { city: string } | null
@@ -51,6 +56,7 @@ interface PetTable {
5156

5257
interface ToyTable {
5358
id: Generated<number>
59+
name: string
5460
pet_id: number
5561
price: number
5662
}

src/kysely.ts

+70-32
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export class Kysely<DB>
341341
*
342342
* await trx.commit().execute()
343343
*
344-
* return catto
344+
* // ...
345345
* } catch (error) {
346346
* await trx.rollback().execute()
347347
* }
@@ -375,20 +375,19 @@ export class Kysely<DB>
375375
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
376376
*
377377
* try {
378-
* const bone = await trxAfterJennifer
379-
* .insertInto('toy')
380-
* .values({ name: 'Bone', price: 1.99 })
381-
* .returning('id')
382-
* .executeTakeFirstOrThrow()
383-
*
384-
* await trxAfterJennifer
378+
* const catto = await trxAfterJennifer
385379
* .insertInto('pet')
386380
* .values({
387381
* owner_id: jennifer.id,
388382
* name: 'Catto',
389383
* species: 'cat',
390-
* favorite_toy_id: bone.id,
391384
* })
385+
* .returning('id')
386+
* .executeTakeFirstOrThrow()
387+
*
388+
* await trxAfterJennifer
389+
* .insertInto('toy')
390+
* .values({ name: 'Bone', price: 1.99, pet_id: catto.id })
392391
* .execute()
393392
* } catch (error) {
394393
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
@@ -838,13 +837,20 @@ export class ControlledTransaction<
838837
* ### Examples
839838
*
840839
* ```ts
840+
* import type { Kysely } from 'kysely'
841+
* import type { Database } from 'type-editor' // imaginary module
842+
*
843+
* const trx = await db.startTransaction().execute()
844+
*
841845
* try {
842846
* await doSomething(trx)
843847
*
844848
* await trx.commit().execute()
845849
* } catch (error) {
846850
* await trx.rollback().execute()
847851
* }
852+
*
853+
* async function doSomething(kysely: Kysely<Database>) {}
848854
* ```
849855
*/
850856
commit(): Command<void> {
@@ -865,13 +871,20 @@ export class ControlledTransaction<
865871
* ### Examples
866872
*
867873
* ```ts
874+
* import type { Kysely } from 'kysely'
875+
* import type { Database } from 'type-editor' // imaginary module
876+
*
877+
* const trx = await db.startTransaction().execute()
878+
*
868879
* try {
869880
* await doSomething(trx)
870881
*
871882
* await trx.commit().execute()
872883
* } catch (error) {
873884
* await trx.rollback().execute()
874885
* }
886+
*
887+
* async function doSomething(kysely: Kysely<Database>) {}
875888
* ```
876889
*/
877890
rollback(): Command<void> {
@@ -894,15 +907,23 @@ export class ControlledTransaction<
894907
* ### Examples
895908
*
896909
* ```ts
897-
* await insertJennifer(trx)
910+
* import type { Kysely } from 'kysely'
911+
* import type { Database } from 'type-editor' // imaginary module
898912
*
899-
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
913+
* const trx = await db.startTransaction().execute()
900914
*
901-
* try {
902-
* await doSomething(trxAfterJennifer)
903-
* } catch (error) {
904-
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
905-
* }
915+
* await insertJennifer(trx)
916+
*
917+
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
918+
*
919+
* try {
920+
* await doSomething(trxAfterJennifer)
921+
* } catch (error) {
922+
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
923+
* }
924+
*
925+
* async function insertJennifer(kysely: Kysely<Database>) {}
926+
* async function doSomething(kysely: Kysely<Database>) {}
906927
* ```
907928
*/
908929
savepoint<SN extends string>(
@@ -932,15 +953,23 @@ export class ControlledTransaction<
932953
* ### Examples
933954
*
934955
* ```ts
935-
* await insertJennifer(trx)
956+
* import type { Kysely } from 'kysely'
957+
* import type { Database } from 'type-editor' // imaginary module
936958
*
937-
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
959+
* const trx = await db.startTransaction().execute()
938960
*
939-
* try {
940-
* await doSomething(trxAfterJennifer)
941-
* } catch (error) {
942-
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
943-
* }
961+
* await insertJennifer(trx)
962+
*
963+
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
964+
*
965+
* try {
966+
* await doSomething(trxAfterJennifer)
967+
* } catch (error) {
968+
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
969+
* }
970+
*
971+
* async function insertJennifer(kysely: Kysely<Database>) {}
972+
* async function doSomething(kysely: Kysely<Database>) {}
944973
* ```
945974
*/
946975
rollbackToSavepoint<SN extends S[number]>(
@@ -972,19 +1001,28 @@ export class ControlledTransaction<
9721001
* ### Examples
9731002
*
9741003
* ```ts
975-
* await insertJennifer(trx)
1004+
* import type { Kysely } from 'kysely'
1005+
* import type { Database } from 'type-editor' // imaginary module
9761006
*
977-
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
1007+
* const trx = await db.startTransaction().execute()
9781008
*
979-
* try {
980-
* await doSomething(trxAfterJennifer)
981-
* } catch (error) {
982-
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
983-
* }
1009+
* await insertJennifer(trx)
9841010
*
985-
* await trxAfterJennifer.releaseSavepoint('after_jennifer').execute()
1011+
* const trxAfterJennifer = await trx.savepoint('after_jennifer').execute()
1012+
*
1013+
* try {
1014+
* await doSomething(trxAfterJennifer)
1015+
* } catch (error) {
1016+
* await trxAfterJennifer.rollbackToSavepoint('after_jennifer').execute()
1017+
* }
1018+
*
1019+
* await trxAfterJennifer.releaseSavepoint('after_jennifer').execute()
1020+
*
1021+
* await doSomethingElse(trx)
9861022
*
987-
* await doSomethingElse(trx)
1023+
* async function insertJennifer(kysely: Kysely<Database>) {}
1024+
* async function doSomething(kysely: Kysely<Database>) {}
1025+
* async function doSomethingElse(kysely: Kysely<Database>) {}
9881026
* ```
9891027
*/
9901028
releaseSavepoint<SN extends S[number]>(

src/query-builder/select-query-builder.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ export interface SelectQueryBuilder<DB, TB extends keyof DB, O>
259259
* ]).as('is_jennifer_or_arnold'),
260260
*
261261
* // Select a raw sql expression
262-
* sql<string>`concat(first_name, ' ', last_name)`.as('full_name').
262+
* sql<string>`concat(first_name, ' ', last_name)`.as('full_name'),
263263
*
264264
* // Select a static string value
265265
* val('Some value').as('string_value'),
@@ -1961,13 +1961,15 @@ export interface SelectQueryBuilder<DB, TB extends keyof DB, O>
19611961
* instances as inputs:
19621962
*
19631963
* ```ts
1964+
* import type { Expression } from 'kysely'
1965+
*
19641966
* function doStuff(expr: Expression<string>) {
1965-
* ...
1967+
* // ...
19661968
* }
19671969
*
19681970
* // Error! This is not ok because the expression type is
19691971
* // `{ first_name: string }` instead of `string`.
1970-
* doStuff(db.selectFrom('person').select('first_name'))
1972+
* // doStuff(db.selectFrom('person').select('first_name'))
19711973
*
19721974
* // Ok! This is ok since we've plucked the `string` type of the
19731975
* // only column in the output type.

src/query-builder/update-query-builder.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import {
5454
NoResultError,
5555
NoResultErrorConstructor,
5656
} from './no-result-error.js'
57-
import { Selectable } from '../util/column-type.js'
5857
import { Explainable, ExplainFormat } from '../util/explainable.js'
5958
import { AliasedExpression, Expression } from '../expression/expression.js'
6059
import {
@@ -649,7 +648,7 @@ export class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O>
649648
* .set('person.first_name', 'Updated person')
650649
* .set('pet.name', 'Updated doggo')
651650
* .whereRef('person.id', '=', 'pet.owner_id')
652-
* .where('person.id', '=', '1')
651+
* .where('person.id', '=', 1)
653652
* .executeTakeFirst()
654653
* ```
655654
*

0 commit comments

Comments
 (0)