@osmix/gtfs 0.0.2 → 0.0.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @osmix/gtfs
 
+## 0.0.3
+
+### Patch Changes
+
+- f468db5: Fix publishing (2)
+- 536a3cd: Remove JSR dependency for CSV parsing
+- Updated dependencies [f468db5]
+  - @osmix/core@0.1.3
+  - @osmix/shared@0.0.8
+
 ## 0.0.2
 
 ### Patch Changes

package/README.md

@@ -196,5 +196,6 @@ Class for more fine-grained control over the conversion process.
 ## Dependencies
 
 - [but-unzip](https://github.com/nicolo-ribaudo/but-unzip) - ZIP file parsing
-- [@std/csv](https://jsr.io/@std/csv) - Streaming CSV parsing (from Deno standard library)
+- [csv-parse](https://www.npmjs.com/package/csv-parse) - CSV parsing from the csv npm
+  project
 - [@osmix/core](../core) - OSM data structures

package/dist/gtfs-archive.d.ts

@@ -1,8 +1,8 @@
 /**
- * Lazy GTFS archive parser with streaming CSV support.
+ * Lazy GTFS archive parser.
  *
  * Only parses CSV files when they are accessed, not upfront.
- * Uses @std/csv CsvParseStream for true line-by-line streaming.
+ * Uses csv-parse from npm for CSV parsing.
  *
  * @module
  */
@@ -24,9 +24,8 @@ export type GtfsFileName = keyof GtfsFileTypeMap;
  * Lazy GTFS archive that only parses files on demand.
  *
  * Files are read from the zip and parsed only when their
- * corresponding getter is called for the first time.
- * Streaming iterators parse CSV line-by-line without loading
- * the entire file into memory.
+ * corresponding iterator is called for the first time.
+ * Iterators yield typed rows one record at a time.
  */
 export declare class GtfsArchive {
     private entries;

package/dist/gtfs-archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gtfs-archive.d.ts","sourceRoot":"","sources":["../src/gtfs-archive.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EACX,UAAU,EACV,SAAS,EACT,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,MAAM,SAAS,CAAA;AAGhB;;GAEG;AACH,MAAM,WAAW,eAAe;IAC/B,YAAY,EAAE,UAAU,CAAA;IACxB,WAAW,EAAE,QAAQ,CAAA;IACrB,YAAY,EAAE,SAAS,CAAA;IACvB,WAAW,EAAE,QAAQ,CAAA;IACrB,gBAAgB,EAAE,YAAY,CAAA;IAC9B,YAAY,EAAE,cAAc,CAAA;CAC5B;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,MAAM,eAAe,CAAA;AAEhD;;;;;;;GAOG;AACH,qBAAa,WAAW;IACvB,OAAO,CAAC,OAAO,CAAsB;IAErC,OAAO;IAIP;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW;IAiB9D;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIlC;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE;IAIrB;;OAEG;YACW,YAAY;IAQ1B;;;;;;;;;;;;;;;;;;OAkBG;IACI,IAAI,CAAC,CAAC,SAAS,YAAY,EACjC,QAAQ,EAAE,CAAC,GACT,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC;CAoBpD"}
+{"version":3,"file":"gtfs-archive.d.ts","sourceRoot":"","sources":["../src/gtfs-archive.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EACX,UAAU,EACV,SAAS,EACT,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,MAAM,SAAS,CAAA;AAEhB;;GAEG;AACH,MAAM,WAAW,eAAe;IAC/B,YAAY,EAAE,UAAU,CAAA;IACxB,WAAW,EAAE,QAAQ,CAAA;IACrB,YAAY,EAAE,SAAS,CAAA;IACvB,WAAW,EAAE,QAAQ,CAAA;IACrB,gBAAgB,EAAE,YAAY,CAAA;IAC9B,YAAY,EAAE,cAAc,CAAA;CAC5B;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,MAAM,eAAe,CAAA;AAEhD;;;;;;GAMG;AACH,qBAAa,WAAW;IACvB,OAAO,CAAC,OAAO,CAAsB;IAErC,OAAO;IAIP;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW;IAiB9D;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIlC;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE;IAIrB;;OAEG;YACW,YAAY;IAQ1B;;;;;;;;;;;;;;;;;;OAkBG;IACI,IAAI,CAAC,CAAC,SAAS,YAAY,EACjC,QAAQ,EAAE,CAAC,GACT,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC;CAepD"}

package/dist/gtfs-archive.js

@@ -1,21 +1,19 @@
 /**
- * Lazy GTFS archive parser with streaming CSV support.
+ * Lazy GTFS archive parser.
  *
  * Only parses CSV files when they are accessed, not upfront.
- * Uses @std/csv CsvParseStream for true line-by-line streaming.
+ * Uses csv-parse from npm for CSV parsing.
  *
  * @module
  */
-import { CsvParseStream } from "@std/csv/parse-stream";
+import { parse } from "csv-parse/sync";
 import { unzip } from "but-unzip";
-import { bytesToTextStream } from "./utils";
 /**
  * Lazy GTFS archive that only parses files on demand.
  *
  * Files are read from the zip and parsed only when their
- * corresponding getter is called for the first time.
- * Streaming iterators parse CSV line-by-line without loading
- * the entire file into memory.
+ * corresponding iterator is called for the first time.
+ * Iterators yield typed rows one record at a time.
  */
 export class GtfsArchive {
     entries;
@@ -83,19 +81,14 @@ export class GtfsArchive {
         const bytes = await this.getFileBytes(filename);
         if (!bytes)
             return;
-        const textStream = bytesToTextStream(bytes);
-        const csvStream = textStream.pipeThrough(new CsvParseStream({ skipFirstRow: true }));
-        const reader = csvStream.getReader();
-        try {
-            while (true) {
-                const { value, done } = await reader.read();
-                if (done)
-                    break;
-                yield value;
-            }
-        }
-        finally {
-            reader.releaseLock();
+        const csvText = new TextDecoder().decode(bytes);
+        const rows = parse(csvText, {
+            bom: true,
+            columns: true,
+            skip_empty_lines: true,
+        });
+        for (const row of rows) {
+            yield row;
         }
     }
 }

package/dist/gtfs-archive.js.map

@@ -1 +1 @@
-{"version":3,"file":"gtfs-archive.js","sourceRoot":"","sources":["../src/gtfs-archive.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAgB,MAAM,WAAW,CAAA;AAS/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAiB3C;;;;;;;GAOG;AACH,MAAM,OAAO,WAAW;IACf,OAAO,CAAsB;IAErC,YAAoB,OAA6B;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,OAAiC;QAC/C,MAAM,KAAK,GACV,OAAO,YAAY,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAA;QAClE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;QAE1B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAA;QAC1C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,gDAAgD;YAChD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;YAC/C,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACxB,CAAC;QACF,CAAC;QAED,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,QAAgB;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED;;OAEG;IACH,SAAS;QACR,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,QAAgB;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAA;QAEvB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;QACzB,OAAO,IAAI,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;IACnD,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,CAAC,IAAI,CACV,QAAW;QAEX,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,KAAK;YAAE,OAAM;QAElB,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CACvC,IAAI,cAAc,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAC1C,CAAA;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,CAAA;QACpC,IAAI,CAAC;YACJ,OAAO,IAAI,EAAE,CAAC;gBACb,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;gBAC3C,IAAI,IAAI;oBAAE,MAAK;gBACf,MAAM,KAAsC,CAAA;YAC7C,CAAC;QACF,CAAC;gBAAS,CAAC;YACV,MAAM,CAAC,WAAW,EAAE,CAAA;QACrB,CAAC;IACF,CAAC;CACD"}
+{"version":3,"file":"gtfs-archive.js","sourceRoot":"","sources":["../src/gtfs-archive.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,KAAK,EAAgB,MAAM,WAAW,CAAA;AAyB/C;;;;;;GAMG;AACH,MAAM,OAAO,WAAW;IACf,OAAO,CAAsB;IAErC,YAAoB,OAA6B;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,OAAiC;QAC/C,MAAM,KAAK,GACV,OAAO,YAAY,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAA;QAClE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;QAE1B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAA;QAC1C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,gDAAgD;YAChD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;YAC/C,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACxB,CAAC;QACF,CAAC;QAED,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,QAAgB;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED;;OAEG;IACH,SAAS;QACR,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,QAAgB;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAA;QAEvB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;QACzB,OAAO,IAAI,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;IACnD,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,CAAC,IAAI,CACV,QAAW;QAEX,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,KAAK;YAAE,OAAM;QAElB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC/C,MAAM,IAAI,GAAG,KAAK,CAAyB,OAAO,EAAE;YACnD,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,IAAI;YACb,gBAAgB,EAAE,IAAI;SACtB,CAAC,CAAA;QAEF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,GAAoC,CAAA;QAC3C,CAAC;IACF,CAAC;CACD"}

package/package.json

@@ -2,7 +2,7 @@
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@osmix/gtfs",
 	"description": "Convert GTFS transit feeds to OSM format.",
-	"version": "0.0.2",
+	"version": "0.0.3",
 	"type": "module",
 	"main": "./src/index.ts",
 	"types": "./src/index.ts",
@@ -47,9 +47,9 @@
 		"typescript": "^5.9.0"
 	},
 	"dependencies": {
-		"@osmix/core": "0.1.2",
-		"@osmix/shared": "0.0.7",
-		"@std/csv": "npm:@jsr/std__csv",
-		"but-unzip": "^0.1.7"
+		"@osmix/core": "0.1.3",
+		"@osmix/shared": "0.0.8",
+		"but-unzip": "^0.1.7",
+		"csv-parse": "^6.1.0"
 	}
 }

package/src/gtfs-archive.ts

@@ -1,13 +1,13 @@
 /**
- * Lazy GTFS archive parser with streaming CSV support.
+ * Lazy GTFS archive parser.
  *
  * Only parses CSV files when they are accessed, not upfront.
- * Uses @std/csv CsvParseStream for true line-by-line streaming.
+ * Uses csv-parse from npm for CSV parsing.
  *
  * @module
  */
 
-import { CsvParseStream } from "@std/csv/parse-stream"
+import { parse } from "csv-parse/sync"
 import { unzip, type ZipItem } from "but-unzip"
 import type {
 	GtfsAgency,
@@ -17,7 +17,6 @@ import type {
 	GtfsStopTime,
 	GtfsTrip,
 } from "./types"
-import { bytesToTextStream } from "./utils"
 
 /**
  * Map of GTFS filenames to their record types.
@@ -38,9 +37,8 @@ export type GtfsFileName = keyof GtfsFileTypeMap
  * Lazy GTFS archive that only parses files on demand.
  *
  * Files are read from the zip and parsed only when their
- * corresponding getter is called for the first time.
- * Streaming iterators parse CSV line-by-line without loading
- * the entire file into memory.
+ * corresponding iterator is called for the first time.
+ * Iterators yield typed rows one record at a time.
  */
 export class GtfsArchive {
 	private entries: Map<string, ZipItem>
@@ -119,20 +117,15 @@ export class GtfsArchive {
 		const bytes = await this.getFileBytes(filename)
 		if (!bytes) return
 
-		const textStream = bytesToTextStream(bytes)
-		const csvStream = textStream.pipeThrough(
-			new CsvParseStream({ skipFirstRow: true }),
-		)
+		const csvText = new TextDecoder().decode(bytes)
+		const rows = parse<Record<string, string>>(csvText, {
+			bom: true,
+			columns: true,
+			skip_empty_lines: true,
+		})
 
-		const reader = csvStream.getReader()
-		try {
-			while (true) {
-				const { value, done } = await reader.read()
-				if (done) break
-				yield value as unknown as GtfsFileTypeMap[F]
-			}
-		} finally {
-			reader.releaseLock()
+		for (const row of rows) {
+			yield row as unknown as GtfsFileTypeMap[F]
 		}
 	}
 }

package/test/from-gtfs.test.ts

@@ -201,6 +201,21 @@ describe("GtfsArchive", () => {
 		expect(routes[0]?.route_short_name).toBe("1")
 	})
 
+	test("parses quoted CSV fields", async () => {
+		const { zipSync } = await import("fflate")
+		const encoder = new TextEncoder()
+		const zipData = zipSync({
+			"stops.txt": encoder.encode(`stop_id,stop_name,stop_lat,stop_lon
+stop1,"Main ""Central"", Downtown",40.7128,-74.0060`),
+		})
+
+		const archive = GtfsArchive.fromZip(zipData)
+		const stops = await Array.fromAsync(archive.iter("stops.txt"))
+
+		expect(stops.length).toBe(1)
+		expect(stops[0]?.stop_name).toBe('Main "Central", Downtown')
+	})
+
 	test("iterates stops without loading all at once", async () => {
 		const zipData = await createTestGtfsZip()
 		const archive = GtfsArchive.fromZip(zipData)