feat(typegen): add functions setof type introspection (#971)

* feat(typegen): add setof function type introspection

- Introspect the setof function fields for functions
- Restore functions as unions of args + returns

* chore: update snapshots

* chore: unify sort and dedup loops

* chore: remove duplicate sort

* chore: include view in type

* fix: isOneToOne

* fix: tests

* chore: dedup typescript typegen logic

* chore: re-use generateColumn

* fix: retrieve prorows only

* chore: refactor typegen for prorows only

* fix: only get reltype in types

* chore: reuse relationTypeByIds

* chore: reduce functions changes to minimum

* chore: only single loop for types

* chore: single sort for relationships

* chore: reduce loops

* fix: relationtype setof functions generation

* chore: fix prettier

* chore: update snapshots

* chore: fix types test

* fix: test types

* fix: include materializedView types

* test: add search_todos_by_details function

* fix: add setof from * for all relation functions

* fix(typescript): union unknown null (#995)

* fix(typescript): unknown is already nullable

Fixes: supabase/cli#4234
supabase/cli#577

* fix: also exclude any from null union

Author: avallete

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20 as build
+FROM node:20 AS build
 WORKDIR /usr/src/app
 # Do `npm ci` separately so we can cache `node_modules`
 # https://nodejs.org/en/docs/guides/nodejs-docker-webapp/

package.json

@@ -26,7 +26,8 @@
     "gen:types:go": "PG_META_GENERATE_TYPES=go node --loader ts-node/esm src/server/server.ts",
     "gen:types:swift": "PG_META_GENERATE_TYPES=swift node --loader ts-node/esm src/server/server.ts",
     "start": "node dist/server/server.js",
-    "dev": "trap 'npm run db:clean' INT && run-s db:clean db:run && nodemon --exec node --loader ts-node/esm src/server/server.ts | pino-pretty --colorize",
+    "dev": "trap 'npm run db:clean' INT && run-s db:clean db:run &&  run-s dev:code",
+    "dev:code": "nodemon --exec node --loader ts-node/esm src/server/server.ts | pino-pretty --colorize",
     "test": "run-s db:clean db:run test:run db:clean",
     "db:clean": "cd test/db && docker compose down",
     "db:run": "cd test/db && docker compose up --detach --wait",

src/lib/sql/functions.sql.ts

@@ -85,6 +85,10 @@ select
   pg_get_function_result(f.oid) as return_type,
   nullif(rt.typrelid::int8, 0) as return_type_relation_id,
   f.proretset as is_set_returning_function,
+  case
+    when f.proretset then nullif(f.prorows, 0)
+    else null
+  end as prorows,
   case
     when f.provolatile = 'i' then 'IMMUTABLE'
     when f.provolatile = 's' then 'STABLE'

src/lib/sql/types.sql.ts

@@ -13,7 +13,8 @@ select
   format_type (t.oid, null) as format,
   coalesce(t_enums.enums, '[]') as enums,
   coalesce(t_attributes.attributes, '[]') as attributes,
-  obj_description (t.oid, 'pg_type') as comment
+  obj_description (t.oid, 'pg_type') as comment,
+  nullif(t.typrelid::int8, 0) as type_relation_id
 from
   pg_type t
   left join pg_namespace n on n.oid = t.typnamespace
@@ -46,7 +47,7 @@ from
         t.typrelid = 0
         or (
           select
-            c.relkind ${props.includeTableTypes ? `in ('c', 'r')` : `= 'c'`}
+            c.relkind ${props.includeTableTypes ? `in ('c', 'r', 'v', 'm')` : `= 'c'`}
           from
             pg_class c
           where

src/lib/types.ts

@@ -156,6 +156,7 @@ const postgresFunctionSchema = Type.Object({
   return_type: Type.String(),
   return_type_relation_id: Type.Union([Type.Integer(), Type.Null()]),
   is_set_returning_function: Type.Boolean(),
+  prorows: Type.Union([Type.Number(), Type.Null()]),
   behavior: Type.Union([
     Type.Literal('IMMUTABLE'),
     Type.Literal('STABLE'),
@@ -442,6 +443,7 @@ export const postgresTypeSchema = Type.Object({
   enums: Type.Array(Type.String()),
   attributes: Type.Array(Type.Object({ name: Type.String(), type_id: Type.Integer() })),
   comment: Type.Union([Type.String(), Type.Null()]),
+  type_relation_id: Type.Union([Type.Integer(), Type.Null()]),
 })
 export type PostgresType = Static<typeof postgresTypeSchema>