HydrogenLib-NEXT 7__tar.gz → 9__tar.gz

{hydrogenlib_next-7 → hydrogenlib_next-9}/.gitignore

@@ -14,3 +14,4 @@
 /**/tests
 /**/dev-scripts/
 /uv.lock
+/hydrogenlib

{hydrogenlib_next-7 → hydrogenlib_next-9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HydrogenLib-NEXT
-Version: 7
+Version: 9
 Project-URL: Documentation, https://github.com/LittleNightSong/HydrogenLib#readme
 Project-URL: Issues, https://github.com/LittleNightSong/HydrogenLib/issues
 Project-URL: Source, https://github.com/LittleNightSong/HydrogenLib
@@ -15,7 +15,6 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.12
-Requires-Dist: hydrogenlib-core>=0.6.0
 Description-Content-Type: text/markdown
 
 <h1 align="center">HydrogenLib</h1>

{hydrogenlib_next-7 → hydrogenlib_next-9}/modules/cli/src/_hydrogenlib_cli/base/__init__.py

@@ -1,3 +1,3 @@
-from .cli import CLIBase
+from .runner import Runner
 from .metadata import *
 from .parser import AbstractParser

{hydrogenlib_next-7 → hydrogenlib_next-9}/modules/cli/src/_hydrogenlib_cli/base/metadata/__init__.py

@@ -1,2 +1,2 @@
 from .argument import Argument, ArgumentTypes
-from .command import CommandMeta
+from .command import CommandSpec

hydrogenlib_next-9/modules/cli/src/_hydrogenlib_cli/base/metadata/command.py

@@ -0,0 +1,66 @@
+import dataclasses
+import enum
+from collections import OrderedDict
+
+from _hydrogenlib_cli.base.metadata.argument import Argument
+
+
+class ArgTypes(str, enum.Enum):
+    POSITION = 'position'
+    KEYWORD = 'keyword'
+    SWITCH = 'switch'
+
+
+@dataclasses.dataclass
+class CommandSpec:
+    name: str
+    command: str
+    description: str
+
+    args: OrderedDict[str, Argument] = dataclasses.field(default_factory=OrderedDict)
+    kwargs: dict[str, Argument] = dataclasses.field(default_factory=dict)
+    switches: dict[str, Argument] = dataclasses.field(default_factory=dict)
+
+    mutually_exclusive: set[str] = None
+    requires: set[str] = None
+
+    _short_names_: dict[str, str] = dataclasses.field(init=False, default=None)
+    _all_names_: dict[str, str] = dataclasses.field(init=False, default=None)
+
+    def __post_init__(self):
+        self._short_names_ = {}
+        self._all_names_ = {}
+
+        for arg in self.args.values():
+            self._short_names_[arg.short_name] = arg.name
+            self._all_names_[arg.name] = ArgTypes.POSITION
+
+        for arg in self.kwargs.values():
+            self._short_names_[arg.short_name] = arg.name
+            self._all_names_[arg.name] = ArgTypes.KEYWORD
+
+        for arg in self.switches.values():
+            self._short_names_[arg.short_name] = arg.name
+            self._all_names_[arg.name] = ArgTypes.SWITCH
+
+    def get_fullname(self, name_or_short_name: str):
+        if name_or_short_name in self._short_names_:
+            return self._short_names_[name_or_short_name]
+        elif name_or_short_name in self._all_names_:
+            return name_or_short_name
+        else:
+            raise KeyError(name_or_short_name)
+
+    def get_argument(self, name: str):
+        name = self.get_fullname(name)
+
+        # if arg := self.args.get(name):
+        #     return arg
+        # elif arg := self.kwargs.get(name):
+        #     return arg
+        # elif arg := self.switches.get(name):
+        #     return arg
+        # else:
+        #     return None
+
+        return self.args.get(name) or self.kwargs.get(name) or self.switches.get(name)

{hydrogenlib_next-7 → hydrogenlib_next-9}/modules/cli/src/_hydrogenlib_cli/base/parser.py

@@ -3,7 +3,7 @@ from typing import Protocol
 
 
 class ParseResult(Protocol):
-    command_line: list[str]
+    original_argv: list[str]
     switches: set[str]
     positional_args: list[str]
     keyword_args: dict[str, str]

hydrogenlib_next-7/modules/cli/src/_hydrogenlib_cli/base/cli.py → hydrogenlib_next-9/modules/cli/src/_hydrogenlib_cli/base/runner.py

@@ -1,3 +1,3 @@
-class CLIBase:
+class Runner:
     def run(self, argv):
         ...

hydrogenlib_next-9/modules/cli/src/_hydrogenlib_cli/cli/command.py

@@ -0,0 +1,12 @@
+from collections.abc import Callable
+from typing import Any
+
+from ..base import Runner, CommandSpec
+
+
+class CommandRunner(Runner):
+    spec: CommandSpec
+    func: Callable[[...], Any]
+
+    def run(self, argv):
+        ...

{hydrogenlib_next-7 → hydrogenlib_next-9}/modules/cli/src/_hydrogenlib_cli/simple_parser.py

@@ -1,8 +1,8 @@
-from _hydrogenlib_cli.base.metadata.command import CommandMeta
+from _hydrogenlib_cli.base.metadata.command import CommandSpec
 
 
 class Parser:
-    def __init__(self, command: CommandMeta):
+    def __init__(self, command: CommandSpec):
         self._command = command
 
     def parse(self, argv):

hydrogenlib_next-9/modules/config/re-import/simple/utils.py

@@ -0,0 +1 @@
+from _hydrogenlib_config.simple.utils import *

{hydrogenlib_next-7 → hydrogenlib_next-9}/modules/config/src/_hydrogenlib_config/simple/__init__.py

@@ -3,3 +3,4 @@ from .builtin_mixins import NamedTupleMixin
 from .mixin import Mixin
 from _hydrogenlib_config_core.field import FieldInfo, Field
 from _hydrogenlib_config_core.type_registry import TypeRegistry
+from .gtr import gtr as global_type_registry

{hydrogenlib_next-7 → hydrogenlib_next-9}/pyproject.toml

@@ -1,57 +1,55 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "HydrogenLib-NEXT"
-dynamic = ["version"]
-readme = "README.md"
-requires-python = ">=3.12"
-keywords = []
-authors = [
-    { name = "LittleNightSong", email = "LittleNightSongYO@outlook.com" },
-]
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: Implementation :: PyPy"
-]
-dependencies = [
-    "hydrogenlib-core>=0.6.0",
-]
-
-import-names = ["hydrogenlib"]
-
-[project.urls]
-Documentation = "https://github.com/LittleNightSong/HydrogenLib#readme"
-Issues = "https://github.com/LittleNightSong/HydrogenLib/issues"
-Source = "https://github.com/LittleNightSong/HydrogenLib"
-
-[tool.hatch.version]
-path = "hydrogenlib/__init__.py"
-
-[[tool.uv.index]]
-url = "https://mirrors.aliyun.com/pypi/simple"
-default = true
-
-[dependency-groups]
-dev = [
-    "aiohttp",
-    "curl-cffi",
-    "hatch",
-    "hatchling",
-    "httpx",
-    "packaging>=25.0",
-    "pydantic",
-    "tomlkit",
-    "urllib3",
-    "uv",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = ["hydrogenlib"]
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "HydrogenLib-NEXT"
+dynamic = ["version"]
+readme = "README.md"
+requires-python = ">=3.12"
+keywords = []
+authors = [
+    { name = "LittleNightSong", email = "LittleNightSongYO@outlook.com" },
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy"
+]
+dependencies = []
+
+import-names = ["hydrogenlib"]
+
+[project.urls]
+Documentation = "https://github.com/LittleNightSong/HydrogenLib#readme"
+Issues = "https://github.com/LittleNightSong/HydrogenLib/issues"
+Source = "https://github.com/LittleNightSong/HydrogenLib"
+
+[tool.hatch.version]
+path = "hydrogenlib/__init__.py"
+
+[[tool.uv.index]]
+url = "https://mirrors.aliyun.com/pypi/simple"
+default = true
+
+[dependency-groups]
+dev = [
+    "aiohttp",
+    "curl-cffi",
+    "hatch",
+    "hatchling",
+    "httpx",
+    "packaging>=25.0",
+    "pydantic",
+    "tomlkit",
+    "urllib3",
+    "uv",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["hydrogenlib"]

hydrogenlib_next-7/hydrogenlib/__init__.py

@@ -1 +0,0 @@
-version = '7'

hydrogenlib_next-7/hydrogenlib/core.py

@@ -1 +0,0 @@
-

hydrogenlib_next-7/hydrogenlib/ctypes.py

@@ -1 +0,0 @@
-from _hydrogenlib_ctypes import *

hydrogenlib_next-7/hydrogenlib/resource_system.py

@@ -1 +0,0 @@
-from _hydrogenlib_resource_system import *

hydrogenlib_next-7/hydrogenlib/sample.py

@@ -1 +0,0 @@
-from _hydrogenlib_sample import *

hydrogenlib_next-7/hydrogenlib/tools.py

@@ -1 +0,0 @@
-from _hydrogenlib_tools import *

hydrogenlib_next-7/hydrogenlib/winreg.py

@@ -1 +0,0 @@
-from _hydrogenlib_winreg import *

hydrogenlib_next-7/modules/cli/src/_hydrogenlib_cli/base/metadata/command.py

@@ -1,61 +0,0 @@
-import dataclasses
-from collections import OrderedDict
-from itertools import chain
-
-from _hydrogenlib_core.typefunc import Function
-from _hydrogenlib_cli.base.metadata.argument import Argument
-
-
-@dataclasses.dataclass
-class CommandMeta:
-    name: str
-    command: str
-    description: str
-
-    args: OrderedDict[str, Argument] = dataclasses.field(default_factory=OrderedDict)
-    kwargs: dict[str, Argument] = dataclasses.field(default_factory=dict)
-    switches: dict[str, Argument] = dataclasses.field(default_factory=dict)
-
-    mutually_exclusive: set[str] = None
-    requires: set[str] = None
-
-    _short_names_ = None
-
-    def __post_init__(self):
-        self._short_names_ = {}
-        for arg in chain(self.args.values(), self.kwargs.values(), self.switches.values()):
-            if arg.short_name:
-                self._short_names_[arg.short_name] = arg.name
-
-    def get_fullname(self, name_or_short_name: str):
-        if name_or_short_name in self._short_names_:
-            return self._short_names_[name_or_short_name]
-        else:
-            return self._short_names_
-
-    def get_argument(self, name: str):
-        name = self.get_fullname(name)
-
-        if arg := self.args.get(name):
-            return arg
-        elif arg := self.kwargs.get(name):
-            return arg
-        elif arg := self.switches.get(name):
-            return arg
-        else:
-            return None
-
-
-# Decorator
-def command(
-        func, *, name: str = None, description: str = None,
-        command: str = None
-):
-    def decorator(func):
-        func = Function(func)
-
-        func.__command__ = cmd = CommandMeta(
-            name or func.name,
-            command or func.name,
-            description or func.doc
-        )

hydrogenlib_next-7/modules/cli/src/_hydrogenlib_cli/cli/command.py

@@ -1,6 +0,0 @@
-from ..base import CLIBase, CommandMeta
-
-
-
-class CLICommand(CLIBase):
-

hydrogenlib_next-7/modules/config/re-import/core/base.py

@@ -1 +0,0 @@
-from _hydrogenlib_config_core.base import *

hydrogenlib_next-7/modules/config/re-import/core/field.py

@@ -1 +0,0 @@
-from _hydrogenlib_config_core.field import *

hydrogenlib_next-7/modules/config/re-import/core/type_registry.py

@@ -1 +0,0 @@
-from _hydrogenlib_config_core.type_registry import *

hydrogenlib_next-7/modules/config/re-import/simple.py

@@ -1 +0,0 @@
-from _hydrogenlib_config.simple import *