@livestore/react 0.0.0-snapshot-6cc3ccfc2318063f931d98d618e1345665c2f8c5 → 0.0.0-snapshot-6d428e0ce79da666fbb12cf54f67ff91732aec2b

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.d.ts

@@ -1,22 +0,0 @@
-import type { QueryInfo } from '@livestore/common';
-import type { LiveQuery } from '@livestore/livestore';
-import * as otel from '@opentelemetry/api';
-import React from 'react';
-export type DepKey = string | number | ReadonlyArray<string | number>;
-/**
- * Creates a query, subscribes and destroys it when the component unmounts.
- *
- * The `key` is used to determine whether the a new query should be created or if the existing one should be reused.
- */
-export declare const useScopedQuery: <TResult>(makeQuery: () => LiveQuery<TResult>, key: DepKey) => TResult;
-export declare const useScopedQueryRef: <TResult>(makeQuery: () => LiveQuery<TResult>, key: DepKey) => React.MutableRefObject<TResult>;
-export declare const useMakeScopedQuery: <TResult, TQueryInfo extends QueryInfo>(makeQuery: (otelContext: otel.Context) => LiveQuery<TResult, TQueryInfo>, key: DepKey, options?: {
-    otel?: {
-        spanName?: string;
-        attributes?: otel.Attributes;
-    };
-}) => {
-    query$: LiveQuery<TResult, TQueryInfo>;
-    otelContext: otel.Context;
-};
-//# sourceMappingURL=useTemporaryQuery.d.ts.map

package/dist/useTemporaryQuery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useTemporaryQuery.d.ts","sourceRoot":"","sources":["../src/useTemporaryQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAuBzB,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAAA;AAErE;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,OAAO,aAAa,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,MAAM,KAAG,OAChD,CAAA;AAE3C,eAAO,MAAM,iBAAiB,GAAI,OAAO,aAC5B,MAAM,SAAS,CAAC,OAAO,CAAC,OAC9B,MAAM,KACV,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAIhC,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,EAAE,UAAU,SAAS,SAAS,aAC3D,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,OACnE,MAAM,YACD;IACR,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;KAC7B,CAAA;CACF,KACA;IAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;CA4ErE,CAAA"}

package/dist/useTemporaryQuery.js

@@ -1,75 +0,0 @@
-import * as otel from '@opentelemetry/api';
-import React from 'react';
-import { useStore } from './LiveStoreContext.js';
-import { useQueryRef } from './useQuery.js';
-// NOTE Given `useMemo` will be called multiple times (e.g. when using React Strict mode or Fast Refresh),
-// we are using this cache to avoid starting multiple queries/spans for the same component.
-// This is somewhat against some recommended React best practices, but it should be fine in our case below.
-// Please definitely open an issue if you see or run into any problems with this approach!
-const cache = new Map();
-/**
- * Creates a query, subscribes and destroys it when the component unmounts.
- *
- * The `key` is used to determine whether the a new query should be created or if the existing one should be reused.
- */
-export const useScopedQuery = (makeQuery, key) => useScopedQueryRef(makeQuery, key).current;
-export const useScopedQueryRef = (makeQuery, key) => {
-    const { query$ } = useMakeScopedQuery(makeQuery, key);
-    return useQueryRef(query$);
-};
-export const useMakeScopedQuery = (makeQuery, key, options) => {
-    const { store } = useStore();
-    const fullKey = React.useMemo(
-    // NOTE We're using the `makeQuery` function body string to make sure the key is unique across the app
-    // TODO we should figure out whether this could cause some problems and/or if there's a better way to do this
-    () => (Array.isArray(key) ? key.join('-') : key) + '-' + store.reactivityGraph.id + '-' + makeQuery.toString(), [key, makeQuery, store.reactivityGraph.id]);
-    const fullKeyRef = React.useRef();
-    const { query$, otelContext } = React.useMemo(() => {
-        if (fullKeyRef.current !== undefined && fullKeyRef.current !== fullKey) {
-            // console.debug('fullKey changed', 'prev', fullKeyRef.current.split('-')[0]!, '-> new', fullKey.split('-')[0]!)
-            const cachedItem = cache.get(fullKeyRef.current);
-            if (cachedItem !== undefined && cachedItem._tag === 'active') {
-                cachedItem.rc--;
-                if (cachedItem.rc === 0) {
-                    // console.debug('rc=0-changed', cachedItem.query$.id, cachedItem.query$.label)
-                    cachedItem.query$.destroy();
-                    cachedItem.span.end();
-                    cache.set(fullKeyRef.current, { _tag: 'destroyed' });
-                }
-            }
-        }
-        const cachedItem = cache.get(fullKey);
-        if (cachedItem !== undefined && cachedItem._tag === 'active') {
-            // console.debug('rc++', cachedItem.query$.id, cachedItem.query$.label)
-            cachedItem.rc++;
-            return cachedItem;
-        }
-        const spanName = options?.otel?.spanName ?? `LiveStore:useScopedQuery:${key}`;
-        const span = store.otel.tracer.startSpan(spanName, { attributes: options?.otel?.attributes }, store.otel.queriesSpanContext);
-        const otelContext = otel.trace.setSpan(otel.context.active(), span);
-        const query$ = makeQuery(otelContext);
-        cache.set(fullKey, { _tag: 'active', rc: 1, query$, span, otelContext });
-        return { query$, otelContext };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [fullKey]);
-    fullKeyRef.current = fullKey;
-    React.useEffect(() => {
-        return () => {
-            const fullKey = fullKeyRef.current;
-            const cachedItem = cache.get(fullKey);
-            // NOTE in case the fullKey changed then the query was already destroyed in the useMemo above
-            if (cachedItem === undefined || cachedItem._tag === 'destroyed')
-                return;
-            // console.debug('rc--', cachedItem.query$.id, cachedItem.query$.label)
-            cachedItem.rc--;
-            if (cachedItem.rc === 0) {
-                // console.debug('rc=0', cachedItem.query$.id, cachedItem.query$.label)
-                cachedItem.query$.destroy();
-                cachedItem.span.end();
-                cache.delete(fullKey);
-            }
-        };
-    }, []);
-    return { query$, otelContext };
-};
-//# sourceMappingURL=useTemporaryQuery.js.map

package/dist/useTemporaryQuery.js.map

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