fix(filter): correct the behavior when multiple transform filter options are specified

sxzz · sxzz · commit f5a5abf4a68f · 2025-04-11T08:34:25.000+08:00
ref: rollup/rollup#5909
diff --git a/src/utils/filter.ts b/src/utils/filter.ts
@@ -13,11 +13,6 @@ function isAbsolute(path: string): boolean {
   return ABSOLUTE_PATH_REGEX.test(path)
 }
 
-const FALLBACK_TRUE = 1
-const FALLBACK_FALSE = 0
-type FallbackValues = typeof FALLBACK_TRUE | typeof FALLBACK_FALSE
-type PluginFilterWithFallback = (input: string) => boolean | FallbackValues
-
 export type PluginFilter = (input: string) => boolean
 export type TransformHookFilter = (id: string, code: string) => boolean
 
@@ -67,7 +62,7 @@ function patternToCodeFilter(pattern: StringOrRegExp): PluginFilter {
 function createFilter(
   exclude: PluginFilter[] | undefined,
   include: PluginFilter[] | undefined,
-): PluginFilterWithFallback | undefined {
+): PluginFilter | undefined {
   if (!exclude && !include) {
     return
   }
@@ -79,7 +74,7 @@ function createFilter(
     if (include?.some(filter => filter(input))) {
       return true
     }
-    return !!include && include.length > 0 ? FALLBACK_FALSE : FALLBACK_TRUE
+    return !(include && include.length > 0)
   }
 }
 
@@ -100,7 +95,7 @@ function normalizeFilter(filter: StringFilter): NormalizedStringFilter {
   }
 }
 
-function createIdFilter(filter: StringFilter | undefined): PluginFilterWithFallback | undefined {
+function createIdFilter(filter: StringFilter | undefined): PluginFilter | undefined {
   if (!filter)
     return
   const { exclude, include } = normalizeFilter(filter)
@@ -109,7 +104,7 @@ function createIdFilter(filter: StringFilter | undefined): PluginFilterWithFallb
   return createFilter(excludeFilter, includeFilter)
 }
 
-function createCodeFilter(filter: StringFilter | undefined): PluginFilterWithFallback | undefined {
+function createCodeFilter(filter: StringFilter | undefined): PluginFilter | undefined {
   if (!filter)
     return
   const { exclude, include } = normalizeFilter(filter)
@@ -134,18 +129,14 @@ function createFilterForTransform(
   return (id, code) => {
     let fallback = true
     if (idFilterFunction) {
-      const idResult = idFilterFunction(id)
-      if (typeof idResult === 'boolean') {
-        return idResult
-      }
-      fallback &&= !!idResult
+      fallback &&= idFilterFunction(id)
+    }
+    if (!fallback) {
+      return false
     }
+
     if (codeFilterFunction) {
-      const codeResult = codeFilterFunction(code)
-      if (typeof codeResult === 'boolean') {
-        return codeResult
-      }
-      fallback &&= !!codeResult
+      fallback &&= codeFilterFunction(code)
     }
     return fallback
   }
