@livestore/react 0.1.0-dev.9 → 0.2.0-dev.0

package/src/__snapshots__/useRow.test.tsx.snap

@@ -21,7 +21,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
       "_name": "sql-in-memory-select",
       "attributes": {
         "sql.cached": false,
-        "sql.query": "select 1 from UserInfo where id = 'u1'",
+        "sql.query": "SELECT 1 FROM 'UserInfo' WHERE id = ?",
         "sql.rowsCount": 0,
       },
     },
@@ -29,7 +29,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
       "_name": "sql-in-memory-select",
       "attributes": {
         "sql.cached": false,
-        "sql.query": "select 1 from UserInfo where id = 'u2'",
+        "sql.query": "SELECT 1 FROM 'UserInfo' WHERE id = ?",
         "sql.rowsCount": 1,
       },
     },
@@ -75,9 +75,9 @@ exports[`useRow > otel > should update the data based on component key > strictM
       "_name": "LiveStore:queries",
       "children": [
         {
-          "_name": "sql:select * from UserInfo where id = 'u1' limit 1",
+          "_name": "db:SELECT * FROM 'UserInfo' WHERE id = ?",
           "attributes": {
-            "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+            "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
             "sql.rowsCount": 1,
           },
           "children": [
@@ -85,7 +85,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
               "_name": "sql-in-memory-select",
               "attributes": {
                 "sql.cached": false,
-                "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+                "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                 "sql.rowsCount": 1,
               },
             },
@@ -115,16 +115,16 @@ exports[`useRow > otel > should update the data based on component key > strictM
               ],
             },
             {
-              "_name": "LiveStore:useQuery:sql(rowQuery:query:UserInfo:u1)",
+              "_name": "LiveStore:useQuery:db(row:UserInfo:u1)",
               "attributes": {
-                "label": "sql(rowQuery:query:UserInfo:u1)",
+                "label": "db(row:UserInfo:u1)",
                 "stackInfo": "{"frames":[{"name":"renderHook.wrapper","filePath":"__REPLACED_FOR_SNAPSHOT__"},{"name":"useRow","filePath":"__REPLACED_FOR_SNAPSHOT__"}]}",
               },
               "children": [
                 {
-                  "_name": "sql:select * from UserInfo where id = 'u1' limit 1",
+                  "_name": "db:SELECT * FROM 'UserInfo' WHERE id = ?",
                   "attributes": {
-                    "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+                    "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                     "sql.rowsCount": 1,
                   },
                   "children": [
@@ -132,7 +132,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
                       "_name": "sql-in-memory-select",
                       "attributes": {
                         "sql.cached": false,
-                        "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+                        "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                         "sql.rowsCount": 1,
                       },
                     },
@@ -141,8 +141,8 @@ exports[`useRow > otel > should update the data based on component key > strictM
                 {
                   "_name": "LiveStore.subscribe",
                   "attributes": {
-                    "label": "sql(rowQuery:query:UserInfo:u1)",
-                    "queryLabel": "sql(rowQuery:query:UserInfo:u1)",
+                    "label": "db(row:UserInfo:u1)",
+                    "queryLabel": "db(row:UserInfo:u1)",
                   },
                 },
               ],
@@ -156,16 +156,16 @@ exports[`useRow > otel > should update the data based on component key > strictM
           },
           "children": [
             {
-              "_name": "LiveStore:useQuery:sql(rowQuery:query:UserInfo:u2)",
+              "_name": "LiveStore:useQuery:db(row:UserInfo:u2)",
               "attributes": {
-                "label": "sql(rowQuery:query:UserInfo:u2)",
+                "label": "db(row:UserInfo:u2)",
                 "stackInfo": "{"frames":[{"name":"renderHook.wrapper","filePath":"__REPLACED_FOR_SNAPSHOT__"},{"name":"useRow","filePath":"__REPLACED_FOR_SNAPSHOT__"}]}",
               },
               "children": [
                 {
-                  "_name": "sql:select * from UserInfo where id = 'u2' limit 1",
+                  "_name": "db:SELECT * FROM 'UserInfo' WHERE id = ?",
                   "attributes": {
-                    "sql.query": "select * from UserInfo where id = 'u2' limit 1",
+                    "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                     "sql.rowsCount": 1,
                   },
                   "children": [
@@ -173,7 +173,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
                       "_name": "sql-in-memory-select",
                       "attributes": {
                         "sql.cached": false,
-                        "sql.query": "select * from UserInfo where id = 'u2' limit 1",
+                        "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                         "sql.rowsCount": 1,
                       },
                     },
@@ -182,8 +182,8 @@ exports[`useRow > otel > should update the data based on component key > strictM
                 {
                   "_name": "LiveStore.subscribe",
                   "attributes": {
-                    "label": "sql(rowQuery:query:UserInfo:u2)",
-                    "queryLabel": "sql(rowQuery:query:UserInfo:u2)",
+                    "label": "db(row:UserInfo:u2)",
+                    "queryLabel": "db(row:UserInfo:u2)",
                   },
                 },
               ],
@@ -217,7 +217,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
       "_name": "sql-in-memory-select",
       "attributes": {
         "sql.cached": false,
-        "sql.query": "select 1 from UserInfo where id = 'u1'",
+        "sql.query": "SELECT 1 FROM 'UserInfo' WHERE id = ?",
         "sql.rowsCount": 0,
       },
     },
@@ -225,7 +225,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
       "_name": "sql-in-memory-select",
       "attributes": {
         "sql.cached": false,
-        "sql.query": "select 1 from UserInfo where id = 'u2'",
+        "sql.query": "SELECT 1 FROM 'UserInfo' WHERE id = ?",
         "sql.rowsCount": 1,
       },
     },
@@ -271,9 +271,9 @@ exports[`useRow > otel > should update the data based on component key > strictM
       "_name": "LiveStore:queries",
       "children": [
         {
-          "_name": "sql:select * from UserInfo where id = 'u1' limit 1",
+          "_name": "db:SELECT * FROM 'UserInfo' WHERE id = ?",
           "attributes": {
-            "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+            "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
             "sql.rowsCount": 1,
           },
           "children": [
@@ -281,7 +281,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
               "_name": "sql-in-memory-select",
               "attributes": {
                 "sql.cached": false,
-                "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+                "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                 "sql.rowsCount": 1,
               },
             },
@@ -311,16 +311,16 @@ exports[`useRow > otel > should update the data based on component key > strictM
               ],
             },
             {
-              "_name": "LiveStore:useQuery:sql(rowQuery:query:UserInfo:u1)",
+              "_name": "LiveStore:useQuery:db(row:UserInfo:u1)",
               "attributes": {
-                "label": "sql(rowQuery:query:UserInfo:u1)",
+                "label": "db(row:UserInfo:u1)",
                 "stackInfo": "{"frames":[{"name":"renderHook.wrapper","filePath":"__REPLACED_FOR_SNAPSHOT__"},{"name":"useRow","filePath":"__REPLACED_FOR_SNAPSHOT__"}]}",
               },
               "children": [
                 {
-                  "_name": "sql:select * from UserInfo where id = 'u1' limit 1",
+                  "_name": "db:SELECT * FROM 'UserInfo' WHERE id = ?",
                   "attributes": {
-                    "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+                    "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                     "sql.rowsCount": 1,
                   },
                   "children": [
@@ -328,7 +328,7 @@ exports[`useRow > otel > should update the data based on component key > strictM
                       "_name": "sql-in-memory-select",
                       "attributes": {
                         "sql.cached": false,
-                        "sql.query": "select * from UserInfo where id = 'u1' limit 1",
+                        "sql.query": "SELECT * FROM 'UserInfo' WHERE id = ?",
                         "sql.rowsCount": 1,
                       },
                     },
@@ -337,15 +337,15 @@ exports[`useRow > otel > should update the data based on component key > strictM
                 {
                   "_name": "LiveStore.subscribe",
                   "attributes": {
-                    "label": "sql(rowQuery:query:UserInfo:u1)",
-                    "queryLabel": "sql(rowQuery:query:UserInfo:u1)",
+                    "label": "db(row:UserInfo:u1)",
+                    "queryLabel": "db(row:UserInfo:u1)",
                   },
                 },
                 {
                   "_name": "LiveStore.subscribe",
                   "attributes": {
-                    "label": "sql(rowQuery:query:UserInfo:u1)",
-                    "queryLabel": "sql(rowQuery:query:UserInfo:u1)",
+                    "label": "db(row:UserInfo:u1)",
+                    "queryLabel": "db(row:UserInfo:u1)",
                   },
                 },
               ],

package/src/useAtom.ts

@@ -1,5 +1,6 @@
-import { type QueryInfoCol, type QueryInfoRow } from '@livestore/common'
+import type { DerivedMutationHelperFns, QueryInfo } from '@livestore/common'
 import type { DbSchema } from '@livestore/common/schema'
+import type { SqliteDsl } from '@livestore/db-schema'
 import type { LiveQuery } from '@livestore/livestore'
 import React from 'react'
 
@@ -8,12 +9,8 @@ import { useQueryRef } from './useQuery.js'
 import type { Dispatch, SetStateAction } from './useRow.js'
 
 export const useAtom = <
-  TQuery extends LiveQuery<any, QueryInfoRow<TTableDef> | QueryInfoCol<TTableDef, any>>,
-  TTableDef extends DbSchema.TableDef<
-    DbSchema.DefaultSqliteTableDefConstrained,
-    boolean,
-    DbSchema.TableOptions & { deriveMutations: { enabled: true } }
-  >,
+  // TODO also support colJsonValue
+  TQuery extends LiveQuery<any, QueryInfo.Row | QueryInfo.Col>,
 >(
   query$: TQuery,
 ): [value: TQuery['__result!'], setValue: Dispatch<SetStateAction<Partial<TQuery['__result!']>>>] => {
@@ -25,23 +22,23 @@ export const useAtom = <
   const setValue = React.useMemo<Dispatch<SetStateAction<TQuery['__result!']>>>(() => {
     return (newValueOrFn: any) => {
       const newValue = typeof newValueOrFn === 'function' ? newValueOrFn(query$Ref.current) : newValueOrFn
+      const table = query$.queryInfo.table as DbSchema.TableDef &
+        DerivedMutationHelperFns<SqliteDsl.Columns, DbSchema.TableOptions>
 
       if (query$.queryInfo._tag === 'Row') {
-        if (query$.queryInfo.table.options.isSingleton && query$.queryInfo.table.isSingleColumn) {
-          store.mutate(query$.queryInfo.table.update(newValue))
-        } else if (query$.queryInfo.table.options.isSingleColumn) {
-          store.mutate(
-            query$.queryInfo.table.update({ where: { id: query$.queryInfo.id }, values: { value: newValue } }),
-          )
+        if (table.options.isSingleton && table.options.isSingleColumn) {
+          store.mutate(table.update(newValue))
+        } else if (table.options.isSingleColumn) {
+          store.mutate(table.update({ where: { id: query$.queryInfo.id }, values: { value: newValue } }))
         } else {
-          store.mutate(query$.queryInfo.table.update({ where: { id: query$.queryInfo.id }, values: newValue }))
+          store.mutate(table.update({ where: { id: query$.queryInfo.id }, values: newValue }))
         }
       } else {
-        if (query$.queryInfo.table.options.isSingleton && query$.queryInfo.table.isSingleColumn) {
-          store.mutate(query$.queryInfo.table.update({ [query$.queryInfo.column]: newValue }))
+        if (table.options.isSingleton && table.options.isSingleColumn) {
+          store.mutate(table.update({ [query$.queryInfo.column]: newValue }))
         } else {
           store.mutate(
-            query$.queryInfo.table.update({
+            table.update({
               where: { id: query$.queryInfo.id },
               values: { [query$.queryInfo.column]: newValue },
             }),

package/src/useQuery.test.tsx

@@ -1,4 +1,4 @@
-import { querySQL } from '@livestore/livestore'
+import { queryDb } from '@livestore/livestore'
 import { Effect, Schema } from '@livestore/utils/effect'
 import { renderHook } from '@testing-library/react'
 import React from 'react'
@@ -14,7 +14,7 @@ describe('useQuery', () => {
 
       const renderCount = makeRenderCount()
 
-      const allTodos$ = querySQL(`select * from todos`, { schema: Schema.Array(tables.todos.schema) })
+      const allTodos$ = queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.schema) })
 
       const { result } = renderHook(
         () => {
@@ -41,14 +41,14 @@ describe('useQuery', () => {
 
       const renderCount = makeRenderCount()
 
-      const todo1$ = querySQL(`select * from todos where id = 't1'`, {
-        label: 'libraryTracksView1',
-        schema: Schema.Array(tables.todos.schema),
-      })
-      const todo2$ = querySQL(`select * from todos where id = 't2'`, {
-        label: 'libraryTracksView2',
-        schema: Schema.Array(tables.todos.schema),
-      })
+      const todo1$ = queryDb(
+        { query: `select * from todos where id = 't1'`, schema: Schema.Array(tables.todos.schema) },
+        { label: 'libraryTracksView1' },
+      )
+      const todo2$ = queryDb(
+        { query: `select * from todos where id = 't2'`, schema: Schema.Array(tables.todos.schema) },
+        { label: 'libraryTracksView2' },
+      )
 
       store.mutate(
         todos.insert({ id: 't1', text: 'buy milk', completed: false }),

package/src/useQuery.ts

@@ -101,6 +101,10 @@ Stack trace:
   React.useEffect(() => {
     query$.activeSubscriptions.add(stackInfo)
 
+    // Dynamic queries only set their actual label after they've been run the first time,
+    // so we're also updating the span name here.
+    span.updateName(`LiveStore:useQuery:${query$.label}`)
+
     return store.subscribe(
       query$,
       (newValue) => {

package/src/useRow.test.tsx

@@ -121,11 +121,10 @@ describe('useRow', () => {
         useGlobalReactivityGraph: false,
       })
 
-      const allTodos$ = LiveStore.querySQL(`select * from todos`, {
-        label: 'allTodos',
-        schema: Schema.Array(tables.todos.schema),
-        reactivityGraph,
-      })
+      const allTodos$ = LiveStore.queryDb(
+        { query: `select * from todos`, schema: Schema.Array(tables.todos.schema) },
+        { label: 'allTodos', reactivityGraph },
+      )
 
       const appRouterRenderCount = makeRenderCount()
       let globalSetState: LiveStoreReact.StateSetters<typeof AppRouterSchema> | undefined
@@ -223,13 +222,12 @@ describe('useRow', () => {
           const [_row, _setRow, rowState$] = LiveStoreReact.useRow(AppComponentSchema, userId, { reactivityGraph })
           const todos = LiveStoreReact.useScopedQuery(
             () =>
-              LiveStore.querySQL(
-                (get) => LiveStore.sql`select * from todos where text like '%${get(rowState$).text}%'`,
-                {
+              LiveStore.queryDb(
+                (get) => ({
+                  query: LiveStore.sql`select * from todos where text like '%${get(rowState$).text}%'`,
                   schema: Schema.Array(tables.todos.schema),
-                  reactivityGraph,
-                  label: 'todosFiltered',
-                },
+                }),
+                { reactivityGraph, label: 'todosFiltered' },
               ),
             userId,
           )

package/src/useRow.ts

@@ -1,9 +1,9 @@
-import type { QueryInfo } from '@livestore/common'
+import type { QueryInfo, RowQuery } from '@livestore/common'
 import { SessionIdSymbol } from '@livestore/common'
 import { DbSchema } from '@livestore/common/schema'
 import type { SqliteDsl } from '@livestore/db-schema'
-import type { LiveQuery, ReactivityGraph, RowResult } from '@livestore/livestore'
-import { rowQuery } from '@livestore/livestore'
+import type { LiveQuery, ReactivityGraph } from '@livestore/livestore'
+import { queryDb } from '@livestore/livestore'
 import { shouldNeverHappen } from '@livestore/utils'
 import { ReadonlyRecord } from '@livestore/utils/effect'
 import React from 'react'
@@ -12,16 +12,12 @@ import { useStore } from './LiveStoreContext.js'
 import { useQueryRef } from './useQuery.js'
 import { useMakeScopedQuery } from './useScopedQuery.js'
 
-export type UseRowResult<TTableDef extends DbSchema.TableDef> = [
-  row: RowResult<TTableDef>,
+export type UseRowResult<TTableDef extends DbSchema.TableDefBase> = [
+  row: RowQuery.Result<TTableDef>,
   setRow: StateSetters<TTableDef>,
-  query$: LiveQuery<RowResult<TTableDef>, QueryInfo>,
+  query$: LiveQuery<RowQuery.Result<TTableDef>, QueryInfo>,
 ]
 
-export type UseRowOptionsDefaulValues<TTableDef extends DbSchema.TableDef> = {
-  defaultValues?: Partial<RowResult<TTableDef>>
-}
-
 export type UseRowOptionsBase = {
   reactivityGraph?: ReactivityGraph
 }
@@ -39,7 +35,6 @@ export const useRow: {
   <
     TTableDef extends DbSchema.TableDef<
       DbSchema.DefaultSqliteTableDef,
-      boolean,
       DbSchema.TableOptions & { isSingleton: true; deriveMutations: { enabled: true } }
     >,
   >(
@@ -49,31 +44,44 @@ export const useRow: {
   <
     TTableDef extends DbSchema.TableDef<
       DbSchema.DefaultSqliteTableDef,
-      boolean,
+      DbSchema.TableOptions & {
+        isSingleton: false
+        requiredInsertColumnNames: 'id'
+        deriveMutations: { enabled: true }
+      }
+    >,
+  >(
+    table: TTableDef,
+    // TODO adjust so it works with arbitrary primary keys or unique constraints
+    id: string | SessionIdSymbol,
+    options?: UseRowOptionsBase & Partial<RowQuery.RequiredColumnsOptions<TTableDef>>,
+  ): UseRowResult<TTableDef>
+  <
+    TTableDef extends DbSchema.TableDef<
+      DbSchema.DefaultSqliteTableDef,
       DbSchema.TableOptions & { isSingleton: false; deriveMutations: { enabled: true } }
     >,
   >(
     table: TTableDef,
     // TODO adjust so it works with arbitrary primary keys or unique constraints
     id: string | SessionIdSymbol,
-    options?: UseRowOptionsBase & UseRowOptionsDefaulValues<TTableDef>,
+    options: UseRowOptionsBase & RowQuery.RequiredColumnsOptions<TTableDef>,
   ): UseRowResult<TTableDef>
 } = <
   TTableDef extends DbSchema.TableDef<
     DbSchema.DefaultSqliteTableDefConstrained,
-    boolean,
     DbSchema.TableOptions & { deriveMutations: { enabled: true } }
   >,
 >(
   table: TTableDef,
   idOrOptions?: string | SessionIdSymbol | UseRowOptionsBase,
-  options_?: UseRowOptionsBase & UseRowOptionsDefaulValues<TTableDef>,
+  options_?: UseRowOptionsBase & Partial<RowQuery.RequiredColumnsOptions<TTableDef>>,
 ): UseRowResult<TTableDef> => {
   const sqliteTableDef = table.sqliteDef
   const id = typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? idOrOptions : undefined
-  const options: (UseRowOptionsBase & UseRowOptionsDefaulValues<TTableDef>) | undefined =
+  const options: (UseRowOptionsBase & Partial<RowQuery.RequiredColumnsOptions<TTableDef>>) | undefined =
     typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? options_ : idOrOptions
-  const { defaultValues, reactivityGraph } = options ?? {}
+  const { insertValues, reactivityGraph } = options ?? {}
 
   type TComponentState = SqliteDsl.FromColumns.RowDecoded<TTableDef['sqliteDef']['columns']>
 
@@ -95,16 +103,14 @@ export const useRow: {
   // console.debug('useRow', tableName, id)
 
   const idStr = id === SessionIdSymbol ? 'session' : id
+  const rowQuery = table.query.row as any
 
+  type Query$ = LiveQuery<RowQuery.Result<TTableDef>, QueryInfo.Row>
   const { query$, otelContext } = useMakeScopedQuery(
     (otelContext) =>
       DbSchema.tableIsSingleton(table)
-        ? (rowQuery(table, { otelContext, reactivityGraph }) as LiveQuery<RowResult<TTableDef>, QueryInfo>)
-        : (rowQuery(table as TTableDef & { options: { isSingleton: false } }, id!, {
-            otelContext,
-            defaultValues: defaultValues!,
-            reactivityGraph,
-          }) as any as LiveQuery<RowResult<TTableDef>, QueryInfo>),
+        ? (queryDb(rowQuery(), { reactivityGraph, otelContext }) as any as Query$)
+        : (queryDb(rowQuery(id!, { insertValues: insertValues! }), { reactivityGraph, otelContext }) as any as Query$),
     [idStr!, tableName],
     {
       otel: {
@@ -114,11 +120,11 @@ export const useRow: {
     },
   )
 
-  const query$Ref = useQueryRef(query$, otelContext) as React.MutableRefObject<RowResult<TTableDef>>
+  const query$Ref = useQueryRef(query$, otelContext) as React.MutableRefObject<RowQuery.Result<TTableDef>>
 
   const setState = React.useMemo<StateSetters<TTableDef>>(() => {
-    if (table.isSingleColumn) {
-      return (newValueOrFn: RowResult<TTableDef>) => {
+    if (table.options.isSingleColumn) {
+      return (newValueOrFn: RowQuery.Result<TTableDef>) => {
         const newValue = typeof newValueOrFn === 'function' ? newValueOrFn(query$Ref.current) : newValueOrFn
         if (query$Ref.current === newValue) return
 
@@ -173,10 +179,10 @@ export const useRow: {
 export type Dispatch<A> = (action: A) => void
 export type SetStateAction<S> = S | ((previousValue: S) => S)
 
-export type StateSetters<TTableDef extends DbSchema.TableDef> = TTableDef['isSingleColumn'] extends true
-  ? Dispatch<SetStateAction<RowResult<TTableDef>>>
+export type StateSetters<TTableDef extends DbSchema.TableDefBase> = TTableDef['options']['isSingleColumn'] extends true
+  ? Dispatch<SetStateAction<RowQuery.Result<TTableDef>>>
   : {
-      [K in keyof RowResult<TTableDef>]: Dispatch<SetStateAction<RowResult<TTableDef>[K]>>
+      [K in keyof RowQuery.Result<TTableDef>]: Dispatch<SetStateAction<RowQuery.Result<TTableDef>[K]>>
     } & {
-      setMany: Dispatch<SetStateAction<Partial<RowResult<TTableDef>>>>
+      setMany: Dispatch<SetStateAction<Partial<RowQuery.Result<TTableDef>>>>
     }

package/src/useScopedQuery.test.tsx

@@ -1,5 +1,5 @@
 import * as LiveStore from '@livestore/livestore'
-import { querySQL } from '@livestore/livestore'
+import { queryDb } from '@livestore/livestore'
 import { Effect, Schema } from '@livestore/utils/effect'
 import { render, renderHook } from '@testing-library/react'
 import React from 'react'
@@ -29,7 +29,8 @@ describe('useScopedQuery', () => {
           renderCount.inc()
 
           return LiveStoreReact.useScopedQuery(() => {
-            const query$ = querySQL(`select * from todos where id = '${id}'`, {
+            const query$ = queryDb({
+              query: `select * from todos where id = '${id}'`,
               schema: Schema.Array(tables.todos.schema),
             })
             queryMap.set(id, query$)

package/dist/useTemporaryQuery.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=useTemporaryQuery.test.d.ts.map

package/dist/useTemporaryQuery.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useTemporaryQuery.test.d.ts","sourceRoot":"","sources":["../src/useTemporaryQuery.test.tsx"],"names":[],"mappings":""}

package/dist/useTemporaryQuery.test.js

@@ -1,59 +0,0 @@
-import * as LiveStore from '@livestore/livestore';
-import { querySQL } from '@livestore/livestore';
-import { Effect, Schema } from '@livestore/utils/effect';
-import { render, renderHook } from '@testing-library/react';
-import React from 'react';
-// @ts-expect-error no types
-import * as ReactWindow from 'react-window';
-import { describe, expect, it } from 'vitest';
-import { makeTodoMvcReact, tables, todos } from './__tests__/fixture.js';
-import * as LiveStoreReact from './mod.js';
-describe('useTemporaryQuery', () => {
-    it('simple', () => Effect.gen(function* () {
-        const { wrapper, store, makeRenderCount } = yield* makeTodoMvcReact();
-        const renderCount = makeRenderCount();
-        store.mutate(todos.insert({ id: 't1', text: 'buy milk', completed: false }), todos.insert({ id: 't2', text: 'buy bread', completed: false }));
-        const queryMap = new Map();
-        const { rerender, result, unmount } = renderHook((id) => {
-            renderCount.inc();
-            return LiveStoreReact.useTemporaryQuery(() => {
-                const query$ = querySQL(`select * from todos where id = '${id}'`, {
-                    schema: Schema.Array(tables.todos.schema),
-                });
-                queryMap.set(id, query$);
-                return query$;
-            }, id);
-        }, { wrapper, initialProps: 't1' });
-        expect(result.current.length).toBe(1);
-        expect(result.current[0].text).toBe('buy milk');
-        expect(renderCount.val).toBe(1);
-        expect(queryMap.get('t1').runs).toBe(1);
-        rerender('t2');
-        expect(result.current.length).toBe(1);
-        expect(result.current[0].text).toBe('buy bread');
-        expect(renderCount.val).toBe(2);
-        expect(queryMap.get('t1').runs).toBe(1);
-        expect(queryMap.get('t2').runs).toBe(1);
-        unmount();
-        expect(queryMap.get('t2').runs).toBe(1);
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
-    // NOTE this test covers some special react lifecyle paths which I couldn't easily reproduce without react-window
-    // it basically causes a "query swap" in the `useMemo` and both a `useEffect` cleanup call.
-    // To handle this properly we introduced the `_tag: 'destroyed'` state in the `spanAlreadyStartedCache`.
-    it('should work for a list with react-window', () => Effect.gen(function* () {
-        const { wrapper } = yield* makeTodoMvcReact();
-        const ListWrapper = ({ numItems }) => {
-            return (React.createElement(ReactWindow.FixedSizeList, { height: 100, width: 100, itemSize: 10, itemCount: numItems, itemData: Array.from({ length: numItems }, (_, i) => i).reverse() }, ListItem));
-        };
-        const ListItem = ({ data: ids, index }) => {
-            const id = ids[index];
-            const res = LiveStoreReact.useTemporaryQuery(() => LiveStore.computed(() => id, { label: `ListItem.${id}` }), id);
-            return React.createElement("div", { role: "listitem" }, res);
-        };
-        const renderResult = render(React.createElement(ListWrapper, { numItems: 1 }), { wrapper });
-        expect(renderResult.container.textContent).toBe('0');
-        renderResult.rerender(React.createElement(ListWrapper, { numItems: 2 }));
-        expect(renderResult.container.textContent).toBe('10');
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
-});
-//# sourceMappingURL=useTemporaryQuery.test.js.map

package/dist/useTemporaryQuery.test.js.map

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