@livestore/react 0.3.0-dev.11 → 0.3.0-dev.14

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

@@ -14,7 +14,6 @@ exports[`useRow > otel > should update the data based on component key strictMod
         "sql.query": "
       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
@@ -211,7 +210,6 @@ exports[`useRow > otel > should update the data based on component key strictMod
         "sql.query": "
       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

package/src/__tests__/fixture.tsx

@@ -1,9 +1,9 @@
+import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import { provideOtel } from '@livestore/common'
 import { DbSchema, makeSchema } from '@livestore/common/schema'
 import type { LiveStoreContextRunning } from '@livestore/livestore'
 import { createStore } from '@livestore/livestore'
 import { Effect } from '@livestore/utils/effect'
-import { makeInMemoryAdapter } from '@livestore/web'
 import type * as otel from '@opentelemetry/api'
 import React from 'react'
 

package/src/useAtom.ts

@@ -1,6 +1,5 @@
 import type { DerivedMutationHelperFns, QueryInfo } from '@livestore/common'
-import type { DbSchema } from '@livestore/common/schema'
-import type { SqliteDsl } from '@livestore/db-schema'
+import type { DbSchema, SqliteDsl } from '@livestore/common/schema'
 import type { GetResult, LiveQueryDef, Store } from '@livestore/livestore'
 import { shouldNeverHappen } from '@livestore/utils'
 import React from 'react'

package/src/useRow.ts

@@ -1,7 +1,7 @@
 import type { QueryInfo, RowQuery } from '@livestore/common'
 import { SessionIdSymbol } from '@livestore/common'
+import type { SqliteDsl } from '@livestore/common/schema'
 import { DbSchema } from '@livestore/common/schema'
-import type { SqliteDsl } from '@livestore/db-schema'
 import type { LiveQuery, LiveQueryDef, Store } from '@livestore/livestore'
 import { queryDb } from '@livestore/livestore'
 import { shouldNeverHappen } from '@livestore/utils'
@@ -51,7 +51,7 @@ export const useRow: {
   >(
     table: TTableDef,
     // TODO adjust so it works with arbitrary primary keys or unique constraints
-    id: string | SessionIdSymbol,
+    id: string | SessionIdSymbol | number,
     options?: Partial<RowQuery.RequiredColumnsOptions<TTableDef>> & { store?: Store },
   ): UseRowResult<TTableDef>
 
@@ -64,7 +64,7 @@ export const useRow: {
   >(
     table: TTableDef,
     // TODO adjust so it works with arbitrary primary keys or unique constraints
-    id: string | SessionIdSymbol,
+    id: string | SessionIdSymbol | number,
     options: RowQuery.RequiredColumnsOptions<TTableDef> & { store?: Store },
   ): UseRowResult<TTableDef>
 } = <
@@ -74,13 +74,18 @@ export const useRow: {
   >,
 >(
   table: TTableDef,
-  idOrOptions?: string | SessionIdSymbol | { store?: Store },
+  idOrOptions?: string | SessionIdSymbol | number | { store?: Store },
   options_?: Partial<RowQuery.RequiredColumnsOptions<TTableDef>> & { store?: Store },
 ): UseRowResult<TTableDef> => {
   const sqliteTableDef = table.sqliteDef
-  const id = typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? idOrOptions : undefined
+  const id =
+    typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol || typeof idOrOptions === 'number'
+      ? idOrOptions
+      : undefined
   const options: (Partial<RowQuery.RequiredColumnsOptions<TTableDef>> & { store?: Store }) | undefined =
-    typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? options_ : idOrOptions
+    typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol || typeof idOrOptions === 'number'
+      ? options_
+      : idOrOptions
   const { insertValues } = options ?? {}
 
   type TComponentState = SqliteDsl.FromColumns.RowDecoded<TTableDef['sqliteDef']['columns']>
@@ -102,7 +107,7 @@ export const useRow: {
 
   // console.debug('useRow', tableName, id)
 
-  const idStr = id === SessionIdSymbol ? 'session' : id
+  const idVal = id === SessionIdSymbol ? 'session' : id
   const rowQuery = table.query.row as any
 
   type QueryDef = LiveQueryDef<RowQuery.Result<TTableDef>, QueryInfo.Row>
@@ -110,12 +115,12 @@ export const useRow: {
     () =>
       DbSchema.tableIsSingleton(table)
         ? queryDb(rowQuery(), {})
-        : queryDb(rowQuery(id!, { insertValues: insertValues! }), { deps: idStr! }),
-    [id, insertValues, rowQuery, table, idStr],
+        : queryDb(rowQuery(id!, { insertValues: insertValues! }), { deps: idVal! }),
+    [id, insertValues, rowQuery, table, idVal],
   )
 
   const queryRef = useQueryRef(queryDef, {
-    otelSpanName: `LiveStore:useRow:${tableName}${idStr === undefined ? '' : `:${idStr}`}`,
+    otelSpanName: `LiveStore:useRow:${tableName}${idVal === undefined ? '' : `:${idVal}`}`,
     store: options?.store,
   })
 

package/tsconfig.json

@@ -11,9 +11,8 @@
   },
   "include": ["./src"],
   "references": [
-    { "path": "../db-schema" },
     { "path": "../common" },
-    { "path": "../web" },
+    { "path": "../adapter-web" },
     { "path": "../livestore" },
     { "path": "../utils" }
   ]