gtfs 3.1.3 → 3.2.2

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

@@ -5,17 +5,17 @@ const model = {
     {
       name: 'note_id',
       type: 'varchar(255)',
-      primary: true
+      primary: true,
     },
     {
       name: 'symbol',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'note',
-      type: 'varchar(2047)'
-    }
-  ]
+      type: 'varchar(2047)',
+    },
+  ],
 };
 
 export default model;

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

@@ -5,17 +5,17 @@ const model = {
     {
       name: 'timetable_page_id',
       type: 'varchar(255)',
-      primary: true
+      primary: true,
     },
     {
       name: 'timetable_page_label',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'filename',
-      type: 'varchar(255)'
-    }
-  ]
+      type: 'varchar(255)',
+    },
+  ],
 };
 
 export default model;

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

@@ -5,24 +5,24 @@ const model = {
     {
       name: 'id',
       type: 'integer',
-      primary: true
+      primary: true,
     },
     {
       name: 'timetable_id',
       type: 'varchar(255)',
-      index: true
+      index: true,
     },
     {
       name: 'stop_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'stop_sequence',
       type: 'integer',
       min: 0,
-      index: true
-    }
-  ]
+      index: true,
+    },
+  ],
 };
 
 export default model;

package/models/non-standard/timetables.js

@@ -5,134 +5,134 @@ const model = {
     {
       name: 'id',
       type: 'integer',
-      primary: true
+      primary: true,
     },
     {
       name: 'timetable_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'route_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'direction_id',
       type: 'integer',
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'start_date',
-      type: 'integer'
+      type: 'integer',
     },
     {
       name: 'end_date',
-      type: 'integer'
+      type: 'integer',
     },
     {
       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_time',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'start_timestamp',
-      type: 'integer'
+      type: 'integer',
     },
     {
       name: 'end_time',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'end_timestamp',
-      type: 'integer'
+      type: 'integer',
     },
     {
       name: 'timetable_label',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'service_notes',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'orientation',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'timetable_page_id',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'timetable_sequence',
       type: 'integer',
       min: 0,
-      index: true
+      index: true,
     },
     {
       name: 'direction_name',
-      type: 'varchar(255)'
+      type: 'varchar(255)',
     },
     {
       name: 'include_exceptions',
       type: 'integer',
       min: 0,
-      max: 1
+      max: 1,
     },
     {
       name: 'show_trip_continuation',
       type: 'integer',
       min: 0,
-      max: 1
-    }
-  ]
+      max: 1,
+    },
+  ],
 };
 
 export default model;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "3.1.3",
+  "version": "3.2.2",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -52,7 +52,8 @@
     "Oskari Groenroos <oskari@groenroos.fi>",
     "Devin Packer",
     "Darius MARTIN",
-    "Mike Brocks"
+    "Mike Brocks",
+    "Matt Moran"
   ],
   "type": "module",
   "main": "index.js",
@@ -60,35 +61,43 @@
     "gtfs-export": "bin/gtfs-export.js",
     "gtfs-import": "bin/gtfs-import.js"
   },
+  "types": "@types",
   "scripts": {
+    "dtslint": "dtslint @types",
     "lint": "eslint **/*.js",
+    "lint-fix": "eslint **/*.js --fix",
     "test": "eslint **/*.js && NODE_ENV=test mocha ./test/mocha/**/*.js --timeout 2000"
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "chalk": "^4.1.2",
-    "csv-parse": "^4.16.3",
-    "csv-stringify": "^5.6.5",
+    "@vscode/sqlite3": "^5.0.7",
+    "chalk": "^5.0.0",
+    "csv-parse": "^5.0.3",
+    "csv-stringify": "^6.0.4",
     "lodash-es": "^4.17.21",
-    "node-fetch": "^3.0.0",
+    "node-fetch": "^3.1.0",
     "pluralize": "^8.0.0",
-    "pretty-error": "^3.0.4",
+    "pretty-error": "^4.0.0",
     "promise-map-series": "^0.3.0",
     "recursive-copy": "^2.0.13",
     "sanitize-filename": "^1.6.3",
     "sqlite": "^4.0.23",
-    "sqlite3": "git+https://git@github.com/mapbox/node-sqlite3#918052b",
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
-    "tmp-promise": "^3.0.2",
+    "tmp-promise": "^3.0.3",
     "untildify": "^4.0.0",
     "unzipper": "^0.10.11",
-    "yargs": "^17.2.1"
+    "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "eslint": "^8.0.1",
+    "dtslint": "^3.4.2",
+    "eslint": "^8.5.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-config-xo": "^0.39.0",
+    "husky": "^7.0.4",
     "mocha": "^9.1.3",
+    "prettier": "^2.5.1",
+    "pretty-quick": "^3.1.3",
     "should": "^13.2.3"
   },
   "engines": {
@@ -103,5 +112,8 @@
         "filename": "CHANGELOG.md"
       }
     }
+  },
+  "prettier": {
+    "singleQuote": true
   }
 }

package/test/mocha/export-gtfs.js

@@ -5,13 +5,19 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createReadStream, existsSync } from 'node:fs';
 import { rm } from 'node:fs/promises';
-import parse from 'csv-parse';
+import { parse } from 'csv-parse';
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import { unzip, generateFolderName } from '../../lib/file-utils.js';
 import config from '../test-config.js';
-import { importGtfs, exportGtfs, getAgencies } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  exportGtfs,
+  getAgencies,
+} from '../../index.js';
 import models from '../../models/models.js';
 
 describe('exportGtfs():', function () {
@@ -21,7 +27,8 @@ describe('exportGtfs():', function () {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   this.timeout(10000);
@@ -33,52 +40,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 +114,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

@@ -1,9 +1,14 @@
 /* eslint-env mocha */
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getAgencies } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getAgencies,
+} from '../../index.js';
 
 describe('getAgencies():', () => {
   before(async () => {
@@ -12,13 +17,14 @@ describe('getAgencies():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   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 +42,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 +56,7 @@ describe('getAgencies():', () => {
 
     const results = await getAgencies({
       agency_id: agencyId,
-      agency_lang: agencyLand
+      agency_lang: agencyLand,
     });
 
     const expectedResult = {
@@ -62,7 +68,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 +79,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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getAttributions } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getAttributions,
+} from '../../index.js';
 
 describe('getAttributions():', () => {
   before(async () => {
@@ -13,13 +18,14 @@ describe('getAttributions():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   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

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