minotor 13.0.0 → 13.0.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/CHANGELOG.md +3 -9
- package/dist/cli.mjs +1419 -1420
- package/dist/cli.mjs.map +1 -1
- package/dist/gtfs/__tests__/logging.test.d.ts +1 -0
- package/dist/gtfs/logging.d.ts +8 -0
- package/dist/parser.cjs.js +108 -98
- package/dist/parser.cjs.js.map +1 -1
- package/dist/parser.d.ts +4 -2
- package/dist/parser.esm.js +108 -99
- package/dist/parser.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/minotor.ts +3 -11
- package/src/gtfs/__tests__/logging.test.ts +100 -0
- package/src/gtfs/frequencies.ts +1 -2
- package/src/gtfs/logging.ts +15 -0
- package/src/gtfs/parser.ts +1 -2
- package/src/gtfs/routes.ts +1 -2
- package/src/gtfs/stops.ts +1 -2
- package/src/gtfs/transfers.ts +1 -2
- package/src/gtfs/trips.ts +1 -2
- package/src/parser.ts +4 -0
package/package.json
CHANGED
package/src/cli/minotor.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import fs from 'fs';
|
|
3
|
-
import log from 'loglevel';
|
|
4
3
|
import { DateTime } from 'luxon';
|
|
5
4
|
|
|
6
5
|
import {
|
|
7
6
|
extendedGtfsProfile,
|
|
8
7
|
GtfsParser,
|
|
9
8
|
GtfsProfile,
|
|
9
|
+
setParserLogLevel,
|
|
10
10
|
standardGtfsProfile,
|
|
11
11
|
StraightLineTransferGenerator,
|
|
12
12
|
} from '../parser.js';
|
|
@@ -82,11 +82,7 @@ program
|
|
|
82
82
|
verbose: boolean;
|
|
83
83
|
},
|
|
84
84
|
) => {
|
|
85
|
-
|
|
86
|
-
log.setDefaultLevel(log.levels.INFO);
|
|
87
|
-
} else {
|
|
88
|
-
log.setDefaultLevel(log.levels.ERROR);
|
|
89
|
-
}
|
|
85
|
+
setParserLogLevel(options.verbose ? 'info' : 'error');
|
|
90
86
|
const radiusMeters =
|
|
91
87
|
options.virtualTransfersRadius !== undefined
|
|
92
88
|
? parseInt(options.virtualTransfersRadius, 10)
|
|
@@ -125,11 +121,7 @@ program
|
|
|
125
121
|
verbose: boolean;
|
|
126
122
|
},
|
|
127
123
|
) => {
|
|
128
|
-
|
|
129
|
-
log.setDefaultLevel(log.levels.INFO);
|
|
130
|
-
} else {
|
|
131
|
-
log.setDefaultLevel(log.levels.ERROR);
|
|
132
|
-
}
|
|
124
|
+
setParserLogLevel(options.verbose ? 'info' : 'error');
|
|
133
125
|
const parser = new GtfsParser(gtfsPath, profiles[options.profileName]);
|
|
134
126
|
const stopsIndex = await parser.parseStops();
|
|
135
127
|
fs.writeFileSync(options.stopsOutputPath, stopsIndex.serialize());
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { Readable } from 'node:stream';
|
|
3
|
+
import { afterEach, beforeEach, test, TestContext } from 'node:test';
|
|
4
|
+
|
|
5
|
+
import log from 'loglevel';
|
|
6
|
+
|
|
7
|
+
import { GtfsParser, setParserLogLevel } from '../../parser.js';
|
|
8
|
+
import { parserLog } from '../logging.js';
|
|
9
|
+
import { parseTransfers } from '../transfers.js';
|
|
10
|
+
|
|
11
|
+
let previousParserLevel: ReturnType<typeof parserLog.getLevel>;
|
|
12
|
+
let previousRootLevel: ReturnType<typeof log.getLevel>;
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
previousParserLevel = parserLog.getLevel();
|
|
15
|
+
previousRootLevel = log.getLevel();
|
|
16
|
+
});
|
|
17
|
+
afterEach(() => {
|
|
18
|
+
parserLog.setLevel(previousParserLevel, false);
|
|
19
|
+
log.setLevel(previousRootLevel, false);
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
function captureConsole(t: TestContext) {
|
|
23
|
+
const calls = {
|
|
24
|
+
info: t.mock.method(console, 'info', () => {}),
|
|
25
|
+
warn: t.mock.method(console, 'warn', () => {}),
|
|
26
|
+
error: t.mock.method(console, 'error', () => {}),
|
|
27
|
+
};
|
|
28
|
+
t.after(() => {
|
|
29
|
+
t.mock.restoreAll();
|
|
30
|
+
parserLog.rebuild();
|
|
31
|
+
log.rebuild();
|
|
32
|
+
});
|
|
33
|
+
return calls;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
test('parser defaults to warnings', () => {
|
|
37
|
+
assert.equal(parserLog.getLevel(), parserLog.levels.WARN);
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
for (const [level, expected] of [
|
|
41
|
+
['info', [1, 1, 1]],
|
|
42
|
+
['warn', [0, 1, 1]],
|
|
43
|
+
['error', [0, 0, 1]],
|
|
44
|
+
['silent', [0, 0, 0]],
|
|
45
|
+
] as const) {
|
|
46
|
+
test(`parser filters diagnostics at ${level}`, (t) => {
|
|
47
|
+
const calls = captureConsole(t);
|
|
48
|
+
setParserLogLevel(level);
|
|
49
|
+
parserLog.info('progress');
|
|
50
|
+
parserLog.warn('warning');
|
|
51
|
+
parserLog.error('error');
|
|
52
|
+
assert.deepEqual(
|
|
53
|
+
Object.values(calls).map((method) => method.mock.callCount()),
|
|
54
|
+
expected,
|
|
55
|
+
);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
test('parsing respects the level and preserves output and application logging', async (t) => {
|
|
60
|
+
const calls = captureConsole(t);
|
|
61
|
+
const parser = new GtfsParser(
|
|
62
|
+
'./src/gtfs/__tests__/resources/sample-feed.zip',
|
|
63
|
+
);
|
|
64
|
+
const date = new Date('2007-01-10');
|
|
65
|
+
log.setLevel('error', false);
|
|
66
|
+
setParserLogLevel('info');
|
|
67
|
+
const stops = (await parser.parseStops()).serialize();
|
|
68
|
+
assert.ok(calls.info.mock.callCount() > 0);
|
|
69
|
+
calls.info.mock.resetCalls();
|
|
70
|
+
const timetable = (await parser.parseTimetable(date)).serialize();
|
|
71
|
+
assert.ok(calls.info.mock.callCount() > 0);
|
|
72
|
+
assert.equal(log.getLevel(), log.levels.ERROR);
|
|
73
|
+
|
|
74
|
+
setParserLogLevel('silent');
|
|
75
|
+
for (const method of Object.values(calls)) method.mock.resetCalls();
|
|
76
|
+
assert.deepEqual((await parser.parseStops()).serialize(), stops);
|
|
77
|
+
assert.deepEqual((await parser.parseTimetable(date)).serialize(), timetable);
|
|
78
|
+
assert.deepEqual(
|
|
79
|
+
Object.values(calls).map((method) => method.mock.callCount()),
|
|
80
|
+
[0, 0, 0],
|
|
81
|
+
);
|
|
82
|
+
assert.equal(parserLog.getLevel(), parserLog.levels.SILENT);
|
|
83
|
+
assert.equal(log.getLevel(), log.levels.ERROR);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
test('transfer warnings use the parser logger', async (t) => {
|
|
87
|
+
const calls = captureConsole(t);
|
|
88
|
+
for (const level of ['warn', 'silent'] as const) {
|
|
89
|
+
setParserLogLevel(level);
|
|
90
|
+
calls.warn.mock.resetCalls();
|
|
91
|
+
await parseTransfers(
|
|
92
|
+
Readable.from([
|
|
93
|
+
'from_stop_id,to_stop_id,transfer_type\nmissing,other,0\n',
|
|
94
|
+
]),
|
|
95
|
+
new Map(),
|
|
96
|
+
new Set(),
|
|
97
|
+
);
|
|
98
|
+
assert.equal(calls.warn.mock.callCount(), level === 'warn' ? 1 : 0);
|
|
99
|
+
}
|
|
100
|
+
});
|
package/src/gtfs/frequencies.ts
CHANGED
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import log from 'loglevel';
|
|
2
|
+
|
|
3
|
+
export type ParserLogLevel =
|
|
4
|
+
'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent';
|
|
5
|
+
|
|
6
|
+
export const parserLog = log.getLogger('minotor:gtfs');
|
|
7
|
+
parserLog.setLevel('warn', false);
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Set logging for all GTFS parser instances in this module.
|
|
11
|
+
* Defaults to warn.
|
|
12
|
+
*/
|
|
13
|
+
export function setParserLogLevel(level: ParserLogLevel): void {
|
|
14
|
+
parserLog.setLevel(level, false);
|
|
15
|
+
}
|
package/src/gtfs/parser.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import log from 'loglevel';
|
|
2
1
|
import { DateTime } from 'luxon';
|
|
3
2
|
import StreamZip from 'node-stream-zip';
|
|
4
3
|
|
|
@@ -7,6 +6,7 @@ import { StopsIndex } from '../stops/stopsIndex.js';
|
|
|
7
6
|
import { RouteType, Timetable } from '../timetable/timetable.js';
|
|
8
7
|
import { TransferGenerator } from '../transfers/generator.js';
|
|
9
8
|
import { FrequenciesMap, parseFrequencies } from './frequencies.js';
|
|
9
|
+
import { parserLog as log } from './logging.js';
|
|
10
10
|
import { standardGtfsProfile } from './profiles/standard.js';
|
|
11
11
|
import { indexRoutes, parseRoutes } from './routes.js';
|
|
12
12
|
import { parseCalendar, parseCalendarDates, ServiceIds } from './services.js';
|
|
@@ -69,7 +69,6 @@ export class GtfsParser {
|
|
|
69
69
|
* @returns The parsed timetable.
|
|
70
70
|
*/
|
|
71
71
|
async parseTimetable(date: Date): Promise<Timetable> {
|
|
72
|
-
log.setLevel('INFO');
|
|
73
72
|
const zip = new StreamZip.async({ file: this.path });
|
|
74
73
|
const entries = await zip.entries();
|
|
75
74
|
const datetime = DateTime.fromJSDate(date);
|
package/src/gtfs/routes.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import log from 'loglevel';
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
RouteType,
|
|
5
3
|
ServiceRoute,
|
|
6
4
|
ServiceRouteId,
|
|
7
5
|
} from '../timetable/timetable.js';
|
|
6
|
+
import { parserLog as log } from './logging.js';
|
|
8
7
|
import { GtfsProfile } from './parser.js';
|
|
9
8
|
import { standardGtfsProfile } from './profiles/standard.js';
|
|
10
9
|
import { parseCsv } from './utils.js';
|
package/src/gtfs/stops.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import log from 'loglevel';
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
Latitude,
|
|
5
3
|
LocationType,
|
|
@@ -8,6 +6,7 @@ import {
|
|
|
8
6
|
SourceStopId,
|
|
9
7
|
Stop,
|
|
10
8
|
} from '../stops/stops.js';
|
|
9
|
+
import { parserLog as log } from './logging.js';
|
|
11
10
|
import { parseCsv } from './utils.js';
|
|
12
11
|
|
|
13
12
|
export type GtfsLocationType =
|
package/src/gtfs/transfers.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import log from 'loglevel';
|
|
2
|
-
|
|
3
1
|
import { SourceStopId, StopId } from '../stops/stops.js';
|
|
4
2
|
import { Route } from '../timetable/route.js';
|
|
5
3
|
import { durationFromSeconds } from '../timetable/time.js';
|
|
@@ -13,6 +11,7 @@ import {
|
|
|
13
11
|
TripTransfers as TripTransfers,
|
|
14
12
|
} from '../timetable/timetable.js';
|
|
15
13
|
import { encode } from '../timetable/tripStopId.js';
|
|
14
|
+
import { parserLog as log } from './logging.js';
|
|
16
15
|
import { ServiceId, ServiceIds } from './services.js';
|
|
17
16
|
import { GtfsStopsMap } from './stops.js';
|
|
18
17
|
import { GtfsTripId, TripsMapping } from './trips.js';
|
package/src/gtfs/trips.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import log from 'loglevel';
|
|
2
|
-
|
|
3
1
|
import { SourceStopId, StopId } from '../stops/stops.js';
|
|
4
2
|
import { SerializedRoute } from '../timetable/io.js';
|
|
5
3
|
import type { RouteId, TripRouteIndex } from '../timetable/route.js';
|
|
@@ -10,6 +8,7 @@ import {
|
|
|
10
8
|
StopAdjacency,
|
|
11
9
|
} from '../timetable/timetable.js';
|
|
12
10
|
import { FrequenciesMap } from './frequencies.js';
|
|
11
|
+
import { parserLog as log } from './logging.js';
|
|
13
12
|
import { GtfsRouteId, GtfsRoutesMap } from './routes.js';
|
|
14
13
|
import { ServiceId, ServiceIds } from './services.js';
|
|
15
14
|
import { GtfsStopsMap } from './stops.js';
|
package/src/parser.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { ParserLogLevel } from './gtfs/logging.js';
|
|
2
|
+
import { setParserLogLevel } from './gtfs/logging.js';
|
|
1
3
|
import type { GtfsProfile } from './gtfs/parser.js';
|
|
2
4
|
import { GtfsParser } from './gtfs/parser.js';
|
|
3
5
|
import { extendedGtfsProfile } from './gtfs/profiles/extended.js';
|
|
@@ -13,6 +15,7 @@ import { StraightLineTransferGenerator } from './transfers/straightLineTransferG
|
|
|
13
15
|
export {
|
|
14
16
|
extendedGtfsProfile,
|
|
15
17
|
GtfsParser,
|
|
18
|
+
setParserLogLevel,
|
|
16
19
|
standardGtfsProfile,
|
|
17
20
|
StraightLineTransferGenerator,
|
|
18
21
|
TransferTypes,
|
|
@@ -20,6 +23,7 @@ export {
|
|
|
20
23
|
export type {
|
|
21
24
|
GeneratedTransfers,
|
|
22
25
|
GtfsProfile,
|
|
26
|
+
ParserLogLevel,
|
|
23
27
|
StraightLineTransferGeneratorOptions,
|
|
24
28
|
TransferGenerator,
|
|
25
29
|
};
|