corequery 0.18.2 → 0.19.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.d.ts +0 -8
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js +9 -24
- package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js.map +1 -1
- package/server/dist/server/config/linting/line/diagram/index.js +0 -2
- package/server/dist/server/config/linting/line/diagram/index.js.map +1 -1
- package/server/dist/server/config/linting/line/index.js +0 -6
- package/server/dist/server/config/linting/line/index.js.map +1 -1
- package/server/dist/server/config/linting/stop/{appears-in-routes.d.ts → appears-in-diagrams.d.ts} +1 -1
- package/server/dist/server/config/linting/stop/appears-in-diagrams.js +24 -0
- package/server/dist/server/config/linting/stop/appears-in-diagrams.js.map +1 -0
- package/server/dist/server/config/linting/stop/index.js +2 -2
- package/server/dist/server/config/linting/stop/index.js.map +1 -1
- package/server/dist/server/config/linting/tags/no-duplicates-in-succession.js +0 -1
- package/server/dist/server/config/linting/tags/no-duplicates-in-succession.js.map +1 -1
- package/server/dist/server/config/linting/types.d.ts +1 -16
- package/server/dist/server/config/types/line-config.d.ts +0 -12
- package/server/dist/server/config/types/tags-config.d.ts +0 -1
- package/server/dist/server/corequery.js +1 -1
- package/server/dist/server/corequery.js.map +1 -1
- package/server/dist/server/data/index.d.ts +0 -1
- package/server/dist/server/data/index.js +0 -1
- 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 +1 -4
- package/server/dist/server/data/line.js +1 -5
- package/server/dist/server/data/line.js.map +1 -1
- package/server/dist/server/config/linting/line/diagram/stops-in-routes.d.ts +0 -4
- package/server/dist/server/config/linting/line/diagram/stops-in-routes.js +0 -26
- package/server/dist/server/config/linting/line/diagram/stops-in-routes.js.map +0 -1
- package/server/dist/server/config/linting/line/has-routes.d.ts +0 -4
- package/server/dist/server/config/linting/line/has-routes.js +0 -12
- package/server/dist/server/config/linting/line/has-routes.js.map +0 -1
- package/server/dist/server/config/linting/line/route/all-or-none-colors-global.d.ts +0 -4
- package/server/dist/server/config/linting/line/route/all-or-none-colors-global.js +0 -20
- package/server/dist/server/config/linting/line/route/all-or-none-colors-global.js.map +0 -1
- package/server/dist/server/config/linting/line/route/index.d.ts +0 -5
- package/server/dist/server/config/linting/line/route/index.js +0 -19
- package/server/dist/server/config/linting/line/route/index.js.map +0 -1
- package/server/dist/server/config/linting/line/route/minimum-stops.d.ts +0 -3
- package/server/dist/server/config/linting/line/route/minimum-stops.js +0 -10
- package/server/dist/server/config/linting/line/route/minimum-stops.js.map +0 -1
- package/server/dist/server/config/linting/line/route/no-duplicate-tags.d.ts +0 -3
- package/server/dist/server/config/linting/line/route/no-duplicate-tags.js +0 -14
- package/server/dist/server/config/linting/line/route/no-duplicate-tags.js.map +0 -1
- package/server/dist/server/config/linting/line/route/non-empty-name.d.ts +0 -3
- package/server/dist/server/config/linting/line/route/non-empty-name.js +0 -10
- package/server/dist/server/config/linting/line/route/non-empty-name.js.map +0 -1
- package/server/dist/server/config/linting/line/route/routes-mirrored.d.ts +0 -4
- package/server/dist/server/config/linting/line/route/routes-mirrored.js +0 -28
- package/server/dist/server/config/linting/line/route/routes-mirrored.js.map +0 -1
- package/server/dist/server/config/linting/line/route/stops-exist.d.ts +0 -4
- package/server/dist/server/config/linting/line/route/stops-exist.js +0 -13
- package/server/dist/server/config/linting/line/route/stops-exist.js.map +0 -1
- package/server/dist/server/config/linting/line/route/unique-ids.d.ts +0 -3
- package/server/dist/server/config/linting/line/route/unique-ids.js +0 -14
- package/server/dist/server/config/linting/line/route/unique-ids.js.map +0 -1
- package/server/dist/server/config/linting/line/route/unique-names.d.ts +0 -4
- package/server/dist/server/config/linting/line/route/unique-names.js +0 -18
- package/server/dist/server/config/linting/line/route/unique-names.js.map +0 -1
- package/server/dist/server/config/linting/stop/appears-in-routes.js +0 -22
- package/server/dist/server/config/linting/stop/appears-in-routes.js.map +0 -1
- package/server/dist/server/data/route.d.ts +0 -24
- package/server/dist/server/data/route.js +0 -32
- package/server/dist/server/data/route.js.map +0 -1
package/package.json
CHANGED
package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import type { TagSuccessionConfig } from "../../../server/config/types/tags-conf
|
|
|
4
4
|
type Options = {
|
|
5
5
|
readonly lines: readonly LineConfig[];
|
|
6
6
|
readonly lineTagSuccession: TagSuccessionConfig;
|
|
7
|
-
readonly routeTagSuccession: TagSuccessionConfig;
|
|
8
7
|
/**
|
|
9
8
|
* Defines tiers such that lines from a subsequent tier are ignored if the
|
|
10
9
|
* stop is also served by lines from an earlier tier. In other words, tiers
|
|
@@ -17,13 +16,6 @@ type Options = {
|
|
|
17
16
|
* tagged as `FULL_TIME`.
|
|
18
17
|
*/
|
|
19
18
|
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
19
|
};
|
|
28
20
|
export declare function createCanonicalLinesServingStopAlgorithm(options: Options): GetCanonicalLinesServingStopConfig;
|
|
29
21
|
export {};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Tags } from "../../../server/data/tags.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
"
|
|
2
|
+
import { extractStopsFromLineDiagramShape } from "../../../server/config/helpers/extract-stops-from-line-diagram-shape.js";
|
|
3
|
+
const isCanonicalMapping = {
|
|
4
|
+
"regular": true,
|
|
5
|
+
"always-express": false,
|
|
5
6
|
};
|
|
6
7
|
export function createCanonicalLinesServingStopAlgorithm(options) {
|
|
7
8
|
const lines = options.lines.map((line) => ({
|
|
@@ -9,16 +10,8 @@ export function createCanonicalLinesServingStopAlgorithm(options) {
|
|
|
9
10
|
tags: Tags.build(line.tags, options.lineTagSuccession),
|
|
10
11
|
}));
|
|
11
12
|
const tierLinesByTag = options.tierLinesByTag ?? [];
|
|
12
|
-
const ignoreRoutesWithTags = options.ignoreRoutesWithTags ?? [];
|
|
13
|
-
const ignoreHiddenStops = options.ignoreHiddenStops ?? true;
|
|
14
13
|
return (stopId) => {
|
|
15
|
-
const allCandidateLines = lines.filter((line) =>
|
|
16
|
-
stopId,
|
|
17
|
-
routes: line.routes,
|
|
18
|
-
routeTagSuccession: options.routeTagSuccession,
|
|
19
|
-
ignoreRoutesWithTags,
|
|
20
|
-
ignoreHiddenStops,
|
|
21
|
-
}));
|
|
14
|
+
const allCandidateLines = lines.filter((line) => isStopInDiagram(stopId, line.diagram));
|
|
22
15
|
if (tierLinesByTag.length === 0 || allCandidateLines.length === 0) {
|
|
23
16
|
return allCandidateLines.map((line) => line.id);
|
|
24
17
|
}
|
|
@@ -33,17 +26,9 @@ export function createCanonicalLinesServingStopAlgorithm(options) {
|
|
|
33
26
|
return linesByTier.get(highestTier) ?? [];
|
|
34
27
|
};
|
|
35
28
|
}
|
|
36
|
-
function
|
|
37
|
-
return
|
|
38
|
-
|
|
39
|
-
|
|
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
|
-
});
|
|
29
|
+
function isStopInDiagram(stopId, diagram) {
|
|
30
|
+
return diagram.entries
|
|
31
|
+
.flatMap((entry) => extractStopsFromLineDiagramShape(entry.shape))
|
|
32
|
+
.some((s) => s.stopId === stopId && isCanonicalMapping[s.type]);
|
|
48
33
|
}
|
|
49
34
|
//# sourceMappingURL=create-canonical-lines-serving-stop-algorithm.js.map
|
package/server/dist/server/config/helpers/create-canonical-lines-serving-stop-algorithm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-canonical-lines-serving-stop-algorithm.js","sourceRoot":"","sources":["../../../../config/helpers/create-canonical-lines-serving-stop-algorithm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-canonical-lines-serving-stop-algorithm.js","sourceRoot":"","sources":["../../../../config/helpers/create-canonical-lines-serving-stop-algorithm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,kBAAkB,GAA+C;IACrE,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAoBF,MAAM,UAAU,wCAAwC,CACtD,OAAgB;IAEhB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACzC,GAAG,IAAI;QACP,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC;KACvD,CAAC,CAAC,CAAC;IAEJ,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;IAEpD,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9C,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CACtC,CAAC;QAEF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClE,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,sEAAsE;QACtE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;YACrC,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,MAAM,IAAI,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9C,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACpD,OAAO,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,MAAc,EAAE,OAA0B;IACjE,OAAO,OAAO,CAAC,OAAO;SACnB,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gCAAgC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACjE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { checkLineDiagramEntriesMinimumStops } from "../../../../../server/config/linting/line/diagram/entry-minimum-stops.js";
|
|
2
2
|
import { checkLineDiagramHasEntries } from "../../../../../server/config/linting/line/diagram/has-entries.js";
|
|
3
3
|
import { checkLineDiagramStopsExist } from "../../../../../server/config/linting/line/diagram/stops-exist.js";
|
|
4
|
-
import { checkLineDiagramStopsInRoutes } from "../../../../../server/config/linting/line/diagram/stops-in-routes.js";
|
|
5
4
|
export function lintLineDiagramConfig(issues, line, lineIndex, stops, options) {
|
|
6
5
|
checkLineDiagramHasEntries(issues, line, lineIndex, options);
|
|
7
6
|
checkLineDiagramEntriesMinimumStops(issues, line, lineIndex);
|
|
8
7
|
checkLineDiagramStopsExist(issues, line, lineIndex, stops);
|
|
9
|
-
checkLineDiagramStopsInRoutes(issues, line, lineIndex, options);
|
|
10
8
|
}
|
|
11
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../config/linting/line/diagram/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mCAAmC,EAAE,MAAM,6DAA6D,CAAC;AAClH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../config/linting/line/diagram/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mCAAmC,EAAE,MAAM,6DAA6D,CAAC;AAClH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AAGjG,MAAM,UAAU,qBAAqB,CACnC,MAAsB,EACtB,IAAgB,EAChB,SAAiB,EACjB,KAA4B,EAC5B,OAAwB;IAExB,0BAA0B,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC7D,mCAAmC,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC7D,0BAA0B,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -1,13 +1,10 @@
|
|
|
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";
|
|
4
3
|
import { lintLineDiagramConfig } from "../../../../server/config/linting/line/diagram/index.js";
|
|
5
|
-
import { checkLineHasRoutes } from "../../../../server/config/linting/line/has-routes.js";
|
|
6
4
|
import { checkLineNoDuplicateTags } from "../../../../server/config/linting/line/no-duplicate-tags.js";
|
|
7
5
|
import { checkLineNonEmptyCode } from "../../../../server/config/linting/line/non-empty-code.js";
|
|
8
6
|
import { checkLineNonEmptyName } from "../../../../server/config/linting/line/non-empty-name.js";
|
|
9
7
|
import { checkLineNonEmptyUrlPath } from "../../../../server/config/linting/line/non-empty-url-path.js";
|
|
10
|
-
import { lintLineRouteConfig } from "../../../../server/config/linting/line/route/index.js";
|
|
11
8
|
import { checkLinesUniqueIds } from "../../../../server/config/linting/line/unique-ids.js";
|
|
12
9
|
import { checkLinesUniqueCodes } from "../../../../server/config/linting/line/unique-codes.js";
|
|
13
10
|
import { checkLinesUniqueUrlPaths } from "../../../../server/config/linting/line/unique-url-paths.js";
|
|
@@ -19,14 +16,11 @@ export function lintLineConfig(issues, lines, stops, options) {
|
|
|
19
16
|
checkLinesUniqueNames(issues, lines, options);
|
|
20
17
|
checkLinesAllOrNoneHaveCodes(issues, lines, options);
|
|
21
18
|
checkLinesAllOrNoneHaveColors(issues, lines, options);
|
|
22
|
-
checkRoutesAllOrNoneHaveColors(issues, lines, options);
|
|
23
19
|
for (const [lineIndex, line] of lines.entries()) {
|
|
24
|
-
checkLineHasRoutes(issues, line, lineIndex, options[line.id] ?? {});
|
|
25
20
|
checkLineNonEmptyCode(issues, line, lineIndex);
|
|
26
21
|
checkLineNonEmptyName(issues, line, lineIndex);
|
|
27
22
|
checkLineNonEmptyUrlPath(issues, line, lineIndex);
|
|
28
23
|
checkLineNoDuplicateTags(issues, line, lineIndex);
|
|
29
|
-
lintLineRouteConfig(issues, line, lineIndex, stops, options[line.id] ?? {});
|
|
30
24
|
lintLineDiagramConfig(issues, line, lineIndex, stops, options[line.id] ?? {});
|
|
31
25
|
}
|
|
32
26
|
}
|
|
@@ -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,
|
|
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,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,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;IAEtD,KAAK,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,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,qBAAqB,CACnB,MAAM,EACN,IAAI,EACJ,SAAS,EACT,KAAK,EACL,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CACvB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/server/dist/server/config/linting/stop/{appears-in-routes.d.ts → appears-in-diagrams.d.ts}
RENAMED
|
@@ -2,4 +2,4 @@ import type { StopConfig } from "../../../../server/config/types/stop-config.js"
|
|
|
2
2
|
import type { LineConfig } from "../../../../server/config/types/line-config.js";
|
|
3
3
|
import type { StopLintOptions } from "../../../../server/config/linting/types.js";
|
|
4
4
|
import { IssueCollector } from "../../../../server/config/linting/utils/issue-collector.js";
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function checkStopsAppearInDiagrams(issues: IssueCollector, stops: readonly StopConfig[], lines: readonly LineConfig[], options: Record<number, StopLintOptions>): void;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { IssueCollector } from "../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
+
import { extractStopsFromLineDiagramShape } from "../../../../server/config/helpers/extract-stops-from-line-diagram-shape.js";
|
|
3
|
+
export function checkStopsAppearInDiagrams(issues, stops, lines, options) {
|
|
4
|
+
const stopIdsInDiagrams = new Set();
|
|
5
|
+
for (const line of lines) {
|
|
6
|
+
for (const diagram of line.diagram.entries) {
|
|
7
|
+
const stopIds = extractStopsFromLineDiagramShape(diagram.shape).map((s) => s.stopId);
|
|
8
|
+
for (const stopId of stopIds) {
|
|
9
|
+
stopIdsInDiagrams.add(stopId);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
for (const [index, stop] of stops.entries()) {
|
|
14
|
+
if (options[stop.id]?.ignoreUnusedStop ?? false)
|
|
15
|
+
continue;
|
|
16
|
+
if (!stopIdsInDiagrams.has(stop.id)) {
|
|
17
|
+
issues.add({
|
|
18
|
+
message: `Stop "${stop.name}" does not appear in any diagram.`,
|
|
19
|
+
path: `stops[${index}]`,
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=appears-in-diagrams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"appears-in-diagrams.js","sourceRoot":"","sources":["../../../../../config/linting/stop/appears-in-diagrams.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,UAAU,0BAA0B,CACxC,MAAsB,EACtB,KAA4B,EAC5B,KAA4B,EAC5B,OAAwC;IAExC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,gCAAgC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CACjE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAChB,CAAC;YAEF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,gBAAgB,IAAI,KAAK;YAAE,SAAS;QAE1D,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,mCAAmC;gBAC9D,IAAI,EAAE,SAAS,KAAK,GAAG;aACxB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { checkStopsAllOrNoneHaveLocations } from "../../../../server/config/linting/stop/all-or-none-locations.js";
|
|
2
2
|
import { checkStopsAllOrNoneHavePositions } from "../../../../server/config/linting/stop/all-or-none-positions.js";
|
|
3
|
-
import {
|
|
3
|
+
import { checkStopsAppearInDiagrams } from "../../../../server/config/linting/stop/appears-in-diagrams.js";
|
|
4
4
|
import { checkStopNoDuplicateTags } from "../../../../server/config/linting/stop/no-duplicate-tags.js";
|
|
5
5
|
import { checkStopNonEmptyName } from "../../../../server/config/linting/stop/non-empty-name.js";
|
|
6
6
|
import { checkStopNonEmptyUrlPath } from "../../../../server/config/linting/stop/non-empty-url-path.js";
|
|
@@ -14,7 +14,7 @@ export function lintStopConfig(issues, stops, lines, options) {
|
|
|
14
14
|
checkStopsUniqueNames(issues, stops, options);
|
|
15
15
|
checkStopsAllOrNoneHaveLocations(issues, stops, options);
|
|
16
16
|
checkStopsAllOrNoneHavePositions(issues, stops, options);
|
|
17
|
-
|
|
17
|
+
checkStopsAppearInDiagrams(issues, stops, lines, options);
|
|
18
18
|
for (const [stopIndex, stop] of stops.entries()) {
|
|
19
19
|
checkStopNonEmptyName(issues, stop, stopIndex);
|
|
20
20
|
checkStopNonEmptyUrlPath(issues, stop, stopIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../config/linting/stop/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../config/linting/stop/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAErF,MAAM,UAAU,cAAc,CAC5B,MAAsB,EACtB,KAA4B,EAC5B,KAA4B,EAC5B,OAAwC;IAExC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,gCAAgC,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,gCAAgC,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAE1D,KAAK,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,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,sBAAsB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC"}
|
|
@@ -3,7 +3,6 @@ import { findDuplicates } from "../../../../server/config/linting/utils/find-dup
|
|
|
3
3
|
export function checkTagsNoDuplicatesInSuccession(issues, tags) {
|
|
4
4
|
checkSuccessionNoDuplicates(issues, tags.stopTagSuccession, "tags.stopTagSuccession");
|
|
5
5
|
checkSuccessionNoDuplicates(issues, tags.lineTagSuccession, "tags.lineTagSuccession");
|
|
6
|
-
checkSuccessionNoDuplicates(issues, tags.routeTagSuccession, "tags.routeTagSuccession");
|
|
7
6
|
}
|
|
8
7
|
function checkSuccessionNoDuplicates(issues, succession, path) {
|
|
9
8
|
for (const [key, tags] of Object.entries(succession)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-duplicates-in-succession.js","sourceRoot":"","sources":["../../../../../config/linting/tags/no-duplicates-in-succession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,iCAAiC,CAC/C,MAAsB,EACtB,IAAgB;IAEhB,2BAA2B,CACzB,MAAM,EACN,IAAI,CAAC,iBAAiB,EACtB,wBAAwB,CACzB,CAAC;IACF,2BAA2B,CACzB,MAAM,EACN,IAAI,CAAC,iBAAiB,EACtB,wBAAwB,CACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-duplicates-in-succession.js","sourceRoot":"","sources":["../../../../../config/linting/tags/no-duplicates-in-succession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,iCAAiC,CAC/C,MAAsB,EACtB,IAAgB;IAEhB,2BAA2B,CACzB,MAAM,EACN,IAAI,CAAC,iBAAiB,EACtB,wBAAwB,CACzB,CAAC;IACF,2BAA2B,CACzB,MAAM,EACN,IAAI,CAAC,iBAAiB,EACtB,wBAAwB,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,MAAsB,EACtB,UAA6C,EAC7C,IAAY;IAEZ,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAEtD,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC;YACxC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,CAAC,GAAG,CAAC;oBACT,OAAO,EAAE,OAAO,GAAG,wCAAwC,GAAG,GAAG;oBACjE,IAAI,EAAE,GAAG,IAAI,IAAI,GAAG,KAAK,KAAK,GAAG;iBAClC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -34,7 +34,7 @@ export type StopLintOptions = {
|
|
|
34
34
|
readonly ignoreMissingLocation?: boolean;
|
|
35
35
|
/** Ignore this stop missing positions when others have them. */
|
|
36
36
|
readonly ignoreMissingPosition?: boolean;
|
|
37
|
-
/** Ignore this stop not appearing in any
|
|
37
|
+
/** Ignore this stop not appearing in any diagram. */
|
|
38
38
|
readonly ignoreUnusedStop?: boolean;
|
|
39
39
|
};
|
|
40
40
|
export type LineLintOptions = {
|
|
@@ -42,26 +42,12 @@ export type LineLintOptions = {
|
|
|
42
42
|
readonly ignoreDuplicatedCode?: boolean;
|
|
43
43
|
/** Ignore this line sharing the same name as another line. */
|
|
44
44
|
readonly ignoreDuplicatedName?: boolean;
|
|
45
|
-
/** Ignore diagram stops that do not appear in any route for this line. */
|
|
46
|
-
readonly ignoreDiagramStopNotInRoute?: boolean;
|
|
47
45
|
/** Ignore this line having no diagram entries. */
|
|
48
46
|
readonly ignoreMissingDiagramEntries?: boolean;
|
|
49
47
|
/** Ignore this line missing a code when others have one. */
|
|
50
48
|
readonly ignoreMissingCode?: boolean;
|
|
51
49
|
/** Ignore this line missing a color when others have one. */
|
|
52
50
|
readonly ignoreMissingColor?: boolean;
|
|
53
|
-
/** Ignore this line having no routes. */
|
|
54
|
-
readonly ignoreMissingRoutes?: boolean;
|
|
55
|
-
/** Options to control the lint rules for routes on this line. */
|
|
56
|
-
readonly routes?: Record<number, RouteLintOptions>;
|
|
57
|
-
};
|
|
58
|
-
type RouteLintOptions = {
|
|
59
|
-
/** Ignore this route sharing the same name as another route on this line. */
|
|
60
|
-
readonly ignoreDuplicatedName?: boolean;
|
|
61
|
-
/** Ignore this route missing a mirrored counterpart. */
|
|
62
|
-
readonly ignoreMissingMirrored?: boolean;
|
|
63
|
-
/** Ignore this route missing a color when others have one. */
|
|
64
|
-
readonly ignoreMissingColor?: boolean;
|
|
65
51
|
};
|
|
66
52
|
export type LinesPageLineLintOptions = {
|
|
67
53
|
/** Ignore this line not appearing on any lines page section. */
|
|
@@ -69,4 +55,3 @@ export type LinesPageLineLintOptions = {
|
|
|
69
55
|
/** Ignore this line appearing in multiple lines page sections. */
|
|
70
56
|
readonly ignoreDuplicatedLine?: boolean;
|
|
71
57
|
};
|
|
72
|
-
export {};
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { Color } from "../../../server/data/color.js";
|
|
2
|
-
export type RouteStopTypeConfig = "regular" | "hidden-unless-stopped-at";
|
|
3
2
|
export type LineDiagramStopTypeConfig = "regular" | "always-express";
|
|
4
3
|
export type LineConfig = {
|
|
5
4
|
readonly id: number;
|
|
@@ -7,20 +6,9 @@ export type LineConfig = {
|
|
|
7
6
|
readonly code: string | null;
|
|
8
7
|
readonly tags: number[];
|
|
9
8
|
readonly urlPath: string;
|
|
10
|
-
readonly routes: readonly RouteConfig[];
|
|
11
9
|
readonly diagram: LineDiagramConfig;
|
|
12
10
|
readonly color: Color | null;
|
|
13
11
|
};
|
|
14
|
-
export type RouteConfig = {
|
|
15
|
-
readonly id: number;
|
|
16
|
-
readonly name: string;
|
|
17
|
-
readonly tags: number[];
|
|
18
|
-
readonly stops: readonly {
|
|
19
|
-
readonly stopId: number;
|
|
20
|
-
readonly type: RouteStopTypeConfig;
|
|
21
|
-
}[];
|
|
22
|
-
readonly color: Color | null;
|
|
23
|
-
};
|
|
24
12
|
export type LineDiagramConfig = {
|
|
25
13
|
readonly entries: readonly LineDiagramEntryConfig[];
|
|
26
14
|
};
|
|
@@ -29,7 +29,7 @@ export class Corequery {
|
|
|
29
29
|
// Only known after assets are prepared, during start().
|
|
30
30
|
this._frontendVersion = null;
|
|
31
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
|
|
32
|
+
this.lines = LineCollection.build(this._config.lines, this._config.tags.lineTagSuccession);
|
|
33
33
|
this.landingPageConfig = this._config.landingPage;
|
|
34
34
|
this.footerConfig = this._config.footer;
|
|
35
35
|
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;AAKvF,MAAM,OAAO,SAAS;IACH,OAAO,CAAkB;IACzB,UAAU,CAAY;IAE9B,GAAG,CAAS;IACZ,aAAa,CAAS;IACvB,wBAAwB,CAAgB;IACxC,gBAAgB,CAAgB;IAE/B,KAAK,CAAiB;IACtB,KAAK,CAAiB;IAE/B,8EAA8E;IAC9E,6CAA6C;IACpC,iBAAiB,CAAoB;IACrC,YAAY,CAAe;IAC3B,eAAe,CAAkB;IACjC,iBAAiB,CAAoB;IAE9C,YAAY,aAAqC;QAC/C,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,CAAC,UAAU,GAAG,IAAI,SAAS,CAC7B,IAAI,EACJ,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,aAAa,EAC5D,gBAAgB,CACjB,CAAC;QAEF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAE1C,0CAA0C;QAC1C,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QAErC,wDAAwD;QACxD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAE7B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EACnC,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAC1C,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,
|
|
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;AAKvF,MAAM,OAAO,SAAS;IACH,OAAO,CAAkB;IACzB,UAAU,CAAY;IAE9B,GAAG,CAAS;IACZ,aAAa,CAAS;IACvB,wBAAwB,CAAgB;IACxC,gBAAgB,CAAgB;IAE/B,KAAK,CAAiB;IACtB,KAAK,CAAiB;IAE/B,8EAA8E;IAC9E,6CAA6C;IACpC,iBAAiB,CAAoB;IACrC,YAAY,CAAe;IAC3B,eAAe,CAAkB;IACjC,iBAAiB,CAAoB;IAE9C,YAAY,aAAqC;QAC/C,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,CAAC,UAAU,GAAG,IAAI,SAAS,CAC7B,IAAI,EACJ,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,aAAa,EAC5D,gBAAgB,CACjB,CAAC;QAEF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAE1C,0CAA0C;QAC1C,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QAErC,wDAAwD;QACxD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAE7B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EACnC,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAC1C,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CACpC,CAAC;QAEF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACxC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QAC9C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACpD,CAAC;IAED,0BAA0B;QACxB,IAAI,IAAI,CAAC,wBAAwB,IAAI,IAAI,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACvC,CAAC;IAED,kBAAkB;QAChB,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,wBAAwB,GAAG,MAAM,0BAA0B,EAAE,CAAC;QAEnE,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QACtC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAE7D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAC3B,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,kBAAkB,EAAE,EACzB,IAAI,CAAC,0BAA0B,EAAE,CAClC,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}
|
|
@@ -2,7 +2,7 @@ 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
|
-
static build(stops: readonly LineConfig[], lineTagSuccession: TagSuccessionConfig
|
|
5
|
+
static build(stops: readonly LineConfig[], lineTagSuccession: TagSuccessionConfig): LineCollection;
|
|
6
6
|
protected _getID(item: Line): number;
|
|
7
7
|
protected _getRequireFailError(id: number): Error;
|
|
8
8
|
protected _getPredicateFailError(): Error;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
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
|
-
static build(stops, lineTagSuccession
|
|
5
|
-
return new LineCollection(stops.map((s) => Line.build(s, lineTagSuccession
|
|
4
|
+
static build(stops, lineTagSuccession) {
|
|
5
|
+
return new LineCollection(stops.map((s) => Line.build(s, lineTagSuccession)));
|
|
6
6
|
}
|
|
7
7
|
_getID(item) {
|
|
8
8
|
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,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,MAAM,CAAC,KAAK,CACV,KAA4B,EAC5B,iBAAsC;QAEtC,OAAO,IAAI,cAAc,CACvB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CACnD,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"}
|
|
@@ -3,7 +3,6 @@ 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
5
|
import { type Color } from "../../server/data/color.js";
|
|
6
|
-
import { Route } from "../../server/data/route.js";
|
|
7
6
|
import { LineDiagram } from "../../server/data/line-diagram.js";
|
|
8
7
|
type LineFields = {
|
|
9
8
|
readonly id: number;
|
|
@@ -11,7 +10,6 @@ type LineFields = {
|
|
|
11
10
|
readonly tags: Tags;
|
|
12
11
|
readonly urlPath: string;
|
|
13
12
|
readonly color: Color | null;
|
|
14
|
-
readonly routes: readonly Route[];
|
|
15
13
|
readonly diagram: LineDiagram;
|
|
16
14
|
};
|
|
17
15
|
export declare class Line {
|
|
@@ -20,10 +18,9 @@ export declare class Line {
|
|
|
20
18
|
readonly tags: Tags;
|
|
21
19
|
readonly urlPath: string;
|
|
22
20
|
readonly color: Color | null;
|
|
23
|
-
readonly routes: readonly Route[];
|
|
24
21
|
readonly diagram: LineDiagram;
|
|
25
22
|
constructor(fields: LineFields);
|
|
26
|
-
static build(lineConfig: LineConfig, lineTagSuccession: TagSuccessionConfig
|
|
23
|
+
static build(lineConfig: LineConfig, lineTagSuccession: TagSuccessionConfig): Line;
|
|
27
24
|
toFoda(): z.input<typeof lineFodaSchema>;
|
|
28
25
|
with(newValues: Partial<LineFields>): Line;
|
|
29
26
|
/** e.g. `"Sandringham" (#1)` */
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Tags } from "../../server/data/tags.js";
|
|
2
2
|
import { getHexCodesForColor } from "../../server/data/color.js";
|
|
3
|
-
import { Route } from "../../server/data/route.js";
|
|
4
3
|
import { LineDiagram } from "../../server/data/line-diagram.js";
|
|
5
4
|
export class Line {
|
|
6
5
|
id;
|
|
@@ -8,7 +7,6 @@ export class Line {
|
|
|
8
7
|
tags;
|
|
9
8
|
urlPath;
|
|
10
9
|
color;
|
|
11
|
-
routes;
|
|
12
10
|
diagram;
|
|
13
11
|
constructor(fields) {
|
|
14
12
|
this.id = fields.id;
|
|
@@ -16,17 +14,15 @@ export class Line {
|
|
|
16
14
|
this.tags = fields.tags;
|
|
17
15
|
this.urlPath = fields.urlPath;
|
|
18
16
|
this.color = fields.color;
|
|
19
|
-
this.routes = fields.routes;
|
|
20
17
|
this.diagram = fields.diagram;
|
|
21
18
|
}
|
|
22
|
-
static build(lineConfig, lineTagSuccession
|
|
19
|
+
static build(lineConfig, lineTagSuccession) {
|
|
23
20
|
return new Line({
|
|
24
21
|
id: lineConfig.id,
|
|
25
22
|
name: lineConfig.name,
|
|
26
23
|
tags: Tags.build(lineConfig.tags, lineTagSuccession),
|
|
27
24
|
urlPath: lineConfig.urlPath,
|
|
28
25
|
color: lineConfig.color,
|
|
29
|
-
routes: lineConfig.routes.map((route) => Route.build(route, routeTagSuccession)),
|
|
30
26
|
diagram: LineDiagram.build(lineConfig.diagram),
|
|
31
27
|
});
|
|
32
28
|
}
|
|
@@ -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,
|
|
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,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAW5D,MAAM,OAAO,IAAI;IACN,EAAE,CAAS;IACX,IAAI,CAAS;IACb,IAAI,CAAO;IACX,OAAO,CAAS;IAChB,KAAK,CAAe;IACpB,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,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,KAAK,CACV,UAAsB,EACtB,iBAAsC;QAEtC,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,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,4 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { LineLintOptions } from "../../../../../server/config/linting/types.js";
|
|
3
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function checkLineDiagramStopsInRoutes(issues: IssueCollector, line: LineConfig, lineIndex: number, options: LineLintOptions): void;
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import { chooseNameForEntry } from "../../../../../server/config/linting/utils/choose-name-for-entry.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
import { extractStopsFromLineDiagramShape } from "../../../../../server/config/helpers/extract-stops-from-line-diagram-shape.js";
|
|
4
|
-
export function checkLineDiagramStopsInRoutes(issues, line, lineIndex, options) {
|
|
5
|
-
if (options.ignoreDiagramStopNotInRoute ?? false)
|
|
6
|
-
return;
|
|
7
|
-
const routeStopIds = new Set();
|
|
8
|
-
for (const route of line.routes) {
|
|
9
|
-
for (const stop of route.stops) {
|
|
10
|
-
routeStopIds.add(stop.stopId);
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
for (const [entryIndex, entry] of line.diagram.entries.entries()) {
|
|
14
|
-
const stops = extractStopsFromLineDiagramShape(entry.shape);
|
|
15
|
-
for (const [stopIndex, diagramStop] of stops.entries()) {
|
|
16
|
-
if (!routeStopIds.has(diagramStop.stopId)) {
|
|
17
|
-
const entryName = chooseNameForEntry(entry.name, entryIndex);
|
|
18
|
-
issues.add({
|
|
19
|
-
message: `Stop ID ${diagramStop.stopId} in diagram entry ${entryName} of line "${line.name}" does not exist in any route.`,
|
|
20
|
-
path: `lines[${lineIndex}].diagram.entries[${entryIndex}].stops[${stopIndex}].stopId`,
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
//# sourceMappingURL=stops-in-routes.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stops-in-routes.js","sourceRoot":"","sources":["../../../../../../config/linting/line/diagram/stops-in-routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,UAAU,6BAA6B,CAC3C,MAAsB,EACtB,IAAgB,EAChB,SAAiB,EACjB,OAAwB;IAExB,IAAI,OAAO,CAAC,2BAA2B,IAAI,KAAK;QAAE,OAAO;IAEzD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACjE,MAAM,KAAK,GAAG,gCAAgC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE5D,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC7D,MAAM,CAAC,GAAG,CAAC;oBACT,OAAO,EAAE,WAAW,WAAW,CAAC,MAAM,qBAAqB,SAAS,aAAa,IAAI,CAAC,IAAI,gCAAgC;oBAC1H,IAAI,EAAE,SAAS,SAAS,qBAAqB,UAAU,WAAW,SAAS,UAAU;iBACtF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { LineLintOptions } from "../../../../server/config/linting/types.js";
|
|
3
|
-
import { IssueCollector } from "../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function checkLineHasRoutes(issues: IssueCollector, line: LineConfig, lineIndex: number, options: LineLintOptions): void;
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { IssueCollector } from "../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
-
export function checkLineHasRoutes(issues, line, lineIndex, options) {
|
|
3
|
-
if (options.ignoreMissingRoutes ?? false)
|
|
4
|
-
return;
|
|
5
|
-
if (line.routes.length === 0) {
|
|
6
|
-
issues.add({
|
|
7
|
-
message: `Line "${line.name}" has no routes.`,
|
|
8
|
-
path: `lines[${lineIndex}].routes`,
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
//# sourceMappingURL=has-routes.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"has-routes.js","sourceRoot":"","sources":["../../../../../config/linting/line/has-routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,kBAAkB,CAChC,MAAsB,EACtB,IAAgB,EAChB,SAAiB,EACjB,OAAwB;IAExB,IAAI,OAAO,CAAC,mBAAmB,IAAI,KAAK;QAAE,OAAO;IAEjD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC;YACT,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,kBAAkB;YAC7C,IAAI,EAAE,SAAS,SAAS,UAAU;SACnC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { LineLintOptions } from "../../../../../server/config/linting/types.js";
|
|
3
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function checkRoutesAllOrNoneHaveColors(issues: IssueCollector, lines: readonly LineConfig[], options: Record<number, LineLintOptions>): void;
|
|
@@ -1,20 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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,5 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { StopConfig } from "../../../../../server/config/types/stop-config.js";
|
|
3
|
-
import type { LineLintOptions } from "../../../../../server/config/linting/types.js";
|
|
4
|
-
import type { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
5
|
-
export declare function lintLineRouteConfig(issues: IssueCollector, line: LineConfig, lineIndex: number, stops: readonly StopConfig[], options: LineLintOptions): void;
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import { checkRouteHasMinimumStops } from "../../../../../server/config/linting/line/route/minimum-stops.js";
|
|
2
|
-
import { checkRouteNoDuplicateTags } from "../../../../../server/config/linting/line/route/no-duplicate-tags.js";
|
|
3
|
-
import { checkLineRouteNonEmptyName } from "../../../../../server/config/linting/line/route/non-empty-name.js";
|
|
4
|
-
import { checkLineRoutesMirrored } from "../../../../../server/config/linting/line/route/routes-mirrored.js";
|
|
5
|
-
import { checkRouteStopsExist } from "../../../../../server/config/linting/line/route/stops-exist.js";
|
|
6
|
-
import { checkLineRoutesUniqueIds } from "../../../../../server/config/linting/line/route/unique-ids.js";
|
|
7
|
-
import { checkLineRoutesUniqueNames } from "../../../../../server/config/linting/line/route/unique-names.js";
|
|
8
|
-
export function lintLineRouteConfig(issues, line, lineIndex, stops, options) {
|
|
9
|
-
checkLineRoutesUniqueIds(issues, line, lineIndex);
|
|
10
|
-
checkLineRoutesUniqueNames(issues, line, lineIndex, options);
|
|
11
|
-
checkLineRoutesMirrored(issues, line, lineIndex, options);
|
|
12
|
-
for (const [routeIndex, route] of line.routes.entries()) {
|
|
13
|
-
checkRouteHasMinimumStops(issues, route, routeIndex, lineIndex, line.name);
|
|
14
|
-
checkRouteNoDuplicateTags(issues, route, routeIndex, lineIndex, line.name);
|
|
15
|
-
checkRouteStopsExist(issues, route, routeIndex, lineIndex, line.name, stops);
|
|
16
|
-
checkLineRouteNonEmptyName(issues, route, routeIndex, lineIndex);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
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,3 +0,0 @@
|
|
|
1
|
-
import type { RouteConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
export declare function checkRouteHasMinimumStops(issues: IssueCollector, route: RouteConfig, routeIndex: number, lineIndex: number, lineName: string): void;
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
-
export function checkRouteHasMinimumStops(issues, route, routeIndex, lineIndex, lineName) {
|
|
3
|
-
if (route.stops.length < 2) {
|
|
4
|
-
issues.add({
|
|
5
|
-
message: `Route "${route.name}" in line "${lineName}" has fewer than 2 stops.`,
|
|
6
|
-
path: `lines[${lineIndex}].routes[${routeIndex}].stops`,
|
|
7
|
-
});
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
//# sourceMappingURL=minimum-stops.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"minimum-stops.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/minimum-stops.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,yBAAyB,CACvC,MAAsB,EACtB,KAAkB,EAClB,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC;YACT,OAAO,EAAE,UAAU,KAAK,CAAC,IAAI,cAAc,QAAQ,2BAA2B;YAC9E,IAAI,EAAE,SAAS,SAAS,YAAY,UAAU,SAAS;SACxD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import type { RouteConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
export declare function checkRouteNoDuplicateTags(issues: IssueCollector, route: RouteConfig, routeIndex: number, lineIndex: number, lineName: string): void;
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { findDuplicates } from "../../../../../server/config/linting/utils/find-duplicates.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
export function checkRouteNoDuplicateTags(issues, route, routeIndex, lineIndex, lineName) {
|
|
4
|
-
const duplicates = findDuplicates(route.tags, (tag) => tag);
|
|
5
|
-
for (const [tag, indices] of duplicates) {
|
|
6
|
-
for (const index of indices) {
|
|
7
|
-
issues.add({
|
|
8
|
-
message: `Tag ${tag} is duplicated in route "${route.name}" of line "${lineName}".`,
|
|
9
|
-
path: `lines[${lineIndex}].routes[${routeIndex}].tags[${index}]`,
|
|
10
|
-
});
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
//# sourceMappingURL=no-duplicate-tags.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"no-duplicate-tags.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/no-duplicate-tags.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,yBAAyB,CACvC,MAAsB,EACtB,KAAkB,EAClB,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAE5D,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,OAAO,GAAG,4BAA4B,KAAK,CAAC,IAAI,cAAc,QAAQ,IAAI;gBACnF,IAAI,EAAE,SAAS,SAAS,YAAY,UAAU,UAAU,KAAK,GAAG;aACjE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import type { RouteConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
export declare function checkLineRouteNonEmptyName(issues: IssueCollector, route: RouteConfig, routeIndex: number, lineIndex: number): void;
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
-
export function checkLineRouteNonEmptyName(issues, route, routeIndex, lineIndex) {
|
|
3
|
-
if (route.name.length === 0) {
|
|
4
|
-
issues.add({
|
|
5
|
-
message: `Route name is empty.`,
|
|
6
|
-
path: `lines[${lineIndex}].routes[${routeIndex}].name`,
|
|
7
|
-
});
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
//# sourceMappingURL=non-empty-name.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"non-empty-name.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/non-empty-name.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,0BAA0B,CACxC,MAAsB,EACtB,KAAkB,EAClB,UAAkB,EAClB,SAAiB;IAEjB,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC;YACT,OAAO,EAAE,sBAAsB;YAC/B,IAAI,EAAE,SAAS,SAAS,YAAY,UAAU,QAAQ;SACvD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { LineLintOptions } from "../../../../../server/config/linting/types.js";
|
|
3
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function checkLineRoutesMirrored(issues: IssueCollector, line: LineConfig, lineIndex: number, options: LineLintOptions): void;
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
-
import { itsOk } from "@dan-schel/js-utils";
|
|
3
|
-
export function checkLineRoutesMirrored(issues, line, lineIndex, options) {
|
|
4
|
-
for (const [routeIndex, route] of line.routes.entries()) {
|
|
5
|
-
if (options.routes?.[route.id]?.ignoreMissingMirrored ?? false)
|
|
6
|
-
continue;
|
|
7
|
-
const hasMirror = line.routes.some((otherRoute, otherIndex) => otherIndex !== routeIndex && routesAreMirrored(route, otherRoute));
|
|
8
|
-
if (!hasMirror) {
|
|
9
|
-
issues.add({
|
|
10
|
-
message: `Route "${route.name}" in line "${line.name}" does not have a mirrored route.`,
|
|
11
|
-
path: `lines[${lineIndex}].routes[${routeIndex}]`,
|
|
12
|
-
});
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
function routesAreMirrored(route1, route2) {
|
|
17
|
-
if (route1.stops.length !== route2.stops.length)
|
|
18
|
-
return false;
|
|
19
|
-
for (let i = 0; i < route1.stops.length; i++) {
|
|
20
|
-
const stop1 = itsOk(route1.stops[i]);
|
|
21
|
-
const stop2 = itsOk(route2.stops[route2.stops.length - 1 - i]);
|
|
22
|
-
if (stop1.stopId !== stop2.stopId || stop1.type !== stop2.type) {
|
|
23
|
-
return false;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
return true;
|
|
27
|
-
}
|
|
28
|
-
//# sourceMappingURL=routes-mirrored.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"routes-mirrored.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/routes-mirrored.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,MAAM,UAAU,uBAAuB,CACrC,MAAsB,EACtB,IAAgB,EAChB,SAAiB,EACjB,OAAwB;IAExB,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,qBAAqB,IAAI,KAAK;YAAE,SAAS;QAEzE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAChC,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CACzB,UAAU,KAAK,UAAU,IAAI,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,UAAU,KAAK,CAAC,IAAI,cAAc,IAAI,CAAC,IAAI,mCAAmC;gBACvF,IAAI,EAAE,SAAS,SAAS,YAAY,UAAU,GAAG;aAClD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAmB,EAAE,MAAmB;IACjE,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE/D,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { RouteConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { StopConfig } from "../../../../../server/config/types/stop-config.js";
|
|
3
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function checkRouteStopsExist(issues: IssueCollector, route: RouteConfig, routeIndex: number, lineIndex: number, lineName: string, stops: readonly StopConfig[]): void;
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
-
export function checkRouteStopsExist(issues, route, routeIndex, lineIndex, lineName, stops) {
|
|
3
|
-
const stopIds = new Set(stops.map((stop) => stop.id));
|
|
4
|
-
for (const [stopIndex, routeStop] of route.stops.entries()) {
|
|
5
|
-
if (!stopIds.has(routeStop.stopId)) {
|
|
6
|
-
issues.add({
|
|
7
|
-
message: `Stop ID ${routeStop.stopId} in route "${route.name}" of line "${lineName}" does not exist in the stop list.`,
|
|
8
|
-
path: `lines[${lineIndex}].routes[${routeIndex}].stops[${stopIndex}].stopId`,
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
//# sourceMappingURL=stops-exist.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stops-exist.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/stops-exist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,oBAAoB,CAClC,MAAsB,EACtB,KAAkB,EAClB,UAAkB,EAClB,SAAiB,EACjB,QAAgB,EAChB,KAA4B;IAE5B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAEtD,KAAK,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,WAAW,SAAS,CAAC,MAAM,cAAc,KAAK,CAAC,IAAI,cAAc,QAAQ,oCAAoC;gBACtH,IAAI,EAAE,SAAS,SAAS,YAAY,UAAU,WAAW,SAAS,UAAU;aAC7E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
export declare function checkLineRoutesUniqueIds(issues: IssueCollector, line: LineConfig, lineIndex: number): void;
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { findDuplicates } from "../../../../../server/config/linting/utils/find-duplicates.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
export function checkLineRoutesUniqueIds(issues, line, lineIndex) {
|
|
4
|
-
const duplicates = findDuplicates(line.routes, (route) => route.id);
|
|
5
|
-
for (const [id, indices] of duplicates) {
|
|
6
|
-
for (const index of indices) {
|
|
7
|
-
issues.add({
|
|
8
|
-
message: `Route ID ${id} is duplicated in line "${line.name}".`,
|
|
9
|
-
path: `lines[${lineIndex}].routes[${index}].id`,
|
|
10
|
-
});
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
//# sourceMappingURL=unique-ids.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"unique-ids.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/unique-ids.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,wBAAwB,CACtC,MAAsB,EACtB,IAAgB,EAChB,SAAiB;IAEjB,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpE,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC;QACvC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,YAAY,EAAE,2BAA2B,IAAI,CAAC,IAAI,IAAI;gBAC/D,IAAI,EAAE,SAAS,SAAS,YAAY,KAAK,MAAM;aAChD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { LineConfig } from "../../../../../server/config/types/line-config.js";
|
|
2
|
-
import type { LineLintOptions } from "../../../../../server/config/linting/types.js";
|
|
3
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
4
|
-
export declare function checkLineRoutesUniqueNames(issues: IssueCollector, line: LineConfig, lineIndex: number, options: LineLintOptions): void;
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { findDuplicates } from "../../../../../server/config/linting/utils/find-duplicates.js";
|
|
2
|
-
import { IssueCollector } from "../../../../../server/config/linting/utils/issue-collector.js";
|
|
3
|
-
import { itsOk } from "@dan-schel/js-utils";
|
|
4
|
-
export function checkLineRoutesUniqueNames(issues, line, lineIndex, options) {
|
|
5
|
-
const duplicates = findDuplicates(line.routes, (route) => route.name);
|
|
6
|
-
for (const [name, indices] of duplicates) {
|
|
7
|
-
for (const index of indices) {
|
|
8
|
-
const route = itsOk(line.routes[index]);
|
|
9
|
-
if (options.routes?.[route.id]?.ignoreDuplicatedName ?? false)
|
|
10
|
-
continue;
|
|
11
|
-
issues.add({
|
|
12
|
-
message: `Route name "${name}" is duplicated in line "${line.name}".`,
|
|
13
|
-
path: `lines[${lineIndex}].routes[${index}].name`,
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=unique-names.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"unique-names.js","sourceRoot":"","sources":["../../../../../../config/linting/line/route/unique-names.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,MAAM,UAAU,0BAA0B,CACxC,MAAsB,EACtB,IAAgB,EAChB,SAAiB,EACjB,OAAwB;IAExB,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEtE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,UAAU,EAAE,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACxC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,oBAAoB,IAAI,KAAK;gBAAE,SAAS;YAExE,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,eAAe,IAAI,4BAA4B,IAAI,CAAC,IAAI,IAAI;gBACrE,IAAI,EAAE,SAAS,SAAS,YAAY,KAAK,QAAQ;aAClD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { IssueCollector } from "../../../../server/config/linting/utils/issue-collector.js";
|
|
2
|
-
export function checkStopsAppearInRoutes(issues, stops, lines, options) {
|
|
3
|
-
const stopIdsInRoutes = new Set();
|
|
4
|
-
for (const line of lines) {
|
|
5
|
-
for (const route of line.routes) {
|
|
6
|
-
for (const stop of route.stops) {
|
|
7
|
-
stopIdsInRoutes.add(stop.stopId);
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
for (const [index, stop] of stops.entries()) {
|
|
12
|
-
if (options[stop.id]?.ignoreUnusedStop ?? false)
|
|
13
|
-
continue;
|
|
14
|
-
if (!stopIdsInRoutes.has(stop.id)) {
|
|
15
|
-
issues.add({
|
|
16
|
-
message: `Stop "${stop.name}" does not appear in any route.`,
|
|
17
|
-
path: `stops[${index}]`,
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
//# sourceMappingURL=appears-in-routes.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"appears-in-routes.js","sourceRoot":"","sources":["../../../../../config/linting/stop/appears-in-routes.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAElF,MAAM,UAAU,wBAAwB,CACtC,MAAsB,EACtB,KAA4B,EAC5B,KAA4B,EAC5B,OAAwC;IAExC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAC/B,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,gBAAgB,IAAI,KAAK;YAAE,SAAS;QAE1D,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC;gBACT,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,iCAAiC;gBAC5D,IAAI,EAAE,SAAS,KAAK,GAAG;aACxB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,24 +0,0 @@
|
|
|
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 {};
|
|
@@ -1,32 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|