Skip to content

Commit adeb532

Browse files
committed
Accept new baselines
1 parent 0a207cc commit adeb532

4 files changed

+24
-144
lines changed

tests/baselines/reference/propTypeValidatorInference.errors.txt

Lines changed: 0 additions & 118 deletions
This file was deleted.

tests/baselines/reference/propTypeValidatorInference.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface Validator<T> {
1414
[nominalTypeHack]?: T;
1515
}
1616

17-
export interface Requireable<T> extends Validator<T | undefined | null> {
17+
export interface Requireable<T> extends Validator<T> {
1818
isRequired: Validator<NonNullable<T>>;
1919
}
2020

tests/baselines/reference/propTypeValidatorInference.symbols

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ export interface Validator<T> {
5959
>T : Symbol(T, Decl(index.d.ts, 8, 27))
6060
}
6161

62-
export interface Requireable<T> extends Validator<T | undefined | null> {
62+
export interface Requireable<T> extends Validator<T> {
6363
>Requireable : Symbol(Requireable, Decl(index.d.ts, 11, 1))
6464
>T : Symbol(T, Decl(index.d.ts, 13, 29))
6565
>Validator : Symbol(Validator, Decl(index.d.ts, 6, 72))
6666
>T : Symbol(T, Decl(index.d.ts, 13, 29))
6767

6868
isRequired: Validator<NonNullable<T>>;
69-
>isRequired : Symbol(Requireable.isRequired, Decl(index.d.ts, 13, 73))
69+
>isRequired : Symbol(Requireable.isRequired, Decl(index.d.ts, 13, 54))
7070
>Validator : Symbol(Validator, Decl(index.d.ts, 6, 72))
7171
>NonNullable : Symbol(NonNullable, Decl(lib.es5.d.ts, --, --))
7272
>T : Symbol(T, Decl(index.d.ts, 13, 29))
@@ -202,11 +202,11 @@ const innerProps = {
202202

203203
foo: PropTypes.string.isRequired,
204204
>foo : Symbol(foo, Decl(file.ts, 18, 20))
205-
>PropTypes.string.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
205+
>PropTypes.string.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
206206
>PropTypes.string : Symbol(PropTypes.string, Decl(index.d.ts, 27, 12))
207207
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
208208
>string : Symbol(PropTypes.string, Decl(index.d.ts, 27, 12))
209-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
209+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
210210

211211
bar: PropTypes.bool,
212212
>bar : Symbol(bar, Decl(file.ts, 19, 37))
@@ -242,11 +242,11 @@ const arrayOfTypes = [PropTypes.string, PropTypes.bool, PropTypes.shape({
242242

243243
bar: PropTypes.number.isRequired
244244
>bar : Symbol(bar, Decl(file.ts, 25, 26))
245-
>PropTypes.number.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
245+
>PropTypes.number.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
246246
>PropTypes.number : Symbol(PropTypes.number, Decl(index.d.ts, 28, 12))
247247
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
248248
>number : Symbol(PropTypes.number, Decl(index.d.ts, 28, 12))
249-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
249+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
250250

251251
})];
252252

@@ -263,37 +263,37 @@ const propTypes: PropTypesMap = {
263263

264264
array: PropTypes.array.isRequired,
265265
>array : Symbol(array, Decl(file.ts, 31, 23))
266-
>PropTypes.array.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
266+
>PropTypes.array.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
267267
>PropTypes.array : Symbol(PropTypes.array, Decl(index.d.ts, 25, 12))
268268
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
269269
>array : Symbol(PropTypes.array, Decl(index.d.ts, 25, 12))
270-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
270+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
271271

272272
bool: PropTypes.bool.isRequired,
273273
>bool : Symbol(bool, Decl(file.ts, 32, 38))
274-
>PropTypes.bool.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
274+
>PropTypes.bool.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
275275
>PropTypes.bool : Symbol(PropTypes.bool, Decl(index.d.ts, 26, 12))
276276
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
277277
>bool : Symbol(PropTypes.bool, Decl(index.d.ts, 26, 12))
278-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
278+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
279279

280280
shape: PropTypes.shape(innerProps).isRequired,
281281
>shape : Symbol(shape, Decl(file.ts, 33, 36))
282-
>PropTypes.shape(innerProps).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
282+
>PropTypes.shape(innerProps).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
283283
>PropTypes.shape : Symbol(PropTypes.shape, Decl(index.d.ts, 28, 41))
284284
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
285285
>shape : Symbol(PropTypes.shape, Decl(index.d.ts, 28, 41))
286286
>innerProps : Symbol(innerProps, Decl(file.ts, 18, 5))
287-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
287+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
288288

289289
oneOfType: PropTypes.oneOfType(arrayOfTypes).isRequired,
290290
>oneOfType : Symbol(oneOfType, Decl(file.ts, 34, 50))
291-
>PropTypes.oneOfType(arrayOfTypes).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
291+
>PropTypes.oneOfType(arrayOfTypes).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
292292
>PropTypes.oneOfType : Symbol(PropTypes.oneOfType, Decl(index.d.ts, 29, 89))
293293
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
294294
>oneOfType : Symbol(PropTypes.oneOfType, Decl(index.d.ts, 29, 89))
295295
>arrayOfTypes : Symbol(arrayOfTypes, Decl(file.ts, 24, 5))
296-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
296+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
297297

298298
};
299299

@@ -309,37 +309,37 @@ const propTypesWithoutAnnotation = {
309309

310310
array: PropTypes.array.isRequired,
311311
>array : Symbol(array, Decl(file.ts, 40, 23))
312-
>PropTypes.array.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
312+
>PropTypes.array.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
313313
>PropTypes.array : Symbol(PropTypes.array, Decl(index.d.ts, 25, 12))
314314
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
315315
>array : Symbol(PropTypes.array, Decl(index.d.ts, 25, 12))
316-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
316+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
317317

318318
bool: PropTypes.bool.isRequired,
319319
>bool : Symbol(bool, Decl(file.ts, 41, 38))
320-
>PropTypes.bool.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
320+
>PropTypes.bool.isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
321321
>PropTypes.bool : Symbol(PropTypes.bool, Decl(index.d.ts, 26, 12))
322322
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
323323
>bool : Symbol(PropTypes.bool, Decl(index.d.ts, 26, 12))
324-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
324+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
325325

326326
shape: PropTypes.shape(innerProps).isRequired,
327327
>shape : Symbol(shape, Decl(file.ts, 42, 36))
328-
>PropTypes.shape(innerProps).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
328+
>PropTypes.shape(innerProps).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
329329
>PropTypes.shape : Symbol(PropTypes.shape, Decl(index.d.ts, 28, 41))
330330
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
331331
>shape : Symbol(PropTypes.shape, Decl(index.d.ts, 28, 41))
332332
>innerProps : Symbol(innerProps, Decl(file.ts, 18, 5))
333-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
333+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
334334

335335
oneOfType: PropTypes.oneOfType(arrayOfTypes).isRequired,
336336
>oneOfType : Symbol(oneOfType, Decl(file.ts, 43, 50))
337-
>PropTypes.oneOfType(arrayOfTypes).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
337+
>PropTypes.oneOfType(arrayOfTypes).isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
338338
>PropTypes.oneOfType : Symbol(PropTypes.oneOfType, Decl(index.d.ts, 29, 89))
339339
>PropTypes : Symbol(PropTypes, Decl(file.ts, 0, 6))
340340
>oneOfType : Symbol(PropTypes.oneOfType, Decl(index.d.ts, 29, 89))
341341
>arrayOfTypes : Symbol(arrayOfTypes, Decl(file.ts, 24, 5))
342-
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 73))
342+
>isRequired : Symbol(PropTypes.Requireable.isRequired, Decl(index.d.ts, 13, 54))
343343

344344
};
345345

tests/baselines/reference/propTypeValidatorInference.types

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ export interface Validator<T> {
3535
>nominalTypeHack : unique symbol
3636
}
3737

38-
export interface Requireable<T> extends Validator<T | undefined | null> {
39-
>null : null
40-
38+
export interface Requireable<T> extends Validator<T> {
4139
isRequired: Validator<NonNullable<T>>;
4240
>isRequired : Validator<NonNullable<T>>
4341
}

0 commit comments

Comments
 (0)