gtfs 4.13.0 → 4.13.2

package/dist/index.d.ts

@@ -43,7 +43,10 @@ declare function updateGtfsRealtime(initialConfig: IConfig): Promise<void>;
 
 declare const exportGtfs: (initialConfig: IConfig) => Promise<void>;
 
-declare function openDb(config?: IConfig | null): Database.Database;
+declare function openDb(config?: {
+    db?: Database.Database;
+    sqlitePath?: string;
+} | null): Database.Database;
 declare function closeDb(db?: Database.Database | null): void;
 declare function deleteDb(db?: Database.Database | null): void;
 

package/dist/index.js

@@ -89,8 +89,6 @@ var model3 = {
     {
       name: "attribution_id",
       type: "text",
-      primary: true,
-      required: true,
       prefix: true
     },
     {
@@ -257,7 +255,7 @@ var model5 = {
     },
     {
       name: "date",
-      type: "integer",
+      type: "date",
       required: true,
       primary: true
     },
@@ -341,13 +339,13 @@ var model6 = {
     },
     {
       name: "start_date",
-      type: "integer",
+      type: "date",
       required: true,
       index: true
     },
     {
       name: "end_date",
-      type: "integer",
+      type: "date",
       required: true,
       index: true
     }
@@ -643,11 +641,11 @@ var model13 = {
     },
     {
       name: "feed_start_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "feed_end_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "feed_version",
@@ -1500,11 +1498,11 @@ var model31 = {
     },
     {
       name: "start_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "end_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "monday",
@@ -2009,7 +2007,7 @@ var model41 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2091,7 +2089,7 @@ var model42 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2175,12 +2173,12 @@ var model43 = {
     },
     {
       name: "ridership_start_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "ridership_end_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2303,7 +2301,7 @@ var model44 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2350,17 +2348,17 @@ var model45 = {
     },
     {
       name: "ride_start_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "ride_end_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "gtfs_feed_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -3151,124 +3149,6 @@ var models_default = models;
 import fs from "fs";
 import Database from "better-sqlite3";
 import untildify from "untildify";
-
-// src/lib/utils.ts
-import sqlString from "sqlstring-sqlite";
-import Long from "long";
-function validateConfigForImport(config) {
-  if (!config.agencies || config.agencies.length === 0) {
-    throw new Error("No `agencies` specified in config");
-  }
-  for (const [index, agency] of config.agencies.entries()) {
-    if (!agency.path && !agency.url) {
-      throw new Error(
-        `No Agency \`url\` or \`path\` specified in config for agency index ${index}.`
-      );
-    }
-  }
-  return config;
-}
-function setDefaultConfig(initialConfig) {
-  const defaults = {
-    sqlitePath: ":memory:",
-    ignoreDuplicates: false,
-    gtfsRealtimeExpirationSeconds: 0
-  };
-  return {
-    ...defaults,
-    ...initialConfig
-  };
-}
-function convertLongTimeToDate(longDate) {
-  const { high, low, unsigned } = longDate;
-  return new Date(new Long(low, high, unsigned).toInt() * 1e3).toISOString();
-}
-function calculateSecondsFromMidnight(time) {
-  const split = time.split(":").map((d) => Number.parseInt(d, 10));
-  if (split.length !== 3) {
-    return null;
-  }
-  return split[0] * 3600 + split[1] * 60 + split[2];
-}
-function padLeadingZeros(time) {
-  const split = time.split(":").map((d) => String(Number(d)).padStart(2, "0"));
-  if (split.length !== 3) {
-    return null;
-  }
-  return split.join(":");
-}
-function formatSelectClause(fields) {
-  if (Array.isArray(fields)) {
-    const selectItem2 = fields.length > 0 ? fields.map((fieldName) => sqlString.escapeId(fieldName)).join(", ") : "*";
-    return `SELECT ${selectItem2}`;
-  }
-  const selectItem = Object.entries(fields).map(
-    (key) => `${sqlString.escapeId(key[0])} AS ${sqlString.escapeId(key[1])}`
-  ).join(", ");
-  return `SELECT ${selectItem}`;
-}
-function formatJoinClause(joinObject) {
-  return joinObject.map(
-    (data) => `${data.type ? data.type + " JOIN" : "INNER JOIN"} ${sqlString.escapeId(
-      data.table
-    )} ON ${data.on}`
-  ).join(" ");
-}
-function degree2radian(angle) {
-  return angle * Math.PI / 180;
-}
-function radian2degree(angle) {
-  return angle / Math.PI * 180;
-}
-function formatWhereClauseBoundingBox(latitudeDegree, longitudeDegree, boundingBoxSideMeters) {
-  const earthRadius = 6371e3;
-  latitudeDegree = typeof latitudeDegree === "string" ? parseFloat(latitudeDegree) : latitudeDegree;
-  longitudeDegree = typeof longitudeDegree === "string" ? parseFloat(longitudeDegree) : longitudeDegree;
-  const latitudeRadian = degree2radian(latitudeDegree);
-  const radiusFromLatitude = Math.cos(latitudeRadian) * earthRadius;
-  const deltaLatitude = radian2degree(boundingBoxSideMeters / 2 / earthRadius);
-  const deltaLongitude = radian2degree(
-    boundingBoxSideMeters / 2 / radiusFromLatitude
-  );
-  let query = `stop_lat BETWEEN ${latitudeDegree - deltaLatitude} AND ${latitudeDegree + deltaLatitude}`;
-  query += ` AND stop_lon BETWEEN ${longitudeDegree - deltaLongitude} AND ${longitudeDegree + deltaLongitude}`;
-  return query;
-}
-function formatWhereClause(key, value) {
-  if (Array.isArray(value)) {
-    let whereClause = `${sqlString.escapeId(key)} IN (${value.filter((v) => v !== null).map((v) => sqlString.escape(v)).join(", ")})`;
-    if (value.includes(null)) {
-      whereClause = `(${whereClause} OR ${sqlString.escapeId(key)} IS NULL)`;
-    }
-    return whereClause;
-  }
-  if (value === null) {
-    return `${sqlString.escapeId(key)} IS NULL`;
-  }
-  return `${sqlString.escapeId(key)} = ${sqlString.escape(value)}`;
-}
-function formatWhereClauses(query) {
-  if (Object.keys(query).length === 0) {
-    return "";
-  }
-  const whereClauses = Object.entries(query).map(
-    ([key, value]) => formatWhereClause(key, value)
-  );
-  return `WHERE ${whereClauses.join(" AND ")}`;
-}
-function formatOrderByClause(orderBy2) {
-  let orderByClause = "";
-  if (orderBy2.length > 0) {
-    orderByClause += "ORDER BY ";
-    orderByClause += orderBy2.map(([key, value]) => {
-      const direction = value === "DESC" ? "DESC" : "ASC";
-      return `${sqlString.escapeId(key)} ${direction}`;
-    }).join(", ");
-  }
-  return orderByClause;
-}
-
-// src/lib/db.ts
 var dbs = {};
 function setupDb(sqlitePath) {
   const db = new Database(untildify(sqlitePath));
@@ -3280,7 +3160,7 @@ function setupDb(sqlitePath) {
 }
 function openDb(config = null) {
   if (config) {
-    const { sqlitePath, db } = setDefaultConfig(config);
+    const { sqlitePath = ":memory:", db } = config;
     if (db) {
       return db;
     }
@@ -3289,6 +3169,9 @@ function openDb(config = null) {
     }
     return setupDb(sqlitePath);
   }
+  if (Object.keys(dbs).length === 0) {
+    return setupDb(":memory:");
+  }
   if (Object.keys(dbs).length === 1) {
     const filename = Object.keys(dbs)[0];
     return dbs[filename];
@@ -3524,6 +3407,122 @@ function formatError(error) {
   return colors.red(errorMessage);
 }
 
+// src/lib/utils.ts
+import sqlString from "sqlstring-sqlite";
+import Long from "long";
+function validateConfigForImport(config) {
+  if (!config.agencies || config.agencies.length === 0) {
+    throw new Error("No `agencies` specified in config");
+  }
+  for (const [index, agency] of config.agencies.entries()) {
+    if (!agency.path && !agency.url) {
+      throw new Error(
+        `No Agency \`url\` or \`path\` specified in config for agency index ${index}.`
+      );
+    }
+  }
+  return config;
+}
+function setDefaultConfig(initialConfig) {
+  const defaults = {
+    sqlitePath: ":memory:",
+    ignoreDuplicates: false,
+    gtfsRealtimeExpirationSeconds: 0
+  };
+  return {
+    ...defaults,
+    ...initialConfig
+  };
+}
+function convertLongTimeToDate(longDate) {
+  const { high, low, unsigned } = longDate;
+  return new Date(new Long(low, high, unsigned).toInt() * 1e3).toISOString();
+}
+function calculateSecondsFromMidnight(time) {
+  const split = time.split(":").map((d) => Number.parseInt(d, 10));
+  if (split.length !== 3) {
+    return null;
+  }
+  return split[0] * 3600 + split[1] * 60 + split[2];
+}
+function padLeadingZeros(time) {
+  const split = time.split(":").map((d) => String(Number(d)).padStart(2, "0"));
+  if (split.length !== 3) {
+    return null;
+  }
+  return split.join(":");
+}
+function formatSelectClause(fields) {
+  if (Array.isArray(fields)) {
+    const selectItem2 = fields.length > 0 ? fields.map((fieldName) => sqlString.escapeId(fieldName)).join(", ") : "*";
+    return `SELECT ${selectItem2}`;
+  }
+  const selectItem = Object.entries(fields).map(
+    (key) => `${sqlString.escapeId(key[0])} AS ${sqlString.escapeId(key[1])}`
+  ).join(", ");
+  return `SELECT ${selectItem}`;
+}
+function formatJoinClause(joinObject) {
+  return joinObject.map(
+    (data) => `${data.type ? data.type + " JOIN" : "INNER JOIN"} ${sqlString.escapeId(
+      data.table
+    )} ON ${data.on}`
+  ).join(" ");
+}
+function degree2radian(angle) {
+  return angle * Math.PI / 180;
+}
+function radian2degree(angle) {
+  return angle / Math.PI * 180;
+}
+function formatWhereClauseBoundingBox(latitudeDegree, longitudeDegree, boundingBoxSideMeters) {
+  const earthRadius = 6371e3;
+  latitudeDegree = typeof latitudeDegree === "string" ? parseFloat(latitudeDegree) : latitudeDegree;
+  longitudeDegree = typeof longitudeDegree === "string" ? parseFloat(longitudeDegree) : longitudeDegree;
+  const latitudeRadian = degree2radian(latitudeDegree);
+  const radiusFromLatitude = Math.cos(latitudeRadian) * earthRadius;
+  const deltaLatitude = radian2degree(boundingBoxSideMeters / 2 / earthRadius);
+  const deltaLongitude = radian2degree(
+    boundingBoxSideMeters / 2 / radiusFromLatitude
+  );
+  let query = `stop_lat BETWEEN ${latitudeDegree - deltaLatitude} AND ${latitudeDegree + deltaLatitude}`;
+  query += ` AND stop_lon BETWEEN ${longitudeDegree - deltaLongitude} AND ${longitudeDegree + deltaLongitude}`;
+  return query;
+}
+function formatWhereClause(key, value) {
+  if (Array.isArray(value)) {
+    let whereClause = `${sqlString.escapeId(key)} IN (${value.filter((v) => v !== null).map((v) => sqlString.escape(v)).join(", ")})`;
+    if (value.includes(null)) {
+      whereClause = `(${whereClause} OR ${sqlString.escapeId(key)} IS NULL)`;
+    }
+    return whereClause;
+  }
+  if (value === null) {
+    return `${sqlString.escapeId(key)} IS NULL`;
+  }
+  return `${sqlString.escapeId(key)} = ${sqlString.escape(value)}`;
+}
+function formatWhereClauses(query) {
+  if (Object.keys(query).length === 0) {
+    return "";
+  }
+  const whereClauses = Object.entries(query).map(
+    ([key, value]) => formatWhereClause(key, value)
+  );
+  return `WHERE ${whereClauses.join(" AND ")}`;
+}
+function formatOrderByClause(orderBy2) {
+  let orderByClause = "";
+  if (orderBy2.length > 0) {
+    orderByClause += "ORDER BY ";
+    orderByClause += orderBy2.map(([key, value]) => {
+      const direction = value === "DESC" ? "DESC" : "ASC";
+      return `${sqlString.escapeId(key)} ${direction}`;
+    }).join(", ");
+  }
+  return orderByClause;
+}
+
 // src/lib/import.ts
 var downloadFiles = async (task) => {
   task.log(`Downloading GTFS from ${task.agency_url}`);
@@ -3635,8 +3634,7 @@ var updateRealtimeData = async (task) => {
     return;
   }
   const db = openDb({
-    sqlitePath: task.sqlitePath,
-    agencies: []
+    sqlitePath: task.sqlitePath
   });
   const vehiclePositionsModel = models_default.find(
     (x) => x.filenameBase === "vehicle_positions"
@@ -3827,7 +3825,17 @@ var formatLine = (line, model56, totalLineCount) => {
   const formattedLine = {};
   for (const columnSchema of model56.schema) {
     const lineValue = line[columnSchema.name];
-    if (columnSchema.type === "integer") {
+    if (columnSchema.type === "date") {
+      if (lineValue !== "" && lineValue !== void 0) {
+        const dateValue = lineValue.replace(/-/g, "");
+        if (dateValue.length !== 8) {
+          throw new Error(
+            `Invalid date in ${model56.filenameBase}.${model56.filenameExtension} for ${columnSchema.name} on line ${lineNumber}.`
+          );
+        }
+        formattedLine[columnSchema.name] = Number.parseInt(dateValue, 10);
+      }
+    } else if (columnSchema.type === "integer") {
       formattedLine[columnSchema.name] = Number.parseInt(lineValue, 10);
     } else if (columnSchema.type === "real") {
       formattedLine[columnSchema.name] = Number.parseFloat(lineValue);
@@ -3877,8 +3885,7 @@ var formatLine = (line, model56, totalLineCount) => {
 };
 var importLines = (task, lines, model56, totalLineCount) => {
   const db = openDb({
-    sqlitePath: task.sqlitePath,
-    agencies: []
+    sqlitePath: task.sqlitePath
   });
   if (lines.length === 0) {
     return;