chore: use canary postgres-meta

Author: avallete

package.json

@@ -49,7 +49,7 @@
     "type-check:test": "tsc --noEmit --project tsconfig.test.json",
     "db:clean": "cd test/db && docker compose down --volumes",
     "db:run": "cd test/db && docker compose up --detach && wait-for-localhost 3000",
-    "db:generate-test-types": "cd test/db && docker compose up --detach && wait-for-localhost 8080 && curl --location 'http://0.0.0.0:8080/generators/typescript?included_schemas=public,personal&detect_one_to_one_relationships=true' > ../types.generated.ts && node ../scripts/update-json-type.js && prettier --write ../types.generated.ts"
+    "db:generate-test-types": "cd test/db && docker compose up --detach && wait-for-localhost 8080 && wait-for-localhost 3000 && curl --location 'http://0.0.0.0:8080/generators/typescript?included_schemas=public,personal&detect_one_to_one_relationships=true' > ../types.generated.ts && node ../scripts/update-json-type.js && prettier --write ../types.generated.ts"
   },
   "dependencies": {
     "@supabase/node-fetch": "^2.6.14"

test/advanced_rpc.test.ts

@@ -1,13 +1,12 @@
 import { PostgrestClient } from '../src/index'
 import { Database } from './types.override'
-import { expectType } from 'tsd'
-import { TypeEqual } from 'ts-expect'
+import { TypeEqual, expectType } from './types'
 import { SelectQueryError } from '../src/select-query-parser/utils'
 import { z } from 'zod'
 import { RequiredDeep } from 'type-fest'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 
 const MessagesWithoutBlurbSchema = z.object({
   channel_id: z.number(),
@@ -526,11 +525,11 @@ describe('advanced rpc', () => {
   test('should be able to filter before and after select rpc', async () => {
     const res = await postgrest
       .rpc('get_user_profile', {
-        //@ts-expect-error will complain about missing the rest of the params
+        //@ts-expect-error Type '{ username: string; }' is missing the following properties from type '{ age_range: unknown; catchphrase: unknown; data: unknown; status: "ONLINE" | "OFFLINE" | null; username: string; }': age_range, catchphrase, data, status
         user_row: { username: 'supabot' },
       })
       .select('id, username, users(username, catchphrase)')
-      //@ts-expect-error will complain about missing the rest of the params
+      //@ts-expect-error Property 'eq' does not exist on type
       .eq('username', 'nope')
 
     expect(res).toMatchInlineSnapshot(`
@@ -544,7 +543,7 @@ describe('advanced rpc', () => {
     `)
     const res2 = await postgrest
       .rpc('get_user_profile', {
-        //@ts-expect-error will complain about missing the rest of the params
+        //@ts-expect-error Type '{ username: string; }' is missing the following properties from type
         user_row: { username: 'supabot' },
       })
       // should also be able to fitler before the select
@@ -562,7 +561,7 @@ describe('advanced rpc', () => {
     `)
     const res3 = await postgrest
       .rpc('get_user_profile', {
-        //@ts-expect-error will complain about missing the rest of the params
+        //@ts-expect-error Type '{ username: string; }' is missing the following properties from type
         user_row: { username: 'supabot' },
       })
       // should also be able to fitler before the select
@@ -830,7 +829,7 @@ describe('advanced rpc', () => {
 
   test('polymorphic function with bool param', async () => {
     const res = await postgrest.rpc('polymorphic_function_with_different_return', {
-      // @ts-expect-error should not have a function with a single unnamed params that isn't json/jsonb/text in types definitions
+      // @ts-expect-error Type 'boolean' is not assignable to type 'string'
       '': true,
     })
     expect(res).toMatchInlineSnapshot(`
@@ -846,7 +845,7 @@ describe('advanced rpc', () => {
 
   test('polymorphic function with unnamed int param', async () => {
     const res = await postgrest.rpc(
-      // @ts-expect-error should not have a function with a single unnamed params that isn't json/jsonb/text in types definitions
+      // @ts-expect-error Argument of type '"polymorphic_function_with_unnamed_integer"' is not assignable to parameter of type '"blurb_message" | "function_returning_row" | "function_returning_set_of_rows"
       'polymorphic_function_with_unnamed_integer',
       {
         '': 1,
@@ -1000,8 +999,8 @@ describe('advanced rpc', () => {
     let result: Exclude<typeof res.data, null>
     // TODO: there is no ways for now to distinguish between a valid optional argument or a missing one if the argument is unnamed
     let expected: SelectQueryError<'Could not choose the best candidate function between: public.polymorphic_function_with_unnamed_default(), public.polymorphic_function_with_unnamed_default( => text). Try renaming the parameters or the function itself in the database so function overloading can be resolved'>
-    //@ts-expect-error
-    expectType<TypeEqual<typeof result, typeof expected>>(true)
+    // this should be true
+    expectType<TypeEqual<typeof result, typeof expected>>(false)
     expect(res).toMatchInlineSnapshot(`
       Object {
         "count": null,
@@ -1062,8 +1061,8 @@ describe('advanced rpc', () => {
     let result: Exclude<typeof res.data, null>
     // TODO: there is no ways for now to distinguish between a valid optional argument or a missing one if the argument is unnamed
     let expected: SelectQueryError<'Could not choose the best candidate function between: public.polymorphic_function_with_unnamed_default_overload(), public.polymorphic_function_with_unnamed_default_overload( => text). Try renaming the parameters or the function itself in the database so function overloading can be resolved'>
-    //@ts-expect-error
-    expectType<TypeEqual<typeof result, typeof expected>>(true)
+    // this should be true
+    expectType<TypeEqual<typeof result, typeof expected>>(false)
     expect(res).toMatchInlineSnapshot(`
       Object {
         "count": null,
@@ -1100,7 +1099,7 @@ describe('advanced rpc', () => {
 
   test('polymorphic function with unnamed default overload bool param', async () => {
     const res = await postgrest.rpc('polymorphic_function_with_unnamed_default_overload', {
-      //@ts-expect-error
+      //@ts-expect-error Type 'boolean' is not assignable to type 'string'
       '': true,
     })
     let result: Exclude<typeof res.data, null>

test/db/docker-compose.yml

@@ -41,8 +41,7 @@ services:
       POSTGRES_HOST: /var/run/postgresql
       POSTGRES_PORT: 5432
   pgmeta:
-    # TODO: use postgres-meta once https://github.com/supabase/postgres-meta/pull/971 is published
-    image: local-pg-meta
+    image: supabase/postgres-meta:canary-pr-971-f1f23911f3feffdc8f033b5aaee0ccca0be39df1
     ports:
       - '8080:8080'
     environment:

test/embeded_functions_join.test.ts

@@ -1,12 +1,11 @@
 import { PostgrestClient } from '../src/index'
 import { Database } from './types.override'
-import { expectType } from 'tsd'
-import { TypeEqual } from 'ts-expect'
+import { expectType, TypeEqual } from './types'
 import { z } from 'zod'
 import { RequiredDeep } from 'type-fest'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 
 describe('embeded functions select', () => {
   test('embeded_setof_function - function returning a setof embeded table', async () => {

test/relationships-aggregate-operations.test.ts

@@ -4,7 +4,7 @@ import { expectType, TypeEqual } from './types'
 import { z } from 'zod'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 
 test('select with aggregate count function', async () => {
   const res = await postgrest.from('users').select('username, messages(count)').limit(1).single()

test/relationships-error-handling.test.ts

@@ -4,7 +4,7 @@ import { expectType, TypeEqual } from './types'
 import { SelectQueryError } from '../src/select-query-parser/utils'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 
 test('join over a 1-1 relation with both nullables and non-nullables fields with no hinting', async () => {
   const res = await postgrest

test/relationships-join-operations.test.ts

@@ -5,7 +5,7 @@ import { z } from 'zod'
 import { RequiredDeep } from 'type-fest'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 const userColumn: 'catchphrase' | 'username' = 'username'
 
 // Zod schemas for common types

test/relationships-spread-operations.test.ts

@@ -5,7 +5,7 @@ import { expectType, TypeEqual } from './types'
 import { z } from 'zod'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 const REST_URL_13 = 'http://localhost:3001'
 const postgrest13 = new PostgrestClient<Database, { PostgrestVersion: '13' }>(REST_URL_13)
 const postgrest13FromDatabaseTypes = new PostgrestClient<DatabaseWithOptions13>(REST_URL_13)

test/relationships.test.ts

@@ -6,7 +6,7 @@ import { Json } from '../src/select-query-parser/types'
 import { RequiredDeep } from 'type-fest'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 
 const UsersRowSchema = z.object({
   age_range: z.unknown().nullable(),

test/rpc.test.ts

@@ -4,9 +4,9 @@ import { expectType, TypeEqual } from './types'
 import { z } from 'zod'
 
 const REST_URL = 'http://localhost:3000'
-export const postgrest = new PostgrestClient<Database>(REST_URL)
+const postgrest = new PostgrestClient<Database>(REST_URL)
 
-export const RPC_NAME = 'get_username_and_status'
+const RPC_NAME = 'get_username_and_status'
 
 test('RPC call with no params', async () => {
   const res = await postgrest.rpc(RPC_NAME, { name_param: 'supabot' }).select()