@tmlmobilidade/dates 20260331.1620.53 → 20260406.1418.25

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

@@ -18,12 +18,12 @@
 export function manualRuleMatchesContext(rule, ctx) {
     if (rule.event_id) {
         // Event-exception rules: date matching already done by filteredManualRules in computeActiveRules.
-        // year_period_ids is cleared for these rules, so skip that check.
         // If weekdays is non-empty, the user narrowed the event to specific days — check it.
-        // If weekdays is empty, all days of the event are included.
-        if (rule.weekdays.length > 0) {
-            return rule.weekdays.includes(ctx.weekday);
-        }
+        if (rule.weekdays.length > 0 && !rule.weekdays.includes(ctx.weekday))
+            return false;
+        // If year_period_ids is non-empty, the user narrowed the event to specific periods — check it.
+        if (rule.year_period_ids.length > 0 && !rule.year_period_ids.includes(ctx.yearPeriodId))
+            return false;
         return true;
     }
     // Strict by design: rule must include the weekday and the yearPeriodId.

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

@@ -9,8 +9,9 @@ import { EventReplacementRule, ManualRule, StopsParameterOverride, YearPeriod }
  */
 export declare function buildYearPeriodsPart(rule: EventReplacementRule | ManualRule | StopsParameterOverride, options: {
     periods?: YearPeriod[];
-}, cfg: {
+}, cfg?: {
     mode: 'long' | 'short';
+    omitIfAll?: boolean;
 }): string;
 /**
  * Builds the weekday portion of a rule summary.
@@ -27,8 +28,9 @@ export declare function buildYearPeriodsPart(rule: EventReplacementRule | Manual
  * @param cfg - Format mode (short or long)
  * @returns Formatted weekday string in Portuguese
  */
-export declare function buildWeekdaysPart(rule: EventReplacementRule | ManualRule | StopsParameterOverride, cfg: {
+export declare function buildWeekdaysPart(rule: EventReplacementRule | ManualRule | StopsParameterOverride, cfg?: {
     mode: 'long' | 'short';
+    omitIfAll?: boolean;
 }): string;
 export declare function buildDayPeriodsPart(parameter: StopsParameterOverride, cfg: {
     mode: 'long' | 'short';

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

@@ -7,11 +7,13 @@ import { DAY_PERIOD_LABELS, WEEKDAY_OPTIONS } from '@tmlmobilidade/types';
  * - Single period: Shows period name
  * - Multiple periods: "N períodos" (short) or "Durante os períodos de X e Y" (long)
  */
-export function buildYearPeriodsPart(rule, options, cfg) {
+export function buildYearPeriodsPart(rule, options, cfg = { mode: 'long', omitIfAll: false }) {
     const allPeriodIds = options?.periods?.map(p => p._id) ?? [];
     const selectedPeriodIds = rule.year_period_ids || [];
     const isAll = allPeriodIds.length > 0 && selectedPeriodIds.length === allPeriodIds.length && allPeriodIds.every(id => selectedPeriodIds.includes(id));
     if (!selectedPeriodIds.length || isAll) {
+        if (cfg.omitIfAll)
+            return '';
         return cfg.mode === 'short' ? 'Todos os períodos' : 'Em todos os períodos';
     }
     const labels = selectedPeriodIds.map(id => options?.periods?.find(p => p._id === id)?.name ?? 'período desconhecido');
@@ -39,13 +41,12 @@ export function buildYearPeriodsPart(rule, options, cfg) {
  * @param cfg - Format mode (short or long)
  * @returns Formatted weekday string in Portuguese
  */
-export function buildWeekdaysPart(rule, cfg) {
-    if (!rule.weekdays || rule.weekdays.length === 0) {
+export function buildWeekdaysPart(rule, cfg = { mode: 'long' }) {
+    if (!rule.weekdays || rule.weekdays.length === 0 || rule.weekdays.length === 7) {
+        if (cfg.omitIfAll)
+            return '';
         return cfg.mode === 'short' ? 'Todos os dias' : 'em todos os dias';
     }
-    if (rule.weekdays.length === 7) {
-        return 'Todos os dias';
-    }
     const weekdaySet = new Set(rule.weekdays);
     const hasMonFri = [1, 2, 3, 4, 5].every(d => weekdaySet.has(d));
     const hasWeekend = weekdaySet.has(6) && weekdaySet.has(7);

package/dist/calendar/rules/formatting/rule-summary.d.ts

@@ -18,21 +18,6 @@ export interface RuleSummary {
  * - **short**: Compact label for badges/pills (e.g., "Dias úteis · Período Escolar")
  * - **long**: Full description for tooltips (e.g., "Durante o Período Escolar, nos dias úteis")
  * - **tooltip**: Detailed event information with dates and times
- *
- * @param rule - The scheduling rule to summarize
- * @param options - Configuration options (periods array for name resolution)
- * @returns RuleSummary with short, long, and tooltip text
- *
- * @example
- * ```ts
- * const rule = { kind: 'manual', weekdays: [1,2,3,4,5], year_period_ids: ['school'], ... };
- * const summary = buildRuleSummary(rule, { periods });
- * // summary = {
- * //   short: "Dias úteis · Período Escolar",
- * //   long: "Durante o Período Escolar, nos dias úteis",
- * //   tooltip: ""
- * // }
- * ```
  */
 export declare function buildRuleSummary(rule: ScheduleRule, options: {
     events?: Event[];
@@ -46,7 +31,7 @@ export declare function buildRuleSummary(rule: ScheduleRule, options: {
  * - ALL
  * - ALL_DU
  * - VER-FER_SAB-DOM
- * - event title for event rules (temporary)
+ * - Rock in Rio_VER_DU
  */
 export declare function buildRuleSummaryGtfs(rule: ScheduleRule, options: {
     events?: Event[];

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

@@ -1,6 +1,6 @@
 import { Dates } from '../../../dates.js';
 import { FORMATS } from '../../../format.js';
-import { WEEKDAY_OPTIONS } from '@tmlmobilidade/types';
+import { WEEKDAY_OPTIONS, } from '@tmlmobilidade/types';
 import { buildWeekdaysPart, buildYearPeriodsPart } from './common.js';
 /**
  * Builds human-readable summaries of a scheduling rule.
@@ -9,21 +9,6 @@ import { buildWeekdaysPart, buildYearPeriodsPart } from './common.js';
  * - **short**: Compact label for badges/pills (e.g., "Dias úteis · Período Escolar")
  * - **long**: Full description for tooltips (e.g., "Durante o Período Escolar, nos dias úteis")
  * - **tooltip**: Detailed event information with dates and times
- *
- * @param rule - The scheduling rule to summarize
- * @param options - Configuration options (periods array for name resolution)
- * @returns RuleSummary with short, long, and tooltip text
- *
- * @example
- * ```ts
- * const rule = { kind: 'manual', weekdays: [1,2,3,4,5], year_period_ids: ['school'], ... };
- * const summary = buildRuleSummary(rule, { periods });
- * // summary = {
- * //   short: "Dias úteis · Período Escolar",
- * //   long: "Durante o Período Escolar, nos dias úteis",
- * //   tooltip: ""
- * // }
- * ```
  */
 export function buildRuleSummary(rule, options) {
     return {
@@ -46,27 +31,48 @@ const getEventForManualRule = (rule, events) => {
     return events?.find(event => event._id === rule.event_id);
 };
 /* ---------------- helpers ---------------- */
+function dateMatchesWeekdays(date, weekdays) {
+    if (!weekdays?.length)
+        return true;
+    const jsDay = Dates.fromOperationalDate(date, 'Europe/Lisbon').js_date.getDay();
+    const isoWeekday = (jsDay === 0 ? 7 : jsDay);
+    return weekdays.includes(isoWeekday);
+}
+function dateMatchesPeriods(date, yearPeriodIds, periods) {
+    if (!yearPeriodIds?.length)
+        return true;
+    const allowedDates = new Set(periods
+        ?.filter(p => yearPeriodIds.includes(p._id))
+        .flatMap(p => p.dates ?? []) ?? []);
+    return allowedDates.has(date);
+}
 /**
  * Builds the short summary format for a rule.
  *
- * Event rules: Returns event title
- * Manual rules: Returns "YearPeriod · Weekdays" format
+ * Event restriction / replacement rules: event title
+ * Manual rules:
+ * - event-based: "Event · Period · Weekdays"
+ * - normal: "Period · Weekdays"
  */
 function buildRuleSummaryShort(rule, options) {
     if (isEventRestriction(rule)) {
-        // Restriction: show event name
         return rule.event?.title ?? '';
     }
     if (isEventReplacement(rule)) {
-        // Replacement: show event name
         return rule.event?.title ?? '';
     }
     if (rule.kind === 'manual' && rule.event_id) {
         const title = getEventForManualRule(rule, options?.events)?.title ?? '';
-        if (!rule.weekdays?.length)
-            return title;
-        const weekdayPart = buildWeekdaysPart(rule, { mode: 'short' });
-        return [title, weekdayPart].filter(Boolean).join(' · ');
+        const parts = [];
+        if (title)
+            parts.push(title);
+        const periodPart = buildYearPeriodsPart(rule, options, { mode: 'short', omitIfAll: true });
+        if (periodPart)
+            parts.push(periodPart);
+        const weekdayPart = buildWeekdaysPart(rule, { mode: 'short', omitIfAll: true });
+        if (weekdayPart)
+            parts.push(weekdayPart);
+        return parts.join(' · ');
     }
     // manual
     const parts = [];
@@ -81,8 +87,10 @@ function buildRuleSummaryShort(rule, options) {
 /**
  * Builds the long summary format for a rule.
  *
- * Event rules: Returns event title
- * Manual rules: Returns "During [period], on [weekdays]" format in Portuguese
+ * Event restriction / replacement rules: event title
+ * Manual rules:
+ * - event-based: "Event, Period, Weekdays"
+ * - normal: "Period, Weekdays"
  */
 function buildRuleSummaryLong(rule, options) {
     if (isEventReplacement(rule) || isEventRestriction(rule)) {
@@ -90,10 +98,16 @@ function buildRuleSummaryLong(rule, options) {
     }
     if (rule.kind === 'manual' && rule.event_id) {
         const title = getEventForManualRule(rule, options?.events)?.title ?? '';
-        if (!rule.weekdays?.length)
-            return title;
-        const weekdayPart = buildWeekdaysPart(rule, { mode: 'long' });
-        return [title, weekdayPart].filter(Boolean).join(', ');
+        const parts = [];
+        if (title)
+            parts.push(title);
+        const periodPart = buildYearPeriodsPart(rule, options, { mode: 'long', omitIfAll: true });
+        if (periodPart)
+            parts.push(periodPart);
+        const weekdayPart = buildWeekdaysPart(rule, { mode: 'long', omitIfAll: true });
+        if (weekdayPart)
+            parts.push(weekdayPart);
+        return parts.join(', ');
     }
     // manual
     const parts = [];
@@ -128,7 +142,7 @@ function truncateDates(dates, max = 5) {
  *
  * Restriction rules: "Oferta excluída [on dates] [time window]"
  * Replacement rules: "Funcionará como [weekdays] · [periods] · [dates]"
- * Manual rules: Returns empty string (no tooltip needed)
+ * Manual event rules: filtered event dates based on weekdays and/or periods
  */
 function buildRuleSummaryTooltip(rule, options) {
     if (isEventRestriction(rule)) {
@@ -161,11 +175,9 @@ function buildRuleSummaryTooltip(rule, options) {
     if (rule.kind === 'manual' && rule.event_id) {
         const event = getEventForManualRule(rule, options?.events);
         const filteredDates = (event?.dates ?? []).filter((date) => {
-            if (!rule.weekdays?.length)
-                return true;
-            const jsDay = Dates.fromOperationalDate(date, 'Europe/Lisbon').js_date.getDay();
-            const isoWeekday = (jsDay === 0 ? 7 : jsDay);
-            return rule.weekdays.includes(isoWeekday);
+            const matchesWeekdays = dateMatchesWeekdays(date, rule.weekdays);
+            const matchesPeriods = dateMatchesPeriods(date, rule.year_period_ids, options?.periods);
+            return matchesWeekdays && matchesPeriods;
         });
         const dates = truncateDates(filteredDates.map(formatDateWithWeekday));
         if (!dates)
@@ -231,19 +243,29 @@ function mapWeekdaysToGtfsAbbreviation(weekdays) {
  * - ALL
  * - ALL_DU
  * - VER-FER_SAB-DOM
- * - event title for event rules (temporary)
+ * - Rock in Rio_VER_DU
  */
 export function buildRuleSummaryGtfs(rule, options) {
     if (isEventRestriction(rule) || isEventReplacement(rule)) {
         return rule.event?.title ?? rule.name ?? rule._id;
     }
-    if (rule.kind === 'manual' && rule.event_id) {
-        return getEventForManualRule(rule, options?.events)?.title ?? rule.name ?? rule._id;
-    }
     const periodIds = rule.year_period_ids ?? [];
     const weekdays = rule.weekdays ?? [];
     const periodPart = mapPeriodsToGtfsAbbreviation(periodIds);
     const weekdayPart = mapWeekdaysToGtfsAbbreviation(weekdays);
+    if (rule.kind === 'manual' && rule.event_id) {
+        const title = getEventForManualRule(rule, options?.events)?.title ?? rule.name ?? rule._id;
+        if (periodPart === 'ALL' && weekdayPart === 'ALL') {
+            return title;
+        }
+        if (periodPart === 'ALL') {
+            return `${title}_${weekdayPart}`;
+        }
+        if (weekdayPart === 'ALL') {
+            return `${title}_${periodPart}`;
+        }
+        return `${title}_${periodPart}_${weekdayPart}`;
+    }
     if (periodPart === 'ALL' && weekdayPart === 'ALL') {
         return 'ALL';
     }

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

@@ -59,6 +59,11 @@ export function getManualRuleAffectedDates(rule, ctx) {
                     if (!rule.weekdays.includes(weekday))
                         continue;
                 }
+                // If year periods are specified, narrow event dates to matching periods only
+                if (rule.year_period_ids?.length) {
+                    if (!isInPeriod(rule, key, ctx))
+                        continue;
+                }
                 affected.push(key);
             }
         }

package/package.json

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