@react-native/codegen 0.88.0-rc.0 → 0.88.0-rc.2

package/lib/generators/modules/GenerateModuleH.js

@@ -16,8 +16,7 @@ const {
   createAliasResolver,
   getModules,
   isArrayRecursiveMember,
-  isDirectRecursiveMember,
-  throwIfUnsupportedEventEmitterPayload
+  isDirectRecursiveMember
 } = require('./Utils');
 function serializeArg(moduleName, arg, index, resolveAlias, enumMap) {
   const {
@@ -411,7 +410,6 @@ function translateFunctionToCpp(hasteModuleName, prop, resolveAlias, enumMap, ar
     ${!isVoid ? !isNullable ? 'return ' : 'auto result = ' : ''}bridging::callFromJs<${returnType}>(rt, &T::${prop.name},  static_cast<${hasteModuleName}CxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule)${methodCallArgs});${!isVoid ? !isNullable ? '' : 'return result ? jsi::Value(std::move(*result)) : jsi::Value::null();' : 'return jsi::Value::undefined();'}\n  }`;
 }
 function translateEventEmitterToCpp(moduleName, eventEmitter, resolveAlias, enumMap) {
-  throwIfUnsupportedEventEmitterPayload(eventEmitter.name, eventEmitter.typeAnnotation.typeAnnotation);
   const isVoidTypeAnnotation = eventEmitter.typeAnnotation.typeAnnotation.type === 'VoidTypeAnnotation';
   const templateName = `${toPascalCase(eventEmitter.name)}Type`;
   const jsiType = translatePrimitiveJSTypeToCpp(moduleName, null, eventEmitter.typeAnnotation.typeAnnotation, false, typeName => `Unsupported type for eventEmitter "${eventEmitter.name}" in ${moduleName}. Found: ${typeName}`, resolveAlias, enumMap);

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

@@ -40,7 +40,6 @@ const {
   getModules,
   isArrayRecursiveMember,
   isDirectRecursiveMember,
-  throwIfUnsupportedEventEmitterPayload,
 } = require('./Utils');
 
 type FilesOutput = Map<string, string>;
@@ -639,11 +638,6 @@ function translateEventEmitterToCpp(
   resolveAlias: AliasResolver,
   enumMap: NativeModuleEnumMap,
 ): EventEmitterCpp {
-  throwIfUnsupportedEventEmitterPayload(
-    eventEmitter.name,
-    eventEmitter.typeAnnotation.typeAnnotation,
-  );
-
   const isVoidTypeAnnotation =
     eventEmitter.typeAnnotation.typeAnnotation.type === 'VoidTypeAnnotation';
   const templateName = `${toPascalCase(eventEmitter.name)}Type`;

package/lib/generators/modules/GenerateModuleJavaSpec.js

@@ -13,7 +13,6 @@ const {
 const {
   createAliasResolver,
   getModules,
-  throwIfUnsupportedEventEmitterPayload,
   throwIfUnsupportedPromiseArrayBuffer
 } = require('./Utils');
 function FileTemplate(config) {
@@ -82,7 +81,6 @@ function MethodTemplate(config) {
 }
 function translateEventEmitterTypeToJavaType(eventEmitter, imports) {
   const typeAnnotation = eventEmitter.typeAnnotation.typeAnnotation;
-  throwIfUnsupportedEventEmitterPayload(eventEmitter.name, typeAnnotation);
   switch (typeAnnotation.type) {
     case 'StringTypeAnnotation':
       return 'String';
@@ -121,7 +119,11 @@ function translateEventEmitterTypeToJavaType(eventEmitter, imports) {
     case 'ArrayTypeAnnotation':
       imports.add('com.facebook.react.bridge.ReadableArray');
       return 'ReadableArray';
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'Int32TypeAnnotation':
     case 'VoidTypeAnnotation':
+    case 'ArrayBufferTypeAnnotation':
       throw new Error(`Unsupported eventType for ${eventEmitter.name}. Found: ${eventEmitter.typeAnnotation.typeAnnotation.type}`);
     default:
       typeAnnotation.type;

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

@@ -28,7 +28,6 @@ const {parseValidUnionType, toPascalCase} = require('../Utils');
 const {
   createAliasResolver,
   getModules,
-  throwIfUnsupportedEventEmitterPayload,
   throwIfUnsupportedPromiseArrayBuffer,
 } = require('./Utils');
 
@@ -142,9 +141,6 @@ function translateEventEmitterTypeToJavaType(
   imports: Set<string>,
 ): string {
   const typeAnnotation = eventEmitter.typeAnnotation.typeAnnotation;
-
-  throwIfUnsupportedEventEmitterPayload(eventEmitter.name, typeAnnotation);
-
   switch (typeAnnotation.type) {
     case 'StringTypeAnnotation':
       return 'String';
@@ -183,8 +179,12 @@ function translateEventEmitterTypeToJavaType(
     case 'ArrayTypeAnnotation':
       imports.add('com.facebook.react.bridge.ReadableArray');
       return 'ReadableArray';
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'Int32TypeAnnotation':
     case 'VoidTypeAnnotation':
-      // Void emitters take no argument, so the caller never asks for a type.
+    case 'ArrayBufferTypeAnnotation':
+      // TODO: Add support for these types
       throw new Error(
         `Unsupported eventType for ${eventEmitter.name}. Found: ${eventEmitter.typeAnnotation.typeAnnotation.type}`,
       );

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

@@ -81,7 +81,6 @@ const HeaderFileTemplate = ({
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-#import <React/RCTArrayBuffer.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>

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

@@ -97,7 +97,6 @@ const HeaderFileTemplate = ({
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-#import <React/RCTArrayBuffer.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>

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

@@ -2,12 +2,8 @@ const {
   parseValidUnionType,
   toPascalCase
 } = require('../../Utils');
-const {
-  throwIfUnsupportedEventEmitterPayload
-} = require('../Utils');
 function getEventEmitterTypeObjCType(eventEmitter) {
   const typeAnnotation = eventEmitter.typeAnnotation.typeAnnotation;
-  throwIfUnsupportedEventEmitterPayload(eventEmitter.name, typeAnnotation);
   switch (typeAnnotation.type) {
     case 'StringTypeAnnotation':
       return 'NSString *_Nonnull';
@@ -30,9 +26,6 @@ function getEventEmitterTypeObjCType(eventEmitter) {
       }
     case 'NumberTypeAnnotation':
     case 'NumberLiteralTypeAnnotation':
-    case 'DoubleTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
       return 'NSNumber *_Nonnull';
     case 'BooleanTypeAnnotation':
     case 'BooleanLiteralTypeAnnotation':
@@ -43,6 +36,9 @@ function getEventEmitterTypeObjCType(eventEmitter) {
       return 'NSDictionary *';
     case 'ArrayTypeAnnotation':
       return 'NSArray<id<NSObject>> *';
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'Int32TypeAnnotation':
     case 'VoidTypeAnnotation':
       throw new Error(`Unsupported eventType for ${eventEmitter.name}. Found: ${eventEmitter.typeAnnotation.typeAnnotation.type}`);
     default:

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

@@ -11,15 +11,12 @@
 import type {NativeModuleEventEmitterShape} from '../../../CodegenSchema';
 
 const {parseValidUnionType, toPascalCase} = require('../../Utils');
-const {throwIfUnsupportedEventEmitterPayload} = require('../Utils');
 
 function getEventEmitterTypeObjCType(
   eventEmitter: NativeModuleEventEmitterShape,
 ): string {
   const typeAnnotation = eventEmitter.typeAnnotation.typeAnnotation;
 
-  throwIfUnsupportedEventEmitterPayload(eventEmitter.name, typeAnnotation);
-
   switch (typeAnnotation.type) {
     case 'StringTypeAnnotation':
       return 'NSString *_Nonnull';
@@ -42,9 +39,6 @@ function getEventEmitterTypeObjCType(
       }
     case 'NumberTypeAnnotation':
     case 'NumberLiteralTypeAnnotation':
-    case 'DoubleTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
       return 'NSNumber *_Nonnull';
     case 'BooleanTypeAnnotation':
     case 'BooleanLiteralTypeAnnotation':
@@ -55,8 +49,11 @@ function getEventEmitterTypeObjCType(
       return 'NSDictionary *';
     case 'ArrayTypeAnnotation':
       return 'NSArray<id<NSObject>> *';
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'Int32TypeAnnotation':
     case 'VoidTypeAnnotation':
-      // Void emitters take no argument, so both callers skip this function.
+      // TODO: Add support for these types
       throw new Error(
         `Unsupported eventType for ${eventEmitter.name}. Found: ${eventEmitter.typeAnnotation.typeAnnotation.type}`,
       );

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

@@ -128,7 +128,7 @@ function getParamObjCType(hasteModuleName, methodName, param, structName, struct
       }
     case 'ArrayBufferTypeAnnotation':
       {
-        return notStruct(wrapOptional('RCTArrayBuffer *', !nullable));
+        return notStruct(wrapOptional('NSMutableData *', !nullable));
       }
   }
   const [structTypeAnnotation] = unwrapNullable(structCollector.process(structName, 'REGULAR', resolveAlias, wrapNullable(nullable, typeAnnotation)));
@@ -252,7 +252,7 @@ function getReturnObjCType(methodName, nullableTypeAnnotation) {
     case 'GenericObjectTypeAnnotation':
       return wrapOptional('NSDictionary *', isRequired);
     case 'ArrayBufferTypeAnnotation':
-      return wrapOptional('RCTArrayBuffer *', isRequired);
+      return wrapOptional('NSMutableData *', isRequired);
     default:
       typeAnnotation.type;
       throw new Error(`Unsupported return type for ${methodName}. Found: ${typeAnnotation.type}`);

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

@@ -227,7 +227,7 @@ function getParamObjCType(
       return notStruct(wrapOptional('NSArray *', !nullable));
     }
     case 'ArrayBufferTypeAnnotation': {
-      return notStruct(wrapOptional('RCTArrayBuffer *', !nullable));
+      return notStruct(wrapOptional('NSMutableData *', !nullable));
     }
   }
 
@@ -398,7 +398,7 @@ function getReturnObjCType(
     case 'GenericObjectTypeAnnotation':
       return wrapOptional('NSDictionary *', isRequired);
     case 'ArrayBufferTypeAnnotation':
-      return wrapOptional('RCTArrayBuffer *', isRequired);
+      return wrapOptional('NSMutableData *', isRequired);
     default:
       typeAnnotation.type as 'MixedTypeAnnotation';
       throw new Error(

package/lib/generators/modules/Utils.js

@@ -43,16 +43,10 @@ function throwIfUnsupportedPromiseArrayBuffer(methodName, nullableReturnTypeAnno
     throw new Error(`Unsupported return type for method "${methodName}": Promise<ArrayBuffer> is not ` + 'supported for Android (Java/Kotlin) or iOS (ObjC) TurboModules. Use a C++ ' + '(Cxx) TurboModule, return the ArrayBuffer from a synchronous method, or resolve ' + 'the Promise with a different type. ArrayBuffer is still supported as a method ' + 'argument and as a synchronous return value on all platforms.');
   }
 }
-function throwIfUnsupportedEventEmitterPayload(eventEmitterName, typeAnnotation) {
-  if (typeAnnotation.type === 'ArrayBufferTypeAnnotation') {
-    throw new Error(`Unsupported eventType for ${eventEmitterName}. Found: ${typeAnnotation.type}. ` + 'ArrayBuffer is not supported as an EventEmitter payload on any platform. ' + 'Pass the ArrayBuffer through a method instead.');
-  }
-}
 module.exports = {
   createAliasResolver,
   getModules,
   isDirectRecursiveMember,
   isArrayRecursiveMember,
-  throwIfUnsupportedEventEmitterPayload,
   throwIfUnsupportedPromiseArrayBuffer
 };

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

@@ -118,29 +118,10 @@ function throwIfUnsupportedPromiseArrayBuffer(
   }
 }
 
-// ArrayBuffer is not emittable on any platform: Android emitters always carry a
-// folly::dynamic payload, which cannot hold raw bytes, and neither the ObjC nor
-// the C++ emitter contract can hand out a buffer that outlives the emit call.
-// The parser rejects this too; the guard here also covers schemas built without
-// going through the parser.
-function throwIfUnsupportedEventEmitterPayload(
-  eventEmitterName: string,
-  typeAnnotation: NativeModuleTypeAnnotation,
-): void {
-  if (typeAnnotation.type === 'ArrayBufferTypeAnnotation') {
-    throw new Error(
-      `Unsupported eventType for ${eventEmitterName}. Found: ${typeAnnotation.type}. ` +
-        'ArrayBuffer is not supported as an EventEmitter payload on any platform. ' +
-        'Pass the ArrayBuffer through a method instead.',
-    );
-  }
-}
-
 module.exports = {
   createAliasResolver,
   getModules,
   isDirectRecursiveMember,
   isArrayRecursiveMember,
-  throwIfUnsupportedEventEmitterPayload,
   throwIfUnsupportedPromiseArrayBuffer,
 };

package/lib/parsers/error-utils.js

@@ -12,7 +12,6 @@ const {
   UnsupportedArrayElementTypeAnnotationParserError,
   UnsupportedFunctionParamTypeAnnotationParserError,
   UnsupportedFunctionReturnTypeAnnotationParserError,
-  UnsupportedModuleEventEmitterPayloadTypeParserError,
   UnsupportedModuleEventEmitterPropertyParserError,
   UnsupportedModuleEventEmitterTypePropertyParserError,
   UnsupportedModulePropertyParserError,
@@ -73,11 +72,6 @@ function throwIfEventEmitterEventTypeIsUnsupported(nativeModuleName, propertyNam
     throw new UnsupportedModuleEventEmitterTypePropertyParserError(nativeModuleName, propertyName, propertyValueType, parser.language(), nullable);
   }
 }
-function throwIfEventEmitterPayloadTypeIsUnsupported(nativeModuleName, propertyValue, propertyName, payloadTypeAnnotation) {
-  if (payloadTypeAnnotation.type === 'ArrayBufferTypeAnnotation') {
-    throw new UnsupportedModuleEventEmitterPayloadTypeParserError(nativeModuleName, propertyValue, propertyName, 'ArrayBuffer');
-  }
-}
 function throwIfModuleTypeIsUnsupported(nativeModuleName, propertyValue, propertyName, propertyValueType, parser) {
   if (!parser.functionTypeAnnotation(propertyValueType)) {
     throw new UnsupportedModulePropertyParserError(nativeModuleName, propertyValue, propertyName, propertyValueType, parser.language());
@@ -185,7 +179,6 @@ module.exports = {
   throwIfUntypedModule,
   throwIfEventEmitterTypeIsUnsupported,
   throwIfEventEmitterEventTypeIsUnsupported,
-  throwIfEventEmitterPayloadTypeIsUnsupported,
   throwIfModuleTypeIsUnsupported,
   throwIfMoreThanOneModuleInterfaceParserError,
   throwIfUnsupportedFunctionParamTypeAnnotationParserError,

package/lib/parsers/error-utils.js.flow

@@ -27,7 +27,6 @@ const {
   UnsupportedArrayElementTypeAnnotationParserError,
   UnsupportedFunctionParamTypeAnnotationParserError,
   UnsupportedFunctionReturnTypeAnnotationParserError,
-  UnsupportedModuleEventEmitterPayloadTypeParserError,
   UnsupportedModuleEventEmitterPropertyParserError,
   UnsupportedModuleEventEmitterTypePropertyParserError,
   UnsupportedModulePropertyParserError,
@@ -197,25 +196,6 @@ function throwIfEventEmitterEventTypeIsUnsupported(
   }
 }
 
-// ArrayBuffer is not emittable on any platform: Android emitters always carry a
-// folly::dynamic payload, which cannot hold raw bytes, and neither the ObjC nor
-// the C++ emitter contract can hand out a buffer that outlives the emit call.
-function throwIfEventEmitterPayloadTypeIsUnsupported(
-  nativeModuleName: string,
-  propertyValue: $FlowFixMe,
-  propertyName: string,
-  payloadTypeAnnotation: NativeModuleTypeAnnotation,
-) {
-  if (payloadTypeAnnotation.type === 'ArrayBufferTypeAnnotation') {
-    throw new UnsupportedModuleEventEmitterPayloadTypeParserError(
-      nativeModuleName,
-      propertyValue,
-      propertyName,
-      'ArrayBuffer',
-    );
-  }
-}
-
 function throwIfModuleTypeIsUnsupported(
   nativeModuleName: string,
   propertyValue: $FlowFixMe,
@@ -438,7 +418,6 @@ module.exports = {
   throwIfUntypedModule,
   throwIfEventEmitterTypeIsUnsupported,
   throwIfEventEmitterEventTypeIsUnsupported,
-  throwIfEventEmitterPayloadTypeIsUnsupported,
   throwIfModuleTypeIsUnsupported,
   throwIfMoreThanOneModuleInterfaceParserError,
   throwIfUnsupportedFunctionParamTypeAnnotationParserError,

package/lib/parsers/errors.js

@@ -43,11 +43,6 @@ class UnsupportedModuleEventEmitterPropertyParserError extends ParserError {
     super(nativeModuleName, propertyValue, message);
   }
 }
-class UnsupportedModuleEventEmitterPayloadTypeParserError extends ParserError {
-  constructor(nativeModuleName, propertyValue, propertyName, payloadType) {
-    super(nativeModuleName, propertyValue, `EventEmitter '${propertyName}' cannot have payload type '${payloadType}'.`);
-  }
-}
 class UnsupportedModulePropertyParserError extends ParserError {
   constructor(nativeModuleName, propertyValue, propertyName, invalidPropertyValueType, language) {
     super(nativeModuleName, propertyValue, `${language} interfaces extending TurboModule must only contain 'FunctionTypeAnnotation's or non nullable 'EventEmitter's. Property '${propertyName}' refers to a '${invalidPropertyValueType}'.`);
@@ -179,7 +174,6 @@ module.exports = {
   UnsupportedEnumDeclarationParserError,
   UnsupportedModuleEventEmitterTypePropertyParserError,
   UnsupportedModuleEventEmitterPropertyParserError,
-  UnsupportedModuleEventEmitterPayloadTypeParserError,
   UnsupportedModulePropertyParserError,
   UnsupportedObjectPropertyTypeAnnotationParserError,
   UnsupportedObjectPropertyWithIndexerTypeAnnotationParserError,

package/lib/parsers/errors.js.flow

@@ -111,21 +111,6 @@ class UnsupportedModuleEventEmitterPropertyParserError extends ParserError {
   }
 }
 
-class UnsupportedModuleEventEmitterPayloadTypeParserError extends ParserError {
-  constructor(
-    nativeModuleName: string,
-    propertyValue: $FlowFixMe,
-    propertyName: string,
-    payloadType: string,
-  ) {
-    super(
-      nativeModuleName,
-      propertyValue,
-      `EventEmitter '${propertyName}' cannot have payload type '${payloadType}'.`,
-    );
-  }
-}
-
 class UnsupportedModulePropertyParserError extends ParserError {
   constructor(
     nativeModuleName: string,
@@ -471,7 +456,6 @@ module.exports = {
   UnsupportedEnumDeclarationParserError,
   UnsupportedModuleEventEmitterTypePropertyParserError,
   UnsupportedModuleEventEmitterPropertyParserError,
-  UnsupportedModuleEventEmitterPayloadTypeParserError,
   UnsupportedModulePropertyParserError,
   UnsupportedObjectPropertyTypeAnnotationParserError,
   UnsupportedObjectPropertyWithIndexerTypeAnnotationParserError,

package/lib/parsers/parsers-commons.js

@@ -3,7 +3,6 @@
 const {
   throwIfConfigNotfound,
   throwIfEventEmitterEventTypeIsUnsupported,
-  throwIfEventEmitterPayloadTypeIsUnsupported,
   throwIfEventEmitterTypeIsUnsupported,
   throwIfIncorrectModuleRegistryCallArgument,
   throwIfIncorrectModuleRegistryCallTypeParameterParserError,
@@ -204,7 +203,6 @@ function buildEventEmitterSchema(hasteModuleName, property, types, aliasMap, enu
   const eventTypeResolutionStatus = resolveTypeAnnotationFN(typeAnnotation.typeParameters.params[0], types, parser);
   throwIfEventEmitterEventTypeIsUnsupported(hasteModuleName, key.name, eventTypeResolutionStatus.typeAnnotation, parser, eventTypeResolutionStatus.nullable);
   const eventTypeAnnotation = translateTypeAnnotation(hasteModuleName, typeAnnotation.typeParameters.params[0], types, aliasMap, enumMap, tryParse, cxxOnly, parser);
-  throwIfEventEmitterPayloadTypeIsUnsupported(hasteModuleName, typeAnnotation.typeParameters.params[0], key.name, eventTypeAnnotation);
   return {
     name: eventemitterName,
     optional: Boolean(property.optional),

package/lib/parsers/parsers-commons.js.flow

@@ -42,7 +42,6 @@ import type {
 const {
   throwIfConfigNotfound,
   throwIfEventEmitterEventTypeIsUnsupported,
-  throwIfEventEmitterPayloadTypeIsUnsupported,
   throwIfEventEmitterTypeIsUnsupported,
   throwIfIncorrectModuleRegistryCallArgument,
   throwIfIncorrectModuleRegistryCallTypeParameterParserError,
@@ -552,13 +551,6 @@ function buildEventEmitterSchema(
     parser,
   );
 
-  throwIfEventEmitterPayloadTypeIsUnsupported(
-    hasteModuleName,
-    typeAnnotation.typeParameters.params[0],
-    key.name,
-    eventTypeAnnotation,
-  );
-
   return {
     name: eventemitterName,
     optional: Boolean(property.optional),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.88.0-rc.0",
+  "version": "0.88.0-rc.2",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {