@verdant-web/server 3.3.11 → 4.0.1

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

@@ -1,93 +1,62 @@
 export class SqlOperations {
-    constructor(dbs, dialect) {
-        this.dbs = dbs;
-        this.dialect = dialect;
+    constructor(db, libraryId) {
+        this.db = db;
+        this.libraryId = libraryId;
         this.hydrate = (row) => {
             // avoiding extra allocation from .map by type-asserting here
             row.data = JSON.parse(row.data);
         };
-        this.getAll = async (libraryId, oid) => {
-            const db = await this.dbs.get(libraryId);
-            const raw = await db
-                .selectFrom('OperationHistory')
-                .where('oid', '=', oid)
-                .orderBy('timestamp', 'asc')
-                .selectAll()
-                .execute();
+        this.getAll = async (oid) => {
+            const db = this.db;
+            const raw = db.query(`SELECT * FROM OperationHistory WHERE oid = ? ORDER BY timestamp ASC`, [oid]);
             raw.forEach(this.hydrate);
             return raw;
         };
-        this.getBeforeServerOrder = async (libraryId, beforeServerOrder) => {
-            const db = await this.dbs.get(libraryId);
-            const raw = await db
-                .selectFrom('OperationHistory')
-                .where('serverOrder', '<', beforeServerOrder)
-                .orderBy('timestamp', 'asc')
-                .selectAll()
-                .execute();
+        this.getBeforeServerOrder = async (beforeServerOrder) => {
+            const db = this.db;
+            const raw = db.query(`SELECT * FROM OperationHistory WHERE serverOrder < ? ORDER BY timestamp ASC`, [beforeServerOrder]);
             raw.forEach(this.hydrate);
             return raw;
         };
-        this.getAfterServerOrder = async (libraryId, afterServerOrder) => {
-            const db = await this.dbs.get(libraryId);
-            const raw = await db
-                .selectFrom('OperationHistory')
-                .where('serverOrder', '>', afterServerOrder)
-                .orderBy('timestamp', 'asc')
-                .selectAll()
-                .execute();
+        this.getAfterServerOrder = async (afterServerOrder) => {
+            const db = this.db;
+            const raw = db.query(`SELECT * FROM OperationHistory WHERE serverOrder > ? ORDER BY timestamp ASC`, [afterServerOrder]);
             raw.forEach(this.hydrate);
             return raw;
         };
-        this.getLatestServerOrder = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            const result = await db
-                .selectFrom('OperationHistory')
-                .orderBy('serverOrder', 'desc')
-                .select('serverOrder')
-                .limit(1)
-                .executeTakeFirst();
+        this.getLatestServerOrder = async () => {
+            const db = this.db;
+            const result = db.first(`SELECT serverOrder FROM OperationHistory ORDER BY serverOrder DESC LIMIT 1`);
             if (result) {
                 return result.serverOrder;
             }
             return 0;
         };
-        this.getCount = async (libraryId) => {
+        this.getCount = async () => {
             var _a, _b;
-            const db = await this.dbs.get(libraryId);
-            return ((_b = (_a = (await db
-                .selectFrom('OperationHistory')
-                .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 OperationHistory`)) === null || _a === void 0 ? void 0 : _a.count) !== null && _b !== void 0 ? _b : 0);
         };
-        this.insertAll = async (libraryId, replicaId, operations) => {
-            const db = await this.dbs.get(libraryId);
+        this.insertAll = async (replicaId, operations) => {
+            const db = this.db;
             // inserts all operations and updates server order
             // FIXME: this whole thing is kinda sus
-            return await db.transaction().execute(async (tx) => {
+            return db.transaction((tx) => {
                 var _a;
-                let orderResult = await tx
-                    .selectFrom('OperationHistory')
-                    .select('serverOrder')
-                    .orderBy('serverOrder', 'desc')
-                    .limit(1)
-                    .executeTakeFirst();
+                let orderResult = tx.first(`SELECT serverOrder FROM OperationHistory ORDER BY serverOrder DESC LIMIT 1`);
                 let currentServerOrder = (_a = orderResult === null || orderResult === void 0 ? void 0 : orderResult.serverOrder) !== null && _a !== void 0 ? _a : 0;
                 for (const item of operations) {
                     // utilizing returned serverOrder accommodates for conflicts
-                    const result = await tx
-                        .insertInto('OperationHistory')
-                        .values({
-                        oid: item.oid,
-                        data: JSON.stringify(item.data),
-                        timestamp: item.timestamp,
+                    const result = tx.first(`INSERT INTO OperationHistory (oid, data, timestamp, replicaId, serverOrder, authz) VALUES (?, ?, ?, ?, ?, ?)
+						ON CONFLICT (replicaId, oid, timestamp) DO NOTHING
+						RETURNING serverOrder`, [
+                        item.oid,
+                        JSON.stringify(item.data),
+                        item.timestamp,
                         replicaId,
-                        serverOrder: currentServerOrder + 1,
-                        authz: item.authz,
-                    })
-                        .onConflict((cb) => cb.columns(['replicaId', 'oid', 'timestamp']).doNothing())
-                        .returning('serverOrder')
-                        .executeTakeFirst();
+                        currentServerOrder + 1,
+                        item.authz,
+                    ]);
                     if (result) {
                         currentServerOrder = result.serverOrder;
                     }
@@ -99,19 +68,15 @@ export class SqlOperations {
                 return currentServerOrder;
             });
         };
-        this.deleteAll = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('OperationHistory').execute();
+        this.deleteAll = async () => {
+            const db = this.db;
+            db.exec('DELETE FROM OperationHistory');
         };
-        this.delete = async (libraryId, operations) => {
-            const db = await this.dbs.get(libraryId);
-            await db.transaction().execute(async (tx) => {
+        this.delete = async (operations) => {
+            const db = this.db;
+            return db.transaction((tx) => {
                 for (const item of operations) {
-                    await tx
-                        .deleteFrom('OperationHistory')
-                        .where('oid', '=', item.oid)
-                        .where('timestamp', '=', item.timestamp)
-                        .execute();
+                    tx.exec(`DELETE FROM OperationHistory WHERE oid = ? AND timestamp = ?`, [item.oid, item.timestamp]);
                 }
             });
         };

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

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

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

@@ -1,32 +1,33 @@
+import { ReplicaType } from '@verdant-web/common';
 import { StoredReplicaInfo } from '../../types.js';
 import { ReplicaStorage } from '../Storage.js';
-import { ReplicaType } from '@verdant-web/common';
-import { Databases } from './Databases.js';
+import { SqliteExecutor } from './database.js';
 export declare class SqlReplicas implements ReplicaStorage {
-    private dbs;
+    private db;
+    private libraryId;
     private readonly replicaTruancyMinutes;
-    private readonly dialect;
-    constructor(dbs: Databases, replicaTruancyMinutes: number, dialect: 'sqlite' | 'postgres');
+    constructor(db: SqliteExecutor, libraryId: string, replicaTruancyMinutes: number);
     get truantCutoff(): number;
     private attachLibraryId;
-    get: (libraryId: string, replicaId: string) => Promise<StoredReplicaInfo | null>;
-    getOrCreate: (libraryId: string, replicaId: string, info: {
+    get: (replicaId: string) => Promise<StoredReplicaInfo | null>;
+    getOrCreate: (replicaId: string, info: {
         userId: string;
         type: ReplicaType;
     }) => Promise<{
         status: "new" | "existing" | "truant";
         replicaInfo: StoredReplicaInfo;
     }>;
-    getAll: (libraryId: string, options?: {
+    getAll: (options?: {
         omitTruant: boolean;
     } | undefined) => Promise<StoredReplicaInfo[]>;
-    updateLastSeen: (libraryId: string, replicaId: string) => Promise<void>;
-    updateAckedServerOrder: (libraryId: string, replicaId: string, serverOrder: number) => Promise<void>;
-    updateAcknowledgedLogicalTime: (libraryId: string, replicaId: string, timestamp: string) => Promise<void>;
-    getEarliestAckedServerOrder: (libraryId: string) => Promise<number>;
-    acknowledgeOperation: (libraryId: string, replicaId: string, timestamp: string) => Promise<void>;
-    getGlobalAck: (libraryId: string, onlineReplicaIds?: string[] | undefined) => Promise<string | null>;
-    delete: (libraryId: string, replicaId: string) => Promise<void>;
-    deleteAll: (libraryId: string) => Promise<void>;
-    deleteAllForUser: (libraryId: string, userId: string) => Promise<void>;
+    updateLastSeen: (replicaId: string) => Promise<void>;
+    updateAckedServerOrder: (replicaId: string, serverOrder: number) => Promise<void>;
+    updateAcknowledgedLogicalTime: (replicaId: string, timestamp: string) => Promise<void>;
+    getEarliestAckedServerOrder: () => Promise<number>;
+    acknowledgeOperation: (replicaId: string, timestamp: string) => Promise<void>;
+    getGlobalAck: (onlineReplicaIds?: string[] | undefined) => Promise<string | null>;
+    delete: (replicaId: string) => Promise<void>;
+    deleteAll: () => Promise<void>;
+    deleteAllForUser: (userId: string) => Promise<void>;
+    forceTruant: (replicaId: string) => Promise<void>;
 }

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

@@ -1,56 +1,42 @@
-import { sql } from 'kysely';
 import { VerdantError } from '@verdant-web/common';
 export class SqlReplicas {
-    constructor(dbs, replicaTruancyMinutes, dialect) {
-        this.dbs = dbs;
+    constructor(db, libraryId, replicaTruancyMinutes) {
+        this.db = db;
+        this.libraryId = libraryId;
         this.replicaTruancyMinutes = replicaTruancyMinutes;
-        this.dialect = dialect;
-        this.attachLibraryId = (libraryId, row) => {
-            row.libraryId = libraryId;
+        this.attachLibraryId = (row) => {
+            row.libraryId = this.libraryId;
             return row;
         };
-        this.get = async (libraryId, replicaId) => {
-            var _a;
-            const db = await this.dbs.get(libraryId);
-            const row = (_a = (await db
-                .selectFrom('ReplicaInfo')
-                .where('id', '=', replicaId)
-                .selectAll()
-                .executeTakeFirst())) !== null && _a !== void 0 ? _a : null;
+        this.get = async (replicaId) => {
+            const db = this.db;
+            const row = db.first(`SELECT * FROM ReplicaInfo WHERE id = ?`, [replicaId]);
             if (row)
-                return this.attachLibraryId(libraryId, row);
+                return this.attachLibraryId(row);
             return row;
         };
-        this.getOrCreate = async (libraryId, replicaId, info) => {
-            const existing = await this.get(libraryId, replicaId);
+        this.getOrCreate = async (replicaId, info) => {
+            const existing = await this.get(replicaId);
             if (!existing) {
-                const db = await this.dbs.get(libraryId);
-                const created = await db
-                    .insertInto('ReplicaInfo')
-                    .values({
-                    id: replicaId,
-                    clientId: info.userId,
-                    type: info.type,
-                    ackedServerOrder: 0,
-                })
-                    .returningAll()
-                    .executeTakeFirst();
+                const db = this.db;
+                const created = db.first(`INSERT INTO ReplicaInfo (id, clientId, type, ackedServerOrder) VALUES (?, ?, ?, ?)
+					ON CONFLICT(id) DO NOTHING
+					RETURNING *`, [replicaId, info.userId, info.type, 0]);
                 if (!created) {
                     throw new VerdantError(VerdantError.Code.Unexpected, undefined, 'Failed to create replica');
                 }
                 return {
                     status: 'new',
-                    replicaInfo: this.attachLibraryId(libraryId, created),
+                    replicaInfo: this.attachLibraryId(created),
                 };
             }
             if (existing.type !== info.type) {
-                const db = await this.dbs.get(libraryId);
+                const db = this.db;
                 // type should be updated if a new token changes it
-                await db
-                    .updateTable('ReplicaInfo')
-                    .set({ type: info.type })
-                    .where('id', '=', replicaId)
-                    .execute();
+                db.exec(`UPDATE ReplicaInfo SET type = ? WHERE id = ?`, [
+                    info.type,
+                    replicaId,
+                ]);
             }
             if (existing.clientId !== info.userId) {
                 // replicas cannot change hands - this is a security issue
@@ -62,77 +48,54 @@ export class SqlReplicas {
             }
             return { status: 'existing', replicaInfo: existing };
         };
-        this.getAll = async (libraryId, options) => {
-            const db = await this.dbs.get(libraryId);
-            let builder = db.selectFrom('ReplicaInfo');
-            if (options === null || options === void 0 ? void 0 : options.omitTruant) {
-                builder = builder.where('lastSeenWallClockTime', '>', this.truantCutoff);
-            }
-            return (await builder.selectAll().execute()).map(this.attachLibraryId.bind(this, libraryId));
+        this.getAll = async (options) => {
+            const result = this.db.query(`SELECT * FROM ReplicaInfo${(options === null || options === void 0 ? void 0 : options.omitTruant) ? ' WHERE lastSeenWallClockTime > ?' : ''}`, (options === null || options === void 0 ? void 0 : options.omitTruant) ? [this.truantCutoff] : []);
+            return result.map(this.attachLibraryId);
         };
-        this.updateLastSeen = async (libraryId, replicaId) => {
+        this.updateLastSeen = async (replicaId) => {
             const clockTime = Date.now();
-            const db = await this.dbs.get(libraryId);
-            await db
-                .updateTable('ReplicaInfo')
-                .set({ lastSeenWallClockTime: clockTime })
-                .where('id', '=', replicaId)
-                .execute();
+            const db = this.db;
+            db.exec(`UPDATE ReplicaInfo SET lastSeenWallClockTime = ? WHERE id = ?`, [
+                clockTime,
+                replicaId,
+            ]);
         };
-        this.updateAckedServerOrder = async (libraryId, replicaId, serverOrder) => {
-            const max = this.dialect === 'postgres' ? 'GREATEST' : 'MAX';
-            const db = await this.dbs.get(libraryId);
-            await db
-                .updateTable('ReplicaInfo')
-                .set('ackedServerOrder', ({ val }) => sql `${sql.raw(max)}(ackedServerOrder, ${val(serverOrder)})`)
-                .where('id', '=', replicaId)
-                .execute();
+        this.updateAckedServerOrder = async (replicaId, serverOrder) => {
+            this.db.exec(`UPDATE ReplicaInfo SET ackedServerOrder = MAX(ackedServerOrder, ?) WHERE id = ?`, [serverOrder, replicaId]);
         };
-        this.updateAcknowledgedLogicalTime = async (libraryId, replicaId, timestamp) => {
-            const db = await this.dbs.get(libraryId);
-            await db
-                .updateTable('ReplicaInfo')
-                .set({ ackedLogicalTime: timestamp })
-                .where('id', '=', replicaId)
-                .execute();
+        this.updateAcknowledgedLogicalTime = async (replicaId, timestamp) => {
+            this.db.exec(`UPDATE ReplicaInfo SET ackedLogicalTime = ? WHERE id = ?`, [
+                timestamp,
+                replicaId,
+            ]);
         };
-        this.getEarliestAckedServerOrder = async (libraryId) => {
+        this.getEarliestAckedServerOrder = async () => {
             var _a;
-            const db = await this.dbs.get(libraryId);
             // gets earliest acked server order of all non-truant replicas.
-            const res = await db
-                .selectFrom('ReplicaInfo')
-                .where('lastSeenWallClockTime', '>', this.truantCutoff)
-                .orderBy('ackedServerOrder', 'asc')
-                .select('ackedServerOrder')
-                .executeTakeFirst();
+            const res = this.db.first(`SELECT ackedServerOrder FROM ReplicaInfo WHERE lastSeenWallClockTime > ? ORDER BY ackedServerOrder ASC LIMIT 1`, [this.truantCutoff]);
             return (_a = res === null || res === void 0 ? void 0 : res.ackedServerOrder) !== null && _a !== void 0 ? _a : 0;
         };
-        this.acknowledgeOperation = async (libraryId, replicaId, timestamp) => {
+        this.acknowledgeOperation = async (replicaId, timestamp) => {
             if (!timestamp)
                 return;
-            const db = await this.dbs.get(libraryId);
             // when acking an operation, we also set the replica's server order
             // to that operation's server order, if it's greater.
-            const max = this.dialect === 'postgres' ? 'GREATEST' : 'MAX';
-            await db
-                .updateTable('ReplicaInfo')
-                .set({ ackedLogicalTime: timestamp })
-                .set('ackedServerOrder', ({ val }) => sql `${sql.raw(max)}(
-					ackedServerOrder,
-					COALESCE(
-						(
-        			SELECT serverOrder FROM OperationHistory
-        			WHERE timestamp = ${val(timestamp)}
-      			),
-						0
+            this.db.exec(`UPDATE ReplicaInfo SET
+					ackedLogicalTime = ?,
+					ackedServerOrder = MAX(
+						ackedServerOrder,
+						COALESCE(
+							(
+								SELECT serverOrder FROM OperationHistory
+								WHERE timestamp = ?
+							),
+							0
+						)
 					)
-				)`)
-                .where('id', '=', replicaId)
-                .execute();
+				WHERE id = ?`, [timestamp, timestamp, replicaId]);
         };
-        this.getGlobalAck = async (libraryId, onlineReplicaIds) => {
-            const nonTruant = await this.getAll(libraryId, { omitTruant: true });
+        this.getGlobalAck = async (onlineReplicaIds) => {
+            const nonTruant = await this.getAll({ omitTruant: true });
             if (nonTruant.length === 0)
                 return null;
             const globalAckEligible = nonTruant.filter((replica) => replica.type < 2 || (onlineReplicaIds === null || onlineReplicaIds === void 0 ? void 0 : onlineReplicaIds.includes(replica.id)));
@@ -144,17 +107,17 @@ export class SqlReplicas {
                 return acc < replica.ackedLogicalTime ? acc : replica.ackedLogicalTime;
             }, null);
         };
-        this.delete = async (libraryId, replicaId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('ReplicaInfo').where('id', '=', replicaId).execute();
+        this.delete = async (replicaId) => {
+            this.db.exec(`DELETE FROM ReplicaInfo WHERE id = ?`, [replicaId]);
+        };
+        this.deleteAll = async () => {
+            this.db.exec(`DELETE FROM ReplicaInfo`, []);
         };
-        this.deleteAll = async (libraryId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('ReplicaInfo').execute();
+        this.deleteAllForUser = async (userId) => {
+            this.db.exec(`DELETE FROM ReplicaInfo WHERE clientId = ?`, [userId]);
         };
-        this.deleteAllForUser = async (libraryId, userId) => {
-            const db = await this.dbs.get(libraryId);
-            await db.deleteFrom('ReplicaInfo').where('clientId', '=', userId).execute();
+        this.forceTruant = async (replicaId) => {
+            this.db.exec(`UPDATE ReplicaInfo SET lastSeenWallClockTime = ? WHERE id = ?`, [Date.now() - this.replicaTruancyMinutes * 60 * 1000 - 1, replicaId]);
         };
     }
     get truantCutoff() {

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

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

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

@@ -1,6 +1,26 @@
-import { Kysely } from 'kysely';
-import { Database as DatabaseTypes } from './tables.js';
-export declare function openDatabase(directory: string, libraryId: string, options?: {
-    skipMigrations?: boolean;
+import { Logger } from '../../logger.js';
+export interface SqliteExecutor {
+    query: <O extends Record<string, any>>(sql: string, parameters?: readonly unknown[]) => O[];
+    first: <O extends Record<string, any>>(sql: string, parameters?: readonly unknown[]) => O | null;
+    exec: (sql: string, parameters?: readonly unknown[]) => void;
+    migrate: () => void;
+    close: () => void;
+    transaction: <T>(cb: (tx: SqliteExecutor) => T) => T | Promise<T>;
+    migrated: boolean;
+}
+export declare class SqliteExecutor {
+    private log;
+    constructor(partial: Pick<SqliteExecutor, 'query' | 'exec' | 'close'> & {
+        createTransaction: (exec: SqliteExecutor) => <T>(cb: (tx: SqliteExecutor) => T) => T | Promise<T>;
+    }, { log }?: {
+        log?: Logger;
+    });
+    migrate: () => void;
+    first: <O extends Record<string, any>>(sql: string, parameters?: readonly unknown[]) => O | null;
+    migrated: boolean;
+}
+export declare function openDatabase(executor: SqliteExecutor): SqliteExecutor;
+export declare function createFilesystemExecutor(directory: string, libraryId: string, options?: {
     disableWal?: boolean;
-}): Promise<Kysely<DatabaseTypes>>;
+    log?: Logger;
+}): SqliteExecutor;

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

@@ -1,9 +1,30 @@
-import { Kysely, SqliteDialect } from 'kysely';
-import { join } from 'path';
 import Database from 'better-sqlite3';
-import { migrateToLatest } from '@a-type/kysely';
-import migrations from './migrations.js';
-export async function openDatabase(directory, libraryId, options = {}) {
+import { join } from 'path';
+import { migrateToLatest } from './migrations.js';
+export class SqliteExecutor {
+    constructor(partial, { log } = {}) {
+        this.migrate = () => {
+            return migrateToLatest(this, this.log);
+        };
+        this.first = (sql, parameters) => {
+            var _a;
+            const results = this.query(sql, parameters);
+            return (_a = results[0]) !== null && _a !== void 0 ? _a : null;
+        };
+        this.migrated = false;
+        this.log = log || (() => { });
+        this.query = partial.query.bind(this);
+        this.exec = partial.exec.bind(this);
+        this.close = partial.close.bind(this);
+        this.transaction = partial.createTransaction(this);
+    }
+}
+export function openDatabase(executor) {
+    executor.migrate();
+    return executor;
+}
+export function createFilesystemExecutor(directory, libraryId, options = {}) {
+    var _a;
     const label = `openDatabase ${libraryId}`;
     console.time(label);
     const filePath = directory === ':memory:'
@@ -13,16 +34,27 @@ export async function openDatabase(directory, libraryId, options = {}) {
     if (!options.disableWal) {
         internalDb.pragma('journal_mode = WAL');
     }
-    const db = new Kysely({
-        dialect: new SqliteDialect({
-            database: internalDb,
-        }),
-    });
-    // only migrate on first open
-    if (!options.skipMigrations) {
-        await migrateToLatest(db, migrations);
-    }
     console.timeEnd(label);
-    return db;
+    return new SqliteExecutor({
+        query: function (sql, parameters = []) {
+            const stmt = internalDb.prepare(sql);
+            return stmt.all(...parameters);
+        },
+        exec: function (sql, parameters = []) {
+            const stmt = internalDb.prepare(sql);
+            stmt.run(...parameters);
+        },
+        close: function () {
+            internalDb.close();
+        },
+        createTransaction: (exec) => (cb) => {
+            const tx = internalDb.transaction(() => {
+                return cb(exec);
+            });
+            return tx();
+        },
+    }, {
+        log: (_a = options.log) !== null && _a !== void 0 ? _a : (() => { }),
+    });
 }
 //# sourceMappingURL=database.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,SAAiB,EACjB,SAAiB,EACjB,UAGI,EAAE;IAEN,MAAM,KAAK,GAAG,gBAAgB,SAAS,EAAE,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,MAAM,QAAQ,GACb,SAAS,KAAK,UAAU;QACvB,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,SAAS,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACzB,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,EAAE,GAAG,IAAI,MAAM,CAAgB;QACpC,OAAO,EAAE,IAAI,aAAa,CAAC;YAC1B,QAAQ,EAAE,UAAU;SACpB,CAAC;KACF,CAAC,CAAC;IACH,6BAA6B;IAC7B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7B,MAAM,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC;AACX,CAAC"}
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/database.ts"],"names":[],"mappings":"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"}

package/dist/esm/storage/sqlShard/migrations/v1.d.ts

@@ -1,3 +1,2 @@
-import { Kysely } from 'kysely';
-export declare function up(db: Kysely<any>): Promise<void>;
-export declare function down(db: Kysely<any>): Promise<void>;
+export declare const version = 1;
+export declare const up: string[];