gtfs 4.15.5 → 4.15.7

package/dist/bin/gtfs-import.js

@@ -18,68 +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 unzip(zipfilePath, exportPath) {
-  const zip = new StreamZip.async({ file: zipfilePath });
-  await zip.extract(null, exportPath);
-  await zip.close();
-}
 
 // src/lib/log-utils.ts
 import { clearLine, cursorTo } from "node:readline";
@@ -92,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 {
@@ -123,16 +61,61 @@ ${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/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 unzip(zipfilePath, exportPath) {
+  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/import-gtfs.ts
@@ -283,7 +266,8 @@ var attributions = {
     {
       name: "attribution_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "agency_id",
@@ -716,26 +700,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
     }
   ]
@@ -942,14 +931,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
     }
   ]
 };
@@ -1210,12 +1201,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
     }
   ]
@@ -1439,16 +1432,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
     }
@@ -1635,21 +1631,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",
@@ -1783,6 +1777,7 @@ var timetablePages = {
       name: "timetable_page_id",
       type: "text",
       primary: true,
+      required: true,
       prefix: true
     },
     {
@@ -1802,28 +1797,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
     }
   ]
 };
@@ -1838,7 +1833,8 @@ var timetableNotes = {
       name: "note_id",
       type: "text",
       primary: true,
-      prefix: true
+      prefix: true,
+      required: true
     },
     {
       name: "symbol",
@@ -1847,7 +1843,8 @@ var timetableNotes = {
     {
       name: "note",
       type: "text",
-      nocase: true
+      nocase: true,
+      required: true
     }
   ]
 };
@@ -1861,37 +1858,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",
@@ -3291,10 +3290,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
@@ -3324,7 +3323,8 @@ function setDefaultConfig(initialConfig) {
     sqlitePath: ":memory:",
     ignoreDuplicates: false,
     ignoreErrors: false,
-    gtfsRealtimeExpirationSeconds: 0
+    gtfsRealtimeExpirationSeconds: 0,
+    verbose: true
   };
   return {
     ...defaults,
@@ -3333,14 +3333,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"));
@@ -3670,18 +3673,31 @@ var createGtfsTables = (db) => {
       return;
     }
     const columns = model.schema.map((column) => {
-      let check = "";
+      const checks = [];
       if (column.min !== void 0 && column.max) {
-        check = `CHECK( ${column.name} >= ${column.min} AND ${column.name} <= ${column.max} )`;
+        checks.push(
+          `${column.name} >= ${column.min} AND ${column.name} <= ${column.max}`
+        );
       } else if (column.min) {
-        check = `CHECK( ${column.name} >= ${column.min} )`;
+        checks.push(`${column.name} >= ${column.min}`);
       } else if (column.max) {
-        check = `CHECK( ${column.name} <= ${column.max} )`;
+        checks.push(`${column.name} <= ${column.max}`);
+      }
+      if (column.type === "integer") {
+        checks.push(
+          `(TYPEOF(${column.name}) = 'integer' OR ${column.name} IS NULL)`
+        );
+      }
+      if (column.type === "real") {
+        checks.push(
+          `(TYPEOF(${column.name}) = 'real' OR ${column.name} IS NULL)`
+        );
       }
       const required = column.required ? "NOT NULL" : "";
       const columnDefault = column.default ? "DEFAULT " + column.default : "";
       const columnCollation = column.nocase ? "COLLATE NOCASE" : "";
-      return `${column.name} ${column.type} ${check} ${required} ${columnDefault} ${columnCollation}`;
+      const checkClause = checks.length > 0 ? `CHECK(${checks.join(" AND ")})` : "";
+      return `${column.name} ${column.type} ${checkClause} ${required} ${columnDefault} ${columnCollation}`;
     });
     const primaryColumns = model.schema.filter((column) => column.primary);
     if (primaryColumns.length > 0) {
@@ -3724,38 +3740,15 @@ var formatGtfsLine = (line, model, totalLineCount) => {
       }
       continue;
     }
-    switch (type) {
-      case "date":
-        value = value.replace(/-/g, "");
-        if (value.length !== 8) {
-          throw new Error(
-            `Invalid date in ${filenameBase}.${filenameExtension} for ${name} on line ${lineNumber}.`
-          );
-        }
-        value = parseInt(value, 10);
-        break;
-      case "integer":
-        value = parseInt(value, 10);
-        break;
-      case "real":
-        value = parseFloat(value);
-        break;
-    }
-    if (Number.isNaN(value)) {
-      formattedLine[name] = null;
-      continue;
+    if (type === "date") {
+      value = value.replace(/-/g, "");
+      if (value.length !== 8) {
+        throw new Error(
+          `Invalid date in ${filenameBase}.${filenameExtension} for ${name} on line ${lineNumber}.`
+        );
+      }
     }
     formattedLine[name] = value;
-    if (min !== void 0 && value < min) {
-      throw new Error(
-        `Invalid value in ${filenameBase}.${filenameExtension} for ${name} on line ${lineNumber}: below minimum value of ${min}.`
-      );
-    }
-    if (max !== void 0 && value > max) {
-      throw new Error(
-        `Invalid value in ${filenameBase}.${filenameExtension} for ${name} on line ${lineNumber}: above maximum value of ${max}.`
-      );
-    }
   }
   for (const [timeColumnName, timestampColumnName] of TIME_COLUMN_PAIRS) {
     const value = formattedLine[timeColumnName];
@@ -3824,7 +3817,7 @@ var importGtfsFiles = (db, task) => mapSeries2(
             );
           }
           task.logWarning(
-            `Check ${filename} for invalid data on row ${rowNumber}.`
+            `Check ${filename} for invalid data on line ${rowNumber + 1}.`
           );
           throw error;
         }