hassl 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

hassl/cli.py

@@ -1,5 +1,6 @@
 import argparse
 import os, json
+from .parser.loader import load_grammar_text
 from .parser.transform import HasslTransformer
 from .ast.nodes import Program
 from lark import Lark
@@ -7,11 +8,10 @@ from .semantics.analyzer import analyze
 from .codegen.package import emit_package
 from .codegen import generate as codegen_generate
 
-GRAMMAR_PATH = os.path.join(os.path.dirname(__file__), "parser", "hassl.lark")
+#GRAMMAR_PATH = os.path.join(os.path.dirname(__file__), "parser", "hassl.lark")
 
 def parse_hassl(text: str) -> Program:
-    with open(GRAMMAR_PATH) as f:
-        grammar = f.read()
+    grammar = load_grammar_text()
     parser = Lark(grammar, start="start", parser="lalr", maybe_placeholders=False)
     tree = parser.parse(text)
     program = HasslTransformer().transform(tree)

hassl/parser/hassl.lark

@@ -0,0 +1,139 @@
+// HASSL grammar — unified if_clause w/ optional inside/outside qualifier
+// + additive schedule support
+
+start: stmt*
+
+stmt: alias
+    | sync
+    | rule
+    | schedule_decl           // NEW (additive)
+
+// --- Aliases ---
+alias: "alias" CNAME "=" entity
+
+// --- Sync ---
+sync: "sync" synctype "[" entity_list "]" "as" CNAME syncopts?
+
+ONOFF: "onoff"
+DIMMER: "dimmer"
+ATTRIBUTE: "attribute"
+SHARED: "shared"
+ALL: "all"
+synctype: ONOFF | DIMMER | ATTRIBUTE | SHARED | ALL
+
+syncopts: "{" ("invert" ":" entity_list) "}"
+
+// --- Rules ---
+// Allow qualifier inside (...) and/or after ) — both optional
+// (augmented to allow schedule clauses inside rules)
+rule: "rule" CNAME ":" rule_clause+
+
+rule_clause: if_clause
+           | rule_schedule_use      // NEW
+           | rule_schedule_inline   // NEW
+
+if_clause: "if" "(" expr qualifier? ")" qualifier? "then" actions
+
+// ---- Conditions ----
+qualifier: "not_by" ( "this" | "any_hassl" | "rule" "(" CNAME ")" )
+
+?expr: expr "||" andexpr   -> or_
+     | andexpr
+?andexpr: andexpr "&&" term -> and_
+        | term
+?term: "!" term             -> not_
+    | "(" expr ")"
+    | comparison
+
+comparison: operand OP operand
+          | operand                -> bare_operand
+
+OP: "==" | "!=" | "<" | ">" | "<=" | ">="
+
+operand: entity | CNAME | STATE | NUMBER | STRING
+
+STATE: "on" | "off"
+NUMBER: INT | SIGNED_NUMBER
+
+// ---- Actions ----
+actions: action (";" action)*
+
+action: assign
+      | attr_assign
+      | waitact
+      | rulectrl
+      | tagact
+
+assign: CNAME "=" STATE ("for" dur)?
+
+// Attribute assignment: allow alias.attr and full entity paths
+attr_assign: CNAME "." CNAME ("." CNAME)* "." CNAME "=" NUMBER
+           | CNAME "." CNAME "=" NUMBER
+
+waitact: "wait" "(" condition "for" dur ")" action
+// condition used by wait(): allow expr + optional qualifier inside the parens
+condition: expr qualifier?
+
+rulectrl: ("disable" | "enable") "rule" CNAME ("for" dur | "until" timepoint)
+tagact: "tag" CNAME "=" (STRING | CNAME | NUMBER)
+
+// Durations
+dur: INT UNIT
+UNIT: "ms" | "s" | "m" | "h" | "d"
+
+// Timepoint placeholder (kept simple)
+timepoint: CNAME
+
+// ---------- Schedules (additive) ----------
+SCHEDULE: "schedule"
+USE: "use"
+FROM: "from"
+TO: "to"
+UNTIL: "until"
+ENABLE: "enable"
+DISABLE: "disable"
+SUNRISE: "sunrise"
+SUNSET: "sunset"
+
+TIME_HHMM: /[0-2]?\d:[0-5]\d/
+OFFSET: /[+-]\d+(ms|s|m|h|d)/
+
+// Reusable named schedule declarations
+schedule_decl: SCHEDULE CNAME ":" schedule_clause+
+
+// Clauses usable both in declarations and inline
+schedule_clause: schedule_op FROM time_spec schedule_end? ";"
+schedule_op: ENABLE | DISABLE
+schedule_end: TO time_spec    -> schedule_to
+            | UNTIL time_spec -> schedule_until
+
+// Rule-level usage
+rule_schedule_use: SCHEDULE USE name_list ";"
+name_list: CNAME ("," CNAME)*
+
+// Inline schedule block inside a rule
+rule_schedule_inline: SCHEDULE schedule_clause+
+
+// Time specifications
+time_spec: TIME_HHMM                 -> time_clock
+         | sun_spec
+         | entity
+         | CNAME
+
+sun_spec: (SUNRISE|SUNSET) OFFSET?   -> time_sun
+
+// ---- Atoms ----
+entity_list: member ("," member)*
+member: entity | CNAME
+
+entity: CNAME ("." CNAME)+
+
+// ---- Lexer ----
+%import common.CNAME
+%import common.WS
+%import common.ESCAPED_STRING -> STRING
+%import common.INT
+%import common.SIGNED_NUMBER
+LINE_COMMENT: /\/\/[^\n]*/
+%ignore LINE_COMMENT
+%ignore WS

hassl/parser/loader.py

@@ -0,0 +1,6 @@
+# hassl/parser/loader.py
+from importlib.resources import files
+
+def load_grammar_text():
+    """Read the embedded hassl.lark grammar safely from the installed package."""
+    return (files("hassl.parser") / "hassl.lark").read_text(encoding="utf-8")

{hassl-0.2.0.dist-info → hassl-0.2.1.dist-info}/METADATA

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

{hassl-0.2.0.dist-info → hassl-0.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hassl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hassl/cli.py,sha256=rp9C-W-Jy_Lxb9sw2mXR-3_KRLTBil5Xy5q5EYdLZT8,1503
+hassl/cli.py,sha256=yCtfMQHzKCmORDypwxtbGQywLvdERLo3BLYSC2WUxu8,1522
 hassl/ast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hassl/ast/nodes.py,sha256=HINbu3o_hEMDD5G9TgYeqAev-Af0Vacqc_gwQQnpiy0,762
 hassl/codegen/__init__.py,sha256=NgEw86oHlsk7cQrHz8Ttrtp68Cm7WKceTWRr02SDfjo,854
@@ -7,13 +7,15 @@ hassl/codegen/package.py,sha256=9dcIjszhGXV26Hwr_rKHLz6yYbElyIegfhlXGi5Q0sY,1661
 hassl/codegen/rules_min.py,sha256=2ko9bFRZujXw7lt5k8L6UbfmTwS2PCWfub5M6Lwkg4I,28330
 hassl/codegen/yaml_emit.py,sha256=VTNnR_uvSSqsL7kX5NyXuPUZh5FK36a_sUFsRyrQOS8,2207
 hassl/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hassl/parser/hassl.lark,sha256=YIeY8ncd6nwBzS54A5JbvLhRiQd0u6ftea4nZac4_cA,3361
+hassl/parser/loader.py,sha256=xwhdoMkmXskanY8IhqIOfkcOkkn33goDnsbjzS66FL8,249
 hassl/parser/transform.py,sha256=dNTyPW9sOw09vBfvWMFSRRiTnOzZQWJvISV1o1aouD4,9481
 hassl/semantics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hassl/semantics/analyzer.py,sha256=1x2bAJXj8hsT_IBoxgfTFV0MmVMXcfjqzl_gWo-WuI8,5195
 hassl/semantics/domains.py,sha256=-OuhA4RkOLVaLnBxhKfJFjiQMYBSTryX9KjHit_8ezI,308
-hassl-0.2.0.dist-info/licenses/LICENSE,sha256=hPNSrn93Btl9sU4BkQlrIK1FpuFPvaemdW6-Scz-Xeo,1072
-hassl-0.2.0.dist-info/METADATA,sha256=OBOKVzmNcsFlcVZyEp0YF6Z912-FStNKntSUd-0F96A,4929
-hassl-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hassl-0.2.0.dist-info/entry_points.txt,sha256=qA8jYPZlESNL6V4fJCTPOBXFeEBtjLGGsftXsSo82so,42
-hassl-0.2.0.dist-info/top_level.txt,sha256=BPuiULeikxMI3jDVLmv3_n7yjSD9Qrq58bp9af_HixI,6
-hassl-0.2.0.dist-info/RECORD,,
+hassl-0.2.1.dist-info/licenses/LICENSE,sha256=hPNSrn93Btl9sU4BkQlrIK1FpuFPvaemdW6-Scz-Xeo,1072
+hassl-0.2.1.dist-info/METADATA,sha256=Z43GbkiT3Sy-Lx3O5eQv8iUdcadYiIx73xac624-sMU,4929
+hassl-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hassl-0.2.1.dist-info/entry_points.txt,sha256=qA8jYPZlESNL6V4fJCTPOBXFeEBtjLGGsftXsSo82so,42
+hassl-0.2.1.dist-info/top_level.txt,sha256=BPuiULeikxMI3jDVLmv3_n7yjSD9Qrq58bp9af_HixI,6
+hassl-0.2.1.dist-info/RECORD,,