chore(tests): setup zod type checking unify (#627)

* chore(tests): use zod schemas for both type assertions and rutime results validations

* fix(types): self-reference relationship unwanted intersection

* chore: context for tsconfig.test.json

---------

Co-authored-by: Bobbie Soedirgo <[email protected]>

Author: avallete

jest.config.js

@@ -6,4 +6,11 @@ module.exports = {
   maxWorkers: 1,
   // Ensure deterministic test order
   testSequencer: '<rootDir>/test/testSequencer.js',
+  globals: {
+    // For consistency between VSCode and type-check
+    // https://github.com/supabase/postgrest-js/pull/627#discussion_r2236995331
+    'ts-jest': {
+      tsconfig: 'tsconfig.test.json'
+    }
+  }
 }

package-lock.json

@@ -42,6 +42,8 @@
     "test:update": "run-s db:clean db:run db:generate-test-types && jest --runInBand --updateSnapshot && run-s db:clean",
     "test:types": "run-s build && tsd --files 'test/**/*.test-d.ts'",
     "test:types:watch": "run-s build && tsd --files 'test/**/*.test-d.ts' --watch",
+    "type-check": "tsc --noEmit --project tsconfig.json",
+    "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 && sed -i '' 's/export type Json = .*/export type Json = unknown;/' ../types.generated.ts"
@@ -64,6 +66,7 @@
     "type-fest": "^4.32.0",
     "typedoc": "^0.22.16",
     "typescript": "^4.5.5",
-    "wait-for-localhost-cli": "^3.0.0"
+    "wait-for-localhost-cli": "^3.0.0",
+    "zod": "^3.25.76"
   }
 }

package.json

@@ -205,7 +205,8 @@ export type ProcessNodes<
                 RelationName,
                 Relationships,
                 RestNodes,
-                Acc & FieldResult
+                // Replace fields that exist in both Acc and FieldResult instead of intersecting
+                Omit<Acc, keyof FieldResult> & FieldResult
               >
             : FieldResult extends SelectQueryError<infer E>
             ? SelectQueryError<E>

src/select-query-parser/result.ts

@@ -528,11 +528,12 @@ test('join over a 1-M relation with both nullables and non-nullables fields usin
     }
   `)
   let result: Exclude<typeof res.data, null>
-  type ExpectedType = Prettify<
-    Database['public']['Tables']['best_friends']['Row'] & {
-      first_user: string & Database['public']['Tables']['users']['Row']
-    }
-  >
+  type ExpectedType = {
+    id: number
+    first_user: Database['public']['Tables']['users']['Row']
+    second_user: string
+    third_wheel: string | null
+  }
   let expected: {
     first_friend_of: ExpectedType[]
     second_friend_of: Array<Database['public']['Tables']['best_friends']['Row']>