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

fix(typegen): Fix support for custom SQL schemas in TypeScript type generation. #717

Closed
wants to merge 6 commits into from
Closed

fix(typegen): Fix support for custom SQL schemas in TypeScript type generation. #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f1db4e
fix(typegen): Fix support for custom SQL schemas in TypeScript type g…
yingw787 Feb 15, 2024
a933456
Delete test.ts
yingw787 Feb 15, 2024
8bade6c
Update typegen.ts updated expected TypeScript types.
yingw787 Feb 15, 2024
e70059b
Update typescript.ts creating types for Tables, TabelsInsert, TablesU…
yingw787 Feb 17, 2024
877ca53
Merge branch 'master' into fix/custom-schemas
yingw787 Feb 17, 2024
7a8ab6b
Update typegen.ts update 2 test cases, 96 tests passing.
yingw787 Feb 17, 2024
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
171 changes: 92 additions & 79 deletions src/server/templates/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,85 +419,98 @@ export type Database = {
})}
}

export type Tables<
PublicTableNameOrOptions extends
| keyof (Database["public"]["Tables"] & Database["public"]["Views"])
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
Database[PublicTableNameOrOptions["schema"]]["Views"])
: never = never
> = PublicTableNameOrOptions extends { schema: keyof Database }
? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: PublicTableNameOrOptions extends keyof (Database["public"]["Tables"] &
Database["public"]["Views"])
? (Database["public"]["Tables"] &
Database["public"]["Views"])[PublicTableNameOrOptions] extends {
Row: infer R
}
? R
: never
: never

export type TablesInsert<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
: never = never
> = PublicTableNameOrOptions extends { schema: keyof Database }
? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
Insert: infer I
}
? I
: never
: PublicTableNameOrOptions extends keyof Database["public"]["Tables"]
? Database["public"]["Tables"][PublicTableNameOrOptions] extends {
Insert: infer I
}
? I
: never
: never

export type TablesUpdate<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
: never = never
> = PublicTableNameOrOptions extends { schema: keyof Database }
? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
Update: infer U
}
? U
: never
: PublicTableNameOrOptions extends keyof Database["public"]["Tables"]
? Database["public"]["Tables"][PublicTableNameOrOptions] extends {
Update: infer U
}
? U
: never
: never

export type Enums<
PublicEnumNameOrOptions extends
| keyof Database["public"]["Enums"]
| { schema: keyof Database },
EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
: never = never
> = PublicEnumNameOrOptions extends { schema: keyof Database }
? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
: PublicEnumNameOrOptions extends keyof Database["public"]["Enums"]
? Database["public"]["Enums"][PublicEnumNameOrOptions]
: never
${schemas
.sort(({ name: a }, { name: b }) => a.localeCompare(b))
.map((schema) => {

const schemaName = schema.name;
const schemaNameWithQuotes = `"${schemaName}"`
const pascalCaseSchemaName = schemaName.replace(/^./, (match) => match.toUpperCase());

return `

export type ${pascalCaseSchemaName}Tables<
${pascalCaseSchemaName}TableNameOrOptions extends
| keyof (Database[${schemaNameWithQuotes}]["Tables"] & Database[${schemaNameWithQuotes}]["Views"])
| { schema: keyof Database },
TableName extends ${pascalCaseSchemaName}TableNameOrOptions extends { schema: keyof Database }
? keyof (Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Tables"] &
Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Views"])
: never = never,
> = ${pascalCaseSchemaName}TableNameOrOptions extends { schema: keyof Database }
? (Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Tables"] &
Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: ${pascalCaseSchemaName}TableNameOrOptions extends keyof (Database[${schemaNameWithQuotes}]["Tables"] &
Database[${schemaNameWithQuotes}]["Views"])
? (Database[${schemaNameWithQuotes}]["Tables"] &
Database[${schemaNameWithQuotes}]["Views"])[${pascalCaseSchemaName}TableNameOrOptions] extends {
Row: infer R
}
? R
: never
: never

export type ${pascalCaseSchemaName}TablesInsert<
${pascalCaseSchemaName}TableNameOrOptions extends
| keyof Database[${schemaNameWithQuotes}]["Tables"]
| { schema: keyof Database },
TableName extends ${pascalCaseSchemaName}TableNameOrOptions extends { schema: keyof Database }
? keyof Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Tables"]
: never = never,
> = ${pascalCaseSchemaName}TableNameOrOptions extends { schema: keyof Database }
? Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Tables"][TableName] extends {
Insert: infer I
}
? I
: never
: ${pascalCaseSchemaName}TableNameOrOptions extends keyof Database[${schemaNameWithQuotes}]["Tables"]
? Database[${schemaNameWithQuotes}]["Tables"][${pascalCaseSchemaName}TableNameOrOptions] extends {
Insert: infer I
}
? I
: never
: never

export type ${pascalCaseSchemaName}TablesUpdate<
${pascalCaseSchemaName}TableNameOrOptions extends
| keyof Database[${schemaNameWithQuotes}]["Tables"]
| { schema: keyof Database },
TableName extends ${pascalCaseSchemaName}TableNameOrOptions extends { schema: keyof Database }
? keyof Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Tables"]
: never = never,
> = ${pascalCaseSchemaName}TableNameOrOptions extends { schema: keyof Database }
? Database[${pascalCaseSchemaName}TableNameOrOptions["schema"]]["Tables"][TableName] extends {
Update: infer U
}
? U
: never
: ${pascalCaseSchemaName}TableNameOrOptions extends keyof Database[${schemaNameWithQuotes}]["Tables"]
? Database[${schemaNameWithQuotes}]["Tables"][${pascalCaseSchemaName}TableNameOrOptions] extends {
Update: infer U
}
? U
: never
: never

export type ${pascalCaseSchemaName}Enums<
${pascalCaseSchemaName}EnumNameOrOptions extends
| keyof Database[${schemaNameWithQuotes}]["Enums"]
| { schema: keyof Database },
EnumName extends ${pascalCaseSchemaName}EnumNameOrOptions extends { schema: keyof Database }
? keyof Database[${pascalCaseSchemaName}EnumNameOrOptions["schema"]]["Enums"]
: never = never,
> = ${pascalCaseSchemaName}EnumNameOrOptions extends { schema: keyof Database }
? Database[${pascalCaseSchemaName}EnumNameOrOptions["schema"]]["Enums"][EnumName]
: ${pascalCaseSchemaName}EnumNameOrOptions extends keyof Database[${schemaNameWithQuotes}]["Enums"]
? Database[${schemaNameWithQuotes}]["Enums"][${pascalCaseSchemaName}EnumNameOrOptions]
: never


`})}
`

output = await prettier.format(output, {
Expand Down
16 changes: 8 additions & 8 deletions test/server/typegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ test('typegen', async () => {
}
}

export type Tables<
export type PublicTables<
PublicTableNameOrOptions extends
| keyof (Database["public"]["Tables"] & Database["public"]["Views"])
| { schema: keyof Database },
Expand All @@ -390,7 +390,7 @@ test('typegen', async () => {
: never
: never

export type TablesInsert<
export type PublicTablesInsert<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
Expand All @@ -411,7 +411,7 @@ test('typegen', async () => {
: never
: never

export type TablesUpdate<
export type PublicTablesUpdate<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
Expand All @@ -432,7 +432,7 @@ test('typegen', async () => {
: never
: never

export type Enums<
export type PublicEnums<
PublicEnumNameOrOptions extends
| keyof Database["public"]["Enums"]
| { schema: keyof Database },
Expand Down Expand Up @@ -829,7 +829,7 @@ test('typegen w/ one-to-one relationships', async () => {
}
}

export type Tables<
export type PublicTables<
PublicTableNameOrOptions extends
| keyof (Database["public"]["Tables"] & Database["public"]["Views"])
| { schema: keyof Database },
Expand All @@ -854,7 +854,7 @@ test('typegen w/ one-to-one relationships', async () => {
: never
: never

export type TablesInsert<
export type PublicTablesInsert<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
Expand All @@ -875,7 +875,7 @@ test('typegen w/ one-to-one relationships', async () => {
: never
: never

export type TablesUpdate<
export type PublicTablesUpdate<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
Expand All @@ -896,7 +896,7 @@ test('typegen w/ one-to-one relationships', async () => {
: never
: never

export type Enums<
export type PublicEnums<
PublicEnumNameOrOptions extends
| keyof Database["public"]["Enums"]
| { schema: keyof Database },
Expand Down