@livestore/livestore 0.0.13 → 0.0.14

package/src/storage/index.ts

@@ -8,12 +8,12 @@
 
 import type * as otel from '@opentelemetry/api'
 
-import type { ParamsObject } from '../util.js'
+import type { PreparedBindValues } from '../util.js'
 
 export type StorageInit = (otelProps: StorageOtelProps) => Promise<Storage> | Storage
 
 export interface Storage {
-  execute(query: string, bindValues?: ParamsObject, parentSpan?: otel.Span): void
+  execute(query: string, bindValues?: PreparedBindValues, parentSpan?: otel.Span): void
 
   /** Return a snapshot of persisted data from the storage */
   getPersistedData(parentSpan?: otel.Span): Promise<Uint8Array>

package/src/storage/tauri/index.ts

@@ -2,7 +2,7 @@ import { getTraceParentHeader } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 import { invoke } from '@tauri-apps/api'
 
-import type { ParamsObject } from '../../util.js'
+import type { PreparedBindValues } from '../../util.js'
 import { prepareBindValues } from '../../util.js'
 import type { Storage, StorageOtelProps } from '../index.js'
 
@@ -28,7 +28,7 @@ export class TauriStorage implements Storage {
       return new TauriStorage(dbFilePath, dbDirPath, otelTracer, parentSpan)
     }
 
-  execute = (query: string, bindValues?: ParamsObject, parentSpan?: otel.Span): void => {
+  execute = (query: string, bindValues?: PreparedBindValues, parentSpan?: otel.Span): void => {
     // console.log({ query, bindValues, prepared: prepareBindValues(bindValues ?? {}, query) })
     void invoke('execute', {
       dbName: this.dbFilePath,

package/src/storage/web-worker/index.ts

@@ -2,8 +2,7 @@ import { casesHandled } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 import * as Comlink from 'comlink'
 
-import type { ParamsObject } from '../../util.js'
-import { prepareBindValues } from '../../util.js'
+import type { PreparedBindValues } from '../../util.js'
 import type { Storage, StorageOtelProps } from '../index.js'
 import { IDB } from '../utils/idb.js'
 import type { WrappedWorker } from './worker.js'
@@ -13,7 +12,7 @@ export type StorageType = 'opfs' | 'indexeddb'
 export type StorageOptionsWeb = {
   /** Specifies where to persist data for this storage */
   type: StorageType
-  virtualFilename: string
+  fileName: string
 }
 
 export class WebWorkerStorage implements Storage {
@@ -21,7 +20,7 @@ export class WebWorkerStorage implements Storage {
   options: StorageOptionsWeb
   otelTracer: otel.Tracer
 
-  executionBacklog: { query: string; bindValues?: ParamsObject }[] = []
+  executionBacklog: { query: string; bindValues?: PreparedBindValues }[] = []
   executionPromise: Promise<void> | undefined
 
   private constructor({
@@ -61,8 +60,7 @@ export class WebWorkerStorage implements Storage {
       })
   }
 
-  execute = (query: string, bindValues_?: ParamsObject) => {
-    const bindValues = prepareBindValues(bindValues_ ?? {}, query)
+  execute = (query: string, bindValues?: PreparedBindValues) => {
     this.executionBacklog.push({ query, bindValues })
 
     // Instead of sending the queries to the worker immediately, we wait a bit and batch them up (which reduces the number of messages sent to the worker)
@@ -91,7 +89,7 @@ const getPersistedData = async (options: StorageOptionsWeb): Promise<Uint8Array>
     case 'opfs': {
       try {
         const rootHandle = await navigator.storage.getDirectory()
-        const fileHandle = await rootHandle.getFileHandle(options.virtualFilename + '.db')
+        const fileHandle = await rootHandle.getFileHandle(options.fileName + '.db')
         const file = await fileHandle.getFile()
         const buffer = await file.arrayBuffer()
         const data = new Uint8Array(buffer)
@@ -107,7 +105,7 @@ const getPersistedData = async (options: StorageOptionsWeb): Promise<Uint8Array>
     }
 
     case 'indexeddb': {
-      const idb = new IDB(options.virtualFilename)
+      const idb = new IDB(options.fileName)
 
       return (await idb.get('db')) ?? new Uint8Array()
     }

package/src/storage/web-worker/worker.ts

@@ -46,7 +46,7 @@ const initialize = async (options: StorageOptionsWeb) => {
   switch (options.type) {
     case 'opfs': {
       try {
-        db = new sqlite3.oo1.OpfsDb(fullyQualifiedFilename(options.virtualFilename)) // , 'c'
+        db = new sqlite3.oo1.OpfsDb(fullyQualifiedFilename(options.fileName)) // , 'c'
       } catch (e) {
         debugger
       }
@@ -55,7 +55,7 @@ const initialize = async (options: StorageOptionsWeb) => {
     case 'indexeddb': {
       try {
         db = new sqlite3.oo1.DB({ filename: ':memory:', flags: 'c' })
-        idb = new IDB(options.virtualFilename)
+        idb = new IDB(options.fileName)
 
         const bytes = await idb.get('db')