chore: 🔥 fixed pagination transformer and base transformer

Author: TouchSek

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-api-queries",
-  "version": "0.0.16",
+  "version": "0.1.0",
   "description": "Elegant and simple way to build requests for REST API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/__tests__/base-proxy.test.ts

@@ -66,6 +66,22 @@ describe('BaseProxy', () => {
     expect(all.pagination.page).toEqual(1)
   })
 
+  it('should assign default object meta if it is null or undefined', async () => {
+    const items = {
+      data: [{ first_name: 'Chantouch', last_name: 'Sek' }],
+      meta: undefined,
+    }
+    mockAdapter.onGet('/posts').reply(200, items)
+    const { data, meta } = await proxy.removeParameters([]).all()
+    const all = {
+      items: BaseTransformer.fetchCollection(data),
+      pagination: PaginationTransformer.fetch(meta),
+    }
+    expect(meta).toBeUndefined()
+    expect(data.length).toEqual(1)
+    expect(all.pagination.currentPage).toEqual(1)
+  })
+
   it('will fetch all records', async () => {
     const items = [{ first_name: 'Chantouch', last_name: 'Sek' }]
     mockAdapter.onGet('/posts').reply(200, { data: items })

src/core/BaseTransformer.ts

@@ -1,37 +1,21 @@
 import snakeCaseKeys from 'snakecase-keys'
 import camelcaseKeys from 'camelcase-keys'
 
-export type Attribute = {
-  [key in string | number]: any
-}
-
 class BaseTransformer {
-  static fetchCollection(
-    items: Array<Attribute>,
-    camelCaseKey?: boolean,
-  ): Array<Attribute> {
-    return items.map((item: Attribute) => this.fetch(item, camelCaseKey))
+  static fetchCollection(items: Array<any>, camelKey?: boolean): Array<any> {
+    return items.map((item: any) => this.fetch(item, camelKey))
   }
 
-  static sendCollection(
-    items: Array<Attribute>,
-    snakeCaseKey?: boolean,
-  ): Array<Attribute> {
-    return items.map((item: Attribute) => this.send(item, snakeCaseKey))
+  static sendCollection(items: Array<any>, snakeKey?: boolean): Array<any> {
+    return items.map((item: any) => this.send(item, snakeKey))
   }
 
-  static fetch(item: Attribute, camelCaseKey?: boolean): Attribute {
-    if (camelCaseKey) {
-      return camelcaseKeys(item, { deep: true })
-    }
-    return item
+  static fetch(item: any, camelKey?: boolean) {
+    return camelKey ? camelcaseKeys(item, { deep: true }) : item
   }
 
-  static send(item: Attribute, snakeCaseKey?: boolean): Attribute {
-    if (snakeCaseKey) {
-      return snakeCaseKeys(item)
-    }
-    return item
+  static send(item: any, snakeKey?: boolean) {
+    return snakeKey ? snakeCaseKeys(item) : item
   }
 }
 

src/core/PaginationTransformer.ts

@@ -26,17 +26,21 @@ export interface MetaOptions {
 
 class PaginationTransformer extends BaseTransformer {
   static fetch(meta: MetaOptions | any) {
+    if (!meta) {
+      meta = { pagination: {}, include: [] }
+    }
     if (!Object.prototype.hasOwnProperty.call(meta, 'pagination')) {
-      return snakecaseKeys(meta, { deep: true })
+      return super.fetch(meta, true)
     }
     const { pagination = {}, include } = meta
-    return {
+    const payload = {
+      ...pagination,
       perPage: pagination.per_page,
       totalPages: pagination.total_pages,
-      currentPage: pagination.current_page,
+      currentPage: pagination.current_page || 1,
       total: pagination.total,
       links: pagination.links,
-      count: pagination.count,
+      count: pagination.count || 0,
       page: pagination.current_page,
       itemsPerPage: pagination.per_page,
       pageCount: pagination.total_pages,
@@ -45,6 +49,8 @@ class PaginationTransformer extends BaseTransformer {
       pageStop: pagination.count,
       include,
     }
+
+    return super.fetch(payload, true)
   }
 }