Fix keyword-only args with defaults

Author: msullivan

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