Merge pull request #28 from teleporthq/task/update-strapi

Update strapi mappers for mixed type support

src/strapi/index.ts

@@ -1,9 +1,37 @@
-function toPlainObject(obj) {
+type Pagination = {
+  total?: number
+  limit?: number
+  start?: number
+  pages?: number
+  page?: number
+  hasNextPage?: boolean
+  hasPrevPage?: boolean
+}
+
+type Meta = {
+  pagination?: Pagination
+}
+
+type ContentData = {
+  id?: string
+  attributes?: Record<string, unknown>
+  data?: ContentData | ContentData[]
+  meta?: Meta
+}
+
+type NormalizedContent = {
+  meta: {
+    pagination?: Pagination
+  }
+  data: unknown[] | unknown
+}
+
+const toPlainObject = (obj: any): any => {
   if (typeof obj !== 'object' || obj === null) {
     return obj
   }
 
-  const plainObj = {}
+  const plainObj: Record<string, unknown> = {}
 
   for (const key in obj) {
     plainObj[key] = toPlainObject(obj[key])
@@ -12,8 +40,10 @@ function toPlainObject(obj) {
   return plainObj
 }
 
-const normalizeNestedAttributes = (attributes) => {
-  const output = {}
+export const normalizeNestedAttributes = (
+  attributes: Record<string, any>
+): Record<string, unknown> => {
+  const output: Record<string, unknown> = {}
 
   for (const key in attributes) {
     const value = attributes[key]
@@ -28,6 +58,10 @@ const normalizeNestedAttributes = (attributes) => {
     ) {
       const normalizedValue = normalizeContent(value)
       output[key] = { id: value.data.id, ...normalizedValue }
+    } else if (Array.isArray(value)) {
+      output[key] = value.map((el: any) => {
+        return normalizeNestedAttributes(el)
+      })
     } else {
       output[key] = toPlainObject(value)
     }
@@ -36,7 +70,7 @@ const normalizeNestedAttributes = (attributes) => {
   return output
 }
 
-export const normalizeContent = (input) => {
+export const normalizeContent = (input: any): any => {
   if (
     input === null ||
     input === undefined ||
@@ -68,22 +102,7 @@ export const normalizeContent = (input) => {
   return output
 }
 
-export const normalize = (
-  content
-): {
-  meta: {
-    pagination?: {
-      total?: number
-      limit?: number
-      start?: number
-      pages: number
-      page: number
-      hasNextPage: boolean
-      hasPrevPage: boolean
-    }
-  }
-  data: Array<unknown> | unknown
-} => {
+export const normalize = (content: any): NormalizedContent => {
   const total = content?.meta?.pagination?.total
   const limit = content?.meta?.pagination?.limit
   const start = content?.meta?.pagination?.start
@@ -95,22 +114,23 @@ export const normalize = (
   }
 
   if (start && limit) {
-    page = start / limit + 1
+    page = Math.floor(start / limit) + 1
   }
 
   const hasNextPage = page < pages
   const hasPrevPage = page >= 2
+
   return {
     meta: {
       ...content?.meta,
       pagination: {
         ...content?.meta?.pagination,
-        ...(!!pages && { pages }),
-        ...(!!page && { page }),
+        ...(pages && { pages }),
+        ...(page && { page }),
         hasNextPage,
         hasPrevPage,
       },
     },
-    ...normalizeContent(content),
+    data: normalizeContent(content.data),
   }
 }