integreat 0.7.39 → 0.7.40

package/lib/actions/get.js

@@ -3,50 +3,76 @@ const appendToAction = require('../utils/appendToAction')
 const createUnknownServiceError = require('../utils/createUnknownServiceError')
 
 const hasCollectionEndpoint = (endpoints) =>
-  endpoints.some((endpoint) => endpoint.match && endpoint.match.scope === 'members')
+  endpoints.some(
+    (endpoint) => endpoint.match && endpoint.match.scope === 'members'
+  )
 
 const getIndividualItems = async (ids, action, getService) => {
-  const responses = await Promise.all(ids.map((id) => get(appendToAction(action, { id }), { getService })))
-  if (responses.some((response) => response.status !== 'ok' && response.status !== 'notfound')) {
-    return { status: 'error', error: `One or more of the requests for ids ${ids} failed.` }
+  const responses = await Promise.all(
+    ids.map((id) => get(appendToAction(action, { id }), { getService }))
+  )
+  if (
+    responses.some(
+      (response) => response.status !== 'ok' && response.status !== 'notfound'
+    )
+  ) {
+    return {
+      status: 'error',
+      error: `One or more of the requests for ids ${ids} failed.`,
+    }
   }
   return {
     status: 'ok',
     data: responses.reduce(
       (data, response) => [...data, ...[].concat(response.data)],
       []
-    )
+    ),
   }
 }
 
-const getIdFromPayload = ({ id }) =>
-  (Array.isArray(id) && id.length === 1) ? id[0] : id
+const getIdFromData = (data) =>
+  Array.isArray(data)
+    ? data.length === 1 && data[0]
+      ? data[0].id
+      : undefined
+    : data
+    ? data.id
+    : undefined
 
-function filterResponseData (data, id) {
+const getIdFromPayload = ({ id, data }) =>
+  Array.isArray(id) && id.length === 1 ? id[0] : id ? id : getIdFromData(data)
+
+function filterResponseData(data, id) {
   if (!id || !Array.isArray(data)) {
     return data
   }
   const ids = [].concat(id)
-  return data.filter(data => ids.includes(data.id))
+  return data.filter((data) => ids.includes(data.id))
 }
 
+const removeData = ({ type, payload: { data, ...payload }, meta }) => ({
+  type,
+  payload,
+  meta,
+})
+
 /**
  * Get several items from a service, based on the given action object.
  * @param {Object} action - payload and ident from the action object
  * @param {Object} resources - Object with getService
  * @returns {array} Array of data from the service
  */
-async function get (action, { getService } = {}) {
+async function get(action, { getService } = {}) {
   const {
     type,
     service: serviceId = null,
     onlyMappedValues = false,
     endpoint,
-    filterWithId = false
+    filterWithId = false,
   } = action.payload
 
-  const service = (typeof getService === 'function')
-    ? getService(type, serviceId) : null
+  const service =
+    typeof getService === 'function' ? getService(type, serviceId) : null
   if (!service) {
     return createUnknownServiceError(type, serviceId, 'GET')
   }
@@ -58,16 +84,20 @@ async function get (action, { getService } = {}) {
     return getIndividualItems(id, action, getService)
   }
 
-  const endpointDebug = (endpoint) ? `endpoint '${endpoint}'` : `endpoint matching type '${type}' and id '${id}'`
+  const endpointDebug = endpoint
+    ? `endpoint '${endpoint}'`
+    : `endpoint matching type '${type}' and id '${id}'`
   debug('GET: Fetch from service %s at %s', service.id, endpointDebug)
 
-  const { response } = await service.send(appendToAction(action, { id, onlyMappedValues }))
+  const { response } = await service.send(
+    appendToAction(removeData(action), { id, onlyMappedValues })
+  )
 
   return filterWithId
     ? {
-      ...response,
-      data: filterResponseData(response.data, id)
-    }
+        ...response,
+        data: filterResponseData(response.data, id),
+      }
     : response
 }
 

package/lib/integreat.js

@@ -5,7 +5,7 @@ const setupMapping = require('./mapping')
 const setupDispatch = require('./dispatch')
 const builtinActions = require('./actions')
 
-const version = '0.7.39'
+const version = '0.7.40'
 
 /**
  * Return an Integreat instance with a dispatch method.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "integreat",
-  "version": "0.7.39",
+  "version": "0.7.40",
   "description": "Node.js integration layer",
   "author": "Kjell-Morten Bratsberg Thorsen <post@kjellmorten.no> (http://kjellmorten.no/)",
   "license": "ISC",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@sindresorhus/is": "^1.2.0",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "got": "^9.6.0",
     "later": "^1.2.0",
     "map-any": "^0.2.1",
@@ -62,9 +62,9 @@
     "coveralls": "^3.1.1",
     "dotenv": "^10.0.0",
     "integreat-adapter-json": "^0.2.1",
-    "nock": "^13.2.4",
+    "nock": "^13.2.9",
     "nyc": "^15.1.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.8.1",
     "sinon": "^11.1.2"
   }
 }