gtfs 3.1.2 → 3.2.1

package/test/mocha/get-stoptimes.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getStoptimes } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getStoptimes,
+} from '../../index.js';
 
 describe('getStoptimes():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getStoptimes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return an empty array if no stoptimes exist for given agency', async () => {
     const stopId = 'fake-stop-id';
 
     const results = await getStoptimes({
-      stop_id: stopId
+      stop_id: stopId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -30,7 +36,7 @@ describe('getStoptimes():', () => {
     const stopId = '70011';
 
     const results = await getStoptimes({
-      stop_id: stopId
+      stop_id: stopId,
     });
     should.exist(results);
     results.should.have.length(80);
@@ -43,11 +49,13 @@ describe('getStoptimes():', () => {
   it('should return array of stoptimes for given trip_id ordered by stop_sequence', async () => {
     const tripId = '421a';
 
-    const results = await getStoptimes({
-      trip_id: tripId
-    }, [], [
-      ['stop_sequence', 'ASC']
-    ]);
+    const results = await getStoptimes(
+      {
+        trip_id: tripId,
+      },
+      [],
+      [['stop_sequence', 'ASC']]
+    );
 
     should.exist(results);
     results.should.have.length(24);

package/test/mocha/get-timetable-pages.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTimetablePages } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTimetablePages,
+} from '../../index.js';
 
 describe('getTimetablePages():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getTimetablePages():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no timetable pages (GTFS-to-HTML timetables)', async () => {
     const timetablePageId = 'fake-timetable-page-id';
 
     const results = await getTimetablePages({
-      timetable_page_id: timetablePageId
+      timetable_page_id: timetablePageId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-timetable-stop-orders.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTimetableStopOrders } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTimetableStopOrders,
+} from '../../index.js';
 
 describe('getTimetableStopOrders():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getTimetableStopOrders():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no timetable stop orders (GTFS-to-HTML timetables)', async () => {
     const timetableId = 'fake-timetable-id';
 
     const results = await getTimetableStopOrders({
-      timetable_id: timetableId
+      timetable_id: timetableId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-timetables.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTimetables } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTimetables,
+} from '../../index.js';
 
 describe('getTimetables():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getTimetables():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no timetables (GTFS-to-HTML timetables)', async () => {
     const timetableId = 'fake-timetable-id';
 
     const results = await getTimetables({
-      timetable_id: timetableId
+      timetable_id: timetableId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-transfers.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTransfers } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTransfers,
+} from '../../index.js';
 
 describe('getTransfers():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getTransfers():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no transfers', async () => {
     const fromStopId = 'fake-stop-id';
 
     const results = await getTransfers({
-      from_stop_id: fromStopId
+      from_stop_id: fromStopId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-translations.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTranslations } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTranslations,
+} from '../../index.js';
 
 describe('getTranslations():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getTranslations():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no translations', async () => {
     const fieldName = 'fake-field-name';
 
     const results = await getTranslations({
-      field_name: fieldName
+      field_name: fieldName,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-trip-capacities.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTripCapacities } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTripCapacities,
+} from '../../index.js';
 
 describe('getTripCapacities():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getTripCapacities():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no trip capacities (GTFS-ride)', async () => {
     const tripId = 'fake-trip-id';
 
     const results = await getTripCapacities({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-trips.js

@@ -2,9 +2,8 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTrips } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getTrips } from '../../index.js';
 
 describe('getTrips():', () => {
   before(async () => {
@@ -13,14 +12,15 @@ describe('getTrips():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no trips exist', async () => {
     const tripId = 'fake-trip-id';
 
     const results = await getTrips({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -30,7 +30,7 @@ describe('getTrips():', () => {
     const routeId = 'Bu-16APR';
 
     const results = await getTrips({
-      route_id: routeId
+      route_id: routeId,
     });
 
     const expectedResult = {
@@ -43,7 +43,7 @@ describe('getTrips():', () => {
       block_id: null,
       shape_id: 'cal_tam_sf',
       wheelchair_accessible: 1,
-      bikes_allowed: 1
+      bikes_allowed: 1,
     };
 
     should.exists(results);

package/test/mocha/import-gtfs.js

@@ -4,24 +4,30 @@
 import { createReadStream, existsSync } from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import parse from 'csv-parse';
+import { parse } from 'csv-parse';
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import { unzip } from '../../lib/file-utils.js';
 import config from '../test-config.js';
-import { importGtfs, getRoutes } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getRoutes } from '../../index.js';
 import models from '../../models/models.js';
 
 let db;
 
-const agenciesFixturesRemote = [{
-  url: 'http://transitfeeds.com/p/caltrain/122/20160406/download'
-}];
-
-const agenciesFixturesLocal = [{
-  path: path.join(path.dirname(fileURLToPath(import.meta.url)), '../fixture/caltrain_20160406.zip')
-}];
+const agenciesFixturesRemote = [
+  {
+    url: 'http://transitfeeds.com/p/caltrain/122/20160406/download',
+  },
+];
+
+const agenciesFixturesLocal = [
+  {
+    path: path.join(
+      path.dirname(fileURLToPath(import.meta.url)),
+      '../fixture/caltrain_20160406.zip'
+    ),
+  },
+];
 
 describe('importGtfs():', function () {
   before(async () => {
@@ -29,7 +35,8 @@ describe('importGtfs():', function () {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   this.timeout(10000);
@@ -37,7 +44,7 @@ describe('importGtfs():', function () {
     it('should be able to download and import from HTTP', async () => {
       await importGtfs({
         ...config,
-        agencies: agenciesFixturesRemote
+        agencies: agenciesFixturesRemote,
       });
 
       const routes = await getRoutes();
@@ -48,7 +55,7 @@ describe('importGtfs():', function () {
     it('should be able to download and import from local filesystem', async () => {
       await importGtfs({
         ...config,
-        agencies: agenciesFixturesLocal
+        agencies: agenciesFixturesLocal,
       });
 
       const routes = await getRoutes();
@@ -56,63 +63,73 @@ describe('importGtfs():', function () {
       routes.length.should.equal(4);
     });
 
-    it('should throw an error when importing from local filesystem which doesn\'t exist', async () => {
+    it("should throw an error when importing from local filesystem which doesn't exist", async () => {
       return importGtfs({
         ...config,
         agencies: [
           {
-            path: '/does/not/exist'
-          }
-        ]
+            path: '/does/not/exist',
+          },
+        ],
       }).should.be.rejected();
     });
   });
 
   describe('Verify data imported into database', () => {
     const countData = {};
-    const temporaryDir = path.join(path.dirname(fileURLToPath(import.meta.url)), '../fixture/tmp/');
+    const temporaryDir = path.join(
+      path.dirname(fileURLToPath(import.meta.url)),
+      '../fixture/tmp/'
+    );
 
     before(async () => {
       await unzip(agenciesFixturesLocal[0].path, temporaryDir);
 
-      await Promise.all(models.map(model => {
-        const filePath = path.join(temporaryDir, `${model.filenameBase}.txt`);
-
-        // GTFS has optional files
-        if (!existsSync(filePath)) {
-          countData[model.filenameBase] = 0;
-          return false;
-        }
-
-        const parser = parse({
-          columns: true,
-          relax: true,
-          trim: true
-        }, (error, data) => {
-          if (error) {
-            throw new Error(error);
-          }
+      await Promise.all(
+        models.map((model) => {
+          const filePath = path.join(temporaryDir, `${model.filenameBase}.txt`);
 
-          countData[model.filenameBase] = data.length;
-        });
+          // GTFS has optional files
+          if (!existsSync(filePath)) {
+            countData[model.filenameBase] = 0;
+            return false;
+          }
 
-        return createReadStream(filePath)
-          .pipe(parser)
-          .on('error', error => {
-            countData[model.collection] = 0;
-            throw new Error(error);
-          });
-      }));
+          const parser = parse(
+            {
+              columns: true,
+              relax: true,
+              trim: true,
+            },
+            (error, data) => {
+              if (error) {
+                throw new Error(error);
+              }
+
+              countData[model.filenameBase] = data.length;
+            }
+          );
+
+          return createReadStream(filePath)
+            .pipe(parser)
+            .on('error', (error) => {
+              countData[model.collection] = 0;
+              throw new Error(error);
+            });
+        })
+      );
 
       await importGtfs({
         ...config,
-        agencies: agenciesFixturesLocal
+        agencies: agenciesFixturesLocal,
       });
     });
 
     for (const model of models) {
       it(`should import the same number of ${model.filenameBase}`, async () => {
-        const result = await db.get(`SELECT COUNT(*) FROM ${model.filenameBase};`);
+        const result = await db.get(
+          `SELECT COUNT(*) FROM ${model.filenameBase};`
+        );
         result['COUNT(*)'].should.equal(countData[model.filenameBase]);
       });
     }

package/test/test-config.js

@@ -2,10 +2,15 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const config = {
-  agencies: [{
-    path: path.join(path.dirname(fileURLToPath(import.meta.url)), 'fixture/caltrain_20160406.zip')
-  }],
-  verbose: false
+  agencies: [
+    {
+      path: path.join(
+        path.dirname(fileURLToPath(import.meta.url)),
+        'fixture/caltrain_20160406.zip'
+      ),
+    },
+  ],
+  verbose: false,
 };
 
 export default config;