Remove container_of and support "of {key: value}" syntax

This syntax is used by Pandas [1]. I'm not entirely sold yet, but let's
add it for now. To avoid confusion, literals should probably be made to
only be accepted on the top-level. Otherwise something like
`dict of {{"a", "b"}: int}` becomes possible.

Co-authored-by: Oriol Abril-Pla <oriol.abril.pla@gmail.com>

Author: lagru

examples/example_pkg-stubs/_basic.pyi

@@ -14,12 +14,14 @@ __all__ = [
 
 def func_empty(a1, a2, a3) -> None: ...
 def func_contains(
-    self,
     a1: list[float],
     a2: dict[str, Union[int, str]],
     a3: Sequence[int | float],
     a4: frozenset[bytes],
-) -> tuple[tuple[int, ...], list[int]]: ...
+    a5: tuple[int],
+    a6: list[int, str],
+    a7: dict[str, int],
+) -> None: ...
 def func_literals(
     a1: Literal[1, 3, "foo"], a2: Literal["uno", 2, "drei", "four"] = ...
 ) -> None: ...

examples/example_pkg/_basic.py

@@ -26,7 +26,7 @@ def func_empty(a1, a2, a3):
     """
 
 
-def func_contains(self, a1, a2, a3, a4):
+def func_contains(a1, a2, a3, a4, a5, a6, a7):
     """Dummy.
 
     Parameters
@@ -35,11 +35,9 @@ def func_contains(self, a1, a2, a3, a4):
     a2 : dict[str, Union[int, str]]
     a3 : Sequence[int | float]
     a4 : frozenset[bytes]
-
-    Returns
-    -------
-    r1 : tuple of int
-    r2 : list of int
+    a5 : tuple of int
+    a6 : list of (int, str)
+    a7 : dict of {str: int}
     """
 
 

src/docstub/_docstrings.py

@@ -239,14 +239,6 @@ def shape_n_dtype(self, tree):
             name = f"{name}[{', '.join(children)}]"
         return name
 
-    def container_of(self, tree):
-        assert len(tree.children) == 2
-        container_name, item_type = tree.children
-        if container_name == "tuple":
-            item_type += ", ..."
-        out = f"{container_name}[{item_type}]"
-        return out
-
     def contains(self, tree):
         out = ", ".join(tree.children)
         out = f"[{out}]"

src/docstub/doctype.lark

@@ -7,7 +7,6 @@ type_or : type (("or" | "|") type)*
 ?type : qualname
       | sphinx_ref
       | "{" literal ("," literal)* "}" -> literals
-      | container_of
       | shape_n_dtype
 
 optional : "optional"
@@ -20,14 +19,11 @@ sphinx_ref : ":" (NAME ":")? NAME ":`" qualname "`"
 // Name with leading dot separated path
 qualname : (/~/ ".")? (NAME ".")* NAME contains?
 
-
 contains: "[" type_or ("," type_or)* "]"
         | "[" type_or "," PY_ELLIPSES "]"
-
-
-// Container-of
-container_of : NAME "of" type_or
-
+        | "of" type
+        | "of" "(" type_or ("," type_or)* ")"
+        | "of" "{" type_or ":" type_or "}"
 
 // Array-like form with dtype or shape information
 shape_n_dtype : shape? ARRAY_NAME ("of" dtype)?
@@ -40,7 +36,7 @@ ARRAY_NAME : "array"
            | "ndarray"
            | "array-like"
            | "array_like"
-dtype : NAME
+dtype : qualname
 shape : "(" dim ",)"
       | "(" leading_optional? dim (("," dim | insert_optional))* ")"
       | NUMBER "-"? "D"