wip

Julien-R44 · Apr 8, 2024 · 0e76cd6 · 0e76cd6
1 parent d668f18
commit 0e76cd6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 0 deletions.
diff --git a/packages/bentocache/src/bento_cache.ts b/packages/bentocache/src/bento_cache.ts
@@ -137,6 +137,9 @@ export class BentoCache<KnownCaches extends Record<string, BentoStore>> implemen
   /**
    * Get a value from the cache
    */
+  get<T = any>(options: GetPojoOptions<T>): Promise<T>
+  get<T = any>(key: string): Promise<T | null | undefined>
+  get<T = any>(key: string, defaultValue: Factory<T>, options?: GetOptions): Promise<T>
   async get<T = any>(
     keyOrOptions: string | GetPojoOptions<T>,
     defaultValue?: Factory<T>,

diff --git a/packages/bentocache/src/cache/cache.ts b/packages/bentocache/src/cache/cache.ts
@@ -50,6 +50,9 @@ export class Cache implements CacheProvider {
     return new Cache(this.name, this.#stack.namespace(namespace))
   }
 
+  get<T = any>(options: GetPojoOptions<T>): Promise<T>
+  get<T = any>(key: string): Promise<T | null | undefined>
+  get<T = any>(key: string, defaultValue: Factory<T>, options?: GetOptions): Promise<T>
   async get<T = any>(
     keyOrOptions: string | GetPojoOptions<T>,
     defaultValue?: Factory<T>,
@@ -100,6 +103,9 @@ export class Cache implements CacheProvider {
       this.#stack.emit(new events.CacheHit(key, localItem.serialize(), this.name, true))
       return localItem.getValue()
     }
+
+    this.#stack.emit(new events.CacheMiss(key, this.name))
+    return this.#resolveDefaultValue(defaultValueFn)
   }
 
   /**

diff --git a/packages/bentocache/src/types/provider.ts b/packages/bentocache/src/types/provider.ts
@@ -38,6 +38,7 @@ export interface CacheProvider {
    */
   get<T = any>(options: GetPojoOptions<T>): Promise<T>
   get<T = any>(key: string, defaultValue?: Factory<T>, options?: GetOptions): Promise<T>
+  get<T = any>(key: string): Promise<T | null | undefined>
 
   /**
    * Get or set a value in the cache

diff --git a/packages/bentocache/tests/cache/one_tier_local.spec.ts b/packages/bentocache/tests/cache/one_tier_local.spec.ts
@@ -66,6 +66,20 @@ test.group('One tier tests', () => {
     assert.isUndefined(r2)
   })
 
+  test('get() with grace period and default value but no fallback value', async ({ assert }) => {
+    const { cache } = new CacheFactory()
+      .withMemoryL1()
+      .merge({ gracePeriod: { enabled: true, duration: '4h' } })
+      .create()
+
+    const result = await cache.get({
+      key: 'key',
+      defaultValue: 'default',
+    })
+
+    assert.equal(result, 'default')
+  })
+
   test('get() should not use grace period when disabled', async ({ assert }) => {
     const { cache } = new CacheFactory()
       .withMemoryL1()

diff --git a/packages/bentocache/tests/typings.spec.ts b/packages/bentocache/tests/typings.spec.ts
@@ -90,10 +90,16 @@ test.group('Typings', () => {
     const r1 = await cache.getOrSet<string>('key', () => 'hey')
     const r2 = await cache.getOrSet('key', () => 32)
     const r3 = await cache.getOrSet('key', () => 50_000)
+    const r4 = await cache.getOrSet({
+      key: 'key',
+      ttl: 1000,
+      factory: () => 34,
+    })
 
     expectTypeOf(r1).toEqualTypeOf<string>()
     expectTypeOf(r2).toEqualTypeOf<number>()
     expectTypeOf(r3).toEqualTypeOf<number>()
+    expectTypeOf(r4).toEqualTypeOf<number>()
   })
 
   test('getOrSet() typings on bento', async ({ expectTypeOf }) => {
@@ -102,10 +108,16 @@ test.group('Typings', () => {
     const r1 = await bento.getOrSet<string>('key', () => 'hey')
     const r2 = await bento.getOrSet('key', () => 32)
     const r3 = await bento.getOrSet('key', () => 50_000)
+    const r4 = await bento.getOrSet({
+      key: 'key',
+      ttl: 1000,
+      factory: () => 34,
+    })
 
     expectTypeOf(r1).toEqualTypeOf<string>()
     expectTypeOf(r2).toEqualTypeOf<number>()
     expectTypeOf(r3).toEqualTypeOf<number>()
+    expectTypeOf(r4).toEqualTypeOf<number>()
   })
 
   test('on() events list', async ({ expectTypeOf }) => {