gtfs 4.17.5 → 4.17.7

package/dist/bin/gtfsrealtime-update.js

@@ -8,10 +8,10 @@ import PrettyError from "pretty-error";
 // src/lib/file-utils.ts
 import path from "path";
 import { existsSync } from "fs";
+import { homedir } from "os";
 import { mkdir, readFile, rm } from "fs/promises";
 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
@@ -65,6 +65,7 @@ function formatError(error) {
 }
 
 // src/lib/file-utils.ts
+var homeDirectory = homedir();
 async function getConfig(argv2) {
   let config;
   let data;
@@ -101,17 +102,17 @@ async function getConfig(argv2) {
     throw error;
   }
 }
+function untildify(pathWithTilde) {
+  return homeDirectory ? pathWithTilde.replace(/^~(?=$|\/|\\)/, homeDirectory) : pathWithTilde;
+}
 
 // src/lib/import-gtfs.ts
 import path2 from "path";
 import { createReadStream, existsSync as existsSync2, lstatSync } from "fs";
 import { cp, readdir, rename, readFile as readFile2, rm as rm2, writeFile } from "fs/promises";
 import { parse } from "csv-parse";
-import pluralize2 from "pluralize";
 import stripBomStream from "strip-bom-stream";
 import { temporaryDirectory } from "tempy";
-import Timer from "timer-machine";
-import untildify3 from "untildify";
 import mapSeries2 from "promise-map-series";
 
 // src/models/gtfs-realtime/trip-updates.ts
@@ -582,10 +583,9 @@ var serviceAlertInformedEntities = {
 
 // src/lib/db.ts
 import Database from "better-sqlite3";
-import untildify2 from "untildify";
 var dbs = {};
 function setupDb(sqlitePath) {
-  const db = new Database(untildify2(sqlitePath));
+  const db = new Database(untildify(sqlitePath));
   db.pragma("journal_mode = OFF");
   db.pragma("synchronous = OFF");
   db.pragma("temp_store = MEMORY");
@@ -632,7 +632,6 @@ import {
 import { feature, featureCollection } from "@turf/helpers";
 
 // src/lib/import-gtfs-realtime.ts
-import pluralize from "pluralize";
 import GtfsRealtimeBindings from "gtfs-realtime-bindings";
 import mapSeries from "promise-map-series";
 import { get } from "lodash-es";
@@ -678,6 +677,9 @@ function applyPrefixToValue(value, columnShouldBePrefixed, prefix) {
   }
   return `${prefix}${value}`;
 }
+function pluralize(singularWord, pluralWord, count) {
+  return count === 1 ? singularWord : pluralWord;
+}
 
 // src/lib/import-gtfs-realtime.ts
 async function fetchGtfsRealtimeData(urlConfig, task) {
@@ -912,9 +914,9 @@ async function updateGtfsRealtime(initialConfig) {
     const agencyCount = config.agencies.length;
     log(config)(
       `Starting GTFS-Realtime refresh for ${pluralize(
+        "agency",
         "agencies",
-        agencyCount,
-        true
+        agencyCount
       )} using SQLite database at ${config.sqlitePath}`
     );
     removeExpiredRealtimeData(config);
@@ -945,9 +947,9 @@ async function updateGtfsRealtime(initialConfig) {
     });
     log(config)(
       `Completed GTFS-Realtime refresh for ${pluralize(
+        "agency",
         "agencies",
-        agencyCount,
-        true
+        agencyCount
       )}
 `
     );
@@ -965,11 +967,9 @@ async function updateGtfsRealtime(initialConfig) {
 import path3 from "path";
 import { writeFile as writeFile2 } from "fs/promises";
 import { without, compact as compact2 } from "lodash-es";
-import pluralize3 from "pluralize";
 import { stringify } from "csv-stringify";
 import sqlString2 from "sqlstring-sqlite";
 import mapSeries3 from "promise-map-series";
-import untildify4 from "untildify";
 
 // src/lib/advancedQuery.ts
 import sqlString3 from "sqlstring-sqlite";
@@ -988,6 +988,10 @@ import { omit as omit5, orderBy, pick as pick3 } from "lodash-es";
 import { omit as omit6 } from "lodash-es";
 import sqlString4 from "sqlstring-sqlite";
 
+// src/lib/gtfs/trips.ts
+import { omit as omit7 } from "lodash-es";
+import sqlString5 from "sqlstring-sqlite";
+
 // src/bin/gtfsrealtime-update.ts
 var pe = new PrettyError();
 var argv = yargs(hideBin(process.argv)).usage("Usage: $0 --configPath ./config.json").help().option("c", {