chore: fix tests null result case

Author: avallete

test/index.test-d.ts

@@ -52,87 +52,93 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
   )
 
   {
-    const { data, error } = await postgrest.from('users').select('status').eq('status', 'ONLINE')
-    if (error) {
-      throw new Error(error.message)
+    const result = await postgrest.from('users').select('status').eq('status', 'ONLINE')
+    if (result.error) {
+      throw new Error(result.error.message)
     }
-    expectType<{ status: Database['public']['Enums']['user_status'] | null }[]>(data)
+    expectType<{ status: Database['public']['Enums']['user_status'] | null }[]>(result.data)
   }
 
   {
-    const { data, error } = await postgrest.from('users').select('status').neq('status', 'ONLINE')
-    if (error) {
-      throw new Error(error.message)
+    const result = await postgrest.from('users').select('status').neq('status', 'ONLINE')
+    if (result.error) {
+      throw new Error(result.error.message)
     }
-    expectType<{ status: Database['public']['Enums']['user_status'] | null }[]>(data)
+    expectType<{ status: Database['public']['Enums']['user_status'] | null }[]>(result.data)
   }
 
   {
-    const { data, error } = await postgrest
+    const result = await postgrest
       .from('users')
       .select('status')
       .in('status', ['ONLINE', 'OFFLINE'])
-    if (error) {
-      throw new Error(error.message)
+    if (result.error) {
+      throw new Error(result.error.message)
     }
-    expectType<{ status: Database['public']['Enums']['user_status'] | null }[]>(data)
+    expectType<{ status: Database['public']['Enums']['user_status'] | null }[]>(result.data)
   }
 
   {
-    const { data, error } = await postgrest
+    const result = await postgrest
       .from('best_friends')
       .select('users!first_user(status)')
       .eq('users.status', 'ONLINE')
-    if (error) {
-      throw new Error(error.message)
+    if (result.error) {
+      throw new Error(result.error.message)
     }
-    expectType<{ users: { status: Database['public']['Enums']['user_status'] | null } }[]>(data)
+    expectType<{ users: { status: Database['public']['Enums']['user_status'] | null } }[]>(
+      result.data
+    )
   }
 
   {
-    const { data, error } = await postgrest
+    const result = await postgrest
       .from('best_friends')
       .select('users!first_user(status)')
       .neq('users.status', 'ONLINE')
-    if (error) {
-      throw new Error(error.message)
+    if (result.error) {
+      throw new Error(result.error.message)
     }
-    expectType<{ users: { status: Database['public']['Enums']['user_status'] | null } }[]>(data)
+    expectType<{ users: { status: Database['public']['Enums']['user_status'] | null } }[]>(
+      result.data
+    )
   }
 
   {
-    const { data, error } = await postgrest
+    const result = await postgrest
       .from('best_friends')
       .select('users!first_user(status)')
       .in('users.status', ['ONLINE', 'OFFLINE'])
-    if (error) {
-      throw new Error(error.message)
+    if (result.error) {
+      throw new Error(result.error.message)
     }
-    expectType<{ users: { status: Database['public']['Enums']['user_status'] | null } }[]>(data)
+    expectType<{ users: { status: Database['public']['Enums']['user_status'] | null } }[]>(
+      result.data
+    )
   }
 }
 
 // can override result type
 {
-  const { data, error } = await postgrest
+  const result = await postgrest
     .from('users')
     .select('*, messages(*)')
     .returns<{ messages: { foo: 'bar' }[] }[]>()
-  if (error) {
-    throw new Error(error.message)
+  if (result.error) {
+    throw new Error(result.error.message)
   }
-  expectType<{ foo: 'bar' }[]>(data[0].messages)
+  expectType<{ foo: 'bar' }[]>(result.data[0].messages)
 }
 {
-  const { data, error } = await postgrest
+  const result = await postgrest
     .from('users')
     .insert({ username: 'foo' })
     .select('*, messages(*)')
     .returns<{ messages: { foo: 'bar' }[] }[]>()
-  if (error) {
-    throw new Error(error.message)
+  if (result.error) {
+    throw new Error(result.error.message)
   }
-  expectType<{ foo: 'bar' }[]>(data[0].messages)
+  expectType<{ foo: 'bar' }[]>(result.data[0].messages)
 }
 
 // cannot update non-updatable views
@@ -147,60 +153,54 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
 
 // spread resource with single column in select query
 {
-  const { data, error } = await postgrest
-    .from('messages')
-    .select('message, ...users(status)')
-    .single()
-  if (error) {
-    throw new Error(error.message)
+  const result = await postgrest.from('messages').select('message, ...users(status)').single()
+  if (result.error) {
+    throw new Error(result.error.message)
   }
   expectType<{ message: string | null; status: Database['public']['Enums']['user_status'] | null }>(
-    data
+    result.data
   )
 }
 
 // spread resource with all columns in select query
 {
-  const { data, error } = await postgrest.from('messages').select('message, ...users(*)').single()
-  if (error) {
-    throw new Error(error.message)
+  const result = await postgrest.from('messages').select('message, ...users(*)').single()
+  if (result.error) {
+    throw new Error(result.error.message)
   }
   expectType<Prettify<{ message: string | null } & Database['public']['Tables']['users']['Row']>>(
-    data
+    result.data
   )
 }
 
 // `count` in embedded resource
 {
-  const { data, error } = await postgrest.from('messages').select('message, users(count)').single()
-  if (error) {
-    throw new Error(error.message)
+  const result = await postgrest.from('messages').select('message, users(count)').single()
+  if (result.error) {
+    throw new Error(result.error.message)
   }
-  expectType<{ message: string | null; users: { count: number } }>(data)
+  expectType<{ message: string | null; users: { count: number } }>(result.data)
 }
 
 // json accessor in select query
 {
-  const { data, error } = await postgrest
-    .from('users')
-    .select('data->foo->bar, data->foo->>baz')
-    .single()
-  if (error) {
-    throw new Error(error.message)
+  const result = await postgrest.from('users').select('data->foo->bar, data->foo->>baz').single()
+  if (result.error) {
+    throw new Error(result.error.message)
   }
   // getting this w/o the cast, not sure why:
   // Parameter type Json is declared too wide for argument type Json
-  expectType<Json>(data.bar)
-  expectType<string>(data.baz)
+  expectType<Json>(result.data.bar)
+  expectType<string>(result.data.baz)
 }
 
 // rpc return type
 {
-  const { data, error } = await postgrest.rpc('get_status')
-  if (error) {
-    throw new Error(error.message)
+  const result = await postgrest.rpc('get_status')
+  if (result.error) {
+    throw new Error(result.error.message)
   }
-  expectType<'ONLINE' | 'OFFLINE'>(data)
+  expectType<'ONLINE' | 'OFFLINE'>(result.data)
 }
 
 // PostgrestBuilder's children retains class when using inherited methods
@@ -214,12 +214,12 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
 
 // Json Accessor with custom types overrides
 {
-  const { data, error } = await postgrest
+  const result = await postgrest
     .schema('personal')
     .from('users')
     .select('data->bar->baz, data->en, data->bar')
-  if (error) {
-    throw new Error(error.message)
+  if (result.error) {
+    throw new Error(result.error.message)
   }
   expectType<
     {
@@ -229,22 +229,22 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
         baz: number
       }
     }[]
-  >(data)
+  >(result.data)
 }
 // Json string Accessor with custom types overrides
 {
-  const { data, error } = await postgrest
+  const result = await postgrest
     .schema('personal')
     .from('users')
     .select('data->bar->>baz, data->>en, data->>bar')
-  if (error) {
-    throw new Error(error.message)
+  if (result.error) {
+    throw new Error(result.error.message)
   }
   expectType<
     {
       baz: string
       en: 'ONE' | 'TWO' | 'THREE'
       bar: string
     }[]
-  >(data)
+  >(result.data)
 }