@selkirk-systems/fetch 1.5.0 → 1.5.2

package/dist/utils/FetchUtils.js

@@ -87,8 +87,8 @@ export async function fetchPagedURL(url, callback, options) {
     results = resultsArray[resultsArray.length - 1];
     await invokeCallbacks(cachedCallbacks, callback);
     ret = sortByProp(ret, "id");
-    ret = ret.reduce((acc, value) => acc.concat(value.items), []);
   }
+  ret = ret.reduce((acc, value) => acc.concat(value.items), []);
   return [null, ret, {
     ...results,
     page: data.page.totalPages
@@ -100,6 +100,43 @@ async function invokeCallbacks(array, callback) {
     return callback(a.results, a.items);
   });
 }
+
+/**
+ * @typedef {Object} Status
+ * @prop {number} [code=200] HTML status code
+ * @prop {string} [text=''] any important message, typical in errors
+ * @prop {boolean} [isAbort=false] was the request aborted, usually if called in quick succession
+ */
+
+/**
+ * @typedef {Object} FetchResponse
+ * @prop {Object} [request=null] the generated request, null if pulled from cache
+ * @prop {Status} [status] current status of the request
+ * @prop {Object} [data] json data from the request
+ * @prop {Response} [response] response from the request
+ */
+
+/**
+ * Creates a standard response obj, the fetch library will always return this structure.
+ * If you need to mock a response return this object.
+ * @param {FetchResponse} props 
+ * @returns {FetchResponse}
+ */
+export const createResponse = props => {
+  const response = new Response(props.data && JSON.stringify(props.data));
+  return {
+    request: null,
+    response: response,
+    data: null,
+    ...props,
+    status: {
+      code: 200,
+      text: '',
+      isAbort: false
+    },
+    ...props.status
+  };
+};
 function getEmbedded(data) {
   return data._embedded[[Object.keys(data._embedded)[0]]];
 }

package/lib/utils/FetchUtils.js

@@ -122,15 +122,14 @@ export async function fetchPagedURL( url, callback, options ) {
 
         ret = sortByProp( ret, "id" );
 
-        ret = ret.reduce( ( acc, value ) => acc.concat( value.items ), [] );
-
     }
 
-
+    ret = ret.reduce( ( acc, value ) => acc.concat( value.items ), [] );
     return [null, ret, { ...results, page: data.page.totalPages }];
 
 }
 
+
 async function invokeCallbacks( array, callback ) {
 
     array = sortByProp( array, "index" );
@@ -141,6 +140,45 @@ async function invokeCallbacks( array, callback ) {
 
 }
 
+/**
+ * @typedef {Object} Status
+ * @prop {number} [code=200] HTML status code
+ * @prop {string} [text=''] any important message, typical in errors
+ * @prop {boolean} [isAbort=false] was the request aborted, usually if called in quick succession
+ */
+
+/**
+ * @typedef {Object} FetchResponse
+ * @prop {Object} [request=null] the generated request, null if pulled from cache
+ * @prop {Status} [status] current status of the request
+ * @prop {Object} [data] json data from the request
+ * @prop {Response} [response] response from the request
+ */
+
+/**
+ * Creates a standard response obj, the fetch library will always return this structure.
+ * If you need to mock a response return this object.
+ * @param {FetchResponse} props 
+ * @returns {FetchResponse}
+ */
+export const createResponse = ( props ) => {
+
+    const response = new Response( props.data && JSON.stringify( props.data ) );
+
+    return {
+        request: null,
+        response: response,
+        data: null,
+        ...props,
+        status: {
+            code: 200,
+            text: '',
+            isAbort: false
+        },
+        ...props.status
+    }
+}
+
 
 function getEmbedded( data ) {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selkirk-systems/fetch",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Abortable fetch library",
   "keywords": [],
   "author": "Marcos Bernal <mbernal@selkirksystems.com>",
@@ -36,5 +36,5 @@
   "peerDependencies": {
     "@selkirk-systems/state-management": ">=1.0.0"
   },
-  "gitHead": "3f425f25b96a2239bea972a184391ceb709f64bb"
+  "gitHead": "97254eb48b612c80120c1285278c8bda7c5b8874"
 }