gtfs 3.8.0 → 4.0.1

package/lib/non-standard/directions.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import directions from '../../models/non-standard/directions.js';
 /*
  * Returns an array of all directions that match the query parameters.
  */
-export async function getDirections(
+export function getDirections(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(directions.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ 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(
+export function getStopAttributes(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(stopAttributes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import timetableNotesReferences from '../../models/non-standard/timetable-notes-
 /*
  * Returns an array of all timetable notes references that match the query parameters.
  */
-export async function getTimetableNotesReferences(
+export function getTimetableNotesReferences(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetableNotesReferences.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ 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(
+export function getTimetableNotes(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetableNotes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ 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(
+export function getTimetablePages(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetablePages.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import timetableStopOrder from '../../models/non-standard/timetable-stop-order.j
 /*
  * Returns an array of all timetable stop orders that match the query parameters.
  */
-export async function getTimetableStopOrders(
+export function getTimetableStopOrders(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetableStopOrder.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/non-standard/timetables.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import timetables from '../../models/non-standard/timetables.js';
 /*
  * Returns an array of all timetables that match the query parameters.
  */
-export async function getTimetables(
+export function getTimetables(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetables.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/non-standard/trips-dated-vehicle-journey.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -10,21 +10,23 @@ import {
 import directions from '../../models/non-standard/trips-dated-vehicle-journey.js';
 
 /*
- * Returns an array of all directions that match the query parameters.
+ * Returns an array of all trips dated vehicle journeys that match the query parameters.
  */
-export async function getTripsDatedVehicleJourneys(
+export function getTripsDatedVehicleJourneys(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(directions.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "3.8.0",
+  "version": "4.0.1",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -74,6 +74,7 @@
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
+    "better-sqlite3": "^8.0.1",
     "csv-parse": "^5.3.3",
     "csv-stringify": "^6.2.3",
     "gtfs-realtime-bindings": "^0.0.6",
@@ -85,8 +86,6 @@
     "promise-map-series": "^0.3.0",
     "recursive-copy": "^2.0.14",
     "sanitize-filename": "^1.6.3",
-    "sqlite": "^4.1.2",
-    "sqlite3": "^5.1.4",
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
     "tmp-promise": "^3.0.3",
@@ -96,8 +95,9 @@
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
+    "@types/better-sqlite3": "^7.6.3",
     "dtslint": "^4.2.1",
-    "eslint": "^8.30.0",
+    "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-xo": "^0.43.1",
     "husky": "^8.0.2",

package/test/mocha/advanced-query.js

@@ -3,26 +3,20 @@
 import should from 'should';
 
 import config from '../test-config.js';
-import {
-  openDb,
-  getDb,
-  closeDb,
-  importGtfs,
-  advancedQuery,
-} from '../../index.js';
+import { openDb, closeDb, importGtfs, advancedQuery } from '../../index.js';
 
 describe('advancedQuery():', () => {
   before(async () => {
-    await openDb(config);
+    openDb(config);
     await importGtfs(config);
   });
 
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
   });
 
-  it('should return empty array if no trips', async () => {
+  it('should return empty array if no trips', () => {
     const routeId = 'fake-route-id';
 
     const advancedQueryOptions = {
@@ -38,13 +32,13 @@ describe('advancedQuery():', () => {
         },
       ],
     };
-    const results = await advancedQuery('stop_times', advancedQueryOptions);
+    const results = advancedQuery('stop_times', advancedQueryOptions);
 
     should.exists(results);
     results.should.have.length(0);
   });
 
-  it('should return expected trips with joined trip', async () => {
+  it('should return expected trips with joined trip', () => {
     const tripId = '329';
 
     const advancedQueryOptions = {
@@ -60,7 +54,7 @@ describe('advancedQuery():', () => {
         },
       ],
     };
-    const results = await advancedQuery('stop_times', advancedQueryOptions);
+    const results = advancedQuery('stop_times', advancedQueryOptions);
 
     const expectedResults = [
       { trip_id: '329', arrival_time: '9:09:00' },

package/test/mocha/export-gtfs.js

@@ -12,7 +12,6 @@ import { unzip, generateFolderName } from '../../lib/file-utils.js';
 import config from '../test-config.js';
 import {
   openDb,
-  getDb,
   closeDb,
   importGtfs,
   exportGtfs,
@@ -22,13 +21,13 @@ import models from '../../models/models.js';
 
 describe('exportGtfs():', function () {
   before(async () => {
-    await openDb(config);
+    openDb(config);
     await importGtfs(config);
   });
 
   after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+    const db = openDb(config);
+    closeDb(db);
   });
 
   this.timeout(10000);
@@ -86,7 +85,7 @@ describe('exportGtfs():', function () {
     });
 
     after(async () => {
-      const agencies = await getAgencies({}, ['agency_name']);
+      const agencies = getAgencies({}, ['agency_name']);
       await rm(
         path.join(
           process.cwd(),
@@ -99,7 +98,7 @@ describe('exportGtfs():', function () {
 
     for (const model of models) {
       it(`should import the same number of ${model.filenameBase}`, async () => {
-        const agencies = await getAgencies({}, ['agency_name']);
+        const agencies = getAgencies({}, ['agency_name']);
         const filePath = path.join(
           process.cwd(),
           'gtfs-export',

package/test/mocha/fare-transfer-rules.js

@@ -0,0 +1,32 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  closeDb,
+  importGtfs,
+  getFareTransferRules,
+} from '../../index.js';
+
+describe('getFareTransferRules():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no fare_transfer_rules exist', () => {
+    const transferId = 'fake-transfer-id';
+    const results = getFareTransferRules({
+      transfer_id: transferId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/get-agencies.js

@@ -2,36 +2,30 @@
 import should from 'should';
 
 import config from '../test-config.js';
-import {
-  openDb,
-  getDb,
-  closeDb,
-  importGtfs,
-  getAgencies,
-} from '../../index.js';
+import { openDb, closeDb, importGtfs, getAgencies } from '../../index.js';
 
 describe('getAgencies():', () => {
   before(async () => {
-    await openDb(config);
+    openDb(config);
     await importGtfs(config);
   });
 
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
   });
 
-  it('should return empty array if no agencies exist', async () => {
+  it('should return empty array if no agencies exist', () => {
     const agencyId = 'fake-agency-id';
-    const results = await getAgencies({
+    const results = getAgencies({
       agency_id: agencyId,
     });
     should.exists(results);
     results.should.have.length(0);
   });
 
-  it('should return expected agencies with no query', async () => {
-    const results = await getAgencies();
+  it('should return expected agencies with no query', () => {
+    const results = getAgencies();
 
     const expectedResult = {
       id: 1,
@@ -50,11 +44,11 @@ describe('getAgencies():', () => {
     expectedResult.should.match(results[0]);
   });
 
-  it('should return expected agency for agency_id and agency_lang', async () => {
+  it('should return expected agency for agency_id and agency_lang', () => {
     const agencyId = 'CT';
     const agencyLand = 'en';
 
-    const results = await getAgencies({
+    const results = getAgencies({
       agency_id: agencyId,
       agency_lang: agencyLand,
     });
@@ -76,10 +70,10 @@ describe('getAgencies():', () => {
     expectedResult.should.match(results[0]);
   });
 
-  it('should return only specific keys for expected agency for agency_id', async () => {
+  it('should return only specific keys for expected agency for agency_id', () => {
     const agencyId = 'CT';
 
-    const results = await getAgencies(
+    const results = getAgencies(
       {
         agency_id: agencyId,
       },

package/test/mocha/get-areas.js

@@ -0,0 +1,27 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import { openDb, closeDb, importGtfs, getAreas } from '../../index.js';
+
+describe('getAreas():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no areas exist', () => {
+    const areaId = 'fake-area-id';
+    const results = getAreas({
+      area_id: areaId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/get-attributions.js

@@ -3,28 +3,22 @@
 import should from 'should';
 
 import config from '../test-config.js';
-import {
-  openDb,
-  getDb,
-  closeDb,
-  importGtfs,
-  getAttributions,
-} from '../../index.js';
+import { openDb, closeDb, importGtfs, getAttributions } from '../../index.js';
 
 describe('getAttributions():', () => {
   before(async () => {
-    await openDb(config);
+    openDb(config);
     await importGtfs(config);
   });
 
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
   });
 
-  it('should return empty array if no attributions exist', async () => {
+  it('should return empty array if no attributions exist', () => {
     const attributionId = 'fake-attribution-id';
-    const results = await getAttributions({
+    const results = getAttributions({
       attribution_id: attributionId,
     });
     should.exists(results);

package/test/mocha/get-board-alights.js

@@ -3,29 +3,23 @@
 import should from 'should';
 
 import config from '../test-config.js';
-import {
-  openDb,
-  getDb,
-  closeDb,
-  importGtfs,
-  getBoardAlights,
-} from '../../index.js';
+import { openDb, closeDb, importGtfs, getBoardAlights } from '../../index.js';
 
 describe('getBoardAlights():', () => {
   before(async () => {
-    await openDb(config);
+    openDb(config);
     await importGtfs(config);
   });
 
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
   });
 
-  it('should return empty array if no board alights (GTFS-ride)', async () => {
+  it('should return empty array if no board alights (GTFS-ride)', () => {
     const tripId = 'fake-trip-id';
 
-    const results = await getBoardAlights({
+    const results = getBoardAlights({
       trip_id: tripId,
     });
     should.exists(results);