Remove default field path of FluentKey

pyproject.toml

@@ -139,7 +139,6 @@ pretty = true
 show_absolute_path = true
 show_error_codes = true
 show_error_context = true
-warn_redundant_casts = true
 warn_unused_configs = true
 warn_unused_ignores = true
 disable_error_code = [

src/ftl_extract/code_extractor.py

@@ -34,6 +34,7 @@ def parse_file(
     path: Path,
     i18n_keys: str | Iterable[str],
     ignore_attributes: Iterable[str],
+    default_ftl_file: Path,
 ) -> dict[str, FluentKey]:
     """
     Second step: parse given .py file and find all i18n calls.
@@ -44,11 +45,18 @@ def parse_file(
     :type i18n_keys: str | Sequence[str]
     :param ignore_attributes: Ignore attributes, like `i18n.set_locale`.
     :type ignore_attributes: Sequence[str]
+    :param default_ftl_file: Default name of FTL file.
+    :type default_ftl_file: Path
     :return: Dict with `key` and `FluentKey`.
     :rtype: dict[str, FluentKey]
     """
     node = ast.parse(path.read_bytes())
-    matcher = I18nMatcher(code_path=path, func_names=i18n_keys, ignore_attributes=ignore_attributes)
+    matcher = I18nMatcher(
+        code_path=path,
+        default_ftl_file=default_ftl_file,
+        func_names=i18n_keys,
+        ignore_attributes=ignore_attributes,
+    )
     matcher.visit(node)
     return matcher.fluent_keys
 
@@ -60,7 +68,7 @@ def post_process_fluent_keys(fluent_keys: dict[str, FluentKey], default_ftl_file
     :param fluent_keys: Dict with `key` and `FluentKey` that will be post-processed.
     :type fluent_keys: dict[str, FluentKey]
     :param default_ftl_file: Default name of FTL file.
-    :type default_ftl_file: str
+    :type default_ftl_file: Path
     """
     for fluent_key in fluent_keys.values():
         if not isinstance(fluent_key.path, Path):
@@ -119,15 +127,20 @@ def extract_fluent_keys(
     :param ignore_attributes: Ignore attributes, like `i18n.set_locale`.
     :type ignore_attributes: Sequence[str]
     :param default_ftl_file: Default name of FTL file.
-    :type default_ftl_file: str
+    :type default_ftl_file: Path
     :return: Dict with `key` and `FluentKey`.
     :rtype: dict[str, FluentKey]
 
     """
     fluent_keys: dict[str, FluentKey] = {}
 
     for file in find_py_files(path):
-        keys = parse_file(path=file, i18n_keys=i18n_keys, ignore_attributes=ignore_attributes)
+        keys = parse_file(
+            path=file,
+            i18n_keys=i18n_keys,
+            ignore_attributes=ignore_attributes,
+            default_ftl_file=default_ftl_file,
+        )
         post_process_fluent_keys(keys, default_ftl_file)
         find_conflicts(fluent_keys, keys)
         fluent_keys.update(keys)

src/ftl_extract/matcher.py

@@ -38,7 +38,7 @@ class FluentKey:
     code_path: Path
     key: str
     translation: fluent_ast.EntryType
-    path: Path = field(default=Path("_default.ftl"))
+    path: Path
     locale: str | None = field(default=None)
     position: int | float = field(default=inf)
 
@@ -47,6 +47,7 @@ class I18nMatcher(ast.NodeVisitor):
     def __init__(
         self,
         code_path: Path,
+        default_ftl_file: Path,
         func_names: str | Iterable[str] = I18N_LITERAL,
         ignore_attributes: str | Iterable[str] = IGNORE_ATTRIBUTES,
     ) -> None:
@@ -66,6 +67,7 @@ def __init__(
             if isinstance(ignore_attributes, str)
             else frozenset(ignore_attributes)
         )
+        self.default_ftl_file = default_ftl_file
         self.fluent_keys: dict[str, FluentKey] = {}
 
     def visit_Call(self, node: ast.Call) -> None:  # noqa: N802
@@ -96,6 +98,7 @@ def visit_Call(self, node: ast.Call) -> None:  # noqa: N802
                         code_path=self.code_path,
                         key=key,
                         keywords=node.keywords,
+                        default_ftl_file=self.default_ftl_file,
                     )
 
                     process_fluent_key(self.fluent_keys, fluent_key)
@@ -109,6 +112,7 @@ def visit_Call(self, node: ast.Call) -> None:  # noqa: N802
                         code_path=self.code_path,
                         key="-".join(reversed(attrs)),
                         keywords=node.keywords,
+                        default_ftl_file=self.default_ftl_file,
                     )
                     process_fluent_key(self.fluent_keys, fluent_key)
             else:
@@ -122,6 +126,7 @@ def visit_Call(self, node: ast.Call) -> None:  # noqa: N802
                 code_path=self.code_path,
                 key=cast(ast.Constant, node.args[0]).value,
                 keywords=node.keywords,
+                default_ftl_file=self.default_ftl_file,
             )
             process_fluent_key(self.fluent_keys, fluent_key)
 
@@ -132,6 +137,7 @@ def create_fluent_key(
     code_path: Path,
     key: str,
     keywords: list[ast.keyword],
+    default_ftl_file: Path,
 ) -> FluentKey:
     fluent_key = FluentKey(
         code_path=code_path,
@@ -140,6 +146,7 @@ def create_fluent_key(
             id=fluent_ast.Identifier(name=key),
             value=fluent_ast.Pattern(elements=[fluent_ast.TextElement(value=key)]),
         ),
+        path=default_ftl_file,
     )
 
     for kw in keywords:

tests/test_extract/test_cli_extractor.py

@@ -10,6 +10,7 @@
 from fluent.syntax import ast as fl_ast
 
 from ftl_extract.cli import cli_extract
+from ftl_extract.const import DEFAULT_FTL_FILE
 from ftl_extract.ftl_extractor import extract
 from ftl_extract.matcher import FluentKey, I18nMatcher
 
@@ -187,6 +188,7 @@ def test_comment_junk_elements_if_needed(setup_environment: tuple[Path, Path]) -
 
     mock_junk_key = MagicMock(spec=FluentKey)
     mock_junk_key.translation = MagicMock(spec=fl_ast.Junk)
+    mock_junk_key.path = MagicMock(spec=Path)
     mock_serializer = MagicMock(spec=FluentSerializer)
 
     with (
@@ -305,7 +307,7 @@ def test_keys_to_comment_and_add_on_different_kwargs(setup_environment: tuple[Pa
 
 def test_i18n_matcher_skips_call_with_no_args(setup_environment: tuple[Path, Path]) -> None:
     code_path, output_path = setup_environment
-    matcher = I18nMatcher(code_path)
+    matcher = I18nMatcher(code_path, default_ftl_file=DEFAULT_FTL_FILE)
 
     node = ast.Call(func=ast.Attribute(value=ast.Name(id="i18n"), attr="get"), args=[], keywords=[])
     matcher.visit_Call(node)
@@ -315,7 +317,7 @@ def test_i18n_matcher_skips_call_with_no_args(setup_environment: tuple[Path, Pat
 
 def test_generic_visit_called_on_else_block(setup_environment: tuple[Path, Path]) -> None:
     code_path, output_path = setup_environment
-    matcher = I18nMatcher(code_path)
+    matcher = I18nMatcher(code_path, default_ftl_file=DEFAULT_FTL_FILE)
 
     node = ast.Call(
         func=ast.Attribute(value=ast.Name(id="i18n"), attr="get"),
@@ -332,7 +334,11 @@ def test_generic_visit_called_when_attr_in_ignore_attributes(
     setup_environment: tuple[Path, Path],
 ) -> None:
     code_path, output_path = setup_environment
-    matcher = I18nMatcher(code_path, ignore_attributes={"ignore_this"})
+    matcher = I18nMatcher(
+        code_path,
+        default_ftl_file=DEFAULT_FTL_FILE,
+        ignore_attributes={"ignore_this"},
+    )
 
     # Create a mock AST node for a function call with an attribute in ignore_attributes
     node = ast.Call(
@@ -354,7 +360,7 @@ def test_generic_visit_called_when_attr_in_ignore_attributes(
 
 def test_i18n_matcher_skips_call_with_no_args_in_elif(setup_environment: tuple[Path, Path]) -> None:
     code_path, output_path = setup_environment
-    matcher = I18nMatcher(code_path)
+    matcher = I18nMatcher(code_path, default_ftl_file=DEFAULT_FTL_FILE)
 
     node = ast.Call(func=ast.Name(id="i18n", ctx=ast.Load()), args=[], keywords=[])
     matcher.visit_Call(node)

tests/test_kwargs_extractor.py

@@ -2,6 +2,7 @@
 
 from fluent.syntax import ast
 
+from ftl_extract.const import DEFAULT_FTL_FILE
 from ftl_extract.matcher import FluentKey
 from ftl_extract.process.kwargs_extractor import extract_kwargs
 
@@ -22,6 +23,7 @@ def extracts_variable_names_from_simple_variable() -> None:
                     ],
                 ),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == {"username"}
@@ -56,6 +58,7 @@ def extracts_variable_names_from_select_expression() -> None:
                     ],
                 ),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == {"gender"}
@@ -70,6 +73,7 @@ def returns_empty_set_for_messages_without_variables() -> None:
                 id=ast.Identifier("no_variables"),
                 value=ast.Pattern(elements=[ast.TextElement("Just a text message.")]),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == set()
@@ -81,6 +85,7 @@ def test_returns_empty_set_for_comment_translation() -> None:
             code_path=Path("test.py"),
             key="key-1",
             translation=ast.Comment(content="This is a comment"),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == set()
@@ -95,6 +100,7 @@ def test_returns_empty_set_for_translation_without_value() -> None:
                 id=ast.Identifier("message_no_value"),
                 value=None,  # Explicitly setting value to None
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == set()
@@ -120,6 +126,7 @@ def test_extracts_variable_names_from_mixed_elements() -> None:
                     ],
                 ),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == {"username", "balance"}
@@ -158,6 +165,7 @@ def test_extracts_selector_variable_name_from_select_expression() -> None:
                     ],
                 ),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     )
     assert kwargs == {"user_status"}
@@ -292,6 +300,7 @@ def test_nested_extraction() -> None:
                     ],
                 ),
             ),
+            path=DEFAULT_FTL_FILE,
             locale="en",
             position=0,
         ),

tests/test_serializer.py

@@ -3,6 +3,7 @@
 import pytest
 from fluent.syntax import FluentSerializer, ast
 
+from ftl_extract.const import DEFAULT_FTL_FILE
 from ftl_extract.matcher import FluentKey
 from ftl_extract.process.serializer import generate_ftl
 
@@ -17,6 +18,7 @@ def single_fluent_key() -> list[FluentKey]:
                 id=ast.Identifier("greeting"),
                 value=ast.Pattern(elements=[ast.TextElement("Hello, world!")]),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     ]
 
@@ -31,6 +33,7 @@ def multiple_fluent_keys() -> list[FluentKey]:
                 id=ast.Identifier("greeting"),
                 value=ast.Pattern(elements=[ast.TextElement("Hello, world!")]),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
         FluentKey(
             code_path=Path("test.py"),
@@ -39,6 +42,7 @@ def multiple_fluent_keys() -> list[FluentKey]:
                 id=ast.Identifier("farewell"),
                 value=ast.Pattern(elements=[ast.TextElement("Goodbye, world!")]),
             ),
+            path=DEFAULT_FTL_FILE,
         ),
     ]
 
@@ -95,6 +99,7 @@ def test_generate_ftl_includes_leave_as_is_elements() -> None:
                     id=ast.Identifier("test_message"),
                     value=ast.Pattern(elements=[ast.TextElement("Test message content")]),
                 ),
+                path=DEFAULT_FTL_FILE,
             ),
         ],
         serializer=FluentSerializer(with_junk=True),
@@ -103,16 +108,19 @@ def test_generate_ftl_includes_leave_as_is_elements() -> None:
                 code_path=Path(),
                 key="",
                 translation=ast.Comment(content="This is a comment"),
+                path=DEFAULT_FTL_FILE,
             ),
             FluentKey(
                 code_path=Path(),
                 key="",
                 translation=ast.GroupComment(content="This is a group comment"),
+                path=DEFAULT_FTL_FILE,
             ),
             FluentKey(
                 code_path=Path(),
                 key="",
                 translation=ast.ResourceComment(content="This is a resource comment"),
+                path=DEFAULT_FTL_FILE,
             ),
             FluentKey(
                 code_path=Path(),
@@ -121,13 +129,15 @@ def test_generate_ftl_includes_leave_as_is_elements() -> None:
                     id=ast.Identifier("test_term"),
                     value=ast.Pattern(elements=[ast.TextElement("Test term content")]),
                 ),
+                path=DEFAULT_FTL_FILE,
             ),
             FluentKey(
                 code_path=Path(),
                 key="",
                 translation=ast.Junk(
                     content="This is junk content",
                 ),
+                path=DEFAULT_FTL_FILE,
             ),
         ],
     )