@magda/minion-framework 2.3.3 → 3.0.0-alpha.1
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/Crawler.d.ts +8 -8
- package/dist/Crawler.js +62 -99
- package/dist/Crawler.js.map +1 -1
- package/dist/MinionOptions.d.ts +6 -5
- package/dist/MinionOptions.js +1 -2
- package/dist/buildWebhookConfig.d.ts +2 -2
- package/dist/buildWebhookConfig.js +4 -7
- package/dist/buildWebhookConfig.js.map +1 -1
- package/dist/commonYargs.d.ts +10 -10
- package/dist/commonYargs.js +31 -37
- package/dist/commonYargs.js.map +1 -1
- package/dist/getWebhookUrl.d.ts +1 -1
- package/dist/getWebhookUrl.js +2 -5
- package/dist/getWebhookUrl.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +111 -127
- package/dist/index.js.map +1 -1
- package/dist/isWebhookRegistered.d.ts +2 -2
- package/dist/isWebhookRegistered.js +14 -31
- package/dist/isWebhookRegistered.js.map +1 -1
- package/dist/registerWebhook.d.ts +5 -5
- package/dist/registerWebhook.js +33 -50
- package/dist/registerWebhook.js.map +1 -1
- package/dist/resumeWebhook.d.ts +3 -3
- package/dist/resumeWebhook.js +8 -22
- package/dist/resumeWebhook.js.map +1 -1
- package/dist/setupRecrawlEndpoint.d.ts +30 -30
- package/dist/setupRecrawlEndpoint.js +46 -45
- package/dist/setupRecrawlEndpoint.js.map +1 -1
- package/dist/setupWebhookEndpoint.d.ts +2 -2
- package/dist/setupWebhookEndpoint.js +22 -47
- package/dist/setupWebhookEndpoint.js.map +1 -1
- package/dist/startApiEndpoints.d.ts +1 -1
- package/dist/startApiEndpoints.js +4 -10
- package/dist/startApiEndpoints.js.map +1 -1
- package/dist/test/Crawler.spec.js +77 -93
- package/dist/test/Crawler.spec.js.map +1 -1
- package/dist/test/baseSpec.d.ts +10 -10
- package/dist/test/baseSpec.js +23 -25
- package/dist/test/baseSpec.js.map +1 -1
- package/dist/test/fakeArgv.d.ts +3 -3
- package/dist/test/fakeArgv.js +6 -6
- package/dist/test/fakeArgv.js.map +1 -1
- package/dist/test/makePromiseQueryable.d.ts +2 -2
- package/dist/test/makePromiseQueryable.js +2 -5
- package/dist/test/makePromiseQueryable.js.map +1 -1
- package/dist/test/registry.spec.js +27 -32
- package/dist/test/registry.spec.js.map +1 -1
- package/dist/test/setupRecrawlEndpoint.spec.js +29 -43
- package/dist/test/setupRecrawlEndpoint.spec.js.map +1 -1
- package/dist/test/startup.spec.js +33 -38
- package/dist/test/startup.spec.js.map +1 -1
- package/dist/test/webhooks.spec.js +43 -43
- package/dist/test/webhooks.spec.js.map +1 -1
- package/package.json +33 -21
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup.spec.js","sourceRoot":"","sources":["../../src/test/startup.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"startup.spec.js","sourceRoot":"","sources":["../../src/test/startup.spec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAO,EACH,qBAAqB,EACrB,mBAAmB,EACnB,SAAS,EACZ,MAAM,iDAAiD,CAAC;AAEzD,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAC7D,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,MAAM,MAAM,GAAG,sCAAsC,CAAC;AAEtD,QAAQ,CACJ,YAAY,EACZ,CACI,UAAiC,EACjC,aAA2B,EAC3B,UAAwB,EACxB,kBAA8B,EAChC,EAAE;IACA,GAAG,CAAC,QAAQ,CACR,gEAAgE,EAChE,qBAAqB,EACrB,qBAAqB,EACrB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EACvB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EACvB,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EACpB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,EAC3C,qBAAqB,EACrB,GAAG,CAAC,IAAI,EACR,CACI,YAAY,EACZ,UAAU,EACV,OAAO,EACP,eAAe,EACf,OAAO,EACP,QAAQ,EACR,SAAS,EACT,iBAAiB,EACnB,EAAE;QACA,kBAAkB,EAAE,CAAC;QACrB,MAAM,WAAW,GAAG,UAAU,YAAY,MAAM,CAAC;QACjD,MAAM,SAAS,GAAG,UAAU,UAAU,MAAM,CAAC;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAE3C,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,OAAY,EAAE,EAAE;YAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAEtB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,WAAgB,EAAE,KAAa,EAAE,EAAE;YACjD,aAAa;iBACR,GAAG,CAAC,UAAU,CAAC;iBACf,KAAK,CAAC,CAAC,WAAgB,EAAE,EAAE;gBACxB,MAAM,SAAS,GAAG,CAAC,UAAuB,EAAE,EAAE;oBAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;wBACd,OAAO,EAAE,CAAC;oBACd,CAAC;yBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;wBACnC,OAAO,UAAU,CAAC;oBACtB,CAAC;yBAAM,CAAC;wBACJ,OAAO,CAAC,UAAU,CAAC,CAAC;oBACxB,CAAC;gBACL,CAAC,CAAC;gBAEF,OAAO,CACH,KAAK,KAAK,GAAG;oBACT,WAAW,CAAC,SAAS,KAAK,KAAK;oBACnC,WAAW,CAAC,WAAW;wBACnB,WAAW,CACP,OAAO,EACP,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAChC;wBACD,WAAW,CACP,eAAe,EACf,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CACxC,CACR,CAAC;YACN,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACR,UAAU,EAAE,OAAO,CAAC,MAAM;gBAC1B,OAAO,EAAE,KAAK;gBACd,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;gBAClC,OAAO,EAAE,WAAW;aACvB,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAkB;YAC3B,IAAI,EAAE,QAAQ,CAAC;gBACX,WAAW,EAAE,oBAAoB;gBACjC,WAAW;gBACX,iBAAiB;gBACjB,SAAS;gBACT,SAAS;gBACT,MAAM;gBACN,UAAU,EAAE,UAAU,EAAE;aAC3B,CAAC;YACF,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE,eAAe;YAChC,eAAe,EAAE,EAAE;YACnB,OAAO,EAAE,UAAU;YACnB,UAAU,EAAE,CAAC;YACb,aAAa,EAAE,KAAK;iBACf,IAAI,EAAE;iBACN,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1C,CAAC;QAEF,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE5D,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE;YAC3B,OAAO,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;gBAC/B,MAAM,CACD,OAAO,CAAC,aAAgC,CAAC,UAAU,CAChD,MAAM,CACT,CACJ,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC,CACJ,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,OAAiB,EAAE,EAAE,CACzC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC;IAc5C,GAAG,CAAC,QAAQ,CACR,0BAA0B,EAC1B,GAAG,CAAC,QAAQ,CACR,GAAG,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,GAAG,CAAC,OAAO;QACjB,WAAW,EAAE,mBAAmB;QAChC,EAAE,EAAE,mBAAmB;QACvB,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC;QACvC,eAAe,EAAE,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC;QAC/C,SAAS,EAAE,mBAAmB;QAC9B,WAAW,EAAE,mBAAmB;QAChC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC;QAC/B,iBAAiB,EAAE,GAAG,CAAC,IAAI;KAC9B,CAAC,EACF,CAAC,MAAa,EAAE,EAAE,CACd,MAAM,CAAC,IAAI,IAAI,CAAC;QAChB,MAAM,CAAC,IAAI,IAAI,KAAK;QACpB,MAAM,CAAC,WAAW,KAAK,EAAE;QACzB,MAAM,CAAC,EAAE,KAAK,EAAE;QAChB,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAC9B,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;QACtC,MAAM,CAAC,SAAS,KAAK,EAAE;QACvB,MAAM,CAAC,WAAW,KAAK,EAAE,CAChC,EACD,CAAC,EACG,IAAI,EACJ,WAAW,EACX,EAAE,EACF,OAAO,EACP,eAAe,EACf,SAAS,EACT,WAAW,EACX,iBAAiB,EACb,EAAE,EAAE;QACR,kBAAkB,EAAE,CAAC;QAErB,MAAM,OAAO,GAAkB;YAC3B,IAAI,EAAE,QAAQ,CAAC;gBACX,WAAW,EAAE,WAAW;gBACxB,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,EAAE;gBACf,iBAAiB;gBACjB,SAAS,EAAE,EAAE;gBACb,SAAS;gBACT,MAAM;aACT,CAAC;YACF,EAAE,EAAE,EAAE;YACN,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE,eAAe;YAChC,eAAe,EAAE,EAAE;YACnB,OAAO,EAAE,UAAU;YACnB,WAAW;YACX,aAAa,EAAE,KAAK;iBACf,IAAI,EAAE;iBACN,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SAChD,CAAC;QAEF,OAAO,MAAM,CAAC,OAAO,CAAC;aACjB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;aACjB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,CACJ,CAAC;AACN,CAAC,CACJ,CAAC;AAEF,SAAS,WAAW,CAAC,CAAQ,EAAE,CAAQ;IACnC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IACzC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
|
|
@@ -1,60 +1,55 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const index_1 = __importDefault(require("../index"));
|
|
14
|
-
const fakeArgv_1 = __importDefault(require("./fakeArgv"));
|
|
15
|
-
const makePromiseQueryable_1 = __importDefault(require("./makePromiseQueryable"));
|
|
16
|
-
const baseSpec_1 = __importDefault(require("./baseSpec"));
|
|
17
|
-
baseSpec_1.default("webhooks", (expressApp, expressServer, listenPort, beforeEachProperty) => {
|
|
1
|
+
import request from "supertest";
|
|
2
|
+
import nock from "nock";
|
|
3
|
+
import sinon from "sinon";
|
|
4
|
+
import _ from "lodash";
|
|
5
|
+
import { expect } from "chai";
|
|
6
|
+
import { arbFlatMap, lcAlphaNumStringArbNe, recordArb } from "magda-typescript-common/src/test/arbitraries.js";
|
|
7
|
+
import jsc from "jsverify";
|
|
8
|
+
import minion from "../index.js";
|
|
9
|
+
import fakeArgv from "./fakeArgv.js";
|
|
10
|
+
import makePromiseQueryable from "./makePromiseQueryable.js";
|
|
11
|
+
import baseSpec from "./baseSpec.js";
|
|
12
|
+
baseSpec("webhooks", (expressApp, expressServer, listenPort, beforeEachProperty) => {
|
|
18
13
|
doWebhookTest("should work synchronously", false);
|
|
19
14
|
doWebhookTest("should work asynchronously", true);
|
|
20
15
|
function doWebhookTest(caption, async) {
|
|
21
16
|
it(caption, () => {
|
|
22
|
-
const batchResultsArb =
|
|
23
|
-
const recordWithSuccessArb = (mightFail) =>
|
|
24
|
-
record:
|
|
25
|
-
success: mightFail ?
|
|
17
|
+
const batchResultsArb = jsc.suchthat(jsc.array(jsc.bool), (array) => array.length <= 5);
|
|
18
|
+
const recordWithSuccessArb = (mightFail) => jsc.record({
|
|
19
|
+
record: recordArb,
|
|
20
|
+
success: mightFail ? jsc.bool : jsc.constant(true)
|
|
26
21
|
});
|
|
27
22
|
const recordsWithSuccessArrArb = (success) => {
|
|
28
|
-
const baseArb =
|
|
23
|
+
const baseArb = jsc.array(recordWithSuccessArb(!success));
|
|
29
24
|
return success
|
|
30
25
|
? baseArb
|
|
31
|
-
:
|
|
26
|
+
: jsc.suchthat(baseArb, (combined) => combined.some(({ success }) => !success));
|
|
32
27
|
};
|
|
33
|
-
const batchArb =
|
|
28
|
+
const batchArb = arbFlatMap(batchResultsArb, (batchResults) => {
|
|
34
29
|
const batchArb = batchResults.map((overallSuccess) => recordsWithSuccessArrArb(overallSuccess).smap((records) => ({ records, overallSuccess }), ({ records }) => records));
|
|
35
30
|
return batchArb.length > 0
|
|
36
|
-
?
|
|
37
|
-
:
|
|
31
|
+
? jsc.tuple(batchArb)
|
|
32
|
+
: jsc.constant([]);
|
|
38
33
|
}, (batches) => batches.map(({ overallSuccess }) => overallSuccess));
|
|
39
34
|
/** Global hook id generator - incremented every time we create another hook */
|
|
40
35
|
let lastHookId = 0;
|
|
41
|
-
return
|
|
36
|
+
return jsc.assert(jsc.forall(batchArb, lcAlphaNumStringArbNe, lcAlphaNumStringArbNe, jsc.integer(1, 10), jsc.bool, (recordsBatches, domain, jwtSecret, concurrency, enableMultiTenant) => {
|
|
42
37
|
beforeEachProperty();
|
|
43
38
|
const registryDomain = "example";
|
|
44
39
|
const registryUrl = `http://${registryDomain}.com:80`;
|
|
45
|
-
const registryScope =
|
|
40
|
+
const registryScope = nock(registryUrl);
|
|
46
41
|
const tenantDomain = "tenant";
|
|
47
42
|
const tenantUrl = `http://${tenantDomain}.com:80`;
|
|
48
|
-
const tenantScope =
|
|
43
|
+
const tenantScope = nock(tenantUrl);
|
|
49
44
|
const userId = "b1fddd6f-e230-4068-bd2c-1a21844f1598";
|
|
50
45
|
/** All records in all the batches */
|
|
51
|
-
const flattenedRecords =
|
|
46
|
+
const flattenedRecords = _.flatMap(recordsBatches, (batch) => batch.records);
|
|
52
47
|
/** Error thrown when the call is *supposed* to fail */
|
|
53
48
|
const fakeError = new Error("Fake-ass testing error");
|
|
54
49
|
fakeError.ignore = true;
|
|
55
50
|
const internalUrl = `http://${domain}.com`;
|
|
56
51
|
const options = {
|
|
57
|
-
argv:
|
|
52
|
+
argv: fakeArgv({
|
|
58
53
|
internalUrl,
|
|
59
54
|
registryUrl,
|
|
60
55
|
enableMultiTenant,
|
|
@@ -70,7 +65,7 @@ baseSpec_1.default("webhooks", (expressApp, expressServer, listenPort, beforeEac
|
|
|
70
65
|
async,
|
|
71
66
|
express: expressApp,
|
|
72
67
|
concurrency: concurrency,
|
|
73
|
-
onRecordFound:
|
|
68
|
+
onRecordFound: sinon
|
|
74
69
|
.stub()
|
|
75
70
|
.callsFake((foundRecord) => {
|
|
76
71
|
const match = flattenedRecords.find(({ record: thisRecord }) => {
|
|
@@ -95,22 +90,27 @@ baseSpec_1.default("webhooks", (expressApp, expressServer, listenPort, beforeEac
|
|
|
95
90
|
});
|
|
96
91
|
registryScope.post(/\/hooks\/.*/).reply(201, {});
|
|
97
92
|
tenantScope.get("/tenants").reply(200, []);
|
|
98
|
-
return
|
|
93
|
+
return minion(options)
|
|
99
94
|
.then(() => Promise.all(recordsBatches.map((batch) => {
|
|
100
95
|
lastHookId++;
|
|
101
96
|
if (async) {
|
|
102
97
|
// If we're running async then we expect that there'll be a call to the registry
|
|
103
98
|
// telling it to give more events.
|
|
104
99
|
registryScope
|
|
105
|
-
.post(`/hooks/${options.id}/ack`,
|
|
106
|
-
|
|
107
|
-
:
|
|
108
|
-
|
|
109
|
-
|
|
100
|
+
.post(`/hooks/${options.id}/ack`, {
|
|
101
|
+
succeeded: batch.overallSuccess,
|
|
102
|
+
lastEventIdReceived: lastHookId,
|
|
103
|
+
// Deactivate if not successful.
|
|
104
|
+
...(batch.overallSuccess
|
|
105
|
+
? {}
|
|
106
|
+
: {
|
|
107
|
+
active: false
|
|
108
|
+
})
|
|
109
|
+
})
|
|
110
110
|
.reply(201);
|
|
111
111
|
}
|
|
112
112
|
// Send the hook payload to the minion
|
|
113
|
-
const test =
|
|
113
|
+
const test = request(expressServer())
|
|
114
114
|
.post("/hook")
|
|
115
115
|
.set("Content-Type", "application/json")
|
|
116
116
|
.send({
|
|
@@ -131,13 +131,13 @@ baseSpec_1.default("webhooks", (expressApp, expressServer, listenPort, beforeEac
|
|
|
131
131
|
? 201
|
|
132
132
|
: 500)
|
|
133
133
|
.expect((response) => {
|
|
134
|
-
|
|
134
|
+
expect(!!response.body
|
|
135
135
|
.deferResponse).to.equal(async);
|
|
136
136
|
});
|
|
137
|
-
const queryable =
|
|
138
|
-
|
|
137
|
+
const queryable = makePromiseQueryable(test);
|
|
138
|
+
expect(queryable.isFulfilled()).to
|
|
139
139
|
.be.false;
|
|
140
|
-
return queryable.then(() => batch.records.forEach(({ record }) =>
|
|
140
|
+
return queryable.then(() => batch.records.forEach(({ record }) => expect(options.onRecordFound.calledWith(record))));
|
|
141
141
|
})))
|
|
142
142
|
.then(() => {
|
|
143
143
|
registryScope.done();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.spec.js","sourceRoot":"","sources":["../../src/test/webhooks.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhooks.spec.js","sourceRoot":"","sources":["../../src/test/webhooks.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,54 +1,66 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@magda/minion-framework",
|
|
3
3
|
"description": "MAGDA Minion Framework",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "3.0.0-alpha.1",
|
|
5
|
+
"type": "module",
|
|
6
|
+
"exports": {
|
|
7
|
+
".": "./dist/index.js",
|
|
8
|
+
"./package.json": "./package.json",
|
|
9
|
+
"./dist/*.js": "./dist/*.js"
|
|
10
|
+
},
|
|
11
|
+
"engines": {
|
|
12
|
+
"node": ">=18.19.0"
|
|
13
|
+
},
|
|
5
14
|
"scripts": {
|
|
6
15
|
"prebuild": "rimraf dist tsconfig.tsbuildinfo",
|
|
7
16
|
"build": "yarn run compile",
|
|
8
17
|
"compile": "tsc -b && ts-module-alias-transformer dist",
|
|
9
18
|
"watch": "tsc -b --watch",
|
|
10
|
-
"test": "mocha
|
|
19
|
+
"test": "mocha",
|
|
11
20
|
"release": "npm publish || echo \"Skip releasing npm package @magda/minion-framework.\""
|
|
12
21
|
},
|
|
13
22
|
"author": "",
|
|
14
23
|
"license": "Apache-2.0",
|
|
15
|
-
"main": "dist",
|
|
16
24
|
"devDependencies": {
|
|
17
|
-
"@magda/scripts": "^
|
|
18
|
-
"@types/chai": "^4.
|
|
19
|
-
"@types/express": "^4.17.
|
|
20
|
-
"@types/isomorphic-fetch": "0.0.34",
|
|
25
|
+
"@magda/scripts": "^3.0.0-alpha.1",
|
|
26
|
+
"@types/chai": "^4.3.11",
|
|
27
|
+
"@types/express": "^4.17.21",
|
|
21
28
|
"@types/lodash": "^4.14.68",
|
|
22
|
-
"@types/mocha": "^
|
|
23
|
-
"@types/nock": "^8.2.1",
|
|
29
|
+
"@types/mocha": "^10.0.6",
|
|
24
30
|
"@types/query-string": "^5.1.0",
|
|
25
31
|
"@types/sinon": "^2.3.3",
|
|
26
|
-
"@types/supertest": "^2.0.
|
|
32
|
+
"@types/supertest": "^2.0.16",
|
|
27
33
|
"@types/yargs": "^12.0.8",
|
|
28
|
-
"chai": "^
|
|
34
|
+
"chai": "^5.0.0-rc.0",
|
|
29
35
|
"jsverify": "^0.8.2",
|
|
30
|
-
"mocha": "^
|
|
36
|
+
"mocha": "^10.2.0",
|
|
31
37
|
"mocha-testcheck": "^1.0.0-rc.0",
|
|
32
|
-
"nock": "^
|
|
38
|
+
"nock": "^13.4.0",
|
|
33
39
|
"portfinder": "^1.0.13",
|
|
34
40
|
"query-string": "^6.1.0",
|
|
35
41
|
"sinon": "^2.4.1",
|
|
36
|
-
"supertest": "^3.
|
|
42
|
+
"supertest": "^6.3.3",
|
|
37
43
|
"testcheck": "^1.0.0-rc.2",
|
|
38
|
-
"typescript": "~
|
|
44
|
+
"typescript": "~5.3.3"
|
|
39
45
|
},
|
|
40
46
|
"dependencies": {
|
|
41
|
-
"@magda/
|
|
42
|
-
"@magda/
|
|
43
|
-
"
|
|
44
|
-
"
|
|
45
|
-
"
|
|
47
|
+
"@magda/esm-utils": "^1.0.1",
|
|
48
|
+
"@magda/registry-aspects": "^3.0.0-alpha.1",
|
|
49
|
+
"@magda/typescript-common": "^3.0.0-alpha.1",
|
|
50
|
+
"cross-fetch": "^4.0.0",
|
|
51
|
+
"express": "^4.17.2",
|
|
46
52
|
"lodash": "^4.17.4",
|
|
47
53
|
"yargs": "^12.0.5"
|
|
48
54
|
},
|
|
55
|
+
"mocha": {
|
|
56
|
+
"import": "tsx/esm",
|
|
57
|
+
"spec": [
|
|
58
|
+
"src/test/**/*.spec.ts"
|
|
59
|
+
]
|
|
60
|
+
},
|
|
49
61
|
"config": {
|
|
50
62
|
"docker": {
|
|
51
|
-
"include": "node_modules dist"
|
|
63
|
+
"include": "node_modules dist package.json"
|
|
52
64
|
}
|
|
53
65
|
},
|
|
54
66
|
"magda": {
|