From 725b056dc7a72d65f9beb4ce8894fa9f91054740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Thu, 5 Mar 2026 07:21:42 -0800 Subject: [PATCH] Filter category members from interface scope (#55899) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55899 Doxygen incorrectly merges category members into the base interface XML output. This causes duplicate members to appear in both the category scope and the interface scope. The fix detects category members by checking if their definition contains the pattern `ClassName(CategoryName)::` (e.g., `RCTBridgeProxy(Cxx)::cxxOnlyProperty`) and filters them out when processing interface sections. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D95191148 fbshipit-source-id: 69d2f35d5aabd8e7567d254dc9b4686b4da2eb89 --- scripts/cxx-api/parser/builders.py | 34 +++++++++++++++++++ .../snapshot.api | 1 - .../snapshot.api | 2 -- .../snapshot.api | 1 - .../snapshot.api | 2 -- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/scripts/cxx-api/parser/builders.py b/scripts/cxx-api/parser/builders.py index e3c0b772818..95c8dba7faf 100644 --- a/scripts/cxx-api/parser/builders.py +++ b/scripts/cxx-api/parser/builders.py @@ -389,15 +389,40 @@ def create_enum_scope(snapshot: Snapshot, enum_def: compound.EnumdefType) -> Non ) +def _is_category_member(member_def: compound.MemberdefType) -> bool: + """ + Check if a member comes from a category based on its definition. + + Doxygen merges category members into the base interface XML output, but the + member's definition field contains the category name in parentheses, e.g.: + "int RCTBridgeProxy(Cxx)::cxxOnlyProperty" + + We use this to filter out category members from the interface scope. + """ + definition = member_def.definition + if not definition: + return False + + # Look for pattern: ClassName(CategoryName)::memberName + # The definition contains the qualified name with category info + return bool(re.search(r"\w+\([^)]+\)::", definition)) + + def _process_objc_sections( snapshot: Snapshot, scope, section_defs: list, location_file: str, scope_type: str, + filter_category_members: bool = False, ) -> None: """ Common section processing for protocols and interfaces. + + Args: + filter_category_members: If True, skip members that come from categories. + This is used for interfaces since Doxygen incorrectly merges category + members into the base interface XML output. """ for section_def in section_defs: kind = section_def.kind @@ -412,11 +437,15 @@ def _process_objc_sections( if member_type == "attrib": for member_def in section_def.memberdef: if member_def.kind == "variable": + if filter_category_members and _is_category_member(member_def): + continue scope.add_member( get_variable_member(member_def, visibility, is_static) ) elif member_type == "func": for function_def in section_def.memberdef: + if filter_category_members and _is_category_member(function_def): + continue scope.add_member( get_function_member(function_def, visibility, is_static) ) @@ -425,6 +454,8 @@ def _process_objc_sections( if member_def.kind == "enum": create_enum_scope(snapshot, member_def) elif member_def.kind == "typedef": + if filter_category_members and _is_category_member(member_def): + continue scope.add_member(get_typedef_member(member_def, visibility)) else: print( @@ -435,6 +466,8 @@ def _process_objc_sections( elif visibility == "property": for member_def in section_def.memberdef: if member_def.kind == "property": + if filter_category_members and _is_category_member(member_def): + continue scope.add_member( get_property_member(member_def, "public", is_static) ) @@ -504,6 +537,7 @@ def create_interface_scope( scope_def.sectiondef, scope_def.location.file, "interface", + filter_category_members=True, ) diff --git a/scripts/cxx-api/tests/snapshots/should_handle_category_with_method/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_category_with_method/snapshot.api index a09b6d80df7..55910acb2ed 100644 --- a/scripts/cxx-api/tests/snapshots/should_handle_category_with_method/snapshot.api +++ b/scripts/cxx-api/tests/snapshots/should_handle_category_with_method/snapshot.api @@ -3,5 +3,4 @@ category RCTConvert(UIActivityIndicatorView) { } interface RCTConvert : public NSObject { - public virtual static UIActivityIndicatorViewStyle UIActivityIndicatorViewStyle:(id json); } diff --git a/scripts/cxx-api/tests/snapshots/should_handle_category_with_multiple_methods/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_category_with_multiple_methods/snapshot.api index 1c99214249a..8159b254a2c 100644 --- a/scripts/cxx-api/tests/snapshots/should_handle_category_with_multiple_methods/snapshot.api +++ b/scripts/cxx-api/tests/snapshots/should_handle_category_with_multiple_methods/snapshot.api @@ -4,6 +4,4 @@ category RCTConvert(Transform) { } interface RCTConvert : public NSObject { - public virtual static CATransform3D CATransform3D:(id json); - public virtual static RCTTransformOrigin RCTTransformOrigin:(id json); } diff --git a/scripts/cxx-api/tests/snapshots/should_handle_ifdef_cplusplus/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_ifdef_cplusplus/snapshot.api index eb5f4fcd4d9..2ce3fc4be46 100644 --- a/scripts/cxx-api/tests/snapshots/should_handle_ifdef_cplusplus/snapshot.api +++ b/scripts/cxx-api/tests/snapshots/should_handle_ifdef_cplusplus/snapshot.api @@ -3,5 +3,4 @@ category RCTBridgeProxy(Cxx) { } interface RCTBridgeProxy : public NSObject { - public @property (assign) int cxxOnlyProperty; } diff --git a/scripts/cxx-api/tests/snapshots/should_handle_multiple_categories/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_multiple_categories/snapshot.api index d3f3804fada..b1e280967e5 100644 --- a/scripts/cxx-api/tests/snapshots/should_handle_multiple_categories/snapshot.api +++ b/scripts/cxx-api/tests/snapshots/should_handle_multiple_categories/snapshot.api @@ -7,6 +7,4 @@ category RCTConvert(CategoryTwo) { } interface RCTConvert : public NSObject { - public virtual static NSString* methodOne:(id json); - public virtual static NSString* methodTwo:(id json); }