integreat 1.5.0-rc.3 → 1.5.0

package/README.md

@@ -365,8 +365,10 @@ specify a few things:
   will not by cast automatically nor will an error be returned if the data is
   not typed.
 - `allowRawResponse`: When set to `true`, response `data` coming from this
-  endpoint will not by cast automatically nor will an error be returned if the
-  data is not typed.
+  endpoint will not be cast automatically nor will an error be returned if the
+  data is not typed. The default is `false`, expcept for incoming endpoints
+  (endpoints where `match` object has `incoming: true`) where the default value
+  is `true`.
 - `castWithoutDefaults`: Set to `true` when you don't want to set default values
   on casted data. This also means no `id` will be generated and no `createdAt`
   or `updatedAt` will be set – when any of these are missing in the data.
@@ -829,6 +831,25 @@ A double carret `^^` takes you to the top -- the root -- so after
 Carret notations -- parents and roots -- does not currently work in reverse, but
 they might in a future version.
 
+### Non-values
+
+The behavior of some transformers are based upon certain values being
+non-values. E.g. `{ $alt: [<pipeline 1>, <pipeline 2>] }` will use the value
+from the first pipeline if it returns a value, otherwise the value from the
+second pipeline, meaning it will check for non-values. By default `null`,
+`undefined`, and `''` (empty string) are non-values. By setting the `nonvalues`
+param to an array of values in the defintions object you pass to
+`Integreat.create()`, you may specify your own non-values.
+
+If you don't want empty string to a non-value, for instance, you do this:
+
+```javascript
+const great = Integreat.create({
+  nonvalues: [null, undefined],
+  // ... other definitions
+})
+```
+
 ## Schemas
 
 A central idea to Integreat, is that any integration has two sides; the getting
@@ -1431,12 +1452,12 @@ Example ident:
   setting the auth rules for a schema, you specify required rules so that to get
   data cast in this schema, an ident with e.g. the role `admin` must be
   provided.
-- `type`: An optional string to signal when this ident is `'ROOT'` or `'ANON'`.
-  This is used internally by Integreat, but in some cases you may want to set
-  this yourself. Make sure, however, that you don't let third-parties set
-  `'ROOT'`. Make sure to also set the id, typically to `'root'` or
-  `'anonymous'`. Not setting any `type` is the same as setting it to `'CUST'`,
-  which is the default.
+- `type`: An optional string to signal when this ident is `'ROOT'`, `'SCHED'`,
+  or `'ANON'`. This is used internally by Integreat, but in some cases you may
+  want to set this yourself. Make sure, however, that you don't let
+  third-parties set `'ROOT'`. Make sure to also set the id, typically to
+  `'root'` or `'anonymous'`. Not setting any `type` is the same as setting it to
+  `'CUST'`, which is the default.
 - `isCompleted`: A flag to signal that an ident has already been completed, so
   that it won't be completed again. Used by the `completeIdent` middleware. You
   should normally not need to set this yourself.
@@ -1775,13 +1796,15 @@ it won't be wrapped in an array.)
 
 #### `EXPIRE`
 
-> [!NOTE]
-> This action will change before we reach v1.0.
+The `EXPIRE` action have two alternative way of operating. If the
+`deleteWithParams` param is `false` or not set, we will first dispatch a `GET`
+action to fetch expired data items from a service, and the then dispatch a
+`DELETE` action with the retrieved data items. If `deleteWithParams` is `true`,
+we will instead dispatch a `DELETE` action right away with the same params we
+would have provided to the `GET` action.
 
-The `EXPIRE` action will `GET` expired data items from a service, and the then
-`DELETE` them.
-
-Here's an example of an `EXPIRE` action:
+Here's an example of an `EXPIRE` action that will dispatch a `GET` and a
+`DELETE`:
 
 ```javascript
 {
@@ -1790,16 +1813,28 @@ Here's an example of an `EXPIRE` action:
     service: 'store',
     type: 'entry',
     endpoint: 'getExpired',
-    msFromNow: 0
+    msFromNow: -24 * 60 * 60 * 1000 // Delete entries older than 24 hours
   }
 }
 ```
 
-The `endpoint` property is required for this action, and needs to specify a
-service endpoint used to fetch expired items. The action dispatched to this
-endpoint will have a `timestamp` property with the current time as microseconds
-since epoc (Januar 1, 1970 UTC), and `isodate` as the current time in the
-extended ISO 8601 format(`YYYY-MM-DDThh:mm:ss.sssZ`).
+Here's an example of an `EXPIRE` action that will dispatch a `DELETE` directly:
+
+```javascript
+{
+  type: 'EXPIRE',
+  payload: {
+    service: 'store',
+    type: 'entry',
+    deleteWithParams: true
+  }
+}
+```
+
+The `GET` action (or the `DELETE` action when `deleteWithParams` is `true`) will
+have a `timestamp` property with the current time as microseconds since epoc
+(Januar 1, 1970 UTC), and `isodate` as the current time in the extended ISO 8601
+format(`YYYY-MM-DDThh:mm:ss.sssZ`).
 
 To have `timestamp` and `isodate` be a time in the future instead, set
 `msFromNow` to a positive number of milliseconds. This will be added to the
@@ -1889,7 +1924,220 @@ intention is not to replace an existing action handler.
 
 ## Jobs
 
-> **Editor's note:** Write this section.
+You define jobs to run one or more actions on a schedule or to add additional
+logic that is not provided by one specific service endpoint. When you dispatch
+several actions, in sequence or in parallel, we call it a "flow".
+
+A simple job running on a schedule, may look like this:
+
+```javascript
+const syncJob = {
+  id: 'syncEntries',
+  cron: '0 */1 * * *', // Every hour
+  action: {
+    type: 'SYNC',
+    payload: {
+      type: 'entry',
+      retrieve: 'updated',
+      from: 'entries',
+      to: 'store',
+    },
+  },
+}
+```
+
+This will dispatch the given `SYNC` action every hour. (The `SYNC` action and
+cron syntax is out of scope in this section. Fron cron expressions,
+(Crontab)[https://crontab.cronhub.io] is a good and practical resource.)
+
+An alternative to running a job on a schedule with `cron`, is to run it by
+dispatching a `RUN` action with the job id in the payload `jobId` param.
+
+A flow may look like this:
+
+```javascript
+const flowJob = {
+  id: 'getEntryFromOtherService',
+  flow: [
+    {
+      id: 'getFromStore',
+      action: {
+        type: 'GET',
+        payload: {
+          type: 'entry',
+          targetService: 'store',
+        },
+      },
+      premutation: {
+        payload: {
+          $modify: 'payload',
+          id: '^^.action.payload.id',
+        },
+      },
+    },
+    {
+      id: 'getFromOtherService',
+      action: {
+        type: 'GET',
+        payload: {
+          type: 'entry',
+          targetService: 'otherService',
+        },
+      },
+      premutation: {
+        payload: {
+          $modify: 'payload',
+          id: '^^.getFromStore.response.data.otherId',
+        },
+      },
+    },
+  ],
+}
+```
+
+Several things are going on here: First, we have a flow with two actions. We
+imagine here that we are going to fetch an entry with an id that is found in the
+`store` service, and use the `otherId` retrieved from that service to get the
+entry from `otherService`. The two steps in `flow` look a lot like a job, and
+in one way they are the same, with some differences, that we will get back to.
+They are run sequentally in the order they appear in the `flow` array.
+
+Secondly, we have a `premutation` on each step. This is given the `action` and
+may mutate it before it is dispatched. As for endpoint mutations, the top level
+has `$modify: true` as default, but we need to modify the sub-objects we
+include, when that is what we want. In the first step, we set the payload `id`
+to the `id` provided in the action that called this job. This job is passed to
+mutations on jobs and steps under the name `'action'`, and we prepend it with
+the root path (`^^`) as it is found on the top level of the data structure we're
+mutating.
+
+The second step is similar, but here we set the payload `id` to the `otherId`
+found in the response data of the first step. The action and the response from a
+step is available to all following steps by the id of the step, in this case
+`'getFromStore'`. We have to prepend with the root path (`^^`) here as well.
+When we say the action and response is available, we find it as an action object
+with any response on a `response` property.
+
+With the action
+`{ type: 'RUN', payload: { jobId: 'getEntryFromOtherService', id: '12345' } }`,
+the first step will dispatch a `GET` for the id `12345`. If that action
+succeeds with the data `{ id: '12345', otherId: '67890' }`, the second step will
+dispatch a `GET` for the id `67890`. The response from the last action is
+returned by default.
+
+If any job step fails, the entire job will fail and the error will be returned,
+unless you set up any `preconditions`, `postconditions`, or `postmutations` to
+alter this default behavior. More on that in the following sections.
+
+### Job and step mutations
+
+Jobs and job steps provide two mechanisms for mutations: `premutation` and
+`postmutation`. They work in a similar way, but `premutation` is used to
+mutate the action of a job or a job step _before_ it is dispatched, and
+`postmutations` is used to mutate the response from a job or a step.
+
+Note that `premutation` will not have an effect on a job with a `flow`, but
+`postmutation` may be used with the response from a flow.
+
+Both mutation pipelines are passed an object that holds the action and response
+of every step that has been run so far, set on a property with the same key as
+the step id. The response is given as a `response` property on the action. The
+action that was dispatched to run the job is also included on the `'action'`
+property. (Thus a step may not have the id `'action'`.) The object also holds
+the action of the step on an internal property, and this is the starting point
+for the mutations. You do not reference the step action directly, just mutate
+was is given in the pipeline data and use the root path `^^` to get to the
+actions and responses of other steps.
+
+For both pipelines, an action object is expected, and in the case of
+`postmutation` the action should have a `response` object which is what will be
+used as the response from the job or step.
+
+### Step conditions
+
+By default, if a step in a flow fails, no more steps are run, and the entire job
+will fail with the response from the failed step. You may however provide your
+own conditions for when a step should be run and when a step should be regarded
+as having failed.
+
+`preconditions` on a step must be an array of condition objects, that must all
+pass in order for the step to be run. A condition object must have a `condition`
+property with an array of mutation pipelines, that must all return truthy for
+the condition to be regarded as passed. Each pipeline is given the same object
+as is given to `premutation` with action and responses from previous steps, but
+without the action to be dispatched. See
+[the section on mutating jobs](#job-and-step-mutations) for more on this.
+
+The condition object may also have a `failResponse` property with a response
+object that will be used as the response from the step if the condition fails.
+
+Finally, the `condition` object may have a `break` property set to `true`, to
+signal that the entire job should fail if the condition fails. If `break` is not
+set, the step will just be skipped and the job flow continues.
+
+> [!NOTE]
+> By setting the feature flag `breakByDefault` to `true` (on the `flags` object
+> in the defintions given to `Integreat.create()`), `break` will be `true` by
+> default, and you must set it to `false` to make the flow continue. This will
+> be the default behavior in the next major version of Integreat, so it's a good
+> idea to set the flag to `true` already now.
+
+Note that a step has a default pre-condition, that will make it fail and stop
+the flow if the previous step failed. By specifying your own `preconditions`,
+you override this, and only your conditions will be used. But when you set
+`breakByDefault` to `true` (see note above), this default condition will be
+set in the `postconditions` instead, so that you may override it there. This
+way, you may set pre-conditions on a step, whithout overriding the fail-on-error
+behavior of the step before.
+
+`postconditions` is also an array of condition objects, but this is used to
+decide if the step should be regarded as having failed after its action or flow
+has run. The condition pipelines are passed the same object as `postmutation`,
+but _after_ `postmutation` has been applied. Just as for `preconditions`, the
+`break` property is `false` by default, so to stop the entire job, set it to
+`true` (but see note on `breakByDefault` above). An error will usually cause
+the job to fail even with `break: false`, but the breaking may be handled by the
+`preconditions` on the next step, as describe above.
+
+Post-conditions specify what is required for a step to be succeessful, and
+sometimes you may require a certain error as success, e.g. when you're checking
+a cache and will only continue if a value is not cached, requiring a `notfound`
+response status. The condition pipeline for this should be straight
+forward, but as you cannot specify the response that will be used when the
+condition _passes_, you may wonder what happens with the error response.
+Integreat will set the status of a passing response to `ok` if it was an error,
+and otherwise leave it as is. Also, when changing an error to an `ok`, any
+`error` property will be changed to a `warning`.
+
+### Dispatching several actions by iterating over an array
+
+Sometimes you will want to dispatch several actions based on a data array, e.g.
+when you have an array of data items, but the relevant endpoint only accepts one
+data item. This may be done with `iterate`, which is a special mutation that is
+must return an array, and the job action will be dispatched once for every item
+in this array. The item will be set as payload `data`. `premutation` may be used
+to modify the action before it is dispatched as usual, but note that the
+mutation is applied to every single action, after the `iterate`, so to speak.
+
+This applies to both a job with an action and a step with an action in a flow.
+
+The responses of each action are combined and set as a `response` object on the
+step action (before the iteration), making an iterated step just like any other.
+When all actions are successful, the response will have status `ok`, and the
+response `data` will be an array of the data from each response in the order
+they where run. When there are errors, Integreat will use any common status, if
+possible, otherwise the status will be `'error'`. The `error` string will
+include all the indidivual errors, separated by a pipe (`|`). The individual
+responses will also be available on a `responses` property on the `response`
+object.
+
+Every single iterated action and response will also be available on the step id
+with an index prefix, e.g. `getEntries` will have `getEntries_0`,
+`getEntries_1`, etc.
+
+By default, the iterations are run in sequence, but you may run several in
+parallel by specifying the number of concurrent iterations on the
+`iterateConcurrency` property on the job step. The default is `1`.
 
 ## Queues
 
@@ -2018,7 +2266,8 @@ const great = Integreat.create(
 - `props`: You may provide alternative field names for the `id`, `roles`, and
   `tokens` for an ident in the schema specified on `type`. When the prop and the
   field has the same name, it may be omitted, though it doesn't hurt to specif
-  it anyway for clarity.
+  it anyway for clarity. For setups that don't need `roles` and/or `tokens`, you
+  may set these to `null`. Omitting them will result in the default field names.
 
 Note that in the example above, the `id` of the data will be used as the ident
 `id`. When the id is not suited for this, you will need another field on the

package/dist/Instance.js

@@ -41,10 +41,10 @@ const setIdOnAuthenticators = (authenticators) => Object.fromEntries(Object.entr
 const createAuthObjects = (authDefs, authenticators) => authDefs
     .map(setUpAuth(authenticators))
     .reduce(indexById, {});
-function prepareJobs(jobDefs, mapOptions) {
+function prepareJobs(jobDefs, mapOptions, breakByDefault) {
     const jobs = new Map();
     ensureArray(jobDefs).forEach((jobDef) => {
-        const job = new Job(jobDef, mapOptions);
+        const job = new Job(jobDef, mapOptions, breakByDefault);
         jobs.set(job.id, new Job(jobDef, mapOptions));
     });
     return jobs;
@@ -75,9 +75,10 @@ function createServices(defs, resources, schemas, mapOptions, middlewareForServi
         .reduce(indexById, {});
 }
 function setupServicesAndDispatch(defs, resources, schemas, middlewareForDispatch, middlewareForService, emit) {
-    const mapOptions = createMapOptions(schemas, defs.mutations, resources.transformers, defs.dictionaries);
+    const mapOptions = createMapOptions(schemas, defs.mutations, resources.transformers, defs.dictionaries, defs.nonvalues);
     const services = createServices(defs, resources, schemas, mapOptions, middlewareForService, emit);
-    const jobs = prepareJobs(defs.jobs || [], mapOptions);
+    const breakByDefault = defs.flags?.breakByDefault ?? false;
+    const jobs = prepareJobs(defs.jobs || [], mapOptions, breakByDefault);
     const dispatch = createDispatch({
         schemas,
         services,

package/dist/Instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"Instance.js","sourceRoot":"","sources":["../src/Instance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Instance.js","sourceRoot":"","sources":["../src/Instance.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAA;AACtC,OAAO,IAAI,MAAM,mBAAmB,CAAA;AACpC,OAAO,eAAe,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,MAAM,mBAAmB,CAAA;AACrC,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,OAAO,MAAM,sBAAsB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,gBAAgB,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,cAAc,MAAM,eAAe,CAAA;AAC1C,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,KAAK,MAAM,YAAY,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,GAAG,MAAM,eAAe,CAAA;AAC/B,OAAO,uBAAuB,MAAM,wBAAwB,CAAA;AAiB5D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,cAA8C,EAAE,EAAE,CAC1E,SAAS,SAAS,CAAC,GAAY;IAC7B,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAA;IACnE,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CACb,gBAAgB,GAAG,CAAC,EAAE,6CAA6C,GAAG,CAAC,aAAa,GAAG,CACxF,CAAA;KACF;IAED,OAAO,IAAI,IAAI,CACb,GAAG,CAAC,EAAE,EACN,aAAa,EACb,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,oBAAoB,CACzB,CAAA;AACH,CAAC,CAAA;AAEH,MAAM,aAAa,GAAG,CAAC,QAAkC,EAAE,EAAE,CAC3D,QAAQ;IACN,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;QAC9C,EAAE;QACF,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE;KACnB,CAAC,CACH;IACH,CAAC,CAAC,EAAE,CAAA;AAER,MAAM,iBAAiB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAA;AAEtD,SAAS,cAAc,CAAC,UAAuB;IAC7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAA;IACzC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;IACF,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,qBAAqB,GAAG,CAC5B,cAA6C,EACd,EAAE,CACjC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;IACvD,EAAE;IACF,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;CAChB,CAAC,CACH,CAAA;AAEH,MAAM,iBAAiB,GAAG,CACxB,QAAmB,EACnB,cAA6C,EAC7C,EAAE,CACF,QAAQ;KACL,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;KAC9B,MAAM,CAAC,SAAS,EAAE,EAA0B,CAAC,CAAA;AAElD,SAAS,WAAW,CAClB,OAAiB,EACjB,UAAsB,EACtB,cAAuB;IAEvB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAe,CAAA;IACnC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;QACvD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;IACF,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,eAAe,GAAG,CACtB,QAAuC,EACvC,IAAsB,EACtB,EAAE,CAAC,CAAC;IACJ,GAAG,eAAe;IAClB,GAAG,QAAQ;IACX,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC;CACjB,CAAC,CAAA;AAEF,MAAM,sBAAsB,GAAG,CAAC,IAAiB,EAAE,EAAE,CAAC,CAAC;IACrD,WAAW,EAAE,IAAI,CAAC,WAAW;IAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;CAChC,CAAC,CAAA;AAEF,SAAS,cAAc,CACrB,IAAiB,EACjB,SAAoB,EACpB,OAA4B,EAC5B,UAAsB,EACtB,oBAAkC,EAClC,IAAiE;IAEjE,MAAM,cAAc,GAAG,qBAAqB,CAAC,SAAS,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;IAC5E,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,cAAc,CAAC,CAAA;IAEjE,OAAO,IAAI,CAAC,QAAQ;SACjB,GAAG,CACF,CAAC,GAAG,EAAE,EAAE,CACN,IAAI,OAAO,CAAC,GAAG,EAAE;QACf,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,QAAQ,EAAE,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC3C,cAAc,EAAE,cAAc;QAC9B,KAAK;QACL,OAAO;QACP,UAAU;QACV,UAAU,EAAE,oBAAoB;QAChC,IAAI;KACL,CAAC,CACL;SACA,MAAM,CAAC,SAAS,EAAE,EAA6B,CAAC,CAAA;AACrD,CAAC;AAED,SAAS,wBAAwB,CAC/B,IAAiB,EACjB,SAAoB,EACpB,OAA4B,EAC5B,qBAAmC,EACnC,oBAAkC,EAClC,IAAiE;IAEjE,MAAM,UAAU,GAAG,gBAAgB,CACjC,OAAO,EACP,IAAI,CAAC,SAAS,EACd,SAAS,CAAC,YAAY,EACtB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,SAAS,CACf,CAAA;IACD,MAAM,QAAQ,GAAG,cAAc,CAC7B,IAAI,EACJ,SAAS,EACT,OAAO,EACP,UAAU,EACV,oBAAoB,EACpB,IAAI,CACL,CAAA;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,EAAE,cAAc,IAAI,KAAK,CAAA;IAC1D,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;IACrE,MAAM,QAAQ,GAAG,cAAc,CAAC;QAC9B,OAAO;QACP,QAAQ;QACR,QAAQ,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ,IAAI,EAAE,EAAE,IAAI,CAAC;QACzD,UAAU,EAAE,qBAAqB;QACjC,OAAO,EAAE,sBAAsB,CAAC,IAAI,CAAC;KACtC,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,uBAAuB,CAC/C,QAAQ,EACR,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAC7C,CAAA;IAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA;AAClD,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,YAAY;IAChD,EAAE,CAAS;IACX,QAAQ,CAAyB;IACjC,OAAO,CAAqB;IAC5B,SAAS,CAAS;IAClB,YAAY,CAAS;IAErB,QAAQ,CAAU;IAClB,iBAAiB,CAA6C;IAE9D,YACE,IAAiB,EACjB,SAAoB,EACpB,wBAAsC,EAAE,EACxC,uBAAqC,EAAE;QAEvC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjE,MAAM,IAAI,SAAS,CACjB,6DAA6D,CAC9D,CAAA;SACF;QAED,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;QACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAA;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAA;QACrC,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAE3C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,wBAAwB,CACxE,IAAI,EACJ,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,qBAAqB,EACrB,oBAAoB,EACpB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CACrB,CAAA;QAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM;QACV,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC5D,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC5C,CAAC;CACF"}

package/dist/authenticators/options.js

@@ -1,11 +1,12 @@
-import mapTransform from 'map-transform';
+import { pathGetter } from 'map-transform';
 import { isObject } from '../utils/is.js';
+const state = { context: [], value: undefined };
 const compareValues = (expected, value) => expected !== undefined && Array.isArray(expected)
     ? expected.includes(value)
     : expected === value;
 const getIsMatchCount = (matches) => matches.filter(([match]) => !!match).length;
 const getHasPropsCount = (matches) => matches.filter(([, exists]) => !!exists).length;
-async function validateOptions(options, action) {
+function validateOptions(options, action) {
     if (action === null) {
         return [false, false];
     }
@@ -13,10 +14,10 @@ async function validateOptions(options, action) {
     if (pathAndExpectedArr.length === 0) {
         return [true, false];
     }
-    const matches = await Promise.all(pathAndExpectedArr.map(async function ([path, expected]) {
-        const value = await mapTransform(path)(action);
+    const matches = pathAndExpectedArr.map(function ([path, expected,]) {
+        const value = pathGetter(path)(action, state);
         return [compareValues(expected, value), value !== undefined];
-    }));
+    });
     return [
         getIsMatchCount(matches) === pathAndExpectedArr.length,
         getHasPropsCount(matches) > 0,
@@ -31,7 +32,7 @@ const optionsAuth = {
     },
     async validate(_authentication, options, action) {
         const { identId, ...authOptions } = options || {};
-        const [isValid, hasProps] = await validateOptions(authOptions, action);
+        const [isValid, hasProps] = validateOptions(authOptions, action);
         if (isValid) {
             return { status: 'ok', access: { ident: { id: identId } } };
         }

package/dist/authenticators/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/authenticators/options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/authenticators/options.ts"],"names":[],"mappings":"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"}

package/dist/dispatchScheduled.d.ts

@@ -1,4 +1,4 @@
 import type Job from './jobs/Job.js';
-import type { Dispatch, Action } from './types.js';
+import { Dispatch, Action } from './types.js';
 declare const _default: (dispatch: Dispatch, jobs: Job[]) => (from: Date, to: Date) => Promise<Action[]>;
 export default _default;

package/dist/dispatchScheduled.js

@@ -1,6 +1,10 @@
+import { IdentType } from './types.js';
 export default (dispatch, jobs) => async function dispatchScheduled(from, to) {
     const dispatched = [];
-    const meta = { ident: { id: 'scheduler' }, queue: true };
+    const meta = {
+        ident: { id: 'scheduler', type: IdentType.Scheduler },
+        queue: true,
+    };
     for (const job of jobs) {
         if (job && job.schedule) {
             if (job.schedule.shouldRun(from, to)) {

package/dist/dispatchScheduled.js.map

@@ -1 +1 @@
-{"version":3,"file":"dispatchScheduled.js","sourceRoot":"","sources":["../src/dispatchScheduled.ts"],"names":[],"mappings":"AAGA,eAAe,CAAC,QAAkB,EAAE,IAAW,EAAE,EAAE,CACjD,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,EAAQ;IACnD,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IAExD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE;YACvB,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpC,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;gBAChE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAA;gBACvC,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;aACzC;SACF;KACF;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"dispatchScheduled.js","sourceRoot":"","sources":["../src/dispatchScheduled.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,YAAY,CAAA;AAExD,eAAe,CAAC,QAAkB,EAAE,IAAW,EAAE,EAAE,CACjD,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,EAAQ;IACnD,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE;QACrD,KAAK,EAAE,IAAI;KACZ,CAAA;IAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE;YACvB,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpC,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;gBAChE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAA;gBACvC,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;aACzC;SACF;KACF;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}

package/dist/handlers/expire.js

@@ -1,50 +1,53 @@
 import { createErrorResponse } from '../utils/response.js';
 import { isTypedData } from '../utils/is.js';
 const isTypedDataArray = (value) => Array.isArray(value) && isTypedData(value[0]);
-const getExpired = async (targetService, type, endpointId, msFromNow, dispatch, cid, ident) => {
+const createDeleteAction = (type, data, targetService, ident, cid) => ({
+    type: 'DELETE',
+    payload: {
+        type,
+        data,
+        ...(targetService && { targetService }),
+    },
+    meta: { ident, queue: true, cid },
+});
+const getOrDeleteExpired = async (deleteWithParams, dispatch, type, msFromNow, targetService, endpointId, cid, ident) => {
     const timestamp = Date.now() + msFromNow;
     const isodate = new Date(timestamp).toISOString();
     return dispatch({
-        type: 'GET',
+        type: deleteWithParams ? 'DELETE' : 'GET',
         payload: {
             type,
             timestamp,
             isodate,
-            targetService,
-            endpoint: endpointId,
+            ...(targetService && { targetService }),
+            ...(endpointId && { endpoint: endpointId }),
         },
-        meta: { ident, cid },
+        meta: { ident, cid, ...(deleteWithParams ? { queue: true } : {}) },
     });
 };
-const deleteExpired = async (data, targetService, dispatch, cid, ident) => {
+async function deleteItems(dispatch, response, type, serviceId, cid, ident) {
+    if (response.status !== 'ok') {
+        return createErrorResponse(`Could not get items from service '${serviceId}'. Reason: ${response.status} ${response.error}`, 'handler:EXPIRE');
+    }
+    const data = response.data;
+    if (!isTypedDataArray(data)) {
+        return createErrorResponse(`No items to expire from service '${serviceId}'`, 'handler:EXPIRE', 'noaction');
+    }
     const deleteData = data.map((item) => ({ id: item.id, $type: item.$type }));
-    const deleteAction = {
-        type: 'DELETE',
-        payload: { data: deleteData, targetService },
-        meta: { ident, queue: true, cid },
-    };
-    return await dispatch(deleteAction);
-};
+    return await dispatch(createDeleteAction(type, deleteData, serviceId, ident, cid));
+}
 export default async function expire(action, { dispatch }) {
-    const { payload: { type, endpoint: endpointId, targetService: serviceId }, meta: { ident, cid } = {}, } = action;
+    const { payload: { type, endpoint: endpointId, targetService: serviceId, deleteWithParams = false, }, meta: { ident, cid } = {}, } = action;
     const msFromNow = action.payload.msFromNow || 0;
-    if (!serviceId) {
-        return createErrorResponse(`Can't delete expired without a specified service`, 'handler:EXPIRE');
-    }
-    if (!endpointId) {
-        return createErrorResponse(`Can't delete expired from service '${serviceId}' without an endpoint`, 'handler:EXPIRE');
-    }
     if (!type) {
         return createErrorResponse(`Can't delete expired from service '${serviceId}' without one or more specified types`, 'handler:EXPIRE', 'badrequest');
     }
-    const expiredResponse = await getExpired(serviceId, type, endpointId, msFromNow, dispatch, cid, ident);
-    if (expiredResponse.status !== 'ok') {
-        return createErrorResponse(`Could not get items from service '${serviceId}'. Reason: ${expiredResponse.status} ${expiredResponse.error}`, 'handler:EXPIRE');
+    const response = await getOrDeleteExpired(!!deleteWithParams, dispatch, type, msFromNow, serviceId, endpointId, cid, ident);
+    if (deleteWithParams) {
+        return response;
     }
-    const data = expiredResponse.data;
-    if (!isTypedDataArray(data)) {
-        return createErrorResponse(`No items to expire from service '${serviceId}'`, 'handler:EXPIRE', 'noaction');
+    else {
+        return await deleteItems(dispatch, response, type, serviceId, cid, ident);
     }
-    return await deleteExpired(data, serviceId, dispatch, cid, ident);
 }
 //# sourceMappingURL=expire.js.map

package/dist/handlers/expire.js.map

@@ -1 +1 @@
-{"version":3,"file":"expire.js","sourceRoot":"","sources":["../../src/handlers/expire.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expire.js","sourceRoot":"","sources":["../../src/handlers/expire.ts"],"names":[],"mappings":"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"}