gtfs 4.13.0 → 4.13.2

package/dist/bin/gtfs-import.js

@@ -221,8 +221,6 @@ var model3 = {
     {
       name: "attribution_id",
       type: "text",
-      primary: true,
-      required: true,
       prefix: true
     },
     {
@@ -389,7 +387,7 @@ var model5 = {
     },
     {
       name: "date",
-      type: "integer",
+      type: "date",
       required: true,
       primary: true
     },
@@ -473,13 +471,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
     }
@@ -775,11 +773,11 @@ var model13 = {
     },
     {
       name: "feed_start_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "feed_end_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "feed_version",
@@ -1632,11 +1630,11 @@ var model31 = {
     },
     {
       name: "start_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "end_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "monday",
@@ -2141,7 +2139,7 @@ var model41 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2223,7 +2221,7 @@ var model42 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2307,12 +2305,12 @@ var model43 = {
     },
     {
       name: "ridership_start_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "ridership_end_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2435,7 +2433,7 @@ var model44 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2482,17 +2480,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
     },
     {
@@ -3282,54 +3280,6 @@ var models_default = models;
 // src/lib/db.ts
 import Database from "better-sqlite3";
 import untildify2 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(":");
-}
-
-// src/lib/db.ts
 var dbs = {};
 function setupDb(sqlitePath) {
   const db = new Database(untildify2(sqlitePath));
@@ -3341,7 +3291,7 @@ function setupDb(sqlitePath) {
 }
 function openDb(config = null) {
   if (config) {
-    const { sqlitePath, db } = setDefaultConfig(config);
+    const { sqlitePath = ":memory:", db } = config;
     if (db) {
       return db;
     }
@@ -3350,6 +3300,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];
@@ -3399,6 +3352,52 @@ function isValidJSON(string) {
   return true;
 }
 
+// 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(":");
+}
+
 // src/lib/import.ts
 var downloadFiles = async (task) => {
   task.log(`Downloading GTFS from ${task.agency_url}`);
@@ -3489,8 +3488,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"
@@ -3681,7 +3679,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);
@@ -3731,8 +3739,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;