Optimizations

This reverts commit 59bce9d28d.

package.json

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

src/cache.ts

@@ -39,7 +39,7 @@ export class Cache<K extends string | number | symbol, T> {
 			if(typeof this.options.persistentStorage == 'string')
 				this.options.persistentStorage = {storage: localStorage, key: this.options.persistentStorage};
 
-			if(this.options.persistentStorage?.storage instanceof Database) {
+			if(this.options.persistentStorage?.storage?.constructor.name == 'Database') {
 				(async () => {
 					const persists: any = this.options.persistentStorage;
 					const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
@@ -47,8 +47,8 @@ export class Cache<K extends string | number | symbol, T> {
 					Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
 					done();
 				})();
-			} else {
+			} else if(this.options.persistentStorage?.storage?.constructor.name == 'Storage') {
-				const stored = this.options.persistentStorage.storage.getItem(this.options.persistentStorage.key);
+				const stored = (<Storage>this.options.persistentStorage.storage).getItem(this.options.persistentStorage.key);
 				if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
 				done();
 			}
@@ -75,10 +75,10 @@ export class Cache<K extends string | number | symbol, T> {
 	}
 
 	private save(key?: K) {
-		const persists: any = this.options.persistentStorage;
+		const persists: {storage: any, key: string} = <any>this.options.persistentStorage;
 		if(!!persists?.storage) {
-			if(persists.storage instanceof Database) {
+			if(persists.storage?.constructor.name == 'Database') {
-				(<Database>persists.storage).createTable({name: persists.storage.key, key: <string>this.key}).then(table => {
+				(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
 					if(key) {
 						table.set(key, this.get(key));
 					} else {
@@ -86,7 +86,7 @@ export class Cache<K extends string | number | symbol, T> {
 						this.all().forEach(row => table.add(row));
 					}
 				});
-			} else {
+			} else if(persists.storage?.constructor.name == 'Storage') {
 				persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
 			}
 		}

src/csv.ts

@@ -64,7 +64,6 @@ export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
 	});
 }
 
-
 /**
  * Convert an array of objects to a CSV string
  *

tests/cache.spec.ts

@@ -10,6 +10,7 @@ describe('Cache', () => {
 
 	beforeEach(() => {
 		storageMock = {
+			constructor: {name: 'Storage' as any},
 			getItem: jest.fn(),
 			setItem: jest.fn(),
 			removeItem: jest.fn(),