gtfs-to-html 2.6.5 → 2.6.6

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.6.6] - 2024-05-14
+
+### Updated
+- Improved error formatting
+- Text-wrap for timetable notes for trips
+- Dependency updates
+- Trip label for vertical multi-route timetables
+
 ## [2.6.5] - 2024-05-11
 
 ### Updated

package/bin/gtfs-to-html.js

@@ -2,11 +2,14 @@
 
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
+import PrettyError from 'pretty-error';
 
 import { getConfig } from '../lib/file-utils.js';
 import { formatError } from '../lib/log-utils.js';
 import gtfsToHtml from '../index.js';
 
+const pe = new PrettyError();
+
 const { argv } = yargs(hideBin(process.argv))
   .usage('Usage: $0 --configPath ./config.json')
   .help()
@@ -32,7 +35,7 @@ const { argv } = yargs(hideBin(process.argv))
 const handleError = (error) => {
   const text = error || 'Unknown Error';
   process.stdout.write(`\n${formatError(text)}\n`);
-  console.error(error);
+  console.error(pe.render(error));
   process.exit(1);
 };
 

package/lib/file-utils.js

@@ -26,37 +26,34 @@ import * as templateFunctions from './template-functions.js';
  * Attempt to parse the specified config JSON file.
  */
 export async function getConfig(argv) {
-  try {
-    const data = await readFile(
-      path.resolve(untildify(argv.configPath)),
-      'utf8',
-    ).catch((error) => {
-      console.error(
-        new Error(
-          `Cannot find configuration file at \`${argv.configPath}\`. Use config-sample.json as a starting point, pass --configPath option`,
-        ),
-      );
-      throw error;
-    });
-    const config = JSON.parse(data);
-
-    if (argv.skipImport === true) {
-      config.skipImport = argv.skipImport;
-    }
+  let data;
+  let config;
 
-    if (argv.showOnlyTimepoint === true) {
-      config.showOnlyTimepoint = argv.showOnlyTimepoint;
-    }
+  try {
+    data = await readFile(path.resolve(untildify(argv.configPath)), 'utf8');
+  } catch (error) {
+    throw new Error(
+      `Cannot find configuration file at \`${argv.configPath}\`. Use config-sample.json as a starting point, pass --configPath option`,
+    );
+  }
 
-    return config;
+  try {
+    config = JSON.parse(data);
   } catch (error) {
-    console.error(
-      new Error(
-        `Cannot parse configuration file at \`${argv.configPath}\`. Check to ensure that it is valid JSON.`,
-      ),
+    throw new Error(
+      `Cannot parse configuration file at \`${argv.configPath}\`. Check to ensure that it is valid JSON.`,
     );
-    throw error;
   }
+
+  if (argv.skipImport === true) {
+    config.skipImport = argv.skipImport;
+  }
+
+  if (argv.showOnlyTimepoint === true) {
+    config.showOnlyTimepoint = argv.showOnlyTimepoint;
+  }
+
+  return config;
 }
 
 /*

package/lib/log-utils.js

@@ -1,13 +1,9 @@
 import { clearLine, cursorTo } from 'node:readline';
-import PrettyError from 'pretty-error';
 import { noop } from 'lodash-es';
 import * as colors from 'yoctocolors';
 import { getFeedInfo } from 'gtfs';
 import Table from 'cli-table';
 
-const pe = new PrettyError();
-pe.start();
-
 /*
  * Creates text for a log of output details.
  */

package/lib/template-functions.js

@@ -149,10 +149,13 @@ export function formatTripName(trip, index, timetable) {
   let tripName;
   if (timetable.routes.length > 1) {
     tripName = trip.route_short_name;
-  } else if (trip.trip_short_name) {
-    tripName = trip.trip_short_name;
-  } else {
-    tripName = `Run #${index + 1}`;
+  } else if (timetable.orientation === 'horizontal') {
+    // Only add this to horizontal timetables.
+    if (trip.trip_short_name) {
+      tripName = trip.trip_short_name;
+    } else {
+      tripName = `Run #${index + 1}`;
+    }
   }
 
   if (timetableHasDifferentDays(timetable)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -40,9 +40,9 @@
     "archiver": "^7.0.1",
     "cli-table": "^0.3.11",
     "copy-dir": "^1.3.0",
-    "csv-stringify": "^6.4.6",
+    "csv-stringify": "^6.5.0",
     "express": "^4.19.2",
-    "gtfs": "^4.10.2",
+    "gtfs": "^4.10.4",
     "insane": "^2.6.2",
     "js-beautify": "^1.15.1",
     "lodash-es": "^4.17.21",
@@ -51,14 +51,14 @@
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^22.8.0",
+    "puppeteer": "^22.8.1",
     "sanitize-filename": "^1.6.3",
     "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",
     "toposort": "^2.0.2",
     "untildify": "^5.0.0",
     "yargs": "^17.7.2",
-    "yoctocolors": "^2.0.0"
+    "yoctocolors": "^2.0.2"
   },
   "devDependencies": {
     "husky": "^9.0.11",

package/public/css/timetable_styles.css

@@ -162,6 +162,10 @@ a:hover {
   width: auto;
 }
 
+.timetable .table-vertical .trip-row .trip-notes {
+  text-wrap: nowrap;
+}
+
 .route-color-swatch {
   min-width: 34px;
   height: 34px;

package/views/default/timetable_note_symbol.pug

@@ -1,2 +1,5 @@
 a(href=`#note-${timetable.timetable_id}-${note.note_id}` class=`timetable-note-${note.note_id}`).symbol
-  sup= note.symbol
+  if timetable.routes.length <= 1 && timetable.orientation === 'vertical'
+    span= note.symbol
+  else
+    sup= note.symbol

package/views/default/timetable_vertical.pug

@@ -9,14 +9,14 @@
 - }
 - var timetableHasTripNotes = timetable.orderedTrips.flatMap(trip => getNotesForTrip(timetable.notes, trip)).length > 0;
 .table-container
-  table(summary= getTimetableSummary(timetable) data-orientation="vertical")
+  table.table-vertical(summary= getTimetableSummary(timetable) data-orientation="vertical")
     caption.sr-only= `${timetable.timetable_label} | ${timetable.dayList}`
     colgroup
       each stop, idx in timetable.stops
         col(id=`stop_id_${formatHtmlId(stop.stop_id)}` class=`stop-${idx}` data-stop-id=`${stop.stop_id}` data-is-timepoint=`${stop.is_timepoint}`)
     thead
       tr
-        if timetableHasTripNotes
+        if timetableHasTripNotes || timetable.routes.length > 1
           th
         if timetable.has_continues_from_route
           th.stop-header.continues-from Continues from route
@@ -36,7 +36,7 @@
     tbody
       if timetable.frequencies && !timetable.frequencyExactTimes
         tr.trip-row
-          if timetableHasTripNotes
+          if timetableHasTripNotes || timetable.routes.length > 1
             td
           if timetable.has_continues_from_route
             td
@@ -47,8 +47,8 @@
             td
       each trip, idx in timetable.orderedTrips
         tr.trip-row(id=`trip_id_${formatHtmlId(trip.trip_id)}`)
-          if timetableHasTripNotes
-            td.trip-notes
+          if timetableHasTripNotes || timetable.routes.length > 1
+            td.trip-notes= formatTripName(trip, idx, timetable)
               each note in getNotesForTrip(timetable.notes, trip)
                 include timetable_note_symbol.pug
           if timetable.has_continues_from_route