From 5d9f45f0927cf6e7169cccd093d5d2924194780d Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 17 Apr 2022 15:34:38 +0900 Subject: [PATCH 01/11] feat(ast-spec): add `in` and `out` to `TSTypeParameter` --- packages/ast-spec/src/special/TSTypeParameter/spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/ast-spec/src/special/TSTypeParameter/spec.ts b/packages/ast-spec/src/special/TSTypeParameter/spec.ts index 61d75a6a29e..ab62751ea55 100644 --- a/packages/ast-spec/src/special/TSTypeParameter/spec.ts +++ b/packages/ast-spec/src/special/TSTypeParameter/spec.ts @@ -8,4 +8,6 @@ export interface TSTypeParameter extends BaseNode { name: Identifier; constraint?: TypeNode; default?: TypeNode; + in?: boolean; + out?: boolean; } From 0a74ba8c4058f4c0891bac4b3051ff5d0ae09313 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 17 Apr 2022 18:54:30 +0900 Subject: [PATCH 02/11] feat(typescript-estree): add `in` and `out` to `TSTypeParameter` --- packages/typescript-estree/src/convert.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts index f619a78d5bd..07f25fda776 100644 --- a/packages/typescript-estree/src/convert.ts +++ b/packages/typescript-estree/src/convert.ts @@ -671,6 +671,26 @@ export class Converter { : node.elements.map(element => this.convertChild(element)); } + private convertTypeParamVariances( + modifiers?: ts.ModifiersArray, + ): Pick { + const result: Pick = { + in: undefined, + out: undefined, + }; + if (!modifiers) { + return result; + } + for (const modifier of modifiers) { + if (modifier.kind === SyntaxKind.InKeyword) { + result.in = true; + } else if (modifier.kind === SyntaxKind.OutKeyword) { + result.out = true; + } + } + return result; + } + /** * Applies the given TS modifiers to the given result object. * @param result @@ -2342,6 +2362,7 @@ export class Converter { ? this.convertType(node.constraint) : undefined, default: node.default ? this.convertType(node.default) : undefined, + ...this.convertTypeParamVariances(node.modifiers), }); } From 0eb5560e2f5ea8bded397eb493b750797b6a5630 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 17 Apr 2022 19:09:28 +0900 Subject: [PATCH 03/11] test(typescript-estree): add tests for optional variance syntax --- .../typescript/types/optional-variance-in-and-out.src.ts | 1 + .../typescript/types/optional-variance-in-out.src.ts | 1 + .../fixtures/typescript/types/optional-variance-in.src.ts | 1 + .../typescript/types/optional-variance-out.src.ts | 1 + .../tests/ast-alignment/fixtures-to-test.ts | 8 ++++++++ 5 files changed, 12 insertions(+) create mode 100644 packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-and-out.src.ts create mode 100644 packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-out.src.ts create mode 100644 packages/shared-fixtures/fixtures/typescript/types/optional-variance-in.src.ts create mode 100644 packages/shared-fixtures/fixtures/typescript/types/optional-variance-out.src.ts diff --git a/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-and-out.src.ts b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-and-out.src.ts new file mode 100644 index 00000000000..ee58a11cfc3 --- /dev/null +++ b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-and-out.src.ts @@ -0,0 +1 @@ +type Mapper = (x: T) => U; diff --git a/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-out.src.ts b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-out.src.ts new file mode 100644 index 00000000000..1dd6ace1261 --- /dev/null +++ b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in-out.src.ts @@ -0,0 +1 @@ +type Processor = (x: T) => T; diff --git a/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in.src.ts b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in.src.ts new file mode 100644 index 00000000000..3cb911e9c26 --- /dev/null +++ b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-in.src.ts @@ -0,0 +1 @@ +type Consumer = (x: T) => void; diff --git a/packages/shared-fixtures/fixtures/typescript/types/optional-variance-out.src.ts b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-out.src.ts new file mode 100644 index 00000000000..dd9dd201249 --- /dev/null +++ b/packages/shared-fixtures/fixtures/typescript/types/optional-variance-out.src.ts @@ -0,0 +1 @@ +type Provider = () => T; diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts index 5f44161557c..ca9e0e688a5 100644 --- a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts +++ b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts @@ -484,6 +484,14 @@ tester.addFixturePatternConfig('typescript/types', { 'template-literal-type-2', 'template-literal-type-3', 'template-literal-type-4', + /** + * [BABEL ERRORED, BUT TS-ESTREE DID NOT] + * Babel doesn't support TS 4.7 new features yet. + */ + 'optional-variance-in', + 'optional-variance-out', + 'optional-variance-in-out', + 'optional-variance-in-and-out', ], }); From 435f61000e3aceb2bb5c54f8cc6dd378b5a70d4d Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 17 Apr 2022 19:09:49 +0900 Subject: [PATCH 04/11] test(typescript-estree): update snapshots --- .../lib/__snapshots__/convert.test.ts.snap | 2 + .../semantic-diagnostics-enabled.test.ts.snap | 8 + .../type-parameter-whitespace-loc.src.ts.shot | 2 + .../type-parameters.src.ts.shot | 2 + ...-function-with-type-parameters.src.ts.shot | 2 + .../call-signatures-with-generics.src.ts.shot | 4 + ...onstructor-and-type-parameters.src.ts.shot | 4 + ...-with-extends-generic-multiple.src.ts.shot | 2 + .../class-with-extends-generic.src.ts.shot | 2 + ...ss-with-generic-method-default.src.ts.shot | 2 + .../class-with-generic-method.src.ts.shot | 2 + .../basics/class-with-method.src.ts.shot | 2 + .../class-with-mixin-reference.src.ts.shot | 2 + .../basics/class-with-mixin.src.ts.shot | 4 + ...o-methods-computed-constructor.src.ts.shot | 4 + ...ss-with-type-parameter-default.src.ts.shot | 2 + ...with-type-parameter-underscore.src.ts.shot | 2 + .../class-with-type-parameter.src.ts.shot | 2 + ...ort-default-class-with-generic.src.ts.shot | 2 + ...t-class-with-multiple-generics.src.ts.shot | 4 + ...xport-named-class-with-generic.src.ts.shot | 2 + ...d-class-with-multiple-generics.src.ts.shot | 4 + ...-anonymus-with-type-parameters.src.ts.shot | 2 + ...-parameters-that-have-comments.src.ts.shot | 2 + ...ype-parameters-with-constraint.src.ts.shot | 2 + .../function-with-type-parameters.src.ts.shot | 2 + .../interface-type-parameters.src.ts.shot | 2 + ...erface-with-all-property-types.src.ts.shot | 4 + ...e-with-extends-type-parameters.src.ts.shot | 2 + .../basics/interface-with-generic.src.ts.shot | 2 + .../basics/interface-with-method.src.ts.shot | 2 + .../basics/intrinsic-keyword.src.ts.shot | 8 + .../object-with-typed-methods.src.ts.shot | 4 + ...ith-constrained-type-parameter.src.ts.shot | 2 + .../basics/type-alias-declaration.src.ts.shot | 2 + ...e-parameters-comments-heritage.src.ts.shot | 8 + .../type-parameters-comments.src.ts.shot | 4 + .../basics/typed-method-signature.src.ts.shot | 2 + .../conditional-infer-nested.src.ts.shot | 8 + .../conditional-infer-simple.src.ts.shot | 6 + .../types/conditional-infer.src.ts.shot | 4 + .../types/constructor-generic.src.ts.shot | 2 + .../types/function-generic.src.ts.shot | 2 + .../types/intersection-type.src.ts.shot | 2 + .../types/mapped-named-type.src.ts.shot | 4 + .../types/mapped-readonly-minus.src.ts.shot | 2 + .../types/mapped-readonly-plus.src.ts.shot | 2 + .../types/mapped-readonly.src.ts.shot | 2 + .../types/mapped-untypped.src.ts.shot | 2 + .../typescript/types/mapped.src.ts.shot | 2 + .../optional-variance-in-and-out.src.ts.shot | 626 ++++++++++++++++++ .../optional-variance-in-out.src.ts.shot | 551 +++++++++++++++ .../types/optional-variance-in.src.ts.shot | 514 ++++++++++++++ .../types/optional-variance-out.src.ts.shot | 407 ++++++++++++ .../types/template-literal-type-4.src.ts.shot | 2 + 55 files changed, 2250 insertions(+) create mode 100644 packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot create mode 100644 packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-out.src.ts.shot create mode 100644 packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot create mode 100644 packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot diff --git a/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap index 0ea5f89cdcd..2e49891dd14 100644 --- a/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap +++ b/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap @@ -475,6 +475,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 11, @@ -503,6 +504,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap index 03f030ad731..0a870b70441 100644 --- a/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap +++ b/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.test.ts.snap @@ -2730,6 +2730,14 @@ exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" e exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/object-literal-type-with-accessors.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; +exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/optional-variance-in.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; + +exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/optional-variance-in-and-out.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; + +exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/optional-variance-in-out.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; + +exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/optional-variance-out.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; + exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/parenthesized-type.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/types/reference.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`; diff --git a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot index 84a0faaccca..dc6ca7e1234 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot @@ -74,6 +74,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 14, @@ -102,6 +103,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 13, 14, diff --git a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot index 245b52dc08a..994e697662a 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot @@ -106,6 +106,7 @@ Object { ], "type": "TSObjectKeyword", }, + "in": undefined, "loc": Object { "end": Object { "column": 36, @@ -134,6 +135,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 11, 36, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot index 126d82a3115..5bba4bae24c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot @@ -219,6 +219,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 2, @@ -247,6 +248,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 1, 2, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot index 84bc3e241e6..c38ec847ea5 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot @@ -168,6 +168,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 4, @@ -196,6 +197,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 16, 17, @@ -329,6 +331,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 7, @@ -357,6 +360,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 44, 45, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot index 56353693fd6..d950727bee7 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot @@ -98,6 +98,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 15, @@ -126,6 +127,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 24, 25, @@ -234,6 +236,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 19, @@ -262,6 +265,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 52, 53, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot index bc3a09258d0..0a921e487de 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot @@ -214,6 +214,7 @@ Object { "typeParameters": undefined, }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 21, @@ -242,6 +243,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 10, 21, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot index fac39361497..b83ffe8c56f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot @@ -143,6 +143,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 11, @@ -171,6 +172,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot index 517d5dd3e62..71bc3c5cc2c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot @@ -133,6 +133,7 @@ Object { }, "typeParameters": undefined, }, + "in": undefined, "loc": Object { "end": Object { "column": 16, @@ -161,6 +162,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 21, 28, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot index 504612e7858..8f8586b9ec0 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot @@ -98,6 +98,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 10, @@ -126,6 +127,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 21, 22, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot index 84f1c8825bc..a5a68597b19 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot @@ -211,6 +211,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 7, @@ -239,6 +240,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 36, 37, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot index e9b4d70e837..9b18d787286 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot @@ -235,6 +235,7 @@ Object { }, }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 35, @@ -263,6 +264,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 11, 35, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot index 7ea53067001..5565b47545c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot @@ -289,6 +289,7 @@ Object { }, }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 36, @@ -317,6 +318,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 11, 36, @@ -828,6 +830,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 18, @@ -856,6 +859,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 175, 176, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot index abf1f5816b2..0dec61e1da2 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot @@ -133,6 +133,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 17, @@ -161,6 +162,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 26, 27, @@ -303,6 +305,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 19, @@ -331,6 +334,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 64, 65, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot index 7f1f690528f..efee1d0a9e3 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot @@ -106,6 +106,7 @@ Object { }, "typeParameters": undefined, }, + "in": undefined, "loc": Object { "end": Object { "column": 17, @@ -134,6 +135,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 10, 17, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot index d069b3552b3..80627e04864 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot @@ -71,6 +71,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 11, @@ -99,6 +100,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 8, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot index 3e52dcb8d33..f1ebe39ce0f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot @@ -71,6 +71,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 11, @@ -99,6 +100,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot index b2054c9f8be..e0633373502 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot @@ -55,6 +55,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 22, @@ -83,6 +84,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 21, 22, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot index ad9d453a491..a951ffdc0dd 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot @@ -55,6 +55,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 22, @@ -83,6 +84,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 21, 22, @@ -92,6 +94,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 25, @@ -120,6 +123,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 24, 25, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot index 4a648475383..e5688547eba 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot @@ -73,6 +73,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 18, @@ -101,6 +102,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 17, 18, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot index 988daf8a174..e34f544ce7e 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot @@ -73,6 +73,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 18, @@ -101,6 +102,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 17, 18, @@ -110,6 +112,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 21, @@ -138,6 +141,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 20, 21, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot index 018d4d72552..f8de0db1e9f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot @@ -167,6 +167,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 21, @@ -195,6 +196,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 20, 21, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot index b626f8aa803..75253f966f9 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot @@ -74,6 +74,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 29, @@ -102,6 +103,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 28, 29, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot index a3ae99a1377..b1f923ef3c7 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot @@ -252,6 +252,7 @@ Object { "type": "TSTypeLiteral", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 23, @@ -280,6 +281,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 11, 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot index d65c9203b65..b329b415b79 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot @@ -235,6 +235,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 12, @@ -263,6 +264,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 11, 12, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot index 382d69ac3d4..7d315795fc4 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot @@ -70,6 +70,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 15, @@ -98,6 +99,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 14, 15, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot index dece748c4b2..aad32e7f8a4 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot @@ -880,6 +880,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 9, @@ -908,6 +909,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 194, 195, @@ -1116,6 +1118,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 10, @@ -1144,6 +1147,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 247, 248, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot index 4cb2e5a2a08..252a1b63455 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot @@ -162,6 +162,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 15, @@ -190,6 +191,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 14, 15, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot index 1ee99f876aa..f108ef8b06b 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot @@ -70,6 +70,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 16, @@ -98,6 +99,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 15, 16, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot index f94e3498298..a807fcb32c3 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot @@ -308,6 +308,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 5, @@ -336,6 +337,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 45, 46, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot index 22d41df5f1a..2d6e7801b73 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot @@ -85,6 +85,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 31, @@ -113,6 +114,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 15, 31, @@ -209,6 +211,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 31, @@ -237,6 +240,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 61, 77, @@ -333,6 +337,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 32, @@ -361,6 +366,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 108, 124, @@ -457,6 +463,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 34, @@ -485,6 +492,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 157, 173, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot index 33dc823fd72..10199d3091e 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot @@ -200,6 +200,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 17, @@ -228,6 +229,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 30, 31, @@ -406,6 +408,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 7, @@ -434,6 +437,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 69, 70, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot index 709a4cc36a6..ca2acdf23fe 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot @@ -214,6 +214,7 @@ Object { "type": "TSTypeLiteral", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 24, @@ -242,6 +243,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 12, 24, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot index b97bf6d4afd..8898fc5821c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot @@ -197,6 +197,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 13, @@ -225,6 +226,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 12, 13, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot index d244e9e147f..37ee387eefd 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot @@ -143,6 +143,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 23, @@ -171,6 +172,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 22, 23, @@ -360,6 +362,7 @@ Object { ], "type": "TSLiteralType", }, + "in": undefined, "loc": Object { "end": Object { "column": 38, @@ -388,6 +391,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 98, 113, @@ -561,6 +565,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 27, @@ -589,6 +594,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 191, 192, @@ -797,6 +803,7 @@ Object { ], "type": "TSLiteralType", }, + "in": undefined, "loc": Object { "end": Object { "column": 42, @@ -825,6 +832,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 272, 287, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot index e4dc865f2b6..161fee1f76a 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot @@ -183,6 +183,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 25, @@ -211,6 +212,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 68, 69, @@ -331,6 +333,7 @@ Object { }, "typeParameters": undefined, }, + "in": undefined, "loc": Object { "end": Object { "column": 41, @@ -359,6 +362,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 112, 129, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot index a175d632669..11e74a7bb26 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot @@ -351,6 +351,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 5, @@ -379,6 +380,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 41, 42, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot index 50f8f0f7ff8..af335c7ea2c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot @@ -94,6 +94,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 20, @@ -122,6 +123,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 38, 39, @@ -201,6 +203,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 21, @@ -229,6 +232,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 69, 70, @@ -338,6 +342,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 31, @@ -366,6 +371,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 107, 108, @@ -588,6 +594,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 15, @@ -616,6 +623,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 14, 15, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot index c172c25e40a..8b13cd578b9 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot @@ -161,6 +161,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 36, @@ -189,6 +190,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 35, 36, @@ -273,6 +275,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 48, @@ -301,6 +304,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 47, 48, @@ -401,6 +405,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 10, @@ -429,6 +434,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 9, 10, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot index d55b6ac728e..d3e4a4e9464 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot @@ -94,6 +94,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 36, @@ -122,6 +123,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 35, 36, @@ -248,6 +250,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 14, @@ -276,6 +279,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 13, 14, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot index d0434a7edb7..4a28bfbaf9d 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot @@ -197,6 +197,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 13, @@ -225,6 +226,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 12, 13, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot index 20329d59abb..83075915e1b 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot @@ -196,6 +196,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 9, @@ -224,6 +225,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 8, 9, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot index de61acf25c4..907a0c38e27 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot @@ -274,6 +274,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 17, @@ -302,6 +303,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 16, 17, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot index 4adec74e80a..ae8a3d6ce0a 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot @@ -234,6 +234,7 @@ Object { }, }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 15, @@ -262,6 +263,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 20, 32, @@ -284,6 +286,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 11, @@ -312,6 +315,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot index 5bc1ed74e22..9ba1c8e6249 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot @@ -94,6 +94,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 33, @@ -122,6 +123,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 22, 33, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot index 0529961e665..9937dae14c2 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot @@ -94,6 +94,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 33, @@ -122,6 +123,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 22, 33, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot index b18350797d0..b1ea2d6f362 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot @@ -94,6 +94,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 32, @@ -122,6 +123,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 21, 32, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot index d254c7d5933..f0453f8a169 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot @@ -75,6 +75,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 23, @@ -103,6 +104,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 12, 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot index 75f22d34e02..f05ee2777bf 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot @@ -92,6 +92,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 23, @@ -120,6 +121,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 12, 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot new file mode 100644 index 00000000000..56732c94489 --- /dev/null +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot @@ -0,0 +1,626 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`typescript types optional-variance-in-and-out.src 1`] = ` +Object { + "body": Array [ + Object { + "id": Object { + "loc": Object { + "end": Object { + "column": 11, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "name": "Mapper", + "range": Array [ + 5, + 11, + ], + "type": "Identifier", + }, + "loc": Object { + "end": Object { + "column": 39, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 39, + ], + "type": "TSTypeAliasDeclaration", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 27, + "line": 1, + }, + }, + "params": Array [ + Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 28, + "line": 1, + }, + }, + "name": "x", + "range": Array [ + 28, + 32, + ], + "type": "Identifier", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 32, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 31, + "line": 1, + }, + }, + "range": Array [ + 31, + 32, + ], + "type": "TSTypeReference", + "typeName": Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 31, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 31, + 32, + ], + "type": "Identifier", + }, + "typeParameters": undefined, + }, + }, + }, + ], + "range": Array [ + 27, + 38, + ], + "returnType": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 34, + "line": 1, + }, + }, + "range": Array [ + 34, + 38, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 37, + "line": 1, + }, + }, + "range": Array [ + 37, + 38, + ], + "type": "TSTypeReference", + "typeName": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 37, + "line": 1, + }, + }, + "name": "U", + "range": Array [ + 37, + 38, + ], + "type": "Identifier", + }, + "typeParameters": undefined, + }, + }, + "type": "TSFunctionType", + }, + "typeParameters": Object { + "loc": Object { + "end": Object { + "column": 24, + "line": 1, + }, + "start": Object { + "column": 11, + "line": 1, + }, + }, + "params": Array [ + Object { + "constraint": undefined, + "default": undefined, + "in": true, + "loc": Object { + "end": Object { + "column": 16, + "line": 1, + }, + "start": Object { + "column": 12, + "line": 1, + }, + }, + "name": Object { + "loc": Object { + "end": Object { + "column": 16, + "line": 1, + }, + "start": Object { + "column": 15, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 15, + 16, + ], + "type": "Identifier", + }, + "out": undefined, + "range": Array [ + 12, + 16, + ], + "type": "TSTypeParameter", + }, + Object { + "constraint": undefined, + "default": undefined, + "in": undefined, + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 18, + "line": 1, + }, + }, + "name": Object { + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 22, + "line": 1, + }, + }, + "name": "U", + "range": Array [ + 22, + 23, + ], + "type": "Identifier", + }, + "out": true, + "range": Array [ + 18, + 23, + ], + "type": "TSTypeParameter", + }, + ], + "range": Array [ + 11, + 24, + ], + "type": "TSTypeParameterDeclaration", + }, + }, + ], + "comments": Array [], + "loc": Object { + "end": Object { + "column": 0, + "line": 2, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 40, + ], + "sourceType": "script", + "tokens": Array [ + Object { + "loc": Object { + "end": Object { + "column": 4, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 4, + ], + "type": "Identifier", + "value": "type", + }, + Object { + "loc": Object { + "end": Object { + "column": 11, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "range": Array [ + 5, + 11, + ], + "type": "Identifier", + "value": "Mapper", + }, + Object { + "loc": Object { + "end": Object { + "column": 12, + "line": 1, + }, + "start": Object { + "column": 11, + "line": 1, + }, + }, + "range": Array [ + 11, + 12, + ], + "type": "Punctuator", + "value": "<", + }, + Object { + "loc": Object { + "end": Object { + "column": 14, + "line": 1, + }, + "start": Object { + "column": 12, + "line": 1, + }, + }, + "range": Array [ + 12, + 14, + ], + "type": "Keyword", + "value": "in", + }, + Object { + "loc": Object { + "end": Object { + "column": 16, + "line": 1, + }, + "start": Object { + "column": 15, + "line": 1, + }, + }, + "range": Array [ + 15, + 16, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 17, + "line": 1, + }, + "start": Object { + "column": 16, + "line": 1, + }, + }, + "range": Array [ + 16, + 17, + ], + "type": "Punctuator", + "value": ",", + }, + Object { + "loc": Object { + "end": Object { + "column": 21, + "line": 1, + }, + "start": Object { + "column": 18, + "line": 1, + }, + }, + "range": Array [ + 18, + 21, + ], + "type": "Identifier", + "value": "out", + }, + Object { + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 22, + "line": 1, + }, + }, + "range": Array [ + 22, + 23, + ], + "type": "Identifier", + "value": "U", + }, + Object { + "loc": Object { + "end": Object { + "column": 24, + "line": 1, + }, + "start": Object { + "column": 23, + "line": 1, + }, + }, + "range": Array [ + 23, + 24, + ], + "type": "Punctuator", + "value": ">", + }, + Object { + "loc": Object { + "end": Object { + "column": 26, + "line": 1, + }, + "start": Object { + "column": 25, + "line": 1, + }, + }, + "range": Array [ + 25, + 26, + ], + "type": "Punctuator", + "value": "=", + }, + Object { + "loc": Object { + "end": Object { + "column": 28, + "line": 1, + }, + "start": Object { + "column": 27, + "line": 1, + }, + }, + "range": Array [ + 27, + 28, + ], + "type": "Punctuator", + "value": "(", + }, + Object { + "loc": Object { + "end": Object { + "column": 29, + "line": 1, + }, + "start": Object { + "column": 28, + "line": 1, + }, + }, + "range": Array [ + 28, + 29, + ], + "type": "Identifier", + "value": "x", + }, + Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 30, + ], + "type": "Punctuator", + "value": ":", + }, + Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 31, + "line": 1, + }, + }, + "range": Array [ + 31, + 32, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 33, + "line": 1, + }, + "start": Object { + "column": 32, + "line": 1, + }, + }, + "range": Array [ + 32, + 33, + ], + "type": "Punctuator", + "value": ")", + }, + Object { + "loc": Object { + "end": Object { + "column": 36, + "line": 1, + }, + "start": Object { + "column": 34, + "line": 1, + }, + }, + "range": Array [ + 34, + 36, + ], + "type": "Punctuator", + "value": "=>", + }, + Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 37, + "line": 1, + }, + }, + "range": Array [ + 37, + 38, + ], + "type": "Identifier", + "value": "U", + }, + Object { + "loc": Object { + "end": Object { + "column": 39, + "line": 1, + }, + "start": Object { + "column": 38, + "line": 1, + }, + }, + "range": Array [ + 38, + 39, + ], + "type": "Punctuator", + "value": ";", + }, + ], + "type": "Program", +} +`; diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-out.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-out.src.ts.shot new file mode 100644 index 00000000000..9639322188c --- /dev/null +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-out.src.ts.shot @@ -0,0 +1,551 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`typescript types optional-variance-in-out.src 1`] = ` +Object { + "body": Array [ + Object { + "id": Object { + "loc": Object { + "end": Object { + "column": 14, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "name": "Processor", + "range": Array [ + 5, + 14, + ], + "type": "Identifier", + }, + "loc": Object { + "end": Object { + "column": 39, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 39, + ], + "type": "TSTypeAliasDeclaration", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 27, + "line": 1, + }, + }, + "params": Array [ + Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 28, + "line": 1, + }, + }, + "name": "x", + "range": Array [ + 28, + 32, + ], + "type": "Identifier", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 32, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 31, + "line": 1, + }, + }, + "range": Array [ + 31, + 32, + ], + "type": "TSTypeReference", + "typeName": Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 31, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 31, + 32, + ], + "type": "Identifier", + }, + "typeParameters": undefined, + }, + }, + }, + ], + "range": Array [ + 27, + 38, + ], + "returnType": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 34, + "line": 1, + }, + }, + "range": Array [ + 34, + 38, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 37, + "line": 1, + }, + }, + "range": Array [ + 37, + 38, + ], + "type": "TSTypeReference", + "typeName": Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 37, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 37, + 38, + ], + "type": "Identifier", + }, + "typeParameters": undefined, + }, + }, + "type": "TSFunctionType", + }, + "typeParameters": Object { + "loc": Object { + "end": Object { + "column": 24, + "line": 1, + }, + "start": Object { + "column": 14, + "line": 1, + }, + }, + "params": Array [ + Object { + "constraint": undefined, + "default": undefined, + "in": true, + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 15, + "line": 1, + }, + }, + "name": Object { + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 22, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 22, + 23, + ], + "type": "Identifier", + }, + "out": true, + "range": Array [ + 15, + 23, + ], + "type": "TSTypeParameter", + }, + ], + "range": Array [ + 14, + 24, + ], + "type": "TSTypeParameterDeclaration", + }, + }, + ], + "comments": Array [], + "loc": Object { + "end": Object { + "column": 0, + "line": 2, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 40, + ], + "sourceType": "script", + "tokens": Array [ + Object { + "loc": Object { + "end": Object { + "column": 4, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 4, + ], + "type": "Identifier", + "value": "type", + }, + Object { + "loc": Object { + "end": Object { + "column": 14, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "range": Array [ + 5, + 14, + ], + "type": "Identifier", + "value": "Processor", + }, + Object { + "loc": Object { + "end": Object { + "column": 15, + "line": 1, + }, + "start": Object { + "column": 14, + "line": 1, + }, + }, + "range": Array [ + 14, + 15, + ], + "type": "Punctuator", + "value": "<", + }, + Object { + "loc": Object { + "end": Object { + "column": 17, + "line": 1, + }, + "start": Object { + "column": 15, + "line": 1, + }, + }, + "range": Array [ + 15, + 17, + ], + "type": "Keyword", + "value": "in", + }, + Object { + "loc": Object { + "end": Object { + "column": 21, + "line": 1, + }, + "start": Object { + "column": 18, + "line": 1, + }, + }, + "range": Array [ + 18, + 21, + ], + "type": "Identifier", + "value": "out", + }, + Object { + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 22, + "line": 1, + }, + }, + "range": Array [ + 22, + 23, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 24, + "line": 1, + }, + "start": Object { + "column": 23, + "line": 1, + }, + }, + "range": Array [ + 23, + 24, + ], + "type": "Punctuator", + "value": ">", + }, + Object { + "loc": Object { + "end": Object { + "column": 26, + "line": 1, + }, + "start": Object { + "column": 25, + "line": 1, + }, + }, + "range": Array [ + 25, + 26, + ], + "type": "Punctuator", + "value": "=", + }, + Object { + "loc": Object { + "end": Object { + "column": 28, + "line": 1, + }, + "start": Object { + "column": 27, + "line": 1, + }, + }, + "range": Array [ + 27, + 28, + ], + "type": "Punctuator", + "value": "(", + }, + Object { + "loc": Object { + "end": Object { + "column": 29, + "line": 1, + }, + "start": Object { + "column": 28, + "line": 1, + }, + }, + "range": Array [ + 28, + 29, + ], + "type": "Identifier", + "value": "x", + }, + Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 30, + ], + "type": "Punctuator", + "value": ":", + }, + Object { + "loc": Object { + "end": Object { + "column": 32, + "line": 1, + }, + "start": Object { + "column": 31, + "line": 1, + }, + }, + "range": Array [ + 31, + 32, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 33, + "line": 1, + }, + "start": Object { + "column": 32, + "line": 1, + }, + }, + "range": Array [ + 32, + 33, + ], + "type": "Punctuator", + "value": ")", + }, + Object { + "loc": Object { + "end": Object { + "column": 36, + "line": 1, + }, + "start": Object { + "column": 34, + "line": 1, + }, + }, + "range": Array [ + 34, + 36, + ], + "type": "Punctuator", + "value": "=>", + }, + Object { + "loc": Object { + "end": Object { + "column": 38, + "line": 1, + }, + "start": Object { + "column": 37, + "line": 1, + }, + }, + "range": Array [ + 37, + 38, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 39, + "line": 1, + }, + "start": Object { + "column": 38, + "line": 1, + }, + }, + "range": Array [ + 38, + 39, + ], + "type": "Punctuator", + "value": ";", + }, + ], + "type": "Program", +} +`; diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot new file mode 100644 index 00000000000..b600fac8a6b --- /dev/null +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot @@ -0,0 +1,514 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`typescript types optional-variance-in.src 1`] = ` +Object { + "body": Array [ + Object { + "id": Object { + "loc": Object { + "end": Object { + "column": 13, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "name": "Consumer", + "range": Array [ + 5, + 13, + ], + "type": "Identifier", + }, + "loc": Object { + "end": Object { + "column": 37, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 37, + ], + "type": "TSTypeAliasDeclaration", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 36, + "line": 1, + }, + "start": Object { + "column": 22, + "line": 1, + }, + }, + "params": Array [ + Object { + "loc": Object { + "end": Object { + "column": 27, + "line": 1, + }, + "start": Object { + "column": 23, + "line": 1, + }, + }, + "name": "x", + "range": Array [ + 23, + 27, + ], + "type": "Identifier", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 27, + "line": 1, + }, + "start": Object { + "column": 24, + "line": 1, + }, + }, + "range": Array [ + 24, + 27, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 27, + "line": 1, + }, + "start": Object { + "column": 26, + "line": 1, + }, + }, + "range": Array [ + 26, + 27, + ], + "type": "TSTypeReference", + "typeName": Object { + "loc": Object { + "end": Object { + "column": 27, + "line": 1, + }, + "start": Object { + "column": 26, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 26, + 27, + ], + "type": "Identifier", + }, + "typeParameters": undefined, + }, + }, + }, + ], + "range": Array [ + 22, + 36, + ], + "returnType": Object { + "loc": Object { + "end": Object { + "column": 36, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 36, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 36, + "line": 1, + }, + "start": Object { + "column": 32, + "line": 1, + }, + }, + "range": Array [ + 32, + 36, + ], + "type": "TSVoidKeyword", + }, + }, + "type": "TSFunctionType", + }, + "typeParameters": Object { + "loc": Object { + "end": Object { + "column": 19, + "line": 1, + }, + "start": Object { + "column": 13, + "line": 1, + }, + }, + "params": Array [ + Object { + "constraint": undefined, + "default": undefined, + "in": true, + "loc": Object { + "end": Object { + "column": 18, + "line": 1, + }, + "start": Object { + "column": 14, + "line": 1, + }, + }, + "name": Object { + "loc": Object { + "end": Object { + "column": 18, + "line": 1, + }, + "start": Object { + "column": 17, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 17, + 18, + ], + "type": "Identifier", + }, + "out": undefined, + "range": Array [ + 14, + 18, + ], + "type": "TSTypeParameter", + }, + ], + "range": Array [ + 13, + 19, + ], + "type": "TSTypeParameterDeclaration", + }, + }, + ], + "comments": Array [], + "loc": Object { + "end": Object { + "column": 0, + "line": 2, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 38, + ], + "sourceType": "script", + "tokens": Array [ + Object { + "loc": Object { + "end": Object { + "column": 4, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 4, + ], + "type": "Identifier", + "value": "type", + }, + Object { + "loc": Object { + "end": Object { + "column": 13, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "range": Array [ + 5, + 13, + ], + "type": "Identifier", + "value": "Consumer", + }, + Object { + "loc": Object { + "end": Object { + "column": 14, + "line": 1, + }, + "start": Object { + "column": 13, + "line": 1, + }, + }, + "range": Array [ + 13, + 14, + ], + "type": "Punctuator", + "value": "<", + }, + Object { + "loc": Object { + "end": Object { + "column": 16, + "line": 1, + }, + "start": Object { + "column": 14, + "line": 1, + }, + }, + "range": Array [ + 14, + 16, + ], + "type": "Keyword", + "value": "in", + }, + Object { + "loc": Object { + "end": Object { + "column": 18, + "line": 1, + }, + "start": Object { + "column": 17, + "line": 1, + }, + }, + "range": Array [ + 17, + 18, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 19, + "line": 1, + }, + "start": Object { + "column": 18, + "line": 1, + }, + }, + "range": Array [ + 18, + 19, + ], + "type": "Punctuator", + "value": ">", + }, + Object { + "loc": Object { + "end": Object { + "column": 21, + "line": 1, + }, + "start": Object { + "column": 20, + "line": 1, + }, + }, + "range": Array [ + 20, + 21, + ], + "type": "Punctuator", + "value": "=", + }, + Object { + "loc": Object { + "end": Object { + "column": 23, + "line": 1, + }, + "start": Object { + "column": 22, + "line": 1, + }, + }, + "range": Array [ + 22, + 23, + ], + "type": "Punctuator", + "value": "(", + }, + Object { + "loc": Object { + "end": Object { + "column": 24, + "line": 1, + }, + "start": Object { + "column": 23, + "line": 1, + }, + }, + "range": Array [ + 23, + 24, + ], + "type": "Identifier", + "value": "x", + }, + Object { + "loc": Object { + "end": Object { + "column": 25, + "line": 1, + }, + "start": Object { + "column": 24, + "line": 1, + }, + }, + "range": Array [ + 24, + 25, + ], + "type": "Punctuator", + "value": ":", + }, + Object { + "loc": Object { + "end": Object { + "column": 27, + "line": 1, + }, + "start": Object { + "column": 26, + "line": 1, + }, + }, + "range": Array [ + 26, + 27, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 28, + "line": 1, + }, + "start": Object { + "column": 27, + "line": 1, + }, + }, + "range": Array [ + 27, + 28, + ], + "type": "Punctuator", + "value": ")", + }, + Object { + "loc": Object { + "end": Object { + "column": 31, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 31, + ], + "type": "Punctuator", + "value": "=>", + }, + Object { + "loc": Object { + "end": Object { + "column": 36, + "line": 1, + }, + "start": Object { + "column": 32, + "line": 1, + }, + }, + "range": Array [ + 32, + 36, + ], + "type": "Keyword", + "value": "void", + }, + Object { + "loc": Object { + "end": Object { + "column": 37, + "line": 1, + }, + "start": Object { + "column": 36, + "line": 1, + }, + }, + "range": Array [ + 36, + 37, + ], + "type": "Punctuator", + "value": ";", + }, + ], + "type": "Program", +} +`; diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot new file mode 100644 index 00000000000..01664fc8941 --- /dev/null +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot @@ -0,0 +1,407 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`typescript types optional-variance-out.src 1`] = ` +Object { + "body": Array [ + Object { + "id": Object { + "loc": Object { + "end": Object { + "column": 13, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "name": "Provider", + "range": Array [ + 5, + 13, + ], + "type": "Identifier", + }, + "loc": Object { + "end": Object { + "column": 31, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 31, + ], + "type": "TSTypeAliasDeclaration", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 23, + "line": 1, + }, + }, + "params": Array [], + "range": Array [ + 23, + 30, + ], + "returnType": Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 26, + "line": 1, + }, + }, + "range": Array [ + 26, + 30, + ], + "type": "TSTypeAnnotation", + "typeAnnotation": Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 30, + ], + "type": "TSTypeReference", + "typeName": Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 29, + 30, + ], + "type": "Identifier", + }, + "typeParameters": undefined, + }, + }, + "type": "TSFunctionType", + }, + "typeParameters": Object { + "loc": Object { + "end": Object { + "column": 20, + "line": 1, + }, + "start": Object { + "column": 13, + "line": 1, + }, + }, + "params": Array [ + Object { + "constraint": undefined, + "default": undefined, + "in": undefined, + "loc": Object { + "end": Object { + "column": 19, + "line": 1, + }, + "start": Object { + "column": 14, + "line": 1, + }, + }, + "name": Object { + "loc": Object { + "end": Object { + "column": 19, + "line": 1, + }, + "start": Object { + "column": 18, + "line": 1, + }, + }, + "name": "T", + "range": Array [ + 18, + 19, + ], + "type": "Identifier", + }, + "out": true, + "range": Array [ + 14, + 19, + ], + "type": "TSTypeParameter", + }, + ], + "range": Array [ + 13, + 20, + ], + "type": "TSTypeParameterDeclaration", + }, + }, + ], + "comments": Array [], + "loc": Object { + "end": Object { + "column": 0, + "line": 2, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 32, + ], + "sourceType": "script", + "tokens": Array [ + Object { + "loc": Object { + "end": Object { + "column": 4, + "line": 1, + }, + "start": Object { + "column": 0, + "line": 1, + }, + }, + "range": Array [ + 0, + 4, + ], + "type": "Identifier", + "value": "type", + }, + Object { + "loc": Object { + "end": Object { + "column": 13, + "line": 1, + }, + "start": Object { + "column": 5, + "line": 1, + }, + }, + "range": Array [ + 5, + 13, + ], + "type": "Identifier", + "value": "Provider", + }, + Object { + "loc": Object { + "end": Object { + "column": 14, + "line": 1, + }, + "start": Object { + "column": 13, + "line": 1, + }, + }, + "range": Array [ + 13, + 14, + ], + "type": "Punctuator", + "value": "<", + }, + Object { + "loc": Object { + "end": Object { + "column": 17, + "line": 1, + }, + "start": Object { + "column": 14, + "line": 1, + }, + }, + "range": Array [ + 14, + 17, + ], + "type": "Identifier", + "value": "out", + }, + Object { + "loc": Object { + "end": Object { + "column": 19, + "line": 1, + }, + "start": Object { + "column": 18, + "line": 1, + }, + }, + "range": Array [ + 18, + 19, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 20, + "line": 1, + }, + "start": Object { + "column": 19, + "line": 1, + }, + }, + "range": Array [ + 19, + 20, + ], + "type": "Punctuator", + "value": ">", + }, + Object { + "loc": Object { + "end": Object { + "column": 22, + "line": 1, + }, + "start": Object { + "column": 21, + "line": 1, + }, + }, + "range": Array [ + 21, + 22, + ], + "type": "Punctuator", + "value": "=", + }, + Object { + "loc": Object { + "end": Object { + "column": 24, + "line": 1, + }, + "start": Object { + "column": 23, + "line": 1, + }, + }, + "range": Array [ + 23, + 24, + ], + "type": "Punctuator", + "value": "(", + }, + Object { + "loc": Object { + "end": Object { + "column": 25, + "line": 1, + }, + "start": Object { + "column": 24, + "line": 1, + }, + }, + "range": Array [ + 24, + 25, + ], + "type": "Punctuator", + "value": ")", + }, + Object { + "loc": Object { + "end": Object { + "column": 28, + "line": 1, + }, + "start": Object { + "column": 26, + "line": 1, + }, + }, + "range": Array [ + 26, + 28, + ], + "type": "Punctuator", + "value": "=>", + }, + Object { + "loc": Object { + "end": Object { + "column": 30, + "line": 1, + }, + "start": Object { + "column": 29, + "line": 1, + }, + }, + "range": Array [ + 29, + 30, + ], + "type": "Identifier", + "value": "T", + }, + Object { + "loc": Object { + "end": Object { + "column": 31, + "line": 1, + }, + "start": Object { + "column": 30, + "line": 1, + }, + }, + "range": Array [ + 30, + 31, + ], + "type": "Punctuator", + "value": ";", + }, + ], + "type": "Program", +} +`; diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot index fafb3e04c2f..72e20af9b1c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot @@ -559,6 +559,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": undefined, "loc": Object { "end": Object { "column": 42, @@ -587,6 +588,7 @@ Object { ], "type": "Identifier", }, + "out": undefined, "range": Array [ 26, 42, From 1f0958ff6662b1477b6d9dc90497937e050f95a1 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 18 May 2022 13:53:31 +0900 Subject: [PATCH 05/11] fix(typescript-estree): use `hasModifier` --- packages/typescript-estree/src/convert.ts | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts index 07f25fda776..1f782061029 100644 --- a/packages/typescript-estree/src/convert.ts +++ b/packages/typescript-estree/src/convert.ts @@ -671,26 +671,6 @@ export class Converter { : node.elements.map(element => this.convertChild(element)); } - private convertTypeParamVariances( - modifiers?: ts.ModifiersArray, - ): Pick { - const result: Pick = { - in: undefined, - out: undefined, - }; - if (!modifiers) { - return result; - } - for (const modifier of modifiers) { - if (modifier.kind === SyntaxKind.InKeyword) { - result.in = true; - } else if (modifier.kind === SyntaxKind.OutKeyword) { - result.out = true; - } - } - return result; - } - /** * Applies the given TS modifiers to the given result object. * @param result @@ -2362,7 +2342,8 @@ export class Converter { ? this.convertType(node.constraint) : undefined, default: node.default ? this.convertType(node.default) : undefined, - ...this.convertTypeParamVariances(node.modifiers), + in: hasModifier(SyntaxKind.InKeyword, node), + out: hasModifier(SyntaxKind.OutKeyword, node), }); } From 088d45cbc843d72730a0e689ac21ce58885c1532 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 18 May 2022 13:55:34 +0900 Subject: [PATCH 06/11] test(typescript-estree): update snapshots --- .../tests/lib/__snapshots__/convert.test.ts.snap | 4 ++-- .../type-parameter-whitespace-loc.src.ts.shot | 4 ++-- .../type-parameters.src.ts.shot | 4 ++-- ...row-function-with-type-parameters.src.ts.shot | 4 ++-- .../call-signatures-with-generics.src.ts.shot | 8 ++++---- ...h-constructor-and-type-parameters.src.ts.shot | 8 ++++---- ...ass-with-extends-generic-multiple.src.ts.shot | 4 ++-- .../class-with-extends-generic.src.ts.shot | 4 ++-- ...class-with-generic-method-default.src.ts.shot | 4 ++-- .../basics/class-with-generic-method.src.ts.shot | 4 ++-- .../basics/class-with-method.src.ts.shot | 4 ++-- .../class-with-mixin-reference.src.ts.shot | 4 ++-- .../basics/class-with-mixin.src.ts.shot | 8 ++++---- ...-two-methods-computed-constructor.src.ts.shot | 8 ++++---- ...class-with-type-parameter-default.src.ts.shot | 4 ++-- ...ss-with-type-parameter-underscore.src.ts.shot | 4 ++-- .../basics/class-with-type-parameter.src.ts.shot | 4 ++-- ...export-default-class-with-generic.src.ts.shot | 4 ++-- ...ault-class-with-multiple-generics.src.ts.shot | 8 ++++---- .../export-named-class-with-generic.src.ts.shot | 4 ++-- ...amed-class-with-multiple-generics.src.ts.shot | 8 ++++---- ...ion-anonymus-with-type-parameters.src.ts.shot | 4 ++-- ...ype-parameters-that-have-comments.src.ts.shot | 4 ++-- ...h-type-parameters-with-constraint.src.ts.shot | 4 ++-- .../function-with-type-parameters.src.ts.shot | 4 ++-- .../basics/interface-type-parameters.src.ts.shot | 4 ++-- ...interface-with-all-property-types.src.ts.shot | 8 ++++---- ...face-with-extends-type-parameters.src.ts.shot | 4 ++-- .../basics/interface-with-generic.src.ts.shot | 4 ++-- .../basics/interface-with-method.src.ts.shot | 4 ++-- .../basics/intrinsic-keyword.src.ts.shot | 16 ++++++++-------- .../basics/object-with-typed-methods.src.ts.shot | 8 ++++---- ...n-with-constrained-type-parameter.src.ts.shot | 4 ++-- .../basics/type-alias-declaration.src.ts.shot | 4 ++-- ...type-parameters-comments-heritage.src.ts.shot | 16 ++++++++-------- .../basics/type-parameters-comments.src.ts.shot | 8 ++++---- .../basics/typed-method-signature.src.ts.shot | 4 ++-- .../types/conditional-infer-nested.src.ts.shot | 16 ++++++++-------- .../types/conditional-infer-simple.src.ts.shot | 12 ++++++------ .../types/conditional-infer.src.ts.shot | 8 ++++---- .../types/constructor-generic.src.ts.shot | 4 ++-- .../types/function-generic.src.ts.shot | 4 ++-- .../types/intersection-type.src.ts.shot | 4 ++-- .../types/mapped-named-type.src.ts.shot | 8 ++++---- .../types/mapped-readonly-minus.src.ts.shot | 4 ++-- .../types/mapped-readonly-plus.src.ts.shot | 4 ++-- .../typescript/types/mapped-readonly.src.ts.shot | 4 ++-- .../typescript/types/mapped-untypped.src.ts.shot | 4 ++-- .../typescript/types/mapped.src.ts.shot | 4 ++-- .../optional-variance-in-and-out.src.ts.shot | 4 ++-- .../types/optional-variance-in.src.ts.shot | 2 +- .../types/optional-variance-out.src.ts.shot | 2 +- .../types/template-literal-type-4.src.ts.shot | 4 ++-- 53 files changed, 148 insertions(+), 148 deletions(-) diff --git a/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap index 2e49891dd14..0f40740978e 100644 --- a/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap +++ b/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap @@ -475,7 +475,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 11, @@ -504,7 +504,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot index dc6ca7e1234..a32b6821f9e 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot @@ -74,7 +74,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 14, @@ -103,7 +103,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 13, 14, diff --git a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot index 994e697662a..bd4752cee3b 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot @@ -106,7 +106,7 @@ Object { ], "type": "TSObjectKeyword", }, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 36, @@ -135,7 +135,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 11, 36, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot index 5bba4bae24c..b233dae579e 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot @@ -219,7 +219,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 2, @@ -248,7 +248,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 1, 2, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot index c38ec847ea5..8ec8827246f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot @@ -168,7 +168,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 4, @@ -197,7 +197,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 16, 17, @@ -331,7 +331,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 7, @@ -360,7 +360,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 44, 45, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot index d950727bee7..fc9e41e1cce 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot @@ -98,7 +98,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 15, @@ -127,7 +127,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 24, 25, @@ -236,7 +236,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 19, @@ -265,7 +265,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 52, 53, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot index 0a921e487de..4b163281504 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot @@ -214,7 +214,7 @@ Object { "typeParameters": undefined, }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 21, @@ -243,7 +243,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 10, 21, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot index b83ffe8c56f..1b34e17f7eb 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot @@ -143,7 +143,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 11, @@ -172,7 +172,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot index 71bc3c5cc2c..d648e1c98cf 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot @@ -133,7 +133,7 @@ Object { }, "typeParameters": undefined, }, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 16, @@ -162,7 +162,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 21, 28, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot index 8f8586b9ec0..f00ade847e8 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot @@ -98,7 +98,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 10, @@ -127,7 +127,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 21, 22, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot index a5a68597b19..7519442ea6e 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-method.src.ts.shot @@ -211,7 +211,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 7, @@ -240,7 +240,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 36, 37, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot index 9b18d787286..47dd1de2f0d 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot @@ -235,7 +235,7 @@ Object { }, }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 35, @@ -264,7 +264,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 11, 35, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot index 5565b47545c..8a991733611 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-mixin.src.ts.shot @@ -289,7 +289,7 @@ Object { }, }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 36, @@ -318,7 +318,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 11, 36, @@ -830,7 +830,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 18, @@ -859,7 +859,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 175, 176, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot index 0dec61e1da2..f119f99cc7c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-two-methods-computed-constructor.src.ts.shot @@ -133,7 +133,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 17, @@ -162,7 +162,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 26, 27, @@ -305,7 +305,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 19, @@ -334,7 +334,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 64, 65, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot index efee1d0a9e3..b062afebf38 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-default.src.ts.shot @@ -106,7 +106,7 @@ Object { }, "typeParameters": undefined, }, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 17, @@ -135,7 +135,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 10, 17, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot index 80627e04864..f11826fd104 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter-underscore.src.ts.shot @@ -71,7 +71,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 11, @@ -100,7 +100,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 8, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot index f1ebe39ce0f..8403e95ce8c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/class-with-type-parameter.src.ts.shot @@ -71,7 +71,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 11, @@ -100,7 +100,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot index e0633373502..b8c81c94fc2 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-generic.src.ts.shot @@ -55,7 +55,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 22, @@ -84,7 +84,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 21, 22, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot index a951ffdc0dd..5c8f0f1bd13 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-default-class-with-multiple-generics.src.ts.shot @@ -55,7 +55,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 22, @@ -84,7 +84,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 21, 22, @@ -94,7 +94,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 25, @@ -123,7 +123,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 24, 25, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot index e5688547eba..150f857526d 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-generic.src.ts.shot @@ -73,7 +73,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 18, @@ -102,7 +102,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 17, 18, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot index e34f544ce7e..74f2566093d 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/export-named-class-with-multiple-generics.src.ts.shot @@ -73,7 +73,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 18, @@ -102,7 +102,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 17, 18, @@ -112,7 +112,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 21, @@ -141,7 +141,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 20, 21, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot index f8de0db1e9f..9945853dea0 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-anonymus-with-type-parameters.src.ts.shot @@ -167,7 +167,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 21, @@ -196,7 +196,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 20, 21, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot index 75253f966f9..0bd43c2697c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-that-have-comments.src.ts.shot @@ -74,7 +74,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 29, @@ -103,7 +103,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 28, 29, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot index b1f923ef3c7..114fd02b9e6 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters-with-constraint.src.ts.shot @@ -252,7 +252,7 @@ Object { "type": "TSTypeLiteral", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 23, @@ -281,7 +281,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 11, 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot index b329b415b79..defa0485d9e 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/function-with-type-parameters.src.ts.shot @@ -235,7 +235,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 12, @@ -264,7 +264,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 11, 12, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot index 7d315795fc4..f1d74ce8b70 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-type-parameters.src.ts.shot @@ -70,7 +70,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 15, @@ -99,7 +99,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 14, 15, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot index aad32e7f8a4..8c772c7947a 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-all-property-types.src.ts.shot @@ -880,7 +880,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -909,7 +909,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 194, 195, @@ -1118,7 +1118,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 10, @@ -1147,7 +1147,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 247, 248, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot index 252a1b63455..5ac92facdff 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-extends-type-parameters.src.ts.shot @@ -162,7 +162,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 15, @@ -191,7 +191,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 14, 15, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot index f108ef8b06b..3c1d50e28b2 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-generic.src.ts.shot @@ -70,7 +70,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 16, @@ -99,7 +99,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 15, 16, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot index a807fcb32c3..fdc32c02335 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/interface-with-method.src.ts.shot @@ -308,7 +308,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 5, @@ -337,7 +337,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 45, 46, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot index 2d6e7801b73..5b885e496df 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/intrinsic-keyword.src.ts.shot @@ -85,7 +85,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 31, @@ -114,7 +114,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 15, 31, @@ -211,7 +211,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 31, @@ -240,7 +240,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 61, 77, @@ -337,7 +337,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 32, @@ -366,7 +366,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 108, 124, @@ -463,7 +463,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 34, @@ -492,7 +492,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 157, 173, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot index 10199d3091e..bafe11a59fd 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/object-with-typed-methods.src.ts.shot @@ -200,7 +200,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 17, @@ -229,7 +229,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 30, 31, @@ -408,7 +408,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 7, @@ -437,7 +437,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 69, 70, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot index ca2acdf23fe..d2c6248a377 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration-with-constrained-type-parameter.src.ts.shot @@ -214,7 +214,7 @@ Object { "type": "TSTypeLiteral", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 24, @@ -243,7 +243,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 12, 24, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot index 8898fc5821c..169e2a2c6f6 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-alias-declaration.src.ts.shot @@ -197,7 +197,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 13, @@ -226,7 +226,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 12, 13, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot index 37ee387eefd..9ac707ba48f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments-heritage.src.ts.shot @@ -143,7 +143,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 23, @@ -172,7 +172,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 22, 23, @@ -362,7 +362,7 @@ Object { ], "type": "TSLiteralType", }, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 38, @@ -391,7 +391,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 98, 113, @@ -565,7 +565,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 27, @@ -594,7 +594,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 191, 192, @@ -803,7 +803,7 @@ Object { ], "type": "TSLiteralType", }, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 42, @@ -832,7 +832,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 272, 287, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot index 161fee1f76a..23e4e8cfe5c 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/type-parameters-comments.src.ts.shot @@ -183,7 +183,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 25, @@ -212,7 +212,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 68, 69, @@ -333,7 +333,7 @@ Object { }, "typeParameters": undefined, }, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 41, @@ -362,7 +362,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 112, 129, diff --git a/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot index 11e74a7bb26..45a7d851587 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/basics/typed-method-signature.src.ts.shot @@ -351,7 +351,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 5, @@ -380,7 +380,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 41, 42, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot index af335c7ea2c..693f5d114a9 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-nested.src.ts.shot @@ -94,7 +94,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 20, @@ -123,7 +123,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 38, 39, @@ -203,7 +203,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 21, @@ -232,7 +232,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 69, 70, @@ -342,7 +342,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 31, @@ -371,7 +371,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 107, 108, @@ -594,7 +594,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 15, @@ -623,7 +623,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 14, 15, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot index 8b13cd578b9..48cb6977cbf 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-simple.src.ts.shot @@ -161,7 +161,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 36, @@ -190,7 +190,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 35, 36, @@ -275,7 +275,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 48, @@ -304,7 +304,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 47, 48, @@ -405,7 +405,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 10, @@ -434,7 +434,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 9, 10, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot index d3e4a4e9464..9534b875bd9 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer.src.ts.shot @@ -94,7 +94,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 36, @@ -123,7 +123,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 35, 36, @@ -250,7 +250,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 14, @@ -279,7 +279,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 13, 14, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot index 4a28bfbaf9d..43b72d5dff0 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/constructor-generic.src.ts.shot @@ -197,7 +197,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 13, @@ -226,7 +226,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 12, 13, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot index 83075915e1b..3d0a9285487 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/function-generic.src.ts.shot @@ -196,7 +196,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -225,7 +225,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 8, 9, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot index 907a0c38e27..7e56c87cf8b 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/intersection-type.src.ts.shot @@ -274,7 +274,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 17, @@ -303,7 +303,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 16, 17, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot index ae8a3d6ce0a..ad9603c0953 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-named-type.src.ts.shot @@ -234,7 +234,7 @@ Object { }, }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 15, @@ -263,7 +263,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 20, 32, @@ -286,7 +286,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 11, @@ -315,7 +315,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 10, 11, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot index 9ba1c8e6249..b4f571e2c11 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-minus.src.ts.shot @@ -94,7 +94,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 33, @@ -123,7 +123,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 22, 33, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot index 9937dae14c2..f3ba73b4aa5 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly-plus.src.ts.shot @@ -94,7 +94,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 33, @@ -123,7 +123,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 22, 33, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot index b1ea2d6f362..cce96c961cc 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-readonly.src.ts.shot @@ -94,7 +94,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 32, @@ -123,7 +123,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 21, 32, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot index f0453f8a169..27b7b9c9c4d 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped-untypped.src.ts.shot @@ -75,7 +75,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 23, @@ -104,7 +104,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 12, 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot index f05ee2777bf..1689f5647b9 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/mapped.src.ts.shot @@ -92,7 +92,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 23, @@ -121,7 +121,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 12, 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot index 56732c94489..26e233652d4 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in-and-out.src.ts.shot @@ -224,7 +224,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 12, 16, @@ -234,7 +234,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 23, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot index b600fac8a6b..bf2e85f702f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-in.src.ts.shot @@ -205,7 +205,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 14, 18, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot index 01664fc8941..04c6769229f 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/optional-variance-out.src.ts.shot @@ -123,7 +123,7 @@ Object { Object { "constraint": undefined, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 19, diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot index 72e20af9b1c..44900a50b51 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/template-literal-type-4.src.ts.shot @@ -559,7 +559,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, - "in": undefined, + "in": false, "loc": Object { "end": Object { "column": 42, @@ -588,7 +588,7 @@ Object { ], "type": "Identifier", }, - "out": undefined, + "out": false, "range": Array [ 26, 42, From 6cd5c7e63cd34d7c32b1f81900d21a2de8d7b79a Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 18 May 2022 14:06:09 +0900 Subject: [PATCH 07/11] test(typescript-estree): fix for babel --- packages/typescript-estree/tests/ast-alignment/utils.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts index ece4ab9e511..526648fd485 100644 --- a/packages/typescript-estree/tests/ast-alignment/utils.ts +++ b/packages/typescript-estree/tests/ast-alignment/utils.ts @@ -150,6 +150,13 @@ export function preprocessBabylonAST(ast: File): any { type: AST_NODE_TYPES.Identifier, }; } + // Babel does not support TS 4.7 optional vaiance yet. + if (!node.in) { + node.in = false; + } + if (!node.out) { + node.out = false; + } }, MethodDefinition(node) { /** From 96f0b45b1e2362708abf9e641b4756c758de5a14 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 19 May 2022 13:32:18 +0900 Subject: [PATCH 08/11] fix(ast-spec): make `in` and `out` boolean --- packages/ast-spec/src/special/TSTypeParameter/spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ast-spec/src/special/TSTypeParameter/spec.ts b/packages/ast-spec/src/special/TSTypeParameter/spec.ts index ab62751ea55..7487e4f5617 100644 --- a/packages/ast-spec/src/special/TSTypeParameter/spec.ts +++ b/packages/ast-spec/src/special/TSTypeParameter/spec.ts @@ -8,6 +8,6 @@ export interface TSTypeParameter extends BaseNode { name: Identifier; constraint?: TypeNode; default?: TypeNode; - in?: boolean; - out?: boolean; + in: boolean; + out: boolean; } From 03acdb30f87e846cf84e526ebe3bea1b1e2b8f06 Mon Sep 17 00:00:00 2001 From: Brad Zacher Date: Wed, 18 May 2022 21:45:51 -0700 Subject: [PATCH 09/11] fix spelling typo --- packages/typescript-estree/tests/ast-alignment/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts index 526648fd485..01283b2a3f0 100644 --- a/packages/typescript-estree/tests/ast-alignment/utils.ts +++ b/packages/typescript-estree/tests/ast-alignment/utils.ts @@ -150,7 +150,7 @@ export function preprocessBabylonAST(ast: File): any { type: AST_NODE_TYPES.Identifier, }; } - // Babel does not support TS 4.7 optional vaiance yet. + // Babel does not support TS 4.7 optional variance yet. if (!node.in) { node.in = false; } From 42d2c74690fb9f54d4bd132f3c3560a987cda47f Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 19 May 2022 21:47:49 +0900 Subject: [PATCH 10/11] test(ast-spec): update snapshots --- .../snapshots/1-TSESTree-AST.shot | 2 ++ .../snapshots/5-AST-Alignment-AST.shot | 2 ++ .../fixtures/type-parameters/snapshots/1-TSESTree-AST.shot | 2 ++ .../fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot | 2 ++ 4 files changed, 8 insertions(+) diff --git a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/1-TSESTree-AST.shot index 7fa28228017..c3bf9660d6d 100644 --- a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/1-TSESTree-AST.shot @@ -71,6 +71,7 @@ Program { params: Array [ TSTypeParameter { type: "TSTypeParameter", + in: false, name: Identifier { type: "Identifier", name: "T", @@ -81,6 +82,7 @@ Program { end: { column: 11, line: 1 }, }, }, + out: false, range: [10, 11], loc: { diff --git a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/5-AST-Alignment-AST.shot b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/5-AST-Alignment-AST.shot index 70cae74b300..25dcb54dbeb 100644 --- a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/5-AST-Alignment-AST.shot +++ b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters-extends-type-parameters/snapshots/5-AST-Alignment-AST.shot @@ -75,6 +75,7 @@ exports[`AST Fixtures declaration ClassDeclaration type-parameters-extends-type- params: Array [ TSTypeParameter { type: 'TSTypeParameter', +- in: false, - name: Identifier { - type: 'Identifier', - name: 'T', @@ -85,6 +86,7 @@ exports[`AST Fixtures declaration ClassDeclaration type-parameters-extends-type- - end: { column: 11, line: 1 }, - }, - }, +- out: false, + name: 'T', range: [10, 11], diff --git a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/1-TSESTree-AST.shot b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/1-TSESTree-AST.shot index 0b476f5584e..09fb61990bf 100644 --- a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/1-TSESTree-AST.shot +++ b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/1-TSESTree-AST.shot @@ -32,6 +32,7 @@ Program { params: Array [ TSTypeParameter { type: "TSTypeParameter", + in: false, name: Identifier { type: "Identifier", name: "T", @@ -42,6 +43,7 @@ Program { end: { column: 11, line: 1 }, }, }, + out: false, range: [10, 11], loc: { diff --git a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot index f3b75ecbb25..2dd40abc556 100644 --- a/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot +++ b/packages/ast-spec/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot @@ -36,6 +36,7 @@ exports[`AST Fixtures declaration ClassDeclaration type-parameters AST Alignment params: Array [ TSTypeParameter { type: 'TSTypeParameter', +- in: false, - name: Identifier { - type: 'Identifier', - name: 'T', @@ -46,6 +47,7 @@ exports[`AST Fixtures declaration ClassDeclaration type-parameters AST Alignment - end: { column: 11, line: 1 }, - }, - }, +- out: false, + name: 'T', range: [10, 11], From 68c350bd6b75a0f0d5468e80a8c793e938136948 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 19 May 2022 22:01:09 +0900 Subject: [PATCH 11/11] test(typescript-estree): update snapshots --- ...ditional-infer-with-constraint.src.ts.shot | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-with-constraint.src.ts.shot b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-with-constraint.src.ts.shot index b0168cb5762..f4a26f22e90 100644 --- a/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-with-constraint.src.ts.shot +++ b/packages/typescript-estree/tests/snapshots/typescript/types/conditional-infer-with-constraint.src.ts.shot @@ -111,6 +111,7 @@ Object { "type": "TSNumberKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 46, @@ -139,6 +140,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 30, 46, @@ -301,6 +303,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -329,6 +332,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 8, 9, @@ -451,6 +455,7 @@ Object { "type": "TSNumberKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 46, @@ -479,6 +484,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 105, 121, @@ -521,6 +527,7 @@ Object { "type": "TSNumberKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 70, @@ -549,6 +556,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 129, 145, @@ -711,6 +719,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -739,6 +748,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 83, 84, @@ -861,6 +871,7 @@ Object { "type": "TSNumberKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 46, @@ -889,6 +900,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 204, 220, @@ -915,6 +927,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 55, @@ -943,6 +956,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 228, 229, @@ -1105,6 +1119,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -1133,6 +1148,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 182, 183, @@ -1239,6 +1255,7 @@ Object { "typeParameter": Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 31, @@ -1267,6 +1284,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 288, 289, @@ -1309,6 +1327,7 @@ Object { "type": "TSNumberKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 55, @@ -1337,6 +1356,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 297, 313, @@ -1499,6 +1519,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -1527,6 +1548,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 266, 267, @@ -1649,6 +1671,7 @@ Object { "type": "TSStringKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 46, @@ -1677,6 +1700,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 372, 388, @@ -1719,6 +1743,7 @@ Object { "type": "TSNumberKeyword", }, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 70, @@ -1747,6 +1772,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 396, 412, @@ -1855,6 +1881,7 @@ Object { Object { "constraint": undefined, "default": undefined, + "in": false, "loc": Object { "end": Object { "column": 9, @@ -1883,6 +1910,7 @@ Object { ], "type": "Identifier", }, + "out": false, "range": Array [ 350, 351,