Fix keyword-only args with defaults

Author: msullivan

tests/test_type_dir.py

@@ -42,7 +42,7 @@ class Base[T]:
 
     fin: typing.Final[int]
 
-    def foo(self, a: T | None, b: int = 0) -> dict[str, T]:
+    def foo(self, a: T | None, *, b: int = 0) -> dict[str, T]:
         pass
 
     def base[Z](self, a: T | Z | None, b: K) -> dict[str, T | Z]:
@@ -166,7 +166,7 @@ class Final:
             fin: typing.Final[int]
             x: tests.test_type_dir.Wrapper[int | None]
             ordinary: str
-            def foo(self, a: int | None, b: int = 0) -> dict[str, int]: ...
+            def foo(self, a: int | None, *, b: int = 0) -> dict[str, int]: ...
             def base[Z](self, a: int | Z | None, b: ~K) -> dict[str, int | Z]: ...
             def cbase(cls, a: int | None, b: ~K) -> dict[str, int]: ...
             def sbase[Z](cls, a: int | Literal['gotcha!'] | Z | None, b: ~K) -> dict[str, int | Z]: ...
@@ -260,7 +260,8 @@ def test_type_dir_7():
 typing.Callable[[\
 typemap.typing.Param[typing.Literal['self'], typing.Any, typing.Never], \
 typemap.typing.Param[typing.Literal['a'], int | None, typing.Never], \
-typemap.typing.Param[typing.Literal['b'], int, typing.Literal['=']]], \
+typemap.typing.Param[typing.Literal['b'], int, typing.Literal['keyword', \
+'default']]], \
 dict[str, int]], typing.Literal['ClassVar'], tests.test_type_dir.Final]"
     )
 

typemap/type_eval/_apply_generic.py

@@ -133,7 +133,12 @@ def make_func(
     annos: dict[str, Any],
 ) -> types.FunctionType:
     new_func = types.FunctionType(
-        func.__code__, func.__globals__, "__call__", func.__defaults__, ()
+        func.__code__,
+        func.__globals__,
+        "__call__",
+        func.__defaults__,
+        (),
+        func.__kwdefaults__,
     )
 
     new_func.__module__ = func.__module__

typemap/type_eval/_eval_operators.py

@@ -203,8 +203,10 @@ def _ann(x):
             quals.append("*")
         if p.kind == inspect.Parameter.VAR_KEYWORD:
             quals.append("**")
+        if p.kind == inspect.Parameter.KEYWORD_ONLY:
+            quals.append("keyword")
         if p.default is not empty:
-            quals.append("=")
+            quals.append("default")
         params.append(
             Param[
                 typing.Literal[p.name if has_name else None],

typemap/type_eval/_eval_typing.py

@@ -121,7 +121,12 @@ def _eval_func(func: types.FunctionType | types.MethodType, ctx: EvalContext):
     annos = {name: _eval_types(tp, ctx) for name, tp in annos.items()}
 
     new_func = types.FunctionType(
-        root.__code__, root.__globals__, "__call__", root.__defaults__, ()
+        root.__code__,
+        root.__globals__,
+        "__call__",
+        root.__defaults__,
+        (),
+        root.__kwdefaults__,
     )
 
     new_func.__name__ = root.__name__

typemap/typing.py

@@ -17,8 +17,10 @@ class SpecialFormEllipsis:
 
 ###
 
+MemberQuals = typing.Literal["ClassVar", "Final"]
 
-class Member[N: str, T, Q: str = typing.Never, D = typing.Never]:
+
+class Member[N: str, T, Q: MemberQuals = typing.Never, D = typing.Never]:
     pass
 
 
@@ -32,7 +34,10 @@ class Attrs[T]:
     pass
 
 
-class Param[N: str | None, T, Q: str = typing.Never]:
+ParamQuals = typing.Literal["*", "**", "="]
+
+
+class Param[N: str | None, T, Q: ParamQuals = typing.Never]:
     pass