feat(core): expose cache on generator

antfu · antfu · commit 6990846e27b3 · 2024-12-25T12:03:22.000+08:00
diff --git a/packages/autocomplete/src/create.ts b/packages/autocomplete/src/create.ts
@@ -174,8 +174,7 @@ export function createAutocomplete(
   }
 
   async function suggestUnoCache(input: string) {
-    // @ts-expect-error private
-    const keys = Array.from(uno._cache.entries())
+    const keys = Array.from(uno.cache.entries())
     return keys.filter(i => i[1] && i[0].startsWith(input)).map(i => i[0])
   }
 
diff --git a/packages/core/src/generator.ts b/packages/core/src/generator.ts
@@ -15,15 +15,16 @@ export const symbols: ControlSymbols = {
 }
 
 class UnoGeneratorInternal<Theme extends object = object> {
-  public version = version
-  private _cache = new Map<string, StringifiedUtil<Theme>[] | null>()
+  public readonly version = version
+  public readonly events = createNanoEvents<{
+    config: (config: ResolvedConfig<Theme>) => void
+  }>()
+
   public config: ResolvedConfig<Theme> = undefined!
+  public cache = new Map<string, StringifiedUtil<Theme>[] | null>()
   public blocked = new Set<string>()
   public parentOrders = new Map<string, number>()
   public activatedRules = new Set<Rule<Theme>>()
-  public events = createNanoEvents<{
-    config: (config: ResolvedConfig<Theme>) => void
-  }>()
 
   protected constructor(
     public userConfig: UserConfig<Theme> = {},
@@ -52,7 +53,7 @@ class UnoGeneratorInternal<Theme extends object = object> {
     this.blocked.clear()
     this.parentOrders.clear()
     this.activatedRules.clear()
-    this._cache.clear()
+    this.cache.clear()
     this.config = await resolveConfig(userConfig, this.defaults)
     this.events.emit('config', this.config)
   }
@@ -123,24 +124,24 @@ class UnoGeneratorInternal<Theme extends object = object> {
     const cacheKey = `${raw}${alias ? ` ${alias}` : ''}`
 
     // use caches if possible
-    if (this._cache.has(cacheKey))
-      return this._cache.get(cacheKey)
+    if (this.cache.has(cacheKey))
+      return this.cache.get(cacheKey)
 
     let current = raw
     for (const p of this.config.preprocess)
       current = p(raw)!
 
     if (this.isBlocked(current)) {
       this.blocked.add(raw)
-      this._cache.set(cacheKey, null)
+      this.cache.set(cacheKey, null)
       return
     }
 
     const variantResults = await this.matchVariants(raw, current)
 
     if (variantResults.every(i => !i || this.isBlocked(i[1]))) {
       this.blocked.add(raw)
-      this._cache.set(cacheKey, null)
+      this.cache.set(cacheKey, null)
       return
     }
 
@@ -162,12 +163,12 @@ class UnoGeneratorInternal<Theme extends object = object> {
 
     const result = (await Promise.all(variantResults.map(i => handleVariantResult(i)))).flat().filter(x => !!x)
     if (result?.length) {
-      this._cache.set(cacheKey, result)
+      this.cache.set(cacheKey, result)
       return result
     }
 
     // set null cache for unmatched result
-    this._cache.set(cacheKey, null)
+    this.cache.set(cacheKey, null)
   }
 
   generate(

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ export function createAutocomplete(`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`async function suggestUnoCache(input: string) {`
`177`		`- // @ts-expect-error private`
`178`		`- const keys = Array.from(uno._cache.entries())`
	`177`	`+ const keys = Array.from(uno.cache.entries())`
`179`	`178`	`return keys.filter(i => i[1] && i[0].startsWith(input)).map(i => i[0])`
`180`	`179`	`}`
`181`	`180`