🎨 format

benchmark.py

@@ -1,7 +1,8 @@
-import time
-from arclet.alconna import Alconna, Args, ANY, command_manager, namespace
 import cProfile
 import pstats
+import time
+
+from arclet.alconna import ANY, Alconna, Args, command_manager, namespace
 
 
 class Plain:

commander/__main__.py

@@ -1,4 +1,4 @@
-from arclet.alconna import Alconna, command_manager, Args
+from arclet.alconna import Alconna, Args, command_manager
 from commander import Commands
 
 command = Commands()

commander/commander.py

@@ -1,10 +1,12 @@
-from arclet.alconna import Alconna, Arparma
-from arclet.alconna.core import ArparmaExecutor
-from tarina import is_awaitable
 from dataclasses import dataclass, field
-from typing import TypeVar, Tuple, Callable, Any, Optional
+from typing import Any, Callable, Optional, Tuple, TypeVar
 from weakref import WeakKeyDictionary
 
+from tarina import is_awaitable
+
+from arclet.alconna import Alconna, Arparma
+from arclet.alconna.core import ArparmaExecutor
+
 TCall = TypeVar("TCall", bound=Callable)
 
 

entry_test.py

@@ -1,10 +1,10 @@
+from tests.analyser_test import *
 from tests.args_test import *
 from tests.base_test import *
-from tests.util_test import *
-from tests.core_test import *
 from tests.components_test import *
 from tests.config_test import *
-from tests.analyser_test import *
+from tests.core_test import *
+from tests.util_test import *
 
 if __name__ == '__main__':
     import pytest

exam1.py

@@ -1,6 +1,7 @@
-from arclet.alconna import Alconna, Option, CommandMeta, Args, CompSession, Arg, OptionResult
 from tarina import lang
 
+from arclet.alconna import Alconna, Arg, Args, CommandMeta, CompSession, Option, OptionResult
+
 lang.set("completion", "node", "")
 lang.set("completion", "prompt_select", "")
 

exam3.py

@@ -1,5 +1,5 @@
+from typing import Any, Callable, TypeVar
 from typing_extensions import ParamSpec, Self
-from typing import Callable, TypeVar, Any
 
 T = TypeVar("T")
 R = TypeVar("R")

exam7.py

@@ -1,8 +1,9 @@
-from arclet.alconna import Args
-from arclet.alconna.action import Action, store_true, store
-from typing import Literal, overload, Optional
-from typing_extensions import Self
 from dataclasses import dataclass, field
+from typing import Literal, Optional, overload
+from typing_extensions import Self
+
+from arclet.alconna import Args
+from arclet.alconna.action import Action, store, store_true
 
 
 @dataclass

example/calculate.py

@@ -1,7 +1,9 @@
-from arclet.alconna import Alconna, Arg
-from nepattern import SwitchPattern, NUMBER
 import operator
 
+from nepattern import NUMBER, SwitchPattern
+
+from arclet.alconna import Alconna, Arg
+
 alc = Alconna(
     "calc",
     Arg("a", NUMBER),

example/endpoint.py

@@ -1,5 +1,7 @@
-from arclet.alconna import Alconna, Args, Option, UnpackVar, KeyWordVar
-from dataclasses import dataclass, asdict
+from dataclasses import asdict, dataclass
+
+from arclet.alconna import Alconna, Args, KeyWordVar, Option, UnpackVar
+
 
 @dataclass
 class User:

example/exec_code.py

@@ -1,9 +1,10 @@
 import sys
 from io import StringIO
 
-from arclet.alconna import Alconna, Args, Field, Option, CommandMeta, MultiVar, Arparma
 from nepattern import AnyString
 
+from arclet.alconna import Alconna, Args, Arparma, CommandMeta, Field, MultiVar, Option
+
 alc = Alconna(
     "exec",
     Args["code", MultiVar(AnyString), Field(completion=lambda: "print(1+1)")] / "\n",

example/exec_sql.py

@@ -1,6 +1,7 @@
 from sqlite3 import connect
 from typing import Optional
-from arclet.alconna import Alconna, Arg, Option, KeyWordVar, MultiVar
+
+from arclet.alconna import Alconna, Arg, KeyWordVar, MultiVar, Option
 
 db = connect('example.db')
 

example/img_search.py

@@ -1,6 +1,8 @@
-from arclet.alconna import Alconna, Args, namespace
 from typing import Optional
 
+from arclet.alconna import Alconna, Args, namespace
+
+
 class Text:
     type = "text"
     text: str

example/pip.py

@@ -1,8 +1,9 @@
-from arclet.alconna import Alconna, Option, count, Subcommand, Args, MultiVar, store_true
-from nepattern import URL, create_local_patterns
 from pathlib import Path
 from typing import Tuple
 
+from nepattern import URL, create_local_patterns
+
+from arclet.alconna import Alconna, Args, MultiVar, Option, Subcommand, count, store_true
 
 pip = Alconna(
     "/pip",

pyproject.toml

@@ -55,6 +55,8 @@ dev = [
     "coverage~=7.0.1",
     "pydeps~=1.11.0",
     "fix-future-annotations>=0.4.0",
+    "isort>=5.13.2",
+    "black>=24.2.0",
 ]
 
 [tool.pdm.scripts]

src/arclet/alconna/__init__.py

@@ -43,13 +43,13 @@
 from .stub import SubcommandStub as SubcommandStub
 from .typing import AllParam as AllParam
 from .typing import CommandMeta as CommandMeta
+from .typing import ContextVal as ContextVal
 from .typing import KeyWordVar as KeyWordVar
 from .typing import Kw as Kw
 from .typing import MultiVar as MultiVar
 from .typing import Nargs as Nargs
 from .typing import UnpackVar as UnpackVar
 from .typing import Up as Up
-from .typing import ContextVal as ContextVal
 
 __version__ = "1.7.44"
 

src/arclet/alconna/_internal/_analyser.py

@@ -1,23 +1,31 @@
 from __future__ import annotations
 
+import re
 from dataclasses import dataclass, field
 from re import Match
 from typing import TYPE_CHECKING, Any, Callable, Generic, Set
 from typing_extensions import Self, TypeAlias
 
-from tarina import lang, Empty
+from tarina import Empty, lang
 
 from ..action import Action
 from ..args import Args
 from ..arparma import Arparma
 from ..base import Completion, Help, Option, Shortcut, Subcommand
 from ..completion import comp_ctx
-from ..exceptions import ArgumentMissing, FuzzyMatchSuccess, InvalidParam, ParamsUnmatched, PauseTriggered, SpecialOptionTriggered
+from ..constraint import SHORTCUT_ARGS, SHORTCUT_REGEX_MATCH, SHORTCUT_REST, SHORTCUT_TRIGGER
+from ..exceptions import (
+    ArgumentMissing,
+    FuzzyMatchSuccess,
+    InvalidParam,
+    ParamsUnmatched,
+    PauseTriggered,
+    SpecialOptionTriggered,
+)
 from ..manager import command_manager
 from ..model import HeadResult, OptionResult, Sentence, SubcommandResult
 from ..output import output_manager
 from ..typing import TDC, InnerShortcutArgs
-from ..constraint import SHORTCUT_TRIGGER, SHORTCUT_ARGS, SHORTCUT_REST, SHORTCUT_REGEX_MATCH
 from ._handlers import (
     _handle_shortcut_data,
     _handle_shortcut_reg,
@@ -292,7 +300,7 @@ def shortcut(
             return self.export(argv, True, exc)
         argv.addon(short.args)
         data = _handle_shortcut_data(argv, data)
-        if not data and argv.raw_data and any(isinstance(i, str) and "{%0}" in i for i in argv.raw_data):
+        if not data and argv.raw_data and any(isinstance(i, str) and bool(re.search(r"\{%(\d+)|\*(.*?)\}", i)) for i in argv.raw_data):
             exc = ArgumentMissing(lang.require("analyser", "param_missing"))
             if self.command.meta.raise_exception:
                 raise exc

src/arclet/alconna/_internal/_argv.py

@@ -9,9 +9,9 @@
 from ..args import Arg
 from ..base import Option, Subcommand
 from ..config import Namespace, config
+from ..constraint import ARGV_OVERRIDES
 from ..exceptions import NullMessage
 from ..typing import TDC
-from ..constraint import ARGV_OVERRIDES
 
 
 @dataclass(repr=True)

src/arclet/alconna/_internal/_handlers.py

@@ -3,7 +3,7 @@
 import re
 from typing import TYPE_CHECKING, Any, Iterable
 
-from nepattern import ANY, AnyString, BasePattern, STRING
+from nepattern import ANY, STRING, AnyString, BasePattern
 from nepattern.util import TPattern
 from tarina import Empty, lang, split_once
 
@@ -15,7 +15,7 @@
 from ..exceptions import ArgumentMissing, FuzzyMatchSuccess, InvalidParam, PauseTriggered, SpecialOptionTriggered
 from ..model import HeadResult, OptionResult, Sentence
 from ..output import output_manager
-from ..typing import KWBool, ShortcutRegWrapper, MultiKeyWordVar, MultiVar, ContextVal
+from ..typing import ContextVal, KWBool, MultiKeyWordVar, MultiVar, ShortcutRegWrapper
 from ._header import Double, Header
 from ._util import escape, levenshtein, unescape
 
@@ -594,8 +594,6 @@ def _handle_multi_slot(argv: Argv, unit: str, data: list, index: int, current: i
 
 def _handle_shortcut_data(argv: Argv, data: list):
     data_len = len(data)
-    if not data_len:
-        return []
     record = set()
     offset = 0
     for i, unit in enumerate(argv.raw_data.copy()):

src/arclet/alconna/_internal/_header.py

@@ -4,7 +4,7 @@
 from inspect import isclass
 from typing import Any, Callable
 
-from nepattern import BasePattern, UnionPattern, all_patterns, parser, MatchMode
+from nepattern import BasePattern, MatchMode, UnionPattern, all_patterns, parser
 from nepattern.util import TPattern
 from tarina import lang
 
@@ -105,7 +105,8 @@ def __repr__(self):
 class Double:
     """用于匹配前缀和命令的组合"""
 
-    command: TPattern | BasePattern | str
+    command: TPattern | BasePattern
+    comp_pattern: TPattern | BasePattern
 
     def __init__(
         self,
@@ -127,17 +128,20 @@ def __init__(
             self.prefix = set(texts) if texts else None
             self.comp_pattern = prefixed(command)
             self.cmd_type = 0
+            self.match = self.match0
         elif not texts:
             self.prefix = None
             self.command = re.compile(command)
             self.comp_pattern = re.compile(f"^{command}")
             self.cmd_type = 1
+            self.match = self.match1
         else:
             prf = "|".join(re.escape(h) for h in texts)
             self.prefix = re.compile(f"(?:{prf}){command}")
             self.command = re.compile(command)
             self.cmd_type = 2
             self.comp_pattern = re.compile(f"^(?:{prf}){command}")
+            self.match = self.match2
 
     def __repr__(self):
         if self.cmd_type == 0:
@@ -182,11 +186,7 @@ def match1(self, pf: Any, cmd: Any, p_str: bool, c_str: bool, pbfn: Callable[...
             pbfn(cmd[len(mat[0]):], replace=True)
             return (pf, cmd), (pf, mat[0]), True, mat.groupdict()
 
-    def match(self, pf: Any, cmd: Any, p_str: bool, c_str: bool, pbfn: Callable[..., ...], comp: bool):
-        if not self.cmd_type:
-            return self.match0(pf, cmd, p_str, c_str, pbfn, comp)
-        if self.cmd_type == 1:
-            return self.match1(pf, cmd, p_str, c_str, pbfn, comp)
+    def match2(self, pf: Any, cmd: Any, p_str: bool, c_str: bool, pbfn: Callable[..., ...], comp: bool):
         if not p_str and not c_str:
             return
         if p_str:
@@ -212,6 +212,9 @@ def match(self, pf: Any, cmd: Any, p_str: bool, c_str: bool, pbfn: Callable[...,
                 pbfn(cmd[len(mat[0]):], replace=True)
                 return (pf, cmd), (val._value, mat[0]), True, mat.groupdict()
 
+    def match(self, pf: Any, cmd: Any, p_str: bool, c_str: bool, pbfn: Callable[..., ...], comp: bool):
+        ...
+
 
 class Header:
     """命令头部的匹配表达式"""

src/arclet/alconna/args.py

@@ -9,11 +9,11 @@
 from typing import Any, Callable, Generic, Iterable, List, Sequence, Type, TypeVar, Union, cast
 from typing_extensions import Self, TypeAlias
 
-from nepattern import BasePattern, MatchMode, RawStr, UnionPattern, parser, NONE, ANY, AntiPattern
+from nepattern import ANY, NONE, AntiPattern, BasePattern, MatchMode, RawStr, UnionPattern, parser
 from tarina import Empty, get_signature, lang
 
 from .exceptions import InvalidArgs
-from .typing import KeyWordVar, KWBool, MultiVar, UnpackVar, MultiKeyWordVar, AllParam
+from .typing import AllParam, KeyWordVar, KWBool, MultiKeyWordVar, MultiVar, UnpackVar
 
 
 def safe_dcls_kw(**kwargs):

src/arclet/alconna/base.py

@@ -4,10 +4,10 @@
 from dataclasses import replace
 from functools import reduce
 from typing import Any, Iterable, Sequence, overload
-
-from tarina import lang, Empty
 from typing_extensions import Self
 
+from tarina import Empty, lang
+
 from .action import Action, store
 from .args import Arg, Args
 from .exceptions import InvalidArgs

src/arclet/alconna/core.py

@@ -8,6 +8,7 @@
 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
@@ -19,7 +20,7 @@
 from .exceptions import ExecuteFailed, NullMessage
 from .formatter import TextFormatter
 from .manager import ShortcutArgs, command_manager
-from .typing import TDC, CommandMeta, DataCollection, ShortcutRegWrapper, TPrefixes, InnerShortcutArgs
+from .typing import TDC, CommandMeta, DataCollection, InnerShortcutArgs, ShortcutRegWrapper, TPrefixes
 
 T_Duplication = TypeVar("T_Duplication", bound=Duplication)
 T = TypeVar("T")

src/arclet/alconna/manager.py

@@ -17,7 +17,7 @@
 from .arparma import Arparma
 from .config import Namespace, config
 from .exceptions import ExceedMaxCount
-from .typing import TDC, CommandMeta, DataCollection, ShortcutArgs, InnerShortcutArgs
+from .typing import TDC, CommandMeta, DataCollection, InnerShortcutArgs, ShortcutArgs
 
 if TYPE_CHECKING:
     from ._internal._analyser import Analyser

src/arclet/alconna/stub.py

@@ -10,8 +10,8 @@
 
 from .args import Args
 from .base import Option, Subcommand
-from .typing import AllParam
 from .model import OptionResult, SubcommandResult
+from .typing import AllParam
 
 T = TypeVar("T")
 T_Origin = TypeVar("T_Origin")