gtfs 4.15.6 → 4.15.8

package/dist/index.js

@@ -152,7 +152,8 @@ var attributions = {
     {
       name: "attribution_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "agency_id",
@@ -585,26 +586,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
     }
   ]
@@ -811,14 +817,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
     }
   ]
 };
@@ -1079,12 +1087,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
     }
   ]
@@ -1308,16 +1318,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
     }
@@ -1504,21 +1517,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",
@@ -1652,6 +1663,7 @@ var timetablePages = {
       name: "timetable_page_id",
       type: "text",
       primary: true,
+      required: true,
       prefix: true
     },
     {
@@ -1671,28 +1683,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
     }
   ]
 };
@@ -1707,7 +1719,8 @@ var timetableNotes = {
       name: "note_id",
       type: "text",
       primary: true,
-      prefix: true
+      prefix: true,
+      required: true
     },
     {
       name: "symbol",
@@ -1716,7 +1729,8 @@ var timetableNotes = {
     {
       name: "note",
       type: "text",
-      nocase: true
+      nocase: true,
+      required: true
     }
   ]
 };
@@ -1730,37 +1744,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",
@@ -2394,7 +2410,7 @@ var tripUpdates = {
   extension: "gtfs-realtime",
   schema: [
     {
-      name: "update_id",
+      name: "id",
       type: "text",
       required: true,
       primary: true,
@@ -2558,7 +2574,7 @@ var vehiclePositions = {
   extension: "gtfs-realtime",
   schema: [
     {
-      name: "update_id",
+      name: "id",
       type: "text",
       required: true,
       primary: true,
@@ -2797,17 +2813,12 @@ var deadheadTimes = {
   nonstandard: true,
   extension: "ods",
   schema: [
-    {
-      name: "id",
-      type: "integer",
-      primary: true,
-      prefix: true
-    },
     {
       name: "deadhead_id",
       type: "text",
       required: true,
       index: true,
+      primary: true,
       prefix: true
     },
     {
@@ -2844,6 +2855,7 @@ var deadheadTimes = {
       name: "location_sequence",
       type: "integer",
       required: true,
+      primary: true,
       min: 0,
       index: true
     },
@@ -3170,6 +3182,58 @@ import { omit, snakeCase } from "lodash-es";
 import sanitize from "sanitize-filename";
 import untildify2 from "untildify";
 import StreamZip from "node-stream-zip";
+
+// src/lib/log-utils.ts
+import { clearLine, cursorTo } from "node:readline";
+import { noop } from "lodash-es";
+import * as colors from "yoctocolors";
+function log(config) {
+  if (config.verbose === false) {
+    return noop;
+  }
+  if (config.logFunction) {
+    return config.logFunction;
+  }
+  return (text, overwrite = false) => {
+    if (overwrite && process.stdout.isTTY) {
+      clearLine(process.stdout, 0);
+      cursorTo(process.stdout, 0);
+    } else {
+      process.stdout.write("\n");
+    }
+    process.stdout.write(text);
+  };
+}
+function logWarning(config) {
+  if (config.logFunction) {
+    return config.logFunction;
+  }
+  return (text) => {
+    process.stdout.write(`
+${formatWarning(text)}
+`);
+  };
+}
+function logError(config) {
+  if (config.logFunction) {
+    return config.logFunction;
+  }
+  return (text) => {
+    process.stdout.write(`
+${formatError(text)}
+`);
+  };
+}
+function formatWarning(text) {
+  return colors.yellow(`${colors.underline("Warning")}: ${text}`);
+}
+function formatError(error) {
+  const messageText = error instanceof Error ? error.message : error;
+  const cleanMessage = messageText.replace(/^Error:\s*/i, "");
+  return colors.red(`${colors.underline("Error")}: ${cleanMessage}`);
+}
+
+// src/lib/file-utils.ts
 async function prepDirectory(exportPath) {
   await rm(exportPath, { recursive: true, force: true });
   await mkdir(exportPath, { recursive: true });
@@ -3317,56 +3381,6 @@ import GtfsRealtimeBindings from "gtfs-realtime-bindings";
 import sqlString2 from "sqlstring-sqlite";
 import mapSeries from "promise-map-series";
 
-// src/lib/log-utils.ts
-import { clearLine, cursorTo } from "node:readline";
-import { noop } from "lodash-es";
-import * as colors from "yoctocolors";
-function log(config) {
-  if (!config.verbose) {
-    return noop;
-  }
-  if (config.logFunction) {
-    return config.logFunction;
-  }
-  return (text, overwrite = false) => {
-    if (overwrite && process.stdout.isTTY) {
-      clearLine(process.stdout, 0);
-      cursorTo(process.stdout, 0);
-    } else {
-      process.stdout.write("\n");
-    }
-    process.stdout.write(text);
-  };
-}
-function logWarning(config) {
-  if (config.logFunction) {
-    return config.logFunction;
-  }
-  return (text) => {
-    process.stdout.write(`
-${formatWarning(text)}
-`);
-  };
-}
-function logError(config) {
-  if (config.logFunction) {
-    return config.logFunction;
-  }
-  return (text) => {
-    process.stdout.write(`
-${formatError(text)}
-`);
-  };
-}
-function formatWarning(text) {
-  return colors.yellow(`${colors.underline("Warning")}: ${text}`);
-}
-function formatError(error) {
-  const messageText = error instanceof Error ? error.message : error;
-  const cleanMessage = messageText.replace(/^Error:\s*/i, "");
-  return colors.red(`${colors.underline("Error")}: ${cleanMessage}`);
-}
-
 // src/lib/utils.ts
 import sqlString from "sqlstring-sqlite";
 import Long from "long";
@@ -3388,7 +3402,8 @@ function setDefaultConfig(initialConfig) {
     sqlitePath: ":memory:",
     ignoreDuplicates: false,
     ignoreErrors: false,
-    gtfsRealtimeExpirationSeconds: 0
+    gtfsRealtimeExpirationSeconds: 0,
+    verbose: true
   };
   return {
     ...defaults,
@@ -3511,6 +3526,15 @@ function getDayOfWeekFromDate(date) {
   }
   return DAYS_OF_WEEK[dateObj.getDay()];
 }
+function formatCurrency(value, currency) {
+  const parts = new Intl.NumberFormat(void 0, {
+    style: "currency",
+    currency
+  }).formatToParts(value);
+  const integerPart = parts.find((part) => part.type === "integer")?.value ?? "0";
+  const fractionPart = parts.find((part) => part.type === "fraction")?.value ?? "";
+  return `${integerPart}${fractionPart !== "" ? `.${fractionPart}` : ""}`;
+}
 
 // src/lib/import-gtfs-realtime.ts
 function getNestedProperty(obj, defaultValue, path3) {
@@ -3907,18 +3931,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) {
@@ -3961,38 +3998,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];
@@ -4028,12 +4042,11 @@ var importGtfsFiles = (db, task) => mapSeries2(
       return;
     }
     task.log(`Importing - ${filename}\r`);
-    const columns = model.schema.filter((column) => column.name !== "id");
-    const placeholder = columns.map(({ name }) => `@${name}`).join(", ");
+    const placeholder = model.schema.map(({ name }) => `@${name}`).join(", ");
     const prefixedColumns = new Set(
-      columns.filter((col) => col.prefix).map((col) => col.name)
+      model.schema.filter((column) => column.prefix).map((column) => column.name)
     );
-    const prepareStatement = `INSERT ${task.ignoreDuplicates ? "OR IGNORE" : ""} INTO ${model.filenameBase} (${columns.map((column) => column.name).join(", ")}) VALUES (${placeholder})`;
+    const prepareStatement = `INSERT ${task.ignoreDuplicates ? "OR IGNORE" : ""} INTO ${model.filenameBase} (${model.schema.map((column) => column.name).join(", ")}) VALUES (${placeholder})`;
     const insert = db.prepare(prepareStatement);
     const insertLines = db.transaction((lines) => {
       for (const [rowNumber, line] of Object.entries(lines)) {
@@ -4061,7 +4074,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;
         }
@@ -4279,7 +4292,6 @@ var exportGtfs = async (initialConfig) => {
       }
       if (model.filenameExtension === "txt") {
         const excludeColumns = [
-          "id",
           "arrival_timestamp",
           "departure_timestamp",
           "start_timestamp",
@@ -4298,6 +4310,14 @@ var exportGtfs = async (initialConfig) => {
           if (!routesWithAgencyId || routesWithAgencyId.length === 0) {
             excludeColumns.push("agency_id");
           }
+        } else if (model.filenameBase === "fare_attributes") {
+          for (const line of lines) {
+            line.price = formatCurrency(line.price, line.currency_type);
+          }
+        } else if (model.filenameBase === "fare_products") {
+          for (const line of lines) {
+            line.price = formatCurrency(line.amount, line.currency);
+          }
         }
         const columns = without(
           model.schema.map((column) => column.name),