gtfs-sqljs 0.2.0 → 0.3.0

package/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="logo.svg" alt="gtfs-sqljs logo" width="200" height="200">
+  <img src="illustrations/logo.svg" alt="gtfs-sqljs logo" width="200" height="200">
   <h1>gtfs-sqljs</h1>
 
   [![npm version](https://img.shields.io/npm/v/gtfs-sqljs)](https://www.npmjs.com/package/gtfs-sqljs)
@@ -97,7 +97,8 @@ Full API documentation: [API Reference](https://sysdevrun.github.io/gtfs-sqljs/d
 
 ### Static Methods
 
-- `GtfsSqlJs.fromZip(zipPath, options?)` - Create instance from GTFS ZIP file
+- `GtfsSqlJs.fromZip(zipPath, options?)` - Create instance from GTFS ZIP file path or URL
+- `GtfsSqlJs.fromZipData(zipData, options?)` - Create instance from pre-loaded GTFS ZIP data (`ArrayBuffer` or `Uint8Array`)
 - `GtfsSqlJs.fromDatabase(database, options?)` - Create instance from existing database
 
 ### Instance Methods

package/dist/index.d.ts

@@ -385,7 +385,8 @@ interface FareAttribute {
     price: number;
     currency_type: string;
     payment_method: number;
-    transfers: number;
+    /** Number of transfers permitted. null means unlimited. */
+    transfers: number | null;
     agency_id?: string;
     transfer_duration?: number;
 }
@@ -713,19 +714,25 @@ declare class GtfsSqlJs {
      */
     private constructor();
     /**
-     * Create GtfsSqlJs instance from GTFS ZIP file
+     * Create GtfsSqlJs instance from GTFS ZIP file path or URL
      */
     static fromZip(zipPath: string, options?: Omit<GtfsSqlJsOptions, 'zipPath' | 'database'>): Promise<GtfsSqlJs>;
+    /**
+     * Create GtfsSqlJs instance from pre-loaded GTFS ZIP data
+     * @param source - Optional original path/URL, used for cache key generation and metadata
+     */
+    static fromZipData(zipData: ArrayBuffer | Uint8Array, options?: Omit<GtfsSqlJsOptions, 'zipPath' | 'database'>, source?: string): Promise<GtfsSqlJs>;
     /**
      * Create GtfsSqlJs instance from existing SQLite database
      */
     static fromDatabase(database: ArrayBuffer, options?: Omit<GtfsSqlJsOptions, 'zipPath' | 'database'>): Promise<GtfsSqlJs>;
     /**
-     * Initialize from ZIP file
+     * Initialize from pre-loaded ZIP data
+     * @param source - Optional original path/URL, used for cache key generation and metadata
      */
-    private initFromZip;
+    private initFromZipData;
     /**
-     * Helper method to load GTFS data from zip data (ArrayBuffer)
+     * Helper method to load GTFS data from zip data
      * Used by both cache-enabled and cache-disabled paths
      */
     private loadFromZipData;
@@ -1057,8 +1064,8 @@ interface IndexDefinition {
 declare const GTFS_SCHEMA: TableSchema[];
 
 /**
- * Compute SHA-256 checksum of data
- * Uses Web Crypto API (available in both browser and Node.js 18+)
+ * Compute SHA-256 checksum of data.
+ * Uses the global Web Crypto API (available in browsers and Node.js 18+).
  */
 declare function computeChecksum(data: ArrayBuffer | Uint8Array): Promise<string>;
 /**

package/dist/index.js

@@ -185,7 +185,7 @@ var GTFS_SCHEMA = [
       { name: "price", type: "REAL", required: true },
       { name: "currency_type", type: "TEXT", required: true },
       { name: "payment_method", type: "INTEGER", required: true },
-      { name: "transfers", type: "INTEGER", required: true },
+      { name: "transfers", type: "INTEGER", required: false },
       { name: "agency_id", type: "TEXT", required: false },
       { name: "transfer_duration", type: "INTEGER", required: false }
     ]
@@ -340,25 +340,28 @@ function getAllCreateIndexStatements() {
 
 // src/loaders/zip-loader.ts
 import JSZip from "jszip";
-async function loadGTFSZip(source) {
-  let zipData;
-  if (typeof source === "string") {
-    zipData = await fetchZip(source);
-  } else {
-    zipData = source;
-  }
+
+// src/utils/env.ts
+function isNodeEnvironment() {
+  return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
+}
+
+// src/loaders/zip-loader.ts
+async function loadGTFSZip(zipData, skipFiles) {
   const zip = await JSZip.loadAsync(zipData);
+  const skipSet = skipFiles ? new Set(skipFiles) : null;
   const files = {};
   const filePromises = [];
   zip.forEach((relativePath, file) => {
-    if (!file.dir && relativePath.endsWith(".txt")) {
-      const fileName = relativePath.split("/").pop() || relativePath;
-      filePromises.push(
-        file.async("string").then((content) => {
-          files[fileName] = content;
-        })
-      );
-    }
+    if (file.dir) return;
+    const fileName = relativePath.split("/").pop() || relativePath;
+    if (!(fileName in GTFS_FILE_MAPPING)) return;
+    if (skipSet?.has(fileName)) return;
+    filePromises.push(
+      file.async("string").then((content) => {
+        files[fileName] = content;
+      })
+    );
   });
   await Promise.all(filePromises);
   return files;
@@ -411,8 +414,7 @@ async function fetchZip(source, onProgress) {
     }
     throw new Error("fetch is not available to load URL");
   }
-  const isNode = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
-  if (isNode) {
+  if (isNodeEnvironment()) {
     try {
       const fs = await import("fs");
       const buffer = await fs.promises.readFile(source);
@@ -430,6 +432,24 @@ async function fetchZip(source, onProgress) {
   }
   throw new Error("No method available to load ZIP file");
 }
+var GTFS_FILE_MAPPING = {
+  "agency.txt": "agency",
+  "stops.txt": "stops",
+  "routes.txt": "routes",
+  "trips.txt": "trips",
+  "stop_times.txt": "stop_times",
+  "calendar.txt": "calendar",
+  "calendar_dates.txt": "calendar_dates",
+  "fare_attributes.txt": "fare_attributes",
+  "fare_rules.txt": "fare_rules",
+  "shapes.txt": "shapes",
+  "frequencies.txt": "frequencies",
+  "transfers.txt": "transfers",
+  "pathways.txt": "pathways",
+  "levels.txt": "levels",
+  "feed_info.txt": "feed_info",
+  "attributions.txt": "attributions"
+};
 
 // src/loaders/csv-parser.ts
 import Papa from "papaparse";
@@ -867,8 +887,7 @@ async function fetchProtobuf(source) {
     const arrayBuffer2 = await response2.arrayBuffer();
     return new Uint8Array(arrayBuffer2);
   }
-  const isNode = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
-  if (isNode) {
+  if (isNodeEnvironment()) {
     try {
       const fs = await import("fs");
       const buffer = await fs.promises.readFile(source);
@@ -898,24 +917,13 @@ function loadGtfsRtProto() {
 function camelToSnake(str) {
   return str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
-function convertKeysToSnakeCase(obj) {
-  if (obj === null || obj === void 0) {
-    return obj;
-  }
-  if (Array.isArray(obj)) {
-    return obj.map(convertKeysToSnakeCase);
-  }
-  if (typeof obj === "object") {
-    const result = {};
-    for (const key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key)) {
-        const snakeKey = camelToSnake(key);
-        result[snakeKey] = convertKeysToSnakeCase(obj[key]);
-      }
-    }
-    return result;
+function convertObjectKeysToSnakeCase(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const snakeKey = camelToSnake(key);
+    result[snakeKey] = value !== null && typeof value === "object" && !Array.isArray(value) ? convertObjectKeysToSnakeCase(value) : value;
   }
-  return obj;
+  return result;
 }
 function parseTranslatedString(ts) {
   if (!ts || !ts.translation || ts.translation.length === 0) {
@@ -936,8 +944,8 @@ function insertAlerts(db, alerts, timestamp) {
     ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
   `);
   for (const alert of alerts) {
-    const activePeriodSnake = convertKeysToSnakeCase(alert.activePeriod || []);
-    const informedEntitySnake = convertKeysToSnakeCase(alert.informedEntity || []);
+    const activePeriodSnake = (alert.activePeriod ?? []).map(convertObjectKeysToSnakeCase);
+    const informedEntitySnake = (alert.informedEntity ?? []).map(convertObjectKeysToSnakeCase);
     stmt.run([
       alert.id,
       JSON.stringify(activePeriodSnake),
@@ -1098,24 +1106,16 @@ async function loadRealtimeData(db, feedUrls) {
 }
 
 // src/cache/checksum.ts
-async function getCrypto() {
-  if (typeof crypto !== "undefined" && crypto.subtle) {
-    return crypto;
-  }
-  if (typeof globalThis !== "undefined") {
-    try {
-      const { webcrypto } = await import("crypto");
-      return webcrypto;
-    } catch {
-      throw new Error("Web Crypto API not available");
-    }
-  }
-  throw new Error("Crypto not available in this environment");
-}
 async function computeChecksum(data) {
-  const cryptoInstance = await getCrypto();
-  const bufferSource = data instanceof Uint8Array ? data : new Uint8Array(data);
-  const hashBuffer = await cryptoInstance.subtle.digest("SHA-256", bufferSource);
+  let buffer;
+  if (data instanceof ArrayBuffer) {
+    buffer = data;
+  } else {
+    const copy = new ArrayBuffer(data.byteLength);
+    new Uint8Array(copy).set(data);
+    buffer = copy;
+  }
+  const hashBuffer = await crypto.subtle.digest("SHA-256", buffer);
   const hashArray = Array.from(new Uint8Array(hashBuffer));
   const hashHex = hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
   return hashHex;
@@ -1591,11 +1591,10 @@ function getTrips(db, filters = {}, stalenessThreshold = 120) {
   }
   if (serviceIds) {
     const serviceIdArray = Array.isArray(serviceIds) ? serviceIds : [serviceIds];
-    if (serviceIdArray.length > 0) {
-      const placeholders = serviceIdArray.map(() => "?").join(", ");
-      conditions.push(needsRoutesJoin ? `t.service_id IN (${placeholders})` : `service_id IN (${placeholders})`);
-      params.push(...serviceIdArray);
-    }
+    if (serviceIdArray.length === 0) return [];
+    const placeholders = serviceIdArray.map(() => "?").join(", ");
+    conditions.push(needsRoutesJoin ? `t.service_id IN (${placeholders})` : `service_id IN (${placeholders})`);
+    params.push(...serviceIdArray);
   }
   if (directionId !== void 0) {
     const directionIds = Array.isArray(directionId) ? directionId : [directionId];
@@ -1720,11 +1719,10 @@ function getStopTimes(db, filters = {}, stalenessThreshold = 120) {
   }
   if (serviceIds) {
     const serviceIdArray = Array.isArray(serviceIds) ? serviceIds : [serviceIds];
-    if (serviceIdArray.length > 0) {
-      const placeholders = serviceIdArray.map(() => "?").join(", ");
-      conditions.push(`t.service_id IN (${placeholders})`);
-      params.push(...serviceIdArray);
-    }
+    if (serviceIdArray.length === 0) return [];
+    const placeholders = serviceIdArray.map(() => "?").join(", ");
+    conditions.push(`t.service_id IN (${placeholders})`);
+    params.push(...serviceIdArray);
   }
   if (directionId !== void 0) {
     const directionIds = Array.isArray(directionId) ? directionId : [directionId];
@@ -1812,7 +1810,7 @@ function buildOrderedStopList(db, tripIds) {
     if (!tripStopSequences.has(tripId)) {
       tripStopSequences.set(tripId, []);
     }
-    tripStopSequences.get(tripId).push({ stop_id: stopId, stop_sequence: stopSequence });
+    tripStopSequences.get(tripId)?.push({ stop_id: stopId, stop_sequence: stopSequence });
   }
   stmt.free();
   const orderedStopIds = [];
@@ -2310,7 +2308,7 @@ function getTripUpdates(db, filters = {}, stalenessThreshold = 120) {
       if (!stopTimesByTripId.has(stu.trip_id)) {
         stopTimesByTripId.set(stu.trip_id, []);
       }
-      stopTimesByTripId.get(stu.trip_id).push(stu);
+      stopTimesByTripId.get(stu.trip_id)?.push(stu);
     }
     for (const tu of tripUpdates) {
       tu.stop_time_update = stopTimesByTripId.get(tu.trip_id) || [];
@@ -2336,7 +2334,7 @@ function getAllTripUpdates(db) {
       if (!stopTimesByTripId.has(stu.trip_id)) {
         stopTimesByTripId.set(stu.trip_id, []);
       }
-      stopTimesByTripId.get(stu.trip_id).push(stu);
+      stopTimesByTripId.get(stu.trip_id)?.push(stu);
     }
     for (const tu of tripUpdates) {
       tu.stop_time_update = stopTimesByTripId.get(tu.trip_id) || [];
@@ -2359,11 +2357,19 @@ var GtfsSqlJs = class _GtfsSqlJs {
     this.lastRealtimeFetchTimestamp = null;
   }
   /**
-   * Create GtfsSqlJs instance from GTFS ZIP file
+   * Create GtfsSqlJs instance from GTFS ZIP file path or URL
    */
   static async fromZip(zipPath, options = {}) {
+    const zipData = await fetchZip(zipPath, options.onProgress);
+    return _GtfsSqlJs.fromZipData(zipData, options, zipPath);
+  }
+  /**
+   * Create GtfsSqlJs instance from pre-loaded GTFS ZIP data
+   * @param source - Optional original path/URL, used for cache key generation and metadata
+   */
+  static async fromZipData(zipData, options = {}, source) {
     const instance = new _GtfsSqlJs();
-    await instance.initFromZip(zipPath, options);
+    await instance.initFromZipData(zipData, options, source);
     return instance;
   }
   /**
@@ -2375,9 +2381,10 @@ var GtfsSqlJs = class _GtfsSqlJs {
     return instance;
   }
   /**
-   * Initialize from ZIP file
+   * Initialize from pre-loaded ZIP data
+   * @param source - Optional original path/URL, used for cache key generation and metadata
    */
-  async initFromZip(zipPath, options) {
+  async initFromZipData(zipData, options, source) {
     const onProgress = options.onProgress;
     const {
       cache: userCache,
@@ -2398,20 +2405,14 @@ var GtfsSqlJs = class _GtfsSqlJs {
         percentComplete: 0,
         message: "Checking cache..."
       });
-      let zipData2;
-      if (typeof zipPath === "string") {
-        zipData2 = await fetchZip(zipPath, onProgress);
-      } else {
-        zipData2 = zipPath;
-      }
-      const filesize = zipData2.byteLength;
-      const checksum = await computeZipChecksum(zipData2);
+      const filesize = zipData.byteLength;
+      const checksum = await computeZipChecksum(zipData);
       const cacheKey = generateCacheKey(
         checksum,
         LIB_VERSION,
         cacheVersion,
         filesize,
-        typeof zipPath === "string" ? zipPath : void 0,
+        source,
         skipFiles
       );
       const cacheEntry = await cache.get(cacheKey);
@@ -2460,7 +2461,7 @@ var GtfsSqlJs = class _GtfsSqlJs {
           return;
         }
       }
-      await this.loadFromZipData(zipData2, options, onProgress);
+      await this.loadFromZipData(zipData, options, onProgress);
       onProgress?.({
         phase: "saving_cache",
         currentFile: null,
@@ -2476,7 +2477,7 @@ var GtfsSqlJs = class _GtfsSqlJs {
         checksum,
         version: cacheVersion,
         timestamp: Date.now(),
-        source: typeof zipPath === "string" ? zipPath : void 0,
+        source,
         size: dbBuffer.byteLength,
         skipFiles
       });
@@ -2492,12 +2493,6 @@ var GtfsSqlJs = class _GtfsSqlJs {
       });
       return;
     }
-    let zipData;
-    if (typeof zipPath === "string") {
-      zipData = await fetchZip(zipPath, onProgress);
-    } else {
-      zipData = zipPath;
-    }
     await this.loadFromZipData(zipData, options, onProgress);
     onProgress?.({
       phase: "complete",
@@ -2511,10 +2506,13 @@ var GtfsSqlJs = class _GtfsSqlJs {
     });
   }
   /**
-   * Helper method to load GTFS data from zip data (ArrayBuffer)
+   * Helper method to load GTFS data from zip data
    * Used by both cache-enabled and cache-disabled paths
    */
   async loadFromZipData(zipData, options, onProgress) {
+    if (!this.SQL) {
+      throw new Error("SQL.js not initialized");
+    }
     this.db = new this.SQL.Database();
     this.db.run("PRAGMA synchronous = OFF");
     this.db.run("PRAGMA journal_mode = MEMORY");
@@ -2546,7 +2544,7 @@ var GtfsSqlJs = class _GtfsSqlJs {
       percentComplete: 35,
       message: "Extracting GTFS ZIP file"
     });
-    const files = await loadGTFSZip(zipData);
+    const files = await loadGTFSZip(zipData, options.skipFiles);
     onProgress?.({
       phase: "inserting_data",
       currentFile: null,