Skip to content

Commit 3331238

Browse files
Antoine Doubovetzkypull[bot]
authored andcommitted
Remove unused language argument in codegen errors (#35732)
Summary: This is not a task from #34872 but I noticed that we were passing `language` arguments that were never used for several errors so I removed them. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. Pick one each for the category and type tags: [ANDROID|GENERAL|IOS|INTERNAL] [BREAKING|ADDED|CHANGED|DEPRECATED|REMOVED|FIXED|SECURITY] - Message For more details, see: https://reactnative.dev/contributing/changelogs-in-pull-requests --> [INTERNAL] [CHANGED] - Remove unused language argument in Codegen errors Pull Request resolved: #35732 Test Plan: I tested using Flow and Jest. Reviewed By: christophpurrer Differential Revision: D42266490 Pulled By: rshest fbshipit-source-id: 7953a98586bf9e927a58222cc27cf88e9c1c1163
1 parent 35df5cc commit 3331238

File tree

8 files changed

+5
-89
lines changed

8 files changed

+5
-89
lines changed

packages/react-native-codegen/src/parsers/__tests__/error-utils-test.js

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,24 @@ describe('throwIfMoreThanOneModuleRegistryCalls', () => {
9191
{name: 'callExpression1'},
9292
{name: 'callExpression2'},
9393
];
94-
const parserType = 'Flow';
9594

9695
expect(() => {
9796
throwIfMoreThanOneModuleRegistryCalls(
9897
nativeModuleName,
9998
callExpressions,
10099
callExpressions.length,
101-
parserType,
102100
);
103101
}).toThrow(MoreThanOneModuleRegistryCallsParserError);
104102
});
105103
it("don't throw error if single module registry call", () => {
106104
const nativeModuleName = 'moduleName';
107105
const callExpressions = [{name: 'callExpression1'}];
108-
const parserType = 'TypeScript';
109106

110107
expect(() => {
111108
throwIfMoreThanOneModuleRegistryCalls(
112109
nativeModuleName,
113110
callExpressions,
114111
callExpressions.length,
115-
parserType,
116112
);
117113
}).not.toThrow(MoreThanOneModuleRegistryCallsParserError);
118114
});
@@ -123,13 +119,11 @@ describe('throwIfUnusedModuleInterfaceParserError', () => {
123119
const nativeModuleName = 'moduleName';
124120
const callExpressions: Array<$FlowFixMe> = [];
125121
const spec = {name: 'Spec'};
126-
const parserType = 'Flow';
127122
expect(() => {
128123
throwIfUnusedModuleInterfaceParserError(
129124
nativeModuleName,
130125
spec,
131126
callExpressions,
132-
parserType,
133127
);
134128
}).toThrow(UnusedModuleInterfaceParserError);
135129
});
@@ -138,13 +132,11 @@ describe('throwIfUnusedModuleInterfaceParserError', () => {
138132
const nativeModuleName = 'moduleName';
139133
const callExpressions = [{name: 'callExpression1'}];
140134
const spec = {name: 'Spec'};
141-
const parserType = 'TypeScript';
142135
expect(() => {
143136
throwIfUnusedModuleInterfaceParserError(
144137
nativeModuleName,
145138
spec,
146139
callExpressions,
147-
parserType,
148140
);
149141
}).not.toThrow(UnusedModuleInterfaceParserError);
150142
});
@@ -156,14 +148,12 @@ describe('throwErrorIfWrongNumberOfCallExpressionArgs', () => {
156148
const flowCallExpression: {argument: Array<$FlowFixMe>} = {argument: []};
157149
const methodName = 'methodName';
158150
const numberOfCallExpressionArgs = flowCallExpression.argument.length;
159-
const language = 'Flow';
160151
expect(() => {
161152
throwIfWrongNumberOfCallExpressionArgs(
162153
nativeModuleName,
163154
flowCallExpression,
164155
methodName,
165156
numberOfCallExpressionArgs,
166-
language,
167157
);
168158
}).toThrow(IncorrectModuleRegistryCallArityParserError);
169159
});
@@ -173,14 +163,12 @@ describe('throwErrorIfWrongNumberOfCallExpressionArgs', () => {
173163
const flowCallExpression = {argument: ['argument']};
174164
const methodName = 'methodName';
175165
const numberOfCallExpressionArgs = flowCallExpression.argument.length;
176-
const language = 'Flow';
177166
expect(() => {
178167
throwIfWrongNumberOfCallExpressionArgs(
179168
nativeModuleName,
180169
flowCallExpression,
181170
methodName,
182171
numberOfCallExpressionArgs,
183-
language,
184172
);
185173
}).not.toThrow(IncorrectModuleRegistryCallArityParserError);
186174
});
@@ -191,8 +179,7 @@ describe('throwIfUnsupportedFunctionReturnTypeAnnotationParserError', () => {
191179
returnType: '',
192180
},
193181
nativeModuleName = 'moduleName',
194-
invalidReturnType = 'FunctionTypeAnnotation',
195-
language = 'Flow';
182+
invalidReturnType = 'FunctionTypeAnnotation';
196183

197184
it('do not throw error if cxxOnly is true', () => {
198185
const cxxOnly = true,
@@ -203,7 +190,6 @@ describe('throwIfUnsupportedFunctionReturnTypeAnnotationParserError', () => {
203190
nativeModuleName,
204191
returnTypeAnnotation,
205192
invalidReturnType,
206-
language,
207193
cxxOnly,
208194
returnType,
209195
);
@@ -219,7 +205,6 @@ describe('throwIfUnsupportedFunctionReturnTypeAnnotationParserError', () => {
219205
nativeModuleName,
220206
returnTypeAnnotation,
221207
invalidReturnType,
222-
language,
223208
cxxOnly,
224209
returnType,
225210
);
@@ -235,7 +220,6 @@ describe('throwIfUnsupportedFunctionReturnTypeAnnotationParserError', () => {
235220
nativeModuleName,
236221
returnTypeAnnotation,
237222
invalidReturnType,
238-
language,
239223
cxxOnly,
240224
returnType,
241225
);
@@ -485,15 +469,13 @@ describe('throwIfUntypedModule', () => {
485469

486470
it('should throw error if module does not have a type', () => {
487471
const typeArguments = null;
488-
const language = 'Flow';
489472
expect(() =>
490473
throwIfUntypedModule(
491474
typeArguments,
492475
hasteModuleName,
493476
callExpressions,
494477
methodName,
495478
moduleName,
496-
language,
497479
),
498480
).toThrowError(UntypedModuleRegistryCallParserError);
499481
});
@@ -504,15 +486,13 @@ describe('throwIfUntypedModule', () => {
504486
params: [],
505487
};
506488

507-
const language = 'TypeScript';
508489
expect(() =>
509490
throwIfUntypedModule(
510491
typeArguments,
511492
hasteModuleName,
512493
callExpressions,
513494
methodName,
514495
moduleName,
515-
language,
516496
),
517497
).not.toThrowError(UntypedModuleRegistryCallParserError);
518498
});
@@ -644,7 +624,6 @@ describe('throwIfArrayElementTypeAnnotationIsUnsupported', () => {
644624
UnsupportedArrayElementTypeAnnotationParserError,
645625
} = require('../errors.js');
646626
const moduleName = 'moduleName';
647-
const language = 'Flow';
648627

649628
it('throws the error if it is the type is void type annotation', () => {
650629
expect(() => {
@@ -653,7 +632,6 @@ describe('throwIfArrayElementTypeAnnotationIsUnsupported', () => {
653632
undefined,
654633
'Array',
655634
'VoidTypeAnnotation',
656-
language,
657635
);
658636
}).toThrow(UnsupportedArrayElementTypeAnnotationParserError);
659637
});
@@ -665,7 +643,6 @@ describe('throwIfArrayElementTypeAnnotationIsUnsupported', () => {
665643
undefined,
666644
'Array',
667645
'PromiseTypeAnnotation',
668-
language,
669646
);
670647
}).toThrow(UnsupportedArrayElementTypeAnnotationParserError);
671648
});
@@ -677,7 +654,6 @@ describe('throwIfArrayElementTypeAnnotationIsUnsupported', () => {
677654
undefined,
678655
'Array',
679656
'FunctionTypeAnnotation',
680-
language,
681657
);
682658
}).toThrow(UnsupportedArrayElementTypeAnnotationParserError);
683659
});
@@ -689,7 +665,6 @@ describe('throwIfArrayElementTypeAnnotationIsUnsupported', () => {
689665
undefined,
690666
'Array',
691667
'StringTypeAnnotation',
692-
language,
693668
);
694669
}).not.toThrow(UnsupportedArrayElementTypeAnnotationParserError);
695670
});

packages/react-native-codegen/src/parsers/__tests__/parsers-primitives-test.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,6 @@ describe('emitUnion', () => {
672672
hasteModuleName,
673673
typeAnnotation,
674674
unionTypes,
675-
flowParser.language(),
676675
);
677676

678677
expect(() => {
@@ -687,7 +686,6 @@ describe('emitUnion', () => {
687686
hasteModuleName,
688687
typeAnnotation,
689688
unionTypes,
690-
flowParser.language(),
691689
);
692690

693691
expect(() => {
@@ -887,7 +885,6 @@ describe('emitUnion', () => {
887885
hasteModuleName,
888886
typeAnnotation,
889887
unionTypes,
890-
typeScriptParser.language(),
891888
);
892889

893890
expect(() => {
@@ -902,7 +899,6 @@ describe('emitUnion', () => {
902899
hasteModuleName,
903900
typeAnnotation,
904901
unionTypes,
905-
typeScriptParser.language(),
906902
);
907903

908904
expect(() => {

packages/react-native-codegen/src/parsers/error-utils.js

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,12 @@ function throwIfMoreThanOneModuleRegistryCalls(
6363
hasteModuleName: string,
6464
callExpressions: $FlowFixMe,
6565
callExpressionsLength: number,
66-
language: ParserType,
6766
) {
6867
if (callExpressions.length > 1) {
6968
throw new MoreThanOneModuleRegistryCallsParserError(
7069
hasteModuleName,
7170
callExpressions,
7271
callExpressionsLength,
73-
language,
7472
);
7573
}
7674
}
@@ -79,14 +77,9 @@ function throwIfUnusedModuleInterfaceParserError(
7977
nativeModuleName: string,
8078
moduleSpec: $FlowFixMe,
8179
callExpressions: $FlowFixMe,
82-
language: ParserType,
8380
) {
8481
if (callExpressions.length === 0) {
85-
throw new UnusedModuleInterfaceParserError(
86-
nativeModuleName,
87-
moduleSpec,
88-
language,
89-
);
82+
throw new UnusedModuleInterfaceParserError(nativeModuleName, moduleSpec);
9083
}
9184
}
9285

@@ -95,15 +88,13 @@ function throwIfWrongNumberOfCallExpressionArgs(
9588
flowCallExpression: $FlowFixMe,
9689
methodName: string,
9790
numberOfCallExpressionArgs: number,
98-
language: ParserType,
9991
) {
10092
if (numberOfCallExpressionArgs !== 1) {
10193
throw new IncorrectModuleRegistryCallArityParserError(
10294
nativeModuleName,
10395
flowCallExpression,
10496
methodName,
10597
numberOfCallExpressionArgs,
106-
language,
10798
);
10899
}
109100
}
@@ -121,7 +112,6 @@ function throwIfIncorrectModuleRegistryCallTypeParameterParserError(
121112
typeArguments,
122113
methodName,
123114
moduleName,
124-
parser.language(),
125115
);
126116
}
127117

@@ -134,7 +124,6 @@ function throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
134124
nativeModuleName: string,
135125
returnTypeAnnotation: $FlowFixMe,
136126
invalidReturnType: string,
137-
language: ParserType,
138127
cxxOnly: boolean,
139128
returnType: string,
140129
) {
@@ -143,7 +132,6 @@ function throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
143132
nativeModuleName,
144133
returnTypeAnnotation.returnType,
145134
'FunctionTypeAnnotation',
146-
language,
147135
);
148136
}
149137
}
@@ -154,15 +142,13 @@ function throwIfUntypedModule(
154142
callExpression: $FlowFixMe,
155143
methodName: string,
156144
moduleName: string,
157-
language: ParserType,
158145
) {
159146
if (typeArguments == null) {
160147
throw new UntypedModuleRegistryCallParserError(
161148
hasteModuleName,
162149
callExpression,
163150
methodName,
164151
moduleName,
165-
language,
166152
);
167153
}
168154
}
@@ -208,7 +194,6 @@ function throwIfPropertyValueTypeIsUnsupported(
208194
propertyValue: $FlowFixMe,
209195
propertyKey: string,
210196
type: string,
211-
language: ParserType,
212197
) {
213198
const invalidPropertyValueType =
214199
UnsupportedObjectPropertyTypeToInvalidPropertyValueTypeMap[type];
@@ -218,7 +203,6 @@ function throwIfPropertyValueTypeIsUnsupported(
218203
propertyValue,
219204
propertyKey,
220205
invalidPropertyValueType,
221-
language,
222206
);
223207
}
224208

@@ -256,7 +240,6 @@ function throwIfArrayElementTypeAnnotationIsUnsupported(
256240
flowElementType: $FlowFixMe,
257241
flowArrayType: 'Array' | '$ReadOnlyArray' | 'ReadonlyArray',
258242
type: string,
259-
language: ParserType,
260243
) {
261244
const TypeMap = {
262245
FunctionTypeAnnotation: 'FunctionTypeAnnotation',
@@ -273,7 +256,6 @@ function throwIfArrayElementTypeAnnotationIsUnsupported(
273256
flowElementType,
274257
flowArrayType,
275258
TypeMap[type],
276-
language,
277259
);
278260
}
279261
}

0 commit comments

Comments
 (0)