@react-native/codegen 0.73.0-nightly-20230731-b0a8d45e2 → 0.73.0-nightly-20230807-2bf59c764

package/lib/parsers/errors.js

@@ -84,9 +84,7 @@ class UnsupportedTypeAnnotationParserError extends ParserError {
 class UnsupportedGenericParserError extends ParserError {
   // +genericName: string;
   constructor(nativeModuleName, genericTypeAnnotation, parser) {
-    const genericName = parser.nameForGenericTypeAnnotation(
-      genericTypeAnnotation,
-    );
+    const genericName = parser.getTypeAnnotationName(genericTypeAnnotation);
     super(
       nativeModuleName,
       genericTypeAnnotation,
@@ -99,9 +97,7 @@ class UnsupportedGenericParserError extends ParserError {
 
 class MissingTypeParameterGenericParserError extends ParserError {
   constructor(nativeModuleName, genericTypeAnnotation, parser) {
-    const genericName = parser.nameForGenericTypeAnnotation(
-      genericTypeAnnotation,
-    );
+    const genericName = parser.getTypeAnnotationName(genericTypeAnnotation);
     super(
       nativeModuleName,
       genericTypeAnnotation,
@@ -111,9 +107,7 @@ class MissingTypeParameterGenericParserError extends ParserError {
 }
 class MoreThanOneTypeParameterGenericParserError extends ParserError {
   constructor(nativeModuleName, genericTypeAnnotation, parser) {
-    const genericName = parser.nameForGenericTypeAnnotation(
-      genericTypeAnnotation,
-    );
+    const genericName = parser.getTypeAnnotationName(genericTypeAnnotation);
     super(
       nativeModuleName,
       genericTypeAnnotation,

package/lib/parsers/errors.js.flow

@@ -117,9 +117,7 @@ class UnsupportedGenericParserError extends ParserError {
     genericTypeAnnotation: $FlowFixMe,
     parser: Parser,
   ) {
-    const genericName = parser.nameForGenericTypeAnnotation(
-      genericTypeAnnotation,
-    );
+    const genericName = parser.getTypeAnnotationName(genericTypeAnnotation);
     super(
       nativeModuleName,
       genericTypeAnnotation,
@@ -136,9 +134,7 @@ class MissingTypeParameterGenericParserError extends ParserError {
     genericTypeAnnotation: $FlowFixMe,
     parser: Parser,
   ) {
-    const genericName = parser.nameForGenericTypeAnnotation(
-      genericTypeAnnotation,
-    );
+    const genericName = parser.getTypeAnnotationName(genericTypeAnnotation);
 
     super(
       nativeModuleName,
@@ -154,9 +150,7 @@ class MoreThanOneTypeParameterGenericParserError extends ParserError {
     genericTypeAnnotation: $FlowFixMe,
     parser: Parser,
   ) {
-    const genericName = parser.nameForGenericTypeAnnotation(
-      genericTypeAnnotation,
-    );
+    const genericName = parser.getTypeAnnotationName(genericTypeAnnotation);
 
     super(
       nativeModuleName,

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

@@ -30,7 +30,7 @@ function getTypeAnnotationForArray(
   }
   if (
     extractedTypeAnnotation.type === 'GenericTypeAnnotation' &&
-    extractedTypeAnnotation.id.name === 'WithDefault'
+    parser.getTypeAnnotationName(extractedTypeAnnotation) === 'WithDefault'
   ) {
     throw new Error(
       'Nested defaults such as "$ReadOnlyArray<WithDefault<boolean, false>>" are not supported, please declare defaults at the top level of value definitions as in "WithDefault<$ReadOnlyArray<boolean>, false>"',
@@ -75,7 +75,7 @@ function getTypeAnnotationForArray(
   }
   const type =
     extractedTypeAnnotation.type === 'GenericTypeAnnotation'
-      ? extractedTypeAnnotation.id.name
+      ? parser.getTypeAnnotationName(extractedTypeAnnotation)
       : extractedTypeAnnotation.type;
   switch (type) {
     case 'ImageSource':
@@ -160,7 +160,6 @@ function getTypeAnnotationForArray(
         );
       }
     default:
-      type;
       throw new Error(`Unknown property type for "${name}": ${type}`);
   }
 }
@@ -203,7 +202,7 @@ function getTypeAnnotation(
   const typeAnnotation = getValueFromTypes(annotation, types);
   if (
     typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === '$ReadOnlyArray'
+    parser.getTypeAnnotationName(typeAnnotation) === '$ReadOnlyArray'
   ) {
     return {
       type: 'ArrayTypeAnnotation',
@@ -219,7 +218,7 @@ function getTypeAnnotation(
   }
   if (
     typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === '$ReadOnly'
+    parser.getTypeAnnotationName(typeAnnotation) === '$ReadOnly'
   ) {
     return {
       type: 'ObjectTypeAnnotation',
@@ -234,7 +233,7 @@ function getTypeAnnotation(
   }
   const type =
     typeAnnotation.type === 'GenericTypeAnnotation'
-      ? typeAnnotation.id.name
+      ? parser.getTypeAnnotationName(typeAnnotation)
       : typeAnnotation.type;
   switch (type) {
     case 'ImageSource':
@@ -361,7 +360,6 @@ function getTypeAnnotation(
         type: 'MixedTypeAnnotation',
       };
     default:
-      type;
       throw new Error(
         `Unknown property type for "${name}": "${type}" in the State`,
       );

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

@@ -32,7 +32,7 @@ function getTypeAnnotationForArray<+T>(
 
   if (
     extractedTypeAnnotation.type === 'GenericTypeAnnotation' &&
-    extractedTypeAnnotation.id.name === 'WithDefault'
+    parser.getTypeAnnotationName(extractedTypeAnnotation) === 'WithDefault'
   ) {
     throw new Error(
       'Nested defaults such as "$ReadOnlyArray<WithDefault<boolean, false>>" are not supported, please declare defaults at the top level of value definitions as in "WithDefault<$ReadOnlyArray<boolean>, false>"',
@@ -82,7 +82,7 @@ function getTypeAnnotationForArray<+T>(
 
   const type =
     extractedTypeAnnotation.type === 'GenericTypeAnnotation'
-      ? extractedTypeAnnotation.id.name
+      ? parser.getTypeAnnotationName(extractedTypeAnnotation)
       : extractedTypeAnnotation.type;
 
   switch (type) {
@@ -170,7 +170,6 @@ function getTypeAnnotationForArray<+T>(
         );
       }
     default:
-      (type: empty);
       throw new Error(`Unknown property type for "${name}": ${type}`);
   }
 }
@@ -220,7 +219,7 @@ function getTypeAnnotation<+T>(
 
   if (
     typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === '$ReadOnlyArray'
+    parser.getTypeAnnotationName(typeAnnotation) === '$ReadOnlyArray'
   ) {
     return {
       type: 'ArrayTypeAnnotation',
@@ -237,7 +236,7 @@ function getTypeAnnotation<+T>(
 
   if (
     typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === '$ReadOnly'
+    parser.getTypeAnnotationName(typeAnnotation) === '$ReadOnly'
   ) {
     return {
       type: 'ObjectTypeAnnotation',
@@ -253,7 +252,7 @@ function getTypeAnnotation<+T>(
 
   const type =
     typeAnnotation.type === 'GenericTypeAnnotation'
-      ? typeAnnotation.id.name
+      ? parser.getTypeAnnotationName(typeAnnotation)
       : typeAnnotation.type;
 
   switch (type) {
@@ -379,7 +378,6 @@ function getTypeAnnotation<+T>(
         type: 'MixedTypeAnnotation',
       };
     default:
-      (type: empty);
       throw new Error(
         `Unknown property type for "${name}": "${type}" in the State`,
       );

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

@@ -16,7 +16,8 @@ const _require = require('../../error-utils'),
   throwIfArgumentPropsAreNull = _require.throwIfArgumentPropsAreNull;
 const _require2 = require('../../parsers-commons'),
   getEventArgument = _require2.getEventArgument,
-  buildPropertiesForEvent = _require2.buildPropertiesForEvent;
+  buildPropertiesForEvent = _require2.buildPropertiesForEvent,
+  handleEventHandler = _require2.handleEventHandler;
 const _require3 = require('../../parsers-primitives'),
   emitBoolProp = _require3.emitBoolProp,
   emitDoubleProp = _require3.emitDoubleProp,
@@ -24,7 +25,8 @@ const _require3 = require('../../parsers-primitives'),
   emitMixedProp = _require3.emitMixedProp,
   emitStringProp = _require3.emitStringProp,
   emitInt32Prop = _require3.emitInt32Prop,
-  emitObjectProp = _require3.emitObjectProp;
+  emitObjectProp = _require3.emitObjectProp,
+  emitUnionProp = _require3.emitUnionProp;
 function getPropertyType(
   /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
    * LTI update could not be added via codemod */
@@ -33,7 +35,7 @@ function getPropertyType(
   typeAnnotation,
   parser,
 ) {
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type = extractTypeFromTypeAnnotation(typeAnnotation, parser);
   switch (type) {
     case 'BooleanTypeAnnotation':
       return emitBoolProp(name, optional);
@@ -61,16 +63,7 @@ function getPropertyType(
         extractArrayElementType,
       );
     case 'UnionTypeAnnotation':
-      return {
-        name,
-        optional,
-        typeAnnotation: {
-          type: 'StringEnumTypeAnnotation',
-          options: typeAnnotation.types.map(option =>
-            parser.getLiteralValue(option),
-          ),
-        },
-      };
+      return emitUnionProp(name, optional, parser, typeAnnotation);
     case 'UnsafeMixed':
       return emitMixedProp(name, optional);
     case 'ArrayTypeAnnotation':
@@ -85,7 +78,7 @@ function getPropertyType(
   }
 }
 function extractArrayElementType(typeAnnotation, name, parser) {
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type = extractTypeFromTypeAnnotation(typeAnnotation, parser);
   switch (type) {
     case 'BooleanTypeAnnotation':
       return {
@@ -161,6 +154,11 @@ function extractArrayElementType(typeAnnotation, name, parser) {
 function prettify(jsonObject) {
   return JSON.stringify(jsonObject, null, 2);
 }
+function extractTypeFromTypeAnnotation(typeAnnotation, parser) {
+  return typeAnnotation.type === 'GenericTypeAnnotation'
+    ? parser.getTypeAnnotationName(typeAnnotation)
+    : typeAnnotation.type;
+}
 function findEventArgumentsAndType(
   parser,
   typeAnnotation,
@@ -169,7 +167,7 @@ function findEventArgumentsAndType(
   paperName,
 ) {
   throwIfEventHasNoName(typeAnnotation, parser);
-  const name = typeAnnotation.id.name;
+  const name = parser.getTypeAnnotationName(typeAnnotation);
   if (name === '$ReadOnly') {
     return {
       argumentProps: typeAnnotation.typeParameters.params[0].properties,
@@ -177,25 +175,12 @@ function findEventArgumentsAndType(
       bubblingType,
     };
   } else if (name === 'BubblingEventHandler' || name === 'DirectEventHandler') {
-    const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
-    const paperTopLevelNameDeprecated =
-      parser.getPaperTopLevelNameDeprecated(typeAnnotation);
-    if (
-      typeAnnotation.typeParameters.params[0].type ===
-      parser.nullLiteralTypeAnnotation
-    ) {
-      return {
-        argumentProps: [],
-        bubblingType: eventType,
-        paperTopLevelNameDeprecated,
-      };
-    }
-    return findEventArgumentsAndType(
+    return handleEventHandler(
+      name,
+      typeAnnotation,
       parser,
-      typeAnnotation.typeParameters.params[0],
       types,
-      eventType,
-      paperTopLevelNameDeprecated,
+      findEventArgumentsAndType,
     );
   } else if (types[name]) {
     return findEventArgumentsAndType(
@@ -223,8 +208,8 @@ function buildEventSchema(types, property, parser) {
       : property.value;
   if (
     typeAnnotation.type !== 'GenericTypeAnnotation' ||
-    (typeAnnotation.id.name !== 'BubblingEventHandler' &&
-      typeAnnotation.id.name !== 'DirectEventHandler')
+    (parser.getTypeAnnotationName(typeAnnotation) !== 'BubblingEventHandler' &&
+      parser.getTypeAnnotationName(typeAnnotation) !== 'DirectEventHandler')
   ) {
     return null;
   }

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

@@ -16,6 +16,7 @@ import type {
   EventTypeAnnotation,
 } from '../../../CodegenSchema.js';
 import type {Parser} from '../../parser';
+import type {EventArgumentReturnType} from '../../parsers-commons';
 
 const {
   throwIfEventHasNoName,
@@ -25,6 +26,7 @@ const {
 const {
   getEventArgument,
   buildPropertiesForEvent,
+  handleEventHandler,
 } = require('../../parsers-commons');
 const {
   emitBoolProp,
@@ -34,6 +36,7 @@ const {
   emitStringProp,
   emitInt32Prop,
   emitObjectProp,
+  emitUnionProp,
 } = require('../../parsers-primitives');
 
 function getPropertyType(
@@ -44,7 +47,7 @@ function getPropertyType(
   typeAnnotation: $FlowFixMe,
   parser: Parser,
 ): NamedShape<EventTypeAnnotation> {
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type = extractTypeFromTypeAnnotation(typeAnnotation, parser);
 
   switch (type) {
     case 'BooleanTypeAnnotation':
@@ -73,16 +76,7 @@ function getPropertyType(
         extractArrayElementType,
       );
     case 'UnionTypeAnnotation':
-      return {
-        name,
-        optional,
-        typeAnnotation: {
-          type: 'StringEnumTypeAnnotation',
-          options: typeAnnotation.types.map(option =>
-            parser.getLiteralValue(option),
-          ),
-        },
-      };
+      return emitUnionProp(name, optional, parser, typeAnnotation);
     case 'UnsafeMixed':
       return emitMixedProp(name, optional);
     case 'ArrayTypeAnnotation':
@@ -102,7 +96,7 @@ function extractArrayElementType(
   name: string,
   parser: Parser,
 ): EventTypeAnnotation {
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type = extractTypeFromTypeAnnotation(typeAnnotation, parser);
 
   switch (type) {
     case 'BooleanTypeAnnotation':
@@ -171,19 +165,24 @@ function prettify(jsonObject: $FlowFixMe): string {
   return JSON.stringify(jsonObject, null, 2);
 }
 
+function extractTypeFromTypeAnnotation(
+  typeAnnotation: $FlowFixMe,
+  parser: Parser,
+): string {
+  return typeAnnotation.type === 'GenericTypeAnnotation'
+    ? parser.getTypeAnnotationName(typeAnnotation)
+    : typeAnnotation.type;
+}
+
 function findEventArgumentsAndType(
   parser: Parser,
   typeAnnotation: $FlowFixMe,
   types: TypeMap,
   bubblingType: void | 'direct' | 'bubble',
   paperName: ?$FlowFixMe,
-): {
-  argumentProps: $FlowFixMe,
-  bubblingType: ?('direct' | 'bubble'),
-  paperTopLevelNameDeprecated: ?$FlowFixMe,
-} {
+): EventArgumentReturnType {
   throwIfEventHasNoName(typeAnnotation, parser);
-  const name = typeAnnotation.id.name;
+  const name = parser.getTypeAnnotationName(typeAnnotation);
   if (name === '$ReadOnly') {
     return {
       argumentProps: typeAnnotation.typeParameters.params[0].properties,
@@ -191,25 +190,12 @@ function findEventArgumentsAndType(
       bubblingType,
     };
   } else if (name === 'BubblingEventHandler' || name === 'DirectEventHandler') {
-    const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
-    const paperTopLevelNameDeprecated =
-      parser.getPaperTopLevelNameDeprecated(typeAnnotation);
-    if (
-      typeAnnotation.typeParameters.params[0].type ===
-      parser.nullLiteralTypeAnnotation
-    ) {
-      return {
-        argumentProps: [],
-        bubblingType: eventType,
-        paperTopLevelNameDeprecated,
-      };
-    }
-    return findEventArgumentsAndType(
+    return handleEventHandler(
+      name,
+      typeAnnotation,
       parser,
-      typeAnnotation.typeParameters.params[0],
       types,
-      eventType,
-      paperTopLevelNameDeprecated,
+      findEventArgumentsAndType,
     );
   } else if (types[name]) {
     return findEventArgumentsAndType(
@@ -244,8 +230,8 @@ function buildEventSchema(
 
   if (
     typeAnnotation.type !== 'GenericTypeAnnotation' ||
-    (typeAnnotation.id.name !== 'BubblingEventHandler' &&
-      typeAnnotation.id.name !== 'DirectEventHandler')
+    (parser.getTypeAnnotationName(typeAnnotation) !== 'BubblingEventHandler' &&
+      parser.getTypeAnnotationName(typeAnnotation) !== 'DirectEventHandler')
   ) {
     return null;
   }

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

@@ -122,7 +122,7 @@ function translateTypeAnnotation(
     typeResolutionStatus = _resolveTypeAnnotatio.typeResolutionStatus;
   switch (typeAnnotation.type) {
     case 'GenericTypeAnnotation': {
-      switch (typeAnnotation.id.name) {
+      switch (parser.getTypeAnnotationName(typeAnnotation)) {
         case 'RootTag': {
           return emitRootTag(nullable);
         }

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

@@ -64,7 +64,7 @@ function translateTypeAnnotation(
 
   switch (typeAnnotation.type) {
     case 'GenericTypeAnnotation': {
-      switch (typeAnnotation.id.name) {
+      switch (parser.getTypeAnnotationName(typeAnnotation)) {
         case 'RootTag': {
           return emitRootTag(nullable);
         }

package/lib/parsers/flow/parser.js

@@ -101,7 +101,7 @@ class FlowParser {
   language() {
     return 'Flow';
   }
-  nameForGenericTypeAnnotation(typeAnnotation) {
+  getTypeAnnotationName(typeAnnotation) {
     var _typeAnnotation$id;
     return typeAnnotation === null || typeAnnotation === void 0
       ? void 0
@@ -372,7 +372,7 @@ class FlowParser {
       if (node.type !== 'GenericTypeAnnotation') {
         break;
       }
-      const typeAnnotationName = this.nameForGenericTypeAnnotation(node);
+      const typeAnnotationName = this.getTypeAnnotationName(node);
       const resolvedTypeAnnotation = types[typeAnnotationName];
       if (resolvedTypeAnnotation == null) {
         break;

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

@@ -99,7 +99,7 @@ class FlowParser implements Parser {
     return 'Flow';
   }
 
-  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string {
+  getTypeAnnotationName(typeAnnotation: $FlowFixMe): string {
     return typeAnnotation?.id?.name;
   }
 
@@ -421,7 +421,7 @@ class FlowParser implements Parser {
         break;
       }
 
-      const typeAnnotationName = this.nameForGenericTypeAnnotation(node);
+      const typeAnnotationName = this.getTypeAnnotationName(node);
       const resolvedTypeAnnotation = types[typeAnnotationName];
       if (resolvedTypeAnnotation == null) {
         break;

package/lib/parsers/parser.js.flow

@@ -127,11 +127,11 @@ export interface Parser {
    */
   language(): ParserType;
   /**
-   * Given a type annotation for a generic type, it returns the type name.
+   * Given a type annotation, it returns the type name.
    * @parameter typeAnnotation: the annotation for a type in the AST.
    * @returns: the name of the type.
    */
-  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string;
+  getTypeAnnotationName(typeAnnotation: $FlowFixMe): string;
   /**
    * Given a type arguments, it returns a boolean specifying if the Module is Invalid.
    * @parameter typeArguments: the type arguments.

package/lib/parsers/parserMock.js

@@ -102,8 +102,14 @@ export class MockedParser {
   language() {
     return 'Flow';
   }
-  nameForGenericTypeAnnotation(typeAnnotation) {
-    return typeAnnotation.id.name;
+  getTypeAnnotationName(typeAnnotation) {
+    var _typeAnnotation$id;
+    return typeAnnotation === null || typeAnnotation === void 0
+      ? void 0
+      : (_typeAnnotation$id = typeAnnotation.id) === null ||
+        _typeAnnotation$id === void 0
+      ? void 0
+      : _typeAnnotation$id.name;
   }
   checkIfInvalidModule(typeArguments) {
     return false;

package/lib/parsers/parserMock.js.flow

@@ -96,8 +96,8 @@ export class MockedParser implements Parser {
     return 'Flow';
   }
 
-  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string {
-    return typeAnnotation.id.name;
+  getTypeAnnotationName(typeAnnotation: $FlowFixMe): string {
+    return typeAnnotation?.id?.name;
   }
 
   checkIfInvalidModule(typeArguments: $FlowFixMe): boolean {

package/lib/parsers/parsers-commons.js

@@ -811,7 +811,7 @@ function getCommandTypeNameAndOptionsExpression(namedExport, parser) {
     );
   }
   return {
-    commandTypeName: parser.nameForGenericTypeAnnotation(typeArgumentParam),
+    commandTypeName: parser.getTypeAnnotationName(typeArgumentParam),
     commandOptionsExpression: callExpression.arguments[0],
   };
 }
@@ -944,7 +944,7 @@ function getTypeResolutionStatus(type, typeAnnotation, parser) {
   return {
     successful: true,
     type,
-    name: parser.nameForGenericTypeAnnotation(typeAnnotation),
+    name: parser.getTypeAnnotationName(typeAnnotation),
   };
 }
 function handleGenericTypeAnnotation(
@@ -1007,6 +1007,34 @@ function verifyPropNotAlreadyDefined(props, needleProp) {
     throw new Error(`A prop was already defined with the name ${propName}`);
   }
 }
+function handleEventHandler(
+  name,
+  typeAnnotation,
+  parser,
+  types,
+  findEventArgumentsAndType,
+) {
+  const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
+  const paperTopLevelNameDeprecated =
+    parser.getPaperTopLevelNameDeprecated(typeAnnotation);
+  switch (typeAnnotation.typeParameters.params[0].type) {
+    case parser.nullLiteralTypeAnnotation:
+    case parser.undefinedLiteralTypeAnnotation:
+      return {
+        argumentProps: [],
+        bubblingType: eventType,
+        paperTopLevelNameDeprecated,
+      };
+    default:
+      return findEventArgumentsAndType(
+        parser,
+        typeAnnotation.typeParameters.params[0],
+        types,
+        eventType,
+        paperTopLevelNameDeprecated,
+      );
+  }
+}
 module.exports = {
   wrapModuleSchema,
   unwrapNullable,
@@ -1035,4 +1063,5 @@ module.exports = {
   getTypeResolutionStatus,
   buildPropertiesForEvent,
   verifyPropNotAlreadyDefined,
+  handleEventHandler,
 };

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

@@ -87,6 +87,12 @@ type ExtendedPropResult = {
   knownTypeName: 'ReactNativeCoreViewProps',
 } | null;
 
+export type EventArgumentReturnType = {
+  argumentProps: ?$ReadOnlyArray<$FlowFixMe>,
+  paperTopLevelNameDeprecated: ?$FlowFixMe,
+  bubblingType: ?'direct' | 'bubble',
+};
+
 function wrapModuleSchema(
   nativeModuleSchema: NativeModuleSchema,
   hasteModuleName: string,
@@ -818,7 +824,7 @@ function getCommandTypeNameAndOptionsExpression(
   }
 
   return {
-    commandTypeName: parser.nameForGenericTypeAnnotation(typeArgumentParam),
+    commandTypeName: parser.getTypeAnnotationName(typeArgumentParam),
     commandOptionsExpression: callExpression.arguments[0],
   };
 }
@@ -998,7 +1004,7 @@ function getTypeResolutionStatus(
   return {
     successful: true,
     type,
-    name: parser.nameForGenericTypeAnnotation(typeAnnotation),
+    name: parser.getTypeAnnotationName(typeAnnotation),
   };
 }
 
@@ -1083,6 +1089,42 @@ function verifyPropNotAlreadyDefined(
   }
 }
 
+function handleEventHandler(
+  name: 'BubblingEventHandler' | 'DirectEventHandler',
+  typeAnnotation: $FlowFixMe,
+  parser: Parser,
+  types: TypeDeclarationMap,
+  findEventArgumentsAndType: (
+    parser: Parser,
+    typeAnnotation: $FlowFixMe,
+    types: TypeDeclarationMap,
+    bubblingType: void | 'direct' | 'bubble',
+    paperName: ?$FlowFixMe,
+  ) => EventArgumentReturnType,
+): EventArgumentReturnType {
+  const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
+  const paperTopLevelNameDeprecated =
+    parser.getPaperTopLevelNameDeprecated(typeAnnotation);
+
+  switch (typeAnnotation.typeParameters.params[0].type) {
+    case parser.nullLiteralTypeAnnotation:
+    case parser.undefinedLiteralTypeAnnotation:
+      return {
+        argumentProps: [],
+        bubblingType: eventType,
+        paperTopLevelNameDeprecated,
+      };
+    default:
+      return findEventArgumentsAndType(
+        parser,
+        typeAnnotation.typeParameters.params[0],
+        types,
+        eventType,
+        paperTopLevelNameDeprecated,
+      );
+  }
+}
+
 module.exports = {
   wrapModuleSchema,
   unwrapNullable,
@@ -1111,4 +1153,5 @@ module.exports = {
   getTypeResolutionStatus,
   buildPropertiesForEvent,
   verifyPropNotAlreadyDefined,
+  handleEventHandler,
 };

package/lib/parsers/parsers-primitives.js

@@ -567,7 +567,7 @@ function emitCommonTypes(
     return simpleEmitter(nullable);
   }
   const genericTypeAnnotationName =
-    parser.nameForGenericTypeAnnotation(typeAnnotation);
+    parser.getTypeAnnotationName(typeAnnotation);
   const emitter = typeMap[genericTypeAnnotationName];
   if (!emitter) {
     return null;
@@ -615,6 +615,18 @@ function emitObjectProp(
     typeAnnotation: extractArrayElementType(typeAnnotation, name, parser),
   };
 }
+function emitUnionProp(name, optional, parser, typeAnnotation) {
+  return {
+    name,
+    optional,
+    typeAnnotation: {
+      type: 'StringEnumTypeAnnotation',
+      options: typeAnnotation.types.map(option =>
+        parser.getLiteralValue(option),
+      ),
+    },
+  };
+}
 module.exports = {
   emitArrayType,
   emitBoolean,
@@ -646,4 +658,5 @@ module.exports = {
   translateArrayTypeAnnotation,
   Visitor,
   emitObjectProp,
+  emitUnionProp,
 };

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

@@ -611,7 +611,7 @@ function emitCommonTypes(
   }
 
   const genericTypeAnnotationName =
-    parser.nameForGenericTypeAnnotation(typeAnnotation);
+    parser.getTypeAnnotationName(typeAnnotation);
 
   const emitter = typeMap[genericTypeAnnotationName];
   if (!emitter) {
@@ -675,6 +675,24 @@ function emitObjectProp(
   };
 }
 
+function emitUnionProp(
+  name: string,
+  optional: boolean,
+  parser: Parser,
+  typeAnnotation: $FlowFixMe,
+): NamedShape<EventTypeAnnotation> {
+  return {
+    name,
+    optional,
+    typeAnnotation: {
+      type: 'StringEnumTypeAnnotation',
+      options: typeAnnotation.types.map(option =>
+        parser.getLiteralValue(option),
+      ),
+    },
+  };
+}
+
 module.exports = {
   emitArrayType,
   emitBoolean,
@@ -706,4 +724,5 @@ module.exports = {
   translateArrayTypeAnnotation,
   Visitor,
   emitObjectProp,
+  emitUnionProp,
 };

package/lib/parsers/typescript/components/componentsUtils.js

@@ -120,8 +120,8 @@ function detectArrayType(
   // Covers: Array<T> and ReadonlyArray<T>
   if (
     typeAnnotation.type === 'TSTypeReference' &&
-    (typeAnnotation.typeName.name === 'ReadonlyArray' ||
-      typeAnnotation.typeName.name === 'Array')
+    (parser.getTypeAnnotationName(typeAnnotation) === 'ReadonlyArray' ||
+      parser.getTypeAnnotationName(typeAnnotation) === 'Array')
   ) {
     return {
       type: 'ArrayTypeAnnotation',
@@ -360,7 +360,7 @@ function getTypeAnnotation(
   const type =
     typeAnnotation.type === 'TSTypeReference' ||
     typeAnnotation.type === 'TSTypeAliasDeclaration'
-      ? typeAnnotation.typeName.name
+      ? parser.getTypeAnnotationName(typeAnnotation)
       : typeAnnotation.type;
   const common = getCommonTypeAnnotation(
     name,
@@ -394,7 +394,6 @@ function getTypeAnnotation(
         `Cannot use "${type}" type annotation for "${name}": must use a specific function type like BubblingEventHandler, or DirectEventHandler`,
       );
     default:
-      type;
       throw new Error(`Unknown prop type for "${name}": "${type}"`);
   }
 }

package/lib/parsers/typescript/components/componentsUtils.js.flow

@@ -121,8 +121,8 @@ function detectArrayType<T>(
   // Covers: Array<T> and ReadonlyArray<T>
   if (
     typeAnnotation.type === 'TSTypeReference' &&
-    (typeAnnotation.typeName.name === 'ReadonlyArray' ||
-      typeAnnotation.typeName.name === 'Array')
+    (parser.getTypeAnnotationName(typeAnnotation) === 'ReadonlyArray' ||
+      parser.getTypeAnnotationName(typeAnnotation) === 'Array')
   ) {
     return {
       type: 'ArrayTypeAnnotation',
@@ -378,7 +378,7 @@ function getTypeAnnotation<T>(
   const type =
     typeAnnotation.type === 'TSTypeReference' ||
     typeAnnotation.type === 'TSTypeAliasDeclaration'
-      ? typeAnnotation.typeName.name
+      ? parser.getTypeAnnotationName(typeAnnotation)
       : typeAnnotation.type;
 
   const common = getCommonTypeAnnotation(
@@ -414,7 +414,6 @@ function getTypeAnnotation<T>(
         `Cannot use "${type}" type annotation for "${name}": must use a specific function type like BubblingEventHandler, or DirectEventHandler`,
       );
     default:
-      (type: empty);
       throw new Error(`Unknown prop type for "${name}": "${type}"`);
   }
 }

package/lib/parsers/typescript/components/events.js

@@ -20,7 +20,8 @@ const _require3 = require('../../error-utils'),
   throwIfArgumentPropsAreNull = _require3.throwIfArgumentPropsAreNull;
 const _require4 = require('../../parsers-commons'),
   getEventArgument = _require4.getEventArgument,
-  buildPropertiesForEvent = _require4.buildPropertiesForEvent;
+  buildPropertiesForEvent = _require4.buildPropertiesForEvent,
+  handleEventHandler = _require4.handleEventHandler;
 const _require5 = require('../../parsers-primitives'),
   emitBoolProp = _require5.emitBoolProp,
   emitDoubleProp = _require5.emitDoubleProp,
@@ -28,7 +29,8 @@ const _require5 = require('../../parsers-primitives'),
   emitMixedProp = _require5.emitMixedProp,
   emitStringProp = _require5.emitStringProp,
   emitInt32Prop = _require5.emitInt32Prop,
-  emitObjectProp = _require5.emitObjectProp;
+  emitObjectProp = _require5.emitObjectProp,
+  emitUnionProp = _require5.emitUnionProp;
 function getPropertyType(
   /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
    * LTI update could not be added via codemod */
@@ -42,7 +44,10 @@ function getPropertyType(
   const topLevelType = parseTopLevelType(annotation);
   const typeAnnotation = topLevelType.type;
   const optional = optionalProperty || topLevelType.optional;
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type =
+    typeAnnotation.type === 'TSTypeReference'
+      ? parser.getTypeAnnotationName(typeAnnotation)
+      : typeAnnotation.type;
   switch (type) {
     case 'TSBooleanKeyword':
       return emitBoolProp(name, optional);
@@ -63,16 +68,7 @@ function getPropertyType(
         extractArrayElementType,
       );
     case 'TSUnionType':
-      return {
-        name,
-        optional,
-        typeAnnotation: {
-          type: 'StringEnumTypeAnnotation',
-          options: typeAnnotation.types.map(option =>
-            parser.getLiteralValue(option),
-          ),
-        },
-      };
+      return emitUnionProp(name, optional, parser, typeAnnotation);
     case 'UnsafeMixed':
       return emitMixedProp(name, optional);
     case 'TSArrayType':
@@ -86,7 +82,7 @@ function getPropertyType(
   }
 }
 function extractArrayElementType(typeAnnotation, name, parser) {
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type = extractTypeFromTypeAnnotation(typeAnnotation, parser);
   switch (type) {
     case 'TSParenthesizedType':
       return extractArrayElementType(
@@ -150,6 +146,11 @@ function extractArrayElementType(typeAnnotation, name, parser) {
       );
   }
 }
+function extractTypeFromTypeAnnotation(typeAnnotation, parser) {
+  return typeAnnotation.type === 'TSTypeReference'
+    ? parser.getTypeAnnotationName(typeAnnotation)
+    : typeAnnotation.type;
+}
 function findEventArgumentsAndType(
   parser,
   typeAnnotation,
@@ -172,7 +173,7 @@ function findEventArgumentsAndType(
     };
   }
   throwIfEventHasNoName(typeAnnotation, parser);
-  const name = typeAnnotation.typeName.name;
+  const name = parser.getTypeAnnotationName(typeAnnotation);
   if (name === 'Readonly') {
     return findEventArgumentsAndType(
       parser,
@@ -182,26 +183,13 @@ function findEventArgumentsAndType(
       paperName,
     );
   } else if (name === 'BubblingEventHandler' || name === 'DirectEventHandler') {
-    const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
-    const paperTopLevelNameDeprecated =
-      parser.getPaperTopLevelNameDeprecated(typeAnnotation);
-    switch (typeAnnotation.typeParameters.params[0].type) {
-      case parser.nullLiteralTypeAnnotation:
-      case parser.undefinedLiteralTypeAnnotation:
-        return {
-          argumentProps: [],
-          bubblingType: eventType,
-          paperTopLevelNameDeprecated,
-        };
-      default:
-        return findEventArgumentsAndType(
-          parser,
-          typeAnnotation.typeParameters.params[0],
-          types,
-          eventType,
-          paperTopLevelNameDeprecated,
-        );
-    }
+    return handleEventHandler(
+      name,
+      typeAnnotation,
+      parser,
+      types,
+      findEventArgumentsAndType,
+    );
   } else if (types[name]) {
     let elementType = types[name];
     if (elementType.type === 'TSTypeAliasDeclaration') {

package/lib/parsers/typescript/components/events.js.flow

@@ -27,6 +27,7 @@ const {
 const {
   getEventArgument,
   buildPropertiesForEvent,
+  handleEventHandler,
 } = require('../../parsers-commons');
 const {
   emitBoolProp,
@@ -36,6 +37,7 @@ const {
   emitStringProp,
   emitInt32Prop,
   emitObjectProp,
+  emitUnionProp,
 } = require('../../parsers-primitives');
 function getPropertyType(
   /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
@@ -50,7 +52,10 @@ function getPropertyType(
   const topLevelType = parseTopLevelType(annotation);
   const typeAnnotation = topLevelType.type;
   const optional = optionalProperty || topLevelType.optional;
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type =
+    typeAnnotation.type === 'TSTypeReference'
+      ? parser.getTypeAnnotationName(typeAnnotation)
+      : typeAnnotation.type;
 
   switch (type) {
     case 'TSBooleanKeyword':
@@ -72,16 +77,7 @@ function getPropertyType(
         extractArrayElementType,
       );
     case 'TSUnionType':
-      return {
-        name,
-        optional,
-        typeAnnotation: {
-          type: 'StringEnumTypeAnnotation',
-          options: typeAnnotation.types.map(option =>
-            parser.getLiteralValue(option),
-          ),
-        },
-      };
+      return emitUnionProp(name, optional, parser, typeAnnotation);
     case 'UnsafeMixed':
       return emitMixedProp(name, optional);
     case 'TSArrayType':
@@ -100,7 +96,7 @@ function extractArrayElementType(
   name: string,
   parser: Parser,
 ): EventTypeAnnotation {
-  const type = parser.extractTypeFromTypeAnnotation(typeAnnotation);
+  const type = extractTypeFromTypeAnnotation(typeAnnotation, parser);
 
   switch (type) {
     case 'TSParenthesizedType':
@@ -162,6 +158,15 @@ function extractArrayElementType(
   }
 }
 
+function extractTypeFromTypeAnnotation(
+  typeAnnotation: $FlowFixMe,
+  parser: Parser,
+): string {
+  return typeAnnotation.type === 'TSTypeReference'
+    ? parser.getTypeAnnotationName(typeAnnotation)
+    : typeAnnotation.type;
+}
+
 function findEventArgumentsAndType(
   parser: Parser,
   typeAnnotation: $FlowFixMe,
@@ -190,7 +195,7 @@ function findEventArgumentsAndType(
   }
 
   throwIfEventHasNoName(typeAnnotation, parser);
-  const name = typeAnnotation.typeName.name;
+  const name = parser.getTypeAnnotationName(typeAnnotation);
   if (name === 'Readonly') {
     return findEventArgumentsAndType(
       parser,
@@ -200,27 +205,13 @@ function findEventArgumentsAndType(
       paperName,
     );
   } else if (name === 'BubblingEventHandler' || name === 'DirectEventHandler') {
-    const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
-    const paperTopLevelNameDeprecated =
-      parser.getPaperTopLevelNameDeprecated(typeAnnotation);
-
-    switch (typeAnnotation.typeParameters.params[0].type) {
-      case parser.nullLiteralTypeAnnotation:
-      case parser.undefinedLiteralTypeAnnotation:
-        return {
-          argumentProps: [],
-          bubblingType: eventType,
-          paperTopLevelNameDeprecated,
-        };
-      default:
-        return findEventArgumentsAndType(
-          parser,
-          typeAnnotation.typeParameters.params[0],
-          types,
-          eventType,
-          paperTopLevelNameDeprecated,
-        );
-    }
+    return handleEventHandler(
+      name,
+      typeAnnotation,
+      parser,
+      types,
+      findEventArgumentsAndType,
+    );
   } else if (types[name]) {
     let elementType = types[name];
     if (elementType.type === 'TSTypeAliasDeclaration') {

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

@@ -218,7 +218,7 @@ function translateTypeAnnotation(
     }
     case 'TSTypeReference': {
       return translateTypeReferenceAnnotation(
-        typeAnnotation.typeName.name,
+        parser.getTypeAnnotationName(typeAnnotation),
         nullable,
         typeAnnotation,
         hasteModuleName,

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

@@ -234,7 +234,7 @@ function translateTypeAnnotation(
     }
     case 'TSTypeReference': {
       return translateTypeReferenceAnnotation(
-        typeAnnotation.typeName.name,
+        parser.getTypeAnnotationName(typeAnnotation),
         nullable,
         typeAnnotation,
         hasteModuleName,

package/lib/parsers/typescript/parser.js

@@ -101,7 +101,7 @@ class TypeScriptParser {
   language() {
     return 'TypeScript';
   }
-  nameForGenericTypeAnnotation(typeAnnotation) {
+  getTypeAnnotationName(typeAnnotation) {
     var _typeAnnotation$typeN;
     return typeAnnotation === null || typeAnnotation === void 0
       ? void 0
@@ -391,7 +391,7 @@ class TypeScriptParser {
       if (node.type !== 'TSTypeReference') {
         break;
       }
-      const typeAnnotationName = this.nameForGenericTypeAnnotation(node);
+      const typeAnnotationName = this.getTypeAnnotationName(node);
       const resolvedTypeAnnotation = types[typeAnnotationName];
       if (resolvedTypeAnnotation == null) {
         break;
@@ -422,7 +422,7 @@ class TypeScriptParser {
       return false;
     }
     const eventNames = new Set(['BubblingEventHandler', 'DirectEventHandler']);
-    return eventNames.has(typeAnnotation.typeName.name);
+    return eventNames.has(this.getTypeAnnotationName(typeAnnotation));
   }
   isProp(name, typeAnnotation) {
     if (typeAnnotation.type !== 'TSTypeReference') {
@@ -431,7 +431,7 @@ class TypeScriptParser {
     const isStyle =
       name === 'style' &&
       typeAnnotation.type === 'GenericTypeAnnotation' &&
-      typeAnnotation.typeName.name === 'ViewStyleProp';
+      this.getTypeAnnotationName(typeAnnotation) === 'ViewStyleProp';
     return !isStyle;
   }
   getProps(typeDefinition, types) {

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

@@ -94,7 +94,7 @@ class TypeScriptParser implements Parser {
     return 'TypeScript';
   }
 
-  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string {
+  getTypeAnnotationName(typeAnnotation: $FlowFixMe): string {
     return typeAnnotation?.typeName?.name;
   }
 
@@ -413,7 +413,7 @@ class TypeScriptParser implements Parser {
         break;
       }
 
-      const typeAnnotationName = this.nameForGenericTypeAnnotation(node);
+      const typeAnnotationName = this.getTypeAnnotationName(node);
       const resolvedTypeAnnotation = types[typeAnnotationName];
       if (resolvedTypeAnnotation == null) {
         break;
@@ -447,7 +447,7 @@ class TypeScriptParser implements Parser {
       return false;
     }
     const eventNames = new Set(['BubblingEventHandler', 'DirectEventHandler']);
-    return eventNames.has(typeAnnotation.typeName.name);
+    return eventNames.has(this.getTypeAnnotationName(typeAnnotation));
   }
 
   isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
@@ -457,7 +457,7 @@ class TypeScriptParser implements Parser {
     const isStyle =
       name === 'style' &&
       typeAnnotation.type === 'GenericTypeAnnotation' &&
-      typeAnnotation.typeName.name === 'ViewStyleProp';
+      this.getTypeAnnotationName(typeAnnotation) === 'ViewStyleProp';
     return !isStyle;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.73.0-nightly-20230731-b0a8d45e2",
+  "version": "0.73.0-nightly-20230807-2bf59c764",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {