gtfs 3.1.4 → 3.2.3

package/models/gtfs/routes.js

@@ -13,14 +13,17 @@ const model = {
     {
       name: 'route_short_name',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'route_long_name',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'route_desc',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'route_type',
@@ -37,10 +40,12 @@ const model = {
     {
       name: 'route_color',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'route_text_color',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'route_sort_order',

package/models/gtfs/stop-times.js

@@ -45,6 +45,7 @@ const model = {
     {
       name: 'stop_headsign',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'pickup_type',

package/models/gtfs/stops.js

@@ -13,14 +13,17 @@ const model = {
     {
       name: 'stop_name',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'tts_stop_name',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'stop_desc',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'stop_lat',

package/models/gtfs/trips.js

@@ -21,10 +21,12 @@ const model = {
     {
       name: 'trip_headsign',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'trip_short_name',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'direction_id',

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

@@ -16,6 +16,7 @@ const model = {
     {
       name: 'stop_city',
       type: 'varchar(255)',
+      nocase: true,
     },
   ],
 };

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

@@ -14,6 +14,7 @@ const model = {
     {
       name: 'note',
       type: 'varchar(2047)',
+      nocase: true,
     },
   ],
 };

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

@@ -14,6 +14,7 @@ const model = {
     {
       name: 'filename',
       type: 'varchar(255)',
+      nocase: true,
     },
   ],
 };

package/models/non-standard/timetables.js

@@ -97,10 +97,12 @@ const model = {
     {
       name: 'timetable_label',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'service_notes',
       type: 'varchar(255)',
+      nocase: true,
     },
     {
       name: 'orientation',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "3.1.4",
+  "version": "3.2.3",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -52,7 +52,9 @@
     "Oskari Groenroos <oskari@groenroos.fi>",
     "Devin Packer",
     "Darius MARTIN",
-    "Mike Brocks"
+    "Mike Brocks",
+    "Matt Moran",
+    "Daniel Sörlöv"
   ],
   "type": "module",
   "main": "index.js",
@@ -60,40 +62,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.4",
+    "csv-stringify": "^6.0.5",
     "lodash-es": "^4.17.21",
-    "node-fetch": "^3.0.0",
+    "node-fetch": "^3.1.1",
     "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": "^5.0.2",
     "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.7.0",
     "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",
+    "husky": "^7.0.4",
+    "mocha": "^9.1.4",
+    "prettier": "^2.5.1",
+    "pretty-quick": "^3.1.3",
     "should": "^13.2.3"
   },
   "engines": {

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);

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,7 +17,8 @@ describe('getAgencies():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no agencies exist', async () => {

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,7 +18,8 @@ describe('getAttributions():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no attributions exist', async () => {

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,7 +18,8 @@ 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 () => {

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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getCalendarDates } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getCalendarDates,
+} from '../../index.js';
 
 describe('getCalendarDates():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getCalendarDates():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no calendar dates exist', async () => {

package/test/mocha/get-calendars.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getCalendars } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getCalendars,
+} from '../../index.js';
 
 describe('getCalendars():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getCalendars():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no calendars', async () => {

package/test/mocha/get-db.js

@@ -1,10 +1,21 @@
 /* eslint-env mocha */
 
 import should from 'should';
+import fs from 'fs';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getDb } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getShapes } from '../../index.js';
+
+const db2Config = {
+  ...config,
+  agencies: [
+    {
+      ...config.agencies[0],
+      exclude: ['shapes'],
+    },
+  ],
+  sqlitePath: './tmpdb',
+};
 
 describe('getDb():', () => {
   before(async () => {
@@ -13,7 +24,13 @@ describe('getDb():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
+
+    // Close db2 and then delete it
+    const db2 = getDb(db2Config);
+    await closeDb(db2);
+    fs.unlinkSync(db2Config.sqlitePath);
   });
 
   it('should allow raw db queries: calendar_dates', async () => {
@@ -41,4 +58,46 @@ describe('getDb():', () => {
     should.exists(results);
     results.should.have.length(62);
   });
+
+  it('should allow multiple db connections', async () => {
+    const db2 = await openDb(db2Config);
+    await importGtfs(db2Config);
+
+    const db1 = getDb(config);
+
+    db1.config.filename.should.equal(':memory:');
+    db2.config.filename.should.equal('./tmpdb');
+
+    // Query db1 for shapes
+    const shapeId = 'cal_sf_tam';
+    const results1 = await getShapes({
+      shape_id: shapeId,
+    });
+
+    const expectedResult = {
+      id: 1424,
+      shape_id: 'cal_sf_tam',
+      shape_pt_lat: 37.45375587083584,
+      shape_pt_lon: -122.18063950538635,
+      shape_pt_sequence: 279,
+      shape_dist_traveled: null,
+    };
+
+    should.exist(results1);
+    results1.length.should.equal(401);
+    results1.should.containEql(expectedResult);
+
+    // Query db2 for shapes, none should exist
+    const results2 = await getShapes(
+      {
+        shape_id: shapeId,
+      },
+      [],
+      [],
+      { db: db2 }
+    );
+
+    should.exist(results2);
+    results2.length.should.equal(0);
+  });
 });

package/test/mocha/get-directions.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getDirections } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getDirections,
+} from '../../index.js';
 
 describe('getDirections():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getDirections():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no directions', async () => {

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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFareAttributes } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFareAttributes,
+} from '../../index.js';
 
 describe('getFareAttributes():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFareAttributes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no fare_attributes', async () => {

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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFareRules } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFareRules,
+} from '../../index.js';
 
 describe('getFareRules():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFareRules():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no fare_rules', async () => {

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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFeedInfo } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFeedInfo,
+} from '../../index.js';
 
 describe('getFeedInfo():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFeedInfo():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no feed info', async () => {

package/test/mocha/get-frequencies.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFrequencies } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFrequencies,
+} from '../../index.js';
 
 describe('getFrequencies():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFrequencies():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no frequencies', async () => {

package/test/mocha/get-levels.js

@@ -2,9 +2,8 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getLevels } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getLevels } from '../../index.js';
 
 describe('getLevels():', () => {
   before(async () => {
@@ -13,7 +12,8 @@ describe('getLevels():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no levels', async () => {

package/test/mocha/get-pathways.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getPathways } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getPathways,
+} from '../../index.js';
 
 describe('getPathways():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getPathways():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no pathways', async () => {

package/test/mocha/get-ride-feed-infos.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getRideFeedInfos } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getRideFeedInfos,
+} from '../../index.js';
 
 describe('getRideFeedInfos():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getRideFeedInfos():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no ride-feed-infos (GTFS-ride)', async () => {