corequery 0.31.2 → 0.32.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/args-error.d.ts +3 -0
- package/server/dist/server/api/args-error.js +7 -0
- package/server/dist/server/api/args-error.js.map +1 -0
- package/server/dist/server/api/create-api-router.js +8 -6
- package/server/dist/server/api/create-api-router.js.map +1 -1
- package/server/dist/server/api/handlers/departures/v0/index.d.ts +5 -1
- package/server/dist/server/api/handlers/departures/v0/index.js +82 -39
- package/server/dist/server/api/handlers/departures/v0/index.js.map +1 -1
- package/server/dist/server/api/handlers/departures/v0/to-api-result.d.ts +4 -0
- package/server/dist/server/api/handlers/departures/v0/to-api-result.js +24 -0
- package/server/dist/server/api/handlers/departures/v0/to-api-result.js.map +1 -0
- package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-stop-foda.js +24 -0
- package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-stop-foda.js.map +1 -1
- package/server/dist/server/config/config.d.ts +7 -1
- package/server/dist/server/config/helpers/corequery-filters.d.ts +14 -0
- package/server/dist/server/config/helpers/corequery-filters.js +34 -0
- package/server/dist/server/config/helpers/corequery-filters.js.map +1 -0
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.d.ts +1 -1
- package/server/dist/server/config/helpers/index.d.ts +1 -0
- package/server/dist/server/config/helpers/index.js +1 -0
- package/server/dist/server/config/helpers/index.js.map +1 -1
- package/server/dist/server/config/linting/types.d.ts +3 -0
- package/server/dist/server/config/types/custom-filter-function-type.d.ts +8 -0
- package/server/dist/server/config/types/custom-filter-function-type.js +2 -0
- package/server/dist/server/config/types/custom-filter-function-type.js.map +1 -0
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config.js +2 -0
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config.js.map +1 -0
- package/server/dist/server/config/types/get-default-departure-feeds-for-stop-config.d.ts +7 -0
- package/server/dist/server/config/types/get-default-departure-feeds-for-stop-config.js +2 -0
- package/server/dist/server/config/types/get-default-departure-feeds-for-stop-config.js.map +1 -0
- package/server/dist/server/config/types/get-filters-for-stop-config.d.ts +15 -0
- package/server/dist/server/config/types/get-filters-for-stop-config.js +2 -0
- package/server/dist/server/config/types/get-filters-for-stop-config.js.map +1 -0
- package/server/dist/server/config/types/index.d.ts +4 -1
- package/server/dist/server/config/types/index.js +4 -1
- package/server/dist/server/config/types/index.js.map +1 -1
- package/server/dist/server/corequery.d.ts +2 -0
- package/server/dist/server/corequery.js +4 -1
- package/server/dist/server/corequery.js.map +1 -1
- package/server/dist/server/data/departure-filters/departure-filter-type.d.ts +9 -0
- package/server/dist/server/data/departure-filters/departure-filter-type.js +9 -0
- package/server/dist/server/data/departure-filters/departure-filter-type.js.map +1 -0
- package/server/dist/server/data/departure-filters/departure-filters.d.ts +31 -0
- package/server/dist/server/data/departure-filters/departure-filters.js +94 -0
- package/server/dist/server/data/departure-filters/departure-filters.js.map +1 -0
- package/server/dist/server/data/departure-filters/index.d.ts +2 -0
- package/server/dist/server/data/departure-filters/index.js +3 -0
- package/server/dist/server/data/departure-filters/index.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/arrival.d.ts +6 -0
- package/server/dist/server/data/departure-filters/types/arrival.js +12 -0
- package/server/dist/server/data/departure-filters/types/arrival.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/custom.d.ts +9 -0
- package/server/dist/server/data/departure-filters/types/custom.js +19 -0
- package/server/dist/server/data/departure-filters/types/custom.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/line-tag.d.ts +6 -0
- package/server/dist/server/data/departure-filters/types/line-tag.js +17 -0
- package/server/dist/server/data/departure-filters/types/line-tag.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/line.d.ts +6 -0
- package/server/dist/server/data/departure-filters/types/line.js +14 -0
- package/server/dist/server/data/departure-filters/types/line.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/position.d.ts +6 -0
- package/server/dist/server/data/departure-filters/types/position.js +14 -0
- package/server/dist/server/data/departure-filters/types/position.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/service-tag.d.ts +6 -0
- package/server/dist/server/data/departure-filters/types/service-tag.js +14 -0
- package/server/dist/server/data/departure-filters/types/service-tag.js.map +1 -0
- package/server/dist/server/data/departure-filters/types/set-down-only.d.ts +6 -0
- package/server/dist/server/data/departure-filters/types/set-down-only.js +12 -0
- package/server/dist/server/data/departure-filters/types/set-down-only.js.map +1 -0
- package/server/dist/server/data/index.d.ts +1 -0
- package/server/dist/server/data/index.js +1 -0
- package/server/dist/server/data/index.js.map +1 -1
- package/server/dist/server/data/stop-collection.d.ts +2 -2
- package/server/dist/server/data/stop-collection.js +2 -2
- package/server/dist/server/data/stop-collection.js.map +1 -1
- package/server/dist/server/data/stop-default-departure-feed.d.ts +15 -0
- package/server/dist/server/data/stop-default-departure-feed.js +21 -0
- package/server/dist/server/data/stop-default-departure-feed.js.map +1 -0
- package/server/dist/server/data/stop-departure-filters.d.ts +39 -0
- package/server/dist/server/data/stop-departure-filters.js +63 -0
- package/server/dist/server/data/stop-departure-filters.js.map +1 -0
- package/server/dist/server/data/stop-position.d.ts +13 -0
- package/server/dist/server/data/stop-position.js +18 -0
- package/server/dist/server/data/stop-position.js.map +1 -0
- package/server/dist/server/data/stop.d.ts +11 -2
- package/server/dist/server/data/stop.js +17 -1
- package/server/dist/server/data/stop.js.map +1 -1
- package/server/dist/shared/apis/departures/v0/departure.d.ts +19 -0
- package/server/dist/shared/apis/departures/v0/departure.js +48 -0
- package/server/dist/shared/apis/departures/v0/departure.js.map +1 -0
- package/server/dist/shared/apis/departures/v0/feed.d.ts +10 -0
- package/server/dist/shared/apis/departures/v0/feed.js +15 -0
- package/server/dist/shared/apis/departures/v0/feed.js.map +1 -0
- package/server/dist/shared/apis/departures/v0/index.d.ts +33 -18
- package/server/dist/shared/apis/departures/v0/index.js +12 -68
- package/server/dist/shared/apis/departures/v0/index.js.map +1 -1
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.d.ts +42 -0
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.js +42 -28
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.js.map +1 -1
- package/server/dist/shared/apis/foundational-data/v1/index.d.ts +21 -0
- package/server/dist/shared/data/departure-filter-expression.d.ts +16 -0
- package/server/dist/shared/data/departure-filter-expression.js +82 -0
- package/server/dist/shared/data/departure-filter-expression.js.map +1 -0
- package/web/dist/assets/{About-DGmg1TM-.js → About-BdSlO-kD.js} +1 -1
- package/web/dist/assets/{AdminControls-T05hoDB-.js → AdminControls-DJo59RGN.js} +1 -1
- package/web/dist/assets/{Alert-DfpdtaOB.js → Alert-SQhECZag.js} +1 -1
- package/web/dist/assets/{Debug-Q4Vy4lZ_.js → Debug-5P9iSK2l.js} +1 -1
- package/web/dist/assets/{Home-C6T20k8G.js → Home-hrGQ5RvQ.js} +1 -1
- package/web/dist/assets/{Line-6nd7KD0E.js → Line-ClqpaOxi.js} +1 -1
- package/web/dist/assets/NotFound-D-nyY3X1.js +1 -0
- package/web/dist/assets/{NotFoundPage-UhXr10a9.js → NotFoundPage-qJ2To3wC.js} +1 -1
- package/web/dist/assets/{Picker-D-TjVZAI.js → Picker-di2TPJNV.js} +1 -1
- package/web/dist/assets/{Service-CkHxNopv.js → Service-CjcKHFQZ.js} +1 -1
- package/web/dist/assets/{Settings-Ccrmh7u8.js → Settings-Clz1x2Cr.js} +1 -1
- package/web/dist/assets/{SimpleMobileHeaderContent-Ja68XAJd.js → SimpleMobileHeaderContent-DJTkr_6C.js} +1 -1
- package/web/dist/assets/{Status-CO5w5a1E.js → Status-Bw3AMuJH.js} +1 -1
- package/web/dist/assets/Stop-hkgAICn9.js +1 -0
- package/web/dist/assets/{ZenMode-C3S7FmYt.js → ZenMode-CXXD5IBd.js} +1 -1
- package/web/dist/assets/index-DOvczcZF.js +2 -0
- package/web/dist/assets/{linear-CtNhjlrM.js → linear-BiU4teCm.js} +1 -1
- package/web/dist/assets/{use-api-BJomuYg6.js → use-api-Ft007Dfs.js} +1 -1
- package/web/dist/assets/{use-foda-synced-query-BM-OPAql.js → use-foda-synced-query-hrC70vJ_.js} +1 -1
- package/web/dist/assets/{use-simple-headers-Cbv0t_De.js → use-simple-headers-DM6VutL0.js} +1 -1
- package/web/dist/index.html +2 -2
- package/web/dist/sw.js +1 -1
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config-func.js +0 -2
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config-func.js.map +0 -1
- package/web/dist/assets/NotFound-BozS7u6u.js +0 -1
- package/web/dist/assets/Stop-BWZOcpvU.js +0 -1
- package/web/dist/assets/index-CrhwkQ9k.js +0 -2
- /package/server/dist/server/config/types/{get-canonical-lines-serving-stop-config-func.d.ts → get-canonical-lines-serving-stop-config.d.ts} +0 -0
package/package.json
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"args-error.js","sourceRoot":"","sources":["../../../api/args-error.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAU,SAAQ,KAAK;IAClC,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;IAC1B,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Router } from "express";
|
|
2
2
|
import * as apis from "../../shared/apis/index.js";
|
|
3
3
|
import * as handlers from "./handlers/index.js";
|
|
4
|
+
import { ArgsError } from "./args-error.js";
|
|
4
5
|
export function createApiRouter(app) {
|
|
5
6
|
const router = Router();
|
|
6
7
|
// No CORS middleware needed. The API is served from the same origin as the
|
|
@@ -22,12 +23,13 @@ export function createApiRouter(app) {
|
|
|
22
23
|
res.json(result);
|
|
23
24
|
}
|
|
24
25
|
catch (err) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
26
|
+
if (err instanceof ArgsError) {
|
|
27
|
+
res.status(400).json({ message: err.message });
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
app.log.general.apiError(api.path, err);
|
|
31
|
+
res.sendStatus(500);
|
|
32
|
+
}
|
|
31
33
|
}
|
|
32
34
|
});
|
|
33
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-api-router.js","sourceRoot":"","sources":["../../../api/create-api-router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"create-api-router.js","sourceRoot":"","sources":["../../../api/create-api-router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,MAAM,UAAU,eAAe,CAC7B,GAAiC;IAEjC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,2EAA2E;IAC3E,8EAA8E;IAC9E,2EAA2E;IAC3E,gDAAgD;IAEhD,SAAS,KAAK,CACZ,GAA4B;IAE5B,0EAA0E;IAC1E,OAAsE;QAEtE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACvC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAChD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACjC,OAAO;gBACT,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7D,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,YAAY,SAAS,EAAE,CAAC;oBAC7B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACxC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IAClD,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IAClD,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAChE,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5C,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACxD,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC/B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { DEPARTURES_V0 } from "../../../../../shared/apis/index.js";
|
|
2
|
-
import type { ApiContext } from "../../../types.js";
|
|
2
|
+
import type { ApiContext, ServerFodaSyncedResultOf } from "../../../types.js";
|
|
3
3
|
import type { ServerArgsOf, ServerResultOf } from "../../../types.js";
|
|
4
|
+
type DeparturesV0ApiResult = ServerFodaSyncedResultOf<typeof DEPARTURES_V0>;
|
|
5
|
+
type DeparturesV0ApiFeedResult = DeparturesV0ApiResult["feeds"][number];
|
|
6
|
+
export type DeparturesV0ApiDeparture = DeparturesV0ApiFeedResult["departures"][number];
|
|
4
7
|
export declare function handle<CustomContextType>(ctx: ApiContext<CustomContextType>, args: ServerArgsOf<typeof DEPARTURES_V0>): Promise<ServerResultOf<typeof DEPARTURES_V0>>;
|
|
8
|
+
export {};
|
|
@@ -1,50 +1,93 @@
|
|
|
1
1
|
import { applyFodaSyncedResult } from "../../foda-synced-handler.js";
|
|
2
|
+
import { ArgsError } from "../../../args-error.js";
|
|
3
|
+
import { itsOk, nonNull, unique } from "@dan-schel/js-utils";
|
|
4
|
+
import { toApiResult } from "./to-api-result.js";
|
|
2
5
|
export async function handle(ctx, args) {
|
|
3
6
|
return applyFodaSyncedResult(ctx, async () => {
|
|
4
|
-
//
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
// Parse everything and throw if its invalid.
|
|
8
|
+
ensureFeedsReasonable(args.feeds);
|
|
9
|
+
const compiledFilters = ensureValidFeedFilters(ctx.app, args.feeds);
|
|
10
|
+
const instant = parseInstant(args.instant);
|
|
11
|
+
const results = args.feeds.map(() => []);
|
|
12
|
+
const stopIds = new Set(args.feeds.map((feed) => feed.stopId));
|
|
13
|
+
const feedFilters = compiledFilters.map((x) => x.filterFunction);
|
|
14
|
+
for (const stopId of stopIds) {
|
|
15
|
+
const iterator = ctx.app.services.getDeparturesIterator(stopId, instant, args.direction);
|
|
16
|
+
while (!allFeedsSatisfied(results, args.feeds, stopId) &&
|
|
17
|
+
(await iterator.peek()) != null) {
|
|
18
|
+
const departure = await iterator.take();
|
|
19
|
+
for (let i = 0; i < args.feeds.length; i++) {
|
|
20
|
+
const feed = itsOk(args.feeds[i]);
|
|
21
|
+
const passesFilter = itsOk(feedFilters[i]);
|
|
22
|
+
const resultsSubarray = itsOk(results[i]);
|
|
23
|
+
if (feed.stopId !== stopId)
|
|
24
|
+
continue;
|
|
25
|
+
if (resultsSubarray.length >= feed.desiredCount)
|
|
26
|
+
continue;
|
|
27
|
+
if (!passesFilter(departure))
|
|
28
|
+
continue;
|
|
29
|
+
if (isSkipped(departure, feed.skips))
|
|
30
|
+
continue;
|
|
31
|
+
resultsSubarray.push(departure);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
13
34
|
}
|
|
14
35
|
return {
|
|
15
|
-
|
|
36
|
+
feeds: results.map((x) => ({
|
|
37
|
+
departures: x.map((y) => toApiResult(ctx.app, y)),
|
|
38
|
+
})),
|
|
39
|
+
invalidFilterTokens: collectInvalidFilterTokens(compiledFilters),
|
|
16
40
|
};
|
|
17
41
|
});
|
|
18
42
|
}
|
|
19
|
-
function
|
|
20
|
-
|
|
21
|
-
.
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
.
|
|
43
|
+
function ensureFeedsReasonable(feeds) {
|
|
44
|
+
if (feeds.length < 1)
|
|
45
|
+
throw new ArgsError("No feeds provided.");
|
|
46
|
+
if (feeds.length > 4)
|
|
47
|
+
throw new ArgsError("Too many feeds.");
|
|
48
|
+
for (const feed of feeds) {
|
|
49
|
+
if (feed.desiredCount < 1)
|
|
50
|
+
throw new ArgsError("Desired count too low.");
|
|
51
|
+
if (feed.desiredCount > 50)
|
|
52
|
+
throw new ArgsError("Desired count too high.");
|
|
53
|
+
}
|
|
26
54
|
}
|
|
27
|
-
function
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
55
|
+
function ensureValidFeedFilters(app, feeds) {
|
|
56
|
+
const successfullyCompiled = feeds
|
|
57
|
+
.map((f) => app.departureFilters.compile(f.filterExpression))
|
|
58
|
+
.filter(nonNull);
|
|
59
|
+
const someInvalid = successfullyCompiled.length < feeds.length;
|
|
60
|
+
if (someInvalid)
|
|
61
|
+
throw new ArgsError("Some feed filters were invalid.");
|
|
62
|
+
return successfullyCompiled;
|
|
63
|
+
}
|
|
64
|
+
function collectInvalidFilterTokens(compilationResults) {
|
|
65
|
+
return unique(compilationResults
|
|
66
|
+
.flatMap((x) => Array.from(x.invalidTokens))
|
|
67
|
+
.map((x) => x.toString()));
|
|
68
|
+
}
|
|
69
|
+
function parseInstant(instant) {
|
|
70
|
+
try {
|
|
71
|
+
return Temporal.Instant.from(instant);
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
throw new ArgsError(`Couldn't convert "${instant}" to an instant.`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
function allFeedsSatisfied(results, feeds, stopId) {
|
|
78
|
+
for (let i = 0; i < feeds.length; i++) {
|
|
79
|
+
const feed = itsOk(feeds[i]);
|
|
80
|
+
if (feed.stopId !== stopId)
|
|
81
|
+
continue;
|
|
82
|
+
const resultsCount = itsOk(results[i]).length;
|
|
83
|
+
const desiredCount = feed.desiredCount;
|
|
84
|
+
if (resultsCount < desiredCount)
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
function isSkipped(departure, skips) {
|
|
90
|
+
return skips.some((s) => s.sourceId === departure.service.sourceId &&
|
|
91
|
+
s.intrasourceId === departure.service.intrasourceId);
|
|
49
92
|
}
|
|
50
93
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { DeparturesV0ApiDeparture } from "./index.js";
|
|
2
|
+
import type { Corequery } from "../../../../corequery.js";
|
|
3
|
+
import type { Departure } from "../../../../data/index.js";
|
|
4
|
+
export declare function toApiResult<CustomContextType>(app: Corequery<CustomContextType>, departure: Departure): DeparturesV0ApiDeparture;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export function toApiResult(app, departure) {
|
|
2
|
+
const { service, movement } = departure;
|
|
3
|
+
const terminusName = app.stops.require(service.termination.stopId).name;
|
|
4
|
+
return {
|
|
5
|
+
sourceId: service.sourceId,
|
|
6
|
+
intrasourceId: service.intrasourceId,
|
|
7
|
+
// TODO: Crawl the connections until either the chain ends, or we find a
|
|
8
|
+
// servicing movement at a stop which was already serviced. Once we find
|
|
9
|
+
// that repeated servicing movement, we use the previous servicing movement
|
|
10
|
+
// as the "destination".
|
|
11
|
+
primaryDestinationText: terminusName,
|
|
12
|
+
secondaryDestinationText: null,
|
|
13
|
+
lineIds: service.lineIds,
|
|
14
|
+
color: service.getColorHexCodes(),
|
|
15
|
+
isCancelled: service.isCancelled,
|
|
16
|
+
movement: {
|
|
17
|
+
index: departure.movementIndex,
|
|
18
|
+
positionId: movement.currentPositionId,
|
|
19
|
+
time: movement.timeRelevantToDeparturesAlgorithm.toString(),
|
|
20
|
+
formerTime: movement.formerTimeRelevantToDeparturesAlgorithm?.toString() ?? null,
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=to-api-result.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"to-api-result.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/to-api-result.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,WAAW,CACzB,GAAiC,EACjC,SAAoB;IAEpB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IACxC,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAExE,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;QAEpC,wEAAwE;QACxE,wEAAwE;QACxE,2EAA2E;QAC3E,wBAAwB;QACxB,sBAAsB,EAAE,YAAY;QACpC,wBAAwB,EAAE,IAAI;QAE9B,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"}
|
package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-stop-foda.js
CHANGED
|
@@ -12,12 +12,33 @@ export class MultiversionalStopFoda {
|
|
|
12
12
|
name: stop.name,
|
|
13
13
|
urlPath: stop.urlPath,
|
|
14
14
|
canonicalLinesServingStop: stop.canonicalLinesServingStop,
|
|
15
|
+
positions: stop.positions.map((position) => ({
|
|
16
|
+
id: position.id,
|
|
17
|
+
name: position.name,
|
|
18
|
+
})),
|
|
15
19
|
location: stop.location != null
|
|
16
20
|
? {
|
|
17
21
|
latitude: stop.location.latitude,
|
|
18
22
|
longitude: stop.location.longitude,
|
|
19
23
|
}
|
|
20
24
|
: null,
|
|
25
|
+
defaultDepartureFeeds: stop.defaultDepartureFeeds.map((feed) => ({
|
|
26
|
+
name: feed.name,
|
|
27
|
+
desiredCount: feed.desiredCount,
|
|
28
|
+
filterExpression: feed.filterExpression,
|
|
29
|
+
})),
|
|
30
|
+
departureFilters: {
|
|
31
|
+
lines: stop.departureFilters.lines,
|
|
32
|
+
positions: stop.departureFilters.positions,
|
|
33
|
+
customGroups: stop.departureFilters.customGroups.map((group) => ({
|
|
34
|
+
label: group.label,
|
|
35
|
+
items: group.items.map((item) => ({
|
|
36
|
+
name: item.name,
|
|
37
|
+
labelWithinGroup: item.labelWithinGroup,
|
|
38
|
+
filterExpression: item.filterExpression,
|
|
39
|
+
})),
|
|
40
|
+
})),
|
|
41
|
+
},
|
|
21
42
|
};
|
|
22
43
|
}
|
|
23
44
|
toFodaV1() {
|
|
@@ -26,7 +47,10 @@ export class MultiversionalStopFoda {
|
|
|
26
47
|
name: this.obj.name,
|
|
27
48
|
urlPath: this.obj.urlPath,
|
|
28
49
|
canonicalLinesServingStop: this.obj.canonicalLinesServingStop,
|
|
50
|
+
positions: this.obj.positions,
|
|
29
51
|
location: this.obj.location,
|
|
52
|
+
defaultDepartureFeeds: this.obj.defaultDepartureFeeds,
|
|
53
|
+
departureFilters: this.obj.departureFilters,
|
|
30
54
|
};
|
|
31
55
|
}
|
|
32
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiversional-stop-foda.js","sourceRoot":"","sources":["../../../../../../api/handlers/foundational-data/multiversional/multiversional-stop-foda.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,sBAAsB;IAEtB;IADX,YACW,GAAwD;QAAxD,QAAG,GAAH,GAAG,CAAqD;IAChE,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,IAAU;QACrB,OAAO,IAAI,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,IAAU;QACjC,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,QAAQ,EACN,IAAI,CAAC,QAAQ,IAAI,IAAI;gBACnB,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;oBAChC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;iBACnC;gBACH,CAAC,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"multiversional-stop-foda.js","sourceRoot":"","sources":["../../../../../../api/handlers/foundational-data/multiversional/multiversional-stop-foda.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,sBAAsB;IAEtB;IADX,YACW,GAAwD;QAAxD,QAAG,GAAH,GAAG,CAAqD;IAChE,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,IAAU;QACrB,OAAO,IAAI,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,IAAU;QACjC,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC3C,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,IAAI,EAAE,QAAQ,CAAC,IAAI;aACpB,CAAC,CAAC;YACH,QAAQ,EACN,IAAI,CAAC,QAAQ,IAAI,IAAI;gBACnB,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;oBAChC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;iBACnC;gBACH,CAAC,CAAC,IAAI;YACV,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC/D,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aACxC,CAAC,CAAC;YACH,gBAAgB,EAAE;gBAChB,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK;gBAClC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS;gBAC1C,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAC/D,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;wBAChC,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;wBACvC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;qBACxC,CAAC,CAAC;iBACJ,CAAC,CAAC;aACJ;SACF,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;YACnB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO;YACzB,yBAAyB,EAAE,IAAI,CAAC,GAAG,CAAC,yBAAyB;YAC7D,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS;YAC7B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ;YAC3B,qBAAqB,EAAE,IAAI,CAAC,GAAG,CAAC,qBAAqB;YACrD,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,gBAAgB;SAC5C,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import type { AboutPageConfig, AssetConfig, FooterConfig, LandingPageConfig, LineConfig, LinesPageConfig, StopConfig, TagsConfig, TerminologyConfig } from "./types/index.js";
|
|
2
2
|
import type { Logger } from "../logger/logger.js";
|
|
3
|
-
import type { GetCanonicalLinesServingStopConfig } from "./types/get-canonical-lines-serving-stop-config
|
|
3
|
+
import type { GetCanonicalLinesServingStopConfig } from "./types/get-canonical-lines-serving-stop-config.js";
|
|
4
4
|
import type { ServiceSourcesConfig } from "./types/service-sources-config.js";
|
|
5
|
+
import type { GetDepartureFiltersForStopConfig } from "./types/get-filters-for-stop-config.js";
|
|
6
|
+
import type { GetDefaultDepartureFeedsForStopConfig } from "./types/get-default-departure-feeds-for-stop-config.js";
|
|
7
|
+
import type { CustomDepartureFilterTypesConfig } from "./types/custom-filter-function-type.js";
|
|
5
8
|
export type CorequeryConfig<CustomContextType = unknown> = {
|
|
6
9
|
readonly logger: Logger;
|
|
7
10
|
readonly port: number;
|
|
@@ -16,6 +19,9 @@ export type CorequeryConfig<CustomContextType = unknown> = {
|
|
|
16
19
|
readonly linesPage: LinesPageConfig;
|
|
17
20
|
readonly tags: TagsConfig;
|
|
18
21
|
readonly getCanonicalLinesServingStop: GetCanonicalLinesServingStopConfig;
|
|
22
|
+
readonly getDefaultDepartureFeedsForStop: GetDefaultDepartureFeedsForStopConfig;
|
|
23
|
+
readonly getDepartureFiltersForStop: GetDepartureFiltersForStopConfig;
|
|
24
|
+
readonly customDepartureFilterTypes?: CustomDepartureFilterTypesConfig<CustomContextType>;
|
|
19
25
|
readonly serviceSources: ServiceSourcesConfig;
|
|
20
26
|
readonly custom: CustomContextType;
|
|
21
27
|
};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export declare class CorequeryFilters {
|
|
2
|
+
static readonly arr = "arr";
|
|
3
|
+
static readonly sdo = "sdo";
|
|
4
|
+
static readonly notArr: string;
|
|
5
|
+
static readonly notSdo: string;
|
|
6
|
+
static line(lineId: number): string;
|
|
7
|
+
static position(positionId: number): string;
|
|
8
|
+
static serviceTag(serviceTag: number): string;
|
|
9
|
+
static lineTag(lineTag: number): string;
|
|
10
|
+
static not(filterExpression: string): string;
|
|
11
|
+
static or(...filterExpressions: string[]): string;
|
|
12
|
+
static and(...filterExpressions: string[]): string;
|
|
13
|
+
static cnf(filterExpressions: string[][]): string;
|
|
14
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export class CorequeryFilters {
|
|
2
|
+
static arr = "arr";
|
|
3
|
+
static sdo = "sdo";
|
|
4
|
+
static notArr = CorequeryFilters.not(CorequeryFilters.arr);
|
|
5
|
+
static notSdo = CorequeryFilters.not(CorequeryFilters.sdo);
|
|
6
|
+
static line(lineId) {
|
|
7
|
+
return `line:${lineId}`;
|
|
8
|
+
}
|
|
9
|
+
static position(positionId) {
|
|
10
|
+
return `position:${positionId}`;
|
|
11
|
+
}
|
|
12
|
+
static serviceTag(serviceTag) {
|
|
13
|
+
return `service-tag:${serviceTag}`;
|
|
14
|
+
}
|
|
15
|
+
static lineTag(lineTag) {
|
|
16
|
+
return `line-tag:${lineTag}`;
|
|
17
|
+
}
|
|
18
|
+
static not(filterExpression) {
|
|
19
|
+
return `!${filterExpression}`;
|
|
20
|
+
}
|
|
21
|
+
static or(...filterExpressions) {
|
|
22
|
+
if (filterExpressions.some((x) => x.includes(" "))) {
|
|
23
|
+
throw new Error("Filter expression is too complex.");
|
|
24
|
+
}
|
|
25
|
+
return filterExpressions.join("|");
|
|
26
|
+
}
|
|
27
|
+
static and(...filterExpressions) {
|
|
28
|
+
return filterExpressions.join(" ");
|
|
29
|
+
}
|
|
30
|
+
static cnf(filterExpressions) {
|
|
31
|
+
return CorequeryFilters.and(...filterExpressions.map((x) => CorequeryFilters.or(...x)));
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=corequery-filters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"corequery-filters.js","sourceRoot":"","sources":["../../../../config/helpers/corequery-filters.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAgB;IAC3B,MAAM,CAAU,GAAG,GAAG,KAAK,CAAC;IAC5B,MAAM,CAAU,GAAG,GAAG,KAAK,CAAC;IAE5B,MAAM,CAAU,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACpE,MAAM,CAAU,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAEpE,MAAM,CAAC,IAAI,CAAC,MAAc;QACxB,OAAO,QAAQ,MAAM,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,UAAkB;QAChC,OAAO,YAAY,UAAU,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,UAAkB;QAClC,OAAO,eAAe,UAAU,EAAE,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAAe;QAC5B,OAAO,YAAY,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,gBAAwB;QACjC,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,GAAG,iBAA2B;QACtC,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAG,iBAA2B;QACvC,OAAO,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,iBAA6B;QACtC,OAAO,gBAAgB,CAAC,GAAG,CACzB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAC3D,CAAC;IACJ,CAAC"}
|
package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { GetCanonicalLinesServingStopConfig } from "../types/get-canonical-lines-serving-stop-config
|
|
1
|
+
import type { GetCanonicalLinesServingStopConfig } from "../types/get-canonical-lines-serving-stop-config.js";
|
|
2
2
|
import type { LineConfig } from "../types/line-config.js";
|
|
3
3
|
import type { TagSuccessionConfig } from "../types/tags-config.js";
|
|
4
4
|
type Options = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../config/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oDAAoD,CAAC;AACnE,cAAc,4CAA4C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../config/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,oDAAoD,CAAC;AACnE,cAAc,4CAA4C,CAAC"}
|
|
@@ -16,6 +16,9 @@ export type LintableConfig = {
|
|
|
16
16
|
readonly aboutPage: CorequeryConfig["aboutPage"];
|
|
17
17
|
readonly linesPage: CorequeryConfig["linesPage"];
|
|
18
18
|
readonly tags: CorequeryConfig["tags"];
|
|
19
|
+
readonly getCanonicalLinesServingStop: CorequeryConfig["getCanonicalLinesServingStop"];
|
|
20
|
+
readonly getDefaultDepartureFeedsForStop: CorequeryConfig["getDefaultDepartureFeedsForStop"];
|
|
21
|
+
readonly getDepartureFiltersForStop: CorequeryConfig["getDepartureFiltersForStop"];
|
|
19
22
|
};
|
|
20
23
|
export type LintOptions = {
|
|
21
24
|
/** Options to control the lint rules for the stops config. */
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Corequery } from "../../corequery.js";
|
|
2
|
+
import type { DepartureFilterFunction } from "../../data/departure-filters/departure-filter-type.js";
|
|
3
|
+
export type CustomDepartureFilterTypesConfig<CustomContextType> = readonly CustomDepartureFilterTypeConfig<CustomContextType>[];
|
|
4
|
+
export type CustomDepartureFilterTypeConfig<CustomContextType> = {
|
|
5
|
+
readonly prefix: string;
|
|
6
|
+
readonly buildFilterFunction: CustomDepartureFilterTypeFunctionBuilder<CustomContextType>;
|
|
7
|
+
};
|
|
8
|
+
export type CustomDepartureFilterTypeFunctionBuilder<CustomContextType> = (app: Corequery<CustomContextType>, args: string) => DepartureFilterFunction | null;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"custom-filter-function-type.js","sourceRoot":"","sources":["../../../../config/types/custom-filter-function-type.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-canonical-lines-serving-stop-config.js","sourceRoot":"","sources":["../../../../config/types/get-canonical-lines-serving-stop-config.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export type GetDefaultDepartureFeedsForStopConfig = (stopId: number) => StopDefaultDepartureFeedsConfig;
|
|
2
|
+
export type StopDefaultDepartureFeedsConfig = readonly StopDefaultDepartureFeedConfig[];
|
|
3
|
+
export type StopDefaultDepartureFeedConfig = {
|
|
4
|
+
readonly name: string;
|
|
5
|
+
readonly desiredCount: number;
|
|
6
|
+
readonly filterExpression: string;
|
|
7
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-default-departure-feeds-for-stop-config.js","sourceRoot":"","sources":["../../../../config/types/get-default-departure-feeds-for-stop-config.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export type GetDepartureFiltersForStopConfig = (stopId: number) => StopDepartureFiltersConfig;
|
|
2
|
+
export type StopDepartureFiltersConfig = {
|
|
3
|
+
readonly lines: "off" | "canonical" | readonly number[];
|
|
4
|
+
readonly positions: "off" | "all" | readonly number[];
|
|
5
|
+
readonly customGroups: readonly CustomStopDepartureFilterGroupConfig[];
|
|
6
|
+
};
|
|
7
|
+
export type CustomStopDepartureFilterGroupConfig = {
|
|
8
|
+
readonly label: string;
|
|
9
|
+
readonly items: readonly CustomStopDepartureFilterConfig[];
|
|
10
|
+
};
|
|
11
|
+
export type CustomStopDepartureFilterConfig = {
|
|
12
|
+
readonly name: string;
|
|
13
|
+
readonly labelWithinGroup: string;
|
|
14
|
+
readonly filterExpression: string;
|
|
15
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-filters-for-stop-config.js","sourceRoot":"","sources":["../../../../config/types/get-filters-for-stop-config.ts"],"names":[],"mappings":""}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
export * from "./about-page-config.js";
|
|
2
2
|
export * from "./asset-config.js";
|
|
3
|
+
export * from "./custom-filter-function-type.js";
|
|
3
4
|
export * from "./footer-config.js";
|
|
4
|
-
export * from "./get-canonical-lines-serving-stop-config
|
|
5
|
+
export * from "./get-canonical-lines-serving-stop-config.js";
|
|
6
|
+
export * from "./get-default-departure-feeds-for-stop-config.js";
|
|
7
|
+
export * from "./get-filters-for-stop-config.js";
|
|
5
8
|
export * from "./landing-page-config.js";
|
|
6
9
|
export * from "./line-config.js";
|
|
7
10
|
export * from "./lines-page-config.js";
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
export * from "./about-page-config.js";
|
|
2
2
|
export * from "./asset-config.js";
|
|
3
|
+
export * from "./custom-filter-function-type.js";
|
|
3
4
|
export * from "./footer-config.js";
|
|
4
|
-
export * from "./get-canonical-lines-serving-stop-config
|
|
5
|
+
export * from "./get-canonical-lines-serving-stop-config.js";
|
|
6
|
+
export * from "./get-default-departure-feeds-for-stop-config.js";
|
|
7
|
+
export * from "./get-filters-for-stop-config.js";
|
|
5
8
|
export * from "./landing-page-config.js";
|
|
6
9
|
export * from "./line-config.js";
|
|
7
10
|
export * from "./lines-page-config.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../config/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../config/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kCAAkC,CAAC;AACjD,cAAc,oBAAoB,CAAC;AACnC,cAAc,8CAA8C,CAAC;AAC7D,cAAc,kDAAkD,CAAC;AACjE,cAAc,kCAAkC,CAAC;AACjD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC"}
|
|
@@ -5,6 +5,7 @@ import type { AboutPageConfig, FooterConfig, LandingPageConfig, TerminologyConfi
|
|
|
5
5
|
import type { Logger } from "./logger/logger.js";
|
|
6
6
|
import { ServiceRepository } from "./data/service/service-repository.js";
|
|
7
7
|
import { MultiversionalFoda } from "./api/handlers/foundational-data/multiversional/multiversional-foda.js";
|
|
8
|
+
import { DepartureFilters } from "./data/departure-filters/index.js";
|
|
8
9
|
export type CorequeryConfigBuilder<CustomContextType> = (corequery: Corequery<CustomContextType>) => CorequeryConfig<CustomContextType>;
|
|
9
10
|
export declare class Corequery<CustomContextType = unknown> {
|
|
10
11
|
private readonly _config;
|
|
@@ -16,6 +17,7 @@ export declare class Corequery<CustomContextType = unknown> {
|
|
|
16
17
|
readonly stops: StopCollection;
|
|
17
18
|
readonly lines: LineCollection;
|
|
18
19
|
readonly services: ServiceRepository;
|
|
20
|
+
readonly departureFilters: DepartureFilters<CustomContextType>;
|
|
19
21
|
readonly landingPageConfig: LandingPageConfig;
|
|
20
22
|
readonly footerConfig: FooterConfig;
|
|
21
23
|
readonly aboutPageConfig: AboutPageConfig;
|
|
@@ -6,6 +6,7 @@ import { LineCollection } from "./data/line-collection.js";
|
|
|
6
6
|
import { getCorequeryPackageVersion } from "./get-corequery-package-version.js";
|
|
7
7
|
import { ServiceRepository } from "./data/service/service-repository.js";
|
|
8
8
|
import { MultiversionalFoda } from "./api/handlers/foundational-data/multiversional/multiversional-foda.js";
|
|
9
|
+
import { DepartureFilters } from "./data/departure-filters/index.js";
|
|
9
10
|
export class Corequery {
|
|
10
11
|
_config;
|
|
11
12
|
_webServer;
|
|
@@ -16,6 +17,7 @@ export class Corequery {
|
|
|
16
17
|
stops;
|
|
17
18
|
lines;
|
|
18
19
|
services;
|
|
20
|
+
departureFilters;
|
|
19
21
|
// I'm happy just exposing the config for now. Can be migrated to full classes
|
|
20
22
|
// if and when we want to add helper methods.
|
|
21
23
|
landingPageConfig;
|
|
@@ -33,9 +35,10 @@ export class Corequery {
|
|
|
33
35
|
this._corequeryPackageVersion = null;
|
|
34
36
|
// Only known after assets are prepared, during start().
|
|
35
37
|
this._frontendVersion = null;
|
|
36
|
-
this.stops = StopCollection.build(this._config.stops, this._config.tags.stopTagSuccession, this._config.getCanonicalLinesServingStop);
|
|
38
|
+
this.stops = StopCollection.build(this._config.stops, this._config.tags.stopTagSuccession, this._config.getCanonicalLinesServingStop, this._config.getDepartureFiltersForStop, this._config.getDefaultDepartureFeedsForStop);
|
|
37
39
|
this.lines = LineCollection.build(this._config.lines, this._config.tags.lineTagSuccession);
|
|
38
40
|
this.services = ServiceRepository.build(this._config.serviceSources);
|
|
41
|
+
this.departureFilters = DepartureFilters.build(this, this._config.customDepartureFilterTypes ?? []);
|
|
39
42
|
this.landingPageConfig = this._config.landingPage;
|
|
40
43
|
this.footerConfig = this._config.footer;
|
|
41
44
|
this.aboutPageConfig = this._config.aboutPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAOlE,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAEvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+EAA+E,CAAC;
|
|
1
|
+
{"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"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"}
|