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

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,
@@ -174,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(

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,
@@ -178,11 +180,7 @@ function findEventArgumentsAndType(
   types: TypeMap,
   bubblingType: void | 'direct' | 'bubble',
   paperName: ?$FlowFixMe,
-): {
-  argumentProps: $FlowFixMe,
-  bubblingType: ?('direct' | 'bubble'),
-  paperTopLevelNameDeprecated: ?$FlowFixMe,
-} {
+): EventArgumentReturnType {
   throwIfEventHasNoName(typeAnnotation, parser);
   const name = parser.getTypeAnnotationName(typeAnnotation);
   if (name === '$ReadOnly') {
@@ -192,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(

package/lib/parsers/parsers-commons.js

@@ -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,
@@ -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/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,
@@ -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,
@@ -204,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/package.json

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