gtfs 4.15.4 → 4.15.6

package/dist/bin/gtfs-import.js

@@ -21,64 +21,49 @@ 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 unzip(zipfilePath, exportPath) {
-  const zip = new StreamZip.async({ file: zipfilePath });
-  await zip.extract(null, exportPath);
-  await zip.close();
+  try {
+    const zip = new StreamZip.async({ file: zipfilePath });
+    await zip.extract(null, exportPath);
+    await zip.close();
+  } catch (error) {
+    throw new Error(
+      `Failed to extract zip file: ${error instanceof Error ? error.message : "Unknown error"}`
+    );
+  }
 }
 
 // src/lib/log-utils.ts
@@ -86,14 +71,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 {
@@ -123,16 +108,12 @@ ${formatError(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
@@ -3291,10 +3272,10 @@ import { feature, featureCollection } from "@turf/helpers";
 function isValidJSON(string) {
   try {
     JSON.parse(string);
+    return true;
   } catch (error) {
     return false;
   }
-  return true;
 }
 
 // src/lib/import-gtfs-realtime.ts
@@ -3333,14 +3314,17 @@ function setDefaultConfig(initialConfig) {
 }
 function convertLongTimeToDate(longDate) {
   const { high, low, unsigned } = longDate;
-  return new Date(new Long(low, high, unsigned).toInt() * 1e3).toISOString();
+  return new Date(
+    Long.fromBits(low, high, unsigned).toNumber() * 1e3
+  ).toISOString();
 }
 function calculateSecondsFromMidnight(time) {
-  const split = time.split(":").map((d) => Number.parseInt(d, 10));
-  if (split.length !== 3) {
+  if (!time || typeof time !== "string") return null;
+  const [hours, minutes, seconds] = time.split(":").map(Number);
+  if ([hours, minutes, seconds].some(isNaN) || hours >= 24 || minutes >= 60 || seconds >= 60) {
     return null;
   }
-  return split[0] * 3600 + split[1] * 60 + split[2];
+  return hours * 3600 + minutes * 60 + seconds;
 }
 function padLeadingZeros(time) {
   const split = time.split(":").map((d) => String(Number(d)).padStart(2, "0"));
@@ -3793,6 +3777,9 @@ var importGtfsFiles = (db, task) => mapSeries2(
     task.log(`Importing - ${filename}\r`);
     const columns = model.schema.filter((column) => column.name !== "id");
     const placeholder = columns.map(({ name }) => `@${name}`).join(", ");
+    const prefixedColumns = new Set(
+      columns.filter((col) => col.prefix).map((col) => col.name)
+    );
     const prepareStatement = `INSERT ${task.ignoreDuplicates ? "OR IGNORE" : ""} INTO ${model.filenameBase} (${columns.map((column) => column.name).join(", ")}) VALUES (${placeholder})`;
     const insert = db.prepare(prepareStatement);
     const insertLines = db.transaction((lines) => {
@@ -3806,7 +3793,7 @@ var importGtfsFiles = (db, task) => mapSeries2(
                 line
               ).map(([columnName, value]) => [
                 columnName,
-                columns.find((col) => col.name === columnName)?.prefix ? `${task.prefix}${value}` : value
+                prefixedColumns.has(columnName) && value !== null ? `${task.prefix}${value}` : value
               ])
             );
             insert.run(prefixedLine);