feat(core): support safelist access to RuleContext

packages/core/src/generator/index.ts

@@ -184,6 +184,14 @@ export class UnoGenerator<Theme extends object = object> {
     if (safelist) {
       this.config.safelist.forEach((s) => {
         // We don't want to increment count if token is already in the set
+        if (typeof s === 'function') {
+          const result = toArray(s(this.config))
+          result.forEach((s) => {
+            if (!tokens.has(s))
+              tokens.add(s)
+          })
+          return
+        }
         if (!tokens.has(s))
           tokens.add(s)
       })
@@ -284,7 +292,7 @@ export class UnoGenerator<Theme extends object = object> {
                 || a[2]?.localeCompare(b[2] || '') // body
                 || 0
             })
-            .map(([, selector, body,, meta,, variantNoMerge]) => {
+            .map(([, selector, body, , meta, , variantNoMerge]) => {
               const scopedSelector = selector ? applyScope(selector, scope) : selector
               return [
                 [[scopedSelector ?? '', meta?.sort ?? 0]],
@@ -725,8 +733,8 @@ export class UnoGenerator<Theme extends object = object> {
             }
 
             const merges = [
-              [e.filter(([, noMerge]) => noMerge).map(([entries,, sort]) => [entries, sort]), true],
-              [e.filter(([, noMerge]) => !noMerge).map(([entries,, sort]) => [entries, sort]), false],
+              [e.filter(([, noMerge]) => noMerge).map(([entries, , sort]) => [entries, sort]), true],
+              [e.filter(([, noMerge]) => !noMerge).map(([entries, , sort]) => [entries, sort]), false],
             ] as [[CSSEntries, number][], boolean][]
 
             return merges.map(([e, noMerge]) => [

packages/core/src/types.ts

@@ -359,7 +359,7 @@ export interface ConfigBase<Theme extends object = object> {
   /**
    * Utilities that always been included
    */
-  safelist?: string[]
+  safelist?: (string | ((config: ResolvedConfig<Theme>) => string[] | string))[]
 
   /**
    * Extractors to handle the source file and outputs possible classes/selectors
@@ -686,7 +686,7 @@ export interface ContentOptions {
   /**
    * Inline text to be extracted
    */
-  inline?: (string | { code: string, id?: string } | (() => Awaitable<string | { code: string, id?: string }>)) []
+  inline?: (string | { code: string, id?: string } | (() => Awaitable<string | { code: string, id?: string }>))[]
 
   /**
    * Filters to determine whether to extract certain modules from the build tools' transformation pipeline.
@@ -722,7 +722,7 @@ export interface ContentOptions {
   /**
    * @deprecated Renamed to `inline`
    */
-  plain?: (string | { code: string, id?: string }) []
+  plain?: (string | { code: string, id?: string })[]
 }
 
 /**
@@ -778,12 +778,12 @@ export interface PluginOptions {
   exclude?: FilterPattern
 }
 
-export interface UserConfig<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions {}
-export interface UserConfigDefaults<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme> {}
+export interface UserConfig<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme>, GeneratorOptions, PluginOptions, CliOptions { }
+export interface UserConfigDefaults<Theme extends object = object> extends ConfigBase<Theme>, UserOnlyOptions<Theme> { }
 
 export interface ResolvedConfig<Theme extends object = object> extends Omit<
-RequiredByKey<UserConfig<Theme>, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>,
-'rules' | 'shortcuts' | 'autocomplete'
+  RequiredByKey<UserConfig<Theme>, 'mergeSelectors' | 'theme' | 'rules' | 'variants' | 'layers' | 'extractors' | 'blocklist' | 'safelist' | 'preflights' | 'sortLayers'>,
+  'rules' | 'shortcuts' | 'autocomplete'
 > {
   presets: Preset<Theme>[]
   shortcuts: Shortcut<Theme>[]

test/safelist.test.ts

@@ -10,10 +10,13 @@ describe('safelist', () => {
       ],
       safelist: [
         'm1',
+        () => ['m3', 'm4'],
       ],
     })
     const { css } = await uno.generate('m2')
     expect(css).toContain('.m1')
     expect(css).toContain('.m2')
+    expect(css).toContain('.m3')
+    expect(css).toContain('.m4')
   })
 })