feat: Support for SCXML <script>, all W3C tests imported and ~50% passing

Author: fgmacedo

pyproject.toml

@@ -96,7 +96,10 @@ addopts = [
 ]
 doctest_optionflags = "ELLIPSIS IGNORE_EXCEPTION_DETAIL NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL"
 asyncio_mode = "auto"
-markers = ["""slow: marks tests as slow (deselect with '-m "not slow"')"""]
+markers = [
+    """slow: marks tests as slow (deselect with '-m "not slow"')""",
+    """scxml: marks a tests as scxml (deselect with '-m "not scxml"')""",
+]
 python_files = ["tests.py", "test_*.py", "*_tests.py"]
 xfail_strict = true
 

statemachine/engines/base.py

@@ -34,10 +34,7 @@ def put(self, trigger_data: TriggerData):
         self._external_queue.put(trigger_data)
 
     def pop(self):
-        try:
-            return self._external_queue.get(block=False)
-        except Exception:
-            return None
+        return self._external_queue.get(block=False)
 
     def clear(self):
         with self._external_queue.mutex:

statemachine/event.py

@@ -152,6 +152,9 @@ def split(  # type: ignore[override]
             return [self]
         return [Event(event) for event in result]
 
+    def match(self, event: str) -> bool:
+        return self == event or self == "*"
+
 
 class BoundEvent(Event):
     pass

statemachine/event_data.py

@@ -12,14 +12,6 @@
     from .transition import Transition
 
 
-@dataclass
-class _Data:
-    kwargs: dict
-
-    def __getattr__(self, name):
-        return self.kwargs.get(name, None)
-
-
 @dataclass(order=True)
 class TriggerData:
     machine: "StateMachine" = field(compare=False)
@@ -74,9 +66,6 @@ class EventData:
 
     executed: bool = False
 
-    origintype: str = "http://www.w3.org/TR/scxml/#SCXMLEventProcessor"
-    """The origintype of the :ref:`Event` as specified by the SCXML namespace."""
-
     def __post_init__(self):
         self.state = self.transition.source
         self.source = self.transition.source
@@ -103,13 +92,3 @@ def extended_kwargs(self):
         kwargs["source"] = self.source
         kwargs["target"] = self.target
         return kwargs
-
-    @property
-    def data(self):
-        "Property used by the SCXML namespace"
-        if self.trigger_data.kwargs:
-            return _Data(self.trigger_data.kwargs)
-        elif self.trigger_data.args and len(self.trigger_data.args) == 1:
-            return self.trigger_data.args[0]
-        else:
-            return self.trigger_data.args

statemachine/events.py

@@ -34,7 +34,7 @@ def add(self, events):
     def match(self, event: str):
         if event is None and self.is_empty:
             return True
-        return any(e == event or e == "*" for e in self)
+        return any(e.match(event) for e in self)
 
     def _replace(self, old, new):
         self._items.remove(old)