gtfs 4.15.5 → 4.15.6

package/dist/bin/gtfs-export.js

@@ -21,65 +21,47 @@ import StreamZip from "node-stream-zip";
 async function getConfig(argv2) {
   let config;
   let data;
-  if (argv2.configPath) {
-    try {
-      data = await readFile(path.resolve(untildify(argv2.configPath)), "utf8");
-    } catch (error) {
-      throw new Error(
-        `Cannot find configuration file at \`${argv2.configPath}\`. Use config-sample.json as a starting point.`
-      );
-    }
-    try {
+  try {
+    if (argv2.configPath) {
+      const configPath = path.resolve(untildify(argv2.configPath));
+      data = await readFile(configPath, "utf8");
       config = Object.assign(JSON.parse(data), argv2);
-    } catch (error) {
-      throw new Error(
-        `Cannot parse configuration file at \`${argv2.configPath}\`. Check to ensure that it is valid JSON.`
-      );
-    }
-  } else if (argv2.gtfsPath || argv2.gtfsUrl || argv2.sqlitePath) {
-    const agencies = [];
-    if (argv2.gtfsPath) {
-      agencies.push({
-        path: argv2.gtfsPath
-      });
-    }
-    if (argv2.gtfsUrl) {
-      agencies.push({
-        url: argv2.gtfsUrl
-      });
-    }
-    config = {
-      agencies,
-      ...omit(argv2, ["path", "url"])
-    };
-  } else if (existsSync(path.resolve("./config.json"))) {
-    try {
+    } else if (argv2.gtfsPath || argv2.gtfsUrl || argv2.sqlitePath) {
+      const agencies = [
+        ...argv2.gtfsPath ? [{ path: argv2.gtfsPath }] : [],
+        ...argv2.gtfsUrl ? [{ url: argv2.gtfsUrl }] : []
+      ];
+      config = {
+        agencies,
+        ...omit(argv2, ["path", "url"])
+      };
+    } else if (existsSync(path.resolve("./config.json"))) {
       data = await readFile(path.resolve("./config.json"), "utf8");
-    } catch (error) {
+      config = Object.assign(JSON.parse(data), argv2);
+      console.log("Using configuration from ./config.json");
+    } else {
       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.`
+        "Cannot find configuration file. Use config-sample.json as a starting point, pass --configPath option."
       );
     }
-    try {
-      config = Object.assign(JSON.parse(data), argv2);
-      console.log("Using configuration from ./config.json");
-    } catch (error) {
+    return config;
+  } catch (error) {
+    if (error instanceof SyntaxError) {
       throw new Error(
-        `Cannot parse configuration file at \`${path.resolve("./config.json")}\`. Check to ensure that it is valid JSON.`
+        `Cannot parse configuration file. Check to ensure that it is valid JSON. Error: ${error.message}`
       );
     }
-  } else {
-    throw new Error(
-      "Cannot find configuration file. Use config-sample.json as a starting point, pass --configPath option."
-    );
+    throw error;
   }
-  return config;
 }
 async function prepDirectory(exportPath) {
   await rm(exportPath, { recursive: true, force: true });
   await mkdir(exportPath, { recursive: true });
 }
 function generateFolderName(folderName) {
+  if (!folderName || typeof folderName !== "string") {
+    throw new Error("Folder name must be a non-empty string");
+  }
   return snakeCase(sanitize(folderName));
 }
 
@@ -88,14 +70,14 @@ import { clearLine, cursorTo } from "node:readline";
 import { noop } from "lodash-es";
 import * as colors from "yoctocolors";
 function log(config) {
-  if (config.verbose === false) {
+  if (!config.verbose) {
     return noop;
   }
   if (config.logFunction) {
     return config.logFunction;
   }
-  return (text, overwrite) => {
-    if (overwrite === true && process.stdout.isTTY) {
+  return (text, overwrite = false) => {
+    if (overwrite && process.stdout.isTTY) {
       clearLine(process.stdout, 0);
       cursorTo(process.stdout, 0);
     } else {
@@ -115,16 +97,12 @@ ${formatWarning(text)}
   };
 }
 function formatWarning(text) {
-  const warningMessage = `${colors.underline("Warning")}: ${text}`;
-  return colors.yellow(warningMessage);
+  return colors.yellow(`${colors.underline("Warning")}: ${text}`);
 }
 function formatError(error) {
   const messageText = error instanceof Error ? error.message : error;
-  const errorMessage = `${colors.underline("Error")}: ${messageText.replace(
-    "Error: ",
-    ""
-  )}`;
-  return colors.red(errorMessage);
+  const cleanMessage = messageText.replace(/^Error:\s*/i, "");
+  return colors.red(`${colors.underline("Error")}: ${cleanMessage}`);
 }
 
 // src/lib/import-gtfs.ts