🐛 version 1.7.44

fix shortcut_list

Author: RF-Tar-Railt

CHANGELOG.md

@@ -1,5 +1,11 @@
 # 更新日志
 
+## Alconna 1.7.44
+
+### 修复
+
+- 修复 `shortcut list` 的错误
+
 ## Alconna 1.7.43
 
 ### 改进

src/arclet/alconna/__init__.py

@@ -50,7 +50,7 @@
 from .typing import UnpackVar as UnpackVar
 from .typing import Up as Up
 
-__version__ = "1.7.43"
+__version__ = "1.7.44"
 
 # backward compatibility
 Arpamar = Arparma

src/arclet/alconna/core.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Any, Callable, Generic, Literal, Sequence, TypeVar, cast, overload
 from typing_extensions import Self
-
+from weakref import WeakSet
 from tarina import init_spec, lang
 
 from ._internal._analyser import Analyser, TCompile
@@ -169,7 +169,8 @@ def __init__(
             self.behaviors.extend(requirement_handler(behavior))
         command_manager.register(self)
         self._executors: dict[ArparmaExecutor, Any] = {}
-        self.union = set()
+        self.union: "WeakSet[Alconna]" = WeakSet()
+        self._union = False
 
     @property
     def namespace_config(self) -> Namespace:
@@ -346,8 +347,8 @@ def subcommand(self, sub: Subcommand) -> Self:
         return self.add(sub)
 
     def _parse(self, message: TDC) -> Arparma[TDC]:
-        if self.union:
-            for ana, argv in command_manager.requires(*self.union):
+        if self._union:
+            for ana, argv in command_manager.unpack(self.union):
                 if (res := ana.process(argv.build(message))).matched:
                     return res
         analyser = command_manager.require(self)
@@ -429,7 +430,8 @@ def __add__(self, other) -> Self:
         return self
 
     def __or__(self, other: Alconna) -> Self:
-        self.union.add(other.path)
+        self.union.add(other)
+        self._union = True
         return self
 
     def _calc_hash(self):

src/arclet/alconna/manager.py

@@ -152,11 +152,11 @@ def require(self, command: Alconna[TDC]) -> Analyser[TDC]:
             namespace, name = self._command_part(command.path)
             raise ValueError(lang.require("manager", "undefined_command").format(target=f"{namespace}.{name}")) from e
 
-    def requires(self, *paths: str) -> zip[tuple[Analyser, Argv]]:  # type: ignore
+    def unpack(self, commands: set[Alconna]) -> zip[tuple[Analyser, Argv]]:  # type: ignore
         """获取多个命令解析器"""
         return zip(
-            [v for k, v in self.__analysers.items() if k.path in paths],
-            [v for k, v in self.__argv.items() if k.path in paths],
+            [v for k, v in self.__analysers.items() if k in commands],
+            [v for k, v in self.__argv.items() if k in commands],
         )
 
     def delete(self, command: Alconna | str) -> None:
@@ -230,7 +230,7 @@ def get_shortcut(self, target: Alconna[TDC]) -> dict[str, Union[Arparma[TDC], In
             dict[str, Arparma | InnerShortcutArgs]: 快捷命令的参数
         """
         namespace, name = self._command_part(target.path)
-        if f"{namespace}.{name}" not in self.__analysers:
+        if f"{namespace}.{name}" not in self.__shortcuts:
             raise ValueError(lang.require("manager", "undefined_command").format(target=f"{namespace}.{name}"))
         if not (_shortcut := self.__shortcuts.get(f"{namespace}.{name}")):
             return {}