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

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

@@ -11,18 +11,19 @@
 'use strict';
 
 import type {
-  Nullable,
   NamedShape,
-  SchemaType,
-  NativeModulePropertyShape,
-  NativeModuleReturnTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
   NativeModuleParamTypeAnnotation,
+  NativeModulePropertyShape,
+  NativeModuleReturnTypeAnnotation,
+  Nullable,
+  SchemaType,
 } from '../../CodegenSchema';
-
 import type {AliasResolver} from './Utils';
-const {createAliasResolver, getModules} = require('./Utils');
+
 const {unwrapNullable} = require('../../parsers/parsers-commons');
+const {wrapOptional} = require('../TypeUtils/Java');
+const {createAliasResolver, getModules} = require('./Utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -111,13 +112,8 @@ function translateFunctionParamToJavaType(
   const [typeAnnotation, nullable] =
     unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
   const isRequired = !optional && !nullable;
-
-  function wrapNullable(javaType: string, nullableType?: string) {
-    if (!isRequired) {
-      imports.add('javax.annotation.Nullable');
-      return `@Nullable ${nullableType ?? javaType}`;
-    }
-    return javaType;
+  if (!isRequired) {
+    imports.add('javax.annotation.Nullable');
   }
 
   // FIXME: support class alias for args
@@ -130,41 +126,41 @@ function translateFunctionParamToJavaType(
     case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return wrapNullable('double', 'Double');
+          return wrapOptional('double', isRequired);
         default:
           (realTypeAnnotation.name: empty);
           throw new Error(createErrorMessage(realTypeAnnotation.name));
       }
     case 'StringTypeAnnotation':
-      return wrapNullable('String');
+      return wrapOptional('String', isRequired);
     case 'NumberTypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('double', isRequired);
     case 'FloatTypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('float', isRequired);
     case 'DoubleTypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('double', isRequired);
     case 'Int32TypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('int', isRequired);
     case 'BooleanTypeAnnotation':
-      return wrapNullable('boolean', 'Boolean');
+      return wrapOptional('boolean', isRequired);
     case 'EnumDeclaration':
       switch (realTypeAnnotation.memberType) {
         case 'NumberTypeAnnotation':
-          return wrapNullable('double', 'Double');
+          return wrapOptional('double', isRequired);
         case 'StringTypeAnnotation':
-          return wrapNullable('String');
+          return wrapOptional('String', isRequired);
         default:
           throw new Error(createErrorMessage(realTypeAnnotation.type));
       }
     case 'UnionTypeAnnotation':
       switch (typeAnnotation.memberType) {
         case 'NumberTypeAnnotation':
-          return wrapNullable('double', 'Double');
+          return wrapOptional('double', isRequired);
         case 'ObjectTypeAnnotation':
           imports.add('com.facebook.react.bridge.ReadableMap');
-          return wrapNullable('ReadableMap');
+          return wrapOptional('ReadableMap', isRequired);
         case 'StringTypeAnnotation':
-          return wrapNullable('String');
+          return wrapOptional('String', isRequired);
         default:
           throw new Error(
             `Unsupported union member returning value, found: ${realTypeAnnotation.memberType}"`,
@@ -172,17 +168,17 @@ function translateFunctionParamToJavaType(
       }
     case 'ObjectTypeAnnotation':
       imports.add('com.facebook.react.bridge.ReadableMap');
-      return wrapNullable('ReadableMap');
+      return wrapOptional('ReadableMap', isRequired);
     case 'GenericObjectTypeAnnotation':
       // Treat this the same as ObjectTypeAnnotation for now.
       imports.add('com.facebook.react.bridge.ReadableMap');
-      return wrapNullable('ReadableMap');
+      return wrapOptional('ReadableMap', isRequired);
     case 'ArrayTypeAnnotation':
       imports.add('com.facebook.react.bridge.ReadableArray');
-      return wrapNullable('ReadableArray');
+      return wrapOptional('ReadableArray', isRequired);
     case 'FunctionTypeAnnotation':
       imports.add('com.facebook.react.bridge.Callback');
-      return wrapNullable('Callback');
+      return wrapOptional('Callback', isRequired);
     default:
       (realTypeAnnotation.type: 'MixedTypeAnnotation');
       throw new Error(createErrorMessage(realTypeAnnotation.type));
@@ -200,14 +196,12 @@ function translateFunctionReturnTypeToJavaType(
       nullableReturnTypeAnnotation,
     );
 
-  function wrapNullable(javaType: string, nullableType?: string) {
-    if (nullable) {
-      imports.add('javax.annotation.Nullable');
-      return `@Nullable ${nullableType ?? javaType}`;
-    }
-    return javaType;
+  if (nullable) {
+    imports.add('javax.annotation.Nullable');
   }
 
+  const isRequired = !nullable;
+
   // FIXME: support class alias for args
   let realTypeAnnotation = returnTypeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -218,7 +212,7 @@ function translateFunctionReturnTypeToJavaType(
     case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return wrapNullable('double', 'Double');
+          return wrapOptional('double', isRequired);
         default:
           (realTypeAnnotation.name: empty);
           throw new Error(createErrorMessage(realTypeAnnotation.name));
@@ -228,35 +222,35 @@ function translateFunctionReturnTypeToJavaType(
     case 'PromiseTypeAnnotation':
       return 'void';
     case 'StringTypeAnnotation':
-      return wrapNullable('String');
+      return wrapOptional('String', isRequired);
     case 'NumberTypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('double', isRequired);
     case 'FloatTypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('double', isRequired);
     case 'DoubleTypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('double', isRequired);
     case 'Int32TypeAnnotation':
-      return wrapNullable('double', 'Double');
+      return wrapOptional('double', isRequired);
     case 'BooleanTypeAnnotation':
-      return wrapNullable('boolean', 'Boolean');
+      return wrapOptional('boolean', isRequired);
     case 'EnumDeclaration':
       switch (realTypeAnnotation.memberType) {
         case 'NumberTypeAnnotation':
-          return wrapNullable('double', 'Double');
+          return wrapOptional('double', isRequired);
         case 'StringTypeAnnotation':
-          return wrapNullable('String');
+          return wrapOptional('String', isRequired);
         default:
           throw new Error(createErrorMessage(realTypeAnnotation.type));
       }
     case 'UnionTypeAnnotation':
       switch (realTypeAnnotation.memberType) {
         case 'NumberTypeAnnotation':
-          return wrapNullable('double', 'Double');
+          return wrapOptional('double', isRequired);
         case 'ObjectTypeAnnotation':
           imports.add('com.facebook.react.bridge.WritableMap');
-          return wrapNullable('WritableMap');
+          return wrapOptional('WritableMap', isRequired);
         case 'StringTypeAnnotation':
-          return wrapNullable('String');
+          return wrapOptional('String', isRequired);
         default:
           throw new Error(
             `Unsupported union member returning value, found: ${realTypeAnnotation.memberType}"`,
@@ -264,13 +258,13 @@ function translateFunctionReturnTypeToJavaType(
       }
     case 'ObjectTypeAnnotation':
       imports.add('com.facebook.react.bridge.WritableMap');
-      return wrapNullable('WritableMap');
+      return wrapOptional('WritableMap', isRequired);
     case 'GenericObjectTypeAnnotation':
       imports.add('com.facebook.react.bridge.WritableMap');
-      return wrapNullable('WritableMap');
+      return wrapOptional('WritableMap', isRequired);
     case 'ArrayTypeAnnotation':
       imports.add('com.facebook.react.bridge.WritableArray');
-      return wrapNullable('WritableArray');
+      return wrapOptional('WritableArray', isRequired);
     default:
       (realTypeAnnotation.type: 'MixedTypeAnnotation');
       throw new Error(createErrorMessage(realTypeAnnotation.type));
@@ -441,6 +435,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const files = new Map<string, string>();
     const nativeModules = getModules(schema);

package/lib/generators/modules/GenerateModuleJniCpp.js

@@ -78,11 +78,11 @@ function _iterableToArrayLimit(arr, i) {
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
-const _require = require('./Utils'),
-  createAliasResolver = _require.createAliasResolver,
-  getModules = _require.getModules;
-const _require2 = require('../../parsers/parsers-commons'),
-  unwrapNullable = _require2.unwrapNullable;
+const _require = require('../../parsers/parsers-commons'),
+  unwrapNullable = _require.unwrapNullable;
+const _require2 = require('./Utils'),
+  createAliasResolver = _require2.createAliasResolver,
+  getModules = _require2.getModules;
 const HostFunctionTemplate = ({
   hasteModuleName,
   propertyName,
@@ -123,8 +123,7 @@ const FileTemplate = ({libraryName, include, modules, moduleLookups}) => {
 
 #include ${include}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${modules}
 
@@ -133,8 +132,7 @@ ${moduleLookups.map(ModuleLookupTemplate).join('\n')}
   return nullptr;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 };
 function translateReturnTypeToKind(nullableTypeAnnotation, resolveAlias) {
@@ -338,9 +336,9 @@ function translateReturnTypeToJniType(nullableTypeAnnotation, resolveAlias) {
     case 'DoubleTypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'FloatTypeAnnotation':
-      return nullable ? 'Ljava/lang/Double;' : 'D';
+      return nullable ? 'Ljava/lang/Float;' : 'F';
     case 'Int32TypeAnnotation':
-      return nullable ? 'Ljava/lang/Double;' : 'D';
+      return nullable ? 'Ljava/lang/Integer;' : 'I';
     case 'PromiseTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Promise;';
     case 'GenericObjectTypeAnnotation':
@@ -415,7 +413,13 @@ function translateMethodForImplementation(
   });
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const nativeModules = getModules(schema);
     const modules = Object.keys(nativeModules)
       .filter(hasteModuleName => {

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

@@ -11,18 +11,18 @@
 'use strict';
 
 import type {
-  Nullable,
   NamedShape,
-  SchemaType,
+  NativeModuleFunctionTypeAnnotation,
+  NativeModuleParamTypeAnnotation,
   NativeModulePropertyShape,
   NativeModuleReturnTypeAnnotation,
-  NativeModuleParamTypeAnnotation,
-  NativeModuleFunctionTypeAnnotation,
+  Nullable,
+  SchemaType,
 } from '../../CodegenSchema';
-
 import type {AliasResolver} from './Utils';
-const {createAliasResolver, getModules} = require('./Utils');
+
 const {unwrapNullable} = require('../../parsers/parsers-commons');
+const {createAliasResolver, getModules} = require('./Utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -108,8 +108,7 @@ const FileTemplate = ({
 
 #include ${include}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${modules}
 
@@ -118,8 +117,7 @@ ${moduleLookups.map(ModuleLookupTemplate).join('\n')}
   return nullptr;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 };
 
@@ -336,9 +334,9 @@ function translateReturnTypeToJniType(
     case 'DoubleTypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'FloatTypeAnnotation':
-      return nullable ? 'Ljava/lang/Double;' : 'D';
+      return nullable ? 'Ljava/lang/Float;' : 'F';
     case 'Int32TypeAnnotation':
-      return nullable ? 'Ljava/lang/Double;' : 'D';
+      return nullable ? 'Ljava/lang/Integer;' : 'I';
     case 'PromiseTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Promise;';
     case 'GenericObjectTypeAnnotation':
@@ -424,6 +422,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const nativeModules = getModules(schema);
 

package/lib/generators/modules/GenerateModuleJniH.js

@@ -39,16 +39,14 @@ const HeaderFileTemplate = ({modules, libraryName}) => {
 #include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${modules}
 
 JSI_EXPORT
 std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 };
 
@@ -81,10 +79,13 @@ target_link_libraries(
   ${libraryName !== 'rncore' ? 'react_codegen_rncore' : ''}
   react_debug
   react_nativemodule_core
+  react_render_componentregistry
   react_render_core
   react_render_debug
   react_render_graphics
   react_render_imagemanager
+  react_render_mapbuffer
+  react_utils
   rrc_image
   rrc_view
   turbomodulejsijni
@@ -103,7 +104,13 @@ target_compile_options(
 `;
 };
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const nativeModules = getModules(schema);
     const modules = Object.keys(nativeModules)
       .filter(hasteModuleName => {

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

@@ -12,10 +12,10 @@
 
 import type {SchemaType} from '../../CodegenSchema';
 
-type FilesOutput = Map<string, string>;
-
 const {getModules} = require('./Utils');
 
+type FilesOutput = Map<string, string>;
+
 const ModuleClassDeclarationTemplate = ({
   hasteModuleName,
 }: $ReadOnly<{hasteModuleName: string}>) => {
@@ -49,16 +49,14 @@ const HeaderFileTemplate = ({
 #include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${modules}
 
 JSI_EXPORT
 std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 };
 
@@ -93,10 +91,13 @@ target_link_libraries(
   ${libraryName !== 'rncore' ? 'react_codegen_rncore' : ''}
   react_debug
   react_nativemodule_core
+  react_render_componentregistry
   react_render_core
   react_render_debug
   react_render_graphics
   react_render_imagemanager
+  react_render_mapbuffer
+  react_utils
   rrc_image
   rrc_view
   turbomodulejsijni
@@ -121,6 +122,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const nativeModules = getModules(schema);
     const modules = Object.keys(nativeModules)

package/lib/generators/modules/GenerateModuleObjCpp/StructCollector.js

@@ -140,11 +140,11 @@ function _toPrimitive(input, hint) {
   }
   return (hint === 'string' ? String : Number)(input);
 }
-const _require = require('../../Utils'),
-  capitalize = _require.capitalize;
-const _require2 = require('../../../parsers/parsers-commons'),
-  unwrapNullable = _require2.unwrapNullable,
-  wrapNullable = _require2.wrapNullable;
+const _require = require('../../../parsers/parsers-commons'),
+  unwrapNullable = _require.unwrapNullable,
+  wrapNullable = _require.wrapNullable;
+const _require2 = require('../../Utils'),
+  capitalize = _require2.capitalize;
 class StructCollector {
   constructor() {
     _defineProperty(this, '_structs', new Map());

package/lib/generators/modules/GenerateModuleObjCpp/StructCollector.js.flow

@@ -11,29 +11,28 @@
 'use strict';
 
 import type {
-  Nullable,
-  NativeModuleObjectTypeAnnotation,
-  NativeModuleStringTypeAnnotation,
-  NativeModuleNumberTypeAnnotation,
-  NativeModuleInt32TypeAnnotation,
-  NativeModuleDoubleTypeAnnotation,
-  NativeModuleFloatTypeAnnotation,
+  NativeModuleArrayTypeAnnotation,
+  NativeModuleBaseTypeAnnotation,
   NativeModuleBooleanTypeAnnotation,
+  NativeModuleDoubleTypeAnnotation,
   NativeModuleEnumDeclaration,
+  NativeModuleFloatTypeAnnotation,
   NativeModuleGenericObjectTypeAnnotation,
-  ReservedTypeAnnotation,
+  NativeModuleInt32TypeAnnotation,
+  NativeModuleNumberTypeAnnotation,
+  NativeModuleObjectTypeAnnotation,
+  NativeModuleStringTypeAnnotation,
   NativeModuleTypeAliasTypeAnnotation,
-  NativeModuleArrayTypeAnnotation,
-  NativeModuleBaseTypeAnnotation,
+  Nullable,
+  ReservedTypeAnnotation,
 } from '../../../CodegenSchema';
-
 import type {AliasResolver} from '../Utils';
 
-const {capitalize} = require('../../Utils');
 const {
   unwrapNullable,
   wrapNullable,
 } = require('../../../parsers/parsers-commons');
+const {capitalize} = require('../../Utils');
 
 type StructContext = 'CONSTANTS' | 'REGULAR';
 

package/lib/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js

@@ -78,13 +78,17 @@ function _iterableToArrayLimit(arr, i) {
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
-const _require = require('../Utils'),
-  getSafePropertyName = _require.getSafePropertyName,
-  getNamespacedStructName = _require.getNamespacedStructName;
-const _require2 = require('../../../Utils'),
-  capitalize = _require2.capitalize;
-const _require3 = require('../../../../parsers/parsers-commons'),
-  unwrapNullable = _require3.unwrapNullable;
+const _require = require('../../../../parsers/parsers-commons'),
+  unwrapNullable = _require.unwrapNullable;
+const _require2 = require('../../../TypeUtils/Cxx'),
+  wrapCxxOptional = _require2.wrapOptional;
+const _require3 = require('../../../TypeUtils/Objective-C'),
+  wrapObjCOptional = _require3.wrapOptional;
+const _require4 = require('../../../Utils'),
+  capitalize = _require4.capitalize;
+const _require5 = require('../Utils'),
+  getNamespacedStructName = _require5.getNamespacedStructName,
+  getSafePropertyName = _require5.getSafePropertyName;
 const StructTemplate = ({
   hasteModuleName,
   structName,
@@ -138,14 +142,11 @@ function toObjCType(
     typeAnnotation = _unwrapNullable2[0],
     nullable = _unwrapNullable2[1];
   const isRequired = !nullable && !isOptional;
-  const wrapOptional = type => {
-    return isRequired ? type : `std::optional<${type}>`;
-  };
   switch (typeAnnotation.type) {
     case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
-          return wrapOptional('double');
+          return wrapCxxOptional('double', isRequired);
         default:
           typeAnnotation.name;
           throw new Error(`Unknown prop type, found: ${typeAnnotation.name}"`);
@@ -153,19 +154,19 @@ function toObjCType(
     case 'StringTypeAnnotation':
       return 'NSString *';
     case 'NumberTypeAnnotation':
-      return wrapOptional('double');
+      return wrapCxxOptional('double', isRequired);
     case 'FloatTypeAnnotation':
-      return wrapOptional('double');
+      return wrapCxxOptional('double', isRequired);
     case 'Int32TypeAnnotation':
-      return wrapOptional('double');
+      return wrapCxxOptional('double', isRequired);
     case 'DoubleTypeAnnotation':
-      return wrapOptional('double');
+      return wrapCxxOptional('double', isRequired);
     case 'BooleanTypeAnnotation':
-      return wrapOptional('bool');
+      return wrapCxxOptional('bool', isRequired);
     case 'EnumDeclaration':
       switch (typeAnnotation.memberType) {
         case 'NumberTypeAnnotation':
-          return wrapOptional('double');
+          return wrapCxxOptional('double', isRequired);
         case 'StringTypeAnnotation':
           return 'NSString *';
         default:
@@ -174,16 +175,17 @@ function toObjCType(
           );
       }
     case 'GenericObjectTypeAnnotation':
-      return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable ';
+      return wrapObjCOptional('id<NSObject>', isRequired);
     case 'ArrayTypeAnnotation':
       if (typeAnnotation.elementType == null) {
-        return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable ';
+        return wrapObjCOptional('id<NSObject>', isRequired);
       }
-      return wrapOptional(
+      return wrapCxxOptional(
         `std::vector<${toObjCType(
           hasteModuleName,
           typeAnnotation.elementType,
         )}>`,
+        isRequired,
       );
     case 'TypeAliasTypeAnnotation':
       const structName = capitalize(typeAnnotation.name);
@@ -191,7 +193,7 @@ function toObjCType(
         hasteModuleName,
         structName,
       );
-      return wrapOptional(`${namespacedStructName}::Builder`);
+      return wrapCxxOptional(`${namespacedStructName}::Builder`, isRequired);
     default:
       typeAnnotation.type;
       throw new Error(