gtfs-to-html 2.11.2 → 2.11.4

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ConfigAgency } from 'gtfs';
+import { ConfigAgency, Timetable, Route, TimetablePage } from 'gtfs';
 
 interface Config {
     agencies: ConfigAgency[];
@@ -24,6 +24,7 @@ interface Config {
     noHead?: boolean;
     noPickupSymbol?: string;
     noPickupText?: string;
+    noRegularServiceDaysText?: string;
     noServiceSymbol?: string;
     noServiceText?: string;
     outputFormat?: 'html' | 'pdf' | 'csv';
@@ -55,6 +56,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

@@ -497,7 +497,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.11.2",
+  version: "2.11.4",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -522,7 +522,8 @@ var package_default = {
     "Holly Kvalheim",
     "Pawajoro",
     "Andrea Mignone",
-    "Evo Stamatov"
+    "Evo Stamatov",
+    "Sebastian Knopf"
   ],
   type: "module",
   main: "./dist/index.js",
@@ -550,16 +551,16 @@ var package_default = {
     "cli-table": "^0.3.11",
     "csv-stringify": "^6.6.0",
     express: "^5.1.0",
-    gtfs: "^4.18.0",
+    gtfs: "^4.18.1",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    marked: "^16.3.0",
+    marked: "^16.4.1",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.21.0",
+    puppeteer: "^24.26.1",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -568,23 +569,24 @@ var package_default = {
     yoctocolors: "^2.1.2"
   },
   devDependencies: {
-    "@types/archiver": "^6.0.3",
-    "@types/express": "^5.0.3",
+    "@types/archiver": "^7.0.0",
+    "@types/cli-table": "^0.3.4",
+    "@types/express": "^5.0.4",
     "@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",
+    "@types/yargs": "^17.0.34",
     husky: "^9.1.7",
-    "lint-staged": "^16.1.6",
+    "lint-staged": "^16.2.6",
     prettier: "^3.6.2",
     tsup: "^8.5.0",
-    typescript: "^5.9.2"
+    typescript: "^5.9.3"
   },
   engines: {
     node: ">= 22"
@@ -711,9 +713,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) => {
@@ -733,7 +732,7 @@ var getCalendarDatesForTimetable = (timetable, config) => {
   const excludedDates = /* @__PURE__ */ new Set();
   const includedDates = /* @__PURE__ */ new Set();
   for (const calendarDate of calendarDates) {
-    if (moment2(calendarDate.date, "YYYYMMDD").isBetween(start, end)) {
+    if (moment2(calendarDate.date, "YYYYMMDD").isBetween(start, end, "day", "[]")) {
       if (calendarDate.exception_type === 1) {
         includedDates.add(formatDate(calendarDate, config.dateFormat));
       } else if (calendarDate.exception_type === 2) {
@@ -1342,7 +1341,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 = [];
@@ -1366,6 +1365,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) => {
@@ -1503,7 +1505,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;
   });
@@ -1608,7 +1613,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}`
@@ -1749,6 +1756,7 @@ function setDefaultConfig(initialConfig) {
     noHead: false,
     noPickupSymbol: "**",
     noPickupText: "No pickup available",
+    noRegularServiceDaysText: "No regular service days",
     noServiceSymbol: "-",
     noServiceText: "No service at this stop",
     outputFormat: "html",
@@ -2047,7 +2055,7 @@ function formatDays(calendar, config) {
     }
   }
   if (dayString.length === 0) {
-    dayString = "No regular service days";
+    dayString = config.noRegularServiceDaysText;
   }
   return dayString;
 }
@@ -2507,7 +2515,7 @@ var gtfsToHtml = async (initialConfig) => {
         timetablePageId,
         config
       );
-      for (const timetable of timetablePage.timetables) {
+      for (const timetable of timetablePage.consolidatedTimetables) {
         if (timetable.warnings) {
           for (const warning of timetable.warnings) {
             stats.warnings.push(warning);