From bf805b3444483d0517d1bfc0cef24969dde01756 Mon Sep 17 00:00:00 2001 From: Eli White Date: Fri, 3 Jan 2025 12:12:25 -0800 Subject: [PATCH 1/2] [skip ci] Make CompleteType contain module and component reserved names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Over the years of copying and moving and renaming types through CodegenSchema, this type ended up in the Command params, although the Command parser doesn't allow it. I made this change to a fixture: {F1974104959} and got this error ``` FAIL xplat/js/react-native-github/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js ● RN Codegen Flow Parser › can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES Unsupported param type for method "scrollTo", param "speed". Found UnionTypeAnnotation 127 | default: 128 | (type: empty); > 129 | throw new Error( | ^ 130 | `Unsupported param type for method "${name}", param "${paramName}". Found ${type}`, 131 | ); 132 | } ``` Also, a default value for enum an argument of a Command doesn't make sense anyways. Commands should probably have support for enums and string literal unions, but that's out of scope here. Still need to add to this vec\concat on www: https://www.internalfb.com/code/www/[ebfa58f888a6064e17879934d447f59bcc2b6951]/flib/intern/sandcastle/react_native/ota_steps/SandcastleOTACompatibilityCheckReportingStep.php?lines=62 Changelog: [internal] Differential Revision: D67806808 --- packages/react-native-codegen/src/CodegenSchema.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js index 14552f63f063be..6a7adb57e11bb8 100644 --- a/packages/react-native-codegen/src/CodegenSchema.js +++ b/packages/react-native-codegen/src/CodegenSchema.js @@ -412,6 +412,14 @@ type NativeModuleReturnOnlyTypeAnnotation = | NativeModulePromiseTypeAnnotation | VoidTypeAnnotation; +// Add the allowed component reserved types to the native module union +export type CompleteReservedTypeAnnotation = + | ReservedTypeAnnotation + | { + type: 'ReservedTypeAnnotation', + name: ReservedPropTypeAnnotation['name'], + }; + // Used by compatibility check which needs to handle all possible types // This will eventually also include the union of all view manager types export type CompleteTypeAnnotation = @@ -421,6 +429,7 @@ export type CompleteTypeAnnotation = | EventEmitterTypeAnnotation | NativeModuleEnumDeclarationWithMembers | UnsafeAnyTypeAnnotation + | CompleteReservedTypeAnnotation // Native Module event emitters and methods | ObjectTypeAnnotation< Nullable | EventEmitterTypeAnnotation, From 2a1c1d489305f51f8f2c2912f12d20b0eb49c31b Mon Sep 17 00:00:00 2001 From: Eli White Date: Fri, 3 Jan 2025 12:12:25 -0800 Subject: [PATCH 2/2] [skip ci] Simplify CompleteTypeAnnotation Summary: This is such a simpler approach lol. I'll need this later for when I want to pass in arrays or objects of these types to the compat check Changelog: [internal] Differential Revision: D67806812 --- packages/react-native-codegen/src/CodegenSchema.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js index 6a7adb57e11bb8..e7fc38e4f3a919 100644 --- a/packages/react-native-codegen/src/CodegenSchema.js +++ b/packages/react-native-codegen/src/CodegenSchema.js @@ -429,8 +429,6 @@ export type CompleteTypeAnnotation = | EventEmitterTypeAnnotation | NativeModuleEnumDeclarationWithMembers | UnsafeAnyTypeAnnotation - | CompleteReservedTypeAnnotation - // Native Module event emitters and methods - | ObjectTypeAnnotation< - Nullable | EventEmitterTypeAnnotation, - >; + | ArrayTypeAnnotation + | ObjectTypeAnnotation + | CompleteReservedTypeAnnotation;