gtfs 3.1.4 → 3.2.0

package/lib/gtfs/calendars.js

@@ -12,8 +12,13 @@ import calendars from '../../models/gtfs/calendar.js';
 /*
  * Returns an array of calendars that match the query parameters.
  */
-export async function getCalendars(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getCalendars(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(calendars.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/fare-attributes.js

@@ -12,8 +12,13 @@ import fareAttributes from '../../models/gtfs/fare-attributes.js';
 /*
  * Returns an array of all fare attributes that match the query parameters.
  */
-export async function getFareAttributes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFareAttributes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(fareAttributes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/fare-rules.js

@@ -12,8 +12,13 @@ import fareRules from '../../models/gtfs/fare-rules.js';
 /*
  * Returns an array of all fare rules that match the query parameters.
  */
-export async function getFareRules(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFareRules(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(fareRules.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/feed-info.js

@@ -12,8 +12,13 @@ import feedInfo from '../../models/gtfs/feed-info.js';
 /*
  * Returns an array of all feed info that match the query parameters.
  */
-export async function getFeedInfo(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFeedInfo(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(feedInfo.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/frequencies.js

@@ -12,8 +12,13 @@ import frequencies from '../../models/gtfs/frequencies.js';
 /*
  * Returns an array of all frequencies that match the query parameters.
  */
-export async function getFrequencies(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFrequencies(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(frequencies.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/levels.js

@@ -12,8 +12,13 @@ import levels from '../../models/gtfs/levels.js';
 /*
  * Returns an array of all levels that match the query parameters.
  */
-export async function getLevels(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getLevels(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(levels.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/pathways.js

@@ -12,8 +12,13 @@ import pathways from '../../models/gtfs/pathways.js';
 /*
  * Returns an array of all pathways that match the query parameters.
  */
-export async function getPathways(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getPathways(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(pathways.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/routes.js

@@ -26,8 +26,13 @@ function buildTripSubquery(query) {
  * Returns an array of routes that match the query parameters. A `stop_id`
  * query parameter may be passed to find all routes that contain that stop.
  */
-export async function getRoutes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getRoutes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(routes.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';

package/lib/gtfs/shapes.js

@@ -26,8 +26,13 @@ function buildTripSubquery(query) {
  * query parameter may be passed to find all shapes for a trip. A
  * `direction_id` query parameter may be passed to find all shapes for a direction.
  */
-export async function getShapes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getShapes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(shapes.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
@@ -67,8 +72,8 @@ export async function getShapes(query = {}, fields = [], orderBy = []) {
  * Returns geoJSON of the shapes that match the query parameters. A `route_id`
  * query parameter may be passed to find all shapes for a route.
  */
-export async function getShapesAsGeoJSON(query = {}) {
-  const agencies = await getAgencies();
+export async function getShapesAsGeoJSON(query = {}, options = {}) {
+  const agencies = await getAgencies({}, [], [], options);
 
   const routeQuery = {};
 
@@ -76,7 +81,7 @@ export async function getShapesAsGeoJSON(query = {}) {
     routeQuery.route_id = query.route_id;
   }
 
-  const routes = await getRoutes(routeQuery);
+  const routes = await getRoutes(routeQuery, [], [], options);
   const features = [];
 
   await Promise.all(
@@ -85,12 +90,12 @@ export async function getShapesAsGeoJSON(query = {}) {
         route_id: route.route_id,
         ...omit(query, 'route_id'),
       };
-      const shapes = await getShapes(shapeQuery, [
-        'shape_id',
-        'shape_pt_sequence',
-        'shape_pt_lon',
-        'shape_pt_lat',
-      ]);
+      const shapes = await getShapes(
+        shapeQuery,
+        ['shape_id', 'shape_pt_sequence', 'shape_pt_lon', 'shape_pt_lat'],
+        [],
+        options
+      );
 
       const agency = agencies.find(
         (agency) => agency.agency_id === route.agency_id

package/lib/gtfs/stop-times.js

@@ -12,8 +12,13 @@ import stopTimes from '../../models/gtfs/stop-times.js';
 /*
  * Returns an array of stoptimes that match the query parameters.
  */
-export async function getStoptimes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getStoptimes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(stopTimes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/stops.js

@@ -30,8 +30,13 @@ function buildStoptimeSubquery(query) {
  * query parameter may be passed to find all shapes for a trip. A
  * `direction_id` query parameter may be passed to find all shapes for a direction.
  */
-export async function getStops(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getStops(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(stops.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
@@ -71,12 +76,12 @@ export async function getStops(query = {}, fields = [], orderBy = []) {
  * Returns geoJSON with stops for the `agencyKey` specified, optionally limited
  * to the `stopIds` specified
  */
-export async function getStopsAsGeoJSON(query = {}) {
-  const db = await getDb();
-  const stops = await getStops(query);
+export async function getStopsAsGeoJSON(query = {}, options = {}) {
+  const db = options.db ?? (await getDb());
+  const stops = await getStops(query, [], [], options);
 
   // Get all agencies for reference
-  const agencies = await getAgencies();
+  const agencies = await getAgencies({}, [], [], options);
 
   const preparedStops = await Promise.all(
     stops.map(async (stop) => {

package/lib/gtfs/transfers.js

@@ -12,8 +12,13 @@ import transfers from '../../models/gtfs/transfers.js';
 /*
  * Returns an array of all transfers that match the query parameters.
  */
-export async function getTransfers(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTransfers(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(transfers.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/translations.js

@@ -12,8 +12,13 @@ import translations from '../../models/gtfs/translations.js';
 /*
  * Returns an array of all translations that match the query parameters.
  */
-export async function getTranslations(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTranslations(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(translations.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs/trips.js

@@ -12,8 +12,13 @@ import trips from '../../models/gtfs/trips.js';
 /*
  * Returns an array of all trips that match the query parameters.
  */
-export async function getTrips(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTrips(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(trips.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs-ride/board-alights.js

@@ -12,8 +12,13 @@ import boardAlights from '../../models/gtfs-ride/board-alight.js';
 /*
  * Returns an array of all board-alights that match the query parameters.
  */
-export async function getBoardAlights(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getBoardAlights(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(boardAlights.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs-ride/ride-feed-infos.js

@@ -12,8 +12,13 @@ import rideFeedInfo from '../../models/gtfs-ride/ride-feed-info.js';
 /*
  * Returns an array of all ride-feed-info that match the query parameters.
  */
-export async function getRideFeedInfos(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getRideFeedInfos(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(rideFeedInfo.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs-ride/rider-trips.js

@@ -12,8 +12,13 @@ import riderTrip from '../../models/gtfs-ride/rider-trip.js';
 /*
  * Returns an array of all rider trips that match the query parameters.
  */
-export async function getRiderTrips(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getRiderTrips(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(riderTrip.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs-ride/riderships.js

@@ -12,8 +12,13 @@ import riderships from '../../models/gtfs-ride/ridership.js';
 /*
  * Returns an array of all riderships that match the query parameters.
  */
-export async function getRiderships(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getRiderships(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(riderships.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/gtfs-ride/trip-capacities.js

@@ -12,8 +12,13 @@ import tripCapacity from '../../models/gtfs-ride/trip-capacity.js';
 /*
  * Returns an array of all trip-capacities that match the query parameters.
  */
-export async function getTripCapacities(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTripCapacities(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(tripCapacity.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/import.js

@@ -3,7 +3,7 @@ import { createReadStream, existsSync, lstatSync } from 'node:fs';
 import { readdir, rename, writeFile } from 'node:fs/promises';
 import copy from 'recursive-copy';
 import fetch from 'node-fetch';
-import parse from 'csv-parse';
+import { parse } from 'csv-parse';
 import pluralize from 'pluralize';
 import stripBomStream from 'strip-bom-stream';
 import { dir } from 'tmp-promise';
@@ -38,9 +38,9 @@ const downloadFiles = async (task) => {
     throw new Error('Couldn’t download files');
   }
 
-  const buffer = await response.buffer();
+  const buffer = await response.arrayBuffer();
 
-  await writeFile(task.path, buffer);
+  await writeFile(task.path, Buffer.from(buffer));
   task.log('Download successful');
 };
 

package/lib/non-standard/directions.js

@@ -12,8 +12,13 @@ import directions from '../../models/non-standard/directions.js';
 /*
  * Returns an array of all directions that match the query parameters.
  */
-export async function getDirections(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getDirections(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(directions.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/non-standard/stop-attributes.js

@@ -12,8 +12,13 @@ import stopAttributes from '../../models/non-standard/stop-attributes.js';
 /*
  * Returns an array of all stop attributes that match the query parameters.
  */
-export async function getStopAttributes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getStopAttributes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(stopAttributes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/non-standard/timetable-notes-references.js

@@ -15,9 +15,10 @@ import timetableNotesReferences from '../../models/non-standard/timetable-notes-
 export async function getTimetableNotesReferences(
   query = {},
   fields = [],
-  orderBy = []
+  orderBy = [],
+  options = {}
 ) {
-  const db = await getDb();
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(timetableNotesReferences.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/non-standard/timetable-notes.js

@@ -12,8 +12,13 @@ import timetableNotes from '../../models/non-standard/timetable-notes.js';
 /*
  * Returns an array of all timetable notes that match the query parameters.
  */
-export async function getTimetableNotes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTimetableNotes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(timetableNotes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/non-standard/timetable-pages.js

@@ -12,8 +12,13 @@ import timetablePages from '../../models/non-standard/timetable-pages.js';
 /*
  * Returns an array of all timetable pages that match the query parameters.
  */
-export async function getTimetablePages(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTimetablePages(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(timetablePages.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/non-standard/timetable-stop-order.js

@@ -15,9 +15,10 @@ import timetableStopOrder from '../../models/non-standard/timetable-stop-order.j
 export async function getTimetableStopOrders(
   query = {},
   fields = [],
-  orderBy = []
+  orderBy = [],
+  options = {}
 ) {
-  const db = await getDb();
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(timetableStopOrder.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/non-standard/timetables.js

@@ -12,8 +12,13 @@ import timetables from '../../models/non-standard/timetables.js';
 /*
  * Returns an array of all timetables that match the query parameters.
  */
-export async function getTimetables(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTimetables(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(timetables.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);

package/lib/utils.js

@@ -27,7 +27,10 @@ export function setDefaultConfig(initialConfig) {
     sqlitePath: ':memory:',
   };
 
-  return Object.assign(defaults, initialConfig);
+  return {
+    ...defaults,
+    ...initialConfig,
+  };
 }
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -52,7 +52,8 @@
     "Oskari Groenroos <oskari@groenroos.fi>",
     "Devin Packer",
     "Darius MARTIN",
-    "Mike Brocks"
+    "Mike Brocks",
+    "Matt Moran"
   ],
   "type": "module",
   "main": "index.js",
@@ -60,7 +61,9 @@
     "gtfs-export": "bin/gtfs-export.js",
     "gtfs-import": "bin/gtfs-import.js"
   },
+  "types": "@types",
   "scripts": {
+    "dtslint": "dtslint @types",
     "lint": "eslint **/*.js",
     "lint-fix": "eslint **/*.js --fix",
     "test": "eslint **/*.js && NODE_ENV=test mocha ./test/mocha/**/*.js --timeout 2000"
@@ -68,12 +71,12 @@
   "dependencies": {
     "@turf/helpers": "^6.5.0",
     "chalk": "^4.1.2",
-    "csv-parse": "^4.16.3",
-    "csv-stringify": "^5.6.5",
+    "csv-parse": "^5.0.3",
+    "csv-stringify": "^6.0.4",
     "lodash-es": "^4.17.21",
-    "node-fetch": "^3.0.0",
+    "node-fetch": "^3.1.0",
     "pluralize": "^8.0.0",
-    "pretty-error": "^3.0.4",
+    "pretty-error": "^4.0.0",
     "promise-map-series": "^0.3.0",
     "recursive-copy": "^2.0.13",
     "sanitize-filename": "^1.6.3",
@@ -81,19 +84,20 @@
     "sqlite3": "^5.0.2",
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
-    "tmp-promise": "^3.0.2",
+    "tmp-promise": "^3.0.3",
     "untildify": "^4.0.0",
     "unzipper": "^0.10.11",
     "yargs": "^17.2.1"
   },
   "devDependencies": {
-    "eslint": "^8.0.1",
+    "dtslint": "^4.2.0",
+    "eslint": "^8.2.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-xo": "^0.39.0",
-    "husky": "^7.0.2",
+    "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "prettier": "^2.4.1",
-    "pretty-quick": "^3.1.1",
+    "pretty-quick": "^3.1.2",
     "should": "^13.2.3"
   },
   "engines": {

package/test/mocha/export-gtfs.js

@@ -5,13 +5,19 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createReadStream, existsSync } from 'node:fs';
 import { rm } from 'node:fs/promises';
-import parse from 'csv-parse';
+import { parse } from 'csv-parse';
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import { unzip, generateFolderName } from '../../lib/file-utils.js';
 import config from '../test-config.js';
-import { importGtfs, exportGtfs, getAgencies } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  exportGtfs,
+  getAgencies,
+} from '../../index.js';
 import models from '../../models/models.js';
 
 describe('exportGtfs():', function () {
@@ -21,7 +27,8 @@ describe('exportGtfs():', function () {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   this.timeout(10000);

package/test/mocha/get-agencies.js

@@ -1,9 +1,14 @@
 /* eslint-env mocha */
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getAgencies } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getAgencies,
+} from '../../index.js';
 
 describe('getAgencies():', () => {
   before(async () => {
@@ -12,7 +17,8 @@ describe('getAgencies():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no agencies exist', async () => {