Updated cache indexing signature

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.16.7",
+	"version": "0.16.10",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@ztimson/utils",
-			"version": "0.16.7",
+			"version": "0.16.10",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.12",

package.json

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

src/cache.ts

@@ -1,9 +1,11 @@
 /**
  * Map of data which tracks whether it is a complete collection & offers optional expiry of cached values
  */
-export class Cache<K, T> {
-	private store: any = {};
+export class Cache<K extends string | number | symbol, T> {
+	private store = <Record<K, T>>{};
 
+	/** Support index lookups */
+	[key: string | number | symbol]: T | any;
 	/** Whether cache is complete */
 	complete = false;
 
@@ -13,21 +15,22 @@ export class Cache<K, T> {
 	 * @param {keyof T} key Default property to use as primary key
 	 * @param {number} ttl Default expiry in milliseconds
 	 */
-	constructor(public readonly key: keyof T, public ttl?: number) {
+	constructor(public readonly key?: keyof T, public ttl?: number) {
 		return new Proxy(this, {
 			get: (target: this, prop: string | symbol) => {
-				if(prop in target) return (<any>target)[prop];
-				return target.store[prop];
+				if (prop in target) return (target as any)[prop];
+				return target.store[prop as K];
 			},
-			set: (target: any, prop: string | symbol, value: T) => {
-				if(prop in target) target[prop] = value;
-				else target.store[prop] = value;
+			set: (target: this, prop: string | symbol, value: any) => {
+				if (prop in target) (target as any)[prop] = value;
+				else target.store[prop as K] = value;
 				return true;
 			}
 		});
 	}
 
 	private getKey(value: T): K {
+		if(!this.key) throw new Error('No key defined');
 		return <K>value[this.key];
 	}
 
@@ -101,6 +104,15 @@ export class Cache<K, T> {
 		return <K[]>Object.keys(this.store);
 	}
 
+	/**
+	 * Get map of cached items
+	 *
+	 * @return {Record<K, T>}
+	 */
+	map(): Record<K, T> {
+		return structuredClone(this.store);
+	}
+
 	/**
 	 * Add an item to the cache manually specifying the key
 	 *

src/jwt.ts

@@ -6,10 +6,10 @@ import {JSONAttemptParse} from './objects.ts';
  * @param {string} token JWT to decode
  * @return {unknown} JWT payload
  */
-function decodeJwt<T>(token: string): T {
+export function jwtDecode<T>(token: string): T {
 	const base64 = token.split('.')[1]
 		.replace(/-/g, '+').replace(/_/g, '/');
-	return <T>JSONAttemptParse(decodeURIComponent(window.atob(base64).split('').map(function(c) {
+	return <T>JSONAttemptParse(decodeURIComponent(atob(base64).split('').map(function(c) {
 		return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
 	}).join('')));
 }