@tmlmobilidade/dates 20260408.1128.43 → 20260409.1552.16

package/dist/calendar/rules/calculation/index.js

@@ -53,6 +53,9 @@ export function computeActiveRules(date, rules, periods, holidays, options) {
         return event.dates.includes(date);
     });
     const key = calendarKey(Dates.fromOperationalDate(date, 'Europe/Lisbon'));
+    // Filter out manual rules whose months list doesn't include the current month
+    const month = Number(key.slice(5, 7));
+    const monthFilteredManualRules = filteredManualRules.filter(rule => !rule.months?.length || rule.months.includes(month));
     const replacement = findReplacementForDate(date, replacementRules);
     // 1) Base timepoints
     let timepoints;
@@ -64,11 +67,11 @@ export function computeActiveRules(date, rules, periods, holidays, options) {
             ? { ...replacement, weekdays: [calendarWeekday(key, holidays)] }
             : replacement;
         // Replacement mode: match manuals by intersection (Option A)
-        const base = collectReplacementManualIncludes(effectiveReplacement, filteredManualRules);
+        const base = collectReplacementManualIncludes(effectiveReplacement, monthFilteredManualRules);
         timepoints = base.timepoints;
         appliedRuleIds = base.appliedRuleIds;
         // Apply manual excludes *also* by intersection with replacement targets
-        applyReplacementManualExcludes(timepoints, appliedRuleIds, effectiveReplacement, filteredManualRules);
+        applyReplacementManualExcludes(timepoints, appliedRuleIds, effectiveReplacement, monthFilteredManualRules);
     }
     else {
         // Normal mode: day resolves to a single weekday + single yearPeriodId
@@ -76,10 +79,10 @@ export function computeActiveRules(date, rules, periods, holidays, options) {
             weekday: calendarWeekday(key, holidays),
             yearPeriodId: getActivePeriodId(date, periods),
         };
-        const base = collectManualIncludes(filteredManualRules, ctx);
+        const base = collectManualIncludes(monthFilteredManualRules, ctx);
         timepoints = base.timepoints;
         appliedRuleIds = base.appliedRuleIds;
-        applyManualExcludes(timepoints, appliedRuleIds, filteredManualRules, ctx);
+        applyManualExcludes(timepoints, appliedRuleIds, monthFilteredManualRules, ctx);
     }
     // 2) Event restrictions always apply by date
     applyEventRestrictions(date, timepoints, appliedRuleIds, restrictionRules);

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

@@ -35,3 +35,15 @@ export declare function buildWeekdaysPart(rule: EventReplacementRule | ManualRul
 export declare function buildDayPeriodsPart(parameter: StopsParameterOverride, cfg: {
     mode: 'long' | 'short';
 }): string;
+/**
+ * Builds the months portion of a rule summary.
+ *
+ * Handles smart formatting:
+ * - No months or all 12 selected: "Todos os meses" / "em todos os meses"
+ * - Single month: Shows month label
+ * - Multiple months: "N meses" (short) or lists them (long)
+ */
+export declare function buildMonthsPart(rule: Pick<ManualRule, 'months'>, cfg?: {
+    mode: 'long' | 'short';
+    omitIfAll?: boolean;
+}): string;

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

@@ -1,4 +1,4 @@
-import { DAY_PERIOD_LABELS, WEEKDAY_OPTIONS } from '@tmlmobilidade/types';
+import { DAY_PERIOD_LABELS, MONTH_OPTIONS, WEEKDAY_OPTIONS } from '@tmlmobilidade/types';
 /**
  * Builds the period portion of a rule summary.
  *
@@ -93,3 +93,29 @@ export function buildDayPeriodsPart(parameter, cfg) {
         return `Durante ${labels[0]}`;
     return `Durante ${labels.join(' e ')}`;
 }
+/**
+ * Builds the months portion of a rule summary.
+ *
+ * Handles smart formatting:
+ * - No months or all 12 selected: "Todos os meses" / "em todos os meses"
+ * - Single month: Shows month label
+ * - Multiple months: "N meses" (short) or lists them (long)
+ */
+export function buildMonthsPart(rule, cfg = { mode: 'long' }) {
+    if (!rule.months?.length || rule.months.length === 12) {
+        if (cfg.omitIfAll)
+            return '';
+        return cfg.mode === 'short' ? 'Todos os meses' : 'em todos os meses';
+    }
+    const labels = MONTH_OPTIONS
+        .filter(o => rule.months.includes(o.value))
+        .map(o => o.label);
+    if (cfg.mode === 'short') {
+        return labels.length === 1 ? labels[0] : `${labels.length} meses`;
+    }
+    if (labels.length === 1)
+        return labels[0];
+    if (labels.length === 2)
+        return `${labels[0]} e ${labels[1]}`;
+    return labels.join(', ');
+}

package/dist/calendar/rules/formatting/rule-summary.js

@@ -1,7 +1,7 @@
 import { Dates } from '../../../dates.js';
 import { FORMATS } from '../../../format.js';
-import { WEEKDAY_OPTIONS, } from '@tmlmobilidade/types';
-import { buildWeekdaysPart, buildYearPeriodsPart } from './common.js';
+import { MONTH_OPTIONS, WEEKDAY_OPTIONS, } from '@tmlmobilidade/types';
+import { buildMonthsPart, buildWeekdaysPart, buildYearPeriodsPart } from './common.js';
 /**
  * Builds human-readable summaries of a scheduling rule.
  *
@@ -69,6 +69,9 @@ function buildRuleSummaryShort(rule, options) {
         const periodPart = buildYearPeriodsPart(rule, options, { mode: 'short', omitIfAll: true });
         if (periodPart)
             parts.push(periodPart);
+        const monthsPart = buildMonthsPart(rule, { mode: 'short', omitIfAll: true });
+        if (monthsPart)
+            parts.push(monthsPart);
         const weekdayPart = buildWeekdaysPart(rule, { mode: 'short', omitIfAll: true });
         if (weekdayPart)
             parts.push(weekdayPart);
@@ -79,6 +82,9 @@ function buildRuleSummaryShort(rule, options) {
     const periodPart = buildYearPeriodsPart(rule, options, { mode: 'short' });
     if (periodPart)
         parts.push(periodPart);
+    const monthsPart = buildMonthsPart(rule, { mode: 'short', omitIfAll: true });
+    if (monthsPart)
+        parts.push(monthsPart);
     const weekdayPart = buildWeekdaysPart(rule, { mode: 'short' });
     if (weekdayPart)
         parts.push(weekdayPart);
@@ -104,6 +110,9 @@ function buildRuleSummaryLong(rule, options) {
         const periodPart = buildYearPeriodsPart(rule, options, { mode: 'long', omitIfAll: true });
         if (periodPart)
             parts.push(periodPart);
+        const monthsPart = buildMonthsPart(rule, { mode: 'long', omitIfAll: true });
+        if (monthsPart)
+            parts.push(monthsPart);
         const weekdayPart = buildWeekdaysPart(rule, { mode: 'long', omitIfAll: true });
         if (weekdayPart)
             parts.push(weekdayPart);
@@ -114,6 +123,9 @@ function buildRuleSummaryLong(rule, options) {
     const periodPart = buildYearPeriodsPart(rule, options, { mode: 'long' });
     if (periodPart)
         parts.push(periodPart);
+    const monthsPart = buildMonthsPart(rule, { mode: 'long', omitIfAll: true });
+    if (monthsPart)
+        parts.push(monthsPart);
     const weekdayPart = buildWeekdaysPart(rule, { mode: 'long' });
     if (weekdayPart)
         parts.push(weekdayPart);
@@ -235,6 +247,14 @@ function mapWeekdaysToGtfsAbbreviation(weekdays) {
     };
     return sorted.map(day => map[day] || String(day)).join('-');
 }
+function mapMonthsToGtfsAbbreviation(months) {
+    if (!months?.length)
+        return null;
+    const sorted = [...months].sort((a, b) => a - b);
+    return sorted
+        .map(m => MONTH_OPTIONS.find(o => o.value === m)?.label.toUpperCase() ?? String(m))
+        .join('-');
+}
 /**
  * GTFS-oriented rule token:
  * - FER_DU
@@ -253,27 +273,26 @@ export function buildRuleSummaryGtfs(rule, options) {
     const weekdays = rule.weekdays ?? [];
     const periodPart = mapPeriodsToGtfsAbbreviation(periodIds);
     const weekdayPart = mapWeekdaysToGtfsAbbreviation(weekdays);
+    const monthsPart = mapMonthsToGtfsAbbreviation(rule.months);
     if (rule.kind === 'manual' && rule.event_id) {
         const title = getEventForManualRule(rule, options?.events)?.title ?? rule.name ?? rule._id;
-        if (periodPart === 'ALL' && weekdayPart === 'ALL') {
+        const tokenParts = [];
+        if (periodPart !== 'ALL')
+            tokenParts.push(periodPart);
+        if (monthsPart)
+            tokenParts.push(monthsPart);
+        if (weekdayPart !== 'ALL')
+            tokenParts.push(weekdayPart);
+        if (!tokenParts.length)
             return title;
-        }
-        if (periodPart === 'ALL') {
-            return `${title}_${weekdayPart}`;
-        }
-        if (weekdayPart === 'ALL') {
-            return `${title}_${periodPart}`;
-        }
-        return `${title}_${periodPart}_${weekdayPart}`;
+        return `${title}_${tokenParts.join('_')}`;
     }
-    if (periodPart === 'ALL' && weekdayPart === 'ALL') {
+    const tokenParts = [periodPart];
+    if (monthsPart)
+        tokenParts.push(monthsPart);
+    if (weekdayPart !== 'ALL')
+        tokenParts.push(weekdayPart);
+    if (tokenParts.length === 1 && tokenParts[0] === 'ALL')
         return 'ALL';
-    }
-    if (periodPart === 'ALL') {
-        return `ALL_${weekdayPart}`;
-    }
-    if (weekdayPart === 'ALL') {
-        return periodPart;
-    }
-    return `${periodPart}_${weekdayPart}`;
+    return tokenParts.join('_');
 }

package/dist/calendar/rules/preview/affectedDates.js

@@ -25,6 +25,12 @@ function ruleAppliesToCivilKey(rule, key, ctx) {
         return false;
     if (!rule.weekdays.includes(weekday))
         return false;
+    // 3) Months filter (optional)
+    if (rule.months?.length) {
+        const month = Number(key.slice(5, 7));
+        if (!rule.months.includes(month))
+            return false;
+    }
     return true;
 }
 // USED IN RuleCreateEditView
@@ -64,6 +70,12 @@ export function getManualRuleAffectedDates(rule, ctx) {
                     if (!isInPeriod(rule, key, ctx))
                         continue;
                 }
+                // If months are specified, narrow event dates to matching months only
+                if (rule.months?.length) {
+                    const month = Number(key.slice(5, 7));
+                    if (!rule.months.includes(month))
+                        continue;
+                }
                 affected.push(key);
             }
         }

package/package.json

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