gtfs-to-html 2.10.17 → 2.11.1

package/dist/bin/gtfs-to-html.js

@@ -23,14 +23,16 @@ import {
   readFile,
   rm
 } from "fs/promises";
+import { homedir } from "os";
+import { findPackageJSON } from "module";
 import * as _ from "lodash-es";
+import { uniqBy as uniqBy2 } from "lodash-es";
 import archiver from "archiver";
 import beautify from "js-beautify";
 import sanitizeHtml from "sanitize-html";
 import { renderFile } from "pug";
 import puppeteer from "puppeteer";
 import sanitize from "sanitize-filename";
-import untildify from "untildify";
 import { marked } from "marked";
 
 // src/lib/formatters.ts
@@ -59,16 +61,7 @@ function fromGTFSTime(timeString) {
 function toGTFSTime(time) {
   return time.format("HH:mm:ss");
 }
-function fromGTFSDate(gtfsDate) {
-  return moment(gtfsDate, "YYYYMMDD");
-}
-function toGTFSDate(date) {
-  return moment(date).format("YYYYMMDD");
-}
 function calendarToCalendarCode(c) {
-  if (c.service_id) {
-    return c.service_id;
-  }
   return `${c.monday}${c.tuesday}${c.wednesday}${c.thursday}${c.friday}${c.saturday}${c.sunday}`;
 }
 function calendarCodeToCalendar(code) {
@@ -109,13 +102,13 @@ import {
   find,
   findLast,
   first,
-  flatMap as flatMap2,
-  flattenDeep,
+  flatMap,
   flow,
   groupBy,
   head,
   last,
   maxBy,
+  orderBy,
   partialRight,
   reduce,
   size,
@@ -149,7 +142,6 @@ import toposort from "toposort";
 
 // src/lib/geojson-utils.ts
 import { getShapesAsGeoJSON, getStopsAsGeoJSON } from "gtfs";
-import { flatMap } from "lodash-es";
 import simplify from "@turf/simplify";
 import { featureCollection, round } from "@turf/helpers";
 
@@ -311,7 +303,7 @@ function progressBar(formatString, barTotal, config) {
 }
 
 // src/lib/geojson-utils.ts
-var mergeGeojson = (...geojsons) => featureCollection(flatMap(geojsons, (geojson) => geojson.features));
+var mergeGeojson = (...geojsons) => featureCollection(geojsons.flatMap((geojson) => geojson.features));
 var truncateGeoJSONDecimals = (geojson, config) => {
   for (const feature of geojson.features) {
     if (feature.geometry.coordinates) {
@@ -502,7 +494,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.10.17",
+  version: "2.11.1",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -555,24 +547,22 @@ var package_default = {
     "cli-table": "^0.3.11",
     "csv-stringify": "^6.6.0",
     express: "^5.1.0",
-    gtfs: "^4.17.7",
+    gtfs: "^4.18.0",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    marked: "^16.1.2",
+    marked: "^16.3.0",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.16.2",
+    puppeteer: "^24.21.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
-    "timer-machine": "^1.1.0",
     toposort: "^2.0.2",
-    untildify: "^5.0.0",
     yargs: "^18.0.0",
-    yoctocolors: "^2.1.1"
+    yoctocolors: "^2.1.2"
   },
   devDependencies: {
     "@types/archiver": "^6.0.3",
@@ -584,16 +574,17 @@ var package_default = {
     "@types/node": "^22",
     "@types/pug": "^2.0.10",
     "@types/sanitize-html": "^2.16.0",
-    "@types/timer-machine": "^1.1.3",
+    "@types/sqlstring": "^2.3.2",
+    "@types/toposort": "^2.0.7",
     "@types/yargs": "^17.0.33",
     husky: "^9.1.7",
-    "lint-staged": "^16.1.5",
+    "lint-staged": "^16.1.6",
     prettier: "^3.6.2",
     tsup: "^8.5.0",
     typescript: "^5.9.2"
   },
   engines: {
-    node: ">= 20.11.0"
+    node: ">= 22"
   },
   "release-it": {
     github: {
@@ -643,7 +634,7 @@ var findCommonStopId = (trips, config) => {
     return null;
   }
   const commonStoptime = longestTripStoptimes.find((stoptime, idx) => {
-    if (idx === 0 && stoptime.stop_id === last(longestTripStoptimes).stop_id) {
+    if (idx === 0 && stoptime.stop_id === last(longestTripStoptimes)?.stop_id) {
       return false;
     }
     if (isNullOrEmpty(stoptime.arrival_time)) {
@@ -696,11 +687,7 @@ var sortTrips = (trips, config) => {
         trip.stoptimes[trip.stoptimes.length - 1].departure_time
       );
     }
-    sortedTrips = sortBy(
-      trips,
-      ["firstStoptime", "lastStoptime"],
-      ["asc", "asc"]
-    );
+    sortedTrips = sortBy(trips, ["firstStoptime", "lastStoptime"]);
   } else if (config.sortingAlgorithm === "end") {
     for (const trip of trips) {
       if (trip.stoptimes.length === 0) {
@@ -711,11 +698,7 @@ var sortTrips = (trips, config) => {
         trip.stoptimes[trip.stoptimes.length - 1].departure_time
       );
     }
-    sortedTrips = sortBy(
-      trips,
-      ["lastStoptime", "firstStoptime"],
-      ["asc", "asc"]
-    );
+    sortedTrips = sortBy(trips, ["lastStoptime", "firstStoptime"]);
   } else if (config.sortingAlgorithm === "first") {
     const longestTripStoptimes = getLongestTripStoptimes(trips, config);
     const firstStopId = first(longestTripStoptimes).stop_id;
@@ -742,8 +725,8 @@ var getCalendarDatesForTimetable = (timetable, config) => {
     [],
     [["date", "ASC"]]
   );
-  const start = fromGTFSDate(timetable.start_date);
-  const end = fromGTFSDate(timetable.end_date);
+  const start = moment2(timetable.start_date, "YYYYMMDD");
+  const end = moment2(timetable.end_date, "YYYYMMDD");
   const excludedDates = /* @__PURE__ */ new Set();
   const includedDates = /* @__PURE__ */ new Set();
   for (const calendarDate of calendarDates) {
@@ -868,28 +851,70 @@ var getTimetableNotesForTimetable = (timetable, config) => {
   }));
   return sortBy(formattedNotes, "symbol");
 };
-var convertTimetableToTimetablePage = (timetable, config) => {
-  if (!timetable.routes) {
-    timetable.routes = getRoutes({
-      route_id: timetable.route_ids
-    });
-  }
-  const filename = generateFileName(timetable, config, "html");
+var createTimetablePage = ({
+  timetablePageId,
+  timetables,
+  config
+}) => {
+  const updatedTimetables = timetables.map((timetable) => {
+    if (!timetable.routes) {
+      timetable.routes = getRoutes({
+        route_id: timetable.route_ids
+      });
+    }
+    return timetable;
+  });
+  const timetablePage = {
+    timetable_page_id: timetablePageId,
+    timetables: updatedTimetables,
+    routes: updatedTimetables.flatMap((timetable) => timetable.routes)
+  };
+  const filename = generateTimetablePageFileName(timetablePage, config);
   return {
-    timetable_page_id: timetable.timetable_id,
-    timetable_page_label: timetable.timetable_label,
-    timetables: [timetable],
+    ...timetablePage,
     filename
   };
 };
-var convertRouteToTimetablePage = (route, direction, calendars, calendarDates, config) => {
-  const timetable = {
+var createTimetable = ({
+  route,
+  directionId,
+  tripHeadsign,
+  calendars,
+  calendarDates
+}) => {
+  const serviceIds = uniq([
+    ...calendars?.map((calendar) => calendar.service_id) ?? [],
+    ...calendarDates?.map((calendarDate) => calendarDate.service_id) ?? []
+  ]);
+  const days2 = {};
+  let startDate = null;
+  let endDate = null;
+  if (calendars && calendars.length > 0) {
+    Object.assign(days2, getDaysFromCalendars(calendars));
+    startDate = parseInt(
+      moment2.min(
+        calendars.map((calendar) => moment2(calendar.start_date, "YYYYMMDD"))
+      ).format("YYYYMMDD"),
+      10
+    );
+    endDate = parseInt(
+      moment2.max(calendars.map((calendar) => moment2(calendar.end_date, "YYYYMMDD"))).format("YYYYMMDD"),
+      10
+    );
+  }
+  const timetableId = formatTimetableId({
+    routeIds: [route.route_id],
+    directionId,
+    days: days2
+  });
+  return {
+    timetable_id: timetableId,
     route_ids: [route.route_id],
-    direction_id: direction ? direction.direction_id : void 0,
-    direction_name: direction ? direction.trip_headsign : void 0,
+    direction_id: directionId === null ? null : directionId,
+    direction_name: tripHeadsign === null ? null : tripHeadsign,
     routes: [route],
     include_exceptions: calendarDates && calendarDates.length > 0 ? 1 : 0,
-    service_id: calendarDates && calendarDates.length > 0 ? calendarDates[0].service_id : null,
+    service_ids: serviceIds,
     service_notes: null,
     timetable_label: null,
     start_time: null,
@@ -897,88 +922,83 @@ var convertRouteToTimetablePage = (route, direction, calendars, calendarDates, c
     orientation: null,
     timetable_sequence: null,
     show_trip_continuation: null,
-    start_date: null,
-    end_date: null
+    start_date: startDate,
+    end_date: endDate,
+    ...days2
   };
-  if (calendars && calendars.length > 0) {
-    Object.assign(timetable, getDaysFromCalendars(calendars));
-    timetable.start_date = toGTFSDate(
-      moment2.min(
-        calendars.map((calendar) => fromGTFSDate(calendar.start_date))
-      )
-    );
-    timetable.end_date = toGTFSDate(
-      moment2.max(calendars.map((calendar) => fromGTFSDate(calendar.end_date)))
-    );
-  }
-  timetable.timetable_id = formatTimetableId(timetable);
-  return convertTimetableToTimetablePage(timetable, config);
 };
 var convertRoutesToTimetablePages = (config) => {
-  const db = openDb(config);
   const routes = getRoutes();
-  let whereClause = "";
-  const whereClauses = [];
-  if (config.endDate) {
-    whereClauses.push(
-      `start_date <= ${sqlString.escape(toGTFSDate(moment2(config.endDate)))}`
-    );
-  }
-  if (config.startDate) {
-    whereClauses.push(
-      `end_date >= ${sqlString.escape(toGTFSDate(moment2(config.startDate)))}`
-    );
-  }
-  if (whereClauses.length > 0) {
-    whereClause = `WHERE ${whereClauses.join(" AND ")}`;
-  }
-  const calendars = db.prepare(`SELECT * FROM calendar ${whereClause}`).all();
-  const serviceIds = calendars.map((calendar) => calendar.service_id);
-  const calendarDates = db.prepare(
-    `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map((serviceId) => `'${serviceId}'`).join(", ")})`
-  ).all();
-  const timetablePages = routes.map((route) => {
+  const timetablePages = [];
+  const { calendars, calendarDates } = getCalendarsFromConfig(config);
+  for (const route of routes) {
     const trips = getTrips(
       {
         route_id: route.route_id
       },
       ["trip_headsign", "direction_id", "trip_id", "service_id"]
     );
-    const directions = uniqBy(trips, (trip) => trip.direction_id);
-    const dayGroups = groupBy(calendars, calendarToCalendarCode);
+    const uniqueTripDirections = orderBy(
+      uniqBy(trips, (trip) => trip.direction_id),
+      "direction_id"
+    );
+    const sortedCalendars = orderBy(calendars, calendarToCalendarCode, "desc");
+    const calendarGroups = groupBy(sortedCalendars, calendarToCalendarCode);
     const calendarDateGroups = groupBy(calendarDates, "service_id");
-    return directions.map((direction) => [
-      Object.values(dayGroups).map((calendars2) => {
+    const timetables = [];
+    for (const uniqueTripDirection of uniqueTripDirections) {
+      for (const calendars2 of Object.values(calendarGroups)) {
         const tripsForCalendars = trips.filter(
           (trip) => some(calendars2, { service_id: trip.service_id })
         );
         if (tripsForCalendars.length > 0) {
-          return convertRouteToTimetablePage(
-            route,
-            direction,
-            calendars2,
-            null,
-            config
+          timetables.push(
+            createTimetable({
+              route,
+              directionId: uniqueTripDirection.direction_id,
+              tripHeadsign: uniqueTripDirection.trip_headsign,
+              calendars: calendars2
+            })
           );
         }
-      }),
-      Object.values(calendarDateGroups).map((calendarDates2) => {
+      }
+      for (const calendarDates2 of Object.values(calendarDateGroups)) {
         const tripsForCalendarDates = trips.filter(
           (trip) => some(calendarDates2, { service_id: trip.service_id })
         );
         if (tripsForCalendarDates.length > 0) {
-          return convertRouteToTimetablePage(
-            route,
-            direction,
-            null,
-            calendarDates2,
-            config
+          timetables.push(
+            createTimetable({
+              route,
+              directionId: uniqueTripDirection.direction_id,
+              tripHeadsign: uniqueTripDirection.trip_headsign,
+              calendarDates: calendarDates2
+            })
           );
         }
-      })
-    ]);
-  });
-  return compact(flattenDeep(timetablePages));
+      }
+    }
+    if (config.groupTimetablesIntoPages === true) {
+      timetablePages.push(
+        createTimetablePage({
+          timetablePageId: `route_${route.route_short_name ?? route.route_long_name}`,
+          timetables,
+          config
+        })
+      );
+    } else {
+      for (const timetable of timetables) {
+        timetablePages.push(
+          createTimetablePage({
+            timetablePageId: timetable.timetable_id,
+            timetables: [timetable],
+            config
+          })
+        );
+      }
+    }
+  }
+  return timetablePages;
 };
 var generateTripsByFrequencies = (trip, frequencies, config) => {
   const formattedFrequencies = frequencies.map(
@@ -1001,7 +1021,7 @@ var generateTripsByFrequencies = (trip, frequencies, config) => {
   return trips;
 };
 var duplicateStopsForDifferentArrivalDeparture = (stopIds, timetable, config) => {
-  if (config.showArrivalOnDifference === null) {
+  if (config.showArrivalOnDifference === null || config.showArrivalOnDifference === void 0) {
     return stopIds;
   }
   for (const trip of timetable.orderedTrips) {
@@ -1123,7 +1143,7 @@ var getStopsForTimetable = (timetable, config) => {
     }
     return stop;
   });
-  if (timetable.showStopCity) {
+  if (config.showStopCity) {
     const stopAttributes = getStopAttributes({
       stop_id: orderedStopIds
     });
@@ -1138,6 +1158,39 @@ var getStopsForTimetable = (timetable, config) => {
   }
   return orderedStops;
 };
+var getCalendarsFromConfig = (config) => {
+  const db = openDb();
+  let whereClause = "";
+  const whereClauses = [];
+  if (config.endDate) {
+    if (!moment2(config.endDate).isValid()) {
+      throw new Error(`Invalid endDate=${config.endDate} in config.json`);
+    }
+    whereClauses.push(
+      `start_date <= ${sqlString.escape(moment2(config.endDate).format("YYYYMMDD"))}`
+    );
+  }
+  if (config.startDate) {
+    if (!moment2(config.startDate).isValid()) {
+      throw new Error(`Invalid startDate=${config.startDate} in config.json`);
+    }
+    whereClauses.push(
+      `end_date >= ${sqlString.escape(moment2(config.startDate).format("YYYYMMDD"))}`
+    );
+  }
+  if (whereClauses.length > 0) {
+    whereClause = `WHERE ${whereClauses.join(" AND ")}`;
+  }
+  const calendars = db.prepare(`SELECT * FROM calendar ${whereClause}`).all();
+  const serviceIds = calendars.map((calendar) => calendar.service_id);
+  const calendarDates = db.prepare(
+    `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map((serviceId) => `'${serviceId}'`).join(", ")})`
+  ).all();
+  return {
+    calendars,
+    calendarDates
+  };
+};
 var getCalendarsFromTimetable = (timetable) => {
   const db = openDb();
   let whereClause = "";
@@ -1287,13 +1340,17 @@ var filterTrips = (timetable) => {
     }
     trip.stoptimes = combinedStoptimes;
   }
-  const timetableStopIds = new Set(timetable.stops.map((stop) => stop.stop_id));
+  const timetableStopIds = new Set(
+    timetable.stops.map((stop) => stop.stop_id)
+  );
   for (const trip of filteredTrips) {
     trip.stoptimes = trip.stoptimes.filter(
       (stoptime) => timetableStopIds.has(stoptime.stop_id)
     );
   }
-  filteredTrips = filteredTrips.filter((trip) => trip.stoptimes.length > 1);
+  filteredTrips = filteredTrips.filter(
+    (trip) => trip.stoptimes.length > 1
+  );
   return filteredTrips;
 };
 var getTripsForTimetable = (timetable, calendars, config) => {
@@ -1444,6 +1501,15 @@ var formatTimetables = (timetables, config) => {
 };
 function getTimetablePagesForAgency(config) {
   const timetables = mergeTimetablesWithSameId(getTimetables());
+  const routes = getRoutes();
+  const formattedTimetables = timetables.map((timetable) => {
+    return {
+      ...timetable,
+      routes: routes.filter(
+        (route) => timetable.route_ids.includes(route.route_id)
+      )
+    };
+  });
   if (timetables.length === 0) {
     return convertRoutesToTimetablePages(config);
   }
@@ -1453,68 +1519,33 @@ function getTimetablePagesForAgency(config) {
     [["timetable_page_id", "ASC"]]
   );
   if (timetablePages.length === 0) {
-    return timetables.map(
-      (timetable) => convertTimetableToTimetablePage(timetable, config)
+    return formattedTimetables.map(
+      (timetable) => createTimetablePage({
+        timetablePageId: timetable.timetable_id,
+        timetables: [timetable],
+        config
+      })
     );
   }
-  const routes = getRoutes();
   return timetablePages.map((timetablePage) => {
-    timetablePage.timetables = sortBy(
-      timetables.filter(
-        (timetable) => timetable.timetable_page_id === timetablePage.timetable_page_id
-      ),
-      "timetable_sequence"
-    );
-    for (const timetable of timetablePage.timetables) {
-      timetable.routes = routes.filter(
-        (route) => timetable.route_ids.includes(route.route_id)
-      );
-    }
-    return timetablePage;
+    return {
+      ...timetablePage,
+      timetables: sortBy(
+        formattedTimetables.filter(
+          (timetable) => timetable.timetable_page_id === timetablePage.timetable_page_id
+        ),
+        "timetable_sequence"
+      )
+    };
   });
 }
-var getTimetablePageById = (timetablePageId, config) => {
-  const timetablePages = getTimetablePages({
-    timetable_page_id: timetablePageId
-  });
-  const timetables = mergeTimetablesWithSameId(getTimetables());
-  if (timetablePages.length > 1) {
-    throw new Error(
-      `Multiple timetable_pages found for timetable_page_id=${timetablePageId}`
-    );
-  }
-  if (timetablePages.length === 1) {
-    const timetablePage = timetablePages[0];
-    timetablePage.timetables = sortBy(
-      timetables.filter(
-        (timetable) => timetable.timetable_page_id === timetablePageId
-      ),
-      "timetable_sequence"
-    );
-    for (const timetable of timetablePage.timetables) {
-      timetable.routes = getRoutes({
-        route_id: timetable.route_ids
-      });
-    }
-    return timetablePage;
-  }
-  if (timetables.length > 0) {
-    const timetablePageTimetables = timetables.filter(
-      (timetable) => timetable.timetable_id === timetablePageId
-    );
-    if (timetablePageTimetables.length === 0) {
-      throw new Error(
-        `No timetable found for timetable_page_id=${timetablePageId}`
-      );
-    }
-    return convertTimetableToTimetablePage(timetablePageTimetables[0], config);
-  }
+var getDataForTimetablePageById = (timetablePageId) => {
   let calendarCode;
   let calendars;
   let calendarDates;
   let serviceId;
   let directionId = "";
-  const parts = timetablePageId.split("|");
+  const parts = timetablePageId?.split("|") ?? [];
   if (parts.length > 2) {
     directionId = Number.parseInt(parts.pop(), 10);
     calendarCode = parts.pop();
@@ -1533,13 +1564,13 @@ var getTimetablePageById = (timetablePageId, config) => {
     },
     ["trip_headsign", "direction_id"]
   );
-  const directions = uniqBy(trips, (trip) => trip.direction_id);
-  if (directions.length === 0) {
+  const uniqueTripDirections = uniqBy(trips, (trip) => trip.direction_id);
+  if (uniqueTripDirections.length === 0) {
     throw new Error(
       `No trips found for timetable_page_id=${timetablePageId} route_id=${routeId} direction_id=${directionId}`
     );
   }
-  if (/^[01]*$/.test(calendarCode)) {
+  if (/^[01]*$/.test(calendarCode ?? "")) {
     calendars = getCalendars({
       ...calendarCodeToCalendar(calendarCode)
     });
@@ -1550,13 +1581,129 @@ var getTimetablePageById = (timetablePageId, config) => {
       service_id: serviceId
     });
   }
-  return convertRouteToTimetablePage(
-    routes[0],
-    directions[0],
+  return {
     calendars,
     calendarDates,
+    route: routes[0],
+    directionId: uniqueTripDirections[0].direction_id,
+    tripHeadsign: uniqueTripDirections[0].trip_headsign
+  };
+};
+var getTimetablePageById = (timetablePageId, config) => {
+  const timetablePages = getTimetablePages({
+    timetable_page_id: timetablePageId
+  });
+  const timetables = mergeTimetablesWithSameId(getTimetables());
+  if (timetablePages.length > 1) {
+    throw new Error(
+      `Multiple timetable_pages found for timetable_page_id=${timetablePageId}`
+    );
+  }
+  if (timetablePages.length === 1) {
+    const timetablePage = timetablePages[0];
+    timetablePage.timetables = sortBy(
+      timetables.filter(
+        (timetable2) => timetable2.timetable_page_id === timetablePageId
+      ),
+      "timetable_sequence"
+    );
+    for (const timetable2 of timetablePage.timetables) {
+      timetable2.routes = getRoutes({
+        route_id: timetable2.route_ids
+      });
+    }
+    return timetablePage;
+  }
+  if (timetables.length > 0) {
+    const timetablePageTimetables = timetables.filter(
+      (timetable2) => timetable2.timetable_id === timetablePageId
+    );
+    if (timetablePageTimetables.length === 0) {
+      throw new Error(
+        `No timetable found for timetable_page_id=${timetablePageId}`
+      );
+    }
+    return createTimetablePage({
+      timetablePageId,
+      timetables: [timetablePageTimetables[0]],
+      config
+    });
+  }
+  if (timetablePageId.startsWith("route_")) {
+    const routes = getRoutes({
+      route_short_name: timetablePageId.split("_")[1]
+    });
+    if (routes.length === 0) {
+      throw new Error(
+        `No route found for timetable_page_id=${timetablePageId}`
+      );
+    }
+    const { calendars: calendars2, calendarDates: calendarDates2 } = getCalendarsFromConfig(config);
+    const trips = getTrips(
+      {
+        route_id: routes[0].route_id
+      },
+      ["trip_headsign", "direction_id", "trip_id", "service_id"]
+    );
+    const uniqueTripDirections = orderBy(
+      uniqBy(trips, (trip) => trip.direction_id),
+      "direction_id"
+    );
+    const sortedCalendars = orderBy(calendars2, calendarToCalendarCode, "desc");
+    const calendarGroups = groupBy(sortedCalendars, calendarToCalendarCode);
+    const calendarDateGroups = groupBy(calendarDates2, "service_id");
+    const timetables2 = [];
+    for (const uniqueTripDirection of uniqueTripDirections) {
+      for (const calendars3 of Object.values(calendarGroups)) {
+        const tripsForCalendars = trips.filter(
+          (trip) => some(calendars3, { service_id: trip.service_id })
+        );
+        if (tripsForCalendars.length > 0) {
+          timetables2.push(
+            createTimetable({
+              route: routes[0],
+              directionId: uniqueTripDirection.direction_id,
+              tripHeadsign: uniqueTripDirection.trip_headsign,
+              calendars: calendars3
+            })
+          );
+        }
+      }
+      for (const calendarDates3 of Object.values(calendarDateGroups)) {
+        const tripsForCalendarDates = trips.filter(
+          (trip) => some(calendarDates3, { service_id: trip.service_id })
+        );
+        if (tripsForCalendarDates.length > 0) {
+          timetables2.push(
+            createTimetable({
+              route: routes[0],
+              directionId: uniqueTripDirection.direction_id,
+              tripHeadsign: uniqueTripDirection.trip_headsign,
+              calendarDates: calendarDates3
+            })
+          );
+        }
+      }
+    }
+    return createTimetablePage({
+      timetablePageId,
+      timetables: timetables2,
+      config
+    });
+  }
+  const { calendars, calendarDates, route, directionId, tripHeadsign } = getDataForTimetablePageById(timetablePageId);
+  const timetable = createTimetable({
+    route,
+    directionId,
+    tripHeadsign,
+    calendars,
+    calendarDates
+  });
+  return createTimetablePage({
+    timetablePageId,
+    timetables: [timetable],
     config
-  );
+  });
 };
 function setDefaultConfig(initialConfig) {
   const defaults = {
@@ -1577,6 +1724,7 @@ function setDefaultConfig(initialConfig) {
     defaultOrientation: "vertical",
     interpolatedStopSymbol: "\u2022",
     interpolatedStopText: "Estimated time of arrival",
+    groupTimetablesIntoPages: true,
     gtfsToHtmlVersion: version,
     linkStopUrls: false,
     mapStyleUrl: "https://tiles.openfreemap.org/styles/positron",
@@ -1633,12 +1781,6 @@ function getFormattedTimetablePage(timetablePageId, config) {
     timetablePageId,
     config
   );
-  const timetableRoutes = getRoutes(
-    {
-      route_id: timetablePage.route_ids
-    },
-    ["agency_id"]
-  );
   const consolidatedTimetables = formatTimetables(
     timetablePage.timetables,
     config
@@ -1654,7 +1796,7 @@ function getFormattedTimetablePage(timetablePageId, config) {
     }
   }
   const uniqueRoutes = uniqBy(
-    flatMap2(consolidatedTimetables, (timetable) => timetable.routes),
+    flatMap(consolidatedTimetables, (timetable) => timetable.routes),
     "route_id"
   );
   const formattedTimetablePage = {
@@ -1665,7 +1807,7 @@ function getFormattedTimetablePage(timetablePageId, config) {
       consolidatedTimetables.map((timetable) => timetable.dayList)
     ),
     route_ids: uniqueRoutes.map((route) => route.route_id),
-    agency_ids: uniq(compact(timetableRoutes.map((route) => route.agency_id))),
+    agency_ids: uniq(compact(uniqueRoutes.map((route) => route.agency_id))),
     filename: timetablePage.filename ?? `${timetablePage.timetable_page_id}.html`,
     timetable_page_label: timetablePage.timetable_page_label ?? formatListForDisplay(uniqueRoutes.map((route) => formatRouteName(route)))
   };
@@ -1923,12 +2065,14 @@ function formatFrequency(frequency, config) {
   frequency.headway_min = Math.round(headway.asMinutes());
   return frequency;
 }
-function formatTimetableId(timetable) {
-  let timetableId = `${timetable.route_ids.join("_")}|${calendarToCalendarCode(
-    timetable
-  )}`;
-  if (!isNullOrEmpty(timetable.direction_id)) {
-    timetableId += `|${timetable.direction_id}`;
+function formatTimetableId({
+  routeIds,
+  directionId,
+  days: days2
+}) {
+  let timetableId = `${routeIds.join("_")}|${calendarToCalendarCode(days2)}`;
+  if (!isNullOrEmpty(directionId)) {
+    timetableId += `|${directionId}`;
   }
   return timetableId;
 }
@@ -2081,10 +2225,18 @@ function formatTimetableLabel(timetable) {
   return timetableLabel;
 }
 var formatRouteName = (route) => {
-  if (route.route_long_name === null || route.route_long_name === "") {
-    return `Route ${route.route_short_name}`;
+  if (route.route_long_name) {
+    return `Route ${route.route_long_name}`;
   }
-  return route.route_long_name ?? "Unknown";
+  return route.route_short_name ?? "Unknown";
+};
+var formatRouteNameForFilename = (route) => {
+  if (route.route_short_name) {
+    return route.route_short_name.replace(/\s/g, "-");
+  } else if (route.route_long_name) {
+    return route.route_long_name.replace(/\s/g, "-");
+  }
+  return "Unknown";
 };
 var formatListForDisplay = (list) => {
   return new Intl.ListFormat("en-US", {
@@ -2107,6 +2259,7 @@ function mergeTimetablesWithSameId(timetables) {
 }
 
 // src/lib/file-utils.ts
+var homeDirectory = homedir();
 async function getConfig(argv2) {
   let data;
   let config;
@@ -2188,18 +2341,32 @@ async function copyStaticAssets(config, outputPath) {
   }
   if (config.hasGtfsRealtimeVehiclePositions || config.hasGtfsRealtimeTripUpdates || config.hasGtfsRealtimeAlerts) {
     await copyFile(
-      "node_modules/pbf/dist/pbf.js",
+      join(
+        dirname(findPackageJSON("pbf", import.meta.url)),
+        "dist/pbf.js"
+      ),
       join(outputPath, "js/pbf.js")
     );
     await copyFile(
-      "node_modules/gtfs-realtime-pbf-js-module/gtfs-realtime.browser.proto.js",
+      join(
+        dirname(
+          findPackageJSON(
+            "gtfs-realtime-pbf-js-module",
+            import.meta.url
+          )
+        ),
+        "gtfs-realtime.browser.proto.js"
+      ),
       join(outputPath, "js/gtfs-realtime.browser.proto.js")
     );
   }
   if (config.hasGtfsRealtimeAlerts) {
     await copyFile(
-      "node_modules/anchorme/dist/browser/anchorme.min.js",
-      join(outputPath, "js//anchorme.min.js")
+      join(
+        dirname(findPackageJSON("anchorme", import.meta.url)),
+        "dist/browser/anchorme.min.js"
+      ),
+      join(outputPath, "js/anchorme.min.js")
     );
   }
 }
@@ -2216,15 +2383,34 @@ function zipFolder(outputPath) {
     archive.finalize();
   });
 }
-function generateFileName(timetable, config, extension = "html") {
-  let filename = timetable.timetable_id;
+function generateTimetablePageFileName(timetablePage, config) {
+  if (timetablePage.filename) {
+    return sanitize(timetablePage.filename);
+  }
+  if (config.groupTimetablesIntoPages === true && uniqBy2(timetablePage.timetables, "route_id").length === 1) {
+    const route = timetablePage.timetables[0].routes[0];
+    return sanitize(`${formatRouteNameForFilename(route).toLowerCase()}.html`);
+  }
+  const timetable = timetablePage.timetables[0];
+  let filename = timetable.timetable_id ?? "";
+  for (const route of timetable.routes) {
+    filename += `_${formatRouteNameForFilename(route)}`;
+  }
+  if (!isNullOrEmpty(timetable.direction_id)) {
+    filename += `_${timetable.direction_id}`;
+  }
+  filename += `_${formatDays(timetable, config).replace(/\s/g, "")}.html`;
+  return sanitize(filename.toLowerCase());
+}
+function generateCSVFileName(timetable, config) {
+  let filename = timetable.timetable_id ?? "";
   for (const route of timetable.routes) {
-    filename += isNullOrEmpty(route.route_short_name) ? `_${route.route_long_name.replace(/\s/g, "-")}` : `_${route.route_short_name.replace(/\s/g, "-")}`;
+    filename += `_${formatRouteNameForFilename(route)}`;
   }
   if (!isNullOrEmpty(timetable.direction_id)) {
     filename += `_${timetable.direction_id}`;
   }
-  filename += `_${formatDays(timetable, config).replace(/\s/g, "")}.${extension}`;
+  filename += `_${formatDays(timetable, config).replace(/\s/g, "")}.csv`;
   return sanitize(filename).toLowerCase();
 }
 function generateFolderName(timetablePage) {
@@ -2264,22 +2450,22 @@ async function renderPdf(htmlPath) {
   });
   await browser.close();
 }
+function untildify(pathWithTilde) {
+  return homeDirectory ? pathWithTilde.replace(/^~(?=$|\/|\\)/, homeDirectory) : pathWithTilde;
+}
 
 // src/lib/gtfs-to-html.ts
 import path from "path";
 import { mkdir as mkdir2, writeFile } from "fs/promises";
 import { openDb as openDb2, importGtfs } from "gtfs";
 import sanitize2 from "sanitize-filename";
-import Timer from "timer-machine";
-import untildify2 from "untildify";
 var gtfsToHtml = async (initialConfig) => {
   const config = setDefaultConfig(initialConfig);
-  const timer = new Timer();
+  const startTime = process.hrtime.bigint();
   const agencyKey = config.agencies.map(
     (agency) => agency.agencyKey ?? agency.agency_key ?? "unknown"
   ).join("-");
-  const outputPath = config.outputPath ? untildify2(config.outputPath) : path.join(process.cwd(), "html", sanitize2(agencyKey));
-  timer.start();
+  const outputPath = config.outputPath ? untildify(config.outputPath) : path.join(process.cwd(), "html", sanitize2(agencyKey));
   await prepDirectory(outputPath, config);
   try {
     openDb2(config);
@@ -2325,9 +2511,11 @@ var gtfsToHtml = async (initialConfig) => {
         config
       );
       for (const timetable of timetablePage.timetables) {
-        for (const warning of timetable.warnings) {
-          stats.warnings.push(warning);
-          bar?.interrupt(warning);
+        if (timetable.warnings) {
+          for (const warning of timetable.warnings) {
+            stats.warnings.push(warning);
+            bar?.interrupt(warning);
+          }
         }
       }
       if (timetablePage.consolidatedTimetables.length === 0) {
@@ -2350,7 +2538,7 @@ var gtfsToHtml = async (initialConfig) => {
           const csvPath = path.join(
             outputPath,
             datePath,
-            generateFileName(timetable, config, "csv")
+            generateCSVFileName(timetable, config)
           );
           await writeFile(csvPath, csv);
         }
@@ -2396,11 +2584,11 @@ var gtfsToHtml = async (initialConfig) => {
     `${agencyKey}: ${config.outputFormat.toUpperCase()} timetables created at ${fullOutputPath}`
   );
   logStats(config)(stats);
-  const seconds = Math.round(timer.time() / 1e3);
+  const endTime = process.hrtime.bigint();
+  const elapsedSeconds = Number(endTime - startTime) / 1e9;
   log(config)(
-    `${agencyKey}: ${config.outputFormat.toUpperCase()} timetable generation required ${seconds} seconds`
+    `${agencyKey}: ${config.outputFormat.toUpperCase()} timetable generation required ${elapsedSeconds.toFixed(1)} seconds`
   );
-  timer.stop();
   return fullOutputPath;
 };
 var gtfs_to_html_default = gtfsToHtml;