corequery 0.33.0 → 0.34.0
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/package.json +1 -1
- package/server/dist/server/api/handlers/departures/v0/index.js +17 -7
- package/server/dist/server/api/handlers/departures/v0/index.js.map +1 -1
- package/server/dist/server/api/handlers/departures/v0/to-api-result.js +1 -1
- package/server/dist/server/api/handlers/departures/v0/to-api-result.js.map +1 -1
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js +1 -1
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js.map +1 -1
- package/server/dist/server/data/departure-filters/departure-filter-type.d.ts +2 -2
- package/server/dist/server/data/departure-filters/departure-filter-type.js.map +1 -1
- package/server/dist/server/data/departure-filters/departure-filters.d.ts +4 -5
- package/server/dist/server/data/departure-filters/departure-filters.js +2 -2
- package/server/dist/server/data/departure-filters/departure-filters.js.map +1 -1
- package/server/dist/server/data/departure-filters/types/line-tag.js +1 -1
- package/server/dist/server/data/departure-filters/types/line-tag.js.map +1 -1
- package/server/dist/server/data/departure-filters/types/line.js +1 -1
- package/server/dist/server/data/departure-filters/types/line.js.map +1 -1
- package/server/dist/server/data/departure-filters/types/service-tag.js +1 -1
- package/server/dist/server/data/departure-filters/types/service-tag.js.map +1 -1
- package/server/dist/server/data/service/service-source.d.ts +11 -1
- package/server/dist/server/data/service/zipper-departures-iterator.d.ts +3 -2
- package/server/dist/server/data/service/zipper-departures-iterator.js +8 -9
- package/server/dist/server/data/service/zipper-departures-iterator.js.map +1 -1
package/package.json
CHANGED
|
@@ -13,9 +13,11 @@ export async function handle(ctx, args) {
|
|
|
13
13
|
const feedFilters = compiledFilters.map((x) => x.filterFunction);
|
|
14
14
|
for (const stopId of stopIds) {
|
|
15
15
|
const iterator = ctx.app.services.getDeparturesIterator(stopId, instant, args.direction);
|
|
16
|
-
while (!allFeedsSatisfied(results, args.feeds, stopId)
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
while (!allFeedsSatisfied(results, args.feeds, stopId)) {
|
|
17
|
+
const candidate = await iterator.peek();
|
|
18
|
+
if (candidate == null)
|
|
19
|
+
break;
|
|
20
|
+
const matchingResults = [];
|
|
19
21
|
for (let i = 0; i < args.feeds.length; i++) {
|
|
20
22
|
const feed = itsOk(args.feeds[i]);
|
|
21
23
|
const passesFilter = itsOk(feedFilters[i]);
|
|
@@ -24,10 +26,18 @@ export async function handle(ctx, args) {
|
|
|
24
26
|
continue;
|
|
25
27
|
if (resultsSubarray.length >= feed.desiredCount)
|
|
26
28
|
continue;
|
|
27
|
-
if (!passesFilter(
|
|
29
|
+
if (!passesFilter(candidate))
|
|
28
30
|
continue;
|
|
29
|
-
if (isSkipped(
|
|
31
|
+
if (isSkipped(candidate, feed.skips))
|
|
30
32
|
continue;
|
|
33
|
+
matchingResults.push(resultsSubarray);
|
|
34
|
+
}
|
|
35
|
+
if (matchingResults.length === 0) {
|
|
36
|
+
await iterator.skip();
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
const departure = await iterator.take();
|
|
40
|
+
for (const resultsSubarray of matchingResults) {
|
|
31
41
|
// TODO: corequery-gtfs is synchronous here, but future service
|
|
32
42
|
// sources might not be. For that reason, while it doesn't matter
|
|
33
43
|
// right now, doing this in series is not ideal.
|
|
@@ -91,7 +101,7 @@ function allFeedsSatisfied(results, feeds, stopId) {
|
|
|
91
101
|
function isSkipped(departure, skips) {
|
|
92
102
|
// TODO: Should consider `movementIndex`, as looping services might appear
|
|
93
103
|
// multiple times in the same departures list.
|
|
94
|
-
return skips.some((s) => s.sourceId === departure.
|
|
95
|
-
s.intrasourceId === departure.
|
|
104
|
+
return skips.some((s) => s.sourceId === departure.sourceId &&
|
|
105
|
+
s.intrasourceId === departure.intrasourceId);
|
|
96
106
|
}
|
|
97
107
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAYnF,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,GAAkC,EAClC,IAAwC;IAExC,OAAO,qBAAqB,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;QAC3C,6CAA6C;QAC7C,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAiC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAEjE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CACrD,MAAM,EACN,OAAO,EACP,IAAI,CAAC,SAAS,CACf,CAAC;YAEF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ async function getNextServiceIfApplicable(app, service) {
|
|
|
37
37
|
if (service.nextServiceOfEntireVehicle == null)
|
|
38
38
|
return null;
|
|
39
39
|
const connection = service.nextServiceOfEntireVehicle;
|
|
40
|
-
const sourceId = connection.
|
|
40
|
+
const sourceId = connection.otherServiceSourceId;
|
|
41
41
|
const intrasourceId = connection.otherServiceIntrasourceId;
|
|
42
42
|
const other = await app.services.requireService(sourceId, intrasourceId);
|
|
43
43
|
return other.isCancelled ? null : other;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"to-api-result.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/to-api-result.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAiC,EACjC,SAAoB;IAEpB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAErE,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;QAEpC,sBAAsB,EAAE,gBAAgB,CAAC,OAAO;QAChD,wBAAwB,EAAE,gBAAgB,CAAC,SAAS;QAEpD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,gBAAgB,EAAE;QAEjC,WAAW,EAAE,OAAO,CAAC,WAAW;QAEhC,QAAQ,EAAE;YACR,KAAK,EAAE,SAAS,CAAC,aAAa;YAC9B,UAAU,EAAE,QAAQ,CAAC,iBAAiB;YACtC,IAAI,EAAE,QAAQ,CAAC,iCAAiC,CAAC,QAAQ,EAAE;YAE3D,UAAU,EACR,QAAQ,CAAC,uCAAuC,EAAE,QAAQ,EAAE,IAAI,IAAI;SACvE;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,GAAiC,EACjC,OAA6B;IAE7B,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAEtE,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACnE,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAClD,CAAC;IAED,wEAAwE;IACxE,wEAAwE;IACxE,2EAA2E;IAC3E,wBAAwB;IACxB,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAE5E,OAAO;QACL,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE,OAAO,UAAU,EAAE;KAC/B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,GAAiC,EACjC,OAA6B;IAE7B,IAAI,OAAO,CAAC,0BAA0B,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAE5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"to-api-result.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/to-api-result.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAiC,EACjC,SAAoB;IAEpB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAErE,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;QAEpC,sBAAsB,EAAE,gBAAgB,CAAC,OAAO;QAChD,wBAAwB,EAAE,gBAAgB,CAAC,SAAS;QAEpD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,gBAAgB,EAAE;QAEjC,WAAW,EAAE,OAAO,CAAC,WAAW;QAEhC,QAAQ,EAAE;YACR,KAAK,EAAE,SAAS,CAAC,aAAa;YAC9B,UAAU,EAAE,QAAQ,CAAC,iBAAiB;YACtC,IAAI,EAAE,QAAQ,CAAC,iCAAiC,CAAC,QAAQ,EAAE;YAE3D,UAAU,EACR,QAAQ,CAAC,uCAAuC,EAAE,QAAQ,EAAE,IAAI,IAAI;SACvE;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,GAAiC,EACjC,OAA6B;IAE7B,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAEtE,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACnE,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAClD,CAAC;IAED,wEAAwE;IACxE,wEAAwE;IACxE,2EAA2E;IAC3E,wBAAwB;IACxB,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAE5E,OAAO;QACL,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE,OAAO,UAAU,EAAE;KAC/B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,GAAiC,EACjC,OAA6B;IAE7B,IAAI,OAAO,CAAC,0BAA0B,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAE5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,oBAAoB,CAAC;IACjD,MAAM,aAAa,GAAG,UAAU,CAAC,yBAAyB,CAAC;IAC3D,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzE,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1C,CAAC"}
|
|
@@ -10,7 +10,7 @@ export function createCanonicalLinesServingStopAlgorithm(options) {
|
|
|
10
10
|
tags: Tags.build(line.tags, options.lineTagSuccession),
|
|
11
11
|
}));
|
|
12
12
|
const tierLinesByTag = options.tierLinesByTag ?? [];
|
|
13
|
-
return (stopId) => {
|
|
13
|
+
return (stopId, _tags) => {
|
|
14
14
|
const allCandidateLines = lines.filter((line) => isStopInDiagram(stopId, line.diagram));
|
|
15
15
|
if (tierLinesByTag.length === 0 || allCandidateLines.length === 0) {
|
|
16
16
|
return allCandidateLines.map((line) => line.id);
|
package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-canonical-lines-serving-stop-algorithm.js","sourceRoot":"","sources":["../../../../config/helpers/create-canonical-lines-serving-stop-algorithm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,kBAAkB,GAA+C;IACrE,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAoBF,MAAM,UAAU,wCAAwC,CACtD,OAAgB;IAEhB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACzC,GAAG,IAAI;QACP,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC;KACvD,CAAC,CAAC,CAAC;IAEJ,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;IAEpD,OAAO,CAAC,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"create-canonical-lines-serving-stop-algorithm.js","sourceRoot":"","sources":["../../../../config/helpers/create-canonical-lines-serving-stop-algorithm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,kBAAkB,GAA+C;IACrE,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAoBF,MAAM,UAAU,wCAAwC,CACtD,OAAgB;IAEhB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACzC,GAAG,IAAI;QACP,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC;KACvD,CAAC,CAAC,CAAC;IAEJ,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;IAEpD,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9C,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CACtC,CAAC;QAEF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClE,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,sEAAsE;QACtE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;YACrC,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,MAAM,IAAI,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9C,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACpD,OAAO,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,MAAc,EAAE,OAA0B;IACjE,OAAO,OAAO,CAAC,OAAO;SACnB,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gCAAgC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACjE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Corequery } from "../../corequery.js";
|
|
2
|
-
import type {
|
|
3
|
-
export type DepartureFilterFunction = (departure:
|
|
2
|
+
import type { LightweightDeparture } from "../service/service-source.js";
|
|
3
|
+
export type DepartureFilterFunction = (departure: LightweightDeparture) => boolean;
|
|
4
4
|
export declare abstract class DepartureFilterType<CustomContextType> {
|
|
5
5
|
protected readonly _app: Corequery<CustomContextType>;
|
|
6
6
|
readonly prefix: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"departure-filter-type.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filter-type.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"departure-filter-type.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filter-type.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,mBAAmB;IAElB;IACV;IAFX,YACqB,IAAkC,EAC5C,MAAc;QADJ,SAAI,GAAJ,IAAI,CAA8B;QAC5C,WAAM,GAAN,MAAM,CAAQ;IACtB,CAAC;CAGL"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { CustomDepartureFilterTypesConfig } from "../../config/types/custom-filter-function-type.js";
|
|
2
2
|
import type { Corequery } from "../../corequery.js";
|
|
3
|
-
import type { DepartureFilterType } from "./departure-filter-type.js";
|
|
4
|
-
import type { Departure } from "../service/departure.js";
|
|
3
|
+
import type { DepartureFilterFunction, DepartureFilterType } from "./departure-filter-type.js";
|
|
5
4
|
import { DepartureFilterToken } from "../../../shared/data/departure-filter-expression.js";
|
|
6
5
|
export declare class DepartureFilters<CustomContextType> {
|
|
7
6
|
private readonly _types;
|
|
@@ -9,8 +8,8 @@ export declare class DepartureFilters<CustomContextType> {
|
|
|
9
8
|
static build<CustomContextType>(app: Corequery<CustomContextType>, customDepartureFilterTypes: CustomDepartureFilterTypesConfig<CustomContextType>): DepartureFilters<CustomContextType>;
|
|
10
9
|
static createBuiltInFunctions<CustomContextType>(app: Corequery<CustomContextType>): DepartureFilterType<CustomContextType>[];
|
|
11
10
|
/**
|
|
12
|
-
* Returns a `(departure:
|
|
13
|
-
* provided filter expression. The filter expression must be given in
|
|
11
|
+
* Returns a `(departure: DepartureForFiltering) => boolean` function based on
|
|
12
|
+
* the provided filter expression. The filter expression must be given in
|
|
14
13
|
* conjunctive normal form (CNF), in the supported filter syntax.
|
|
15
14
|
*
|
|
16
15
|
* For example, `line:1|line:2 service-tag:1|service-tag:2 !arr` means the
|
|
@@ -24,7 +23,7 @@ export declare class DepartureFilters<CustomContextType> {
|
|
|
24
23
|
* allowed, so any complex expressions must be converted to CNF first.
|
|
25
24
|
*/
|
|
26
25
|
compile(filterExpression: string): {
|
|
27
|
-
filterFunction:
|
|
26
|
+
filterFunction: DepartureFilterFunction;
|
|
28
27
|
invalidTokens: Set<DepartureFilterToken>;
|
|
29
28
|
} | null;
|
|
30
29
|
private _compileToken;
|
|
@@ -37,8 +37,8 @@ export class DepartureFilters {
|
|
|
37
37
|
];
|
|
38
38
|
}
|
|
39
39
|
/**
|
|
40
|
-
* Returns a `(departure:
|
|
41
|
-
* provided filter expression. The filter expression must be given in
|
|
40
|
+
* Returns a `(departure: DepartureForFiltering) => boolean` function based on
|
|
41
|
+
* the provided filter expression. The filter expression must be given in
|
|
42
42
|
* conjunctive normal form (CNF), in the supported filter syntax.
|
|
43
43
|
*
|
|
44
44
|
* For example, `line:1|line:2 service-tag:1|service-tag:2 !arr` means the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"departure-filters.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"departure-filters.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filters.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export class LineTagDepartureFilterType extends DepartureFilterType {
|
|
|
11
11
|
const taggedLines = this._app.lines
|
|
12
12
|
.filter((x) => x.tags.has(lineTag))
|
|
13
13
|
.map((x) => x.id);
|
|
14
|
-
return (departure) => departure.
|
|
14
|
+
return (departure) => departure.lineIds.some((id) => taggedLines.includes(id));
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=line-tag.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,0BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACzB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpB,OAAO,CAAC,SAAS,EAAE,EAAE,CACnB,SAAS,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"line-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,0BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACzB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpB,OAAO,CAAC,SAAS,EAAE,EAAE,CACnB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF"}
|
|
@@ -8,7 +8,7 @@ export class LineDepartureFilterType extends DepartureFilterType {
|
|
|
8
8
|
const lineId = parseIntNull(args);
|
|
9
9
|
if (lineId === null)
|
|
10
10
|
return null;
|
|
11
|
-
return (departure) => departure.
|
|
11
|
+
return (departure) => departure.lineIds.includes(lineId);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=line.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,uBAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAEjC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,uBAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAEjC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC;CACF"}
|
|
@@ -8,7 +8,7 @@ export class ServiceTagDepartureFilterType extends DepartureFilterType {
|
|
|
8
8
|
const serviceTag = parseIntNull(args);
|
|
9
9
|
if (serviceTag === null)
|
|
10
10
|
return null;
|
|
11
|
-
return (departure) => departure.
|
|
11
|
+
return (departure) => departure.serviceTags.has(serviceTag);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=service-tag.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/service-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,6BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC5B,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAErC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"service-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/service-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,6BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC5B,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAErC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;CACF"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
import type { Service } from "./service.js";
|
|
2
2
|
import type { Departure } from "./departure.js";
|
|
3
|
+
import type { Tags } from "../tags.js";
|
|
4
|
+
import type { ServiceServicingMovement } from "./service-movement.js";
|
|
3
5
|
export type DeparturesIterationDirection = "forwards" | "backwards";
|
|
6
|
+
export type LightweightDeparture = {
|
|
7
|
+
readonly sourceId: string;
|
|
8
|
+
readonly intrasourceId: string;
|
|
9
|
+
readonly lineIds: readonly number[];
|
|
10
|
+
readonly serviceTags: Tags;
|
|
11
|
+
readonly movement: ServiceServicingMovement;
|
|
12
|
+
};
|
|
4
13
|
export type DeparturesIterator = {
|
|
5
|
-
peek: () => Promise<
|
|
14
|
+
peek: () => Promise<LightweightDeparture | null>;
|
|
15
|
+
skip: () => Promise<void>;
|
|
6
16
|
take: () => Promise<Departure>;
|
|
7
17
|
};
|
|
8
18
|
export type ServiceSource = {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DeparturesIterationDirection, DeparturesIterator } from "./service-source.js";
|
|
1
|
+
import type { LightweightDeparture, DeparturesIterationDirection, DeparturesIterator } from "./service-source.js";
|
|
2
2
|
import type { Departure } from "./departure.js";
|
|
3
3
|
export declare class ZipperDeparturesIterator implements DeparturesIterator {
|
|
4
4
|
private readonly _iterators;
|
|
@@ -6,7 +6,8 @@ export declare class ZipperDeparturesIterator implements DeparturesIterator {
|
|
|
6
6
|
private _nextIterator;
|
|
7
7
|
private _isInitialized;
|
|
8
8
|
constructor(_iterators: DeparturesIterator[], _direction: DeparturesIterationDirection);
|
|
9
|
-
peek(): Promise<
|
|
9
|
+
peek(): Promise<LightweightDeparture | null>;
|
|
10
|
+
skip(): Promise<void>;
|
|
10
11
|
take(): Promise<Departure>;
|
|
11
12
|
private _ensureSetup;
|
|
12
13
|
private _determineBestIterator;
|
|
@@ -16,6 +16,14 @@ export class ZipperDeparturesIterator {
|
|
|
16
16
|
return null;
|
|
17
17
|
return await this._nextIterator.peek();
|
|
18
18
|
}
|
|
19
|
+
async skip() {
|
|
20
|
+
await this._ensureSetup();
|
|
21
|
+
const iterator = this._nextIterator;
|
|
22
|
+
if (iterator == null)
|
|
23
|
+
throw new Error("Nothing to skip.");
|
|
24
|
+
await iterator.skip();
|
|
25
|
+
this._nextIterator = await this._determineBestIterator();
|
|
26
|
+
}
|
|
19
27
|
async take() {
|
|
20
28
|
await this._ensureSetup();
|
|
21
29
|
const iterator = this._nextIterator;
|
|
@@ -44,15 +52,6 @@ export class ZipperDeparturesIterator {
|
|
|
44
52
|
bestIterator = iterator;
|
|
45
53
|
}
|
|
46
54
|
}
|
|
47
|
-
// TODO: Should we be storing the `best` value we're finding here, so that
|
|
48
|
-
// we don't have to call `peek` again on the subiterator? Or is it the
|
|
49
|
-
// subiterator's responsibility to cache its own `peek` value?
|
|
50
|
-
//
|
|
51
|
-
// A: It should probably be the subiterator's responsibility, because unless
|
|
52
|
-
// we cache the best value for each subiterator, we have to `peek` them all
|
|
53
|
-
// again everytime we `take`, so I think we're making the assumption that
|
|
54
|
-
// while `peek` has to be async for the first call, all subsequent calls
|
|
55
|
-
// should be free.
|
|
56
55
|
return bestIterator;
|
|
57
56
|
}
|
|
58
57
|
_isBetter(currentBest, candidate) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zipper-departures-iterator.js","sourceRoot":"","sources":["../../../../data/service/zipper-departures-iterator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"zipper-departures-iterator.js","sourceRoot":"","sources":["../../../../data/service/zipper-departures-iterator.ts"],"names":[],"mappings":"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"}
|