chore: refactor for accounts-api response (#10)

* chore: undo documents response

* nit: remove 'dev' for tests

src/accounts/filter-by-type.ts

@@ -1,4 +1,4 @@
-import { AccountsFilterBody, AccountsRequestResultWithMetadata } from '../types'
+import { AccountsFilterBody, AccountsRequestResult } from '../types'
 import { Cluster, requestHeaders, tryExtractResultFromResponse } from '../utils'
 
 /** Configures the accounts filterByType request. */
@@ -36,5 +36,5 @@ export async function accountsFilterByType<T = any>(
       method: 'POST',
     }
   )
-  return tryExtractResultFromResponse<AccountsRequestResultWithMetadata<T>>(res)
+  return tryExtractResultFromResponse<AccountsRequestResult<T[]>>(res)
 }

src/accounts/filter.ts

@@ -1,4 +1,4 @@
-import { AccountsFilterBody, AccountsRequestResultWithMetadata } from '../types'
+import { AccountsFilterBody, AccountsRequestResult } from '../types'
 import { Cluster, requestHeaders, tryExtractResultFromResponse } from '../utils'
 
 /** Configures the accounts filter request. */
@@ -33,5 +33,5 @@ export async function accountsFilter<T = any>(
       method: 'POST',
     }
   )
-  return tryExtractResultFromResponse<AccountsRequestResultWithMetadata<T>>(res)
+  return tryExtractResultFromResponse<AccountsRequestResult<T[]>>(res)
 }

src/accounts/find-by-type.ts

@@ -1,4 +1,4 @@
-import { AccountsRequestResultWithMetadata } from '../types'
+import { AccountsRequestResult } from '../types'
 import { Cluster, requestHeaders, tryExtractResultFromResponse } from '../utils'
 
 /** Configures the accounts findByType request. */
@@ -32,5 +32,5 @@ export async function accountsFindByType<T = any>(
       method: 'GET',
     }
   )
-  return tryExtractResultFromResponse<AccountsRequestResultWithMetadata<T>>(res)
+  return tryExtractResultFromResponse<AccountsRequestResult<T[]>>(res)
 }

src/accounts/memcmp.ts

@@ -1,4 +1,4 @@
-import { AccountsRequestResultWithMetadata, AccountsMemcmpBody } from '../types'
+import { AccountsMemcmpBody, AccountsRequestResult } from '../types'
 import { Cluster, requestHeaders, tryExtractResultFromResponse } from '../utils'
 
 /** Configures the accounts memcmp request. */
@@ -33,5 +33,5 @@ export async function accountsMemcmp<T = any>(
       method: 'POST',
     }
   )
-  return tryExtractResultFromResponse<AccountsRequestResultWithMetadata<T>>(res)
+  return tryExtractResultFromResponse<AccountsRequestResult<T[]>>(res)
 }

src/accounts/mongodb/find.ts

@@ -1,4 +1,4 @@
-import { AccountsRequestResultWithMetadata, MongoDbFindBody } from '../../types'
+import { AccountsRequestResult, MongoDbFindBody } from '../../types'
 import {
   Cluster,
   requestHeaders,
@@ -33,5 +33,5 @@ export async function mongoDbFind<T = any>(
       method: 'POST',
     }
   )
-  return tryExtractResultFromResponse<AccountsRequestResultWithMetadata<T>>(res)
+  return tryExtractResultFromResponse<AccountsRequestResult<T[]>>(res)
 }

src/types.ts

@@ -6,16 +6,16 @@
  * The success case of @link AccountsRequestResult.
  */
 export type SuccessAccountsRequestResult<T> = {
-  error: null | undefined
-  data: T
+  data: T | null
+  error: undefined
 }
 
 /**
  * The failure case of @link AccountsRequestResult.
  */
 export type FailureAccountsRequestResult = {
   error: string
-  data: null | undefined
+  data: undefined
 }
 
 /**
@@ -44,17 +44,6 @@ export function isSuccessResult<T>(
   return result.error == null && result.data != null
 }
 
-export type AccountsRequestResultWithMetadata<T> = AccountsRequestResult<
-  T[]
-> & {
-  metadata: {
-    count: number
-    offset: number
-    limit: number
-    hasMore: boolean
-  }
-}
-
 // -----------------
 // Body Types
 // -----------------

test/accounts-sdk.ts

@@ -45,7 +45,6 @@ test('accounts-sdk: aggregate', async () => {
 
   assert.equal(status, 200)
   assert(result.error == null)
-  result.data
   assert.equal(result.data?.length, 5)
 })
 
@@ -63,10 +62,7 @@ test('accounts-sdk: filter by type', async (t) => {
     offset: 0,
   })
   assert.equal(status, 200)
-  spok(t, result, {
-    metadata: { count: 2, offset: 0, limit: 2, hasMore: true },
-    error: null,
-  })
+  assert(result.error == null)
   assert.equal(result.data?.length, 2)
 })
 
@@ -82,11 +78,9 @@ test('accounts-sdk: filter', async (t) => {
     limit: 3,
     offset: 0,
   })
+
   assert.equal(status, 200)
-  spok(t, result, {
-    metadata: { count: 3, offset: 0, limit: 3, hasMore: true },
-    error: null,
-  })
+  assert(result.error == null)
   assert.equal(result.data?.length, 3)
 })
 
@@ -103,10 +97,7 @@ test('accounts-sdk: find by type', async (t) => {
     offset: 0,
   })
   assert.equal(status, 200)
-  spok(t, result, {
-    metadata: { count: 2, offset: 0, limit: 2, hasMore: true },
-    error: null,
-  })
+  assert(result.error == null)
   assert(
     !(result.data as any[]).some((x: any) => x.account_type !== 'CandyMachine')
   )
@@ -165,10 +156,7 @@ test('accounts-sdk: memcmp', async (t) => {
     offset: 0,
   })
   assert.equal(status, 200)
-  spok(t, result, {
-    metadata: { count: 3, offset: 0, limit: 3, hasMore: true },
-    error: null,
-  })
+  assert(result.error == null)
   assert.equal(result.data?.length, 3)
 })
 
@@ -233,10 +221,7 @@ test('accounts-sdk: mongodb', async (t) => {
 
     assert.equal(status, 200)
 
-    spok(t, result, {
-      metadata: { count: 5, offset: 10, limit: 5, hasMore: true },
-      error: null,
-    })
+    assert(result.error == null)
 
     const data = result.data
     assert(data != null)