integreat 0.7.37 → 0.7.38

package/index.d.ts

@@ -1,7 +1,7 @@
 export as namespace integreat
 export = integreat
 
-declare function integreat (
+declare function integreat(
   defs: integreat.Definitions,
   resources: integreat.Resources,
   middlewares?: integreat.Middleware[]
@@ -20,58 +20,63 @@ declare namespace integreat {
   }
 
   export interface Ident {
-    id?: string,
+    id?: string
     root?: boolean
   }
 
   export interface Meta {
-    queue?: boolean,
-    ident?: Ident,
+    queue?: boolean
+    ident?: Ident
     [key: string]: unknown
   }
 
   export interface Action<P = Payload> {
-    type: string,
-    payload: P,
+    type: string
+    payload: P
     meta?: Meta
   }
 
   export type ActionHandlerResources = {
     dispatch: Dispatch
+    setProgress: (progress: number) => void
   }
 
   export interface Instance {
-    version: string,
-    schemas: object,
-    services: object,
-    identType: string,
+    version: string
+    schemas: object
+    services: object
+    identType: string
 
-    dispatch: Dispatch,
-    on: (eventName: string, serviceId: string, listener: (request: Request, response: Response) => void) => void
+    dispatch: Dispatch
+    on: (
+      eventName: string,
+      serviceId: string,
+      listener: (request: Request, response: Response) => void
+    ) => void
   }
 
   export interface IdentDefinitions {
     type: string
     props?: {
-      id?: string,
-      roles?: string,
+      id?: string
+      roles?: string
       tokens?: string
     }
   }
 
   export interface Definitions {
-    schemas: object[],
-    services: object[],
-    mappings: object[],
-    auths?: object[],
+    schemas: object[]
+    services: object[]
+    mappings: object[]
+    auths?: object[]
     ident?: IdentDefinitions
   }
 
   export interface Resources {
-    adapters: any,
-    authenticators?: any,
-    transformers?: any,
-    filters?: any,
+    adapters: any
+    authenticators?: any
+    transformers?: any
+    filters?: any
     actions?: any
   }
 
@@ -80,9 +85,9 @@ declare namespace integreat {
   }
 
   export interface Queue {
-    queue: object,
-    setDispatch: (dispatch: Dispatch) => Promise<void>,
-    middleware: Middleware,
+    queue: object
+    setDispatch: (dispatch: Dispatch) => Promise<void>
+    middleware: Middleware
     schedule: (schedule: object) => Promise<Response>
   }
 
@@ -97,10 +102,10 @@ declare namespace integreat {
   }
 
   type Relationship = {
-    id: string | null | undefined,
-    type: string,
-    attributes?: Attributes,
-    relationships?: Relationships,
+    id: string | null | undefined
+    type: string
+    attributes?: Attributes
+    relationships?: Relationships
     meta?: object
   }
 
@@ -109,30 +114,30 @@ declare namespace integreat {
   }
 
   export type Data = {
-    id: string | null | undefined,
-    type: string,
-    attributes: Attributes,
+    id: string | null | undefined
+    type: string
+    attributes: Attributes
     relationships: Relationships
   }
 
   interface Request<T = Data[] | Data | null> {
-    action: string,
+    action: string
     params?: {
       [param: string]: any
-    },
+    }
     endpoint?: {
       [option: string]: any
     }
-    data: T,
-    auth?: object | boolean,
+    data: T
+    auth?: object | boolean
     access?: { ident: Ident }
   }
 
   interface Response<T = Data[]> {
-    status: string,
-    data?: T,
-    error?: string,
-    responses?: Response[],
+    status: string
+    data?: T
+    error?: string
+    responses?: Response[]
     access?: object
   }
 }

package/lib/integreat.js

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

package/lib/service/mapFromService.js

@@ -5,13 +5,19 @@ const mergeWithParams = (response, params) => ({
   ...response,
   params: {
     ...params,
-    ...response.params
-  }
+    ...response.params,
+  },
 })
 
 const mapWithEndpoint = (responseMapper, response, params, actionType) => {
-  if (responseMapper || actionType.startsWith('GET') || actionType === 'REQUEST') {
-    return (responseMapper) ? responseMapper(mergeWithParams(response, params)) || {} : response
+  if (
+    responseMapper ||
+    actionType.startsWith('GET') ||
+    actionType === 'REQUEST'
+  ) {
+    return responseMapper
+      ? responseMapper(mergeWithParams(response, params)) || {}
+      : response
   } else {
     return {}
   }
@@ -25,8 +31,14 @@ const mapWithEndpoint = (responseMapper, response, params, actionType) => {
  * @param {Object} options - mappings, params, onlyMappedValues, and endpoint
  * @returns {Object[]} Array of mapped items
  */
-function mapFromService () {
-  return ({ response, request, responseMapper, mappings, mapResponseWithType = true }) => {
+function mapFromService() {
+  return ({
+    response,
+    request,
+    responseMapper,
+    mappings,
+    mapResponseWithType = true,
+  }) => {
     const type = request.params.type || Object.keys(mappings)
     const { onlyMappedValues, unmapped = false } = request.params
 
@@ -34,28 +46,38 @@ function mapFromService () {
       return response
     }
 
-    const {
-      data,
-      status = response.status,
-      error,
-      paging,
-      params
-    } = mapWithEndpoint(responseMapper, response, request.params, request.action)
+    const { data, status, error, paging, params } = mapWithEndpoint(
+      responseMapper,
+      response,
+      request.params,
+      request.action
+    )
+
     const responseError = [response.error, error].filter(Boolean).join(' | ')
+    const responseStatus =
+      response.status !== 'ok'
+        ? response.status
+        : status || (responseError ? 'error' : 'ok')
 
     const ret = {
       ...response,
-      status: response.status === 'ok' ? status : response.status,
-      ...(status !== 'ok' && responseError ? { error: responseError } : {}),
-      ...((paging) ? { paging } : {}),
-      ...((params) ? { params } : {}),
-      ...(status === 'ok' || data ? { data: data === null ? undefined : data } : {})
+      status: responseStatus,
+      ...(responseError ? { error: responseError } : {}),
+      ...(paging ? { paging } : {}),
+      ...(params ? { params } : {}),
+      ...(responseStatus === 'ok' || data
+        ? { data: data === null ? undefined : data }
+        : {}),
     }
 
-    if (status === 'ok' && data && mapResponseWithType) {
-      const mapType = (type) => (mappings[type])
-        ? mappings[type].fromService({ ...request, data }, { onlyMappedValues })
-        : []
+    if (ret.status === 'ok' && data && mapResponseWithType) {
+      const mapType = (type) =>
+        mappings[type]
+          ? mappings[type].fromService(
+              { ...request, data },
+              { onlyMappedValues }
+            )
+          : []
       ret.data = flatten(mapAny(mapType, type))
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "integreat",
-  "version": "0.7.37",
+  "version": "0.7.38",
   "description": "Node.js integration layer",
   "author": "Kjell-Morten Bratsberg Thorsen <post@kjellmorten.no> (http://kjellmorten.no/)",
   "license": "ISC",