integreat 1.4.6 → 1.5.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/handlers/run.d.ts +1 -1
- package/dist/handlers/run.js +2 -2
- package/dist/handlers/run.js.map +1 -1
- package/dist/jobs/Job.d.ts +2 -2
- package/dist/jobs/Job.js +4 -2
- package/dist/jobs/Job.js.map +1 -1
- package/dist/utils/deepClone.d.ts +2 -0
- package/dist/utils/deepClone.js +3 -0
- package/dist/utils/deepClone.js.map +1 -0
- package/package.json +4 -4
package/dist/handlers/run.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Action, ActionHandlerResources, Response } from '../types.js';
|
|
2
2
|
import type Job from '../jobs/Job.js';
|
|
3
|
-
declare const _default: (jobs: Map<string, Job>) => (action: Action, { dispatch }: ActionHandlerResources) => Promise<Response>;
|
|
3
|
+
declare const _default: (jobs: Map<string, Job>) => (action: Action, { dispatch, setProgress }: ActionHandlerResources) => Promise<Response>;
|
|
4
4
|
export default _default;
|
package/dist/handlers/run.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { createErrorResponse } from '../utils/response.js';
|
|
2
|
-
export default (jobs) => async function run(action, { dispatch }) {
|
|
2
|
+
export default (jobs) => async function run(action, { dispatch, setProgress }) {
|
|
3
3
|
const { payload: { jobId }, } = action;
|
|
4
4
|
const job = typeof jobId === 'string' ? jobs.get(jobId) : undefined;
|
|
5
5
|
if (!job) {
|
|
6
6
|
return createErrorResponse(`No valid job with id '${jobId}'`, 'handler:RUN', 'notfound');
|
|
7
7
|
}
|
|
8
|
-
return await job.run(action, dispatch);
|
|
8
|
+
return await job.run(action, dispatch, setProgress);
|
|
9
9
|
};
|
|
10
10
|
//# sourceMappingURL=run.js.map
|
package/dist/handlers/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAI1D,eAAe,CAAC,IAAsB,EAAE,EAAE,CACxC,KAAK,UAAU,GAAG,CAChB,MAAc,EACd,EAAE,QAAQ,EAA0B;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAI1D,eAAe,CAAC,IAAsB,EAAE,EAAE,CACxC,KAAK,UAAU,GAAG,CAChB,MAAc,EACd,EAAE,QAAQ,EAAE,WAAW,EAA0B;IAEjD,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,MAAM,CAAA;IACV,MAAM,GAAG,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,mBAAmB,CACxB,yBAAyB,KAAK,GAAG,EACjC,aAAa,EACb,UAAU,CACX,CAAA;KACF;IAED,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;AACrD,CAAC,CAAA"}
|
package/dist/jobs/Job.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import Schedule from './Schedule.js';
|
|
2
|
-
import type { Action, Response, HandlerDispatch, MapOptions } from '../types.js';
|
|
2
|
+
import type { Action, Response, HandlerDispatch, MapOptions, SetProgress } from '../types.js';
|
|
3
3
|
import type { JobDef } from './types.js';
|
|
4
4
|
export default class Job {
|
|
5
5
|
#private;
|
|
6
6
|
id: string;
|
|
7
7
|
schedule?: Schedule;
|
|
8
8
|
constructor(jobDef: JobDef, mapOptions: MapOptions);
|
|
9
|
-
run(action: Action, dispatch: HandlerDispatch): Promise<Response>;
|
|
9
|
+
run(action: Action, dispatch: HandlerDispatch, setProgress: SetProgress): Promise<Response>;
|
|
10
10
|
}
|
package/dist/jobs/Job.js
CHANGED
|
@@ -54,6 +54,7 @@ function getResponse(jobId, steps, responses, isFlow) {
|
|
|
54
54
|
}
|
|
55
55
|
const getId = (jobDef) => typeof jobDef.id === 'string' && jobDef.id ? jobDef.id : nanoid();
|
|
56
56
|
const removePostmutationAndSetId = ({ postmutation, responseMutation, ...job }, id) => ({ ...job, id });
|
|
57
|
+
const calculateProgress = (index, stepsCount) => (index + 1) / (stepsCount + 1);
|
|
57
58
|
export default class Job {
|
|
58
59
|
id;
|
|
59
60
|
schedule;
|
|
@@ -81,7 +82,7 @@ export default class Job {
|
|
|
81
82
|
this.schedule = new Schedule(jobDef);
|
|
82
83
|
}
|
|
83
84
|
}
|
|
84
|
-
async run(action, dispatch) {
|
|
85
|
+
async run(action, dispatch, setProgress) {
|
|
85
86
|
if (this.#steps.length === 0) {
|
|
86
87
|
return {
|
|
87
88
|
status: 'noaction',
|
|
@@ -91,8 +92,9 @@ export default class Job {
|
|
|
91
92
|
}
|
|
92
93
|
let actionResponses = { action };
|
|
93
94
|
const meta = generateSubMeta(action.meta || {}, this.id);
|
|
94
|
-
for (const step of this.#steps) {
|
|
95
|
+
for (const [index, step] of this.#steps.entries()) {
|
|
95
96
|
const { [breakSymbol]: doBreak, ...responses } = await step.run(meta, actionResponses, dispatch);
|
|
97
|
+
setProgress(calculateProgress(index, this.#steps.length));
|
|
96
98
|
actionResponses = { ...actionResponses, ...responses };
|
|
97
99
|
if (doBreak) {
|
|
98
100
|
break;
|
package/dist/jobs/Job.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../src/jobs/Job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,IAAI,EAAE,EACX,aAAa,EACb,sBAAsB,EACtB,eAAe,EACf,cAAc,EACd,WAAW,GACZ,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../src/jobs/Job.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,eAAe,IAAI,EAAE,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0-rc.0",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -57,10 +57,10 @@
|
|
|
57
57
|
"@types/debug": "^4.1.12",
|
|
58
58
|
"@types/luxon": "^3.3.4",
|
|
59
59
|
"@types/sinon": "^17.0.1",
|
|
60
|
-
"integreat-adapter-json": "^1.0.
|
|
60
|
+
"integreat-adapter-json": "^1.0.1",
|
|
61
61
|
"integreat-adapter-uri": "^1.0.0",
|
|
62
|
-
"integreat-transformers": "^1.0.
|
|
63
|
-
"integreat-transporter-http": "1.2.
|
|
62
|
+
"integreat-transformers": "^1.0.5",
|
|
63
|
+
"integreat-transporter-http": "^1.2.2",
|
|
64
64
|
"nock": "^13.3.8",
|
|
65
65
|
"sinon": "^17.0.1"
|
|
66
66
|
}
|