Skip to content

Commit c65ae78

Browse files
javachefacebook-github-bot
javache
authored and
facebook-github-bot
committed
Fix type of constantsToExport arg
Summary: 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] Differential Revision: D87980865
1 parent 7c603ee commit c65ae78

File tree

8 files changed

+39
-43
lines changed

8 files changed

+39
-43
lines changed

‎packages/react-native-codegen/e2e/deep_imports/__test_fixtures__/modules/NativeSampleTurboModule.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ export interface Spec extends TurboModule {
3535
+getObjectShape: (arg: {prop: number}) => {prop: number};
3636
+getAlias: (arg: Animal) => Animal;
3737
+getRootTag: (arg: RootTag) => RootTag;
38-
+getValue: (
39-
x: number,
40-
getValuegetValuegetValuegetValuegetValuey: string,
41-
z: Object,
42-
) => Object;
38+
+getValue: (x: number, y: string, z: Object) => Object;
4339
+getValueWithCallback: (callback: (value: string) => void) => void;
4440
+getValueWithPromise: (error: boolean) => Promise<string>;
4541
}

‎packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ namespace JS {
392392
- (NSDictionary *)getGenericObjectReadOnly:(NSDictionary *)arg;
393393
- (NSDictionary *)getGenericObjectWithAlias:(NSDictionary *)arg;
394394
- (NSDictionary *)difficultObject:(JS::NativeObjectTurboModule::SpecDifficultObjectA &)A;
395-
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)constantsToExport;
396-
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)getConstants;
395+
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants>)constantsToExport;
396+
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants>)getConstants;
397397
398398
@end
399399
@@ -534,8 +534,8 @@ namespace JS {
534534
}
535535
@protocol NativeOptionalObjectTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
536536
537-
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)constantsToExport;
538-
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)getConstants;
537+
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants>)constantsToExport;
538+
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants>)getConstants;
539539
540540
@end
541541
@@ -734,14 +734,14 @@ namespace JS {
734734
- (NSDictionary *)getAlias:(JS::NativeSampleTurboModule::Animal &)arg;
735735
- (NSNumber *)getRootTag:(double)arg;
736736
- (NSDictionary *)getValue:(double)x
737-
getValuegetValuegetValuegetValuegetValuey:(NSString *)getValuegetValuegetValuegetValuegetValuey
737+
y:(NSString *)y
738738
z:(NSDictionary *)z;
739739
- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
740740
- (void)getValueWithPromise:(BOOL)error
741741
resolve:(RCTPromiseResolveBlock)resolve
742742
reject:(RCTPromiseRejectBlock)reject;
743-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
744-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
743+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants>)constantsToExport;
744+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants>)getConstants;
745745
746746
@end
747747
@@ -838,8 +838,8 @@ namespace JS {
838838
- (void)getValueWithPromise:(NSArray *)error
839839
resolve:(RCTPromiseResolveBlock)resolve
840840
reject:(RCTPromiseRejectBlock)reject;
841-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)constantsToExport;
842-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)getConstants;
841+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants>)constantsToExport;
842+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants>)getConstants;
843843
844844
@end
845845
@@ -938,8 +938,8 @@ namespace JS {
938938
- (void)getValueWithPromise:(NSNumber *)error
939939
resolve:(RCTPromiseResolveBlock)resolve
940940
reject:(RCTPromiseRejectBlock)reject;
941-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)constantsToExport;
942-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)getConstants;
941+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants>)constantsToExport;
942+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants>)getConstants;
943943
944944
@end
945945
@@ -1038,8 +1038,8 @@ namespace JS {
10381038
- (void)getValueWithPromise:(NSNumber *)error
10391039
resolve:(RCTPromiseResolveBlock)resolve
10401040
reject:(RCTPromiseRejectBlock)reject;
1041-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)constantsToExport;
1042-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)getConstants;
1041+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants>)constantsToExport;
1042+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants>)getConstants;
10431043
10441044
@end
10451045
@@ -1138,8 +1138,8 @@ namespace JS {
11381138
- (void)getValueWithPromise:(NSNumber *)error
11391139
resolve:(RCTPromiseResolveBlock)resolve
11401140
reject:(RCTPromiseRejectBlock)reject;
1141-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)constantsToExport;
1142-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)getConstants;
1141+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants>)constantsToExport;
1142+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants>)getConstants;
11431143
11441144
@end
11451145
@@ -1904,8 +1904,8 @@ namespace JS {
19041904
- (NSDictionary *)getGenericObjectReadOnly:(NSDictionary *)arg;
19051905
- (NSDictionary *)getGenericObjectWithAlias:(NSDictionary *)arg;
19061906
- (NSDictionary *)difficultObject:(JS::NativeObjectTurboModule::SpecDifficultObjectA &)A;
1907-
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)constantsToExport;
1908-
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)getConstants;
1907+
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants>)constantsToExport;
1908+
- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants>)getConstants;
19091909
19101910
@end
19111911
@@ -2046,8 +2046,8 @@ namespace JS {
20462046
}
20472047
@protocol NativeOptionalObjectTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
20482048
2049-
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)constantsToExport;
2050-
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)getConstants;
2049+
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants>)constantsToExport;
2050+
- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants>)getConstants;
20512051
20522052
@end
20532053
@@ -2246,14 +2246,14 @@ namespace JS {
22462246
- (NSDictionary *)getAlias:(JS::NativeSampleTurboModule::Animal &)arg;
22472247
- (NSNumber *)getRootTag:(double)arg;
22482248
- (NSDictionary *)getValue:(double)x
2249-
getValuegetValuegetValuegetValuegetValuey:(NSString *)getValuegetValuegetValuegetValuegetValuey
2249+
y:(NSString *)y
22502250
z:(NSDictionary *)z;
22512251
- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
22522252
- (void)getValueWithPromise:(BOOL)error
22532253
resolve:(RCTPromiseResolveBlock)resolve
22542254
reject:(RCTPromiseRejectBlock)reject;
2255-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
2256-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
2255+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants>)constantsToExport;
2256+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants>)getConstants;
22572257
22582258
@end
22592259
@@ -2350,8 +2350,8 @@ namespace JS {
23502350
- (void)getValueWithPromise:(NSArray *)error
23512351
resolve:(RCTPromiseResolveBlock)resolve
23522352
reject:(RCTPromiseRejectBlock)reject;
2353-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)constantsToExport;
2354-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)getConstants;
2353+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants>)constantsToExport;
2354+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants>)getConstants;
23552355
23562356
@end
23572357
@@ -2450,8 +2450,8 @@ namespace JS {
24502450
- (void)getValueWithPromise:(NSNumber *)error
24512451
resolve:(RCTPromiseResolveBlock)resolve
24522452
reject:(RCTPromiseRejectBlock)reject;
2453-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)constantsToExport;
2454-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)getConstants;
2453+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants>)constantsToExport;
2454+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants>)getConstants;
24552455
24562456
@end
24572457
@@ -2550,8 +2550,8 @@ namespace JS {
25502550
- (void)getValueWithPromise:(NSNumber *)error
25512551
resolve:(RCTPromiseResolveBlock)resolve
25522552
reject:(RCTPromiseRejectBlock)reject;
2553-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)constantsToExport;
2554-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)getConstants;
2553+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants>)constantsToExport;
2554+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants>)getConstants;
25552555
25562556
@end
25572557
@@ -2650,8 +2650,8 @@ namespace JS {
26502650
- (void)getValueWithPromise:(NSNumber *)error
26512651
resolve:(RCTPromiseResolveBlock)resolve
26522652
reject:(RCTPromiseRejectBlock)reject;
2653-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)constantsToExport;
2654-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)getConstants;
2653+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants>)constantsToExport;
2654+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants>)getConstants;
26552655
26562656
@end
26572657
@@ -3541,7 +3541,7 @@ namespace facebook::react {
35413541
}
35423542
35433543
static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
3544-
return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:getValuegetValuegetValuegetValuegetValuey:z:), args, count);
3544+
return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
35453545
}
35463546
35473547
static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {

‎packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ function serializeConstantsProtocolMethods(
514514
"Unable to generate C++ struct from module's getConstants() method return type.",
515515
);
516516

517-
const returnObjCType = `facebook::react::ModuleConstants<JS::${hasteModuleName}::Constants::Builder>`;
517+
const returnObjCType = `facebook::react::ModuleConstants<JS::${hasteModuleName}::Constants>`;
518518

519519
// $FlowFixMe[missing-type-arg]
520520
return ['constantsToExport', 'getConstants'].map<MethodSerializationOutput>(

‎packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,8 +1055,8 @@ namespace JS {
10551055
- (NSString *)getEnums:(double)enumInt
10561056
enumFloat:(double)enumFloat
10571057
enumString:(NSString *)enumString;
1058-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
1059-
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
1058+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants>)constantsToExport;
1059+
- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants>)getConstants;
10601060
10611061
@end
10621062

‎packages/react-native/Libraries/Settings/RCTSettingsManager.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ - (instancetype)initWithUserDefaults:(NSUserDefaults *)defaults
5252

5353
- (facebook::react::ModuleConstants<JS::NativeSettingsManager::Constants>)constantsToExport
5454
{
55-
return (facebook::react::ModuleConstants<JS::NativeSettingsManager::Constants>)[self getConstants];
55+
return [self getConstants];
5656
}
5757

5858
- (facebook::react::ModuleConstants<JS::NativeSettingsManager::Constants>)getConstants

‎packages/react-native/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @implementation RCTStatusBarManager
3535

3636
- (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)constantsToExport
3737
{
38-
return (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)[self getConstants];
38+
return [self getConstants];
3939
}
4040

4141
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

‎packages/react-native/React/CoreModules/RCTAppState.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ - (void)initialize
6464

6565
- (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)constantsToExport
6666
{
67-
return (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)[self getConstants];
67+
return [self getConstants];
6868
}
6969

7070
- (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)getConstants

‎packages/react-native/React/CoreModules/RCTStatusBarManager.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification
193193

194194
- (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)constantsToExport
195195
{
196-
return (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)[self getConstants];
196+
return [self getConstants];
197197
}
198198

199199
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

0 commit comments

Comments
 (0)