Fix relative includes in component codegen (#42956)

Summary: Pull Request resolved: #42956 In the component codegen system, when the header prefix is an empty string, we generate includes using angle brackets, like this: ``` #include <EventEmitter.h> ``` This fails to compile in buck. If we instead generate includes using quotations, buck compiles again. ``` #include "EventEmitter.h" ``` So, changes: if the headerPrefix is an empty string, generate includes using quotes. This is a followup to D51811596. Changelog: [Internal] Reviewed By: fkgozali, dmytrorykun Differential Revision: D53487111 fbshipit-source-id: e90a8b9fd4f8a2a93a0f4ad0ed989af26ad122c5
facebook · Feb 10, 2024 · 3582f43 · 3582f43
1 parent d0dd0e2
commit 3582f43
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/packages/react-native-codegen/src/generators/components/CppHelpers.js b/packages/react-native-codegen/src/generators/components/CppHelpers.js
@@ -256,6 +256,19 @@ function convertDefaultTypeToString(
   }
 }
 
+const IncludeTemplate = ({
+  headerPrefix,
+  file,
+}: {
+  headerPrefix: string,
+  file: string,
+}): string => {
+  if (headerPrefix === '') {
+    return `#include "${file}"`;
+  }
+  return `#include <${headerPrefix}${file}>`;
+};
+
 module.exports = {
   convertDefaultTypeToString,
   getCppArrayTypeForAnnotation,
@@ -265,4 +278,5 @@ module.exports = {
   toIntEnumValueName,
   generateStructName,
   generateEventStructName,
+  IncludeTemplate,
 };
diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
@@ -12,6 +12,8 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -33,7 +35,7 @@ const FileTemplate = ({
 
 #pragma once
 
-#include <${headerPrefix}ShadowNodes.h>
+${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {

diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
@@ -19,7 +19,7 @@ import type {
 } from '../../CodegenSchema';
 
 const {indent} = require('../Utils');
-const {generateEventStructName} = require('./CppHelpers');
+const {IncludeTemplate, generateEventStructName} = require('./CppHelpers');
 
 // File path -> contents
 type FilesOutput = Map<string, string>;
@@ -47,7 +47,7 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <${headerPrefix}EventEmitters.h>
+${IncludeTemplate({headerPrefix, file: 'EventEmitters.h'})}
 ${[...extraIncludes].join('\n')}
 
 namespace facebook::react {

diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
@@ -12,7 +12,11 @@
 
 import type {ComponentShape, SchemaType} from '../../CodegenSchema';
 
-const {convertDefaultTypeToString, getImports} = require('./CppHelpers');
+const {
+  IncludeTemplate,
+  convertDefaultTypeToString,
+  getImports,
+} = require('./CppHelpers');
 
 // File path -> contents
 type FilesOutput = Map<string, string>;
@@ -35,7 +39,7 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GeneratePropsCpp.js
  */
 
-#include <${headerPrefix}Props.h>
+${IncludeTemplate({headerPrefix, file: 'Props.h'})}
 ${imports}
 
 namespace facebook::react {

diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js
@@ -12,6 +12,8 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -31,7 +33,7 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include <${headerPrefix}ShadowNodes.h>
+${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
 
 namespace facebook::react {
 

diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
@@ -12,6 +12,8 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -33,9 +35,9 @@ const FileTemplate = ({
 
 #pragma once
 
-#include <${headerPrefix}EventEmitters.h>
-#include <${headerPrefix}Props.h>
-#include <${headerPrefix}States.h>
+${IncludeTemplate({headerPrefix, file: 'EventEmitters.h'})}
+${IncludeTemplate({headerPrefix, file: 'Props.h'})}
+${IncludeTemplate({headerPrefix, file: 'States.h'})}
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 

diff --git a/packages/react-native-codegen/src/generators/components/GenerateStateCpp.js b/packages/react-native-codegen/src/generators/components/GenerateStateCpp.js
@@ -12,6 +12,8 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -30,7 +32,7 @@ const FileTemplate = ({
  *
  * ${'@'}generated by codegen project: GenerateStateCpp.js
  */
-#include <${headerPrefix}States.h>
+${IncludeTemplate({headerPrefix, file: 'States.h'})}
 
 namespace facebook::react {