Merge pull request #577 from supabase/fix/any-embeded-renaming-relation

fix(types): inference for default any schema
supabase · Nov 13, 2024 · efa3e5c · efa3e5c
2 parents fee2a82 + 74b99bb
commit efa3e5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/select-query-parser/result.ts b/src/select-query-parser/result.ts
@@ -78,15 +78,9 @@ type ProcessFieldNodeWithoutSchema<Node extends Ast.FieldNode> = IsNonEmptyArray
   Node['children']
 > extends true
   ? {
-      [K in Node['name']]: Node['children'] extends Ast.StarNode[]
-        ? any[]
-        : Node['children'] extends Ast.FieldNode[]
-        ? {
-            [P in Node['children'][number] as GetFieldNodeResultName<P>]: P['castType'] extends PostgreSQLTypes
-              ? TypeScriptTypes<P['castType']>
-              : any
-          }[]
-        : any[]
+      [K in GetFieldNodeResultName<Node>]: Node['children'] extends Ast.Node[]
+        ? ProcessNodesWithoutSchema<Node['children']>[]
+        : ProcessSimpleFieldWithoutSchema<Node>
     }
   : ProcessSimpleFieldWithoutSchema<Node>
 

diff --git a/test/select-query-parser/default-inference-d.ts b/test/select-query-parser/default-inference-d.ts
@@ -35,6 +35,22 @@ const REST_URL = 'http://localhost:3000'
   }
   expectType<TypeEqual<typeof result, typeof expected>>(true)
 }
+// embeding renaming
+{
+  const postgrest = new PostgrestClient(REST_URL)
+  const { data } = await postgrest
+    .from('projects')
+    .select('status,service:services(service_api_keys(*))')
+    .single()
+  let result: Exclude<typeof data, null>
+  let expected: {
+    status: any
+    service: {
+      service_api_keys: any[]
+    }[]
+  }
+  expectType<TypeEqual<typeof result, typeof expected>>(true)
+}
 // spread operator with stars should return any
 {
   const postgrest = new PostgrestClient(REST_URL)