minotor 6.0.0 → 7.0.0

package/CHANGELOG.md

@@ -1,11 +1,11 @@
-# [6.0.0](https://github.com/aubryio/minotor/compare/v5.0.1...v6.0.0) (2025-09-19)
+# [7.0.0](https://github.com/aubryio/minotor/compare/v6.0.0...v7.0.0) (2025-09-19)
 
 
 ### Performance Improvements
 
-* use arrays instead of maps for stops adjacency and service routes ([#25](https://github.com/aubryio/minotor/issues/25)) ([c803b4d](https://github.com/aubryio/minotor/commit/c803b4d60d7a421b889938d88fc6f316ae43de2f))
+* optimize loops on the critical path ([#26](https://github.com/aubryio/minotor/issues/26)) ([8504930](https://github.com/aubryio/minotor/commit/85049308f7bbcf4d88f3dcfb47edd2511e9da80d))
 
 
 ### BREAKING CHANGES
 
-* Stops and timetable binary format was updated and is not compatible with the old ones.
+* Timetable binary format was updated and is not compatible with the old one.

package/dist/cli.mjs

@@ -16079,20 +16079,15 @@ const serializeLocationType = (locationType) => {
  */
 class StopsIndex {
     constructor(stops) {
+        var _a;
         this.stops = stops;
         this.sourceStopsMap = new Map();
-        stops.forEach((stop, id) => {
-            this.sourceStopsMap.set(stop.sourceStopId, id);
-        });
-        this.textIndex = lt({
-            fields: ['name'],
-            storeFields: ['id'],
-            searchOptions: { prefix: true, fuzzy: 0.2 },
-            processTerm: generateAccentVariants,
-        });
         const stopsSet = new Map();
-        stops.forEach((stop, id) => {
-            var _a;
+        this.stopPoints = [];
+        for (let id = 0; id < stops.length; id++) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const stop = stops[id];
+            this.sourceStopsMap.set(stop.sourceStopId, id);
             const effectiveStopId = (_a = stop.parent) !== null && _a !== void 0 ? _a : id;
             if (!stopsSet.has(effectiveStopId)) {
                 stopsSet.set(effectiveStopId, {
@@ -16101,22 +16096,26 @@ class StopsIndex {
                     name: stop.parent ? this.stops[stop.parent].name : stop.name,
                 });
             }
+            if (stop.lat && stop.lon) {
+                this.stopPoints.push({
+                    id: id,
+                    lat: stop.lat,
+                    lon: stop.lon,
+                });
+            }
+        }
+        this.textIndex = lt({
+            fields: ['name'],
+            storeFields: ['id'],
+            searchOptions: { prefix: true, fuzzy: 0.2 },
+            processTerm: generateAccentVariants,
         });
         const stopsArray = Array.from(stopsSet.values());
         q(this.textIndex, stopsArray);
-        this.stopPoints = this.stops
-            .filter((stop) => {
-            if (stop.lat && stop.lon)
-                return true;
-            return false;
-        })
-            .map((stop, id) => ({
-            id: id,
-            lat: stop.lat,
-            lon: stop.lon,
-        }));
         this.geoIndex = new KDBush(this.stopPoints.length);
-        for (const { lat, lon } of this.stopPoints) {
+        for (let i = 0; i < this.stopPoints.length; i++) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const { lat, lon } = this.stopPoints[i];
             this.geoIndex.add(lon, lat);
         }
         this.geoIndex.finish();
@@ -16629,7 +16628,7 @@ const StopAdjacency = {
         }
         writer.uint32(18).fork();
         for (const v of message.routes) {
-            writer.int32(v);
+            writer.uint32(v);
         }
         writer.join();
         return writer;
@@ -16650,13 +16649,13 @@ const StopAdjacency = {
                 }
                 case 2: {
                     if (tag === 16) {
-                        message.routes.push(reader.int32());
+                        message.routes.push(reader.uint32());
                         continue;
                     }
                     if (tag === 18) {
                         const end2 = reader.uint32() + reader.pos;
                         while (reader.pos < end2) {
-                            message.routes.push(reader.int32());
+                            message.routes.push(reader.uint32());
                         }
                         continue;
                     }
@@ -16713,7 +16712,7 @@ const ServiceRoute = {
         }
         writer.uint32(26).fork();
         for (const v of message.routes) {
-            writer.int32(v);
+            writer.uint32(v);
         }
         writer.join();
         return writer;
@@ -16741,13 +16740,13 @@ const ServiceRoute = {
                 }
                 case 3: {
                     if (tag === 24) {
-                        message.routes.push(reader.int32());
+                        message.routes.push(reader.uint32());
                         continue;
                     }
                     if (tag === 26) {
                         const end2 = reader.uint32() + reader.pos;
                         while (reader.pos < end2) {
-                            message.routes.push(reader.int32());
+                            message.routes.push(reader.uint32());
                         }
                         continue;
                     }
@@ -17302,27 +17301,6 @@ let Route$1 = class Route {
             : byte & 0x03; // Lower 2 bits for first pair
         return toPickupDropOffType(dropOffValue);
     }
-    /**
-     * Iterates over the stops in the route, starting from an optional specified stop.
-     * If no start stop is provided, the iteration begins from the first stop in the route.
-     *
-     * @param [startStopId] - (Optional) The StopId of the stop to start the iteration from.
-     * @returns An IterableIterator of StopIds, starting from the specified stop or the first stop.
-     * @throws An error if the specified start stop is not found in the route.
-     */
-    stopsIterator(startStopId) {
-        const startIndex = startStopId !== undefined ? this.stopIndices.get(startStopId) : 0;
-        if (startIndex === undefined) {
-            throw new Error(`Start stop ${startStopId} not found in route ${this.serviceRouteId}`);
-        }
-        function* generator(stops, startIndex) {
-            for (let i = startIndex; i < stops.length; i++) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                yield stops[i];
-            }
-        }
-        return generator(this.stops, startIndex);
-    }
     /**
      * Finds the earliest trip that can be taken from a specific stop on a given route,
      * optionally constrained by a latest trip index and a time before which the trip
@@ -17472,31 +17450,48 @@ const serializeServiceRoutesMap = (serviceRoutes) => {
     });
 };
 const deserializeStopsAdjacency = (protoStopsAdjacency) => {
-    return protoStopsAdjacency.map((value) => {
-        return {
-            transfers: value.transfers.map((transfer) => (Object.assign({ destination: transfer.destination, type: parseTransferType(transfer.type) }, (transfer.minTransferTime !== undefined && {
+    const result = [];
+    for (let i = 0; i < protoStopsAdjacency.length; i++) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const value = protoStopsAdjacency[i];
+        const transfers = [];
+        for (let j = 0; j < value.transfers.length; j++) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const transfer = value.transfers[j];
+            const newTransfer = Object.assign({ destination: transfer.destination, type: parseTransferType(transfer.type) }, (transfer.minTransferTime !== undefined && {
                 minTransferTime: Duration.fromSeconds(transfer.minTransferTime),
-            })))),
+            }));
+            transfers.push(newTransfer);
+        }
+        result.push({
+            transfers: transfers,
             routes: value.routes,
-        };
-    });
+        });
+    }
+    return result;
 };
 const deserializeRoutesAdjacency = (protoRoutesAdjacency) => {
     const routesAdjacency = [];
-    protoRoutesAdjacency.forEach((value) => {
+    for (let i = 0; i < protoRoutesAdjacency.length; i++) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const value = protoRoutesAdjacency[i];
         const stops = bytesToUint32Array(value.stops);
         routesAdjacency.push(new Route$1(bytesToUint16Array(value.stopTimes), value.pickUpDropOffTypes, stops, value.serviceRouteId));
-    });
+    }
     return routesAdjacency;
 };
 const deserializeServiceRoutesMap = (protoServiceRoutes) => {
-    return protoServiceRoutes.map((value) => {
-        return {
+    const result = [];
+    for (let i = 0; i < protoServiceRoutes.length; i++) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const value = protoServiceRoutes[i];
+        result.push({
             type: parseRouteType(value.type),
             name: value.name,
             routes: value.routes,
-        };
-    });
+        });
+    }
+    return result;
 };
 const parseTransferType = (type) => {
     switch (type) {
@@ -17588,7 +17583,7 @@ const ALL_TRANSPORT_MODES = new Set([
     'TROLLEYBUS',
     'MONORAIL',
 ]);
-const CURRENT_VERSION = '0.0.6';
+const CURRENT_VERSION = '0.0.7';
 /**
  * The internal transit timetable format.
  */
@@ -17696,7 +17691,8 @@ class Timetable {
             return [];
         }
         const routes = [];
-        for (const routeId of stopData.routes) {
+        for (let i = 0; i < stopData.routes.length; i++) {
+            const routeId = stopData.routes[i];
             const route = this.routesAdjacency[routeId];
             if (route) {
                 routes.push(route);
@@ -17715,12 +17711,15 @@ class Timetable {
      */
     findReachableRoutes(fromStops, transportModes = ALL_TRANSPORT_MODES) {
         const reachableRoutes = new Map();
-        for (const originStop of fromStops) {
+        const fromStopsArray = Array.from(fromStops);
+        for (let i = 0; i < fromStopsArray.length; i++) {
+            const originStop = fromStopsArray[i];
             const validRoutes = this.routesPassingThrough(originStop).filter((route) => {
                 const serviceRoute = this.getServiceRouteInfo(route);
                 return transportModes.has(serviceRoute.type);
             });
-            for (const route of validRoutes) {
+            for (let j = 0; j < validRoutes.length; j++) {
+                const route = validRoutes[j];
                 const hopOnStop = reachableRoutes.get(route);
                 if (hopOnStop) {
                     if (route.isBefore(originStop, hopOnStop)) {
@@ -20135,8 +20134,12 @@ const buildStopsAdjacencyStructure = (serviceRoutes, routes, transfersMap, nbSto
     for (let i = 0; i < nbStops; i++) {
         stopsAdjacency[i] = { routes: [], transfers: [] };
     }
-    routes.forEach((route, index) => {
-        for (const stop of route.stopsIterator()) {
+    for (let index = 0; index < routes.length; index++) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const route = routes[index];
+        for (let j = 0; j < route.getNbStops(); j++) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const stop = route.stops[j];
             if (activeStops.has(stop)) {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 stopsAdjacency[stop].routes.push(index);
@@ -20147,9 +20150,11 @@ const buildStopsAdjacencyStructure = (serviceRoutes, routes, transfersMap, nbSto
             throw new Error(`Service route ${route.serviceRoute()} not found for route ${index}.`);
         }
         serviceRoute.routes.push(index);
-    });
+    }
     for (const [stop, transfers] of transfersMap) {
-        for (const transfer of transfers) {
+        for (let i = 0; i < transfers.length; i++) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const transfer = transfers[i];
             if (activeStops.has(stop) || activeStops.has(transfer.destination)) {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 stopsAdjacency[stop].transfers.push(transfer);
@@ -20815,7 +20820,9 @@ class Router {
         var _a, _b;
         const { options } = query;
         const newlyMarkedStops = new Set();
-        for (const stop of markedStops) {
+        const markedStopsArray = Array.from(markedStops);
+        for (let i = 0; i < markedStopsArray.length; i++) {
+            const stop = markedStopsArray[i];
             const currentArrival = arrivalsAtCurrentRound.get(stop);
             if (!currentArrival)
                 continue;
@@ -20824,7 +20831,9 @@ class Router {
             if (previousLeg && !('route' in previousLeg)) {
                 continue;
             }
-            for (const transfer of this.timetable.getTransfers(stop)) {
+            const transfers = this.timetable.getTransfers(stop);
+            for (let j = 0; j < transfers.length; j++) {
+                const transfer = transfers[j];
                 let transferTime;
                 if (transfer.minTransferTime) {
                     transferTime = transfer.minTransferTime;
@@ -20859,7 +20868,9 @@ class Router {
                 }
             }
         }
-        for (const newStop of newlyMarkedStops) {
+        const newlyMarkedStopsArray = Array.from(newlyMarkedStops);
+        for (let i = 0; i < newlyMarkedStopsArray.length; i++) {
+            const newStop = newlyMarkedStopsArray[i];
             markedStops.add(newStop);
         }
     }
@@ -20873,7 +20884,8 @@ class Router {
     earliestArrivalAtAnyStop(earliestArrivals, destinations) {
         var _a, _b;
         let earliestArrivalAtAnyDestination = UNREACHED;
-        for (const destination of destinations) {
+        for (let i = 0; i < destinations.length; i++) {
+            const destination = destinations[i];
             const arrival = (_b = (_a = earliestArrivals.get(destination.id)) === null || _a === void 0 ? void 0 : _a.arrival) !== null && _b !== void 0 ? _b : UNREACHED;
             earliestArrivalAtAnyDestination = Time.min(earliestArrivalAtAnyDestination, arrival);
         }
@@ -20897,7 +20909,8 @@ class Router {
         const earliestArrivalsPerRound = [earliestArrivalsWithoutAnyLeg];
         // Stops that have been improved at round k-1
         const markedStops = new Set();
-        for (const originStop of origins) {
+        for (let i = 0; i < origins.length; i++) {
+            const originStop = origins[i];
             markedStops.add(originStop.id);
             earliestArrivals.set(originStop.id, {
                 arrival: departureTime,
@@ -20921,9 +20934,13 @@ class Router {
             const reachableRoutes = this.timetable.findReachableRoutes(markedStops, options.transportModes);
             markedStops.clear();
             // for each route that can be reached with at least round - 1 trips
-            for (const [route, hopOnStop] of reachableRoutes.entries()) {
+            const reachableRoutesArray = Array.from(reachableRoutes.entries());
+            for (let i = 0; i < reachableRoutesArray.length; i++) {
+                const [route, hopOnStop] = reachableRoutesArray[i];
                 let currentTrip = undefined;
-                for (const currentStop of route.stopsIterator(hopOnStop)) {
+                const startIndex = route.stopIndex(hopOnStop);
+                for (let j = startIndex; j < route.getNbStops(); j++) {
+                    const currentStop = route.stops[j];
                     // If we're currently on a trip,
                     // check if arrival at the stop improves the earliest arrival time
                     if (currentTrip !== undefined) {