@tmlmobilidade/import-gtfs 20251009.1357.48 → 20251010.751.17

package/dist/index.d.ts

@@ -1,5 +1,15 @@
-import { type GtfsSQLTables, type ImportGtfsToDatabaseConfig } from './src/types.js';
-import { type Plan } from '@tmlmobilidade/types';
+import { type GtfsSQLTables } from './src/types.js';
+import { type OperationalDate, type Plan } from '@tmlmobilidade/types';
+/**
+ * Configuration options for importing GTFS data into a database.
+ */
+export interface ImportGtfsToDatabaseConfig {
+    date_range?: {
+        end: OperationalDate;
+        start: OperationalDate;
+    };
+    discrete_dates?: OperationalDate[];
+}
 /**
  * Imports GTFS data into the database for a given plan.
  * @param plan The plan containing GTFS feed information.

package/dist/index.js

@@ -45,8 +45,8 @@ export async function importGtfsToDatabase(plan, config = {}) {
         }
         //
         // Process GTFS files in the correct order
-        await processCalendarFile(context, config.start_date ?? plan.gtfs_feed_info.feed_start_date, config.end_date ?? plan.gtfs_feed_info.feed_end_date);
-        await processCalendarDatesFile(context, config.start_date ?? plan.gtfs_feed_info.feed_start_date, config.end_date ?? plan.gtfs_feed_info.feed_end_date);
+        await processCalendarFile(context, config);
+        await processCalendarDatesFile(context, config);
         await processTripsFile(context);
         await processRoutesFile(context);
         await processShapesFile(context);

package/dist/src/processors/calendar.d.ts

@@ -1,5 +1,5 @@
 import { type ImportGtfsContext } from '../types.js';
-import { OperationalDate } from '@tmlmobilidade/types';
+import { type ImportGtfsToDatabaseConfig } from '../../index.js';
 /**
  * Processes the calendar.txt file from the GTFS dataset.
  * It extracts service_ids that are valid between the given start_date and end_date,
@@ -8,4 +8,4 @@ import { OperationalDate } from '@tmlmobilidade/types';
  * @param startDate The start date of the range to filter service_ids.
  * @param endDate The end date of the range to filter service_ids.
  */
-export declare function processCalendarFile(context: ImportGtfsContext, startDate: OperationalDate, endDate: OperationalDate): Promise<void>;
+export declare function processCalendarFile(context: ImportGtfsContext, config: ImportGtfsToDatabaseConfig): Promise<void>;

package/dist/src/processors/calendar.js

@@ -12,7 +12,7 @@ import fs from 'node:fs';
  * @param startDate The start date of the range to filter service_ids.
  * @param endDate The end date of the range to filter service_ids.
  */
-export async function processCalendarFile(context, startDate, endDate) {
+export async function processCalendarFile(context, config) {
     try {
         //
         const calendarParseTimer = new TIMETRACKER();
@@ -23,21 +23,39 @@ export async function processCalendarFile(context, startDate, endDate) {
             // Validate the current row against the proper type
             const validatedData = validateGtfsCalendar(data);
             //
-            // Check if this service_id is between the given start_date and end_date.
-            // Clip the service_id's start and end dates to the given start and end dates.
-            let serviceIdStartDate = validatedData.start_date;
-            let serviceIdEndDate = validatedData.end_date;
-            if (serviceIdEndDate < startDate || serviceIdStartDate > endDate)
-                return;
-            if (serviceIdStartDate < startDate)
-                serviceIdStartDate = startDate;
-            if (serviceIdEndDate > endDate)
-                serviceIdEndDate = endDate;
+            // Setup an array to keep track of the valid operational dates for this service_id
+            // for the given start_date and end_date or single dates from the config.
+            const allOperationalDatesInRange = [];
+            //
+            // If the config is of date-range type, check if this service_id
+            // is between the given start_date and end_date. Clip the service_id's
+            // start and end dates to the given start and end dates.
+            if (config.date_range?.start && config.date_range?.end) {
+                let serviceIdStartDate = validatedData.start_date;
+                let serviceIdEndDate = validatedData.end_date;
+                if (serviceIdEndDate < config.date_range.start || serviceIdStartDate > config.date_range.end)
+                    return;
+                if (serviceIdStartDate < config.date_range.start)
+                    serviceIdStartDate = config.date_range.start;
+                if (serviceIdEndDate > config.date_range.end)
+                    serviceIdEndDate = config.date_range.end;
+                const operationalDates = getOperationalDatesFromRange(serviceIdStartDate, serviceIdEndDate);
+                allOperationalDatesInRange.push(...operationalDates);
+            }
+            //
+            // If the config is of discrete-dates type, get the operational dates
+            // for this service_id that are in the given discrete dates array.
+            if (config.discrete_dates?.length) {
+                config.discrete_dates.forEach((date) => {
+                    if (date >= validatedData.start_date && date <= validatedData.end_date) {
+                        allOperationalDatesInRange.push(date);
+                    }
+                });
+            }
             //
             // If we're here, it means the service_id is valid between the given dates.
             // For the configured weekly schedule, create the individual operational dates
             // for each day of the week that is active.
-            const allOperationalDatesInRange = getOperationalDatesFromRange(serviceIdStartDate, serviceIdEndDate);
             const validOperationalDates = new Set();
             for (const currentDate of allOperationalDatesInRange) {
                 const dayOfWeek = Dates.fromOperationalDate(currentDate, 'Europe/Lisbon').toFormat('c');

package/dist/src/processors/calendar_dates.d.ts

@@ -1,5 +1,5 @@
 import { type ImportGtfsContext } from '../types.js';
-import { OperationalDate } from '@tmlmobilidade/types';
+import { type ImportGtfsToDatabaseConfig } from '../../index.js';
 /**
  * Processes the calendar_dates.txt file from the GTFS dataset.
  * It extracts service_ids that are valid between the given start_date and end_date,
@@ -8,4 +8,4 @@ import { OperationalDate } from '@tmlmobilidade/types';
  * @param startDate The start date of the range to filter service_ids.
  * @param endDate The end date of the range to filter service_ids.
  */
-export declare function processCalendarDatesFile(context: ImportGtfsContext, startDate: OperationalDate, endDate: OperationalDate): Promise<void>;
+export declare function processCalendarDatesFile(context: ImportGtfsContext, config: ImportGtfsToDatabaseConfig): Promise<void>;

package/dist/src/processors/calendar_dates.js

@@ -12,7 +12,7 @@ import fs from 'node:fs';
  * @param startDate The start date of the range to filter service_ids.
  * @param endDate The end date of the range to filter service_ids.
  */
-export async function processCalendarDatesFile(context, startDate, endDate) {
+export async function processCalendarDatesFile(context, config) {
     try {
         //
         const calendarDatesParseTimer = new TIMETRACKER();
@@ -24,8 +24,18 @@ export async function processCalendarDatesFile(context, startDate, endDate) {
             const validatedData = validateGtfsCalendarDate(data);
             //
             // Skip if this row's date is not between the given start and end dates
-            if (validatedData.date < startDate || validatedData.date > endDate)
-                return;
+            // if they are provided in the config.
+            if (config.date_range?.start && config.date_range?.end) {
+                if (validatedData.date < config.date_range.start || validatedData.date > config.date_range.end)
+                    return;
+            }
+            //
+            // Skip if this row's date is not in the given discrete dates array
+            // if it is provided in the config.
+            if (config.discrete_dates?.length) {
+                if (!config.discrete_dates.includes(validatedData.date))
+                    return;
+            }
             //
             // If we're here, it means the service_id is valid between the given dates.
             // Get the previously saved calendars and check if it exists for this service_id.

package/dist/src/types.d.ts

@@ -1,13 +1,6 @@
 import { SQLiteWriter } from '@tmlmobilidade/connectors';
 import { type GTFS_Route_Extended, type GTFS_Shape, type GTFS_Stop_Extended, type GTFS_StopTime, type GTFS_Trip_Extended, type Plan } from '@tmlmobilidade/types';
 import { type OperationalDate } from '@tmlmobilidade/types';
-/**
- * Configuration options for importing GTFS data into a database.
- */
-export interface ImportGtfsToDatabaseConfig {
-    end_date?: OperationalDate;
-    start_date?: OperationalDate;
-}
 /**
  * Holds references to all GTFS-related SQL tables and writers.
  * Each property corresponds to a specific GTFS entity and is associated

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/import-gtfs",
-	"version": "20251009.1357.48",
+	"version": "20251010.751.17",
 	"author": "João de Vasconcelos & Jusi Monteiro",
 	"license": "AGPL-3.0-or-later",
 	"homepage": "https://github.com/tmlmobilidade/services#readme",