Skip to content

[codegen] move remapUnionTypeAnnotationMemberNames to Parser #35314

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

Closed
youedd wants to merge 1 commit into from
Closed

[codegen] move remapUnionTypeAnnotationMemberNames to Parser #35314

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
46 changes: 22 additions & 24 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 @@ -29,8 +29,10 @@ const {

import {MockedParser} from '../parserMock';
import {TypeScriptParser} from '../typescript/parser';
import {FlowParser} from '../flow/parser';

const parser = new MockedParser();
const flowParser = new FlowParser();
const typeScriptParser = new TypeScriptParser();

const flowTranslateTypeAnnotation = require('../flow/modules/index');
Expand Down Expand Up @@ -399,8 +401,6 @@ describe('emitUnionTypeAnnotation', () => {
const hasteModuleName = 'SampleTurboModule';

describe('when language is flow', () => {
const language: ParserType = 'Flow';

describe('when members type is numeric', () => {
const typeAnnotation = {
type: 'UnionTypeAnnotation',
Expand All @@ -415,7 +415,7 @@ describe('emitUnionTypeAnnotation', () => {
true,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);

const expected = {
Expand All @@ -436,7 +436,7 @@ describe('emitUnionTypeAnnotation', () => {
false,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);

const expected = {
Expand All @@ -463,7 +463,7 @@ describe('emitUnionTypeAnnotation', () => {
true,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);

const expected = {
Expand All @@ -484,7 +484,7 @@ describe('emitUnionTypeAnnotation', () => {
false,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);

const expected = {
Expand All @@ -508,7 +508,7 @@ describe('emitUnionTypeAnnotation', () => {
true,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);

const expected = {
Expand All @@ -529,7 +529,7 @@ describe('emitUnionTypeAnnotation', () => {
false,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);

const expected = {
Expand Down Expand Up @@ -562,15 +562,15 @@ describe('emitUnionTypeAnnotation', () => {
hasteModuleName,
typeAnnotation,
unionTypes,
language,
flowParser.language(),
);

expect(() => {
emitUnionTypeAnnotation(
true,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);
}).toThrow(expected);
});
Expand All @@ -582,15 +582,15 @@ describe('emitUnionTypeAnnotation', () => {
hasteModuleName,
typeAnnotation,
unionTypes,
language,
flowParser.language(),
);

expect(() => {
emitUnionTypeAnnotation(
false,
hasteModuleName,
typeAnnotation,
language,
flowParser,
);
}).toThrow(expected);
});
Expand All @@ -599,8 +599,6 @@ describe('emitUnionTypeAnnotation', () => {
});

describe('when language is typescript', () => {
const language: ParserType = 'TypeScript';

describe('when members type is numeric', () => {
const typeAnnotation = {
type: 'TSUnionType',
Expand All @@ -621,7 +619,7 @@ describe('emitUnionTypeAnnotation', () => {
true,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);

const expected = {
Expand All @@ -642,7 +640,7 @@ describe('emitUnionTypeAnnotation', () => {
false,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);

const expected = {
Expand Down Expand Up @@ -675,7 +673,7 @@ describe('emitUnionTypeAnnotation', () => {
true,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);

const expected = {
Expand All @@ -696,7 +694,7 @@ describe('emitUnionTypeAnnotation', () => {
false,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);

const expected = {
Expand Down Expand Up @@ -727,7 +725,7 @@ describe('emitUnionTypeAnnotation', () => {
true,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);

const expected = {
Expand All @@ -748,7 +746,7 @@ describe('emitUnionTypeAnnotation', () => {
false,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);

const expected = {
Expand Down Expand Up @@ -789,15 +787,15 @@ describe('emitUnionTypeAnnotation', () => {
hasteModuleName,
typeAnnotation,
unionTypes,
language,
typeScriptParser.language(),
);

expect(() => {
emitUnionTypeAnnotation(
true,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);
}).toThrow(expected);
});
Expand All @@ -809,15 +807,15 @@ describe('emitUnionTypeAnnotation', () => {
hasteModuleName,
typeAnnotation,
unionTypes,
language,
typeScriptParser.language(),
);

expect(() => {
emitUnionTypeAnnotation(
false,
hasteModuleName,
typeAnnotation,
language,
typeScriptParser,
);
}).toThrow(expected);
});
Expand Down
37 changes: 35 additions & 2 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 @@ -19,7 +19,7 @@ import {TypeScriptParser} from '../typescript/parser';
import {FlowParser} from '../flow/parser';

const hasteModuleName = 'moduleName';
describe('TypeScriptParser', () => {
describe('FlowParser', () => {
const parser = new FlowParser();
describe('getKeyName', () => {
describe('when propertyOrIndex is ObjectTypeProperty', () => {
Expand Down Expand Up @@ -76,9 +76,26 @@ describe('TypeScriptParser', () => {
});
});
});

describe('remapUnionTypeAnnotationMemberNames', () => {
it('returns remaped union annotation member types without duplicates', () => {
const membersType = [
{type: 'NumberLiteralTypeAnnotation'},
{type: 'ObjectTypeAnnotation'},
{type: 'StringLiteralTypeAnnotation'},
{type: 'ObjectTypeAnnotation'},
];

expect(parser.remapUnionTypeAnnotationMemberNames(membersType)).toEqual([
'NumberTypeAnnotation',
'ObjectTypeAnnotation',
'StringTypeAnnotation',
]);
});
});
});

describe('FlowParser', () => {
describe('TypeScriptParser', () => {
const parser = new TypeScriptParser();
describe('getKeyName', () => {
describe('when propertyOrIndex is TSPropertySignature', () => {
Expand Down Expand Up @@ -126,4 +143,20 @@ describe('FlowParser', () => {
});
});
});
describe('remapUnionTypeAnnotationMemberNames', () => {
it('returns remaped union annotation member types without duplicates', () => {
const membersType = [
{literal: {type: 'NumericLiteral'}},
{type: 'ObjectTypeAnnotation'},
{literal: {type: 'StringLiteral'}},
{type: 'ObjectTypeAnnotation'},
];

expect(parser.remapUnionTypeAnnotationMemberNames(membersType)).toEqual([
'NumberTypeAnnotation',
'ObjectTypeAnnotation',
'StringTypeAnnotation',
]);
});
});
});
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/modules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ function translateTypeAnnotation(
nullable,
hasteModuleName,
typeAnnotation,
language,
parser,
);
}
// Fallthrough
Expand Down
13 changes: 13 additions & 0 deletions packages/react-native-codegen/src/parsers/flow/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

'use strict';

import type {UnionTypeAnnotationMemberType} from '../../CodegenSchema.js';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';

Expand Down Expand Up @@ -63,6 +64,18 @@ class FlowParser implements Parser {
typeArguments.params[0].id.name !== 'Spec'
);
}

remapUnionTypeAnnotationMemberNames(
membersTypes: $FlowFixMe[],
): UnionTypeAnnotationMemberType[] {
const remapLiteral = (item: $FlowFixMe) => {
return item.type
.replace('NumberLiteralTypeAnnotation', 'NumberTypeAnnotation')
.replace('StringLiteralTypeAnnotation', 'StringTypeAnnotation');
};

return [...new Set(membersTypes.map(remapLiteral))];
}
}

module.exports = {
Expand Down
9 changes: 9 additions & 0 deletions packages/react-native-codegen/src/parsers/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

'use strict';

import type {UnionTypeAnnotationMemberType} from '../CodegenSchema.js';
import type {ParserType} from './errors';

/**
Expand Down Expand Up @@ -58,4 +59,12 @@ export interface Parser {
* @returns: a boolean specifying if the Module is Invalid.
*/
checkIfInvalidModule(typeArguments: $FlowFixMe): boolean;
/**
* Given a union annotation members types, it returns an array of remaped members names without duplicates.
* @parameter membersTypes: union annotation members types
* @returns: an array of remaped members names without duplicates.
*/
remapUnionTypeAnnotationMemberNames(
types: $FlowFixMe,
): UnionTypeAnnotationMemberType[];
}
7 changes: 7 additions & 0 deletions packages/react-native-codegen/src/parsers/parserMock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

'use strict';

import type {UnionTypeAnnotationMemberType} from '../CodegenSchema.js';
import type {Parser} from './parser';
import type {ParserType} from './errors';

Expand Down Expand Up @@ -58,4 +59,10 @@ export class MockedParser implements Parser {
checkIfInvalidModule(typeArguments: $FlowFixMe): boolean {
return false;
}

remapUnionTypeAnnotationMemberNames(
membersTypes: $FlowFixMe[],
): UnionTypeAnnotationMemberType[] {
return [];
}
}
Loading