gtfs 4.15.6 → 4.15.8

package/dist/bin/gtfs-export.js

@@ -18,6 +18,48 @@ import { omit, snakeCase } from "lodash-es";
 import sanitize from "sanitize-filename";
 import untildify 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 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 getConfig(argv2) {
   let config;
   let data;
@@ -38,7 +80,7 @@ async function getConfig(argv2) {
     } else if (existsSync(path.resolve("./config.json"))) {
       data = await readFile(path.resolve("./config.json"), "utf8");
       config = Object.assign(JSON.parse(data), argv2);
-      console.log("Using configuration from ./config.json");
+      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."
@@ -65,46 +107,6 @@ function generateFolderName(folderName) {
   return snakeCase(sanitize(folderName));
 }
 
-// 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 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/import-gtfs.ts
 import { parse } from "csv-parse";
 import pluralize2 from "pluralize";
@@ -250,7 +252,8 @@ var attributions = {
     {
       name: "attribution_id",
       type: "text",
-      prefix: true
+      prefix: true,
+      primary: true
     },
     {
       name: "agency_id",
@@ -683,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
     }
   ]
@@ -909,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
     }
   ]
 };
@@ -1177,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
     }
   ]
@@ -1406,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
     }
@@ -1602,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",
@@ -1750,6 +1763,7 @@ var timetablePages = {
       name: "timetable_page_id",
       type: "text",
       primary: true,
+      required: true,
       prefix: true
     },
     {
@@ -1769,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
     }
   ]
 };
@@ -1805,7 +1819,8 @@ var timetableNotes = {
       name: "note_id",
       type: "text",
       primary: true,
-      prefix: true
+      prefix: true,
+      required: true
     },
     {
       name: "symbol",
@@ -1814,7 +1829,8 @@ var timetableNotes = {
     {
       name: "note",
       type: "text",
-      nocase: true
+      nocase: true,
+      required: true
     }
   ]
 };
@@ -1828,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",
@@ -2492,7 +2510,7 @@ var tripUpdates = {
   extension: "gtfs-realtime",
   schema: [
     {
-      name: "update_id",
+      name: "id",
       type: "text",
       required: true,
       primary: true,
@@ -2656,7 +2674,7 @@ var vehiclePositions = {
   extension: "gtfs-realtime",
   schema: [
     {
-      name: "update_id",
+      name: "id",
       type: "text",
       required: true,
       primary: true,
@@ -2895,17 +2913,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
     },
     {
@@ -2942,6 +2955,7 @@ var deadheadTimes = {
       name: "location_sequence",
       type: "integer",
       required: true,
+      primary: true,
       min: 0,
       index: true
     },
@@ -3253,13 +3267,23 @@ function setDefaultConfig(initialConfig) {
     sqlitePath: ":memory:",
     ignoreDuplicates: false,
     ignoreErrors: false,
-    gtfsRealtimeExpirationSeconds: 0
+    gtfsRealtimeExpirationSeconds: 0,
+    verbose: true
   };
   return {
     ...defaults,
     ...initialConfig
   };
 }
+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.ts
 var TIME_COLUMN_NAMES = [
@@ -3346,7 +3370,6 @@ var exportGtfs = async (initialConfig) => {
       }
       if (model.filenameExtension === "txt") {
         const excludeColumns = [
-          "id",
           "arrival_timestamp",
           "departure_timestamp",
           "start_timestamp",
@@ -3365,6 +3388,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),