python-statemachine 3.2.1__py3-none-any.whl → 3.2.2__py3-none-any.whl

statemachine/locale/pt_BR/LC_MESSAGES/statemachine.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  3.1.1\n"
 "Report-Msgid-Bugs-To: fgmacedo@gmail.com\n"
-"POT-Creation-Date: 2026-06-16 23:00-0300\n"
+"POT-Creation-Date: 2026-10-13 21:26-0300\n"
 "PO-Revision-Date: 2024-06-07 17:41-0300\n"
 "Last-Translator: Fernando Macedo <fgmacedo@gmail.com>\n"
 "Language: pt_BR\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.18.0\n"
 
-#: statemachine/callbacks.py:398 statemachine/callbacks.py:403
+#: statemachine/callbacks.py:409 statemachine/callbacks.py:414
 #, python-brace-format
 msgid "Did not found name '{}' from model or statemachine"
 msgstr "Nome '{}' não encontrado no modelo ou na máquina de estados"
@@ -29,12 +29,24 @@ msgstr ""
 "Nenhum estado atual definido. Em código assíncrono, você ativou o estado "
 "inicial? (ex.: `await sm.activate_initial_state()`)"
 
-#: statemachine/dispatcher.py:123
+#: statemachine/dispatcher.py:127
 #, python-brace-format
 msgid "Failed to parse boolean expression '{}'"
 msgstr "Falha ao interpretar a expressão booleana '{}'"
 
-#: statemachine/event.py:94
+#: statemachine/event.py:56
+#, python-brace-format
+msgid ""
+"Event {id!r} cannot be both delayed and internal: the internal queue runs"
+" within the current macrostep, which takes no time. Drop 'internal' to "
+"deliver it later on the external queue, or drop 'delay' to run it now."
+msgstr ""
+"O evento {id!r} não pode ser atrasado e interno ao mesmo tempo: a fila "
+"interna roda dentro do macrostep atual, que não leva tempo. Remova "
+"'internal' para entregá-lo depois pela fila externa, ou remova 'delay' "
+"para executá-lo agora."
+
+#: statemachine/event.py:108
 #, python-brace-format
 msgid ""
 "Event() received a non-string 'id' ({cls_name}). To combine multiple "
@@ -43,12 +55,12 @@ msgstr ""
 "Event() recebeu um 'id' que não é uma string ({cls_name}). Para combinar "
 "múltiplas transições em um único evento, use o operador |: t1 | t2."
 
-#: statemachine/event.py:130
+#: statemachine/event.py:147
 #, python-brace-format
 msgid "Cannot add callback '{}' to an event with no transitions."
 msgstr "Não é possível adicionar callback '{}' a um evento sem transições."
 
-#: statemachine/event.py:163
+#: statemachine/event.py:182
 #, python-brace-format
 msgid "Event {} cannot be called without a SM instance"
 msgstr "O evento {} não pode ser chamado sem uma instância de SM"
@@ -63,7 +75,7 @@ msgstr "{!r} não é um valor de estado válido."
 msgid "Can't {} when in {}."
 msgstr "Não é possível {} quando em {}."
 
-#: statemachine/factory.py:77
+#: statemachine/factory.py:91
 #, python-brace-format
 msgid ""
 "There should be one and only one initial state. Your currently have "
@@ -72,7 +84,36 @@ msgstr ""
 "Deve haver um e apenas um estado inicial. Atualmente, você possui estes: "
 "{0}"
 
-#: statemachine/factory.py:194
+#: statemachine/factory.py:249
+#, python-brace-format
+msgid "is declared in both the '{}' and the '{}' state bodies"
+msgstr "está declarado nos corpos dos estados '{}' e '{}'"
+
+#: statemachine/factory.py:253
+#, python-brace-format
+msgid "in the '{}' state body clashes with the event '{}'"
+msgstr "no corpo do estado '{}' conflita com o evento '{}'"
+
+#: statemachine/factory.py:257
+#, python-brace-format
+msgid "is declared in both the '{}' state body and the '{}' class body"
+msgstr "está declarado no corpo do estado '{}' e no corpo da classe '{}'"
+
+#: statemachine/factory.py:261
+#, python-brace-format
+msgid "in the '{}' state body clashes with the '{}' attribute of '{}'"
+msgstr "no corpo do estado '{}' conflita com o atributo '{}' de '{}'"
+
+#: statemachine/factory.py:267
+#, python-brace-format
+msgid ""
+"Callback '{}' {}. Nested state bodies share the class namespace. Rename "
+"one of them."
+msgstr ""
+"Callback '{}' {}. Corpos de estados aninhados compartilham o namespace da"
+" classe. Renomeie um deles."
+
+#: statemachine/factory.py:291
 #, python-brace-format
 msgid ""
 "There should be one and only one initial state. You currently have these:"
@@ -81,14 +122,14 @@ msgstr ""
 "Deve haver um e apenas um estado inicial. Atualmente, você possui estes: "
 "{!r}"
 
-#: statemachine/factory.py:209
+#: statemachine/factory.py:306
 #, python-brace-format
 msgid "Cannot declare transitions from final state. Invalid state(s): {}"
 msgstr ""
 "Não é possível declarar transições a partir de um estado final. Estado(s)"
 " inválido(s): {}"
 
-#: statemachine/factory.py:221
+#: statemachine/factory.py:318
 #, python-brace-format
 msgid ""
 "All non-final states should have at least one outgoing transition. These "
@@ -97,7 +138,7 @@ msgstr ""
 "Todos os estados não finais devem ter pelo menos uma transição de saída. "
 "Estes estados não possuem transição de saída: {!r}"
 
-#: statemachine/factory.py:235
+#: statemachine/factory.py:332
 #, python-brace-format
 msgid ""
 "All non-final states should have at least one path to a final state. "
@@ -107,7 +148,7 @@ msgstr ""
 "estado final. Estes estados não possuem caminho para um estado final: "
 "{!r}"
 
-#: statemachine/factory.py:248
+#: statemachine/factory.py:345
 #, python-brace-format
 msgid ""
 "There are unreachable states. The statemachine graph should have a single"
@@ -116,7 +157,7 @@ msgstr ""
 "Há estados inacessíveis. O grafo da máquina de estados deve ter um único "
 "componente. Estados desconectados: {}"
 
-#: statemachine/factory.py:285
+#: statemachine/factory.py:382
 #, python-brace-format
 msgid ""
 "Invalid entry in 'listeners': {!r}. Expected a class, callable, or "
@@ -125,7 +166,7 @@ msgstr ""
 "Entrada inválida em 'listeners': {!r}. Esperado uma classe, callable ou "
 "instância de listener."
 
-#: statemachine/factory.py:384
+#: statemachine/factory.py:481
 #, python-brace-format
 msgid "An event in the '{}' has no id."
 msgstr "Um evento em '{}' não possui id."
@@ -135,15 +176,15 @@ msgstr "Um evento em '{}' não possui id."
 msgid "{!r} is not a valid state machine name."
 msgstr "{!r} não é um nome de máquina de estados válido."
 
-#: statemachine/state.py:249
+#: statemachine/state.py:273
 msgid "'donedata' can only be specified on final states."
 msgstr "'donedata' só pode ser especificado em estados finais."
 
-#: statemachine/statemachine.py:167
+#: statemachine/statemachine.py:168
 msgid "There are no states or transitions."
 msgstr "Não há estados ou transições."
 
-#: statemachine/statemachine.py:237
+#: statemachine/statemachine.py:242
 #, python-brace-format
 msgid "State overriding is not allowed. Trying to add '{}' to {}"
 msgstr "Sobrescrever estados não é permitido. Tentando adicionar '{}' a {}"
@@ -162,6 +203,14 @@ msgstr ""
 msgid "{} only supports the decorator syntax to register callbacks."
 msgstr "{} suporta apenas a sintaxe de decorator para registrar callbacks."
 
+#: statemachine/engines/async_.py:50
+msgid ""
+"The task running the processing loop was cancelled while it processed "
+"this event."
+msgstr ""
+"A tarefa que executava o loop de processamento foi cancelada enquanto "
+"processava este evento."
+
 #~ msgid "There are no states."
 #~ msgstr "Não há estados."
 

statemachine/locale/zh_CN/LC_MESSAGES/statemachine.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  3.1.1\n"
 "Report-Msgid-Bugs-To: fgmacedo@gmail.com\n"
-"POT-Creation-Date: 2026-06-16 23:00-0300\n"
+"POT-Creation-Date: 2026-10-13 21:26-0300\n"
 "PO-Revision-Date: 2024-06-07 17:41-0300\n"
 "Last-Translator: Fernando Macedo <fgmacedo@gmail.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.18.0\n"
 
-#: statemachine/callbacks.py:398 statemachine/callbacks.py:403
+#: statemachine/callbacks.py:409 statemachine/callbacks.py:414
 #, python-brace-format
 msgid "Did not found name '{}' from model or statemachine"
 msgstr "在模型或状态机中未找到名称 '{}'"
@@ -27,24 +27,34 @@ msgid ""
 " state? (e.g., `await sm.activate_initial_state()`)"
 msgstr "没有设置当前状态。在异步代码中，您是否激活了初始状态？（例如，`await sm.activate_initial_state()`）"
 
-#: statemachine/dispatcher.py:123
+#: statemachine/dispatcher.py:127
 #, python-brace-format
 msgid "Failed to parse boolean expression '{}'"
 msgstr "无法解析布尔表达式 '{}'"
 
-#: statemachine/event.py:94
+#: statemachine/event.py:56
+#, python-brace-format
+msgid ""
+"Event {id!r} cannot be both delayed and internal: the internal queue runs"
+" within the current macrostep, which takes no time. Drop 'internal' to "
+"deliver it later on the external queue, or drop 'delay' to run it now."
+msgstr ""
+"事件 {id!r} 不能同时是延迟的和内部的：内部队列在当前宏步骤内运行，不占用时间。去掉 'internal' 以便稍后通过外部队列投递，或去掉"
+" 'delay' 以立即执行。"
+
+#: statemachine/event.py:108
 #, python-brace-format
 msgid ""
 "Event() received a non-string 'id' ({cls_name}). To combine multiple "
 "transitions under one event, use the | operator: t1 | t2."
 msgstr "Event() 接收到的 'id' 不是字符串 ({cls_name})。要将多个转换组合在同一个事件下，请使用 | 运算符：t1 | t2。"
 
-#: statemachine/event.py:130
+#: statemachine/event.py:147
 #, python-brace-format
 msgid "Cannot add callback '{}' to an event with no transitions."
 msgstr "无法将回调 '{}' 添加到没有转换的事件。"
 
-#: statemachine/event.py:163
+#: statemachine/event.py:182
 #, python-brace-format
 msgid "Event {} cannot be called without a SM instance"
 msgstr "事件 {} 不能在没有 SM 实例的情况下调用"
@@ -59,54 +69,81 @@ msgstr "{!r} 不是有效的状态值。"
 msgid "Can't {} when in {}."
 msgstr "在 {} 时无法 {}。"
 
-#: statemachine/factory.py:77
+#: statemachine/factory.py:91
 #, python-brace-format
 msgid ""
 "There should be one and only one initial state. Your currently have "
 "these: {0}"
 msgstr "应有且仅有一个初始状态。当前您有这些：{0}"
 
-#: statemachine/factory.py:194
+#: statemachine/factory.py:249
+#, python-brace-format
+msgid "is declared in both the '{}' and the '{}' state bodies"
+msgstr "同时声明在 '{}' 和 '{}' 状态体中"
+
+#: statemachine/factory.py:253
+#, python-brace-format
+msgid "in the '{}' state body clashes with the event '{}'"
+msgstr "在 '{}' 状态体中与事件 '{}' 冲突"
+
+#: statemachine/factory.py:257
+#, python-brace-format
+msgid "is declared in both the '{}' state body and the '{}' class body"
+msgstr "同时声明在 '{}' 状态体和 '{}' 类体中"
+
+#: statemachine/factory.py:261
+#, python-brace-format
+msgid "in the '{}' state body clashes with the '{}' attribute of '{}'"
+msgstr "在 '{0}' 状态体中与 '{2}' 的属性 '{1}' 冲突"
+
+#: statemachine/factory.py:267
+#, python-brace-format
+msgid ""
+"Callback '{}' {}. Nested state bodies share the class namespace. Rename "
+"one of them."
+msgstr "回调 '{}' {}。嵌套状态体共享类的命名空间。请重命名其中一个。"
+
+#: statemachine/factory.py:291
 #, python-brace-format
 msgid ""
 "There should be one and only one initial state. You currently have these:"
 " {!r}"
 msgstr "应有且仅有一个初始状态。当前您有这些：{!r}"
 
-#: statemachine/factory.py:209
+#: statemachine/factory.py:306
 #, python-brace-format
 msgid "Cannot declare transitions from final state. Invalid state(s): {}"
 msgstr "无法从终止状态声明转换。无效状态：{}"
 
-#: statemachine/factory.py:221
+#: statemachine/factory.py:318
 #, python-brace-format
 msgid ""
 "All non-final states should have at least one outgoing transition. These "
 "states have no outgoing transition: {!r}"
 msgstr "所有非终止状态都应至少有一个外部转换。这些状态没有外部转换：{!r}"
 
-#: statemachine/factory.py:235
+#: statemachine/factory.py:332
 #, python-brace-format
 msgid ""
 "All non-final states should have at least one path to a final state. "
 "These states have no path to a final state: {!r}"
 msgstr "所有非终止状态应至少有一个到终止状态的路径。这些状态没有到终止状态的路径：{!r}"
 
-#: statemachine/factory.py:248
+#: statemachine/factory.py:345
 #, python-brace-format
 msgid ""
 "There are unreachable states. The statemachine graph should have a single"
 " component. Disconnected states: {}"
 msgstr "存在不可到达的状态。状态机图应具有单个组件。断开的状态：{}"
 
-#: statemachine/factory.py:285
+#: statemachine/factory.py:382
 #, python-brace-format
 msgid ""
 "Invalid entry in 'listeners': {!r}. Expected a class, callable, or "
 "listener instance."
 msgstr "'listeners' 中的条目无效：{!r}。期望为类、可调用对象或监听器实例。"
 
-#: statemachine/factory.py:384
+#: statemachine/factory.py:481
 #, python-brace-format
 msgid "An event in the '{}' has no id."
 msgstr "'{}' 中的事件没有 ID。"
@@ -116,15 +153,15 @@ msgstr "'{}' 中的事件没有 ID。"
 msgid "{!r} is not a valid state machine name."
 msgstr "{!r} 不是有效的状态机名称。"
 
-#: statemachine/state.py:249
+#: statemachine/state.py:273
 msgid "'donedata' can only be specified on final states."
 msgstr "'donedata' 只能在终止状态上指定。"
 
-#: statemachine/statemachine.py:167
+#: statemachine/statemachine.py:168
 msgid "There are no states or transitions."
 msgstr "没有状态或转换。"
 
-#: statemachine/statemachine.py:237
+#: statemachine/statemachine.py:242
 #, python-brace-format
 msgid "State overriding is not allowed. Trying to add '{}' to {}"
 msgstr "不允许覆盖状态。尝试将 '{}' 添加到 {}"
@@ -141,6 +178,12 @@ msgstr "从源 {source!r} 的内部转换无效，目标 {target!r} 应为自身
 msgid "{} only supports the decorator syntax to register callbacks."
 msgstr "{} 仅支持使用装饰器语法注册回调。"
 
+#: statemachine/engines/async_.py:50
+msgid ""
+"The task running the processing loop was cancelled while it processed "
+"this event."
+msgstr "运行处理循环的任务在处理此事件时被取消。"
+
 #~ msgid "There are no states."
 #~ msgstr "没有状态。"
 

statemachine/registry.py

@@ -1,5 +1,10 @@
+from typing import TYPE_CHECKING
+
 from .utils import qualname
 
+if TYPE_CHECKING:
+    from .statemachine import StateMachine
+
 try:
     from django.utils.module_loading import autodiscover_modules
 except ImportError:  # pragma: no cover
@@ -8,7 +13,7 @@ except ImportError:  # pragma: no cover
         pass
 
 
-_REGISTRY = {}
+_REGISTRY: "dict[str, type[StateMachine]]" = {}
 _initialized = False
 
 

statemachine/spec_parser.py

@@ -204,7 +204,9 @@ def build_unaryop(op_fn, operand: Callable) -> Callable:
 
 def build_collection(factory, item_exprs: "list[Callable]") -> Callable:
     def decorated(*args, **kwargs):
-        return factory(item(*args, **kwargs) for item in item_exprs)
+        items = [item(*args, **kwargs) for item in item_exprs]
+        _check_value_size(items, "collection")
+        return factory(items)
 
     decorated.__name__ = f"{factory.__name__}(...)"
     return decorated
@@ -212,10 +214,12 @@ def build_collection(factory, item_exprs: "list[Callable]") -> Callable:
 
 def build_dict(key_exprs: "list[Callable]", value_exprs: "list[Callable]") -> Callable:
     def decorated(*args, **kwargs):
-        return {
-            key(*args, **kwargs): value(*args, **kwargs)
+        items = [
+            (key(*args, **kwargs), value(*args, **kwargs))
             for key, value in zip(key_exprs, value_exprs, strict=True)
-        }
+        ]
+        _check_value_size(items, "dict")
+        return dict(items)
 
     decorated.__name__ = "dict(...)"
     return decorated
@@ -289,7 +293,7 @@ def build_expression(  # noqa: C901
             op_type = type(node.op)
             if op_type not in binary_operators:
                 # e.g. bitwise ``^``/``|``/``<<`` are outside the allowlist. (``**`` and ``*``
-                # are allowed but magnitude-capped — see ``binary_operators``.)
+                # are allowed but magnitude-capped, see ``binary_operators``.)
                 raise ValueError(f"Binary operator '{op_type.__name__}' is not allowed")
             return build_binop(binary_operators[op_type], recurse(node.left), recurse(node.right))
         case ast.List(elts=elts) if allow_value_nodes:
@@ -339,6 +343,15 @@ def parse_boolean_expr(expr, variable_hook, operator_mapping):
     return build_expression(tree.body, variable_hook, operator_mapping)
 
 
+def names_in_boolean_expr(expr: str) -> "set[str]":
+    """Variable names that :func:`parse_boolean_expr` would resolve in ``expr``."""
+    try:
+        tree = ast.parse(replace_operators(expr), mode="eval")
+    except SyntaxError:
+        return set()
+    return {node.id for node in ast.walk(tree) if isinstance(node, ast.Name)}
+
+
 def parse_expr(expr: str, variable_hook: Callable) -> Callable:
     """Parse a value expression into a callable using the restricted AST allowlist.
 
@@ -374,11 +387,51 @@ operator_mapping = {
     ast.NotEq: build_custom_operator(operator.ne),
 }
 
-# Result-size caps for the two operators that can blow up cheaply. Ordinary scalar
-# arithmetic (``x * 2``, ``x ** 2``) is well under these; the caps only reject the
-# denial-of-service forms (``9**9**9`` bignum, ``[0]*20000000`` sequence replication).
+# Result-size caps for the values an expression can build cheaply. Ordinary arithmetic and
+# collections are well under these; the caps only reject the denial-of-service forms (giant
+# bignums, giant or deeply shared sequences and collections).
 _MAX_POW_RESULT_BITS = 4096
-_MAX_SEQUENCE_LEN = 1_000_000
+_MAX_VALUE_SIZE = 1_000_000
+
+_TEXT_TYPES = (str, bytes, bytearray)
+_SEQUENCE_TYPES = (*_TEXT_TYPES, list, tuple)
+_CONTAINER_TYPES = (list, tuple, set, frozenset)
+
+
+def _value_size(value) -> int:
+    """Size of ``value`` counting a shared reference every time it appears.
+
+    ``[[0] * 1000] * 1000`` holds a thousand references to one list, so it is cheap to build,
+    but comparing, hashing or printing it walks a million elements. That walked size is what
+    is measured here, in elements, characters or bytes, memoized by identity so the
+    measurement itself stays cheap.
+    """
+    memo: "dict[int, int]" = {}
+
+    def size(item) -> int:
+        key = id(item)
+        if key in memo:
+            return memo[key]
+        memo[key] = 1
+        if isinstance(item, _TEXT_TYPES):
+            total = len(item)
+        elif isinstance(item, int):
+            total = item.bit_length() // 8
+        elif isinstance(item, dict):
+            total = sum(size(k) + size(v) for k, v in item.items())
+        elif isinstance(item, _CONTAINER_TYPES):
+            total = sum(size(element) for element in item)
+        else:
+            total = 1
+        memo[key] = max(total, 1)
+        return memo[key]
+
+    return size(value)
+
+
+def _check_value_size(value, what: str):
+    if _value_size(value) > _MAX_VALUE_SIZE:
+        raise ValueError(f"{what} is too large for the restricted evaluator")
 
 
 def _guarded_pow(base, exp):
@@ -396,29 +449,52 @@ def _guarded_pow(base, exp):
 
 
 def _guarded_mul(a, b):
-    """``*`` with a sequence-replication cap (GHSA-r8gj-366q-cgvj).
+    """``*`` with a result-size cap (GHSA-r8gj-366q-cgvj).
 
     ``seq * n`` (list/str/bytes/tuple times an int) can allocate an enormous object from a
-    12-character expression (``[0]*20000000``). The resulting length is checked *before*
-    allocating. Scalar numeric multiplication is unaffected.
+    12-character expression (``[0]*20000000``), and repeatedly squaring an ``int`` doubles its
+    size every time. The result size is checked *before* allocating. Other operands (floats)
+    are passed straight through.
     """
+    if isinstance(a, int) and isinstance(b, int):
+        if a.bit_length() + b.bit_length() > _MAX_POW_RESULT_BITS:
+            raise ValueError("'*' result is too large for the restricted evaluator")
     for seq, n in ((a, b), (b, a)):
-        if isinstance(seq, (str, bytes, bytearray, list, tuple)) and isinstance(n, int):
-            if n > 0 and n * len(seq) > _MAX_SEQUENCE_LEN:
+        if isinstance(seq, _SEQUENCE_TYPES) and isinstance(n, int):
+            if n > 0 and n * _value_size(seq) > _MAX_VALUE_SIZE:
                 raise ValueError("'*' repetition is too large for the restricted evaluator")
     return operator.mul(a, b)
 
 
-# ``**`` and ``*`` stay available for ordinary arithmetic but are wrapped so a tiny untrusted
-# expression cannot exhaust CPU/memory (GHSA-r8gj-366q-cgvj). ``trusted=True`` uses the full
-# Python evaluator instead, without these caps.
+def _guarded_add(a, b):
+    """``+`` with a sequence-length cap: repeated ``x + x`` doubles a sequence every time."""
+    sizes = [_value_size(x) for x in (a, b) if isinstance(x, _SEQUENCE_TYPES)]
+    if len(sizes) == 2 and sum(sizes) > _MAX_VALUE_SIZE:
+        raise ValueError("'+' result is too large for the restricted evaluator")
+    return operator.add(a, b)
+
+
+def _guarded_mod(a, b):
+    """``%`` restricted to numbers.
+
+    printf-style formatting (``'%2000000000d' % 0``) allocates whatever field width the
+    expression asks for, so it is rejected on ``str``/``bytes`` operands.
+    """
+    if isinstance(a, _TEXT_TYPES):
+        raise ValueError("'%' string formatting is not allowed by the restricted evaluator")
+    return operator.mod(a, b)
+
+
+# ``**``, ``*``, ``+`` and ``%`` stay available for ordinary arithmetic but are wrapped so a
+# tiny untrusted expression cannot exhaust CPU/memory (GHSA-r8gj-366q-cgvj). ``trusted=True``
+# uses the full Python evaluator instead, without these caps.
 binary_operators = {
-    ast.Add: operator.add,
+    ast.Add: _guarded_add,
     ast.Sub: operator.sub,
     ast.Mult: _guarded_mul,
     ast.Div: operator.truediv,
     ast.FloorDiv: operator.floordiv,
-    ast.Mod: operator.mod,
+    ast.Mod: _guarded_mod,
     ast.Pow: _guarded_pow,
 }
 

statemachine/state.py

@@ -1,4 +1,5 @@
 from collections.abc import Generator
+from collections.abc import Mapping
 from enum import Enum
 from typing import TYPE_CHECKING
 from typing import Any
@@ -8,6 +9,7 @@ from weakref import ref
 from .callbacks import CallbackGroup
 from .callbacks import CallbackPriority
 from .callbacks import CallbackSpecList
+from .event import Event
 from .event import _expand_event_id
 from .exceptions import InvalidDefinition
 from .i18n import _
@@ -56,7 +58,7 @@ class _FromState(_TransitionBuilder):
 
 
 class NestedStateFactory(type):
-    def __new__(  # type: ignore [misc]
+    def __new__(  # type: ignore [misc]  # noqa: C901
         cls, classname, bases, attrs, name="", **kwargs
     ) -> "State":
         if not bases:
@@ -76,6 +78,8 @@ class NestedStateFactory(type):
         states = []
         history = []
         callbacks = {}
+        # Order is significant: a ``HistoryState`` is a ``State``, and an ``Event`` is a
+        # callable ``str``, so both would be captured by a later branch.
         for key, value in attrs.items():
             if isinstance(value, States):
                 for state_id, state in value.items():
@@ -88,7 +92,27 @@ class NestedStateFactory(type):
                 value._set_id(key)
                 states.append(value)
             elif isinstance(value, TransitionList):
-                value.add_event(_expand_event_id(key))
+                for event_id in _expand_event_id(key):
+                    value.add_event(event_id)
+            elif isinstance(value, Event):
+                event_ids = [value.id] if value._has_real_id else _expand_event_id(key)
+                events = [
+                    Event(
+                        id=event_id,
+                        name=value.name,
+                        delay=value.delay,
+                        internal=value.internal,
+                    )
+                    for event_id in event_ids
+                ]
+                if value._transitions is not None:
+                    for event in events:
+                        value._transitions.add_event(event)
+            elif getattr(value, "attr_name", None):
+                if value.is_event:
+                    for event_id in _expand_event_id(key):
+                        value._transitions.add_event(event_id)
+                callbacks[value.attr_name] = value
             elif callable(value):
                 callbacks[key] = value
 
@@ -366,14 +390,18 @@ class InstanceState(State):
         self,
         state: State,
         machine: "StateChart",
+        instance_states: "Mapping[Any, State]",
     ):
         self._state = state
         self._machine = ref(machine)
+        self._instance_states = instance_states
         self._hash = hash(state)
-        self._init_states()
+        # No _init_states(): it would rebind the shared children's ``parent`` to this proxy.
 
     def __getattr__(self, name: str):
         value = getattr(self._state, name)
+        if isinstance(value, State):
+            value = self._instance_states.get(value.value, value)
         self.__dict__[name] = value
         return value
 
@@ -416,13 +444,24 @@ class AnyState(State):
     until the state machine class is evaluated.
     """
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._copies: dict[tuple[int, int], Transition] = {}
+        """Transition copied onto each state, keyed by ``(id(transition), id(state))``, so an
+        attribute that declares several ids adds them all to one copy."""
+
     def _on_event_defined(self, event: str, transition: Transition, states: list[State]):
         for state in states:
             if state.final:
                 continue
-            new_transition = transition._copy_with_args(source=state, event=event)
-
-            state.transitions.add_transitions(new_transition)
+            key = (id(transition), id(state))
+            copy = self._copies.get(key)
+            if copy is None:
+                copy = transition._copy_with_args(source=state, event=event)
+                self._copies[key] = copy
+                state.transitions.add_transitions(copy)
+            else:
+                copy.add_event(event)
 
 
 class HistoryType(str, Enum):