integreat 0.8.0-alpha.85 → 0.8.0-alpha.88
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/create.d.ts +6 -3
- package/dist/create.js +9 -3
- package/dist/create.js.map +1 -1
- package/dist/handlers/index.js +2 -0
- package/dist/handlers/index.js.map +1 -1
- package/dist/handlers/run.d.ts +6 -0
- package/dist/handlers/run.js +97 -0
- package/dist/handlers/run.js.map +1 -0
- package/dist/index.js +1 -1
- package/dist/schema/index.d.ts +1 -1
- package/dist/schema/index.js +2 -2
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/types.d.ts +1 -0
- package/dist/service/Connection.d.ts +1 -1
- package/dist/service/Connection.js +6 -4
- package/dist/service/Connection.js.map +1 -1
- package/dist/service/index.d.ts +2 -1
- package/dist/service/index.js +2 -2
- package/dist/service/index.js.map +1 -1
- package/dist/types.d.ts +12 -3
- package/dist/utils/createSchedule.d.ts +2 -2
- package/dist/utils/createSchedule.js +7 -2
- package/dist/utils/createSchedule.js.map +1 -1
- package/dist/utils/mergeDefinitions.js +2 -2
- package/dist/utils/mergeDefinitions.js.map +1 -1
- package/package.json +4 -4
package/dist/create.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import EventEmitter = require('node:events');
|
|
1
3
|
import { Dictionaries, CustomFunction, MapDefinition } from 'map-transform';
|
|
2
|
-
import { Middleware, Transporter, Dispatch,
|
|
4
|
+
import { Middleware, Transporter, Dispatch, JobDef, Action, Response, ActionHandler } from './types';
|
|
3
5
|
import { ServiceDef, IdentConfig, AuthDef, Authenticator, Service } from './service/types';
|
|
4
6
|
import { SchemaDef } from './schema/types';
|
|
5
7
|
import { Schema } from './schema';
|
|
@@ -11,7 +13,7 @@ export interface Definitions {
|
|
|
11
13
|
identConfig?: IdentConfig;
|
|
12
14
|
queueService?: string;
|
|
13
15
|
dictionaries?: Dictionaries;
|
|
14
|
-
|
|
16
|
+
jobs?: JobDef[];
|
|
15
17
|
}
|
|
16
18
|
export interface Resources {
|
|
17
19
|
transporters?: Record<string, Transporter>;
|
|
@@ -28,5 +30,6 @@ export interface Instance<ResponseData = unknown> {
|
|
|
28
30
|
dispatchScheduled: (from: Date, to: Date) => Promise<Action[]>;
|
|
29
31
|
listen: () => Promise<Response>;
|
|
30
32
|
close: () => Promise<Response>;
|
|
33
|
+
on: (eventName: string, listener: (...args: unknown[]) => void) => EventEmitter;
|
|
31
34
|
}
|
|
32
|
-
export default function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths: authDefs, identConfig, queueService, dictionaries,
|
|
35
|
+
export default function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths: authDefs, identConfig, queueService, dictionaries, jobs: jobsDefs, }: Definitions, { transporters, transformers, handlers, authenticators }: Resources, middlewareForDispatch?: Middleware[], middlewareForService?: Middleware[]): Instance;
|
package/dist/create.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const EventEmitter = require("node:events");
|
|
3
4
|
const Auth_1 = require("./service/Auth");
|
|
4
5
|
const handlers_1 = require("./handlers");
|
|
6
|
+
const run_1 = require("./handlers/run");
|
|
5
7
|
const builtIns_1 = require("./transformers/builtIns");
|
|
6
8
|
const schema_1 = require("./schema");
|
|
7
9
|
const service_1 = require("./service");
|
|
@@ -14,10 +16,11 @@ const close_1 = require("./close");
|
|
|
14
16
|
const indexUtils_2 = require("./utils/indexUtils");
|
|
15
17
|
const createSchedule_1 = require("./utils/createSchedule");
|
|
16
18
|
const dispatchScheduled_1 = require("./dispatchScheduled");
|
|
17
|
-
function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths: authDefs, identConfig, queueService, dictionaries,
|
|
19
|
+
function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths: authDefs, identConfig, queueService, dictionaries, jobs: jobsDefs = [], }, { transporters, transformers, handlers, authenticators }, middlewareForDispatch = [], middlewareForService = []) {
|
|
18
20
|
if (!Array.isArray(serviceDefs) || !Array.isArray(schemaDefs)) {
|
|
19
21
|
throw new TypeError('Please provide Integreat with at least services and schemas');
|
|
20
22
|
}
|
|
23
|
+
const emitter = new EventEmitter();
|
|
21
24
|
const schemas = schemaDefs
|
|
22
25
|
.map(schema_1.default)
|
|
23
26
|
.reduce(indexUtils_2.indexById, {});
|
|
@@ -34,16 +37,18 @@ function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths:
|
|
|
34
37
|
schemas,
|
|
35
38
|
mapOptions,
|
|
36
39
|
middleware: middlewareForService,
|
|
40
|
+
emit: emitter.emit.bind(emitter),
|
|
37
41
|
}))
|
|
38
42
|
.reduce(indexUtils_2.indexById, {});
|
|
43
|
+
const jobs = jobsDefs.reduce((jobs, job) => typeof job.id === 'string' ? { ...jobs, [job.id]: job } : jobs, {});
|
|
39
44
|
const dispatch = (0, dispatch_1.default)({
|
|
40
45
|
schemas,
|
|
41
46
|
services,
|
|
42
|
-
handlers: { ...handlers_1.default, ...handlers },
|
|
47
|
+
handlers: { ...handlers_1.default, ...handlers, RUN: (0, run_1.default)(jobs) },
|
|
43
48
|
middleware: middlewareForDispatch,
|
|
44
49
|
options: { identConfig, queueService },
|
|
45
50
|
});
|
|
46
|
-
const scheduled =
|
|
51
|
+
const scheduled = jobsDefs.filter(is_1.isObject).map(createSchedule_1.default);
|
|
47
52
|
const dispatchScheduled = (0, dispatchScheduled_1.default)(dispatch, scheduled);
|
|
48
53
|
return {
|
|
49
54
|
services,
|
|
@@ -54,6 +59,7 @@ function create({ services: serviceDefs, schemas: schemaDefs, mutations, auths:
|
|
|
54
59
|
dispatchScheduled,
|
|
55
60
|
listen: async () => (0, listen_1.default)(Object.values(services), dispatch),
|
|
56
61
|
close: async () => (0, close_1.default)(Object.values(services)),
|
|
62
|
+
on: (eventName, listener) => emitter.on(eventName, listener),
|
|
57
63
|
};
|
|
58
64
|
}
|
|
59
65
|
exports.default = create;
|
package/dist/create.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":";;AAAA,4CAA4C;AAmB5C,yCAAiC;AACjC,yCAAwC;AACxC,wCAAkC;AAClC,sDAAyD;AACzD,qCAA+C;AAC/C,uCAAqC;AACrC,mCAAqC;AACrC,+DAAuD;AACvD,mDAA+C;AAC/C,yCAAuC;AACvC,qCAA6B;AAC7B,mCAA2B;AAC3B,mDAA8C;AAC9C,2DAAmD;AACnD,2DAAyD;AAsCzD,SAAwB,MAAM,CAC5B,EACE,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,UAAU,EACnB,SAAS,EACT,KAAK,EAAE,QAAQ,EACf,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,IAAI,EAAE,QAAQ,GAAG,EAAE,GACP,EACd,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAa,EACnE,wBAAsC,EAAE,EACxC,uBAAqC,EAAE;IAEvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7D,MAAM,IAAI,SAAS,CACjB,6DAA6D,CAC9D,CAAA;KACF;IAGD,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAA;IAGlC,MAAM,OAAO,GAAG,UAAU;SACvB,GAAG,CAAC,gBAAY,CAAC;SACjB,MAAM,CAAC,sBAAS,EAAE,EAA4B,CAAC,CAAA;IAGlD,MAAM,UAAU,GAAG,IAAA,0BAAgB,EACjC,OAAO,EACP,SAAS,EACT,EAAE,GAAG,kBAAmB,EAAE,GAAG,YAAY,EAAE,EAC3C,YAAY,CACb,CAAA;IAGD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACnC,CAAC,CAAC,QAAQ;aACL,GAAG,CACF,CAAC,GAAG,EAAE,EAAE,CACN,IAAI,cAAI,CACN,GAAG,CAAC,EAAE,EACN,IAAA,uBAAU,EAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,EAC7C,GAAG,CAAC,OAAO,CACZ,CACJ;aACA,MAAM,CAAC,sBAAS,EAAE,EAA0B,CAAC;QAClD,CAAC,CAAC,SAAS,CAAA;IAGb,MAAM,QAAQ,GAAG,WAAW;SACzB,GAAG,CACF,IAAA,iBAAa,EAAC;QACZ,YAAY;QACZ,KAAK;QACL,OAAO;QACP,UAAU;QACV,UAAU,EAAE,oBAAoB;QAChC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;KACjC,CAAC,CACH;SACA,MAAM,CAAC,sBAAS,EAAE,EAA6B,CAAC,CAAA;IAGnD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAC1B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CACZ,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAChE,EAAE,CACH,CAAA;IAGD,MAAM,QAAQ,GAAG,IAAA,kBAAc,EAAC;QAC9B,OAAO;QACP,QAAQ;QACR,QAAQ,EAAE,EAAE,GAAG,kBAAe,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QAC/D,UAAU,EAAE,qBAAqB;QACjC,OAAO,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE;KACvC,CAAC,CAAA;IAGF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAQ,CAAC,CAAC,GAAG,CAAC,wBAAc,CAAC,CAAA;IAC/D,MAAM,iBAAiB,GAAG,IAAA,2BAAuB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAGtE,OAAO;QACL,QAAQ;QACR,OAAO;QACP,SAAS,EAAE,WAAW,EAAE,IAAI;QAC5B,YAAY;QACZ,QAAQ;QACR,iBAAiB;QACjB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,gBAAM,EAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAC7D,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,eAAK,EAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;KAC7D,CAAA;AACH,CAAC;AAjGD,yBAiGC"}
|
package/dist/handlers/index.js
CHANGED
|
@@ -4,6 +4,7 @@ const get_1 = require("./get");
|
|
|
4
4
|
const getAll_1 = require("./getAll");
|
|
5
5
|
const getMeta_1 = require("./getMeta");
|
|
6
6
|
const getIdent_1 = require("./getIdent");
|
|
7
|
+
const run_1 = require("./run");
|
|
7
8
|
const set_1 = require("./set");
|
|
8
9
|
const setMeta_1 = require("./setMeta");
|
|
9
10
|
const delete_1 = require("./delete");
|
|
@@ -16,6 +17,7 @@ const handlers = {
|
|
|
16
17
|
GET_ALL: getAll_1.default,
|
|
17
18
|
GET_META: getMeta_1.default,
|
|
18
19
|
GET_IDENT: getIdent_1.default,
|
|
20
|
+
RUN: (0, run_1.default)({}),
|
|
19
21
|
SET: set_1.default,
|
|
20
22
|
SET_META: setMeta_1.default,
|
|
21
23
|
DELETE: delete_1.default,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handlers/index.ts"],"names":[],"mappings":";;AAAA,+BAAuB;AACvB,qCAA8B;AAC9B,uCAAgC;AAChC,yCAAkC;AAClC,+BAAuB;AACvB,uCAAgC;AAChC,qCAA6B;AAC7B,iCAAyB;AACzB,qCAA6B;AAC7B,mCAA2B;AAC3B,uCAA+B;AAG/B,MAAM,QAAQ,GAAkC;IAC9C,GAAG,EAAH,aAAG;IACH,OAAO,EAAP,gBAAO;IACP,QAAQ,EAAR,iBAAQ;IACR,SAAS,EAAT,kBAAS;IACT,GAAG,EAAH,aAAG;IACH,QAAQ,EAAR,iBAAQ;IACR,MAAM,EAAN,gBAAM;IACN,GAAG,EAAE,gBAAM;IACX,IAAI,EAAJ,cAAI;IACJ,MAAM,EAAN,gBAAM;IACN,KAAK,EAAL,eAAK;IACL,OAAO,EAAP,iBAAO;CACR,CAAA;AAED,kBAAe,QAAQ,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handlers/index.ts"],"names":[],"mappings":";;AAAA,+BAAuB;AACvB,qCAA8B;AAC9B,uCAAgC;AAChC,yCAAkC;AAClC,+BAAyB;AACzB,+BAAuB;AACvB,uCAAgC;AAChC,qCAA6B;AAC7B,iCAAyB;AACzB,qCAA6B;AAC7B,mCAA2B;AAC3B,uCAA+B;AAG/B,MAAM,QAAQ,GAAkC;IAC9C,GAAG,EAAH,aAAG;IACH,OAAO,EAAP,gBAAO;IACP,QAAQ,EAAR,iBAAQ;IACR,SAAS,EAAT,kBAAS;IACT,GAAG,EAAE,IAAA,aAAK,EAAC,EAAE,CAAC;IACd,GAAG,EAAH,aAAG;IACH,QAAQ,EAAR,iBAAQ;IACR,MAAM,EAAN,gBAAM;IACN,GAAG,EAAE,gBAAM;IACX,IAAI,EAAJ,cAAI;IACJ,MAAM,EAAN,gBAAM;IACN,KAAK,EAAL,eAAK;IACL,OAAO,EAAP,iBAAO;CACR,CAAA;AAED,kBAAe,QAAQ,CAAA"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Action, ActionHandlerResources, Payload as BasePayload, Job } from '../types';
|
|
2
|
+
export interface Payload extends BasePayload {
|
|
3
|
+
jobId?: string;
|
|
4
|
+
}
|
|
5
|
+
declare const _default: (jobs: Record<string, Job>) => (action: Action, { dispatch }: ActionHandlerResources) => Promise<Action>;
|
|
6
|
+
export default _default;
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const createError_1 = require("../utils/createError");
|
|
4
|
+
const is_1 = require("../utils/is");
|
|
5
|
+
const isJobStep = (step) => (0, is_1.isObject)(step) && typeof step.id === 'string';
|
|
6
|
+
const prepareAction = (action, meta) => ({
|
|
7
|
+
...action,
|
|
8
|
+
meta,
|
|
9
|
+
});
|
|
10
|
+
async function runAction(action, dispatch, meta) {
|
|
11
|
+
if (action) {
|
|
12
|
+
return await dispatch(prepareAction(action, meta));
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
return { response: { status: 'noaction' } };
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
const prependResponseError = (response, message) => response?.error
|
|
19
|
+
? { ...response, error: `${message}${response.error}` }
|
|
20
|
+
: response;
|
|
21
|
+
const errorMessageFromResponses = (indices, responses, ids) => indices
|
|
22
|
+
.map((index) => `'${ids[index]}' (${responses[index].response?.status}: ${responses[index].response?.error})`)
|
|
23
|
+
.join(', ');
|
|
24
|
+
function responseFromResponses(responses, ids) {
|
|
25
|
+
const errorIndices = responses
|
|
26
|
+
.map((response, index) => response.response?.status === 'ok' ? undefined : index)
|
|
27
|
+
.filter((index) => index !== undefined);
|
|
28
|
+
return {
|
|
29
|
+
response: errorIndices.length > 0
|
|
30
|
+
? {
|
|
31
|
+
status: 'error',
|
|
32
|
+
error: errorMessageFromResponses(errorIndices, responses, ids),
|
|
33
|
+
}
|
|
34
|
+
: { status: 'ok' },
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
function getLastJobWithResponse(flow, responses) {
|
|
38
|
+
for (let i = flow.length - 1; i > -1; i--) {
|
|
39
|
+
const step = flow[i];
|
|
40
|
+
const ids = Array.isArray(step) ? step.map((f) => f.id) : [step.id];
|
|
41
|
+
if (ids.some((id) => responses[id])) {
|
|
42
|
+
return responseFromResponses(ids.map((id) => responses[id]), ids);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
const setResponses = (source, target) => Object.entries(source).forEach(([key, value]) => {
|
|
48
|
+
target[key] = value;
|
|
49
|
+
});
|
|
50
|
+
async function runFlow(flow, parentId, dispatch, meta) {
|
|
51
|
+
if (Array.isArray(flow)) {
|
|
52
|
+
const responses = {};
|
|
53
|
+
for (const step of flow) {
|
|
54
|
+
if (isJobStep(step)) {
|
|
55
|
+
const response = await runFlow(step.action, step.id, dispatch, meta);
|
|
56
|
+
setResponses(response, responses);
|
|
57
|
+
if (response[step.id].response?.status !== 'ok') {
|
|
58
|
+
return responses;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
else if (Array.isArray(step)) {
|
|
62
|
+
const ret = await Promise.all(step.map((step) => runFlow(step.action, step.id, dispatch, meta)));
|
|
63
|
+
ret.forEach((response) => {
|
|
64
|
+
setResponses(response, responses);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return responses;
|
|
69
|
+
}
|
|
70
|
+
else if (flow) {
|
|
71
|
+
return { [parentId]: await runAction(flow, dispatch, meta) };
|
|
72
|
+
}
|
|
73
|
+
return {};
|
|
74
|
+
}
|
|
75
|
+
exports.default = (jobs) => async function set(action, { dispatch }) {
|
|
76
|
+
const { payload: { jobId }, meta, } = action;
|
|
77
|
+
const job = typeof jobId === 'string' ? jobs[jobId] : undefined;
|
|
78
|
+
if (!job || !job.id) {
|
|
79
|
+
return (0, createError_1.createErrorOnAction)(action, `No job with id '${jobId}'`, 'notfound');
|
|
80
|
+
}
|
|
81
|
+
const responses = await runFlow(job.action, job.id, dispatch, meta);
|
|
82
|
+
if (Array.isArray(job.action)) {
|
|
83
|
+
const lastResponse = getLastJobWithResponse(job.action, responses);
|
|
84
|
+
return {
|
|
85
|
+
...action,
|
|
86
|
+
response: prependResponseError(lastResponse?.response, `Could not finish job '${job.id}', the following steps failed: `) || { status: 'noaction' },
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
const response = responses[job.id];
|
|
91
|
+
return {
|
|
92
|
+
...action,
|
|
93
|
+
response: response.response,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
//# sourceMappingURL=run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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-alpha.
|
|
18
|
+
version: '0.8.0-alpha.87',
|
|
19
19
|
create: create_1.default,
|
|
20
20
|
mergeDefinitions: mergeDefinitions_1.default,
|
|
21
21
|
mergeResources: mergeResources_1.default,
|
package/dist/schema/index.d.ts
CHANGED
|
@@ -10,4 +10,4 @@ export interface Schema {
|
|
|
10
10
|
mapping: MapDefinition;
|
|
11
11
|
accessForAction: (actionType?: string) => Access;
|
|
12
12
|
}
|
|
13
|
-
export default function createSchema({ id, plural, service, shape, access, internal, }: SchemaDef): Schema;
|
|
13
|
+
export default function createSchema({ id, plural, service, generateId, shape, access, internal, }: SchemaDef): Schema;
|
package/dist/schema/index.js
CHANGED
|
@@ -12,7 +12,7 @@ const expandField = (val) => typeof val === 'string'
|
|
|
12
12
|
const expandFields = (vals) => Object.entries(vals).reduce((newVals, [key, def]) => ({ ...newVals, [key]: expandField(def) }), {});
|
|
13
13
|
const defaultId = () => (0, nanoid_1.nanoid)();
|
|
14
14
|
const defaultDate = () => new Date();
|
|
15
|
-
function createSchema({ id, plural, service, shape, access, internal = false, }) {
|
|
15
|
+
function createSchema({ id, plural, service, generateId = false, shape, access, internal = false, }) {
|
|
16
16
|
return {
|
|
17
17
|
id,
|
|
18
18
|
plural: plural || `${id}s`,
|
|
@@ -28,7 +28,7 @@ function createSchema({ id, plural, service, shape, access, internal = false, })
|
|
|
28
28
|
accessForAction: (0, accessForAction_1.default)(access),
|
|
29
29
|
mapping: (0, createCastMapping_1.default)({
|
|
30
30
|
...shape,
|
|
31
|
-
id: { $cast: 'string', $default: defaultId },
|
|
31
|
+
id: { $cast: 'string', $default: generateId ? defaultId : null },
|
|
32
32
|
createdAt: { $cast: 'date', $default: defaultDate },
|
|
33
33
|
updatedAt: { $cast: 'date', $default: defaultDate },
|
|
34
34
|
}, id),
|
package/dist/schema/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,uDAA+C;AAG/C,oCAAsC;AACtC,mCAA+B;AAE/B,MAAM,WAAW,GAAG,CAAC,GAA+C,EAAE,EAAE,CACtE,OAAO,GAAG,KAAK,QAAQ;IACrB,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE;IAChB,CAAC,CAAC,IAAA,aAAQ,EAAC,GAAG,CAAC;QACf,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC;QACnB,CAAC,CAAC,GAAG,CAAA;AAET,MAAM,YAAY,GAAG,CAAC,IAAW,EAAS,EAAE,CAC1C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CACzB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAClE,EAAE,CACH,CAAA;AAEH,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,IAAA,eAAM,GAAE,CAAA;AAChC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAA;AAkBpC,SAAwB,YAAY,CAAC,EACnC,EAAE,EACF,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,KAAK,GACN;IACV,OAAO;QACL,EAAE;QACF,MAAM,EAAE,MAAM,IAAI,GAAG,EAAE,GAAG;QAC1B,OAAO;QACP,QAAQ;QACR,KAAK,EAAE;YACL,GAAG,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5B,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;YACvB,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;YAC5B,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SAC7B;QACD,MAAM;QACN,eAAe,EAAE,IAAA,yBAAe,EAAC,MAAM,CAAC;QACxC,OAAO,EAAE,IAAA,2BAAiB,EACxB;YACE,GAAG,KAAK;YACR,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,uDAA+C;AAG/C,oCAAsC;AACtC,mCAA+B;AAE/B,MAAM,WAAW,GAAG,CAAC,GAA+C,EAAE,EAAE,CACtE,OAAO,GAAG,KAAK,QAAQ;IACrB,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE;IAChB,CAAC,CAAC,IAAA,aAAQ,EAAC,GAAG,CAAC;QACf,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC;QACnB,CAAC,CAAC,GAAG,CAAA;AAET,MAAM,YAAY,GAAG,CAAC,IAAW,EAAS,EAAE,CAC1C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CACzB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAClE,EAAE,CACH,CAAA;AAEH,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,IAAA,eAAM,GAAE,CAAA;AAChC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAA;AAkBpC,SAAwB,YAAY,CAAC,EACnC,EAAE,EACF,MAAM,EACN,OAAO,EACP,UAAU,GAAG,KAAK,EAClB,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,KAAK,GACN;IACV,OAAO;QACL,EAAE;QACF,MAAM,EAAE,MAAM,IAAI,GAAG,EAAE,GAAG;QAC1B,OAAO;QACP,QAAQ;QACR,KAAK,EAAE;YACL,GAAG,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5B,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;YACvB,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;YAC5B,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SAC7B;QACD,MAAM;QACN,eAAe,EAAE,IAAA,yBAAe,EAAC,MAAM,CAAC;QACxC,OAAO,EAAE,IAAA,2BAAiB,EACxB;YACE,GAAG,KAAK;YACR,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE;YAChE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE;YACnD,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE;SACpD,EACD,EAAE,CACH;KACF,CAAA;AACH,CAAC;AAhCD,+BAgCC"}
|
package/dist/schema/types.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export interface ConnectionObject extends Record<string, unknown> {
|
|
|
6
6
|
}
|
|
7
7
|
export default class Connection {
|
|
8
8
|
#private;
|
|
9
|
-
constructor(transporter: Transporter, options: EndpointOptions);
|
|
9
|
+
constructor(transporter: Transporter, options: EndpointOptions, emit: (eventType: string, ...args: unknown[]) => void);
|
|
10
10
|
connect(auth?: Record<string, unknown> | null): Promise<boolean>;
|
|
11
11
|
disconnect(): Promise<void>;
|
|
12
12
|
get status(): string | null;
|
|
@@ -10,21 +10,23 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _Connection_transporter, _Connection_options, _Connection_connection;
|
|
13
|
+
var _Connection_transporter, _Connection_options, _Connection_connection, _Connection_emit;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const isSuccessStatus = (status) => typeof status === 'string' && ['ok', 'noaction'].includes(status);
|
|
16
16
|
class Connection {
|
|
17
|
-
constructor(transporter, options) {
|
|
17
|
+
constructor(transporter, options, emit) {
|
|
18
18
|
_Connection_transporter.set(this, void 0);
|
|
19
19
|
_Connection_options.set(this, void 0);
|
|
20
20
|
_Connection_connection.set(this, void 0);
|
|
21
|
+
_Connection_emit.set(this, void 0);
|
|
21
22
|
__classPrivateFieldSet(this, _Connection_transporter, transporter, "f");
|
|
22
23
|
__classPrivateFieldSet(this, _Connection_options, options, "f");
|
|
23
24
|
__classPrivateFieldSet(this, _Connection_connection, null, "f");
|
|
25
|
+
__classPrivateFieldSet(this, _Connection_emit, emit, "f");
|
|
24
26
|
}
|
|
25
27
|
async connect(auth) {
|
|
26
28
|
if (typeof __classPrivateFieldGet(this, _Connection_transporter, "f").connect === 'function') {
|
|
27
|
-
__classPrivateFieldSet(this, _Connection_connection, (await __classPrivateFieldGet(this, _Connection_transporter, "f").connect(__classPrivateFieldGet(this, _Connection_options, "f"), auth || null, __classPrivateFieldGet(this, _Connection_connection, "f")?.status === 'ok' ? __classPrivateFieldGet(this, _Connection_connection, "f") : null)) || { status: 'ok' }, "f");
|
|
29
|
+
__classPrivateFieldSet(this, _Connection_connection, (await __classPrivateFieldGet(this, _Connection_transporter, "f").connect(__classPrivateFieldGet(this, _Connection_options, "f"), auth || null, __classPrivateFieldGet(this, _Connection_connection, "f")?.status === 'ok' ? __classPrivateFieldGet(this, _Connection_connection, "f") : null, __classPrivateFieldGet(this, _Connection_emit, "f"))) || { status: 'ok' }, "f");
|
|
28
30
|
}
|
|
29
31
|
else {
|
|
30
32
|
__classPrivateFieldSet(this, _Connection_connection, { status: 'ok' }, "f");
|
|
@@ -48,5 +50,5 @@ class Connection {
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
exports.default = Connection;
|
|
51
|
-
_Connection_transporter = new WeakMap(), _Connection_options = new WeakMap(), _Connection_connection = new WeakMap();
|
|
53
|
+
_Connection_transporter = new WeakMap(), _Connection_options = new WeakMap(), _Connection_connection = new WeakMap(), _Connection_emit = new WeakMap();
|
|
52
54
|
//# sourceMappingURL=Connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/service/Connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE,CACjD,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAEnE,MAAqB,UAAU;
|
|
1
|
+
{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/service/Connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE,CACjD,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAEnE,MAAqB,UAAU;IAM7B,YACE,WAAwB,EACxB,OAAwB,EACxB,IAAqD;QARvD,0CAAyB;QACzB,sCAAyB;QACzB,yCAAoC;QACpC,mCAAsD;QAOpD,uBAAA,IAAI,2BAAgB,WAAW,MAAA,CAAA;QAC/B,uBAAA,IAAI,uBAAY,OAAO,MAAA,CAAA;QACvB,uBAAA,IAAI,0BAAe,IAAI,MAAA,CAAA;QACvB,uBAAA,IAAI,oBAAS,IAAI,MAAA,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqC;QACjD,IAAI,OAAO,uBAAA,IAAI,+BAAa,CAAC,OAAO,KAAK,UAAU,EAAE;YACnD,uBAAA,IAAI,0BAAe,CAAC,MAAM,uBAAA,IAAI,+BAAa,CAAC,OAAO,CACjD,uBAAA,IAAI,2BAAS,EACb,IAAI,IAAI,IAAI,EACZ,uBAAA,IAAI,8BAAY,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,uBAAA,IAAI,8BAAY,CAAC,CAAC,CAAC,IAAI,EAC3D,uBAAA,IAAI,wBAAM,CACX,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAA,CAAA;SACvB;aAAM;YACL,uBAAA,IAAI,0BAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAA,CAAA;SACpC;QACD,OAAO,eAAe,CAAC,uBAAA,IAAI,8BAAY,EAAE,MAAM,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,OAAO,uBAAA,IAAI,+BAAa,CAAC,UAAU,KAAK,UAAU,EAAE;YACtD,MAAM,uBAAA,IAAI,+BAAa,CAAC,UAAU,CAAC,uBAAA,IAAI,8BAAY,CAAC,CAAA;SACrD;QACD,uBAAA,IAAI,0BAAe,IAAI,MAAA,CAAA;IACzB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,uBAAA,IAAI,8BAAY,EAAE,MAAM,IAAI,IAAI,CAAA;IACzC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,uBAAA,IAAI,8BAAY,EAAE,KAAK,IAAI,IAAI,CAAA;IACxC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,uBAAA,IAAI,8BAAY,IAAI,IAAI,CAAA;IACjC,CAAC;CACF;AAjDD,6BAiDC"}
|
package/dist/service/index.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ interface Resources {
|
|
|
8
8
|
schemas: Record<string, Schema>;
|
|
9
9
|
mapOptions?: MapOptions;
|
|
10
10
|
middleware?: Middleware[];
|
|
11
|
+
emit?: (eventType: string, ...args: unknown[]) => void;
|
|
11
12
|
}
|
|
12
|
-
declare const _default: ({ transporters, auths, schemas, mapOptions, middleware, }: Resources) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options, mutation, endpoints: endpointDefs, }: ServiceDef) => Service;
|
|
13
|
+
declare const _default: ({ transporters, auths, schemas, mapOptions, middleware, emit, }: Resources) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options, mutation, endpoints: endpointDefs, }: ServiceDef) => Service;
|
|
13
14
|
export default _default;
|
package/dist/service/index.js
CHANGED
|
@@ -58,7 +58,7 @@ const sendToTransporter = (transporter, connection, serviceId) => async function
|
|
|
58
58
|
return (0, createError_1.createErrorOnAction)(action, `Error retrieving from service '${serviceId}': ${error.message}`);
|
|
59
59
|
}
|
|
60
60
|
};
|
|
61
|
-
exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware = [], }) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options = {}, mutation, endpoints: endpointDefs = [], }) => {
|
|
61
|
+
exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware = [], emit = () => undefined, }) => ({ id: serviceId, transporter: transporterId, auth, incomingIdent, meta, options = {}, mutation, endpoints: endpointDefs = [], }) => {
|
|
62
62
|
if (typeof serviceId !== 'string' || serviceId === '') {
|
|
63
63
|
throw new TypeError(`Can't create service without an id.`);
|
|
64
64
|
}
|
|
@@ -71,7 +71,7 @@ exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware =
|
|
|
71
71
|
const getEndpointMapper = (0, endpoints_1.default)(serviceId, endpointDefs, options, mapOptions, mutation, isTransporter(transporter) ? transporter.prepareOptions : undefined);
|
|
72
72
|
const runThroughMiddleware = middleware.length > 0 ? (0, dispatch_1.compose)(...middleware) : (fn) => fn;
|
|
73
73
|
let connection = isTransporter(transporter)
|
|
74
|
-
? new Connection_1.default(transporter, options)
|
|
74
|
+
? new Connection_1.default(transporter, options, emit)
|
|
75
75
|
: null;
|
|
76
76
|
return {
|
|
77
77
|
id: serviceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,wCAAwC;AACxC,2CAA+C;AAC/C,sDAA+E;AAG/E,6CAAqC;AAGrC,oDAAgD;AAChD,oCAAsC;AACtC,kDAA0C;AAC1C,kDAAiD;AACjD,+CAAgD;AAChD,0CAAqC;AAErC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import PProgress = require('p-progress');
|
|
2
|
+
import { MapDefinition } from 'map-transform';
|
|
2
3
|
import { EndpointOptions } from './service/endpoints/types';
|
|
3
4
|
import { IdentConfig } from './service/types';
|
|
4
5
|
import { Service } from './service/types';
|
|
@@ -35,12 +36,20 @@ export declare type ScheduleObject = {
|
|
|
35
36
|
wm?: number[];
|
|
36
37
|
wy?: number[];
|
|
37
38
|
};
|
|
38
|
-
export interface
|
|
39
|
+
export interface JobStep {
|
|
40
|
+
id: string;
|
|
41
|
+
action?: Action | (JobStep | JobStep[])[];
|
|
42
|
+
mutation?: MapDefinition;
|
|
43
|
+
}
|
|
44
|
+
export interface Job {
|
|
45
|
+
id?: string;
|
|
46
|
+
action: Action | (JobStep | JobStep[])[];
|
|
47
|
+
}
|
|
48
|
+
export interface JobDef extends Job {
|
|
39
49
|
schedules?: ScheduleObject[];
|
|
40
50
|
exceptions?: ScheduleObject[];
|
|
41
51
|
cron?: string;
|
|
42
52
|
human?: string;
|
|
43
|
-
action: Action;
|
|
44
53
|
}
|
|
45
54
|
export interface DataFunction {
|
|
46
55
|
(): Data;
|
|
@@ -128,7 +137,7 @@ export interface Connection extends Record<string, unknown> {
|
|
|
128
137
|
export interface Transporter {
|
|
129
138
|
authentication: string | null;
|
|
130
139
|
prepareOptions: (options: Record<string, unknown>, serviceId: string) => Record<string, unknown>;
|
|
131
|
-
connect: (options: Record<string, unknown>, authentication: Record<string, unknown> | null, connection: Connection | null) => Promise<Connection | null>;
|
|
140
|
+
connect: (options: Record<string, unknown>, authentication: Record<string, unknown> | null, connection: Connection | null, emit: (eventType: string, ...args: unknown[]) => void) => Promise<Connection | null>;
|
|
132
141
|
send: (action: Action, connection: Connection | null) => Promise<Response>;
|
|
133
142
|
shouldListen?: (options: EndpointOptions) => boolean;
|
|
134
143
|
listen?: (dispatch: Dispatch, connection: Connection | null) => Promise<Response>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import later = require('later');
|
|
2
|
-
import {
|
|
2
|
+
import { JobDef, Action } from '../types';
|
|
3
3
|
export interface Schedule {
|
|
4
4
|
later: later.Schedule;
|
|
5
5
|
action: Action;
|
|
6
6
|
}
|
|
7
|
-
export default function createSchedule({ schedules, exceptions, cron, human, action, }:
|
|
7
|
+
export default function createSchedule({ schedules, exceptions, cron, human, action, }: JobDef): Schedule | undefined;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const later = require("later");
|
|
4
|
+
const is_1 = require("./is");
|
|
4
5
|
later.date.UTC();
|
|
5
6
|
function parseSched(schedules, exceptions, cron, human) {
|
|
6
7
|
if (schedules) {
|
|
@@ -15,8 +16,12 @@ function parseSched(schedules, exceptions, cron, human) {
|
|
|
15
16
|
return null;
|
|
16
17
|
}
|
|
17
18
|
function createSchedule({ schedules, exceptions, cron, human, action, }) {
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
if ((0, is_1.isAction)(action)) {
|
|
20
|
+
const schedule = parseSched(schedules, exceptions, cron, human);
|
|
21
|
+
return schedule ? { later: later.schedule(schedule), action } : undefined;
|
|
22
|
+
}
|
|
23
|
+
else
|
|
24
|
+
return undefined;
|
|
20
25
|
}
|
|
21
26
|
exports.default = createSchedule;
|
|
22
27
|
//# sourceMappingURL=createSchedule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSchedule.js","sourceRoot":"","sources":["../../src/utils/createSchedule.ts"],"names":[],"mappings":";;AAAA,+BAA+B;
|
|
1
|
+
{"version":3,"file":"createSchedule.js","sourceRoot":"","sources":["../../src/utils/createSchedule.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAE/B,6BAA+B;AAE/B,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;AAOhB,SAAS,UAAU,CACjB,SAA4B,EAC5B,UAA6B,EAC7B,IAAa,EACb,KAAc;IAEd,IAAI,SAAS,EAAE;QACb,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,CAAA;KACjC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACnC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAC9B;SAAM,IAAI,KAAK,EAAE;QAChB,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC/B;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAwB,cAAc,CAAC,EACrC,SAAS,EACT,UAAU,EACV,IAAI,EACJ,KAAK,EACL,MAAM,GACC;IACP,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,EAAE;QACpB,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QAC/D,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;KAC1E;;QAAM,OAAO,SAAS,CAAA;AACzB,CAAC;AAXD,iCAWC"}
|
|
@@ -12,7 +12,7 @@ const mergeDefs = (defs, def) => ({
|
|
|
12
12
|
services: mergeArrays(defs.services, def.services),
|
|
13
13
|
mutations: { ...defs.mutations, ...def.mutations },
|
|
14
14
|
dictionaries: { ...defs.dictionaries, ...def.dictionaries },
|
|
15
|
-
|
|
15
|
+
jobs: mergeArrays(defs.jobs, def.jobs),
|
|
16
16
|
identConfig: def.identConfig || defs.identConfig,
|
|
17
17
|
queueService: def.queueService || defs.queueService,
|
|
18
18
|
});
|
|
@@ -23,7 +23,7 @@ function mergeDefinitions(...defs) {
|
|
|
23
23
|
services: [],
|
|
24
24
|
mutations: {},
|
|
25
25
|
dictionaries: {},
|
|
26
|
-
|
|
26
|
+
jobs: [],
|
|
27
27
|
identConfig: undefined,
|
|
28
28
|
queueService: undefined,
|
|
29
29
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeDefinitions.js","sourceRoot":"","sources":["../../src/utils/mergeDefinitions.ts"],"names":[],"mappings":";;AAEA,MAAM,aAAa,GAAG,CAAI,GAAS,EAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAE5E,MAAM,WAAW,GAAG,CAAI,IAAU,EAAE,IAAU,EAAO,EAAE,CAAC;IACtD,GAAG,aAAa,CAAC,IAAI,CAAC;IACtB,GAAG,aAAa,CAAC,IAAI,CAAC;CACvB,CAAA;AAED,MAAM,SAAS,GAAG,CAChB,IAA0B,EAC1B,GAAyB,EACZ,EAAE,CAAC,CAAC;IACjB,GAAG,IAAI;IACP,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;IAC/C,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC;IAClD,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,GAAG,CAAC,SAAS,EAAE;IAClD,YAAY,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,GAAG,CAAC,YAAY,EAAE;IAC3D,
|
|
1
|
+
{"version":3,"file":"mergeDefinitions.js","sourceRoot":"","sources":["../../src/utils/mergeDefinitions.ts"],"names":[],"mappings":";;AAEA,MAAM,aAAa,GAAG,CAAI,GAAS,EAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAE5E,MAAM,WAAW,GAAG,CAAI,IAAU,EAAE,IAAU,EAAO,EAAE,CAAC;IACtD,GAAG,aAAa,CAAC,IAAI,CAAC;IACtB,GAAG,aAAa,CAAC,IAAI,CAAC;CACvB,CAAA;AAED,MAAM,SAAS,GAAG,CAChB,IAA0B,EAC1B,GAAyB,EACZ,EAAE,CAAC,CAAC;IACjB,GAAG,IAAI;IACP,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;IAC/C,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC;IAClD,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,GAAG,CAAC,SAAS,EAAE;IAClD,YAAY,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,GAAG,CAAC,YAAY,EAAE;IAC3D,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACtC,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW;IAChD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY;CACpD,CAAC,CAAA;AAEF,SAAwB,gBAAgB,CACtC,GAAG,IAA4B;IAE/B,OAAO,IAAI,CAAC,MAAM,CAAc,SAAS,EAAE;QACzC,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,SAAS;KACxB,CAAC,CAAA;AACJ,CAAC;AAbD,mCAaC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "0.8.0-alpha.
|
|
3
|
+
"version": "0.8.0-alpha.88",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"later": "^1.2.0",
|
|
49
49
|
"luxon": "^2.4.0",
|
|
50
50
|
"map-any": "^0.2.1",
|
|
51
|
-
"map-transform": "0.4.0-alpha.
|
|
51
|
+
"map-transform": "0.4.0-alpha.15",
|
|
52
52
|
"ms": "^2.1.3",
|
|
53
53
|
"nanoid": "^3.3.4",
|
|
54
54
|
"p-limit": "^3.1.0",
|
|
@@ -60,9 +60,9 @@
|
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@integreat/ts-dev-setup": "^2.3.0",
|
|
63
|
-
"@types/sinon": "^10.0.
|
|
63
|
+
"@types/sinon": "^10.0.12",
|
|
64
64
|
"integreat-transporter-http": "0.1.0-alpha.25",
|
|
65
|
-
"nock": "^13.2.
|
|
65
|
+
"nock": "^13.2.8",
|
|
66
66
|
"sinon": "^14.0.0"
|
|
67
67
|
}
|
|
68
68
|
}
|