Merge branch 'main'

typescript-eslint · Aug 24, 2022 · 392d84e · 392d84e
2 parents 74b7d44 + 7d402f3
commit 392d84e
Show file tree

Hide file tree

Showing 26 changed files with 2,311 additions and 1,603 deletions.
diff --git a/...Declaration/fixtures/assertion/fixture.ts → ...ion/fixtures/_error_/assertion/fixture.ts b/...Declaration/fixtures/assertion/fixture.ts → ...ion/fixtures/_error_/assertion/fixture.ts
diff --git a/...s/assertion/snapshots/1-TSESTree-AST.shot → ..._/assertion/snapshots/1-TSESTree-AST.shot b/...s/assertion/snapshots/1-TSESTree-AST.shot → ..._/assertion/snapshots/1-TSESTree-AST.shot
diff --git a/...aration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/1-TSESTree-Error.shot b/...aration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/1-TSESTree-Error.shot
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AST Fixtures declaration ExportNamedDeclaration _error_ assertion TSESTree - Error 1`] = `"NO ERROR"`;
diff --git a/...eclaration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/2-Babel-Error.shot b/...eclaration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/2-Babel-Error.shot
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AST Fixtures declaration ExportNamedDeclaration _error_ assertion Babel - Error 1`] = `[SyntaxError: A JSON module can only be imported with \`default\`. (1:9)]`;
diff --git a/...ssertion/snapshots/2-TSESTree-Tokens.shot → ...ssertion/snapshots/2-TSESTree-Tokens.shot b/...ssertion/snapshots/2-TSESTree-Tokens.shot → ...ssertion/snapshots/2-TSESTree-Tokens.shot
diff --git a/...ration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/3-Alignment-Error.shot b/...ration/ExportNamedDeclaration/fixtures/_error_/assertion/snapshots/3-Alignment-Error.shot
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AST Fixtures declaration ExportNamedDeclaration _error_ assertion Error Alignment 1`] = `"Babel errored but TSESTree didn't"`;
diff --git a/...ures/assertion/snapshots/3-Babel-AST.shot → ...ror_/assertion/snapshots/3-Babel-AST.shot b/...ures/assertion/snapshots/3-Babel-AST.shot → ...ror_/assertion/snapshots/3-Babel-AST.shot
diff --git a/...s/assertion/snapshots/4-Babel-Tokens.shot → ..._/assertion/snapshots/4-Babel-Tokens.shot b/...s/assertion/snapshots/4-Babel-Tokens.shot → ..._/assertion/snapshots/4-Babel-Tokens.shot
diff --git a/...ertion/snapshots/5-AST-Alignment-AST.shot → ...ertion/snapshots/5-AST-Alignment-AST.shot b/...ertion/snapshots/5-AST-Alignment-AST.shot → ...ertion/snapshots/5-AST-Alignment-AST.shot
diff --git a/...ion/snapshots/6-AST-Alignment-Tokens.shot → ...ion/snapshots/6-AST-Alignment-Tokens.shot b/...ion/snapshots/6-AST-Alignment-Tokens.shot → ...ion/snapshots/6-AST-Alignment-Tokens.shot
diff --git a/packages/ast-spec/tests/fixtures-with-differences-errors.shot b/packages/ast-spec/tests/fixtures-with-differences-errors.shot
@@ -9,6 +9,7 @@ Object {
     "declaration/ExportAllDeclaration/fixtures/_error_/kind-type/fixture.ts",
     "declaration/ExportAllDeclaration/fixtures/_error_/type-kind/fixture.ts",
     "declaration/ExportNamedDeclaration/fixtures/_error_/anonymous-class/fixture.ts",
+    "declaration/ExportNamedDeclaration/fixtures/_error_/assertion/fixture.ts",
     "declaration/FunctionDeclaration/fixtures/_error_/missing-type-param/fixture.ts",
     "declaration/TSDeclareFunction/fixtures/_error_/async/fixture.ts",
     "declaration/TSDeclareFunction/fixtures/_error_/declare-with-body/fixture.ts",

diff --git a/packages/eslint-plugin/src/rules/array-type.ts b/packages/eslint-plugin/src/rules/array-type.ts
@@ -103,7 +103,7 @@ export default util.createRule<Options, MessageIds>({
         "Array type using '{{readonlyPrefix}}{{type}}[]' is forbidden for non-simple types. Use '{{className}}<{{type}}>' instead.",
     },
     schema: {
-      definitions: {
+      $defs: {
         arrayOption: {
           enum: ['array', 'generic', 'array-simple'],
         },
@@ -112,11 +112,11 @@ export default util.createRule<Options, MessageIds>({
         {
           properties: {
             default: {
-              $ref: '#/definitions/arrayOption',
+              $ref: '#/$defs/arrayOption',
               description: 'The array type expected for mutable cases...',
             },
             readonly: {
-              $ref: '#/definitions/arrayOption',
+              $ref: '#/$defs/arrayOption',
               description:
                 'The array type expected for readonly cases. If omitted, the value for `default` will be used.',
             },

diff --git a/packages/eslint-plugin/src/rules/ban-ts-comment.ts b/packages/eslint-plugin/src/rules/ban-ts-comment.ts
@@ -39,7 +39,7 @@ export default util.createRule<[Options], MessageIds>({
         'The description for the "@ts-{{directive}}" directive must match the {{format}} format.',
     },
     schema: {
-      definitions: {
+      $defs: {
         directiveConfigSchema: {
           oneOf: [
             {
@@ -62,11 +62,11 @@ export default util.createRule<[Options], MessageIds>({
         {
           properties: {
             'ts-expect-error': {
-              $ref: '#/definitions/directiveConfigSchema',
+              $ref: '#/$defs/directiveConfigSchema',
             },
-            'ts-ignore': { $ref: '#/definitions/directiveConfigSchema' },
-            'ts-nocheck': { $ref: '#/definitions/directiveConfigSchema' },
-            'ts-check': { $ref: '#/definitions/directiveConfigSchema' },
+            'ts-ignore': { $ref: '#/$defs/directiveConfigSchema' },
+            'ts-nocheck': { $ref: '#/$defs/directiveConfigSchema' },
+            'ts-check': { $ref: '#/$defs/directiveConfigSchema' },
             minimumDescriptionLength: {
               type: 'number',
               default: defaultMinimumDescriptionLength,

diff --git a/packages/eslint-plugin/src/rules/comma-dangle.ts b/packages/eslint-plugin/src/rules/comma-dangle.ts
@@ -46,7 +46,7 @@ export default util.createRule<Options, MessageIds>({
       extendsBaseRule: true,
     },
     schema: {
-      definitions: {
+      $defs: {
         value: {
           enum: OPTION_VALUE_SCHEME,
         },
@@ -59,19 +59,19 @@ export default util.createRule<Options, MessageIds>({
         {
           oneOf: [
             {
-              $ref: '#/definitions/value',
+              $ref: '#/$defs/value',
             },
             {
               type: 'object',
               properties: {
-                arrays: { $ref: '#/definitions/valueWithIgnore' },
-                objects: { $ref: '#/definitions/valueWithIgnore' },
-                imports: { $ref: '#/definitions/valueWithIgnore' },
-                exports: { $ref: '#/definitions/valueWithIgnore' },
-                functions: { $ref: '#/definitions/valueWithIgnore' },
-                enums: { $ref: '#/definitions/valueWithIgnore' },
-                generics: { $ref: '#/definitions/valueWithIgnore' },
-                tuples: { $ref: '#/definitions/valueWithIgnore' },
+                arrays: { $ref: '#/$defs/valueWithIgnore' },
+                objects: { $ref: '#/$defs/valueWithIgnore' },
+                imports: { $ref: '#/$defs/valueWithIgnore' },
+                exports: { $ref: '#/$defs/valueWithIgnore' },
+                functions: { $ref: '#/$defs/valueWithIgnore' },
+                enums: { $ref: '#/$defs/valueWithIgnore' },
+                generics: { $ref: '#/$defs/valueWithIgnore' },
+                tuples: { $ref: '#/$defs/valueWithIgnore' },
               },
               additionalProperties: false,
             },

diff --git a/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts b/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -62,23 +62,23 @@ export default util.createRule<Options, MessageIds>({
         'Public accessibility modifier on {{type}} {{name}}.',
     },
     schema: {
-      definitions: {
+      $defs: {
         accessibilityLevel,
       },
       prefixItems: [
         {
           type: 'object',
           properties: {
-            accessibility: { $ref: '#/definitions/accessibilityLevel' },
+            accessibility: { $ref: '#/$defs/accessibilityLevel' },
             overrides: {
               type: 'object',
               properties: {
-                accessors: { $ref: '#/definitions/accessibilityLevel' },
-                constructors: { $ref: '#/definitions/accessibilityLevel' },
-                methods: { $ref: '#/definitions/accessibilityLevel' },
-                properties: { $ref: '#/definitions/accessibilityLevel' },
+                accessors: { $ref: '#/$defs/accessibilityLevel' },
+                constructors: { $ref: '#/$defs/accessibilityLevel' },
+                methods: { $ref: '#/$defs/accessibilityLevel' },
+                properties: { $ref: '#/$defs/accessibilityLevel' },
                 parameterProperties: {
-                  $ref: '#/definitions/accessibilityLevel',
+                  $ref: '#/$defs/accessibilityLevel',
                 },
               },
 

diff --git a/packages/eslint-plugin/src/rules/padding-line-between-statements.ts b/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -594,7 +594,7 @@ export default util.createRule<Options, MessageIds>({
     fixable: 'whitespace',
     hasSuggestions: false,
     schema: {
-      definitions: {
+      $defs: {
         paddingType: {
           enum: Object.keys(PaddingTypes),
         },
@@ -615,9 +615,9 @@ export default util.createRule<Options, MessageIds>({
       items: {
         type: 'object',
         properties: {
-          blankLine: { $ref: '#/definitions/paddingType' },
-          prev: { $ref: '#/definitions/statementType' },
-          next: { $ref: '#/definitions/statementType' },
+          blankLine: { $ref: '#/$defs/paddingType' },
+          prev: { $ref: '#/$defs/statementType' },
+          next: { $ref: '#/$defs/statementType' },
         },
         additionalProperties: false,
         required: ['blankLine', 'prev', 'next'],

diff --git a/packages/eslint-plugin/src/rules/parameter-properties.ts b/packages/eslint-plugin/src/rules/parameter-properties.ts
@@ -37,7 +37,7 @@ export default util.createRule<Options, MessageIds>({
         'Property {{parameter}} should be declared as a parameter property.',
     },
     schema: {
-      definitions: {
+      $defs: {
         modifier: {
           enum: [
             'readonly',
@@ -57,7 +57,7 @@ export default util.createRule<Options, MessageIds>({
             allow: {
               type: 'array',
               items: {
-                $ref: '#/definitions/modifier',
+                $ref: '#/$defs/modifier',
               },
               minItems: 1,
             },