[cdd/shared/parse/__init__.py] Expand kind2_instance_type ; [cdd/sq…

…lalchemy/utils/parser_utils.py] Implement `column_parse_extra_sql`

cdd/__init__.py

@@ -8,7 +8,7 @@
 from logging import getLogger as get_logger
 
 __author__ = "Samuel Marks"
-__version__ = "0.0.99-beta"
+__version__ = "0.0.99-rc0"
 __description__ = (
     "Open API to/fro routes, models, and tests. "
     "Convert between docstrings, classes, methods, argparse, pydantic, and SQLalchemy."

cdd/shared/parse/__init__.py

@@ -24,12 +24,15 @@
 ]
 
 kind2instance_type = {
-    "sqlalchemy_table": (Assign, AnnAssign),
     "argparse": (FunctionDef,),
-    "function": (FunctionDef, AsyncFunctionDef),
-    "pydantic": (FunctionDef, AsyncFunctionDef),
+    "argparse_function": (FunctionDef,),
     "class": (ClassDef,),
     "class_": (ClassDef,),
+    "function": (FunctionDef, AsyncFunctionDef),
+    "method": (FunctionDef, AsyncFunctionDef),
+    "pydantic": (ClassDef,),
+    "sqlalchemy_table": (Assign, AnnAssign),
+    "sqlalchemy": (ClassDef,),
 }
 
 __all__ = ["PARSERS", "kind2instance_type"]

cdd/sqlalchemy/utils/parser_utils.py

@@ -96,6 +96,21 @@
 )
 
 
+def column_parse_extra_sql(idx_arg):
+    """
+    Parse Column arg into extra sql type information
+
+    :param idx_arg: argument number, node
+    :type idx_arg: ```Tuple[int, AST]```
+
+    :rtype: ```Optional[Tuple[str, dict]]```
+    """
+    idx, arg = idx_arg
+    if idx < 2 and isinstance(arg, Name) and arg.id in column_type2typ:
+        return "x_typ", {"sql": {"type": arg.id}}
+    return None
+
+
 def column_parse_arg(idx_arg):
     """
     Parse Column arg
@@ -165,6 +180,7 @@ def column_call_to_param(call):
             chain.from_iterable(
                 (
                     map(column_parse_arg, enumerate(call.args)),
+                    map(column_parse_extra_sql, enumerate(call.args)),
                     map(column_parse_kwarg, call.keywords),
                 )
             ),