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

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

@@ -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,
 };

package/lib/generators/components/GenerateComponentDescriptorCpp.js

@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ *
+ * @format
+ */
+
+'use strict';
+
+const _require = require('./CppHelpers'),
+  IncludeTemplate = _require.IncludeTemplate;
+
+// File path -> contents
+
+const FileTemplate = ({libraryName, componentRegistrations, headerPrefix}) => `
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * ${'@'}generated by codegen project: GenerateComponentDescriptorCpp.js
+ */
+
+${IncludeTemplate({
+  headerPrefix,
+  file: 'ComponentDescriptors.h',
+})}
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
+
+void ${libraryName}_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
+${componentRegistrations}
+}
+
+} // namespace facebook::react
+`;
+const ComponentRegistrationTemplate = ({className}) =>
+  `
+registry->add(concreteComponentDescriptorProvider<${className}ComponentDescriptor>());
+`.trim();
+module.exports = {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
+    const fileName = 'ComponentDescriptors.cpp';
+    const componentRegistrations = Object.keys(schema.modules)
+      .map(moduleName => {
+        const module = schema.modules[moduleName];
+        if (module.type !== 'Component') {
+          return;
+        }
+        const components = module.components;
+        // No components in this module
+        if (components == null) {
+          return null;
+        }
+        return Object.keys(components)
+          .map(componentName => {
+            if (components[componentName].interfaceOnly === true) {
+              return;
+            }
+            return ComponentRegistrationTemplate({
+              className: componentName,
+            });
+          })
+          .join('\n');
+      })
+      .filter(Boolean)
+      .join('\n');
+    const replacedTemplate = FileTemplate({
+      libraryName,
+      componentRegistrations,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
+    });
+    return new Map([[fileName, replacedTemplate]]);
+  },
+};

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

@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {SchemaType} from '../../CodegenSchema';
+
+const {IncludeTemplate} = require('./CppHelpers');
+
+// File path -> contents
+type FilesOutput = Map<string, string>;
+
+const FileTemplate = ({
+  libraryName,
+  componentRegistrations,
+  headerPrefix,
+}: {
+  libraryName: string,
+  componentRegistrations: string,
+  headerPrefix: string,
+}) => `
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * ${'@'}generated by codegen project: GenerateComponentDescriptorCpp.js
+ */
+
+${IncludeTemplate({headerPrefix, file: 'ComponentDescriptors.h'})}
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
+
+void ${libraryName}_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
+${componentRegistrations}
+}
+
+} // namespace facebook::react
+`;
+
+const ComponentRegistrationTemplate = ({className}: {className: string}) =>
+  `
+registry->add(concreteComponentDescriptorProvider<${className}ComponentDescriptor>());
+`.trim();
+
+module.exports = {
+  generate(
+    libraryName: string,
+    schema: SchemaType,
+    packageName?: string,
+    assumeNonnull: boolean = false,
+    headerPrefix?: string,
+  ): FilesOutput {
+    const fileName = 'ComponentDescriptors.cpp';
+
+    const componentRegistrations = Object.keys(schema.modules)
+      .map(moduleName => {
+        const module = schema.modules[moduleName];
+        if (module.type !== 'Component') {
+          return;
+        }
+
+        const {components} = module;
+        // No components in this module
+        if (components == null) {
+          return null;
+        }
+
+        return Object.keys(components)
+          .map(componentName => {
+            if (components[componentName].interfaceOnly === true) {
+              return;
+            }
+
+            return ComponentRegistrationTemplate({className: componentName});
+          })
+          .join('\n');
+      })
+      .filter(Boolean)
+      .join('\n');
+
+    const replacedTemplate = FileTemplate({
+      libraryName,
+      componentRegistrations,
+      headerPrefix: headerPrefix ?? '',
+    });
+
+    return new Map([[fileName, replacedTemplate]]);
+  },
+};

package/lib/generators/components/GenerateComponentDescriptorH.js

@@ -10,9 +10,12 @@
 
 'use strict';
 
+const _require = require('./CppHelpers'),
+  IncludeTemplate = _require.IncludeTemplate;
+
 // File path -> contents
 
-const FileTemplate = ({componentDescriptors, libraryName}) => `
+const FileTemplate = ({libraryName, componentDefinitions, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -24,25 +27,36 @@ const FileTemplate = ({componentDescriptors, libraryName}) => `
 
 #pragma once
 
-#include <react/renderer/components/${libraryName}/ShadowNodes.h>
+${IncludeTemplate({
+  headerPrefix,
+  file: 'ShadowNodes.h',
+})}
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
 
-namespace facebook {
-namespace react {
+${componentDefinitions}
 
-${componentDescriptors}
+void ${libraryName}_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
-const ComponentTemplate = ({className}) =>
+const ComponentDefinitionTemplate = ({className}) =>
   `
 using ${className}ComponentDescriptor = ConcreteComponentDescriptor<${className}ShadowNode>;
 `.trim();
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'ComponentDescriptors.h';
-    const componentDescriptors = Object.keys(schema.modules)
+    const componentDefinitions = Object.keys(schema.modules)
       .map(moduleName => {
         const module = schema.modules[moduleName];
         if (module.type !== 'Component') {
@@ -58,7 +72,7 @@ module.exports = {
             if (components[componentName].interfaceOnly === true) {
               return;
             }
-            return ComponentTemplate({
+            return ComponentDefinitionTemplate({
               className: componentName,
             });
           })
@@ -67,8 +81,10 @@ module.exports = {
       .filter(Boolean)
       .join('\n');
     const replacedTemplate = FileTemplate({
-      componentDescriptors,
       libraryName,
+      componentDefinitions,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

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

@@ -12,15 +12,19 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
+const {IncludeTemplate} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
 const FileTemplate = ({
-  componentDescriptors,
   libraryName,
+  componentDefinitions,
+  headerPrefix,
 }: {
-  componentDescriptors: string,
   libraryName: string,
+  componentDefinitions: string,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -33,19 +37,21 @@ const FileTemplate = ({
 
 #pragma once
 
-#include <react/renderer/components/${libraryName}/ShadowNodes.h>
+${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
 
-namespace facebook {
-namespace react {
+${componentDefinitions}
 
-${componentDescriptors}
+void ${libraryName}_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
-const ComponentTemplate = ({className}: {className: string}) =>
+const ComponentDefinitionTemplate = ({className}: {className: string}) =>
   `
 using ${className}ComponentDescriptor = ConcreteComponentDescriptor<${className}ShadowNode>;
 `.trim();
@@ -56,10 +62,11 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'ComponentDescriptors.h';
 
-    const componentDescriptors = Object.keys(schema.modules)
+    const componentDefinitions = Object.keys(schema.modules)
       .map(moduleName => {
         const module = schema.modules[moduleName];
         if (module.type !== 'Component') {
@@ -78,7 +85,7 @@ module.exports = {
               return;
             }
 
-            return ComponentTemplate({className: componentName});
+            return ComponentDefinitionTemplate({className: componentName});
           })
           .join('\n');
       })
@@ -86,8 +93,9 @@ module.exports = {
       .join('\n');
 
     const replacedTemplate = FileTemplate({
-      componentDescriptors,
       libraryName,
+      componentDefinitions,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateComponentHObjCpp.js

@@ -125,6 +125,8 @@ function getObjCParamType(param) {
       return 'NSInteger';
     case 'StringTypeAnnotation':
       return 'NSString *';
+    case 'ArrayTypeAnnotation':
+      return 'const NSArray *';
     default:
       typeAnnotation.type;
       throw new Error('Received invalid param type annotation');
@@ -151,6 +153,8 @@ function getObjCExpectedKindParamType(param) {
       return '[NSNumber class]';
     case 'StringTypeAnnotation':
       return '[NSString class]';
+    case 'ArrayTypeAnnotation':
+      return '[NSArray class]';
     default:
       typeAnnotation.type;
       throw new Error('Received invalid param type annotation');
@@ -177,6 +181,8 @@ function getReadableExpectedKindParamType(param) {
       return 'number';
     case 'StringTypeAnnotation':
       return 'string';
+    case 'ArrayTypeAnnotation':
+      return 'array';
     default:
       typeAnnotation.type;
       throw new Error('Received invalid param type annotation');
@@ -203,6 +209,8 @@ function getObjCRightHandAssignmentParamType(param, index) {
       return `[(NSNumber *)arg${index} intValue]`;
     case 'StringTypeAnnotation':
       return `(NSString *)arg${index}`;
+    case 'ArrayTypeAnnotation':
+      return `(NSArray *)arg${index}`;
     default:
       typeAnnotation.type;
       throw new Error('Received invalid param type annotation');
@@ -286,7 +294,13 @@ function generateCommandHandler(component, componentName) {
   });
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'RCTComponentViewHelpers.h';
     const componentContent = Object.keys(schema.modules)
       .map(moduleName => {

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

@@ -11,11 +11,11 @@
 'use strict';
 
 import type {
-  NamedShape,
+  CommandParamTypeAnnotation,
   CommandTypeAnnotation,
   ComponentShape,
+  NamedShape,
   SchemaType,
-  CommandParamTypeAnnotation,
 } from '../../CodegenSchema';
 
 type FilesOutput = Map<string, string>;
@@ -171,6 +171,8 @@ function getObjCParamType(param: Param): string {
       return 'NSInteger';
     case 'StringTypeAnnotation':
       return 'NSString *';
+    case 'ArrayTypeAnnotation':
+      return 'const NSArray *';
     default:
       (typeAnnotation.type: empty);
       throw new Error('Received invalid param type annotation');
@@ -199,6 +201,8 @@ function getObjCExpectedKindParamType(param: Param): string {
       return '[NSNumber class]';
     case 'StringTypeAnnotation':
       return '[NSString class]';
+    case 'ArrayTypeAnnotation':
+      return '[NSArray class]';
     default:
       (typeAnnotation.type: empty);
       throw new Error('Received invalid param type annotation');
@@ -227,6 +231,8 @@ function getReadableExpectedKindParamType(param: Param): string {
       return 'number';
     case 'StringTypeAnnotation':
       return 'string';
+    case 'ArrayTypeAnnotation':
+      return 'array';
     default:
       (typeAnnotation.type: empty);
       throw new Error('Received invalid param type annotation');
@@ -258,6 +264,8 @@ function getObjCRightHandAssignmentParamType(
       return `[(NSNumber *)arg${index} intValue]`;
     case 'StringTypeAnnotation':
       return `(NSString *)arg${index}`;
+    case 'ArrayTypeAnnotation':
+      return `(NSArray *)arg${index}`;
     default:
       (typeAnnotation.type: empty);
       throw new Error('Received invalid param type annotation');
@@ -372,6 +380,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'RCTComponentViewHelpers.h';
 

package/lib/generators/components/GenerateEventEmitterCpp.js

@@ -10,11 +10,15 @@
 
 'use strict';
 
-const _require = require('./CppHelpers'),
-  generateEventStructName = _require.generateEventStructName;
-const _require2 = require('../Utils'),
-  indent = _require2.indent;
-const FileTemplate = ({events, libraryName, extraIncludes}) => `
+const _require = require('../Utils'),
+  indent = _require.indent;
+const _require2 = require('./CppHelpers'),
+  IncludeTemplate = _require2.IncludeTemplate,
+  generateEventStructName = _require2.generateEventStructName;
+
+// File path -> contents
+
+const FileTemplate = ({events, extraIncludes, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -24,14 +28,15 @@ const FileTemplate = ({events, libraryName, extraIncludes}) => `
  * ${'@'}generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/EventEmitters.h>
+${IncludeTemplate({
+  headerPrefix,
+  file: 'EventEmitters.h',
+})}
 ${[...extraIncludes].join('\n')}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 ${events}
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const ComponentTemplate = ({
   className,
@@ -318,9 +323,10 @@ function generateEvent(componentName, event, extraIncludes) {
   // In order to migrate to this new system we have to support the current
   // naming scheme. We should delete this once we are able to control this name
   // throughout the system.
-  const dispatchEventName = `${event.name[2].toLowerCase()}${event.name.slice(
-    3,
-  )}`;
+  const dispatchEventName =
+    event.paperTopLevelNameDeprecated != null
+      ? event.paperTopLevelNameDeprecated
+      : `${event.name[2].toLowerCase()}${event.name.slice(3)}`;
   if (event.typeAnnotation.argument) {
     const implementation = `
     auto $payload = jsi::Object(runtime);
@@ -350,7 +356,13 @@ function generateEvent(componentName, event, extraIncludes) {
   });
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const moduleComponents = Object.keys(schema.modules)
       .map(moduleName => {
         const module = schema.modules[moduleName];
@@ -377,9 +389,10 @@ module.exports = {
       .join('\n');
     const fileName = 'EventEmitters.cpp';
     const replacedTemplate = FileTemplate({
-      libraryName,
       events: componentEmitters,
       extraIncludes,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

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

@@ -10,18 +10,17 @@
 
 'use strict';
 import type {EventTypeShape} from '../../CodegenSchema';
-
-const {generateEventStructName} = require('./CppHelpers');
-const {indent} = require('../Utils');
-
 import type {
   ComponentShape,
-  NamedShape,
   EventTypeAnnotation,
-  SchemaType,
+  NamedShape,
   ObjectTypeAnnotation,
+  SchemaType,
 } from '../../CodegenSchema';
 
+const {indent} = require('../Utils');
+const {IncludeTemplate, generateEventStructName} = require('./CppHelpers');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
@@ -32,12 +31,12 @@ type ComponentCollection = $ReadOnly<{
 
 const FileTemplate = ({
   events,
-  libraryName,
   extraIncludes,
+  headerPrefix,
 }: {
   events: string,
-  libraryName: string,
   extraIncludes: Set<string>,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -48,14 +47,12 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/EventEmitters.h>
+${IncludeTemplate({headerPrefix, file: 'EventEmitters.h'})}
 ${[...extraIncludes].join('\n')}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 ${events}
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const ComponentTemplate = ({
@@ -372,9 +369,10 @@ function generateEvent(
   // In order to migrate to this new system we have to support the current
   // naming scheme. We should delete this once we are able to control this name
   // throughout the system.
-  const dispatchEventName = `${event.name[2].toLowerCase()}${event.name.slice(
-    3,
-  )}`;
+  const dispatchEventName =
+    event.paperTopLevelNameDeprecated != null
+      ? event.paperTopLevelNameDeprecated
+      : `${event.name[2].toLowerCase()}${event.name.slice(3)}`;
 
   if (event.typeAnnotation.argument) {
     const implementation = `
@@ -414,6 +412,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const moduleComponents: ComponentCollection = Object.keys(schema.modules)
       .map(moduleName => {
@@ -445,9 +444,9 @@ module.exports = {
 
     const fileName = 'EventEmitters.cpp';
     const replacedTemplate = FileTemplate({
-      libraryName,
       events: componentEmitters,
       extraIncludes,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);