integreat 0.8.0-beta.10 → 0.8.0-beta.12
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.js
CHANGED
|
@@ -20,7 +20,7 @@ function mutateAction(action, mutation, responses, mapOptions) {
|
|
|
20
20
|
if (mutation && (0, is_1.isAction)(action)) {
|
|
21
21
|
const mutationIncludingAction = Array.isArray(mutation)
|
|
22
22
|
? ['$action', ...mutation.map(addModify)]
|
|
23
|
-
: { '.': '
|
|
23
|
+
: ['$action', { '.': '.', ...mutation }];
|
|
24
24
|
const responsesIncludingAction = { ...responses, $action: action };
|
|
25
25
|
return (0, map_transform_1.mapTransform)(mutationIncludingAction, mapOptions)(responsesIncludingAction);
|
|
26
26
|
}
|
|
@@ -137,6 +137,34 @@ function unpackIterationSteps(step, responses, mapOptions) {
|
|
|
137
137
|
action: setData(step.action, data),
|
|
138
138
|
}));
|
|
139
139
|
}
|
|
140
|
+
function getFlowResponse(job, responses) {
|
|
141
|
+
if ((0, is_1.isJobWithFlow)(job)) {
|
|
142
|
+
const lastResponse = getLastJobWithResponse(job.flow, responses);
|
|
143
|
+
return (prependResponseError(lastResponse?.response, `Could not finish job '${job.id}', the following steps failed: `) || { status: 'noaction' });
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
const response = responses[job.id];
|
|
147
|
+
return response?.response;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
const cleanUpResponse = (action) => ({
|
|
151
|
+
...action,
|
|
152
|
+
response: {
|
|
153
|
+
...action.response,
|
|
154
|
+
status: (action.response?.status === 'ok' || !action.response?.status) &&
|
|
155
|
+
action.response?.error
|
|
156
|
+
? 'error'
|
|
157
|
+
: action.response?.status || 'ok',
|
|
158
|
+
...(action.response?.error && {
|
|
159
|
+
error: Array.isArray(action.response.error)
|
|
160
|
+
? action.response.error.join(' | ')
|
|
161
|
+
: action.response.error,
|
|
162
|
+
}),
|
|
163
|
+
},
|
|
164
|
+
});
|
|
165
|
+
function mutateResponse(action, job, responses, mapOptions) {
|
|
166
|
+
return cleanUpResponse(mutateAction(action, job.responseMutation, { ...responses, action }, mapOptions));
|
|
167
|
+
}
|
|
140
168
|
async function runFlow(job, prevResponses, dispatch, mapOptions, meta) {
|
|
141
169
|
const { id: parentId, mutation } = job;
|
|
142
170
|
if ((0, is_1.isJobWithFlow)(job)) {
|
|
@@ -178,34 +206,6 @@ async function runFlow(job, prevResponses, dispatch, mapOptions, meta) {
|
|
|
178
206
|
}
|
|
179
207
|
return {};
|
|
180
208
|
}
|
|
181
|
-
function getFlowResponse(job, responses) {
|
|
182
|
-
if ((0, is_1.isJobWithFlow)(job)) {
|
|
183
|
-
const lastResponse = getLastJobWithResponse(job.flow, responses);
|
|
184
|
-
return (prependResponseError(lastResponse?.response, `Could not finish job '${job.id}', the following steps failed: `) || { status: 'noaction' });
|
|
185
|
-
}
|
|
186
|
-
else {
|
|
187
|
-
const response = responses[job.id];
|
|
188
|
-
return response?.response;
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
const cleanUpResponse = (action) => ({
|
|
192
|
-
...action,
|
|
193
|
-
response: {
|
|
194
|
-
...action.response,
|
|
195
|
-
status: (action.response?.status === 'ok' || !action.response?.status) &&
|
|
196
|
-
action.response?.error
|
|
197
|
-
? 'error'
|
|
198
|
-
: action.response?.status || 'ok',
|
|
199
|
-
...(action.response?.error && {
|
|
200
|
-
error: Array.isArray(action.response.error)
|
|
201
|
-
? action.response.error.join(' | ')
|
|
202
|
-
: action.response.error,
|
|
203
|
-
}),
|
|
204
|
-
},
|
|
205
|
-
});
|
|
206
|
-
function mutateResponse(action, job, responses, mapOptions) {
|
|
207
|
-
return cleanUpResponse(mutateAction(action, job.responseMutation, { ...responses, action }, mapOptions));
|
|
208
|
-
}
|
|
209
209
|
exports.default = (jobs, mapOptions) => async function run(action, { dispatch }) {
|
|
210
210
|
const { payload: { jobId }, meta, } = action;
|
|
211
211
|
const job = typeof jobId === 'string' ? jobs[jobId] : undefined;
|
|
@@ -214,9 +214,12 @@ exports.default = (jobs, mapOptions) => async function run(action, { dispatch })
|
|
|
214
214
|
}
|
|
215
215
|
const prevResponses = { action };
|
|
216
216
|
const responses = await runFlow(job, prevResponses, dispatch, mapOptions, meta);
|
|
217
|
-
|
|
217
|
+
const responseAction = {
|
|
218
218
|
...action,
|
|
219
219
|
response: getFlowResponse(job, responses),
|
|
220
|
-
}
|
|
220
|
+
};
|
|
221
|
+
return (0, is_1.isJobWithAction)(job)
|
|
222
|
+
? cleanUpResponse(responseAction)
|
|
223
|
+
: mutateResponse(responseAction, job, responses, mapOptions);
|
|
221
224
|
};
|
|
222
225
|
//# 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":";;AACA,iDAAgE;AAChE,kCAAkC;AAclC,sDAA0D;AAC1D,oCAOoB;AACpB,0CAA4C;AAC5C,8DAAsD;AAQtD,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,IAAW,EAAE,EAAE,CAAC,CAAC;IACtD,GAAG,MAAM;IACT,IAAI,EAAE;QACJ,GAAG,IAAI;QACP,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9D;CACF,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,CAAC,QAAmB,EAAE,EAAE,CAC3C,OAAO,QAAQ,EAAE,MAAM,KAAK,QAAQ;IACpC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAE9C,MAAM,SAAS,GAAG,CAAC,QAA+B,EAAE,EAAE,CACpD,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;AAGhE,SAAS,YAAY,CACnB,MAA4C,EAC5C,QAAyC,EACzC,SAAiC,EACjC,UAAsB;IAEtB,IAAI,QAAQ,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,EAAE;QAChC,MAAM,uBAAuB,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACrD,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,CAAC,CAAC,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "transformers", { enumerable: true, get: function
|
|
|
15
15
|
var middleware_1 = require("./middleware");
|
|
16
16
|
Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return middleware_1.default; } });
|
|
17
17
|
exports.default = {
|
|
18
|
-
version: '0.8.0-beta.
|
|
18
|
+
version: '0.8.0-beta.11',
|
|
19
19
|
create: create_1.default,
|
|
20
20
|
mergeDefinitions: mergeDefinitions_1.default,
|
|
21
21
|
mergeResources: mergeResources_1.default,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B,+DAAuD;AACvD,2DAAmD;AAyBnD,qDAA8D;AAArD,4GAAA,OAAO,OAAgB;AAEhC,mDAA4D;AAAnD,gHAAA,OAAO,OAAkB;AAClC,yCAAkD;AAAzC,sGAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,4GAAA,OAAO,OAAgB;AAChC,2CAAoD;AAA3C,wGAAA,OAAO,OAAc;AAE9B,kBAAe;IACb,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B,+DAAuD;AACvD,2DAAmD;AAyBnD,qDAA8D;AAArD,4GAAA,OAAO,OAAgB;AAEhC,mDAA4D;AAAnD,gHAAA,OAAO,OAAkB;AAClC,yCAAkD;AAAzC,sGAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,4GAAA,OAAO,OAAgB;AAChC,2CAAoD;AAA3C,wGAAA,OAAO,OAAc;AAE9B,kBAAe;IACb,OAAO,EAAE,eAAe;IACxB,MAAM,EAAN,gBAAM;IACN,gBAAgB,EAAhB,0BAAgB;IAChB,cAAc,EAAd,wBAAc;CACf,CAAA"}
|
|
@@ -28,6 +28,13 @@ const extractType = (type) => hasArrayNotation(type)
|
|
|
28
28
|
? [type.slice(0, type.length - 2), true]
|
|
29
29
|
: [type, false];
|
|
30
30
|
const appendBrackets = (field) => `${field}[]`;
|
|
31
|
+
const isRef = (type) => (value) => {
|
|
32
|
+
if (!(0, is_1.isObject)(value)) {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
const noOfKeys = Object.keys(value).length;
|
|
36
|
+
return (!!value.id && (noOfKeys === 1 || (noOfKeys === 2 && value.$ref === type)));
|
|
37
|
+
};
|
|
31
38
|
const transformFromType = (type) => {
|
|
32
39
|
if (primitiveTypes.includes(type)) {
|
|
33
40
|
return { $transform: type };
|
|
@@ -39,7 +46,7 @@ const transformFromType = (type) => {
|
|
|
39
46
|
return undefined;
|
|
40
47
|
}
|
|
41
48
|
else {
|
|
42
|
-
return { $transform: 'reference', type };
|
|
49
|
+
return (0, map_transform_1.iterate)((0, map_transform_1.ifelse)(isRef(type), { $transform: 'reference', type }, (0, map_transform_1.apply)(`cast_${type}`)));
|
|
43
50
|
}
|
|
44
51
|
};
|
|
45
52
|
const mappingFromSchema = (schema, iterate = false) => Object.entries(schema).reduce((mapping, [field, prop]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCastMapping.js","sourceRoot":"","sources":["../../src/schema/createCastMapping.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"createCastMapping.js","sourceRoot":"","sources":["../../src/schema/createCastMapping.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "0.8.0-beta.
|
|
3
|
+
"version": "0.8.0-beta.12",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"later": "^1.2.0",
|
|
46
46
|
"luxon": "^3.1.0",
|
|
47
47
|
"map-any": "^0.2.1",
|
|
48
|
-
"map-transform": "0.4.0-beta.
|
|
48
|
+
"map-transform": "0.4.0-beta.2",
|
|
49
49
|
"ms": "^2.1.3",
|
|
50
50
|
"nanoid": "^3.3.4",
|
|
51
51
|
"p-limit": "^3.1.0",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@integreat/ts-dev-setup": "^2.3.1",
|
|
58
58
|
"@types/sinon": "^10.0.13",
|
|
59
|
-
"integreat-transporter-http": "0.1.0-beta.
|
|
59
|
+
"integreat-transporter-http": "0.1.0-beta.1",
|
|
60
60
|
"nock": "^13.2.9",
|
|
61
61
|
"sinon": "^14.0.2"
|
|
62
62
|
}
|