@react-native/codegen 0.74.0 → 0.75.0-nightly-20240221-a1171f79f

package/lib/generators/components/GenerateShadowNodeCpp.js.flow

@@ -12,15 +12,17 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
 const FileTemplate = ({
-  libraryName,
   componentNames,
+  headerPrefix,
 }: {
-  libraryName: string,
   componentNames: string,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -31,15 +33,13 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/ShadowNodes.h>
+${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentNames}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const ComponentTemplate = ({className}: {className: string}) =>
@@ -53,6 +53,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'ShadowNodes.cpp';
 
@@ -87,7 +88,7 @@ module.exports = {
 
     const replacedTemplate = FileTemplate({
       componentNames,
-      libraryName,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateShadowNodeH.js

@@ -10,9 +10,12 @@
 
 'use strict';
 
+const _require = require('./CppHelpers'),
+  IncludeTemplate = _require.IncludeTemplate;
+
 // File path -> contents
 
-const FileTemplate = ({imports, libraryName, componentClasses}) => `
+const FileTemplate = ({componentClasses, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -24,18 +27,26 @@ const FileTemplate = ({imports, libraryName, componentClasses}) => `
 
 #pragma once
 
-${imports}#include <react/renderer/components/${libraryName}/Props.h>
-#include <react/renderer/components/${libraryName}/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>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const ComponentTemplate = ({className, eventEmitter}) =>
   `
@@ -50,7 +61,13 @@ using ${className}ShadowNode = ConcreteViewShadowNode<
     ${className}State>;
 `.trim();
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'ShadowNodes.h';
     const moduleResults = Object.keys(schema.modules)
       .map(moduleName => {
@@ -80,11 +97,10 @@ module.exports = {
       })
       .filter(Boolean)
       .join('\n\n');
-    const eventEmitterImport = `#include <react/renderer/components/${libraryName}/EventEmitters.h>\n`;
     const replacedTemplate = FileTemplate({
       componentClasses: moduleResults,
-      libraryName,
-      imports: eventEmitterImport,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

package/lib/generators/components/GenerateShadowNodeH.js.flow

@@ -12,17 +12,17 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
 const FileTemplate = ({
-  imports,
-  libraryName,
   componentClasses,
+  headerPrefix,
 }: {
-  imports: string,
-  libraryName: string,
   componentClasses: string,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -35,18 +35,17 @@ const FileTemplate = ({
 
 #pragma once
 
-${imports}#include <react/renderer/components/${libraryName}/Props.h>
-#include <react/renderer/components/${libraryName}/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>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const ComponentTemplate = ({
@@ -74,6 +73,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'ShadowNodes.h';
 
@@ -111,12 +111,9 @@ module.exports = {
       .filter(Boolean)
       .join('\n\n');
 
-    const eventEmitterImport = `#include <react/renderer/components/${libraryName}/EventEmitters.h>\n`;
-
     const replacedTemplate = FileTemplate({
       componentClasses: moduleResults,
-      libraryName,
-      imports: eventEmitterImport,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateStateCpp.js

@@ -10,9 +10,12 @@
 
 'use strict';
 
+const _require = require('./CppHelpers'),
+  IncludeTemplate = _require.IncludeTemplate;
+
 // File path -> contents
 
-const FileTemplate = ({libraryName, stateClasses}) => `
+const FileTemplate = ({stateClasses, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -21,19 +24,26 @@ const FileTemplate = ({libraryName, stateClasses}) => `
  *
  * ${'@'}generated by codegen project: GenerateStateCpp.js
  */
-#include <react/renderer/components/${libraryName}/States.h>
+${IncludeTemplate({
+  headerPrefix,
+  file: 'States.h',
+})}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${stateClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const StateTemplate = ({stateName}) => '';
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'States.cpp';
     const stateClasses = Object.keys(schema.modules)
       .map(moduleName => {
@@ -62,8 +72,9 @@ module.exports = {
       .filter(Boolean)
       .join('\n');
     const replacedTemplate = FileTemplate({
-      libraryName,
       stateClasses,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

package/lib/generators/components/GenerateStateCpp.js.flow

@@ -12,15 +12,17 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
 const FileTemplate = ({
-  libraryName,
   stateClasses,
+  headerPrefix,
 }: {
-  libraryName: string,
   stateClasses: string,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -30,15 +32,13 @@ const FileTemplate = ({
  *
  * ${'@'}generated by codegen project: GenerateStateCpp.js
  */
-#include <react/renderer/components/${libraryName}/States.h>
+${IncludeTemplate({headerPrefix, file: 'States.h'})}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${stateClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const StateTemplate = ({stateName}: {stateName: string}) => '';
@@ -49,6 +49,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'States.cpp';
 
@@ -83,8 +84,8 @@ module.exports = {
       .join('\n');
 
     const replacedTemplate = FileTemplate({
-      libraryName,
       stateClasses,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateStateH.js

@@ -30,13 +30,11 @@ const FileTemplate = ({libraryName, stateClasses}) =>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${stateClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `.trim();
 const StateTemplate = ({stateName}) =>
   `
@@ -56,7 +54,13 @@ public:
 };
 `.trim();
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'States.h';
     const stateClasses = Object.keys(schema.modules)
       .map(moduleName => {

package/lib/generators/components/GenerateStateH.js.flow

@@ -39,13 +39,11 @@ const FileTemplate = ({
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${stateClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `.trim();
 
 const StateTemplate = ({stateName}: {stateName: string}) =>
@@ -72,6 +70,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'States.h';
 

package/lib/generators/components/GenerateTests.js

@@ -10,10 +10,10 @@
 
 'use strict';
 
-const _require = require('./CppHelpers'),
-  getImports = _require.getImports;
-const _require2 = require('../Utils'),
-  toSafeCppString = _require2.toSafeCppString;
+const _require = require('../Utils'),
+  toSafeCppString = _require.toSafeCppString;
+const _require2 = require('./CppHelpers'),
+  getImports = _require2.getImports;
 const FileTemplate = ({libraryName, imports, componentTests}) =>
   `
 /**
@@ -125,7 +125,13 @@ function generateTestsString(name, component) {
   return [baseTest, ...testCases].map(createTest).join('');
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'Tests.cpp';
     const allImports = new Set([
       '#include <react/renderer/core/propsConversions.h>',

package/lib/generators/components/GenerateTests.js.flow

@@ -12,9 +12,8 @@
 import type {ComponentShape, PropTypeAnnotation} from '../../CodegenSchema';
 import type {SchemaType} from '../../CodegenSchema';
 
-const {getImports} = require('./CppHelpers');
-
 const {toSafeCppString} = require('../Utils');
+const {getImports} = require('./CppHelpers');
 
 type FilesOutput = Map<string, string>;
 type PropValueType = string | number | boolean;
@@ -172,6 +171,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'Tests.cpp';
     const allImports = new Set([

package/lib/generators/components/GenerateThirdPartyFabricComponentsProviderH.js

@@ -10,6 +10,10 @@
 
 'use strict';
 
+const _require = require('./ComponentsProviderUtils'),
+  generateSupportedApplePlatformsMacro =
+    _require.generateSupportedApplePlatformsMacro;
+
 // File path -> contents
 
 const FileTemplate = ({lookupFuncs}) => `
@@ -32,11 +36,12 @@ extern "C" {
 #endif
 
 Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name);
-
+#if RCT_NEW_ARCH_ENABLED
 #ifndef RCT_DYNAMIC_FRAMEWORKS
 
 ${lookupFuncs}
 
+#endif
 #endif
 
 #ifdef __cplusplus
@@ -51,12 +56,16 @@ const LookupFuncTemplate = ({className, libraryName}) =>
 Class<RCTComponentViewProtocol> ${className}Cls(void) __attribute__((used)); // ${libraryName}
 `.trim();
 module.exports = {
-  generate(schemas) {
+  generate(schemas, supportedApplePlatforms) {
     const fileName = 'RCTThirdPartyFabricComponentsProvider.h';
     const lookupFuncs = Object.keys(schemas)
       .map(libraryName => {
         const schema = schemas[libraryName];
-        return Object.keys(schema.modules)
+        const librarySupportedApplePlatforms =
+          supportedApplePlatforms === null || supportedApplePlatforms === void 0
+            ? void 0
+            : supportedApplePlatforms[libraryName];
+        const generatedLookup = Object.keys(schema.modules)
           .map(moduleName => {
             const module = schema.modules[moduleName];
             if (module.type !== 'Component') {
@@ -85,6 +94,10 @@ module.exports = {
           })
           .filter(Boolean)
           .join('\n');
+        return generateSupportedApplePlatformsMacro(
+          generatedLookup,
+          librarySupportedApplePlatforms,
+        );
       })
       .join('\n');
     const replacedTemplate = FileTemplate({

package/lib/generators/components/GenerateThirdPartyFabricComponentsProviderH.js.flow

@@ -12,6 +12,10 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {
+  generateSupportedApplePlatformsMacro,
+} = require('./ComponentsProviderUtils');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -35,11 +39,12 @@ extern "C" {
 #endif
 
 Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name);
-
+#if RCT_NEW_ARCH_ENABLED
 #ifndef RCT_DYNAMIC_FRAMEWORKS
 
 ${lookupFuncs}
 
+#endif
 #endif
 
 #ifdef __cplusplus
@@ -62,13 +67,18 @@ Class<RCTComponentViewProtocol> ${className}Cls(void) __attribute__((used)); //
 `.trim();
 
 module.exports = {
-  generate(schemas: {[string]: SchemaType}): FilesOutput {
+  generate(
+    schemas: {[string]: SchemaType},
+    supportedApplePlatforms?: {[string]: {[string]: boolean}},
+  ): FilesOutput {
     const fileName = 'RCTThirdPartyFabricComponentsProvider.h';
 
     const lookupFuncs = Object.keys(schemas)
       .map(libraryName => {
         const schema = schemas[libraryName];
-        return Object.keys(schema.modules)
+        const librarySupportedApplePlatforms =
+          supportedApplePlatforms?.[libraryName];
+        const generatedLookup = Object.keys(schema.modules)
           .map(moduleName => {
             const module = schema.modules[moduleName];
             if (module.type !== 'Component') {
@@ -99,6 +109,11 @@ module.exports = {
           })
           .filter(Boolean)
           .join('\n');
+
+        return generateSupportedApplePlatformsMacro(
+          generatedLookup,
+          librarySupportedApplePlatforms,
+        );
       })
       .join('\n');
 

package/lib/generators/components/GenerateThirdPartyFabricComponentsProviderObjCpp.js

@@ -10,6 +10,10 @@
 
 'use strict';
 
+const _require = require('./ComponentsProviderUtils'),
+  generateSupportedApplePlatformsMacro =
+    _require.generateSupportedApplePlatformsMacro;
+
 // File path -> contents
 
 const FileTemplate = ({lookupMap}) => `
@@ -31,9 +35,11 @@ const FileTemplate = ({lookupMap}) => `
 
 Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name) {
   static std::unordered_map<std::string, Class (*)(void)> sFabricComponentsClassMap = {
+    #if RCT_NEW_ARCH_ENABLED
     #ifndef RCT_DYNAMIC_FRAMEWORKS
 ${lookupMap}
     #endif
+    #endif
   };
 
   auto p = sFabricComponentsClassMap.find(name);
@@ -47,12 +53,16 @@ ${lookupMap}
 const LookupMapTemplate = ({className, libraryName}) => `
     {"${className}", ${className}Cls}, // ${libraryName}`;
 module.exports = {
-  generate(schemas) {
+  generate(schemas, supportedApplePlatforms) {
     const fileName = 'RCTThirdPartyFabricComponentsProvider.mm';
     const lookupMap = Object.keys(schemas)
       .map(libraryName => {
         const schema = schemas[libraryName];
-        return Object.keys(schema.modules)
+        const librarySupportedApplePlatforms =
+          supportedApplePlatforms === null || supportedApplePlatforms === void 0
+            ? void 0
+            : supportedApplePlatforms[libraryName];
+        const generatedLookup = Object.keys(schema.modules)
           .map(moduleName => {
             const module = schema.modules[moduleName];
             if (module.type !== 'Component') {
@@ -80,7 +90,12 @@ module.exports = {
               });
             return componentTemplates.length > 0 ? componentTemplates : null;
           })
-          .filter(Boolean);
+          .filter(Boolean)
+          .join('\n');
+        return generateSupportedApplePlatformsMacro(
+          generatedLookup,
+          librarySupportedApplePlatforms,
+        );
       })
       .join('\n');
     const replacedTemplate = FileTemplate({

package/lib/generators/components/GenerateThirdPartyFabricComponentsProviderObjCpp.js.flow

@@ -12,6 +12,10 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {
+  generateSupportedApplePlatformsMacro,
+} = require('./ComponentsProviderUtils');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -34,9 +38,11 @@ const FileTemplate = ({lookupMap}: {lookupMap: string}) => `
 
 Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name) {
   static std::unordered_map<std::string, Class (*)(void)> sFabricComponentsClassMap = {
+    #if RCT_NEW_ARCH_ENABLED
     #ifndef RCT_DYNAMIC_FRAMEWORKS
 ${lookupMap}
     #endif
+    #endif
   };
 
   auto p = sFabricComponentsClassMap.find(name);
@@ -58,13 +64,19 @@ const LookupMapTemplate = ({
     {"${className}", ${className}Cls}, // ${libraryName}`;
 
 module.exports = {
-  generate(schemas: {[string]: SchemaType}): FilesOutput {
+  generate(
+    schemas: {[string]: SchemaType},
+    supportedApplePlatforms?: {[string]: {[string]: boolean}},
+  ): FilesOutput {
     const fileName = 'RCTThirdPartyFabricComponentsProvider.mm';
 
     const lookupMap = Object.keys(schemas)
       .map(libraryName => {
         const schema = schemas[libraryName];
-        return Object.keys(schema.modules)
+        const librarySupportedApplePlatforms =
+          supportedApplePlatforms?.[libraryName];
+
+        const generatedLookup = Object.keys(schema.modules)
           .map(moduleName => {
             const module = schema.modules[moduleName];
             if (module.type !== 'Component') {
@@ -96,7 +108,13 @@ module.exports = {
 
             return componentTemplates.length > 0 ? componentTemplates : null;
           })
-          .filter(Boolean);
+          .filter(Boolean)
+          .join('\n');
+
+        return generateSupportedApplePlatformsMacro(
+          generatedLookup,
+          librarySupportedApplePlatforms,
+        );
       })
       .join('\n');
 

package/lib/generators/components/GenerateViewConfigJs.js

@@ -167,7 +167,7 @@ function getValidAttributesForEvents(events, imports) {
 function generateBubblingEventInfo(event, nameOveride) {
   return j.property(
     'init',
-    j.identifier(nameOveride || normalizeInputEventName(event.name)),
+    j.identifier(normalizeInputEventName(nameOveride || event.name)),
     j.objectExpression([
       j.property(
         'init',
@@ -187,7 +187,7 @@ function generateBubblingEventInfo(event, nameOveride) {
 function generateDirectEventInfo(event, nameOveride) {
   return j.property(
     'init',
-    j.identifier(nameOveride || normalizeInputEventName(event.name)),
+    j.identifier(normalizeInputEventName(nameOveride || event.name)),
     j.objectExpression([
       j.property(
         'init',

package/lib/generators/components/GenerateViewConfigJs.js.flow

@@ -197,7 +197,7 @@ function generateBubblingEventInfo(
 ) {
   return j.property(
     'init',
-    j.identifier(nameOveride || normalizeInputEventName(event.name)),
+    j.identifier(normalizeInputEventName(nameOveride || event.name)),
     j.objectExpression([
       j.property(
         'init',
@@ -221,7 +221,7 @@ function generateDirectEventInfo(
 ) {
   return j.property(
     'init',
-    j.identifier(nameOveride || normalizeInputEventName(event.name)),
+    j.identifier(normalizeInputEventName(nameOveride || event.name)),
     j.objectExpression([
       j.property(
         'init',