@dpgradio/creative 5.0.4 → 5.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpgradio/creative",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "Support package for standalone Javascript applications",
   "main": "src/index.js",
   "scripts": {

package/src/api/PaginatedResponse.js

@@ -0,0 +1,41 @@
+import api from './api'
+
+export default class PaginatedResponse {
+  constructor(response, dataKey = 'data') {
+    this.pagination = response.pagination
+    this.data = response[dataKey]
+    this.dataKey = dataKey
+  }
+
+  async fetchNext() {
+    const response = await api.onVersion(null).request().get(this.pagination.next)
+    this.pagination.next = response.pagination.next
+    this.data = [...this.data, ...response[this.dataKey]]
+
+    return response[this.dataKey]
+  }
+
+  async fetchPrevious() {
+    const response = await api.onVersion(null).request().get(this.pagination.previous)
+    this.pagination.previous = response.pagination.previous
+    this.data = [...response[this.dataKey], ...this.data]
+
+    return response[this.dataKey]
+  }
+
+  async fetchAllNext() {
+    while ((await this.fetchNext()).length > 0) {
+      continue
+    }
+
+    return this.data
+  }
+
+  async fetchAllPrevious() {
+    while ((await this.fetchPrevious()).length > 0) {
+      continue
+    }
+
+    return this.data
+  }
+}

package/src/api/api.js

@@ -69,6 +69,8 @@ export class Api {
 
   clone() {
     return tap(new Api(this.baseUrlOverride, this.version), (api) => {
+      api.apiKey = this.apiKey
+      api.radioToken = this.radioToken
       api.requestModifiers = this.requestModifiers
       api.errorHandlers = this.errorHandlers
     })

package/src/api/endpoints/Endpoint.js

@@ -2,6 +2,7 @@
 import { Api } from '../api.js'
 // eslint-disable-next-line no-unused-vars -- used in JSDoc
 import Request from '../request.js'
+import PaginatedResponse from '../PaginatedResponse.js'
 
 export default class Endpoint {
   /**
@@ -34,4 +35,24 @@ export default class Endpoint {
     }
     return response[key]
   }
+
+  /**
+   * @param {requestCallback} callback
+   * @returns {PaginatedResponse}
+   */
+  async requestPaginatedData(callback, key = 'data') {
+    const response = await callback(this.api.request())
+
+    if (response === null) {
+      throw new Error(`Endpoint returned invalid JSON.`)
+    }
+    if (response[key] === undefined) {
+      throw new Error(`Key '${key}' not found in response: ${JSON.stringify(response)}`)
+    }
+    if (response.pagination === undefined) {
+      throw new Error(`Key 'pagination' not found in response: ${JSON.stringify(response)}`)
+    }
+
+    return new PaginatedResponse(response, key)
+  }
 }

package/src/api/endpoints/Ratings.js

@@ -2,7 +2,7 @@ import Endpoint from './Endpoint.js'
 
 export default class Ratings extends Endpoint {
   async allForMember() {
-    return await this.requestData((r) => r.get('/members/me/ratings'), 'ratings')
+    return await this.requestPaginatedData((r) => r.get('/members/me/ratings'), 'ratings')
   }
 
   async like(selectorCode) {

package/src/api/request.js

@@ -96,8 +96,13 @@ export default class Request {
 
     const endpointWithoutSlash = endpoint.replace(/^\/+/, '')
 
-    return tap(new URL(`${baseUrlWithProtocol}/${this.version}/${endpointWithoutSlash}`), (url) => {
-      url.search = new URLSearchParams(this.queryParameters).toString()
+    const urlParts = [baseUrlWithProtocol, this.version, endpointWithoutSlash].filter(Boolean)
+
+    return tap(new URL(urlParts.join('/')), (url) => {
+      url.search = new URLSearchParams({
+        ...Object.fromEntries(new URLSearchParams(url.search)),
+        ...this.queryParameters,
+      }).toString()
     })
   }
 }