@react-native/codegen 0.75.0-rc.1 → 0.76.0-nightly-20240627-TEMP

package/lib/CodegenSchema.d.ts

@@ -60,7 +60,7 @@ export interface MixedTypeAnnotation {
 
 export interface EventEmitterTypeAnnotation {
   readonly type: 'EventEmitterTypeAnnotation';
-  readonly typeAnnotation: NativeModuleBaseTypeAnnotation;
+  readonly typeAnnotation: NativeModuleEventEmitterTypeAnnotation;
 }
 
 export interface FunctionTypeAnnotation<P, R> {
@@ -360,6 +360,23 @@ export interface NativeModuleMixedTypeAnnotation {
   readonly type: 'MixedTypeAnnotation';
 }
 
+export type NativeModuleEventEmitterBaseTypeAnnotation =
+  | NativeModuleBooleanTypeAnnotation
+  | NativeModuleDoubleTypeAnnotation
+  | NativeModuleFloatTypeAnnotation
+  | NativeModuleInt32TypeAnnotation
+  | NativeModuleNumberTypeAnnotation
+  | NativeModuleStringTypeAnnotation
+  | NativeModuleTypeAliasTypeAnnotation
+  | VoidTypeAnnotation;
+
+export type NativeModuleEventEmitterTypeAnnotation =
+  | NativeModuleEventEmitterBaseTypeAnnotation
+  | {
+    readonly type: 'ArrayTypeAnnotation';
+    readonly elementType: NativeModuleEventEmitterBaseTypeAnnotation | {type: string};
+  };
+
 export type NativeModuleBaseTypeAnnotation =
   | NativeModuleStringTypeAnnotation
   | NativeModuleNumberTypeAnnotation
@@ -387,7 +404,8 @@ export type NativeModuleReturnTypeAnnotation =
 export type NativeModuleTypeAnnotation =
   | NativeModuleBaseTypeAnnotation
   | NativeModuleParamOnlyTypeAnnotation
-  | NativeModuleReturnOnlyTypeAnnotation;
+  | NativeModuleReturnOnlyTypeAnnotation
+  | NativeModuleEventEmitterTypeAnnotation;
 
 type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
 

package/lib/CodegenSchema.js.flow

@@ -63,7 +63,7 @@ export type MixedTypeAnnotation = $ReadOnly<{
 
 type EventEmitterTypeAnnotation = $ReadOnly<{
   type: 'EventEmitterTypeAnnotation',
-  typeAnnotation: NativeModuleBaseTypeAnnotation,
+  typeAnnotation: NativeModuleEventEmitterTypeAnnotation | $FlowFixMe,
 }>;
 
 type FunctionTypeAnnotation<+P, +R> = $ReadOnly<{
@@ -366,6 +366,23 @@ export type NativeModuleMixedTypeAnnotation = $ReadOnly<{
   type: 'MixedTypeAnnotation',
 }>;
 
+type NativeModuleEventEmitterBaseTypeAnnotation =
+  | NativeModuleBooleanTypeAnnotation
+  | NativeModuleDoubleTypeAnnotation
+  | NativeModuleFloatTypeAnnotation
+  | NativeModuleInt32TypeAnnotation
+  | NativeModuleNumberTypeAnnotation
+  | NativeModuleStringTypeAnnotation
+  | NativeModuleTypeAliasTypeAnnotation
+  | VoidTypeAnnotation;
+
+export type NativeModuleEventEmitterTypeAnnotation =
+  | NativeModuleEventEmitterBaseTypeAnnotation
+  | {
+      type: 'ArrayTypeAnnotation',
+      elementType: NativeModuleEventEmitterBaseTypeAnnotation | {type: string},
+    };
+
 export type NativeModuleBaseTypeAnnotation =
   | NativeModuleStringTypeAnnotation
   | NativeModuleNumberTypeAnnotation
@@ -393,7 +410,8 @@ export type NativeModuleReturnTypeAnnotation =
 export type NativeModuleTypeAnnotation =
   | NativeModuleBaseTypeAnnotation
   | NativeModuleParamOnlyTypeAnnotation
-  | NativeModuleReturnOnlyTypeAnnotation;
+  | NativeModuleReturnOnlyTypeAnnotation
+  | NativeModuleEventEmitterTypeAnnotation;
 
 type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
 

package/lib/parsers/errors.js

@@ -86,7 +86,7 @@ class UnsupportedModuleEventEmitterPropertyParserError extends ParserError {
       message += `'${propertyValue}' must non nullable.`;
     } else if (untyped) {
       message += `'${propertyValue}' must have a concrete or void eventType.`;
-    } else if (cxxOnly) {
+    } else if (!cxxOnly) {
       message += `'${propertyValue}' is only supported in C++ Turbo Modules.`;
     }
     super(nativeModuleName, propertyValue, message);

package/lib/parsers/errors.js.flow

@@ -107,7 +107,7 @@ class UnsupportedModuleEventEmitterPropertyParserError extends ParserError {
       message += `'${propertyValue}' must non nullable.`;
     } else if (untyped) {
       message += `'${propertyValue}' must have a concrete or void eventType.`;
-    } else if (cxxOnly) {
+    } else if (!cxxOnly) {
       message += `'${propertyValue}' is only supported in C++ Turbo Modules.`;
     }
     super(nativeModuleName, propertyValue, message);

package/lib/parsers/flow/modules/__test_fixtures__/fixtures.js

@@ -598,6 +598,41 @@ export interface Spec extends TurboModule {
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
+`;
+const NATIVE_MODULE_WITH_EVENT_EMITTERS = `
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from '../RCTExport';
+import type {EventEmitter} from '../CodegenTypes';
+import * as TurboModuleRegistry from '../TurboModuleRegistry';
+
+export type ObjectStruct = {
+  a: number,
+  b: string,
+  c?: ?string,
+};
+
+export interface Spec extends TurboModule {
+  +onEvent1: EventEmitter<void>;
+  +onEvent2: EventEmitter<string>;
+  +onEvent3: EventEmitter<number>;
+  +onEvent4: EventEmitter<boolean>;
+  +onEvent5: EventEmitter<ObjectStruct>;
+  +onEvent6: EventEmitter<ObjectStruct[]>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModuleCxx');
+
 `;
 const ANDROID_ONLY_NATIVE_MODULE = `
 /**
@@ -788,6 +823,7 @@ module.exports = {
   NATIVE_MODULE_WITH_BASIC_PARAM_TYPES,
   NATIVE_MODULE_WITH_CALLBACK,
   NATIVE_MODULE_WITH_UNION,
+  NATIVE_MODULE_WITH_EVENT_EMITTERS,
   EMPTY_NATIVE_MODULE,
   ANDROID_ONLY_NATIVE_MODULE,
   IOS_ONLY_NATIVE_MODULE,

package/lib/parsers/flow/modules/__test_fixtures__/fixtures.js.flow

@@ -620,6 +620,42 @@ export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
 `;
 
+const NATIVE_MODULE_WITH_EVENT_EMITTERS = `
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from '../RCTExport';
+import type {EventEmitter} from '../CodegenTypes';
+import * as TurboModuleRegistry from '../TurboModuleRegistry';
+
+export type ObjectStruct = {
+  a: number,
+  b: string,
+  c?: ?string,
+};
+
+export interface Spec extends TurboModule {
+  +onEvent1: EventEmitter<void>;
+  +onEvent2: EventEmitter<string>;
+  +onEvent3: EventEmitter<number>;
+  +onEvent4: EventEmitter<boolean>;
+  +onEvent5: EventEmitter<ObjectStruct>;
+  +onEvent6: EventEmitter<ObjectStruct[]>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModuleCxx');
+
+`;
+
 const ANDROID_ONLY_NATIVE_MODULE = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -813,6 +849,7 @@ module.exports = {
   NATIVE_MODULE_WITH_BASIC_PARAM_TYPES,
   NATIVE_MODULE_WITH_CALLBACK,
   NATIVE_MODULE_WITH_UNION,
+  NATIVE_MODULE_WITH_EVENT_EMITTERS,
   EMPTY_NATIVE_MODULE,
   ANDROID_ONLY_NATIVE_MODULE,
   IOS_ONLY_NATIVE_MODULE,

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

@@ -98,6 +98,7 @@ const _require3 = require('../../parsers-primitives'),
   emitPromise = _require3.emitPromise,
   emitRootTag = _require3.emitRootTag,
   emitUnion = _require3.emitUnion,
+  translateArrayTypeAnnotation = _require3.translateArrayTypeAnnotation,
   typeAliasResolution = _require3.typeAliasResolution,
   typeEnumResolution = _require3.typeEnumResolution;
 function translateTypeAnnotation(
@@ -123,6 +124,20 @@ function translateTypeAnnotation(
     typeAnnotation = _resolveTypeAnnotatio.typeAnnotation,
     typeResolutionStatus = _resolveTypeAnnotatio.typeResolutionStatus;
   switch (typeAnnotation.type) {
+    case 'ArrayTypeAnnotation': {
+      return translateArrayTypeAnnotation(
+        hasteModuleName,
+        types,
+        aliasMap,
+        enumMap,
+        cxxOnly,
+        'Array',
+        typeAnnotation.elementType,
+        nullable,
+        translateTypeAnnotation,
+        parser,
+      );
+    }
     case 'GenericTypeAnnotation': {
       switch (parser.getTypeAnnotationName(typeAnnotation)) {
         case 'RootTag': {

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

@@ -40,6 +40,7 @@ const {
   emitPromise,
   emitRootTag,
   emitUnion,
+  translateArrayTypeAnnotation,
   typeAliasResolution,
   typeEnumResolution,
 } = require('../../parsers-primitives');
@@ -62,6 +63,20 @@ function translateTypeAnnotation(
     resolveTypeAnnotationFN(flowTypeAnnotation, types, parser);
 
   switch (typeAnnotation.type) {
+    case 'ArrayTypeAnnotation': {
+      return translateArrayTypeAnnotation(
+        hasteModuleName,
+        types,
+        aliasMap,
+        enumMap,
+        cxxOnly,
+        'Array',
+        typeAnnotation.elementType,
+        nullable,
+        translateTypeAnnotation,
+        parser,
+      );
+    }
     case 'GenericTypeAnnotation': {
       switch (parser.getTypeAnnotationName(typeAnnotation)) {
         case 'RootTag': {

package/lib/parsers/parsers-commons.js

@@ -563,8 +563,11 @@ function buildEventEmitterSchema(
   translateTypeAnnotation,
   parser,
 ) {
-  let key = property.key,
-    value = property.value;
+  const key = property.key;
+  const value =
+    parser.language() === 'TypeScript'
+      ? property.typeAnnotation.typeAnnotation
+      : property.value;
   const eventemitterName = key.name;
   const resolveTypeAnnotationFN = parser.getResolveTypeAnnotationFN();
   const _unwrapNullable7 = unwrapNullable(value),
@@ -573,8 +576,11 @@ function buildEventEmitterSchema(
     typeAnnotationNullable = _unwrapNullable8[1];
   const typeAnnotationUntyped =
     value.typeParameters.params.length === 1 &&
-    value.typeParameters.params[0].type === 'ObjectTypeAnnotation' &&
-    value.typeParameters.params[0].properties.length === 0;
+    parser.language() === 'TypeScript'
+      ? value.typeParameters.params[0].type === 'TSTypeLiteral' &&
+        value.typeParameters.params[0].members.length === 0
+      : value.typeParameters.params[0].type === 'ObjectTypeAnnotation' &&
+        value.typeParameters.params[0].properties.length === 0;
   throwIfEventEmitterTypeIsUnsupported(
     hasteModuleName,
     key.name,
@@ -596,14 +602,22 @@ function buildEventEmitterSchema(
     parser,
     eventTypeResolutionStatus.nullable,
   );
+  const eventTypeAnnotation = translateTypeAnnotation(
+    hasteModuleName,
+    typeAnnotation.typeParameters.params[0],
+    types,
+    aliasMap,
+    enumMap,
+    tryParse,
+    cxxOnly,
+    parser,
+  );
   return {
     name: eventemitterName,
     optional: false,
     typeAnnotation: {
       type: 'EventEmitterTypeAnnotation',
-      typeAnnotation: {
-        type: eventTypeResolutionStatus.typeAnnotation.type,
-      },
+      typeAnnotation: eventTypeAnnotation,
     },
   };
 }
@@ -817,23 +831,38 @@ const buildModuleSchema = (
         property.type === 'TSMethodSignature',
     )
     .map(property => {
-      var _property$value, _property$value2;
+      var _property$typeAnnotat, _property$value, _property$value2;
       const enumMap = {};
       const isEventEmitter =
-        (property === null ||
-        property === void 0 ||
-        (_property$value = property.value) === null ||
-        _property$value === void 0
-          ? void 0
-          : _property$value.type) === 'GenericTypeAnnotation' &&
-        (property === null ||
-        property === void 0 ||
-        (_property$value2 = property.value) === null ||
-        _property$value2 === void 0 ||
-        (_property$value2 = _property$value2.id) === null ||
-        _property$value2 === void 0
-          ? void 0
-          : _property$value2.name) === 'EventEmitter';
+        language === 'TypeScript'
+          ? (property === null || property === void 0
+              ? void 0
+              : property.type) === 'TSPropertySignature' &&
+            (property === null ||
+            property === void 0 ||
+            (_property$typeAnnotat = property.typeAnnotation) === null ||
+            _property$typeAnnotat === void 0 ||
+            (_property$typeAnnotat = _property$typeAnnotat.typeAnnotation) ===
+              null ||
+            _property$typeAnnotat === void 0 ||
+            (_property$typeAnnotat = _property$typeAnnotat.typeName) === null ||
+            _property$typeAnnotat === void 0
+              ? void 0
+              : _property$typeAnnotat.name) === 'EventEmitter'
+          : (property === null ||
+            property === void 0 ||
+            (_property$value = property.value) === null ||
+            _property$value === void 0
+              ? void 0
+              : _property$value.type) === 'GenericTypeAnnotation' &&
+            (property === null ||
+            property === void 0 ||
+            (_property$value2 = property.value) === null ||
+            _property$value2 === void 0 ||
+            (_property$value2 = _property$value2.id) === null ||
+            _property$value2 === void 0
+              ? void 0
+              : _property$value2.name) === 'EventEmitter';
       return tryParse(() => ({
         aliasMap,
         enumMap,

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

@@ -489,15 +489,22 @@ function buildEventEmitterSchema(
   translateTypeAnnotation: $FlowFixMe,
   parser: Parser,
 ): NativeModuleEventEmitterShape {
-  let {key, value} = property;
-  const eventemitterName: string = key.name;
+  const {key} = property;
+  const value =
+    parser.language() === 'TypeScript'
+      ? property.typeAnnotation.typeAnnotation
+      : property.value;
 
+  const eventemitterName: string = key.name;
   const resolveTypeAnnotationFN = parser.getResolveTypeAnnotationFN();
   const [typeAnnotation, typeAnnotationNullable] = unwrapNullable(value);
   const typeAnnotationUntyped =
     value.typeParameters.params.length === 1 &&
-    value.typeParameters.params[0].type === 'ObjectTypeAnnotation' &&
-    value.typeParameters.params[0].properties.length === 0;
+    parser.language() === 'TypeScript'
+      ? value.typeParameters.params[0].type === 'TSTypeLiteral' &&
+        value.typeParameters.params[0].members.length === 0
+      : value.typeParameters.params[0].type === 'ObjectTypeAnnotation' &&
+        value.typeParameters.params[0].properties.length === 0;
 
   throwIfEventEmitterTypeIsUnsupported(
     hasteModuleName,
@@ -520,12 +527,24 @@ function buildEventEmitterSchema(
     parser,
     eventTypeResolutionStatus.nullable,
   );
+
+  const eventTypeAnnotation = translateTypeAnnotation(
+    hasteModuleName,
+    typeAnnotation.typeParameters.params[0],
+    types,
+    aliasMap,
+    enumMap,
+    tryParse,
+    cxxOnly,
+    parser,
+  );
+
   return {
     name: eventemitterName,
     optional: false,
     typeAnnotation: {
       type: 'EventEmitterTypeAnnotation',
-      typeAnnotation: {type: eventTypeResolutionStatus.typeAnnotation.type},
+      typeAnnotation: eventTypeAnnotation,
     },
   };
 }
@@ -775,7 +794,6 @@ const buildModuleSchema = (
         parser,
       )
     : {};
-
   const properties: $ReadOnlyArray<$FlowFixMe> =
     language === 'Flow' ? moduleSpec.body.properties : moduleSpec.body.body;
 
@@ -798,8 +816,12 @@ const buildModuleSchema = (
     }>(property => {
       const enumMap: {...NativeModuleEnumMap} = {};
       const isEventEmitter =
-        property?.value?.type === 'GenericTypeAnnotation' &&
-        property?.value?.id?.name === 'EventEmitter';
+        language === 'TypeScript'
+          ? property?.type === 'TSPropertySignature' &&
+            property?.typeAnnotation?.typeAnnotation?.typeName?.name ===
+              'EventEmitter'
+          : property?.value?.type === 'GenericTypeAnnotation' &&
+            property?.value?.id?.name === 'EventEmitter';
       return tryParse(() => ({
         aliasMap,
         enumMap,

package/lib/parsers/typescript/modules/__test_fixtures__/fixtures.js

@@ -695,6 +695,37 @@ export interface Spec extends TurboModule {
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
+`;
+const NATIVE_MODULE_WITH_EVENT_EMITTERS = `
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+export type ObjectStruct = {
+  a: number;
+  b: string;
+  c?: string | null;
+};
+
+export interface Spec extends TurboModule {
+  readonly onEvent1: EventEmitter<void>;
+  readonly onEvent2: EventEmitter<string>;
+  readonly onEvent3: EventEmitter<number>;
+  readonly onEvent4: EventEmitter<boolean>;
+  readonly onEvent5: EventEmitter<ObjectStruct>;
+  readonly onEvent6: EventEmitter<ObjectStruct[]>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModuleCxx');
+
 `;
 const ANDROID_ONLY_NATIVE_MODULE = `
 /**
@@ -845,6 +876,7 @@ module.exports = {
   NATIVE_MODULE_WITH_BASIC_PARAM_TYPES,
   NATIVE_MODULE_WITH_CALLBACK,
   NATIVE_MODULE_WITH_UNION,
+  NATIVE_MODULE_WITH_EVENT_EMITTERS,
   EMPTY_NATIVE_MODULE,
   ANDROID_ONLY_NATIVE_MODULE,
   IOS_ONLY_NATIVE_MODULE,

package/lib/parsers/typescript/modules/__test_fixtures__/fixtures.js.flow

@@ -723,6 +723,38 @@ export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
 `;
 
+const NATIVE_MODULE_WITH_EVENT_EMITTERS = `
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+export type ObjectStruct = {
+  a: number;
+  b: string;
+  c?: string | null;
+};
+
+export interface Spec extends TurboModule {
+  readonly onEvent1: EventEmitter<void>;
+  readonly onEvent2: EventEmitter<string>;
+  readonly onEvent3: EventEmitter<number>;
+  readonly onEvent4: EventEmitter<boolean>;
+  readonly onEvent5: EventEmitter<ObjectStruct>;
+  readonly onEvent6: EventEmitter<ObjectStruct[]>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModuleCxx');
+
+`;
+
 const ANDROID_ONLY_NATIVE_MODULE = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -875,6 +907,7 @@ module.exports = {
   NATIVE_MODULE_WITH_BASIC_PARAM_TYPES,
   NATIVE_MODULE_WITH_CALLBACK,
   NATIVE_MODULE_WITH_UNION,
+  NATIVE_MODULE_WITH_EVENT_EMITTERS,
   EMPTY_NATIVE_MODULE,
   ANDROID_ONLY_NATIVE_MODULE,
   IOS_ONLY_NATIVE_MODULE,

package/lib/parsers/typescript/parser.js

@@ -334,6 +334,8 @@ class TypeScriptParser {
   }
   convertKeywordToTypeAnnotation(keyword) {
     switch (keyword) {
+      case 'TSArrayType':
+        return 'ArrayTypeAnnotation';
       case 'TSBooleanKeyword':
         return 'BooleanTypeAnnotation';
       case 'TSNumberKeyword':
@@ -342,6 +344,8 @@ class TypeScriptParser {
         return 'VoidTypeAnnotation';
       case 'TSStringKeyword':
         return 'StringTypeAnnotation';
+      case 'TSTypeLiteral':
+        return 'ObjectTypeAnnotation';
       case 'TSUnknownKeyword':
         return 'MixedTypeAnnotation';
     }

package/lib/parsers/typescript/parser.js.flow

@@ -337,6 +337,8 @@ class TypeScriptParser implements Parser {
 
   convertKeywordToTypeAnnotation(keyword: string): string {
     switch (keyword) {
+      case 'TSArrayType':
+        return 'ArrayTypeAnnotation';
       case 'TSBooleanKeyword':
         return 'BooleanTypeAnnotation';
       case 'TSNumberKeyword':
@@ -345,6 +347,8 @@ class TypeScriptParser implements Parser {
         return 'VoidTypeAnnotation';
       case 'TSStringKeyword':
         return 'StringTypeAnnotation';
+      case 'TSTypeLiteral':
+        return 'ObjectTypeAnnotation';
       case 'TSUnknownKeyword':
         return 'MixedTypeAnnotation';
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.75.0-rc.1",
+  "version": "0.76.0-nightly-20240627-TEMP",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {