c2e 1.dev6__tar.gz → 1.dev8__tar.gz

{c2e-1.dev6/src/c2e.egg-info → c2e-1.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2e
-Version: 1.dev6
+Version: 1.dev8
 Summary: C2E: Console Command Engine
 Author: iFamished
 License: GPL-3.0

{c2e-1.dev6 → c2e-1.dev8}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "c2e"
-version = "1-dev.6"
+version = "1-dev.8"
 description = "C2E: Console Command Engine"
 readme = "README.md"
 requires-python = ">=3.14"

{c2e-1.dev6 → c2e-1.dev8}/src/c2e/dsl.py

@@ -3,9 +3,11 @@ import inspect
 
 from mapres import res
 
-
 COMMANDS = {}
 
+# ------------------------------------------------------------
+# Shared metadata structures
+# ------------------------------------------------------------
 
 @dataclass
 class ParamSpec:
@@ -15,14 +17,12 @@ class ParamSpec:
     func: callable
     desc: str | None
 
-
 @dataclass
 class FlagSpec:
     name: str
     func: callable
     desc: str | None
 
-
 @dataclass
 class ArgMeta:
     name: str
@@ -32,28 +32,38 @@ class ArgMeta:
     required_flags: set[str]
 
 
-class ChildSpec:
-    def __init__(self, parent, name, func):
-        self.parent = parent
-        self.name = name
+# ------------------------------------------------------------
+# Base class for CommandSpec and ChildSpec
+# ------------------------------------------------------------
+
+class BaseSpec:
+    def __init__(self, func):
         self.func = func
         self.params = {}
         self.flags = {}
         self.args_meta = {}
         self.desc = self._doc(func)
+
         self._extract_args_block()
         self._parse_args_meta()
         self._infer_arg_requirement()
 
+    # ------------------------------
+    # Docstring extraction
+    # ------------------------------
     def _doc(self, f):
         d = f.__doc__
         return d.strip().splitlines()[0].strip() if d else None
 
+    # ------------------------------
+    # __args__ block extraction
+    # ------------------------------
     def _extract_args_block(self):
         src = inspect.getsource(self.func)
         lines = src.splitlines()
         block = []
         in_block = False
+
         for line in lines:
             s = line.strip()
             if s.startswith('__args__'):
@@ -66,18 +76,24 @@ class ChildSpec:
                     else:
                         break
                 block.append(line)
+
         if block:
             raw = '\n'.join(l.strip() for l in block)
             setattr(self.func, '__args__', raw)
 
+    # ------------------------------
+    # Parse __args__ metadata
+    # ------------------------------
     def _parse_args_meta(self):
         raw = getattr(self.func, '__args__', None)
         if not raw:
             return
+
         for line in raw.splitlines():
             s = line.strip()
             if not s:
                 continue
+
             if ':' in s:
                 arg, rest = s.split(':', 1)
                 arg = arg.strip()
@@ -85,15 +101,18 @@ class ChildSpec:
             else:
                 arg = s
                 tokens = []
+
             params = []
             flags = []
             req_p = set()
             req_f = set()
+
             for t in tokens:
                 required = True
                 if t.startswith('[') and t.endswith(']'):
                     required = False
                     t = t[1:-1].strip()
+
                 if t.startswith('--'):
                     f = t[2:]
                     flags.append(f)
@@ -103,11 +122,16 @@ class ChildSpec:
                     params.append(t)
                     if required:
                         req_p.add(t)
+
             self.args_meta[arg] = ArgMeta(arg, params, flags, req_p, req_f)
 
+    # ------------------------------
+    # Infer required/optional positional arg
+    # ------------------------------
     def _infer_arg_requirement(self):
         sig = inspect.signature(self.func)
         ps = list(sig.parameters.values())
+
         if len(ps) == 1:
             self.requires_arg = False
             self.optional_arg = False
@@ -123,6 +147,9 @@ class ChildSpec:
             self.requires_arg = False
             self.optional_arg = False
 
+    # ------------------------------
+    # Param decorator
+    # ------------------------------
     def param(self, name, type=str, default=None):
         def deco(f):
             py = name.replace('-', '_')
@@ -131,6 +158,9 @@ class ChildSpec:
             return f
         return deco
 
+    # ------------------------------
+    # Flag decorator
+    # ------------------------------
     def flag(self, name):
         def deco(f):
             py = name.replace('-', '_')
@@ -140,35 +170,27 @@ class ChildSpec:
         return deco
 
 
-class CommandSpec:
-    def __init__(self, name, func, namespace=False):
+# ------------------------------------------------------------
+# ChildSpec (inherits BaseSpec)
+# ------------------------------------------------------------
+
+class ChildSpec(BaseSpec):
+    def __init__(self, parent, name, func):
+        self.parent = parent
         self.name = name
-        self.func = func
-        self.children = {}
-        self.params = {}
-        self.flags = {}
-        self.desc = self._doc(func)
-        self.is_namespace = namespace
+        super().__init__(func)
 
-    def _doc(self, f):
-        d = f.__doc__
-        return d.strip().splitlines()[0].strip() if d else None
 
-    def param(self, name, type=str, default=None):
-        def deco(f):
-            py = name.replace('-', '_')
-            d = f.__doc__.strip().splitlines()[0].strip() if f.__doc__ else None
-            self.params[py] = ParamSpec(name, type, default, f, d)
-            return f
-        return deco
+# ------------------------------------------------------------
+# CommandSpec (inherits BaseSpec)
+# ------------------------------------------------------------
 
-    def flag(self, name):
-        def deco(f):
-            py = name.replace('-', '_')
-            d = f.__doc__.strip().splitlines()[0].strip() if f.__doc__ else None
-            self.flags[py] = FlagSpec(name, f, d)
-            return f
-        return deco
+class CommandSpec(BaseSpec):
+    def __init__(self, name, func, namespace=False):
+        self.name = name
+        self.children = {}
+        self.is_namespace = namespace
+        super().__init__(func)
 
     def child(self, name):
         def deco(f):
@@ -179,6 +201,10 @@ class CommandSpec:
         return deco
 
 
+# ------------------------------------------------------------
+# DSL entry point
+# ------------------------------------------------------------
+
 class CommandDSL:
     def __call__(self, name, namespace=False):
         def deco(f):
@@ -187,10 +213,13 @@ class CommandDSL:
             return spec
         return deco
 
-
 command = CommandDSL()
 
 
+# ------------------------------------------------------------
+# ParsedArgs structure
+# ------------------------------------------------------------
+
 @dataclass
 class ParsedArgs:
     sub: str | None
@@ -199,15 +228,21 @@ class ParsedArgs:
     params: dict[str, str]
 
 
+# ------------------------------------------------------------
+# Line parser
+# ------------------------------------------------------------
+
 def parse_line(raw):
     raw = raw.strip()
     if not raw:
         return ParsedArgs(None, [], {}, {})
+
     parts = raw.split()
     sub = parts[0]
     pos = []
     flags = {}
     params = {}
+
     for t in parts[1:]:
         if t.startswith('--'):
             flags[t[2:]] = True
@@ -216,9 +251,14 @@ def parse_line(raw):
             params[k.lower()] = v
         else:
             pos.append(t)
+
     return ParsedArgs(sub, pos, flags, params)
 
 
+# ------------------------------------------------------------
+# Help generation (unchanged)
+# ------------------------------------------------------------
+
 def help_command(cmd):
     lines = []
     d = cmd.desc or 'No description'
@@ -309,6 +349,7 @@ def help_arg(child, meta):
     u = res(f'<aqua>Usage:<reset> <gold>{p}<reset> <green>{child.name}<reset> <aqua>{a}<reset>')
     req = []
     opt = []
+
     for pn in meta.params:
         ps = child.params.get(pn)
         t = ps.type_.__name__ if ps else 'str'
@@ -316,12 +357,15 @@ def help_arg(child, meta):
             req.append(res(f'<dark_gray>\\<<reset>{pn}:{t}<dark_gray>\\><reset>'))
         else:
             opt.append(res(f'<dark_gray>[<reset>{pn}:{t}<dark_gray>]<reset>'))
+
     if req:
         u += ' ' + ' '.join(req)
     if opt:
         u += ' ' + ' '.join(opt)
+
     if meta.flags:
         u += res(' <dark_gray>[<reset>--flags<dark_gray>]<reset>')
+
     lines.append(u)
 
     if meta.params:

{c2e-1.dev6 → c2e-1.dev8/src/c2e.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2e
-Version: 1.dev6
+Version: 1.dev8
 Summary: C2E: Console Command Engine
 Author: iFamished
 License: GPL-3.0