gtfs 4.15.5 → 4.15.7

package/dist/bin/gtfs-export.js

@@ -18,70 +18,6 @@ import { omit, snakeCase } from "lodash-es";
 import sanitize from "sanitize-filename";
 import untildify from "untildify";
 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 {
-      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 {
-      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), argv2);
-      console.log("Using configuration from ./config.json");
-    } catch (error) {
-      throw new Error(
-        `Cannot parse configuration file at \`${path.resolve("./config.json")}\`. Check to ensure that it is valid JSON.`
-      );
-    }
-  } else {
-    throw new Error(
-      "Cannot find configuration file. Use config-sample.json as a starting point, pass --configPath option."
-    );
-  }
-  return config;
-}
-async function prepDirectory(exportPath) {
-  await rm(exportPath, { recursive: true, force: true });
-  await mkdir(exportPath, { recursive: true });
-}
-function generateFolderName(folderName) {
-  return snakeCase(sanitize(folderName));
-}
 
 // src/lib/log-utils.ts
 import { clearLine, cursorTo } from "node:readline";
@@ -94,8 +30,8 @@ function log(config) {
   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 +51,60 @@ ${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/file-utils.ts
+async function getConfig(argv2) {
+  let config;
+  let data;
+  try {
+    if (argv2.configPath) {
+      const configPath = path.resolve(untildify(argv2.configPath));
+      data = await readFile(configPath, "utf8");
+      config = Object.assign(JSON.parse(data), argv2);
+    } 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");
+      config = Object.assign(JSON.parse(data), argv2);
+      log(config)("Using configuration from ./config.json");
+    } else {
+      throw new Error(
+        "Cannot find configuration file. Use config-sample.json as a starting point, pass --configPath option."
+      );
+    }
+    return config;
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      throw new Error(
+        `Cannot parse configuration file. Check to ensure that it is valid JSON. Error: ${error.message}`
+      );
+    }
+    throw error;
+  }
+}
+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));
 }
 
 // src/lib/import-gtfs.ts
@@ -272,7 +252,8 @@ var attributions = {
     {
       name: "attribution_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "agency_id",
@@ -705,26 +686,31 @@ var fareRules = {
       name: "fare_id",
       type: "text",
       required: true,
+      primary: true,
       prefix: true
     },
     {
       name: "route_id",
       type: "text",
+      primary: true,
       prefix: true
     },
     {
       name: "origin_id",
       type: "text",
+      primary: true,
       prefix: true
     },
     {
       name: "destination_id",
       type: "text",
+      primary: true,
       prefix: true
     },
     {
       name: "contains_id",
       type: "text",
+      primary: true,
       prefix: true
     }
   ]
@@ -931,14 +917,16 @@ var locationGroupStops = {
       type: "text",
       prefix: true,
       index: true,
-      required: true
+      required: true,
+      primary: true
     },
     {
       name: "stop_id",
       type: "text",
       required: true,
       prefix: true,
-      index: true
+      index: true,
+      primary: true
     }
   ]
 };
@@ -1199,12 +1187,14 @@ var stopAreas = {
       name: "area_id",
       type: "text",
       required: true,
+      primary: true,
       prefix: true
     },
     {
       name: "stop_id",
       type: "text",
       required: true,
+      primary: true,
       prefix: true
     }
   ]
@@ -1428,16 +1418,19 @@ var timeframes = {
     },
     {
       name: "start_time",
-      type: "text"
+      type: "text",
+      primary: true
     },
     {
       name: "end_time",
-      type: "text"
+      type: "text",
+      primary: true
     },
     {
       name: "service_id",
       type: "text",
       required: true,
+      primary: true,
       index: true,
       prefix: true
     }
@@ -1624,21 +1617,19 @@ var timetables = {
   filenameExtension: "txt",
   nonstandard: true,
   schema: [
-    {
-      name: "id",
-      type: "integer",
-      primary: true,
-      prefix: true
-    },
     {
       name: "timetable_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      required: true,
+      primary: true
     },
     {
       name: "route_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      required: true,
+      primary: true
     },
     {
       name: "direction_id",
@@ -1772,6 +1763,7 @@ var timetablePages = {
       name: "timetable_page_id",
       type: "text",
       primary: true,
+      required: true,
       prefix: true
     },
     {
@@ -1791,28 +1783,28 @@ var timetableStopOrder = {
   filenameExtension: "txt",
   nonstandard: true,
   schema: [
-    {
-      name: "id",
-      type: "integer",
-      primary: true,
-      prefix: true
-    },
     {
       name: "timetable_id",
       type: "text",
       index: true,
-      prefix: true
+      prefix: true,
+      required: true,
+      primary: true
     },
     {
       name: "stop_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      required: true,
+      primary: true
     },
     {
       name: "stop_sequence",
       type: "integer",
       min: 0,
-      index: true
+      index: true,
+      required: true,
+      primary: true
     }
   ]
 };
@@ -1827,7 +1819,8 @@ var timetableNotes = {
       name: "note_id",
       type: "text",
       primary: true,
-      prefix: true
+      prefix: true,
+      required: true
     },
     {
       name: "symbol",
@@ -1836,7 +1829,8 @@ var timetableNotes = {
     {
       name: "note",
       type: "text",
-      nocase: true
+      nocase: true,
+      required: true
     }
   ]
 };
@@ -1850,37 +1844,39 @@ var timetableNotesReferences = {
     {
       name: "note_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      required: true,
+      primary: true
     },
     {
       name: "timetable_id",
       type: "text",
-      index: true,
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "route_id",
       type: "text",
-      index: true,
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "trip_id",
       type: "text",
-      index: true,
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "stop_id",
       type: "text",
-      index: true,
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "stop_sequence",
       type: "integer",
       min: 0,
-      index: true
+      primary: true
     },
     {
       name: "show_on_stoptime",
@@ -3275,7 +3271,8 @@ function setDefaultConfig(initialConfig) {
     sqlitePath: ":memory:",
     ignoreDuplicates: false,
     ignoreErrors: false,
-    gtfsRealtimeExpirationSeconds: 0
+    gtfsRealtimeExpirationSeconds: 0,
+    verbose: true
   };
   return {
     ...defaults,