corequery 0.33.1 → 0.34.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "corequery",
3
- "version": "0.33.1",
3
+ "version": "0.34.0",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "server/dist",
@@ -13,9 +13,11 @@ export async function handle(ctx, args) {
13
13
  const feedFilters = compiledFilters.map((x) => x.filterFunction);
14
14
  for (const stopId of stopIds) {
15
15
  const iterator = ctx.app.services.getDeparturesIterator(stopId, instant, args.direction);
16
- while (!allFeedsSatisfied(results, args.feeds, stopId) &&
17
- (await iterator.peek()) != null) {
18
- const departure = await iterator.take();
16
+ while (!allFeedsSatisfied(results, args.feeds, stopId)) {
17
+ const candidate = await iterator.peek();
18
+ if (candidate == null)
19
+ break;
20
+ const matchingResults = [];
19
21
  for (let i = 0; i < args.feeds.length; i++) {
20
22
  const feed = itsOk(args.feeds[i]);
21
23
  const passesFilter = itsOk(feedFilters[i]);
@@ -24,10 +26,18 @@ export async function handle(ctx, args) {
24
26
  continue;
25
27
  if (resultsSubarray.length >= feed.desiredCount)
26
28
  continue;
27
- if (!passesFilter(departure))
29
+ if (!passesFilter(candidate))
28
30
  continue;
29
- if (isSkipped(departure, feed.skips))
31
+ if (isSkipped(candidate, feed.skips))
30
32
  continue;
33
+ matchingResults.push(resultsSubarray);
34
+ }
35
+ if (matchingResults.length === 0) {
36
+ await iterator.skip();
37
+ continue;
38
+ }
39
+ const departure = await iterator.take();
40
+ for (const resultsSubarray of matchingResults) {
31
41
  // TODO: corequery-gtfs is synchronous here, but future service
32
42
  // sources might not be. For that reason, while it doesn't matter
33
43
  // right now, doing this in series is not ideal.
@@ -91,7 +101,7 @@ function allFeedsSatisfied(results, feeds, stopId) {
91
101
  function isSkipped(departure, skips) {
92
102
  // TODO: Should consider `movementIndex`, as looping services might appear
93
103
  // multiple times in the same departures list.
94
- return skips.some((s) => s.sourceId === departure.service.sourceId &&
95
- s.intrasourceId === departure.service.intrasourceId);
104
+ return skips.some((s) => s.sourceId === departure.sourceId &&
105
+ s.intrasourceId === departure.intrasourceId);
96
106
  }
97
107
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/departures/v0/index.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import type { Corequery } from "../../corequery.js";
2
- import type { Departure } from "../service/departure.js";
3
- export type DepartureFilterFunction = (departure: Departure) => boolean;
2
+ import type { LightweightDeparture } from "../service/service-source.js";
3
+ export type DepartureFilterFunction = (departure: LightweightDeparture) => boolean;
4
4
  export declare abstract class DepartureFilterType<CustomContextType> {
5
5
  protected readonly _app: Corequery<CustomContextType>;
6
6
  readonly prefix: string;
@@ -1 +1 @@
1
- {"version":3,"file":"departure-filter-type.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filter-type.ts"],"names":[],"mappings":"AAKA,MAAM,OAAgB,mBAAmB;IAElB;IACV;IAFX,YACqB,IAAkC,EAC5C,MAAc;QADJ,SAAI,GAAJ,IAAI,CAA8B;QAC5C,WAAM,GAAN,MAAM,CAAQ;IACtB,CAAC;CAGL"}
1
+ {"version":3,"file":"departure-filter-type.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filter-type.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,mBAAmB;IAElB;IACV;IAFX,YACqB,IAAkC,EAC5C,MAAc;QADJ,SAAI,GAAJ,IAAI,CAA8B;QAC5C,WAAM,GAAN,MAAM,CAAQ;IACtB,CAAC;CAGL"}
@@ -1,7 +1,6 @@
1
1
  import type { CustomDepartureFilterTypesConfig } from "../../config/types/custom-filter-function-type.js";
2
2
  import type { Corequery } from "../../corequery.js";
3
- import type { DepartureFilterType } from "./departure-filter-type.js";
4
- import type { Departure } from "../service/departure.js";
3
+ import type { DepartureFilterFunction, DepartureFilterType } from "./departure-filter-type.js";
5
4
  import { DepartureFilterToken } from "../../../shared/data/departure-filter-expression.js";
6
5
  export declare class DepartureFilters<CustomContextType> {
7
6
  private readonly _types;
@@ -9,8 +8,8 @@ export declare class DepartureFilters<CustomContextType> {
9
8
  static build<CustomContextType>(app: Corequery<CustomContextType>, customDepartureFilterTypes: CustomDepartureFilterTypesConfig<CustomContextType>): DepartureFilters<CustomContextType>;
10
9
  static createBuiltInFunctions<CustomContextType>(app: Corequery<CustomContextType>): DepartureFilterType<CustomContextType>[];
11
10
  /**
12
- * Returns a `(departure: Departure) => boolean` function based on the
13
- * provided filter expression. The filter expression must be given in
11
+ * Returns a `(departure: DepartureForFiltering) => boolean` function based on
12
+ * the provided filter expression. The filter expression must be given in
14
13
  * conjunctive normal form (CNF), in the supported filter syntax.
15
14
  *
16
15
  * For example, `line:1|line:2 service-tag:1|service-tag:2 !arr` means the
@@ -24,7 +23,7 @@ export declare class DepartureFilters<CustomContextType> {
24
23
  * allowed, so any complex expressions must be converted to CNF first.
25
24
  */
26
25
  compile(filterExpression: string): {
27
- filterFunction: (departure: Departure) => boolean;
26
+ filterFunction: DepartureFilterFunction;
28
27
  invalidTokens: Set<DepartureFilterToken>;
29
28
  } | null;
30
29
  private _compileToken;
@@ -37,8 +37,8 @@ export class DepartureFilters {
37
37
  ];
38
38
  }
39
39
  /**
40
- * Returns a `(departure: Departure) => boolean` function based on the
41
- * provided filter expression. The filter expression must be given in
40
+ * Returns a `(departure: DepartureForFiltering) => boolean` function based on
41
+ * the provided filter expression. The filter expression must be given in
42
42
  * conjunctive normal form (CNF), in the supported filter syntax.
43
43
  *
44
44
  * For example, `line:1|line:2 service-tag:1|service-tag:2 !arr` means the
@@ -1 +1 @@
1
- {"version":3,"file":"departure-filters.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filters.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"departure-filters.js","sourceRoot":"","sources":["../../../../data/departure-filters/departure-filters.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,7 @@ export class LineTagDepartureFilterType extends DepartureFilterType {
11
11
  const taggedLines = this._app.lines
12
12
  .filter((x) => x.tags.has(lineTag))
13
13
  .map((x) => x.id);
14
- return (departure) => departure.service.lineIds.some((id) => taggedLines.includes(id));
14
+ return (departure) => departure.lineIds.some((id) => taggedLines.includes(id));
15
15
  }
16
16
  }
17
17
  //# sourceMappingURL=line-tag.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"line-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,0BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACzB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpB,OAAO,CAAC,SAAS,EAAE,EAAE,CACnB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;CACF"}
1
+ {"version":3,"file":"line-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,0BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACzB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpB,OAAO,CAAC,SAAS,EAAE,EAAE,CACnB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF"}
@@ -8,7 +8,7 @@ export class LineDepartureFilterType extends DepartureFilterType {
8
8
  const lineId = parseIntNull(args);
9
9
  if (lineId === null)
10
10
  return null;
11
- return (departure) => departure.service.lineIds.includes(lineId);
11
+ return (departure) => departure.lineIds.includes(lineId);
12
12
  }
13
13
  }
14
14
  //# sourceMappingURL=line.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,uBAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAEjC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;CACF"}
1
+ {"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/line.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,uBAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrB,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAEjC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC;CACF"}
@@ -8,7 +8,7 @@ export class ServiceTagDepartureFilterType extends DepartureFilterType {
8
8
  const serviceTag = parseIntNull(args);
9
9
  if (serviceTag === null)
10
10
  return null;
11
- return (departure) => departure.service.tags.has(serviceTag);
11
+ return (departure) => departure.serviceTags.has(serviceTag);
12
12
  }
13
13
  }
14
14
  //# sourceMappingURL=service-tag.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"service-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/service-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,6BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC5B,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAErC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/D,CAAC;CACF"}
1
+ {"version":3,"file":"service-tag.js","sourceRoot":"","sources":["../../../../../data/departure-filters/types/service-tag.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,OAAO,6BAEX,SAAQ,mBAAsC;IAC9C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC5B,CAAC;IAEQ,mBAAmB,CAAC,IAAY;QACvC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAErC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;CACF"}
@@ -1,8 +1,18 @@
1
1
  import type { Service } from "./service.js";
2
2
  import type { Departure } from "./departure.js";
3
+ import type { Tags } from "../tags.js";
4
+ import type { ServiceServicingMovement } from "./service-movement.js";
3
5
  export type DeparturesIterationDirection = "forwards" | "backwards";
6
+ export type LightweightDeparture = {
7
+ readonly sourceId: string;
8
+ readonly intrasourceId: string;
9
+ readonly lineIds: readonly number[];
10
+ readonly serviceTags: Tags;
11
+ readonly movement: ServiceServicingMovement;
12
+ };
4
13
  export type DeparturesIterator = {
5
- peek: () => Promise<Departure | null>;
14
+ peek: () => Promise<LightweightDeparture | null>;
15
+ skip: () => Promise<void>;
6
16
  take: () => Promise<Departure>;
7
17
  };
8
18
  export type ServiceSource = {
@@ -1,4 +1,4 @@
1
- import type { DeparturesIterationDirection, DeparturesIterator } from "./service-source.js";
1
+ import type { LightweightDeparture, DeparturesIterationDirection, DeparturesIterator } from "./service-source.js";
2
2
  import type { Departure } from "./departure.js";
3
3
  export declare class ZipperDeparturesIterator implements DeparturesIterator {
4
4
  private readonly _iterators;
@@ -6,7 +6,8 @@ export declare class ZipperDeparturesIterator implements DeparturesIterator {
6
6
  private _nextIterator;
7
7
  private _isInitialized;
8
8
  constructor(_iterators: DeparturesIterator[], _direction: DeparturesIterationDirection);
9
- peek(): Promise<Departure | null>;
9
+ peek(): Promise<LightweightDeparture | null>;
10
+ skip(): Promise<void>;
10
11
  take(): Promise<Departure>;
11
12
  private _ensureSetup;
12
13
  private _determineBestIterator;
@@ -16,6 +16,14 @@ export class ZipperDeparturesIterator {
16
16
  return null;
17
17
  return await this._nextIterator.peek();
18
18
  }
19
+ async skip() {
20
+ await this._ensureSetup();
21
+ const iterator = this._nextIterator;
22
+ if (iterator == null)
23
+ throw new Error("Nothing to skip.");
24
+ await iterator.skip();
25
+ this._nextIterator = await this._determineBestIterator();
26
+ }
19
27
  async take() {
20
28
  await this._ensureSetup();
21
29
  const iterator = this._nextIterator;
@@ -44,15 +52,6 @@ export class ZipperDeparturesIterator {
44
52
  bestIterator = iterator;
45
53
  }
46
54
  }
47
- // TODO: Should we be storing the `best` value we're finding here, so that
48
- // we don't have to call `peek` again on the subiterator? Or is it the
49
- // subiterator's responsibility to cache its own `peek` value?
50
- //
51
- // A: It should probably be the subiterator's responsibility, because unless
52
- // we cache the best value for each subiterator, we have to `peek` them all
53
- // again everytime we `take`, so I think we're making the assumption that
54
- // while `peek` has to be async for the first call, all subsequent calls
55
- // should be free.
56
55
  return bestIterator;
57
56
  }
58
57
  _isBetter(currentBest, candidate) {
@@ -1 +1 @@
1
- {"version":3,"file":"zipper-departures-iterator.js","sourceRoot":"","sources":["../../../../data/service/zipper-departures-iterator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,OAAO,wBAAwB;IAKhB;IACA;IALX,aAAa,CAA4B;IACzC,cAAc,CAAU;IAEhC,YACmB,UAAgC,EAChC,UAAwC;QADxC,eAAU,GAAV,UAAU,CAAsB;QAChC,eAAU,GAAV,UAAU,CAA8B;QAEzD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAC5C,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC;QACpC,IAAI,QAAQ,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAE1D,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEpC,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAEzD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACzD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAClC,IAAI,IAAI,GAAqB,IAAI,CAAC;QAClC,IAAI,YAAY,GAA8B,IAAI,CAAC;QAEnD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,IAAI,SAAS,IAAI,IAAI;gBAAE,SAAS;YAEhC,IACE,IAAI,IAAI,IAAI;gBACZ,IAAI,CAAC,SAAS,CACZ,IAAI,CAAC,QAAQ,CAAC,iCAAiC,EAC/C,SAAS,CAAC,QAAQ,CAAC,iCAAiC,CACrD,EACD,CAAC;gBACD,IAAI,GAAG,SAAS,CAAC;gBACjB,YAAY,GAAG,QAAQ,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,0EAA0E;QAC1E,sEAAsE;QACtE,8DAA8D;QAC9D,EAAE;QACF,4EAA4E;QAC5E,2EAA2E;QAC3E,yEAAyE;QACzE,wEAAwE;QACxE,kBAAkB;QAElB,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,SAAS,CACf,WAA6B,EAC7B,SAA2B;QAE3B,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;YAC3C,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"zipper-departures-iterator.js","sourceRoot":"","sources":["../../../../data/service/zipper-departures-iterator.ts"],"names":[],"mappings":"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"}