Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

'[skip ci] [codegen] Array'\''s with unparsable element tyoe'\''s are explicitly Any vs missing #46221

Closed
wants to merge 1 commit into from
Closed

'[skip ci] [codegen] Array'\''s with unparsable element tyoe'\''s are explicitly Any vs missing #46221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 53 additions & 49 deletions packages/react-native-codegen/src/CodegenSchema.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ export interface ExtendsPropsShape {
export interface EventTypeShape {
readonly name: string;
readonly bubblingType:
| 'direct'
| 'bubble';
| 'direct'
| 'bubble';
readonly optional: boolean;
readonly paperTopLevelNameDeprecated?: string | undefined;
readonly typeAnnotation: {
Expand All @@ -137,55 +137,55 @@ export type EventTypeAnnotation =
export type ArrayTypeAnnotation = {
readonly type: 'ArrayTypeAnnotation';
readonly elementType:
| BooleanTypeAnnotation
| StringTypeAnnotation
| DoubleTypeAnnotation
| FloatTypeAnnotation
| Int32TypeAnnotation
| {
readonly type: 'StringEnumTypeAnnotation';
readonly default: string;
readonly options: readonly string[];
}
| ObjectTypeAnnotation<PropTypeAnnotation>
| ReservedPropTypeAnnotation
| {
readonly type: 'ArrayTypeAnnotation';
readonly elementType: ObjectTypeAnnotation<PropTypeAnnotation>;
};
| BooleanTypeAnnotation
| StringTypeAnnotation
| DoubleTypeAnnotation
| FloatTypeAnnotation
| Int32TypeAnnotation
| {
readonly type: 'StringEnumTypeAnnotation';
readonly default: string;
readonly options: readonly string[];
}
| ObjectTypeAnnotation<PropTypeAnnotation>
| ReservedPropTypeAnnotation
| {
readonly type: 'ArrayTypeAnnotation';
readonly elementType: ObjectTypeAnnotation<PropTypeAnnotation>;
};
}

export type PropTypeAnnotation =
| {
readonly type: 'BooleanTypeAnnotation';
readonly default: boolean | null;
}
readonly type: 'BooleanTypeAnnotation';
readonly default: boolean | null;
}
| {
readonly type: 'StringTypeAnnotation';
readonly default: string | null;
}
readonly type: 'StringTypeAnnotation';
readonly default: string | null;
}
| {
readonly type: 'DoubleTypeAnnotation';
readonly default: number;
}
readonly type: 'DoubleTypeAnnotation';
readonly default: number;
}
| {
readonly type: 'FloatTypeAnnotation';
readonly default: number | null;
}
readonly type: 'FloatTypeAnnotation';
readonly default: number | null;
}
| {
readonly type: 'Int32TypeAnnotation';
readonly default: number;
}
readonly type: 'Int32TypeAnnotation';
readonly default: number;
}
| {
readonly type: 'StringEnumTypeAnnotation';
readonly default: string;
readonly options: readonly string[];
}
readonly type: 'StringEnumTypeAnnotation';
readonly default: string;
readonly options: readonly string[];
}
| {
readonly type: 'Int32EnumTypeAnnotation';
readonly default: number;
readonly options: readonly number[];
}
readonly type: 'Int32EnumTypeAnnotation';
readonly default: number;
readonly options: readonly number[];
}
| ReservedPropTypeAnnotation
| ObjectTypeAnnotation<PropTypeAnnotation>
| ArrayTypeAnnotation
Expand All @@ -194,12 +194,12 @@ export type PropTypeAnnotation =
export interface ReservedPropTypeAnnotation {
readonly type: 'ReservedPropTypeAnnotation';
readonly name:
| 'ColorPrimitive'
| 'ImageSourcePrimitive'
| 'PointPrimitive'
| 'EdgeInsetsPrimitive'
| 'ImageRequestPrimitive'
| 'DimensionPrimitive';
| 'ColorPrimitive'
| 'ImageSourcePrimitive'
| 'PointPrimitive'
| 'EdgeInsetsPrimitive'
| 'ImageRequestPrimitive'
| 'DimensionPrimitive';
}

export type CommandTypeAnnotation = FunctionTypeAnnotation<
Expand Down Expand Up @@ -279,7 +279,11 @@ export interface NativeModuleArrayTypeAnnotation<T extends Nullable<NativeModule
* TODO(T72031674): Migrate all our NativeModule specs to not use
* invalid Array ElementTypes. Then, make the elementType required.
*/
readonly elementType?: T | undefined;
readonly elementType: T | UnsafeAnyTypeAnnotation;
}

export interface UnsafeAnyTypeAnnotation {
readonly type: 'AnyTypeAnnotation',
}

export interface NativeModuleStringTypeAnnotation {
Expand Down Expand Up @@ -375,7 +379,7 @@ export type NativeModuleEventEmitterTypeAnnotation =
| NativeModuleEventEmitterBaseTypeAnnotation
| {
readonly type: 'ArrayTypeAnnotation';
readonly elementType: NativeModuleEventEmitterBaseTypeAnnotation | {type: string};
readonly elementType: NativeModuleEventEmitterBaseTypeAnnotation | { type: string };
};

export type NativeModuleBaseTypeAnnotation =
Expand Down
6 changes: 5 additions & 1 deletion packages/react-native-codegen/src/CodegenSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,13 @@ export type NativeModuleArrayTypeAnnotation<
* TODO(T72031674): Migrate all our NativeModule specs to not use
* invalid Array ElementTypes. Then, make the elementType required.
*/
elementType?: T,
elementType: T | UnsafeAnyTypeAnnotation,
}>;

export type UnsafeAnyTypeAnnotation = {
type: 'AnyTypeAnnotation',
};

export type NativeModuleNumberTypeAnnotation = $ReadOnly<{
type: 'NumberTypeAnnotation',
}>;
Expand Down
5 changes: 4 additions & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,12 @@ class StructCollector {
});
}
case 'ArrayTypeAnnotation': {
if (typeAnnotation.elementType == null) {
if (typeAnnotation.elementType.type === 'AnyTypeAnnotation') {
return wrapNullable(nullable, {
type: 'ArrayTypeAnnotation',
elementType: {
type: 'AnyTypeAnnotation',
},
});
}

Expand Down
4 changes: 2 additions & 2 deletions ...ve-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function toObjCType(
case 'GenericObjectTypeAnnotation':
return wrapObjCOptional('id<NSObject>', isRequired);
case 'ArrayTypeAnnotation':
if (typeAnnotation.elementType == null) {
if (typeAnnotation.elementType.type === 'AnyTypeAnnotation') {
return wrapObjCOptional('id<NSObject>', isRequired);
}

Expand Down Expand Up @@ -198,7 +198,7 @@ function toObjCValue(
return value;
case 'ArrayTypeAnnotation':
const {elementType} = typeAnnotation;
if (elementType == null) {
if (elementType.type === 'AnyTypeAnnotation') {
return value;
}

Expand Down
4 changes: 2 additions & 2 deletions ...tive-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function toObjCType(
case 'GenericObjectTypeAnnotation':
return wrapObjCOptional('id<NSObject>', isRequired);
case 'ArrayTypeAnnotation':
if (typeAnnotation.elementType == null) {
if (typeAnnotation.elementType.type === 'AnyTypeAnnotation') {
return wrapObjCOptional('id<NSObject>', isRequired);
}
return wrapCxxOptional(
Expand Down Expand Up @@ -188,7 +188,7 @@ function toObjCValue(
return value;
case 'ArrayTypeAnnotation':
const {elementType} = typeAnnotation;
if (elementType == null) {
if (elementType.type === 'AnyTypeAnnotation') {
return value;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ function getReturnObjCType(
case 'TypeAliasTypeAnnotation':
return wrapOptional('NSDictionary *', isRequired);
case 'ArrayTypeAnnotation':
if (typeAnnotation.elementType == null) {
if (typeAnnotation.elementType.type === 'AnyTypeAnnotation') {
return wrapOptional('NSArray<id<NSObject>> *', isRequired);
}

Expand Down
6 changes: 6 additions & 0 deletions packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,9 @@ const COMPLEX_OBJECTS: SchemaType = {
type: 'NullableTypeAnnotation',
typeAnnotation: {
type: 'ArrayTypeAnnotation',
elementType: {
type: 'AnyTypeAnnotation',
},
},
},
params: [],
Expand Down Expand Up @@ -1969,6 +1972,9 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
type: 'FunctionTypeAnnotation',
returnTypeAnnotation: {
type: 'ArrayTypeAnnotation',
elementType: {
type: 'AnyTypeAnnotation',
},
},
params: [
{
Expand Down
10 changes: 8 additions & 2 deletions packages/react-native-codegen/src/parsers/__tests__/parsers-commons-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,10 @@ describe('buildSchema', () => {
{
name: 'a',
optional: false,
typeAnnotation: {type: 'ArrayTypeAnnotation'},
typeAnnotation: {
type: 'ArrayTypeAnnotation',
elementType: {type: 'AnyTypeAnnotation'},
},
},
],
},
Expand Down Expand Up @@ -1258,7 +1261,10 @@ describe('buildModuleSchema', () => {
{
name: 'a',
optional: false,
typeAnnotation: {type: 'ArrayTypeAnnotation'},
typeAnnotation: {
type: 'ArrayTypeAnnotation',
elementType: {type: 'AnyTypeAnnotation'},
},
},
],
returnTypeAnnotation: {
Expand Down
10 changes: 8 additions & 2 deletions ...egen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,14 +798,20 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WI
'typeAnnotation': {
'type': 'FunctionTypeAnnotation',
'returnTypeAnnotation': {
'type': 'ArrayTypeAnnotation'
'type': 'ArrayTypeAnnotation',
'elementType': {
'type': 'AnyTypeAnnotation'
}
},
'params': [
{
'name': 'arg',
'optional': false,
'typeAnnotation': {
'type': 'ArrayTypeAnnotation'
'type': 'ArrayTypeAnnotation',
'elementType': {
'type': 'AnyTypeAnnotation'
}
}
}
]
Expand Down
31 changes: 23 additions & 8 deletions packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,13 @@ describe('Flow Module Parser', () => {
expect(paramTypeAnnotation.type).toBe('ArrayTypeAnnotation');
invariant(paramTypeAnnotation.type === 'ArrayTypeAnnotation', '');

expect(paramTypeAnnotation.elementType).not.toBe(null);
invariant(paramTypeAnnotation.elementType != null, '');
expect(paramTypeAnnotation.elementType.type).not.toEqual(
'AnyTypeAnnotation',
);
invariant(
paramTypeAnnotation.elementType.type !== 'AnyTypeAnnotation',
'',
);
const [elementType, isElementTypeNullable] =
unwrapNullable<NativeModuleBaseTypeAnnotation>(
paramTypeAnnotation.elementType,
Expand Down Expand Up @@ -532,8 +537,13 @@ describe('Flow Module Parser', () => {

const {elementType: nullableElementType} =
property.typeAnnotation;
expect(nullableElementType).not.toBe(null);
invariant(nullableElementType != null, '');
expect(nullableElementType.type).not.toEqual(
'AnyTypeAnnotation',
);
invariant(
nullableElementType.type !== 'AnyTypeAnnotation',
'',
);

const [elementType, isElementTypeNullable] =
unwrapNullable<NativeModuleBaseTypeAnnotation>(
Expand Down Expand Up @@ -802,8 +812,8 @@ describe('Flow Module Parser', () => {
const arrayTypeAnnotation = returnTypeAnnotation;

const {elementType} = arrayTypeAnnotation;
expect(elementType).not.toBe(null);
invariant(elementType != null, '');
expect(elementType.type).not.toEqual('AnyTypeAnnotation');
invariant(elementType.type !== 'AnyTypeAnnotation', '');

const [elementTypeAnnotation, isElementTypeAnnotation] =
unwrapNullable<NativeModuleBaseTypeAnnotation>(elementType);
Expand Down Expand Up @@ -1074,8 +1084,13 @@ describe('Flow Module Parser', () => {

const {elementType: nullableElementType} =
property.typeAnnotation;
expect(nullableElementType).not.toBe(null);
invariant(nullableElementType != null, '');
expect(nullableElementType.type).not.toEqual(
'AnyTypeAnnotation',
);
invariant(
nullableElementType.type !== 'AnyTypeAnnotation',
'',
);

const [elementType, isElementTypeNullable] =
unwrapNullable<NativeModuleBaseTypeAnnotation>(
Expand Down
3 changes: 3 additions & 0 deletions packages/react-native-codegen/src/parsers/parsers-primitives.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,9 @@ function translateArrayTypeAnnotation(
} catch (ex) {
return wrapNullable(nullable, {
type: 'ArrayTypeAnnotation',
elementType: {
type: 'AnyTypeAnnotation',
},
});
}
}
Expand Down
Loading
Loading