From b60f0c9f0421158a55614c0fabc48cfbd2f872a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Thu, 9 Apr 2026 07:04:52 -0700 Subject: [PATCH] Change parser config to accept regex in exclude symbols field. (#56367) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56367 Adds support for regex in the `exclude_symbols` field in the C++ API parser config. This enables better scoped definitions of symbols that should be matched. Changelog: [Internal] Reviewed By: huntie Differential Revision: D99844594 fbshipit-source-id: 0d2b4f9970c535afa6af8712c9435bdb06c50779 --- .../api-snapshots/ReactAndroidDebugCxx.api | 11 --- .../api-snapshots/ReactAndroidReleaseCxx.api | 11 --- .../api-snapshots/ReactAppleDebugCxx.api | 13 --- .../api-snapshots/ReactAppleReleaseCxx.api | 13 --- .../api-snapshots/ReactCommonDebugCxx.api | 10 -- .../api-snapshots/ReactCommonReleaseCxx.api | 10 -- scripts/cxx-api/config.yml | 11 ++- scripts/cxx-api/parser/builders.py | 36 ++++--- scripts/cxx-api/parser/main.py | 34 ++++--- .../tests/test_excluded_symbol_references.py | 93 ++++++++++++++----- 10 files changed, 116 insertions(+), 126 deletions(-) diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index 93cc7a00087..f73a3357618 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -2166,7 +2166,6 @@ class facebook::react::EventBeat { public virtual void requestSynchronous() const; public virtual ~EventBeat() = default; public void setBeatCallback(facebook::react::EventBeat::BeatCallback beatCallback); - public void unstable_setInduceCallback(std::function callback); } struct facebook::react::EventBeat::OwnerBox { @@ -2193,7 +2192,6 @@ class facebook::react::EventDispatcher { public void dispatchEvent(facebook::react::RawEvent&& rawEvent) const; public void dispatchStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode) const; public void dispatchUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; public void removeListener(const std::shared_ptr& listener) const; } @@ -2219,8 +2217,6 @@ class facebook::react::EventEmitter { public void dispatchUniqueEvent(std::string type, folly::dynamic&& payload, facebook::react::HighResTimeStamp eventTimestamp) const; public void setEnabled(bool enabled); public void setShadowNodeFamily(std::weak_ptr shadowNodeFamily); - template - public void experimental_flushSync(Lambda syncFunc) const; } class facebook::react::EventEmitterWrapper : public jni::HybridClass { @@ -2269,7 +2265,6 @@ class facebook::react::EventQueue { public void enqueueEvent(facebook::react::RawEvent&& rawEvent) const; public void enqueueStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode = facebook::react::EventQueue::UpdateMode::Asynchronous) const; public void enqueueUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; } enum facebook::react::EventQueue::UpdateMode { @@ -2541,7 +2536,6 @@ class facebook::react::ImageProps : public facebook::react::HostPlatformViewProp public facebook::react::ImageSources sources; public facebook::react::SharedColor overlayColor; public facebook::react::SharedColor tintColor; - public std::string internal_analyticTag; public std::string resizeMethod; public virtual facebook::react::ComponentName getDiffPropsImplementationTarget() const override; public virtual folly::dynamic getDiffProps(const facebook::react::Props* prevProps) const override; @@ -2823,7 +2817,6 @@ class facebook::react::JReactHostInspectorTarget : public jni::HybridClass base64Data)>& callback) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) override; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) override; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&) override; public void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest& params, facebook::react::jsinspector_modern::ScopedExecutor executor) override; public void recordFrameTimings(jni::alias_ref frameTimingSequence); public void sendDebuggerResumeCommand(); @@ -5179,7 +5172,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public std::shared_ptr getNewestCloneOfShadowNode(const facebook::react::ShadowNode& shadowNode) const; public std::shared_ptr cloneNode(const facebook::react::ShadowNode& shadowNode, const std::shared_ptr>>& children, facebook::react::RawProps rawProps) const; public std::shared_ptr createNode(facebook::react::Tag tag, const std::string& componentName, facebook::react::SurfaceId surfaceId, facebook::react::RawProps props, facebook::react::InstanceHandle::Shared instanceHandle) const; - public std::weak_ptr unstable_getAnimationBackend(); public virtual facebook::react::RootShadowNode::Unshared shadowTreeWillCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& oldRootShadowNode, const facebook::react::RootShadowNode::Unshared& newRootShadowNode, const facebook::react::ShadowTree::CommitOptions& commitOptions) const override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; @@ -5208,7 +5200,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public void synchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic& props); public void unregisterCommitHook(facebook::react::UIManagerCommitHook& commitHook); public void unregisterMountHook(facebook::react::UIManagerMountHook& mountHook); - public void unstable_setAnimationBackend(std::shared_ptr animationBackend); public void updateShadowTree(std::unordered_map&& tagToProps); public void updateState(const facebook::react::StateUpdate& stateUpdate) const; public void visitBinding(const std::function& callback, facebook::jsi::Runtime& runtime) const; @@ -10392,7 +10383,6 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook: public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&); public virtual ~HostTargetDelegate() override; } @@ -10461,7 +10451,6 @@ class facebook::react::jsinspector_modern::ILocalConnection : public facebook::r class facebook::react::jsinspector_modern::IPageStatusListener : public facebook::react::jsinspector_modern::IDestructible { public virtual void onPageRemoved(int); - public virtual void unstable_onHostTargetAdded(); public virtual ~IPageStatusListener() = 0; } diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 138be39942a..c5f0aab04c2 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -2164,7 +2164,6 @@ class facebook::react::EventBeat { public virtual void requestSynchronous() const; public virtual ~EventBeat() = default; public void setBeatCallback(facebook::react::EventBeat::BeatCallback beatCallback); - public void unstable_setInduceCallback(std::function callback); } struct facebook::react::EventBeat::OwnerBox { @@ -2191,7 +2190,6 @@ class facebook::react::EventDispatcher { public void dispatchEvent(facebook::react::RawEvent&& rawEvent) const; public void dispatchStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode) const; public void dispatchUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; public void removeListener(const std::shared_ptr& listener) const; } @@ -2217,8 +2215,6 @@ class facebook::react::EventEmitter { public void dispatchUniqueEvent(std::string type, folly::dynamic&& payload, facebook::react::HighResTimeStamp eventTimestamp) const; public void setEnabled(bool enabled); public void setShadowNodeFamily(std::weak_ptr shadowNodeFamily); - template - public void experimental_flushSync(Lambda syncFunc) const; } class facebook::react::EventEmitterWrapper : public jni::HybridClass { @@ -2267,7 +2263,6 @@ class facebook::react::EventQueue { public void enqueueEvent(facebook::react::RawEvent&& rawEvent) const; public void enqueueStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode = facebook::react::EventQueue::UpdateMode::Asynchronous) const; public void enqueueUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; } enum facebook::react::EventQueue::UpdateMode { @@ -2538,7 +2533,6 @@ class facebook::react::ImageProps : public facebook::react::HostPlatformViewProp public facebook::react::ImageSources sources; public facebook::react::SharedColor overlayColor; public facebook::react::SharedColor tintColor; - public std::string internal_analyticTag; public std::string resizeMethod; public virtual facebook::react::ComponentName getDiffPropsImplementationTarget() const override; public virtual folly::dynamic getDiffProps(const facebook::react::Props* prevProps) const override; @@ -2820,7 +2814,6 @@ class facebook::react::JReactHostInspectorTarget : public jni::HybridClass base64Data)>& callback) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) override; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) override; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&) override; public void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest& params, facebook::react::jsinspector_modern::ScopedExecutor executor) override; public void recordFrameTimings(jni::alias_ref frameTimingSequence); public void sendDebuggerResumeCommand(); @@ -5170,7 +5163,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public std::shared_ptr getNewestCloneOfShadowNode(const facebook::react::ShadowNode& shadowNode) const; public std::shared_ptr cloneNode(const facebook::react::ShadowNode& shadowNode, const std::shared_ptr>>& children, facebook::react::RawProps rawProps) const; public std::shared_ptr createNode(facebook::react::Tag tag, const std::string& componentName, facebook::react::SurfaceId surfaceId, facebook::react::RawProps props, facebook::react::InstanceHandle::Shared instanceHandle) const; - public std::weak_ptr unstable_getAnimationBackend(); public virtual facebook::react::RootShadowNode::Unshared shadowTreeWillCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& oldRootShadowNode, const facebook::react::RootShadowNode::Unshared& newRootShadowNode, const facebook::react::ShadowTree::CommitOptions& commitOptions) const override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; @@ -5199,7 +5191,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public void synchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic& props); public void unregisterCommitHook(facebook::react::UIManagerCommitHook& commitHook); public void unregisterMountHook(facebook::react::UIManagerMountHook& mountHook); - public void unstable_setAnimationBackend(std::shared_ptr animationBackend); public void updateShadowTree(std::unordered_map&& tagToProps); public void updateState(const facebook::react::StateUpdate& stateUpdate) const; public void visitBinding(const std::function& callback, facebook::jsi::Runtime& runtime) const; @@ -10248,7 +10239,6 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook: public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&); public virtual ~HostTargetDelegate() override; } @@ -10317,7 +10307,6 @@ class facebook::react::jsinspector_modern::ILocalConnection : public facebook::r class facebook::react::jsinspector_modern::IPageStatusListener : public facebook::react::jsinspector_modern::IDestructible { public virtual void onPageRemoved(int); - public virtual void unstable_onHostTargetAdded(); public virtual ~IPageStatusListener() = 0; } diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 16299da9aad..f12fa4b6207 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -1304,7 +1304,6 @@ interface RCTImageView : public RCTView { public @property (assign) UIEdgeInsets capInsets; public @property (assign) UIImageRenderingMode renderingMode; public @property (copy) NSArray* imageSources; - public @property (copy) NSString* internal_analyticTag; public @property (strong) UIImage* defaultImage; public virtual instancetype initWithBridge:(RCTBridge* bridge); } @@ -5051,7 +5050,6 @@ class facebook::react::EventBeat { public virtual void requestSynchronous() const; public virtual ~EventBeat() = default; public void setBeatCallback(facebook::react::EventBeat::BeatCallback beatCallback); - public void unstable_setInduceCallback(std::function callback); } struct facebook::react::EventBeat::OwnerBox { @@ -5066,7 +5064,6 @@ class facebook::react::EventDispatcher { public void dispatchEvent(facebook::react::RawEvent&& rawEvent) const; public void dispatchStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode) const; public void dispatchUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; public void removeListener(const std::shared_ptr& listener) const; } @@ -5092,8 +5089,6 @@ class facebook::react::EventEmitter { public void dispatchUniqueEvent(std::string type, folly::dynamic&& payload, facebook::react::HighResTimeStamp eventTimestamp) const; public void setEnabled(bool enabled); public void setShadowNodeFamily(std::weak_ptr shadowNodeFamily); - template - public void experimental_flushSync(Lambda syncFunc) const; } class facebook::react::EventListenerContainer { @@ -5132,7 +5127,6 @@ class facebook::react::EventQueue { public void enqueueEvent(facebook::react::RawEvent&& rawEvent) const; public void enqueueStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode = facebook::react::EventQueue::UpdateMode::Asynchronous) const; public void enqueueUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; } enum facebook::react::EventQueue::UpdateMode { @@ -5322,7 +5316,6 @@ class facebook::react::ImageProps : public facebook::react::HostPlatformViewProp public facebook::react::ImageSources sources; public facebook::react::SharedColor overlayColor; public facebook::react::SharedColor tintColor; - public std::string internal_analyticTag; public std::string resizeMethod; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } @@ -5639,7 +5632,6 @@ struct facebook::react::JSModulesUnbundle::Module { class facebook::react::JSRuntime { public virtual facebook::jsi::Runtime& getRuntime() noexcept = 0; public virtual facebook::react::jsinspector_modern::RuntimeTargetDelegate& getRuntimeTargetDelegate(); - public virtual void unstable_initializeOnJsThread(); public virtual ~JSRuntime() = default; } @@ -7750,7 +7742,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public std::shared_ptr getNewestCloneOfShadowNode(const facebook::react::ShadowNode& shadowNode) const; public std::shared_ptr cloneNode(const facebook::react::ShadowNode& shadowNode, const std::shared_ptr>>& children, facebook::react::RawProps rawProps) const; public std::shared_ptr createNode(facebook::react::Tag tag, const std::string& componentName, facebook::react::SurfaceId surfaceId, facebook::react::RawProps props, facebook::react::InstanceHandle::Shared instanceHandle) const; - public std::weak_ptr unstable_getAnimationBackend(); public virtual facebook::react::RootShadowNode::Unshared shadowTreeWillCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& oldRootShadowNode, const facebook::react::RootShadowNode::Unshared& newRootShadowNode, const facebook::react::ShadowTree::CommitOptions& commitOptions) const override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; @@ -7779,7 +7770,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public void synchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic& props); public void unregisterCommitHook(facebook::react::UIManagerCommitHook& commitHook); public void unregisterMountHook(facebook::react::UIManagerMountHook& mountHook); - public void unstable_setAnimationBackend(std::shared_ptr animationBackend); public void updateShadowTree(std::unordered_map&& tagToProps); public void updateState(const facebook::react::StateUpdate& stateUpdate) const; public void visitBinding(const std::function& callback, facebook::jsi::Runtime& runtime) const; @@ -12681,7 +12671,6 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook: public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&); public virtual ~HostTargetDelegate() override; } @@ -12750,7 +12739,6 @@ class facebook::react::jsinspector_modern::ILocalConnection : public facebook::r class facebook::react::jsinspector_modern::IPageStatusListener : public facebook::react::jsinspector_modern::IDestructible { public virtual void onPageRemoved(int); - public virtual void unstable_onHostTargetAdded(); public virtual ~IPageStatusListener() = 0; } @@ -15786,7 +15774,6 @@ struct JS::NativeImageEditor::OptionsSize { struct JS::NativeNetworkingIOS::SpecSendRequestQuery { protected NSString* method() const; protected NSString* responseType() const; - protected NSString* unstable_devToolsRequestId() const; protected NSString* url() const; protected SpecSendRequestQuery(NSDictionary* const v); protected bool incrementalUpdates() const; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 4c20a15a757..8e01afae30b 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -1304,7 +1304,6 @@ interface RCTImageView : public RCTView { public @property (assign) UIEdgeInsets capInsets; public @property (assign) UIImageRenderingMode renderingMode; public @property (copy) NSArray* imageSources; - public @property (copy) NSString* internal_analyticTag; public @property (strong) UIImage* defaultImage; public virtual instancetype initWithBridge:(RCTBridge* bridge); } @@ -5049,7 +5048,6 @@ class facebook::react::EventBeat { public virtual void requestSynchronous() const; public virtual ~EventBeat() = default; public void setBeatCallback(facebook::react::EventBeat::BeatCallback beatCallback); - public void unstable_setInduceCallback(std::function callback); } struct facebook::react::EventBeat::OwnerBox { @@ -5064,7 +5062,6 @@ class facebook::react::EventDispatcher { public void dispatchEvent(facebook::react::RawEvent&& rawEvent) const; public void dispatchStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode) const; public void dispatchUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; public void removeListener(const std::shared_ptr& listener) const; } @@ -5090,8 +5087,6 @@ class facebook::react::EventEmitter { public void dispatchUniqueEvent(std::string type, folly::dynamic&& payload, facebook::react::HighResTimeStamp eventTimestamp) const; public void setEnabled(bool enabled); public void setShadowNodeFamily(std::weak_ptr shadowNodeFamily); - template - public void experimental_flushSync(Lambda syncFunc) const; } class facebook::react::EventListenerContainer { @@ -5130,7 +5125,6 @@ class facebook::react::EventQueue { public void enqueueEvent(facebook::react::RawEvent&& rawEvent) const; public void enqueueStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode = facebook::react::EventQueue::UpdateMode::Asynchronous) const; public void enqueueUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; } enum facebook::react::EventQueue::UpdateMode { @@ -5319,7 +5313,6 @@ class facebook::react::ImageProps : public facebook::react::HostPlatformViewProp public facebook::react::ImageSources sources; public facebook::react::SharedColor overlayColor; public facebook::react::SharedColor tintColor; - public std::string internal_analyticTag; public std::string resizeMethod; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } @@ -5636,7 +5629,6 @@ struct facebook::react::JSModulesUnbundle::Module { class facebook::react::JSRuntime { public virtual facebook::jsi::Runtime& getRuntime() noexcept = 0; public virtual facebook::react::jsinspector_modern::RuntimeTargetDelegate& getRuntimeTargetDelegate(); - public virtual void unstable_initializeOnJsThread(); public virtual ~JSRuntime() = default; } @@ -7741,7 +7733,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public std::shared_ptr getNewestCloneOfShadowNode(const facebook::react::ShadowNode& shadowNode) const; public std::shared_ptr cloneNode(const facebook::react::ShadowNode& shadowNode, const std::shared_ptr>>& children, facebook::react::RawProps rawProps) const; public std::shared_ptr createNode(facebook::react::Tag tag, const std::string& componentName, facebook::react::SurfaceId surfaceId, facebook::react::RawProps props, facebook::react::InstanceHandle::Shared instanceHandle) const; - public std::weak_ptr unstable_getAnimationBackend(); public virtual facebook::react::RootShadowNode::Unshared shadowTreeWillCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& oldRootShadowNode, const facebook::react::RootShadowNode::Unshared& newRootShadowNode, const facebook::react::ShadowTree::CommitOptions& commitOptions) const override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; @@ -7770,7 +7761,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public void synchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic& props); public void unregisterCommitHook(facebook::react::UIManagerCommitHook& commitHook); public void unregisterMountHook(facebook::react::UIManagerMountHook& mountHook); - public void unstable_setAnimationBackend(std::shared_ptr animationBackend); public void updateShadowTree(std::unordered_map&& tagToProps); public void updateState(const facebook::react::StateUpdate& stateUpdate) const; public void visitBinding(const std::function& callback, facebook::jsi::Runtime& runtime) const; @@ -12547,7 +12537,6 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook: public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&); public virtual ~HostTargetDelegate() override; } @@ -12616,7 +12605,6 @@ class facebook::react::jsinspector_modern::ILocalConnection : public facebook::r class facebook::react::jsinspector_modern::IPageStatusListener : public facebook::react::jsinspector_modern::IDestructible { public virtual void onPageRemoved(int); - public virtual void unstable_onHostTargetAdded(); public virtual ~IPageStatusListener() = 0; } @@ -15652,7 +15640,6 @@ struct JS::NativeImageEditor::OptionsSize { struct JS::NativeNetworkingIOS::SpecSendRequestQuery { protected NSString* method() const; protected NSString* responseType() const; - protected NSString* unstable_devToolsRequestId() const; protected NSString* url() const; protected SpecSendRequestQuery(NSDictionary* const v); protected bool incrementalUpdates() const; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index abc0536f2fc..c26b497e4f4 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -1414,7 +1414,6 @@ class facebook::react::EventBeat { public virtual void requestSynchronous() const; public virtual ~EventBeat() = default; public void setBeatCallback(facebook::react::EventBeat::BeatCallback beatCallback); - public void unstable_setInduceCallback(std::function callback); } struct facebook::react::EventBeat::OwnerBox { @@ -1429,7 +1428,6 @@ class facebook::react::EventDispatcher { public void dispatchEvent(facebook::react::RawEvent&& rawEvent) const; public void dispatchStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode) const; public void dispatchUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; public void removeListener(const std::shared_ptr& listener) const; } @@ -1455,8 +1453,6 @@ class facebook::react::EventEmitter { public void dispatchUniqueEvent(std::string type, folly::dynamic&& payload, facebook::react::HighResTimeStamp eventTimestamp) const; public void setEnabled(bool enabled); public void setShadowNodeFamily(std::weak_ptr shadowNodeFamily); - template - public void experimental_flushSync(Lambda syncFunc) const; } class facebook::react::EventListenerContainer { @@ -1495,7 +1491,6 @@ class facebook::react::EventQueue { public void enqueueEvent(facebook::react::RawEvent&& rawEvent) const; public void enqueueStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode = facebook::react::EventQueue::UpdateMode::Asynchronous) const; public void enqueueUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; } enum facebook::react::EventQueue::UpdateMode { @@ -1685,7 +1680,6 @@ class facebook::react::ImageProps : public facebook::react::HostPlatformViewProp public facebook::react::ImageSources sources; public facebook::react::SharedColor overlayColor; public facebook::react::SharedColor tintColor; - public std::string internal_analyticTag; public std::string resizeMethod; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } @@ -3645,7 +3639,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public std::shared_ptr getNewestCloneOfShadowNode(const facebook::react::ShadowNode& shadowNode) const; public std::shared_ptr cloneNode(const facebook::react::ShadowNode& shadowNode, const std::shared_ptr>>& children, facebook::react::RawProps rawProps) const; public std::shared_ptr createNode(facebook::react::Tag tag, const std::string& componentName, facebook::react::SurfaceId surfaceId, facebook::react::RawProps props, facebook::react::InstanceHandle::Shared instanceHandle) const; - public std::weak_ptr unstable_getAnimationBackend(); public virtual facebook::react::RootShadowNode::Unshared shadowTreeWillCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& oldRootShadowNode, const facebook::react::RootShadowNode::Unshared& newRootShadowNode, const facebook::react::ShadowTree::CommitOptions& commitOptions) const override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; @@ -3674,7 +3667,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public void synchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic& props); public void unregisterCommitHook(facebook::react::UIManagerCommitHook& commitHook); public void unregisterMountHook(facebook::react::UIManagerMountHook& mountHook); - public void unstable_setAnimationBackend(std::shared_ptr animationBackend); public void updateShadowTree(std::unordered_map&& tagToProps); public void updateState(const facebook::react::StateUpdate& stateUpdate) const; public void visitBinding(const std::function& callback, facebook::jsi::Runtime& runtime) const; @@ -7506,7 +7498,6 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook: public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&); public virtual ~HostTargetDelegate() override; } @@ -7575,7 +7566,6 @@ class facebook::react::jsinspector_modern::ILocalConnection : public facebook::r class facebook::react::jsinspector_modern::IPageStatusListener : public facebook::react::jsinspector_modern::IDestructible { public virtual void onPageRemoved(int); - public virtual void unstable_onHostTargetAdded(); public virtual ~IPageStatusListener() = 0; } diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index f52fcb96025..8ab7acfe388 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -1412,7 +1412,6 @@ class facebook::react::EventBeat { public virtual void requestSynchronous() const; public virtual ~EventBeat() = default; public void setBeatCallback(facebook::react::EventBeat::BeatCallback beatCallback); - public void unstable_setInduceCallback(std::function callback); } struct facebook::react::EventBeat::OwnerBox { @@ -1427,7 +1426,6 @@ class facebook::react::EventDispatcher { public void dispatchEvent(facebook::react::RawEvent&& rawEvent) const; public void dispatchStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode) const; public void dispatchUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; public void removeListener(const std::shared_ptr& listener) const; } @@ -1453,8 +1451,6 @@ class facebook::react::EventEmitter { public void dispatchUniqueEvent(std::string type, folly::dynamic&& payload, facebook::react::HighResTimeStamp eventTimestamp) const; public void setEnabled(bool enabled); public void setShadowNodeFamily(std::weak_ptr shadowNodeFamily); - template - public void experimental_flushSync(Lambda syncFunc) const; } class facebook::react::EventListenerContainer { @@ -1493,7 +1489,6 @@ class facebook::react::EventQueue { public void enqueueEvent(facebook::react::RawEvent&& rawEvent) const; public void enqueueStateUpdate(facebook::react::StateUpdate&& stateUpdate, facebook::react::EventQueue::UpdateMode updateMode = facebook::react::EventQueue::UpdateMode::Asynchronous) const; public void enqueueUniqueEvent(facebook::react::RawEvent&& rawEvent) const; - public void experimental_flushSync() const; } enum facebook::react::EventQueue::UpdateMode { @@ -1682,7 +1677,6 @@ class facebook::react::ImageProps : public facebook::react::HostPlatformViewProp public facebook::react::ImageSources sources; public facebook::react::SharedColor overlayColor; public facebook::react::SharedColor tintColor; - public std::string internal_analyticTag; public std::string resizeMethod; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } @@ -3636,7 +3630,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public std::shared_ptr getNewestCloneOfShadowNode(const facebook::react::ShadowNode& shadowNode) const; public std::shared_ptr cloneNode(const facebook::react::ShadowNode& shadowNode, const std::shared_ptr>>& children, facebook::react::RawProps rawProps) const; public std::shared_ptr createNode(facebook::react::Tag tag, const std::string& componentName, facebook::react::SurfaceId surfaceId, facebook::react::RawProps props, facebook::react::InstanceHandle::Shared instanceHandle) const; - public std::weak_ptr unstable_getAnimationBackend(); public virtual facebook::react::RootShadowNode::Unshared shadowTreeWillCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& oldRootShadowNode, const facebook::react::RootShadowNode::Unshared& newRootShadowNode, const facebook::react::ShadowTree::CommitOptions& commitOptions) const override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; @@ -3665,7 +3658,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public void synchronouslyUpdateViewOnUIThread(facebook::react::Tag tag, const folly::dynamic& props); public void unregisterCommitHook(facebook::react::UIManagerCommitHook& commitHook); public void unregisterMountHook(facebook::react::UIManagerMountHook& mountHook); - public void unstable_setAnimationBackend(std::shared_ptr animationBackend); public void updateShadowTree(std::unordered_map&& tagToProps); public void updateState(const facebook::react::StateUpdate& stateUpdate) const; public void visitBinding(const std::function& callback, facebook::jsi::Runtime& runtime) const; @@ -7497,7 +7489,6 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook: public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor) override; public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0; public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0; - public virtual void unstable_onPerfIssueAdded(const facebook::react::jsinspector_modern::PerfIssuePayload&); public virtual ~HostTargetDelegate() override; } @@ -7566,7 +7557,6 @@ class facebook::react::jsinspector_modern::ILocalConnection : public facebook::r class facebook::react::jsinspector_modern::IPageStatusListener : public facebook::react::jsinspector_modern::IDestructible { public virtual void onPageRemoved(int); - public virtual void unstable_onHostTargetAdded(); public virtual ~IPageStatusListener() = 0; } diff --git a/scripts/cxx-api/config.yml b/scripts/cxx-api/config.yml index e0a2694d6ef..f549da59242 100644 --- a/scripts/cxx-api/config.yml +++ b/scripts/cxx-api/config.yml @@ -10,13 +10,14 @@ exclude_patterns: exclude_symbols: - "Fantom" - "NativeReactNativeFeatureFlags" + - "(?i)experimental" + - "unstable_" - "UnstableLegacy" - - "Experimental" - "TinyMap" - "packAnimatedProps" - "DO_NOT_USE" - - "_DEPRECATED" - - "DEPRECATED_" + - "_DEPRECATED|DEPRECATED_" + - "internal_" platforms: ReactCommon: @@ -94,8 +95,8 @@ platforms: - "*/components/switch/androidswitch/*" exclude_symbols: - "Android" - - "(Deprecated)" - - "(Internal)" + - "\\(Deprecated\\)" + - "\\(Internal\\)" input_filter: true definitions: __cplusplus: 1 diff --git a/scripts/cxx-api/parser/builders.py b/scripts/cxx-api/parser/builders.py index cec83d918bc..f217e594d2e 100644 --- a/scripts/cxx-api/parser/builders.py +++ b/scripts/cxx-api/parser/builders.py @@ -544,26 +544,32 @@ def get_property_member( # region Symbol exclusion -def _should_exclude_symbol(name: str, exclude_symbols: list[str]) -> bool: - """ - Check if a symbol name should be excluded based on symbol patterns. +def compile_exclude_patterns(exclude_symbols: list[str]) -> list[re.Pattern]: + """Compile exclude_symbols strings into regex patterns for efficient matching.""" + return [re.compile(pattern) for pattern in exclude_symbols] - Each pattern in exclude_symbols is treated as a substring match against - the symbol's qualified name. + +def _should_exclude_symbol(name: str, exclude_symbols: list[re.Pattern]) -> bool: """ - return any(pattern in name for pattern in exclude_symbols) + Check if a symbol name should be excluded based on regex patterns. + + Each pattern is used as a regex search against the symbol's name. + """ + return any(pattern.search(name) for pattern in exclude_symbols) def _type_contains_excluded_symbol( - type_str: str | None, exclude_symbols: list[str] + type_str: str | None, exclude_symbols: list[re.Pattern] ) -> bool: - """Return True if *type_str* contains any substring from *exclude_symbols*.""" + """Return True if *type_str* matches any regex from *exclude_symbols*.""" if not type_str or not exclude_symbols: return False - return any(pattern in type_str for pattern in exclude_symbols) + return any(pattern.search(type_str) for pattern in exclude_symbols) -def _member_types_reference_excluded_symbol(member, exclude_symbols: list[str]) -> bool: +def _member_types_reference_excluded_symbol( + member, exclude_symbols: list[re.Pattern] +) -> bool: """Check whether any type string on *member* references an excluded symbol.""" if not exclude_symbols: return False @@ -644,7 +650,7 @@ def _process_objc_sections( location_file: str, scope_type: str, filter_category_members: bool = False, - exclude_symbols: list[str] | None = None, + exclude_symbols: list[re.Pattern] | None = None, ) -> None: """ Common section processing for protocols and interfaces. @@ -747,7 +753,7 @@ def _process_objc_sections( def create_protocol_scope( snapshot: Snapshot, scope_def: compound.CompounddefType, - exclude_symbols: list[str] | None = None, + exclude_symbols: list[re.Pattern] | None = None, ) -> None: """ Create a protocol scope in the snapshot. @@ -779,7 +785,7 @@ def create_protocol_scope( def create_interface_scope( snapshot: Snapshot, scope_def: compound.CompounddefType, - exclude_symbols: list[str] | None = None, + exclude_symbols: list[re.Pattern] | None = None, ) -> None: """ Create an interface scope in the snapshot (Objective-C @interface). @@ -828,7 +834,7 @@ def create_interface_scope( def create_class_scope( snapshot: Snapshot, compound_object: compound.CompounddefType, - exclude_symbols: list[str] | None = None, + exclude_symbols: list[re.Pattern] | None = None, ) -> None: """ Create a class/struct/union scope in the snapshot. @@ -954,7 +960,7 @@ def create_class_scope( def create_category_scope( snapshot: Snapshot, scope_def: compound.CompounddefType, - exclude_symbols: list[str] | None = None, + exclude_symbols: list[re.Pattern] | None = None, ) -> None: """ Create a category scope in the snapshot (Objective-C category). diff --git a/scripts/cxx-api/parser/main.py b/scripts/cxx-api/parser/main.py index 947a9404b35..946119b00c1 100644 --- a/scripts/cxx-api/parser/main.py +++ b/scripts/cxx-api/parser/main.py @@ -10,6 +10,7 @@ Main entry point for building API snapshots from Doxygen XML output. from __future__ import annotations import os +import re from dataclasses import dataclass from doxmlparser import compound, index @@ -17,6 +18,7 @@ from doxmlparser import compound, index from .builders import ( _member_types_reference_excluded_symbol, _should_exclude_symbol, + compile_exclude_patterns, create_category_scope, create_class_scope, create_enum_scope, @@ -45,7 +47,7 @@ from .utils import ( def _process_namespace_sections( - snapshot, namespace_scope, compound_object, exclude_symbols: list[str] + snapshot, namespace_scope, compound_object, exclude_symbols: list[re.Pattern] ): """ Process all section definitions inside a namespace compound. @@ -197,16 +199,16 @@ def _check_text_for_excluded_patterns( text: str, scope_name: str, context: str, - exclude_symbols: list[str], + exclude_symbols: list[re.Pattern], results: list[ExcludedSymbolReference], ) -> None: """Append an ExcludedSymbolReference for each pattern found in *text*.""" for pattern in exclude_symbols: - if pattern in text: + if pattern.search(text): results.append( ExcludedSymbolReference( symbol=text, - pattern=pattern, + pattern=pattern.pattern, scope=scope_name, context=context, ) @@ -217,7 +219,7 @@ def _check_arguments_for_excluded_patterns( arguments: list, scope_name: str, context_prefix: str, - exclude_symbols: list[str], + exclude_symbols: list[re.Pattern], results: list[ExcludedSymbolReference], ) -> None: """Check every argument's type string for excluded patterns.""" @@ -237,7 +239,7 @@ def _check_arguments_for_excluded_patterns( def _check_member_for_excluded_patterns( member, scope_name: str, - exclude_symbols: list[str], + exclude_symbols: list[re.Pattern], results: list[ExcludedSymbolReference], ) -> None: """Check a single member for type references matching excluded patterns.""" @@ -328,7 +330,7 @@ def _check_member_for_excluded_patterns( def _walk_scope_for_excluded_patterns( scope: Scope, - exclude_symbols: list[str], + exclude_symbols: list[re.Pattern], results: list[ExcludedSymbolReference], ) -> None: """Recursively walk a scope tree checking for excluded pattern references.""" @@ -367,7 +369,7 @@ def _walk_scope_for_excluded_patterns( def find_excluded_symbol_references( snapshot: Snapshot, - exclude_symbols: list[str], + exclude_symbols: list[re.Pattern], ) -> list[ExcludedSymbolReference]: """ Walk the snapshot scope tree after it has been finalized and find @@ -392,12 +394,14 @@ def build_snapshot(xml_dir: str, exclude_symbols: list[str] | None = None) -> Sn Args: xml_dir: Path to the Doxygen XML output directory. - exclude_symbols: Optional list of substring patterns. Compounds whose - qualified name contains any of these patterns will be excluded. + exclude_symbols: Optional list of regex patterns. Compounds whose + qualified name matches any of these patterns will be excluded. """ if exclude_symbols is None: exclude_symbols = [] + compiled_patterns = compile_exclude_patterns(exclude_symbols) + index_path = os.path.join(xml_dir, "index.xml") if not os.path.exists(index_path): raise RuntimeError(f"Doxygen entry point not found at {index_path}") @@ -417,7 +421,7 @@ def build_snapshot(xml_dir: str, exclude_symbols: list[str] | None = None) -> Sn if compound_object.prot == "private": continue - if _should_exclude_symbol(compound_object.compoundname, exclude_symbols): + if _should_exclude_symbol(compound_object.compoundname, compiled_patterns): continue kind = compound_object.kind @@ -427,15 +431,15 @@ def build_snapshot(xml_dir: str, exclude_symbols: list[str] | None = None) -> Sn elif kind in _COMPOUND_HANDLERS: handler = _COMPOUND_HANDLERS[kind] if handler == _handle_namespace_compound: - handler(snapshot, compound_object, exclude_symbols) + handler(snapshot, compound_object, compiled_patterns) elif handler == _handle_class_compound: - handler(snapshot, compound_object, exclude_symbols) + handler(snapshot, compound_object, compiled_patterns) elif handler in ( create_category_scope, create_protocol_scope, create_interface_scope, ): - handler(snapshot, compound_object, exclude_symbols) + handler(snapshot, compound_object, compiled_patterns) else: handler(snapshot, compound_object) else: @@ -444,7 +448,7 @@ def build_snapshot(xml_dir: str, exclude_symbols: list[str] | None = None) -> Sn snapshot.finish() snapshot.excluded_symbol_references = find_excluded_symbol_references( - snapshot, exclude_symbols + snapshot, compiled_patterns ) return snapshot diff --git a/scripts/cxx-api/tests/test_excluded_symbol_references.py b/scripts/cxx-api/tests/test_excluded_symbol_references.py index 2d61a710681..1542a851f59 100644 --- a/scripts/cxx-api/tests/test_excluded_symbol_references.py +++ b/scripts/cxx-api/tests/test_excluded_symbol_references.py @@ -7,7 +7,10 @@ from __future__ import annotations import unittest -from ..parser.builders import _member_types_reference_excluded_symbol +from ..parser.builders import ( + _member_types_reference_excluded_symbol, + compile_exclude_patterns, +) from ..parser.main import find_excluded_symbol_references from ..parser.member import ( FriendMember, @@ -35,7 +38,7 @@ def _make_snapshot_with_class( class TestFindExcludedSymbolReferencesEmpty(unittest.TestCase): def test_empty_exclude_symbols_returns_empty(self) -> None: snapshot = Snapshot() - refs = find_excluded_symbol_references(snapshot, []) + refs = find_excluded_symbol_references(snapshot, compile_exclude_patterns([])) self.assertEqual(refs, []) def test_no_references_returns_empty(self) -> None: @@ -52,7 +55,9 @@ class TestFindExcludedSymbolReferencesEmpty(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(refs, []) @@ -68,7 +73,9 @@ class TestFindExcludedSymbolReferencesBaseClass(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].symbol, "ExperimentalBase") self.assertEqual(refs[0].pattern, "Experimental") @@ -85,7 +92,9 @@ class TestFindExcludedSymbolReferencesBaseClass(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(refs, []) @@ -104,7 +113,9 @@ class TestFindExcludedSymbolReferencesFunctionMember(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].symbol, "ExperimentalModule") self.assertEqual(refs[0].context, "return type") @@ -123,7 +134,9 @@ class TestFindExcludedSymbolReferencesFunctionMember(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].context, "function parameter type") @@ -141,7 +154,9 @@ class TestFindExcludedSymbolReferencesFunctionMember(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(refs, []) @@ -162,7 +177,9 @@ class TestFindExcludedSymbolReferencesVariableMember(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].context, "variable type") @@ -180,7 +197,9 @@ class TestFindExcludedSymbolReferencesTypedefMember(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].context, "typedef target type") @@ -190,7 +209,9 @@ class TestFindExcludedSymbolReferencesFriendMember(unittest.TestCase): snapshot, scope = _make_snapshot_with_class() scope.add_member(FriendMember(name="ExperimentalHelper")) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].context, "friend declaration") @@ -210,7 +231,9 @@ class TestFindExcludedSymbolReferencesPropertyMember(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].context, "property type") @@ -236,7 +259,9 @@ class TestFindExcludedSymbolReferencesSpecializationArgs(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental"]) + ) self.assertEqual(len(refs), 1) self.assertEqual(refs[0].context, "specialization argument") @@ -256,7 +281,9 @@ class TestFindExcludedSymbolReferencesMultiplePatterns(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental", "Fantom"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental", "Fantom"]) + ) self.assertEqual(len(refs), 2) patterns = {r.pattern for r in refs} self.assertIn("Experimental", patterns) @@ -276,7 +303,9 @@ class TestFindExcludedSymbolReferencesMultiplePatterns(unittest.TestCase): ) ) snapshot.finish() - refs = find_excluded_symbol_references(snapshot, ["Experimental", "Fantom"]) + refs = find_excluded_symbol_references( + snapshot, compile_exclude_patterns(["Experimental", "Fantom"]) + ) self.assertEqual(len(refs), 2) self.assertTrue(all(r.symbol == "ExperimentalFantomModule" for r in refs)) @@ -293,7 +322,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): is_static=False, ) self.assertTrue( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_function_param_type_detected(self) -> None: @@ -307,7 +338,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): is_static=False, ) self.assertTrue( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_function_no_match(self) -> None: @@ -321,7 +354,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): is_static=False, ) self.assertFalse( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_variable_type_detected(self) -> None: @@ -337,7 +372,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): definition="ExperimentalFeatureSet feature", ) self.assertTrue( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_variable_no_match(self) -> None: @@ -353,7 +390,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): definition="int count", ) self.assertFalse( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_typedef_type_detected(self) -> None: @@ -365,7 +404,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): keyword="using", ) self.assertTrue( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_property_type_detected(self) -> None: @@ -379,7 +420,9 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): is_writable=True, ) self.assertTrue( - _member_types_reference_excluded_symbol(member, ["Experimental"]) + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns(["Experimental"]) + ) ) def test_empty_exclude_symbols_returns_false(self) -> None: @@ -392,4 +435,8 @@ class TestMemberTypesReferenceExcludedSymbol(unittest.TestCase): is_pure_virtual=False, is_static=False, ) - self.assertFalse(_member_types_reference_excluded_symbol(member, [])) + self.assertFalse( + _member_types_reference_excluded_symbol( + member, compile_exclude_patterns([]) + ) + )