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

Turbo module codegen support interface with inheritance in module #36011

Closed
wants to merge 6 commits into from
Closed

Turbo module codegen support interface with inheritance in module #36011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
232ff85
Update CodegenSchema.js
ZihanChen-MSFT Jan 30, 2023
283380f
...
ZihanChen-MSFT Jan 30, 2023
3534fbb
ensure base types exist and appear in aliasMap
ZihanChen-MSFT Jan 30, 2023
a012abf
Add baseTypes
ZihanChen-MSFT Jan 30, 2023
17b20c6
yarn flow-check-ios
ZihanChen-MSFT Jan 31, 2023
3ba73a8
Update index.js
ZihanChen-MSFT Jan 31, 2023
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
3 changes: 3 additions & 0 deletions packages/react-native-codegen/src/CodegenSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ export type VoidTypeAnnotation = $ReadOnly<{
export type ObjectTypeAnnotation<+T> = $ReadOnly<{
type: 'ObjectTypeAnnotation',
properties: $ReadOnlyArray<NamedShape<T>>,

// metadata for objects that generated from interfaces
baseTypes?: $ReadOnlyArray<string>,
}>;

type FunctionTypeAnnotation<+P, +R> = $ReadOnly<{
Expand Down
54 changes: 54 additions & 0 deletions ...typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,56 @@ exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_NE
}
]
},
'Base1': {
'type': 'ObjectTypeAnnotation',
'properties': [
{
'name': 'bar1',
'optional': false,
'typeAnnotation': {
'type': 'TypeAliasTypeAnnotation',
'name': 'Bar'
}
}
]
},
'Base2': {
'type': 'ObjectTypeAnnotation',
'properties': [
{
'name': 'bar2',
'optional': false,
'typeAnnotation': {
'type': 'TypeAliasTypeAnnotation',
'name': 'Bar'
}
}
]
},
'Base3': {
'type': 'ObjectTypeAnnotation',
'properties': [
{
'name': 'bar2',
'optional': false,
'typeAnnotation': {
'type': 'TypeAliasTypeAnnotation',
'name': 'Bar'
}
},
{
'name': 'bar3',
'optional': false,
'typeAnnotation': {
'type': 'TypeAliasTypeAnnotation',
'name': 'Bar'
}
}
],
'baseTypes': [
'Base2'
]
},
'Foo': {
'type': 'ObjectTypeAnnotation',
'properties': [
Expand Down Expand Up @@ -1556,6 +1606,10 @@ exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_NE
'name': 'Bar'
}
}
],
'baseTypes': [
'Base1',
'Base3'
]
}
},
Expand Down
28 changes: 27 additions & 1 deletion packages/react-native-codegen/src/parsers/typescript/modules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,26 @@ function translateTypeAnnotation(
}
}
case 'TSInterfaceDeclaration': {
const objectTypeAnnotation = {
const baseTypes = (typeAnnotation.extends ?? []).map(
extend => extend.expression.name,
);
for (const baseType of baseTypes) {
// ensure base types exist and appear in aliasMap
translateTypeAnnotation(
hasteModuleName,
{
type: 'TSTypeReference',
typeName: {type: 'Identifier', name: baseType},
},
types,
aliasMap,
tryParse,
cxxOnly,
parser,
);
}

let objectTypeAnnotation = {
type: 'ObjectTypeAnnotation',
// $FlowFixMe[missing-type-arg]
properties: (flattenProperties(
Expand All @@ -246,8 +265,15 @@ function translateTypeAnnotation(
},
)
.filter(Boolean),
baseTypes,
};

if (objectTypeAnnotation.baseTypes.length === 0) {
// The flow checker does not allow adding a member after an object literal is created
// so here I do it in a reverse way
delete objectTypeAnnotation.baseTypes;
}

return typeAliasResolution(
typeAliasResolutionStatus,
objectTypeAnnotation,
Expand Down