Skip to content

fix: function type generation for zero arg and scalar computed fields #1035

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

Open
7ttp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: function type generation for zero arg and scalar computed fields #1035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b0c32e
fix: use Record<PropertyKey, never> for zero-arg functions to prevent…
7ttp Jan 31, 2026
5a41d9e
fix: include scalar computed fields in table Row types
7ttp Jan 31, 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
9 changes: 6 additions & 3 deletions src/server/templates/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@ export const apply = async ({
const columnsByTableId: Record<number, PostgresColumn[]> = {}
const tablesNamesByTableId: Record<number, string> = {}
const relationTypeByIds = new Map<number, (typeof types)[number]>()
// group types by id for quicker lookup
const typesById = new Map<number, (typeof types)[number]>()
Copy link
Member

@avallete avallete Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const typesById = new Map<number, (typeof types)[number]>()
// group types by id for quicker lookup
const typesById = new Map<number, (typeof types)[number]>()

const tablesLike = [...tables, ...foreignTables, ...views, ...materializedViews]
const tableAndViewNames = new Set<string>()

for (const tableLike of tablesLike) {
columnsByTableId[tableLike.id] = []
tablesNamesByTableId[tableLike.id] = tableLike.name
tableAndViewNames.add(tableLike.name)
}
for (const column of columns) {
if (column.table_id in columnsByTableId) {
Expand Down Expand Up @@ -197,7 +198,9 @@ export const apply = async ({
getTableNameFromRelationId(func.return_type_relation_id, func.return_type_id)) ||
// OR if the function takes a table row but doesn't qualify as embedded (for error reporting)
(relationTypeByIds.get(inArgs[0].type_id) &&
!getTableNameFromRelationId(func.return_type_relation_id, func.return_type_id))))
!getTableNameFromRelationId(func.return_type_relation_id, func.return_type_id)) ||
// OR if the function takes a table/view row (computed field)
tableAndViewNames.has(func.argument_types)))
Comment on lines +201 to +203
Copy link
Member

@avallete avallete Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should already be covered by: https://github.com/supabase/postgres-meta/pull/1035/changes#diff-c903ec71df16a8ae5f665c19c21b273f74c2f8eb02f5e8a3552ebe69d18be18fR196-R198 🤔

) {
introspectionBySchema[func.schema].functions.push({ fn: func, inArgs })
}
Expand Down Expand Up @@ -410,7 +413,7 @@ export const apply = async ({
) => {
return fns
.map(({ fn, inArgs }) => {
let argsType = 'never'
let argsType = 'Record<PropertyKey, never>'
Copy link
Member

@avallete avallete Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be tested with the inference within https://github.com/supabase/supabase-js/tree/master/packages/core/postgrest-js as I expect this might break a few things.

I remember having to use never specifically here to be able to detect the difference between actual functions with args, and functions with no args. Using a Record<string, never> in my memory didn't allowed that.

let returnType = getFunctionReturnType(schema, fn)

// Check for specific error cases
Expand Down
Loading