corequery 0.16.1 → 0.17.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 +7 -7
- package/server/dist/server/config/linting/line/index.js +2 -0
- package/server/dist/server/config/linting/line/index.js.map +1 -1
- package/server/dist/server/config/linting/line/route/{all-or-none-colors.d.ts → all-or-none-colors-global.d.ts} +1 -1
- package/server/dist/server/config/linting/line/route/all-or-none-colors-global.js +20 -0
- package/server/dist/server/config/linting/line/route/all-or-none-colors-global.js.map +1 -0
- package/server/dist/server/config/linting/line/route/index.js +0 -2
- package/server/dist/server/config/linting/line/route/index.js.map +1 -1
- package/server/dist/server/config/types/line-config.d.ts +10 -10
- package/server/dist/server/data/index.d.ts +2 -1
- package/server/dist/server/data/index.js +2 -1
- package/server/dist/server/data/index.js.map +1 -1
- package/server/dist/server/data/line-collection.d.ts +1 -2
- package/server/dist/server/data/line-collection.js +1 -4
- package/server/dist/server/data/line-collection.js.map +1 -1
- package/server/dist/server/data/line-diagram-entry.d.ts +21 -0
- package/server/dist/server/data/line-diagram-entry.js +42 -0
- package/server/dist/server/data/line-diagram-entry.js.map +1 -0
- package/server/dist/server/data/line-diagram.d.ts +16 -0
- package/server/dist/server/data/line-diagram.js +26 -0
- package/server/dist/server/data/line-diagram.js.map +1 -0
- package/server/dist/server/data/line.d.ts +3 -0
- package/server/dist/server/data/line.js +5 -0
- package/server/dist/server/data/line.js.map +1 -1
- package/server/dist/server/data/stop-collection.d.ts +1 -2
- package/server/dist/server/data/stop-collection.js +1 -4
- package/server/dist/server/data/stop-collection.js.map +1 -1
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.d.ts +79 -4
- package/server/dist/shared/apis/foundational-data/v1/foundational-data.js +42 -13
- 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 +24 -4
- package/server/dist/shared/data/collection.js.map +1 -0
- package/web/dist/assets/About-CaTBAYPV.js +1 -0
- package/web/dist/assets/AdminControls-z2-hx_Wi.js +1 -0
- package/web/dist/assets/Alert-ZeYzkS1G.js +1 -0
- package/web/dist/assets/Debug-B4B1XWnL.js +1 -0
- package/web/dist/assets/{Divider-Be0m4WgQ.js → Divider-dQCO5rFf.js} +1 -1
- package/web/dist/assets/Home-CrgHy4-U.js +1 -0
- package/web/dist/assets/Line-aTuN5Qn2.js +1 -0
- package/web/dist/assets/LinkText-BZEamFKR.js +1 -0
- package/web/dist/assets/Markdown-CsYleoHG.js +2 -0
- package/web/dist/assets/Nearby-D9fcPcO8.js +1 -0
- package/web/dist/assets/NotFound-s2u-0Rtl.js +1 -0
- package/web/dist/assets/NotFoundPage-CmT-cPq4.js +1 -0
- package/web/dist/assets/Page-14zdRXyE.js +1 -0
- package/web/dist/assets/Picker-B_2kVnst.js +1 -0
- package/web/dist/assets/Placeholder-Dg6ymgQL.js +1 -0
- package/web/dist/assets/Settings-DetCeQb0.js +1 -0
- package/web/dist/assets/Status-BZjxaB6p.js +1 -0
- package/web/dist/assets/Stop-B_-mSd4e.js +1 -0
- package/web/dist/assets/{Strong-D9f5KEpX.js → Strong-DQEYCa_y.js} +1 -1
- package/web/dist/assets/ZenMode-BYFX2HyF.js +1 -0
- package/web/dist/assets/{index-BwSq_h7e.js → index-CLEhHuwG.js} +16 -16
- package/web/dist/assets/{index-CQqh1NYO.css → index-gUxgtCJY.css} +1 -1
- package/web/dist/assets/{use-simple-headers-DWUUdRcU.js → use-simple-headers-CdkDNHF3.js} +1 -1
- package/web/dist/index.html +2 -2
- package/web/dist/sw.js +1 -1
- package/server/dist/server/config/linting/line/route/all-or-none-colors.js +0 -13
- package/server/dist/server/config/linting/line/route/all-or-none-colors.js.map +0 -1
- package/server/dist/server/data/collection.js.map +0 -1
- package/web/dist/assets/About-B4-dkQWr.js +0 -1
- package/web/dist/assets/AdminControls-CzU02gqN.js +0 -1
- package/web/dist/assets/Alert-IVv67CZ1.js +0 -1
- package/web/dist/assets/Debug-D3jL5PaF.js +0 -1
- package/web/dist/assets/Home-BPoVw8gT.js +0 -1
- package/web/dist/assets/Line-E2TOnCOo.js +0 -1
- package/web/dist/assets/Markdown-C8fLva6C.js +0 -2
- package/web/dist/assets/Nearby-C4nB11U5.js +0 -1
- package/web/dist/assets/NotFound-CzT6M9J8.js +0 -1
- package/web/dist/assets/NotFoundPage-DBDabcv_.js +0 -1
- package/web/dist/assets/Page-CEn9SSvt.js +0 -1
- package/web/dist/assets/Settings-pye1MxCr.js +0 -1
- package/web/dist/assets/Status-D_1UU9CO.js +0 -1
- package/web/dist/assets/Stop-CsAwhg3q.js +0 -1
- package/web/dist/assets/ZenMode-CGoCJmvB.js +0 -1
- /package/server/dist/{server → shared}/data/collection.d.ts +0 -0
- /package/server/dist/{server → shared}/data/collection.js +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "corequery",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.17.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"server/dist",
|
|
@@ -45,17 +45,17 @@
|
|
|
45
45
|
"eslint-config-prettier": "10.1.8",
|
|
46
46
|
"eslint-plugin-prettier": "5.5.5",
|
|
47
47
|
"eslint-plugin-react": "7.37.5",
|
|
48
|
-
"eslint-plugin-react-hooks": "7.
|
|
49
|
-
"globals": "17.
|
|
50
|
-
"knip": "6.4.
|
|
48
|
+
"eslint-plugin-react-hooks": "7.1.1",
|
|
49
|
+
"globals": "17.5.0",
|
|
50
|
+
"knip": "6.4.1",
|
|
51
51
|
"preact": "10.29.1",
|
|
52
52
|
"preact-iso": "2.11.1",
|
|
53
|
-
"prettier": "3.8.
|
|
53
|
+
"prettier": "3.8.3",
|
|
54
54
|
"tailwindcss": "4.2.2",
|
|
55
55
|
"tsc-alias": "1.8.16",
|
|
56
56
|
"tsx": "4.21.0",
|
|
57
|
-
"typescript": "6.0.
|
|
58
|
-
"typescript-eslint": "8.58.
|
|
57
|
+
"typescript": "6.0.3",
|
|
58
|
+
"typescript-eslint": "8.58.2",
|
|
59
59
|
"vite": "7.3.2",
|
|
60
60
|
"vite-plugin-pwa": "1.2.0",
|
|
61
61
|
"vitest": "4.1.4"
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { checkLinesAllOrNoneHaveColors } from "../../../../server/config/linting/line/all-or-none-colors.js";
|
|
2
2
|
import { checkLinesAllOrNoneHaveCodes } from "../../../../server/config/linting/line/all-or-none-codes.js";
|
|
3
|
+
import { checkRoutesAllOrNoneHaveColors } from "../../../../server/config/linting/line/route/all-or-none-colors-global.js";
|
|
3
4
|
import { lintLineDiagramConfig } from "../../../../server/config/linting/line/diagram/index.js";
|
|
4
5
|
import { checkLineHasRoutes } from "../../../../server/config/linting/line/has-routes.js";
|
|
5
6
|
import { checkLineNoDuplicateTags } from "../../../../server/config/linting/line/no-duplicate-tags.js";
|
|
@@ -18,6 +19,7 @@ export function lintLineConfig(issues, lines, stops, options) {
|
|
|
18
19
|
checkLinesUniqueNames(issues, lines, options);
|
|
19
20
|
checkLinesAllOrNoneHaveCodes(issues, lines, options);
|
|
20
21
|
checkLinesAllOrNoneHaveColors(issues, lines, options);
|
|
22
|
+
checkRoutesAllOrNoneHaveColors(issues, lines, options);
|
|
21
23
|
for (const [lineIndex, line] of lines.entries()) {
|
|
22
24
|
checkLineHasRoutes(issues, line, lineIndex, options[line.id] ?? {});
|
|
23
25
|
checkLineNonEmptyCode(issues, line, lineIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../config/linting/line/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAGrF,MAAM,UAAU,cAAc,CAC5B,MAAsB,EACtB,KAA4B,EAC5B,KAA4B,EAC5B,OAAwC;IAExC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACrD,6BAA6B,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../config/linting/line/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,8BAA8B,EAAE,MAAM,iEAAiE,CAAC;AACjH,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAGrF,MAAM,UAAU,cAAc,CAC5B,MAAsB,EACtB,KAA4B,EAC5B,KAA4B,EAC5B,OAAwC;IAExC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACrD,6BAA6B,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACtD,8BAA8B,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAEvD,KAAK,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,qBAAqB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,qBAAqB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,wBAAwB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAClD,wBAAwB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAElD,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5E,qBAAqB,CACnB,MAAM,EACN,IAAI,EACJ,SAAS,EACT,KAAK,EACL,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CACvB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
2
|
import type { LineLintOptions } from "../../../../../server/config/linting/types.js";
|
|
3
3
|
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function
|
|
4
|
+
export declare function checkRoutesAllOrNoneHaveColors(issues: IssueCollector, lines: readonly LineConfig[], options: Record<number, LineLintOptions>): void;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { findAllOrNoneViolations } from "../../../../../server/config/linting/utils/find-all-or-none-violations.js";
|
|
2
|
+
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
+
export function checkRoutesAllOrNoneHaveColors(issues, lines, options) {
|
|
4
|
+
const routesToCheck = [];
|
|
5
|
+
for (const [lineIndex, line] of lines.entries()) {
|
|
6
|
+
for (const [routeIndex, route] of line.routes.entries()) {
|
|
7
|
+
if (!(options[line.id]?.routes?.[route.id]?.ignoreMissingColor ?? false)) {
|
|
8
|
+
routesToCheck.push({ route, lineIndex, routeIndex });
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
const missingColors = findAllOrNoneViolations(routesToCheck, ({ route }) => route.color !== null);
|
|
13
|
+
for (const { item } of missingColors ?? []) {
|
|
14
|
+
issues.add({
|
|
15
|
+
message: `Route "${item.route.name}" is missing a color.`,
|
|
16
|
+
path: `lines[${item.lineIndex}].routes[${item.routeIndex}].color`,
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=all-or-none-colors-global.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"all-or-none-colors-global.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/all-or-none-colors-global.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,8BAA8B,CAC5C,MAAsB,EACtB,KAA4B,EAC5B,OAAwC;IAExC,MAAM,aAAa,GAId,EAAE,CAAC;IAER,KAAK,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACxD,IACE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,kBAAkB,IAAI,KAAK,CAAC,EACpE,CAAC;gBACD,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAC3C,aAAa,EACb,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CACpC,CAAC;IAEF,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC;YACT,OAAO,EAAE,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,uBAAuB;YACzD,IAAI,EAAE,SAAS,IAAI,CAAC,SAAS,YAAY,IAAI,CAAC,UAAU,SAAS;SAClE,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { checkLineRoutesAllOrNoneHaveColors } from "../../../../../server/config/linting/line/route/all-or-none-colors.js";
|
|
2
1
|
import { checkRouteHasMinimumStops } from "../../../../../server/config/linting/line/route/minimum-stops.js";
|
|
3
2
|
import { checkRouteNoDuplicateTags } from "../../../../../server/config/linting/line/route/no-duplicate-tags.js";
|
|
4
3
|
import { checkLineRouteNonEmptyName } from "../../../../../server/config/linting/line/route/non-empty-name.js";
|
|
@@ -10,7 +9,6 @@ export function lintLineRouteConfig(issues, line, lineIndex, stops, options) {
|
|
|
10
9
|
checkLineRoutesUniqueIds(issues, line, lineIndex);
|
|
11
10
|
checkLineRoutesUniqueNames(issues, line, lineIndex, options);
|
|
12
11
|
checkLineRoutesMirrored(issues, line, lineIndex, options);
|
|
13
|
-
checkLineRoutesAllOrNoneHaveColors(issues, line, lineIndex, options);
|
|
14
12
|
for (const [routeIndex, route] of line.routes.entries()) {
|
|
15
13
|
checkRouteHasMinimumStops(issues, route, routeIndex, lineIndex, line.name);
|
|
16
14
|
checkRouteNoDuplicateTags(issues, route, routeIndex, lineIndex, line.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,EAAE,yBAAyB,EAAE,MAAM,yDAAyD,CAAC;AACpG,OAAO,EAAE,0BAA0B,EAAE,MAAM,sDAAsD,CAAC;AAClG,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAChG,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,oDAAoD,CAAC;AAEhG,MAAM,UAAU,mBAAmB,CACjC,MAAsB,EACtB,IAAgB,EAChB,SAAiB,EACjB,KAA4B,EAC5B,OAAwB;IAExB,wBAAwB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAClD,0BAA0B,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC7D,uBAAuB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAE1D,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,yBAAyB,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,yBAAyB,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,oBAAoB,CAClB,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,EACT,IAAI,CAAC,IAAI,EACT,KAAK,CACN,CAAC;QACF,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Color } from "../../../server/data/color.js";
|
|
2
2
|
export type RouteStopTypeConfig = "regular" | "hidden-unless-stopped-at";
|
|
3
|
-
type LineDiagramStopTypeConfig = "regular" | "always-express";
|
|
3
|
+
export type LineDiagramStopTypeConfig = "regular" | "always-express";
|
|
4
4
|
export type LineConfig = {
|
|
5
5
|
readonly id: number;
|
|
6
6
|
readonly name: string;
|
|
@@ -21,14 +21,14 @@ export type RouteConfig = {
|
|
|
21
21
|
}[];
|
|
22
22
|
readonly color: Color | null;
|
|
23
23
|
};
|
|
24
|
-
export type
|
|
25
|
-
readonly
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
readonly
|
|
29
|
-
|
|
30
|
-
readonly type: LineDiagramStopTypeConfig;
|
|
31
|
-
}[];
|
|
24
|
+
export type LineDiagramEntryConfig = {
|
|
25
|
+
readonly name: string | null;
|
|
26
|
+
readonly color: Color | null;
|
|
27
|
+
readonly stops: readonly {
|
|
28
|
+
readonly stopId: number;
|
|
29
|
+
readonly type: LineDiagramStopTypeConfig;
|
|
32
30
|
}[];
|
|
33
31
|
};
|
|
34
|
-
export {
|
|
32
|
+
export type LineDiagramConfig = {
|
|
33
|
+
readonly entries: readonly LineDiagramEntryConfig[];
|
|
34
|
+
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export * from "./collection.js";
|
|
2
1
|
export * from "./color.js";
|
|
3
2
|
export * from "./line-collection.js";
|
|
3
|
+
export * from "./line-diagram-entry.js";
|
|
4
|
+
export * from "./line-diagram.js";
|
|
4
5
|
export * from "./line.js";
|
|
5
6
|
export * from "./location.js";
|
|
6
7
|
export * from "./route.js";
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export * from "./collection.js";
|
|
2
1
|
export * from "./color.js";
|
|
3
2
|
export * from "./line-collection.js";
|
|
3
|
+
export * from "./line-diagram-entry.js";
|
|
4
|
+
export * from "./line-diagram.js";
|
|
4
5
|
export * from "./line.js";
|
|
5
6
|
export * from "./location.js";
|
|
6
7
|
export * from "./route.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../data/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../data/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { Collection } from "../../
|
|
1
|
+
import { Collection } from "../../shared/data/collection.js";
|
|
2
2
|
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
|
-
constructor(data: readonly Line[]);
|
|
6
5
|
static build(stops: readonly LineConfig[], lineTagSuccession: TagSuccessionConfig, routeTagSuccession: TagSuccessionConfig): LineCollection;
|
|
7
6
|
protected _getID(item: Line): number;
|
|
8
7
|
protected _getRequireFailError(id: number): Error;
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { Collection } from "../../
|
|
1
|
+
import { Collection } from "../../shared/data/collection.js";
|
|
2
2
|
import { Line } from "../../server/data/line.js";
|
|
3
3
|
export class LineCollection extends Collection {
|
|
4
|
-
constructor(data) {
|
|
5
|
-
super(data);
|
|
6
|
-
}
|
|
7
4
|
static build(stops, lineTagSuccession, routeTagSuccession) {
|
|
8
5
|
return new LineCollection(stops.map((s) => Line.build(s, lineTagSuccession, routeTagSuccession)));
|
|
9
6
|
}
|
|
@@ -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,
|
|
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,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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { LineDiagramEntryConfig } from "../../server/config/index.js";
|
|
2
|
+
import { type Color } from "../../server/data/color.js";
|
|
3
|
+
import type { lineDiagramEntryFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
|
|
4
|
+
import type z from "zod";
|
|
5
|
+
type LineDiagramStop = LineDiagramEntryConfig["stops"][number];
|
|
6
|
+
type LineDiagramEntryFields = {
|
|
7
|
+
readonly name: string | null;
|
|
8
|
+
readonly color: Color | null;
|
|
9
|
+
readonly stops: readonly LineDiagramStop[];
|
|
10
|
+
};
|
|
11
|
+
export declare class LineDiagramEntry {
|
|
12
|
+
readonly name: string | null;
|
|
13
|
+
readonly color: Color | null;
|
|
14
|
+
readonly stops: readonly LineDiagramStop[];
|
|
15
|
+
constructor(fields: LineDiagramEntryFields);
|
|
16
|
+
static build(entryConfig: LineDiagramEntryConfig): LineDiagramEntry;
|
|
17
|
+
toFoda(): z.input<typeof lineDiagramEntryFodaSchema>;
|
|
18
|
+
getFallbackStopList(): number[];
|
|
19
|
+
with(newValues: Partial<LineDiagramEntryFields>): LineDiagramEntry;
|
|
20
|
+
}
|
|
21
|
+
export {};
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { getHexCodesForColor } from "../../server/data/color.js";
|
|
2
|
+
const includedInStopListMapping = {
|
|
3
|
+
"regular": true,
|
|
4
|
+
"always-express": false,
|
|
5
|
+
};
|
|
6
|
+
export class LineDiagramEntry {
|
|
7
|
+
name;
|
|
8
|
+
color;
|
|
9
|
+
stops;
|
|
10
|
+
constructor(fields) {
|
|
11
|
+
this.name = fields.name;
|
|
12
|
+
this.color = fields.color;
|
|
13
|
+
this.stops = fields.stops;
|
|
14
|
+
}
|
|
15
|
+
static build(entryConfig) {
|
|
16
|
+
return new LineDiagramEntry({
|
|
17
|
+
name: entryConfig.name,
|
|
18
|
+
color: entryConfig.color,
|
|
19
|
+
stops: entryConfig.stops,
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
toFoda() {
|
|
23
|
+
return {
|
|
24
|
+
type: "linear",
|
|
25
|
+
name: this.name,
|
|
26
|
+
color: this.color != null ? getHexCodesForColor(this.color) : null,
|
|
27
|
+
stops: this.stops.map((stop) => ({
|
|
28
|
+
stopId: stop.stopId,
|
|
29
|
+
type: stop.type,
|
|
30
|
+
})),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
getFallbackStopList() {
|
|
34
|
+
return this.stops
|
|
35
|
+
.filter((s) => includedInStopListMapping[s.type])
|
|
36
|
+
.map((stop) => stop.stopId);
|
|
37
|
+
}
|
|
38
|
+
with(newValues) {
|
|
39
|
+
return new LineDiagramEntry({ ...this, ...newValues });
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=line-diagram-entry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"line-diagram-entry.js","sourceRoot":"","sources":["../../../data/line-diagram-entry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,wBAAwB,CAAC;AAIzE,MAAM,yBAAyB,GAA+C;IAC5E,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAUF,MAAM,OAAO,gBAAgB;IAClB,IAAI,CAAgB;IACpB,KAAK,CAAe;IACpB,KAAK,CAA6B;IAE3C,YAAY,MAA8B;QACxC,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,CAAC,WAAmC;QAC9C,OAAO,IAAI,gBAAgB,CAAC;YAC1B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,KAAK,EAAE,WAAW,CAAC,KAAK;SACzB,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;YAClE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,KAAK;aACd,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAChD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,CAAC,SAA0C;QAC7C,OAAO,IAAI,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACzD,CAAC;CACF"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { LineDiagramEntry } from "../../server/data/line-diagram-entry.js";
|
|
2
|
+
import type { lineDiagramFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
|
|
3
|
+
import type z from "zod";
|
|
4
|
+
import type { LineDiagramConfig } from "../../server/config/index.js";
|
|
5
|
+
type LineDiagramFields = {
|
|
6
|
+
readonly entries: LineDiagramEntry[];
|
|
7
|
+
};
|
|
8
|
+
export declare class LineDiagram {
|
|
9
|
+
readonly entries: LineDiagramEntry[];
|
|
10
|
+
constructor(fields: LineDiagramFields);
|
|
11
|
+
static build(diagram: LineDiagramConfig): LineDiagram;
|
|
12
|
+
toFoda(): z.input<typeof lineDiagramFodaSchema>;
|
|
13
|
+
with(newValues: Partial<LineDiagramFields>): LineDiagram;
|
|
14
|
+
getFallbackStopList(): number[];
|
|
15
|
+
}
|
|
16
|
+
export {};
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { LineDiagramEntry } from "../../server/data/line-diagram-entry.js";
|
|
2
|
+
import { unique } from "@dan-schel/js-utils";
|
|
3
|
+
export class LineDiagram {
|
|
4
|
+
entries;
|
|
5
|
+
constructor(fields) {
|
|
6
|
+
this.entries = fields.entries;
|
|
7
|
+
}
|
|
8
|
+
static build(diagram) {
|
|
9
|
+
return new LineDiagram({
|
|
10
|
+
entries: diagram.entries.map((entry) => LineDiagramEntry.build(entry)),
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
toFoda() {
|
|
14
|
+
return {
|
|
15
|
+
entries: this.entries.map((entry) => entry.toFoda()),
|
|
16
|
+
fallbackStopList: this.getFallbackStopList(),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
with(newValues) {
|
|
20
|
+
return new LineDiagram({ ...this, ...newValues });
|
|
21
|
+
}
|
|
22
|
+
getFallbackStopList() {
|
|
23
|
+
return unique(this.entries.flatMap((entry) => entry.getFallbackStopList()));
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=line-diagram.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"line-diagram.js","sourceRoot":"","sources":["../../../data/line-diagram.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAQ7C,MAAM,OAAO,WAAW;IACb,OAAO,CAAqB;IAErC,YAAY,MAAyB;QACnC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAA0B;QACrC,OAAO,IAAI,WAAW,CAAC;YACrB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACvE,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACpD,gBAAgB,EAAE,IAAI,CAAC,mBAAmB,EAAE;SAC7C,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAAqC;QACxC,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,mBAAmB;QACjB,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;CACF"}
|
|
@@ -4,6 +4,7 @@ import type { lineFodaSchema } from "../../shared/apis/foundational-data/v1/foun
|
|
|
4
4
|
import type z from "zod";
|
|
5
5
|
import { type Color } from "../../server/data/color.js";
|
|
6
6
|
import { Route } from "../../server/data/route.js";
|
|
7
|
+
import { LineDiagram } from "../../server/data/line-diagram.js";
|
|
7
8
|
type LineFields = {
|
|
8
9
|
readonly id: number;
|
|
9
10
|
readonly name: string;
|
|
@@ -11,6 +12,7 @@ type LineFields = {
|
|
|
11
12
|
readonly urlPath: string;
|
|
12
13
|
readonly color: Color | null;
|
|
13
14
|
readonly routes: readonly Route[];
|
|
15
|
+
readonly diagram: LineDiagram;
|
|
14
16
|
};
|
|
15
17
|
export declare class Line {
|
|
16
18
|
readonly id: number;
|
|
@@ -19,6 +21,7 @@ export declare class Line {
|
|
|
19
21
|
readonly urlPath: string;
|
|
20
22
|
readonly color: Color | null;
|
|
21
23
|
readonly routes: readonly Route[];
|
|
24
|
+
readonly diagram: LineDiagram;
|
|
22
25
|
constructor(fields: LineFields);
|
|
23
26
|
static build(lineConfig: LineConfig, lineTagSuccession: TagSuccessionConfig, routeTagSuccession: TagSuccessionConfig): Line;
|
|
24
27
|
toFoda(): z.input<typeof lineFodaSchema>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Tags } from "../../server/data/tags.js";
|
|
2
2
|
import { getHexCodesForColor } from "../../server/data/color.js";
|
|
3
3
|
import { Route } from "../../server/data/route.js";
|
|
4
|
+
import { LineDiagram } from "../../server/data/line-diagram.js";
|
|
4
5
|
export class Line {
|
|
5
6
|
id;
|
|
6
7
|
name;
|
|
@@ -8,6 +9,7 @@ export class Line {
|
|
|
8
9
|
urlPath;
|
|
9
10
|
color;
|
|
10
11
|
routes;
|
|
12
|
+
diagram;
|
|
11
13
|
constructor(fields) {
|
|
12
14
|
this.id = fields.id;
|
|
13
15
|
this.name = fields.name;
|
|
@@ -15,6 +17,7 @@ export class Line {
|
|
|
15
17
|
this.urlPath = fields.urlPath;
|
|
16
18
|
this.color = fields.color;
|
|
17
19
|
this.routes = fields.routes;
|
|
20
|
+
this.diagram = fields.diagram;
|
|
18
21
|
}
|
|
19
22
|
static build(lineConfig, lineTagSuccession, routeTagSuccession) {
|
|
20
23
|
return new Line({
|
|
@@ -24,6 +27,7 @@ export class Line {
|
|
|
24
27
|
urlPath: lineConfig.urlPath,
|
|
25
28
|
color: lineConfig.color,
|
|
26
29
|
routes: lineConfig.routes.map((route) => Route.build(route, routeTagSuccession)),
|
|
30
|
+
diagram: LineDiagram.build(lineConfig.diagram),
|
|
27
31
|
});
|
|
28
32
|
}
|
|
29
33
|
toFoda() {
|
|
@@ -32,6 +36,7 @@ export class Line {
|
|
|
32
36
|
name: this.name,
|
|
33
37
|
urlPath: this.urlPath,
|
|
34
38
|
color: this.color != null ? getHexCodesForColor(this.color) : null,
|
|
39
|
+
diagram: this.diagram.toFoda(),
|
|
35
40
|
};
|
|
36
41
|
}
|
|
37
42
|
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;AAG7C,OAAO,EAAE,mBAAmB,EAAc,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,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;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAY5D,MAAM,OAAO,IAAI;IACN,EAAE,CAAS;IACX,IAAI,CAAS;IACb,IAAI,CAAO;IACX,OAAO,CAAS;IAChB,KAAK,CAAe;IACpB,MAAM,CAAmB;IACzB,OAAO,CAAc;IAE9B,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;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,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;YACD,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;SAC/C,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;YAClE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;SAC/B,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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { Collection } from "../../
|
|
1
|
+
import { Collection } from "../../shared/data/collection.js";
|
|
2
2
|
import { Stop } from "../../server/data/stop.js";
|
|
3
3
|
import type { GetCanonicalLinesServingStopConfig, StopConfig, TagSuccessionConfig } from "../../server/config/index.js";
|
|
4
4
|
export declare class StopCollection extends Collection<number, Stop> {
|
|
5
|
-
constructor(data: readonly Stop[]);
|
|
6
5
|
static build(stops: readonly StopConfig[], stopTagSuccession: TagSuccessionConfig, getCanonicalLinesServingStop: GetCanonicalLinesServingStopConfig): StopCollection;
|
|
7
6
|
protected _getID(item: Stop): number;
|
|
8
7
|
protected _getRequireFailError(id: number): Error;
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { Collection } from "../../
|
|
1
|
+
import { Collection } from "../../shared/data/collection.js";
|
|
2
2
|
import { Stop } from "../../server/data/stop.js";
|
|
3
3
|
export class StopCollection extends Collection {
|
|
4
|
-
constructor(data) {
|
|
5
|
-
super(data);
|
|
6
|
-
}
|
|
7
4
|
static build(stops, stopTagSuccession, getCanonicalLinesServingStop) {
|
|
8
5
|
return new StopCollection(stops.map((s) => Stop.build(s, stopTagSuccession, getCanonicalLinesServingStop(s.id))));
|
|
9
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-collection.js","sourceRoot":"","sources":["../../../data/stop-collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAO7C,MAAM,OAAO,cAAe,SAAQ,UAAwB;IAC1D,
|
|
1
|
+
{"version":3,"file":"stop-collection.js","sourceRoot":"","sources":["../../../data/stop-collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAO7C,MAAM,OAAO,cAAe,SAAQ,UAAwB;IAC1D,MAAM,CAAC,KAAK,CACV,KAA4B,EAC5B,iBAAsC,EACtC,4BAAgE;QAEhE,OAAO,IAAI,cAAc,CACvB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACd,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,EAAE,4BAA4B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CACrE,CACF,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"}
|
|
@@ -13,6 +13,41 @@ export declare const stopFodaSchema: z.ZodObject<{
|
|
|
13
13
|
longitude: z.ZodNumber;
|
|
14
14
|
}, z.z.core.$strip>>;
|
|
15
15
|
}, z.z.core.$strip>;
|
|
16
|
+
export declare const lineDiagramEntryFodaSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
17
|
+
type: z.ZodLiteral<"linear">;
|
|
18
|
+
name: z.ZodNullable<z.ZodString>;
|
|
19
|
+
color: z.ZodNullable<z.ZodObject<{
|
|
20
|
+
lightModeHexCode: z.ZodString;
|
|
21
|
+
darkModeHexCode: z.ZodString;
|
|
22
|
+
}, z.z.core.$strip>>;
|
|
23
|
+
stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
|
|
24
|
+
stopId: z.ZodNumber;
|
|
25
|
+
type: z.ZodEnum<{
|
|
26
|
+
regular: "regular";
|
|
27
|
+
"always-express": "always-express";
|
|
28
|
+
}>;
|
|
29
|
+
}, z.z.core.$strip>>>;
|
|
30
|
+
}, z.z.core.$strip>]>;
|
|
31
|
+
export declare const lineDiagramFodaSchema: z.ZodObject<{
|
|
32
|
+
entries: z.ZodReadonly<z.ZodArray<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodObject<{
|
|
33
|
+
type: z.ZodLiteral<"linear">;
|
|
34
|
+
name: z.ZodNullable<z.ZodString>;
|
|
35
|
+
color: z.ZodNullable<z.ZodObject<{
|
|
36
|
+
lightModeHexCode: z.ZodString;
|
|
37
|
+
darkModeHexCode: z.ZodString;
|
|
38
|
+
}, z.z.core.$strip>>;
|
|
39
|
+
stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
|
|
40
|
+
stopId: z.ZodNumber;
|
|
41
|
+
type: z.ZodEnum<{
|
|
42
|
+
regular: "regular";
|
|
43
|
+
"always-express": "always-express";
|
|
44
|
+
}>;
|
|
45
|
+
}, z.z.core.$strip>>>;
|
|
46
|
+
}, z.z.core.$strip>]>, z.ZodObject<{
|
|
47
|
+
type: z.ZodString;
|
|
48
|
+
}, z.z.core.$strip>]>>>;
|
|
49
|
+
fallbackStopList: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
|
|
50
|
+
}, z.z.core.$strip>;
|
|
16
51
|
export declare const lineFodaSchema: z.ZodObject<{
|
|
17
52
|
id: z.ZodNumber;
|
|
18
53
|
name: z.ZodString;
|
|
@@ -21,13 +56,33 @@ export declare const lineFodaSchema: z.ZodObject<{
|
|
|
21
56
|
lightModeHexCode: z.ZodString;
|
|
22
57
|
darkModeHexCode: z.ZodString;
|
|
23
58
|
}, z.z.core.$strip>>;
|
|
59
|
+
diagram: z.ZodObject<{
|
|
60
|
+
entries: z.ZodReadonly<z.ZodArray<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodObject<{
|
|
61
|
+
type: z.ZodLiteral<"linear">;
|
|
62
|
+
name: z.ZodNullable<z.ZodString>;
|
|
63
|
+
color: z.ZodNullable<z.ZodObject<{
|
|
64
|
+
lightModeHexCode: z.ZodString;
|
|
65
|
+
darkModeHexCode: z.ZodString;
|
|
66
|
+
}, z.z.core.$strip>>;
|
|
67
|
+
stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
|
|
68
|
+
stopId: z.ZodNumber;
|
|
69
|
+
type: z.ZodEnum<{
|
|
70
|
+
regular: "regular";
|
|
71
|
+
"always-express": "always-express";
|
|
72
|
+
}>;
|
|
73
|
+
}, z.z.core.$strip>>>;
|
|
74
|
+
}, z.z.core.$strip>]>, z.ZodObject<{
|
|
75
|
+
type: z.ZodString;
|
|
76
|
+
}, z.z.core.$strip>]>>>;
|
|
77
|
+
fallbackStopList: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
|
|
78
|
+
}, z.z.core.$strip>;
|
|
24
79
|
}, z.z.core.$strip>;
|
|
25
80
|
export declare const fodaSchema: z.ZodObject<{
|
|
26
81
|
metadata: z.ZodObject<{
|
|
27
82
|
hash: z.ZodString;
|
|
28
83
|
serverVersion: z.ZodString;
|
|
29
84
|
}, z.z.core.$strip>;
|
|
30
|
-
stops: z.ZodArray<z.ZodObject<{
|
|
85
|
+
stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
|
|
31
86
|
id: z.ZodNumber;
|
|
32
87
|
name: z.ZodString;
|
|
33
88
|
urlPath: z.ZodString;
|
|
@@ -36,8 +91,8 @@ export declare const fodaSchema: z.ZodObject<{
|
|
|
36
91
|
latitude: z.ZodNumber;
|
|
37
92
|
longitude: z.ZodNumber;
|
|
38
93
|
}, z.z.core.$strip>>;
|
|
39
|
-
}, z.z.core.$strip
|
|
40
|
-
lines: z.ZodArray<z.ZodObject<{
|
|
94
|
+
}, z.z.core.$strip>>>;
|
|
95
|
+
lines: z.ZodReadonly<z.ZodArray<z.ZodObject<{
|
|
41
96
|
id: z.ZodNumber;
|
|
42
97
|
name: z.ZodString;
|
|
43
98
|
urlPath: z.ZodString;
|
|
@@ -45,7 +100,27 @@ export declare const fodaSchema: z.ZodObject<{
|
|
|
45
100
|
lightModeHexCode: z.ZodString;
|
|
46
101
|
darkModeHexCode: z.ZodString;
|
|
47
102
|
}, z.z.core.$strip>>;
|
|
48
|
-
|
|
103
|
+
diagram: z.ZodObject<{
|
|
104
|
+
entries: z.ZodReadonly<z.ZodArray<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodObject<{
|
|
105
|
+
type: z.ZodLiteral<"linear">;
|
|
106
|
+
name: z.ZodNullable<z.ZodString>;
|
|
107
|
+
color: z.ZodNullable<z.ZodObject<{
|
|
108
|
+
lightModeHexCode: z.ZodString;
|
|
109
|
+
darkModeHexCode: z.ZodString;
|
|
110
|
+
}, z.z.core.$strip>>;
|
|
111
|
+
stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
|
|
112
|
+
stopId: z.ZodNumber;
|
|
113
|
+
type: z.ZodEnum<{
|
|
114
|
+
regular: "regular";
|
|
115
|
+
"always-express": "always-express";
|
|
116
|
+
}>;
|
|
117
|
+
}, z.z.core.$strip>>>;
|
|
118
|
+
}, z.z.core.$strip>]>, z.ZodObject<{
|
|
119
|
+
type: z.ZodString;
|
|
120
|
+
}, z.z.core.$strip>]>>>;
|
|
121
|
+
fallbackStopList: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
|
|
122
|
+
}, z.z.core.$strip>;
|
|
123
|
+
}, z.z.core.$strip>>>;
|
|
49
124
|
terminology: z.ZodObject<{
|
|
50
125
|
stop: z.ZodEnum<{
|
|
51
126
|
stop: "stop";
|
|
@@ -25,6 +25,10 @@ export const locationFodaSchema = z.object({
|
|
|
25
25
|
latitude: z.number(),
|
|
26
26
|
longitude: z.number(),
|
|
27
27
|
});
|
|
28
|
+
const colorFodaSchema = z.object({
|
|
29
|
+
lightModeHexCode: z.string(),
|
|
30
|
+
darkModeHexCode: z.string(),
|
|
31
|
+
});
|
|
28
32
|
export const stopFodaSchema = z.object({
|
|
29
33
|
id: z.number(),
|
|
30
34
|
name: z.string(),
|
|
@@ -60,19 +64,41 @@ export const stopFodaSchema = z.object({
|
|
|
60
64
|
// requests rather than the size of each one, as when the internet is
|
|
61
65
|
// available, it's fast anyway!
|
|
62
66
|
});
|
|
67
|
+
export const lineDiagramEntryFodaSchema = z.union([
|
|
68
|
+
z.object({
|
|
69
|
+
type: z.literal("linear"),
|
|
70
|
+
name: z.string().nullable(),
|
|
71
|
+
color: colorFodaSchema.nullable(),
|
|
72
|
+
stops: z
|
|
73
|
+
.object({
|
|
74
|
+
stopId: z.number(),
|
|
75
|
+
type: z.enum(["regular", "always-express"]),
|
|
76
|
+
})
|
|
77
|
+
.array()
|
|
78
|
+
.readonly(),
|
|
79
|
+
}),
|
|
80
|
+
]);
|
|
81
|
+
export const lineDiagramFodaSchema = z.object({
|
|
82
|
+
entries: z
|
|
83
|
+
.union([
|
|
84
|
+
lineDiagramEntryFodaSchema,
|
|
85
|
+
// Allows for future diagram types, without a breaking change. When this
|
|
86
|
+
// case is hit, the frontend, which doesn't understand this new diagram
|
|
87
|
+
// type, will fallback to the `fallbackStopList`.
|
|
88
|
+
z.object({
|
|
89
|
+
type: z.string(),
|
|
90
|
+
}),
|
|
91
|
+
])
|
|
92
|
+
.array()
|
|
93
|
+
.readonly(),
|
|
94
|
+
fallbackStopList: z.number().array().readonly(),
|
|
95
|
+
});
|
|
63
96
|
export const lineFodaSchema = z.object({
|
|
64
97
|
id: z.number(),
|
|
65
98
|
name: z.string(),
|
|
66
99
|
urlPath: z.string(),
|
|
67
|
-
color:
|
|
68
|
-
|
|
69
|
-
lightModeHexCode: z.string(),
|
|
70
|
-
darkModeHexCode: z.string(),
|
|
71
|
-
})
|
|
72
|
-
.nullable(),
|
|
73
|
-
// To the above point. It's probably good to include line diagrams in the
|
|
74
|
-
// foundational data, so navigation (by clicking through to a stop via the
|
|
75
|
-
// line page) isn't blocked by an API call.
|
|
100
|
+
color: colorFodaSchema.nullable(),
|
|
101
|
+
diagram: lineDiagramFodaSchema,
|
|
76
102
|
});
|
|
77
103
|
// Omitting for now, see comments below for each field's reasoning.
|
|
78
104
|
const terminologySchema = z.object({
|
|
@@ -113,8 +139,11 @@ const landingPageFodaSchema = z.object({
|
|
|
113
139
|
primaryMarkdown: z.string(),
|
|
114
140
|
});
|
|
115
141
|
const footerFodaSchema = z.object({
|
|
116
|
-
//
|
|
117
|
-
//
|
|
142
|
+
// Adding this to the foundational data when the about page content is NOT in
|
|
143
|
+
// the foundational data doesn't make much sense. I put it in because I
|
|
144
|
+
// thought we'd be displaying this footer on most/every page, but given that
|
|
145
|
+
// we're only showing it on the about page, it can probably be removed in the
|
|
146
|
+
// next major version.
|
|
118
147
|
primaryMarkdown: z.string(),
|
|
119
148
|
});
|
|
120
149
|
export const fodaSchema = z.object({
|
|
@@ -122,8 +151,8 @@ export const fodaSchema = z.object({
|
|
|
122
151
|
hash: z.string(),
|
|
123
152
|
serverVersion: z.string(),
|
|
124
153
|
}),
|
|
125
|
-
stops: stopFodaSchema.array(),
|
|
126
|
-
lines: lineFodaSchema.array(),
|
|
154
|
+
stops: stopFodaSchema.array().readonly(),
|
|
155
|
+
lines: lineFodaSchema.array().readonly(),
|
|
127
156
|
terminology: terminologySchema,
|
|
128
157
|
landingPage: landingPageFodaSchema,
|
|
129
158
|
footer: footerFodaSchema,
|