@tmlmobilidade/generate-offer-files 20250626.2300.25 → 20250627.1206.31

package/dist/main.js

@@ -2,12 +2,11 @@
 import LOGGER from '@helperkits/logger';
 import TIMETRACKER from '@helperkits/timer';
 import { JsonWriter } from '@helperkits/writer';
-import { validateOperationalDate } from '@tmlmobilidade/types';
+import { validateGtfsCalendar, validateGtfsCalendarDate, validateGtfsRouteExtended, validateGtfsStopExtended, validateGtfsStopTime, validateGtfsTripExtended } from '@tmlmobilidade/types';
 import { convertMetersOrKilometersToMeters, Dates, getOperationalDatesFromRange } from '@tmlmobilidade/utils';
 import { parse as csvParser } from 'csv-parse';
 import extract from 'extract-zip';
 import fs from 'fs';
-import { ExceptionType } from 'gtfs-types';
 /* * */
 export async function generateOfferOutput(filePath, startDate, endDate, outputDir, feedId) {
     try {
@@ -76,21 +75,13 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
             const parseEachRow = async (data) => {
                 //
                 //
-                // Validate the start and end dates to ensure
-                // they are of in the OperationalDate format
-                let serviceIdStartDate;
-                let serviceIdEndDate;
-                try {
-                    serviceIdStartDate = validateOperationalDate(data.start_date);
-                    serviceIdEndDate = validateOperationalDate(data.end_date);
-                }
-                catch (error) {
-                    LOGGER.error(`Error creating operational date "${data.start_date}" or "${data.end_date}" for service_id "${data.service_id}"`, error);
-                    return;
-                }
+                // 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)
@@ -105,24 +96,24 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
                 const validOperationalDates = [];
                 for (const currentDate of allOperationalDatesInRange) {
                     const dayOfWeek = Dates.fromOperationalDate(currentDate, 'Europe/Lisbon').toFormat('c');
-                    if (dayOfWeek === '1' && String(data.monday) === '1')
+                    if (dayOfWeek === '1' && validatedData.monday === 1)
                         validOperationalDates.push(currentDate);
-                    if (dayOfWeek === '2' && String(data.tuesday) === '1')
+                    if (dayOfWeek === '2' && validatedData.tuesday === 1)
                         validOperationalDates.push(currentDate);
-                    if (dayOfWeek === '3' && String(data.wednesday) === '1')
+                    if (dayOfWeek === '3' && validatedData.wednesday === 1)
                         validOperationalDates.push(currentDate);
-                    if (dayOfWeek === '4' && String(data.thursday) === '1')
+                    if (dayOfWeek === '4' && validatedData.thursday === 1)
                         validOperationalDates.push(currentDate);
-                    if (dayOfWeek === '5' && String(data.friday) === '1')
+                    if (dayOfWeek === '5' && validatedData.friday === 1)
                         validOperationalDates.push(currentDate);
-                    if (dayOfWeek === '6' && String(data.saturday) === '1')
+                    if (dayOfWeek === '6' && validatedData.saturday === 1)
                         validOperationalDates.push(currentDate);
-                    if (dayOfWeek === '7' && String(data.sunday) === '1')
+                    if (dayOfWeek === '7' && validatedData.sunday === 1)
                         validOperationalDates.push(currentDate);
                 }
                 //
                 // Save the valid operational dates for this service_id
-                savedCalendarDates.set(data.service_id, validOperationalDates);
+                savedCalendarDates.set(validatedData.service_id, validOperationalDates);
                 //
             };
             //
@@ -154,40 +145,33 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
             const parseEachRow = async (data) => {
                 //
                 //
-                // Validate the date to ensure it is of type OperationalDate
-                let currentOperationalDate;
-                try {
-                    currentOperationalDate = validateOperationalDate(data.date);
-                }
-                catch (error) {
-                    LOGGER.error(`Error creating operational date "${data.date}" for service_id "${data.service_id}"`, error);
-                    return;
-                }
+                // Validate the current row against the proper type
+                const validatedData = validateGtfsCalendarDate(data);
                 //
                 // Skip if this row's date is not between the given start and end dates
-                if (currentOperationalDate < startDate || currentOperationalDate > endDate)
+                if (validatedData.date < startDate || validatedData.date > endDate)
                     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.
-                const savedCalendar = savedCalendarDates.get(data.service_id);
+                const savedCalendar = savedCalendarDates.get(validatedData.service_id);
                 if (savedCalendar) {
                     // Create a new Set to avoid duplicated dates
                     const updatedCalendar = new Set(savedCalendar);
                     // If this service_id was previously saved, either add or remove the current date
                     // to it based on the exception_type value for this row.
-                    if (Number(data.exception_type) === ExceptionType.SERVICE_ADDED)
-                        updatedCalendar.add(currentOperationalDate);
-                    else if (Number(data.exception_type) === ExceptionType.SERVICE_REMOVED)
-                        updatedCalendar.delete(currentOperationalDate);
+                    if (validatedData.exception_type === 1)
+                        updatedCalendar.add(validatedData.date);
+                    else if (validatedData.exception_type === 2)
+                        updatedCalendar.delete(validatedData.date);
                     // Update the service_id with the new dates
-                    savedCalendarDates.set(data.service_id, Array.from(updatedCalendar));
+                    savedCalendarDates.set(validatedData.service_id, Array.from(updatedCalendar));
                 }
                 else {
                     // If this is the first time we're seeing this service_id, then it is only necessary
                     // to initiate a new dates array if it is a service addition
-                    if (Number(data.exception_type) === ExceptionType.SERVICE_ADDED) {
-                        savedCalendarDates.set(data.service_id, [currentOperationalDate]);
+                    if (validatedData.exception_type === 1) {
+                        savedCalendarDates.set(validatedData.service_id, [validatedData.date]);
                     }
                 }
                 //
@@ -219,31 +203,16 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
             //
             LOGGER.info(`Reading zip entry "trips.txt"...`);
             const parseEachRow = async (data) => {
-                //
-                //
+                // Validate the current row against the proper type
+                const validatedData = validateGtfsTripExtended(data);
                 // For each trip, check if the associated service_id was saved
                 // in the previous step or not. Include it if yes, skip otherwise.
-                if (!savedCalendarDates.has(data.service_id))
+                if (!savedCalendarDates.has(validatedData.service_id))
                     return;
-                //
-                // Format the exported row. Only include the minimum required data
-                // to prevent memory bloat later on.
-                const parsedRowData = {
-                    direction_id: data.direction_id,
-                    pattern_id: data.pattern_id,
-                    route_id: data.route_id,
-                    service_id: data.service_id,
-                    shape_id: data.shape_id,
-                    trip_headsign: data.trip_headsign,
-                    trip_id: data.trip_id,
-                    wheelchair_accessible: data.wheelchair_accessible,
-                };
-                //
-                // Save this trip for later and reference
-                // the associated route_id to filter them later.
-                savedTrips.set(data.trip_id, parsedRowData);
-                referencedRouteIds.add(data.route_id);
-                //
+                // Save the exported row
+                savedTrips.set(validatedData.trip_id, validatedData);
+                // Reference the associated entities to filter them later.
+                referencedRouteIds.add(validatedData.route_id);
             };
             //
             // Setup the CSV parsing operation
@@ -265,28 +234,14 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
             //
             LOGGER.info(`Reading zip entry "routes.txt"...`);
             const parseEachRow = async (data) => {
-                //
-                //
+                // Validate the current row against the proper type
+                const validatedData = validateGtfsRouteExtended(data);
                 // For each route, only save the ones referenced
                 // by the previously saved trips.
-                if (!referencedRouteIds.has(data.route_id))
+                if (!referencedRouteIds.has(validatedData.route_id))
                     return;
-                //
-                // Format and save the exported row
-                const parsedRowData = {
-                    agency_id: data.agency_id,
-                    line_id: data.line_id,
-                    line_long_name: data.line_long_name,
-                    line_short_name: data.line_short_name,
-                    path_type: data.path_type,
-                    route_color: data.route_color,
-                    route_id: data.route_id,
-                    route_long_name: data.route_long_name,
-                    route_short_name: data.route_short_name,
-                    route_text_color: data.route_text_color,
-                };
-                savedRoutes.set(data.route_id, parsedRowData);
-                //
+                // Save the exported row
+                savedRoutes.set(validatedData.route_id, validatedData);
             };
             //
             // Setup the CSV parsing operation
@@ -309,22 +264,10 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
             //
             LOGGER.info(`Reading zip entry "stops.txt"...`);
             const parseEachRow = async (data) => {
-                //
-                //
-                // Save all stops, but only the mininum required data.
-                const parsedRowData = {
-                    location_type: data.location_type,
-                    municipality_id: data.municipality_id,
-                    parent_station: data.parent_station,
-                    parish_id: data.parish_id,
-                    region_id: data.region_id,
-                    stop_id: data.stop_id,
-                    stop_lat: Number(data.stop_lat),
-                    stop_lon: Number(data.stop_lon),
-                    stop_name: data.stop_name,
-                };
-                savedStops.set(data.stop_id, parsedRowData);
-                //
+                // Validate the current row against the proper type
+                const validatedData = validateGtfsStopExtended(data);
+                // Save the exported row
+                savedStops.set(validatedData.stop_id, validatedData);
             };
             //
             // Setup the CSV parsing operation
@@ -350,35 +293,26 @@ export async function generateOfferOutput(filePath, startDate, endDate, outputDi
             const parseEachRow = async (data) => {
                 //
                 //
+                // Validate the current row against the proper type
+                const validatedData = validateGtfsStopTime(data);
+                //
                 // For each stopTime of each trip, check if the associated trip_id was saved
                 // in the previous step or not. Skip if this row's trip_id was not saved before.
                 // Also, check if the stop_id is valid and was saved before.
-                const tripData = savedTrips.get(data.trip_id);
+                const tripData = savedTrips.get(validatedData.trip_id);
                 if (!tripData)
                     return;
-                const stopData = savedStops.get(data.stop_id);
+                const stopData = savedStops.get(validatedData.stop_id);
                 if (!stopData)
                     return;
                 //
                 // Format the exported row. Only include the minimum required data
                 // to prevent memory bloat later on, and include the stop data right away.
-                const parsedRowData = {
-                    arrival_time: data.arrival_time,
-                    continuous_drop_off: data.continuous_drop_off,
-                    continuous_pickup: data.continuous_pickup,
-                    departure_time: data.departure_time,
-                    shape_dist_traveled: data.shape_dist_traveled,
-                    stop_headsign: data.stop_headsign,
-                    stop_id: data.stop_id,
-                    stop_sequence: data.stop_sequence,
-                    timepoint: data.timepoint,
-                    trip_id: data.trip_id,
-                };
-                const savedStopTime = savedStopTimes.get(data.trip_id);
+                const savedStopTime = savedStopTimes.get(validatedData.trip_id);
                 if (savedStopTime)
-                    savedStopTimes.set(data.trip_id, [...savedStopTime, parsedRowData]);
+                    savedStopTimes.set(validatedData.trip_id, [...savedStopTime, validatedData]);
                 else
-                    savedStopTimes.set(data.trip_id, [parsedRowData]);
+                    savedStopTimes.set(validatedData.trip_id, [validatedData]);
                 //
             };
             //

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/generate-offer-files",
-	"version": "20250626.2300.25",
+	"version": "20250627.1206.31",
 	"type": "module",
 	"files": [
 		"dist"