diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap index ea24b5af1b5..435e5d6471e 100644 --- a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap @@ -1111,7 +1111,7 @@ inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(const Inpu auto const3 = i.const3.get(); d[@\\"const3\\"] = RCTConvertVecToArray(const3, ^id(NSString * el_) { return el_; }); auto id_ = i.id_; - d[@\\"id_\\"] = RCTConvertOptionalVecToArray(id_, ^id(folly::Optional el_) { return el_.hasValue() ? el_.value().buildUnsafeRawValue() : nil; }); + d[@\\"id\\"] = RCTConvertOptionalVecToArray(id_, ^id(folly::Optional el_) { return el_.hasValue() ? el_.value().buildUnsafeRawValue() : nil; }); return d; }) {} inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(Constants i) : _factory(^{ diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js index 9b39bf1560d..7a1772ad363 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js @@ -222,15 +222,15 @@ function serializeConstantsStruct( builderInputProps: struct.properties .map(property => { const {typeAnnotation, optional} = property; - const propName = getSafePropertyName(property); + const safePropName = getSafePropertyName(property); const objCType = toObjCType(hasteModuleName, typeAnnotation, optional); if (!optional) { - return `RCTRequired<${objCType}> ${propName};`; + return `RCTRequired<${objCType}> ${safePropName};`; } const space = ' '.repeat(objCType.endsWith('*') ? 0 : 1); - return `${objCType}${space}${propName};`; + return `${objCType}${space}${safePropName};`; }) .join('\n '), }); @@ -240,17 +240,17 @@ function serializeConstantsStruct( structName: struct.name, properties: struct.properties .map(property => { - const {typeAnnotation, optional} = property; - const propName = getSafePropertyName(property); + const {typeAnnotation, optional, name: propName} = property; + const safePropName = getSafePropertyName(property); const objCValue = toObjCValue( hasteModuleName, typeAnnotation, - propName, + safePropName, 0, optional, ); - let varDecl = `auto ${propName} = i.${propName}`; + let varDecl = `auto ${safePropName} = i.${safePropName}`; if (!optional) { varDecl += '.get()'; } diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js index 14b8f7b4e9c..168afa44ebd 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js @@ -52,13 +52,15 @@ const MethodTemplate = ({ hasteModuleName, structName, propertyName, + safePropertyName, }: $ReadOnly<{ returnType: string, returnValue: string, hasteModuleName: string, structName: string, propertyName: string, -}>) => `inline ${returnType}JS::${hasteModuleName}::${structName}::${propertyName}() const + safePropertyName: string, +}>) => `inline ${returnType}JS::${hasteModuleName}::${structName}::${safePropertyName}() const { id const p = _v[@"${propertyName}"]; return ${returnValue}; @@ -211,7 +213,7 @@ function serializeRegularStruct( structProperties: struct.properties .map(property => { const {typeAnnotation, optional} = property; - const propName = getSafePropertyName(property); + const safePropName = getSafePropertyName(property); const returnType = toObjCType( hasteModuleName, typeAnnotation, @@ -219,15 +221,15 @@ function serializeRegularStruct( ); const padding = ' '.repeat(returnType.endsWith('*') ? 0 : 1); - return `${returnType}${padding}${propName}() const;`; + return `${returnType}${padding}${safePropName}() const;`; }) .join('\n '), }); const methods = struct.properties .map(property => { - const {typeAnnotation, optional} = property; - const propName = getSafePropertyName(property); + const {typeAnnotation, optional, name: propName} = property; + const safePropertyName = getSafePropertyName(property); const returnType = toObjCType(hasteModuleName, typeAnnotation, optional); const returnValue = toObjCValue( hasteModuleName, @@ -244,6 +246,7 @@ function serializeRegularStruct( returnType: returnType + padding, returnValue: returnValue, propertyName: propName, + safePropertyName, }); }) .join('\n'); 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 713889b0cf1..232d40e7dc1 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 @@ -171,7 +171,7 @@ inline NSString *JS::NativeSampleTurboModule::SpecDifficultAE::F() const } inline double JS::NativeSampleTurboModule::SpecDifficultAE::id_() const { - id const p = _v[@\\"id_\\"]; + id const p = _v[@\\"id\\"]; return RCTBridgingToDouble(p); } inline bool JS::NativeSampleTurboModule::SpecDifficultA::D() const @@ -743,7 +743,7 @@ inline facebook::react::LazyVector JS:: } inline double JS::NativeExceptionsManager::ExceptionData::id_() const { - id const p = _v[@\\"id_\\"]; + id const p = _v[@\\"id\\"]; return RCTBridgingToDouble(p); } inline bool JS::NativeExceptionsManager::ExceptionData::isFatal() const