corequery 0.14.2 → 0.16.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 +5 -4
- package/server/dist/server/api/create-api-router.js +6 -6
- package/server/dist/server/api/create-api-router.js.map +1 -1
- package/server/dist/server/config/config.d.ts +4 -0
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.d.ts +29 -0
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js +49 -0
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js.map +1 -0
- package/server/dist/server/config/helpers/index.d.ts +1 -0
- package/server/dist/server/config/helpers/index.js +2 -0
- package/server/dist/server/config/helpers/index.js.map +1 -0
- package/server/dist/server/config/index.d.ts +1 -0
- package/server/dist/server/config/index.js +1 -0
- package/server/dist/server/config/index.js.map +1 -1
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config-func.d.ts +1 -0
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config-func.js +2 -0
- package/server/dist/server/config/types/get-canonical-lines-serving-stop-config-func.js.map +1 -0
- package/server/dist/server/config/types/index.d.ts +1 -0
- package/server/dist/server/config/types/index.js +1 -0
- package/server/dist/server/config/types/index.js.map +1 -1
- package/server/dist/server/config/types/line-config.d.ts +7 -3
- package/server/dist/server/corequery.d.ts +2 -0
- package/server/dist/server/corequery.js +5 -12
- package/server/dist/server/corequery.js.map +1 -1
- package/server/dist/server/data/color.d.ts +7 -0
- package/server/dist/server/data/color.js +38 -0
- package/server/dist/server/data/color.js.map +1 -0
- package/server/dist/server/data/index.d.ts +2 -0
- package/server/dist/server/data/index.js +2 -0
- package/server/dist/server/data/index.js.map +1 -1
- package/server/dist/server/data/line-collection.d.ts +1 -1
- package/server/dist/server/data/line-collection.js +2 -2
- package/server/dist/server/data/line-collection.js.map +1 -1
- package/server/dist/server/data/line.d.ts +7 -1
- package/server/dist/server/data/line.js +10 -1
- package/server/dist/server/data/line.js.map +1 -1
- package/server/dist/server/data/route.d.ts +24 -0
- package/server/dist/server/data/route.js +32 -0
- package/server/dist/server/data/route.js.map +1 -0
- 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.d.ts +3 -1
- package/server/dist/server/data/stop.js +5 -1
- package/server/dist/server/data/stop.js.map +1 -1
- package/server/dist/server/index.d.ts +1 -0
- package/server/dist/server/index.js +1 -0
- package/server/dist/server/index.js.map +1 -1
- package/server/dist/server/logger/console-logger.d.ts +4 -0
- package/server/dist/server/logger/console-logger.js +8 -0
- package/server/dist/server/logger/console-logger.js.map +1 -0
- package/server/dist/server/logger/general-log-category.d.ts +6 -0
- package/server/dist/server/logger/general-log-category.js +19 -0
- package/server/dist/server/logger/general-log-category.js.map +1 -0
- package/server/dist/server/logger/index.d.ts +2 -0
- package/server/dist/server/logger/index.js +3 -0
- package/server/dist/server/logger/index.js.map +1 -0
- package/server/dist/server/logger/logger.d.ts +8 -0
- package/server/dist/server/logger/logger.js +12 -0
- package/server/dist/server/logger/logger.js.map +1 -0
- package/server/dist/server/logger/web-server-log-category.d.ts +6 -0
- package/server/dist/server/logger/web-server-log-category.js +13 -0
- package/server/dist/server/logger/web-server-log-category.js.map +1 -0
- package/server/dist/server/web-server/web-server.js +2 -6
- package/server/dist/server/web-server/web-server.js.map +1 -1
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.d.ts +10 -0
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.js +7 -0
- 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 +5 -0
- package/web/dist/assets/About-B4-dkQWr.js +1 -0
- package/web/dist/assets/AdminControls-CzU02gqN.js +1 -0
- package/web/dist/assets/{Alert-BZkWwXeY.js → Alert-IVv67CZ1.js} +1 -1
- package/web/dist/assets/{Debug-D9oQDrPU.js → Debug-D3jL5PaF.js} +1 -1
- package/web/dist/assets/Divider-Be0m4WgQ.js +1 -0
- package/web/dist/assets/Home-BPoVw8gT.js +1 -0
- package/web/dist/assets/Line-E2TOnCOo.js +1 -0
- package/web/dist/assets/Markdown-C8fLva6C.js +2 -0
- package/web/dist/assets/Nearby-C4nB11U5.js +1 -0
- package/web/dist/assets/NotFound-CzT6M9J8.js +1 -0
- package/web/dist/assets/NotFoundPage-DBDabcv_.js +1 -0
- package/web/dist/assets/Page-CEn9SSvt.js +1 -0
- package/web/dist/assets/{Settings-BUC4NlRV.js → Settings-pye1MxCr.js} +1 -1
- package/web/dist/assets/Status-D_1UU9CO.js +1 -0
- package/web/dist/assets/Stop-CsAwhg3q.js +1 -0
- package/web/dist/assets/Strong-D9f5KEpX.js +1 -0
- package/web/dist/assets/ZenMode-CGoCJmvB.js +1 -0
- package/web/dist/assets/index-BwSq_h7e.js +41 -0
- package/web/dist/assets/index-CQqh1NYO.css +1 -0
- package/web/dist/assets/use-simple-headers-DWUUdRcU.js +1 -0
- package/web/dist/index.html +2 -2
- package/web/dist/sw.js +1 -1
- package/web/dist/assets/About-CfcrUsiZ.js +0 -2
- package/web/dist/assets/AdminControls-Dmob4y9A.js +0 -1
- package/web/dist/assets/Divider-CtxRE7XC.js +0 -1
- package/web/dist/assets/Home-ztS1ho-i.js +0 -1
- package/web/dist/assets/Nearby-BjjxELnV.js +0 -1
- package/web/dist/assets/NotFound-DmphRk75.js +0 -1
- package/web/dist/assets/Page-1xak0ANk.js +0 -1
- package/web/dist/assets/Status-BemKsElR.js +0 -1
- package/web/dist/assets/Strong-DpRkFcr8.js +0 -1
- package/web/dist/assets/ZenMode-DEVORvf5.js +0 -1
- package/web/dist/assets/index-DzefptUV.css +0 -1
- package/web/dist/assets/index-O_prf-ho.js +0 -41
- package/web/dist/assets/use-simple-headers-BmXvTlrq.js +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "corequery",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"server/dist",
|
|
@@ -20,12 +20,13 @@
|
|
|
20
20
|
"test": "scripts/test",
|
|
21
21
|
"test-coverage": "scripts/test --coverage",
|
|
22
22
|
"lint": "scripts/lint",
|
|
23
|
+
"lint-demo-app": "scripts/lint-demo-app",
|
|
23
24
|
"format": "prettier --write .",
|
|
24
25
|
"format-check": "prettier --check .",
|
|
25
26
|
"bump-check": "bump-check --ignore \"^renovate\\/\""
|
|
26
27
|
},
|
|
27
28
|
"dependencies": {
|
|
28
|
-
"@dan-schel/js-utils": "^4.
|
|
29
|
+
"@dan-schel/js-utils": "^4.12.0",
|
|
29
30
|
"express": "^5.2.1",
|
|
30
31
|
"node-html-parser": "^7.1.0",
|
|
31
32
|
"sharp": "^0.34.5",
|
|
@@ -46,14 +47,14 @@
|
|
|
46
47
|
"eslint-plugin-react": "7.37.5",
|
|
47
48
|
"eslint-plugin-react-hooks": "7.0.1",
|
|
48
49
|
"globals": "17.4.0",
|
|
49
|
-
"knip": "
|
|
50
|
+
"knip": "6.4.0",
|
|
50
51
|
"preact": "10.29.1",
|
|
51
52
|
"preact-iso": "2.11.1",
|
|
52
53
|
"prettier": "3.8.2",
|
|
53
54
|
"tailwindcss": "4.2.2",
|
|
54
55
|
"tsc-alias": "1.8.16",
|
|
55
56
|
"tsx": "4.21.0",
|
|
56
|
-
"typescript": "
|
|
57
|
+
"typescript": "6.0.2",
|
|
57
58
|
"typescript-eslint": "8.58.1",
|
|
58
59
|
"vite": "7.3.2",
|
|
59
60
|
"vite-plugin-pwa": "1.2.0",
|
|
@@ -3,8 +3,10 @@ import * as apis from "../../shared/apis/index.js";
|
|
|
3
3
|
import * as handlers from "../../server/api/handlers/index.js";
|
|
4
4
|
export function createApiRouter(app) {
|
|
5
5
|
const router = Router();
|
|
6
|
-
//
|
|
7
|
-
//
|
|
6
|
+
// No CORS middleware needed. The API is served from the same origin as the
|
|
7
|
+
// web app, so nothing is needed to make that work, and browsers already block
|
|
8
|
+
// cross-origin requests bydefault, unless the server explicitly opts-in to
|
|
9
|
+
// allowing JS from another domain accessing it.
|
|
8
10
|
function setup(api, handler) {
|
|
9
11
|
router.post(api.path, async (req, res) => {
|
|
10
12
|
try {
|
|
@@ -17,14 +19,12 @@ export function createApiRouter(app) {
|
|
|
17
19
|
const result = await handler({ app /* token */ }, args.data);
|
|
18
20
|
res.json(result);
|
|
19
21
|
}
|
|
20
|
-
catch
|
|
22
|
+
catch (err) {
|
|
21
23
|
// In future we might want to allow handlers to throw some sort of
|
|
22
24
|
// custom error (e.g. throw new Api400Error(message)) and handle it here
|
|
23
25
|
// to return 400 rather than 500. So far, my plan is to handle that with
|
|
24
26
|
// return types in the schema instead, but it's an idea.
|
|
25
|
-
|
|
26
|
-
// app.log.warn(`500 Error handling ${api.path}`);
|
|
27
|
-
// app.log.warn(err);
|
|
27
|
+
app.log.general.apiError(api.path, err);
|
|
28
28
|
res.sendStatus(500);
|
|
29
29
|
}
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-api-router.js","sourceRoot":"","sources":["../../../api/create-api-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,gCAAgC,CAAC;AAI3D,MAAM,UAAU,eAAe,CAAC,GAAc;IAC5C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,
|
|
1
|
+
{"version":3,"file":"create-api-router.js","sourceRoot":"","sources":["../../../api/create-api-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,gCAAgC,CAAC;AAI3D,MAAM,UAAU,eAAe,CAAC,GAAc;IAC5C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,2EAA2E;IAC3E,8EAA8E;IAC9E,2EAA2E;IAC3E,gDAAgD;IAEhD,SAAS,KAAK,CACZ,GAAsB,EACtB,OAAiC;QAEjC,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,kEAAkE;gBAClE,wEAAwE;gBACxE,wEAAwE;gBACxE,wDAAwD;gBAExD,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACxC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAChE,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IAClD,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,5 +1,8 @@
|
|
|
1
1
|
import type { AboutPageConfig, AssetConfig, FooterConfig, LandingPageConfig, LineConfig, LinesPageConfig, StopConfig, TagsConfig, TerminologyConfig } from "../../server/config/types/index.js";
|
|
2
|
+
import type { Logger } from "../../server/logger/logger.js";
|
|
3
|
+
import type { GetCanonicalLinesServingStopConfig } from "../../server/config/types/get-canonical-lines-serving-stop-config-func.js";
|
|
2
4
|
export type CorequeryConfig = {
|
|
5
|
+
readonly logger: Logger;
|
|
3
6
|
readonly port: number;
|
|
4
7
|
readonly version: string;
|
|
5
8
|
readonly assets: AssetConfig;
|
|
@@ -11,4 +14,5 @@ export type CorequeryConfig = {
|
|
|
11
14
|
readonly aboutPage: AboutPageConfig;
|
|
12
15
|
readonly linesPage: LinesPageConfig;
|
|
13
16
|
readonly tags: TagsConfig;
|
|
17
|
+
readonly getCanonicalLinesServingStop: GetCanonicalLinesServingStopConfig;
|
|
14
18
|
};
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { GetCanonicalLinesServingStopConfig } from "../../../server/config/types/get-canonical-lines-serving-stop-config-func.js";
|
|
2
|
+
import type { LineConfig } from "../../../server/config/types/line-config.js";
|
|
3
|
+
import type { TagSuccessionConfig } from "../../../server/config/types/tags-config.js";
|
|
4
|
+
type Options = {
|
|
5
|
+
readonly lines: readonly LineConfig[];
|
|
6
|
+
readonly lineTagSuccession: TagSuccessionConfig;
|
|
7
|
+
readonly routeTagSuccession: TagSuccessionConfig;
|
|
8
|
+
/**
|
|
9
|
+
* Defines tiers such that lines from a subsequent tier are ignored if the
|
|
10
|
+
* stop is also served by lines from an earlier tier. In other words, tiers
|
|
11
|
+
* are ordered by priority, with the first tier having the highest priority.
|
|
12
|
+
* Any lines which don't fall into any tier are always included (as though
|
|
13
|
+
* they were in the first tier).
|
|
14
|
+
*
|
|
15
|
+
* E.g. if set to `[tag.FULL_TIME, tag.PART_TIME]`, then lines tagged as
|
|
16
|
+
* `PART_TIME` will only be listed for stops which aren't also served by lines
|
|
17
|
+
* tagged as `FULL_TIME`.
|
|
18
|
+
*/
|
|
19
|
+
readonly tierLinesByTag?: number[];
|
|
20
|
+
/** A list of route tags, the routes of which should be ignored. */
|
|
21
|
+
readonly ignoreRoutesWithTags?: number[];
|
|
22
|
+
/**
|
|
23
|
+
* Whether to ignore stops on routes marked as `hidden-unless-stopped-at`.
|
|
24
|
+
* (Default: `true`)
|
|
25
|
+
*/
|
|
26
|
+
readonly ignoreHiddenStops?: boolean;
|
|
27
|
+
};
|
|
28
|
+
export declare function createCanonicalLinesServingStopAlgorithm(options: Options): GetCanonicalLinesServingStopConfig;
|
|
29
|
+
export {};
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { Tags } from "../../../server/data/tags.js";
|
|
2
|
+
const isHiddenMapping = {
|
|
3
|
+
"regular": false,
|
|
4
|
+
"hidden-unless-stopped-at": true,
|
|
5
|
+
};
|
|
6
|
+
export function createCanonicalLinesServingStopAlgorithm(options) {
|
|
7
|
+
const lines = options.lines.map((line) => ({
|
|
8
|
+
...line,
|
|
9
|
+
tags: Tags.build(line.tags, options.lineTagSuccession),
|
|
10
|
+
}));
|
|
11
|
+
const tierLinesByTag = options.tierLinesByTag ?? [];
|
|
12
|
+
const ignoreRoutesWithTags = options.ignoreRoutesWithTags ?? [];
|
|
13
|
+
const ignoreHiddenStops = options.ignoreHiddenStops ?? true;
|
|
14
|
+
return (stopId) => {
|
|
15
|
+
const allCandidateLines = lines.filter((line) => find({
|
|
16
|
+
stopId,
|
|
17
|
+
routes: line.routes,
|
|
18
|
+
routeTagSuccession: options.routeTagSuccession,
|
|
19
|
+
ignoreRoutesWithTags,
|
|
20
|
+
ignoreHiddenStops,
|
|
21
|
+
}));
|
|
22
|
+
if (tierLinesByTag.length === 0 || allCandidateLines.length === 0) {
|
|
23
|
+
return allCandidateLines.map((line) => line.id);
|
|
24
|
+
}
|
|
25
|
+
// Assign each line to a tier, using 0 as the default if tier unclear.
|
|
26
|
+
const linesByTier = new Map();
|
|
27
|
+
for (const line of allCandidateLines) {
|
|
28
|
+
const foundTier = tierLinesByTag.findIndex((tag) => line.tags.has(tag));
|
|
29
|
+
const tier = foundTier === -1 ? 0 : foundTier;
|
|
30
|
+
linesByTier.set(tier, [...(linesByTier.get(tier) ?? []), line.id]);
|
|
31
|
+
}
|
|
32
|
+
const highestTier = Math.min(...linesByTier.keys());
|
|
33
|
+
return linesByTier.get(highestTier) ?? [];
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
function find({ stopId, routes, routeTagSuccession, ignoreRoutesWithTags, ignoreHiddenStops, }) {
|
|
37
|
+
return routes.some((route) => {
|
|
38
|
+
const routeTags = Tags.build(route.tags, routeTagSuccession);
|
|
39
|
+
const ignored = ignoreRoutesWithTags.some((tag) => routeTags.has(tag));
|
|
40
|
+
if (ignored)
|
|
41
|
+
return false;
|
|
42
|
+
const relevantStops = route.stops.filter((stop) => {
|
|
43
|
+
const isHiddenStop = isHiddenMapping[stop.type];
|
|
44
|
+
return !isHiddenStop || !ignoreHiddenStops;
|
|
45
|
+
});
|
|
46
|
+
return relevantStops.some((stop) => stop.stopId === stopId);
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=create-canonical-lines-serving-stop-algorithm.js.map
|
package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js.map
ADDED
|
@@ -0,0 +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;AAE7C,MAAM,eAAe,GAAyC;IAC5D,SAAS,EAAE,KAAK;IAChB,0BAA0B,EAAE,IAAI;CACjC,CAAC;AA8BF,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;IACpD,MAAM,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC;IAChE,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAE5D,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9C,IAAI,CAAC;YACH,MAAM;YACN,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,oBAAoB;YACpB,iBAAiB;SAClB,CAAC,CACH,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,IAAI,CAAC,EACZ,MAAM,EACN,MAAM,EACN,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,GAOlB;IACC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvE,IAAI,OAAO;YAAE,OAAO,KAAK,CAAC;QAE1B,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAChD,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,OAAO,CAAC,YAAY,IAAI,CAAC,iBAAiB,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./create-canonical-lines-serving-stop-algorithm.js";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../config/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oDAAoD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../config/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../config/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,aAAa,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type GetCanonicalLinesServingStopConfig = (stopId: number) => readonly number[];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-canonical-lines-serving-stop-config-func.js","sourceRoot":"","sources":["../../../../config/types/get-canonical-lines-serving-stop-config-func.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from "./about-page-config.js";
|
|
2
2
|
export * from "./asset-config.js";
|
|
3
3
|
export * from "./footer-config.js";
|
|
4
|
+
export * from "./get-canonical-lines-serving-stop-config-func.js";
|
|
4
5
|
export * from "./landing-page-config.js";
|
|
5
6
|
export * from "./line-config.js";
|
|
6
7
|
export * from "./lines-page-config.js";
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from "./about-page-config.js";
|
|
2
2
|
export * from "./asset-config.js";
|
|
3
3
|
export * from "./footer-config.js";
|
|
4
|
+
export * from "./get-canonical-lines-serving-stop-config-func.js";
|
|
4
5
|
export * from "./landing-page-config.js";
|
|
5
6
|
export * from "./line-config.js";
|
|
6
7
|
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,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,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,oBAAoB,CAAC;AACnC,cAAc,mDAAmD,CAAC;AAClE,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import type { Color } from "../../../server/data/color.js";
|
|
2
|
+
export type RouteStopTypeConfig = "regular" | "hidden-unless-stopped-at";
|
|
3
|
+
type LineDiagramStopTypeConfig = "regular" | "always-express";
|
|
1
4
|
export type LineConfig = {
|
|
2
5
|
readonly id: number;
|
|
3
6
|
readonly name: string;
|
|
@@ -6,6 +9,7 @@ export type LineConfig = {
|
|
|
6
9
|
readonly urlPath: string;
|
|
7
10
|
readonly routes: readonly RouteConfig[];
|
|
8
11
|
readonly diagram: LineDiagramConfig;
|
|
12
|
+
readonly color: Color | null;
|
|
9
13
|
};
|
|
10
14
|
export type RouteConfig = {
|
|
11
15
|
readonly id: number;
|
|
@@ -13,7 +17,7 @@ export type RouteConfig = {
|
|
|
13
17
|
readonly tags: number[];
|
|
14
18
|
readonly stops: readonly {
|
|
15
19
|
readonly stopId: number;
|
|
16
|
-
readonly type:
|
|
20
|
+
readonly type: RouteStopTypeConfig;
|
|
17
21
|
}[];
|
|
18
22
|
readonly color: Color | null;
|
|
19
23
|
};
|
|
@@ -23,8 +27,8 @@ export type LineDiagramConfig = {
|
|
|
23
27
|
readonly color: string;
|
|
24
28
|
readonly stops: readonly {
|
|
25
29
|
readonly stopId: number;
|
|
26
|
-
readonly type:
|
|
30
|
+
readonly type: LineDiagramStopTypeConfig;
|
|
27
31
|
}[];
|
|
28
32
|
}[];
|
|
29
33
|
};
|
|
30
|
-
export
|
|
34
|
+
export {};
|
|
@@ -2,10 +2,12 @@ import type { CorequeryConfig } from "../server/config/config.js";
|
|
|
2
2
|
import { StopCollection } from "../server/data/stop-collection.js";
|
|
3
3
|
import { LineCollection } from "../server/data/line-collection.js";
|
|
4
4
|
import type { AboutPageConfig, FooterConfig, LandingPageConfig, TerminologyConfig } from "../server/config/index.js";
|
|
5
|
+
import type { Logger } from "../server/logger/logger.js";
|
|
5
6
|
export type CorequeryConfigBuilder = (corequery: Corequery) => CorequeryConfig;
|
|
6
7
|
export declare class Corequery {
|
|
7
8
|
private readonly _config;
|
|
8
9
|
private readonly _webServer;
|
|
10
|
+
readonly log: Logger;
|
|
9
11
|
readonly serverVersion: string;
|
|
10
12
|
private _corequeryPackageVersion;
|
|
11
13
|
private _frontendVersion;
|
|
@@ -7,6 +7,7 @@ import { getCorequeryPackageVersion } from "../server/get-corequery-package-vers
|
|
|
7
7
|
export class Corequery {
|
|
8
8
|
_config;
|
|
9
9
|
_webServer;
|
|
10
|
+
log;
|
|
10
11
|
serverVersion;
|
|
11
12
|
_corequeryPackageVersion;
|
|
12
13
|
_frontendVersion;
|
|
@@ -21,14 +22,14 @@ export class Corequery {
|
|
|
21
22
|
constructor(configBuilder) {
|
|
22
23
|
this._config = configBuilder(this);
|
|
23
24
|
this._webServer = new WebServer(this, this._config.port, this._config.assets, env.COREQUERY_HOT_RELOAD ? "vite-middleware" : "dist-folder", serverFolderPath);
|
|
25
|
+
this.log = this._config.logger;
|
|
24
26
|
this.serverVersion = this._config.version;
|
|
25
27
|
// Currently fetched async during start().
|
|
26
28
|
this._corequeryPackageVersion = null;
|
|
27
29
|
// Only known after assets are prepared, during start().
|
|
28
30
|
this._frontendVersion = null;
|
|
29
|
-
|
|
30
|
-
this.
|
|
31
|
-
this.lines = LineCollection.build(this._config.lines, lineTagSuccession);
|
|
31
|
+
this.stops = StopCollection.build(this._config.stops, this._config.tags.stopTagSuccession, this._config.getCanonicalLinesServingStop);
|
|
32
|
+
this.lines = LineCollection.build(this._config.lines, this._config.tags.lineTagSuccession, this._config.tags.routeTagSuccession);
|
|
32
33
|
this.landingPageConfig = this._config.landingPage;
|
|
33
34
|
this.footerConfig = this._config.footer;
|
|
34
35
|
this.aboutPageConfig = this._config.aboutPage;
|
|
@@ -50,15 +51,7 @@ export class Corequery {
|
|
|
50
51
|
this._corequeryPackageVersion = await getCorequeryPackageVersion();
|
|
51
52
|
await this._webServer.prepareAssets();
|
|
52
53
|
this._frontendVersion = this._webServer.getFrontendVersion();
|
|
53
|
-
|
|
54
|
-
// eslint-disable-next-line no-console
|
|
55
|
-
console.log(`Starting ${this._config.assets.appName}...`);
|
|
56
|
-
// eslint-disable-next-line no-console
|
|
57
|
-
console.log(`- Server version: ${this.serverVersion}`);
|
|
58
|
-
// eslint-disable-next-line no-console
|
|
59
|
-
console.log(`- Frontend version: ${this.getFrontendVersion()}`);
|
|
60
|
-
// eslint-disable-next-line no-console
|
|
61
|
-
console.log(`- CoreQuery version: ${this.getCorequeryPackageVersion()}`);
|
|
54
|
+
this.log.general.starting(this._config.assets.appName, this.serverVersion, this.getFrontendVersion(), this.getCorequeryPackageVersion());
|
|
62
55
|
await this._webServer.start();
|
|
63
56
|
}
|
|
64
57
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export type Color = "red" | "yellow" | "green" | "cyan" | "blue" | "pink" | "purple" | "gray";
|
|
2
|
+
type HexCodes = {
|
|
3
|
+
readonly lightModeHexCode: string;
|
|
4
|
+
readonly darkModeHexCode: string;
|
|
5
|
+
};
|
|
6
|
+
export declare function getHexCodesForColor(color: Color): HexCodes;
|
|
7
|
+
export {};
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
const hexCodes = {
|
|
2
|
+
red: {
|
|
3
|
+
lightModeHexCode: "#db0f0f",
|
|
4
|
+
darkModeHexCode: "#ff5252",
|
|
5
|
+
},
|
|
6
|
+
yellow: {
|
|
7
|
+
lightModeHexCode: "#d19600",
|
|
8
|
+
darkModeHexCode: "#ffc124",
|
|
9
|
+
},
|
|
10
|
+
green: {
|
|
11
|
+
lightModeHexCode: "#1caf0e",
|
|
12
|
+
darkModeHexCode: "#33d025",
|
|
13
|
+
},
|
|
14
|
+
cyan: {
|
|
15
|
+
lightModeHexCode: "#00a7cc",
|
|
16
|
+
darkModeHexCode: "#1ad5ff",
|
|
17
|
+
},
|
|
18
|
+
blue: {
|
|
19
|
+
lightModeHexCode: "#3352c1",
|
|
20
|
+
darkModeHexCode: "#8aa3ff",
|
|
21
|
+
},
|
|
22
|
+
pink: {
|
|
23
|
+
lightModeHexCode: "#d73cab",
|
|
24
|
+
darkModeHexCode: "#ff61d2",
|
|
25
|
+
},
|
|
26
|
+
purple: {
|
|
27
|
+
lightModeHexCode: "#a135e3",
|
|
28
|
+
darkModeHexCode: "#cc7aff",
|
|
29
|
+
},
|
|
30
|
+
gray: {
|
|
31
|
+
lightModeHexCode: "#000714cc",
|
|
32
|
+
darkModeHexCode: "#ebf1ffcc",
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
export function getHexCodesForColor(color) {
|
|
36
|
+
return hexCodes[color];
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=color.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"color.js","sourceRoot":"","sources":["../../../data/color.ts"],"names":[],"mappings":"AAeA,MAAM,QAAQ,GAA4B;IACxC,GAAG,EAAE;QACH,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,MAAM,EAAE;QACN,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,MAAM,EAAE;QACN,gBAAgB,EAAE,SAAS;QAC3B,eAAe,EAAE,SAAS;KAC3B;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,WAAW;QAC7B,eAAe,EAAE,WAAW;KAC7B;CACF,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,KAAY;IAC9C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
export * from "./collection.js";
|
|
2
|
+
export * from "./color.js";
|
|
2
3
|
export * from "./line-collection.js";
|
|
3
4
|
export * from "./line.js";
|
|
4
5
|
export * from "./location.js";
|
|
6
|
+
export * from "./route.js";
|
|
5
7
|
export * from "./stop-collection.js";
|
|
6
8
|
export * from "./stop.js";
|
|
7
9
|
export * from "./tags.js";
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
export * from "./collection.js";
|
|
2
|
+
export * from "./color.js";
|
|
2
3
|
export * from "./line-collection.js";
|
|
3
4
|
export * from "./line.js";
|
|
4
5
|
export * from "./location.js";
|
|
6
|
+
export * from "./route.js";
|
|
5
7
|
export * from "./stop-collection.js";
|
|
6
8
|
export * from "./stop.js";
|
|
7
9
|
export * from "./tags.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../data/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../data/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { Line } from "../../server/data/line.js";
|
|
|
3
3
|
import type { LineConfig, TagSuccessionConfig } from "../../server/config/index.js";
|
|
4
4
|
export declare class LineCollection extends Collection<number, Line> {
|
|
5
5
|
constructor(data: readonly Line[]);
|
|
6
|
-
static build(stops: readonly LineConfig[], lineTagSuccession: TagSuccessionConfig): LineCollection;
|
|
6
|
+
static build(stops: readonly LineConfig[], lineTagSuccession: TagSuccessionConfig, routeTagSuccession: TagSuccessionConfig): LineCollection;
|
|
7
7
|
protected _getID(item: Line): number;
|
|
8
8
|
protected _getRequireFailError(id: number): Error;
|
|
9
9
|
protected _getPredicateFailError(): Error;
|
|
@@ -4,8 +4,8 @@ export class LineCollection extends Collection {
|
|
|
4
4
|
constructor(data) {
|
|
5
5
|
super(data);
|
|
6
6
|
}
|
|
7
|
-
static build(stops, lineTagSuccession) {
|
|
8
|
-
return new LineCollection(stops.map((s) => Line.build(s, lineTagSuccession)));
|
|
7
|
+
static build(stops, lineTagSuccession, routeTagSuccession) {
|
|
8
|
+
return new LineCollection(stops.map((s) => Line.build(s, lineTagSuccession, routeTagSuccession)));
|
|
9
9
|
}
|
|
10
10
|
_getID(item) {
|
|
11
11
|
return item.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-collection.js","sourceRoot":"","sources":["../../../data/line-collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,MAAM,OAAO,cAAe,SAAQ,UAAwB;IAC1D,YAAY,IAAqB;QAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAK,CACV,KAA4B,EAC5B,iBAAsC;
|
|
1
|
+
{"version":3,"file":"line-collection.js","sourceRoot":"","sources":["../../../data/line-collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,MAAM,OAAO,cAAe,SAAQ,UAAwB;IAC1D,YAAY,IAAqB;QAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAK,CACV,KAA4B,EAC5B,iBAAsC,EACtC,kBAAuC;QAEvC,OAAO,IAAI,cAAc,CACvB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC,CACvE,CAAC;IACJ,CAAC;IAES,MAAM,CAAC,IAAU;QACzB,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAES,oBAAoB,CAAC,EAAU;QACvC,OAAO,IAAI,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IAES,sBAAsB;QAC9B,OAAO,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC;CACF"}
|
|
@@ -2,19 +2,25 @@ import type { LineConfig, TagSuccessionConfig } from "../../server/config/index.
|
|
|
2
2
|
import { Tags } from "../../server/data/tags.js";
|
|
3
3
|
import type { lineFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
|
|
4
4
|
import type z from "zod";
|
|
5
|
+
import { type Color } from "../../server/data/color.js";
|
|
6
|
+
import { Route } from "../../server/data/route.js";
|
|
5
7
|
type LineFields = {
|
|
6
8
|
readonly id: number;
|
|
7
9
|
readonly name: string;
|
|
8
10
|
readonly tags: Tags;
|
|
9
11
|
readonly urlPath: string;
|
|
12
|
+
readonly color: Color | null;
|
|
13
|
+
readonly routes: readonly Route[];
|
|
10
14
|
};
|
|
11
15
|
export declare class Line {
|
|
12
16
|
readonly id: number;
|
|
13
17
|
readonly name: string;
|
|
14
18
|
readonly tags: Tags;
|
|
15
19
|
readonly urlPath: string;
|
|
20
|
+
readonly color: Color | null;
|
|
21
|
+
readonly routes: readonly Route[];
|
|
16
22
|
constructor(fields: LineFields);
|
|
17
|
-
static build(lineConfig: LineConfig, lineTagSuccession: TagSuccessionConfig): Line;
|
|
23
|
+
static build(lineConfig: LineConfig, lineTagSuccession: TagSuccessionConfig, routeTagSuccession: TagSuccessionConfig): Line;
|
|
18
24
|
toFoda(): z.input<typeof lineFodaSchema>;
|
|
19
25
|
with(newValues: Partial<LineFields>): Line;
|
|
20
26
|
/** e.g. `"Sandringham" (#1)` */
|
|
@@ -1,21 +1,29 @@
|
|
|
1
1
|
import { Tags } from "../../server/data/tags.js";
|
|
2
|
+
import { getHexCodesForColor } from "../../server/data/color.js";
|
|
3
|
+
import { Route } from "../../server/data/route.js";
|
|
2
4
|
export class Line {
|
|
3
5
|
id;
|
|
4
6
|
name;
|
|
5
7
|
tags;
|
|
6
8
|
urlPath;
|
|
9
|
+
color;
|
|
10
|
+
routes;
|
|
7
11
|
constructor(fields) {
|
|
8
12
|
this.id = fields.id;
|
|
9
13
|
this.name = fields.name;
|
|
10
14
|
this.tags = fields.tags;
|
|
11
15
|
this.urlPath = fields.urlPath;
|
|
16
|
+
this.color = fields.color;
|
|
17
|
+
this.routes = fields.routes;
|
|
12
18
|
}
|
|
13
|
-
static build(lineConfig, lineTagSuccession) {
|
|
19
|
+
static build(lineConfig, lineTagSuccession, routeTagSuccession) {
|
|
14
20
|
return new Line({
|
|
15
21
|
id: lineConfig.id,
|
|
16
22
|
name: lineConfig.name,
|
|
17
23
|
tags: Tags.build(lineConfig.tags, lineTagSuccession),
|
|
18
24
|
urlPath: lineConfig.urlPath,
|
|
25
|
+
color: lineConfig.color,
|
|
26
|
+
routes: lineConfig.routes.map((route) => Route.build(route, routeTagSuccession)),
|
|
19
27
|
});
|
|
20
28
|
}
|
|
21
29
|
toFoda() {
|
|
@@ -23,6 +31,7 @@ export class Line {
|
|
|
23
31
|
id: this.id,
|
|
24
32
|
name: this.name,
|
|
25
33
|
urlPath: this.urlPath,
|
|
34
|
+
color: this.color != null ? getHexCodesForColor(this.color) : null,
|
|
26
35
|
};
|
|
27
36
|
}
|
|
28
37
|
with(newValues) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../data/line.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../data/line.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,OAAO,EAAE,mBAAmB,EAAc,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAW/C,MAAM,OAAO,IAAI;IACN,EAAE,CAAS;IACX,IAAI,CAAS;IACb,IAAI,CAAO;IACX,OAAO,CAAS;IAChB,KAAK,CAAe;IACpB,MAAM,CAAmB;IAElC,YAAY,MAAkB;QAC5B,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAK,CACV,UAAsB,EACtB,iBAAsC,EACtC,kBAAuC;QAEvC,OAAO,IAAI,IAAI,CAAC;YACd,EAAE,EAAE,UAAU,CAAC,EAAE;YACjB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,iBAAiB,CAAC;YACpD,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACtC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,kBAAkB,CAAC,CACvC;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;SACnE,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAA8B;QACjC,OAAO,IAAI,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAgC;IAChC,IAAI,SAAS;QACX,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC;IACxC,CAAC;CACF"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { RouteConfig, TagSuccessionConfig } from "../../server/config/index.js";
|
|
2
|
+
import { Tags } from "../../server/data/tags.js";
|
|
3
|
+
import type { Color } from "../../server/data/color.js";
|
|
4
|
+
type RouteStop = RouteConfig["stops"][number];
|
|
5
|
+
type RouteFields = {
|
|
6
|
+
readonly id: number;
|
|
7
|
+
readonly name: string;
|
|
8
|
+
readonly tags: Tags;
|
|
9
|
+
readonly stops: readonly RouteStop[];
|
|
10
|
+
readonly color: Color | null;
|
|
11
|
+
};
|
|
12
|
+
export declare class Route {
|
|
13
|
+
readonly id: number;
|
|
14
|
+
readonly name: string;
|
|
15
|
+
readonly tags: Tags;
|
|
16
|
+
readonly stops: readonly RouteStop[];
|
|
17
|
+
readonly color: Color | null;
|
|
18
|
+
constructor(fields: RouteFields);
|
|
19
|
+
static build(routeConfig: RouteConfig, routeTagSuccession: TagSuccessionConfig): Route;
|
|
20
|
+
with(newValues: Partial<RouteFields>): Route;
|
|
21
|
+
/** e.g. `"Sandringham to Flinders Street" (#1)` */
|
|
22
|
+
get debugName(): string;
|
|
23
|
+
}
|
|
24
|
+
export {};
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { Tags } from "../../server/data/tags.js";
|
|
2
|
+
export class Route {
|
|
3
|
+
id;
|
|
4
|
+
name;
|
|
5
|
+
tags;
|
|
6
|
+
stops;
|
|
7
|
+
color;
|
|
8
|
+
constructor(fields) {
|
|
9
|
+
this.id = fields.id;
|
|
10
|
+
this.name = fields.name;
|
|
11
|
+
this.tags = fields.tags;
|
|
12
|
+
this.stops = fields.stops;
|
|
13
|
+
this.color = fields.color;
|
|
14
|
+
}
|
|
15
|
+
static build(routeConfig, routeTagSuccession) {
|
|
16
|
+
return new Route({
|
|
17
|
+
id: routeConfig.id,
|
|
18
|
+
name: routeConfig.name,
|
|
19
|
+
tags: Tags.build(routeConfig.tags, routeTagSuccession),
|
|
20
|
+
stops: routeConfig.stops,
|
|
21
|
+
color: routeConfig.color,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
with(newValues) {
|
|
25
|
+
return new Route({ ...this, ...newValues });
|
|
26
|
+
}
|
|
27
|
+
/** e.g. `"Sandringham to Flinders Street" (#1)` */
|
|
28
|
+
get debugName() {
|
|
29
|
+
return `"${this.name}" (#${this.id})`;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=route.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../data/route.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAa7C,MAAM,OAAO,KAAK;IACP,EAAE,CAAS;IACX,IAAI,CAAS;IACb,IAAI,CAAO;IACX,KAAK,CAAuB;IAC5B,KAAK,CAAe;IAE7B,YAAY,MAAmB;QAC7B,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,KAAK,CACV,WAAwB,EACxB,kBAAuC;QAEvC,OAAO,IAAI,KAAK,CAAC;YACf,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,kBAAkB,CAAC;YACtD,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,WAAW,CAAC,KAAK;SACzB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,SAA+B;QAClC,OAAO,IAAI,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,mDAAmD;IACnD,IAAI,SAAS;QACX,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC;IACxC,CAAC;CACF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Collection } from "../../server/data/collection.js";
|
|
2
2
|
import { Stop } from "../../server/data/stop.js";
|
|
3
|
-
import type { StopConfig, TagSuccessionConfig } from "../../server/config/index.js";
|
|
3
|
+
import type { GetCanonicalLinesServingStopConfig, StopConfig, TagSuccessionConfig } from "../../server/config/index.js";
|
|
4
4
|
export declare class StopCollection extends Collection<number, Stop> {
|
|
5
5
|
constructor(data: readonly Stop[]);
|
|
6
|
-
static build(stops: readonly StopConfig[], stopTagSuccession: TagSuccessionConfig): StopCollection;
|
|
6
|
+
static build(stops: readonly StopConfig[], stopTagSuccession: TagSuccessionConfig, getCanonicalLinesServingStop: GetCanonicalLinesServingStopConfig): StopCollection;
|
|
7
7
|
protected _getID(item: Stop): number;
|
|
8
8
|
protected _getRequireFailError(id: number): Error;
|
|
9
9
|
protected _getPredicateFailError(): Error;
|