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

Jump to bottom

Fix codegen output for object with indexer #35344

Closed
wants to merge 13 commits into from
Closed

Fix codegen output for object with indexer #35344

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a6a7432
[TS] Fix dictionary type schema output
ZihanChen-MSFT Nov 14, 2022
baffa9f
[TS] Delete unnecessary test cases
ZihanChen-MSFT Nov 14, 2022
f55ee35
[Flow] Fix dictionary type schema output
ZihanChen-MSFT Nov 14, 2022
11e39c2
[Flow] Delete unnecessary test cases
ZihanChen-MSFT Nov 14, 2022
d76e478
yarn prettier
ZihanChen-MSFT Nov 14, 2022
d2f6506
yarn flow-check-ios
ZihanChen-MSFT Nov 14, 2022
2d36d51
Fix code review comments
ZihanChen-MSFT Nov 15, 2022
1ebab2d
...
ZihanChen-MSFT Nov 15, 2022
dd46fe7
Fix code review comments
ZihanChen-MSFT Nov 17, 2022
f0fc95e
Update module-parser-snapshot-test.js.snap
ZihanChen-MSFT Nov 29, 2022
5f11adc
Check property type of indexed object
ZihanChen-MSFT Nov 29, 2022
a319914
yarn prettier
ZihanChen-MSFT Nov 29, 2022
49c8252
Fix code review comments
ZihanChen-MSFT Nov 29, 2022
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
Prev Previous commit
Next Next commit
[TS] Delete unnecessary test cases
  • Loading branch information
@ZihanChen-MSFT
ZihanChen-MSFT committed Dec 12, 2022
commit baffa9f7cacf43767fbdf24f13e19a917c2b8bdd
50 changes: 2 additions & 48 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 @@ -261,18 +261,7 @@ describe('isObjectProperty', () => {
expect(result).toEqual(true);
});

it("returns 'true' if 'property.type' is 'TSIndexSignature'", () => {
const result = isObjectProperty(
{
type: 'TSIndexSignature',
...propertyStub,
},
language,
);
expect(result).toEqual(true);
});

it("returns 'false' if 'property.type' is not 'TSPropertySignature' or 'TSIndexSignature'", () => {
it("returns 'false' if 'property.type' is not 'TSPropertySignature'", () => {
const result = isObjectProperty(
{
type: 'notTSPropertySignature',
Expand Down Expand Up @@ -329,7 +318,7 @@ describe('parseObjectProperty', () => {

describe("when 'language' is 'TypeScript'", () => {
const language: ParserType = 'TypeScript';
it("throws an 'UnsupportedObjectPropertyTypeAnnotationParserError' error if 'property.type' is not 'TSPropertySignature' or 'TSIndexSignature'.", () => {
it("throws an 'UnsupportedObjectPropertyTypeAnnotationParserError' error if 'property.type' is not 'TSPropertySignature'.", () => {
const property = {
type: 'notTSPropertySignature',
typeAnnotation: {
Expand Down Expand Up @@ -358,40 +347,5 @@ describe('parseObjectProperty', () => {
),
).toThrow(expected);
});

it("returns a 'NativeModuleBaseTypeAnnotation' object with 'typeAnnotation.type' equal to 'GenericObjectTypeAnnotation', if 'property.type' is 'TSIndexSignature'.", () => {
const property = {
type: 'TSIndexSignature',
typeAnnotation: {
type: 'TSIndexSignature',
typeAnnotation: 'TSIndexSignature',
},
key: {
name: 'testKeyName',
},
value: 'wrongValue',
name: 'wrongName',
parameters: [{name: 'testName'}],
};
const result = parseObjectProperty(
property,
moduleName,
types,
aliasMap,
tryParse,
cxxOnly,
nullable,
typeScriptTranslateTypeAnnotation,
typeScriptParser,
);
const expected = {
name: 'testName',
optional: false,
typeAnnotation: wrapNullable(nullable, {
type: 'GenericObjectTypeAnnotation',
}),
};
expect(result).toEqual(expected);
});
});
});
17 changes: 0 additions & 17 deletions packages/react-native-codegen/src/parsers/__tests__/parsers-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,23 +113,6 @@ describe('TypeScriptParser', () => {
});
});

describe('when propertyOrIndex is TSIndexSignature', () => {
it('returns indexer name', () => {
const indexer = {
type: 'TSIndexSignature',
parameters: [
{
name: 'indexerName',
},
],
};

const expected = 'indexerName';

expect(parser.getKeyName(indexer, hasteModuleName)).toEqual(expected);
});
});

describe('when propertyOrIndex is not TSPropertySignature or TSIndexSignature', () => {
it('throw UnsupportedObjectPropertyTypeAnnotationParserError', () => {
const indexer = {
Expand Down
6 changes: 2 additions & 4 deletions packages/react-native-codegen/src/parsers/parsers-commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ function isObjectProperty(property: $FlowFixMe, language: ParserType): boolean {
);
case 'TypeScript':
return (
property.type === 'TSPropertySignature' ||
property.type === 'TSIndexSignature'
property.type === 'TSPropertySignature'
);
default:
return false;
Expand Down Expand Up @@ -160,8 +159,7 @@ function parseObjectProperty(
: property.value;

if (
property.type === 'ObjectTypeIndexer' ||
property.type === 'TSIndexSignature'
property.type === 'ObjectTypeIndexer'
) {
return {
name,
Expand Down
2 changes: 0 additions & 2 deletions packages/react-native-codegen/src/parsers/typescript/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class TypeScriptParser implements Parser {
switch (propertyOrIndex.type) {
case 'TSPropertySignature':
return propertyOrIndex.key.name;
case 'TSIndexSignature':
return propertyOrIndex.parameters[0].name;
default:
throw new UnsupportedObjectPropertyTypeAnnotationParserError(
hasteModuleName,
Expand Down