From 2abbd47d1be0d590b151e12d1b5319ceaefb9bf2 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 16 Dec 2025 05:37:01 -0800 Subject: [PATCH] Fix type of constantsToExport arg (#54718) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54718 The cast in `constantsToExport` is unnecessary if we actually use the right type here, without the `Builder` suffix. Not a breaking change, since Objective-C seemingly doesn't enforce these parameter constraints. Changelog: [Internal] Reviewed By: sammy-SC Differential Revision: D87980865 fbshipit-source-id: c9052e219fdf44d012583fcaa94b10b7c189b510 --- .../modules/NativeSampleTurboModule.js | 6 +- .../GenerateModuleObjCpp-test.js.snap | 62 +++++++++---------- .../GenerateModuleObjCpp/serializeMethod.js | 2 +- .../GenerateModuleHObjCpp-test.js.snap | 4 +- .../Libraries/Settings/RCTSettingsManager.mm | 2 +- .../PlatformStubs/RCTStatusBarManager.mm | 2 +- .../React/CoreModules/RCTAppState.mm | 2 +- .../React/CoreModules/RCTStatusBarManager.mm | 2 +- 8 files changed, 39 insertions(+), 43 deletions(-) diff --git a/packages/react-native-codegen/e2e/deep_imports/__test_fixtures__/modules/NativeSampleTurboModule.js b/packages/react-native-codegen/e2e/deep_imports/__test_fixtures__/modules/NativeSampleTurboModule.js index 69a518427b6..b6708f325e0 100644 --- a/packages/react-native-codegen/e2e/deep_imports/__test_fixtures__/modules/NativeSampleTurboModule.js +++ b/packages/react-native-codegen/e2e/deep_imports/__test_fixtures__/modules/NativeSampleTurboModule.js @@ -35,11 +35,7 @@ export interface Spec extends TurboModule { +getObjectShape: (arg: {prop: number}) => {prop: number}; +getAlias: (arg: Animal) => Animal; +getRootTag: (arg: RootTag) => RootTag; - +getValue: ( - x: number, - getValuegetValuegetValuegetValuegetValuey: string, - z: Object, - ) => Object; + +getValue: (x: number, y: string, z: Object) => Object; +getValueWithCallback: (callback: (value: string) => void) => void; +getValueWithPromise: (error: boolean) => Promise; } diff --git a/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap index e71b84d5596..b974709b3b6 100644 --- a/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap +++ b/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap @@ -392,8 +392,8 @@ namespace JS { - (NSDictionary *)getGenericObjectReadOnly:(NSDictionary *)arg; - (NSDictionary *)getGenericObjectWithAlias:(NSDictionary *)arg; - (NSDictionary *)difficultObject:(JS::NativeObjectTurboModule::SpecDifficultObjectA &)A; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -534,8 +534,8 @@ namespace JS { } @protocol NativeOptionalObjectTurboModuleSpec -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -734,14 +734,14 @@ namespace JS { - (NSDictionary *)getAlias:(JS::NativeSampleTurboModule::Animal &)arg; - (NSNumber *)getRootTag:(double)arg; - (NSDictionary *)getValue:(double)x -getValuegetValuegetValuegetValuegetValuey:(NSString *)getValuegetValuegetValuegetValuegetValuey + y:(NSString *)y z:(NSDictionary *)z; - (void)getValueWithCallback:(RCTResponseSenderBlock)callback; - (void)getValueWithPromise:(BOOL)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -838,8 +838,8 @@ namespace JS { - (void)getValueWithPromise:(NSArray *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -938,8 +938,8 @@ namespace JS { - (void)getValueWithPromise:(NSNumber *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -1038,8 +1038,8 @@ namespace JS { - (void)getValueWithPromise:(NSNumber *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -1138,8 +1138,8 @@ namespace JS { - (void)getValueWithPromise:(NSNumber *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -1904,8 +1904,8 @@ namespace JS { - (NSDictionary *)getGenericObjectReadOnly:(NSDictionary *)arg; - (NSDictionary *)getGenericObjectWithAlias:(NSDictionary *)arg; - (NSDictionary *)difficultObject:(JS::NativeObjectTurboModule::SpecDifficultObjectA &)A; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -2046,8 +2046,8 @@ namespace JS { } @protocol NativeOptionalObjectTurboModuleSpec -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -2246,14 +2246,14 @@ namespace JS { - (NSDictionary *)getAlias:(JS::NativeSampleTurboModule::Animal &)arg; - (NSNumber *)getRootTag:(double)arg; - (NSDictionary *)getValue:(double)x -getValuegetValuegetValuegetValuegetValuey:(NSString *)getValuegetValuegetValuegetValuegetValuey + y:(NSString *)y z:(NSDictionary *)z; - (void)getValueWithCallback:(RCTResponseSenderBlock)callback; - (void)getValueWithPromise:(BOOL)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -2350,8 +2350,8 @@ namespace JS { - (void)getValueWithPromise:(NSArray *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -2450,8 +2450,8 @@ namespace JS { - (void)getValueWithPromise:(NSNumber *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -2550,8 +2550,8 @@ namespace JS { - (void)getValueWithPromise:(NSNumber *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -2650,8 +2650,8 @@ namespace JS { - (void)getValueWithPromise:(NSNumber *)error resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end @@ -3541,7 +3541,7 @@ namespace facebook::react { } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) { - return static_cast(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:getValuegetValuegetValuegetValuegetValuey:z:), args, count); + return static_cast(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) { diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js index 25a2d1ee17f..c48a8b20e95 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js @@ -513,7 +513,7 @@ function serializeConstantsProtocolMethods( "Unable to generate C++ struct from module's getConstants() method return type.", ); - const returnObjCType = `facebook::react::ModuleConstants`; + const returnObjCType = `facebook::react::ModuleConstants`; // $FlowFixMe[missing-type-arg] return ['constantsToExport', 'getConstants'].map( diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap index 3cb576c6ad3..8d8a17e00b1 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap @@ -1055,8 +1055,8 @@ namespace JS { - (NSString *)getEnums:(double)enumInt enumFloat:(double)enumFloat enumString:(NSString *)enumString; -- (facebook::react::ModuleConstants)constantsToExport; -- (facebook::react::ModuleConstants)getConstants; +- (facebook::react::ModuleConstants)constantsToExport; +- (facebook::react::ModuleConstants)getConstants; @end diff --git a/packages/react-native/Libraries/Settings/RCTSettingsManager.mm b/packages/react-native/Libraries/Settings/RCTSettingsManager.mm index e1515ef05c2..e9ed3f6f3d4 100644 --- a/packages/react-native/Libraries/Settings/RCTSettingsManager.mm +++ b/packages/react-native/Libraries/Settings/RCTSettingsManager.mm @@ -52,7 +52,7 @@ RCT_EXPORT_MODULE() - (facebook::react::ModuleConstants)constantsToExport { - return (facebook::react::ModuleConstants)[self getConstants]; + return [self getConstants]; } - (facebook::react::ModuleConstants)getConstants diff --git a/packages/react-native/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm b/packages/react-native/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm index 287128e83df..2253c069600 100644 --- a/packages/react-native/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm +++ b/packages/react-native/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm @@ -35,7 +35,7 @@ RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible) {} - (facebook::react::ModuleConstants)constantsToExport { - return (facebook::react::ModuleConstants)[self getConstants]; + return [self getConstants]; } - (std::shared_ptr)getTurboModule: diff --git a/packages/react-native/React/CoreModules/RCTAppState.mm b/packages/react-native/React/CoreModules/RCTAppState.mm index 1998115ea27..d504c525bb9 100644 --- a/packages/react-native/React/CoreModules/RCTAppState.mm +++ b/packages/react-native/React/CoreModules/RCTAppState.mm @@ -64,7 +64,7 @@ RCT_EXPORT_MODULE() - (facebook::react::ModuleConstants)constantsToExport { - return (facebook::react::ModuleConstants)[self getConstants]; + return [self getConstants]; } - (facebook::react::ModuleConstants)getConstants diff --git a/packages/react-native/React/CoreModules/RCTStatusBarManager.mm b/packages/react-native/React/CoreModules/RCTStatusBarManager.mm index a7cd2cc9db5..764b463731f 100644 --- a/packages/react-native/React/CoreModules/RCTStatusBarManager.mm +++ b/packages/react-native/React/CoreModules/RCTStatusBarManager.mm @@ -193,7 +193,7 @@ RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible) - (facebook::react::ModuleConstants)constantsToExport { - return (facebook::react::ModuleConstants)[self getConstants]; + return [self getConstants]; } - (std::shared_ptr)getTurboModule: