corequery 0.29.0 → 0.30.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.
Files changed (108) hide show
  1. package/package.json +1 -1
  2. package/server/dist/server/api/create-api-router.js +3 -1
  3. package/server/dist/server/api/create-api-router.js.map +1 -1
  4. package/server/dist/server/api/handlers/about-page/v1/index.d.ts +2 -2
  5. package/server/dist/server/api/handlers/about-page/v1/index.js.map +1 -1
  6. package/server/dist/server/api/handlers/departures/v0/index.d.ts +2 -2
  7. package/server/dist/server/api/handlers/departures/v0/index.js +16 -13
  8. package/server/dist/server/api/handlers/departures/v0/index.js.map +1 -1
  9. package/server/dist/server/api/handlers/foda-synced-handler.d.ts +5 -0
  10. package/server/dist/server/api/handlers/foda-synced-handler.js +6 -0
  11. package/server/dist/server/api/handlers/foda-synced-handler.js.map +1 -0
  12. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-foda.d.ts +11 -0
  13. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-foda.js +107 -0
  14. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-foda.js.map +1 -0
  15. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-diagram-entry-foda.d.ts +10 -0
  16. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-diagram-entry-foda.js +35 -0
  17. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-diagram-entry-foda.js.map +1 -0
  18. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-diagram-foda.d.ts +10 -0
  19. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-diagram-foda.js +23 -0
  20. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-diagram-foda.js.map +1 -0
  21. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-foda.d.ts +10 -0
  22. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-foda.js +30 -0
  23. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-line-foda.js.map +1 -0
  24. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-stop-foda.d.ts +10 -0
  25. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-stop-foda.js +33 -0
  26. package/server/dist/server/api/handlers/foundational-data/multiversional/multiversional-stop-foda.js.map +1 -0
  27. package/server/dist/server/api/handlers/foundational-data/v1/index.d.ts +2 -2
  28. package/server/dist/server/api/handlers/foundational-data/v1/index.js +6 -4
  29. package/server/dist/server/api/handlers/foundational-data/v1/index.js.map +1 -1
  30. package/server/dist/server/api/handlers/service/v0/index.d.ts +2 -2
  31. package/server/dist/server/api/handlers/service/v0/index.js +18 -15
  32. package/server/dist/server/api/handlers/service/v0/index.js.map +1 -1
  33. package/server/dist/server/api/handlers/version-check/v1/index.d.ts +2 -2
  34. package/server/dist/server/api/handlers/version-check/v1/index.js.map +1 -1
  35. package/server/dist/server/api/handlers/versions/v1/index.d.ts +2 -2
  36. package/server/dist/server/api/handlers/versions/v1/index.js +1 -3
  37. package/server/dist/server/api/handlers/versions/v1/index.js.map +1 -1
  38. package/server/dist/server/api/types.d.ts +8 -1
  39. package/server/dist/server/corequery.d.ts +2 -0
  40. package/server/dist/server/corequery.js +12 -0
  41. package/server/dist/server/corequery.js.map +1 -1
  42. package/server/dist/server/data/line-diagram-entry.d.ts +0 -3
  43. package/server/dist/server/data/line-diagram-entry.js +1 -18
  44. package/server/dist/server/data/line-diagram-entry.js.map +1 -1
  45. package/server/dist/server/data/line-diagram.d.ts +0 -3
  46. package/server/dist/server/data/line-diagram.js +0 -6
  47. package/server/dist/server/data/line-diagram.js.map +1 -1
  48. package/server/dist/server/data/line.d.ts +0 -3
  49. package/server/dist/server/data/line.js +1 -10
  50. package/server/dist/server/data/line.js.map +1 -1
  51. package/server/dist/server/data/location.d.ts +0 -3
  52. package/server/dist/server/data/location.js +0 -6
  53. package/server/dist/server/data/location.js.map +1 -1
  54. package/server/dist/server/data/stop.d.ts +0 -3
  55. package/server/dist/server/data/stop.js +0 -9
  56. package/server/dist/server/data/stop.js.map +1 -1
  57. package/server/dist/shared/apis/departures/v0/index.d.ts +20 -17
  58. package/server/dist/shared/apis/departures/v0/index.js +3 -47
  59. package/server/dist/shared/apis/departures/v0/index.js.map +1 -1
  60. package/server/dist/shared/apis/foda-synced-result.d.ts +5 -0
  61. package/server/dist/shared/apis/foda-synced-result.js +8 -0
  62. package/server/dist/shared/apis/foda-synced-result.js.map +1 -0
  63. package/server/dist/shared/apis/foundational-data/v1/foundational-data.d.ts +2 -5
  64. package/server/dist/shared/apis/foundational-data/v1/foundational-data.js +3 -7
  65. package/server/dist/shared/apis/foundational-data/v1/foundational-data.js.map +1 -1
  66. package/server/dist/shared/apis/foundational-data/v1/index.d.ts +1 -0
  67. package/server/dist/shared/apis/service/v0/index.d.ts +21 -18
  68. package/server/dist/shared/apis/service/v0/index.js +3 -4
  69. package/server/dist/shared/apis/service/v0/index.js.map +1 -1
  70. package/server/dist/shared/apis/types.d.ts +1 -3
  71. package/server/dist/shared/apis/types.js +1 -1
  72. package/server/dist/shared/apis/types.js.map +1 -1
  73. package/web/dist/assets/About-DpFLDTV_.js +1 -0
  74. package/web/dist/assets/{AdminControls-BRkz2H1D.js → AdminControls-BMTTV4kR.js} +1 -1
  75. package/web/dist/assets/Alert-k_U4L_j3.js +1 -0
  76. package/web/dist/assets/Debug-DGqHdl31.js +1 -0
  77. package/web/dist/assets/{Home-Bimr0Ebg.js → Home-LcK9TehM.js} +1 -1
  78. package/web/dist/assets/Line-ZicduquS.js +1 -0
  79. package/web/dist/assets/NotFound-zNBih-TR.js +1 -0
  80. package/web/dist/assets/NotFoundPage-DLkgQE3z.js +1 -0
  81. package/web/dist/assets/{Picker-B59cZ5e5.js → Picker-ByWHXE97.js} +1 -1
  82. package/web/dist/assets/Service-CqfnDpff.js +1 -0
  83. package/web/dist/assets/{Settings-CcUztzue.js → Settings-1Z6FXsgC.js} +1 -1
  84. package/web/dist/assets/{SimpleMobileHeaderContent-9gskaqRe.js → SimpleMobileHeaderContent-DnaUyjiU.js} +1 -1
  85. package/web/dist/assets/{Status-Brsavasr.js → Status-DIIRyqgr.js} +1 -1
  86. package/web/dist/assets/Stop-DKWaUN6o.js +1 -0
  87. package/web/dist/assets/{ZenMode-D8bVmCaS.js → ZenMode-qKwx-pZt.js} +1 -1
  88. package/web/dist/assets/index-CE8NAPhv.js +2 -0
  89. package/web/dist/assets/linear-CMwrWzQJ.js +1 -0
  90. package/web/dist/assets/use-api-BJomuYg6.js +55 -0
  91. package/web/dist/assets/use-foda-synced-query-BM-OPAql.js +1 -0
  92. package/web/dist/assets/{use-simple-headers-CovxFlVs.js → use-simple-headers-Bihzijd5.js} +1 -1
  93. package/web/dist/index.html +2 -2
  94. package/web/dist/sw.js +1 -1
  95. package/server/dist/server/api/handlers/foundational-data/v1/builder.d.ts +0 -11
  96. package/server/dist/server/api/handlers/foundational-data/v1/builder.js +0 -44
  97. package/server/dist/server/api/handlers/foundational-data/v1/builder.js.map +0 -1
  98. package/web/dist/assets/About-BFYcBory.js +0 -1
  99. package/web/dist/assets/Alert-D41vPACK.js +0 -1
  100. package/web/dist/assets/Debug-CdyB6z1N.js +0 -1
  101. package/web/dist/assets/Line-DG7fDqpF.js +0 -1
  102. package/web/dist/assets/NotFound-DS9pNgRR.js +0 -1
  103. package/web/dist/assets/NotFoundPage-rHyFGsin.js +0 -1
  104. package/web/dist/assets/Service-CscfW4h8.js +0 -1
  105. package/web/dist/assets/Stop-mET1TOC2.js +0 -1
  106. package/web/dist/assets/index-DapCozyq.js +0 -2
  107. package/web/dist/assets/linear-eK93gfBn.js +0 -1
  108. package/web/dist/assets/use-query-BRsiAaVY.js +0 -55
@@ -4,6 +4,7 @@ import { LineCollection } from "./data/line-collection.js";
4
4
  import type { AboutPageConfig, FooterConfig, LandingPageConfig, TerminologyConfig } from "./config/index.js";
5
5
  import type { Logger } from "./logger/logger.js";
6
6
  import { ServiceRepository } from "./data/service/service-repository.js";
7
+ import { MultiversionalFoda } from "./api/handlers/foundational-data/multiversional/multiversional-foda.js";
7
8
  export type CorequeryConfigBuilder<CustomContextType> = (corequery: Corequery<CustomContextType>) => CorequeryConfig<CustomContextType>;
8
9
  export declare class Corequery<CustomContextType = unknown> {
9
10
  private readonly _config;
@@ -20,6 +21,7 @@ export declare class Corequery<CustomContextType = unknown> {
20
21
  readonly aboutPageConfig: AboutPageConfig;
21
22
  readonly terminologyConfig: TerminologyConfig;
22
23
  readonly custom: CustomContextType;
24
+ readonly foda: MultiversionalFoda;
23
25
  constructor(configBuilder: CorequeryConfigBuilder<CustomContextType>);
24
26
  getCorequeryPackageVersion(): string;
25
27
  getFrontendVersion(): string;
@@ -5,6 +5,7 @@ import { StopCollection } from "./data/stop-collection.js";
5
5
  import { LineCollection } from "./data/line-collection.js";
6
6
  import { getCorequeryPackageVersion } from "./get-corequery-package-version.js";
7
7
  import { ServiceRepository } from "./data/service/service-repository.js";
8
+ import { MultiversionalFoda } from "./api/handlers/foundational-data/multiversional/multiversional-foda.js";
8
9
  export class Corequery {
9
10
  _config;
10
11
  _webServer;
@@ -22,6 +23,7 @@ export class Corequery {
22
23
  aboutPageConfig;
23
24
  terminologyConfig;
24
25
  custom;
26
+ foda;
25
27
  constructor(configBuilder) {
26
28
  this._config = configBuilder(this);
27
29
  this._webServer = new WebServer(this, this._config.port, this._config.assets, env.COREQUERY_HOT_RELOAD ? "vite-middleware" : "dist-folder", serverFolderPath);
@@ -39,6 +41,16 @@ export class Corequery {
39
41
  this.aboutPageConfig = this._config.aboutPage;
40
42
  this.terminologyConfig = this._config.terminology;
41
43
  this.custom = this._config.custom;
44
+ // Right now, FODA is completely static (it only changes if the server
45
+ // config changes) and relies purely on the data which is already available
46
+ // above. Because of that, I'm able to construct it here and memoize it for
47
+ // the life of the server. If that ever changes, and it may (this is why the
48
+ // FODA hash is NOT based on the server version, and it actually calculated
49
+ // from the data itself - in case it becomes dynamic in the future), then
50
+ // this strategy won't work anymore. I'll still want to find a way to
51
+ // memoize the FODA though, so that the hash is only recalculated when the
52
+ // FODA actually changes, instead of on every API request.
53
+ this.foda = MultiversionalFoda.build(this);
42
54
  }
43
55
  getCorequeryPackageVersion() {
44
56
  if (this._corequeryPackageVersion == null) {
@@ -1 +1 @@
1
- {"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,5 @@
1
1
  import type { LineDiagramEntryConfig, LineDiagramShapeConfig } from "../config/index.js";
2
2
  import { type Color } from "./color.js";
3
- import type { lineDiagramEntryFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
4
- import type z from "zod";
5
3
  type LineDiagramEntryFields = {
6
4
  readonly name: string | null;
7
5
  readonly color: Color | null;
@@ -13,7 +11,6 @@ export declare class LineDiagramEntry {
13
11
  readonly shape: LineDiagramShapeConfig;
14
12
  constructor(fields: LineDiagramEntryFields);
15
13
  static build(entryConfig: LineDiagramEntryConfig): LineDiagramEntry;
16
- toFoda(): z.input<typeof lineDiagramEntryFodaSchema>;
17
14
  getFallbackStopList(): number[];
18
15
  with(newValues: Partial<LineDiagramEntryFields>): LineDiagramEntry;
19
16
  }
@@ -1,4 +1,4 @@
1
- import { getHexCodesForColor } from "./color.js";
1
+ import {} from "./color.js";
2
2
  import { unique } from "@dan-schel/js-utils";
3
3
  import { extractStopsFromLineDiagramShape } from "../config/helpers/extract-stops-from-line-diagram-shape.js";
4
4
  const includedInStopListMapping = {
@@ -21,23 +21,6 @@ export class LineDiagramEntry {
21
21
  shape: entryConfig.shape,
22
22
  });
23
23
  }
24
- toFoda() {
25
- // So there's a mismatch between how the config creates line diagrams, with
26
- // its "shape" field, and how the FODA schema doesn't have a "shape" field,
27
- // it's all just dumped at the top level. This wasn't intentional, I decided
28
- // on the schema first, and then when I got around to implementing the
29
- // config I preferred having a "shape" field, as name and color are common.
30
- //
31
- // But, to be fair, maybe it's a good thing? This means if we change other
32
- // fields (not just the shape), it can be a new "type" in the FODA, and then
33
- // the frontend gracefully falls back to the fallbackStopList, instead of
34
- // requiring a breaking change to the FODA schema.
35
- return {
36
- name: this.name,
37
- color: this.color != null ? getHexCodesForColor(this.color) : null,
38
- ...this.shape,
39
- };
40
- }
41
24
  getFallbackStopList() {
42
25
  return unique(extractStopsFromLineDiagramShape(this.shape)
43
26
  .filter((s) => includedInStopListMapping[s.type])
@@ -1 +1 @@
1
- {"version":3,"file":"line-diagram-entry.js","sourceRoot":"","sources":["../../../data/line-diagram-entry.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAc,MAAM,wBAAwB,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,yBAAyB,GAA+C;IAC5E,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAQF,MAAM,OAAO,gBAAgB;IAClB,IAAI,CAAgB;IACpB,KAAK,CAAe;IACpB,KAAK,CAAyB;IAEvC,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,2EAA2E;QAC3E,2EAA2E;QAC3E,4EAA4E;QAC5E,sEAAsE;QACtE,2EAA2E;QAC3E,EAAE;QACF,0EAA0E;QAC1E,4EAA4E;QAC5E,yEAAyE;QACzE,kDAAkD;QAClD,OAAO;YACL,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,GAAG,IAAI,CAAC,KAAK;SACd,CAAC;IACJ,CAAC;IAED,mBAAmB;QACjB,OAAO,MAAM,CACX,gCAAgC,CAAC,IAAI,CAAC,KAAK,CAAC;aACzC,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,CAC9B,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAA0C;QAC7C,OAAO,IAAI,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACzD,CAAC;CACF"}
1
+ {"version":3,"file":"line-diagram-entry.js","sourceRoot":"","sources":["../../../data/line-diagram-entry.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kEAAkE,CAAC;AAEpH,MAAM,yBAAyB,GAA+C;IAC5E,SAAS,EAAE,IAAI;IACf,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAQF,MAAM,OAAO,gBAAgB;IAClB,IAAI,CAAgB;IACpB,KAAK,CAAe;IACpB,KAAK,CAAyB;IAEvC,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,mBAAmB;QACjB,OAAO,MAAM,CACX,gCAAgC,CAAC,IAAI,CAAC,KAAK,CAAC;aACzC,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,CAC9B,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAA0C;QAC7C,OAAO,IAAI,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACzD,CAAC;CACF"}
@@ -1,6 +1,4 @@
1
1
  import { LineDiagramEntry } from "./line-diagram-entry.js";
2
- import type { lineDiagramFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
3
- import type z from "zod";
4
2
  import type { LineDiagramConfig } from "../config/index.js";
5
3
  type LineDiagramFields = {
6
4
  readonly entries: LineDiagramEntry[];
@@ -9,7 +7,6 @@ export declare class LineDiagram {
9
7
  readonly entries: LineDiagramEntry[];
10
8
  constructor(fields: LineDiagramFields);
11
9
  static build(diagram: LineDiagramConfig): LineDiagram;
12
- toFoda(): z.input<typeof lineDiagramFodaSchema>;
13
10
  with(newValues: Partial<LineDiagramFields>): LineDiagram;
14
11
  getFallbackStopList(): number[];
15
12
  }
@@ -10,12 +10,6 @@ export class LineDiagram {
10
10
  entries: diagram.entries.map((entry) => LineDiagramEntry.build(entry)),
11
11
  });
12
12
  }
13
- toFoda() {
14
- return {
15
- entries: this.entries.map((entry) => entry.toFoda()),
16
- fallbackStopList: this.getFallbackStopList(),
17
- };
18
- }
19
13
  with(newValues) {
20
14
  return new LineDiagram({ ...this, ...newValues });
21
15
  }
@@ -1 +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"}
1
+ {"version":3,"file":"line-diagram.js","sourceRoot":"","sources":["../../../data/line-diagram.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAO7C,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,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"}
@@ -1,7 +1,5 @@
1
1
  import type { LineConfig, TagSuccessionConfig } from "../config/index.js";
2
2
  import { Tags } from "./tags.js";
3
- import type { lineFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
4
- import type z from "zod";
5
3
  import { type Color } from "./color.js";
6
4
  import { LineDiagram } from "./line-diagram.js";
7
5
  type LineFields = {
@@ -21,7 +19,6 @@ export declare class Line {
21
19
  readonly diagram: LineDiagram;
22
20
  constructor(fields: LineFields);
23
21
  static build(lineConfig: LineConfig, lineTagSuccession: TagSuccessionConfig): Line;
24
- toFoda(): z.input<typeof lineFodaSchema>;
25
22
  with(newValues: Partial<LineFields>): Line;
26
23
  /** e.g. `"Sandringham" (#1)` */
27
24
  get debugName(): string;
@@ -1,5 +1,5 @@
1
1
  import { Tags } from "./tags.js";
2
- import { getHexCodesForColor } from "./color.js";
2
+ import {} from "./color.js";
3
3
  import { LineDiagram } from "./line-diagram.js";
4
4
  export class Line {
5
5
  id;
@@ -26,15 +26,6 @@ export class Line {
26
26
  diagram: LineDiagram.build(lineConfig.diagram),
27
27
  });
28
28
  }
29
- toFoda() {
30
- return {
31
- id: this.id,
32
- name: this.name,
33
- urlPath: this.urlPath,
34
- color: this.color != null ? getHexCodesForColor(this.color) : null,
35
- diagram: this.diagram.toFoda(),
36
- };
37
- }
38
29
  with(newValues) {
39
30
  return new Line({ ...this, ...newValues });
40
31
  }
@@ -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,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
+ {"version":3,"file":"line.js","sourceRoot":"","sources":["../../../data/line.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,MAAM,wBAAwB,CAAC;AACpD,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,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,5 +1,3 @@
1
- import type { locationFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
2
- import type z from "zod";
3
1
  export declare class Location {
4
2
  readonly latitude: number;
5
3
  readonly longitude: number;
@@ -8,5 +6,4 @@ export declare class Location {
8
6
  readonly latitude: number;
9
7
  readonly longitude: number;
10
8
  } | null): Location | null;
11
- toFoda(): z.input<typeof locationFodaSchema>;
12
9
  }
@@ -10,11 +10,5 @@ export class Location {
10
10
  return null;
11
11
  return new Location(input.latitude, input.longitude);
12
12
  }
13
- toFoda() {
14
- return {
15
- latitude: this.latitude,
16
- longitude: this.longitude,
17
- };
18
- }
19
13
  }
20
14
  //# sourceMappingURL=location.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"location.js","sourceRoot":"","sources":["../../../data/location.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,QAAQ;IAED;IACA;IAFlB,YACkB,QAAgB,EAChB,SAAiB;QADjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;IAChC,CAAC;IAEJ,MAAM,CAAC,cAAc,CACnB,KAGQ;QAER,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAC/B,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;IAED,MAAM;QACJ,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"location.js","sourceRoot":"","sources":["../../../data/location.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,QAAQ;IAED;IACA;IAFlB,YACkB,QAAgB,EAChB,SAAiB;QADjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;IAChC,CAAC;IAEJ,MAAM,CAAC,cAAc,CACnB,KAGQ;QAER,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAC/B,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;CACF"}
@@ -1,7 +1,5 @@
1
1
  import type { StopConfig, TagSuccessionConfig } from "../config/index.js";
2
2
  import { Tags } from "./tags.js";
3
- import type { stopFodaSchema } from "../../shared/apis/foundational-data/v1/foundational-data.js";
4
- import type z from "zod";
5
3
  import { Location } from "./location.js";
6
4
  type StopFields = {
7
5
  readonly id: number;
@@ -21,7 +19,6 @@ export declare class Stop {
21
19
  constructor(fields: StopFields);
22
20
  static build(stopConfig: StopConfig, stopTagSuccession: TagSuccessionConfig, canonicalLinesServingStop: readonly number[]): Stop;
23
21
  with(newValues: Partial<StopFields>): Stop;
24
- toFoda(): z.input<typeof stopFodaSchema>;
25
22
  /** e.g. `"Sandringham" (#1)` */
26
23
  get debugName(): string;
27
24
  }
@@ -28,15 +28,6 @@ export class Stop {
28
28
  with(newValues) {
29
29
  return new Stop({ ...this, ...newValues });
30
30
  }
31
- toFoda() {
32
- return {
33
- id: this.id,
34
- name: this.name,
35
- urlPath: this.urlPath,
36
- canonicalLinesServingStop: this.canonicalLinesServingStop,
37
- location: this.location?.toFoda() ?? null,
38
- };
39
- }
40
31
  /** e.g. `"Sandringham" (#1)` */
41
32
  get debugName() {
42
33
  return `"${this.name}" (#${this.id})`;
@@ -1 +1 @@
1
- {"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../data/stop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAWrD,MAAM,OAAO,IAAI;IACN,EAAE,CAAS;IACX,IAAI,CAAS;IACb,IAAI,CAAO;IACX,OAAO,CAAS;IAChB,QAAQ,CAAkB;IAC1B,yBAAyB,CAAoB;IAEtD,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,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,KAAK,CACV,UAAsB,EACtB,iBAAsC,EACtC,yBAA4C;QAE5C,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,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC;YACtD,yBAAyB;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,SAA8B;QACjC,OAAO,IAAI,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM;QACJ,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI;SAC1C,CAAC;IACJ,CAAC;IAED,gCAAgC;IAChC,IAAI,SAAS;QACX,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC;IACxC,CAAC;CACF"}
1
+ {"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../data/stop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAWrD,MAAM,OAAO,IAAI;IACN,EAAE,CAAS;IACX,IAAI,CAAS;IACb,IAAI,CAAO;IACX,OAAO,CAAS;IAChB,QAAQ,CAAkB;IAC1B,yBAAyB,CAAoB;IAEtD,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,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,KAAK,CACV,UAAsB,EACtB,iBAAsC,EACtC,yBAA4C;QAE5C,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,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC;YACtD,yBAAyB;SAC1B,CAAC,CAAC;IACL,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"}
@@ -5,24 +5,27 @@ declare const argsSchema: z.ZodObject<{
5
5
  count: z.ZodNumber;
6
6
  }, z.z.core.$strip>;
7
7
  declare const resultSchema: z.ZodObject<{
8
- departures: z.ZodArray<z.ZodObject<{
9
- sourceId: z.ZodString;
10
- intrasourceId: z.ZodString;
11
- primaryDestinationText: z.ZodString;
12
- secondaryDestinationText: z.ZodNullable<z.ZodString>;
13
- lineIds: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
14
- color: z.ZodNullable<z.ZodObject<{
15
- lightModeHexCode: z.ZodString;
16
- darkModeHexCode: z.ZodString;
8
+ foundationalDataHash: z.ZodString;
9
+ innerResult: z.ZodObject<{
10
+ departures: z.ZodArray<z.ZodObject<{
11
+ sourceId: z.ZodString;
12
+ intrasourceId: z.ZodString;
13
+ primaryDestinationText: z.ZodString;
14
+ secondaryDestinationText: z.ZodNullable<z.ZodString>;
15
+ lineIds: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
16
+ color: z.ZodNullable<z.ZodObject<{
17
+ lightModeHexCode: z.ZodString;
18
+ darkModeHexCode: z.ZodString;
19
+ }, z.z.core.$strip>>;
20
+ isCancelled: z.ZodBoolean;
21
+ movement: z.ZodObject<{
22
+ index: z.ZodNumber;
23
+ positionId: z.ZodNullable<z.ZodNumber>;
24
+ time: z.ZodString;
25
+ formerTime: z.ZodNullable<z.ZodString>;
26
+ }, z.z.core.$strip>;
17
27
  }, z.z.core.$strip>>;
18
- isCancelled: z.ZodBoolean;
19
- movement: z.ZodObject<{
20
- index: z.ZodNumber;
21
- positionId: z.ZodNullable<z.ZodNumber>;
22
- time: z.ZodString;
23
- formerTime: z.ZodNullable<z.ZodString>;
24
- }, z.z.core.$strip>;
25
- }, z.z.core.$strip>>;
28
+ }, z.z.core.$strip>;
26
29
  }, z.z.core.$strip>;
27
30
  export declare const api: Api<typeof argsSchema, typeof resultSchema>;
28
31
  export {};
@@ -1,52 +1,8 @@
1
1
  import z from "zod";
2
+ import { createFodaSyncedResultSchema } from "../../foda-synced-result.js";
2
3
  // NOTE: This is a "v0" API, i.e. its not intended to be used by anyone except
3
4
  // me, during the "beta" phase. When we switch to "v1" it'll break compatibility
4
5
  // with frontends that only understand the v0 API, and that's A-OK.
5
- // TODO: The v1 API needs to be wrapped in foundational data (FODA) updating
6
- // logic, because the cached FODA might be missing stops that this API response
7
- // includes (at least, in the future when I add the stopping pattern field).
8
- // Maybe the server has had a new stop added since the user opened the app. It
9
- // means all APIs that reference things in the FODA (e.g. stop IDs) need to take
10
- // FODA hash from the client as an argument, and if the FODA hash is outdated,
11
- // return the updated FODA along with the API response, so that the client can
12
- // update its cached FODA, and use that to now render the API response against.
13
- //
14
- // Something that'll be tricky with this foundational data update logic, is that
15
- // foundational data is stored in state, in a global context, so when the API
16
- // response comes back, if we need to update the foundational data, we'll call
17
- // setState(), but that updated state doesn't apply until the next render (I
18
- // think?), so there'll still be a render with the old foundational data unless
19
- // I'm able to find a way to prevent that first render.
20
- //
21
- // I think if you call setState() synchronously in a component's render function
22
- // rather than inside a useEffect() it'll essentially ignore the result of that
23
- // render, and immediately re-render with the new state. The issue is that
24
- // because we're doing an API call, it'll probably be inside a useEffect(), so
25
- // maybe we'd need to store the whole result in state ("whole" = with the
26
- // foundational data too), and then check synchronously inside the render
27
- // function (of some `useFodaSynchronizedApiCall()` hook which will be doing the
28
- // API call, subbing in the FODA hash argument, unwrapping the result, and
29
- // managing everything related to this problem) that if that state is set AND
30
- // has updated foundational data, then setState on the foundational data context
31
- // immediately. I'd have to check that this re-rendering thing works in Preact
32
- // like it does in React though.
33
- //
34
- // ^^ Actually, I don't think this works, because even as the render which will
35
- // ultimately be discarded is being rendered, an error could be thrown while
36
- // trying to resolve a stop name or something, and we don't want that! I doubt
37
- // Preact will just swallow that error, and even so, executing broken code like
38
- // that could weird bugs if that code has side-effects. The real solution might
39
- // just have to be ensuring that components who consume an API response that
40
- // requires up-to-date FODA only ever use the FODA given by the
41
- // `useFodaSynchronizedApiCall()` hook itself, and the hook will ensure that if
42
- // it returns a result, it also returns the FODA from that result if the FODA in
43
- // the global context is outdated (but still updating the global context of
44
- // course, we're just solving that first render bug). Child components fetching
45
- // their FODA from the global context could still be affected by the bug though,
46
- // so we might need to wrap the children in a second context provider which uses
47
- // the hook result's FODA.
48
- //
49
- // Sheesh! 😅
50
6
  const argsSchema = z.object({
51
7
  stopId: z.number(),
52
8
  count: z.number(),
@@ -69,7 +25,7 @@ const argsSchema = z.object({
69
25
  // })
70
26
  // .array(),
71
27
  });
72
- const resultSchema = z.object({
28
+ const resultSchema = createFodaSyncedResultSchema(z.object({
73
29
  departures: z
74
30
  .object({
75
31
  sourceId: z.string(),
@@ -118,7 +74,7 @@ const resultSchema = z.object({
118
74
  }),
119
75
  })
120
76
  .array(),
121
- });
77
+ }));
122
78
  export const api = {
123
79
  path: "/departures/v0",
124
80
  argsSchema,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../shared/apis/departures/v0/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../shared/apis/departures/v0/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AAEnF,8EAA8E;AAC9E,gFAAgF;AAChF,mEAAmE;AAEnE,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IAEjB,8EAA8E;IAC9E,4EAA4E;IAC5E,cAAc;IACd,EAAE;IACF,4CAA4C;IAC5C,EAAE;IACF,uBAAuB;IACvB,gDAAgD;IAChD,+BAA+B;IAC/B,EAAE;IACF,yEAAyE;IACzE,oBAAoB;IACpB,UAAU;IACV,cAAc;IACd,4BAA4B;IAC5B,iCAAiC;IACjC,OAAO;IACP,cAAc;CACf,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,4BAA4B,CAC/C,CAAC,CAAC,MAAM,CAAC;IACP,UAAU,EAAE,CAAC;SACV,MAAM,CAAC;QACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;QAEzB,0EAA0E;QAC1E,mEAAmE;QACnE,qDAAqD;QACrD,EAAE;QACF,mEAAmE;QACnE,yEAAyE;QACzE,uEAAuE;QACvE,8DAA8D;QAC9D,EAAE;QACF,iEAAiE;QACjE,sEAAsE;QACtE,yEAAyE;QACzE,0EAA0E;QAC1E,sEAAsE;QACtE,yEAAyE;QACzE,wEAAwE;QACxE,yEAAyE;QACzE,8BAA8B;QAC9B,EAAE;QACF,qEAAqE;QACrE,0EAA0E;QAC1E,qEAAqE;QACrE,yEAAyE;QACzE,0BAA0B;QAC1B,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE;QAClC,wBAAwB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAE/C,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QACtC,KAAK,EAAE,CAAC;aACL,MAAM,CAAC;YACN,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;YAC5B,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;SAC5B,CAAC;aACD,QAAQ,EAAE;QAEb,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;QAExB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,yCAAyC;YACzC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;YAEjB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAEjC,yEAAyE;YACzE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAClC,CAAC;KACH,CAAC;SACD,KAAK,EAAE;CACX,CAAC,CACH,CAAC;AAEF,MAAM,CAAC,MAAM,GAAG,GAAgD;IAC9D,IAAI,EAAE,gBAAgB;IACtB,UAAU;IACV,YAAY;CACb,CAAC"}
@@ -0,0 +1,5 @@
1
+ import { z, type ZodType } from "zod";
2
+ export declare function createFodaSyncedResultSchema<T extends ZodType>(innerResultSchema: T): z.ZodObject<{
3
+ foundationalDataHash: z.ZodString;
4
+ innerResult: T;
5
+ }, z.core.$strip>;
@@ -0,0 +1,8 @@
1
+ import { z } from "zod";
2
+ export function createFodaSyncedResultSchema(innerResultSchema) {
3
+ return z.object({
4
+ foundationalDataHash: z.string(),
5
+ innerResult: innerResultSchema,
6
+ });
7
+ }
8
+ //# sourceMappingURL=foda-synced-result.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"foda-synced-result.js","sourceRoot":"","sources":["../../../../shared/apis/foda-synced-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAgB,MAAM,KAAK,CAAC;AAEtC,MAAM,UAAU,4BAA4B,CAC1C,iBAAoB;IAEpB,OAAO,CAAC,CAAC,MAAM,CAAC;QACd,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE;QAChC,WAAW,EAAE,iBAAiB;KAC/B,CAAC,CAAC;AACL,CAAC"}
@@ -1,8 +1,4 @@
1
1
  import z from "zod";
2
- export declare const locationFodaSchema: z.ZodObject<{
3
- latitude: z.ZodNumber;
4
- longitude: z.ZodNumber;
5
- }, z.z.core.$strip>;
6
2
  export declare const stopFodaSchema: z.ZodObject<{
7
3
  id: z.ZodNumber;
8
4
  name: z.ZodString;
@@ -91,7 +87,7 @@ export declare const lineDiagramEntryFodaSchema: z.ZodUnion<readonly [z.ZodObjec
91
87
  }>;
92
88
  }, z.z.core.$strip>>>;
93
89
  }, z.z.core.$strip>]>;
94
- type UnderstoodLineDiagramEntryType = z.infer<typeof lineDiagramEntryFodaSchema>["type"];
90
+ type UnderstoodLineDiagramEntryType = z.output<typeof lineDiagramEntryFodaSchema>["type"];
95
91
  export declare function isUnderstoodLineDiagramEntryType(type: string): type is UnderstoodLineDiagramEntryType;
96
92
  export declare const lineDiagramFodaSchema: z.ZodObject<{
97
93
  entries: z.ZodReadonly<z.ZodArray<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodObject<{
@@ -257,6 +253,7 @@ export declare const lineFodaSchema: z.ZodObject<{
257
253
  export declare const fodaSchema: z.ZodObject<{
258
254
  metadata: z.ZodObject<{
259
255
  hash: z.ZodString;
256
+ fodaApiVersion: z.ZodLiteral<"1">;
260
257
  serverVersion: z.ZodString;
261
258
  }, z.z.core.$strip>;
262
259
  stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
@@ -21,7 +21,7 @@ import z from "zod";
21
21
  // data (for a little while at least). Remember that the frontend, of course,
22
22
  // doesn't need to be backwards compatible (we won't be running an old version
23
23
  // of the SERVER)!
24
- export const locationFodaSchema = z.object({
24
+ const locationFodaSchema = z.object({
25
25
  latitude: z.number(),
26
26
  longitude: z.number(),
27
27
  });
@@ -36,12 +36,7 @@ export const stopFodaSchema = z.object({
36
36
  canonicalLinesServingStop: z.number().array().readonly(),
37
37
  // To avoid users needing to send their location to the server, we send the
38
38
  // locations of each stop to them instead, and do the maths client-side.
39
- location: z
40
- .object({
41
- latitude: z.number(),
42
- longitude: z.number(),
43
- })
44
- .nullable(),
39
+ location: locationFodaSchema.nullable(),
45
40
  // Considering whether things like the list of supported filters and default
46
41
  // departure feeds would go in a `/stop-page/v1` API (which would also return
47
42
  // the departures themselves, even though subsequent refreshes would still use
@@ -172,6 +167,7 @@ const footerFodaSchema = z.object({
172
167
  export const fodaSchema = z.object({
173
168
  metadata: z.object({
174
169
  hash: z.string(),
170
+ fodaApiVersion: z.literal("1"),
175
171
  serverVersion: z.string(),
176
172
  }),
177
173
  stops: stopFodaSchema.array().readonly(),
@@ -1 +1 @@
1
- {"version":3,"file":"foundational-data.js","sourceRoot":"","sources":["../../../../../../shared/apis/foundational-data/v1/foundational-data.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"foundational-data.js","sourceRoot":"","sources":["../../../../../../shared/apis/foundational-data/v1/foundational-data.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ declare const resultSchema: z.ZodUnion<readonly [z.ZodObject<{
8
8
  foundationalData: z.ZodObject<{
9
9
  metadata: z.ZodObject<{
10
10
  hash: z.ZodString;
11
+ fodaApiVersion: z.ZodLiteral<"1">;
11
12
  serverVersion: z.ZodString;
12
13
  }, z.z.core.$strip>;
13
14
  stops: z.ZodReadonly<z.ZodArray<z.ZodObject<{
@@ -5,25 +5,28 @@ declare const argsSchema: z.ZodObject<{
5
5
  intrasourceId: z.ZodString;
6
6
  }, z.z.core.$strip>;
7
7
  declare const resultSchema: z.ZodObject<{
8
- service: z.ZodNullable<z.ZodObject<{
9
- sourceId: z.ZodString;
10
- intrasourceId: z.ZodString;
11
- primaryDestinationText: z.ZodString;
12
- lineIds: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
13
- color: z.ZodNullable<z.ZodObject<{
14
- lightModeHexCode: z.ZodString;
15
- darkModeHexCode: z.ZodString;
8
+ foundationalDataHash: z.ZodString;
9
+ innerResult: z.ZodObject<{
10
+ service: z.ZodNullable<z.ZodObject<{
11
+ sourceId: z.ZodString;
12
+ intrasourceId: z.ZodString;
13
+ primaryDestinationText: z.ZodString;
14
+ lineIds: z.ZodReadonly<z.ZodArray<z.ZodNumber>>;
15
+ color: z.ZodNullable<z.ZodObject<{
16
+ lightModeHexCode: z.ZodString;
17
+ darkModeHexCode: z.ZodString;
18
+ }, z.z.core.$strip>>;
19
+ isCancelled: z.ZodBoolean;
20
+ movements: z.ZodReadonly<z.ZodArray<z.ZodObject<{
21
+ stopId: z.ZodNumber;
22
+ positionId: z.ZodNullable<z.ZodNumber>;
23
+ arrivalTime: z.ZodNullable<z.ZodString>;
24
+ formerArrivalTime: z.ZodNullable<z.ZodString>;
25
+ departureTime: z.ZodNullable<z.ZodString>;
26
+ formerDepartureTime: z.ZodNullable<z.ZodString>;
27
+ }, z.z.core.$strip>>>;
16
28
  }, z.z.core.$strip>>;
17
- isCancelled: z.ZodBoolean;
18
- movements: z.ZodReadonly<z.ZodArray<z.ZodObject<{
19
- stopId: z.ZodNumber;
20
- positionId: z.ZodNullable<z.ZodNumber>;
21
- arrivalTime: z.ZodNullable<z.ZodString>;
22
- formerArrivalTime: z.ZodNullable<z.ZodString>;
23
- departureTime: z.ZodNullable<z.ZodString>;
24
- formerDepartureTime: z.ZodNullable<z.ZodString>;
25
- }, z.z.core.$strip>>>;
26
- }, z.z.core.$strip>>;
29
+ }, z.z.core.$strip>;
27
30
  }, z.z.core.$strip>;
28
31
  export declare const api: Api<typeof argsSchema, typeof resultSchema>;
29
32
  export {};
@@ -1,14 +1,13 @@
1
1
  import z from "zod";
2
+ import { createFodaSyncedResultSchema } from "../../foda-synced-result.js";
2
3
  // NOTE: This is a "v0" API, i.e. its not intended to be used by anyone except
3
4
  // me, during the "beta" phase. When we switch to "v1" it'll break compatibility
4
5
  // with frontends that only understand the v0 API, and that's A-OK.
5
- // TODO: The v1 API needs to be wrapped in foundational data just like
6
- // /api/departures (see TODO there for more details).
7
6
  const argsSchema = z.object({
8
7
  sourceId: z.string(),
9
8
  intrasourceId: z.string(),
10
9
  });
11
- const resultSchema = z.object({
10
+ const resultSchema = createFodaSyncedResultSchema(z.object({
12
11
  service: z
13
12
  .object({
14
13
  sourceId: z.string(),
@@ -35,7 +34,7 @@ const resultSchema = z.object({
35
34
  .readonly(),
36
35
  })
37
36
  .nullable(),
38
- });
37
+ }));
39
38
  export const api = {
40
39
  path: "/service/v0",
41
40
  argsSchema,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../shared/apis/service/v0/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAGpB,8EAA8E;AAC9E,gFAAgF;AAChF,mEAAmE;AAEnE,sEAAsE;AACtE,qDAAqD;AAErD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;CAC1B,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,OAAO,EAAE,CAAC;SACP,MAAM,CAAC;QACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;QAEzB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE;QAElC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QACtC,KAAK,EAAE,CAAC;aACL,MAAM,CAAC;YACN,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;YAC5B,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;SAC5B,CAAC;aACD,QAAQ,EAAE;QAEb,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;QAExB,SAAS,EAAE,CAAC;aACT,MAAM,CAAC;YACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAEjC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAClC,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAExC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACpC,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC3C,CAAC;aACD,KAAK,EAAE;aACP,QAAQ,EAAE;KACd,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,GAAG,GAAgD;IAC9D,IAAI,EAAE,aAAa;IACnB,UAAU;IACV,YAAY;CACb,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../shared/apis/service/v0/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AAEnF,8EAA8E;AAC9E,gFAAgF;AAChF,mEAAmE;AAEnE,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;CAC1B,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,4BAA4B,CAC/C,CAAC,CAAC,MAAM,CAAC;IACP,OAAO,EAAE,CAAC;SACP,MAAM,CAAC;QACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;QACpB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;QAEzB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE;QAElC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QACtC,KAAK,EAAE,CAAC;aACL,MAAM,CAAC;YACN,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;YAC5B,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;SAC5B,CAAC;aACD,QAAQ,EAAE;QAEb,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;QAExB,SAAS,EAAE,CAAC;aACT,MAAM,CAAC;YACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAEjC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAClC,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAExC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACpC,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC3C,CAAC;aACD,KAAK,EAAE;aACP,QAAQ,EAAE;KACd,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CACH,CAAC;AAEF,MAAM,CAAC,MAAM,GAAG,GAAgD;IAC9D,IAAI,EAAE,aAAa;IACnB,UAAU;IACV,YAAY;CACb,CAAC"}
@@ -1,8 +1,6 @@
1
- import z, { ZodType } from "zod";
1
+ import type { ZodType } from "zod";
2
2
  export type Api<Args extends ZodType, Result extends ZodType> = {
3
3
  path: string;
4
4
  argsSchema: Args;
5
5
  resultSchema: Result;
6
6
  };
7
- export type ArgsOf<ApiType> = ApiType extends Api<infer Args, any> ? z.infer<Args> : never;
8
- export type ResultOf<ApiType> = ApiType extends Api<any, infer Result> ? z.input<Result> : never;