make the schema types a discriminated union

typescript-eslint · Apr 28, 2023 · 178cf35 · 178cf35
1 parent 4874706
commit 178cf35
Show file tree

Hide file tree

Showing 63 changed files with 401 additions and 392 deletions.
diff --git a/packages/eslint-plugin/src/rules/array-type.ts b/packages/eslint-plugin/src/rules/array-type.ts
@@ -109,6 +109,7 @@ export default util.createRule<Options, MessageIds>({
       {
         $defs: {
           arrayOption: {
+            type: 'string',
             enum: ['array', 'generic', 'array-simple'],
           },
         },

diff --git a/packages/eslint-plugin/src/rules/ban-ts-comment.ts b/packages/eslint-plugin/src/rules/ban-ts-comment.ts
@@ -49,6 +49,7 @@ export default util.createRule<[Options], MessageIds>({
                 default: true,
               },
               {
+                type: 'string',
                 enum: ['allow-with-description'],
               },
               {

diff --git a/packages/eslint-plugin/src/rules/ban-types.ts b/packages/eslint-plugin/src/rules/ban-types.ts
@@ -148,11 +148,13 @@ export default util.createRule<Options, MessageIds>({
                 description: 'Bans the type with the default message',
               },
               {
+                type: 'boolean',
                 enum: [false],
                 description:
                   'Un-bans the type (useful when paired with `extendDefaults`)',
               },
               {
+                type: 'boolean',
                 enum: [true],
                 description: 'Bans the type with the default message',
               },

diff --git a/packages/eslint-plugin/src/rules/class-literal-property-style.ts b/packages/eslint-plugin/src/rules/class-literal-property-style.ts
@@ -50,7 +50,12 @@ export default util.createRule<Options, MessageIds>({
       preferFieldStyle: 'Literals should be exposed using readonly fields.',
       preferGetterStyle: 'Literals should be exposed using getters.',
     },
-    schema: [{ enum: ['fields', 'getters'] }],
+    schema: [
+      {
+        type: 'string',
+        enum: ['fields', 'getters'],
+      },
+    ],
   },
   defaultOptions: ['fields'],
   create(context, [style]) {

diff --git a/packages/eslint-plugin/src/rules/comma-dangle.ts b/packages/eslint-plugin/src/rules/comma-dangle.ts
@@ -49,9 +49,11 @@ export default util.createRule<Options, MessageIds>({
     schema: {
       $defs: {
         value: {
+          type: 'string',
           enum: OPTION_VALUE_SCHEME,
         },
         valueWithIgnore: {
+          type: 'string',
           enum: [...OPTION_VALUE_SCHEME, 'ignore'],
         },
       },
@@ -79,7 +81,7 @@ export default util.createRule<Options, MessageIds>({
           ],
         },
       ],
-      additionalProperties: false,
+      additionalItems: false,
     },
     fixable: 'code',
     hasSuggestions: baseRule.meta.hasSuggestions,

diff --git a/packages/eslint-plugin/src/rules/consistent-generic-constructors.ts b/packages/eslint-plugin/src/rules/consistent-generic-constructors.ts
@@ -24,6 +24,7 @@ export default createRule<Options, MessageIds>({
     fixable: 'code',
     schema: [
       {
+        type: 'string',
         enum: ['type-annotation', 'constructor'],
       },
     ],

diff --git a/packages/eslint-plugin/src/rules/consistent-indexed-object-style.ts b/packages/eslint-plugin/src/rules/consistent-indexed-object-style.ts
@@ -21,6 +21,7 @@ export default createRule<Options, MessageIds>({
     fixable: 'code',
     schema: [
       {
+        type: 'string',
         enum: ['record', 'index-signature'],
       },
     ],

diff --git a/packages/eslint-plugin/src/rules/consistent-type-assertions.ts b/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
@@ -48,6 +48,7 @@ export default util.createRule<Options, MessageIds>({
             type: 'object',
             properties: {
               assertionStyle: {
+                type: 'string',
                 enum: ['never'],
               },
             },
@@ -58,9 +59,11 @@ export default util.createRule<Options, MessageIds>({
             type: 'object',
             properties: {
               assertionStyle: {
+                type: 'string',
                 enum: ['as', 'angle-bracket'],
               },
               objectLiteralTypeAssertions: {
+                type: 'string',
                 enum: ['allow', 'allow-as-parameter', 'never'],
               },
             },

diff --git a/packages/eslint-plugin/src/rules/consistent-type-definitions.ts b/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
@@ -18,6 +18,7 @@ export default util.createRule({
     },
     schema: [
       {
+        type: 'string',
         enum: ['interface', 'type'],
       },
     ],

diff --git a/packages/eslint-plugin/src/rules/consistent-type-imports.ts b/packages/eslint-plugin/src/rules/consistent-type-imports.ts
@@ -65,12 +65,14 @@ export default util.createRule<Options, MessageIds>({
         type: 'object',
         properties: {
           prefer: {
+            type: 'string',
             enum: ['type-imports', 'no-type-imports'],
           },
           disallowTypeAnnotations: {
             type: 'boolean',
           },
           fixStyle: {
+            type: 'string',
             enum: ['separate-type-imports', 'inline-type-imports'],
           },
         },

diff --git a/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts b/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -51,14 +51,17 @@ export default util.createRule<Options, MessageIds>({
           accessibilityLevel: {
             oneOf: [
               {
+                type: 'string',
                 enum: ['explicit'],
                 description: 'Always require an accessor.',
               },
               {
+                type: 'string',
                 enum: ['no-public'],
                 description: 'Require an accessor except when public.',
               },
               {
+                type: 'string',
                 enum: ['off'],
                 description: 'Never check whether there is an accessor.',
               },

diff --git a/packages/eslint-plugin/src/rules/func-call-spacing.ts b/packages/eslint-plugin/src/rules/func-call-spacing.ts
@@ -29,6 +29,7 @@ export default util.createRule<Options, MessageIds>({
           type: 'array',
           items: [
             {
+              type: 'string',
               enum: ['never'],
             },
           ],
@@ -39,6 +40,7 @@ export default util.createRule<Options, MessageIds>({
           type: 'array',
           items: [
             {
+              type: 'string',
               enum: ['always'],
             },
             {

diff --git a/packages/eslint-plugin/src/rules/keyword-spacing.ts b/packages/eslint-plugin/src/rules/keyword-spacing.ts
@@ -3,6 +3,7 @@ import { AST_NODE_TYPES, AST_TOKEN_TYPES } from '@typescript-eslint/utils';
 
 import * as util from '../util';
 import { getESLintCoreRule } from '../util/getESLintCoreRule';
+import { JSONSchema4 } from '@typescript-eslint/utils/json-schema';
 
 const baseRule = getESLintCoreRule('keyword-spacing');
 
@@ -26,7 +27,7 @@ const schema = util.deepMerge(
       },
     },
   },
-);
+) as unknown as JSONSchema4;
 
 export default util.createRule<Options, MessageIds>({
   name: 'keyword-spacing',

diff --git a/packages/eslint-plugin/src/rules/member-delimiter-style.ts b/packages/eslint-plugin/src/rules/member-delimiter-style.ts
@@ -150,9 +150,15 @@ export default util.createRule<Options, MessageIds>({
     schema: [
       {
         $defs: {
-          multiLineOption: { enum: ['none', 'semi', 'comma'] },
+          multiLineOption: {
+            type: 'string',
+            enum: ['none', 'semi', 'comma'],
+          },
           // note can't have "none" for single line delimiter as it's invalid syntax
-          singleLineOption: { enum: ['semi', 'comma'] },
+          singleLineOption: {
+            type: 'string',
+            enum: ['semi', 'comma'],
+          },
           // note - need to define this last as it references the enums
           delimiterConfig: BASE_SCHEMA,
         },
@@ -172,6 +178,7 @@ export default util.createRule<Options, MessageIds>({
             additionalProperties: false,
           },
           multilineDetection: {
+            type: 'string',
             enum: ['brackets', 'last-member'],
           },
         },

diff --git a/packages/eslint-plugin/src/rules/member-ordering.ts b/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -644,7 +644,7 @@ export default util.createRule<Options, MessageIds>({
           },
           allItems: {
             type: 'string',
-            enum: allMemberTypes,
+            enum: allMemberTypes as string[],
           },
           typeItems: {
             type: 'string',

diff --git a/packages/eslint-plugin/src/rules/method-signature-style.ts b/packages/eslint-plugin/src/rules/method-signature-style.ts
@@ -22,6 +22,7 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
+        type: 'string',
         enum: ['property', 'method'],
       },
     ],

diff --git a/packages/eslint-plugin/src/rules/no-empty-function.ts b/packages/eslint-plugin/src/rules/no-empty-function.ts
@@ -3,6 +3,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/utils';
 
 import * as util from '../util';
 import { getESLintCoreRule } from '../util/getESLintCoreRule';
+import { JSONSchema4 } from '@typescript-eslint/utils/json-schema';
 
 const baseRule = getESLintCoreRule('no-empty-function');
 
@@ -18,6 +19,7 @@ const schema = util.deepMerge(
     properties: {
       allow: {
         items: {
+          type: 'string',
           enum: [
             'functions',
             'arrowFunctions',
@@ -38,7 +40,7 @@ const schema = util.deepMerge(
       },
     },
   },
-);
+) as unknown as JSONSchema4;
 
 export default util.createRule<Options, MessageIds>({
   name: 'no-empty-function',

diff --git a/packages/eslint-plugin/src/rules/no-invalid-void-type.ts b/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
@@ -47,7 +47,7 @@ export default util.createRule<[Options], MessageIds>({
               {
                 type: 'array',
                 items: { type: 'string' },
-                minLength: 1,
+                minItems: 1,
               },
             ],
           },

diff --git a/packages/eslint-plugin/src/rules/no-magic-numbers.ts b/packages/eslint-plugin/src/rules/no-magic-numbers.ts
@@ -3,6 +3,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/utils';
 
 import * as util from '../util';
 import { getESLintCoreRule } from '../util/getESLintCoreRule';
+import { JSONSchema4 } from '@typescript-eslint/utils/json-schema';
 
 const baseRule = getESLintCoreRule('no-magic-numbers');
 
@@ -31,7 +32,7 @@ const schema = util.deepMerge(
       },
     },
   },
-);
+) as unknown as JSONSchema4;
 
 export default util.createRule<Options, MessageIds>({
   name: 'no-magic-numbers',

diff --git a/packages/eslint-plugin/src/rules/no-shadow.ts b/packages/eslint-plugin/src/rules/no-shadow.ts
@@ -43,6 +43,7 @@ export default util.createRule<Options, MessageIds>({
             type: 'boolean',
           },
           hoist: {
+            type: 'string',
             enum: ['all', 'functions', 'never'],
           },
           allow: {

diff --git a/packages/eslint-plugin/src/rules/no-type-alias.ts b/packages/eslint-plugin/src/rules/no-type-alias.ts
@@ -50,6 +50,7 @@ export default util.createRule<Options, MessageIds>({
       {
         $defs: {
           expandedOptions: {
+            type: 'string',
             enum: [
               'always',
               'never',
@@ -59,6 +60,7 @@ export default util.createRule<Options, MessageIds>({
             ] satisfies Values[],
           },
           simpleOptions: {
+            type: 'string',
             enum: ['always', 'never'],
           },
         },

diff --git a/packages/eslint-plugin/src/rules/no-unused-vars.ts b/packages/eslint-plugin/src/rules/no-unused-vars.ts
@@ -44,18 +44,21 @@ export default util.createRule<Options, MessageIds>({
       {
         oneOf: [
           {
+            type: 'string',
             enum: ['all', 'local'],
           },
           {
             type: 'object',
             properties: {
               vars: {
+                type: 'string',
                 enum: ['all', 'local'],
               },
               varsIgnorePattern: {
                 type: 'string',
               },
               args: {
+                type: 'string',
                 enum: ['all', 'after-used', 'none'],
               },
               ignoreRestSiblings: {
@@ -65,6 +68,7 @@ export default util.createRule<Options, MessageIds>({
                 type: 'string',
               },
               caughtErrors: {
+                type: 'string',
                 enum: ['all', 'none'],
               },
               caughtErrorsIgnorePattern: {

diff --git a/packages/eslint-plugin/src/rules/no-use-before-define.ts b/packages/eslint-plugin/src/rules/no-use-before-define.ts
@@ -251,6 +251,7 @@ export default util.createRule<Options, MessageIds>({
       {
         oneOf: [
           {
+            type: 'string',
             enum: ['nofunc'],
           },
           {

diff --git a/packages/eslint-plugin/src/rules/padding-line-between-statements.ts b/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -598,14 +598,21 @@ export default util.createRule<Options, MessageIds>({
     schema: {
       $defs: {
         paddingType: {
+          type: 'string',
           enum: Object.keys(PaddingTypes),
         },
         statementType: {
           anyOf: [
-            { enum: Object.keys(StatementTypes) },
+            {
+              type: 'string',
+              enum: Object.keys(StatementTypes),
+            },
             {
               type: 'array',
-              items: { enum: Object.keys(StatementTypes) },
+              items: {
+                type: 'string',
+                enum: Object.keys(StatementTypes),
+              },
               minItems: 1,
               uniqueItems: true,
               additionalItems: false,

diff --git a/packages/eslint-plugin/src/rules/parameter-properties.ts b/packages/eslint-plugin/src/rules/parameter-properties.ts
@@ -41,6 +41,7 @@ export default util.createRule<Options, MessageIds>({
       {
         $defs: {
           modifier: {
+            type: 'string',
             enum: [
               'readonly',
               'private',
@@ -62,6 +63,7 @@ export default util.createRule<Options, MessageIds>({
             minItems: 1,
           },
           prefer: {
+            type: 'string',
             enum: ['class-property', 'parameter-property'],
           },
         },

diff --git a/packages/eslint-plugin/src/rules/return-await.ts b/packages/eslint-plugin/src/rules/return-await.ts
@@ -37,6 +37,7 @@ export default util.createRule({
     },
     schema: [
       {
+        type: 'string',
         enum: ['in-try-catch', 'always', 'never'],
       },
     ],