@transportme/load-ptv-gtfs 1.4.34 → 1.4.36

package/lib/gtfs-parser/GTFSCalendarDate.mjs

@@ -4,10 +4,12 @@ export default class GTFSCalendarDate {
 
   id
   date
+  rawDate
   type
 
   constructor({ id, date, type }) {
     this.id = id
+    this.rawDate = date
     this.date = dateUtils.parseDate(date)
     this.type = type
   }

package/lib/gtfs-parser/readers/GTFSCalendarReader.mjs

@@ -6,6 +6,9 @@ export default class GTFSCalendarReader extends GTFSReader {
 
   #calendarDateFile
   #calendarDates = {}
+  #unprocessedCalendarDates = new Set()
+
+  #hasCalendar = true
 
   /**
    * Constructs a new GTFS Calendar reader.
@@ -18,17 +21,31 @@ export default class GTFSCalendarReader extends GTFSReader {
     this.#calendarDateFile = calendarDateFile
   }
 
+  #checkMissingFile(e) {
+    if (!e.stack.includes('ENOENT')) throw e
+  }
+
   async open() {
-    await super.open()
+    try {
+      await super.open()
+    } catch (e) {
+      this.#checkMissingFile(e)
+      this.#hasCalendar = false
+    }
 
     if (!this.#calendarDateFile) return
-    let calendarDateReader = new GTFSCalendarDateReader(this.#calendarDateFile)
-    await calendarDateReader.open()
-    while (calendarDateReader.available()) {
-      let calendarDate = await calendarDateReader.getNextEntity()
-      if (!this.#calendarDates[calendarDate.id]) this.#calendarDates[calendarDate.id] = []
-      this.#calendarDates[calendarDate.id].push(calendarDate)
-    }
+    try {
+      let calendarDateReader = new GTFSCalendarDateReader(this.#calendarDateFile)
+      await calendarDateReader.open()
+      while (calendarDateReader.available()) {
+        let calendarDate = await calendarDateReader.getNextEntity()
+        if (!this.#calendarDates[calendarDate.id]) {
+          this.#calendarDates[calendarDate.id] = []
+          this.#unprocessedCalendarDates.add(calendarDate.id)
+        }
+        this.#calendarDates[calendarDate.id].push(calendarDate)
+      }
+    } catch (e) { this.#checkMissingFile(e) }
   }
 
   /**
@@ -59,6 +76,30 @@ export default class GTFSCalendarReader extends GTFSReader {
       endDay: data.end_date
     }
 
+    this.#unprocessedCalendarDates.delete(data.service_id)
+
     return new GTFSCalendar(calendarData, this.#calendarDates[data.service_id])
   }
+
+  available() {
+    const underlyingAvailable = this.#hasCalendar ? super.available() : false
+    if (underlyingAvailable) return true
+    return this.#unprocessedCalendarDates.size > 0
+  }
+
+  getNextEntity() {
+    if (this.#hasCalendar && super.available()) return super.getNextEntity()
+    const calendarDate = Array.from(this.#unprocessedCalendarDates.values())[0]
+    const calendarData = this.#calendarDates[calendarDate]
+
+    const calendar = new GTFSCalendar({
+      id: calendarDate,
+      daysOfWeek: Array(7).fill(false),
+      startDay: calendarData[0].rawDate,
+      endDay: calendarData[0].rawDate
+    }, calendarData)
+
+    this.#unprocessedCalendarDates.delete(calendarDate)
+    return calendar
+  }
 }

package/lib/gtfs-parser/readers/line-reader.mjs

@@ -31,7 +31,10 @@ export default class CSVLineReader {
   async open() {
     await new Promise((resolve, reject) => {
       lineReader.open(this.#file, async (err, reader) => {
-        if (err) return reject(err)
+        if (err) {
+          err.stack = `${err.stack}\n${new Error().stack.split('\n').slice(1).join('\n')}`
+          return reject(err)
+        }
 
         this.#reader = reader
         this.#headers = (await this.#readNextLine()).split(',')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transportme/load-ptv-gtfs",
-  "version": "1.4.34",
+  "version": "1.4.36",
   "description": "",
   "main": "index.mjs",
   "scripts": {