Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
e78120b067 | |||
71552aa243 | |||
ce3878e18b |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.26.2",
|
"version": "0.26.5",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
10
src/cache.ts
10
src/cache.ts
@ -39,7 +39,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
if(typeof this.options.persistentStorage == 'string')
|
if(typeof this.options.persistentStorage == 'string')
|
||||||
this.options.persistentStorage = {storage: localStorage, key: this.options.persistentStorage};
|
this.options.persistentStorage = {storage: localStorage, key: this.options.persistentStorage};
|
||||||
|
|
||||||
if(this.options.persistentStorage?.storage?.constructor.name == 'Database') {
|
if(this.options.persistentStorage?.storage?.database != undefined) {
|
||||||
(async () => {
|
(async () => {
|
||||||
const persists: any = this.options.persistentStorage;
|
const persists: any = this.options.persistentStorage;
|
||||||
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
|
const table: Table<any, any> = await persists.storage.createTable({name: persists.key, key: this.key});
|
||||||
@ -47,7 +47,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
|
Object.assign(this.store, rows.reduce((acc, row) => ({...acc, [this.getKey(row)]: row}), {}));
|
||||||
done();
|
done();
|
||||||
})();
|
})();
|
||||||
} else if(this.options.persistentStorage?.storage?.constructor.name == 'Storage') {
|
} else if((<any>this.options.persistentStorage?.storage)?.getItem != undefined) {
|
||||||
const stored = (<Storage>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 { }
|
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
|
||||||
done();
|
done();
|
||||||
@ -77,16 +77,16 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
private save(key?: K) {
|
private save(key?: K) {
|
||||||
const persists: {storage: any, key: string} = <any>this.options.persistentStorage;
|
const persists: {storage: any, key: string} = <any>this.options.persistentStorage;
|
||||||
if(!!persists?.storage) {
|
if(!!persists?.storage) {
|
||||||
if(persists.storage?.constructor.name == 'Database') {
|
if(persists.storage?.database != undefined) {
|
||||||
(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
|
(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
|
||||||
if(key) {
|
if(key) {
|
||||||
table.set(key, this.get(key));
|
table.set(this.get(key), key);
|
||||||
} else {
|
} else {
|
||||||
table.clear();
|
table.clear();
|
||||||
this.all().forEach(row => table.add(row));
|
this.all().forEach(row => table.add(row));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else if(persists.storage?.constructor.name == 'Storage') {
|
} else if(persists.storage?.setItem != undefined) {
|
||||||
persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
|
persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -166,8 +166,11 @@ export class Table<K extends IDBValidKey = any, T = any> {
|
|||||||
return this.tx(this.name, store => store.getAllKeys(), true);
|
return this.tx(this.name, store => store.getAllKeys(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
put(key: K, value: T): Promise<void> {
|
put(value: T, key?: string): Promise<void> {
|
||||||
return this.tx(this.name, store => store.put(value, key));
|
return this.tx(this.name, store => {
|
||||||
|
if (store.keyPath) return store.put(value);
|
||||||
|
return store.put(value, key);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
read(): Promise<T[]>;
|
read(): Promise<T[]>;
|
||||||
@ -177,8 +180,9 @@ export class Table<K extends IDBValidKey = any, T = any> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set(value: T, key?: K): Promise<void> {
|
set(value: T, key?: K): Promise<void> {
|
||||||
if(!key && !(<any>value)[this.key]) return this.add(value);
|
if(key) (<any>value)[this.key] = key;
|
||||||
return this.put(key || (<any>value)[this.key], value);
|
if(!(<any>value)[this.key]) return this.add(value);
|
||||||
|
return this.put(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
update = this.set;
|
update = this.set;
|
||||||
|
Reference in New Issue
Block a user