integreat 0.8.0-beta.0 → 0.8.0-beta.10
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/get.js +1 -2
- package/dist/handlers/get.js.map +1 -1
- package/dist/handlers/run.js +87 -24
- package/dist/handlers/run.js.map +1 -1
- package/dist/handlers/set.js +2 -2
- package/dist/handlers/set.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/service/endpoints/match.js +2 -4
- package/dist/service/endpoints/match.js.map +1 -1
- package/dist/service/endpoints/types.d.ts +2 -2
- package/dist/service/index.js +1 -1
- package/dist/service/index.js.map +1 -1
- package/dist/types.d.ts +11 -2
- package/dist/utils/validateFilters.d.ts +2 -2
- package/dist/utils/validateFilters.js +36 -7
- package/dist/utils/validateFilters.js.map +1 -1
- package/package.json +5 -5
package/dist/handlers/get.js
CHANGED
|
@@ -6,7 +6,6 @@ const pLimit = require("p-limit");
|
|
|
6
6
|
const createError_1 = require("../utils/createError");
|
|
7
7
|
const createUnknownServiceError_1 = require("../utils/createUnknownServiceError");
|
|
8
8
|
const debug = debugLib('great');
|
|
9
|
-
const limit = pLimit(1);
|
|
10
9
|
const isErrorAction = (action) => action.response?.status !== 'ok' && action.response?.status !== 'notfound';
|
|
11
10
|
const getIdFromAction = ({ payload: { id } }) => Array.isArray(id) && id.length === 1 ? id[0] : id;
|
|
12
11
|
const combineActions = (action, actions) => actions.some(isErrorAction)
|
|
@@ -33,7 +32,7 @@ async function runAsIndividualActions(action, service, mapPerId) {
|
|
|
33
32
|
if (!endpoint) {
|
|
34
33
|
return createNoEndpointError(action, service.id);
|
|
35
34
|
}
|
|
36
|
-
return combineActions(action, await Promise.all(actions.map((action) =>
|
|
35
|
+
return combineActions(action, await Promise.all(actions.map((action) => pLimit(1)(() => mapPerId(endpoint)(action)))));
|
|
37
36
|
}
|
|
38
37
|
const doRunIndividualIds = (action, endpoint) => Array.isArray(action.payload.id) &&
|
|
39
38
|
action.meta?.authorized &&
|
package/dist/handlers/get.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/handlers/get.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,gCAAgC;AAChC,kCAAkC;AAClC,sDAA0D;AAC1D,kFAA0E;AAK1E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/handlers/get.ts"],"names":[],"mappings":"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"}
|
package/dist/handlers/run.js
CHANGED
|
@@ -1,19 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const map_transform_1 = require("map-transform");
|
|
4
|
+
const pLimit = require("p-limit");
|
|
4
5
|
const createError_1 = require("../utils/createError");
|
|
5
6
|
const is_1 = require("../utils/is");
|
|
7
|
+
const array_1 = require("../utils/array");
|
|
6
8
|
const validateFilters_1 = require("../utils/validateFilters");
|
|
7
9
|
const prepareAction = (action, meta) => ({
|
|
8
10
|
...action,
|
|
9
|
-
meta
|
|
11
|
+
meta: {
|
|
12
|
+
...meta,
|
|
13
|
+
...(action.meta?.queue ?? meta?.queue ? { queue: true } : {}),
|
|
14
|
+
},
|
|
10
15
|
});
|
|
11
16
|
const isOkResponse = (response) => typeof response?.status === 'string' &&
|
|
12
17
|
['ok', 'noaction'].includes(response.status);
|
|
18
|
+
const addModify = (mutation) => (0, is_1.isObject)(mutation) ? { $modify: true, ...mutation } : mutation;
|
|
13
19
|
function mutateAction(action, mutation, responses, mapOptions) {
|
|
14
20
|
if (mutation && (0, is_1.isAction)(action)) {
|
|
15
21
|
const mutationIncludingAction = Array.isArray(mutation)
|
|
16
|
-
? ['$action', ...mutation]
|
|
22
|
+
? ['$action', ...mutation.map(addModify)]
|
|
17
23
|
: { '.': '$action', ...mutation };
|
|
18
24
|
const responsesIncludingAction = { ...responses, $action: action };
|
|
19
25
|
return (0, map_transform_1.mapTransform)(mutationIncludingAction, mapOptions)(responsesIncludingAction);
|
|
@@ -31,20 +37,26 @@ async function runAction(action, dispatch, meta) {
|
|
|
31
37
|
const prependResponseError = (response, message) => response?.error
|
|
32
38
|
? { ...response, error: `${message}${response.error}` }
|
|
33
39
|
: response;
|
|
34
|
-
const errorMessageFromResponses = (
|
|
35
|
-
.map((index) =>
|
|
40
|
+
const errorMessageFromResponses = (responses, ids) => responses
|
|
41
|
+
.map((response, index) => response.response?.error
|
|
42
|
+
? `'${ids[index]}' (${response.response?.status}: ${response.response?.error})`
|
|
43
|
+
: undefined)
|
|
44
|
+
.filter(Boolean)
|
|
36
45
|
.join(', ');
|
|
37
46
|
function responseFromResponses(responses, ids) {
|
|
38
47
|
const errorIndices = responses
|
|
39
48
|
.map((response, index) => isOkResponse(response?.response) ? undefined : index)
|
|
40
49
|
.filter((index) => index !== undefined);
|
|
50
|
+
const message = errorMessageFromResponses(responses, ids);
|
|
41
51
|
return {
|
|
42
52
|
response: errorIndices.length > 0
|
|
43
53
|
? {
|
|
44
54
|
status: 'error',
|
|
45
|
-
error:
|
|
55
|
+
error: message,
|
|
46
56
|
}
|
|
47
|
-
:
|
|
57
|
+
: message
|
|
58
|
+
? { status: 'ok', warning: `Message from steps: ${message}` }
|
|
59
|
+
: { status: 'ok' },
|
|
48
60
|
};
|
|
49
61
|
}
|
|
50
62
|
function getLastJobWithResponse(flow, responses) {
|
|
@@ -73,49 +85,95 @@ function isStepOk(steps, responses) {
|
|
|
73
85
|
return isOkResponse(responses[steps.id]?.response);
|
|
74
86
|
}
|
|
75
87
|
}
|
|
88
|
+
const messageFromValidationErrors = (vals) => vals
|
|
89
|
+
.map((val) => val.message)
|
|
90
|
+
.filter(Boolean)
|
|
91
|
+
.join(' | ');
|
|
92
|
+
function statusFromValidationErrors(vals) {
|
|
93
|
+
const statuses = vals.map((val) => val.status).filter(Boolean);
|
|
94
|
+
if (statuses.length === 0) {
|
|
95
|
+
return undefined;
|
|
96
|
+
}
|
|
97
|
+
return statuses[0];
|
|
98
|
+
}
|
|
76
99
|
async function runStep(step, responses, newResponses, dispatch, mapOptions, meta, prevStep) {
|
|
77
|
-
let response;
|
|
78
100
|
if (step.conditions) {
|
|
79
|
-
|
|
80
|
-
|
|
101
|
+
const validationErrors = (0, validateFilters_1.default)(step.conditions, true)(responses);
|
|
102
|
+
if (validationErrors.length > 0) {
|
|
103
|
+
const response = setStepError(step.id, messageFromValidationErrors(validationErrors), statusFromValidationErrors(validationErrors));
|
|
104
|
+
setResponses(response, newResponses);
|
|
105
|
+
return validationErrors.some((val) => val.break);
|
|
81
106
|
}
|
|
82
107
|
}
|
|
83
108
|
else if (prevStep) {
|
|
84
109
|
if (!isStepOk(prevStep, responses)) {
|
|
85
|
-
|
|
110
|
+
return false;
|
|
86
111
|
}
|
|
87
112
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
113
|
+
let response;
|
|
114
|
+
try {
|
|
115
|
+
response = await runFlow(step, responses, dispatch, mapOptions, meta);
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
response = setStepError(step.id, error instanceof Error ? error.message : String(error), 'rejected');
|
|
95
119
|
}
|
|
96
120
|
setResponses(response, newResponses);
|
|
97
|
-
return
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
const isJobWithIteratePath = (step) => (0, is_1.isJobStep)(step) && typeof step.iteratePath === 'string';
|
|
124
|
+
const setData = (action, data) => ({
|
|
125
|
+
...action,
|
|
126
|
+
payload: { ...action.payload, data },
|
|
127
|
+
});
|
|
128
|
+
function unpackIterationSteps(step, responses, mapOptions) {
|
|
129
|
+
if (!isJobWithIteratePath(step)) {
|
|
130
|
+
return step;
|
|
131
|
+
}
|
|
132
|
+
const getter = (0, map_transform_1.mapTransform)(step.iteratePath, mapOptions);
|
|
133
|
+
const items = (0, array_1.ensureArray)(getter(responses));
|
|
134
|
+
return items.map((data, index) => ({
|
|
135
|
+
...step,
|
|
136
|
+
id: `${step.id}_${index}`,
|
|
137
|
+
action: setData(step.action, data),
|
|
138
|
+
}));
|
|
98
139
|
}
|
|
99
140
|
async function runFlow(job, prevResponses, dispatch, mapOptions, meta) {
|
|
100
141
|
const { id: parentId, mutation } = job;
|
|
101
142
|
if ((0, is_1.isJobWithFlow)(job)) {
|
|
102
143
|
const flow = job.flow;
|
|
103
144
|
const newResponses = {};
|
|
104
|
-
for (const [index,
|
|
145
|
+
for (const [index, rawStep] of flow.entries()) {
|
|
105
146
|
const responses = { ...prevResponses, ...newResponses };
|
|
106
147
|
const prevStep = index > 0 ? flow[index - 1] : undefined;
|
|
148
|
+
const step = unpackIterationSteps(rawStep, responses, mapOptions);
|
|
107
149
|
if ((0, is_1.isJobStep)(step)) {
|
|
108
|
-
await runStep(step, responses, newResponses, dispatch, mapOptions, meta, prevStep);
|
|
150
|
+
const doBreak = await runStep(step, responses, newResponses, dispatch, mapOptions, meta, prevStep);
|
|
151
|
+
if (doBreak) {
|
|
152
|
+
return newResponses;
|
|
153
|
+
}
|
|
109
154
|
}
|
|
110
155
|
else if (Array.isArray(step)) {
|
|
111
|
-
|
|
156
|
+
const arrayResponses = {};
|
|
157
|
+
const doBreak = await Promise.all(step.map((step) => pLimit(1)(() => runStep(step, responses, arrayResponses, dispatch, mapOptions, meta, prevStep))));
|
|
158
|
+
setResponses(arrayResponses, newResponses);
|
|
159
|
+
if (doBreak.includes(true)) {
|
|
160
|
+
return newResponses;
|
|
161
|
+
}
|
|
162
|
+
if ((0, is_1.isObject)(rawStep) && typeof rawStep.id === 'string') {
|
|
163
|
+
const data = Object.values(arrayResponses).map((response) => response.response?.data);
|
|
164
|
+
newResponses[rawStep.id] = {
|
|
165
|
+
response: { status: 'ok', data },
|
|
166
|
+
};
|
|
167
|
+
}
|
|
112
168
|
}
|
|
113
169
|
}
|
|
114
170
|
return newResponses;
|
|
115
171
|
}
|
|
116
172
|
else if ((0, is_1.isJobWithAction)(job) && parentId) {
|
|
173
|
+
const action = mutateAction(job.action, mutation, prevResponses, mapOptions);
|
|
174
|
+
const response = await runAction(action, dispatch, meta);
|
|
117
175
|
return {
|
|
118
|
-
[parentId]:
|
|
176
|
+
[parentId]: mutateResponse({ ...action, response: response.response }, job, prevResponses, mapOptions),
|
|
119
177
|
};
|
|
120
178
|
}
|
|
121
179
|
return {};
|
|
@@ -145,6 +203,9 @@ const cleanUpResponse = (action) => ({
|
|
|
145
203
|
}),
|
|
146
204
|
},
|
|
147
205
|
});
|
|
206
|
+
function mutateResponse(action, job, responses, mapOptions) {
|
|
207
|
+
return cleanUpResponse(mutateAction(action, job.responseMutation, { ...responses, action }, mapOptions));
|
|
208
|
+
}
|
|
148
209
|
exports.default = (jobs, mapOptions) => async function run(action, { dispatch }) {
|
|
149
210
|
const { payload: { jobId }, meta, } = action;
|
|
150
211
|
const job = typeof jobId === 'string' ? jobs[jobId] : undefined;
|
|
@@ -153,7 +214,9 @@ exports.default = (jobs, mapOptions) => async function run(action, { dispatch })
|
|
|
153
214
|
}
|
|
154
215
|
const prevResponses = { action };
|
|
155
216
|
const responses = await runFlow(job, prevResponses, dispatch, mapOptions, meta);
|
|
156
|
-
|
|
157
|
-
|
|
217
|
+
return mutateResponse({
|
|
218
|
+
...action,
|
|
219
|
+
response: getFlowResponse(job, responses),
|
|
220
|
+
}, job, responses, mapOptions);
|
|
158
221
|
};
|
|
159
222
|
//# 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;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/handlers/run.ts"],"names":[],"mappings":"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"}
|
package/dist/handlers/set.js
CHANGED
|
@@ -7,7 +7,7 @@ const createUnknownServiceError_1 = require("../utils/createUnknownServiceError"
|
|
|
7
7
|
const is_1 = require("../utils/is");
|
|
8
8
|
const debug = debugLib('great');
|
|
9
9
|
const extractType = (action, data) => action.payload.type || ((0, is_1.isTypedData)(data) && data.$type) || undefined;
|
|
10
|
-
const extractId = (data) => ((0, is_1.isTypedData)(data) && data.id) || undefined;
|
|
10
|
+
const extractId = (action, data) => action.payload.id || ((0, is_1.isTypedData)(data) && data.id) || undefined;
|
|
11
11
|
const setIdAndTypeOnAction = (action, id, type) => ({
|
|
12
12
|
...action,
|
|
13
13
|
payload: { ...action.payload, id, type },
|
|
@@ -15,7 +15,7 @@ const setIdAndTypeOnAction = (action, id, type) => ({
|
|
|
15
15
|
async function set(action, { getService }) {
|
|
16
16
|
const { data, targetService: serviceId, endpoint: endpointId, } = action.payload;
|
|
17
17
|
const type = extractType(action, data);
|
|
18
|
-
const id = extractId(data);
|
|
18
|
+
const id = extractId(action, data);
|
|
19
19
|
const service = getService(type, serviceId);
|
|
20
20
|
if (!service) {
|
|
21
21
|
return (0, createUnknownServiceError_1.default)(action, type, serviceId, 'SET');
|
package/dist/handlers/set.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../src/handlers/set.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,gCAAgC;AAChC,sDAA0D;AAC1D,kFAA0E;AAC1E,oCAAyC;AAGzC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAE/B,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,IAAc,EAAE,EAAE,CACrD,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAW,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAA;AAEvE,MAAM,SAAS,GAAG,CAAC,IAAc,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../src/handlers/set.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,gCAAgC;AAChC,sDAA0D;AAC1D,kFAA0E;AAC1E,oCAAyC;AAGzC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAE/B,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,IAAc,EAAE,EAAE,CACrD,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAW,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAA;AAEvE,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,IAAc,EAAE,EAAE,CACnD,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAA,gBAAW,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,SAAS,CAAA;AAElE,MAAM,oBAAoB,GAAG,CAC3B,MAAc,EACd,EAAsB,EACtB,IAAwB,EACxB,EAAE,CAAC,CAAC;IACJ,GAAG,MAAM;IACT,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE;CACzC,CAAC,CAAA;AAKa,KAAK,UAAU,GAAG,CAC/B,MAAc,EACd,EAAE,UAAU,EAA0B;IAEtC,MAAM,EACJ,IAAI,EACJ,aAAa,EAAE,SAAS,EACxB,QAAQ,EAAE,UAAU,GACrB,GAAG,MAAM,CAAC,OAAO,CAAA;IAElB,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACtC,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAElC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAC3C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAA,mCAAyB,EAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;KACjE;IAED,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,gBAAgB,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IACrE,KAAK,CAAC,4BAA4B,EAAE,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IAE9D,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;IACvD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,IAAA,iCAAmB,EACxB,MAAM,EACN,wBAAwB,MAAM,CAAC,IAAI,wBAAwB,SAAS,IAAI,EACxE,UAAU,CACX,CAAA;KACF;IAED,OAAO,KAAK,CACV,OAAO,CAAC,eAAe,EACvB,CAAC,MAAc,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EACxD,OAAO,CAAC,IAAI,EACZ,CAAC,MAAc,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC1D,CAAC,UAAU,CAAC,CAAA;AACf,CAAC;AArCD,sBAqCC"}
|
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.9',
|
|
19
19
|
create: create_1.default,
|
|
20
20
|
mergeDefinitions: mergeDefinitions_1.default,
|
|
21
21
|
mergeResources: mergeResources_1.default,
|
|
@@ -19,16 +19,14 @@ const matchParams = ({ match: { params } = {} }, { payload }) => typeof params !
|
|
|
19
19
|
const matchIncoming = ({ match: { incoming: incomingEndpoint } = {} }, isIncoming) => incomingEndpoint === undefined || incomingEndpoint === isIncoming;
|
|
20
20
|
function isMatch(endpoint) {
|
|
21
21
|
const match = endpoint.match || {};
|
|
22
|
-
const matchFilters = match.filters
|
|
23
|
-
? (0, validateFilters_1.default)(match.filters)
|
|
24
|
-
: () => true;
|
|
22
|
+
const matchFilters = match.filters ? (0, validateFilters_1.default)(match.filters) : () => [];
|
|
25
23
|
return (action, isIncoming = false) => matchId(endpoint, action) &&
|
|
26
24
|
matchType(endpoint, action) &&
|
|
27
25
|
matchScope(endpoint, action) &&
|
|
28
26
|
matchAction(endpoint, action) &&
|
|
29
27
|
matchParams(endpoint, action) &&
|
|
30
28
|
matchIncoming(endpoint, isIncoming) &&
|
|
31
|
-
matchFilters(action);
|
|
29
|
+
matchFilters(action).length === 0;
|
|
32
30
|
}
|
|
33
31
|
exports.default = isMatch;
|
|
34
32
|
//# sourceMappingURL=match.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../src/service/endpoints/match.ts"],"names":[],"mappings":";;AAAA,iEAAyD;AAGzD,6CAAiD;AAEjD,MAAM,UAAU,GAAG,CAAC,KAAyB,EAAE,KAAyB,EAAE,EAAE,CAC1E,IAAA,qBAAa,EAAC,KAAK,EAAE,KAAK,CAAC,CAAA;AAE7B,MAAM,QAAQ,GAAG,CAAC,MAA0B,EAAE,GAAW,EAAE,EAAE,CAC3D,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,CAAA;AAErC,MAAM,OAAO,GAAG,CACd,QAAqB,EACrB,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,EAAU,EAClD,EAAE,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,KAAK,UAAU,CAAA;AAE9C,MAAM,SAAS,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAe,EAAE,EAAE,OAAO,EAAU,EAAE,EAAE,CACrE,CAAC,KAAK,CAAC,IAAI,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;AAErD,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAe,EAAE,EAAE,OAAO,EAAU,EAAE,EAAE,CACtE,CAAC,KAAK,CAAC,KAAK;IACZ,UAAU,CACR,KAAK,CAAC,KAAK,EACX,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,QAAQ;QACZ,CAAC,CAAC,YAAY,CACjB,CAAA;AAEH,MAAM,WAAW,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAe,EAAE,EAAE,IAAI,EAAU,EAAE,EAAE,CACpE,CAAC,KAAK,CAAC,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAEjD,MAAM,WAAW,GAAG,CAClB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAe,EACvC,EAAE,OAAO,EAAU,EACnB,EAAE,CACF,OAAO,MAAM,KAAK,QAAQ;IAC1B,MAAM,KAAK,IAAI;IACf,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAC1B,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAC7D,CAAA;AAEH,MAAM,aAAa,GAAG,CACpB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,EAAe,EAC3D,UAAmB,EACnB,EAAE,CAAC,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,UAAU,CAAA;AAQtE,SAAwB,OAAO,CAC7B,QAAqB;IAErB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAA;IAClC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../src/service/endpoints/match.ts"],"names":[],"mappings":";;AAAA,iEAAyD;AAGzD,6CAAiD;AAEjD,MAAM,UAAU,GAAG,CAAC,KAAyB,EAAE,KAAyB,EAAE,EAAE,CAC1E,IAAA,qBAAa,EAAC,KAAK,EAAE,KAAK,CAAC,CAAA;AAE7B,MAAM,QAAQ,GAAG,CAAC,MAA0B,EAAE,GAAW,EAAE,EAAE,CAC3D,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,CAAA;AAErC,MAAM,OAAO,GAAG,CACd,QAAqB,EACrB,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,EAAU,EAClD,EAAE,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,KAAK,UAAU,CAAA;AAE9C,MAAM,SAAS,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAe,EAAE,EAAE,OAAO,EAAU,EAAE,EAAE,CACrE,CAAC,KAAK,CAAC,IAAI,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;AAErD,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAe,EAAE,EAAE,OAAO,EAAU,EAAE,EAAE,CACtE,CAAC,KAAK,CAAC,KAAK;IACZ,UAAU,CACR,KAAK,CAAC,KAAK,EACX,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,QAAQ;QACZ,CAAC,CAAC,YAAY,CACjB,CAAA;AAEH,MAAM,WAAW,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAe,EAAE,EAAE,IAAI,EAAU,EAAE,EAAE,CACpE,CAAC,KAAK,CAAC,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAEjD,MAAM,WAAW,GAAG,CAClB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAe,EACvC,EAAE,OAAO,EAAU,EACnB,EAAE,CACF,OAAO,MAAM,KAAK,QAAQ;IAC1B,MAAM,KAAK,IAAI;IACf,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAC1B,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAC7D,CAAA;AAEH,MAAM,aAAa,GAAG,CACpB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,EAAe,EAC3D,UAAmB,EACnB,EAAE,CAAC,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,UAAU,CAAA;AAQtE,SAAwB,OAAO,CAC7B,QAAqB;IAErB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAA;IAClC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,yBAAe,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAA;IAE9E,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE,CACpC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC;QACzB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC3B,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC5B,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC7B,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC7B,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC;QACnC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAA;AACrC,CAAC;AAdD,0BAcC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { MapDefinition } from 'map-transform';
|
|
2
|
-
import { Action,
|
|
2
|
+
import { Action, Condition } from '../../types';
|
|
3
3
|
export declare type EndpointOptions = Record<string, unknown>;
|
|
4
4
|
export interface MatchObject {
|
|
5
5
|
action?: string | string[];
|
|
6
6
|
type?: string | string[];
|
|
7
7
|
scope?: string | string[];
|
|
8
8
|
params?: Record<string, boolean | undefined>;
|
|
9
|
-
filters?: Record<string,
|
|
9
|
+
filters?: Record<string, Condition | boolean | undefined>;
|
|
10
10
|
incoming?: boolean;
|
|
11
11
|
}
|
|
12
12
|
export interface EndpointDef {
|
package/dist/service/index.js
CHANGED
|
@@ -63,7 +63,7 @@ exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware =
|
|
|
63
63
|
throw new TypeError(`Can't create service without an id.`);
|
|
64
64
|
}
|
|
65
65
|
const transporter = (0, indexUtils_1.lookupById)(transporterId, transporters);
|
|
66
|
-
mapOptions = { noneValues: [undefined, null], ...mapOptions };
|
|
66
|
+
mapOptions = { noneValues: [undefined, null, ''], ...mapOptions };
|
|
67
67
|
const authorization = typeof auth === 'string' ? (0, indexUtils_1.lookupById)(auth, auths) : undefined;
|
|
68
68
|
const requireAuth = !!auth;
|
|
69
69
|
const authorizeDataFromService = authorizeData.fromService(schemas);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { MapObject, MapPipe } from 'map-transform';
|
|
|
3
3
|
import { EndpointOptions } from './service/endpoints/types';
|
|
4
4
|
import { IdentConfig } from './service/types';
|
|
5
5
|
import { Service } from './service/types';
|
|
6
|
-
export declare type JsonSchema = Record<string, unknown> | boolean;
|
|
7
6
|
export interface Reference {
|
|
8
7
|
id: string | null;
|
|
9
8
|
$ref: string;
|
|
@@ -32,9 +31,17 @@ export declare type ScheduleObject = {
|
|
|
32
31
|
wm?: number[];
|
|
33
32
|
wy?: number[];
|
|
34
33
|
};
|
|
34
|
+
export interface ConditionFailObject extends Record<string, unknown> {
|
|
35
|
+
message?: string;
|
|
36
|
+
status?: string;
|
|
37
|
+
break?: boolean;
|
|
38
|
+
}
|
|
39
|
+
export interface Condition extends Record<string, unknown> {
|
|
40
|
+
onFail?: ConditionFailObject | string;
|
|
41
|
+
}
|
|
35
42
|
interface JobFields {
|
|
36
43
|
id: string;
|
|
37
|
-
conditions?: Record<string,
|
|
44
|
+
conditions?: Record<string, Condition | undefined>;
|
|
38
45
|
mutation?: MapObject | MapPipe;
|
|
39
46
|
}
|
|
40
47
|
export interface JobWithFlow extends JobFields {
|
|
@@ -42,6 +49,8 @@ export interface JobWithFlow extends JobFields {
|
|
|
42
49
|
}
|
|
43
50
|
export interface JobWithAction extends JobFields {
|
|
44
51
|
action: Action;
|
|
52
|
+
iteratePath?: string;
|
|
53
|
+
responseMutation?: MapObject | MapPipe;
|
|
45
54
|
}
|
|
46
55
|
export declare type Job = JobWithAction | JobWithFlow;
|
|
47
56
|
export interface JobDef {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Condition, ConditionFailObject } from '../types';
|
|
2
2
|
export declare type FilterFn = (data: unknown) => boolean;
|
|
3
|
-
export default function validateFilters(filters: Record<string,
|
|
3
|
+
export default function validateFilters(filters: Record<string, Condition | boolean | undefined>, useFriendlyMessages?: boolean): (data: unknown) => ConditionFailObject[];
|
|
@@ -1,16 +1,45 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const util = require("util");
|
|
3
4
|
const map_transform_1 = require("map-transform");
|
|
4
|
-
|
|
5
|
+
const is_1 = require("./is");
|
|
6
|
+
const cleanCondition = ({ onFail, ...filter }) => filter;
|
|
7
|
+
const cleanFilter = (filter) => (0, is_1.isObject)(filter) ? cleanCondition(filter) : filter;
|
|
8
|
+
function prepareFilter(path, filter) {
|
|
9
|
+
if (path === '$or') {
|
|
10
|
+
if ((0, is_1.isObject)(filter)) {
|
|
11
|
+
return validateFilters({ $or: true, ...filter });
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
else if (filter) {
|
|
15
|
+
return (0, map_transform_1.validate)(path, cleanFilter(filter));
|
|
16
|
+
}
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
19
|
+
const prepareMessage = (path, filter, useFriendlyMessages) => !useFriendlyMessages
|
|
20
|
+
? () => path
|
|
21
|
+
: (0, is_1.isObject)(filter)
|
|
22
|
+
? filter.onFail
|
|
23
|
+
? () => typeof filter.onFail === 'string'
|
|
24
|
+
? { message: filter.onFail }
|
|
25
|
+
: filter.onFail
|
|
26
|
+
: () => ({ message: `'${path}' did not pass ${util.inspect(filter)}` })
|
|
27
|
+
: () => ({ message: `'${path}' did not pass its condition` });
|
|
28
|
+
function validateFilters(filters, useFriendlyMessages = false) {
|
|
5
29
|
const filterFns = Object.entries(filters)
|
|
6
|
-
.
|
|
7
|
-
|
|
8
|
-
|
|
30
|
+
.map(([path, filter]) => [
|
|
31
|
+
prepareFilter(path, filter),
|
|
32
|
+
prepareMessage(path, filter, useFriendlyMessages),
|
|
33
|
+
])
|
|
34
|
+
.filter(([filter]) => !!filter);
|
|
9
35
|
const isOrFilters = filters.$or === true;
|
|
10
36
|
return function validate(data) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
37
|
+
const failObjects = filterFns
|
|
38
|
+
.map(([filter, getMessage]) => (filter(data) ? undefined : getMessage()))
|
|
39
|
+
.filter(Boolean);
|
|
40
|
+
return isOrFilters && failObjects.length < filterFns.length
|
|
41
|
+
? []
|
|
42
|
+
: failObjects;
|
|
14
43
|
};
|
|
15
44
|
}
|
|
16
45
|
exports.default = validateFilters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateFilters.js","sourceRoot":"","sources":["../../src/utils/validateFilters.ts"],"names":[],"mappings":";;AAAA,iDAAwC;
|
|
1
|
+
{"version":3,"file":"validateFilters.js","sourceRoot":"","sources":["../../src/utils/validateFilters.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,iDAAwC;AAExC,6BAA+B;AAM/B,MAAM,cAAc,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAa,EAAE,EAAE,CAAC,MAAM,CAAA;AACnE,MAAM,WAAW,GAAG,CAAC,MAA2B,EAAE,EAAE,CAClD,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;AAEpD,SAAS,aAAa,CACpB,IAAY,EACZ,MAA0C;IAE1C,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,EAAE;YACpB,OAAO,eAAe,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;SACjD;KACF;SAAM,IAAI,MAAM,EAAE;QACjB,OAAO,IAAA,wBAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;KAC3C;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,cAAc,GAAG,CACrB,IAAY,EACZ,MAAuC,EACvC,mBAA4B,EAC5B,EAAE,CACF,CAAC,mBAAmB;IAClB,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI;IACZ,CAAC,CAAC,IAAA,aAAQ,EAAC,MAAM,CAAC;QAClB,CAAC,CAAC,MAAM,CAAC,MAAM;YACb,CAAC,CAAC,GAAG,EAAE,CACH,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;gBAC/B,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;gBAC5B,CAAC,CAAC,MAAM,CAAC,MAAM;YACrB,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,kBAAkB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACzE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,8BAA8B,EAAE,CAAC,CAAA;AAEjE,SAAwB,eAAe,CACrC,OAAwD,EACxD,mBAAmB,GAAG,KAAK;IAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACtC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;QACvB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC;QAC3B,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,CAAC;KAClD,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAuB,CAAA;IACvD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,KAAK,IAAI,CAAA;IAExC,OAAO,SAAS,QAAQ,CAAC,IAAa;QACpC,MAAM,WAAW,GAAG,SAAS;aAC1B,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;aACxE,MAAM,CAAC,OAAO,CAA0B,CAAA;QAC3C,OAAO,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM;YACzD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,WAAW,CAAA;IACjB,CAAC,CAAA;AACH,CAAC;AApBD,kCAoBC"}
|
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.10",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -37,13 +37,13 @@
|
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@types/debug": "^4.1.7",
|
|
39
39
|
"@types/later": "^1.2.7",
|
|
40
|
-
"@types/luxon": "^3.0
|
|
40
|
+
"@types/luxon": "^3.1.0",
|
|
41
41
|
"@types/nanoid": "^3.0.0",
|
|
42
42
|
"debug": "^4.3.4",
|
|
43
43
|
"dot-prop": "^6.0.1",
|
|
44
44
|
"got": "^11.8.5",
|
|
45
45
|
"later": "^1.2.0",
|
|
46
|
-
"luxon": "^3.0
|
|
46
|
+
"luxon": "^3.1.0",
|
|
47
47
|
"map-any": "^0.2.1",
|
|
48
48
|
"map-transform": "0.4.0-beta.0",
|
|
49
49
|
"ms": "^2.1.3",
|
|
@@ -56,8 +56,8 @@
|
|
|
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-
|
|
59
|
+
"integreat-transporter-http": "0.1.0-beta.0",
|
|
60
60
|
"nock": "^13.2.9",
|
|
61
|
-
"sinon": "^14.0.
|
|
61
|
+
"sinon": "^14.0.2"
|
|
62
62
|
}
|
|
63
63
|
}
|