From 3bf7a09ecba3fe9ed62631e29c192d7a64d43f1e Mon Sep 17 00:00:00 2001 From: Marco Wang Date: Wed, 17 Dec 2025 18:45:46 -0800 Subject: [PATCH] Support ReadonlyArray in react-native-codegen (#54924) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54924 The lint is triggered in D89415612. Not sure what those file do but it seems a good fix Changelog: [General][Added] Support parsing `ReadonlyArray` for the new Flow utility types Reviewed By: SamChou19815 Differential Revision: D89418033 fbshipit-source-id: ef227b344a693ec47dea86bbf34e0af17bad25fd --- .../src/parsers/flow/components/commands.js | 3 ++- .../src/parsers/flow/components/componentsUtils.js | 8 ++++++-- .../src/parsers/flow/components/events.js | 2 ++ .../src/parsers/flow/modules/index.js | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/react-native-codegen/src/parsers/flow/components/commands.js b/packages/react-native-codegen/src/parsers/flow/components/commands.js index d6a680fd5bd..88fc2d1ad4f 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/commands.js +++ b/packages/react-native-codegen/src/parsers/flow/components/commands.js @@ -105,11 +105,12 @@ function buildCommandSchema( break; case 'Array': case '$ReadOnlyArray': + case 'ReadonlyArray': /* $FlowFixMe[invalid-compare] Error discovered during Constant * Condition roll out. See https://fburl.com/workplace/4oq3zi07. */ if (!paramValue.type === 'GenericTypeAnnotation') { throw new Error( - 'Array and $ReadOnlyArray are GenericTypeAnnotation for array', + 'Array, $ReadOnlyArray and ReadonlyArray are GenericTypeAnnotation for array', ); } returnType = { diff --git a/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js b/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js index 7f242972af6..c6e72d31601 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js +++ b/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js @@ -58,7 +58,10 @@ function getTypeAnnotationForArray<+T>( }; } - if (objectType.id.name === '$ReadOnlyArray') { + if ( + objectType.id.name === '$ReadOnlyArray' || + objectType.id.name === 'ReadonlyArray' + ) { // We need to go yet another level deeper to resolve // types that may be defined in a type alias const nestedObjectType = getValueFromTypes( @@ -226,7 +229,8 @@ function getTypeAnnotation<+T>( if ( typeAnnotation.type === 'GenericTypeAnnotation' && - parser.getTypeAnnotationName(typeAnnotation) === '$ReadOnlyArray' + (parser.getTypeAnnotationName(typeAnnotation) === '$ReadOnlyArray' || + parser.getTypeAnnotationName(typeAnnotation) === 'ReadonlyArray') ) { return { type: 'ArrayTypeAnnotation', diff --git a/packages/react-native-codegen/src/parsers/flow/components/events.js b/packages/react-native-codegen/src/parsers/flow/components/events.js index c8f41e125c1..4bea22f5695 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/events.js +++ b/packages/react-native-codegen/src/parsers/flow/components/events.js @@ -82,6 +82,7 @@ function getPropertyType( return emitMixedProp(name, optional); case 'ArrayTypeAnnotation': case '$ReadOnlyArray': + case 'ReadonlyArray': return { name, optional, @@ -142,6 +143,7 @@ function extractArrayElementType( ), }; case '$ReadOnlyArray': + case 'ReadonlyArray': const genericParams = typeAnnotation.typeParameters.params; if (genericParams.length !== 1) { throw new Error( diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js index 148161a1a61..6730a7ac18b 100644 --- a/packages/react-native-codegen/src/parsers/flow/modules/index.js +++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js @@ -100,7 +100,8 @@ function translateTypeAnnotation( ); } case 'Array': - case '$ReadOnlyArray': { + case '$ReadOnlyArray': + case 'ReadonlyArray': { return emitArrayType( hasteModuleName, typeAnnotation,