Fixes for type signatures relating to Escaper/IsEscaper

Author: spookylukey

src/fluent_compiler/bundle.py

@@ -2,7 +2,7 @@
 
 from typing import Any, Callable, Sequence
 
-from fluent_compiler.escapers import Escaper
+from fluent_compiler.escapers import IsEscaper
 
 from .compiler import CompilationErrorItem, compile_messages
 from .resource import FtlResource
@@ -28,7 +28,7 @@ def __init__(
         resources: Sequence[FtlResource],
         functions: dict[str, Callable] | None = None,
         use_isolating: bool = True,
-        escapers: Sequence[Escaper] | None = None,
+        escapers: Sequence[IsEscaper] | None = None,
     ):
         self.locale = locale
         compiled_ftl = compile_messages(
@@ -48,7 +48,7 @@ def from_string(
         text: str,
         functions: dict[str, Callable] | None = None,
         use_isolating: bool = True,
-        escapers: Sequence[Escaper] | None = None,
+        escapers: Sequence[IsEscaper] | None = None,
     ) -> FluentBundle:
         return cls(
             locale,

src/fluent_compiler/compiler.py

@@ -30,8 +30,8 @@
     FluentReferenceError,
 )
 from .escapers import (
-    Escaper,
     EscaperJoin,
+    IsEscaper,
     NullEscaper,
     RegisteredEscaper,
     escaper_for_message,
@@ -176,7 +176,7 @@ def compile_messages(
     resources: Sequence[FtlResource],
     use_isolating: bool = True,
     functions: dict[str, Callable] | None = None,
-    escapers: Sequence[Escaper] | None = None,
+    escapers: Sequence[IsEscaper] | None = None,
 ) -> CompiledFtl:
     """
     Compile a list of FtlResource to a Python module,
@@ -280,7 +280,7 @@ def messages_to_module(
     locale: babel.Locale,
     use_isolating: bool = True,
     functions: Mapping[str, Callable] | None = None,
-    escapers: Sequence[Escaper] | None = None,
+    escapers: Sequence[IsEscaper] | None = None,
 ) -> tuple:
     """
     Compile a set of {id: Message/Term objects} to a Python module, returning a tuple:

src/fluent_compiler/escapers.py

@@ -40,7 +40,7 @@ class IsEscaper(Protocol[T]):
     name: Final[str]
     use_isolating: Final[bool | None]
 
-    def select(self, **kwargs: object) -> bool:
+    def select(self, message_id: str, **kwargs: object) -> bool:
         ...
 
     def escape(self, unescaped: str, /) -> T:
@@ -75,7 +75,7 @@ def __init__(self) -> None:
         self.use_isolating = None
         self.output_type = str
 
-    def select(**kwargs: object) -> bool:
+    def select(self, message_id: str, **kwargs: object) -> bool:
         return True
 
     def escape(self, unescaped: str) -> str:
@@ -135,7 +135,7 @@ class RegisteredEscaper:
     functions are called in the compiler environment.
     """
 
-    def __init__(self, escaper: Escaper, compiler_env: CompilerEnvironment):
+    def __init__(self, escaper: IsEscaper, compiler_env: CompilerEnvironment):
         self._escaper = escaper
         self._compiler_env = compiler_env