@tmlmobilidade/dates 20260421.1115.34 → 20260424.1050.20

package/dist/calendar/rules/formatting/common.js

@@ -51,14 +51,24 @@ export function buildWeekdaysPart(rule, cfg = { mode: 'long' }) {
     const hasMonFri = [1, 2, 3, 4, 5].every(d => weekdaySet.has(d));
     const hasWeekend = weekdaySet.has(6) && weekdaySet.has(7);
     const getDayLabel = (value) => WEEKDAY_OPTIONS.find(opt => opt.value === value)?.label ?? '?';
+    const getSingleDayLongLabel = (value) => {
+        if (value === 6) {
+            return `ao ${getDayLabel(value)}`;
+        }
+        if (value === 7) {
+            return `aos ${getDayLabel(value)}`;
+        }
+        return `à ${getDayLabel(value)}`;
+    };
     if (hasMonFri && hasWeekend)
-        return 'Todos os dias';
+        return cfg.mode === 'short' ? 'Todos os dias' : 'em todos os dias';
     if (hasMonFri) {
         const extraDays = rule.weekdays
             .filter(d => d < 1 || d > 5)
             .sort((a, b) => a - b);
-        if (extraDays.length === 0)
-            return 'Dias úteis';
+        if (extraDays.length === 0) {
+            return cfg.mode === 'short' ? 'Dias úteis' : 'nos dias úteis';
+        }
         const extraLabels = extraDays.map(getDayLabel);
         return cfg.mode === 'short'
             ? `Dias úteis + ${extraLabels.join(', ')}`
@@ -78,9 +88,13 @@ export function buildWeekdaysPart(rule, cfg = { mode: 'long' }) {
     }
     const sortedDays = [...rule.weekdays].sort((a, b) => a - b);
     const dayLabels = sortedDays.map(getDayLabel);
-    return cfg.mode === 'short'
-        ? dayLabels.join(', ')
-        : `à ${dayLabels.join(', ')}`;
+    if (cfg.mode === 'short') {
+        return dayLabels.join(', ');
+    }
+    if (sortedDays.length === 1) {
+        return getSingleDayLongLabel(sortedDays[0]);
+    }
+    return `à ${dayLabels.join(', ')}`;
 }
 export function buildDayPeriodsPart(parameter, cfg) {
     const selected = (parameter.day_periods ?? []);

package/dist/calendar/rules/formatting/sort.d.ts

@@ -0,0 +1,3 @@
+import { type ScheduleRule } from '@tmlmobilidade/types';
+export type RulesSectionName = 'exclude' | 'include' | 'overwrite';
+export declare function sortRulesBySection(rules: ScheduleRule[], section: RulesSectionName, totalYearPeriods: number): ScheduleRule[];

package/dist/calendar/rules/formatting/sort.js

@@ -0,0 +1,118 @@
+/* * */
+/* * */
+function safeStringCompare(a, b) {
+    return (a || '').localeCompare(b || '');
+}
+function getSortedPeriodIds(rule) {
+    if ('year_period_ids' in rule && Array.isArray(rule.year_period_ids)) {
+        return [...rule.year_period_ids].sort((a, b) => a.localeCompare(b));
+    }
+    return [];
+}
+function hasAllYearPeriods(rule, totalYearPeriods) {
+    if (!('year_period_ids' in rule) || !Array.isArray(rule.year_period_ids)) {
+        return false;
+    }
+    return totalYearPeriods > 0 && new Set(rule.year_period_ids).size === totalYearPeriods;
+}
+function getPeriodSortKey(rule) {
+    return getSortedPeriodIds(rule).join('|');
+}
+function normalizeWeekdayValue(weekday) {
+    if (typeof weekday === 'number')
+        return weekday;
+    const numericValue = Number(weekday);
+    if (!Number.isNaN(numericValue))
+        return numericValue;
+    return 999;
+}
+function getSortedWeekdays(rule) {
+    if ('weekdays' in rule && Array.isArray(rule.weekdays)) {
+        return [...rule.weekdays]
+            .map(normalizeWeekdayValue)
+            .sort((a, b) => a - b);
+    }
+    return [];
+}
+function isExactWeekdaySet(rule, expected) {
+    const weekdays = getSortedWeekdays(rule);
+    if (weekdays.length !== expected.length)
+        return false;
+    return weekdays.every((day, index) => day === expected[index]);
+}
+function getWeekdayGroupPriority(rule) {
+    // 1..7 => first
+    if (isExactWeekdaySet(rule, [1, 2, 3, 4, 5, 6, 7]))
+        return 0;
+    // DU / weekdays only => second
+    if (isExactWeekdaySet(rule, [1, 2, 3, 4, 5]))
+        return 1;
+    // everything else
+    return 2;
+}
+function getWeekdaySortKey(rule) {
+    return getSortedWeekdays(rule)
+        .map(day => day.toString().padStart(3, '0'))
+        .join('|');
+}
+function getFirstDate(rule) {
+    if ('dates' in rule && Array.isArray(rule.dates) && rule.dates.length > 0) {
+        return [...rule.dates].sort((a, b) => a.localeCompare(b))[0];
+    }
+    return undefined;
+}
+function isEventException(rule) {
+    if (rule.kind === 'event_restriction' || rule.kind === 'event_replacement') {
+        return true;
+    }
+    return rule.kind === 'manual' && Boolean(rule.event_id);
+}
+function compareByEventDate(a, b) {
+    const firstDateA = getFirstDate(a) || '99999999';
+    const firstDateB = getFirstDate(b) || '99999999';
+    const dateComparison = firstDateA.localeCompare(firstDateB);
+    if (dateComparison !== 0)
+        return dateComparison;
+    return safeStringCompare(a.name, b.name);
+}
+function compareByRuleParams(a, b, totalYearPeriods) {
+    const aHasAllPeriods = hasAllYearPeriods(a, totalYearPeriods);
+    const bHasAllPeriods = hasAllYearPeriods(b, totalYearPeriods);
+    if (aHasAllPeriods && !bHasAllPeriods)
+        return -1;
+    if (!aHasAllPeriods && bHasAllPeriods)
+        return 1;
+    const periodComparison = getPeriodSortKey(a).localeCompare(getPeriodSortKey(b));
+    if (periodComparison !== 0)
+        return periodComparison;
+    const weekdayGroupComparison = getWeekdayGroupPriority(a) - getWeekdayGroupPriority(b);
+    if (weekdayGroupComparison !== 0)
+        return weekdayGroupComparison;
+    const weekdayComparison = getWeekdaySortKey(a).localeCompare(getWeekdaySortKey(b));
+    if (weekdayComparison !== 0)
+        return weekdayComparison;
+    return safeStringCompare(a.name, b.name);
+}
+function compareIncludeExcludeRules(a, b, totalYearPeriods) {
+    const aIsEventException = isEventException(a);
+    const bIsEventException = isEventException(b);
+    if (aIsEventException && !bIsEventException)
+        return 1;
+    if (!aIsEventException && bIsEventException)
+        return -1;
+    if (aIsEventException && bIsEventException) {
+        return compareByEventDate(a, b);
+    }
+    return compareByRuleParams(a, b, totalYearPeriods);
+}
+function compareOverwriteRules(a, b) {
+    return compareByEventDate(a, b);
+}
+/* * */
+export function sortRulesBySection(rules, section, totalYearPeriods) {
+    const sortedRules = [...rules];
+    if (section === 'overwrite') {
+        return sortedRules.sort((a, b) => compareOverwriteRules(a, b));
+    }
+    return sortedRules.sort((a, b) => compareIncludeExcludeRules(a, b, totalYearPeriods));
+}

package/dist/calendar/rules/index.d.ts

@@ -2,6 +2,7 @@ export * from './calculation/index.js';
 export * from './calculation/types.js';
 export * from './formatting/parameter-summary.js';
 export * from './formatting/rule-summary.js';
+export * from './formatting/sort.js';
 export * from './merging/index.js';
 export * from './preview/affectedDates.js';
 export * from './preview/buildDayDetails.js';

package/dist/calendar/rules/index.js

@@ -2,6 +2,7 @@ export * from './calculation/index.js';
 export * from './calculation/types.js';
 export * from './formatting/parameter-summary.js';
 export * from './formatting/rule-summary.js';
+export * from './formatting/sort.js';
 export * from './merging/index.js';
 export * from './preview/affectedDates.js';
 export * from './preview/buildDayDetails.js';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/dates",
-	"version": "20260421.1115.34",
+	"version": "20260424.1050.20",
 	"author": {
 		"email": "iso@tmlmobilidade.pt",
 		"name": "TML-ISO"