@livestore/solid 0.4.0 → 0.5.0-dev.0

package/dist/useStore.server.test.jsx.map

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

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@livestore/solid",
-  "version": "0.4.0",
+  "version": "0.5.0-dev.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/livestorejs/livestore.git"
+    "url": "git+https://github.com/livestorejs/livestore-contrib.git"
   },
   "files": [
     "dist",
@@ -20,63 +20,53 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "1.9.0",
-    "@livestore/framework-toolkit": "^0.4.0",
-    "@livestore/utils": "^0.4.0",
-    "@livestore/common": "^0.4.0",
-    "@livestore/livestore": "^0.4.0"
+    "@livestore/common": "0.5.0-dev.0",
+    "@livestore/framework-toolkit": "0.5.0-dev.0",
+    "@livestore/livestore": "0.5.0-dev.0",
+    "@livestore/utils": "0.5.0-dev.0",
+    "@opentelemetry/api": "1.9.0"
   },
   "devDependencies": {
+    "@livestore/adapter-web": "0.5.0-dev.0",
+    "@livestore/utils-dev": "0.5.0-dev.0",
     "@opentelemetry/sdk-trace-base": "2.2.0",
     "@solidjs/testing-library": "0.8.10",
     "@testing-library/jest-dom": "6.6.3",
     "jsdom": "26.1.0",
     "solid-js": "1.9.10",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "vite": "7.3.1",
     "vite-plugin-solid": "2.11.10",
-    "vitest": "3.2.4",
-    "@livestore/adapter-web": "^0.4.0",
-    "@livestore/utils-dev": "^0.4.0"
+    "vitest": "4.1.9"
   },
   "peerDependencies": {
-    "@effect/ai": "^0.35.0",
-    "@effect/cli": "^0.75.1",
-    "@effect/cluster": "^0.58.2",
-    "@effect/experimental": "^0.60.0",
-    "@effect/opentelemetry": "^0.63.0",
-    "@effect/platform": "^0.96.1",
-    "@effect/platform-browser": "^0.76.0",
-    "@effect/platform-bun": "^0.89.0",
-    "@effect/platform-node": "^0.106.0",
-    "@effect/printer": "^0.49.0",
-    "@effect/printer-ansi": "^0.49.0",
-    "@effect/rpc": "^0.75.1",
-    "@effect/sql": "^0.51.1",
-    "@effect/typeclass": "^0.40.0",
-    "@effect/vitest": "^0.29.0",
+    "@effect/opentelemetry": "^4.0.0-rc.111",
+    "@effect/platform-browser": "^4.0.0-rc.111",
+    "@effect/platform-bun": "^4.0.0-rc.111",
+    "@effect/platform-node": "^4.0.0-rc.111",
+    "@effect/platform-node-shared": "^4.0.0-rc.111",
+    "@effect/vitest": "^4.0.0-rc.111",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
     "@standard-schema/spec": "^1.1.0",
-    "effect": "^3.21.2",
+    "effect": "^4.0.0-rc.111",
     "solid-js": "^1.9.10"
   },
   "$genie": {
     "source": "package.json.genie.ts",
     "warning": "DO NOT EDIT - changes will be overwritten",
     "workspaceClosureDirs": [
-      "packages/@livestore/adapter-web",
-      "packages/@livestore/common",
-      "packages/@livestore/common-cf",
-      "packages/@livestore/devtools-web-common",
-      "packages/@livestore/framework-toolkit",
-      "packages/@livestore/livestore",
       "packages/@livestore/solid",
-      "packages/@livestore/sqlite-wasm",
-      "packages/@livestore/utils",
-      "packages/@livestore/utils-dev",
-      "packages/@livestore/wa-sqlite",
-      "packages/@livestore/webmesh"
+      "repos/livestore/packages/@livestore/adapter-web",
+      "repos/livestore/packages/@livestore/common",
+      "repos/livestore/packages/@livestore/common-cf",
+      "repos/livestore/packages/@livestore/framework-toolkit",
+      "repos/livestore/packages/@livestore/livestore",
+      "repos/livestore/packages/@livestore/sqlite-wasm",
+      "repos/livestore/packages/@livestore/utils",
+      "repos/livestore/packages/@livestore/utils-dev",
+      "repos/livestore/packages/@livestore/wa-sqlite",
+      "repos/livestore/packages/@livestore/webmesh"
     ]
   },
   "scripts": {

package/src/StoreRegistryContext.tsx

@@ -1,6 +1,5 @@
-import * as Solid from 'solid-js'
-
 import type { StoreRegistry } from '@livestore/livestore'
+import * as Solid from 'solid-js'
 
 export const StoreRegistryContext = Solid.createContext<StoreRegistry | undefined>(undefined)
 

package/src/__tests__/fixture.tsx

@@ -1,5 +1,3 @@
-import type * as Solid from 'solid-js'
-
 import type { UnknownError } from '@livestore/common'
 import {
   type AppState,
@@ -14,12 +12,13 @@ import {
 import type { Store } from '@livestore/livestore'
 import { StoreInternalsSymbol } from '@livestore/livestore'
 import { Effect, type Scope } from '@livestore/utils/effect'
+import type * as Solid from 'solid-js'
 
 import * as LiveStoreSolid from '../mod.ts'
 
-// Re-export shared types, schema, and StoreInternalsSymbol for tests
-export { events, schema, StoreInternalsSymbol, tables }
 export type { AppState, Filter, Todo }
+// Re-export shared types, schema, and StoreInternalsSymbol for tests
+export { events, StoreInternalsSymbol, schema, tables }
 
 export const makeTodoMvcSolid = (
   opts: CreateTodoMvcStoreOptions = {},

package/src/experimental/components/LiveList.tsx

@@ -1,8 +1,7 @@
-import type { Accessor, JSX } from 'solid-js'
-import * as Solid from 'solid-js'
-
 import type { LiveQueryDef, Store } from '@livestore/livestore'
 import { computed } from '@livestore/livestore'
+import type { Accessor, JSX } from 'solid-js'
+import * as Solid from 'solid-js'
 
 import { useQuery } from '../../useQuery.ts'
 

package/src/useClientDocument.client.test.tsx

@@ -16,7 +16,7 @@ import type * as LiveStoreSolid from './mod.ts'
 
 // NOTE running tests concurrently doesn't work with the default global db graph
 Vitest.describe('useClientDocument', () => {
-  Vitest.scopedLive('should update the data based on component key', () =>
+  Vitest.live('should update the data based on component key', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -45,7 +45,7 @@ Vitest.describe('useClientDocument', () => {
 
   // TODO add a test that makes sure Solid doesn't re-render when a setter is used to set the same value
 
-  Vitest.scopedLive('should update the data reactively - via setState', () =>
+  Vitest.live('should update the data reactively - via setState', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -67,7 +67,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('should update the data reactively - via raw store commit', () =>
+  Vitest.live('should update the data reactively - via raw store commit', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -89,7 +89,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('should work for a larger app', () =>
+  Vitest.live('should work for a larger app', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -160,7 +160,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('should work for a useClientDocument query chained with a useTemporary query', () =>
+  Vitest.live('should work for a useClientDocument query chained with a useTemporary query', () =>
     Effect.gen(function* () {
       const { store, wrapper } = yield* makeTodoMvcSolid({})
 
@@ -201,7 +201,7 @@ Vitest.describe('useClientDocument', () => {
     }),
   )
 
-  Vitest.scopedLive('kv client document overwrites value (Schema.Any, no partial merge)', () =>
+  Vitest.live('kv client document overwrites value (Schema.Any, no partial merge)', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 

package/src/useClientDocument.server.test.tsx

@@ -3,12 +3,11 @@
  * These tests run in node environment with SSR JSX transform using renderToString.
  */
 
-import { isServer, renderToString } from 'solid-js/web'
-import { describe, expect, it } from 'vitest'
-
 import { provideOtel } from '@livestore/common'
 import * as LiveStore from '@livestore/livestore'
 import { Effect, Schema } from '@livestore/utils/effect'
+import { isServer, renderToString } from 'solid-js/web'
+import { describe, expect, it } from 'vitest'
 
 import { events, makeTodoMvcSolid, tables } from './__tests__/fixture.tsx'
 

package/src/useClientDocument.ts

@@ -1,11 +1,10 @@
-import * as Solid from 'solid-js'
-
 import type { RowQuery } from '@livestore/common'
 import { SessionIdSymbol } from '@livestore/common'
 import { State } from '@livestore/common/schema'
 import { removeUndefinedValues, type StateSetters, validateTableOptions } from '@livestore/framework-toolkit'
 import type { LiveQuery, LiveQueryDef, Store } from '@livestore/livestore'
 import { queryDb } from '@livestore/livestore'
+import * as Solid from 'solid-js'
 
 import { useQueryRef } from './useQuery.ts'
 import { type AccessorMaybe, resolve } from './utils.ts'

package/src/useQuery.client.test.tsx

@@ -31,7 +31,7 @@ Vitest.describe('useQuery', () => {
     RG.__resetIds()
   })
 
-  Vitest.scopedLive('simple', () =>
+  Vitest.live('simple', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -55,7 +55,7 @@ Vitest.describe('useQuery', () => {
     }),
   )
 
-  Vitest.scopedLive('same `useQuery` hook invoked with different queries', () =>
+  Vitest.live('same `useQuery` hook invoked with different queries', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -104,7 +104,7 @@ Vitest.describe('useQuery', () => {
     }),
   )
 
-  Vitest.scopedLive('filtered dependency query', () =>
+  Vitest.live('filtered dependency query', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -141,7 +141,7 @@ Vitest.describe('useQuery', () => {
     }),
   )
 
-  Vitest.scopedLive('should work for a dynamic list with query swapping', () =>
+  Vitest.live('should work for a dynamic list with query swapping', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -177,7 +177,7 @@ Vitest.describe('useQuery', () => {
   // NOTE: This test covers special Solid lifecycle patterns similar to react-window
   // It causes query swapping in reactive computations and cleanup calls
   // This tests the `_tag: 'destroyed'` state in the `spanAlreadyStartedCache`
-  Vitest.scopedLive('should work for a virtualized list with @solid-primitives/virtual', () =>
+  Vitest.live('should work for a virtualized list with @solid-primitives/virtual', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -228,7 +228,7 @@ Vitest.describe('useQuery', () => {
     }),
   )
 
-  Vitest.scopedLive('should work with signal', () =>
+  Vitest.live('should work with signal', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
       const num$ = signal(0)
@@ -243,7 +243,7 @@ Vitest.describe('useQuery', () => {
     }),
   )
 
-  Vitest.scopedLive('supports query builders directly', () =>
+  Vitest.live('supports query builders directly', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 
@@ -266,7 +266,7 @@ Vitest.describe('useQuery', () => {
     }),
   )
 
-  Vitest.scopedLive('union of different result types with useQuery', () =>
+  Vitest.live('union of different result types with useQuery', () =>
     Effect.gen(function* () {
       const { wrapper, store } = yield* makeTodoMvcSolid({})
 

package/src/useQuery.server.test.tsx

@@ -3,12 +3,11 @@
  * These tests run in node environment with SSR JSX transform using renderToString.
  */
 
-import { isServer, renderToString } from 'solid-js/web'
-import { describe, expect, it } from 'vitest'
-
 import { provideOtel } from '@livestore/common'
 import { queryDb, signal } from '@livestore/livestore'
 import { Effect, Schema } from '@livestore/utils/effect'
+import { isServer, renderToString } from 'solid-js/web'
+import { describe, expect, it } from 'vitest'
 
 import { events, makeTodoMvcSolid, tables } from './__tests__/fixture.tsx'
 

package/src/useQuery.ts

@@ -1,6 +1,3 @@
-import type * as otel from '@opentelemetry/api'
-import * as Solid from 'solid-js'
-
 import {
   captureStackInfo,
   computeRcRefKey,
@@ -12,6 +9,8 @@ import {
 import type { LiveQuery, Queryable, Store } from '@livestore/livestore'
 import type { LiveQueries } from '@livestore/livestore/internal'
 import { deepEqual } from '@livestore/utils'
+import type * as otel from '@opentelemetry/api'
+import * as Solid from 'solid-js'
 
 import { type AccessorMaybe, resolve } from './utils.ts'
 

package/src/useStore.server.test.tsx

@@ -3,13 +3,12 @@
  * These tests run in node environment with SSR JSX transform using renderToString.
  */
 
-import { isServer, renderToString } from 'solid-js/web'
-import { describe, expect, it } from 'vitest'
-
 import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import { provideOtel } from '@livestore/common'
 import { createStore } from '@livestore/livestore'
 import { Effect } from '@livestore/utils/effect'
+import { isServer, renderToString } from 'solid-js/web'
+import { describe, expect, it } from 'vitest'
 
 import { schema, tables } from './__tests__/fixture.tsx'
 import { withSolidApi } from './useStore.ts'

package/src/useStore.ts

@@ -1,9 +1,8 @@
-import * as Solid from 'solid-js'
-
 import type { RowQuery, SessionIdSymbol } from '@livestore/common'
 import type { LiveStoreSchema, State } from '@livestore/common/schema'
 import type { Queryable, RegistryStoreOptions, Store } from '@livestore/livestore'
 import type { Schema } from '@livestore/utils/effect'
+import * as Solid from 'solid-js'
 
 import { useStoreRegistry } from './StoreRegistryContext.tsx'
 import { type UseClientDocumentResult, useClientDocument } from './useClientDocument.ts'
@@ -106,7 +105,7 @@ export type SolidApi = {
 export const useStore = <
   TSchema extends LiveStoreSchema,
   TContext = {},
-  TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue,
+  TSyncPayloadSchema extends Schema.Codec<Schema.Json, Schema.Json> = typeof Schema.Json,
 >(
   options: AccessorMaybe<RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>>,
 ): Solid.Resource<Store<TSchema, TContext>> & SolidApi => {