May 19, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022 · May 18, 2022
diff --git a/...eclaration/fixtures/type-parameters-extends-type-parameters/snapshots/1-TSESTree-AST.shot b/...eclaration/fixtures/type-parameters-extends-type-parameters/snapshots/1-TSESTree-AST.shot
        params: Array [
          TSTypeParameter {
            type: "TSTypeParameter",
            in: false,
            name: Identifier {
              type: "Identifier",
              name: "T",
                end: { column: 11, line: 1 },
              },
            },
            out: false,

            range: [10, 11],
            loc: {
diff --git a/...ation/fixtures/type-parameters-extends-type-parameters/snapshots/5-AST-Alignment-AST.shot b/...ation/fixtures/type-parameters-extends-type-parameters/snapshots/5-AST-Alignment-AST.shot
          params: Array [
            TSTypeParameter {
              type: 'TSTypeParameter',
 -             in: false,
 -             name: Identifier {
 -               type: 'Identifier',
 -               name: 'T',
 -                 end: { column: 11, line: 1 },
 -               },
 -             },
 -             out: false,
 +             name: 'T',

              range: [10, 11],
diff --git a/...c/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/1-TSESTree-AST.shot b/...c/src/declaration/ClassDeclaration/fixtures/type-parameters/snapshots/1-TSESTree-AST.shot
        params: Array [
          TSTypeParameter {
            type: "TSTypeParameter",
            in: false,
            name: Identifier {
              type: "Identifier",
              name: "T",
                end: { column: 11, line: 1 },
              },
            },
            out: false,

            range: [10, 11],
            loc: {
diff --git a/.../declaration/ClassDeclaration/fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot b/.../declaration/ClassDeclaration/fixtures/type-parameters/snapshots/5-AST-Alignment-AST.shot
          params: Array [
            TSTypeParameter {
              type: 'TSTypeParameter',
 -             in: false,
 -             name: Identifier {
 -               type: 'Identifier',
 -               name: 'T',
 -                 end: { column: 11, line: 1 },
 -               },
 -             },
 -             out: false,
 +             name: 'T',

              range: [10, 11],
diff --git a/packages/ast-spec/src/special/TSTypeParameter/spec.ts b/packages/ast-spec/src/special/TSTypeParameter/spec.ts
  name: Identifier;
  constraint?: TypeNode;
  default?: TypeNode;
  in: boolean;
  out: boolean;
 }
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
 type Mapper<in T, out U> = (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
 type Processor<in out T> = (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
 type Consumer<in T> = (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
 type Provider<out T> = () => T;
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
            ? this.convertType(node.constraint)
            : undefined,
          default: node.default ? this.convertType(node.default) : undefined,
          in: hasModifier(SyntaxKind.InKeyword, node),
          out: hasModifier(SyntaxKind.OutKeyword, node),
        });
      }

diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
     * Babel doesn't support TS 4.7 new feature yet.
     */
    'conditional-infer-with-constraint',
    /**
     * [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',
  ],
 });

diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts
            type: AST_NODE_TYPES.Identifier,
          };
        }
        // Babel does not support TS 4.7 optional variance yet.
        if (!node.in) {
          node.in = false;
        }
        if (!node.out) {
          node.out = false;
        }
      },
      MethodDefinition(node) {
        /**
diff --git a/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/convert.test.ts.snap
      Object {
        "constraint": undefined,
        "default": undefined,
        "in": false,
        "loc": Object {
          "end": Object {
            "column": 11,
          ],
          "type": "Identifier",
        },
        "out": false,
        "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

 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/.../tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot b/.../tests/snapshots/typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts.shot
          Object {
            "constraint": undefined,
            "default": undefined,
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 14,
              ],
              "type": "Identifier",
            },
            "out": false,
            "range": Array [
              13,
              14,
diff --git a/...escript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot b/...escript-estree/tests/snapshots/typescript/babylon-convergence/type-parameters.src.ts.shot
              ],
              "type": "TSObjectKeyword",
            },
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 36,
              ],
              "type": "Identifier",
            },
            "out": false,
            "range": Array [
              11,
              36,
diff --git a/...-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot b/...-estree/tests/snapshots/typescript/basics/arrow-function-with-type-parameters.src.ts.shot
            Object {
              "constraint": undefined,
              "default": undefined,
              "in": false,
              "loc": Object {
                "end": Object {
                  "column": 2,
                ],
                "type": "Identifier",
              },
              "out": false,
              "range": Array [
                1,
                2,
diff --git a/...script-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot b/...script-estree/tests/snapshots/typescript/basics/call-signatures-with-generics.src.ts.shot
                Object {
                  "constraint": undefined,
                  "default": undefined,
                  "in": false,
                  "loc": Object {
                    "end": Object {
                      "column": 4,
                    ],
                    "type": "Identifier",
                  },
                  "out": false,
                  "range": Array [
                    16,
                    17,
                Object {
                  "constraint": undefined,
                  "default": undefined,
                  "in": false,
                  "loc": Object {
                    "end": Object {
                      "column": 7,
                    ],
                    "type": "Identifier",
                  },
                  "out": false,
                  "range": Array [
                    44,
                    45,
diff --git a/.../tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot b/.../tests/snapshots/typescript/basics/class-with-constructor-and-type-parameters.src.ts.shot
                  Object {
                    "constraint": undefined,
                    "default": undefined,
                    "in": false,
                    "loc": Object {
                      "end": Object {
                        "column": 15,
                      ],
                      "type": "Identifier",
                    },
                    "out": false,
                    "range": Array [
                      24,
                      25,
                  Object {
                    "constraint": undefined,
                    "default": undefined,
                    "in": false,
                    "loc": Object {
                      "end": Object {
                        "column": 19,
                      ],
                      "type": "Identifier",
                    },
                    "out": false,
                    "range": Array [
                      52,
                      53,
diff --git a/...-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot b/...-estree/tests/snapshots/typescript/basics/class-with-extends-generic-multiple.src.ts.shot
              "typeParameters": undefined,
            },
            "default": undefined,
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 21,
              ],
              "type": "Identifier",
            },
            "out": false,
            "range": Array [
              10,
              21,
diff --git a/...ypescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot b/...ypescript-estree/tests/snapshots/typescript/basics/class-with-extends-generic.src.ts.shot
          Object {
            "constraint": undefined,
            "default": undefined,
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 11,
              ],
              "type": "Identifier",
            },
            "out": false,
            "range": Array [
              10,
              11,
diff --git a/...pt-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot b/...pt-estree/tests/snapshots/typescript/basics/class-with-generic-method-default.src.ts.shot
                      },
                      "typeParameters": undefined,
                    },
                    "in": false,
                    "loc": Object {
                      "end": Object {
                        "column": 16,
                      ],
                      "type": "Identifier",
                    },
                    "out": false,
                    "range": Array [
                      21,
                      28,
diff --git a/...typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot b/...typescript-estree/tests/snapshots/typescript/basics/class-with-generic-method.src.ts.shot
                  Object {
                    "constraint": undefined,
                    "default": undefined,
                    "in": false,
                    "loc": Object {
                      "end": Object {
                        "column": 10,
                      ],
                      "type": "Identifier",
                    },
                    "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
                  Object {
                    "constraint": undefined,
                    "default": undefined,
                    "in": false,
                    "loc": Object {
                      "end": Object {
                        "column": 7,
                      ],
                      "type": "Identifier",
                    },
                    "out": false,
                    "range": Array [
                      36,
                      37,
diff --git a/...ypescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot b/...ypescript-estree/tests/snapshots/typescript/basics/class-with-mixin-reference.src.ts.shot
              },
            },
            "default": undefined,
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 35,
              ],
              "type": "Identifier",
            },
            "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
              },
            },
            "default": undefined,
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 36,
              ],
              "type": "Identifier",
            },
            "out": false,
            "range": Array [
              11,
              36,
          Object {
            "constraint": undefined,
            "default": undefined,
            "in": false,
            "loc": Object {
              "end": Object {
                "column": 18,
              ],
              "type": "Identifier",
            },
            "out": false,
            "range": Array [
              175,
              176,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -71,6 +71,7 @@ Program {
		params: Array [
		TSTypeParameter {
		type: "TSTypeParameter",
		in: false,
		name: Identifier {
		type: "Identifier",
		name: "T",
Expand All		@@ -81,6 +82,7 @@ Program {
		end: { column: 11, line: 1 },
		},
		},
		out: false,

		range: [10, 11],
		loc: {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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',
Expand All		@@ -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],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,6 +32,7 @@ Program {
		params: Array [
		TSTypeParameter {
		type: "TSTypeParameter",
		in: false,
		name: Identifier {
		type: "Identifier",
		name: "T",
Expand All		@@ -42,6 +43,7 @@ Program {
		end: { column: 11, line: 1 },
		},
		},
		out: false,

		range: [10, 11],
		loc: {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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',
Expand All		@@ -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],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,6 @@ export interface TSTypeParameter extends BaseNode {
		name: Identifier;
		constraint?: TypeNode;
		default?: TypeNode;
		in: boolean;
		out: boolean;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2342,6 +2342,8 @@ export class Converter {
		? this.convertType(node.constraint)
		: undefined,
		default: node.default ? this.convertType(node.default) : undefined,
		in: hasModifier(SyntaxKind.InKeyword, node),
		out: hasModifier(SyntaxKind.OutKeyword, node),
		});
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -489,6 +489,14 @@ tester.addFixturePatternConfig('typescript/types', {
		* Babel doesn't support TS 4.7 new feature yet.
		*/
		'conditional-infer-with-constraint',
		/**
		* [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',
		],
		});

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,6 +150,13 @@ export function preprocessBabylonAST(ast: File): any {
		type: AST_NODE_TYPES.Identifier,
		};
		}
		// Babel does not support TS 4.7 optional variance yet.
		if (!node.in) {
		node.in = false;
		}
		if (!node.out) {
		node.out = false;
		}
		},
		MethodDefinition(node) {
		/**
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -475,6 +475,7 @@ Object {
		Object {
		"constraint": undefined,
		"default": undefined,
		"in": false,
		"loc": Object {
		"end": Object {
		"column": 11,
Expand DownExpand Up		@@ -503,6 +504,7 @@ Object {
		],
		"type": "Identifier",
		},
		"out": false,
		"range": Array [
		10,
		11,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2732,6 +2732,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"`;
Expand Down