@livestore/livestore 0.0.54-dev.2 → 0.0.54-dev.21

package/src/store.ts

@@ -1,22 +1,27 @@
-import type { BootDb, PreparedBindValues, ResetMode, StoreAdapter, StoreAdapterFactory } from '@livestore/common'
-import { Devtools, getExecArgsFromMutation } from '@livestore/common'
+import type {
+  BootDb,
+  ParamsObject,
+  PreparedBindValues,
+  ResetMode,
+  StoreAdapter,
+  StoreAdapterFactory,
+} from '@livestore/common'
+import { Devtools, getExecArgsFromMutation, prepareBindValues } from '@livestore/common'
 import { version as liveStoreVersion } from '@livestore/common/package.json'
-import type { LiveStoreSchema, MutationEvent, MutationEventSchema } from '@livestore/common/schema'
-import { makeMutationEventSchema } from '@livestore/common/schema'
-import { assertNever, isPromise, makeNoopTracer, ref, shouldNeverHappen } from '@livestore/utils'
+import type { LiveStoreSchema, MutationEvent } from '@livestore/common/schema'
+import { makeMutationEventSchemaMemo } from '@livestore/common/schema'
+import { assertNever, isPromise, makeNoopTracer, shouldNeverHappen } from '@livestore/utils'
 import { Effect, Schema, Stream } from '@livestore/utils/effect'
 import * as otel from '@opentelemetry/api'
 import type { GraphQLSchema } from 'graphql'
 
-import { globalDbGraph } from './global-state.js'
+import { globalReactivityGraph } from './global-state.js'
 import { MainDatabaseWrapper } from './MainDatabaseWrapper.js'
 import type { StackInfo } from './react/utils/stack-info.js'
-import type { DebugRefreshReasonBase, ReactiveGraph, Ref } from './reactive.js'
-import type { DbContext, DbGraph, LiveQuery } from './reactiveQueries/base-class.js'
+import type { DebugRefreshReasonBase, Ref } from './reactive.js'
+import type { LiveQuery, QueryContext, ReactivityGraph } from './reactiveQueries/base-class.js'
 import { downloadBlob } from './utils/dev.js'
 import { getDurationMsFromSpan } from './utils/otel.js'
-import type { ParamsObject } from './utils/util.js'
-import { prepareBindValues } from './utils/util.js'
 
 export type BaseGraphQLContext = {
   queriedTables: Set<string>
@@ -29,17 +34,21 @@ export type GraphQLOptions<TContext> = {
   makeContext: (db: MainDatabaseWrapper, tracer: otel.Tracer) => TContext
 }
 
+export type OtelOptions = {
+  tracer: otel.Tracer
+  rootSpanContext: otel.Context
+}
+
 export type StoreOptions<
   TGraphQLContext extends BaseGraphQLContext,
   TSchema extends LiveStoreSchema = LiveStoreSchema,
 > = {
   adapter: StoreAdapter
   schema: TSchema
+  // TODO remove graphql-related stuff from store and move to GraphQL query directly
   graphQLOptions?: GraphQLOptions<TGraphQLContext>
-  otelTracer: otel.Tracer
-  otelRootSpanContext: otel.Context
-  dbGraph: DbGraph
-  mutationEventSchema: MutationEventSchema<any>
+  otelOptions: OtelOptions
+  reactivityGraph: ReactivityGraph
   disableDevtools?: boolean
 }
 
@@ -95,11 +104,8 @@ export class Store<
   TSchema extends LiveStoreSchema = LiveStoreSchema,
 > {
   id = uniqueStoreId()
-  graph: ReactiveGraph<RefreshReason, QueryDebugInfo, DbContext>
+  reactivityGraph: ReactivityGraph
   mainDbWrapper: MainDatabaseWrapper
-  // TODO refactor
-  // _proxyDb: InMemoryDatabase
-  // TODO
   adapter: StoreAdapter
   schema: LiveStoreSchema
   graphQLSchema?: GraphQLSchema
@@ -109,7 +115,7 @@ export class Store<
    * Note we're using `Ref<null>` here as we don't care about the value but only about *that* something has changed.
    * This only works in combination with `equal: () => false` which will always trigger a refresh.
    */
-  tableRefs: { [key: string]: Ref<null, DbContext, RefreshReason> }
+  tableRefs: { [key: string]: Ref<null, QueryContext, RefreshReason> }
 
   // TODO remove this temporary solution and find a better way to avoid re-processing the same mutation
   __processedMutationIds = new Set<string>()
@@ -124,32 +130,33 @@ export class Store<
     adapter,
     schema,
     graphQLOptions,
-    dbGraph,
-    otelTracer,
-    otelRootSpanContext,
-    mutationEventSchema,
+    reactivityGraph,
+    otelOptions,
     disableDevtools,
   }: StoreOptions<TGraphQLContext, TSchema>) {
-    this.mainDbWrapper = new MainDatabaseWrapper({ otelTracer, otelRootSpanContext, db: adapter.mainDb })
+    this.mainDbWrapper = new MainDatabaseWrapper({ otel: otelOptions, db: adapter.mainDb })
     this.adapter = adapter
     this.schema = schema
 
     // TODO refactor
-    this.__mutationEventSchema = mutationEventSchema
-    // this.mutationEventSchema = makeMutationEventSchema(Object.fromEntries(schema.mutations.entries()) as any)
+    this.__mutationEventSchema = makeMutationEventSchemaMemo(schema)
 
     // TODO generalize the `tableRefs` concept to allow finer-grained refs
     this.tableRefs = {}
     this.activeQueries = new ReferenceCountedSet()
 
-    const mutationsSpan = otelTracer.startSpan('LiveStore:mutations', {}, otelRootSpanContext)
+    const mutationsSpan = otelOptions.tracer.startSpan('LiveStore:mutations', {}, otelOptions.rootSpanContext)
     const otelMuationsSpanContext = otel.trace.setSpan(otel.context.active(), mutationsSpan)
 
-    const queriesSpan = otelTracer.startSpan('LiveStore:queries', {}, otelRootSpanContext)
+    const queriesSpan = otelOptions.tracer.startSpan('LiveStore:queries', {}, otelOptions.rootSpanContext)
     const otelQueriesSpanContext = otel.trace.setSpan(otel.context.active(), queriesSpan)
 
-    this.graph = dbGraph
-    this.graph.context = { store: this as any, otelTracer, rootOtelContext: otelQueriesSpanContext }
+    this.reactivityGraph = reactivityGraph
+    this.reactivityGraph.context = {
+      store: this as any,
+      otelTracer: otelOptions.tracer,
+      rootOtelContext: otelQueriesSpanContext,
+    }
 
     this.adapter.coordinator.syncMutations.pipe(
       Stream.tapSync((mutationEventDecoded) => {
@@ -165,7 +172,7 @@ export class Store<
     }
 
     this.otel = {
-      tracer: otelTracer,
+      tracer: otelOptions.tracer,
       mutationsSpanContext: otelMuationsSpanContext,
       queriesSpanContext: otelQueriesSpanContext,
     }
@@ -177,7 +184,7 @@ export class Store<
       // ...Array.from(dynamicallyRegisteredTables.values()).map((_) => _.sqliteDef.name),
     )
     const existingTableRefs = new Map(
-      Array.from(this.graph.atoms.values())
+      Array.from(this.reactivityGraph.atoms.values())
         .filter((_): _ is Ref<any, any, any> => _._tag === 'ref' && _.label?.startsWith('tableRef:') === true)
         .map((_) => [_.label!.slice('tableRef:'.length), _] as const),
     )
@@ -196,7 +203,7 @@ export class Store<
     parentSpan: otel.Span,
   ): Store<TGraphQLContext, TSchema> => {
     const ctx = otel.trace.setSpan(otel.context.active(), parentSpan)
-    return storeOptions.otelTracer.startActiveSpan('LiveStore:store-constructor', {}, ctx, (span) => {
+    return storeOptions.otelOptions.tracer.startActiveSpan('LiveStore:store-constructor', {}, ctx, (span) => {
       try {
         return new Store(storeOptions)
       } finally {
@@ -224,7 +231,7 @@ export class Store<
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
         const label = `subscribe:${options?.label}`
-        const effect = this.graph.makeEffect((get) => onNewValue(get(query$.results$)), { label })
+        const effect = this.reactivityGraph.makeEffect((get) => onNewValue(get(query$.results$)), { label })
 
         this.activeQueries.add(query$ as LiveQuery<TResult>)
 
@@ -236,7 +243,7 @@ export class Store<
         const unsubscribe = () => {
           // console.log('store unsub', query$.label)
           try {
-            this.graph.destroyNode(effect)
+            this.reactivityGraph.destroyNode(effect)
             this.activeQueries.remove(query$ as LiveQuery<TResult>)
             onUnsubsubscribe?.()
           } finally {
@@ -256,7 +263,7 @@ export class Store<
   destroy = async () => {
     for (const tableRef of Object.values(this.tableRefs)) {
       for (const superComp of tableRef.super) {
-        this.graph.removeEdge(superComp, tableRef)
+        this.reactivityGraph.removeEdge(superComp, tableRef)
       }
     }
 
@@ -374,7 +381,7 @@ export class Store<
             },
           )
 
-          const tablesToUpdate = [] as [Ref<null, DbContext, RefreshReason>, null][]
+          const tablesToUpdate = [] as [Ref<null, QueryContext, RefreshReason>, null][]
           for (const tableName of writeTables) {
             const tableRef = this.tableRefs[tableName]
             assertNever(tableRef !== undefined, `No table ref found for ${tableName}`)
@@ -388,7 +395,7 @@ export class Store<
           }
 
           // Update all table refs together in a batch, to only trigger one reactive update
-          this.graph.setRefs(tablesToUpdate, { debugRefreshReason, otelContext, skipRefresh })
+          this.reactivityGraph.setRefs(tablesToUpdate, { debugRefreshReason, otelContext, skipRefresh })
         } catch (e: any) {
           span.setStatus({ code: otel.SpanStatusCode.ERROR, message: e.toString() })
         } finally {
@@ -412,7 +419,7 @@ export class Store<
       this.otel.mutationsSpanContext,
       (span) => {
         const otelContext = otel.trace.setSpan(otel.context.active(), span)
-        this.graph.runDeferredEffects({ otelContext })
+        this.reactivityGraph.runDeferredEffects({ otelContext })
         span.end()
       },
     )
@@ -480,7 +487,7 @@ export class Store<
 
         if (coordinatorMode !== 'skip-coordinator') {
           // Asynchronously apply mutation to a persistent storage (we're not awaiting this promise here)
-          void this.adapter.coordinator.mutate(mutationEventEncoded, {
+          void this.adapter.coordinator.mutate(mutationEventEncoded as MutationEvent.AnyEncoded, {
             span,
             persisted: coordinatorMode !== 'skip-persist',
           })
@@ -518,7 +525,7 @@ export class Store<
   }
 
   makeTableRef = (tableName: string) =>
-    this.graph.makeRef(null, {
+    this.reactivityGraph.makeRef(null, {
       equal: () => false,
       label: `tableRef:${tableName}`,
       meta: { liveStoreRefType: 'table' },
@@ -527,14 +534,16 @@ export class Store<
   private bootDevtools = () => {
     const devtoolsChannel = Devtools.makeBroadcastChannels()
 
-    const signalsSubcriptionRef = ref<undefined | (() => void)>(undefined)
-    // let alreadySubscribedToLiveQueries = false
-    const liveQueriesSubscriptionRef = ref<undefined | (() => void)>(undefined)
+    type Unsub = () => void
+    type RequestId = string
+
+    const reactivityGraphSubcriptions = new Map<RequestId, Unsub>()
+    const liveQueriesSubscriptions = new Map<RequestId, Unsub>()
     devtoolsChannel.toAppHost.addEventListener('message', async (event) => {
       const decoded = Schema.decodeUnknownOption(Devtools.MessageToAppHost)(event.data)
       if (
         decoded._tag === 'None' ||
-        decoded.value._tag === 'LSD.DevtoolsReadyBroadcast' ||
+        decoded.value._tag === 'LSD.DevtoolsReady' ||
         decoded.value._tag === 'LSD.DevtoolsConnected' ||
         decoded.value.channelId !== this.adapter.coordinator.devtools.channelId
       ) {
@@ -547,12 +556,12 @@ export class Store<
         devtoolsChannel.fromAppHost.postMessage(Schema.encodeSync(Devtools.MessageFromAppHost)(message))
 
       switch (decoded.value._tag) {
-        case 'LSD.SignalsSubscribe': {
+        case 'LSD.ReactivityGraphSubscribe': {
           const includeResults = decoded.value.includeResults
           const send = () =>
             sendToDevtools(
-              Devtools.SignalsRes.make({
-                signals: this.graph.getSnapshot({ includeResults }),
+              Devtools.ReactivityGraphRes.make({
+                reactivityGraph: this.reactivityGraph.getSnapshot({ includeResults }),
                 requestId,
                 liveStoreVersion,
               }),
@@ -560,9 +569,10 @@ export class Store<
 
           send()
 
-          if (signalsSubcriptionRef.current === undefined) {
-            signalsSubcriptionRef.current = this.graph.subscribeToRefresh(() => send())
-          }
+          reactivityGraphSubcriptions.set(
+            requestId,
+            this.reactivityGraph.subscribeToRefresh(() => send()),
+          )
 
           break
         }
@@ -583,9 +593,8 @@ export class Store<
           sendToDevtools(Devtools.DebugInfoRerunQueryRes.make({ requestId, liveStoreVersion }))
           break
         }
-        case 'LSD.SignalsUnsubscribe': {
-          signalsSubcriptionRef.current!()
-          signalsSubcriptionRef.current = undefined
+        case 'LSD.ReactivityGraphUnsubscribe': {
+          reactivityGraphSubcriptions.get(requestId)!()
           break
         }
         case 'LSD.LiveQueriesSubscribe': {
@@ -608,15 +617,15 @@ export class Store<
 
           send()
 
-          if (liveQueriesSubscriptionRef.current === undefined) {
-            liveQueriesSubscriptionRef.current = this.graph.subscribeToRefresh(() => send())
-          }
+          liveQueriesSubscriptions.set(
+            requestId,
+            this.reactivityGraph.subscribeToRefresh(() => send()),
+          )
 
           break
         }
         case 'LSD.LiveQueriesUnsubscribe': {
-          liveQueriesSubscriptionRef.current!()
-          liveQueriesSubscriptionRef.current = undefined
+          liveQueriesSubscriptions.get(requestId)!()
           break
         }
         case 'LSD.ResetAllDataReq': {
@@ -651,24 +660,24 @@ export const createStore = async <
 >({
   schema,
   graphQLOptions,
-  otelTracer = makeNoopTracer(),
-  otelRootSpanContext = otel.context.active(),
+  otelOptions,
   adapter: adapterFactory,
   boot,
-  dbGraph = globalDbGraph,
+  reactivityGraph = globalReactivityGraph,
   batchUpdates,
   disableDevtools,
 }: {
   schema: TSchema
-  graphQLOptions?: GraphQLOptions<TGraphQLContext>
-  otelTracer?: otel.Tracer
-  otelRootSpanContext?: otel.Context
   adapter: StoreAdapterFactory
+  reactivityGraph?: ReactivityGraph
+  graphQLOptions?: GraphQLOptions<TGraphQLContext>
+  otelOptions?: Partial<OtelOptions>
   boot?: (db: BootDb, parentSpan: otel.Span) => unknown | Promise<unknown>
-  dbGraph?: DbGraph
   batchUpdates?: (run: () => void) => void
   disableDevtools?: boolean
 }): Promise<Store<TGraphQLContext, TSchema>> => {
+  const otelTracer = otelOptions?.tracer ?? makeNoopTracer()
+  const otelRootSpanContext = otelOptions?.rootSpanContext ?? otel.context.active()
   return otelTracer.startActiveSpan('createStore', {}, otelRootSpanContext, async (span) => {
     try {
       performance.mark('livestore:db-creating')
@@ -680,10 +689,10 @@ export const createStore = async <
       performance.measure('livestore:db-create', 'livestore:db-creating', 'livestore:db-created')
 
       if (batchUpdates !== undefined) {
-        dbGraph.effectsWrapper = batchUpdates
+        reactivityGraph.effectsWrapper = batchUpdates
       }
 
-      const mutationEventSchema = makeMutationEventSchema(Object.fromEntries(schema.mutations.entries()) as any)
+      const mutationEventSchema = makeMutationEventSchemaMemo(schema)
 
       // TODO consider moving booting into the storage backend
       if (boot !== undefined) {
@@ -716,7 +725,11 @@ export const createStore = async <
               }
 
               const mutationEventEncoded = Schema.encodeUnknownSync(mutationEventSchema)(mutationEventDecoded)
-              void adapter.coordinator.mutate(mutationEventEncoded, { span, persisted: true })
+
+              void adapter.coordinator.mutate(mutationEventEncoded as MutationEvent.AnyEncoded, {
+                span,
+                persisted: true,
+              })
             }
           },
           select: (queryStr, bindValues) => {
@@ -759,13 +772,11 @@ export const createStore = async <
       // await applySchema(db, schema)
       return Store.createStore<TGraphQLContext, TSchema>(
         {
-          adapter: adapter,
+          adapter,
           schema,
           graphQLOptions,
-          otelTracer,
-          otelRootSpanContext,
-          dbGraph,
-          mutationEventSchema,
+          otelOptions: { tracer: otelTracer, rootSpanContext: otelRootSpanContext },
+          reactivityGraph,
           disableDevtools,
         },
         span,

package/dist/utils/bounded-collections.d.ts

@@ -1,34 +0,0 @@
-/**
- * Creates a map that has a fixed number of entries.
- * Once hitting the bound, earliest insertions are removed
- */
-export default class BoundMap<K, V> {
-    #private;
-    constructor(sizeLimit: number);
-    onEvict: ((key: K, value: V) => void) | undefined;
-    set: (key: K, value: V) => void;
-    get: (key: K) => V | undefined;
-    delete: (key: K) => void;
-    keys: () => IterableIterator<K>;
-}
-export declare class BoundSet<V> {
-    #private;
-    constructor(sizeLimit: number);
-    onEvict: ((key: V) => void) | undefined;
-    add: (v: V) => void;
-    [Symbol.iterator]: () => IterableIterator<V>;
-}
-export declare class BoundArray<V> {
-    #private;
-    constructor(sizeLimit: number);
-    onEvict: ((key: V) => void) | undefined;
-    push: (v: V) => void;
-    get: (index: number) => V | undefined;
-    delete: (index: number) => void;
-    get length(): number;
-    [Symbol.iterator]: () => IterableIterator<V>;
-    map: <T>(fn: (v: V) => T) => T[];
-    clear: () => void;
-    sort: (fn?: (a: V, b: V) => number) => V[];
-}
-//# sourceMappingURL=bounded-collections.d.ts.map

package/dist/utils/bounded-collections.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bounded-collections.d.ts","sourceRoot":"","sources":["../../src/utils/bounded-collections.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC,EAAE,CAAC;;gBAIpB,SAAS,EAAE,MAAM;IAI7B,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAEjD,GAAG,QAAS,CAAC,SAAS,CAAC,UAWtB;IAED,GAAG,QAAS,CAAC,KAAG,CAAC,GAAG,SAAS,CAE5B;IAED,MAAM,QAAS,CAAC,UAEf;IAED,IAAI,4BAEH;CACF;AAED,qBAAa,QAAQ,CAAC,CAAC;;gBAGT,SAAS,EAAE,MAAM;IAW7B,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAEvC,GAAG,MAAO,CAAC,UAET;IAEF,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAEhB;CACF;AAED,qBAAa,UAAU,CAAC,CAAC;;gBAIX,SAAS,EAAE,MAAM;IAI7B,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAEvC,IAAI,MAAO,CAAC,UAQX;IAED,GAAG,UAAW,MAAM,KAAG,CAAC,GAAG,SAAS,CAEnC;IAED,MAAM,UAAW,MAAM,UAEtB;IAED,IAAI,MAAM,WAET;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAEhB;IAED,GAAG,UAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAG,CAAC,EAAE,CAE9B;IAED,KAAK,aAEJ;IAED,IAAI,QAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,SAElC;CACF"}

package/dist/utils/bounded-collections.js

@@ -1,91 +0,0 @@
-/**
- * Creates a map that has a fixed number of entries.
- * Once hitting the bound, earliest insertions are removed
- */
-export default class BoundMap {
-    #map = new Map();
-    #sizeLimit;
-    constructor(sizeLimit) {
-        this.#sizeLimit = sizeLimit;
-    }
-    onEvict;
-    set = (key, value) => {
-        this.#map.set(key, value);
-        // console.log(this.#map.size, this.#sizeLimit);
-        if (this.#map.size > this.#sizeLimit) {
-            const firstKey = this.#map.keys().next().value;
-            const deletedValue = this.#map.get(firstKey);
-            this.#map.delete(firstKey);
-            if (this.onEvict) {
-                this.onEvict(firstKey, deletedValue);
-            }
-        }
-    };
-    get = (key) => {
-        return this.#map.get(key);
-    };
-    delete = (key) => {
-        this.#map.delete(key);
-    };
-    keys = () => {
-        return this.#map.keys();
-    };
-}
-export class BoundSet {
-    #map;
-    constructor(sizeLimit) {
-        this.#map = new BoundMap(sizeLimit);
-        this.#map.onEvict = this.#onEvict;
-    }
-    #onEvict = (v) => {
-        if (this.onEvict) {
-            this.onEvict(v);
-        }
-    };
-    onEvict;
-    add = (v) => {
-        this.#map.set(v, v);
-    };
-    [Symbol.iterator] = () => {
-        return this.#map.keys();
-    };
-}
-export class BoundArray {
-    #array = [];
-    #sizeLimit;
-    constructor(sizeLimit) {
-        this.#sizeLimit = sizeLimit;
-    }
-    onEvict;
-    push = (v) => {
-        this.#array.push(v);
-        if (this.#array.length > this.#sizeLimit) {
-            const first = this.#array.shift();
-            if (first && this.onEvict) {
-                this.onEvict(first);
-            }
-        }
-    };
-    get = (index) => {
-        return this.#array[index];
-    };
-    delete = (index) => {
-        this.#array.splice(index, 1);
-    };
-    get length() {
-        return this.#array.length;
-    }
-    [Symbol.iterator] = () => {
-        return this.#array[Symbol.iterator]();
-    };
-    map = (fn) => {
-        return this.#array.map(fn);
-    };
-    clear = () => {
-        this.#array = [];
-    };
-    sort = (fn) => {
-        return this.#array.sort(fn);
-    };
-}
-//# sourceMappingURL=bounded-collections.js.map

package/dist/utils/bounded-collections.js.map

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

package/dist/utils/util.d.ts

@@ -1,14 +0,0 @@
-/// <reference lib="es2022" />
-import type { Brand } from '@livestore/utils/effect';
-export type ParamsObject = Record<string, SqlValue>;
-export type SqlValue = string | number | Uint8Array | null;
-export type Bindable = ReadonlyArray<SqlValue> | ParamsObject;
-export type PreparedBindValues = Brand.Branded<Bindable, 'PreparedBindValues'>;
-/** Prepare bind values to send to SQLite
-/*  Add $ to the beginning of keys; which we use as our interpolation syntax
-/*  We also strip out any params that aren't used in the statement,
-/*  because rusqlite doesn't allow unused named params
-/*  TODO: Search for unused params via proper parsing, not string search
-**/
-export declare const prepareBindValues: (values: Bindable, statement: string) => PreparedBindValues;
-//# sourceMappingURL=util.d.ts.map

package/dist/utils/util.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/utils/util.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAEpD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AACnD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAAA;AAE1D,MAAM,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;AAI7D,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAA;AAE9E;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,WAAY,QAAQ,aAAa,MAAM,KAAG,kBAWvE,CAAA"}

package/dist/utils/util.js

@@ -1,19 +0,0 @@
-/// <reference lib="es2022" />
-/** Prepare bind values to send to SQLite
-/*  Add $ to the beginning of keys; which we use as our interpolation syntax
-/*  We also strip out any params that aren't used in the statement,
-/*  because rusqlite doesn't allow unused named params
-/*  TODO: Search for unused params via proper parsing, not string search
-**/
-export const prepareBindValues = (values, statement) => {
-    if (Array.isArray(values))
-        return values;
-    const result = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (statement.includes(key)) {
-            result[`$${key}`] = value;
-        }
-    }
-    return result;
-};
-//# sourceMappingURL=util.js.map

package/dist/utils/util.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/utils/util.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAa9B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAE,SAAiB,EAAsB,EAAE;IAC3F,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,MAAmC,CAAA;IAErE,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,KAAK,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,MAA4B,CAAA;AACrC,CAAC,CAAA"}

package/src/utils/util.ts

@@ -1,31 +0,0 @@
-/// <reference lib="es2022" />
-
-import type { Brand } from '@livestore/utils/effect'
-
-export type ParamsObject = Record<string, SqlValue>
-export type SqlValue = string | number | Uint8Array | null
-
-export type Bindable = ReadonlyArray<SqlValue> | ParamsObject
-
-type XXX_TODO_REMOVE_REDUDANCY = 1
-
-export type PreparedBindValues = Brand.Branded<Bindable, 'PreparedBindValues'>
-
-/** Prepare bind values to send to SQLite
-/*  Add $ to the beginning of keys; which we use as our interpolation syntax
-/*  We also strip out any params that aren't used in the statement,
-/*  because rusqlite doesn't allow unused named params
-/*  TODO: Search for unused params via proper parsing, not string search
-**/
-export const prepareBindValues = (values: Bindable, statement: string): PreparedBindValues => {
-  if (Array.isArray(values)) return values as any as PreparedBindValues
-
-  const result: ParamsObject = {}
-  for (const [key, value] of Object.entries(values)) {
-    if (statement.includes(key)) {
-      result[`$${key}`] = value
-    }
-  }
-
-  return result as PreparedBindValues
-}