gtfs 3.1.3 → 3.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -62,6 +62,7 @@
   },
   "scripts": {
     "lint": "eslint **/*.js",
+    "lint-fix": "eslint **/*.js --fix",
     "test": "eslint **/*.js && NODE_ENV=test mocha ./test/mocha/**/*.js --timeout 2000"
   },
   "dependencies": {
@@ -77,7 +78,7 @@
     "recursive-copy": "^2.0.13",
     "sanitize-filename": "^1.6.3",
     "sqlite": "^4.0.23",
-    "sqlite3": "git+https://git@github.com/mapbox/node-sqlite3#918052b",
+    "sqlite3": "^5.0.2",
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
     "tmp-promise": "^3.0.2",
@@ -87,8 +88,12 @@
   },
   "devDependencies": {
     "eslint": "^8.0.1",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-config-xo": "^0.39.0",
+    "husky": "^7.0.2",
     "mocha": "^9.1.3",
+    "prettier": "^2.4.1",
+    "pretty-quick": "^3.1.1",
     "should": "^13.2.3"
   },
   "engines": {
@@ -103,5 +108,8 @@
         "filename": "CHANGELOG.md"
       }
     }
+  },
+  "prettier": {
+    "singleQuote": true
   }
 }

package/test/mocha/export-gtfs.js

@@ -33,52 +33,72 @@ describe('exportGtfs():', function () {
 
   describe('Verify data exported', () => {
     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(config.agencies[0].path, temporaryDir);
 
-      await Promise.all(models.map(model => {
-        const filePath = path.join(temporaryDir, `${model.filenameBase}.txt`);
+      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);
+          // GTFS has optional files
+          if (!existsSync(filePath)) {
+            countData[model.filenameBase] = 0;
+            return false;
           }
 
-          countData[model.filenameBase] = data.length;
-        });
-
-        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);
     });
 
     after(async () => {
       const agencies = await getAgencies({}, ['agency_name']);
-      await rm(path.join(process.cwd(), 'gtfs-export', generateFolderName(agencies[0].agency_name)), { recursive: true, force: true });
+      await rm(
+        path.join(
+          process.cwd(),
+          'gtfs-export',
+          generateFolderName(agencies[0].agency_name)
+        ),
+        { recursive: true, force: true }
+      );
     });
 
     for (const model of models) {
       it(`should import the same number of ${model.filenameBase}`, async () => {
         const agencies = await getAgencies({}, ['agency_name']);
-        const filePath = path.join(process.cwd(), 'gtfs-export', generateFolderName(agencies[0].agency_name), `${model.filenameBase}.txt`);
+        const filePath = path.join(
+          process.cwd(),
+          'gtfs-export',
+          generateFolderName(agencies[0].agency_name),
+          `${model.filenameBase}.txt`
+        );
 
         // GTFS has optional files
         if (!existsSync(filePath)) {
@@ -87,23 +107,26 @@ describe('exportGtfs():', function () {
           return;
         }
 
-        const parser = parse({
-          columns: true,
-          relax: true,
-          trim: true
-        }, (error, data) => {
-          if (error) {
-            throw new Error(error);
-          }
+        const parser = parse(
+          {
+            columns: true,
+            relax: true,
+            trim: true,
+          },
+          (error, data) => {
+            if (error) {
+              throw new Error(error);
+            }
 
-          should.not.exist(error);
+            should.not.exist(error);
 
-          data.length.should.equal(countData[model.filenameBase]);
-        });
+            data.length.should.equal(countData[model.filenameBase]);
+          }
+        );
 
         return createReadStream(filePath)
           .pipe(parser)
-          .on('error', error => {
+          .on('error', (error) => {
             should.not.exist(error);
           });
       });

package/test/mocha/get-agencies.js

@@ -18,7 +18,7 @@ describe('getAgencies():', () => {
   it('should return empty array if no agencies exist', async () => {
     const agencyId = 'fake-agency-id';
     const results = await getAgencies({
-      agency_id: agencyId
+      agency_id: agencyId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -36,7 +36,7 @@ describe('getAgencies():', () => {
       agency_lang: 'en',
       agency_phone: '800-660-4287',
       agency_fare_url: null,
-      agency_email: null
+      agency_email: null,
     };
 
     should.exist(results);
@@ -50,7 +50,7 @@ describe('getAgencies():', () => {
 
     const results = await getAgencies({
       agency_id: agencyId,
-      agency_lang: agencyLand
+      agency_lang: agencyLand,
     });
 
     const expectedResult = {
@@ -62,7 +62,7 @@ describe('getAgencies():', () => {
       agency_lang: 'en',
       agency_phone: '800-660-4287',
       agency_fare_url: null,
-      agency_email: null
+      agency_email: null,
     };
 
     should.exist(results);
@@ -73,16 +73,16 @@ describe('getAgencies():', () => {
   it('should return only specific keys for expected agency for agency_id', async () => {
     const agencyId = 'CT';
 
-    const results = await getAgencies({
-      agency_id: agencyId
-    }, [
-      'agency_url',
-      'agency_lang'
-    ]);
+    const results = await getAgencies(
+      {
+        agency_id: agencyId,
+      },
+      ['agency_url', 'agency_lang']
+    );
 
     const expectedResult = {
       agency_url: 'http://www.caltrain.com',
-      agency_lang: 'en'
+      agency_lang: 'en',
     };
 
     should.exist(results);

package/test/mocha/get-attributions.js

@@ -19,7 +19,7 @@ describe('getAttributions():', () => {
   it('should return empty array if no attributions exist', async () => {
     const attributionId = 'fake-attribution-id';
     const results = await getAttributions({
-      attribution_id: attributionId
+      attribution_id: attributionId,
     });
     should.exists(results);
     results.should.have.length(0);

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

@@ -20,7 +20,7 @@ describe('getBoardAlights():', () => {
     const tripId = 'fake-trip-id';
 
     const results = await getBoardAlights({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-calendar-dates.js

@@ -20,7 +20,7 @@ describe('getCalendarDates():', () => {
     const serviceId = 'fake-service-id';
 
     const results = await getCalendarDates({
-      service_id: serviceId
+      service_id: serviceId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -30,7 +30,7 @@ describe('getCalendarDates():', () => {
     const serviceId = 'CT-16APR-Caltrain-Weekday-01';
 
     const results = await getCalendarDates({
-      service_id: serviceId
+      service_id: serviceId,
     });
 
     should.exists(results);
@@ -42,29 +42,29 @@ describe('getCalendarDates():', () => {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20161124,
         exception_type: 2,
-        holiday_name: null
+        holiday_name: null,
       },
       {
         id: 4,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160905,
         exception_type: 2,
-        holiday_name: null
+        holiday_name: null,
       },
       {
         id: 6,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160704,
         exception_type: 2,
-        holiday_name: null
+        holiday_name: null,
       },
       {
         id: 8,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160530,
         exception_type: 2,
-        holiday_name: null
-      }
+        holiday_name: null,
+      },
     ];
 
     for (const result of results) {
@@ -75,33 +75,34 @@ describe('getCalendarDates():', () => {
   it('should return only specific keys for expected calendar dates, sorted by date', async () => {
     const serviceId = 'CT-16APR-Caltrain-Weekday-01';
 
-    const results = await getCalendarDates({
-      service_id: serviceId
-    }, [
-      'service_id',
-      'date'
-    ], [
-      ['date', 'ASC'],
-      ['service_id', 'ASC']
-    ]);
+    const results = await getCalendarDates(
+      {
+        service_id: serviceId,
+      },
+      ['service_id', 'date'],
+      [
+        ['date', 'ASC'],
+        ['service_id', 'ASC'],
+      ]
+    );
 
     const expectedResults = [
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20160530
+        date: 20160530,
       },
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20160704
+        date: 20160704,
       },
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20160905
+        date: 20160905,
       },
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20161124
-      }
+        date: 20161124,
+      },
     ];
 
     results.length.should.equal(4);

package/test/mocha/get-calendars.js

@@ -20,7 +20,7 @@ describe('getCalendars():', () => {
     const serviceId = 'fake-service-id';
 
     const results = await getCalendars({
-      service_id: serviceId
+      service_id: serviceId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -28,7 +28,7 @@ describe('getCalendars():', () => {
 
   it('should return expected calendars by day', async () => {
     const results = await getCalendars({
-      sunday: 1
+      sunday: 1,
     });
 
     const expectedResult = {
@@ -41,7 +41,7 @@ describe('getCalendars():', () => {
       saturday: 0,
       sunday: 1,
       start_date: 20140323,
-      end_date: 20190331
+      end_date: 20190331,
     };
 
     should.exist(results);
@@ -53,8 +53,8 @@ describe('getCalendars():', () => {
     const results = await getCalendars({
       service_id: [
         'CT-16APR-Caltrain-Saturday-02',
-        'CT-16APR-Caltrain-Sunday-02'
-      ]
+        'CT-16APR-Caltrain-Sunday-02',
+      ],
     });
 
     const expectedResults = [
@@ -68,7 +68,7 @@ describe('getCalendars():', () => {
         saturday: 1,
         sunday: 0,
         start_date: 20140329,
-        end_date: 20190331
+        end_date: 20190331,
       },
       {
         service_id: 'CT-16APR-Caltrain-Sunday-02',
@@ -80,8 +80,8 @@ describe('getCalendars():', () => {
         saturday: 0,
         sunday: 1,
         start_date: 20140323,
-        end_date: 20190331
-      }
+        end_date: 20190331,
+      },
     ];
 
     should.exist(results);

package/test/mocha/get-db.js

@@ -19,7 +19,11 @@ describe('getDb():', () => {
   it('should allow raw db queries: calendar_dates', async () => {
     const serviceIds = ['CT-16APR-Caltrain-Weekday-01'];
     const db = getDb();
-    const results = await db.all(`SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map(serviceId => `'${serviceId}'`).join(', ')})`);
+    const results = await db.all(
+      `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds
+        .map((serviceId) => `'${serviceId}'`)
+        .join(', ')})`
+    );
 
     should.exists(results);
     results.should.have.length(4);
@@ -30,7 +34,10 @@ describe('getDb():', () => {
     const startStopId = '70261';
     const endStopId = '70131';
     const db = getDb();
-    const results = await db.all('SELECT * from trips where trips.trip_id IN (SELECT start_stop_times.trip_id FROM stop_times as start_stop_times WHERE stop_id = ? AND start_stop_times.stop_sequence < (SELECT end_stop_times.stop_sequence FROM stop_times as end_stop_times WHERE end_stop_times.stop_sequence > start_stop_times.stop_sequence AND end_stop_times.trip_id = start_stop_times.trip_id AND end_stop_times.stop_id = ? ))', [startStopId, endStopId]);
+    const results = await db.all(
+      'SELECT * from trips where trips.trip_id IN (SELECT start_stop_times.trip_id FROM stop_times as start_stop_times WHERE stop_id = ? AND start_stop_times.stop_sequence < (SELECT end_stop_times.stop_sequence FROM stop_times as end_stop_times WHERE end_stop_times.stop_sequence > start_stop_times.stop_sequence AND end_stop_times.trip_id = start_stop_times.trip_id AND end_stop_times.stop_id = ? ))',
+      [startStopId, endStopId]
+    );
     should.exists(results);
     results.should.have.length(62);
   });

package/test/mocha/get-directions.js

@@ -20,7 +20,7 @@ describe('getDirections():', () => {
     const fareRouteId = 'not_real';
 
     const results = await getDirections({
-      route_id: fareRouteId
+      route_id: fareRouteId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-fare-attributes.js

@@ -20,7 +20,7 @@ describe('getFareAttributes():', () => {
     const fareId = 'not_real';
 
     const results = await getFareAttributes({
-      fare_id: fareId
+      fare_id: fareId,
     });
 
     should.exists(results);
@@ -31,7 +31,7 @@ describe('getFareAttributes():', () => {
     const fareId = 'OW_1_20160228';
 
     const results = await getFareAttributes({
-      fare_id: fareId
+      fare_id: fareId,
     });
 
     const expectedResult = {
@@ -41,7 +41,7 @@ describe('getFareAttributes():', () => {
       payment_method: 1,
       transfers: 0,
       agency_id: null,
-      transfer_duration: null
+      transfer_duration: null,
     };
 
     should.exist(results);

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

@@ -20,7 +20,7 @@ describe('getFareRules():', () => {
     const routeId = 'not_real';
 
     const results = await getFareRules({
-      route_id: routeId
+      route_id: routeId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -29,20 +29,18 @@ describe('getFareRules():', () => {
   it('should return expected fare_rules', async () => {
     const routeId = 'Bu-16APR';
 
-    const results = await getFareRules({
-      route_id: routeId
-    }, [
-      'fare_id',
-      'route_id',
-      'origin_id',
-      'destination_id'
-    ]);
+    const results = await getFareRules(
+      {
+        route_id: routeId,
+      },
+      ['fare_id', 'route_id', 'origin_id', 'destination_id']
+    );
 
     const expectedResult = {
       fare_id: 'OW_2_20160228',
       route_id: 'Bu-16APR',
       origin_id: '6',
-      destination_id: '5'
+      destination_id: '5',
     };
 
     should.exist(results);

package/test/mocha/get-feed-info.js

@@ -20,7 +20,7 @@ describe('getFeedInfo():', () => {
     const feedPublisherName = 'not_real';
 
     const results = await getFeedInfo({
-      feed_publisher_name: feedPublisherName
+      feed_publisher_name: feedPublisherName,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-frequencies.js

@@ -20,7 +20,7 @@ describe('getFrequencies():', () => {
     const tripId = 'not_real';
 
     const results = await getFrequencies({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-levels.js

@@ -20,7 +20,7 @@ describe('getLevels():', () => {
     const levelId = 'not_real';
 
     const results = await getLevels({
-      level_id: levelId
+      level_id: levelId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-pathways.js

@@ -20,7 +20,7 @@ describe('getPathways():', () => {
     const pathwayId = 'not_real';
 
     const results = await getPathways({
-      pathway_id: pathwayId
+      pathway_id: pathwayId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-rider-trips.js

@@ -20,7 +20,7 @@ describe('getRiderTrips():', () => {
     const tripId = 'fake-trip-id';
 
     const results = await getRiderTrips({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-riderships.js

@@ -20,7 +20,7 @@ describe('getRiderships():', () => {
     const routeId = 'fake-route-id';
 
     const results = await getRiderships({
-      route_id: routeId
+      route_id: routeId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-routes.js

@@ -20,18 +20,14 @@ describe('getRoutes():', () => {
     const routeId = 'fake-route-id';
 
     const results = await getRoutes({
-      route_id: routeId
+      route_id: routeId,
     });
     should.exists(results);
     results.should.have.length(0);
   });
 
   it('should return expected routes', async () => {
-    const results = await getRoutes(
-      {},
-      [],
-      [['route_long_name', 'ASC']]
-    );
+    const results = await getRoutes({}, [], [['route_long_name', 'ASC']]);
 
     const expectedResults = [
       {
@@ -46,7 +42,7 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
+        continuous_drop_off: null,
       },
       {
         route_id: 'Li-16APR',
@@ -60,7 +56,7 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
+        continuous_drop_off: null,
       },
       {
         route_id: 'Lo-16APR',
@@ -74,7 +70,7 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
+        continuous_drop_off: null,
       },
       {
         route_id: 'TaSj-16APR',
@@ -88,8 +84,8 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
-      }
+        continuous_drop_off: null,
+      },
     ];
 
     should.exist(results);
@@ -117,8 +113,8 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
-      }
+        continuous_drop_off: null,
+      },
     ];
 
     should.exist(results);

package/test/mocha/get-shapes-as-geojson.js

@@ -19,7 +19,7 @@ describe('getShapesAsGeoJSON():', () => {
   it('should return geojson with an empty features array if no shapes exist', async () => {
     const shapeId = 'fake-shape-id';
     const geojson = await getShapesAsGeoJSON({
-      shape_id: shapeId
+      shape_id: shapeId,
     });
 
     should.exist(geojson);
@@ -42,7 +42,7 @@ describe('getShapesAsGeoJSON():', () => {
     const routeId = 'Lo-16APR';
 
     const geojson = await getShapesAsGeoJSON({
-      route_id: routeId
+      route_id: routeId,
     });
 
     should.exist(geojson);
@@ -59,7 +59,7 @@ describe('getShapesAsGeoJSON():', () => {
 
     const geojson = await getShapesAsGeoJSON({
       route_id: routeId,
-      direction_id: directionId
+      direction_id: directionId,
     });
 
     should.exist(geojson);