gtfs 4.10.3 → 4.10.4

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).
 
+## [4.10.4] - 2024-05-14
+
+### Updated
+
+- Improved error messages
+- Don't use pretty-error globally
+- Dependency updates
+
 ## [4.10.3] - 2024-05-12
 
 ### Added

package/bin/gtfs-export.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 { exportGtfs } from '../lib/gtfs.js';
 
+const pe = new PrettyError();
+
 const { argv } = yargs(hideBin(process.argv))
   .usage('Usage: $0 --configPath ./config.json')
   .help()
@@ -26,6 +29,7 @@ const { argv } = yargs(hideBin(process.argv))
 
 const handleError = (error = 'Unknown Error') => {
   process.stdout.write(`\n${formatError(error)}\n`);
+  console.error(pe.render(error));
   process.exit(1);
 };
 

package/bin/gtfs-import.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 { closeDb, importGtfs, openDb } from '../lib/gtfs.js';
 
+const pe = new PrettyError();
+
 const { argv } = yargs(hideBin(process.argv))
   .usage('Usage: $0 --configPath ./config.json')
   .help()
@@ -31,7 +34,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/bin/gtfsrealtime-update.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 { updateGtfsRealtime } from '../lib/gtfs.js';
 
+const pe = new PrettyError();
+
 const { argv } = yargs(hideBin(process.argv))
   .usage('Usage: $0 --configPath ./config.json')
   .help()
@@ -19,7 +22,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

@@ -11,43 +11,42 @@ import StreamZip from 'node-stream-zip';
  */
 export async function getConfig(argv) {
   let config;
+  let data;
 
   if (argv.configPath) {
     // If a `configPath` is specified, try to read it and throw error if it doesn't exist
     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;
-      });
+      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.`,
+      );
+    }
+
+    try {
       config = Object.assign(JSON.parse(data), argv);
     } 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;
     }
   } else if (existsSync(path.resolve('./config.json'))) {
     // Else if `config.json` exists, use config values read from it
     try {
-      const data = await readFile(path.resolve('./config.json'), 'utf8');
+      data = await readFile(path.resolve('./config.json'), 'utf8');
+    } catch (error) {
+      throw new Error(
+        `Cannot open configuration file at \`${path.resolve('./config.json')}\`. Check to ensure that it exists. Use config-sample.json as a starting point.`,
+      );
+    }
+
+    try {
       config = Object.assign(JSON.parse(data), argv);
       console.log('Using configuration from ./config.json');
     } catch (error) {
-      console.error(
-        new Error(
-          'Cannot parse configuration file at `./config.json`. Check to ensure that it is valid JSON.'
-        )
+      throw new Error(
+        `Cannot parse configuration file at \`${path.resolve('./config.json')}\`. Check to ensure that it is valid JSON.`,
       );
-      throw error;
     }
   } else if (argv.gtfsPath || argv.gtfsUrl) {
     // Use argv values from CLI
@@ -69,11 +68,9 @@ export async function getConfig(argv) {
       ...omit(argv, ['path', 'url']),
     };
   } else {
-    const error = new Error(
-      'Cannot find configuration file. Use config-sample.json as a starting point, pass --configPath option.'
+    throw new Error(
+      'Cannot find configuration file. Use config-sample.json as a starting point, pass --configPath option.',
     );
-    console.error(error);
-    throw error;
   }
 
   return config;

package/lib/import.js

@@ -348,7 +348,6 @@ const readFiles = async (task) => {
       }
     } catch (error) {
       task.error(error);
-      console.error(error);
       throw new Error(`Unable to unzip file ${task.path}`);
     }
   } else {

package/lib/log-utils.js

@@ -1,11 +1,7 @@
 import { clearLine, cursorTo } from 'node:readline';
-import PrettyError from 'pretty-error';
 import { noop } from 'lodash-es';
 import * as colors from 'yoctocolors';
 
-const pe = new PrettyError();
-pe.start();
-
 /*
  * Returns a log function based on config settings
  */
@@ -71,7 +67,7 @@ export function formatError(error) {
   const messageText = error instanceof Error ? error.message : error;
   const errorMessage = `${colors.underline('Error')}: ${messageText.replace(
     'Error: ',
-    ''
+    '',
   )}`;
   return colors.red(errorMessage);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.10.3",
+  "version": "4.10.4",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -78,8 +78,8 @@
   "dependencies": {
     "@turf/helpers": "^6.5.0",
     "better-sqlite3": "^10.0.0",
-    "csv-parse": "^5.5.5",
-    "csv-stringify": "^6.4.6",
+    "csv-parse": "^5.5.6",
+    "csv-stringify": "^6.5.0",
     "gtfs-realtime-bindings": "^1.1.1",
     "lodash-es": "^4.17.21",
     "long": "^5.2.3",
@@ -95,7 +95,7 @@
     "tmp-promise": "^3.0.3",
     "untildify": "^5.0.0",
     "yargs": "^17.7.2",
-    "yoctocolors": "^2.0.0"
+    "yoctocolors": "^2.0.2"
   },
   "devDependencies": {
     "husky": "^9.0.11",