chore(tests): add types generation and database override

Author: avallete

package.json

@@ -44,7 +44,7 @@
     "test:types:watch": "run-s build && tsd --files 'test/**/*.test-d.ts' --watch",
     "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"
+    "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 && sed -i 's/export type Json = .*/export type Json = unknown;/' ../types.generated.ts"
   },
   "dependencies": {
     "@supabase/node-fetch": "^2.6.14"

test/basic.ts

@@ -1,5 +1,5 @@
 import { PostgrestClient } from '../src/index'
-import { CustomUserDataType, Database } from './types'
+import { CustomUserDataType, Database } from './types.override'
 
 const REST_URL = 'http://localhost:3000'
 const postgrest = new PostgrestClient<Database>(REST_URL)

test/filters.ts

@@ -1,5 +1,5 @@
 import { PostgrestClient } from '../src/index'
-import { Database } from './types'
+import { Database } from './types.override'
 
 const postgrest = new PostgrestClient<Database>('http://localhost:3000')
 

test/index.test-d.ts

@@ -2,7 +2,8 @@ import { TypeEqual } from 'ts-expect'
 import { expectError, expectType } from 'tsd'
 import { PostgrestClient, PostgrestError } from '../src/index'
 import { Prettify } from '../src/types'
-import { Database, Json } from './types'
+import { Json } from './types.generated'
+import { Database } from './types.override'
 
 const REST_URL = 'http://localhost:3000'
 const postgrest = new PostgrestClient<Database>(REST_URL)
@@ -191,7 +192,7 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
   }
   // getting this w/o the cast, not sure why:
   // Parameter type Json is declared too wide for argument type Json
-  expectType<Json>(result.data.bar)
+  expectType<typeof result.data.bar extends Json ? true : false>(true)
   expectType<string>(result.data.baz)
 }
 

test/override-types.test-d.ts

@@ -1,7 +1,8 @@
 import { expectType } from 'tsd'
 import { TypeEqual } from 'ts-expect'
 import { PostgrestClient } from '../src'
-import { CustomUserDataType, Database, Json } from './types'
+import { CustomUserDataType, Database } from './types.override'
+import { Json } from './types.generated'
 
 const REST_URL = 'http://localhost:54321'
 const postgrest = new PostgrestClient<Database>(REST_URL)

test/resource-embedding.ts

@@ -1,5 +1,5 @@
 import { PostgrestClient } from '../src/index'
-import { Database } from './types'
+import { Database } from './types.override'
 
 const postgrest = new PostgrestClient<Database>('http://localhost:3000')
 

test/select-query-parser/result.test-d.ts

@@ -1,9 +1,11 @@
-import { Database, Json } from '../types.override'
+import { Database } from '../types.override'
 import { selectParams } from '../relationships'
 import { GetResult } from '../../src/select-query-parser/result'
 import { expectType } from 'tsd'
 import { TypeEqual } from 'ts-expect'
 import { SelectQueryError } from '../../src/select-query-parser/utils'
+// TODO: should change this type in favor of unknown instead of the current one
+import type { Json } from '../../src/select-query-parser/types'
 
 type SelectQueryFromTableResult<
   TableName extends keyof Database['public']['Tables'],

test/select-query-parser/rpc.test-d.ts

@@ -1,5 +1,5 @@
 import { postgrest, selectParams, RPC_NAME } from '../rpc'
-import { Database } from '../types'
+import { Database } from '../types.override'
 import { expectType } from 'tsd'
 import { TypeEqual } from 'ts-expect'
 

test/select-query-parser/select.test-d.ts

@@ -622,7 +622,6 @@ type Schema = Database['public']
       username: string
     }
   }
-  //@ts-expect-error this should work once we use unknown instead of Json type definition
   expectType<TypeEqual<typeof result, typeof expected>>(true)
 }
 

test/transforms.ts

@@ -1,5 +1,5 @@
 import { PostgrestClient } from '../src/index'
-import { Database } from './types'
+import { Database } from './types.override'
 
 import { AbortController } from 'node-abort-controller'