gtfs 3.8.0 → 4.0.0

package/lib/advancedQuery.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from './db.js';
+import { openDb } from './db.js';
 
 import {
   formatOrderByClause,
@@ -12,7 +12,7 @@ import {
 /*
  * Returns an array of all agencies that match the query parameters.
  */
-export async function advancedQuery(table, advancedQueryOptions) {
+export function advancedQuery(table, advancedQueryOptions) {
   const defaultOptions = {
     query: {},
     fields: [],
@@ -22,24 +22,15 @@ export async function advancedQuery(table, advancedQueryOptions) {
   };
   const queryOptions = { ...defaultOptions, ...advancedQueryOptions };
 
-  const db = queryOptions.options.db ?? (await getDb());
+  const db = queryOptions.options.db ?? openDb();
   const tableName = sqlString.escapeId(table);
   const selectClause = formatSelectClause(queryOptions.fields);
   const whereClause = formatWhereClauses(queryOptions.query);
   const joinClause = formatJoinClause(queryOptions.join);
   const orderByClause = formatOrderByClause(queryOptions.orderBy);
-  const sqlStatement = `${selectClause} FROM ${tableName} ${joinClause} ${whereClause} ${orderByClause};`;
-  return db.all(sqlStatement).catch((error) => {
-    console.log(error);
-  });
-}
-
-export async function runRawQuery(sql, options = {}) {
-  const db = options.db ?? (await getDb());
-  return db.all(sql);
-}
-
-export async function execRawQuery(sql, options = {}) {
-  const db = options.db ?? (await getDb());
-  return db.exec(sql);
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${joinClause} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/db.js

@@ -1,47 +1,43 @@
-import sqlite3 from 'sqlite3';
-import { open } from 'sqlite';
-import { setDefaultConfig } from './utils.js';
+import Database from 'better-sqlite3';
 import untildify from 'untildify';
+
+import { setDefaultConfig } from './utils.js';
 const dbs = {};
 
-export async function openDb(initialConfig) {
-  const config = setDefaultConfig(initialConfig);
-  if (!dbs[config.sqlitePath]) {
-    dbs[config.sqlitePath] = await open({
-      filename: untildify(config.sqlitePath),
-      driver: sqlite3.Database,
-    });
+const getOrCreateDbConnection = (sqlitePath) => {
+  if (dbs[sqlitePath]) {
+    return dbs[sqlitePath];
   }
 
-  return dbs[config.sqlitePath];
-}
+  const db = new Database(untildify(sqlitePath));
+  setupDb(db);
 
-export async function setupDb(db) {
-  if (Object.keys(dbs).length === 0) {
-    throw new Error(
-      'No database connection. Call `openDb(config)` before using any methods.'
-    );
-  }
+  dbs[sqlitePath] = db;
+  return db;
+};
 
-  if (!db) {
-    if (Object.keys(dbs).length > 1) {
-      throw new Error(
-        'Multiple database connections. Pass the db you want to setup as a parameter to `setupDb`.'
-      );
-    }
+export function openDb(config) {
+  if (config) {
+    return getOrCreateDbConnection(setDefaultConfig(config).sqlitePath);
+  }
 
+  // If only one db connection already exists, use it
+  if (Object.keys(dbs).length === 1) {
     const filename = Object.keys(dbs)[0];
-    db = dbs[filename];
+    return dbs[filename];
   }
 
-  await db.run('PRAGMA journal_mode = OFF;');
-  await db.run('PRAGMA synchronous = 0;');
-  await db.run('PRAGMA locking_mode = EXCLUSIVE;');
-  await db.run('PRAGMA temp_store = MEMORY;');
-  await db.run('VACUUM;');
+  throw new Error('Unable to find database connection.');
 }
 
-export async function closeDb(db) {
+export function setupDb(db) {
+  db.pragma('journal_mode = WAL');
+  db.pragma('synchronous = OFF');
+  db.pragma('locking_mode = EXCLUSIVE');
+  db.pragma('temp_store = MEMORY');
+}
+
+export function closeDb(db) {
   if (Object.keys(dbs).length === 0) {
     throw new Error(
       'No database connection. Call `openDb(config)` before using any methods.'
@@ -58,32 +54,6 @@ export async function closeDb(db) {
     db = dbs[Object.keys(dbs)[0]];
   }
 
-  const { filename } = db.config;
-
-  await db.close();
-  delete dbs[filename];
-}
-
-export function getDb(initialConfig) {
-  if (Object.keys(dbs).length === 0) {
-    throw new Error(
-      'No database connection. Call `openDb(config)` before using any methods.'
-    );
-  }
-
-  const config = setDefaultConfig(initialConfig);
-  if (dbs[config.sqlitePath]) {
-    return dbs[config.sqlitePath];
-  }
-
-  /*
-   * Fall back to using the only open database connection if only
-   * one exists for backwards compatibility
-   */
-  if (Object.keys(dbs).length === 1) {
-    const filename = Object.keys(dbs)[0];
-    return dbs[filename];
-  }
-
-  throw new Error('Unable to find database connection.');
+  db.close();
+  delete dbs[db.name];
 }

package/lib/export.js

@@ -14,14 +14,10 @@ import { prepDirectory, generateFolderName } from './file-utils.js';
 import { log as _log, logWarning as _logWarning } from './log-utils.js';
 import { setDefaultConfig } from './utils.js';
 
-const exportGtfs = async (initialConfig) => {
-  const config = setDefaultConfig(initialConfig);
-  const log = _log(config);
-  const logWarning = _logWarning(config);
-  const db = await openDb(config);
-
-  // Get agency name for export folder from first line of agency.txt
-  const agencies = await db.all('SELECT agency_name FROM agency;').catch(() => {
+const getAgencies = (db, config) => {
+  try {
+    return db.prepare('SELECT agency_name FROM agency;').all();
+  } 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:".'
@@ -31,8 +27,18 @@ const exportGtfs = async (initialConfig) => {
     throw new Error(
       'No agencies found in SQLite. Be sure to first import data into SQLite using `gtfs-import` or `importGtfs(config);`'
     );
-  });
+  }
+};
+
+const exportGtfs = async (initialConfig) => {
+  const config = setDefaultConfig(initialConfig);
+  const log = _log(config);
+  const logWarning = _logWarning(config);
+  const db = openDb(config);
+
+  // Get agency name for export folder from first line of agency.txt
 
+  const agencies = getAgencies(db, config);
   const agencyCount = agencies.length;
   if (agencyCount === 0) {
     throw new Error(
@@ -62,7 +68,7 @@ const exportGtfs = async (initialConfig) => {
   const exportedFiles = await mapSeries(models, async (model) => {
     const filepath = path.join(exportPath, `${model.filenameBase}.txt`);
     const tableName = sqlString.escapeId(model.filenameBase);
-    const lines = await db.all(`SELECT * FROM ${tableName};`);
+    const lines = db.prepare(`SELECT * FROM ${tableName};`).all();
 
     if (!lines || lines.length === 0) {
       if (!model.nonstandard) {

package/lib/gtfs/agencies.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 agency from '../../models/gtfs/agency.js';
 /*
  * Returns an array of all agencies that match the query parameters.
  */
-export async function getAgencies(
+export function getAgencies(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(agency.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/gtfs/areas.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,16 @@ import areas from '../../models/gtfs/areas.js';
 /*
  * Returns an array of all areas that match the query parameters.
  */
-export async function getAreas(
-  query = {},
-  fields = [],
-  orderBy = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getAreas(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(areas.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/gtfs/attributions.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 attributions from '../../models/gtfs/attributions.js';
 /*
  * Returns an array of all attributions that match the query parameters.
  */
-export async function getAttributions(
+export function getAttributions(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(attributions.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/gtfs/calendar-dates.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 calendarDates from '../../models/gtfs/calendar-dates.js';
 /*
  * Returns an array of calendarDates that match the query parameters.
  */
-export async function getCalendarDates(
+export function getCalendarDates(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(calendarDates.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/gtfs/calendars.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 calendars from '../../models/gtfs/calendar.js';
 /*
  * Returns an array of calendars that match the query parameters.
  */
-export async function getCalendars(
+export function getCalendars(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(calendars.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/gtfs/fare-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 fareAttributes from '../../models/gtfs/fare-attributes.js';
 /*
  * Returns an array of all fare attributes that match the query parameters.
  */
-export async function getFareAttributes(
+export function getFareAttributes(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(fareAttributes.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/gtfs/fare-leg-rules.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 fareLegRules from '../../models/gtfs/fare-leg-rules.js';
 /*
  * Returns an array of all fare leg rules that match the query parameters.
  */
-export async function getFareLegRules(
+export function getFareLegRules(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(fareLegRules.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/gtfs/fare-products.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 fareProducts from '../../models/gtfs/fare-products.js';
 /*
  * Returns an array of all fare products that match the query parameters.
  */
-export async function getFareProducts(
+export function getFareProducts(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(fareProducts.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/gtfs/fare-rules.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 fareRules from '../../models/gtfs/fare-rules.js';
 /*
  * Returns an array of all fare rules that match the query parameters.
  */
-export async function getFareRules(
+export function getFareRules(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(fareRules.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/gtfs/fare-transfer-rules.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 fareTransferRules from '../../models/gtfs/fare-transfer-rules.js';
 /*
  * Returns an array of all fare transfer rules that match the query parameters.
  */
-export async function getFareTransferRules(
+export function getFareTransferRules(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(fareTransferRules.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/gtfs/feed-info.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 feedInfo from '../../models/gtfs/feed-info.js';
 /*
  * Returns an array of all feed info that match the query parameters.
  */
-export async function getFeedInfo(
+export function getFeedInfo(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(feedInfo.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/gtfs/frequencies.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 frequencies from '../../models/gtfs/frequencies.js';
 /*
  * Returns an array of all frequencies that match the query parameters.
  */
-export async function getFrequencies(
+export function getFrequencies(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(frequencies.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/gtfs/levels.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,16 @@ 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 = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getLevels(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(levels.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();
 }