gtfs-to-html 2.12.5 → 2.12.7

package/dist/app/index.js

@@ -306,6 +306,30 @@ function formatTripNameForCSV(trip, timetable) {
   return tripName;
 }
 
+// src/lib/errors.ts
+import { GtfsErrorCategory, isGtfsError } from "gtfs";
+var GtfsToHtmlError = class extends Error {
+  code;
+  category;
+  isOperational;
+  details;
+  constructor(message, options) {
+    super(message, { cause: options.cause });
+    this.name = "GtfsToHtmlError";
+    this.code = options.code;
+    this.category = options.category;
+    this.isOperational = options.isOperational ?? true;
+    this.details = options.details;
+  }
+};
+function isGtfsToHtmlError(error) {
+  if (!error || typeof error !== "object") {
+    return false;
+  }
+  const candidate = error;
+  return candidate.name === "GtfsToHtmlError" && typeof candidate.message === "string" && typeof candidate.code === "string" && typeof candidate.category === "string" && typeof candidate.isOperational === "boolean";
+}
+
 // src/lib/file-utils.ts
 var homeDirectory = homedir();
 function getPathToThisModuleFolder() {
@@ -385,7 +409,7 @@ import { featureCollection, round } from "@turf/helpers";
 import { clearLine, cursorTo } from "readline";
 import { noop } from "lodash-es";
 import * as colors from "yoctocolors";
-import { getAgencies, getFeedInfo } from "gtfs";
+import { getAgencies, getFeedInfo, isGtfsError as isGtfsError2, formatGtfsError } from "gtfs";
 import Table from "cli-table";
 function logWarning(config2) {
   if (config2.logFunction) {
@@ -402,6 +426,10 @@ function formatWarning(text) {
   return colors.yellow(warningMessage);
 }
 
+// src/lib/trip-id-utils.ts
+var getBaseTripId = (tripId) => tripId.replace(/_freq_\d+$/, "");
+var getBaseTripIds = (trips) => Array.from(new Set(trips.map((trip) => getBaseTripId(trip.trip_id))));
+
 // src/lib/geojson-utils.ts
 var mergeGeojson = (...geojsons) => featureCollection(geojsons.flatMap((geojson) => geojson.features));
 var truncateGeoJSONDecimals = (geojson, config2) => {
@@ -431,18 +459,19 @@ var truncateGeoJSONDecimals = (geojson, config2) => {
   return geojson;
 };
 function getTimetableGeoJSON(timetable, config2) {
+  const tripIds = getBaseTripIds(timetable.orderedTrips);
   const shapesGeojsons = timetable.route_ids.map(
     (routeId) => getShapesAsGeoJSON({
       route_id: routeId,
       direction_id: timetable.direction_id,
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: tripIds
     })
   );
   const stopsGeojsons = timetable.route_ids.map(
     (routeId) => getStopsAsGeoJSON({
       route_id: routeId,
       direction_id: timetable.direction_id,
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: tripIds
     })
   );
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);
@@ -480,7 +509,7 @@ function getAgencyGeoJSON(config2) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.5",
+  version: "2.12.7",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -537,21 +566,21 @@ var package_default = {
     archiver: "^7.0.1",
     "cli-table": "^0.3.11",
     "css.escape": "^1.5.1",
-    "csv-stringify": "^6.6.0",
+    "csv-stringify": "^6.7.0",
     express: "^5.2.1",
-    gtfs: "^4.18.3",
+    gtfs: "^4.18.5",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
-    "lodash-es": "^4.17.23",
-    "maplibre-gl": "^5.20.1",
-    marked: "^17.0.4",
+    "lodash-es": "^4.18.1",
+    "maplibre-gl": "^5.21.1",
+    marked: "^17.0.5",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.4",
-    puppeteer: "^24.39.1",
-    "sanitize-filename": "^1.6.3",
-    "sanitize-html": "^2.17.1",
+    puppeteer: "^24.40.0",
+    "sanitize-filename": "^1.6.4",
+    "sanitize-html": "^2.17.2",
     sqlstring: "^2.3.3",
     toposort: "^2.0.2",
     yargs: "^18.0.0",
@@ -561,10 +590,8 @@ var package_default = {
     "@types/archiver": "^7.0.0",
     "@types/cli-table": "^0.3.4",
     "@types/express": "^5.0.6",
-    "@types/insane": "^1.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
-    "@types/morgan": "^1.9.10",
     "@types/node": "^25",
     "@types/pug": "^2.0.10",
     "@types/sanitize-html": "^2.16.1",
@@ -575,7 +602,7 @@ var package_default = {
     "lint-staged": "^16.4.0",
     prettier: "^3.8.1",
     tsup: "^8.5.1",
-    typescript: "^5.9.3"
+    typescript: "^6.0.2"
   },
   engines: {
     node: ">= 22"
@@ -805,7 +832,7 @@ var getTimetableNotesForTimetable = (timetable, config2) => {
     }),
     // Get all notes for all trips in this timetable.
     ...getTimetableNotesReferences({
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: getBaseTripIds(timetable.orderedTrips)
     }),
     // Get all notes for all stops in this timetable.
     ...getTimetableNotesReferences({
@@ -999,7 +1026,7 @@ var convertRoutesToTimetablePages = (config2) => {
     if (config2.groupTimetablesIntoPages === true) {
       timetablePages.push(
         createTimetablePage({
-          timetablePageId: `route_${route.route_short_name ?? route.route_long_name}`,
+          timetablePageId: `route_${route.route_id}`,
           timetables,
           config: config2
         })
@@ -1146,8 +1173,17 @@ var getStopsForTimetable = (timetable, config2) => {
       stop_id: stopId
     });
     if (stops.length === 0) {
-      throw new Error(
-        `No stop found found for stop_id=${stopId} in timetable_id=${timetable.timetable_id}`
+      throw new GtfsToHtmlError(
+        `No stop found found for stop_id=${stopId} in timetable_id=${timetable.timetable_id}`,
+        {
+          code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+          category: "query" /* QUERY */,
+          details: {
+            entity: "stop",
+            stopId,
+            timetableId: timetable.timetable_id
+          }
+        }
       );
     }
     const stop = {
@@ -1182,7 +1218,14 @@ var getCalendarsFromConfig = (config2) => {
   const whereClauses = [];
   if (config2.endDate) {
     if (!moment2(config2.endDate).isValid()) {
-      throw new Error(`Invalid endDate=${config2.endDate} in config.json`);
+      throw new GtfsToHtmlError(
+        `Invalid endDate=${config2.endDate} in config.json`,
+        {
+          code: "GTFS_TO_HTML_CONFIG_DATE_INVALID" /* CONFIG_DATE_INVALID */,
+          category: "config" /* CONFIG */,
+          details: { field: "endDate", value: config2.endDate }
+        }
+      );
     }
     whereClauses.push(
       `start_date <= ${sqlString.escape(moment2(config2.endDate).format("YYYYMMDD"))}`
@@ -1190,7 +1233,14 @@ var getCalendarsFromConfig = (config2) => {
   }
   if (config2.startDate) {
     if (!moment2(config2.startDate).isValid()) {
-      throw new Error(`Invalid startDate=${config2.startDate} in config.json`);
+      throw new GtfsToHtmlError(
+        `Invalid startDate=${config2.startDate} in config.json`,
+        {
+          code: "GTFS_TO_HTML_CONFIG_DATE_INVALID" /* CONFIG_DATE_INVALID */,
+          category: "config" /* CONFIG */,
+          details: { field: "startDate", value: config2.startDate }
+        }
+      );
     }
     whereClauses.push(
       `end_date >= ${sqlString.escape(moment2(config2.startDate).format("YYYYMMDD"))}`
@@ -1215,16 +1265,34 @@ var getCalendarsFromTimetable = (timetable) => {
   const whereClauses = [];
   if (timetable.end_date) {
     if (!moment2(timetable.end_date, "YYYYMMDD", true).isValid()) {
-      throw new Error(
-        `Invalid end_date=${timetable.end_date} for timetable_id=${timetable.timetable_id}`
+      throw new GtfsToHtmlError(
+        `Invalid end_date=${timetable.end_date} for timetable_id=${timetable.timetable_id}`,
+        {
+          code: "GTFS_TO_HTML_QUERY_INVALID" /* QUERY_INVALID */,
+          category: "validation" /* VALIDATION */,
+          details: {
+            field: "end_date",
+            value: timetable.end_date,
+            timetableId: timetable.timetable_id
+          }
+        }
       );
     }
     whereClauses.push(`start_date <= ${sqlString.escape(timetable.end_date)}`);
   }
   if (timetable.start_date) {
     if (!moment2(timetable.start_date, "YYYYMMDD", true).isValid()) {
-      throw new Error(
-        `Invalid start_date=${timetable.start_date} for timetable_id=${timetable.timetable_id}`
+      throw new GtfsToHtmlError(
+        `Invalid start_date=${timetable.start_date} for timetable_id=${timetable.timetable_id}`,
+        {
+          code: "GTFS_TO_HTML_QUERY_INVALID" /* QUERY_INVALID */,
+          category: "validation" /* VALIDATION */,
+          details: {
+            field: "start_date",
+            value: timetable.start_date,
+            timetableId: timetable.timetable_id
+          }
+        }
       );
     }
     whereClauses.push(`end_date >= ${sqlString.escape(timetable.start_date)}`);
@@ -1269,7 +1337,11 @@ var getAllStationStopIds = (stopId) => {
     stop_id: stopId
   });
   if (stops.length === 0) {
-    throw new Error(`No stop found for stop_id=${stopId}`);
+    throw new GtfsToHtmlError(`No stop found for stop_id=${stopId}`, {
+      code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+      category: "query" /* QUERY */,
+      details: { entity: "stop", stopId }
+    });
   }
   const stop = stops[0];
   if (isNullOrEmpty(stop.parent_station)) {
@@ -1303,8 +1375,13 @@ var getTripsWithSameBlock = (trip, timetable) => {
       [["stop_sequence", "ASC"]]
     );
     if (stopTimes.length === 0) {
-      throw new Error(
-        `No stoptimes found found for trip_id=${blockTrip.trip_id}`
+      throw new GtfsToHtmlError(
+        `No stoptimes found found for trip_id=${blockTrip.trip_id}`,
+        {
+          code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+          category: "query" /* QUERY */,
+          details: { entity: "stoptime", tripId: blockTrip.trip_id }
+        }
       );
     }
     blockTrip.firstStoptime = first(stopTimes);
@@ -1564,9 +1641,7 @@ var formatTimetables = (timetables, config2) => {
     if (config2.showMap) {
       timetable.geojson = getTimetableGeoJSON(timetable, config2);
     }
-    timetable.trip_ids = uniq(
-      timetable.orderedTrips.map((trip) => trip.trip_id)
-    );
+    timetable.trip_ids = uniq(getBaseTripIds(timetable.orderedTrips));
     timetable.orderedTrips = filterTrips(timetable, calendars, config2);
     timetable.stops = formatStops(timetable, config2);
     return timetable;
@@ -1645,8 +1720,18 @@ var getDataForTimetablePageById = (timetablePageId) => {
   );
   const uniqueTripDirections = uniqBy2(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}`
+    throw new GtfsToHtmlError(
+      `No trips found for timetable_page_id=${timetablePageId} route_id=${routeId} direction_id=${directionId}`,
+      {
+        code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+        category: "query" /* QUERY */,
+        details: {
+          entity: "trip",
+          timetablePageId,
+          routeId,
+          directionId
+        }
+      }
     );
   }
   if (/^[01]*$/.test(calendarCode ?? "")) {
@@ -1676,8 +1761,13 @@ var getTimetablePageById = (timetablePageId, config2) => {
     getTimetables()
   );
   if (timetablePages.length > 1) {
-    throw new Error(
-      `Multiple timetable_pages found for timetable_page_id=${timetablePageId}`
+    throw new GtfsToHtmlError(
+      `Multiple timetable_pages found for timetable_page_id=${timetablePageId}`,
+      {
+        code: "GTFS_TO_HTML_QUERY_RESULT_AMBIGUOUS" /* QUERY_RESULT_AMBIGUOUS */,
+        category: "query" /* QUERY */,
+        details: { entity: "timetable_page", timetablePageId }
+      }
     );
   }
   if (timetablePages.length === 1) {
@@ -1700,8 +1790,13 @@ var getTimetablePageById = (timetablePageId, config2) => {
       (timetable2) => timetable2.timetable_id === timetablePageId
     );
     if (timetablePageTimetables.length === 0) {
-      throw new Error(
-        `No timetable found for timetable_page_id=${timetablePageId}`
+      throw new GtfsToHtmlError(
+        `No timetable found for timetable_page_id=${timetablePageId}`,
+        {
+          code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+          category: "query" /* QUERY */,
+          details: { entity: "timetable", timetablePageId }
+        }
       );
     }
     return createTimetablePage({
@@ -1712,11 +1807,16 @@ var getTimetablePageById = (timetablePageId, config2) => {
   }
   if (timetablePageId.startsWith("route_")) {
     const routes = getRoutes({
-      route_short_name: timetablePageId.split("_")[1]
+      route_id: timetablePageId.split("_")[1]
     });
     if (routes.length === 0) {
-      throw new Error(
-        `No route found for timetable_page_id=${timetablePageId}`
+      throw new GtfsToHtmlError(
+        `No route found for timetable_page_id=${timetablePageId}`,
+        {
+          code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+          category: "query" /* QUERY */,
+          details: { entity: "route", timetablePageId }
+        }
       );
     }
     const { calendars: calendars2, calendarDates: calendarDates2 } = getCalendarsFromConfig(config2);
@@ -1907,7 +2007,11 @@ function generateTimetableHTML(timetablePage, config2) {
 function generateOverviewHTML(timetablePages, config2) {
   const agencies = getAgencies2();
   if (agencies.length === 0) {
-    throw new Error("No agencies found");
+    throw new GtfsToHtmlError("No agencies found", {
+      code: "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */,
+      category: "query" /* QUERY */,
+      details: { entity: "agency" }
+    });
   }
   const geojson = config2.showMap ? getAgencyGeoJSON(config2) : void 0;
   const templateVars = {
@@ -2287,7 +2391,15 @@ try {
   console.error(
     `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists and run gtfs-to-html to import GTFS before running this app.`
   );
-  throw error;
+  throw new GtfsToHtmlError(
+    `Unable to open sqlite database "${config.sqlitePath}"`,
+    {
+      code: "GTFS_TO_HTML_DATABASE_OPEN_FAILED" /* DATABASE_OPEN_FAILED */,
+      category: "database" /* DATABASE */,
+      details: { sqlitePath: config.sqlitePath, dbCode: error?.code },
+      cause: error
+    }
+  );
 }
 app.set("views", getPathToViewsFolder(config));
 app.set("view engine", "pug");
@@ -2371,7 +2483,7 @@ app.get("/timetables/:timetablePageId", async (req, res, next) => {
     const html = await generateTimetableHTML(timetablePage, config);
     res.send(html);
   } catch (error) {
-    if (error?.message.startsWith("No timetable found")) {
+    if (isGtfsToHtmlError(error) && error.code === "GTFS_TO_HTML_QUERY_RESULT_NOT_FOUND" /* QUERY_RESULT_NOT_FOUND */) {
       res.status(404).send("Timetable page not found");
       return;
     }