Fix generation of non array main schema

Author: Shinigami92

scripts/generate-rule-files.ts

@@ -87,6 +87,7 @@ async function main(): Promise<void> {
         const deprecated: boolean | undefined = meta?.deprecated;
 
         const schema: JSONSchema4 | JSONSchema4[] | undefined = meta?.schema;
+        const schemaIsObject: boolean = !Array.isArray(schema);
         const mainSchema: JSONSchema4 | undefined = Array.isArray(schema) ? schema[0] : schema;
         const sideSchema: JSONSchema4 | undefined =
           schema && Array.isArray(schema) && schema.length > 1 ? schema[1] : undefined;
@@ -160,9 +161,15 @@ ${ruleOption}
 /**
  * Options.
  */
-export type ${ruleNamePascalCase}Options = [${ruleNamePascalCase}Option?${
-            sideSchema ? `, ${ruleNamePascalCase}Config?${thirdSchema ? `, ${ruleNamePascalCase}Setting?` : ''}` : ''
-          }];`;
+export type ${ruleNamePascalCase}Options = ${
+            schemaIsObject
+              ? `${ruleNamePascalCase}Option`
+              : `[${ruleNamePascalCase}Option?${
+                  sideSchema
+                    ? `, ${ruleNamePascalCase}Config?${thirdSchema ? `, ${ruleNamePascalCase}Setting?` : ''}`
+                    : ''
+                }]`
+          };`;
         }
 
         // TODO: Add third option

src/rules/eslint/array-element-newline.d.ts

@@ -22,7 +22,7 @@ export type BasicConfig =
 /**
  * Options.
  */
-export type ArrayElementNewlineOptions = [ArrayElementNewlineOption?];
+export type ArrayElementNewlineOptions = ArrayElementNewlineOption;
 
 /**
  * Enforce line breaks after each array element.

src/rules/eslint/arrow-body-style.d.ts

@@ -18,7 +18,7 @@ export type ArrowBodyStyleOption =
 /**
  * Options.
  */
-export type ArrowBodyStyleOptions = [ArrowBodyStyleOption?];
+export type ArrowBodyStyleOptions = ArrowBodyStyleOption;
 
 /**
  * Require braces around arrow function bodies.

src/rules/eslint/comma-dangle.d.ts

@@ -21,7 +21,7 @@ export type ValueWithIgnore = 'always-multiline' | 'always' | 'ignore' | 'never'
 /**
  * Options.
  */
-export type CommaDangleOptions = [CommaDangleOption?];
+export type CommaDangleOptions = CommaDangleOption;
 
 /**
  * Require or disallow trailing commas.

src/rules/eslint/consistent-this.d.ts

@@ -8,7 +8,7 @@ export type ConsistentThisOption = string[];
 /**
  * Options.
  */
-export type ConsistentThisOptions = [ConsistentThisOption?];
+export type ConsistentThisOptions = ConsistentThisOption;
 
 /**
  * Enforce consistent naming when capturing the current execution context.

src/rules/eslint/curly.d.ts

@@ -13,7 +13,7 @@ export type CurlyOption =
 /**
  * Options.
  */
-export type CurlyOptions = [CurlyOption?];
+export type CurlyOptions = CurlyOption;
 
 /**
  * Enforce consistent brace style for all control statements.

src/rules/eslint/eqeqeq.d.ts

@@ -18,7 +18,7 @@ export type EqeqeqOption =
 /**
  * Options.
  */
-export type EqeqeqOptions = [EqeqeqOption?];
+export type EqeqeqOptions = EqeqeqOption;
 
 /**
  * Require the use of `===` and `!==`.

src/rules/eslint/func-call-spacing.d.ts

@@ -18,7 +18,7 @@ export type FuncCallSpacingOption =
 /**
  * Options.
  */
-export type FuncCallSpacingOptions = [FuncCallSpacingOption?];
+export type FuncCallSpacingOptions = FuncCallSpacingOption;
 
 /**
  * Require or disallow spacing between function identifiers and their invocations.

src/rules/eslint/func-name-matching.d.ts

@@ -24,7 +24,7 @@ export type FuncNameMatchingOption =
 /**
  * Options.
  */
-export type FuncNameMatchingOptions = [FuncNameMatchingOption?];
+export type FuncNameMatchingOptions = FuncNameMatchingOption;
 
 /**
  * Require function names to match the name of the variable or property to which they are assigned.

src/rules/eslint/func-names.d.ts

@@ -17,7 +17,7 @@ export type Value = 'always' | 'as-needed' | 'never';
 /**
  * Options.
  */
-export type FuncNamesOptions = [FuncNamesOption?];
+export type FuncNamesOptions = FuncNamesOption;
 
 /**
  * Require or disallow named `function` expressions.