fix: support only string globs

DefinitelyTyped/DefinitelyTyped#69210
eslint · Apr 11, 2024 · c99f85e · c99f85e
1 parent a40fc38
commit c99f85e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/app/components/ConfigItem.vue b/app/components/ConfigItem.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, defineModel, ref, watchEffect } from 'vue'
-import type { Linter } from 'eslint'
 import { filtersRules, isGridView } from '~/composables/state'
 import { stringifyUnquoted } from '~/composables/strings'
 import { useRouter } from '#app/composables/router'
@@ -12,7 +11,7 @@ const props = defineProps<{
   index: number
   filters?: FiltersConfigsPage
   active?: boolean
-  matchedGlobs?: Linter.FlatConfigFileSpec[]
+  matchedGlobs?: string[]
 }>()
 
 const emit = defineEmits<{

diff --git a/app/components/GlobItem.vue b/app/components/GlobItem.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, defineComponent } from 'vue'
-import type { Linter } from 'eslint'
 import { Dropdown as VDropdown } from 'floating-vue'
 import { useHighlightedGlob } from '../composables/shiki'
 import { filtersConfigs } from '~/composables/state'
@@ -9,7 +8,7 @@ import { payload } from '~/composables/payload'
 
 const props = withDefaults(
   defineProps<{
-    glob: Linter.FlatConfigFileSpec
+    glob: string
     popup?: 'files' | 'configs'
     active?: boolean | null
   }>(),

diff --git a/app/composables/payload.ts b/app/composables/payload.ts
@@ -1,5 +1,4 @@
 /* eslint-disable no-console */
-import type { Linter } from 'eslint'
 import { $fetch } from 'ofetch'
 import { isGeneralConfig, isIgnoreOnlyConfig } from '~~/shared/configs'
 import { getRuleLevel, getRuleOptions } from '~~/shared/rules'
@@ -91,7 +90,7 @@ export function getRuleStates(name: string): RuleConfigStates | undefined {
 
 export function resolvePayload(payload: Payload): ResolvedPayload {
   const ruleToState = new Map<string, RuleConfigStates>()
-  const globToConfigs = new Map<Linter.FlatConfigFileSpec, FlatConfigItem[]>()
+  const globToConfigs = new Map<string, FlatConfigItem[]>()
 
   payload.configs.forEach((config, index) => {
     // Rule Level
@@ -148,8 +147,8 @@ function resolveFiles(payload: Payload): ResolvedPayload['filesResolved'] {
     .map(i => i.index)
 
   const files: string[] = []
-  const globToFiles = new Map<Linter.FlatConfigFileSpec, Set<string>>()
-  const fileToGlobs = new Map<string, Set<Linter.FlatConfigFileSpec>>()
+  const globToFiles = new Map<string, Set<string>>()
+  const fileToGlobs = new Map<string, Set<string>>()
   const fileToConfigs = new Map<string, Set<number>>()
   const configToFiles = new Map<number, Set<string>>()
   const filesGroupMap = new Map<string, FilesGroup>()

diff --git a/shared/configs.ts b/shared/configs.ts
@@ -1,10 +1,9 @@
-import type { Linter } from 'eslint'
 import { minimatch } from 'minimatch'
 import type { FlatConfigItem, MatchedFile } from './types'
 
-export function getMatchedGlobs(file: string, glob: (Linter.FlatConfigFileSpec | Linter.FlatConfigFileSpec[])[]) {
+export function getMatchedGlobs(file: string, glob: (string | string[])[]) {
   const globs = (Array.isArray(glob) ? glob : [glob]).flat()
-  return globs.filter(glob => typeof glob === 'function' ? glob(file) : minimatch(file, glob)).flat()
+  return globs.filter(glob => minimatch(file, glob)).flat()
 }
 
 const META_KEYS = new Set(['name', 'index'])

diff --git a/shared/types.ts b/shared/types.ts
@@ -1,9 +1,11 @@
 import type { Linter } from 'eslint'
 import type { RuleMetaData } from '@typescript-eslint/utils/ts-eslint'
 
-export interface FlatConfigItem extends Linter.FlatConfig {
+export interface FlatConfigItem extends Omit<Linter.FlatConfig, 'files' | 'ignores'> {
   name?: string
   index: number
+  files?: (string | string[])[]
+  ignores?: string[]
 }
 
 export type RuleLevel = 'off' | 'warn' | 'error'
@@ -20,17 +22,17 @@ export interface ResolvedPayload extends Payload {
   configsGeneral: FlatConfigItem[]
 
   ruleToState: Map<string, RuleConfigStates>
-  globToConfigs: Map<Linter.FlatConfigFileSpec, FlatConfigItem[]>
+  globToConfigs: Map<string, FlatConfigItem[]>
 
   /**
    * Resolved data from files
    * Undefined if users disabled glob matching
    */
   filesResolved?: {
     list: string[]
-    globToFiles: Map<Linter.FlatConfigFileSpec, Set<string>>
+    globToFiles: Map<string, Set<string>>
     configToFiles: Map<number, Set<string>>
-    fileToGlobs: Map<string, Set<Linter.FlatConfigFileSpec>>
+    fileToGlobs: Map<string, Set<string>>
     fileToConfigs: Map<string, FlatConfigItem[]>
     groups: FilesGroup[]
   }
@@ -44,7 +46,7 @@ export interface MatchedFile {
   /**
    * Matched globs, includes both positive and negative globs
    */
-  globs: Linter.FlatConfigFileSpec[]
+  globs: string[]
   /**
    * Matched configs indexes
    */
@@ -60,7 +62,7 @@ export interface FilesGroup {
   id: string
   files: string[]
   configs: FlatConfigItem[]
-  globs: Set<Linter.FlatConfigFileSpec>
+  globs: Set<string>
 }
 
 export interface PayloadMeta {

diff --git a/src/configs.ts b/src/configs.ts
@@ -193,7 +193,7 @@ export async function globMatchedFiles(
 
   const ignoreOnlyConfigs = configs.filter(isIgnoreOnlyConfig)
   // const functionalGlobMap = new Map<any, string>()
-  // function stringifyGlob(glob: Linter.FlatConfigFileSpec) {
+  // function stringifyGlob(glob: string) {
   //   if (typeof glob === 'function') {
   //     if (!functionalGlobMap.has(glob))
   //       functionalGlobMap.set(glob, `<function#${functionalGlobMap.size + 1}>`)