@livestore/solid 0.4.0-dev.21 → 0.4.0-dev.23

package/dist/useClientDocument.js

@@ -0,0 +1,74 @@
+import * as Solid from 'solid-js';
+import { SessionIdSymbol } from '@livestore/common';
+import { State } from '@livestore/common/schema';
+import { removeUndefinedValues, validateTableOptions } from '@livestore/framework-toolkit';
+import { queryDb } from '@livestore/livestore';
+import { useQueryRef } from "./useQuery.js";
+import { resolve } from "./utils.js";
+/**
+ * Similar to `Solid.createSignal` but returns a tuple of `[state, setState, id, query$]` for a given table where ...
+ *
+ *   - `state` is the current value of the row (fully decoded according to the table schema)
+ *   - `setState` is a function that can be used to update the document
+ *   - `id` is the id of the document
+ *   - `query$` is a `LiveQuery` that e.g. can be used to subscribe to changes to the document
+ *
+ * `useClientDocument` only works for client-document tables:
+ *
+ * ```tsx
+ * const MyState = State.SQLite.clientDocument({
+ *   name: 'MyState',
+ *   schema: Schema.Struct({
+ *     showSidebar: Schema.Boolean,
+ *   }),
+ *   default: { id: SessionIdSymbol, value: { showSidebar: true } },
+ * })
+ *
+ * const MyComponent = () => {
+ *   const [{ showSidebar }, setState] = useClientDocument(MyState)
+ *   return (
+ *     <div onClick={() => setState({ showSidebar: !showSidebar })}>
+ *       {showSidebar ? 'Sidebar is open' : 'Sidebar is closed'}
+ *     </div>
+ *   )
+ * }
+ * ```
+ *
+ * If the table has a default id, `useClientDocument` can be called without an `id` argument. Otherwise, the `id` argument is required.
+ */
+export const useClientDocument = (table, _id, options, config) => {
+    const id = () => {
+        const id = resolve(_id);
+        return typeof id === 'string' || id === SessionIdSymbol
+            ? id
+            : resolve(table)[State.SQLite.ClientDocumentTableDefSymbol].options.default.id;
+    };
+    const serializedId = () => {
+        const _id = id();
+        return typeof _id === 'string' ? _id : config.store.sessionId;
+    };
+    Solid.createComputed(() => validateTableOptions(resolve(table)));
+    const queryDef = Solid.createMemo(() => queryDb(resolve(table).get(id(), options?.default !== undefined
+        ? {
+            default: options.default,
+        }
+        : undefined), {
+        deps: [serializedId(), resolve(table).sqliteDef.name, JSON.stringify(options?.default)],
+    }));
+    const queryRef = useQueryRef(queryDef, {
+        get otelSpanName() {
+            return `LiveStore:useClientDocument:${resolve(table).sqliteDef.name}:${serializedId()}`;
+        },
+        get store() {
+            return config.store;
+        },
+    });
+    const setState = (newValueOrFn) => {
+        const newValue = typeof newValueOrFn === 'function' ? newValueOrFn(queryRef.valueRef()) : newValueOrFn;
+        if (queryRef.valueRef() === newValue)
+            return;
+        config.store.commit(resolve(table).set(removeUndefinedValues(newValue), id()));
+    };
+    return [queryRef.valueRef, setState, serializedId, () => queryRef.queryRcRef().value];
+};
+//# sourceMappingURL=useClientDocument.js.map

package/dist/useClientDocument.js.map

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

package/dist/useClientDocument.server.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * SSR tests for useClientDocument
+ * These tests run in node environment with SSR JSX transform using renderToString.
+ */
+export {};
+//# sourceMappingURL=useClientDocument.server.test.d.ts.map

package/dist/useClientDocument.server.test.d.ts.map

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

package/dist/useClientDocument.server.test.jsx

@@ -0,0 +1,76 @@
+/**
+ * SSR tests for useClientDocument
+ * 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 { events, makeTodoMvcSolid, tables } from "./__tests__/fixture.jsx";
+describe('environment', () => {
+    it('runs on server', () => {
+        // Use 'window' in globalThis to avoid TypeScript error without DOM lib
+        expect('window' in globalThis).toBe(false);
+        expect(isServer).toBe(true);
+    });
+});
+describe('useClientDocument SSR', () => {
+    it('renders client document with default value to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            const UserDisplay = () => {
+                const [state] = store.useClientDocument(tables.userInfo, 'u1');
+                return <div>Username: {state().username || 'anonymous'}</div>;
+            };
+            const html = renderToString(() => <UserDisplay />);
+            expect(html).toContain('Username:');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+    it('renders client document with committed value to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            store.commit(events.UserInfoSet({ username: 'ssr-user' }, 'u1'));
+            const UserDisplay = () => {
+                const [state] = store.useClientDocument(tables.userInfo, 'u1');
+                return <div>Username: {state().username}</div>;
+            };
+            const html = renderToString(() => <UserDisplay />);
+            expect(html).toContain('Username:');
+            expect(html).toContain('ssr-user');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+    it('renders larger app with useClientDocument and useQuery to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            const allTodos$ = LiveStore.queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.rowSchema) }, { label: 'allTodos' });
+            store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }), events.todoCreated({ id: 't2', text: 'buy eggs', completed: true }));
+            const App = () => {
+                const [routerState] = store.useClientDocument(tables.AppRouterSchema, 'singleton');
+                const allTodos = store.useQuery(allTodos$);
+                return (<div>
+            <div>Current Task: {routerState().currentTaskId ?? 'none'}</div>
+            <div>Total Tasks: {allTodos()?.length}</div>
+          </div>);
+            };
+            const html = renderToString(() => <App />);
+            expect(html).toContain('Current Task:');
+            expect(html).toContain('none');
+            expect(html).toContain('Total Tasks:');
+            expect(html).toContain('2');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+    it('renders kv client document to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            const KVDisplay = () => {
+                const [state] = store.useClientDocument(tables.kv, 'k1');
+                return <div>Value: {JSON.stringify(state())}</div>;
+            };
+            const html = renderToString(() => <KVDisplay />);
+            expect(html).toContain('Value:');
+            expect(html).toContain('null');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+});
+//# sourceMappingURL=useClientDocument.server.test.jsx.map

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

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

package/dist/useQuery.client.test.d.ts

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

package/dist/useQuery.client.test.d.ts.map

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

package/dist/useQuery.client.test.jsx

@@ -0,0 +1,165 @@
+/** biome-ignore-all lint/a11y: test */
+import * as LiveStore from '@livestore/livestore';
+import { queryDb, signal } from '@livestore/livestore';
+import { RG } from '@livestore/livestore/internal/testing-utils';
+import { Effect, Schema } from '@livestore/utils/effect';
+import { Vitest } from '@livestore/utils-dev/node-vitest';
+import * as SolidTesting from '@solidjs/testing-library';
+import * as Solid from 'solid-js';
+import { expect } from 'vitest';
+import { events, makeTodoMvcSolid, StoreInternalsSymbol, tables } from "./__tests__/fixture.jsx";
+const makeVirtualContainerStyle = (containerHeight) => {
+    return { height: `${containerHeight}px`, overflow: 'auto' };
+};
+const makeVirtualContentStyle = (itemCount, itemHeight) => {
+    return { height: `${itemCount * itemHeight}px`, position: 'relative' };
+};
+const makeVirtualItemStyle = (index, itemHeight) => {
+    return {
+        position: 'absolute',
+        top: `${index * itemHeight}px`,
+        height: `${itemHeight}px`,
+    };
+};
+Vitest.describe('useQuery', () => {
+    Vitest.afterEach(() => {
+        RG.__resetIds();
+    });
+    Vitest.scopedLive('simple', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        const allTodos$ = queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.rowSchema) });
+        const { result } = SolidTesting.renderHook(() => {
+            return store.useQuery(allTodos$);
+        }, { wrapper });
+        expect(result()?.length).toBe(0);
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+        store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }));
+        expect(result()?.length).toBe(1);
+        expect(result()?.[0]?.text).toBe('buy milk');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+    }));
+    Vitest.scopedLive('same `useQuery` hook invoked with different queries', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        const todo1$ = queryDb({ query: `select * from todos where id = 't1'`, schema: Schema.Array(tables.todos.rowSchema) }, { label: 'libraryTracksView1' });
+        const todo2$ = queryDb({ query: `select * from todos where id = 't2'`, schema: Schema.Array(tables.todos.rowSchema) }, { label: 'libraryTracksView2' });
+        store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }), events.todoCreated({ id: 't2', text: 'buy eggs', completed: false }));
+        const [todoId, setTodoId] = Solid.createSignal('t1');
+        const { result } = SolidTesting.renderHook(() => {
+            const query = store.useQuery(() => (todoId() === 't1' ? todo1$ : todo2$));
+            return () => query()?.[0]?.text;
+        }, { wrapper });
+        expect(result()).toBe('buy milk');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot('1: after first render');
+        store.commit(events.todoUpdated({ id: 't1', text: 'buy soy milk' }));
+        expect(result()).toBe('buy soy milk');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot('2: after first commit');
+        setTodoId('t2');
+        expect(result()).toBe('buy eggs');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot('3: after forced rerender');
+    }));
+    Vitest.scopedLive('filtered dependency query', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        const filter$ = signal('t1', { label: 'id-filter' });
+        const todo$ = queryDb((get) => tables.todos.where('id', get(filter$)), { label: 'todo' });
+        store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }), events.todoCreated({ id: 't2', text: 'buy eggs', completed: false }));
+        const { result } = SolidTesting.renderHook(() => {
+            const query = store.useQuery(todo$);
+            return () => query()?.[0]?.text;
+        }, { wrapper });
+        expect(result()).toBe('buy milk');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+        store.commit(events.todoUpdated({ id: 't1', text: 'buy soy milk' }));
+        expect(result()).toBe('buy soy milk');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+        store.setSignal(filter$, 't2');
+        expect(result()).toBe('buy eggs');
+        expect(store[StoreInternalsSymbol].reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+    }));
+    Vitest.scopedLive('should work for a dynamic list with query swapping', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        const ListItem = (props) => {
+            const res = store.useQuery(() => LiveStore.computed(() => props.id, { label: `ListItem.${props.id}`, deps: props.id }));
+            return <div role="listitem">{String(res())}</div>;
+        };
+        const [numItems, setNumItems] = Solid.createSignal(1);
+        const ListWrapper = () => {
+            return (<div>
+            <Solid.For each={Array.from({ length: numItems() }, (_, i) => i).toReversed()}>
+              {(id) => <ListItem id={id}/>}
+            </Solid.For>
+          </div>);
+        };
+        const { container } = SolidTesting.render(() => <ListWrapper />, { wrapper });
+        expect(container.textContent).toBe('0');
+        setNumItems(3);
+        expect(container.textContent).toBe('210');
+    }));
+    // 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', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        // Create a signal to control the number of items
+        const [numItems, setNumItems] = Solid.createSignal(1);
+        const VirtualizedList = () => {
+            const itemData = Solid.createMemo(() => Array.from({ length: numItems() }, (_, i) => i).reverse());
+            const containerHeight = 100;
+            const itemHeight = 10;
+            const visibleCount = Math.ceil(containerHeight / itemHeight);
+            const containerStyle = makeVirtualContainerStyle(containerHeight);
+            const contentStyle = Solid.createMemo(() => makeVirtualContentStyle(itemData().length, itemHeight));
+            return (<div style={containerStyle}>
+            <div style={contentStyle()}>
+              <Solid.For each={itemData().slice(0, visibleCount + 1)}>
+                {(id, index) => <VirtualListItem id={id} index={index()} itemHeight={itemHeight}/>}
+              </Solid.For>
+            </div>
+          </div>);
+        };
+        const VirtualListItem = (props) => {
+            const res = store.useQuery(() => LiveStore.computed(() => props.id, { label: `VirtualListItem.${props.id}`, deps: props.id }));
+            const style = makeVirtualItemStyle(props.index, props.itemHeight);
+            return (<div role="listitem" style={style}>
+            {res()}
+          </div>);
+        };
+        const { container } = SolidTesting.render(() => <VirtualizedList />, { wrapper });
+        expect(container.textContent?.trim()).toBe('0');
+        // Test virtualized list update - this causes query swapping similar to react-window
+        setNumItems(3);
+        // In Solid, reactivity is synchronous, so we don't need to wait
+        expect(container.textContent?.replace(/\s+/g, '')).toBe('210');
+    }));
+    Vitest.scopedLive('should work with signal', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        const num$ = signal(0);
+        const { result } = SolidTesting.renderHook(() => store.useQuery(num$), { wrapper });
+        expect(result()).toBe(0);
+        store.setSignal(num$, 1);
+        expect(result()).toBe(1);
+    }));
+    Vitest.scopedLive('supports query builders directly', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }), events.todoCreated({ id: 't2', text: 'buy eggs', completed: true }));
+        const todosWhereIncomplete = tables.todos.where({ completed: false });
+        const { result } = SolidTesting.renderHook(() => {
+            const todos = store.useQuery(todosWhereIncomplete);
+            return () => todos()?.map((todo) => todo.id);
+        }, { wrapper });
+        expect(result()).toEqual(['t1']);
+    }));
+    Vitest.scopedLive('union of different result types with useQuery', () => Effect.gen(function* () {
+        const { wrapper, store } = yield* makeTodoMvcSolid({});
+        const str$ = signal('hello', { label: 'str' });
+        const num$ = signal(123, { label: 'num' });
+        const [useNum, setUseNum] = Solid.createSignal(false);
+        const { result } = SolidTesting.renderHook(() => {
+            const query$ = Solid.createMemo(() => (useNum() === true ? num$ : str$));
+            return store.useQuery(query$);
+        }, { wrapper });
+        expect(result()).toBe('hello');
+        setUseNum(true);
+        expect(result()).toBe(123);
+    }));
+});
+//# sourceMappingURL=useQuery.client.test.jsx.map

package/dist/useQuery.client.test.jsx.map

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

package/dist/useQuery.d.ts

@@ -0,0 +1,32 @@
+import type * as otel from '@opentelemetry/api';
+import * as Solid from 'solid-js';
+import type { LiveQuery, Queryable, Store } from '@livestore/livestore';
+import type { LiveQueries } from '@livestore/livestore/internal';
+import { type AccessorMaybe } from './utils.ts';
+/**
+ * Returns the result of a query and subscribes to future updates.
+ *
+ * Example:
+ * ```tsx
+ * const App = () => {
+ *   const todos = useQuery(queryDb(tables.todos.query.where({ complete: true })))
+ *   return <div>{todos.map((todo) => <div key={todo.id}>{todo.title}</div>)}</div>
+ * }
+ * ```
+ */
+export declare const useQuery: <TQueryable extends Queryable<any>>(queryDef: AccessorMaybe<TQueryable>, options: {
+    store: Store<any, any>;
+}) => Solid.Accessor<Queryable.Result<TQueryable>>;
+/**
+ */
+export declare const useQueryRef: <TQueryable extends Queryable<any>>(queryable: AccessorMaybe<TQueryable>, options: {
+    store: Store<any, any>;
+    /** Parent otel context for the query */
+    otelContext?: otel.Context;
+    /** The name of the span to use for the query */
+    otelSpanName?: string;
+}) => {
+    valueRef: Solid.Accessor<Queryable.Result<TQueryable>>;
+    queryRcRef: Solid.Accessor<LiveQueries.RcRef<LiveQuery<Queryable.Result<TQueryable>>>>;
+};
+//# sourceMappingURL=useQuery.d.ts.map

package/dist/useQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../src/useQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAUjC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAGhE,OAAO,EAAE,KAAK,aAAa,EAAW,MAAM,YAAY,CAAA;AAExD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,GAAI,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACxD,UAAU,aAAa,CAAC,UAAU,CAAC,EACnC,SAAS;IAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,KAClC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAA4C,CAAA;AAE1F;GACG;AACH,eAAO,MAAM,WAAW,GAAI,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EAC3D,WAAW,aAAa,CAAC,UAAU,CAAC,EACpC,SAAS;IACP,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACtB,wCAAwC;IACxC,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;IAC1B,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,KACA;IACD,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IACtD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;CAoEvF,CAAA"}

package/dist/useQuery.js

@@ -0,0 +1,64 @@
+import * as Solid from 'solid-js';
+import { captureStackInfo, computeRcRefKey, createQueryResource, normalizeQueryable, runInitialQuery, } from '@livestore/framework-toolkit';
+import { deepEqual } from '@livestore/utils';
+import { resolve } from "./utils.js";
+/**
+ * Returns the result of a query and subscribes to future updates.
+ *
+ * Example:
+ * ```tsx
+ * const App = () => {
+ *   const todos = useQuery(queryDb(tables.todos.query.where({ complete: true })))
+ *   return <div>{todos.map((todo) => <div key={todo.id}>{todo.title}</div>)}</div>
+ * }
+ * ```
+ */
+export const useQuery = (queryDef, options) => useQueryRef(queryDef, options).valueRef;
+/**
+ */
+export const useQueryRef = (queryable, options) => {
+    const normalized = Solid.createMemo(() => normalizeQueryable(resolve(queryable)));
+    const rcRefKey = Solid.createMemo(() => computeRcRefKey(options.store, normalized()));
+    const stackInfo = captureStackInfo();
+    const resource = Solid.createMemo(Solid.on(rcRefKey, () => {
+        const _normalized = normalized();
+        const { queryRcRef, span, otelContext } = createQueryResource(options.store, _normalized, stackInfo, {
+            otelSpanName: options.otelSpanName,
+            otelContext: options.otelContext,
+        });
+        const [valueRef, setValueRef] = Solid.createSignal(runInitialQuery(queryRcRef.value, otelContext, stackInfo, 'solid'));
+        queryRcRef.value.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(options.otelSpanName ?? `LiveStore:useQuery:${queryRcRef.value.label}`);
+        const cleanup = options.store.subscribe(queryRcRef.value, (newValue) => {
+            // NOTE: we return a reference to the result object within LiveStore;
+            // this implies that app code must not mutate the results, or else
+            // there may be weird reactivity bugs.
+            if (deepEqual(newValue, valueRef()) === false) {
+                setValueRef(newValue);
+            }
+        }, {
+            onUnsubsubscribe: () => {
+                queryRcRef.value.activeSubscriptions.delete(stackInfo);
+            },
+            label: queryRcRef.value.label,
+            otelContext,
+        });
+        Solid.onCleanup(() => {
+            queryRcRef.deref();
+            span.end();
+            cleanup();
+        });
+        return { valueRef, queryRcRef };
+    }));
+    return {
+        valueRef() {
+            return resource().valueRef();
+        },
+        queryRcRef() {
+            return resource().queryRcRef;
+        },
+    };
+};
+//# sourceMappingURL=useQuery.js.map

package/dist/useQuery.js.map

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

package/dist/useQuery.server.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * SSR tests for useQuery
+ * These tests run in node environment with SSR JSX transform using renderToString.
+ */
+export {};
+//# sourceMappingURL=useQuery.server.test.d.ts.map

package/dist/useQuery.server.test.d.ts.map

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

package/dist/useQuery.server.test.jsx

@@ -0,0 +1,88 @@
+/**
+ * SSR tests for useQuery
+ * 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 { events, makeTodoMvcSolid, tables } from "./__tests__/fixture.jsx";
+describe('environment', () => {
+    it('runs on server', () => {
+        // Use 'window' in globalThis to avoid TypeScript error without DOM lib
+        expect('window' in globalThis).toBe(false);
+        expect(isServer).toBe(true);
+    });
+});
+describe('useQuery SSR', () => {
+    it('renders simple query result to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            store.commit(events.todoCreated({ id: 't1', text: 'SSR Todo', completed: false }));
+            const allTodos$ = queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.rowSchema) });
+            const TodoList = () => {
+                const todos = store.useQuery(allTodos$);
+                return (<ul>
+            {todos()?.map((todo) => (<li>{todo.text}</li>))}
+          </ul>);
+            };
+            const html = renderToString(() => <TodoList />);
+            expect(html).toContain('SSR Todo');
+            expect(html).toContain('<ul');
+            expect(html).toContain('<li');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+    it('renders filtered dependency query to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            const filter$ = signal('t1', { label: 'id-filter' });
+            const todo$ = queryDb((get) => tables.todos.where('id', get(filter$)), { label: 'todo' });
+            store.commit(events.todoCreated({ id: 't1', text: 'buy milk', completed: false }), events.todoCreated({ id: 't2', text: 'buy eggs', completed: false }));
+            const TodoItem = () => {
+                const query = store.useQuery(todo$);
+                return <div>{query()?.[0]?.text ?? 'No todo'}</div>;
+            };
+            const html = renderToString(() => <TodoItem />);
+            expect(html).toContain('buy milk');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+    it('renders signal query to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            const num$ = signal(42);
+            const Counter = () => {
+                const count = store.useQuery(num$);
+                return <div>Count: {count()}</div>;
+            };
+            const html = renderToString(() => <Counter />);
+            expect(html).toContain('Count:');
+            expect(html).toContain('42');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+    it('renders multiple todos to string', async () => {
+        await Effect.gen(function* () {
+            const { store } = yield* makeTodoMvcSolid({});
+            store.commit(events.todoCreated({ id: 't1', text: 'First', completed: false }), events.todoCreated({ id: 't2', text: 'Second', completed: true }), events.todoCreated({ id: 't3', text: 'Third', completed: false }));
+            const allTodos$ = queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.rowSchema) });
+            const App = () => {
+                const todos = store.useQuery(allTodos$);
+                return (<div>
+            <h1>Todo App</h1>
+            <p>Count: {todos()?.length}</p>
+            <ul>
+              {todos()?.map((todo) => (<li>{todo.text}</li>))}
+            </ul>
+          </div>);
+            };
+            const html = renderToString(() => <App />);
+            expect(html).toContain('Todo App');
+            expect(html).toContain('Count:');
+            expect(html).toContain('3');
+            expect(html).toContain('First');
+            expect(html).toContain('Second');
+            expect(html).toContain('Third');
+        }).pipe(provideOtel({}), Effect.scoped, Effect.runPromise);
+    });
+});
+//# sourceMappingURL=useQuery.server.test.jsx.map

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

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

package/dist/useStore.client.test.d.ts

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

package/dist/useStore.client.test.d.ts.map

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