* Fixed cache expiry

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.24.9",
+	"version": "0.24.12",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/cache.ts

@@ -11,7 +11,7 @@ export type CacheOptions = {
 	expiryPolicy?: 'delete' | 'keep';
 }
 
-export type CachedValue<T> = T | {_expired?: boolean};
+export type CachedValue<T> = T & {_expired?: boolean};
 
 /**
  * Map of data which tracks whether it is a complete collection & offers optional expiry of cached values
@@ -119,7 +119,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 */
 	entries(expired?: boolean): [K, CachedValue<T>][] {
 		return deepCopy<any>(Object.entries(this.store)
-			.filter((v: any) => expired || !v._expired));
+			.filter((v: any) => expired || !v?._expired));
 	}
 
 	/**
@@ -139,7 +139,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 */
 	get(key: K, expired?: boolean): T | null {
 		const cached = deepCopy<any>(this.store[key] ?? null);
-		if(expired || !cached._expired) return cached;
+		if(expired || !cached?._expired) return cached;
 		return null;
 	}
 
@@ -172,7 +172,7 @@ export class Cache<K extends string | number | symbol, T> {
 	 * @return {this}
 	 */
 	set(key: K, value: T, ttl = this.options.ttl): this {
-		if(this.options.expiryPolicy == 'keep') delete (<any>this.store[key])._expired;
+		if(this.options.expiryPolicy == 'keep') delete (<any>value)._expired;
 		this.store[key] = value;
 		this.save();
 		if(ttl) setTimeout(() => {