@golemio/pid 2.2.12-dev.648935926 → 2.2.12-dev.650717328
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/output-gateway/departure-boards/DepartureBoardsRouter.js +5 -3
- package/dist/output-gateway/departure-boards/DepartureBoardsRouter.js.map +1 -1
- package/dist/output-gateway/pid/PIDRouter.js +0 -6
- package/dist/output-gateway/pid/PIDRouter.js.map +1 -1
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js +6 -1
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map +1 -1
- package/dist/output-gateway/pid/dto/DepartureBoardsDTO.d.ts +8 -7
- package/dist/output-gateway/pid/dto/DepartureBoardsDTO.js +7 -2
- package/dist/output-gateway/pid/dto/DepartureBoardsDTO.js.map +1 -1
- package/dist/output-gateway/pid/dto/interfaces/IDepartureBoardsQueryDTO.d.ts +19 -0
- package/dist/output-gateway/pid/dto/interfaces/IDepartureBoardsQueryDTO.js +3 -0
- package/dist/output-gateway/pid/dto/interfaces/IDepartureBoardsQueryDTO.js.map +1 -0
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.d.ts +6 -5
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js +9 -12
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js.map +1 -1
- package/package.json +3 -3
|
@@ -70,10 +70,12 @@ class DepartureBoardsRouter extends BaseRouter_1.BaseRouter {
|
|
|
70
70
|
minutesAfter: parseInt(req.query.minutesAfter || this.defaultQueryParameters.minutesAfter, 10),
|
|
71
71
|
minutesBefore: parseInt(req.query.minutesBefore || this.defaultQueryParameters.minutesBefore, 10),
|
|
72
72
|
timeFrom,
|
|
73
|
-
order: req.query.orderBySchedule === "true" ?
|
|
74
|
-
filter: req.query.showAllRoutesFirst === "true" ?
|
|
73
|
+
order: req.query.orderBySchedule === "true" ? pid_1.DepartureOrder.TIMETABLE : pid_1.DepartureOrder.REAL,
|
|
74
|
+
filter: req.query.showAllRoutesFirst === "true" ? pid_1.DepartureFilter.ROUTE_ONCE_FILL : pid_1.DepartureFilter.NONE,
|
|
75
75
|
limit,
|
|
76
|
-
|
|
76
|
+
skip: [],
|
|
77
|
+
mode: pid_1.DepartureMode.DEPARTURES,
|
|
78
|
+
offset: Number(req.query.offset) || 0,
|
|
77
79
|
total: limit,
|
|
78
80
|
timezone: preferredTimezone,
|
|
79
81
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/departure-boards/DepartureBoardsRouter.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;AAEH,+DAA4F;AAC5F,mFAA2E;AAC3E,mEAA6E;AAC7E,oFAAiF;AACjF,6EAAkH;AAClH,sCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"DepartureBoardsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/departure-boards/DepartureBoardsRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,10 +30,6 @@ class PIDRouter extends BaseRouter_1.BaseRouter {
|
|
|
30
30
|
(0, express_validator_1.query)("names").exists().isArray(),
|
|
31
31
|
(0, express_validator_1.query)("names").exists().isString(),
|
|
32
32
|
]),
|
|
33
|
-
(0, express_validator_1.query)("ids.*").optional().isString(),
|
|
34
|
-
(0, express_validator_1.query)("aswIds.*").optional().isString(),
|
|
35
|
-
(0, express_validator_1.query)("cisIds.*").optional().isInt(),
|
|
36
|
-
(0, express_validator_1.query)("names.*").optional().isString(),
|
|
37
33
|
(0, express_validator_1.query)("minutesBefore").optional().isInt(),
|
|
38
34
|
(0, express_validator_1.query)("minutesAfter").optional().isInt(),
|
|
39
35
|
(0, express_validator_1.query)("preferredTimezone").optional().isString().isIn(prefferedTimezone),
|
|
@@ -43,8 +39,6 @@ class PIDRouter extends BaseRouter_1.BaseRouter {
|
|
|
43
39
|
(0, express_validator_1.query)("skip").optional().isIn(skip),
|
|
44
40
|
(0, express_validator_1.query)("timeFrom").optional().isString().isISO8601(),
|
|
45
41
|
(0, express_validator_1.query)("includeMetroTrains").optional().isBoolean(),
|
|
46
|
-
(0, express_validator_1.query)("limit").optional().isInt(),
|
|
47
|
-
(0, express_validator_1.query)("offset").optional().isInt(),
|
|
48
42
|
(0, express_validator_1.query)("total").optional().isInt(),
|
|
49
43
|
];
|
|
50
44
|
this.router.get("/departureboards", validation, ...this.commonMiddleware("PIDDepartureBoards"), (0, middleware_1.checkTimeFromMiddleware)("PIDDepartureBoards"), this.departureBoardsController.getDepartureBoard);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PIDRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/PIDRouter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+DAA2D;AAC3D,mFAA2E;AAC3E,oFAAiF;AACjF,6EAAkH;AAClH,mEAA6E;AAC7E,6CAAuD;AACvD,2CAA8D;AAC9D,+CAA+E;AAE/E,MAAa,SAAU,SAAQ,uBAAU;IAKrC;QACI,KAAK,EAAE,CAAC;QALI,WAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QAc1B,kCAA6B,GAAG,GAAG,EAAE;YACzC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,2CAA+B,CAAC;YAClG,MAAM,UAAU,GAAG;gBACf,IAAA,yBAAK,EAAC;oBACF,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;oBAClC,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;oBACnC,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;oBAClC,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;oBACnC,IAAA,yBAAK,EAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;oBAC/B,IAAA,yBAAK,EAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;oBAChC,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;oBACjC,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;iBACrC,CAAC;gBACF,IAAA,yBAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"PIDRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/PIDRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -161,7 +161,12 @@ class DeparturesRepository extends output_gateway_1.SequelizeModel {
|
|
|
161
161
|
[sequelize_1.default.Op.and]: [
|
|
162
162
|
{
|
|
163
163
|
[sequelize_1.default.Op.or]: [
|
|
164
|
-
{
|
|
164
|
+
{
|
|
165
|
+
[sequelize_1.default.Op.and]: [
|
|
166
|
+
conditionDepartureBetween,
|
|
167
|
+
options.minutesBefore <= 0 && conditionTripNotYetDepartured,
|
|
168
|
+
],
|
|
169
|
+
},
|
|
165
170
|
conditionCanceledTripDepartureSustain,
|
|
166
171
|
],
|
|
167
172
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,24 @@
|
|
|
1
1
|
import { IGTFSStopGetAllOutput } from "../../ropid-gtfs/models/GTFSStopModelInterfaces";
|
|
2
2
|
import { IInfotextsStopsWithEventOutputModel } from "../models/RopidVYMIEventsStopsModel";
|
|
3
|
-
import { IPIDDepartureOutput } from "./..";
|
|
4
|
-
|
|
3
|
+
import { IPIDDepartureOutput, DepartureMode, DepartureFilter, DepartureOrder, DepartureSkip } from "./..";
|
|
4
|
+
import { IDepartureBoardsQueryDTO } from "./interfaces/IDepartureBoardsQueryDTO";
|
|
5
|
+
export declare class DepartureBoardsQueryDTO implements IDepartureBoardsQueryDTO {
|
|
5
6
|
aswIds: string[];
|
|
6
7
|
cisIds: string[];
|
|
7
8
|
ids: string[];
|
|
8
9
|
names: string[];
|
|
9
|
-
skip:
|
|
10
|
+
skip: DepartureSkip[];
|
|
10
11
|
limit: number;
|
|
11
12
|
minutesAfter: number;
|
|
12
13
|
minutesBefore: number;
|
|
13
14
|
includeMetroTrains: boolean;
|
|
15
|
+
mode: DepartureMode;
|
|
16
|
+
order: DepartureOrder;
|
|
17
|
+
filter: DepartureFilter;
|
|
18
|
+
offset: number;
|
|
14
19
|
total?: number;
|
|
15
20
|
preferredTimezone?: string;
|
|
16
21
|
timeFrom?: string;
|
|
17
|
-
mode?: string;
|
|
18
|
-
order?: string;
|
|
19
|
-
filter?: string;
|
|
20
|
-
offset?: number;
|
|
21
22
|
}
|
|
22
23
|
export declare class DepartureBoardsResponseDTO {
|
|
23
24
|
stops: IGTFSStopGetAllOutput[];
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DepartureBoardsResponseDTO = exports.DepartureBoardsQueryDTO = void 0;
|
|
13
13
|
const decorators_1 = require("../../shared/decorators");
|
|
14
|
+
const pid_1 = require("./..");
|
|
14
15
|
class DepartureBoardsQueryDTO {
|
|
15
16
|
constructor() {
|
|
16
17
|
this.aswIds = [];
|
|
@@ -22,6 +23,10 @@ class DepartureBoardsQueryDTO {
|
|
|
22
23
|
this.minutesAfter = 180;
|
|
23
24
|
this.minutesBefore = 0;
|
|
24
25
|
this.includeMetroTrains = false;
|
|
26
|
+
this.mode = pid_1.DepartureMode.DEPARTURES;
|
|
27
|
+
this.order = pid_1.DepartureOrder.REAL;
|
|
28
|
+
this.filter = pid_1.DepartureFilter.NONE;
|
|
29
|
+
this.offset = 0;
|
|
25
30
|
}
|
|
26
31
|
}
|
|
27
32
|
__decorate([
|
|
@@ -63,11 +68,11 @@ __decorate([
|
|
|
63
68
|
__decorate([
|
|
64
69
|
(0, decorators_1.TransformInteger)(),
|
|
65
70
|
__metadata("design:type", Number)
|
|
66
|
-
], DepartureBoardsQueryDTO.prototype, "
|
|
71
|
+
], DepartureBoardsQueryDTO.prototype, "offset", void 0);
|
|
67
72
|
__decorate([
|
|
68
73
|
(0, decorators_1.TransformInteger)(),
|
|
69
74
|
__metadata("design:type", Number)
|
|
70
|
-
], DepartureBoardsQueryDTO.prototype, "
|
|
75
|
+
], DepartureBoardsQueryDTO.prototype, "total", void 0);
|
|
71
76
|
exports.DepartureBoardsQueryDTO = DepartureBoardsQueryDTO;
|
|
72
77
|
class DepartureBoardsResponseDTO {
|
|
73
78
|
constructor() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardsDTO.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/dto/DepartureBoardsDTO.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA2F;
|
|
1
|
+
{"version":3,"file":"DepartureBoardsDTO.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/dto/DepartureBoardsDTO.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA2F;AAG3F,8BAA6G;AAG7G,MAAa,uBAAuB;IAApC;QAEI,WAAM,GAAa,EAAE,CAAC;QAGtB,WAAM,GAAa,EAAE,CAAC;QAGtB,QAAG,GAAa,EAAE,CAAC;QAGnB,UAAK,GAAa,EAAE,CAAC;QAGrB,SAAI,GAAoB,EAAE,CAAC;QAG3B,UAAK,GAAW,EAAE,CAAC;QAGnB,iBAAY,GAAW,GAAG,CAAC;QAG3B,kBAAa,GAAW,CAAC,CAAC;QAG1B,uBAAkB,GAAY,KAAK,CAAC;QAEpC,SAAI,GAAkB,mBAAa,CAAC,UAAU,CAAC;QAE/C,UAAK,GAAmB,oBAAc,CAAC,IAAI,CAAC;QAE5C,WAAM,GAAoB,qBAAe,CAAC,IAAI,CAAC;QAG/C,WAAM,GAAW,CAAC,CAAC;IAQvB,CAAC;CAAA;AAzCG;IADC,IAAA,2BAAc,GAAE;;uDACK;AAGtB;IADC,IAAA,2BAAc,GAAE;;uDACK;AAGtB;IADC,IAAA,2BAAc,GAAE;;oDACE;AAGnB;IADC,IAAA,2BAAc,GAAE;;sDACI;AAGrB;IADC,IAAA,2BAAc,GAAE;;qDACU;AAG3B;IADC,IAAA,6BAAgB,GAAE;;sDACA;AAGnB;IADC,IAAA,6BAAgB,GAAE;;6DACQ;AAG3B;IADC,IAAA,6BAAgB,GAAE;;8DACO;AAG1B;IADC,IAAA,6BAAgB,GAAE;;mEACiB;AASpC;IADC,IAAA,6BAAgB,GAAE;;uDACA;AAGnB;IADC,IAAA,6BAAgB,GAAE;;sDACJ;AAtCnB,0DA2CC;AAED,MAAa,0BAA0B;IAAvC;QACI,UAAK,GAA4B,EAAE,CAAC;QACpC,eAAU,GAA0B,EAAE,CAAC;QACvC,cAAS,GAA0C,EAAE,CAAC;IAC1D,CAAC;CAAA;AAJD,gEAIC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { DepartureMode, DepartureFilter, DepartureOrder, DepartureSkip } from "../..";
|
|
2
|
+
export interface IDepartureBoardsQueryDTO {
|
|
3
|
+
aswIds: string[];
|
|
4
|
+
cisIds: string[];
|
|
5
|
+
ids: string[];
|
|
6
|
+
names: string[];
|
|
7
|
+
skip: DepartureSkip[];
|
|
8
|
+
limit: number;
|
|
9
|
+
minutesAfter: number;
|
|
10
|
+
minutesBefore: number;
|
|
11
|
+
includeMetroTrains: boolean;
|
|
12
|
+
mode: DepartureMode;
|
|
13
|
+
order: DepartureOrder;
|
|
14
|
+
filter: DepartureFilter;
|
|
15
|
+
offset: number;
|
|
16
|
+
total?: number;
|
|
17
|
+
preferredTimezone?: string;
|
|
18
|
+
timeFrom?: string;
|
|
19
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IDepartureBoardsQueryDTO.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/dto/interfaces/IDepartureBoardsQueryDTO.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Moment } from "@golemio/core/dist/shared/moment-timezone";
|
|
2
|
+
import { DepartureFilter, DepartureMode, DepartureOrder, DepartureSkip } from "..";
|
|
2
3
|
declare class PIDDepartureBoardsModel {
|
|
3
4
|
private stopsMaxCount;
|
|
4
5
|
private ropidVYMIEventsStopsModel;
|
|
@@ -16,14 +17,14 @@ declare class PIDDepartureBoardsModel {
|
|
|
16
17
|
names?: string[];
|
|
17
18
|
total: number;
|
|
18
19
|
limit: number;
|
|
19
|
-
offset
|
|
20
|
-
mode
|
|
20
|
+
offset: number;
|
|
21
|
+
mode: DepartureMode;
|
|
21
22
|
minutesBefore: number;
|
|
22
23
|
minutesAfter: number;
|
|
23
24
|
timeFrom?: Moment;
|
|
24
|
-
order
|
|
25
|
-
filter
|
|
26
|
-
skip
|
|
25
|
+
order: DepartureOrder;
|
|
26
|
+
filter: DepartureFilter;
|
|
27
|
+
skip: DepartureSkip[];
|
|
27
28
|
includeMetroTrains?: boolean;
|
|
28
29
|
timezone: string;
|
|
29
30
|
}) => Promise<any>;
|
|
@@ -31,13 +31,10 @@ class PIDDepartureBoardsModel {
|
|
|
31
31
|
*/
|
|
32
32
|
this.GetAll = (options) => __awaiter(this, void 0, void 0, function* () {
|
|
33
33
|
var _a, _b;
|
|
34
|
-
// set init parameters from query
|
|
35
34
|
const currentMoment = (0, moment_timezone_1.default)();
|
|
36
35
|
const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
|
|
37
|
-
|
|
38
|
-
const
|
|
39
|
-
const filter = options.filter || __1.DepartureFilter.NONE;
|
|
40
|
-
const skip = options.skip || [];
|
|
36
|
+
// Combination of ?minutesBefore > 0 and ?skip=atStop is not supported, fall back to 0
|
|
37
|
+
const minutesBefore = options.skip.includes(__1.DepartureSkip.AT_STOP) && options.minutesBefore > 0 ? 0 : options.minutesBefore;
|
|
41
38
|
const spanStops = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.stops", config_1.config.telemetry);
|
|
42
39
|
spanStops === null || spanStops === void 0 ? void 0 : spanStops.setAttributes(Object.assign(Object.assign({}, options), { timeFrom: (_a = options.timeFrom) === null || _a === void 0 ? void 0 : _a.toString() }));
|
|
43
40
|
const stopsToInclude = yield models_1.models.GTFSStopModel.GetAll({
|
|
@@ -69,21 +66,21 @@ class PIDDepartureBoardsModel {
|
|
|
69
66
|
const results = yield this.departuresRepository.GetAll({
|
|
70
67
|
currentMoment,
|
|
71
68
|
minutesAfter: options.minutesAfter,
|
|
72
|
-
minutesBefore
|
|
69
|
+
minutesBefore,
|
|
73
70
|
minutesOffset,
|
|
74
71
|
stopsIds,
|
|
75
|
-
mode,
|
|
72
|
+
mode: options.mode,
|
|
76
73
|
});
|
|
77
74
|
const spanDepartures = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.departures", config_1.config.telemetry);
|
|
78
75
|
const res = {
|
|
79
76
|
departures: new PIDDepartureModel_1.default(results, {
|
|
80
77
|
limit: options.limit,
|
|
81
|
-
offset: options.offset
|
|
78
|
+
offset: options.offset,
|
|
82
79
|
total: options.total,
|
|
83
|
-
mode,
|
|
84
|
-
order,
|
|
85
|
-
filter,
|
|
86
|
-
skip,
|
|
80
|
+
mode: options.mode,
|
|
81
|
+
order: options.order,
|
|
82
|
+
filter: options.filter,
|
|
83
|
+
skip: options.skip,
|
|
87
84
|
departuresDirections,
|
|
88
85
|
timezone: options.timezone,
|
|
89
86
|
}).toArray(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAAuE;AACvE,gGAA2E;AAC3E,oDAA+C;AAC/C,wBAA8E;AAC9E,0BAAmF;AAEnF,gDAA2D;AAC3D,qEAAkE;AAClE,+FAA6F;AAE7F,oFAA6D;AAE7D,MAAM,uBAAuB;IAMzB;QALQ,kBAAa,GAAG,GAAG,CAAC;QAW5B;;;WAGG;QACI,WAAM,GAAG,CAAO,OAiBtB,EAAgB,EAAE;;YACf,
|
|
1
|
+
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.2.12-dev.
|
|
3
|
+
"version": "2.2.12-dev.650717328",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
|
|
9
9
|
"build-minimal": "run-s 'build --sourceMap false --declaration false'",
|
|
10
10
|
"build-watch": "run-s 'build --watch --preserveWatchOutput'",
|
|
11
|
-
"pretest": "golemio import-db-data
|
|
11
|
+
"pretest": "golemio import-db-data",
|
|
12
12
|
"test": "cross-env NODE_ENV='test' TS_NODE_COMPILER='ttypescript' TZ='UTC' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
|
|
13
13
|
"test-debug": "run-s 'test --inspect-brk=9230'",
|
|
14
14
|
"code-coverage": "nyc run-s 'test -r source-map-support/register'",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@commitlint/cli": "^11.0.0",
|
|
29
29
|
"@commitlint/config-conventional": "^11.0.0",
|
|
30
|
-
"@golemio/cli": "1.3.
|
|
30
|
+
"@golemio/cli": "1.3.2-dev.650635067",
|
|
31
31
|
"@golemio/core": "1.2.19-dev.648810013",
|
|
32
32
|
"@golemio/db-common": "1.0.1",
|
|
33
33
|
"@golemio/eslint-config": "^1.1.0",
|