From 150377caf0caee41f2e0efc76544e18f3a285836 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 11 Mar 2026 23:58:46 -0700 Subject: [PATCH] Move input_filters inside the parser package (#56054) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56054 Changelog: [Internal] Moves `input_filers` inside the `parser` package. Imports outside of the package were causing errors when running the snapshot generator in OSS. Reviewed By: cipolleschi Differential Revision: D96109755 fbshipit-source-id: c29d70c895057fd51a92c1a073b331d27c0b289b --- scripts/cxx-api/parser/__main__.py | 1 + scripts/cxx-api/parser/builders.py | 2 +- scripts/cxx-api/parser/input_filters/__init__.py | 4 ++++ .../input_filters/handle_objc_interface_generics.py | 0 scripts/cxx-api/{ => parser}/input_filters/main.py | 0 .../{ => parser}/input_filters/strip_block_comments.py | 0 .../{ => parser}/input_filters/strip_deprecated_msg.py | 0 .../{ => parser}/input_filters/strip_ns_unavailable.py | 0 scripts/cxx-api/tests/test_input_filters.py | 8 ++++---- scripts/cxx-api/tests/test_snapshots.py | 2 +- 10 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 scripts/cxx-api/parser/input_filters/__init__.py rename scripts/cxx-api/{ => parser}/input_filters/handle_objc_interface_generics.py (100%) rename scripts/cxx-api/{ => parser}/input_filters/main.py (100%) rename scripts/cxx-api/{ => parser}/input_filters/strip_block_comments.py (100%) rename scripts/cxx-api/{ => parser}/input_filters/strip_deprecated_msg.py (100%) rename scripts/cxx-api/{ => parser}/input_filters/strip_ns_unavailable.py (100%) diff --git a/scripts/cxx-api/parser/__main__.py b/scripts/cxx-api/parser/__main__.py index 0bd9c514b73..4e4e88089d3 100644 --- a/scripts/cxx-api/parser/__main__.py +++ b/scripts/cxx-api/parser/__main__.py @@ -229,6 +229,7 @@ def main(): get_react_native_dir(), "scripts", "cxx-api", + "parser", "input_filters", "main.py", ) diff --git a/scripts/cxx-api/parser/builders.py b/scripts/cxx-api/parser/builders.py index af11aa36b20..9beb9a93880 100644 --- a/scripts/cxx-api/parser/builders.py +++ b/scripts/cxx-api/parser/builders.py @@ -17,7 +17,7 @@ import re from doxmlparser import compound -from ..input_filters.handle_objc_interface_generics import decode_objc_generics +from .input_filters.handle_objc_interface_generics import decode_objc_generics from .member import ( ConceptMember, EnumMember, diff --git a/scripts/cxx-api/parser/input_filters/__init__.py b/scripts/cxx-api/parser/input_filters/__init__.py new file mode 100644 index 00000000000..7bec24cb17b --- /dev/null +++ b/scripts/cxx-api/parser/input_filters/__init__.py @@ -0,0 +1,4 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. diff --git a/scripts/cxx-api/input_filters/handle_objc_interface_generics.py b/scripts/cxx-api/parser/input_filters/handle_objc_interface_generics.py similarity index 100% rename from scripts/cxx-api/input_filters/handle_objc_interface_generics.py rename to scripts/cxx-api/parser/input_filters/handle_objc_interface_generics.py diff --git a/scripts/cxx-api/input_filters/main.py b/scripts/cxx-api/parser/input_filters/main.py similarity index 100% rename from scripts/cxx-api/input_filters/main.py rename to scripts/cxx-api/parser/input_filters/main.py diff --git a/scripts/cxx-api/input_filters/strip_block_comments.py b/scripts/cxx-api/parser/input_filters/strip_block_comments.py similarity index 100% rename from scripts/cxx-api/input_filters/strip_block_comments.py rename to scripts/cxx-api/parser/input_filters/strip_block_comments.py diff --git a/scripts/cxx-api/input_filters/strip_deprecated_msg.py b/scripts/cxx-api/parser/input_filters/strip_deprecated_msg.py similarity index 100% rename from scripts/cxx-api/input_filters/strip_deprecated_msg.py rename to scripts/cxx-api/parser/input_filters/strip_deprecated_msg.py diff --git a/scripts/cxx-api/input_filters/strip_ns_unavailable.py b/scripts/cxx-api/parser/input_filters/strip_ns_unavailable.py similarity index 100% rename from scripts/cxx-api/input_filters/strip_ns_unavailable.py rename to scripts/cxx-api/parser/input_filters/strip_ns_unavailable.py diff --git a/scripts/cxx-api/tests/test_input_filters.py b/scripts/cxx-api/tests/test_input_filters.py index 8370e61c82a..b7a5dae08c6 100644 --- a/scripts/cxx-api/tests/test_input_filters.py +++ b/scripts/cxx-api/tests/test_input_filters.py @@ -7,13 +7,13 @@ from __future__ import annotations import unittest -from ..input_filters.handle_objc_interface_generics import ( +from ..parser.input_filters.handle_objc_interface_generics import ( decode_objc_generics, encode_objc_interface_generics, ) -from ..input_filters.strip_block_comments import strip_block_comments -from ..input_filters.strip_deprecated_msg import strip_deprecated_msg -from ..input_filters.strip_ns_unavailable import strip_ns_unavailable +from ..parser.input_filters.strip_block_comments import strip_block_comments +from ..parser.input_filters.strip_deprecated_msg import strip_deprecated_msg +from ..parser.input_filters.strip_ns_unavailable import strip_ns_unavailable class TestDoxygenStripComments(unittest.TestCase): diff --git a/scripts/cxx-api/tests/test_snapshots.py b/scripts/cxx-api/tests/test_snapshots.py index 5c52d0fe5d3..7a90b9b9807 100644 --- a/scripts/cxx-api/tests/test_snapshots.py +++ b/scripts/cxx-api/tests/test_snapshots.py @@ -106,7 +106,7 @@ def _make_case_test(case_dir: Traversable, tests_root: Traversable): # Find the filter script in the package resources pkg_root = ir.files(__package__ if __package__ else "__main__") - filter_script = pkg_root.parent / "input_filters" / "main.py" + filter_script = pkg_root.parent / "parser" / "input_filters" / "main.py" # Get real filesystem path for filter script if it exists # IMPORTANT: Keep the context manager active while Doxygen runs,