Skip to content

feat: Omit Knex types when generate_knex_types is false #22

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
louis-pre merged 2 commits into from
Oct 5, 2026
Merged

feat: Omit Knex types when generate_knex_types is false #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cf7003
feat: Omit Knex types when generate_knex_types is false
louis-pre Oct 5, 2026
8e8d61c
test: Remove generate_knex_types snapshot tests
louis-pre Oct 5, 2026
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
5 changes: 4 additions & 1 deletion src/lib/file-generators/generated/[schema_name]/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ export const createSchemaGeneratedTypeIndexFile = (
{
kind: StructureKind.ImportDeclaration,
moduleSpecifier: '../utils',
namedImports: ['KyselyTable', 'KnexTable'],
namedImports: [
'KyselyTable',
...(config.generate_knex_types === true ? ['KnexTable'] : []),
],
isTypeOnly: true,
},
]
Expand Down
33 changes: 20 additions & 13 deletions src/lib/file-generators/generated/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,26 @@ export const createGeneratedUtilsFile = (
const { project } = args
const { output_dir } = config

const knex_import =
config.generate_knex_types === true ? '\nimport { Knex } from "knex"' : ''

const knex_types =
config.generate_knex_types === true
? `
type KnexInsertableTable<T> = {
[K in keyof T]: Knex.MaybeRawColumn<T[K]>
}

export type KnexTable<Selectable, Initializer> = Knex.CompositeTableType<
Selectable,
Partial<KnexInsertableTable<Initializer>>, // TODO remove \`Partial\` once we fix the code
Partial<KnexInsertableTable<Initializer>>
>
`
: ''

const file_source = `import type { JSONValue } from "zapatos/db"
import { type ColumnType } from "kysely"
import { Knex } from "knex"
import { type ColumnType } from "kysely"${knex_import}

type PartialWithNever<T> = {
[P in keyof T as T[P] extends never ? never : P]?: T[P]
Expand All @@ -30,17 +47,7 @@ export type KyselyTable<Selectable, Initializer> = {
: never
>
}

type KnexInsertableTable<T> = {
[K in keyof T]: Knex.MaybeRawColumn<T[K]>
}

export type KnexTable<Selectable, Initializer> = Knex.CompositeTableType<
Selectable,
Partial<KnexInsertableTable<Initializer>>, // TODO remove \`Partial\` once we fix the code
Partial<KnexInsertableTable<Initializer>>
>

${knex_types}
type KeysOfUnion<T> = T extends T ? keyof T : never

type NullableKeys<T> = {
Expand Down
Loading