gtfs-to-html 2.11.0 → 2.11.2

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

@@ -24,6 +24,7 @@ import {
   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";
@@ -61,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) {
@@ -493,7 +497,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.11.0",
+  version: "2.11.2",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -583,7 +587,7 @@ var package_default = {
     typescript: "^5.9.2"
   },
   engines: {
-    node: ">= 20.11.0"
+    node: ">= 22"
   },
   "release-it": {
     github: {
@@ -885,7 +889,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) {
@@ -904,7 +916,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,
@@ -977,6 +990,9 @@ var convertRoutesToTimetablePages = (config) => {
         }
       }
     }
+    if (timetables.length === 0) {
+      continue;
+    }
     if (config.groupTimetablesIntoPages === true) {
       timetablePages.push(
         createTimetablePage({
@@ -2067,9 +2083,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}`;
   }
@@ -2340,18 +2362,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")
     );
   }
 }
@@ -2377,7 +2413,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)}`;
   }