@livestore/livestore 0.3.0-dev.11 → 0.3.0-dev.5

package/src/utils/tests/fixture.ts

@@ -1,7 +1,7 @@
 import { provideOtel } from '@livestore/common'
 import type { FromInputSchema } from '@livestore/common/schema'
 import type { Store } from '@livestore/livestore'
-import { createStore, DbSchema, makeSchema } from '@livestore/livestore'
+import { createStore, DbSchema, globalReactivityGraph, makeReactivityGraph, makeSchema } from '@livestore/livestore'
 import { Effect } from '@livestore/utils/effect'
 import { makeInMemoryAdapter } from '@livestore/web'
 import type * as otel from '@opentelemetry/api'
@@ -47,17 +47,22 @@ export interface FixtureSchema extends FromInputSchema.DeriveSchema<{ tables: ty
 export const makeTodoMvc = ({
   otelTracer,
   otelContext,
+  useGlobalReactivityGraph = true,
 }: {
   otelTracer?: otel.Tracer
   otelContext?: otel.Context
+  useGlobalReactivityGraph?: boolean
 } = {}) =>
   Effect.gen(function* () {
+    const reactivityGraph = useGlobalReactivityGraph ? globalReactivityGraph : makeReactivityGraph()
+
     const store: Store<any, FixtureSchema> = yield* createStore({
       schema,
       storeId: 'default',
       adapter: makeInMemoryAdapter(),
+      reactivityGraph,
       debug: { instanceId: 'test' },
     })
 
-    return store
+    return { store, reactivityGraph }
   }).pipe(provideOtel({ parentSpanContext: otelContext, otelTracer: otelTracer }))

package/src/utils/tests/mod.ts

@@ -1,3 +1,2 @@
 export * from './fixture.js'
 export * from './otel.js'
-export * as RG from '../../reactive.js'

package/dist/SqliteDbWrapper.d.ts

@@ -1,54 +0,0 @@
-import type { DebugInfo, MutableDebugInfo, PreparedBindValues, PreparedStatement, SqliteDb, SqliteDbChangeset, SqliteDbSession } from '@livestore/common';
-import type * as otel from '@opentelemetry/api';
-export declare const emptyDebugInfo: () => DebugInfo;
-/**
- * This class is mostly adding result caching around a SqliteDb which is used to speed up
- * SQLite queries when used through the reactivity graph.
- */
-export declare class SqliteDbWrapper implements SqliteDb {
-    _tag: "SqliteDb";
-    private cachedStmts;
-    private tablesUsedCache;
-    private resultCache;
-    private db;
-    private otelTracer;
-    private otelRootSpanContext;
-    private tablesUsedStmt;
-    debugInfo: MutableDebugInfo;
-    constructor({ db, otel, }: {
-        db: SqliteDb;
-        otel: {
-            tracer: otel.Tracer;
-            rootSpanContext: otel.Context;
-        };
-    });
-    metadata: any;
-    prepare(queryStr: string): PreparedStatement;
-    import(data: Uint8Array<ArrayBufferLike> | SqliteDb<any, any>): void;
-    close(): void;
-    destroy(): void;
-    session(): SqliteDbSession;
-    makeChangeset(data: Uint8Array): SqliteDbChangeset;
-    txn<TRes>(callback: () => TRes): TRes;
-    withChangeset<TRes>(callback: () => TRes): {
-        result: TRes;
-        changeset: Uint8Array | undefined;
-    };
-    rollback(changeset: Uint8Array): void;
-    getTablesUsed(query: string): Set<string>;
-    execute(queryStr: string, bindValues?: PreparedBindValues | undefined, options?: {
-        hasNoEffects?: boolean;
-        otelContext?: otel.Context;
-        writeTables?: ReadonlySet<string>;
-        onRowsChanged?: (rowsChanged: number) => void;
-    }): {
-        durationMs: number;
-    };
-    select<T = any>(queryStr: string, bindValues?: PreparedBindValues | undefined, options?: {
-        queriedTables?: ReadonlySet<string>;
-        skipCache?: boolean;
-        otelContext?: otel.Context;
-    }): ReadonlyArray<T>;
-    export(): Uint8Array<ArrayBufferLike>;
-}
-//# sourceMappingURL=SqliteDbWrapper.d.ts.map

package/dist/SqliteDbWrapper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SqliteDbWrapper.d.ts","sourceRoot":"","sources":["../src/SqliteDbWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,eAAe,EAChB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAK/C,eAAO,MAAM,cAAc,QAAO,SAKhC,CAAA;AAEF;;;GAGG;AACH,qBAAa,eAAgB,YAAW,QAAQ;IAC9C,IAAI,EAAG,UAAU,CAAS;IAE1B,OAAO,CAAC,WAAW,CAA+C;IAClE,OAAO,CAAC,eAAe,CAAyC;IAChE,OAAO,CAAC,WAAW,CAAmB;IACtC,OAAO,CAAC,EAAE,CAAU;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,mBAAmB,CAAc;IACzC,OAAO,CAAC,cAAc,CAAA;IACf,SAAS,EAAE,gBAAgB,CAAmB;gBAEzC,EACV,EAAE,EACF,IAAI,GACL,EAAE;QACD,EAAE,EAAE,QAAQ,CAAA;QACZ,IAAI,EAAE;YACJ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;YACnB,eAAe,EAAE,IAAI,CAAC,OAAO,CAAA;SAC9B,CAAA;KACF;IAaD,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB;IAG5C,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAG7D,KAAK,IAAI,IAAI;IAGb,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,eAAe;IAG1B,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,iBAAiB;IAIlD,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAqBrC,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,SAAS,EAAE,UAAU,GAAG,SAAS,CAAA;KAAE;IAU9F,QAAQ,CAAC,SAAS,EAAE,UAAU;IAK9B,aAAa,CAAC,KAAK,EAAE,MAAM;IA4B3B,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,kBAAkB,GAAG,SAAS,EAC3C,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,OAAO,CAAA;QACtB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QACjC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;KAC9C,GACA;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE;IA8CzB,MAAM,CAAC,CAAC,GAAG,GAAG,EACZ,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,kBAAkB,GAAG,SAAS,EAC3C,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QACnC,SAAS,CAAC,EAAE,OAAO,CAAA;QACnB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;KAC3B,GACA,aAAa,CAAC,CAAC,CAAC;IA+DnB,MAAM;CAQP"}

package/dist/SqliteDbWrapper.js

@@ -1,212 +0,0 @@
-/* eslint-disable prefer-arrow/prefer-arrow-functions */
-import { BoundArray, BoundMap, sql } from '@livestore/common';
-import { isDevEnv } from '@livestore/utils';
-import QueryCache from './QueryCache.js';
-import { getDurationMsFromSpan, getStartTimeHighResFromSpan } from './utils/otel.js';
-export const emptyDebugInfo = () => ({
-    slowQueries: new BoundArray(200),
-    queryFrameDuration: 0,
-    queryFrameCount: 0,
-    events: new BoundArray(1000),
-});
-/**
- * This class is mostly adding result caching around a SqliteDb which is used to speed up
- * SQLite queries when used through the reactivity graph.
- */
-export class SqliteDbWrapper {
-    _tag = 'SqliteDb';
-    // TODO: how many unique active statements are expected?
-    cachedStmts = new BoundMap(200);
-    tablesUsedCache = new BoundMap(200);
-    resultCache = new QueryCache();
-    db;
-    otelTracer;
-    otelRootSpanContext;
-    tablesUsedStmt;
-    debugInfo = emptyDebugInfo();
-    constructor({ db, otel, }) {
-        this.db = db;
-        this.otelTracer = otel.tracer;
-        this.otelRootSpanContext = otel.rootSpanContext;
-        this.tablesUsedStmt = db.prepare(`SELECT tbl_name FROM tables_used(?) AS u JOIN sqlite_master ON sqlite_master.name = u.name WHERE u.schema = 'main';`);
-        this.cachedStmts.onEvict = (_queryStr, stmt) => stmt.finalize();
-        configureSQLite(this);
-    }
-    metadata;
-    prepare(queryStr) {
-        return this.db.prepare(queryStr);
-    }
-    import(data) {
-        return this.db.import(data);
-    }
-    close() {
-        return this.db.close();
-    }
-    destroy() {
-        return this.db.destroy();
-    }
-    session() {
-        return this.db.session();
-    }
-    makeChangeset(data) {
-        return this.db.makeChangeset(data);
-    }
-    txn(callback) {
-        this.execute(sql `begin transaction;`);
-        let errored = false;
-        let result;
-        try {
-            result = callback();
-        }
-        catch (e) {
-            errored = true;
-            this.execute(sql `rollback;`);
-            throw e;
-        }
-        if (!errored) {
-            this.execute(sql `commit;`);
-        }
-        return result;
-    }
-    withChangeset(callback) {
-        const session = this.db.session();
-        const result = callback();
-        const changeset = session.changeset();
-        session.finish();
-        return { result, changeset };
-    }
-    rollback(changeset) {
-        const invertedChangeset = this.db.makeChangeset(changeset).invert();
-        invertedChangeset.apply();
-    }
-    getTablesUsed(query) {
-        // It seems that SQLite doesn't properly handle `DELETE FROM SOME_TABLE` queries without a WHERE clause
-        // So we need to handle these queries separately
-        const tableNameFromPlainDeleteQuery = tryGetTableNameFromPlainDeleteQuery(query);
-        if (tableNameFromPlainDeleteQuery !== undefined) {
-            return new Set([tableNameFromPlainDeleteQuery]);
-        }
-        const cached = this.tablesUsedCache.get(query);
-        if (cached) {
-            return cached;
-        }
-        const stmt = this.tablesUsedStmt;
-        const tablesUsed = new Set();
-        try {
-            const results = stmt.select([query]);
-            for (const row of results) {
-                tablesUsed.add(row.tbl_name);
-            }
-        }
-        catch (e) {
-            console.error('Error getting tables used', e, 'for query', query);
-            return new Set();
-        }
-        this.tablesUsedCache.set(query, tablesUsed);
-        return tablesUsed;
-    }
-    execute(queryStr, bindValues, options) {
-        // console.debug('in-memory-db:execute', query, bindValues)
-        return this.otelTracer.startActiveSpan('livestore.in-memory-db:execute', 
-        // TODO truncate query string
-        { attributes: { 'sql.query': queryStr } }, options?.otelContext ?? this.otelRootSpanContext, (span) => {
-            let stmt = this.cachedStmts.get(queryStr);
-            if (stmt === undefined) {
-                stmt = this.db.prepare(queryStr);
-                this.cachedStmts.set(queryStr, stmt);
-            }
-            stmt.execute(bindValues);
-            if (options?.hasNoEffects !== true && !this.resultCache.ignoreQuery(queryStr)) {
-                // TODO use write tables instead
-                // check what queries actually end up here.
-                this.resultCache.invalidate(options?.writeTables ?? this.getTablesUsed(queryStr));
-            }
-            span.end();
-            const durationMs = getDurationMsFromSpan(span);
-            this.debugInfo.queryFrameDuration += durationMs;
-            this.debugInfo.queryFrameCount++;
-            if (durationMs > 5 && isDevEnv()) {
-                this.debugInfo.slowQueries.push({
-                    queryStr,
-                    bindValues,
-                    durationMs,
-                    rowsCount: undefined,
-                    queriedTables: new Set(),
-                    startTimePerfNow: getStartTimeHighResFromSpan(span),
-                });
-            }
-            return { durationMs };
-        });
-    }
-    select(queryStr, bindValues, options) {
-        const { queriedTables, skipCache = false, otelContext } = options ?? {};
-        // console.debug('in-memory-db:select', query, bindValues)
-        return this.otelTracer.startActiveSpan('sql-in-memory-select', {}, otelContext ?? this.otelRootSpanContext, (span) => {
-            try {
-                span.setAttribute('sql.query', queryStr);
-                const key = this.resultCache.getKey(queryStr, bindValues);
-                const cachedResult = this.resultCache.get(key);
-                if (skipCache === false && cachedResult !== undefined) {
-                    span.setAttribute('sql.rowsCount', cachedResult.length);
-                    span.setAttribute('sql.cached', true);
-                    span.end();
-                    return cachedResult;
-                }
-                let stmt = this.cachedStmts.get(queryStr);
-                if (stmt === undefined) {
-                    stmt = this.db.prepare(queryStr);
-                    this.cachedStmts.set(queryStr, stmt);
-                }
-                const result = stmt.select(bindValues);
-                span.setAttribute('sql.rowsCount', result.length);
-                span.setAttribute('sql.cached', false);
-                const queriedTables_ = queriedTables ?? this.getTablesUsed(queryStr);
-                this.resultCache.set(queriedTables_, key, result);
-                span.end();
-                const durationMs = getDurationMsFromSpan(span);
-                this.debugInfo.queryFrameDuration += durationMs;
-                this.debugInfo.queryFrameCount++;
-                // TODO also enable in non-dev mode
-                if (durationMs > 5 && isDevEnv()) {
-                    this.debugInfo.slowQueries.push({
-                        queryStr,
-                        bindValues,
-                        durationMs,
-                        rowsCount: result.length,
-                        queriedTables: queriedTables_,
-                        startTimePerfNow: getStartTimeHighResFromSpan(span),
-                    });
-                }
-                return result;
-            }
-            finally {
-                span.end();
-            }
-        });
-    }
-    export() {
-        // Clear statement cache because exporting frees statements
-        for (const key of this.cachedStmts.keys()) {
-            this.cachedStmts.delete(key);
-        }
-        return this.db.export();
-    }
-}
-/** Set up SQLite performance; hasn't been super carefully optimized yet. */
-const configureSQLite = (db) => {
-    db.execute(
-    // TODO: revisit these tuning parameters for max performance
-    sql `
-      PRAGMA page_size=32768;
-      PRAGMA cache_size=10000;
-      PRAGMA journal_mode='MEMORY'; -- we don't flush to disk before committing a write
-      PRAGMA synchronous='OFF';
-      PRAGMA temp_store='MEMORY';
-      PRAGMA foreign_keys='ON'; -- we want foreign key constraints to be enforced
-    `);
-};
-const tryGetTableNameFromPlainDeleteQuery = (query) => {
-    const [_, tableName] = query.trim().match(/^delete\s+from\s+(\w+)$/i) ?? [];
-    return tableName;
-};
-//# sourceMappingURL=SqliteDbWrapper.js.map

package/dist/SqliteDbWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SqliteDbWrapper.js","sourceRoot":"","sources":["../src/SqliteDbWrapper.ts"],"names":[],"mappings":"AAAA,wDAAwD;AAWxD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,UAAU,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAA;AAEpF,MAAM,CAAC,MAAM,cAAc,GAAG,GAAc,EAAE,CAAC,CAAC;IAC9C,WAAW,EAAE,IAAI,UAAU,CAAC,GAAG,CAAC;IAChC,kBAAkB,EAAE,CAAC;IACrB,eAAe,EAAE,CAAC;IAClB,MAAM,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC;CAC7B,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,OAAO,eAAe;IAC1B,IAAI,GAAG,UAAmB,CAAA;IAC1B,wDAAwD;IAChD,WAAW,GAAG,IAAI,QAAQ,CAA4B,GAAG,CAAC,CAAA;IAC1D,eAAe,GAAG,IAAI,QAAQ,CAAsB,GAAG,CAAC,CAAA;IACxD,WAAW,GAAG,IAAI,UAAU,EAAE,CAAA;IAC9B,EAAE,CAAU;IACZ,UAAU,CAAa;IACvB,mBAAmB,CAAc;IACjC,cAAc,CAAA;IACf,SAAS,GAAqB,cAAc,EAAE,CAAA;IAErD,YAAY,EACV,EAAE,EACF,IAAI,GAOL;QACC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAA;QAC7B,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAA;QAE/C,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,OAAO,CAC9B,qHAAqH,CACtH,CAAA;QAED,IAAI,CAAC,WAAW,CAAC,OAAO,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAA;QAE/D,eAAe,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IACD,QAAQ,CAAK;IACb,OAAO,CAAC,QAAgB;QACtB,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IACD,MAAM,CAAC,IAAsD;QAC3D,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IACD,KAAK;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;IACD,OAAO;QACL,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IACD,OAAO;QACL,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IACD,aAAa,CAAC,IAAgB;QAC5B,OAAO,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,GAAG,CAAO,QAAoB;QAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA,oBAAoB,CAAC,CAAA;QAErC,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,IAAI,MAAY,CAAA;QAEhB,IAAI,CAAC;YACH,MAAM,GAAG,QAAQ,EAAE,CAAA;QACrB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,GAAG,IAAI,CAAA;YACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA,WAAW,CAAC,CAAA;YAC5B,MAAM,CAAC,CAAA;QACT,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA,SAAS,CAAC,CAAA;QAC5B,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,aAAa,CAAO,QAAoB;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAA;QACjC,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAA;QACzB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAA;QAErC,OAAO,CAAC,MAAM,EAAE,CAAA;QAEhB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;IAC9B,CAAC;IAED,QAAQ,CAAC,SAAqB;QAC5B,MAAM,iBAAiB,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAA;QACnE,iBAAiB,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,aAAa,CAAC,KAAa;QACzB,uGAAuG;QACvG,gDAAgD;QAChD,MAAM,6BAA6B,GAAG,mCAAmC,CAAC,KAAK,CAAC,CAAA;QAChF,IAAI,6BAA6B,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,IAAI,GAAG,CAAS,CAAC,6BAA6B,CAAC,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC9C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAA;QAChC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAA;QACpC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAuB,CAAC,KAAK,CAAkC,CAAC,CAAA;YAE3F,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAA;YACjE,OAAO,IAAI,GAAG,EAAU,CAAA;QAC1B,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAC3C,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,OAAO,CACL,QAAgB,EAChB,UAA2C,EAC3C,OAKC;QAED,2DAA2D;QAE3D,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CACpC,gCAAgC;QAChC,6BAA6B;QAC7B,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EACzC,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,mBAAmB,EAChD,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACzC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAChC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YACtC,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAExB,IAAI,OAAO,EAAE,YAAY,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9E,gCAAgC;gBAChC,2CAA2C;gBAC3C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;YACnF,CAAC;YAED,IAAI,CAAC,GAAG,EAAE,CAAA;YAEV,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;YAE9C,IAAI,CAAC,SAAS,CAAC,kBAAkB,IAAI,UAAU,CAAA;YAC/C,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAA;YAEhC,IAAI,UAAU,GAAG,CAAC,IAAI,QAAQ,EAAE,EAAE,CAAC;gBACjC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC9B,QAAQ;oBACR,UAAU;oBACV,UAAU;oBACV,SAAS,EAAE,SAAS;oBACpB,aAAa,EAAE,IAAI,GAAG,EAAE;oBACxB,gBAAgB,EAAE,2BAA2B,CAAC,IAAI,CAAC;iBACpD,CAAC,CAAA;YACJ,CAAC;YAED,OAAO,EAAE,UAAU,EAAE,CAAA;QACvB,CAAC,CACF,CAAA;IACH,CAAC;IAED,MAAM,CACJ,QAAgB,EAChB,UAA2C,EAC3C,OAIC;QAED,MAAM,EAAE,aAAa,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QAEvE,0DAA0D;QAE1D,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CACpC,sBAAsB,EACtB,EAAE,EACF,WAAW,IAAI,IAAI,CAAC,mBAAmB,EACvC,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC;gBACH,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;gBAExC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;gBACzD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBAC9C,IAAI,SAAS,KAAK,KAAK,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;oBACtD,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,MAAM,CAAC,CAAA;oBACvD,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;oBACrC,IAAI,CAAC,GAAG,EAAE,CAAA;oBACV,OAAO,YAAY,CAAA;gBACrB,CAAC;gBAED,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;gBACzC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;oBAChC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;gBACtC,CAAC;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAI,UAAU,CAAC,CAAA;gBAEzC,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;gBACjD,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;gBAEtC,MAAM,cAAc,GAAG,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;gBACpE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;gBAEjD,IAAI,CAAC,GAAG,EAAE,CAAA;gBAEV,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBAE9C,IAAI,CAAC,SAAS,CAAC,kBAAkB,IAAI,UAAU,CAAA;gBAC/C,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAA;gBAEhC,mCAAmC;gBACnC,IAAI,UAAU,GAAG,CAAC,IAAI,QAAQ,EAAE,EAAE,CAAC;oBACjC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC;wBAC9B,QAAQ;wBACR,UAAU;wBACV,UAAU;wBACV,SAAS,EAAE,MAAM,CAAC,MAAM;wBACxB,aAAa,EAAE,cAAc;wBAC7B,gBAAgB,EAAE,2BAA2B,CAAC,IAAI,CAAC;qBACpD,CAAC,CAAA;gBACJ,CAAC;gBAED,OAAO,MAAM,CAAA;YACf,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,GAAG,EAAE,CAAA;YACZ,CAAC;QACH,CAAC,CACF,CAAA;IACH,CAAC;IAED,MAAM;QACJ,2DAA2D;QAC3D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC9B,CAAC;QAED,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAA;IACzB,CAAC;CACF;AAED,4EAA4E;AAC5E,MAAM,eAAe,GAAG,CAAC,EAAmB,EAAE,EAAE;IAC9C,EAAE,CAAC,OAAO;IACR,4DAA4D;IAC5D,GAAG,CAAA;;;;;;;KAOF,CACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,mCAAmC,GAAG,CAAC,KAAa,EAAE,EAAE;IAC5D,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAA;IAC3E,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA"}

package/dist/__tests__/fixture.d.ts

@@ -1,252 +0,0 @@
-import { DbSchema } from '@livestore/common/schema';
-import { Schema } from '@livestore/utils/effect';
-export declare const todos: DbSchema.TableDef<{
-    name: "todos";
-    columns: {
-        id: {
-            columnType: "text";
-            schema: Schema.Schema<string, string, never>;
-            default: import("effect/Option").None<never>;
-            nullable: false;
-            primaryKey: true;
-        };
-        text: {
-            columnType: "text";
-            schema: Schema.Schema<string, string, never>;
-            default: import("effect/Option").Some<"">;
-            nullable: false;
-            primaryKey: false;
-        };
-        completed: {
-            columnType: "integer";
-            schema: Schema.Schema<boolean, number, never>;
-            default: import("effect/Option").Some<false>;
-            nullable: false;
-            primaryKey: false;
-        };
-    };
-    indexes?: ReadonlyArray<DbSchema.SqliteDsl.Index>;
-    ast: import("@livestore/db-schema/dist/ast/sqlite.js").Table;
-}, {
-    isSingleton: false;
-    disableAutomaticIdColumn: false;
-    deriveMutations: {
-        enabled: true;
-        localOnly: boolean;
-    };
-    isSingleColumn: false;
-    requiredInsertColumnNames: "id";
-}, Schema.Schema<{
-    readonly id: string;
-    readonly text: string;
-    readonly completed: boolean;
-}, {
-    readonly id: string;
-    readonly text: string;
-    readonly completed: number;
-}, never>>;
-export declare const appConfig: DbSchema.TableDef<{
-    name: "app_config";
-    columns: {
-        value: {
-            columnType: "text";
-            schema: Schema.Schema<{
-                readonly fontSize: number;
-                readonly theme: "light" | "dark";
-            } | null, string | null, never>;
-            default: import("effect/Option").None<never>;
-            nullable: true;
-            primaryKey: false;
-        };
-        id: DbSchema.SqliteDsl.ColumnDefinition<"singleton", "singleton">;
-    };
-    indexes?: ReadonlyArray<DbSchema.SqliteDsl.Index>;
-    ast: import("@livestore/db-schema/dist/ast/sqlite.js").Table;
-}, {
-    isSingleton: true;
-    disableAutomaticIdColumn: false;
-    deriveMutations: {
-        enabled: true;
-        localOnly: boolean;
-    };
-    isSingleColumn: true;
-    requiredInsertColumnNames: never;
-}, Schema.Schema<{
-    readonly value: {
-        readonly fontSize: number;
-        readonly theme: "light" | "dark";
-    } | null;
-    readonly id: "singleton";
-}, {
-    readonly value: string | null;
-    readonly id: "singleton";
-}, never>>;
-export declare const tables: {
-    todos: DbSchema.TableDef<{
-        name: "todos";
-        columns: {
-            id: {
-                columnType: "text";
-                schema: Schema.Schema<string, string, never>;
-                default: import("effect/Option").None<never>;
-                nullable: false;
-                primaryKey: true;
-            };
-            text: {
-                columnType: "text";
-                schema: Schema.Schema<string, string, never>;
-                default: import("effect/Option").Some<"">;
-                nullable: false;
-                primaryKey: false;
-            };
-            completed: {
-                columnType: "integer";
-                schema: Schema.Schema<boolean, number, never>;
-                default: import("effect/Option").Some<false>;
-                nullable: false;
-                primaryKey: false;
-            };
-        };
-        indexes?: ReadonlyArray<DbSchema.SqliteDsl.Index>;
-        ast: import("@livestore/db-schema/dist/ast/sqlite.js").Table;
-    }, {
-        isSingleton: false;
-        disableAutomaticIdColumn: false;
-        deriveMutations: {
-            enabled: true;
-            localOnly: boolean;
-        };
-        isSingleColumn: false;
-        requiredInsertColumnNames: "id";
-    }, Schema.Schema<{
-        readonly id: string;
-        readonly text: string;
-        readonly completed: boolean;
-    }, {
-        readonly id: string;
-        readonly text: string;
-        readonly completed: number;
-    }, never>>;
-    appConfig: DbSchema.TableDef<{
-        name: "app_config";
-        columns: {
-            value: {
-                columnType: "text";
-                schema: Schema.Schema<{
-                    readonly fontSize: number;
-                    readonly theme: "light" | "dark";
-                } | null, string | null, never>;
-                default: import("effect/Option").None<never>;
-                nullable: true;
-                primaryKey: false;
-            };
-            id: DbSchema.SqliteDsl.ColumnDefinition<"singleton", "singleton">;
-        };
-        indexes?: ReadonlyArray<DbSchema.SqliteDsl.Index>;
-        ast: import("@livestore/db-schema/dist/ast/sqlite.js").Table;
-    }, {
-        isSingleton: true;
-        disableAutomaticIdColumn: false;
-        deriveMutations: {
-            enabled: true;
-            localOnly: boolean;
-        };
-        isSingleColumn: true;
-        requiredInsertColumnNames: never;
-    }, Schema.Schema<{
-        readonly value: {
-            readonly fontSize: number;
-            readonly theme: "light" | "dark";
-        } | null;
-        readonly id: "singleton";
-    }, {
-        readonly value: string | null;
-        readonly id: "singleton";
-    }, never>>;
-};
-export declare const schema: import("@livestore/common/schema").FromInputSchema.DeriveSchema<{
-    tables: {
-        todos: DbSchema.TableDef<{
-            name: "todos";
-            columns: {
-                id: {
-                    columnType: "text";
-                    schema: Schema.Schema<string, string, never>;
-                    default: import("effect/Option").None<never>;
-                    nullable: false;
-                    primaryKey: true;
-                };
-                text: {
-                    columnType: "text";
-                    schema: Schema.Schema<string, string, never>;
-                    default: import("effect/Option").Some<"">;
-                    nullable: false;
-                    primaryKey: false;
-                };
-                completed: {
-                    columnType: "integer";
-                    schema: Schema.Schema<boolean, number, never>;
-                    default: import("effect/Option").Some<false>;
-                    nullable: false;
-                    primaryKey: false;
-                };
-            };
-            indexes?: ReadonlyArray<DbSchema.SqliteDsl.Index>;
-            ast: import("@livestore/db-schema/dist/ast/sqlite.js").Table;
-        }, {
-            isSingleton: false;
-            disableAutomaticIdColumn: false;
-            deriveMutations: {
-                enabled: true;
-                localOnly: boolean;
-            };
-            isSingleColumn: false;
-            requiredInsertColumnNames: "id";
-        }, Schema.Schema<{
-            readonly id: string;
-            readonly text: string;
-            readonly completed: boolean;
-        }, {
-            readonly id: string;
-            readonly text: string;
-            readonly completed: number;
-        }, never>>;
-        appConfig: DbSchema.TableDef<{
-            name: "app_config";
-            columns: {
-                value: {
-                    columnType: "text";
-                    schema: Schema.Schema<{
-                        readonly fontSize: number;
-                        readonly theme: "light" | "dark";
-                    } | null, string | null, never>;
-                    default: import("effect/Option").None<never>;
-                    nullable: true;
-                    primaryKey: false;
-                };
-                id: DbSchema.SqliteDsl.ColumnDefinition<"singleton", "singleton">;
-            };
-            indexes?: ReadonlyArray<DbSchema.SqliteDsl.Index>;
-            ast: import("@livestore/db-schema/dist/ast/sqlite.js").Table;
-        }, {
-            isSingleton: true;
-            disableAutomaticIdColumn: false;
-            deriveMutations: {
-                enabled: true;
-                localOnly: boolean;
-            };
-            isSingleColumn: true;
-            requiredInsertColumnNames: never;
-        }, Schema.Schema<{
-            readonly value: {
-                readonly fontSize: number;
-                readonly theme: "light" | "dark";
-            } | null;
-            readonly id: "singleton";
-        }, {
-            readonly value: string | null;
-            readonly id: "singleton";
-        }, never>>;
-    };
-}>;
-//# sourceMappingURL=fixture.d.ts.map

package/dist/__tests__/fixture.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../src/__tests__/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQjB,CAAA;AAOD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAGpB,CAAA;AAEF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAuB,CAAA;AAE1C,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyB,CAAA"}

package/dist/__tests__/fixture.js

@@ -1,18 +0,0 @@
-import { DbSchema, makeSchema } from '@livestore/common/schema';
-import { Schema } from '@livestore/utils/effect';
-export const todos = DbSchema.table('todos', {
-    id: DbSchema.text({ primaryKey: true }),
-    text: DbSchema.text({ default: '', nullable: false }),
-    completed: DbSchema.boolean({ default: false, nullable: false }),
-}, { deriveMutations: true });
-const Config = Schema.Struct({
-    fontSize: Schema.Number,
-    theme: Schema.Literal('light', 'dark'),
-});
-export const appConfig = DbSchema.table('app_config', DbSchema.json({ schema: Config, nullable: true }), {
-    isSingleton: true,
-    deriveMutations: true,
-});
-export const tables = { todos, appConfig };
-export const schema = makeSchema({ tables });
-//# sourceMappingURL=fixture.js.map

package/dist/__tests__/fixture.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../src/__tests__/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CACjC,OAAO,EACP;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACrD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CACjE,EACD,EAAE,eAAe,EAAE,IAAI,EAAE,CAC1B,CAAA;AAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;CACvC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;IACvG,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI;CACtB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;AAE1C,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA"}

package/dist/live-queries/db-query.d.ts

@@ -1,67 +0,0 @@
-import type { Bindable, QueryBuilder, QueryInfo } from '@livestore/common';
-import { Schema } from '@livestore/utils/effect';
-import * as otel from '@opentelemetry/api';
-import type { Thunk } from '../reactive.js';
-import type { RefreshReason } from '../store/store-types.js';
-import type { DepKey, GetAtomResult, LiveQueryDef, ReactivityGraph, ReactivityGraphContext } from './base-class.js';
-import { LiveStoreQueryBase } from './base-class.js';
-export type QueryInputRaw<TDecoded, TEncoded, TQueryInfo extends QueryInfo> = {
-    query: string;
-    schema: Schema.Schema<TDecoded, TEncoded>;
-    bindValues?: Bindable;
-    /**
-     * Can be provided explicitly to slightly speed up initial query performance
-     *
-     * NOTE In the future we want to do this automatically at build time
-     */
-    queriedTables?: Set<string>;
-    queryInfo?: TQueryInfo;
-    execBeforeFirstRun?: (ctx: ReactivityGraphContext) => void;
-};
-export declare const isQueryInputRaw: (value: unknown) => value is QueryInputRaw<any, any, any>;
-export type QueryInput<TDecoded, TEncoded, TQueryInfo extends QueryInfo> = QueryInputRaw<TDecoded, TEncoded, TQueryInfo> | QueryBuilder<TDecoded, any, any, TQueryInfo>;
-/**
- * NOTE `query` is only supposed to read data. Don't use it to insert/update/delete data but use mutations instead.
- */
-export declare const queryDb: {
-    <TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None>(queryInput: QueryInputRaw<TResultSchema, ReadonlyArray<any>, TQueryInfo> | QueryBuilder<TResultSchema, any, any, TQueryInfo>, options?: {
-        map?: (rows: TResultSchema) => TResult;
-        /**
-         * Used for debugging / devtools
-         */
-        label?: string;
-        deps?: DepKey;
-        queryInfo?: TQueryInfo;
-    }): LiveQueryDef<TResult, TQueryInfo>;
-    <TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None>(queryInput: ((get: GetAtomResult) => QueryInputRaw<TResultSchema, ReadonlyArray<any>, TQueryInfo>) | ((get: GetAtomResult) => QueryBuilder<TResultSchema, any, any, TQueryInfo>), options?: {
-        map?: (rows: TResultSchema) => TResult;
-        /**
-         * Used for debugging / devtools
-         */
-        label?: string;
-        deps?: DepKey;
-        queryInfo?: TQueryInfo;
-    }): LiveQueryDef<TResult, TQueryInfo>;
-};
-export declare class LiveStoreDbQuery<TResultSchema, TResult = TResultSchema, TQueryInfo extends QueryInfo = QueryInfo.None> extends LiveStoreQueryBase<TResult, TQueryInfo> {
-    _tag: 'db';
-    /** A reactive thunk representing the query text */
-    queryInput$: Thunk<QueryInputRaw<any, any, QueryInfo>, ReactivityGraphContext, RefreshReason> | undefined;
-    /** A reactive thunk representing the query results */
-    results$: Thunk<TResult, ReactivityGraphContext, RefreshReason>;
-    label: string;
-    queryInfo: TQueryInfo;
-    readonly reactivityGraph: ReactivityGraph;
-    private mapResult;
-    constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: inputQueryInfo, otelContext, }: {
-        label?: string;
-        queryInput: QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo> | ((get: GetAtomResult, ctx: ReactivityGraphContext) => QueryInput<TResultSchema, ReadonlyArray<any>, TQueryInfo>);
-        reactivityGraph: ReactivityGraph;
-        map?: (rows: TResultSchema) => TResult;
-        queryInfo?: TQueryInfo;
-        /** Only used for the initial query execution */
-        otelContext?: otel.Context;
-    });
-    destroy: () => void;
-}
-//# sourceMappingURL=db-query.d.ts.map