Compare commits

...

3 Commits

Author SHA1 Message Date
1b03ae875b Fixed database includes
All checks were successful
Build / Build NPM Project (push) Successful in 41s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 35s
2025-05-27 15:13:53 -04:00
af1da75a82 Removed console.log statments
All checks were successful
Build / Build NPM Project (push) Successful in 41s
Build / Tag Version (push) Successful in 8s
Build / Publish Documentation (push) Successful in 34s
2025-05-27 14:56:24 -04:00
e19768688d Fixed using numbers as database table name
All checks were successful
Build / Build NPM Project (push) Successful in 1m16s
Build / Tag Version (push) Successful in 15s
Build / Publish Documentation (push) Successful in 53s
2025-05-27 14:51:04 -04:00
3 changed files with 19 additions and 39 deletions

View File

@ -3,27 +3,7 @@
<script type="module">
import {Cache, Database} from './dist/index.mjs';
const db = new Database('test', ['test', 'test2', 'test3']);
const cache = new Cache('id', {
ttl: 60,
storage: db.table('test'),
expiryPolicy: 'delete'
});
const cache2 = new Cache('id', {
ttl: 60,
storage: db.table('test2'),
expiryPolicy: 'delete'
});
const cache3 = new Cache('id', {
ttl: 60,
storage: db.table('test3'),
expiryPolicy: 'delete'
});
console.log(cache3.all());
const db = new Database('test', []);
</script>
</body>
</html>

View File

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

View File

@ -1,3 +1,5 @@
import {ASet} from './aset.ts';
export type TableOptions = {
name: string;
key?: string;
@ -5,16 +7,19 @@ export type TableOptions = {
export class Database {
connection!: Promise<IDBDatabase>;
tables!: TableOptions[];
constructor(public readonly database: string, public readonly tables: (string | TableOptions)[], public version?: number) {
constructor(public readonly database: string, tables: (string | TableOptions)[], public version?: number) {
this.connection = new Promise((resolve, reject) => {
const req = indexedDB.open(this.database, this.version);
this.tables = tables.map(t => typeof t == 'object' ? t : {name: t});
const tableNames = new ASet(this.tables.map(t => t.name));
req.onerror = () => reject(req.error);
req.onsuccess = () => {
const db = req.result;
if(tables.find(s => !db.objectStoreNames.contains(typeof s === 'string' ? s : s.name))) {
if(tableNames.symmetricDifference(new ASet(Array.from(db.objectStoreNames))).length) {
db.close();
Object.assign(this, new Database(this.database, this.tables, db.version + 1));
} else {
@ -25,34 +30,29 @@ export class Database {
req.onupgradeneeded = () => {
const db = req.result;
Array.from(db.objectStoreNames)
.filter(s => !this.tables.find(t => typeof t === 'string' ? t : t.name == s))
.forEach(name => db.deleteObjectStore(name));
tables.filter(t => !db.objectStoreNames.contains(typeof t === 'string' ? t : t.name))
.forEach(t => {db.createObjectStore(typeof t === 'string' ? t : t.name, {
keyPath: typeof t === 'string' ? undefined : t.key
});
});
const existingTables = new ASet(Array.from(db.objectStoreNames));
existingTables.difference(tableNames).forEach(name => db.deleteObjectStore(name));
tableNames.difference(existingTables).forEach(name => db.createObjectStore(name));
};
});
}
includes(name: string): boolean {
return this.tables.some(t => (typeof t === 'string' ? name === t : name === t.name));
includes(name: any): boolean {
return !!this.tables.find(t => t.name == name.toString());
}
table<K extends IDBValidKey = any, T = any>(name: string): Table<K, T> {
return new Table<K, T>(this, name);
table<K extends IDBValidKey = any, T = any>(name: any): Table<K, T> {
return new Table<K, T>(this, name.toString());
}
}
export class Table<K extends IDBValidKey = any, T = any> {
constructor(private readonly database: Database, public readonly name: string) {}
async tx<R>(schema: string, fn: (store: IDBObjectStore) => IDBRequest, readonly = false): Promise<R> {
async tx<R>(table: string, fn: (store: IDBObjectStore) => IDBRequest, readonly = false): Promise<R> {
const db = await this.database.connection;
const tx = db.transaction(schema, readonly ? 'readonly' : 'readwrite');
const store = tx.objectStore(schema);
const tx = db.transaction(table, readonly ? 'readonly' : 'readwrite');
const store = tx.objectStore(table);
return new Promise<R>((resolve, reject) => {
const request = fn(store);
request.onsuccess = () => resolve(request.result as R); // ✅ explicit cast