gtfs-to-html 2.2.0 → 2.3.2

package/lib/formatters.js

@@ -1,14 +1,32 @@
-import { clone, find, first, flatMap, groupBy, last, omit, sortBy, uniqBy, zipObject } from 'lodash-es';
+import {
+  clone,
+  find,
+  first,
+  flatMap,
+  groupBy,
+  last,
+  omit,
+  sortBy,
+  uniqBy,
+  zipObject,
+} from 'lodash-es';
 import moment from 'moment';
 
-import { fromGTFSTime, minutesAfterMidnight, calendarToCalendarCode, secondsAfterMidnight, toGTFSTime, updateTimeByOffset } from './time-utils.js';
+import {
+  fromGTFSTime,
+  minutesAfterMidnight,
+  calendarToCalendarCode,
+  secondsAfterMidnight,
+  toGTFSTime,
+  updateTimeByOffset,
+} from './time-utils.js';
 
 /*
  * Replace all instances in a string with items from an object.
  */
 function replaceAll(string, mapObject) {
   const re = new RegExp(Object.keys(mapObject).join('|'), 'gi');
-  return string.replace(re, matched => mapObject[matched]);
+  return string.replace(re, (matched) => mapObject[matched]);
 }
 
 /*
@@ -120,13 +138,17 @@ function filterHourlyTimes(stops) {
   // Sort stoptimes by minutes for first stop.
   const firstStopTimesAndIndex = firstStopTimes.map((time, idx) => ({
     idx,
-    time
+    time,
   }));
-  const sortedFirstStopTimesAndIndex = sortBy(firstStopTimesAndIndex, item => Number.parseInt(item.time.format('m'), 10));
+  const sortedFirstStopTimesAndIndex = sortBy(firstStopTimesAndIndex, (item) =>
+    Number.parseInt(item.time.format('m'), 10)
+  );
 
   // Filter and arrange stoptimes for all stops based on sort.
-  return stops.map(stop => {
-    stop.hourlyTimes = sortedFirstStopTimesAndIndex.map(item => fromGTFSTime(stop.trips[item.idx].arrival_time).format(':mm'));
+  return stops.map((stop) => {
+    stop.hourlyTimes = sortedFirstStopTimesAndIndex.map((item) =>
+      fromGTFSTime(stop.trips[item.idx].arrival_time).format(':mm')
+    );
 
     return stop;
   });
@@ -135,7 +157,15 @@ function filterHourlyTimes(stops) {
 /*
  * Format a calendar's list of days for display using abbreviated day names.
  */
-const days = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'];
+const days = [
+  'monday',
+  'tuesday',
+  'wednesday',
+  'thursday',
+  'friday',
+  'saturday',
+  'sunday',
+];
 export function formatDays(calendar, config) {
   const daysShort = config.daysShortStrings;
   let daysInARow = 0;
@@ -146,9 +176,9 @@ export function formatDays(calendar, config) {
   }
 
   for (let i = 0; i <= 6; i += 1) {
-    const currentDayOperating = (calendar[days[i]] === 1);
-    const previousDayOperating = (i > 0) ? (calendar[days[i - 1]] === 1) : false;
-    const nextDayOperating = (i < 6) ? (calendar[days[i + 1]] === 1) : false;
+    const currentDayOperating = calendar[days[i]] === 1;
+    const previousDayOperating = i > 0 ? calendar[days[i - 1]] === 1 : false;
+    const nextDayOperating = i < 6 ? calendar[days[i + 1]] === 1 : false;
 
     if (currentDayOperating) {
       if (dayString.length > 0) {
@@ -161,7 +191,12 @@ export function formatDays(calendar, config) {
 
       daysInARow += 1;
 
-      if (dayString.length === 0 || !nextDayOperating || i === 6 || !previousDayOperating) {
+      if (
+        dayString.length === 0 ||
+        !nextDayOperating ||
+        i === 6 ||
+        !previousDayOperating
+      ) {
         dayString += daysShort[i];
       }
     } else {
@@ -190,7 +225,7 @@ export function formatDaysLong(dayList, config) {
  */
 export function formatTrip(trip, timetable, calendars, config) {
   trip.calendar = find(calendars, {
-    service_id: trip.service_id
+    service_id: trip.service_id,
   });
   trip.dayList = formatDays(trip.calendar, config);
   trip.dayListLong = formatDaysLong(trip.dayList, config);
@@ -198,7 +233,9 @@ export function formatTrip(trip, timetable, calendars, config) {
   if (timetable.routes.length === 1) {
     trip.route_short_name = timetable.routes[0].route_short_name;
   } else {
-    const route = timetable.routes.find(route => route.route_id === trip.route_id);
+    const route = timetable.routes.find(
+      (route) => route.route_id === trip.route_id
+    );
     trip.route_short_name = route.route_short_name;
   }
 
@@ -236,7 +273,9 @@ export function formatFrequency(frequency, config) {
  * Generate a timetable id.
  */
 export function formatTimetableId(timetable) {
-  let timetableId = `${timetable.route_ids.join('_')}|${calendarToCalendarCode(timetable)}`;
+  let timetableId = `${timetable.route_ids.join('_')}|${calendarToCalendarCode(
+    timetable
+  )}`;
   if (!isNullOrEmpty(timetable.direction_id)) {
     timetableId += `|${timetable.direction_id}`;
   }
@@ -258,7 +297,7 @@ function createEmptyStoptime(stopId, tripId) {
     continuous_pickup: null,
     continuous_drop_off: null,
     shape_dist_traveled: null,
-    timepoint: null
+    timepoint: null,
   };
 }
 
@@ -288,7 +327,9 @@ export function formatStops(timetable, config) {
       if (stop.type === 'arrival' && idx < trip.stoptimes.length - 1) {
         const departureStoptime = clone(stoptime);
         departureStoptime.type = 'departure';
-        timetable.stops[stopIndex + 1].trips.push(formatStopTime(departureStoptime, timetable, config));
+        timetable.stops[stopIndex + 1].trips.push(
+          formatStopTime(departureStoptime, timetable, config)
+        );
       }
 
       // Show times if it is an arrival stop and is the first stoptime for the trip.
@@ -315,16 +356,53 @@ export function formatStops(timetable, config) {
   return timetable.stops;
 }
 
+/*
+ * Formats a stop name.
+ */
+export function formatStopName(stop) {
+  return `${stop.stop_name}${
+    stop.type === 'arrival'
+      ? ' (Arrival)'
+      : stop.type === 'departure'
+      ? ' (Departure)'
+      : ''
+  }`;
+}
+
+/*
+ * Formats trip "Contines from".
+ */
+export function formatTripContinuesFrom(trip) {
+  return trip.continues_from_route
+    ? trip.continues_from_route.route.route_short_name
+    : '';
+}
+
+/*
+ * Formats trip "Contines as".
+ */
+export function formatTripContinuesAs(trip) {
+  return trip.continues_as_route
+    ? trip.continues_as_route.route.route_short_name
+    : '';
+}
+
 /*
  * Change all stoptimes of a trip so the first trip starts at midnight. Useful
  * for hourly schedules.
  */
 export function resetStoptimesToMidnight(trip) {
-  const offsetSeconds = secondsAfterMidnight(first(trip.stoptimes).departure_time);
+  const offsetSeconds = secondsAfterMidnight(
+    first(trip.stoptimes).departure_time
+  );
   if (offsetSeconds > 0) {
     for (const stoptime of trip.stoptimes) {
-      stoptime.departure_time = toGTFSTime(fromGTFSTime(stoptime.departure_time).subtract(offsetSeconds, 'seconds'));
-      stoptime.arrival_time = toGTFSTime(fromGTFSTime(stoptime.arrival_time).subtract(offsetSeconds, 'seconds'));
+      stoptime.departure_time = toGTFSTime(
+        fromGTFSTime(stoptime.departure_time).subtract(offsetSeconds, 'seconds')
+      );
+      stoptime.arrival_time = toGTFSTime(
+        fromGTFSTime(stoptime.arrival_time).subtract(offsetSeconds, 'seconds')
+      );
     }
   }
 
@@ -336,10 +414,16 @@ export function resetStoptimesToMidnight(trip) {
  * hourly schedules.
  */
 export function updateStoptimesByOffset(trip, offsetSeconds) {
-  return trip.stoptimes.map(stoptime => {
+  return trip.stoptimes.map((stoptime) => {
     delete stoptime._id;
-    stoptime.departure_time = updateTimeByOffset(stoptime.departure_time, offsetSeconds);
-    stoptime.arrival_time = updateTimeByOffset(stoptime.arrival_time, offsetSeconds);
+    stoptime.departure_time = updateTimeByOffset(
+      stoptime.departure_time,
+      offsetSeconds
+    );
+    stoptime.arrival_time = updateTimeByOffset(
+      stoptime.arrival_time,
+      offsetSeconds
+    );
     stoptime.trip_id = trip.trip_id;
     return stoptime;
   });
@@ -392,9 +476,18 @@ export function formatTimetablePageLabel(timetablePage) {
   }
 
   // Get label from first timetable.
-  if (timetablePage.consolidatedTimetables && timetablePage.consolidatedTimetables.length > 0) {
-    const routes = uniqBy(flatMap(timetablePage.consolidatedTimetables, timetable => timetable.routes), 'route_id');
-    const timetablePageLabel = routes.map(route => formatRouteName(route));
+  if (
+    timetablePage.consolidatedTimetables &&
+    timetablePage.consolidatedTimetables.length > 0
+  ) {
+    const routes = uniqBy(
+      flatMap(
+        timetablePage.consolidatedTimetables,
+        (timetable) => timetable.routes
+      ),
+      'route_id'
+    );
+    const timetablePageLabel = routes.map((route) => formatRouteName(route));
 
     return timetablePageLabel.join(' and ');
   }
@@ -412,10 +505,12 @@ export function mergeTimetablesWithSameId(timetables) {
 
   const mergedTimetables = groupBy(timetables, 'timetable_id');
 
-  return Object.values(mergedTimetables).map(timetableGroup => {
+  return Object.values(mergedTimetables).map((timetableGroup) => {
     const mergedTimetable = omit(timetableGroup[0], 'route_id');
 
-    mergedTimetable.route_ids = timetableGroup.map(timetable => timetable.route_id);
+    mergedTimetable.route_ids = timetableGroup.map(
+      (timetable) => timetable.route_id
+    );
 
     return mergedTimetable;
   });

package/lib/geojson-utils.js

@@ -6,14 +6,15 @@ import { featureCollection } from '@turf/helpers';
 /*
  * Merge any number of geojson objects into one. Only works for `FeatureCollection`.
  */
-const mergeGeojson = (...geojsons) => featureCollection(flatMap(geojsons, geojson => geojson.features));
+const mergeGeojson = (...geojsons) =>
+  featureCollection(flatMap(geojsons, (geojson) => geojson.features));
 
 /*
  * Truncate a coordinate to a specific number of decimal places.
  */
 const truncateCoordinate = (coordinate, precision) => [
-  Math.round(coordinate[0] * (10 ** precision)) / (10 ** precision),
-  Math.round(coordinate[1] * (10 ** precision)) / (10 ** precision)
+  Math.round(coordinate[0] * 10 ** precision) / 10 ** precision,
+  Math.round(coordinate[1] * 10 ** precision) / 10 ** precision,
 ];
 
 /*
@@ -23,9 +24,15 @@ const truncateGeoJSONDecimals = (geojson, config) => {
   for (const feature of geojson.features) {
     if (feature.geometry.coordinates) {
       if (feature.geometry.type.toLowerCase() === 'point') {
-        feature.geometry.coordinates = truncateCoordinate(feature.geometry.coordinates, config.coordinatePrecision);
+        feature.geometry.coordinates = truncateCoordinate(
+          feature.geometry.coordinates,
+          config.coordinatePrecision
+        );
       } else if (feature.geometry.type.toLowerCase() === 'linestring') {
-        feature.geometry.coordinates = feature.geometry.coordinates.map(coordinate => truncateCoordinate(coordinate, config.coordinatePrecision));
+        feature.geometry.coordinates = feature.geometry.coordinates.map(
+          (coordinate) =>
+            truncateCoordinate(coordinate, config.coordinatePrecision)
+        );
       }
     }
   }
@@ -39,8 +46,8 @@ const truncateGeoJSONDecimals = (geojson, config) => {
 const simplifyGeoJSON = (geojson, config) => {
   try {
     const simplifiedGeojson = simplify(geojson, {
-      tolerance: 1 / (10 ** config.coordinatePrecision),
-      highQuality: true
+      tolerance: 1 / 10 ** config.coordinatePrecision,
+      highQuality: true,
     });
 
     return truncateGeoJSONDecimals(simplifiedGeojson, config);
@@ -56,16 +63,24 @@ const simplifyGeoJSON = (geojson, config) => {
  */
 export async function getTimetableGeoJSON(timetable, config) {
   const [shapesGeojsons, stopsGeojsons] = await Promise.all([
-    await Promise.all(timetable.route_ids.map(routeId => getShapesAsGeoJSON({
-      route_id: routeId,
-      direction_id: timetable.direction_id,
-      trip_id: timetable.orderedTrips.map(trip => trip.trip_id)
-    }))),
-    await Promise.all(timetable.route_ids.map(routeId => getStopsAsGeoJSON({
-      route_id: routeId,
-      direction_id: timetable.direction_id,
-      trip_id: timetable.orderedTrips.map(trip => trip.trip_id)
-    })))
+    await Promise.all(
+      timetable.route_ids.map((routeId) =>
+        getShapesAsGeoJSON({
+          route_id: routeId,
+          direction_id: timetable.direction_id,
+          trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
+        })
+      )
+    ),
+    await Promise.all(
+      timetable.route_ids.map((routeId) =>
+        getStopsAsGeoJSON({
+          route_id: routeId,
+          direction_id: timetable.direction_id,
+          trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
+        })
+      )
+    ),
   ]);
 
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);

package/lib/gtfs-to-html.js

@@ -1,19 +1,41 @@
 import path from 'node:path';
 import { mkdir, writeFile } from 'node:fs/promises';
 
-import { each, map } from 'lodash-es';
+import { map } from 'lodash-es';
 import { openDb, getDb, importGtfs } from 'gtfs';
 import sanitize from 'sanitize-filename';
 import Timer from 'timer-machine';
 
-import { prepDirectory, copyStaticAssets, generateFolderName, renderPdf, zipFolder } from './file-utils.js';
-import { log, logWarning, logError, progressBar, generateLogText, logStats } from './log-utils.js';
-import { setDefaultConfig, getTimetablePagesForAgency, getFormattedTimetablePage, generateHTML, generateOverviewHTML } from './utils.js';
+import {
+  prepDirectory,
+  copyStaticAssets,
+  generateFolderName,
+  renderPdf,
+  zipFolder,
+  generateCSVFileName,
+} from './file-utils.js';
+import {
+  log,
+  logWarning,
+  logError,
+  progressBar,
+  generateLogText,
+  logStats,
+} from './log-utils.js';
+import {
+  setDefaultConfig,
+  getTimetablePagesForAgency,
+  getFormattedTimetablePage,
+  generateTimetableHTML,
+  generateTimetableCSV,
+  generateOverviewHTML,
+  generateStats,
+} from './utils.js';
 
 /*
  * Generate HTML timetables from GTFS.
  */
-const gtfsToHtml = async initialConfig => {
+const gtfsToHtml = async (initialConfig) => {
   const config = setDefaultConfig(initialConfig);
   const timer = new Timer();
 
@@ -23,9 +45,11 @@ const gtfsToHtml = async initialConfig => {
 
   timer.start();
 
-  await openDb(config).catch(error => {
+  await openDb(config).catch((error) => {
     if (error instanceof Error && error.code === 'SQLITE_CANTOPEN') {
-      config.logError(`Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`);
+      config.logError(
+        `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
+      );
     }
 
     throw error;
@@ -51,7 +75,9 @@ const gtfsToHtml = async initialConfig => {
     await importGtfs(config);
   }
 
-  const agencyKey = config.agencies.map(agency => agency.agency_key).join('-');
+  const agencyKey = config.agencies
+    .map((agency) => agency.agency_key)
+    .join('-');
   const exportPath = path.join(process.cwd(), 'html', sanitize(agencyKey));
   const outputStats = {
     timetables: 0,
@@ -60,14 +86,17 @@ const gtfsToHtml = async initialConfig => {
     trips: 0,
     routes: 0,
     stops: 0,
-    warnings: []
+    warnings: [],
   };
 
   const timetablePages = [];
-  const timetablePageIds = map(await getTimetablePagesForAgency(config), 'timetable_page_id');
+  const timetablePageIds = map(
+    await getTimetablePagesForAgency(config),
+    'timetable_page_id'
+  );
   await prepDirectory(exportPath);
 
-  if (config.noHead !== true) {
+  if (config.noHead !== true && ['html', 'pdf'].includes(config.outputFormat)) {
     copyStaticAssets(exportPath);
   }
 
@@ -80,10 +109,15 @@ const gtfsToHtml = async initialConfig => {
   /* eslint-disable no-await-in-loop */
   for (const timetablePageId of timetablePageIds) {
     try {
-      const timetablePage = await getFormattedTimetablePage(timetablePageId, config);
+      const timetablePage = await getFormattedTimetablePage(
+        timetablePageId,
+        config
+      );
 
       if (timetablePage.consolidatedTimetables.length === 0) {
-        throw new Error(`No timetables found for timetable_page_id=${timetablePage.timetable_page_id}`);
+        throw new Error(
+          `No timetables found for timetable_page_id=${timetablePage.timetable_page_id}`
+        );
       }
 
       for (const timetable of timetablePage.timetables) {
@@ -102,24 +136,43 @@ const gtfsToHtml = async initialConfig => {
       await mkdir(path.join(exportPath, datePath), { recursive: true });
       config.assetPath = '../';
 
-      timetablePage.relativePath = path.join(datePath, sanitize(timetablePage.filename));
-
-      const results = await generateHTML(timetablePage, config);
-
-      each(outputStats, (stat, key) => {
-        if (results.stats[key]) {
-          outputStats[key] += results.stats[key];
+      timetablePage.relativePath = path.join(
+        datePath,
+        sanitize(timetablePage.filename)
+      );
+
+      if (config.outputFormat === 'csv') {
+        for (const timetable of timetablePage.timetables) {
+          const csv = await generateTimetableCSV(timetable);
+          const csvPath = path.join(
+            exportPath,
+            datePath,
+            generateCSVFileName(timetable, timetablePage)
+          );
+          await writeFile(csvPath, csv);
+        }
+      } else {
+        const html = await generateTimetableHTML(timetablePage, config);
+        const htmlPath = path.join(
+          exportPath,
+          datePath,
+          sanitize(timetablePage.filename)
+        );
+        await writeFile(htmlPath, html);
+
+        if (config.outputFormat === 'pdf') {
+          await renderPdf(htmlPath);
         }
-      });
-
-      const htmlPath = path.join(exportPath, datePath, sanitize(timetablePage.filename));
-      await writeFile(htmlPath, results.html);
-
-      if (config.outputFormat === 'pdf') {
-        await renderPdf(htmlPath);
       }
 
       timetablePages.push(timetablePage);
+      const timetableStats = generateStats(timetablePage);
+
+      for (const key of Object.keys(outputStats)) {
+        if (timetableStats[key]) {
+          outputStats[key] += timetableStats[key];
+        }
+      }
     } catch (error) {
       outputStats.warnings.push(error.message);
       bar.interrupt(error.message);
@@ -129,10 +182,12 @@ const gtfsToHtml = async initialConfig => {
   }
   /* eslint-enable no-await-in-loop */
 
-  // Generate route summary index.html
-  config.assetPath = '';
-  const html = await generateOverviewHTML(timetablePages, config);
-  await writeFile(path.join(exportPath, 'index.html'), html);
+  if (config.outputFormat === 'html') {
+    // Generate route summary index.html
+    config.assetPath = '';
+    const html = await generateOverviewHTML(timetablePages, config);
+    await writeFile(path.join(exportPath, 'index.html'), html);
+  }
 
   // Generate output log.txt
   const logText = await generateLogText(outputStats, config);
@@ -143,15 +198,22 @@ const gtfsToHtml = async initialConfig => {
     await zipFolder(exportPath);
   }
 
-  const fullExportPath = path.join(exportPath, config.zipOutput ? '/timetables.zip' : '');
+  const fullExportPath = path.join(
+    exportPath,
+    config.zipOutput ? '/timetables.zip' : ''
+  );
 
   // Print stats
-  config.log(`${agencyKey}: ${config.outputFormat.toUpperCase()} timetables created at ${fullExportPath}`);
+  config.log(
+    `${agencyKey}: ${config.outputFormat.toUpperCase()} timetables created at ${fullExportPath}`
+  );
 
   logStats(outputStats, config);
 
   const seconds = Math.round(timer.time() / 1000);
-  config.log(`${agencyKey}: ${config.outputFormat.toUpperCase()} timetable generation required ${seconds} seconds`);
+  config.log(
+    `${agencyKey}: ${config.outputFormat.toUpperCase()} timetable generation required ${seconds} seconds`
+  );
 
   timer.stop();
 };

package/lib/log-utils.js

@@ -13,7 +13,10 @@ pe.start();
  */
 export async function generateLogText(outputStats, config) {
   const feedInfo = await getFeedInfo();
-  const feedVersion = (feedInfo.length > 0 && feedInfo[0].feed_version) ? feedInfo[0].feed_version : 'Unknown';
+  const feedVersion =
+    feedInfo.length > 0 && feedInfo[0].feed_version
+      ? feedInfo[0].feed_version
+      : 'Unknown';
 
   const logText = [
     `Feed Version: ${feedVersion}`,
@@ -24,7 +27,7 @@ export async function generateLogText(outputStats, config) {
     `Calendar Service ID Count: ${outputStats.calendars}`,
     `Route Count: ${outputStats.routes}`,
     `Trip Count: ${outputStats.trips}`,
-    `Stop Count: ${outputStats.stops}`
+    `Stop Count: ${outputStats.stops}`,
   ];
 
   for (const agency of config.agencies) {
@@ -74,7 +77,7 @@ export function logWarning(config) {
     return config.logFunction;
   }
 
-  return text => {
+  return (text) => {
     process.stdout.write(`\n${formatWarning(text)}\n`);
   };
 }
@@ -87,7 +90,7 @@ export function logError(config) {
     return config.logFunction;
   }
 
-  return text => {
+  return (text) => {
     process.stdout.write(`\n${formatError(text)}\n`);
   };
 }
@@ -96,7 +99,9 @@ export function logError(config) {
  * Format console warning text
  */
 export function formatWarning(text) {
-  return `${chalk.yellow.underline('Warning')}${chalk.yellow(':')} ${chalk.yellow(text)}`;
+  return `${chalk.yellow.underline('Warning')}${chalk.yellow(
+    ':'
+  )} ${chalk.yellow(text)}`;
 }
 
 /*
@@ -104,7 +109,9 @@ export function formatWarning(text) {
  */
 export function formatError(error) {
   const message = error instanceof Error ? error.message : error;
-  return `${chalk.red.underline('Error')}${chalk.red(':')} ${chalk.red(message.replace('Error: ', ''))}`;
+  return `${chalk.red.underline('Error')}${chalk.red(':')} ${chalk.red(
+    message.replace('Error: ', '')
+  )}`;
 }
 
 /*
@@ -118,7 +125,7 @@ export function logStats(stats, config) {
 
   const table = new Table({
     colWidths: [40, 20],
-    head: ['Item', 'Count']
+    head: ['Item', 'Count'],
   });
 
   table.push(
@@ -165,7 +172,7 @@ const generateProgressBarString = (barTotal, barProgress, size = 40) => {
   }
 
   const percentage = barProgress / barTotal;
-  const progress = Math.round((size * percentage));
+  const progress = Math.round(size * percentage);
   const emptyProgress = size - progress;
   const progressText = slider.repeat(progress);
   const emptyProgressText = line.repeat(emptyProgress);
@@ -181,7 +188,7 @@ export function progressBar(formatString, barTotal, config) {
   if (config.verbose === false) {
     return {
       increment: noop,
-      interrupt: noop
+      interrupt: noop,
     };
   }
 
@@ -189,15 +196,16 @@ export function progressBar(formatString, barTotal, config) {
     return null;
   }
 
-  const renderProgressString = () => formatString
-    .replace('{value}', barProgress)
-    .replace('{total}', barTotal)
-    .replace('{bar}', generateProgressBarString(barTotal, barProgress));
+  const renderProgressString = () =>
+    formatString
+      .replace('{value}', barProgress)
+      .replace('{total}', barTotal)
+      .replace('{bar}', generateProgressBarString(barTotal, barProgress));
 
   config.log(renderProgressString(), true);
 
   return {
-    interrupt: text => {
+    interrupt: (text) => {
       // Log two lines to avoid overwrite by progress bar
       config.logWarning(text);
       config.logWarning('');
@@ -205,6 +213,6 @@ export function progressBar(formatString, barTotal, config) {
     increment: () => {
       barProgress += 1;
       config.log(renderProgressString(), true);
-    }
+    },
   };
 }