hassl 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

hassl/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"

hassl/codegen/package.py

@@ -215,7 +215,20 @@ def _holiday_condition(mode: Optional[str], hol_id: Optional[str]):
     # True when today is a holiday for 'only', false when 'except'
     eid = f"binary_sensor.hassl_holiday_{hol_id}"
     return {"condition": "state", "entity_id": eid, "state": "on" if mode == "only" else "off"}
-    
+
+def _norm_hmode(raw: Optional[str]) -> Optional[str]:
+    """Coerce analyzer-provided holiday_mode variants to {'only','except',None}."""
+    if not raw:
+        return None
+    v = str(raw).strip().lower().replace("_", " ").replace("-", " ")
+    # Accept a bunch of user/analyzer phrasings
+    if any(k in v for k in ("except", "exclude", "unless", "not")):
+        return "except"
+    if any(k in v for k in ("only", "holiday only", "holidays only")):
+        return "only"
+    # Unknown → leave as-is to avoid surprising behavior
+    return raw
+
 def _trigger_for(ts: Dict[str, Any]) -> Dict[str, Any]:
     """
     Build a HA trigger for a time-spec dict:
@@ -787,8 +800,10 @@ def emit_package(ir: IRProgram, outdir: str):
 
             ds = w.get("day_selector")
             href = w.get("holiday_ref")
-            hmode = w.get("holiday_mode")
+            hmode = _norm_hmode(w.get("holiday_mode"))
             period = w.get("period")
+            if href and hmode is None and ds in ("weekdays", "weekends"):
+                hmode = "except"
 
             # Coerce time specs to dicts compatible with _trigger_for/_window_condition_from_specs
             raw_start = w.get("start")

hassl/parser/hassl.lark

@@ -108,17 +108,18 @@ schedule_decl: PRIVATE? SCHEDULE CNAME ":" schedule_clause+
 // Clauses usable both in declarations and inline
 // Keep legacy form AND add new 'on …' forms
 schedule_clause: schedule_legacy_clause
-               | schedule_new_clause
+               | schedule_window_clause
+	       | sched_holiday_only
 
 // Legacy (unchanged)
 schedule_legacy_clause: schedule_op FROM time_spec schedule_end? ";"
 
 // NEW schedule window syntax:
-//   [during <period>] on (weekdays|weekends|daily) HH:MM-HH:MM [except holidays <id>] ;
+//   [during <period>] on (weekdaysNo, |weekends|daily) HH:MM-HH:MM [except holidays <id>] ;
 //   on holidays <id> HH:MM-HH:MM ;
-schedule_new_clause: period? "on" day_selector time_range holiday_mod? ";"
-                   | "on" "holidays" CNAME time_range ";"
+schedule_window_clause: period? "on" day_selector time_range holiday_mod? ";"
 
+sched_holiday_only: "on" "holidays" CNAME time_range ";"
 // Periods
 period: "during" "months" month_range
       | "during" "dates"  mmdd_range
@@ -131,7 +132,10 @@ MMDD: /\d{2}-\d{2}/
 ymd_range: YMD ".." YMD
 YMD: /\d{4}-\d{2}-\d{2}/
 
-day_selector: "weekdays" | "weekends" | "daily"
+WEEKDAYS: "weekdays"
+WEEKENDS: "weekends"
+DAILY:    "daily"
+day_selector: WEEKDAYS | WEEKENDS | DAILY
 time_range: TIME_HHMM "-" TIME_HHMM
 holiday_mod: "except" "holidays" CNAME
 

hassl/parser/transform.py

@@ -7,7 +7,7 @@ def _atom(val):
         s = str(val)
         if t in ("INT",):
             return int(s)
-        if t in ("SIGNED_NUMBER","NUMBER"):
+        if t in ("SIGNED_NUMBER", "NUMBER"):
             try:
                 return int(s)
             except ValueError:
@@ -18,6 +18,11 @@ def _atom(val):
             return s[1:-1]
     return val
 
+def _flatten_entity_tree(val):
+    if isinstance(val, Tree) and getattr(val, "data", None) == "entity":
+        return ".".join(str(c) for c in val.children)
+    return val
+
 def _to_str(x):
     return str(x) if not isinstance(x, Token) else str(x)
 
@@ -28,101 +33,53 @@ class HasslTransformer(Transformer):
         self.stmts = []
         self.package = None
         self.imports = []
-        
-    # --- Program / Aliases / Syncs ---
+        # sticky token for day words if the parser inlines them oddly
+        self._last_day_token = None
+
+    # If your .lark declares these tokens (recommended), these hooks will fire:
+    def WEEKDAYS(self, t): self._last_day_token = "weekdays"; return "weekdays"
+    def WEEKENDS(self, t): self._last_day_token = "weekends"; return "weekends"
+    def DAILY(self, t):    self._last_day_token = "daily";    return "daily"
+
+    # ============ Program root ============
     def start(self, *stmts):
         try:
-            return nodes.Program(statements=self.stmts, package=self.package,
-                                 imports=self.imports)
+            return nodes.Program(statements=self.stmts, package=self.package, imports=self.imports)
         except TypeError:
             return nodes.Program(statements=self.stmts)
 
-    # alias: PRIVATE? "alias" CNAME "=" entity
-    def alias(self, *args):
-        private = False
-        if len(args) == 2:
-            name, entity = args
-        else:
-            priv_tok, name, entity = args
-            private = True if isinstance(priv_tok, Token) and priv_tok.type == "PRIVATE" else bool(priv_tok)
-        try:
-            a = nodes.Alias(name=str(name), entity=str(entity), private=private)
-        except TypeError:
-            a = nodes.Alias(name=str(name), entity=str(entity))
-            setattr(a, "private", private)
-        self.stmts.append(a)
-        return a
-
-    def sync(self, synctype, members, name, syncopts=None):
-        invert = []
-        if isinstance(syncopts, list):
-            invert = syncopts
-        s = nodes.Sync(kind=str(synctype), members=members, name=str(name), invert=invert)
-        self.stmts.append(s)
-        return s
-
-    def synctype(self, tok): return str(tok)
-    def syncopts(self, *args): return list(args)[-1] if args else []
-    def entity_list(self, *entities): return [str(e) for e in entities]
-    def member(self, val): return val
-    def entity(self, *parts): return ".".join(str(p) for p in parts)
-
-    # ================
-    # Package / Import
-    # ================
-    # package_decl: "package" entity
+    # ============ Package / Import ============
     def package_decl(self, *children):
-        if not children:
-            raise ValueError("package_decl: missing children")
-        dotted = children[-1]  # handle optional literal "package"
+        if not children: raise ValueError("package_decl: missing children")
+        dotted = children[-1]
         self.package = str(dotted)
         self.stmts.append({"type": "package", "name": self.package})
         return self.package
 
-    # ---- NEW: module_ref to support bare or dotted imports ----
-    # module_ref: CNAME ("." CNAME)*
     def module_ref(self, *parts):
         return ".".join(str(p) for p in parts)
 
-    # import_stmt: "import" module_ref import_tail?
     def import_stmt(self, *children):
-        """
-        Accepts:
-          [module_ref]                       -> bare:  import aliases
-          [module_ref, import_tail]          -> import home.shared: x, y
-          ["import", module_ref, ...]        -> if the literal sneaks in
-        Normalizes to:
-          {"type":"import","module":<str>,"kind":<glob|list|alias|none>,
-           "items":[...], "as":<str|None>}
-        """
-        if not children:
-            return None
-
-        # If the literal "import" is present, drop it.
+        if not children: return None
         if isinstance(children[0], Token) and str(children[0]) == "import":
             children = children[1:]
-
         if len(children) == 1:
-            module = children[0]
-            tail = None
+            module, tail = children[0], None
         elif len(children) == 2:
             module, tail = children
         else:
             raise ValueError(f"import_stmt: unexpected children {children!r}")
 
-        # module_ref should already be a str (via module_ref()), but normalize just in case
         if isinstance(module, Tree) and module.data == "module_ref":
             module = ".".join(str(t.value) for t in module.children)
         else:
             module = str(module)
 
-        # Normalize tail
         kind, items, as_name = ("none", [], None)
         if tail is not None:
             if isinstance(tail, tuple) and len(tail) == 3:
                 kind, items, as_name = tail
             else:
-                # Defensive: try to parse tail-like shapes
                 norm = self.import_tail(tail)
                 if isinstance(norm, tuple) and len(norm) == 3:
                     kind, items, as_name = norm
@@ -132,64 +89,70 @@ class HasslTransformer(Transformer):
         self.stmts.append({"type": "import", **imp})
         return imp
 
-    # import_tail: ".*" | ":" import_list | "as" CNAME
-    # normalize to a tuple: (kind, items, as_name)
     def import_tail(self, *args):
-        # Forms we might see:
-        #   (Token('.*'),)                          -> glob
-        #   (Token('":"'), import_list_tree)        -> list
-        #   (Token('AS',"as"), Token('CNAME',...))  -> alias
-        if len(args) == 1 and isinstance(args[0], Token):
-            if str(args[0]) == ".*":
-                return ("glob", [], None)
-
+        if len(args) == 1 and isinstance(args[0], Token) and str(args[0]) == ".*":
+            return ("glob", [], None)
         if len(args) == 2:
             a0, a1 = args
-            # ":" import_list
             if isinstance(a0, Token) and str(a0) == ":":
-                # a1 should already be a python list via import_list()
                 return ("list", a1 if isinstance(a1, list) else [a1], None)
-            # "as" CNAME  (either literal or tokenized)
             if (isinstance(a0, Token) and str(a0) == "as") or (isinstance(a0, str) and a0 == "as"):
                 return ("alias", [], str(a1))
-
-        # Already normalized (kind, items, as_name)
         if len(args) == 3 and isinstance(args[0], str):
-            return args  # trust caller
-
-        # Optional tail missing or unknown -> "none"
+            return args
         return ("none", [], None)
 
     def import_list(self, *items): return list(items)
 
-    # import_item: CNAME ("as" CNAME)?
     def import_item(self, *parts):
         if len(parts) == 1:
             return {"name": str(parts[0]), "as": None}
         return {"name": str(parts[0]), "as": str(parts[-1])}
 
-    # --- Rules / if_clause ---
+    # ============ Aliases / Sync ============
+    def alias(self, *args):
+        private = False
+        if len(args) == 2:
+            name, entity = args
+        else:
+            priv_tok, name, entity = args
+            private = (isinstance(priv_tok, Token) and priv_tok.type == "PRIVATE") or bool(priv_tok)
+        entity = _flatten_entity_tree(entity)
+        a = nodes.Alias(name=str(name), entity=str(entity), private=private)
+        self.stmts.append(a)
+        return a
+
+    def sync(self, synctype, members, name, syncopts=None):
+        invert = syncopts if isinstance(syncopts, list) else []
+        s = nodes.Sync(kind=str(synctype), members=members, name=str(name), invert=invert)
+        self.stmts.append(s)
+        return s
+
+    def synctype(self, tok): return str(tok)
+    def syncopts(self, *args): return list(args)[-1] if args else []
+    def entity_list(self, *entities): return [str(e) for e in entities]
+    def member(self, val): return val
+
+    def entity(self, *parts): return ".".join(str(p) for p in parts)
+
+    # ============ Rules ============
     def rule(self, name, *clauses):
         r = nodes.Rule(name=str(name), clauses=list(clauses))
         self.stmts.append(r)
         return r
 
-    # if_clause: "if" "(" expr qualifier? ")" qualifier? "then" actions
     def if_clause(self, *parts):
         actions = parts[-1]
         core = list(parts[:-1])
         expr = core[0]
         quals = [q for q in core[1:] if isinstance(q, dict) and "not_by" in q]
         cond = {"expr": expr}
-        if quals:
-            cond.update(quals[-1])  # prefer last qualifier
+        if quals: cond.update(quals[-1])
         return nodes.IfClause(condition=cond, actions=actions)
 
-    # --- Condition & boolean ops ---
     def condition(self, expr, qual=None):
         cond = {"expr": expr}
-        if qual is not None:
-            cond.update(qual)
+        if qual is not None: cond.update(qual)
         return cond
 
     def qualifier(self, *args):
@@ -205,25 +168,21 @@ class HasslTransformer(Transformer):
     def not_(self, term):        return {"op": "not", "value": term}
 
     def comparison(self, left, op=None, right=None):
-        if op is None:
-            return left
+        if op is None: return left
         return {"op": str(op), "left": left, "right": right}
 
     def bare_operand(self, val): return _atom(val)
     def operand(self, val): return _atom(val)
     def OP(self, tok): return str(tok)
 
-    # --- Actions ---
     def actions(self, *acts): return list(acts)
     def action(self, act): return act
 
-    def dur(self, n, unit):
-        return f"{int(str(n))}{str(unit)}"
+    def dur(self, n, unit): return f"{int(str(n))}{str(unit)}"
 
     def assign(self, name, state, *for_parts):
         act = {"type": "assign", "target": str(name), "state": str(state)}
-        if for_parts:
-            act["for"] = for_parts[0]
+        if for_parts: act["for"] = for_parts[0]
         return act
 
     def attr_assign(self, *parts):
@@ -236,16 +195,11 @@ class HasslTransformer(Transformer):
     def waitact(self, cond, dur, action):
         return {"type": "wait", "condition": cond, "for": dur, "then": action}
 
-    # Robust rule control
     def rulectrl(self, *parts):
-        from lark import Token
         def s(x): return str(x) if isinstance(x, Token) else x
         vals = [s(p) for p in parts]
-
         op = next((v.lower() for v in vals if isinstance(v, str) and v.lower() in ("disable","enable")), "disable")
-
-        name = None
-        keywords = {"rule", "for", "until", "disable", "enable"}
+        name = None; keywords = {"rule", "for", "until", "disable", "enable"}
         if "rule" in [str(v).lower() for v in vals if isinstance(v, str)]:
             for i, v in enumerate(vals):
                 if isinstance(v, str) and v.lower() == "rule" and i + 1 < len(vals):
@@ -256,40 +210,26 @@ class HasslTransformer(Transformer):
                     name = v; break
         if name is None:
             raise ValueError(f"rulectrl: could not determine rule name from parts={vals!r}")
-
         payload = {}
-        try:
-            start_idx = vals.index(name) + 1
-        except ValueError:
-            start_idx = 1
-
+        try: start_idx = vals.index(name) + 1
+        except ValueError: start_idx = 1
         i = start_idx
         while i < len(vals):
             v = vals[i]; vlow = str(v).lower() if isinstance(v, str) else ""
-            if vlow == "for" and i + 1 < len(vals):
-                payload["for"] = vals[i + 1]; i += 2; continue
-            if vlow == "until" and i + 1 < len(vals):
-                payload["until"] = vals[i + 1]; i += 2; continue
+            if vlow == "for" and i + 1 < len(vals): payload["for"] = vals[i + 1]; i += 2; continue
+            if vlow == "until" and i + 1 < len(vals): payload["until"] = vals[i + 1]; i += 2; continue
             i += 1
-
         if not payload:
             for v in vals[start_idx:]:
                 if isinstance(v, str) and any(v.endswith(u) for u in ("ms","s","m","h","d")):
                     payload["for"] = v; break
-
-        if not payload:
-            payload["for"] = "0s"
-
+        if not payload: payload["for"] = "0s"
         return {"type": "rule_ctrl", "op": op, "rule": str(name), **payload}
 
     def tagact(self, name, val):
         return {"type": "tag", "name": str(name), "value": _atom(val)}
 
-    # ======================
-    # Schedules (composable)
-    # ======================
-
-    # schedule_decl: PRIVATE? SCHEDULE CNAME ":" schedule_clause+
+    # ============ Schedules ============
     def schedule_decl(self, *parts):
         idx = 0
         private = False
@@ -302,48 +242,32 @@ class HasslTransformer(Transformer):
         name = str(parts[idx]); idx += 1
         if idx < len(parts) and isinstance(parts[idx], Token) and str(parts[idx]) == ":":
             idx += 1
-        # Legacy clauses (enable/disable from ... to/until ...)
         clauses = [c for c in parts[idx:] if isinstance(c, dict) and c.get("type") == "schedule_clause"]
-        # New-form windows (nodes.ScheduleWindow)
         windows = [w for w in parts[idx:] if isinstance(w, nodes.ScheduleWindow)]
         sched = nodes.Schedule(name=name, clauses=clauses, windows=windows, private=private)
         self.stmts.append(sched)
         return sched
-    
-    # rule_schedule_use: SCHEDULE USE name_list ";"
+
     def rule_schedule_use(self, *args):
-        # Accept both strict and loose forms: (SCHEDULE, USE, name_list, ';') or just (name_list)
         names = None
         for a in args:
-            if isinstance(a, list):
-                names = a
+            if isinstance(a, list): names = a
         if names is None:
             names = [str(a) for a in args if isinstance(a, (str, Token))]
         norm = [n if isinstance(n, str) else str(n) for n in names]
         return {"type": "schedule_use", "names": norm}
 
-    # rule_schedule_inline: SCHEDULE schedule_clause+
     def rule_schedule_inline(self, *parts):
-        # Parts may include the literal 'schedule' token; filter and keep only clause dicts.
         clauses = [p for p in parts if isinstance(p, dict) and p.get("type") == "schedule_clause"]
         return {"type": "schedule_inline", "clauses": clauses}
 
-    # schedule_clause is now an alternation:
-    #   schedule_clause: schedule_legacy_clause | schedule_new_clause
-    # Lark passes the single child. Just forward it.
     def schedule_clause(self, item=None, *rest):
-        # Lark may inline/flatten; take the first dict-ish child.
-        if isinstance(item, dict):
-            return item
+        if isinstance(item, dict): return item
         for r in rest:
-            if isinstance(r, dict):
-                return r
+            if isinstance(r, dict): return r
         return item
 
-    # Legacy shape stays the same; build the dict here.
-    # schedule_legacy_clause: schedule_op FROM time_spec schedule_end? ";"
     def schedule_legacy_clause(self, *args):
-        # Expect: op, 'from', start, [end], [';']
         op = "enable"; start = None; end = None
         for a in args:
             if isinstance(a, Token) and a.type in ("ENABLE","DISABLE"):
@@ -352,57 +276,57 @@ class HasslTransformer(Transformer):
                 if start is None: start = a
                 else: end = a if isinstance(a, dict) else end
             elif isinstance(a, dict) and ("to" in a or "until" in a):
-                # already normalized end-shape
                 end = a.get("to") or a.get("until")
         d = {"type": "schedule_clause", "op": op, "from": start}
-        if end is not None:
-            # keep legacy downstream compatibility
-            d.update({"to": end})
+        if end is not None: d.update({"to": end})
         return d
 
-    def schedule_op(self, tok):
-        return str(tok).lower()
-
-    def schedule_to(self, _to_kw, ts):
-        return {"to": ts}
-
-    def schedule_until(self, _until_kw, ts):
-        return {"until": ts}
-
-    def name_list(self, *names):
-        return [n if isinstance(n, str) else str(n) for n in names]
-
-    def name(self, val):
-        return str(val)
-
-    def time_clock(self, tok):
-        return {"kind": "clock", "value": str(tok)}
+    def schedule_op(self, tok): return str(tok).lower()
+    def schedule_to(self, _to_kw, ts): return {"to": ts}
+    def schedule_until(self, _until_kw, ts): return {"until": ts}
+    def name_list(self, *names): return [n if isinstance(n, str) else str(n) for n in names]
+    def name(self, val): return str(val)
 
+    def time_clock(self, tok): return {"kind": "clock", "value": str(tok)}
     def time_sun(self, event_tok, offset_tok=None):
         event = str(event_tok).lower()
         off = str(offset_tok) if offset_tok is not None else "0s"
         return {"kind": "sun", "event": event, "offset": off}
 
-    def time_spec(self, *children):
-        return children[0] if children else None
-
-    def rule_clause(self, item):
-        return item
+    def time_spec(self, *children): return children[0] if children else None
+    def rule_clause(self, item): return item
 
-    # ======================
-    # NEW: Windows & Periods
-    # ======================
-    # schedule_new_clause:
-    #   period? "on" day_selector time_range holiday_mod? ";"
-    # | "on" "holidays" CNAME time_range ";"
-    def schedule_new_clause(self, *parts):
+    def sched_holiday_only(self, *args):
         """
-            Tolerant handler for:
-            period? on (weekdays|weekends|daily) HH:MM-HH:MM [except holidays ID] ;
-            on holidays ID HH:MM-HH:MM ;
-            Accepts either ("time", start, end) or {"start","end"} from time_range().
+        Handles:  on holidays <CNAME> HH:MM-HH:MM ;
+        Args arrive as ( 'on', 'holidays', <CNAME token>, time_range_tuple, ';' )
         """
         from lark import Token
+        
+        ident = None
+        start = None
+        end = None
+        
+        for a in args:
+            if isinstance(a, Token) and a.type == "CNAME":
+                ident = str(a)
+            elif isinstance(a, tuple) and a and a[0] == "time":
+                # ("time", "HH:MM", "HH:MM")
+                start, end = a[1], a[2]
+                
+        return nodes.ScheduleWindow(
+            start=str(start) if start is not None else "00:00",
+            end=str(end) if end is not None else "00:00",
+            day_selector="daily",
+            period=None,
+            holiday_ref=str(ident) if ident is not None else "",
+            holiday_mode="only",
+        )
+
+    # -------- New windows & periods --------
+    def schedule_window_clause(self, *parts):
+        # Reset sticky day for each clause
+        self._last_day_token = None
 
         psel = None
         day = None
@@ -410,91 +334,65 @@ class HasslTransformer(Transformer):
         end = None
         holiday_mode = None
         holiday_ref = None
-
-        prev_holidays = False   # just saw the literal 'holidays'
-        prev_except = False     # just saw the literal 'except'
+        prev_holidays = False
+        prev_except = False
 
         for p in parts:
             if p is None:
                 continue
 
-            # period selector node
             if isinstance(p, nodes.PeriodSelector):
                 psel = p
-                prev_holidays = False
-                prev_except = False
                 continue
 
-            # time range
-            if isinstance(p, tuple) and p and p[0] == "time":
-                start, end = p[1], p[2]
-                prev_holidays = False
-                prev_except = False
+            if isinstance(p, str) and p in ("weekdays", "weekends", "daily"):
+                day = p; continue
+
+            if isinstance(p, Tree) and getattr(p, "data", None) == "day_selector":
+                if p.children:
+                    val = str(p.children[0]).lower()
+                    if val in ("weekdays", "weekends", "daily"): day = val
                 continue
+
+            if isinstance(p, tuple) and p and p[0] == "time":
+                start, end = p[1], p[2]; continue
             if isinstance(p, dict) and "start" in p and "end" in p:
-                start, end = p["start"], p["end"]
-                prev_holidays = False
-                prev_except = False
-                continue
+                start, end = p["start"], p["end"]; continue
 
-            # holiday modifier from holiday_mod()
             if isinstance(p, tuple) and p and p[0] == "holiday_mod":
                 holiday_mode, holiday_ref = p[1], p[2]
-                prev_holidays = False
-                prev_except = False
+                prev_holidays = False; prev_except = False
                 continue
 
-            # tokens / strings
             if isinstance(p, Token):
                 sval = str(p).lower()
-                if sval == "except":
-                    prev_except = True
-                    prev_holidays = False
-                    continue
-                if sval == "holidays":
-                    prev_holidays = True
-                    continue
-                if sval in ("weekdays", "weekends", "daily"):
-                    day = sval
-                    prev_holidays = False
-                    prev_except = False
-                    continue
+                if sval == "except": prev_except = True; continue
+                if sval in ("holiday", "holidays"): prev_holidays = True; continue
+                if sval in ("weekdays", "weekends", "daily"): day = sval; continue
                 if p.type == "CNAME" and prev_holidays and holiday_ref is None:
                     holiday_ref = str(p)
-                    holiday_mode = holiday_mode or ("except" if prev_except else "only")
-                    prev_holidays = False
-                    prev_except = False
+                    holiday_mode = "except" if prev_except else "only"
+                    prev_holidays = False; prev_except = False
                     continue
 
             if isinstance(p, str):
                 sval = p.lower()
-                if sval == "except":
-                    prev_except = True
-                    prev_holidays = False
-                    continue
-                if sval == "holidays":
-                    prev_holidays = True
-                    continue
-                if sval in ("weekdays", "weekends", "daily"):
-                    day = sval
-                    prev_holidays = False
-                    prev_except = False
-                    continue
-                if prev_holidays and holiday_ref is None and sval not in ("on", "holidays", ";", ":"):
+                if sval == "except": prev_except = True; continue
+                if sval in ("holiday", "holidays"): prev_holidays = True; continue
+                if prev_holidays and holiday_ref is None and sval not in ("on","holidays",";",";"):
                     holiday_ref = p
-                    holiday_mode = holiday_mode or ("except" if prev_except else "only")
-                    prev_holidays = False
-                    prev_except = False
+                    holiday_mode = "except" if prev_except else "only"
+                    prev_holidays = False; prev_except = False
                     continue
 
-            # anything else cancels the lookbehinds
-            prev_holidays = False
-            prev_except = False
-
-        # default day when omitted (holiday-only branch or defensive)
+        if day is None and self._last_day_token:
+            day = self._last_day_token
         if day is None:
             day = "daily"
 
+        if day in ("weekdays", "weekends") and holiday_ref and not holiday_mode:
+            holiday_mode = "except"
+
         return nodes.ScheduleWindow(
             start=str(start) if start is not None else "00:00",
             end=str(end) if end is not None else "00:00",
@@ -504,41 +402,28 @@ class HasslTransformer(Transformer):
             holiday_mode=holiday_mode
         )
 
-    # Dedicated handler if your parser surfaces the holiday-only branch separately:
     def sched_holiday_only(self, *args):
-        # Accept: 'on','holidays', ident, time_range, [';']
         ident = None; start=None; end=None
         for a in args:
-            if isinstance(a, Token) and a.type == "CNAME":
-                ident = str(a)
-            elif isinstance(a, tuple) and a and a[0] == "time":
-                start, end = a[1], a[2]
-            elif isinstance(a, dict) and "start" in a and "end" in a:
-                start, end = a["start"], a["end"]
-            elif isinstance(a, str) and a not in ("on","holidays",";"):
-                ident = a
-        return nodes.ScheduleWindow(
-            start=str(start), end=str(end),
-            day_selector="daily",
-            period=None,
-            holiday_ref=str(ident) if ident is not None else "",
-            holiday_mode="only"
-        )
+            if isinstance(a, Token) and a.type == "CNAME": ident = str(a)
+            elif isinstance(a, tuple) and a and a[0] == "time": start, end = a[1], a[2]
+            elif isinstance(a, dict) and "start" in a and "end" in a: start, end = a["start"], a["end"]
+            elif isinstance(a, str) and a not in ("on","holidays",";"): ident = a
+        return nodes.ScheduleWindow(start=str(start), end=str(end),
+                                    day_selector="daily", period=None,
+                                    holiday_ref=str(ident) if ident is not None else "",
+                                    holiday_mode="only")
 
     def period(self, *args):
-        # Transparent wrapper around PeriodSelector
         for a in args:
-            if isinstance(a, nodes.PeriodSelector):
-                return a
+            if isinstance(a, nodes.PeriodSelector): return a
         return args[0] if args else None
 
-    # month_range: MONTH (".." MONTH)? ("," MONTH)*
     def month_range(self, *parts):
         items = [str(x) for x in parts if not (isinstance(x, Token) and str(x) == "..")]
         dots = any(isinstance(x, Token) and str(x) == ".." for x in parts)
         if dots:
-            if len(items) < 2:
-                raise ValueError("month_range: expected A .. B")
+            if len(items) < 2: raise ValueError("month_range: expected A .. B")
             return nodes.PeriodSelector(kind="months", data={"range": [items[0], items[1]]})
         return nodes.PeriodSelector(kind="months", data={"list": items})
 
@@ -555,105 +440,60 @@ class HasslTransformer(Transformer):
         return nodes.PeriodSelector(kind="range", data={"start": a, "end": b})
 
     def day_selector(self, *args):
-        # Accept either a single token (normal) or no children (defensive).
-        # When empty, default to "daily" so schedule_new_clause can still build.
         if not args:
-            return "daily"
-        tok = args[0]
-        return str(tok)
+            val = self._last_day_token
+            self._last_day_token = None
+            return val or "daily"
+        tok = str(args[0]).lower()
+        if tok in ("weekday", "wd", "mon-fri", "monfri"): return "weekdays"
+        if tok in ("weekend", "we", "sat-sun", "satsun"): return "weekends"
+        if tok in ("weekdays", "weekends", "daily"): return tok
+        return tok
 
     def time_range(self, *args):
         from lark import Token
-        # strip literal '-' if present
         parts = [a for a in args if not (isinstance(a, Token) and str(a) == "-")]
-        # Case 1: two TIME_HHMM tokens
         times = [str(p) for p in parts if isinstance(p, Token) and p.type == "TIME_HHMM"]
-        if len(times) >= 2:
-            return ("time", times[0], times[1])
-        # Case 2: two plain strings
+        if len(times) >= 2: return ("time", times[0], times[1])
         s_parts = [str(p) for p in parts if not isinstance(p, Token)]
         if len(s_parts) >= 2 and ":" in s_parts[0] and ":" in s_parts[1]:
             return ("time", s_parts[0], s_parts[1])
-        # Case 3: single "HH:MM-HH:MM"
         if len(parts) == 1 and isinstance(parts[0], (str, Token)):
             val = str(parts[0])
             if "-" in val and ":" in val:
                 a, b = val.split("-", 1)
                 return ("time", a.strip(), b.strip())
-        # Fallback (shouldn't happen): return a harmless range
         return ("time", "00:00", "00:00")
 
     def holiday_mod(self, *args):
-        """
-        Accepts shapes like:
-          - 'except' 'holidays' CNAME
-          - 'on' 'holidays' CNAME  (treated as 'only')
-          - 'holidays' CNAME       (default to 'only')
-        Returns a tuple normalized for schedule_new_clause: ('holiday_mod', mode, ident)
-        """
-        mode = "only"
-        ident = None
+        mode = "only"; ident = None
         for a in args:
             s = str(a).lower()
-            if s == "except":
-                mode = "except"
-            elif s in ("on","only"):
-                mode = "only"
+            if s == "except": mode = "except"
+            elif s in ("on","only"): mode = "only"
             if isinstance(a, Token) and a.type == "CNAME":
                 ident = str(a)
-            elif isinstance(a, str) and s not in ("holidays","except","on","only",":",";"):
+            elif isinstance(a, str) and s not in ("holiday","holidays","except","on","only",":",";"):
                 ident = str(a)
         return ("holiday_mod", mode, ident or "")
 
-    # Tokens
-    def MONTH(self, t): return str(t)
-    def MMDD(self, t): return str(t)
-    def YMD(self, t):  return str(t)
-
-    # =====================
-    # NEW: Holidays decl(s)
-    # =====================
-    # holidays_decl: "holidays" CNAME ":" holi_kv ("," holi_kv)*
+    # ============ Holidays declaration ============
     def holidays_decl(self, *children):
-        """
-        Accepts children like: 'holidays', CNAME, ':', (kv, ',', kv, ...).
-        Robustly extracts the first CNAME as the id and all ('key', value) tuples.
-        """
-        from lark import Token, Tree
-
-        ident = None
-        kvs = []
-
+        ident = None; kvs = []
         for ch in children:
-            # id
             if ident is None:
                 if isinstance(ch, Token) and ch.type == "CNAME":
-                    ident = str(ch)
-                    continue
-                if isinstance(ch, str):  # just in case
-                    ident = ch
-                    continue
-            # kvs arrive as tuples from helper methods
+                    ident = str(ch); continue
+                if isinstance(ch, str):
+                    ident = ch; continue
             if isinstance(ch, tuple) and len(ch) == 2 and isinstance(ch[0], str):
                 kvs.append(ch)
 
-        # defaults
-        params = {
-            "country": None,
-            "province": None,
-            "add": [],
-            "remove": [],
-            "workdays": None,
-            "excludes": None,
-        }
-
-        for k, v in kvs:
-            params[k] = v
+        params = {"country": None, "province": None, "add": [], "remove": [], "workdays": None, "excludes": None}
+        for k, v in kvs: params[k] = v
 
-        # normalize quoted strings (country/province/add/remove can be quoted)
         def unq(s):
-            if isinstance(s, str) and len(s) >= 2 and s[0] == s[-1] == '"':
-                return s[1:-1]
+            if isinstance(s, str) and len(s) >= 2 and s[0] == s[-1] == '"': return s[1:-1]
             return s
 
         country = unq(params["country"])
@@ -663,31 +503,16 @@ class HasslTransformer(Transformer):
         workdays = params["workdays"] or ["mon", "tue", "wed", "thu", "fri"]
         excludes = params["excludes"] or ["sat", "sun", "holiday"]
 
-        hs = nodes.HolidaySet(
-            id=str(ident) if ident is not None else "",
-            country=country,
-            province=province,
-            add=add,
-            remove=remove,
-            workdays=workdays,
-            excludes=excludes,
-        )
+        hs = nodes.HolidaySet(id=str(ident) if ident is not None else "", country=country, province=province,
+                              add=add, remove=remove, workdays=workdays, excludes=excludes)
         self.stmts.append(hs)
         return hs
 
-    # --- Holidays KV helpers (return ('key', value)) ---
-
-    # country="US"
     def holi_country(self, s): return ("country", str(s))
-    # province="CA"
     def holi_province(self, s): return ("province", str(s))
-    # workdays=[ mon, tue, ... ]
     def holi_workdays(self, items): return ("workdays", items)
-    # excludes=[ sat, sun, holiday ]
     def holi_excludes(self, items): return ("excludes", items)
-    # add=["YYYY-MM-DD", ...]
     def holi_add(self, items): return ("add", items)
-    # remove=["YYYY-MM-DD", ...]
     def holi_remove(self, items): return ("remove", items)
 
     def daylist(self, *days): return [str(d) for d in days]

hassl/semantics/analyzer.py

@@ -239,6 +239,33 @@ def analyze(prog: Program) -> IRProgram:
 
     # NEW: collect structured windows (serialize to plain dicts)
     sched_windows: Dict[str, List[dict]] = {}
+
+ # --- helpers: normalization for day selector & holiday mode ---
+    def _norm_day_selector(ds: Optional[str]) -> str:
+        s = (ds or "").strip().lower()
+        if s in ("weekdays", "weekday", "wd", "mon-fri", "monfri"):
+            return "weekdays"
+        if s in ("weekends", "weekend", "we", "sat-sun", "satsun"):
+            return "weekends"
+        return "daily"
+
+    def _norm_holiday_mode(mode: Optional[str]) -> Optional[str]:
+        """
+        Normalize holiday text to {'only','except',None}.
+        Accepts variants like:
+        'holiday', 'only holiday', 'holiday only' -> 'only'
+        'except holiday', 'exclude holiday', 'unless holiday', 'not holiday' -> 'except'
+        """
+        if mode is None:
+            return None
+        m = str(mode).strip().lower().replace("_", " ").replace("-", " ")
+        # look for negation/exclusion first
+        if any(tok in m for tok in ("except", "exclude", "unless", "not")):
+            return "except"
+        if "holiday" in m or "only" in m:
+            return "only"
+        return None
+
     for nm, wins in local_schedule_windows.items():
         out: List[dict] = []
         for w in wins:
@@ -249,14 +276,23 @@ def analyze(prog: Program) -> IRProgram:
             if getattr(w, "period", None):
                 p = w.period  # PeriodSelector
                 period = {"kind": p.kind, "data": dict(p.data)}
+
+            # --- normalize selectors & holiday mode ---
+            day_sel = _norm_day_selector(getattr(w, "day_selector", None))
+            href    = getattr(w, "holiday_ref", None)
+            hmode   = _norm_holiday_mode(getattr(w, "holiday_mode", None))
+            # Heuristic default: if a weekdays/weekends selector references a holiday
+            # set and no mode provided, treat as "except" (workday semantics).
+            if href and hmode is None and day_sel in ("weekdays", "weekends"):
+                hmode = "except"
             out.append({
                 "start": w.start,
                 "end": w.end,
-                "day_selector": w.day_selector,
+                "day_selector": day_sel,
                 "period": period,
-                "holiday_ref": w.holiday_ref,
-                "holiday_mode": w.holiday_mode,
-           })
+                "holiday_ref": href,
+                "holiday_mode": hmode,
+            })
         if out:
             sched_windows[nm] = out
 
@@ -386,6 +422,16 @@ def analyze(prog: Program) -> IRProgram:
     # -------- NEW: validate schedule windows --------
     allowed_days = {"weekdays", "weekends", "daily"}
     for sched_name, wins in sched_windows.items():
+        # Normalize holiday modes defensively:
+        # If a window references a holiday set and also specifies a day bucket,
+        # it should be "except" (non-holiday behavior). We keep pure holiday-only
+        # windows (`day_selector == "daily"`) as "only".
+        for w in wins:
+            ds = (w.get("day_selector") or "daily").lower()
+            href = w.get("holiday_ref")
+            hmode = w.get("holiday_mode")
+            if href and ds in ("weekdays", "weekends") and (hmode is None or hmode == "only"):
+                w["holiday_mode"] = "except"
         for w in wins:
             ds = w.get("day_selector")
             if ds not in allowed_days:

{hassl-0.3.1.dist-info → hassl-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hassl
-Version: 0.3.1
+Version: 0.3.2
 Summary: HASSL: Home Assistant Simple Scripting Language
 Home-page: https://github.com/adanowitz/hassl
 Author: adanowitz

{hassl-0.3.1.dist-info → hassl-0.3.2.dist-info}/RECORD

@@ -1,23 +1,23 @@
-hassl/__init__.py,sha256=r4xAFihOf72W9TD-lpMi6ntWSTKTP2SlzKP1ytkjRbI,22
+hassl/__init__.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
 hassl/cli.py,sha256=TSUvkoAg7ck1vlDUhC2sv_1NSetksdVGuOv-P9wrKxA,15762
 hassl/ast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hassl/ast/nodes.py,sha256=U_UTmWS87laFuFX39mmzkk43JnGx7NEyNbkSomfTzSM,2704
 hassl/codegen/__init__.py,sha256=NgEw86oHlsk7cQrHz8Ttrtp68Cm7WKceTWRr02SDfjo,854
 hassl/codegen/generate.py,sha256=JmVBz8xhuPHosch0lhh8xU6tmdCsAl-qVWoY7hQxjow,206
 hassl/codegen/init.py,sha256=kMfi_Us_7c_T35OK_jo8eqb79lxNV-dToO9-iAb5fHI,55
-hassl/codegen/package.py,sha256=sGG40gonOoK3QJphO62Bju6WqFqfTT3XNx37QPHlb2w,42457
+hassl/codegen/package.py,sha256=7c0hQaGYQ80gNynMghyETFwqYGR3Xp1_RlqWAs9_qw4,43124
 hassl/codegen/rules_min.py,sha256=LbLrpJ_2TV_FJlHB17TcuBaqfbLl97VUKzLck3s9KXo,29557
 hassl/codegen/yaml_emit.py,sha256=VTNnR_uvSSqsL7kX5NyXuPUZh5FK36a_sUFsRyrQOS8,2207
 hassl/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hassl/parser/hassl.lark,sha256=-At0mQQiUXxQU2aB1pxrk1WfQdQiUJeH7Ev8ada7kLg,5637
+hassl/parser/hassl.lark,sha256=73c1wmHaTydRDIcVjIEsQLmfFcylIOfQyqkLvNhFryM,5729
 hassl/parser/loader.py,sha256=xwhdoMkmXskanY8IhqIOfkcOkkn33goDnsbjzS66FL8,249
-hassl/parser/transform.py,sha256=UXiUQBT3oMkFVJwFWA8X3L_Ds7PzZle7ZMBVVNSmp7Y,26332
+hassl/parser/transform.py,sha256=Jg4y7bqrc14aA73SuvrfjyZlc6qs0LqqbNis5vzFqws,21721
 hassl/semantics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hassl/semantics/analyzer.py,sha256=M8pQTFRYSpAyBo-ctIRuT1DBb_WZsGs7hjT4-pHPLjA,18066
+hassl/semantics/analyzer.py,sha256=m6AvDVLJPzbRKMXJMcMbRjD1Ppl67NI7WEVN1DLudRo,20220
 hassl/semantics/domains.py,sha256=-OuhA4RkOLVaLnBxhKfJFjiQMYBSTryX9KjHit_8ezI,308
-hassl-0.3.1.dist-info/licenses/LICENSE,sha256=hPNSrn93Btl9sU4BkQlrIK1FpuFPvaemdW6-Scz-Xeo,1072
-hassl-0.3.1.dist-info/METADATA,sha256=TYCCs2uU-7mRXyvq2_pkMLbVMQY_VTqW5Oi5i0msaJg,9006
-hassl-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hassl-0.3.1.dist-info/entry_points.txt,sha256=qA8jYPZlESNL6V4fJCTPOBXFeEBtjLGGsftXsSo82so,42
-hassl-0.3.1.dist-info/top_level.txt,sha256=BPuiULeikxMI3jDVLmv3_n7yjSD9Qrq58bp9af_HixI,6
-hassl-0.3.1.dist-info/RECORD,,
+hassl-0.3.2.dist-info/licenses/LICENSE,sha256=hPNSrn93Btl9sU4BkQlrIK1FpuFPvaemdW6-Scz-Xeo,1072
+hassl-0.3.2.dist-info/METADATA,sha256=K7Da3-A3a0Ih17mfj6wNLy2VYnmRvx21AH4bc9mzqK8,9006
+hassl-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hassl-0.3.2.dist-info/entry_points.txt,sha256=qA8jYPZlESNL6V4fJCTPOBXFeEBtjLGGsftXsSo82so,42
+hassl-0.3.2.dist-info/top_level.txt,sha256=BPuiULeikxMI3jDVLmv3_n7yjSD9Qrq58bp9af_HixI,6
+hassl-0.3.2.dist-info/RECORD,,