gtfs-to-html 2.11.1 → 2.11.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ConfigAgency } from 'gtfs';
+import { ConfigAgency, Timetable, Route, TimetablePage } from 'gtfs';
 
 interface Config {
     agencies: ConfigAgency[];
@@ -55,6 +55,22 @@ interface Config {
     logFunction?: (text: string) => void;
 }
 
+interface FormattedTimetable extends Timetable {
+    route_ids: string[];
+    trip_ids: string[];
+    routes: Route[];
+    service_ids?: string[];
+    warnings?: string[];
+    has_continues_as_route?: boolean;
+    has_continues_from_route?: boolean;
+}
+
+interface FormattedTimetablePage extends TimetablePage {
+    timetables: FormattedTimetable[];
+    routes: Route[];
+    relativePath?: string;
+}
+
 declare const gtfsToHtml: (initialConfig: Config) => Promise<string>;
 
-export { gtfsToHtml as default };
+export { type Config, type FormattedTimetable, type FormattedTimetablePage, gtfsToHtml as default };

package/dist/index.js

@@ -62,6 +62,9 @@ function toGTFSTime(time) {
   return time.format("HH:mm:ss");
 }
 function calendarToCalendarCode(c) {
+  if (Object.values(c).every((value) => value === null)) {
+    return "";
+  }
   return `${c.monday}${c.tuesday}${c.wednesday}${c.thursday}${c.friday}${c.saturday}${c.sunday}`;
 }
 function calendarCodeToCalendar(code) {
@@ -494,7 +497,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.11.1",
+  version: "2.11.3",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -556,7 +559,7 @@ var package_default = {
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.21.0",
+    puppeteer: "^24.23.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -566,22 +569,23 @@ var package_default = {
   },
   devDependencies: {
     "@types/archiver": "^6.0.3",
+    "@types/cli-table": "^0.3.4",
     "@types/express": "^5.0.3",
     "@types/insane": "^1.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
     "@types/morgan": "^1.9.10",
-    "@types/node": "^22",
+    "@types/node": "^24",
     "@types/pug": "^2.0.10",
     "@types/sanitize-html": "^2.16.0",
     "@types/sqlstring": "^2.3.2",
     "@types/toposort": "^2.0.7",
     "@types/yargs": "^17.0.33",
     husky: "^9.1.7",
-    "lint-staged": "^16.1.6",
+    "lint-staged": "^16.2.3",
     prettier: "^3.6.2",
     tsup: "^8.5.0",
-    typescript: "^5.9.2"
+    typescript: "^5.9.3"
   },
   engines: {
     node: ">= 22"
@@ -708,9 +712,6 @@ var sortTrips = (trips, config) => {
     const lastStopId = last(longestTripStoptimes).stop_id;
     sortedTrips = sortTripsByStoptimeAtStop(trips, lastStopId);
   }
-  if (config.showDuplicateTrips === false) {
-    return deduplicateTrips(sortedTrips ?? []);
-  }
   return sortedTrips ?? [];
 };
 var sortTripsByStoptimeAtStop = (trips, stopId) => sortBy(trips, (trip) => {
@@ -886,7 +887,15 @@ var createTimetable = ({
     ...calendars?.map((calendar) => calendar.service_id) ?? [],
     ...calendarDates?.map((calendarDate) => calendarDate.service_id) ?? []
   ]);
-  const days2 = {};
+  const days2 = {
+    monday: null,
+    tuesday: null,
+    wednesday: null,
+    thursday: null,
+    friday: null,
+    saturday: null,
+    sunday: null
+  };
   let startDate = null;
   let endDate = null;
   if (calendars && calendars.length > 0) {
@@ -905,7 +914,8 @@ var createTimetable = ({
   const timetableId = formatTimetableId({
     routeIds: [route.route_id],
     directionId,
-    days: days2
+    days: days2,
+    dates: calendarDates?.map((calendarDate) => calendarDate.date)
   });
   return {
     timetable_id: timetableId,
@@ -978,6 +988,9 @@ var convertRoutesToTimetablePages = (config) => {
         }
       }
     }
+    if (timetables.length === 0) {
+      continue;
+    }
     if (config.groupTimetablesIntoPages === true) {
       timetablePages.push(
         createTimetablePage({
@@ -1327,7 +1340,7 @@ var addTripContinuation = (trip, timetable) => {
     trip.continues_as_route = nextTrip;
   }
 };
-var filterTrips = (timetable) => {
+var filterTrips = (timetable, config) => {
   let filteredTrips = timetable.orderedTrips;
   for (const trip of filteredTrips) {
     const combinedStoptimes = [];
@@ -1351,6 +1364,9 @@ var filterTrips = (timetable) => {
   filteredTrips = filteredTrips.filter(
     (trip) => trip.stoptimes.length > 1
   );
+  if (config.showDuplicateTrips === false) {
+    filteredTrips = deduplicateTrips(filteredTrips);
+  }
   return filteredTrips;
 };
 var getTripsForTimetable = (timetable, calendars, config) => {
@@ -1488,7 +1504,10 @@ var formatTimetables = (timetables, config) => {
     if (config.showMap) {
       timetable.geojson = getTimetableGeoJSON(timetable, config);
     }
-    timetable.orderedTrips = filterTrips(timetable);
+    timetable.trip_ids = uniq(
+      timetable.orderedTrips.map((trip) => trip.trip_id)
+    );
+    timetable.orderedTrips = filterTrips(timetable, config);
     timetable.stops = formatStops(timetable, config);
     return timetable;
   });
@@ -1593,7 +1612,9 @@ var getTimetablePageById = (timetablePageId, config) => {
   const timetablePages = getTimetablePages({
     timetable_page_id: timetablePageId
   });
-  const timetables = mergeTimetablesWithSameId(getTimetables());
+  const timetables = mergeTimetablesWithSameId(
+    getTimetables()
+  );
   if (timetablePages.length > 1) {
     throw new Error(
       `Multiple timetable_pages found for timetable_page_id=${timetablePageId}`
@@ -2068,9 +2089,15 @@ function formatFrequency(frequency, config) {
 function formatTimetableId({
   routeIds,
   directionId,
-  days: days2
+  days: days2,
+  dates
 }) {
-  let timetableId = `${routeIds.join("_")}|${calendarToCalendarCode(days2)}`;
+  let timetableId = routeIds.join("_");
+  if (calendarToCalendarCode(days2)) {
+    timetableId += `|${calendarToCalendarCode(days2)}`;
+  } else if (dates && dates.length > 0) {
+    timetableId += `|${dates.join("_")}`;
+  }
   if (!isNullOrEmpty(directionId)) {
     timetableId += `|${directionId}`;
   }
@@ -2367,7 +2394,12 @@ function generateTimetablePageFileName(timetablePage, config) {
     return sanitize(`${formatRouteNameForFilename(route).toLowerCase()}.html`);
   }
   const timetable = timetablePage.timetables[0];
-  let filename = timetable.timetable_id ?? "";
+  if (timetable.timetable_id) {
+    return sanitize(
+      `${timetable.timetable_id.replace(/\|/g, "_").toLowerCase()}.html`
+    );
+  }
+  let filename = "";
   for (const route of timetable.routes) {
     filename += `_${formatRouteNameForFilename(route)}`;
   }