@react-native/codegen 0.84.0-nightly-20251204-5bb3a6d68 → 0.84.0-nightly-20251206-63b0aef13

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

@@ -115,7 +115,7 @@ function extractArrayElementType(
       };
     case 'UnionTypeAnnotation':
       return {
-        type: 'StringLiteralUnionTypeAnnotation',
+        type: 'UnionTypeAnnotation',
         types: typeAnnotation.types.map(option => ({
           type: 'StringLiteralTypeAnnotation',
           value: parser.getLiteralValue(option),

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

@@ -220,7 +220,18 @@ function translateTypeAnnotation(
       );
     }
     case 'UnionTypeAnnotation': {
-      return emitUnion(nullable, hasteModuleName, typeAnnotation, parser);
+      return emitUnion(
+        nullable,
+        hasteModuleName,
+        typeAnnotation,
+        types,
+        aliasMap,
+        enumMap,
+        tryParse,
+        cxxOnly,
+        translateTypeAnnotation,
+        parser,
+      );
     }
     case 'NumberLiteralTypeAnnotation': {
       return emitNumberLiteral(nullable, typeAnnotation.value);

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

@@ -245,7 +245,18 @@ function translateTypeAnnotation(
       );
     }
     case 'UnionTypeAnnotation': {
-      return emitUnion(nullable, hasteModuleName, typeAnnotation, parser);
+      return emitUnion(
+        nullable,
+        hasteModuleName,
+        typeAnnotation,
+        types,
+        aliasMap,
+        enumMap,
+        tryParse,
+        cxxOnly,
+        translateTypeAnnotation,
+        parser,
+      );
     }
     case 'NumberLiteralTypeAnnotation': {
       return emitNumberLiteral(nullable, typeAnnotation.value);

package/lib/parsers/flow/parser.js

@@ -131,9 +131,6 @@ class FlowParser {
     };
     return [...new Set(membersTypes.map(remapLiteral))];
   }
-  getStringLiteralUnionTypeAnnotationStringLiterals(membersTypes) {
-    return membersTypes.map(item => item.value);
-  }
   parseFile(filename) {
     const contents = fs.readFileSync(filename, 'utf8');
     return this.parseString(contents, filename);

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

@@ -18,10 +18,10 @@ import type {
   NativeModuleEnumMember,
   NativeModuleEnumMemberType,
   NativeModuleParamTypeAnnotation,
+  NativeModuleUnionTypeAnnotationMemberType,
   Nullable,
   PropTypeAnnotation,
   SchemaType,
-  UnionTypeAnnotationMemberType,
 } from '../../CodegenSchema';
 import type {ParserType} from '../errors';
 import type {
@@ -111,7 +111,7 @@ class FlowParser implements Parser {
 
   remapUnionTypeAnnotationMemberNames(
     membersTypes: $FlowFixMe[],
-  ): UnionTypeAnnotationMemberType[] {
+  ): NativeModuleUnionTypeAnnotationMemberType[] {
     const remapLiteral = (item: $FlowFixMe) => {
       return item.type
         .replace('NumberLiteralTypeAnnotation', 'NumberTypeAnnotation')
@@ -121,12 +121,6 @@ class FlowParser implements Parser {
     return [...new Set(membersTypes.map(remapLiteral))];
   }
 
-  getStringLiteralUnionTypeAnnotationStringLiterals(
-    membersTypes: $FlowFixMe[],
-  ): string[] {
-    return membersTypes.map((item: $FlowFixMe) => item.value);
-  }
-
   parseFile(filename: string): SchemaType {
     const contents = fs.readFileSync(filename, 'utf8');
 

package/lib/parsers/parser.js.flow

@@ -18,10 +18,10 @@ import type {
   NativeModuleEnumMember,
   NativeModuleEnumMemberType,
   NativeModuleParamTypeAnnotation,
+  NativeModuleUnionTypeAnnotationMemberType,
   Nullable,
   PropTypeAnnotation,
   SchemaType,
-  UnionTypeAnnotationMemberType,
 } from '../CodegenSchema';
 import type {ParserType} from './errors';
 import type {
@@ -146,15 +146,7 @@ export interface Parser {
    */
   remapUnionTypeAnnotationMemberNames(
     types: $FlowFixMe,
-  ): UnionTypeAnnotationMemberType[];
-  /**
-   * Given a union annotation members types, it returns an array of string literals.
-   * @parameter membersTypes: union annotation members types
-   * @returns: an array of string literals.
-   */
-  getStringLiteralUnionTypeAnnotationStringLiterals(
-    types: $FlowFixMe,
-  ): string[];
+  ): NativeModuleUnionTypeAnnotationMemberType[];
   /**
    * Given the name of a file, it returns a Schema.
    * @parameter filename: the name of the file.

package/lib/parsers/parserMock.js

@@ -112,9 +112,6 @@ export class MockedParser {
   remapUnionTypeAnnotationMemberNames(membersTypes) {
     return [];
   }
-  getStringLiteralUnionTypeAnnotationStringLiterals(membersTypes) {
-    return [];
-  }
   parseFile(filename) {
     /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
      * https://fburl.com/workplace/6291gfvu */

package/lib/parsers/parserMock.js.flow

@@ -18,10 +18,10 @@ import type {
   NativeModuleEnumMember,
   NativeModuleEnumMemberType,
   NativeModuleParamTypeAnnotation,
+  NativeModuleUnionTypeAnnotationMemberType,
   Nullable,
   PropTypeAnnotation,
   SchemaType,
-  UnionTypeAnnotationMemberType,
 } from '../CodegenSchema';
 import type {ParserType} from './errors';
 import type {
@@ -105,13 +105,7 @@ export class MockedParser implements Parser {
 
   remapUnionTypeAnnotationMemberNames(
     membersTypes: $FlowFixMe[],
-  ): UnionTypeAnnotationMemberType[] {
-    return [];
-  }
-
-  getStringLiteralUnionTypeAnnotationStringLiterals(
-    membersTypes: $FlowFixMe[],
-  ): string[] {
+  ): NativeModuleUnionTypeAnnotationMemberType[] {
     return [];
   }
 

package/lib/parsers/parsers-primitives.js

@@ -15,11 +15,7 @@ const {
   throwIfPartialNotAnnotatingTypeParameter,
   throwIfPartialWithMoreParameter,
 } = require('./error-utils');
-const {
-  ParserError,
-  UnsupportedTypeAnnotationParserError,
-  UnsupportedUnionTypeAnnotationParserError,
-} = require('./errors');
+const {ParserError, UnsupportedTypeAnnotationParserError} = require('./errors');
 const {
   assertGenericTypeAnnotationHasExactlyOneTypeParameter,
   translateFunctionTypeAnnotation,
@@ -320,54 +316,51 @@ function emitFloatProp(name, optional) {
     },
   };
 }
-function emitUnion(nullable, hasteModuleName, typeAnnotation, parser) {
-  // Get all the literals by type
-  // Verify they are all the same
-  // If string, persist as StringLiteralUnionType
-  // If number, persist as NumberTypeAnnotation (TODO: Number literal)
-
-  const unionTypes = parser.remapUnionTypeAnnotationMemberNames(
-    typeAnnotation.types,
-  );
-
-  // Only support unionTypes of the same kind
-  if (unionTypes.length > 1) {
-    throw new UnsupportedUnionTypeAnnotationParserError(
-      hasteModuleName,
-      typeAnnotation,
-      unionTypes,
-    );
-  }
-  if (unionTypes[0] === 'StringTypeAnnotation') {
-    // Reprocess as a string literal union
-    return emitStringLiteralUnion(
-      nullable,
-      hasteModuleName,
-      typeAnnotation,
-      parser,
-    );
-  }
-  return wrapNullable(nullable, {
-    type: 'UnionTypeAnnotation',
-    memberType: unionTypes[0],
-  });
-}
-function emitStringLiteralUnion(
+function emitUnion(
   nullable,
   hasteModuleName,
   typeAnnotation,
+  types,
+  aliasMap,
+  enumMap,
+  tryParse,
+  cxxOnly,
+  translateTypeAnnotation,
   parser,
 ) {
-  const stringLiterals =
-    parser.getStringLiteralUnionTypeAnnotationStringLiterals(
-      typeAnnotation.types,
+  const unparsedMemberTypes = typeAnnotation.types;
+  const memberTypes = unparsedMemberTypes.map(memberType => {
+    const memberTypeAnnotation = translateTypeAnnotation(
+      hasteModuleName,
+      memberType,
+      types,
+      aliasMap,
+      enumMap,
+      tryParse,
+      cxxOnly,
+      parser,
     );
+    switch (memberTypeAnnotation.type) {
+      case 'StringTypeAnnotation':
+      case 'NumberTypeAnnotation':
+      case 'BooleanTypeAnnotation':
+      case 'NumberLiteralTypeAnnotation':
+      case 'StringLiteralTypeAnnotation':
+      case 'BooleanLiteralTypeAnnotation':
+      case 'ObjectTypeAnnotation':
+      case 'TypeAliasTypeAnnotation':
+        return memberTypeAnnotation;
+      default:
+        throw new UnsupportedTypeAnnotationParserError(
+          hasteModuleName,
+          memberType,
+          parser.language(),
+        );
+    }
+  });
   return wrapNullable(nullable, {
-    type: 'StringLiteralUnionTypeAnnotation',
-    types: stringLiterals.map(stringLiteral => ({
-      type: 'StringLiteralTypeAnnotation',
-      value: stringLiteral,
-    })),
+    type: 'UnionTypeAnnotation',
+    types: memberTypes,
   });
 }
 function translateArrayTypeAnnotation(
@@ -542,6 +535,7 @@ function emitCommonTypes(
     VoidTypeAnnotation: emitVoid,
     StringTypeAnnotation: emitString,
     MixedTypeAnnotation: cxxOnly ? emitMixed : emitGenericObject,
+    UnsafeMixed: cxxOnly ? emitMixed : emitGenericObject,
   };
   const typeAnnotationName = parser.convertKeywordToTypeAnnotation(
     typeAnnotation.type,
@@ -608,7 +602,7 @@ function emitUnionProp(name, optional, parser, typeAnnotation) {
     name,
     optional,
     typeAnnotation: {
-      type: 'StringLiteralUnionTypeAnnotation',
+      type: 'UnionTypeAnnotation',
       types: typeAnnotation.types.map(option => ({
         type: 'StringLiteralTypeAnnotation',
         value: parser.getLiteralValue(option),

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

@@ -31,12 +31,12 @@ import type {
   NativeModuleTypeAliasTypeAnnotation,
   NativeModuleTypeAnnotation,
   NativeModuleUnionTypeAnnotation,
+  NativeModuleUnionTypeAnnotationMemberType,
   Nullable,
   NumberLiteralTypeAnnotation,
   ObjectTypeAnnotation,
   ReservedTypeAnnotation,
   StringLiteralTypeAnnotation,
-  StringLiteralUnionTypeAnnotation,
   StringTypeAnnotation,
   VoidTypeAnnotation,
 } from '../CodegenSchema';
@@ -52,11 +52,7 @@ const {
   throwIfPartialNotAnnotatingTypeParameter,
   throwIfPartialWithMoreParameter,
 } = require('./error-utils');
-const {
-  ParserError,
-  UnsupportedTypeAnnotationParserError,
-  UnsupportedUnionTypeAnnotationParserError,
-} = require('./errors');
+const {ParserError, UnsupportedTypeAnnotationParserError} = require('./errors');
 const {
   assertGenericTypeAnnotationHasExactlyOneTypeParameter,
   translateFunctionTypeAnnotation,
@@ -431,61 +427,53 @@ function emitUnion(
   nullable: boolean,
   hasteModuleName: string,
   typeAnnotation: $FlowFixMe,
+  types: TypeDeclarationMap,
+  aliasMap: {...NativeModuleAliasMap},
+  enumMap: {...NativeModuleEnumMap},
+  tryParse: ParserErrorCapturer,
+  cxxOnly: boolean,
+  translateTypeAnnotation: $FlowFixMe,
   parser: Parser,
-): Nullable<
-  NativeModuleUnionTypeAnnotation | StringLiteralUnionTypeAnnotation,
-> {
-  // Get all the literals by type
-  // Verify they are all the same
-  // If string, persist as StringLiteralUnionType
-  // If number, persist as NumberTypeAnnotation (TODO: Number literal)
-
-  const unionTypes = parser.remapUnionTypeAnnotationMemberNames(
-    typeAnnotation.types,
-  );
+): Nullable<NativeModuleUnionTypeAnnotation> {
+  const unparsedMemberTypes: $ReadOnlyArray<$FlowFixMe> =
+    (typeAnnotation.types: $ReadOnlyArray<$FlowFixMe>);
 
-  // Only support unionTypes of the same kind
-  if (unionTypes.length > 1) {
-    throw new UnsupportedUnionTypeAnnotationParserError(
-      hasteModuleName,
-      typeAnnotation,
-      unionTypes,
-    );
-  }
+  const memberTypes = unparsedMemberTypes.map(
+    (memberType: $FlowFixMe): NativeModuleUnionTypeAnnotationMemberType => {
+      const memberTypeAnnotation = translateTypeAnnotation(
+        hasteModuleName,
+        memberType,
+        types,
+        aliasMap,
+        enumMap,
+        tryParse,
+        cxxOnly,
+        parser,
+      );
 
-  if (unionTypes[0] === 'StringTypeAnnotation') {
-    // Reprocess as a string literal union
-    return emitStringLiteralUnion(
-      nullable,
-      hasteModuleName,
-      typeAnnotation,
-      parser,
-    );
-  }
+      switch (memberTypeAnnotation.type) {
+        case 'StringTypeAnnotation':
+        case 'NumberTypeAnnotation':
+        case 'BooleanTypeAnnotation':
+        case 'NumberLiteralTypeAnnotation':
+        case 'StringLiteralTypeAnnotation':
+        case 'BooleanLiteralTypeAnnotation':
+        case 'ObjectTypeAnnotation':
+        case 'TypeAliasTypeAnnotation':
+          return memberTypeAnnotation;
+        default:
+          throw new UnsupportedTypeAnnotationParserError(
+            hasteModuleName,
+            memberType,
+            parser.language(),
+          );
+      }
+    },
+  );
 
   return wrapNullable(nullable, {
     type: 'UnionTypeAnnotation',
-    memberType: unionTypes[0],
-  });
-}
-
-function emitStringLiteralUnion(
-  nullable: boolean,
-  hasteModuleName: string,
-  typeAnnotation: $FlowFixMe,
-  parser: Parser,
-): Nullable<StringLiteralUnionTypeAnnotation> {
-  const stringLiterals =
-    parser.getStringLiteralUnionTypeAnnotationStringLiterals(
-      typeAnnotation.types,
-    );
-
-  return wrapNullable(nullable, {
-    type: 'StringLiteralUnionTypeAnnotation',
-    types: stringLiterals.map(stringLiteral => ({
-      type: 'StringLiteralTypeAnnotation',
-      value: stringLiteral,
-    })),
+    types: memberTypes,
   });
 }
 
@@ -675,6 +663,7 @@ function emitCommonTypes(
     VoidTypeAnnotation: emitVoid,
     StringTypeAnnotation: emitString,
     MixedTypeAnnotation: cxxOnly ? emitMixed : emitGenericObject,
+    UnsafeMixed: cxxOnly ? emitMixed : emitGenericObject,
   };
 
   const typeAnnotationName = parser.convertKeywordToTypeAnnotation(
@@ -763,7 +752,7 @@ function emitUnionProp(
     name,
     optional,
     typeAnnotation: {
-      type: 'StringLiteralUnionTypeAnnotation',
+      type: 'UnionTypeAnnotation',
       types: typeAnnotation.types.map(option => ({
         type: 'StringLiteralTypeAnnotation',
         value: parser.getLiteralValue(option),

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

@@ -115,7 +115,7 @@ function extractArrayElementType(typeAnnotation, name, parser) {
       };
     case 'TSUnionType':
       return {
-        type: 'StringLiteralUnionTypeAnnotation',
+        type: 'UnionTypeAnnotation',
         types: typeAnnotation.types.map(option => ({
           type: 'StringLiteralTypeAnnotation',
           value: parser.getLiteralValue(option),

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

@@ -127,7 +127,7 @@ function extractArrayElementType(
       };
     case 'TSUnionType':
       return {
-        type: 'StringLiteralUnionTypeAnnotation',
+        type: 'UnionTypeAnnotation',
         types: typeAnnotation.types.map(option => ({
           type: 'StringLiteralTypeAnnotation',
           value: parser.getLiteralValue(option),

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

@@ -380,7 +380,18 @@ function translateTypeAnnotation(
       );
     }
     case 'TSUnionType': {
-      return emitUnion(nullable, hasteModuleName, typeAnnotation, parser);
+      return emitUnion(
+        nullable,
+        hasteModuleName,
+        typeAnnotation,
+        types,
+        aliasMap,
+        enumMap,
+        tryParse,
+        cxxOnly,
+        translateTypeAnnotation,
+        parser,
+      );
     }
     case 'TSLiteralType': {
       const literal = typeAnnotation.literal;

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

@@ -399,7 +399,18 @@ function translateTypeAnnotation(
       );
     }
     case 'TSUnionType': {
-      return emitUnion(nullable, hasteModuleName, typeAnnotation, parser);
+      return emitUnion(
+        nullable,
+        hasteModuleName,
+        typeAnnotation,
+        types,
+        aliasMap,
+        enumMap,
+        tryParse,
+        cxxOnly,
+        translateTypeAnnotation,
+        parser,
+      );
     }
     case 'TSLiteralType': {
       const literal = typeAnnotation.literal;

package/lib/parsers/typescript/parser.js

@@ -135,9 +135,6 @@ class TypeScriptParser {
      * https://fburl.com/workplace/6291gfvu */
     return [...new Set(membersTypes.map(remapLiteral))];
   }
-  getStringLiteralUnionTypeAnnotationStringLiterals(membersTypes) {
-    return membersTypes.map(item => item.literal.value);
-  }
   parseFile(filename) {
     const contents = fs.readFileSync(filename, 'utf8');
     return this.parseString(contents, filename);

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

@@ -18,10 +18,10 @@ import type {
   NativeModuleEnumMember,
   NativeModuleEnumMemberType,
   NativeModuleParamTypeAnnotation,
+  NativeModuleUnionTypeAnnotationMemberType,
   Nullable,
   PropTypeAnnotation,
   SchemaType,
-  UnionTypeAnnotationMemberType,
 } from '../../CodegenSchema';
 import type {ParserType} from '../errors';
 import type {
@@ -109,7 +109,7 @@ class TypeScriptParser implements Parser {
 
   remapUnionTypeAnnotationMemberNames(
     membersTypes: Array<$FlowFixMe>,
-  ): Array<UnionTypeAnnotationMemberType> {
+  ): Array<NativeModuleUnionTypeAnnotationMemberType> {
     const remapLiteral = (item: $FlowFixMe) => {
       return item.literal
         ? item.literal.type
@@ -123,12 +123,6 @@ class TypeScriptParser implements Parser {
     return [...new Set(membersTypes.map(remapLiteral))];
   }
 
-  getStringLiteralUnionTypeAnnotationStringLiterals(
-    membersTypes: Array<$FlowFixMe>,
-  ): Array<string> {
-    return membersTypes.map((item: $FlowFixMe) => item.literal.value);
-  }
-
   parseFile(filename: string): SchemaType {
     const contents = fs.readFileSync(filename, 'utf8');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.84.0-nightly-20251204-5bb3a6d68",
+  "version": "0.84.0-nightly-20251206-63b0aef13",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {