gtfs-to-html 2.12.7 → 2.12.9

package/README.md

@@ -61,11 +61,13 @@ Many transit agencies use `gtfs-to-html` to generate the schedule pages used on
 
 | Agency                                                                        | Location                            |
 | ----------------------------------------------------------------------------- | ----------------------------------- |
+| [Asheville Rides Transit (ART)](https://www.ridetheart.com)                   | Asheville, North Carolina           |
 | [Basin Transit](https://basin-transit.com)                                    | Morongo Basin, California           |
 | [Bayway Transit](https://www.baywaytransit.org)                               | Panama City, Florida                |
 | [Brockton Area Transit Authority](https://ridebat.com)                        | Brockton, Massachusetts             |
 | [Cape Ann Transportation Authority](https://canntran.com)                     | Gloucester, Massachusetts           |
 | [Capital Transit](https://juneaucapitaltransit.org)                           | Juneau, Alaska                      |
+| [Cascades East Transit](https://cascadeseasttransit.com)                      | Bend, Oregon                        |
 | [Central Transit](https://centraltransit.org)                                 | Ellensburg, Washington              |
 | [Citibus](https://citibus.com)                                                | Lubbock, Texas                      |
 | [Commute.org](https://commute.org)                                            | San Mateo County, California        |
@@ -77,7 +79,7 @@ Many transit agencies use `gtfs-to-html` to generate the schedule pages used on
 | [Kings Area Rural Transit (KART)](https://www.kartbus.org)                    | Kings County, California            |
 | [Lowell Regional Transit Authority](https://lrta.com)                         | Lowell, Massachusetts               |
 | [Madera County Connection](https://mcctransit.com)                            | Madera County, California           |
-| [Marin Transit](https://marintransit.org)                                     | Marin County, California            |
+| [Marin Transit](https://marintransit.gov)                                     | Marin County, California            |
 | [Morongo Basin Transit Authority](https://mbtabus.com)                        | Morongo Basin, California           |
 | [Mountain Transit](https://mountaintransit.org)                               | Big Bear Valley, California         |
 | [Mountain View Community Shuttle](https://mvcommunityshuttle.com)             | Mountain View, California           |

package/config-sample.json

@@ -2,15 +2,15 @@
   "agencies": [
     {
       "agencyKey": "marintransit",
-      "url": "https://marintransit.org/data/google_transit.zip",
+      "url": "https://marintransit.gov/data/google_transit.zip",
       "realtimeAlerts": {
-        "url": "https://api.marintransit.org/alerts"
+        "url": "https://api.marintransit.gov/alerts"
       },
       "realtimeTripUpdates": {
-        "url": "https://api.marintransit.org/tripupdates"
+        "url": "https://api.marintransit.gov/tripupdates"
       },
       "realtimeVehiclePositions": {
-        "url": "https://api.marintransit.org/vehiclepositions"
+        "url": "https://api.marintransit.gov/vehiclepositions"
       }
     }
   ],

package/dist/app/index.js

@@ -188,7 +188,7 @@ import {
 import { homedir } from "os";
 import * as _ from "lodash-es";
 import { uniqBy } from "lodash-es";
-import archiver from "archiver";
+import { ZipArchive } from "archiver";
 import beautify from "js-beautify";
 import sanitizeHtml from "sanitize-html";
 import { renderFile } from "pug";
@@ -330,6 +330,27 @@ function isGtfsToHtmlError(error) {
   return candidate.name === "GtfsToHtmlError" && typeof candidate.message === "string" && typeof candidate.code === "string" && typeof candidate.category === "string" && typeof candidate.isOperational === "boolean";
 }
 
+// src/lib/log-utils.ts
+import { clearLine, cursorTo } from "readline";
+import { noop } from "lodash-es";
+import * as colors from "yoctocolors";
+import { getAgencies, getFeedInfo, isGtfsError as isGtfsError2, formatGtfsError } from "gtfs";
+import Table from "cli-table";
+function logWarning(config2) {
+  if (config2.logFunction) {
+    return config2.logFunction;
+  }
+  return (text) => {
+    process.stdout.write(`
+${formatWarning(text)}
+`);
+  };
+}
+function formatWarning(text) {
+  const warningMessage = `${colors.underline("Warning")}: ${text}`;
+  return colors.yellow(warningMessage);
+}
+
 // src/lib/file-utils.ts
 var homeDirectory = homedir();
 function getPathToThisModuleFolder() {
@@ -405,27 +426,6 @@ import { getShapesAsGeoJSON, getStopsAsGeoJSON } from "gtfs";
 import simplify from "@turf/simplify";
 import { featureCollection, round } from "@turf/helpers";
 
-// src/lib/log-utils.ts
-import { clearLine, cursorTo } from "readline";
-import { noop } from "lodash-es";
-import * as colors from "yoctocolors";
-import { getAgencies, getFeedInfo, isGtfsError as isGtfsError2, formatGtfsError } from "gtfs";
-import Table from "cli-table";
-function logWarning(config2) {
-  if (config2.logFunction) {
-    return config2.logFunction;
-  }
-  return (text) => {
-    process.stdout.write(`
-${formatWarning(text)}
-`);
-  };
-}
-function formatWarning(text) {
-  const warningMessage = `${colors.underline("Warning")}: ${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))));
@@ -509,7 +509,7 @@ function getAgencyGeoJSON(config2) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.7",
+  version: "2.12.9",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -555,15 +555,15 @@ var package_default = {
     build: "tsup",
     postbuild: "node scripts/postinstall.js",
     start: "node ./dist/app",
-    prepare: "husky && npm run build",
+    prepare: "husky && pnpm run build",
     postinstall: "node scripts/postinstall.js"
   },
   dependencies: {
     "@maplibre/maplibre-gl-geocoder": "^1.9.4",
-    "@turf/helpers": "^7.3.4",
-    "@turf/simplify": "^7.3.4",
+    "@turf/helpers": "^7.3.5",
+    "@turf/simplify": "^7.3.5",
     anchorme: "^3.0.8",
-    archiver: "^7.0.1",
+    archiver: "^8.0.0",
     "cli-table": "^0.3.11",
     "css.escape": "^1.5.1",
     "csv-stringify": "^6.7.0",
@@ -572,15 +572,15 @@ var package_default = {
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.18.1",
-    "maplibre-gl": "^5.21.1",
-    marked: "^17.0.5",
+    "maplibre-gl": "^5.24.0",
+    marked: "^18.0.3",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.4",
-    puppeteer: "^24.40.0",
+    puppeteer: "^24.43.1",
     "sanitize-filename": "^1.6.4",
-    "sanitize-html": "^2.17.2",
+    "sanitize-html": "^2.17.4",
     sqlstring: "^2.3.3",
     toposort: "^2.0.2",
     yargs: "^18.0.0",
@@ -599,14 +599,15 @@ var package_default = {
     "@types/toposort": "^2.0.7",
     "@types/yargs": "^17.0.35",
     husky: "^9.1.7",
-    "lint-staged": "^16.4.0",
-    prettier: "^3.8.1",
+    "lint-staged": "^17.0.4",
+    prettier: "^3.8.3",
     tsup: "^8.5.1",
-    typescript: "^6.0.2"
+    typescript: "^6.0.3"
   },
   engines: {
     node: ">= 22"
   },
+  packageManager: "pnpm@11.1.1+sha512.d1fdf5f73c617b64fa1a56a81c3c8dfe0e966e33a6010aa256b517ae77be21d93e05affc0de1a83b0e4f29d569f68b446ae8f068cd7247c0bb3df0fb4d7bdf9a",
   "release-it": {
     github: {
       release: true
@@ -617,16 +618,14 @@ var package_default = {
       }
     },
     hooks: {
-      "after:bump": "npm run build"
+      "after:bump": "pnpm run build"
     }
   },
   prettier: {
     singleQuote: true
   },
   "lint-staged": {
-    "*.js": "prettier --write",
-    "*.ts": "prettier --write",
-    "*.json": "prettier --write"
+    "*.{js,ts,json}": "prettier --write"
   }
 };
 
@@ -1251,9 +1250,8 @@ var getCalendarsFromConfig = (config2) => {
   }
   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 calendarDatesQuery = serviceIds.length > 0 ? `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map((serviceId) => sqlString.escape(serviceId)).join(", ")})` : "SELECT * FROM calendar_dates WHERE exception_type = 1";
+  const calendarDates = db.prepare(calendarDatesQuery).all();
   return {
     calendars,
     calendarDates
@@ -1325,10 +1323,9 @@ var getCalendarDatesForDateRange = (startDate, endDate) => {
   if (startDate) {
     whereClauses.push(`date >= ${sqlString.escape(startDate)}`);
   }
+  const whereClause = whereClauses.length > 0 ? ` WHERE ${whereClauses.join(" AND ")}` : "";
   const calendarDates = db.prepare(
-    `SELECT service_id, date, exception_type FROM calendar_dates WHERE ${whereClauses.join(
-      " AND "
-    )}`
+    `SELECT service_id, date, exception_type FROM calendar_dates${whereClause}`
   ).all();
   return calendarDates;
 };
@@ -1449,6 +1446,46 @@ var filterTrips = (timetable, calendars, config2) => {
   if (config2.showDuplicateTrips === false) {
     filteredTrips = deduplicateTrips(filteredTrips);
   }
+  const dayNames = [
+    "monday",
+    "tuesday",
+    "wednesday",
+    "thursday",
+    "friday",
+    "saturday",
+    "sunday"
+  ];
+  const timetableDays = dayNames.filter((day) => timetable[day] === 1);
+  if (timetableDays.length > 1) {
+    const warnedServiceIds = /* @__PURE__ */ new Set();
+    for (const trip of filteredTrips) {
+      const tripServiceIds = [
+        trip.service_id,
+        ...trip.additional_service_ids ?? []
+      ];
+      const tripCalendars = calendars.filter(
+        (c) => tripServiceIds.includes(c.service_id)
+      );
+      if (tripCalendars.length === 0) {
+        continue;
+      }
+      const tripDays = getDaysFromCalendars(tripCalendars);
+      const missingDays = timetableDays.filter(
+        (day) => (tripDays[day] ?? 0) !== 1
+      );
+      if (missingDays.length > 0) {
+        const serviceIdKey = tripServiceIds.sort().join("|");
+        if (!warnedServiceIds.has(serviceIdKey)) {
+          warnedServiceIds.add(serviceIdKey);
+          const tripDayList = formatDays(tripDays, config2);
+          const timetableDayList = formatDays(timetable, config2);
+          timetable.warnings.push(
+            `Timetable ${timetable.timetable_id} (Routes: ${timetable.routes.map((route) => route.route_short_name).join(", ")}) covers ${timetableDayList} but some trips (service_id=${tripServiceIds.join(", ")}) only run on ${tripDayList}. This may indicate a data issue in the GTFS or that you should generate separate timetables for different days of the week.`
+          );
+        }
+      }
+    }
+  }
   const formattedTrips = filteredTrips.map((trip) => {
     const tripCalendars = calendars.filter((calendar) => {
       return [
@@ -1807,7 +1844,7 @@ var getTimetablePageById = (timetablePageId, config2) => {
   }
   if (timetablePageId.startsWith("route_")) {
     const routes = getRoutes({
-      route_id: timetablePageId.split("_")[1]
+      route_id: timetablePageId.slice("route_".length)
     });
     if (routes.length === 0) {
       throw new GtfsToHtmlError(