gtfs 3.1.2 → 3.2.1

package/lib/non-standard/directions.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 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);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

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

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 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);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

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

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import timetableNotesReferences from '../../models/non-standard/timetable-notes-references.js';
 
 /*
  * Returns an array of all timetable notes references that match the query parameters.
  */
-export async function getTimetableNotesReferences(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTimetableNotesReferences(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   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.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

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

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 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);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

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

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 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);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

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

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import timetableStopOrder from '../../models/non-standard/timetable-stop-order.js';
 
 /*
  * Returns an array of all timetable stop orders that match the query parameters.
  */
-export async function getTimetableStopOrders(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTimetableStopOrders(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   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.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/non-standard/timetables.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 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);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/utils.js

@@ -10,7 +10,9 @@ export function validateConfigForImport(config) {
 
   for (const [index, agency] of config.agencies.entries()) {
     if (!agency.path && !agency.url) {
-      throw new Error(`No Agency \`url\` or \`path\` specified in config for agency index ${index}.`);
+      throw new Error(
+        `No Agency \`url\` or \`path\` specified in config for agency index ${index}.`
+      );
     }
   }
 
@@ -22,33 +24,41 @@ export function validateConfigForImport(config) {
  */
 export function setDefaultConfig(initialConfig) {
   const defaults = {
-    sqlitePath: ':memory:'
+    sqlitePath: ':memory:',
   };
 
-  return Object.assign(defaults, initialConfig);
+  return {
+    ...defaults,
+    ...initialConfig,
+  };
 }
 
 /*
  * Calculate seconds from midnight for HH:mm:ss
  */
 export function calculateSecondsFromMidnight(time) {
-  const split = time.split(':').map(d => Number.parseInt(d, 10));
+  const split = time.split(':').map((d) => Number.parseInt(d, 10));
   if (split.length !== 3) {
     return null;
   }
 
-  return (split[0] * 3600) + (split[1] * 60) + split[2];
+  return split[0] * 3600 + split[1] * 60 + split[2];
 }
 
 export function formatSelectClause(fields) {
-  const selectItem = fields.length > 0 ? fields.map(fieldName => sqlString.escapeId(fieldName)).join(', ') : '*';
+  const selectItem =
+    fields.length > 0
+      ? fields.map((fieldName) => sqlString.escapeId(fieldName)).join(', ')
+      : '*';
 
   return `SELECT ${selectItem}`;
 }
 
 export function formatWhereClause(key, value) {
   if (Array.isArray(value)) {
-    return `${sqlString.escapeId(key)} IN (${value.map(v => sqlString.escape(v)).join(', ')})`;
+    return `${sqlString.escapeId(key)} IN (${value
+      .map((v) => sqlString.escape(v))
+      .join(', ')})`;
   }
 
   if (value === null) {
@@ -63,7 +73,9 @@ export function formatWhereClauses(query) {
     return '';
   }
 
-  const whereClauses = Object.entries(query).map(([key, value]) => formatWhereClause(key, value));
+  const whereClauses = Object.entries(query).map(([key, value]) =>
+    formatWhereClause(key, value)
+  );
   return `WHERE ${whereClauses.join(' AND ')}`;
 }
 
@@ -73,10 +85,12 @@ export function formatOrderByClause(orderBy) {
   if (orderBy.length > 0) {
     orderByClause += 'ORDER BY ';
 
-    orderByClause += orderBy.map(([key, value]) => {
-      const direction = value === 'DESC' ? 'DESC' : 'ASC';
-      return `${sqlString.escapeId(key)} ${direction}`;
-    }).join(', ');
+    orderByClause += orderBy
+      .map(([key, value]) => {
+        const direction = value === 'DESC' ? 'DESC' : 'ASC';
+        return `${sqlString.escapeId(key)} ${direction}`;
+      })
+      .join(', ');
   }
 
   return orderByClause;

package/models/gtfs/agency.js

@@ -4,44 +4,44 @@ const model = {
     {
       name: 'id',
       type: 'integer',
-      primary: true
+      primary: true,
     },
     {
       name: 'agency_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'agency_name',
       type: 'varchar(255)',
-      required: true
+      required: true,
     },
     {
       name: 'agency_url',
       type: 'varchar(2047)',
-      required: true
+      required: true,
     },
     {
       name: 'agency_timezone',
       type: 'varchar(255)',
-      required: true
+      required: true,
     },
     {
       name: 'agency_lang',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'agency_phone',
-      type: 'varchar(64)'
+      type: 'varchar(64)',
     },
     {
       name: 'agency_fare_url',
-      type: 'varchar(2047)'
+      type: 'varchar(2047)',
     },
     {
       name: 'agency_email',
-      type: 'varchar(255)'
-    }
-  ]
+      type: 'varchar(255)',
+    },
+  ],
 };
 
 export default model;

package/models/gtfs/attributions.js

@@ -4,60 +4,60 @@ const model = {
     {
       name: 'id',
       type: 'integer',
-      primary: true
+      primary: true,
     },
     {
       name: 'attribution_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'agency_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'route_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'trip_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'organization_name',
       type: 'varchar(255)',
-      required: true
+      required: true,
     },
     {
       name: 'is_producer',
       type: 'integer',
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'is_operator',
       type: 'integer',
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'is_authority',
       type: 'integer',
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'attribution_url',
-      type: 'varchar(2047)'
+      type: 'varchar(2047)',
     },
     {
       name: 'attribution_email',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'attribution_phone',
-      type: 'varchar(255)'
-    }
-  ]
+      type: 'varchar(255)',
+    },
+  ],
 };
 
 export default model;

package/models/gtfs/calendar-dates.js

@@ -4,19 +4,19 @@ const model = {
     {
       name: 'id',
       type: 'integer',
-      primary: true
+      primary: true,
     },
     {
       name: 'service_id',
       type: 'varchar(255)',
       required: true,
-      index: true
+      index: true,
     },
     {
       name: 'date',
       type: 'integer',
       required: true,
-      index: true
+      index: true,
     },
     {
       name: 'exception_type',
@@ -24,13 +24,13 @@ const model = {
       required: true,
       min: 1,
       max: 2,
-      index: true
+      index: true,
     },
     {
       name: 'holiday_name',
-      type: 'varchar(255)'
-    }
-  ]
+      type: 'varchar(255)',
+    },
+  ],
 };
 
 export default model;

package/models/gtfs/calendar.js

@@ -5,70 +5,70 @@ const model = {
       name: 'service_id',
       type: 'varchar(255)',
       required: true,
-      primary: true
+      primary: true,
     },
     {
       name: 'monday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'tuesday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'wednesday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'thursday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'friday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'saturday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'sunday',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'start_date',
       type: 'integer',
       required: true,
-      index: true
+      index: true,
     },
     {
       name: 'end_date',
       type: 'integer',
       required: true,
-      index: true
-    }
-  ]
+      index: true,
+    },
+  ],
 };
 
 export default model;

package/models/gtfs/fare-attributes.js

@@ -5,41 +5,41 @@ const model = {
       name: 'fare_id',
       type: 'varchar(255)',
       required: true,
-      primary: true
+      primary: true,
     },
     {
       name: 'price',
       type: 'real',
-      required: true
+      required: true,
     },
     {
       name: 'currency_type',
       type: 'varchar(255)',
-      required: true
+      required: true,
     },
     {
       name: 'payment_method',
       type: 'integer',
       required: true,
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'transfers',
       type: 'integer',
       min: 0,
-      max: 2
+      max: 2,
     },
     {
       name: 'agency_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'transfer_duration',
       type: 'integer',
-      min: 0
-    }
-  ]
+      min: 0,
+    },
+  ],
 };
 
 export default model;

package/models/gtfs/fare-rules.js

@@ -4,32 +4,32 @@ const model = {
     {
       name: 'id',
       type: 'integer',
-      primary: true
+      primary: true,
     },
     {
       name: 'fare_id',
       type: 'varchar(255)',
       required: true,
-      index: true
+      index: true,
     },
     {
       name: 'route_id',
       type: 'varchar(255)',
-      index: true
+      index: true,
     },
     {
       name: 'origin_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'destination_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'contains_id',
-      type: 'varchar(255)'
-    }
-  ]
+      type: 'varchar(255)',
+    },
+  ],
 };
 
 export default model;