feat(core): support custom function for blocklist, #3073

unocss · Sep 4, 2023 · 3392020 · 3392020
1 parent 44b7ebb
commit 3392020
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/core/src/generator/index.ts b/packages/core/src/generator/index.ts
@@ -724,7 +724,7 @@ export class UnoGenerator<Theme extends object = object> {
   }
 
   isBlocked(raw: string): boolean {
-    return !raw || this.config.blocklist.some(e => isString(e) ? e === raw : e.test(raw))
+    return !raw || this.config.blocklist.some(e => typeof e === 'function' ? e(raw) : isString(e) ? e === raw : e.test(raw))
   }
 }
 

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -209,7 +209,7 @@ export interface Preflight<Theme extends object = object> {
   layer?: string
 }
 
-export type BlocklistRule = string | RegExp
+export type BlocklistRule = string | RegExp | ((selector: string) => boolean | null | undefined)
 
 export interface VariantHandlerContext {
   /**

diff --git a/test/blocklist.test.ts b/test/blocklist.test.ts
@@ -14,15 +14,17 @@ describe('blocklist', () => {
       blocklist: [
         'block',
         /^text-/,
+        i => i.includes('green'),
       ],
       presets: [
         presetUno(),
       ],
     })
-    const { css: css1 } = await uno.generate('block text-red-200 hover:block', { minify: true, preflights: false })
-    const { css: css2 } = await dos.generate('block text-red-200 hover:block', { minify: true, preflights: false })
+    const { css: css1 } = await uno.generate('block text-red-200 hover:block bg-green text-green', { minify: true, preflights: false })
+    const { css: css2 } = await dos.generate('block text-red-200 hover:block bg-green text-green', { minify: true, preflights: false })
     expect(css1).contain('.block')
     expect(css1).contain('.text-red-200')
+    expect(css1).contain('.text-green')
     expect(css2).eq('')
 
     const { css: css3 } = await dos.generate('block text-red-200 hover:block', { minify: true, preflights: false })