@golemio/pid 2.20.0 → 2.20.1-dev.1445988247

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.
@@ -1,8 +1,15 @@
1
1
  export declare enum VehicleDescriptorStateEnum {
2
- Dilny = "dilny",
3
- Doco = "doco",
4
- Nzr = "nzr",
5
- Zar = "zar"
2
+ ZAR = "zar",
3
+ DOCO = "doco",
4
+ NZR = "nzr",
5
+ MUZ = "muz",
6
+ DILNY = "dilny",
7
+ NEZ = "nez",
8
+ ODS = "ods",
9
+ SLUZ = "sluz",
10
+ PROD = "prod",
11
+ ZRUS = "zrus",
12
+ VRAK = "vrak"
6
13
  }
7
14
  export declare enum VehicleDescriptorTractionEnum {
8
15
  Tram = "tramvaj",
@@ -3,10 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.VehicleDescriptorTractionEnum = exports.VehicleDescriptorStateEnum = void 0;
4
4
  var VehicleDescriptorStateEnum;
5
5
  (function (VehicleDescriptorStateEnum) {
6
- VehicleDescriptorStateEnum["Dilny"] = "dilny";
7
- VehicleDescriptorStateEnum["Doco"] = "doco";
8
- VehicleDescriptorStateEnum["Nzr"] = "nzr";
9
- VehicleDescriptorStateEnum["Zar"] = "zar";
6
+ VehicleDescriptorStateEnum["ZAR"] = "zar";
7
+ VehicleDescriptorStateEnum["DOCO"] = "doco";
8
+ VehicleDescriptorStateEnum["NZR"] = "nzr";
9
+ VehicleDescriptorStateEnum["MUZ"] = "muz";
10
+ VehicleDescriptorStateEnum["DILNY"] = "dilny";
11
+ VehicleDescriptorStateEnum["NEZ"] = "nez";
12
+ VehicleDescriptorStateEnum["ODS"] = "ods";
13
+ VehicleDescriptorStateEnum["SLUZ"] = "sluz";
14
+ VehicleDescriptorStateEnum["PROD"] = "prod";
15
+ VehicleDescriptorStateEnum["ZRUS"] = "zrus";
16
+ VehicleDescriptorStateEnum["VRAK"] = "vrak";
10
17
  })(VehicleDescriptorStateEnum || (exports.VehicleDescriptorStateEnum = VehicleDescriptorStateEnum = {}));
11
18
  var VehicleDescriptorTractionEnum;
12
19
  (function (VehicleDescriptorTractionEnum) {
@@ -1 +1 @@
1
- {"version":3,"file":"VehicleDescriptorEnums.js","sourceRoot":"","sources":["../../src/helpers/VehicleDescriptorEnums.ts"],"names":[],"mappings":";;;AAAA,IAAY,0BAKX;AALD,WAAY,0BAA0B;IAClC,6CAAe,CAAA;IACf,2CAAa,CAAA;IACb,yCAAW,CAAA;IACX,yCAAW,CAAA;AACf,CAAC,EALW,0BAA0B,0CAA1B,0BAA0B,QAKrC;AAED,IAAY,6BAKX;AALD,WAAY,6BAA6B;IACrC,iDAAgB,CAAA;IAChB,gDAAe,CAAA;IACf,2DAA0B,CAAA;IAC1B,yDAAwB,CAAA;AAC5B,CAAC,EALW,6BAA6B,6CAA7B,6BAA6B,QAKxC"}
1
+ {"version":3,"file":"VehicleDescriptorEnums.js","sourceRoot":"","sources":["../../src/helpers/VehicleDescriptorEnums.ts"],"names":[],"mappings":";;;AAAA,IAAY,0BAYX;AAZD,WAAY,0BAA0B;IAClC,yCAAW,CAAA;IACX,2CAAa,CAAA;IACb,yCAAW,CAAA;IACX,yCAAW,CAAA;IACX,6CAAe,CAAA;IACf,yCAAW,CAAA;IACX,yCAAW,CAAA;IACX,2CAAa,CAAA;IACb,2CAAa,CAAA;IACb,2CAAa,CAAA;IACb,2CAAa,CAAA;AACjB,CAAC,EAZW,0BAA0B,0CAA1B,0BAA0B,QAYrC;AAED,IAAY,6BAKX;AALD,WAAY,6BAA6B;IACrC,iDAAgB,CAAA;IAChB,gDAAe,CAAA;IACf,2DAA0B,CAAA;IAC1B,yDAAwB,CAAA;AAC5B,CAAC,EALW,6BAA6B,6CAA7B,6BAA6B,QAKxC"}
@@ -9,4 +9,7 @@ export declare class DescriptorFilter implements IDescriptorFilter {
9
9
  * - combination of registration number and gtfs route type is unique
10
10
  */
11
11
  yieldFilteredDescriptors(descriptors: IDescriptorOutputDto[]): Generator<IDescriptorOutputDto>;
12
+ private isValidState;
13
+ private isValidTraction;
14
+ private getKeyWithState;
12
15
  }
@@ -15,24 +15,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.DescriptorFilter = void 0;
16
16
  const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
17
17
  const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
18
+ const VehicleDescriptorEnums_1 = require("../../../../../helpers/VehicleDescriptorEnums");
18
19
  let DescriptorFilter = exports.DescriptorFilter = class DescriptorFilter {
19
20
  constructor(logger) {
20
21
  this.logger = logger;
22
+ this.isValidState = (state) => {
23
+ return Object.values(VehicleDescriptorEnums_1.VehicleDescriptorStateEnum).includes(state);
24
+ };
25
+ this.isValidTraction = (traction) => {
26
+ return Object.values(VehicleDescriptorEnums_1.VehicleDescriptorTractionEnum).includes(traction);
27
+ };
21
28
  }
22
29
  /**
23
30
  * Yield descriptors that are valid for saving (filter out duplicates entirely)
24
31
  * - combination of registration number and gtfs route type is unique
25
32
  */
26
33
  *yieldFilteredDescriptors(descriptors) {
27
- for (const currentDescriptor of descriptors) {
28
- const { registration_number, gtfs_route_type } = currentDescriptor;
29
- const interceptedDescriptors = descriptors.filter((descriptor) => descriptor.registration_number === registration_number && descriptor.gtfs_route_type === gtfs_route_type);
30
- if (interceptedDescriptors.length === 1) {
31
- yield currentDescriptor;
34
+ const sortedDescriptors = descriptors.sort((a, b) => {
35
+ if (this.getKeyWithState(a.registration_number, a.gtfs_route_type, a.state) >
36
+ this.getKeyWithState(b.registration_number, b.gtfs_route_type, b.state)) {
37
+ return -1;
38
+ }
39
+ else {
40
+ return 1;
41
+ }
42
+ });
43
+ const seenCombinations = new Set();
44
+ for (const descriptor of sortedDescriptors) {
45
+ const { state, traction, registration_number, gtfs_route_type } = descriptor;
46
+ if (this.isValidState(state) && this.isValidTraction(traction)) {
47
+ const combination = `${registration_number}-${gtfs_route_type}`;
48
+ if (!seenCombinations.has(combination)) {
49
+ seenCombinations.add(combination);
50
+ yield descriptor;
51
+ }
52
+ else {
53
+ this.logger.info(`${this.constructor.name}: descriptor ${registration_number} for route type ${gtfs_route_type} is invalid`);
54
+ }
55
+ }
56
+ else {
57
+ this.logger.info(`${this.constructor.name}: invalid state: ${state} or traction: ${traction}`);
32
58
  }
33
- this.logger.info(`${this.constructor.name}: descriptor ${registration_number} for route type ${gtfs_route_type} is invalid`);
34
59
  }
35
60
  }
61
+ getKeyWithState(registration_number, gtfs_route_type, state) {
62
+ return `${registration_number}-${gtfs_route_type}-${Object.values(VehicleDescriptorEnums_1.VehicleDescriptorStateEnum).indexOf(state)}`;
63
+ }
36
64
  };
37
65
  exports.DescriptorFilter = DescriptorFilter = __decorate([
38
66
  (0, tsyringe_1.injectable)(),
@@ -1 +1 @@
1
- {"version":3,"file":"DescriptorFilter.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/helpers/DescriptorFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,wEAAqE;AAErE,iEAAwE;AAIjE,IAAM,gBAAgB,8BAAtB,MAAM,gBAAgB;IACzB,YAA8C,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEjE;;;OAGG;IACI,CAAC,wBAAwB,CAAC,WAAmC;QAChE,KAAK,MAAM,iBAAiB,IAAI,WAAW,EAAE;YACzC,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,GAAG,iBAAiB,CAAC;YACnE,MAAM,sBAAsB,GAAG,WAAW,CAAC,MAAM,CAC7C,CAAC,UAAU,EAAE,EAAE,CACX,UAAU,CAAC,mBAAmB,KAAK,mBAAmB,IAAI,UAAU,CAAC,eAAe,KAAK,eAAe,CAC/G,CAAC;YAEF,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrC,MAAM,iBAAiB,CAAC;aAC3B;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,gBAAgB,mBAAmB,mBAAmB,eAAe,aAAa,CAC7G,CAAC;SACL;IACL,CAAC;CACJ,CAAA;2BAxBY,gBAAgB;IAD5B,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GAD5B,gBAAgB,CAwB5B"}
1
+ {"version":3,"file":"DescriptorFilter.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/helpers/DescriptorFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,wEAAqE;AAErE,iEAAwE;AAExE,0FAA4G;AAIrG,IAAM,gBAAgB,8BAAtB,MAAM,gBAAgB;IACzB,YAAsC,MAAuB;QAAf,WAAM,GAAN,MAAM,CAAS;QAoCrD,iBAAY,GAAG,CAAC,KAAa,EAAuC,EAAE;YAC1E,OAAO,MAAM,CAAC,MAAM,CAAC,mDAA0B,CAAC,CAAC,QAAQ,CAAC,KAAmC,CAAC,CAAC;QACnG,CAAC,CAAC;QAEM,oBAAe,GAAG,CAAC,QAAgB,EAA6C,EAAE;YACtF,OAAO,MAAM,CAAC,MAAM,CAAC,sDAA6B,CAAC,CAAC,QAAQ,CAAC,QAAyC,CAAC,CAAC;QAC5G,CAAC,CAAC;IA1C8D,CAAC;IAEjE;;;OAGG;IACI,CAAC,wBAAwB,CAAC,WAAmC;QAChE,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAChD,IACI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC;gBACvE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,EACzE;gBACE,OAAO,CAAC,CAAC,CAAC;aACb;iBAAM;gBACH,OAAO,CAAC,CAAC;aACZ;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;YACxC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;YAC7E,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE;gBAC5D,MAAM,WAAW,GAAG,GAAG,mBAAmB,IAAI,eAAe,EAAE,CAAC;gBAChE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;oBACpC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBAClC,MAAM,UAAU,CAAC;iBACpB;qBAAM;oBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,gBAAgB,mBAAmB,mBAAmB,eAAe,aAAa,CAC7G,CAAC;iBACL;aACJ;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,oBAAoB,KAAK,iBAAiB,QAAQ,EAAE,CAAC,CAAC;aAClG;SACJ;IACL,CAAC;IASO,eAAe,CAAC,mBAA2B,EAAE,eAAuB,EAAE,KAAa;QACvF,OAAO,GAAG,mBAAmB,IAAI,eAAe,IAAI,MAAM,CAAC,MAAM,CAAC,mDAA0B,CAAC,CAAC,OAAO,CACjG,KAAmC,CACtC,EAAE,CAAC;IACR,CAAC;CACJ,CAAA;2BAlDY,gBAAgB;IAD5B,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GAD5B,gBAAgB,CAkD5B"}
@@ -5,7 +5,5 @@ export declare class DescriptorTransformation extends BaseTransformation impleme
5
5
  name: string;
6
6
  transform: (data: IVehicleListInfo[]) => Promise<IDescriptorOutputDto[]>;
7
7
  protected transformElement: (dataItem: IVehicleListInfo) => IDescriptorOutputDto | void;
8
- private isValidState;
9
- private isValidTraction;
10
8
  private mapTractionToRouteType;
11
9
  }
@@ -28,9 +28,6 @@ let DescriptorTransformation = exports.DescriptorTransformation = class Descript
28
28
  };
29
29
  this.transformElement = (dataItem) => {
30
30
  var _a, _b;
31
- if (!this.isValidState(dataItem.state) || !this.isValidTraction(dataItem.traction)) {
32
- return;
33
- }
34
31
  return {
35
32
  id: dataItem.id,
36
33
  state: dataItem.state,
@@ -50,12 +47,6 @@ let DescriptorTransformation = exports.DescriptorTransformation = class Descript
50
47
  photo_url: ((_b = dataItem.photoUrl) === null || _b === void 0 ? void 0 : _b.length) === 0 ? null : dataItem.photoUrl,
51
48
  };
52
49
  };
53
- this.isValidState = (state) => {
54
- return Object.values(VehicleDescriptorEnums_1.VehicleDescriptorStateEnum).includes(state);
55
- };
56
- this.isValidTraction = (traction) => {
57
- return Object.values(VehicleDescriptorEnums_1.VehicleDescriptorTractionEnum).includes(traction);
58
- };
59
50
  this.mapTractionToRouteType = (traction) => {
60
51
  switch (traction) {
61
52
  case VehicleDescriptorEnums_1.VehicleDescriptorTractionEnum.Bus:
@@ -1 +1 @@
1
- {"version":3,"file":"DescriptorTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/transformations/DescriptorTransformation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DescriptorTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/transformations/DescriptorTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,2FAA4G;AAC5G,6EAAwE;AACxE,iEAAgE;AAChE,0EAA+D;AAC/D,0FAA+G;AAGxG,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,oCAAkB;IAAzD;;QACI,SAAI,GAAG,4BAA4B,CAAC;QAEpC,cAAS,GAAG,CAAC,IAAwB,EAAmC,EAAE;YAC7E,MAAM,GAAG,GAA2B,EAAE,CAAC;YACvC,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE;gBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,OAAO,EAAE;oBACT,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACrB;aACJ;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC;QAEQ,qBAAgB,GAAG,CAAC,QAA0B,EAA+B,EAAE;;YACrF,OAAO;gBACH,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,mBAAmB,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC9C,yBAAyB,EAAE,QAAQ,CAAC,WAAW;gBAC/C,aAAa,EAAE,QAAQ,CAAC,KAAK;gBAC7B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,eAAe,EAAE,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC/D,wBAAwB,EAAE,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;gBAC5F,kBAAkB,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY;gBAC3C,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW;gBACxC,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,aAAa,EAAE,CAAA,MAAA,QAAQ,CAAC,YAAY,0CAAE,MAAM,MAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY;gBACjF,SAAS,EAAE,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,MAAM,MAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ;aACxE,CAAC;QACN,CAAC,CAAC;QAEM,2BAAsB,GAAG,CAAC,QAAgB,EAAU,EAAE;YAC1D,QAAQ,QAAQ,EAAE;gBACd,KAAK,sDAA6B,CAAC,GAAG;oBAClC,OAAO,kCAAiB,CAAC,GAAG,CAAC;gBACjC,KAAK,sDAA6B,CAAC,WAAW;oBAC1C,OAAO,kCAAiB,CAAC,GAAG,CAAC;gBACjC,KAAK,sDAA6B,CAAC,UAAU;oBACzC,OAAO,kCAAiB,CAAC,UAAU,CAAC;gBACxC,KAAK,sDAA6B,CAAC,IAAI;oBACnC,OAAO,kCAAiB,CAAC,IAAI,CAAC;gBAClC;oBACI,MAAM,IAAI,6BAAY,CAAC,GAAG,IAAI,CAAC,IAAI,uBAAuB,QAAQ,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACpG;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;mCAlDY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;GACA,wBAAwB,CAkDpC"}
@@ -57,7 +57,7 @@ let StopTimesTripScopeHandler = exports.StopTimesTripScopeHandler = class StopTi
57
57
  : luxon_1.DateTime.fromFormat(stopTime.properties.arrival_time, "HH:mm:ss").plus({
58
58
  seconds: stopTimeWithDelay.arr_delay,
59
59
  });
60
- const rtDepartureTime = stopTimeWithDelay.dep_delay === null
60
+ let rtDepartureTime = stopTimeWithDelay.dep_delay === null
61
61
  ? null
62
62
  : luxon_1.DateTime.fromFormat(stopTime.properties.departure_time, "HH:mm:ss").plus({
63
63
  seconds: stopTimeWithDelay.dep_delay,
@@ -1 +1 @@
1
- {"version":3,"file":"StopTimesTripScopeHandler.js","sourceRoot":"","sources":["../../../../../../../src/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StopTimesTripScopeHandler.js","sourceRoot":"","sources":["../../../../../../../src/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,6 @@
1
- import { GTFSRouteTypeEnum } from "../../../../helpers/RouteTypeEnums";
2
- import { VehicleDescriptorStateEnum } from "../../../../helpers/VehicleDescriptorEnums";
3
1
  export interface IDescriptorOutputDto {
4
2
  id: number;
5
- state: VehicleDescriptorStateEnum;
3
+ state: string;
6
4
  registration_number: number;
7
5
  registration_number_index: number;
8
6
  license_plate: string | null;
@@ -10,7 +8,7 @@ export interface IDescriptorOutputDto {
10
8
  manufacturer: string;
11
9
  type: string;
12
10
  traction: string;
13
- gtfs_route_type: GTFSRouteTypeEnum;
11
+ gtfs_route_type: number;
14
12
  is_air_conditioned: boolean;
15
13
  is_wheelchair_accessible: boolean | null;
16
14
  has_usb_chargers: boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/pid",
3
- "version": "2.20.0",
3
+ "version": "2.20.1-dev.1445988247",
4
4
  "description": "Golemio PID Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -76,7 +76,7 @@
76
76
  "@golemio/core": ">=1.11.2-dev.1367649005"
77
77
  },
78
78
  "dependencies": {
79
- "@golemio/ovapi-gtfs-realtime-bindings": "1.2.3",
79
+ "@golemio/ovapi-gtfs-realtime-bindings": "1.2.4-dev.1288219308",
80
80
  "@turf/turf": "^6.5.0",
81
81
  "cheap-ruler": "^3.0.2",
82
82
  "csv-parser": "^3.0.0",