gtfs 4.5.0 → 4.5.1

package/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.5.1] - 2023-11-09
+
+### Updated
+
+- Dependency updates
+- Use path to types file instead of directory in package.json
+
+### Fixed
+
+- Exclude agency_id from export if empty
+
 ## [4.5.0] - 2023-08-23
 
 ### Updated

package/lib/export.js

@@ -20,12 +20,12 @@ const getAgencies = (db, config) => {
   } catch (error) {
     if (config.sqlitePath === ':memory:') {
       throw new Error(
-        'No agencies found in SQLite. You are using an in-memory database - if running this from command line be sure to specify a value for `sqlitePath` in config.json other than ":memory:".'
+        'No agencies found in SQLite. You are using an in-memory database - if running this from command line be sure to specify a value for `sqlitePath` in config.json other than ":memory:".',
       );
     }
 
     throw new Error(
-      'No agencies found in SQLite. Be sure to first import data into SQLite using `gtfs-import` or `importGtfs(config);`'
+      'No agencies found in SQLite. Be sure to first import data into SQLite using `gtfs-import` or `importGtfs(config);`',
     );
   }
 };
@@ -42,11 +42,11 @@ const exportGtfs = async (initialConfig) => {
   const agencyCount = agencies.length;
   if (agencyCount === 0) {
     throw new Error(
-      'No agencies found in SQLite. Be sure to first import data into SQLite using `gtfs-import` or `importGtfs(config);`'
+      'No agencies found in SQLite. Be sure to first import data into SQLite using `gtfs-import` or `importGtfs(config);`',
     );
   } else if (agencyCount > 1) {
     logWarning(
-      'More than one agency is defined in config.json. Export will merge all into one GTFS file.'
+      'More than one agency is defined in config.json. Export will merge all into one GTFS file.',
     );
   }
 
@@ -54,8 +54,8 @@ const exportGtfs = async (initialConfig) => {
     `Starting GTFS export for ${pluralize(
       'agency',
       agencyCount,
-      true
-    )} using SQLite database at ${config.sqlitePath}`
+      true,
+    )} using SQLite database at ${config.sqlitePath}`,
   );
 
   const folderName = generateFolderName(agencies[0].agency_name);
@@ -92,9 +92,19 @@ const exportGtfs = async (initialConfig) => {
       'ridership_end_timestamp',
     ];
 
+    // If no routes have values for agency_id, add it to the excludeColumns list
+    if (model.filenameBase === 'routes') {
+      const routesWithAgencyId = db
+        .prepare('SELECT agency_id FROM routes WHERE agency_id IS NOT NULL;')
+        .all();
+      if (!routesWithAgencyId || routesWithAgencyId.length === 0) {
+        excludeColumns.push('agency_id');
+      }
+    }
+
     const columns = without(
       model.schema.map((column) => column.name),
-      ...excludeColumns
+      ...excludeColumns,
     );
     const fileText = await stringify(lines, { columns, header: true });
     await writeFile(filepath, fileText);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -67,15 +67,15 @@
     "gtfs-import": "bin/gtfs-import.js",
     "gtfsrealtime-update": "bin/gtfsrealtime-update.js"
   },
-  "types": "@types",
+  "types": "@types/index.d.ts",
   "scripts": {
     "test": "NODE_ENV=test mocha ./test/mocha/**/*.js --timeout 2000"
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "better-sqlite3": "^8.5.1",
-    "csv-parse": "^5.4.0",
-    "csv-stringify": "^6.4.0",
+    "better-sqlite3": "^9.1.1",
+    "csv-parse": "^5.5.2",
+    "csv-stringify": "^6.4.4",
     "gtfs-realtime-bindings": "^1.1.1",
     "lodash-es": "^4.17.21",
     "long": "^5.2.3",
@@ -95,9 +95,9 @@
   },
   "devDependencies": {
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.0.2",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.2",
+    "prettier": "^3.0.3",
     "should": "^13.2.3"
   },
   "engines": {