gtfs 4.1.1 → 4.3.0

package/models/ods/ops-locations.js

@@ -8,6 +8,7 @@ const model = {
       type: 'varchar(255)',
       primary: true,
       required: true,
+      prefix: true,
     },
     {
       name: 'ops_location_code',

package/models/ods/run-events.js

@@ -8,11 +8,13 @@ const model = {
       type: 'varchar(255)',
       primary: true,
       required: true,
+      prefix: true,
     },
     {
       name: 'piece_id',
       type: 'varchar(255)',
       required: true,
+      prefix: true,
     },
     {
       name: 'event_type',
@@ -47,6 +49,7 @@ const model = {
     {
       name: 'event_from_location_id',
       type: 'varchar(255)',
+      prefix: true,
     },
     {
       name: 'event_to_location_type',
@@ -58,6 +61,7 @@ const model = {
     {
       name: 'event_to_location_id',
       type: 'varchar(255)',
+      prefix: true,
     },
   ],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.1.1",
+  "version": "4.3.0",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -75,12 +75,13 @@
   "dependencies": {
     "@turf/helpers": "^6.5.0",
     "better-sqlite3": "^8.3.0",
-    "csv-parse": "^5.3.6",
-    "csv-stringify": "^6.3.0",
+    "csv-parse": "^5.3.8",
+    "csv-stringify": "^6.3.2",
     "gtfs-realtime-bindings": "^1.1.1",
     "lodash-es": "^4.17.21",
-    "long": "^5.2.1",
+    "long": "^5.2.3",
     "node-fetch": "^3.3.1",
+    "node-stream-zip": "^1.15.0",
     "pluralize": "^8.0.0",
     "pretty-error": "^4.0.0",
     "promise-map-series": "^0.3.0",
@@ -90,19 +91,18 @@
     "strip-bom-stream": "^5.0.0",
     "tmp-promise": "^3.0.3",
     "untildify": "^4.0.0",
-    "unzipper": "^0.10.11",
     "yargs": "^17.7.1",
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.4",
     "dtslint": "^4.2.1",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-xo": "^0.43.1",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "pretty-quick": "^3.1.3",
     "should": "^13.2.3"
   },

package/test/mocha/advanced-query.js

@@ -57,14 +57,14 @@ describe('advancedQuery():', () => {
     const results = advancedQuery('stop_times', advancedQueryOptions);
 
     const expectedResults = [
-      { trip_id: '329', arrival_time: '9:09:00' },
-      { trip_id: '329', arrival_time: '8:52:00' },
-      { trip_id: '329', arrival_time: '8:44:00' },
-      { trip_id: '329', arrival_time: '8:35:00' },
-      { trip_id: '329', arrival_time: '8:27:00' },
-      { trip_id: '329', arrival_time: '8:16:00' },
-      { trip_id: '329', arrival_time: '8:03:00' },
       { trip_id: '329', arrival_time: '7:56:00' },
+      { trip_id: '329', arrival_time: '8:03:00' },
+      { trip_id: '329', arrival_time: '8:16:00' },
+      { trip_id: '329', arrival_time: '8:27:00' },
+      { trip_id: '329', arrival_time: '8:35:00' },
+      { trip_id: '329', arrival_time: '8:44:00' },
+      { trip_id: '329', arrival_time: '8:52:00' },
+      { trip_id: '329', arrival_time: '9:09:00' },
     ];
 
     should.exist(results);

package/test/mocha/export-gtfs.js

@@ -8,7 +8,11 @@ import { rm } from 'node:fs/promises';
 import { parse } from 'csv-parse';
 import should from 'should';
 
-import { unzip, generateFolderName } from '../../lib/file-utils.js';
+import {
+  unzip,
+  generateFolderName,
+  prepDirectory,
+} from '../../lib/file-utils.js';
 import config from '../test-config.js';
 import {
   openDb,
@@ -45,6 +49,7 @@ describe('exportGtfs():', function () {
     );
 
     before(async () => {
+      await prepDirectory(temporaryDir);
       await unzip(config.agencies[0].path, temporaryDir);
 
       await Promise.all(

package/test/mocha/get-agencies.js

@@ -28,7 +28,6 @@ describe('getAgencies():', () => {
     const results = getAgencies();
 
     const expectedResult = {
-      id: 1,
       agency_id: 'CT',
       agency_name: 'Caltrain',
       agency_url: 'http://www.caltrain.com',
@@ -54,7 +53,6 @@ describe('getAgencies():', () => {
     });
 
     const expectedResult = {
-      id: 1,
       agency_id: 'CT',
       agency_name: 'Caltrain',
       agency_url: 'http://www.caltrain.com',

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

@@ -38,28 +38,24 @@ describe('getCalendarDates():', () => {
 
     const expectedResults = [
       {
-        id: 2,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20161124,
         exception_type: 2,
         holiday_name: null,
       },
       {
-        id: 4,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160905,
         exception_type: 2,
         holiday_name: null,
       },
       {
-        id: 6,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160704,
         exception_type: 2,
         holiday_name: null,
       },
       {
-        id: 8,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160530,
         exception_type: 2,

package/test/mocha/import-gtfs.js

@@ -7,9 +7,15 @@ import { fileURLToPath } from 'node:url';
 import { parse } from 'csv-parse';
 import should from 'should';
 
-import { unzip } from '../../lib/file-utils.js';
+import { prepDirectory, unzip } from '../../lib/file-utils.js';
 import config from '../test-config.js';
-import { openDb, closeDb, importGtfs, getRoutes } from '../../index.js';
+import {
+  openDb,
+  closeDb,
+  importGtfs,
+  getRoutes,
+  getStops,
+} from '../../index.js';
 import models from '../../models/models.js';
 
 let db;
@@ -63,15 +69,35 @@ describe('importGtfs():', function () {
       routes.length.should.equal(4);
     });
 
-    it("should throw an error when importing from local filesystem which doesn't exist", async () => {
-      return importGtfs({
+    it("should throw an error when importing from local filesystem which doesn't exist", async () =>
+      importGtfs({
         ...config,
         agencies: [
           {
             path: '/does/not/exist',
           },
         ],
-      }).should.be.rejected();
+      }).should.be.rejected());
+
+    it('should add a prefix to imported data if present in config', async () => {
+      const prefix = 'test-prefix';
+      await importGtfs({
+        ...config,
+        agencies: [
+          {
+            ...agenciesFixturesLocal[0],
+            prefix,
+          },
+        ],
+      });
+
+      const routes = getRoutes();
+      should.exist(routes);
+      routes[0].route_id.should.startWith(prefix);
+
+      const stops = getStops();
+      should.exist(stops);
+      stops[0].stop_id.should.startWith(prefix);
     });
   });
 
@@ -83,6 +109,7 @@ describe('importGtfs():', function () {
     );
 
     before(async () => {
+      await prepDirectory(temporaryDir);
       await unzip(agenciesFixturesLocal[0].path, temporaryDir);
 
       await Promise.all(

package/test/mocha/open-db.js

@@ -83,7 +83,6 @@ describe('openDb():', () => {
     );
 
     const expectedResult = {
-      id: 1424,
       shape_id: 'cal_sf_tam',
       shape_pt_lat: 37.45375587083584,
       shape_pt_lon: -122.18063950538635,