More type fixes

Author: spookylukey

src/fluent_compiler/compiler.py

@@ -287,10 +287,10 @@ def messages_to_module(
     use_isolating: bool = True,
     functions: Mapping[str, Callable] | None = None,
     escapers: Sequence[IsEscaper] | None = None,
-) -> tuple:
+) -> tuple[codegen.Module, dict[str, str], dict[str, object], list[CompilationErrorItem]]:
     """
     Compile a set of {id: Message/Term objects} to a Python module, returning a tuple:
-    (codegen.Module object, dictionary mapping message IDs to Python functions,
+    (codegen.Module object, dictionary mapping message IDs to Python function names,
      module globals dictionary, errors list)
     """
     if functions is None:
@@ -405,7 +405,7 @@ def get_name_properties(name: str) -> dict[str, object]:
             function = compile_message(msg, msg_id, function_name, module, compiler_env)
             module.add_function(function_name, function)
 
-    module = codegen.simplify(module, Simplifier(compiler_env))
+    module = checked_cast(codegen.Module, codegen.simplify(module, Simplifier(compiler_env)))
     return (module, compiler_env.message_mapping, module_globals, compiler_env.errors)
 
 

src/fluent_compiler/types.py

@@ -247,7 +247,7 @@ def merge_options(
 
     # Use the options_class constructor because it might
     # have validators defined for the fields.
-    kwarg_options = options_class(**kwargs)
+    kwarg_options = options_class(**kwargs)  # type: ignore[reportArgumenType]
     # Then merge, using only the ones explicitly given as keyword params.
     for k in kwargs.keys():
         setattr(retval, k, getattr(kwarg_options, k))