gtfs-to-html 2.12.1 → 2.12.3

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

@@ -25,7 +25,6 @@ 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";
@@ -62,11 +61,11 @@ function fromGTFSTime(timeString) {
 function toGTFSTime(time) {
   return time.format("HH:mm:ss");
 }
-function calendarToCalendarCode(c) {
-  if (Object.values(c).every((value) => value === null)) {
+function calendarToCalendarCode(calendar) {
+  if (Object.values(calendar).every((value) => value === null)) {
     return "";
   }
-  return `${c.monday}${c.tuesday}${c.wednesday}${c.thursday}${c.friday}${c.saturday}${c.sunday}`;
+  return `${calendar.monday ?? "0"}${calendar.tuesday ?? "0"}${calendar.wednesday ?? "0"}${calendar.thursday ?? "0"}${calendar.friday ?? "0"}${calendar.saturday ?? "0"}${calendar.sunday ?? "0"}`;
 }
 function calendarCodeToCalendar(code) {
   const days2 = [
@@ -84,6 +83,35 @@ function calendarCodeToCalendar(code) {
   }
   return calendar;
 }
+function calendarToDateList(calendar, startDate, endDate) {
+  if (!startDate || !endDate) {
+    return [];
+  }
+  const activeWeekdays = [
+    calendar.monday === 1 ? 1 : null,
+    calendar.tuesday === 1 ? 2 : null,
+    calendar.wednesday === 1 ? 3 : null,
+    calendar.thursday === 1 ? 4 : null,
+    calendar.friday === 1 ? 5 : null,
+    calendar.saturday === 1 ? 6 : null,
+    calendar.sunday === 1 ? 7 : null
+  ].filter((weekday) => weekday !== null);
+  if (activeWeekdays.length === 0) {
+    return [];
+  }
+  const activeWeekdaySet = new Set(activeWeekdays);
+  const dates = /* @__PURE__ */ new Set();
+  const date = moment(startDate.toString(), "YYYYMMDD");
+  const endDateMoment = moment(endDate.toString(), "YYYYMMDD");
+  while (date.isSameOrBefore(endDateMoment)) {
+    const isoWeekday = date.isoWeekday();
+    if (activeWeekdaySet.has(isoWeekday)) {
+      dates.add(parseInt(date.format("YYYYMMDD"), 10));
+    }
+    date.add(1, "day");
+  }
+  return Array.from(dates);
+}
 function secondsAfterMidnight(timeString) {
   return moment.duration(timeString).asSeconds();
 }
@@ -494,7 +522,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.1",
+  version: "2.12.3",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -529,6 +557,7 @@ var package_default = {
     "dist",
     "docker",
     "examples",
+    "scripts",
     "views/default",
     "config-sample.json"
   ],
@@ -537,30 +566,32 @@ var package_default = {
   },
   scripts: {
     build: "tsup",
+    postbuild: "node scripts/postinstall.js",
     start: "node ./dist/app",
-    prepare: "husky"
+    prepare: "husky && npm run build",
+    postinstall: "node scripts/postinstall.js"
   },
   dependencies: {
     "@maplibre/maplibre-gl-geocoder": "^1.9.1",
-    "@turf/helpers": "^7.3.0",
-    "@turf/simplify": "^7.3.0",
+    "@turf/helpers": "^7.3.1",
+    "@turf/simplify": "^7.3.1",
     anchorme: "^3.0.8",
     archiver: "^7.0.1",
     "cli-table": "^0.3.11",
     "css.escape": "^1.5.1",
     "csv-stringify": "^6.6.0",
-    express: "^5.1.0",
-    gtfs: "^4.18.1",
+    express: "^5.2.1",
+    gtfs: "^4.18.2",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    "maplibre-gl": "^5.13.0",
-    marked: "^17.0.0",
+    "maplibre-gl": "^5.14.0",
+    marked: "^17.0.1",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.30.0",
+    puppeteer: "^24.32.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -571,7 +602,7 @@ var package_default = {
   devDependencies: {
     "@types/archiver": "^7.0.0",
     "@types/cli-table": "^0.3.4",
-    "@types/express": "^5.0.5",
+    "@types/express": "^5.0.6",
     "@types/insane": "^1.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
@@ -584,7 +615,7 @@ var package_default = {
     "@types/yargs": "^17.0.35",
     husky: "^9.1.7",
     "lint-staged": "^16.2.7",
-    prettier: "^3.6.2",
+    prettier: "^3.7.4",
     tsup: "^8.5.1",
     typescript: "^5.9.3"
   },
@@ -1249,9 +1280,9 @@ var getCalendarsFromTimetable = (timetable) => {
   }
   return db.prepare(`SELECT * FROM calendar ${whereClause}`).all();
 };
-var getCalendarDatesServiceIds = (startDate, endDate) => {
+var getCalendarDatesForDateRange = (startDate, endDate) => {
   const db = openDb();
-  const whereClauses = ["exception_type = 1"];
+  const whereClauses = [];
   if (endDate) {
     whereClauses.push(`date <= ${sqlString.escape(endDate)}`);
   }
@@ -1259,11 +1290,11 @@ var getCalendarDatesServiceIds = (startDate, endDate) => {
     whereClauses.push(`date >= ${sqlString.escape(startDate)}`);
   }
   const calendarDates = db.prepare(
-    `SELECT DISTINCT service_id FROM calendar_dates WHERE ${whereClauses.join(
+    `SELECT service_id, date, exception_type FROM calendar_dates WHERE ${whereClauses.join(
       " AND "
     )}`
   ).all();
-  return calendarDates.map((calendarDate) => calendarDate.service_id);
+  return calendarDates;
 };
 var getAllStationStopIds = (stopId) => {
   const stops = getStops({
@@ -1474,13 +1505,49 @@ var formatTimetables = (timetables, config) => {
     timetable.warnings = [];
     const dayList = formatDays(timetable, config);
     const calendars = getCalendarsFromTimetable(timetable);
-    let serviceIds = calendars.map((calendar) => calendar.service_id);
+    const serviceIds = /* @__PURE__ */ new Set();
+    for (const calendar of calendars) {
+      serviceIds.add(calendar.service_id);
+    }
     if (timetable.include_exceptions === 1) {
-      const calendarDatesServiceIds = getCalendarDatesServiceIds(
+      const calendarDates = getCalendarDatesForDateRange(
         timetable.start_date,
         timetable.end_date
       );
-      serviceIds = uniq([...serviceIds, ...calendarDatesServiceIds]);
+      const calendarDateGroups = groupBy(calendarDates, "service_id");
+      for (const [serviceId, calendarDateGroup] of Object.entries(
+        calendarDateGroups
+      )) {
+        const calendar = calendars.find(
+          (c) => c.service_id === serviceId
+        );
+        if (calendarDateGroup.some(
+          (calendarDate) => calendarDate.exception_type === 1
+        )) {
+          serviceIds.add(serviceId);
+        }
+        const calendarDateGroupExceptionType2 = calendarDateGroup.filter(
+          (calendarDate) => calendarDate.exception_type === 2
+        );
+        if (timetable.start_date && timetable.end_date && calendar && calendarDateGroupExceptionType2.length > 0) {
+          const datesDuringDateRange = calendarToDateList(
+            calendar,
+            timetable.start_date,
+            timetable.end_date
+          );
+          if (datesDuringDateRange.length === 0) {
+            serviceIds.delete(serviceId);
+          }
+          const everyDateIsExcluded = datesDuringDateRange.every(
+            (dateDuringDateRange) => calendarDateGroupExceptionType2.some(
+              (calendarDate) => calendarDate.date === dateDuringDateRange
+            )
+          );
+          if (everyDateIsExcluded) {
+            serviceIds.delete(serviceId);
+          }
+        }
+      }
     }
     Object.assign(timetable, {
       noServiceSymbolUsed: false,
@@ -1498,7 +1565,7 @@ var formatTimetables = (timetables, config) => {
       noPickupSymbol: config.noPickupSymbol,
       interpolatedStopSymbol: config.interpolatedStopSymbol,
       orientation: timetable.orientation || config.defaultOrientation,
-      service_ids: serviceIds,
+      service_ids: Array.from(serviceIds),
       dayList,
       dayListLong: formatDaysLong(dayList, config)
     });
@@ -2319,20 +2386,23 @@ async function getConfig(argv2) {
   }
   return config;
 }
-function getPathToViewsFolder(config) {
-  if (config.templatePath) {
-    return untildify(config.templatePath);
-  }
+function getPathToThisModuleFolder() {
   const __dirname = dirname(fileURLToPath(import.meta.url));
-  let viewsFolderPath;
+  let distFolderPath;
   if (__dirname.endsWith("/dist/bin") || __dirname.endsWith("/dist/app")) {
-    viewsFolderPath = resolve(__dirname, "../../views/default");
+    distFolderPath = resolve(__dirname, "../../");
   } else if (__dirname.endsWith("/dist")) {
-    viewsFolderPath = resolve(__dirname, "../views/default");
+    distFolderPath = resolve(__dirname, "../");
   } else {
-    viewsFolderPath = resolve(__dirname, "../../views/default");
+    distFolderPath = resolve(__dirname, "../../");
   }
-  return viewsFolderPath;
+  return distFolderPath;
+}
+function getPathToViewsFolder(config) {
+  if (config.templatePath) {
+    return untildify(config.templatePath);
+  }
+  return join(getPathToThisModuleFolder(), "views/default");
 }
 function getPathToTemplateFile(templateFileName, config) {
   const fullTemplateFileName = config.noHead !== true ? `${templateFileName}_full.pug` : `${templateFileName}.pug`;
@@ -2365,6 +2435,7 @@ async function prepDirectory(outputPath, config) {
 }
 async function copyStaticAssets(config, outputPath) {
   const viewsFolderPath = getPathToViewsFolder(config);
+  const thisModuleFolderPath = getPathToThisModuleFolder();
   const foldersToCopy = ["css", "js", "img"];
   for (const folder of foldersToCopy) {
     if (await access(join(viewsFolderPath, folder)).then(() => true).catch(() => false)) {
@@ -2375,70 +2446,43 @@ async function copyStaticAssets(config, outputPath) {
   }
   if (config.hasGtfsRealtimeVehiclePositions || config.hasGtfsRealtimeTripUpdates || config.hasGtfsRealtimeAlerts) {
     await copyFile(
-      join(
-        dirname(findPackageJSON("pbf", import.meta.url)),
-        "dist/pbf.js"
-      ),
+      join(thisModuleFolderPath, "dist/frontend_libraries/pbf.js"),
       join(outputPath, "js/pbf.js")
     );
     await copyFile(
       join(
-        dirname(
-          findPackageJSON(
-            "gtfs-realtime-pbf-js-module",
-            import.meta.url
-          )
-        ),
-        "gtfs-realtime.browser.proto.js"
+        thisModuleFolderPath,
+        "dist/frontend_libraries/gtfs-realtime.browser.proto.js"
       ),
       join(outputPath, "js/gtfs-realtime.browser.proto.js")
     );
   }
   if (config.hasGtfsRealtimeAlerts) {
     await copyFile(
-      join(
-        dirname(findPackageJSON("anchorme", import.meta.url)),
-        "dist/browser/anchorme.min.js"
-      ),
+      join(thisModuleFolderPath, "dist/frontend_libraries/anchorme.min.js"),
       join(outputPath, "js/anchorme.min.js")
     );
   }
   if (config.showMap) {
     await copyFile(
-      join(
-        dirname(findPackageJSON("maplibre-gl", import.meta.url)),
-        "dist/maplibre-gl.js"
-      ),
+      join(thisModuleFolderPath, "dist/frontend_libraries/maplibre-gl.js"),
       join(outputPath, "js/maplibre-gl.js")
     );
     await copyFile(
-      join(
-        dirname(findPackageJSON("maplibre-gl", import.meta.url)),
-        "dist/maplibre-gl.css"
-      ),
+      join(thisModuleFolderPath, "dist/frontend_libraries/maplibre-gl.css"),
       join(outputPath, "css/maplibre-gl.css")
     );
     await copyFile(
       join(
-        dirname(
-          findPackageJSON(
-            "@maplibre/maplibre-gl-geocoder",
-            import.meta.url
-          )
-        ),
-        "dist/maplibre-gl-geocoder.js"
+        thisModuleFolderPath,
+        "dist/frontend_libraries/maplibre-gl-geocoder.js"
       ),
       join(outputPath, "js/maplibre-gl-geocoder.js")
     );
     await copyFile(
       join(
-        dirname(
-          findPackageJSON(
-            "@maplibre/maplibre-gl-geocoder",
-            import.meta.url
-          )
-        ),
-        "dist/maplibre-gl-geocoder.css"
+        thisModuleFolderPath,
+        "dist/frontend_libraries/maplibre-gl-geocoder.css"
       ),
       join(outputPath, "css/maplibre-gl-geocoder.css")
     );