@react-native/codegen 0.72.4 → 0.73.0

package/lib/generators/components/GenerateEventEmitterCpp.js

@@ -26,9 +26,7 @@ const FileTemplate = ({events, libraryName}) => `
 
 namespace facebook {
 namespace react {
-
 ${events}
-
 } // namespace react
 } // namespace facebook
 `;
@@ -39,16 +37,16 @@ const ComponentTemplate = ({
   dispatchEventName,
   implementation,
 }) => {
-  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 = ({className, eventName, dispatchEventName}) =>
   `
@@ -58,47 +56,45 @@ void ${className}EventEmitter::${eventName}() const {
 `.trim();
 function generateSetter(variableName, propertyName, propertyParts) {
   const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `event.${propertyParts.join(
+  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(
+  const eventChain = `$event.${propertyParts.join(
     '.',
   )}${trailingPeriod}${propertyName})`;
   return `${variableName}.setProperty(runtime, "${propertyName}", toString(${eventChain});`;
 }
+function generateObjectSetter(
+  variableName,
+  propertyName,
+  propertyParts,
+  typeAnnotation,
+) {
+  return `
+{
+  auto ${propertyName} = jsi::Object(runtime);
+  ${generateSetters(
+    propertyName,
+    typeAnnotation.properties,
+    propertyParts.concat([propertyName]),
+  )}
+  ${variableName}.setProperty(runtime, "${propertyName}", ${propertyName});
+}
+`.trim();
+}
 function generateSetters(parentPropertyName, properties, propertyParts) {
   const propSetters = properties
     .map(eventProperty => {
       const typeAnnotation = eventProperty.typeAnnotation;
       switch (typeAnnotation.type) {
         case 'BooleanTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'StringTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'Int32TypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'DoubleTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'FloatTypeAnnotation':
           return generateSetter(
             parentPropertyName,
@@ -112,19 +108,12 @@ function generateSetters(parentPropertyName, properties, propertyParts) {
             propertyParts,
           );
         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();
+          return generateObjectSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+            typeAnnotation,
+          );
         default:
           typeAnnotation.type;
           throw new Error('Received invalid event property type');
@@ -145,9 +134,9 @@ function generateEvent(componentName, event) {
   )}`;
   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, [])}
+    return $payload;
   `.trim();
     if (!event.name.startsWith('on')) {
       throw new Error('Expected the event name to start with `on`');

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

@@ -18,6 +18,7 @@ import type {
   NamedShape,
   EventTypeAnnotation,
   SchemaType,
+  ObjectTypeAnnotation,
 } from '../../CodegenSchema';
 
 // File path -> contents
@@ -48,9 +49,7 @@ const FileTemplate = ({
 
 namespace facebook {
 namespace react {
-
 ${events}
-
 } // namespace react
 } // namespace facebook
 `;
@@ -68,16 +67,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 = ({
@@ -101,7 +100,7 @@ function generateSetter(
   propertyParts: $ReadOnlyArray<string>,
 ) {
   const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `event.${propertyParts.join(
+  const eventChain = `$event.${propertyParts.join(
     '.',
   )}${trailingPeriod}${propertyName});`;
 
@@ -114,13 +113,32 @@ function generateEnumSetter(
   propertyParts: $ReadOnlyArray<string>,
 ) {
   const trailingPeriod = propertyParts.length === 0 ? '' : '.';
-  const eventChain = `event.${propertyParts.join(
+  const eventChain = `$event.${propertyParts.join(
     '.',
   )}${trailingPeriod}${propertyName})`;
 
   return `${variableName}.setProperty(runtime, "${propertyName}", toString(${eventChain});`;
 }
 
+function generateObjectSetter(
+  variableName: string,
+  propertyName: string,
+  propertyParts: $ReadOnlyArray<string>,
+  typeAnnotation: ObjectTypeAnnotation<EventTypeAnnotation>,
+) {
+  return `
+{
+  auto ${propertyName} = jsi::Object(runtime);
+  ${generateSetters(
+    propertyName,
+    typeAnnotation.properties,
+    propertyParts.concat([propertyName]),
+  )}
+  ${variableName}.setProperty(runtime, "${propertyName}", ${propertyName});
+}
+`.trim();
+}
+
 function generateSetters(
   parentPropertyName: string,
   properties: $ReadOnlyArray<NamedShape<EventTypeAnnotation>>,
@@ -131,29 +149,9 @@ function generateSetters(
       const {typeAnnotation} = eventProperty;
       switch (typeAnnotation.type) {
         case 'BooleanTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'StringTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'Int32TypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'DoubleTypeAnnotation':
-          return generateSetter(
-            parentPropertyName,
-            eventProperty.name,
-            propertyParts,
-          );
         case 'FloatTypeAnnotation':
           return generateSetter(
             parentPropertyName,
@@ -167,19 +165,12 @@ function generateSetters(
             propertyParts,
           );
         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();
+          return generateObjectSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+            typeAnnotation,
+          );
         default:
           (typeAnnotation.type: empty);
           throw new Error('Received invalid event property type');
@@ -203,9 +194,9 @@ 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, [])}
+    return $payload;
   `.trim();
 
     if (!event.name.startsWith('on')) {

package/lib/generators/components/GenerateEventEmitterH.js

@@ -33,9 +33,7 @@ const FileTemplate = ({componentEmitters}) => `
 
 namespace facebook {
 namespace react {
-
 ${componentEmitters}
-
 } // namespace react
 } // namespace facebook
 `;

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

@@ -51,9 +51,7 @@ const FileTemplate = ({componentEmitters}: {componentEmitters: string}) => `
 
 namespace facebook {
 namespace react {
-
 ${componentEmitters}
-
 } // namespace react
 } // namespace facebook
 `;

package/lib/generators/modules/GenerateModuleCpp.js

@@ -91,8 +91,8 @@ const HostFunctionTemplate = ({
 }) => {
   const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
   const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
-  const methodCallArgs = ['rt', ...args].join(', ');
-  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(${methodCallArgs})`;
+  const methodCallArgs = ['    rt', ...args].join(',\n    ');
+  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(\n${methodCallArgs}\n  )`;
   return `static jsi::Value __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {${
     isVoid
       ? `\n  ${methodCall};`
@@ -168,7 +168,7 @@ function serializeArg(moduleName, arg, index, resolveAlias, enumMap) {
     } else {
       let condition = `${val}.isNull() || ${val}.isUndefined()`;
       if (optional) {
-        condition = `count < ${index} || ${condition}`;
+        condition = `count <= ${index} || ${condition}`;
       }
       return `${condition} ? std::nullopt : std::make_optional(${expression})`;
     }

package/lib/generators/modules/GenerateModuleCpp.js.flow

@@ -40,8 +40,8 @@ const HostFunctionTemplate = ({
 }>) => {
   const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
   const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
-  const methodCallArgs = ['rt', ...args].join(', ');
-  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(${methodCallArgs})`;
+  const methodCallArgs = ['    rt', ...args].join(',\n    ');
+  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(\n${methodCallArgs}\n  )`;
 
   return `static jsi::Value __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {${
     isVoid
@@ -139,7 +139,7 @@ function serializeArg(
     } else {
       let condition = `${val}.isNull() || ${val}.isUndefined()`;
       if (optional) {
-        condition = `count < ${index} || ${condition}`;
+        condition = `count <= ${index} || ${condition}`;
       }
       return `${condition} ? std::nullopt : std::make_optional(${expression})`;
     }

package/lib/generators/modules/GenerateModuleJavaSpec.js

@@ -105,7 +105,7 @@ package ${packageName};
 
 ${imports}
 
-public abstract class ${className} extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+public abstract class ${className} extends ReactContextBaseJavaModule implements TurboModule {
   public static final String NAME = "${jsName}";
 
   public ${className}(ReactApplicationContext reactContext) {
@@ -488,7 +488,6 @@ module.exports = {
         'com.facebook.react.bridge.ReactApplicationContext',
         'com.facebook.react.bridge.ReactContextBaseJavaModule',
         'com.facebook.react.bridge.ReactMethod',
-        'com.facebook.react.bridge.ReactModuleWithSpec',
         'com.facebook.react.turbomodule.core.interfaces.TurboModule',
         'com.facebook.proguard.annotations.DoNotStrip',
         'javax.annotation.Nonnull',

package/lib/generators/modules/GenerateModuleJavaSpec.js.flow

@@ -52,7 +52,7 @@ package ${packageName};
 
 ${imports}
 
-public abstract class ${className} extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+public abstract class ${className} extends ReactContextBaseJavaModule implements TurboModule {
   public static final String NAME = "${jsName}";
 
   public ${className}(ReactApplicationContext reactContext) {
@@ -463,7 +463,6 @@ module.exports = {
         'com.facebook.react.bridge.ReactApplicationContext',
         'com.facebook.react.bridge.ReactContextBaseJavaModule',
         'com.facebook.react.bridge.ReactMethod',
-        'com.facebook.react.bridge.ReactModuleWithSpec',
         'com.facebook.react.turbomodule.core.interfaces.TurboModule',
         'com.facebook.proguard.annotations.DoNotStrip',
         'javax.annotation.Nonnull',

package/lib/parsers/flow/components/index.js

@@ -27,8 +27,11 @@ const _require6 = require('../../error-utils'),
 const _require7 = require('../../parsers-commons'),
   createComponentConfig = _require7.createComponentConfig,
   findNativeComponentType = _require7.findNativeComponentType,
+  propertyNames = _require7.propertyNames,
   getCommandOptions = _require7.getCommandOptions,
-  getOptions = _require7.getOptions;
+  getOptions = _require7.getOptions,
+  getCommandTypeNameAndOptionsExpression =
+    _require7.getCommandTypeNameAndOptionsExpression;
 
 // $FlowFixMe[signature-verification-failure] there's no flowtype for AST
 function findComponentConfig(ast, parser) {
@@ -50,67 +53,33 @@ function findComponentConfig(ast, parser) {
     node => node.type === 'ExportNamedDeclaration',
   );
   const commandsTypeNames = namedExports
-    .map(statement => {
-      let callExpression;
-      let calleeName;
-      try {
-        callExpression = statement.declaration.declarations[0].init;
-        calleeName = callExpression.callee.name;
-      } catch (e) {
-        return;
-      }
-      if (calleeName !== 'codegenNativeCommands') {
-        return;
-      }
-
-      // const statement.declaration.declarations[0].init
-      if (callExpression.arguments.length !== 1) {
-        throw new Error(
-          'codegenNativeCommands must be passed options including the supported commands',
-        );
-      }
-      const typeArgumentParam = callExpression.typeArguments.params[0];
-      if (typeArgumentParam.type !== 'GenericTypeAnnotation') {
-        throw new Error(
-          "codegenNativeCommands doesn't support inline definitions. Specify a file local type alias",
-        );
-      }
-      return {
-        commandTypeName: typeArgumentParam.id.name,
-        commandOptionsExpression: callExpression.arguments[0],
-      };
-    })
+    .map(statement => getCommandTypeNameAndOptionsExpression(statement, parser))
     .filter(Boolean);
   throwIfMoreThanOneCodegenNativecommands(commandsTypeNames);
   return createComponentConfig(foundConfig, commandsTypeNames);
 }
-function getCommandProperties(
-  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
-   * LTI update could not be added via codemod */
-  commandTypeName,
-  types,
-  commandOptions,
-) {
+function getCommandProperties(ast, parser) {
+  const _findComponentConfig = findComponentConfig(ast, parser),
+    commandTypeName = _findComponentConfig.commandTypeName,
+    commandOptionsExpression = _findComponentConfig.commandOptionsExpression;
   if (commandTypeName == null) {
     return [];
   }
+  const types = parser.getTypes(ast);
   const typeAlias = types[commandTypeName];
   if (typeAlias.type !== 'InterfaceDeclaration') {
     throw new Error(
       `The type argument for codegenNativeCommands must be an interface, received ${typeAlias.type}`,
     );
   }
-  let properties;
-  try {
-    properties = typeAlias.body.properties;
-  } catch (e) {
+  const properties = parser.bodyProperties(typeAlias);
+  if (!properties) {
     throw new Error(
       `Failed to find type definition for "${commandTypeName}", please check that you have a valid codegen flow file`,
     );
   }
-  const flowPropertyNames = properties
-    .map(property => property && property.key && property.key.name)
-    .filter(Boolean);
+  const flowPropertyNames = propertyNames(properties);
+  const commandOptions = getCommandOptions(commandOptionsExpression);
   if (commandOptions == null || commandOptions.supportedCommands == null) {
     throw new Error(
       'codegenNativeCommands must be given an options object with supportedCommands array',
@@ -133,20 +102,13 @@ function getCommandProperties(
 
 // $FlowFixMe[signature-verification-failure] there's no flowtype for AST
 function buildComponentSchema(ast, parser) {
-  const _findComponentConfig = findComponentConfig(ast, parser),
-    componentName = _findComponentConfig.componentName,
-    propsTypeName = _findComponentConfig.propsTypeName,
-    commandTypeName = _findComponentConfig.commandTypeName,
-    commandOptionsExpression = _findComponentConfig.commandOptionsExpression,
-    optionsExpression = _findComponentConfig.optionsExpression;
+  const _findComponentConfig2 = findComponentConfig(ast, parser),
+    componentName = _findComponentConfig2.componentName,
+    propsTypeName = _findComponentConfig2.propsTypeName,
+    optionsExpression = _findComponentConfig2.optionsExpression;
   const types = parser.getTypes(ast);
   const propProperties = getProperties(propsTypeName, types);
-  const commandOptions = getCommandOptions(commandOptionsExpression);
-  const commandProperties = getCommandProperties(
-    commandTypeName,
-    types,
-    commandOptions,
-  );
+  const commandProperties = getCommandProperties(ast, parser);
   const extendsProps = getExtendsProps(propProperties, types);
   const options = getOptions(optionsExpression);
   const nonExtendsProps = removeKnownExtends(propProperties, types);

package/lib/parsers/flow/components/index.js.flow

@@ -10,8 +10,6 @@
 
 'use strict';
 import type {Parser} from '../../parser';
-import type {TypeDeclarationMap} from '../../utils';
-import type {CommandOptions} from '../../parsers-commons';
 import type {ComponentSchemaBuilderConfig} from '../../schema.js';
 
 const {getCommands} = require('./commands');
@@ -23,8 +21,10 @@ const {throwIfMoreThanOneCodegenNativecommands} = require('../../error-utils');
 const {
   createComponentConfig,
   findNativeComponentType,
+  propertyNames,
   getCommandOptions,
   getOptions,
+  getCommandTypeNameAndOptionsExpression,
 } = require('../../parsers-commons');
 
 // $FlowFixMe[signature-verification-failure] there's no flowtype for AST
@@ -53,40 +53,7 @@ function findComponentConfig(ast: $FlowFixMe, parser: Parser) {
   );
 
   const commandsTypeNames = namedExports
-    .map(statement => {
-      let callExpression;
-      let calleeName;
-      try {
-        callExpression = statement.declaration.declarations[0].init;
-        calleeName = callExpression.callee.name;
-      } catch (e) {
-        return;
-      }
-
-      if (calleeName !== 'codegenNativeCommands') {
-        return;
-      }
-
-      // const statement.declaration.declarations[0].init
-      if (callExpression.arguments.length !== 1) {
-        throw new Error(
-          'codegenNativeCommands must be passed options including the supported commands',
-        );
-      }
-
-      const typeArgumentParam = callExpression.typeArguments.params[0];
-
-      if (typeArgumentParam.type !== 'GenericTypeAnnotation') {
-        throw new Error(
-          "codegenNativeCommands doesn't support inline definitions. Specify a file local type alias",
-        );
-      }
-
-      return {
-        commandTypeName: typeArgumentParam.id.name,
-        commandOptionsExpression: callExpression.arguments[0],
-      };
-    })
+    .map(statement => getCommandTypeNameAndOptionsExpression(statement, parser))
     .filter(Boolean);
 
   throwIfMoreThanOneCodegenNativecommands(commandsTypeNames);
@@ -94,16 +61,16 @@ function findComponentConfig(ast: $FlowFixMe, parser: Parser) {
   return createComponentConfig(foundConfig, commandsTypeNames);
 }
 
-function getCommandProperties(
-  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
-   * LTI update could not be added via codemod */
-  commandTypeName,
-  types: TypeDeclarationMap,
-  commandOptions: ?CommandOptions,
-) {
+function getCommandProperties(ast: $FlowFixMe, parser: Parser) {
+  const {commandTypeName, commandOptionsExpression} = findComponentConfig(
+    ast,
+    parser,
+  );
+
   if (commandTypeName == null) {
     return [];
   }
+  const types = parser.getTypes(ast);
 
   const typeAlias = types[commandTypeName];
 
@@ -113,18 +80,16 @@ function getCommandProperties(
     );
   }
 
-  let properties;
-  try {
-    properties = typeAlias.body.properties;
-  } catch (e) {
+  const properties = parser.bodyProperties(typeAlias);
+  if (!properties) {
     throw new Error(
       `Failed to find type definition for "${commandTypeName}", please check that you have a valid codegen flow file`,
     );
   }
 
-  const flowPropertyNames = properties
-    .map(property => property && property.key && property.key.name)
-    .filter(Boolean);
+  const flowPropertyNames = propertyNames(properties);
+
+  const commandOptions = getCommandOptions(commandOptionsExpression);
 
   if (commandOptions == null || commandOptions.supportedCommands == null) {
     throw new Error(
@@ -153,24 +118,16 @@ function buildComponentSchema(
   ast: $FlowFixMe,
   parser: Parser,
 ): ComponentSchemaBuilderConfig {
-  const {
-    componentName,
-    propsTypeName,
-    commandTypeName,
-    commandOptionsExpression,
-    optionsExpression,
-  } = findComponentConfig(ast, parser);
+  const {componentName, propsTypeName, optionsExpression} = findComponentConfig(
+    ast,
+    parser,
+  );
 
   const types = parser.getTypes(ast);
 
   const propProperties = getProperties(propsTypeName, types);
-  const commandOptions = getCommandOptions(commandOptionsExpression);
 
-  const commandProperties = getCommandProperties(
-    commandTypeName,
-    types,
-    commandOptions,
-  );
+  const commandProperties = getCommandProperties(ast, parser);
 
   const extendsProps = getExtendsProps(propProperties, types);
   const options = getOptions(optionsExpression);