@verdant-web/server 3.3.11 → 4.0.0

package/dist/esm/storage/sqlShard/Databases.d.ts

@@ -1,5 +1,5 @@
-import { Kysely } from 'kysely';
-import { Database as DatabaseTypes } from './tables.js';
+import { Logger } from '../../logger.js';
+import { SqliteExecutor } from './database.js';
 export declare class Databases {
     private openPromises;
     private cache;
@@ -9,12 +9,14 @@ export declare class Databases {
     private closeTimeout;
     private disableWal;
     private closed;
+    private log;
     constructor(config: {
         directory: string;
         closeTimeout?: number;
         disableWal?: boolean;
+        log?: Logger;
     });
-    get: (libraryId: string) => Promise<Kysely<DatabaseTypes>>;
+    get: (libraryId: string) => Promise<SqliteExecutor>;
     private enqueueClose;
     close: (libraryId: string) => void;
     destroy: () => Promise<void>;

package/dist/esm/storage/sqlShard/Databases.js

@@ -1,9 +1,9 @@
-import { openDatabase } from './database.js';
-import { mkdirSync, existsSync } from 'fs';
 import { assert } from '@verdant-web/common';
+import { existsSync, mkdirSync } from 'fs';
+import { createFilesystemExecutor, openDatabase, } from './database.js';
 export class Databases {
     constructor(config) {
-        var _a, _b;
+        var _a, _b, _c;
         this.openPromises = {};
         this.cache = {};
         this.closeTimeouts = {};
@@ -20,10 +20,13 @@ export class Databases {
             }
             let openPromise = this.openPromises[libraryId];
             if (!openPromise) {
-                this.openPromises[libraryId] = openDatabase(this.directory, libraryId, {
-                    skipMigrations: this.openedPreviously[libraryId],
+                // only a promise for potential "forward compatibility"
+                // but tbh I'm not sure a promise-based storage solution
+                // is on the horizon. SQLite is fine.
+                this.openPromises[libraryId] = Promise.resolve(openDatabase(createFilesystemExecutor(this.directory, libraryId, {
                     disableWal: this.disableWal,
-                });
+                    log: this.log,
+                })));
                 openPromise = this.openPromises[libraryId];
             }
             db = await openPromise;
@@ -45,7 +48,7 @@ export class Databases {
             if (db) {
                 this.closed.set(db, true);
                 delete this.cache[libraryId];
-                db.destroy();
+                db.close();
             }
         };
         this.destroy = async () => {
@@ -59,6 +62,7 @@ export class Databases {
         if (this.directory !== ':memory:' && !existsSync(this.directory)) {
             mkdirSync(this.directory, { recursive: true });
         }
+        this.log = (_c = config.log) !== null && _c !== void 0 ? _c : (() => { });
     }
 }
 //# sourceMappingURL=Databases.js.map

package/dist/esm/storage/sqlShard/Databases.js.map

@@ -1 +1 @@
-{"version":3,"file":"Databases.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/Databases.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,OAAO,SAAS;IAUrB,YAAY,MAIX;;QAbO,iBAAY,GAAmD,EAAE,CAAC;QAClE,UAAK,GAA0C,EAAE,CAAC;QAClD,kBAAa,GAAmC,EAAE,CAAC;QACnD,qBAAgB,GAA4B,EAAE,CAAC;QAG/C,eAAU,GAAG,KAAK,CAAC;QACnB,WAAM,GAAG,IAAI,OAAO,EAAkC,CAAC;QAe/D,QAAG,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;YACjE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/B,IAAI,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC1B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC9B,CAAC;YACF,CAAC;YACD,IAAI,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC/C,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE;oBACtE,cAAc,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;oBAChD,UAAU,EAAE,IAAI,CAAC,UAAU;iBAC3B,CAAC,CAAC;gBACH,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC5C,CAAC;YACD,EAAE,GAAG,MAAM,WAAW,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC7B,MAAM,CAAC,EAAE,EAAE,4BAA4B,SAAS,EAAE,CAAC,CAAC;YACpD,OAAO,EAAE,CAAC;QACX,CAAC,CAAC;QAEM,iBAAY,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5C,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,UAAU,CACzC,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,YAAY,EACjB,SAAS,CACT,CAAC;QACH,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjC,IAAI,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC7B,EAAE,CAAC,OAAO,EAAE,CAAC;YACd,CAAC;QACF,CAAC,CAAC;QAEF,YAAO,GAAG,KAAK,IAAI,EAAE;YACpB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACvB,CAAC;QACF,CAAC,CAAC;QAzDD,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,MAAA,MAAM,CAAC,YAAY,mCAAI,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;QAC1D,IAAI,CAAC,UAAU,GAAG,MAAA,MAAM,CAAC,UAAU,mCAAI,KAAK,CAAC;QAC7C,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAClE,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;CAoDD"}
+{"version":3,"file":"Databases.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/Databases.ts"],"names":[],"mappings":"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"}

package/dist/esm/storage/sqlShard/SqlBaselines.d.ts

@@ -1,23 +1,22 @@
-import { Kysely } from 'kysely';
-import { BaselineStorage } from '../Storage.js';
-import { Database } from './tables.js';
 import { DocumentBaseline, Ref } from '@verdant-web/common';
 import { HydratedDocumentBaseline, StoredOperation } from '../../types.js';
-import { Databases } from './Databases.js';
+import { BaselineStorage } from '../Storage.js';
+import { SqliteExecutor } from './database.js';
 export declare class SqlBaselines implements BaselineStorage {
-    private dbs;
-    private dialect;
-    constructor(dbs: Databases, dialect: 'postgres' | 'sqlite');
-    get: (libraryId: string, oid: string, { tx }?: {
-        tx?: Kysely<Database>;
+    #private;
+    private db;
+    private libraryId;
+    constructor(db: SqliteExecutor, libraryId: string);
+    get: (oid: string, { tx }?: {
+        tx?: SqliteExecutor;
     }) => Promise<HydratedDocumentBaseline | null>;
-    getAll: (libraryId: string) => Promise<any>;
-    set: (libraryId: string, baseline: DocumentBaseline, { tx, }: {
-        tx?: Kysely<Database>;
-    }) => Promise<void>;
-    insertAll: (libraryId: string, baselines: DocumentBaseline[]) => Promise<void>;
+    getAll: () => Promise<any>;
+    set: (baseline: DocumentBaseline, { tx, }: {
+        tx?: SqliteExecutor;
+    }) => void;
+    insertAll: (baselines: DocumentBaseline[]) => Promise<void>;
     private hydrate;
-    applyOperations: (libraryId: string, oid: string, operations: StoredOperation[], deletedRefs?: Ref[]) => Promise<void>;
-    deleteAll: (libraryId: string) => Promise<void>;
-    getCount: (libraryId: string) => Promise<number>;
+    applyOperations: (oid: string, operations: StoredOperation[], deletedRefs?: Ref[]) => Promise<void>;
+    deleteAll: () => Promise<void>;
+    getCount: () => Promise<number>;
 }

package/dist/esm/storage/sqlShard/SqlBaselines.js

@@ -1,60 +1,58 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SqlBaselines_getSync;
 import { applyPatch } from '@verdant-web/common';
 export class SqlBaselines {
-    constructor(dbs, dialect) {
-        this.dbs = dbs;
-        this.dialect = dialect;
-        this.get = async (libraryId, oid, { tx } = {}) => {
-            var _a;
-            const db = tx !== null && tx !== void 0 ? tx : (await this.dbs.get(libraryId));
-            const raw = (_a = (await db
-                .selectFrom('DocumentBaseline')
-                .where('oid', '=', oid)
-                .selectAll()
-                .executeTakeFirst())) !== null && _a !== void 0 ? _a : null;
+    constructor(db, libraryId) {
+        this.db = db;
+        this.libraryId = libraryId;
+        this.get = async (oid, { tx } = {}) => {
+            return __classPrivateFieldGet(this, _SqlBaselines_getSync, "f").call(this, oid, { tx });
+        };
+        _SqlBaselines_getSync.set(this, (oid, { tx } = {}) => {
+            const db = tx !== null && tx !== void 0 ? tx : this.db;
+            const raw = db.first(`
+					SELECT * FROM DocumentBaseline
+					WHERE oid = ?
+				`, [oid]);
             if (!raw)
                 return null;
             this.hydrate(raw);
             return raw;
-        };
-        this.getAll = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            const raw = await db
-                .selectFrom('DocumentBaseline')
-                .orderBy('timestamp', 'asc')
-                .selectAll()
-                .execute();
+        });
+        this.getAll = async () => {
+            const db = this.db;
+            const raw = db.query(`SELECT * FROM DocumentBaseline ORDER BY timestamp ASC`);
             raw.forEach(this.hydrate);
             return raw;
         };
-        this.set = async (libraryId, baseline, { tx, }) => {
-            const db = tx !== null && tx !== void 0 ? tx : (await this.dbs.get(libraryId));
+        this.set = (baseline, { tx, }) => {
+            const db = tx !== null && tx !== void 0 ? tx : this.db;
             if (!baseline.snapshot) {
-                await db
-                    .deleteFrom('DocumentBaseline')
-                    .where('oid', '=', baseline.oid)
-                    .execute();
-                return;
+                return db.exec(`DELETE FROM DocumentBaseline WHERE oid = ?`, [
+                    baseline.oid,
+                ]);
             }
-            await db
-                .insertInto('DocumentBaseline')
-                .values({
-                oid: baseline.oid,
-                snapshot: JSON.stringify(baseline.snapshot),
-                timestamp: baseline.timestamp,
-                authz: baseline.authz,
-            })
-                .onConflict((cb) => cb.doUpdateSet({
-                snapshot: JSON.stringify(baseline.snapshot),
-                timestamp: baseline.timestamp,
-                authz: baseline.authz,
-            }))
-                .execute();
+            return db.exec(`INSERT INTO DocumentBaseline (oid, snapshot, timestamp, authz) VALUES (?, ?, ?, ?)
+				ON CONFLICT(oid) DO UPDATE SET
+					snapshot = excluded.snapshot,
+					timestamp = excluded.timestamp,
+					authz = excluded.authz
+				`, [
+                baseline.oid,
+                JSON.stringify(baseline.snapshot),
+                baseline.timestamp,
+                baseline.authz,
+            ]);
         };
-        this.insertAll = async (libraryId, baselines) => {
-            const db = await this.dbs.get(libraryId);
-            await db.transaction().execute(async (tx) => {
+        this.insertAll = async (baselines) => {
+            const db = this.db;
+            return db.transaction((tx) => {
                 for (const baseline of baselines) {
-                    await this.set(libraryId, baseline, { tx });
+                    this.set(baseline, { tx });
                 }
             });
         };
@@ -62,18 +60,18 @@ export class SqlBaselines {
             // avoiding extra allocation from .map by type-asserting here
             row.snapshot = JSON.parse(row.snapshot);
         };
-        this.applyOperations = async (libraryId, oid, operations, deletedRefs) => {
+        this.applyOperations = async (oid, operations, deletedRefs) => {
             if (operations.length === 0)
                 return;
-            const db = await this.dbs.get(libraryId);
-            await db.transaction().execute(async (tx) => {
-                let baseline = await this.get(libraryId, oid, { tx });
+            const db = this.db;
+            await db.transaction((tx) => {
+                let baseline = __classPrivateFieldGet(this, _SqlBaselines_getSync, "f").call(this, oid, { tx });
                 if (!baseline) {
                     baseline = {
                         oid,
                         snapshot: {},
                         timestamp: operations[0].timestamp,
-                        libraryId,
+                        libraryId: this.libraryId,
                         authz: operations[0].authz,
                     };
                 }
@@ -84,21 +82,19 @@ export class SqlBaselines {
                     }
                 }
                 baseline.timestamp = operations[operations.length - 1].timestamp;
-                await this.set(libraryId, baseline, { tx });
+                this.set(baseline, { tx });
             });
         };
-        this.deleteAll = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('DocumentBaseline').execute();
+        this.deleteAll = async () => {
+            const db = this.db;
+            db.exec('DELETE FROM DocumentBaseline;');
         };
-        this.getCount = async (libraryId) => {
+        this.getCount = async () => {
             var _a, _b;
-            const db = await this.dbs.get(libraryId);
-            return ((_b = (_a = (await db
-                .selectFrom('DocumentBaseline')
-                .select(({ fn }) => fn.countAll().as('count'))
-                .executeTakeFirst())) === null || _a === void 0 ? void 0 : _a.count) !== null && _b !== void 0 ? _b : 0);
+            const db = this.db;
+            return ((_b = (_a = db.first(`SELECT COUNT(*) as count FROM DocumentBaseline;`)) === null || _a === void 0 ? void 0 : _a.count) !== null && _b !== void 0 ? _b : 0);
         };
     }
 }
+_SqlBaselines_getSync = new WeakMap();
 //# sourceMappingURL=SqlBaselines.js.map

package/dist/esm/storage/sqlShard/SqlBaselines.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlBaselines.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlBaselines.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqlBaselines.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlBaselines.ts"],"names":[],"mappings":"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"}

package/dist/esm/storage/sqlShard/SqlFileMetadata.d.ts

@@ -1,18 +1,18 @@
-import { FileMetadataStorage } from '../Storage.js';
-import { FileMetadata } from '../../types.js';
 import { FileInfo } from '../../files/FileStorage.js';
-import { Databases } from './Databases.js';
+import { FileMetadata } from '../../types.js';
+import { FileMetadataStorage } from '../Storage.js';
+import { SqliteExecutor } from './database.js';
 export declare class SqlFileMetadata implements FileMetadataStorage {
-    private dbs;
+    private db;
+    private libraryId;
     private deleteExpirationDays;
-    private dialect;
-    constructor(dbs: Databases, deleteExpirationDays: number, dialect: 'postgres' | 'sqlite');
+    constructor(db: SqliteExecutor, libraryId: string, deleteExpirationDays: number);
     private attachLibrary;
-    get: (libraryId: string, fileId: string) => Promise<FileMetadata | null>;
-    getAll: (libraryId: string) => Promise<FileMetadata[]>;
-    deleteAll: (libraryId: string) => Promise<void>;
-    put: (libraryId: string, fileInfo: FileInfo) => Promise<void>;
-    markPendingDelete: (libraryId: string, fileId: string) => Promise<void>;
-    delete: (libraryId: string, fileId: string) => Promise<void>;
-    getPendingDelete: (libraryId: string) => Promise<FileMetadata[]>;
+    get: (fileId: string) => Promise<FileMetadata | null>;
+    getAll: () => Promise<FileMetadata[]>;
+    deleteAll: () => Promise<void>;
+    put: (fileInfo: FileInfo) => Promise<void>;
+    markPendingDelete: (fileId: string) => Promise<void>;
+    delete: (fileId: string) => Promise<void>;
+    getPendingDelete: () => Promise<FileMetadata[]>;
 }

package/dist/esm/storage/sqlShard/SqlFileMetadata.js

@@ -1,69 +1,56 @@
 export class SqlFileMetadata {
-    constructor(dbs, deleteExpirationDays, dialect) {
-        this.dbs = dbs;
+    constructor(db, libraryId, deleteExpirationDays) {
+        this.db = db;
+        this.libraryId = libraryId;
         this.deleteExpirationDays = deleteExpirationDays;
-        this.dialect = dialect;
-        this.attachLibrary = (libraryId, row) => {
+        this.attachLibrary = (row) => {
             if (!row)
                 return row;
-            row.libraryId = libraryId;
+            row.libraryId = this.libraryId;
             return row;
         };
-        this.get = async (libraryId, fileId) => {
-            var _a;
-            const db = await this.dbs.get(libraryId);
-            const row = (_a = (await db
-                .selectFrom('FileMetadata')
-                .where('fileId', '=', fileId)
-                .selectAll()
-                .executeTakeFirst())) !== null && _a !== void 0 ? _a : null;
+        this.get = async (fileId) => {
+            const db = this.db;
+            const row = db.first(`SELECT * FROM FileMetadata WHERE fileId = ?`, [fileId]);
             if (row)
-                return this.attachLibrary(libraryId, row);
+                return this.attachLibrary(row);
             return row;
         };
-        this.getAll = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            return (await db.selectFrom('FileMetadata').selectAll().execute()).map(this.attachLibrary.bind(this, libraryId));
-        };
-        this.deleteAll = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('FileMetadata').execute();
-        };
-        this.put = async (libraryId, fileInfo) => {
-            const db = await this.dbs.get(libraryId);
-            await db
-                .insertInto('FileMetadata')
-                .values({
-                fileId: fileInfo.id,
-                name: fileInfo.fileName,
-                type: fileInfo.type,
-            })
-                .onConflict((cb) => cb.column('fileId').doUpdateSet({
-                name: fileInfo.fileName,
-                type: fileInfo.type,
-                pendingDeleteAt: null,
-            }))
-                .execute();
-        };
-        this.markPendingDelete = async (libraryId, fileId) => {
-            const db = await this.dbs.get(libraryId);
-            await db
-                .updateTable('FileMetadata')
-                .set({ pendingDeleteAt: Date.now() })
-                .where('fileId', '=', fileId)
-                .execute();
-        };
-        this.delete = async (libraryId, fileId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('FileMetadata').where('fileId', '=', fileId).execute();
-        };
-        this.getPendingDelete = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            return (await db
-                .selectFrom('FileMetadata')
-                .where('pendingDeleteAt', '<', Date.now() - 1000 * 60 * 60 * 24 * this.deleteExpirationDays)
-                .selectAll()
-                .execute()).map(this.attachLibrary.bind(this, libraryId));
+        this.getAll = async () => {
+            const db = this.db;
+            return db
+                .query(`SELECT * FROM FileMetadata`)
+                .map(this.attachLibrary);
+        };
+        this.deleteAll = async () => {
+            const db = this.db;
+            db.exec('DELETE FROM FileMetadata');
+        };
+        this.put = async (fileInfo) => {
+            const db = this.db;
+            db.exec(`INSERT INTO FileMetadata (fileId, name, type) VALUES (?, ?, ?)
+				ON CONFLICT(fileId) DO UPDATE SET
+					name = excluded.name,
+					type = excluded.type,
+					pendingDeleteAt = NULL
+			`, [fileInfo.id, fileInfo.fileName, fileInfo.type]);
+        };
+        this.markPendingDelete = async (fileId) => {
+            const db = this.db;
+            db.exec(`UPDATE FileMetadata SET pendingDeleteAt = ? WHERE fileId = ?`, [
+                Date.now(),
+                fileId,
+            ]);
+        };
+        this.delete = async (fileId) => {
+            const db = this.db;
+            db.exec(`DELETE FROM FileMetadata WHERE fileId = ?`, [fileId]);
+        };
+        this.getPendingDelete = async () => {
+            const db = this.db;
+            return db
+                .query(`SELECT * FROM FileMetadata WHERE pendingDeleteAt < ?`, [Date.now() - this.deleteExpirationDays * 24 * 60 * 60 * 1000])
+                .map(this.attachLibrary);
         };
     }
 }

package/dist/esm/storage/sqlShard/SqlFileMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlFileMetadata.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlFileMetadata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqlFileMetadata.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlFileMetadata.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,eAAe;IAC3B,YACS,EAAkB,EAClB,SAAiB,EACjB,oBAA4B;QAF5B,OAAE,GAAF,EAAE,CAAgB;QAClB,cAAS,GAAT,SAAS,CAAQ;QACjB,yBAAoB,GAApB,oBAAoB,CAAQ;QAG7B,kBAAa,GAAG,CAAC,GAAoB,EAAE,EAAE;YAChD,IAAI,CAAC,GAAG;gBAAE,OAAO,GAAG,CAAC;YACpB,GAAW,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACxC,OAAO,GAAmB,CAAC;QAC5B,CAAC,CAAC;QAEF,QAAG,GAAG,KAAK,EAAE,MAAc,EAAgC,EAAE;YAC5D,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CACnB,6CAA6C,EAC7C,CAAC,MAAM,CAAC,CACR,CAAC;YACF,IAAI,GAAG;gBAAE,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YACxC,OAAO,GAAG,CAAC;QACZ,CAAC,CAAC;QAEF,WAAM,GAAG,KAAK,IAA6B,EAAE;YAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,OAAO,EAAE;iBACP,KAAK,CAAkB,4BAA4B,CAAC;iBACpD,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,cAAS,GAAG,KAAK,IAAmB,EAAE;YACrC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACrC,CAAC,CAAC;QAEF,QAAG,GAAG,KAAK,EAAE,QAAkB,EAAiB,EAAE;YACjD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,EAAE,CAAC,IAAI,CACN;;;;;IAKC,EACD,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAC/C,CAAC;QACH,CAAC,CAAC;QAEF,sBAAiB,GAAG,KAAK,EAAE,MAAc,EAAiB,EAAE;YAC3D,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,EAAE,CAAC,IAAI,CAAC,8DAA8D,EAAE;gBACvE,IAAI,CAAC,GAAG,EAAE;gBACV,MAAM;aACN,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,WAAM,GAAG,KAAK,EAAE,MAAc,EAAiB,EAAE;YAChD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,EAAE,CAAC,IAAI,CAAC,2CAA2C,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,qBAAgB,GAAG,KAAK,IAA6B,EAAE;YACtD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,OAAO,EAAE;iBACP,KAAK,CACL,sDAAsD,EACtD,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,oBAAoB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAC9D;iBACA,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,CAAC,CAAC;IAhEC,CAAC;CAiEJ"}

package/dist/esm/storage/sqlShard/SqlOperations.d.ts

@@ -1,18 +1,18 @@
 import { Operation } from '@verdant-web/common';
 import { StoredOperation } from '../../types.js';
 import { OperationStorage } from '../Storage.js';
-import { Databases } from './Databases.js';
+import { SqliteExecutor } from './database.js';
 export declare class SqlOperations implements OperationStorage {
-    private dbs;
-    private dialect;
-    constructor(dbs: Databases, dialect: 'postgres' | 'sqlite');
+    private db;
+    private libraryId;
+    constructor(db: SqliteExecutor, libraryId: string);
     private hydrate;
-    getAll: (libraryId: string, oid: string) => Promise<StoredOperation[]>;
-    getBeforeServerOrder: (libraryId: string, beforeServerOrder: number) => Promise<StoredOperation[]>;
-    getAfterServerOrder: (libraryId: string, afterServerOrder: number) => Promise<StoredOperation[]>;
-    getLatestServerOrder: (libraryId: string) => Promise<number>;
-    getCount: (libraryId: string) => Promise<number>;
-    insertAll: (libraryId: string, replicaId: string, operations: Operation[]) => Promise<number>;
-    deleteAll: (libraryId: string) => Promise<void>;
-    delete: (libraryId: string, operations: Operation[]) => Promise<void>;
+    getAll: (oid: string) => Promise<StoredOperation[]>;
+    getBeforeServerOrder: (beforeServerOrder: number) => Promise<StoredOperation[]>;
+    getAfterServerOrder: (afterServerOrder: number) => Promise<StoredOperation[]>;
+    getLatestServerOrder: () => Promise<number>;
+    getCount: () => Promise<number>;
+    insertAll: (replicaId: string, operations: Operation[]) => Promise<number>;
+    deleteAll: () => Promise<void>;
+    delete: (operations: Operation[]) => Promise<void>;
 }