patch types

eslint-types · Apr 22, 2023 · f47efb6 · f47efb6
1 parent c848987
commit f47efb6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/scripts/generate-rule-files/src/json-schema-to-ts.ts b/scripts/generate-rule-files/src/json-schema-to-ts.ts
@@ -16,14 +16,36 @@ function cleanJsDoc(content: string): string {
     .join('\n');
 }
 
+/**
+ * Replace some types that are generated by `json-schema-to-typescript`.
+ */
+export function patchTypes(content: string): string {
+  const replacements: Array<{
+    pattern: RegExp;
+    replacement: string;
+  }> = [
+    {
+      pattern:
+        /\(string & \{\s*\[k: string\]: any\s*\} & \{\s*\[k: string\]: any\s*\}\)\[\]/,
+      replacement: 'string[]',
+    },
+  ];
+
+  for (const { pattern, replacement } of replacements) {
+    content = content.replace(pattern, replacement);
+  }
+
+  return content;
+}
+
 /**
  * Generate a type from the given JSON schema.
  */
 export async function generateTypeFromSchema(
   schema: JSONSchema4,
   typeName: string,
 ): Promise<string> {
-  const result: string = await compile(schema, typeName, {
+  let result: string = await compile(schema, typeName, {
     format: false,
     bannerComment: '',
     style: {
@@ -33,5 +55,8 @@ export async function generateTypeFromSchema(
     unknownAny: false,
   });
 
-  return cleanJsDoc(result);
+  result = cleanJsDoc(result);
+  result = patchTypes(result);
+
+  return result;
 }
diff --git a/src/rules/vue/attribute-hyphenation.d.ts b/src/rules/vue/attribute-hyphenation.d.ts
@@ -4,11 +4,7 @@ import type { RuleConfig } from '../rule-config';
  * Config.
  */
 export interface AttributeHyphenationConfig {
-  ignore?: (string & {
-    [k: string]: any;
-  } & {
-    [k: string]: any;
-  })[];
+  ignore?: string[];
 }
 
 /**

diff --git a/src/rules/vue/html-indent.d.ts b/src/rules/vue/html-indent.d.ts
@@ -15,11 +15,7 @@ export interface HtmlIndentConfig {
       };
   switchCase?: number;
   alignAttributesVertically?: boolean;
-  ignores?: (string & {
-    [k: string]: any;
-  } & {
-    [k: string]: any;
-  })[];
+  ignores?: string[];
 }
 
 /**

diff --git a/src/rules/vue/script-indent.d.ts b/src/rules/vue/script-indent.d.ts
@@ -6,11 +6,7 @@ import type { RuleConfig } from '../rule-config';
 export interface ScriptIndentConfig {
   baseIndent?: number;
   switchCase?: number;
-  ignores?: (string & {
-    [k: string]: any;
-  } & {
-    [k: string]: any;
-  })[];
+  ignores?: string[];
 }
 
 /**

diff --git a/src/rules/vue/v-on-event-hyphenation.d.ts b/src/rules/vue/v-on-event-hyphenation.d.ts
@@ -5,11 +5,7 @@ import type { RuleConfig } from '../rule-config';
  */
 export interface VOnEventHyphenationConfig {
   autofix?: boolean;
-  ignore?: (string & {
-    [k: string]: any;
-  } & {
-    [k: string]: any;
-  })[];
+  ignore?: string[];
 }
 
 /**