@react-native/codegen 0.73.0 → 0.74.0-nightly-20231003-5dedf277c

package/lib/generators/components/GenerateEventEmitterCpp.js

@@ -10,9 +10,11 @@
 
 'use strict';
 
-const _require = require('./CppHelpers.js'),
+const _require = require('./CppHelpers'),
   generateEventStructName = _require.generateEventStructName;
-const FileTemplate = ({events, libraryName}) => `
+const _require2 = require('../Utils'),
+  indent = _require2.indent;
+const FileTemplate = ({events, libraryName, extraIncludes}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -23,6 +25,7 @@ const FileTemplate = ({events, libraryName}) => `
  */
 
 #include <react/renderer/components/${libraryName}/EventEmitters.h>
+${[...extraIncludes].join('\n')}
 
 namespace facebook {
 namespace react {
@@ -54,39 +57,200 @@ void ${className}EventEmitter::${eventName}() const {
   dispatchEvent("${dispatchEventName}");
 }
 `.trim();
-function generateSetter(variableName, propertyName, propertyParts) {
-  const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `$event.${propertyParts.join(
-    '.',
-  )}${trailingPeriod}${propertyName});`;
-  return `${variableName}.setProperty(runtime, "${propertyName}", ${eventChain}`;
-}
-function generateEnumSetter(variableName, propertyName, propertyParts) {
-  const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `$event.${propertyParts.join(
-    '.',
-  )}${trailingPeriod}${propertyName})`;
-  return `${variableName}.setProperty(runtime, "${propertyName}", toString(${eventChain});`;
+function generateSetter(
+  variableName,
+  propertyName,
+  propertyParts,
+  usingEvent,
+  valueMapper = value => value,
+) {
+  const eventChain = usingEvent
+    ? `$event.${[...propertyParts, propertyName].join('.')}`
+    : [propertyParts, propertyName].join('.');
+  return `${variableName}.setProperty(runtime, "${propertyName}", ${valueMapper(
+    eventChain,
+  )});`;
 }
 function generateObjectSetter(
   variableName,
   propertyName,
   propertyParts,
   typeAnnotation,
+  extraIncludes,
+  usingEvent,
 ) {
   return `
 {
   auto ${propertyName} = jsi::Object(runtime);
-  ${generateSetters(
-    propertyName,
-    typeAnnotation.properties,
-    propertyParts.concat([propertyName]),
+  ${indent(
+    generateSetters(
+      propertyName,
+      typeAnnotation.properties,
+      propertyParts.concat([propertyName]),
+      extraIncludes,
+      usingEvent,
+    ),
+    2,
   )}
   ${variableName}.setProperty(runtime, "${propertyName}", ${propertyName});
 }
 `.trim();
 }
-function generateSetters(parentPropertyName, properties, propertyParts) {
+function setValueAtIndex(
+  propertyName,
+  indexVariable,
+  loopLocalVariable,
+  mappingFunction = value => value,
+) {
+  return `${propertyName}.setValueAtIndex(runtime, ${indexVariable}++, ${mappingFunction(
+    loopLocalVariable,
+  )});`;
+}
+function generateArraySetter(
+  variableName,
+  propertyName,
+  propertyParts,
+  elementType,
+  extraIncludes,
+  usingEvent,
+) {
+  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,
+  propertyName,
+  indexVariable,
+  loopLocalVariable,
+  propertyParts,
+  extraIncludes,
+  usingEvent,
+) {
+  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,
+  indexVariable,
+  loopLocalVariable,
+  propertyParts,
+  objectTypeAnnotation,
+  extraIncludes,
+) {
+  return `auto ${propertyName}Object = jsi::Object(runtime);
+      ${generateSetters(
+        `${propertyName}Object`,
+        objectTypeAnnotation.properties,
+        [].concat([loopLocalVariable]),
+        extraIncludes,
+        false,
+      )}
+      ${setValueAtIndex(propertyName, indexVariable, `${propertyName}Object`)}`;
+}
+function convertArrayTypeArray(
+  propertyName,
+  indexVariable,
+  loopLocalVariable,
+  propertyParts,
+  eventTypeAnnotation,
+  extraIncludes,
+  usingEvent,
+) {
+  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,
+  properties,
+  propertyParts,
+  extraIncludes,
+  usingEvent = true,
+) {
   const propSetters = properties
     .map(eventProperty => {
       const typeAnnotation = eventProperty.typeAnnotation;
@@ -100,12 +264,24 @@ function generateSetters(parentPropertyName, properties, propertyParts) {
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
+          );
+        case 'MixedTypeAnnotation':
+          extraIncludes.add('#include <jsi/JSIDynamic.h>');
+          return generateSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+            usingEvent,
+            prop => `jsi::valueFromDynamic(runtime, ${prop})`,
           );
         case 'StringEnumTypeAnnotation':
-          return generateEnumSetter(
+          return generateSetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
+            prop => `toString(${prop})`,
           );
         case 'ObjectTypeAnnotation':
           return generateObjectSetter(
@@ -113,16 +289,29 @@ function generateSetters(parentPropertyName, properties, propertyParts) {
             eventProperty.name,
             propertyParts,
             typeAnnotation,
+            extraIncludes,
+            usingEvent,
+          );
+        case 'ArrayTypeAnnotation':
+          return generateArraySetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+            typeAnnotation.elementType,
+            extraIncludes,
+            usingEvent,
           );
         default:
           typeAnnotation.type;
-          throw new Error('Received invalid event property type');
+          throw new Error(
+            `Received invalid event property type ${typeAnnotation.type}`,
+          );
       }
     })
     .join('\n');
   return propSetters;
 }
-function generateEvent(componentName, event) {
+function generateEvent(componentName, event, extraIncludes) {
   // 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.
@@ -135,7 +324,12 @@ function generateEvent(componentName, event) {
   if (event.typeAnnotation.argument) {
     const implementation = `
     auto $payload = jsi::Object(runtime);
-    ${generateSetters('$payload', event.typeAnnotation.argument.properties, [])}
+    ${generateSetters(
+      '$payload',
+      event.typeAnnotation.argument.properties,
+      [],
+      extraIncludes,
+    )}
     return $payload;
   `.trim();
     if (!event.name.startsWith('on')) {
@@ -172,20 +366,20 @@ module.exports = {
       })
       .filter(Boolean)
       .reduce((acc, components) => Object.assign(acc, components), {});
-    const fileName = 'EventEmitters.cpp';
+    const extraIncludes = new Set();
     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/GenerateEventEmitterCpp.js.flow

@@ -11,7 +11,8 @@
 'use strict';
 import type {EventTypeShape} from '../../CodegenSchema';
 
-const {generateEventStructName} = require('./CppHelpers.js');
+const {generateEventStructName} = require('./CppHelpers');
+const {indent} = require('../Utils');
 
 import type {
   ComponentShape,
@@ -32,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).
@@ -46,6 +49,7 @@ const FileTemplate = ({
  */
 
 #include <react/renderer/components/${libraryName}/EventEmitters.h>
+${[...extraIncludes].join('\n')}
 
 namespace facebook {
 namespace react {
@@ -98,26 +102,15 @@ 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}`;
-}
-
-function generateEnumSetter(
-  variableName: string,
-  propertyName: string,
-  propertyParts: $ReadOnlyArray<string>,
-) {
-  const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `$event.${propertyParts.join(
-    '.',
-  )}${trailingPeriod}${propertyName})`;
-
-  return `${variableName}.setProperty(runtime, "${propertyName}", toString(${eventChain});`;
+  const eventChain = usingEvent
+    ? `$event.${[...propertyParts, propertyName].join('.')}`
+    : [propertyParts, propertyName].join('.');
+  return `${variableName}.setProperty(runtime, "${propertyName}", ${valueMapper(
+    eventChain,
+  )});`;
 }
 
 function generateObjectSetter(
@@ -125,24 +118,186 @@ function generateObjectSetter(
   propertyName: string,
   propertyParts: $ReadOnlyArray<string>,
   typeAnnotation: ObjectTypeAnnotation<EventTypeAnnotation>,
+  extraIncludes: Set<string>,
+  usingEvent: boolean,
 ) {
   return `
 {
   auto ${propertyName} = jsi::Object(runtime);
-  ${generateSetters(
-    propertyName,
-    typeAnnotation.properties,
-    propertyParts.concat([propertyName]),
+  ${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`)}`;
+}
+
+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 => {
@@ -157,12 +312,24 @@ function generateSetters(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
+          );
+        case 'MixedTypeAnnotation':
+          extraIncludes.add('#include <jsi/JSIDynamic.h>');
+          return generateSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+            usingEvent,
+            prop => `jsi::valueFromDynamic(runtime, ${prop})`,
           );
         case 'StringEnumTypeAnnotation':
-          return generateEnumSetter(
+          return generateSetter(
             parentPropertyName,
             eventProperty.name,
             propertyParts,
+            usingEvent,
+            prop => `toString(${prop})`,
           );
         case 'ObjectTypeAnnotation':
           return generateObjectSetter(
@@ -170,10 +337,23 @@ function generateSetters(
             eventProperty.name,
             propertyParts,
             typeAnnotation,
+            extraIncludes,
+            usingEvent,
+          );
+        case 'ArrayTypeAnnotation':
+          return generateArraySetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+            typeAnnotation.elementType,
+            extraIncludes,
+            usingEvent,
           );
         default:
           (typeAnnotation.type: empty);
-          throw new Error('Received invalid event property type');
+          throw new Error(
+            `Received invalid event property type ${typeAnnotation.type}`,
+          );
       }
     })
     .join('\n');
@@ -181,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.
@@ -195,7 +379,12 @@ function generateEvent(componentName: string, event: EventTypeShape): string {
   if (event.typeAnnotation.argument) {
     const implementation = `
     auto $payload = jsi::Object(runtime);
-    ${generateSetters('$payload', event.typeAnnotation.argument.properties, [])}
+    ${generateSetters(
+      '$payload',
+      event.typeAnnotation.argument.properties,
+      [],
+      extraIncludes,
+    )}
     return $payload;
   `.trim();
 
@@ -244,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]]);