@react-native/codegen 0.72.5 → 0.73.0-nightly-20230605-5062553c6

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

@@ -11,13 +11,15 @@
 'use strict';
 import type {EventTypeShape} from '../../CodegenSchema';
 
-const {generateEventStructName} = require('./CppHelpers.js');
+const {generateEventStructName} = require('./CppHelpers');
+const {indent} = require('../Utils');
 
 import type {
   ComponentShape,
   NamedShape,
   EventTypeAnnotation,
   SchemaType,
+  ObjectTypeAnnotation,
 } from '../../CodegenSchema';
 
 // File path -> contents
@@ -31,9 +33,11 @@ type ComponentCollection = $ReadOnly<{
 const FileTemplate = ({
   events,
   libraryName,
+  extraIncludes,
 }: {
   events: string,
   libraryName: string,
+  extraIncludes: Set<string>,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -45,12 +49,11 @@ const FileTemplate = ({
  */
 
 #include <react/renderer/components/${libraryName}/EventEmitters.h>
+${[...extraIncludes].join('\n')}
 
 namespace facebook {
 namespace react {
-
 ${events}
-
 } // namespace react
 } // namespace facebook
 `;
@@ -68,16 +71,16 @@ const ComponentTemplate = ({
   dispatchEventName: string,
   implementation: string,
 }) => {
-  const capture = implementation.includes('event')
-    ? 'event=std::move(event)'
+  const capture = implementation.includes('$event')
+    ? '$event=std::move($event)'
     : '';
   return `
-void ${className}EventEmitter::${eventName}(${structName} event) const {
+void ${className}EventEmitter::${eventName}(${structName} $event) const {
   dispatchEvent("${dispatchEventName}", [${capture}](jsi::Runtime &runtime) {
     ${implementation}
   });
 }
-`.trim();
+`;
 };
 
 const BasicComponentTemplate = ({
@@ -99,90 +102,258 @@ function generateSetter(
   variableName: string,
   propertyName: string,
   propertyParts: $ReadOnlyArray<string>,
+  usingEvent: boolean,
+  valueMapper: string => string = value => value,
 ) {
-  const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `event.${propertyParts.join(
-    '.',
-  )}${trailingPeriod}${propertyName});`;
-
-  return `${variableName}.setProperty(runtime, "${propertyName}", ${eventChain}`;
+  const eventChain = usingEvent
+    ? `$event.${[...propertyParts, propertyName].join('.')}`
+    : [propertyParts, propertyName].join('.');
+  return `${variableName}.setProperty(runtime, "${propertyName}", ${valueMapper(
+    eventChain,
+  )});`;
 }
 
-function generateEnumSetter(
+function generateObjectSetter(
   variableName: string,
   propertyName: string,
   propertyParts: $ReadOnlyArray<string>,
+  typeAnnotation: ObjectTypeAnnotation<EventTypeAnnotation>,
+  extraIncludes: Set<string>,
+  usingEvent: boolean,
 ) {
-  const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `event.${propertyParts.join(
-    '.',
-  )}${trailingPeriod}${propertyName})`;
+  return `
+{
+  auto ${propertyName} = jsi::Object(runtime);
+  ${indent(
+    generateSetters(
+      propertyName,
+      typeAnnotation.properties,
+      propertyParts.concat([propertyName]),
+      extraIncludes,
+      usingEvent,
+    ),
+    2,
+  )}
+  ${variableName}.setProperty(runtime, "${propertyName}", ${propertyName});
+}
+`.trim();
+}
+
+function setValueAtIndex(
+  propertyName: string,
+  indexVariable: string,
+  loopLocalVariable: string,
+  mappingFunction: string => string = value => value,
+) {
+  return `${propertyName}.setValueAtIndex(runtime, ${indexVariable}++, ${mappingFunction(
+    loopLocalVariable,
+  )});`;
+}
+
+function generateArraySetter(
+  variableName: string,
+  propertyName: string,
+  propertyParts: $ReadOnlyArray<string>,
+  elementType: EventTypeAnnotation,
+  extraIncludes: Set<string>,
+  usingEvent: boolean,
+): string {
+  const eventChain = usingEvent
+    ? `$event.${[...propertyParts, propertyName].join('.')}`
+    : [propertyParts, propertyName].join('.');
+  const indexVar = `${propertyName}Index`;
+  const innerLoopVar = `${propertyName}Value`;
+  return `
+    auto ${propertyName} = jsi::Array(runtime, ${eventChain}.size());
+    size_t ${indexVar} = 0;
+    for (auto ${innerLoopVar} : ${eventChain}) {
+      ${handleArrayElementType(
+        elementType,
+        propertyName,
+        indexVar,
+        innerLoopVar,
+        propertyParts,
+        extraIncludes,
+        usingEvent,
+      )}
+    }
+    ${variableName}.setProperty(runtime, "${propertyName}", ${propertyName});
+  `;
+}
+
+function handleArrayElementType(
+  elementType: EventTypeAnnotation,
+  propertyName: string,
+  indexVariable: string,
+  loopLocalVariable: string,
+  propertyParts: $ReadOnlyArray<string>,
+  extraIncludes: Set<string>,
+  usingEvent: boolean,
+): string {
+  switch (elementType.type) {
+    case 'BooleanTypeAnnotation':
+      return setValueAtIndex(
+        propertyName,
+        indexVariable,
+        loopLocalVariable,
+        val => `(bool)${val}`,
+      );
+    case 'StringTypeAnnotation':
+    case 'Int32TypeAnnotation':
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+      return setValueAtIndex(propertyName, indexVariable, loopLocalVariable);
+    case 'MixedTypeAnnotation':
+      return setValueAtIndex(
+        propertyName,
+        indexVariable,
+        loopLocalVariable,
+        val => `jsi::valueFromDynamic(runtime, ${val})`,
+      );
+    case 'StringEnumTypeAnnotation':
+      return setValueAtIndex(
+        propertyName,
+        indexVariable,
+        loopLocalVariable,
+        val => `toString(${val})`,
+      );
+    case 'ObjectTypeAnnotation':
+      return convertObjectTypeArray(
+        propertyName,
+        indexVariable,
+        loopLocalVariable,
+        propertyParts,
+        elementType,
+        extraIncludes,
+      );
+    case 'ArrayTypeAnnotation':
+      return convertArrayTypeArray(
+        propertyName,
+        indexVariable,
+        loopLocalVariable,
+        propertyParts,
+        elementType,
+        extraIncludes,
+        usingEvent,
+      );
+    default:
+      throw new Error(
+        `Received invalid elementType for array ${elementType.type}`,
+      );
+  }
+}
+
+function convertObjectTypeArray(
+  propertyName: string,
+  indexVariable: string,
+  loopLocalVariable: string,
+  propertyParts: $ReadOnlyArray<string>,
+  objectTypeAnnotation: ObjectTypeAnnotation<EventTypeAnnotation>,
+  extraIncludes: Set<string>,
+): string {
+  return `auto ${propertyName}Object = jsi::Object(runtime);
+      ${generateSetters(
+        `${propertyName}Object`,
+        objectTypeAnnotation.properties,
+        [].concat([loopLocalVariable]),
+        extraIncludes,
+        false,
+      )}
+      ${setValueAtIndex(propertyName, indexVariable, `${propertyName}Object`)}`;
+}
 
-  return `${variableName}.setProperty(runtime, "${propertyName}", toString(${eventChain});`;
+function convertArrayTypeArray(
+  propertyName: string,
+  indexVariable: string,
+  loopLocalVariable: string,
+  propertyParts: $ReadOnlyArray<string>,
+  eventTypeAnnotation: EventTypeAnnotation,
+  extraIncludes: Set<string>,
+  usingEvent: boolean,
+): string {
+  if (eventTypeAnnotation.type !== 'ArrayTypeAnnotation') {
+    throw new Error(
+      `Inconsistent eventTypeAnnotation received. Expected type = 'ArrayTypeAnnotation'; received = ${eventTypeAnnotation.type}`,
+    );
+  }
+  return `auto ${propertyName}Array = jsi::Array(runtime, ${loopLocalVariable}.size());
+      size_t ${indexVariable}Internal = 0;
+      for (auto ${loopLocalVariable}Internal : ${loopLocalVariable}) {
+        ${handleArrayElementType(
+          eventTypeAnnotation.elementType,
+          `${propertyName}Array`,
+          `${indexVariable}Internal`,
+          `${loopLocalVariable}Internal`,
+          propertyParts,
+          extraIncludes,
+          usingEvent,
+        )}
+      }
+      ${setValueAtIndex(propertyName, indexVariable, `${propertyName}Array`)}`;
 }
 
 function generateSetters(
   parentPropertyName: string,
   properties: $ReadOnlyArray<NamedShape<EventTypeAnnotation>>,
   propertyParts: $ReadOnlyArray<string>,
+  extraIncludes: Set<string>,
+  usingEvent: boolean = true,
 ): string {
   const propSetters = properties
     .map(eventProperty => {
       const {typeAnnotation} = eventProperty;
       switch (typeAnnotation.type) {
         case 'BooleanTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'StringTypeAnnotation':
+        case 'Int32TypeAnnotation':
+        case 'DoubleTypeAnnotation':
+        case 'FloatTypeAnnotation':
           return generateSetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
           );
-        case 'Int32TypeAnnotation':
+        case 'MixedTypeAnnotation':
+          extraIncludes.add('#include <jsi/JSIDynamic.h>');
           return generateSetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
+            prop => `jsi::valueFromDynamic(runtime, ${prop})`,
           );
-        case 'DoubleTypeAnnotation':
+        case 'StringEnumTypeAnnotation':
           return generateSetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
+            prop => `toString(${prop})`,
           );
-        case 'FloatTypeAnnotation':
-          return generateSetter(
+        case 'ObjectTypeAnnotation':
+          return generateObjectSetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            typeAnnotation,
+            extraIncludes,
+            usingEvent,
           );
-        case 'StringEnumTypeAnnotation':
-          return generateEnumSetter(
+        case 'ArrayTypeAnnotation':
+          return generateArraySetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            typeAnnotation.elementType,
+            extraIncludes,
+            usingEvent,
           );
-        case 'ObjectTypeAnnotation':
-          const propertyName = eventProperty.name;
-          return `
-            {
-              auto ${propertyName} = jsi::Object(runtime);
-              ${generateSetters(
-                propertyName,
-                typeAnnotation.properties,
-                propertyParts.concat([propertyName]),
-              )}
-
-              ${parentPropertyName}.setProperty(runtime, "${propertyName}", ${propertyName});
-            }
-          `.trim();
         default:
           (typeAnnotation.type: empty);
-          throw new Error('Received invalid event property type');
+          throw new Error(
+            `Received invalid event property type ${typeAnnotation.type}`,
+          );
       }
     })
     .join('\n');
@@ -190,7 +361,11 @@ function generateSetters(
   return propSetters;
 }
 
-function generateEvent(componentName: string, event: EventTypeShape): string {
+function generateEvent(
+  componentName: string,
+  event: EventTypeShape,
+  extraIncludes: Set<string>,
+): string {
   // This is a gross hack necessary because native code is sending
   // events named things like topChange to JS which is then converted back to
   // call the onChange prop. We should be consistent throughout the system.
@@ -203,9 +378,14 @@ function generateEvent(componentName: string, event: EventTypeShape): string {
 
   if (event.typeAnnotation.argument) {
     const implementation = `
-    auto payload = jsi::Object(runtime);
-    ${generateSetters('payload', event.typeAnnotation.argument.properties, [])}
-    return payload;
+    auto $payload = jsi::Object(runtime);
+    ${generateSetters(
+      '$payload',
+      event.typeAnnotation.argument.properties,
+      [],
+      extraIncludes,
+    )}
+    return $payload;
   `.trim();
 
     if (!event.name.startsWith('on')) {
@@ -253,23 +433,21 @@ module.exports = {
       .filter(Boolean)
       .reduce((acc, components) => Object.assign(acc, components), {});
 
-    const fileName = 'EventEmitters.cpp';
-
+    const extraIncludes = new Set<string>();
     const componentEmitters = Object.keys(moduleComponents)
       .map(componentName => {
         const component = moduleComponents[componentName];
-
         return component.events
-          .map(event => {
-            return generateEvent(componentName, event);
-          })
+          .map(event => generateEvent(componentName, event, extraIncludes))
           .join('\n');
       })
       .join('\n');
 
+    const fileName = 'EventEmitters.cpp';
     const replacedTemplate = FileTemplate({
       libraryName,
       events: componentEmitters,
+      extraIncludes,
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateEventEmitterH.js

@@ -12,12 +12,14 @@
 
 const nullthrows = require('nullthrows');
 const _require = require('./CppHelpers'),
+  getImports = _require.getImports,
+  getCppArrayTypeForAnnotation = _require.getCppArrayTypeForAnnotation,
   getCppTypeForAnnotation = _require.getCppTypeForAnnotation,
   generateEventStructName = _require.generateEventStructName;
 const _require2 = require('../Utils'),
   indent = _require2.indent,
   toSafeCppString = _require2.toSafeCppString;
-const FileTemplate = ({componentEmitters}) => `
+const FileTemplate = ({componentEmitters, extraIncludes}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -29,24 +31,21 @@ const FileTemplate = ({componentEmitters}) => `
 #pragma once
 
 #include <react/renderer/components/view/ViewEventEmitter.h>
-#include <jsi/jsi.h>
+${[...extraIncludes].join('\n')}
 
 namespace facebook {
 namespace react {
-
 ${componentEmitters}
-
 } // namespace react
 } // namespace facebook
 `;
 const ComponentTemplate = ({className, structs, events}) =>
   `
-class JSI_EXPORT ${className}EventEmitter : public ViewEventEmitter {
+class ${className}EventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;
 
   ${structs}
-
   ${events}
 };
 `.trim();
@@ -75,11 +74,22 @@ function getNativeTypeFromAnnotation(componentName, eventProperty, nameParts) {
     case 'Int32TypeAnnotation':
     case 'DoubleTypeAnnotation':
     case 'FloatTypeAnnotation':
+    case 'MixedTypeAnnotation':
       return getCppTypeForAnnotation(type);
     case 'StringEnumTypeAnnotation':
-      return generateEventStructName(nameParts.concat([eventProperty.name]));
     case 'ObjectTypeAnnotation':
-      return generateEventStructName(nameParts.concat([eventProperty.name]));
+      return generateEventStructName([...nameParts, eventProperty.name]);
+    case 'ArrayTypeAnnotation':
+      const eventTypeAnnotation = eventProperty.typeAnnotation;
+      if (eventTypeAnnotation.type !== 'ArrayTypeAnnotation') {
+        throw new Error(
+          "Inconsistent Codegen state: type was ArrayTypeAnnotation at the beginning of the body and now it isn't",
+        );
+      }
+      return getCppArrayTypeForAnnotation(eventTypeAnnotation.elementType, [
+        ...nameParts,
+        eventProperty.name,
+      ]);
     default:
       type;
       throw new Error(`Received invalid event property type ${type}`);
@@ -105,6 +115,32 @@ function generateEnum(structs, options, nameParts) {
     }),
   );
 }
+function handleGenerateStructForArray(
+  structs,
+  name,
+  componentName,
+  elementType,
+  nameParts,
+) {
+  if (elementType.type === 'ObjectTypeAnnotation') {
+    generateStruct(
+      structs,
+      componentName,
+      nameParts.concat([name]),
+      nullthrows(elementType.properties),
+    );
+  } else if (elementType.type === 'StringEnumTypeAnnotation') {
+    generateEnum(structs, elementType.options, nameParts.concat([name]));
+  } else if (elementType.type === 'ArrayTypeAnnotation') {
+    handleGenerateStructForArray(
+      structs,
+      name,
+      componentName,
+      elementType.elementType,
+      nameParts,
+    );
+  }
+}
 function generateStruct(structs, componentName, nameParts, properties) {
   const structNameParts = nameParts;
   const structName = generateEventStructName(structNameParts);
@@ -122,14 +158,20 @@ function generateStruct(structs, componentName, nameParts, properties) {
       typeAnnotation = property.typeAnnotation;
     switch (typeAnnotation.type) {
       case 'BooleanTypeAnnotation':
-        return;
       case 'StringTypeAnnotation':
-        return;
       case 'Int32TypeAnnotation':
-        return;
       case 'DoubleTypeAnnotation':
-        return;
       case 'FloatTypeAnnotation':
+      case 'MixedTypeAnnotation':
+        return;
+      case 'ArrayTypeAnnotation':
+        handleGenerateStructForArray(
+          structs,
+          name,
+          componentName,
+          typeAnnotation.elementType,
+          nameParts,
+        );
         return;
       case 'ObjectTypeAnnotation':
         generateStruct(
@@ -189,7 +231,7 @@ module.exports = {
       .map(moduleName => {
         const module = schema.modules[moduleName];
         if (module.type !== 'Component') {
-          return;
+          return null;
         }
         const components = module.components;
         // No components in this module
@@ -200,24 +242,31 @@ module.exports = {
       })
       .filter(Boolean)
       .reduce((acc, components) => Object.assign(acc, components), {});
-    const moduleComponentsWithEvents = Object.keys(moduleComponents);
+    const extraIncludes = new Set();
+    const componentEmitters = Object.keys(moduleComponents)
+      .map(componentName => {
+        const component = moduleComponents[componentName];
+        component.events.forEach(event => {
+          if (event.typeAnnotation.argument) {
+            const argIncludes = getImports(
+              event.typeAnnotation.argument.properties,
+            );
+            // $FlowFixMe[method-unbinding]
+            argIncludes.forEach(extraIncludes.add, extraIncludes);
+          }
+        });
+        const replacedTemplate = ComponentTemplate({
+          className: componentName,
+          structs: indent(generateStructs(componentName, component), 2),
+          events: generateEvents(componentName, component),
+        });
+        return replacedTemplate;
+      })
+      .join('\n');
     const fileName = 'EventEmitters.h';
-    const componentEmitters =
-      moduleComponentsWithEvents.length > 0
-        ? Object.keys(moduleComponents)
-            .map(componentName => {
-              const component = moduleComponents[componentName];
-              const replacedTemplate = ComponentTemplate({
-                className: componentName,
-                structs: indent(generateStructs(componentName, component), 2),
-                events: generateEvents(componentName, component),
-              });
-              return replacedTemplate;
-            })
-            .join('\n')
-        : '';
     const replacedTemplate = FileTemplate({
       componentEmitters,
+      extraIncludes,
     });
     return new Map([[fileName, replacedTemplate]]);
   },