Reduce

Author: timmo001

src/common/condition/extract.ts

@@ -1,4 +1,7 @@
-import type { Condition } from "../../panels/lovelace/common/validate-condition";
+import type {
+  Condition,
+  TimeCondition,
+} from "../../panels/lovelace/common/validate-condition";
 
 /**
  * Extract media queries from conditions recursively
@@ -20,19 +23,13 @@ export function extractMediaQueries(conditions: Condition[]): string[] {
  */
 export function extractTimeConditions(
   conditions: Condition[]
-): { after?: string; before?: string; weekdays?: string[] }[] {
-  return conditions.reduce<
-    { after?: string; before?: string; weekdays?: string[] }[]
-  >((array, c) => {
+): TimeCondition[] {
+  return conditions.reduce<TimeCondition[]>((array, c) => {
     if ("conditions" in c && c.conditions) {
       array.push(...extractTimeConditions(c.conditions));
     }
     if (c.condition === "time") {
-      array.push({
-        after: c.after,
-        before: c.before,
-        weekdays: c.weekdays,
-      });
+      array.push(c);
     }
     return array;
   }, []);

src/common/condition/listeners.ts

@@ -52,12 +52,7 @@ export function setupTimeListeners(
 
   timeConditions.forEach((timeCondition) => {
     const scheduleUpdate = () => {
-      const delay = calculateNextTimeUpdate(
-        hass,
-        timeCondition.after,
-        timeCondition.before,
-        timeCondition.weekdays
-      );
+      const delay = calculateNextTimeUpdate(hass, timeCondition);
 
       if (delay === undefined) return;
 

src/common/condition/time-calculator.ts

@@ -8,20 +8,17 @@ import {
 import type { HomeAssistant } from "../../types";
 import { TimeZone } from "../../data/translation";
 import { parseTimeString } from "../datetime/check_time";
+import type { TimeCondition } from "../../panels/lovelace/common/validate-condition";
 
 /**
  * Calculate milliseconds until next time boundary for a time condition
  * @param hass Home Assistant object
- * @param after Optional time string (HH:MM) for after condition
- * @param before Optional time string (HH:MM) for before condition
- * @param weekdays Optional array of weekdays to match
+ * @param timeCondition Time condition to calculate next update for
  * @returns Milliseconds until next boundary, or undefined if no boundaries
  */
 export function calculateNextTimeUpdate(
   hass: HomeAssistant,
-  after?: string,
-  before?: string,
-  weekdays?: string[]
+  { after, before, weekdays }: TimeCondition
 ): number | undefined {
   const timezone =
     hass.locale.time_zone === TimeZone.server