minotor 9.0.2 → 9.2.0

package/dist/routing/result.d.ts

@@ -1,5 +1,5 @@
 import { Timetable } from '../router.js';
-import { SourceStopId } from '../stops/stops.js';
+import { SourceStopId, StopId } from '../stops/stops.js';
 import { StopsIndex } from '../stops/stopsIndex.js';
 import { Query } from './query.js';
 import { Route } from './route.js';
@@ -10,6 +10,14 @@ export declare class Result {
     readonly stopsIndex: StopsIndex;
     readonly timetable: Timetable;
     constructor(query: Query, routingState: RoutingState, stopsIndex: StopsIndex, timetable: Timetable);
+    /**
+     * Reconstructs the best route to a stop by StopId.
+     * (to any stop reachable in less time / transfers than the destination(s) of the query)
+     *
+     * @param to The destination stop by StopId.
+     * @returns a route to the destination stop if it exists.
+     */
+    bestRouteToStopId(to: StopId | Set<StopId>): Route | undefined;
     /**
      * Reconstructs the best route to a stop.
      * (to any stop reachable in less time / transfers than the destination(s) of the query)

package/dist/stops/stopsIndex.d.ts

@@ -1,6 +1,6 @@
 import { SourceStopId, Stop, StopId } from './stops.js';
 /**
- * The StopMap class provides functionality to search for public transport stops
+ * The StopsIndex class provides functionality to search for public transport stops
  * by name or geographic location. It leverages text search and geospatial indexing
  * to efficiently find stops based on user queries.
  */
@@ -66,4 +66,10 @@ export declare class StopsIndex {
      * Find ids of all sibling stops.
      */
     equivalentStops(sourceId: SourceStopId): Stop[];
+    /**
+     * Makes the StopsIndex iterable, allowing iteration over all stops.
+     *
+     * @returns An iterator for the stops.
+     */
+    [Symbol.iterator](): Iterator<Stop>;
 }

package/eslint.config.mjs

@@ -18,7 +18,6 @@ export default tseslint.config(
       sourceType: 'module',
       parser: tseslint.parser,
       parserOptions: {
-        project: './tsconfig.json',
         projectService: true,
         tsconfigRootDir: import.meta.dirname,
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minotor",
-  "version": "9.0.2",
+  "version": "9.2.0",
   "description": "A lightweight client-side transit routing library.",
   "keywords": [
     "minotor",
@@ -42,11 +42,11 @@
     }
   },
   "engines": {
-    "node": ">=22.18.0",
+    "node": ">=24.11.0",
     "npm": ">=11.5.2"
   },
   "volta": {
-    "node": "22.18.0",
+    "node": "24.12.0",
     "npm": "11.5.2"
   },
   "publishConfig": {
@@ -74,44 +74,44 @@
     "semantic-release": "semantic-release"
   },
   "devDependencies": {
-    "@eslint/js": "^9.34.0",
-    "@rollup/plugin-commonjs": "^28.0.6",
-    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@eslint/js": "^9.39.2",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.4",
+    "@rollup/plugin-typescript": "^12.3.0",
     "@ryansonshine/commitizen": "^4.2.8",
     "@ryansonshine/cz-conventional-changelog": "^3.3.4",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^13.0.1",
-    "@semantic-release/github": "^11.0.4",
-    "@semantic-release/npm": "^12.0.2",
-    "@semantic-release/release-notes-generator": "^14.0.3",
+    "@semantic-release/github": "^12.0.2",
+    "@semantic-release/npm": "^13.1.3",
+    "@semantic-release/release-notes-generator": "^14.1.0",
     "@types/geokdbush": "^1.1.5",
     "@types/luxon": "^3.7.1",
-    "@types/node": "^24.3.0",
+    "@types/node": "^25.0.3",
     "c8": "^10.1.3",
-    "cspell": "^9.2.0",
-    "eslint": "^9.34.0",
+    "cspell": "^9.4.0",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "prettier": "^3.6.2",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.49.0",
-    "semantic-release": "^24.2.7",
-    "ts-proto": "^2.7.7",
-    "tsx": "^4.20.5",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.41.0"
+    "prettier": "^3.7.4",
+    "rimraf": "^6.1.2",
+    "rollup": "^4.55.1",
+    "semantic-release": "^25.0.2",
+    "ts-proto": "^2.10.1",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.52.0"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.7.0",
-    "commander": "^14.0.0",
+    "@bufbuild/protobuf": "^2.10.2",
+    "commander": "^14.0.2",
     "csv-parse": "^6.1.0",
     "geokdbush": "^2.0.1",
     "kdbush": "^4.0.2",
     "loglevel": "^1.9.2",
-    "luxon": "^3.7.1",
+    "luxon": "^3.7.2",
     "node-stream-zip": "^1.15.0",
-    "slimsearch": "^2.2.2"
+    "slimsearch": "^2.3.0"
   }
 }

package/src/__e2e__/router.test.ts

@@ -15,7 +15,7 @@ const routes = [
         from: '8504100:0:2',
         to: '8504086:0:2',
         departure: '08:34',
-        arrival: '09:11',
+        arrival: '09:10',
         route: { type: 'RAIL', name: 'RE2' },
       },
       {
@@ -33,13 +33,13 @@ const routes = [
       },
       {
         from: '8504077:0:1',
-        to: '8577737',
+        to: '8577737:0:B',
         type: 'REQUIRES_MINIMAL_TIME',
         minTransferTime: '02:00',
       },
       {
-        from: '8577737',
-        to: '8504880',
+        from: '8577737:0:B',
+        to: '8504880:0:10000',
         departure: '09:33',
         arrival: '09:44',
         route: { type: 'BUS', name: '263' },
@@ -60,54 +60,28 @@ const routes = [
       },
       {
         from: '8503000:0:33',
-        to: '8503000:0:9',
+        to: '8503000:0:6',
         type: 'REQUIRES_MINIMAL_TIME',
         minTransferTime: '07:00',
       },
       {
-        from: '8503000:0:9',
-        to: '8509002:0:2',
+        from: '8503000:0:6',
+        to: '8509000:0:9',
         departure: '13:38',
-        arrival: '14:41',
+        arrival: '14:52',
         route: { type: 'RAIL', name: 'IC3' },
       },
       {
-        from: '8509002:0:2',
-        to: '8509002:0:6',
+        from: '8509000:0:9',
+        to: '8509000:0:10',
         type: 'REQUIRES_MINIMAL_TIME',
-        minTransferTime: '04:00',
-      },
-      {
-        from: '8509002:0:6',
-        to: '8509269:0:3',
-        departure: '14:49',
-        arrival: '15:52',
-        route: { type: 'RAIL', name: 'RE24' },
-      },
-      {
-        from: '8509269:0:3',
-        to: '8509269:0:4',
-        type: 'REQUIRES_MINIMAL_TIME',
-        minTransferTime: '01:00',
-      },
-      {
-        from: '8509269:0:4',
-        to: '8509251:0:3',
-        departure: '15:54',
-        arrival: '16:43',
-        route: { type: 'RAIL', name: 'R15' },
-      },
-      {
-        from: '8509251:0:3',
-        to: '8509251:0:2',
-        type: 'REQUIRES_MINIMAL_TIME',
-        minTransferTime: '01:00',
+        minTransferTime: '03:00',
       },
       {
-        from: '8509251:0:2',
+        from: '8509000:0:10',
         to: '8509253:0:1',
-        departure: '16:48',
-        arrival: '17:00',
+        departure: '14:58',
+        arrival: '16:55',
         route: { type: 'RAIL', name: 'IR38' },
       },
     ],
@@ -121,7 +95,7 @@ const routes = [
         from: '8500010:0:33',
         to: '8718213',
         departure: '17:08',
-        arrival: '17:15',
+        arrival: '17:16',
         route: { type: 'RAIL', name: 'TER' },
       },
       {
@@ -140,13 +114,26 @@ const routes = [
     route: [
       {
         from: '8504100:0:3',
-        to: '8503000:0:33',
-        departure: '09:03',
-        arrival: '10:28',
-        route: { type: 'RAIL', name: 'IC1' },
+        to: '8507000:0:10',
+        departure: '08:33',
+        arrival: '08:56',
+        route: { type: 'RAIL', name: 'IR15' },
       },
       {
-        from: '8503000:0:33',
+        from: '8507000:0:10',
+        to: '8507000:0:2',
+        type: 'REQUIRES_MINIMAL_TIME',
+        minTransferTime: '06:00',
+      },
+      {
+        from: '8507000:0:2',
+        to: '8503000:0:34',
+        departure: '09:02',
+        arrival: '09:58',
+        route: { type: 'RAIL', name: 'IC81' },
+      },
+      {
+        from: '8503000:0:34',
         to: '8503000:0:10',
         type: 'REQUIRES_MINIMAL_TIME',
         minTransferTime: '07:00',
@@ -154,8 +141,8 @@ const routes = [
       {
         from: '8503000:0:10',
         to: '8509002:0:2',
-        departure: '10:38',
-        arrival: '11:41',
+        departure: '10:07',
+        arrival: '11:11',
         route: { type: 'RAIL', name: 'IC3' },
       },
       {
@@ -166,10 +153,10 @@ const routes = [
       },
       {
         from: '8509002:0:6',
-        to: '8509073:0:1',
-        departure: '11:49',
-        arrival: '13:03',
-        route: { type: 'RAIL', name: 'RE24' },
+        to: '8509073:0:2',
+        departure: '11:20',
+        arrival: '12:27',
+        route: { type: 'RAIL', name: 'RE13' },
       },
     ],
   },
@@ -204,7 +191,7 @@ describe('E2E Tests for Transit Router', () => {
 
       const result = router.route(queryObject);
       const bestRoute = result.bestRoute(toStop.sourceStopId);
-
+      console.log();
       assert.ok(bestRoute, 'No route found');
       const actualRoute = bestRoute.asJson();
 

package/src/__e2e__/timetable/stops.bin

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18eaba61a6014cc31041103c3bcc74a4bebd37c234781c57238113a1de61ffd1
-size 5147203
+oid sha256:8147a3beb12e5dd65fe2bb5ed4013adaa0897ac84bd9722f53a7f38ebfaa9100
+size 4542160

package/src/__e2e__/timetable/timetable.bin

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8c1539545653fd5a1e8d83f52f6b8383c8f1ed6087947105e3093334b046c0b
-size 17521380
+oid sha256:f18f8795ee3dcb04accc3f372cde7041ec4c6d2812fee03e2a0c9de39d4149a6
+size 18441262

package/src/routing/__tests__/result.test.ts

@@ -409,6 +409,87 @@ describe('Result', () => {
     });
   });
 
+  describe('bestRouteToStopId', () => {
+    it('should return route when given a single StopId', () => {
+      const earliestArrivals = new Map([
+        [0, { arrival: Time.fromHMS(8, 0, 0), legNumber: 0 }], // origin
+        [2, { arrival: Time.fromHMS(9, 0, 0), legNumber: 1 }], // destination
+      ]);
+
+      const vehicleEdge: VehicleEdge = {
+        arrival: Time.fromHMS(9, 0, 0),
+        from: 0,
+        to: 2,
+        routeId: 0,
+        tripIndex: 0,
+      };
+
+      const graph: Map<StopId, RoutingEdge>[] = [
+        new Map<StopId, RoutingEdge>([[0, { arrival: Time.fromHMS(8, 0, 0) }]]), // Round 0 - origins
+        new Map<StopId, RoutingEdge>([[2, vehicleEdge]]), // Round 1
+      ];
+
+      const result = new Result(
+        mockQuery,
+        {
+          earliestArrivals,
+          graph,
+          destinations: [2],
+        },
+        mockStopsIndex,
+        mockTimetable,
+      );
+
+      const route = result.bestRouteToStopId(2); // Using StopId instead of SourceStopId
+      assert(route);
+      assert.strictEqual(route.legs.length, 1);
+      const firstLeg = route.legs[0];
+      assert(firstLeg);
+      assert.strictEqual(firstLeg.from.id, 0);
+      assert.strictEqual(firstLeg.to.id, 2);
+    });
+
+    it('should return route to closest destination when given a Set of StopIds', () => {
+      const earliestArrivals = new Map([
+        [0, { arrival: Time.fromHMS(8, 0, 0), legNumber: 0 }], // origin
+        [2, { arrival: Time.fromHMS(9, 0, 0), legNumber: 1 }], // destination (faster)
+        [3, { arrival: Time.fromHMS(9, 45, 0), legNumber: 1 }], // destination (slower)
+      ]);
+
+      const vehicleEdge: VehicleEdge = {
+        arrival: Time.fromHMS(9, 0, 0),
+        from: 0,
+        to: 2,
+        routeId: 0,
+        tripIndex: 0,
+      };
+
+      const graph: Map<StopId, RoutingEdge>[] = [
+        new Map<StopId, RoutingEdge>([[0, { arrival: Time.fromHMS(8, 0, 0) }]]), // Round 0 - origins
+        new Map<StopId, RoutingEdge>([[2, vehicleEdge]]), // Round 1
+      ];
+
+      const result = new Result(
+        mockQuery,
+        {
+          earliestArrivals,
+          graph,
+          destinations: [2, 3],
+        },
+        mockStopsIndex,
+        mockTimetable,
+      );
+
+      const route = result.bestRouteToStopId(new Set([2, 3])); // Using Set of StopIds
+      assert(route);
+      assert.strictEqual(route.legs.length, 1);
+      const firstLeg = route.legs[0];
+      assert(firstLeg);
+      assert.strictEqual(firstLeg.from.id, 0);
+      assert.strictEqual(firstLeg.to.id, 2); // Should route to stop 2 (faster arrival)
+    });
+  });
+
   describe('continuous trips', () => {
     it('should handle single continuous trip correctly', () => {
       const earliestArrivals = new Map([

package/src/routing/result.ts

@@ -23,6 +23,37 @@ export class Result {
     this.timetable = timetable;
   }
 
+  /**
+   * Reconstructs the best route to a stop by StopId.
+   * (to any stop reachable in less time / transfers than the destination(s) of the query)
+   *
+   * @param to The destination stop by StopId.
+   * @returns a route to the destination stop if it exists.
+   */
+  bestRouteToStopId(to: StopId | Set<StopId>): Route | undefined {
+    const sourceStopIds =
+      to instanceof Set
+        ? new Set(
+            Array.from(to)
+              .map(
+                (stopId) => this.stopsIndex.findStopById(stopId)?.sourceStopId,
+              )
+              .filter(
+                (sourceId): sourceId is SourceStopId => sourceId !== undefined,
+              ),
+          )
+        : this.stopsIndex.findStopById(to)?.sourceStopId;
+
+    if (
+      sourceStopIds === undefined ||
+      (sourceStopIds instanceof Set && sourceStopIds.size === 0)
+    ) {
+      return undefined;
+    }
+
+    return this.bestRoute(sourceStopIds);
+  }
+
   /**
    * Reconstructs the best route to a stop.
    * (to any stop reachable in less time / transfers than the destination(s) of the query)
@@ -37,23 +68,24 @@ export class Result {
         : to
           ? [to]
           : Array.from(this.query.to);
-    const destinations = destinationList.flatMap((destination) =>
-      this.stopsIndex.equivalentStops(destination),
-    );
     // find the first reached destination
     let fastestDestination: StopId | undefined = undefined;
     let fastestTime: Arrival | undefined = undefined;
-    for (const destination of destinations) {
-      const arrivalTime = this.routingState.earliestArrivals.get(
-        destination.id,
-      );
-      if (arrivalTime !== undefined) {
-        if (
-          fastestTime === undefined ||
-          arrivalTime.arrival.isBefore(fastestTime.arrival)
-        ) {
-          fastestDestination = destination.id;
-          fastestTime = arrivalTime;
+    for (const sourceDestination of destinationList) {
+      const equivalentStops =
+        this.stopsIndex.equivalentStops(sourceDestination);
+      for (const destination of equivalentStops) {
+        const arrivalTime = this.routingState.earliestArrivals.get(
+          destination.id,
+        );
+        if (arrivalTime !== undefined) {
+          if (
+            fastestTime === undefined ||
+            arrivalTime.arrival.isBefore(fastestTime.arrival)
+          ) {
+            fastestDestination = destination.id;
+            fastestTime = arrivalTime;
+          }
         }
       }
     }

package/src/stops/__tests__/stopFinder.test.ts

@@ -170,4 +170,13 @@ describe('Stop Finder', () => {
       assert.deepStrictEqual(equivalentStops, []);
     });
   });
+
+  describe('iterator', () => {
+    it('should iterate over all stops', () => {
+      const stops = [...stopFinder];
+      assert.strictEqual(stops.length, 7);
+      assert.strictEqual(stops[0]?.id, 0);
+      assert.strictEqual(stops[6]?.id, 6);
+    });
+  });
 });

package/src/stops/proto/stops.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.10.1
 //   protoc               v4.23.4
 // source: src/stops/proto/stops.proto
 

package/src/stops/stopsIndex.ts

@@ -11,7 +11,7 @@ import { SourceStopId, SourceStopsMap, Stop, StopId } from './stops.js';
 type StopPoint = { id: StopId; lat: number; lon: number };
 
 /**
- * The StopMap class provides functionality to search for public transport stops
+ * The StopsIndex class provides functionality to search for public transport stops
  * by name or geographic location. It leverages text search and geospatial indexing
  * to efficiently find stops based on user queries.
  */
@@ -187,4 +187,15 @@ export class StopsIndex {
       (stopId) => this.stops[stopId] as Stop,
     );
   }
+
+  /**
+   * Makes the StopsIndex iterable, allowing iteration over all stops.
+   *
+   * @returns An iterator for the stops.
+   */
+  *[Symbol.iterator](): Iterator<Stop> {
+    for (const stop of this.stops) {
+      yield stop;
+    }
+  }
 }

package/src/timetable/proto/timetable.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.10.1
 //   protoc               v4.23.4
 // source: src/timetable/proto/timetable.proto