@golemio/pid 4.3.2-dev.2122449979 → 4.3.2-dev.2132352828
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/helpers/GtfsStopParser.d.ts +1 -0
- package/dist/helpers/GtfsStopParser.js +6 -1
- package/dist/helpers/GtfsStopParser.js.map +1 -1
- package/dist/output-gateway/jis/controllers/v1/V1EventsController.js +3 -1
- package/dist/output-gateway/jis/controllers/v1/V1EventsController.js.map +1 -1
- package/dist/output-gateway/jis/routers/v1/V1JISRouter.js +1 -1
- package/dist/output-gateway/jis/routers/v1/V1JISRouter.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.js +3 -1
- package/dist/output-gateway/pid/controllers/v2/V2DepartureBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v3/V3InfotextsController.js +3 -1
- package/dist/output-gateway/pid/controllers/v3/V3InfotextsController.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v3/V3TransferBoardsController.js +6 -4
- package/dist/output-gateway/pid/controllers/v3/V3TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.d.ts +4 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js +24 -7
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.d.ts +3 -0
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js +17 -0
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js.map +1 -1
- package/dist/output-gateway/pid/index.d.ts +7 -0
- package/dist/output-gateway/pid/index.js.map +1 -1
- package/dist/output-gateway/pid/routers/v2/V2PIDRouter.js +2 -2
- package/dist/output-gateway/pid/routers/v2/V2PIDRouter.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/TransferFacade.d.ts +24 -4
- package/dist/output-gateway/pid/service/facade/TransferFacade.js +171 -0
- package/dist/output-gateway/pid/service/facade/TransferFacade.js.map +1 -1
- package/dist/output-gateway/public/controllers/v2/V2PublicDepartureBoardsController.js +3 -1
- package/dist/output-gateway/public/controllers/v2/V2PublicDepartureBoardsController.js.map +1 -1
- package/dist/output-gateway/public/controllers/v2/V2PublicGtfsController.js +5 -3
- package/dist/output-gateway/public/controllers/v2/V2PublicGtfsController.js.map +1 -1
- package/dist/output-gateway/public/controllers/v2/V2PublicVehiclePositionsController.js +7 -4
- package/dist/output-gateway/public/controllers/v2/V2PublicVehiclePositionsController.js.map +1 -1
- package/dist/output-gateway/public/data-access/redis/DelayComputationRepository.d.ts +2 -0
- package/dist/output-gateway/public/data-access/redis/DelayComputationRepository.js +44 -0
- package/dist/output-gateway/public/data-access/redis/DelayComputationRepository.js.map +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicStopTimeRepository.d.ts +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicStopTimeRepository.js +16 -20
- package/dist/output-gateway/public/data-access/redis/PublicStopTimeRepository.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/routers/v2/V2GTFSRouter.js +48 -39
- package/dist/output-gateway/ropid-gtfs/routers/v2/V2GTFSRouter.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/routers/v2/V2VehiclePositionsRouter.js +16 -13
- package/dist/output-gateway/vehicle-positions/routers/v2/V2VehiclePositionsRouter.js.map +1 -1
- package/package.json +2 -2
|
@@ -20,6 +20,7 @@ const express_1 = require("@golemio/core/dist/shared/express");
|
|
|
20
20
|
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
21
21
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
22
22
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
23
|
+
const express_validator_2 = require("@golemio/core/dist/shared/express-validator");
|
|
23
24
|
class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
24
25
|
constructor() {
|
|
25
26
|
super(constants_1.RouteVersion.v2, "gtfs");
|
|
@@ -44,10 +45,11 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
44
45
|
];
|
|
45
46
|
this.GetAllServices = async (req, res, next) => {
|
|
46
47
|
try {
|
|
48
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
47
49
|
const data = await this.serviceModel.GetAll({
|
|
48
|
-
date:
|
|
49
|
-
limit: Number(
|
|
50
|
-
offset: Number(
|
|
50
|
+
date: queryData.date || undefined,
|
|
51
|
+
limit: Number(queryData.limit) || undefined,
|
|
52
|
+
offset: Number(queryData.offset) || undefined,
|
|
51
53
|
});
|
|
52
54
|
res.status(200).send(data);
|
|
53
55
|
}
|
|
@@ -57,14 +59,15 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
57
59
|
};
|
|
58
60
|
this.GetAllStopTimes = async (req, res, next) => {
|
|
59
61
|
try {
|
|
62
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
60
63
|
const data = await this.stopTimeModel.GetAll({
|
|
61
|
-
date:
|
|
62
|
-
from:
|
|
63
|
-
limit: Number(
|
|
64
|
-
offset: Number(
|
|
65
|
-
stop: !!
|
|
64
|
+
date: queryData.date || undefined,
|
|
65
|
+
from: queryData.from || undefined,
|
|
66
|
+
limit: Number(queryData.limit) || undefined,
|
|
67
|
+
offset: Number(queryData.offset) || undefined,
|
|
68
|
+
stop: !!queryData.includeStop,
|
|
66
69
|
stopId: req.params.stopId,
|
|
67
|
-
to:
|
|
70
|
+
to: queryData.to || undefined,
|
|
68
71
|
});
|
|
69
72
|
res.status(200).send(data);
|
|
70
73
|
}
|
|
@@ -74,11 +77,12 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
74
77
|
};
|
|
75
78
|
this.GetAllTrips = async (req, res, next) => {
|
|
76
79
|
try {
|
|
80
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
77
81
|
const data = await this.tripModel.GetAll({
|
|
78
|
-
date:
|
|
79
|
-
limit: Number(
|
|
80
|
-
offset: Number(
|
|
81
|
-
stopId:
|
|
82
|
+
date: queryData.date || undefined,
|
|
83
|
+
limit: Number(queryData.limit) || undefined,
|
|
84
|
+
offset: Number(queryData.offset) || undefined,
|
|
85
|
+
stopId: queryData.stopId,
|
|
82
86
|
});
|
|
83
87
|
res.status(200).send(data);
|
|
84
88
|
}
|
|
@@ -88,14 +92,15 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
88
92
|
};
|
|
89
93
|
this.GetOneTrip = async (req, res, next) => {
|
|
90
94
|
try {
|
|
95
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
91
96
|
const id = req.params.id;
|
|
92
97
|
const data = await this.tripModel.GetOne(id, {
|
|
93
|
-
date:
|
|
94
|
-
route: !!
|
|
95
|
-
service: !!
|
|
96
|
-
shapes: !!
|
|
97
|
-
stopTimes: !!
|
|
98
|
-
stops: !!
|
|
98
|
+
date: queryData.date || undefined,
|
|
99
|
+
route: !!queryData.includeRoute,
|
|
100
|
+
service: !!queryData.includeService,
|
|
101
|
+
shapes: !!queryData.includeShapes,
|
|
102
|
+
stopTimes: !!queryData.includeStopTimes,
|
|
103
|
+
stops: !!queryData.includeStops,
|
|
99
104
|
});
|
|
100
105
|
if (!data) {
|
|
101
106
|
throw new golemio_errors_1.GeneralError("not_found", "GTFSRouter", undefined, 404);
|
|
@@ -107,21 +112,22 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
107
112
|
}
|
|
108
113
|
};
|
|
109
114
|
this.GetAllStops = async (req, res, next) => {
|
|
110
|
-
const
|
|
111
|
-
const
|
|
112
|
-
const
|
|
113
|
-
const
|
|
115
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
116
|
+
const names = shared_1.RopidRouterUtils.convertParamToArray(queryData.names);
|
|
117
|
+
const aswIds = shared_1.RopidRouterUtils.convertParamToArray(queryData.aswIds);
|
|
118
|
+
const cisIds = shared_1.RopidRouterUtils.convertParamToArray(queryData.cisIds);
|
|
119
|
+
const gtfsIds = shared_1.RopidRouterUtils.convertParamToArray(queryData.ids);
|
|
114
120
|
try {
|
|
115
|
-
const coords = await (0, Geo_1.parseCoordinates)(
|
|
121
|
+
const coords = await (0, Geo_1.parseCoordinates)(queryData.latlng, queryData.range);
|
|
116
122
|
const data = await this.stopModel.GetAll({
|
|
117
123
|
aswIds,
|
|
118
124
|
cisIds,
|
|
119
125
|
gtfsIds,
|
|
120
126
|
lat: coords.lat,
|
|
121
|
-
limit: Number(
|
|
127
|
+
limit: Number(queryData.limit) || undefined,
|
|
122
128
|
lng: coords.lng,
|
|
123
129
|
names,
|
|
124
|
-
offset: Number(
|
|
130
|
+
offset: Number(queryData.offset) || undefined,
|
|
125
131
|
range: coords.range,
|
|
126
132
|
});
|
|
127
133
|
res.status(200).send(data);
|
|
@@ -145,9 +151,10 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
145
151
|
};
|
|
146
152
|
this.GetAllRoutes = async (req, res, next) => {
|
|
147
153
|
try {
|
|
154
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
148
155
|
const data = await this.routeModel.GetAll({
|
|
149
|
-
limit: Number(
|
|
150
|
-
offset: Number(
|
|
156
|
+
limit: Number(queryData.limit) || undefined,
|
|
157
|
+
offset: Number(queryData.offset) || undefined,
|
|
151
158
|
});
|
|
152
159
|
res.status(200).send(data);
|
|
153
160
|
}
|
|
@@ -170,10 +177,11 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
170
177
|
};
|
|
171
178
|
this.GetAllShapes = async (req, res, next) => {
|
|
172
179
|
try {
|
|
180
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
173
181
|
const data = await this.shapeModel.GetAll({
|
|
174
182
|
id: req.params.id,
|
|
175
|
-
limit: Number(
|
|
176
|
-
offset: Number(
|
|
183
|
+
limit: Number(queryData.limit) || undefined,
|
|
184
|
+
offset: Number(queryData.offset) || undefined,
|
|
177
185
|
});
|
|
178
186
|
if (!data) {
|
|
179
187
|
throw new golemio_errors_1.GeneralError("not_found", "GTFSRouter", undefined, 404);
|
|
@@ -198,17 +206,17 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
198
206
|
this.initServicesEndpoints(maxAge, staleWhileRevalidate);
|
|
199
207
|
};
|
|
200
208
|
this.initRoutesEndpoints = (maxAge, staleWhileRevalidate) => {
|
|
201
|
-
this.router.get("/routes",
|
|
209
|
+
this.router.get("/routes", (0, Validation_1.paginationLimitMiddleware)("GTFSRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetAllRoutes);
|
|
202
210
|
this.router.get("/routes/:id", (0, express_validator_1.param)("id").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetOneRoute);
|
|
203
211
|
};
|
|
204
212
|
this.initServicesEndpoints = (maxAge, staleWhileRevalidate) => {
|
|
205
|
-
this.router.get("/services", (0, express_validator_1.query)("date").optional().isISO8601().custom(ParamValidatorManager_1.ParamValidatorManager.getDateValidator()).not().isArray(),
|
|
213
|
+
this.router.get("/services", (0, express_validator_1.query)("date").optional().isISO8601().custom(ParamValidatorManager_1.ParamValidatorManager.getDateValidator()).not().isArray(), (0, Validation_1.paginationLimitMiddleware)("GTFSRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetAllServices);
|
|
206
214
|
};
|
|
207
215
|
this.initShapesEndpoints = (maxAge, staleWhileRevalidate) => {
|
|
208
|
-
this.router.get("/shapes/:id",
|
|
216
|
+
this.router.get("/shapes/:id", (0, Validation_1.paginationLimitMiddleware)("GTFSRouter"), Validation_1.checkErrors, (0, express_validator_1.param)("id").exists(), this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetAllShapes);
|
|
209
217
|
};
|
|
210
218
|
this.initTripsEndpoints = (maxAge, staleWhileRevalidate) => {
|
|
211
|
-
this.router.get("/trips", (0, express_validator_1.query)("stopId").optional().not().isArray(), this.tripInclusions,
|
|
219
|
+
this.router.get("/trips", (0, express_validator_1.query)("stopId").optional().not().isArray(), this.tripInclusions, (0, Validation_1.paginationLimitMiddleware)("GTFSRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetAllTrips);
|
|
212
220
|
this.router.get("/trips/:id", (0, express_validator_1.param)("id").exists(), this.tripInclusions, Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetOneTrip);
|
|
213
221
|
};
|
|
214
222
|
this.initStopsEndpoints = (maxAge, staleWhileRevalidate) => {
|
|
@@ -219,14 +227,15 @@ class V2GTFSRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
219
227
|
(0, express_validator_1.query)("aswIds").optional().not().isEmpty({ ignore_whitespace: true }),
|
|
220
228
|
(0, express_validator_1.query)("cisIds").optional().isInt(),
|
|
221
229
|
(0, express_validator_1.query)("ids").optional().not().isEmpty({ ignore_whitespace: true }),
|
|
222
|
-
],
|
|
230
|
+
], (0, Validation_1.paginationLimitMiddleware)("GTFSRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetAllStops);
|
|
223
231
|
this.router.get("/stops/:id", [(0, express_validator_1.param)("id").exists()], Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(maxAge, staleWhileRevalidate), this.GetOneStop);
|
|
224
232
|
};
|
|
225
233
|
this.initStopTimesEndpoints = (maxAge, staleWhileRevalidate) => {
|
|
226
|
-
this.router.get("/stoptimes/:stopId", this.stopTimesHandlers,
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
234
|
+
this.router.get("/stoptimes/:stopId", this.stopTimesHandlers, (0, Validation_1.paginationLimitMiddleware)("GTFSRouter"), Validation_1.checkErrors, (req, res, next) => {
|
|
235
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
236
|
+
if (queryData.from &&
|
|
237
|
+
queryData.to &&
|
|
238
|
+
(0, moment_timezone_1.default)(queryData.from, "H:mm:ss").isAfter((0, moment_timezone_1.default)(queryData.to, "H:mm:ss"))) {
|
|
230
239
|
throw new golemio_errors_1.GeneralError("Validation error", "GTFSRouter", new Error("'to' cannot be later than 'from'"), 400);
|
|
231
240
|
}
|
|
232
241
|
return next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2GTFSRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/ropid-gtfs/routers/v2/V2GTFSRouter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"V2GTFSRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/ropid-gtfs/routers/v2/V2GTFSRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,22 +20,24 @@ const express_1 = require("@golemio/core/dist/shared/express");
|
|
|
20
20
|
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
21
21
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
22
22
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
23
|
+
const express_validator_2 = require("@golemio/core/dist/shared/express-validator");
|
|
23
24
|
class V2VehiclePositionsRouter extends AbstractRouter_1.AbstractRouter {
|
|
24
25
|
constructor() {
|
|
25
26
|
super(constants_1.RouteVersion.v2, "vehiclepositions");
|
|
26
27
|
this.GetAll = async (req, res, next) => {
|
|
27
|
-
const
|
|
28
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
29
|
+
const preferredTimezone = shared_1.RopidRouterUtils.getPreferredTimezone(queryData.preferredTimezone);
|
|
28
30
|
const span = (0, trace_provider_1.createChildSpan)("V2VehiclePositionsRouter.GetAll");
|
|
29
31
|
try {
|
|
30
32
|
const result = await this.tripWithPositionRepository.GetAll({
|
|
31
|
-
cisTripNumber: Number(
|
|
32
|
-
includeNotTracking: (0, Utils_1.parseBooleanQueryParam)(
|
|
33
|
-
includeNotPublic: (0, Utils_1.parseBooleanQueryParam)(
|
|
34
|
-
limit: Number(
|
|
35
|
-
offset: Number(
|
|
36
|
-
routeId:
|
|
37
|
-
routeShortName:
|
|
38
|
-
updatedSince:
|
|
33
|
+
cisTripNumber: Number(queryData.cisTripNumber) || undefined,
|
|
34
|
+
includeNotTracking: (0, Utils_1.parseBooleanQueryParam)(queryData.includeNotTracking),
|
|
35
|
+
includeNotPublic: (0, Utils_1.parseBooleanQueryParam)(queryData.includeNotPublic),
|
|
36
|
+
limit: Number(queryData.limit) || undefined,
|
|
37
|
+
offset: Number(queryData.offset) || undefined,
|
|
38
|
+
routeId: queryData.routeId,
|
|
39
|
+
routeShortName: queryData.routeShortName,
|
|
40
|
+
updatedSince: queryData.updatedSince ? new Date(queryData.updatedSince) : null,
|
|
39
41
|
preferredTimezone,
|
|
40
42
|
});
|
|
41
43
|
res.set("X-Last-Modified", (0, moment_timezone_1.default)(result.metadata.maxUpdatedAt).toISOString()).status(200).send(result.data);
|
|
@@ -48,12 +50,13 @@ class V2VehiclePositionsRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
48
50
|
}
|
|
49
51
|
};
|
|
50
52
|
this.GetOne = async (req, res, next) => {
|
|
53
|
+
const queryData = (0, express_validator_2.matchedData)(req);
|
|
51
54
|
const id = req.params.id;
|
|
52
|
-
const preferredTimezone = shared_1.RopidRouterUtils.getPreferredTimezone(
|
|
55
|
+
const preferredTimezone = shared_1.RopidRouterUtils.getPreferredTimezone(queryData.preferredTimezone);
|
|
53
56
|
try {
|
|
54
57
|
const data = await this.tripWithPositionRepository.GetOneByGTFSTripId(id, {
|
|
55
|
-
includeNotTracking: (0, Utils_1.parseBooleanQueryParam)(
|
|
56
|
-
includePositions: (0, Utils_1.parseBooleanQueryParam)(
|
|
58
|
+
includeNotTracking: (0, Utils_1.parseBooleanQueryParam)(queryData.includeNotTracking),
|
|
59
|
+
includePositions: (0, Utils_1.parseBooleanQueryParam)(queryData.includePositions),
|
|
57
60
|
preferredTimezone,
|
|
58
61
|
});
|
|
59
62
|
if (!data) {
|
|
@@ -108,7 +111,7 @@ class V2VehiclePositionsRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
108
111
|
(0, express_validator_1.query)("includeNotPublic").optional().isBoolean().not().isArray(),
|
|
109
112
|
(0, express_validator_1.query)("updatedSince").optional().isISO8601().not().isArray(),
|
|
110
113
|
(0, express_validator_1.query)("preferredTimezone").optional().isIn(constants_1.ValidationArrays.preferredTimezone).not().isArray(),
|
|
111
|
-
],
|
|
114
|
+
], (0, Validation_1.paginationLimitMiddleware)(this.constructor.name), Validation_1.checkErrors,
|
|
112
115
|
// max-age 5 seconds, stale-while-revalidate 5 seconds
|
|
113
116
|
this.cacheHeaderMiddleware.getMiddleware(5, 5), this.compressionByDefaultMiddleware.getMiddleware(), this.GetAll);
|
|
114
117
|
this.router.get("/:id", [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2VehiclePositionsRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/routers/v2/V2VehiclePositionsRouter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,4CAA8C;AAC9C,yDAAsE;AACtE,mDAAiE;AAGjE,sFAAmF;AACnF,+FAA6F;AAG7F,mEAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"V2VehiclePositionsRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/routers/v2/V2VehiclePositionsRouter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "4.3.2-dev.
|
|
3
|
+
"version": "4.3.2-dev.2132352828",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@commitlint/cli": "^11.0.0",
|
|
38
38
|
"@commitlint/config-conventional": "^11.0.0",
|
|
39
39
|
"@golemio/cli": "1.11.0",
|
|
40
|
-
"@golemio/core": "
|
|
40
|
+
"@golemio/core": "2.0.0",
|
|
41
41
|
"@golemio/db-common": "1.2.0",
|
|
42
42
|
"@golemio/eslint-config": "1.1.2",
|
|
43
43
|
"@types/chai": "4.2.3",
|