gtfs 4.15.3 → 4.15.4

package/dist/index.js

@@ -3563,9 +3563,8 @@ async function fetchGtfsRealtimeData(urlConfig, task) {
   });
 }
 function removeExpiredRealtimeData(config) {
-  const log2 = log(config);
   const db = openDb(config);
-  log2(`Removing expired GTFS-Realtime data`);
+  log(config)(`Removing expired GTFS-Realtime data`);
   db.prepare(
     `DELETE FROM vehicle_positions WHERE expiration_timestamp <= strftime('%s','now')`
   ).run();
@@ -3581,7 +3580,7 @@ function removeExpiredRealtimeData(config) {
   db.prepare(
     `DELETE FROM service_alert_targets WHERE expiration_timestamp <= strftime('%s','now')`
   ).run();
-  log2(`Removed expired GTFS-Realtime data\r`, true);
+  log(config)(`Removed expired GTFS-Realtime data\r`, true);
 }
 function prepareRealtimeFieldValue(entity, column, task) {
   if (column.name === "created_timestamp") {
@@ -3735,13 +3734,10 @@ async function updateGtfsRealtimeData(task) {
 async function updateGtfsRealtime(initialConfig) {
   const config = setDefaultConfig(initialConfig);
   validateConfigForImport(config);
-  const log2 = log(config);
-  const logError2 = logError(config);
-  const logWarning2 = logWarning(config);
   try {
     openDb(config);
     const agencyCount = config.agencies.length;
-    log2(
+    log(config)(
       `Starting GTFS-Realtime refresh for ${pluralize(
         "agencies",
         agencyCount,
@@ -3760,20 +3756,20 @@ async function updateGtfsRealtime(initialConfig) {
           ignoreErrors: config.ignoreErrors,
           sqlitePath: config.sqlitePath,
           currentTimestamp: Math.floor(Date.now() / 1e3),
-          log: log2,
-          logWarning: logWarning2,
-          logError: logError2
+          log: log(config),
+          logWarning: logWarning(config),
+          logError: logError(config)
         };
         await updateGtfsRealtimeData(task);
       } catch (error) {
         if (config.ignoreErrors) {
-          logError2(error.message);
+          logError(config)(error.message);
         } else {
           throw error;
         }
       }
     });
-    log2(
+    log(config)(
       `Completed GTFS-Realtime refresh for ${pluralize(
         "agencies",
         agencyCount,
@@ -3782,16 +3778,13 @@ async function updateGtfsRealtime(initialConfig) {
 `
     );
   } catch (error) {
-    handleDatabaseError(error, config, logError2);
-  }
-}
-function handleDatabaseError(error, config, logError2) {
-  if (error?.code === "SQLITE_CANTOPEN") {
-    logError2(
-      `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
-    );
+    if (error?.code === "SQLITE_CANTOPEN") {
+      logError(config)(
+        `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
+      );
+    }
+    throw error;
   }
-  throw error;
 }
 
 // src/lib/import-gtfs.ts
@@ -4137,13 +4130,10 @@ async function importGtfs(initialConfig) {
   timer.start();
   const config = setDefaultConfig(initialConfig);
   validateConfigForImport(config);
-  const log2 = log(config);
-  const logError2 = logError(config);
-  const logWarning2 = logWarning(config);
   try {
     const db = openDb(config);
     const agencyCount = config.agencies.length;
-    log2(
+    log(config)(
       `Starting GTFS import for ${pluralize2("file", agencyCount, true)} using SQLite database at ${config.sqlitePath}`
     );
     createGtfsTables(db);
@@ -4167,9 +4157,9 @@ async function importGtfs(initialConfig) {
           sqlitePath: config.sqlitePath,
           prefix: agency2.prefix,
           currentTimestamp: Math.floor(Date.now() / 1e3),
-          log: log2,
-          logWarning: logWarning2,
-          logError: logError2
+          log: log(config),
+          logWarning: logWarning(config),
+          logError: logError(config)
         };
         if (task.url) {
           await downloadGtfsFiles(task);
@@ -4179,36 +4169,30 @@ async function importGtfs(initialConfig) {
         await updateGtfsRealtimeData(task);
         await rm2(tempPath, { recursive: true });
       } catch (error) {
-        handleImportError(error, config, logError2);
+        if (config.ignoreErrors) {
+          logError(config)(error.message);
+        } else {
+          throw error;
+        }
       }
     });
-    log2(`Creating DB indexes`);
+    log(config)(`Creating DB indexes`);
     createGtfsIndexes(db);
     const seconds = Math.round(timer.time() / 1e3);
     timer.stop();
-    log2(
+    log(config)(
       `Completed GTFS import for ${pluralize2("agency", agencyCount, true)} in ${seconds} seconds
 `
     );
   } catch (error) {
-    handleDatabaseError2(error, config, logError2);
-  }
-}
-function handleImportError(error, config, logError2) {
-  if (config.ignoreErrors) {
-    logError2(error.message);
-  } else {
+    if (error?.code === "SQLITE_CANTOPEN") {
+      logError(config)(
+        `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
+      );
+    }
     throw error;
   }
 }
-function handleDatabaseError2(error, config, logError2) {
-  if (error?.code === "SQLITE_CANTOPEN") {
-    logError2(
-      `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
-    );
-  }
-  throw error;
-}
 
 // src/lib/export.ts
 import path2 from "node:path";
@@ -4235,8 +4219,6 @@ var getAgencies = (db, config) => {
 };
 var exportGtfs = async (initialConfig) => {
   const config = setDefaultConfig(initialConfig);
-  const log2 = log(config);
-  const logWarning2 = logWarning(config);
   const db = openDb(config);
   const agencies = getAgencies(db, config);
   const agencyCount = agencies.length;
@@ -4245,11 +4227,11 @@ var exportGtfs = async (initialConfig) => {
       "No agencies found in SQLite. Be sure to first import data into SQLite using `gtfs-import` or `importGtfs(config);`"
     );
   } else if (agencyCount > 1) {
-    logWarning2(
+    logWarning(config)(
       "More than one agency is defined in config.json. Export will merge all into one GTFS file."
     );
   }
-  log2(
+  log(config)(
     `Starting GTFS export for ${pluralize3(
       "agency",
       agencyCount,
@@ -4274,7 +4256,7 @@ var exportGtfs = async (initialConfig) => {
       const lines = db.prepare(`SELECT * FROM ${tableName};`).all();
       if (!lines || lines.length === 0) {
         if (!model.nonstandard) {
-          log2(
+          log(config)(
             `Skipping (no data) - ${model.filenameBase}.${model.filenameExtension}\r`
           );
         }
@@ -4316,17 +4298,23 @@ var exportGtfs = async (initialConfig) => {
           `Unexpected filename extension: ${model.filenameExtension}`
         );
       }
-      log2(`Exporting - ${model.filenameBase}.${model.filenameExtension}\r`);
+      log(config)(
+        `Exporting - ${model.filenameBase}.${model.filenameExtension}\r`
+      );
       return `${model.filenameBase}.${model.filenameExtension}`;
     }
   );
   if (compact2(exportedFiles).length === 0) {
-    log2("No GTFS data exported. Be sure to first import data into SQLite.");
+    log(config)(
+      "No GTFS data exported. Be sure to first import data into SQLite."
+    );
     return;
   }
-  log2(`Completed GTFS export to ${exportPath}`);
-  log2(`Completed GTFS export for ${pluralize3("agency", agencyCount, true)}
-`);
+  log(config)(`Completed GTFS export to ${exportPath}`);
+  log(config)(
+    `Completed GTFS export for ${pluralize3("agency", agencyCount, true)}
+`
+  );
 };
 
 // src/lib/advancedQuery.ts