@resolid/cache 1.2.0 → 1.2.1

package/dist/index.d.mts

@@ -1,27 +1,31 @@
-import { t as CacheStore } from "./types-BvLwqpdf.mjs";
+import { t as CacheStore } from "./types-BMvLj72n.mjs";
 
 //#region src/index.d.ts
-type Serializer = {
+type CacheSerializer = {
   serialize: <T = unknown>(value: T) => string;
   deserialize: <T = unknown>(value: string) => T;
 };
 interface CacheOptions {
   store?: CacheStore;
-  serializer?: Serializer;
+  serializer?: CacheSerializer;
   defaultTtl?: number;
 }
 declare class Cacher {
   private readonly _store;
   private readonly _serializer;
   private readonly _defaultTtl?;
+  private readonly _inflight;
   constructor({
     store,
     serializer,
     defaultTtl
   }?: CacheOptions);
   get<T>(key: string, defaultValue?: T): Promise<T | undefined>;
+  private _set;
   set<T>(key: string, value: T, ttl?: number): Promise<boolean>;
-  getOrSet<T>(key: string, factory: () => T | Promise<T>, ttl?: number): Promise<T>;
+  getOrSet<T>(key: string, factory: (ctx: {
+    setTtl: (ttl: number | undefined) => void;
+  }) => T | Promise<T>, ttl?: number): Promise<T>;
   del(key: string): Promise<boolean>;
   clear(): Promise<boolean>;
   getMultiple<T>(keys: string[], defaultValue?: T): Promise<(T | undefined)[]>;
@@ -31,4 +35,4 @@ declare class Cacher {
   dispose(): Promise<void>;
 }
 //#endregion
-export { CacheOptions, Cacher };
+export { CacheOptions, CacheSerializer, Cacher };

package/dist/index.mjs

@@ -1 +1 @@
-import{t as e}from"./null-cache-DGPituGm.mjs";function t(e){let t=e.split(`?`)[0]?.replace(/[/\\]/g,`:`).replace(/:+/g,`:`).replace(/^:|:$/g,``);if(!t)throw Error(`Cache key cannot be empty after normalization`);return t}var n=class{_store;_serializer;_defaultTtl;constructor({store:t=new e,serializer:n={serialize:JSON.stringify,deserialize:JSON.parse},defaultTtl:r}={}){this._store=t,this._serializer=n,this._defaultTtl=r}async get(e,n){let r=await this._store.get(t(e));return r===void 0?n:this._serializer.deserialize(r)}set(e,n,r){return this._store.set(t(e),this._serializer.serialize(n),r??this._defaultTtl)}async getOrSet(e,t,n){let r=await this.get(e);if(r!==void 0)return r;let i=await t();return await this.set(e,i,n),i}del(e){return this._store.del(t(e))}clear(){return this._store.clear()}async getMultiple(e,n){return this._store.getMultiple?(await this._store.getMultiple(e.map(t))).map(e=>e===void 0?n:this._serializer.deserialize(e)):Promise.all(e.map(e=>this.get(e,n)))}async setMultiple(e,n){return this._store.setMultiple?this._store.setMultiple(Object.entries(e).reduce((e,[n,r])=>(e[t(n)]=this._serializer.serialize(r),e),{}),n):(await Promise.all(Object.entries(e).map(([e,t])=>this.set(e,t,n)))).every(Boolean)}async delMultiple(e){return this._store.delMultiple?this._store.delMultiple(e.map(t)):(await Promise.all(e.map(e=>this.del(e)))).every(Boolean)}async has(e){return this._store.has?this._store.has(t(e)):await this.get(e)!==void 0}async dispose(){await this._store.dispose?.()}};export{n as Cacher};
+import{t as e}from"./null-cache-C6T2ju9e.mjs";function t(e){let t=e.split(`?`)[0]?.replace(/[/\\]/g,`:`).replace(/:+/g,`:`).replace(/^:|:$/g,``);if(!t)throw Error(`Cache key cannot be empty after normalization`);return t}var n=class{_store;_serializer;_defaultTtl;_inflight=new Map;constructor({store:t=new e,serializer:n={serialize:JSON.stringify,deserialize:JSON.parse},defaultTtl:r}={}){this._store=t,this._serializer=n,this._defaultTtl=r}async get(e,n){let r=await this._store.get(t(e));return r===void 0?n:this._serializer.deserialize(r)}async _set(e,n,r){return this._store.set(t(e),this._serializer.serialize(n),r)}async set(e,t,n){return this._set(e,t,n??this._defaultTtl)}async getOrSet(e,t,n){let r=await this.get(e);if(r!==void 0)return r;let i=this._inflight.get(e);if(i)return i;let a=n??this._defaultTtl,o=Promise.resolve(t({setTtl:e=>{a=e}})).then(async t=>(await this._set(e,t,a),this._inflight.delete(e),t)).catch(t=>{throw this._inflight.delete(e),t});return this._inflight.set(e,o),o}async del(e){return this._store.del(t(e))}async clear(){return this._store.clear()}async getMultiple(e,n){return this._store.getMultiple?(await this._store.getMultiple(e.map(t))).map(e=>e===void 0?n:this._serializer.deserialize(e)):Promise.all(e.map(e=>this.get(e,n)))}async setMultiple(e,n){return this._store.setMultiple?this._store.setMultiple(Object.entries(e).reduce((e,[n,r])=>(e[t(n)]=this._serializer.serialize(r),e),{}),n):(await Promise.all(Object.entries(e).map(([e,t])=>this.set(e,t,n)))).every(Boolean)}async delMultiple(e){return this._store.delMultiple?this._store.delMultiple(e.map(t)):(await Promise.all(e.map(e=>this.del(e)))).every(Boolean)}async has(e){return this._store.has?this._store.has(t(e)):await this.get(e)!==void 0}async dispose(){await this._store.dispose?.()}};export{n as Cacher};

package/dist/stores.d.mts

@@ -1,4 +1,4 @@
-import { t as CacheStore } from "./types-BvLwqpdf.mjs";
+import { t as CacheStore } from "./types-BMvLj72n.mjs";
 
 //#region src/stores/memory-cache.d.ts
 declare class MemoryCache implements CacheStore {

package/dist/stores.mjs

@@ -1 +1 @@
-import{t as e}from"./null-cache-DGPituGm.mjs";import t from"quick-lru";var n=class{_lru;constructor(e=1e3){this._lru=new t({maxSize:e})}async get(e){return this._lru.get(e)}async set(e,t,n){return this._lru.set(e,t,n?{maxAge:n*1e3}:void 0),!0}async del(e){return this._lru.delete(e)}async clear(){return this._lru.clear(),!0}async dispose(){this._lru.clear()}};export{n as MemoryCache,e as NullCache};
+import{t as e}from"./null-cache-C6T2ju9e.mjs";import t from"quick-lru";var n=class{_lru;constructor(e=1e3){this._lru=new t({maxSize:e})}async get(e){return this._lru.get(e)}async set(e,t,n){return this._lru.set(e,t,n?{maxAge:n*1e3}:void 0),!0}async del(e){return this._lru.delete(e)}async clear(){return this._lru.clear(),!0}async dispose(){this._lru.clear()}};export{n as MemoryCache,e as NullCache};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolid/cache",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": false,
   "description": "Type-safe Async Cache for TypeScript",
   "keywords": [