@livestore/solid 0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f → 0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230

package/dist/mod.d.ts

@@ -1,2 +1,3 @@
-export { getStore, query, row } from './store.js';
+export { getStore } from './store.js';
+export { query } from './query.js';
 //# sourceMappingURL=mod.d.ts.map

package/dist/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA"}

package/dist/mod.js

@@ -1,2 +1,3 @@
-export { getStore, query, row } from './store.js';
+export { getStore } from './store.js';
+export { query } from './query.js';
 //# sourceMappingURL=mod.js.map

package/dist/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA"}

package/dist/query.d.ts

@@ -0,0 +1,4 @@
+import type { GetResult, LiveQueryDefAny } from '@livestore/livestore';
+import * as Solid from 'solid-js';
+export declare const query: <TQuery extends LiveQueryDefAny>(queryDef: TQuery, initialValue: GetResult<TQuery>) => Solid.Accessor<GetResult<TQuery>>;
+//# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAIjC,eAAO,MAAM,KAAK,GAAI,MAAM,SAAS,eAAe,YACxC,MAAM,gBAEF,SAAS,CAAC,MAAM,CAAC,KAC9B,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAalC,CAAA"}

package/dist/query.js

@@ -0,0 +1,15 @@
+import * as Solid from 'solid-js';
+import { storeToExport } from './store.js';
+export const query = (queryDef, 
+// TODO do we actually need an `initialValue` at all?
+initialValue) => {
+    const [value, setValue] = Solid.createSignal(initialValue);
+    const store = storeToExport();
+    // TODO avoid null-optionality branching
+    const unsubscribe = store?.subscribe(queryDef, { onUpdate: setValue });
+    Solid.onCleanup(() => {
+        unsubscribe?.();
+    });
+    return value;
+};
+//# sourceMappingURL=query.js.map

package/dist/query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,QAAgB;AAChB,qDAAqD;AACrD,YAA+B,EACI,EAAE;IACrC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IAE1D,MAAM,KAAK,GAAG,aAAa,EAAE,CAAA;IAE7B,wCAAwC;IACxC,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEtE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,WAAW,EAAE,EAAE,CAAA;IACjB,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/store.d.ts

@@ -1,11 +1,5 @@
-import type { BaseGraphQLContext, CreateStoreOptions, DbSchema, GetResult, LiveQueryAny, LiveStoreSchema, RowResult, Store } from '@livestore/livestore';
-import type { Accessor } from 'solid-js';
-export declare const getStore: <Schema extends LiveStoreSchema, GraphQLContext extends BaseGraphQLContext = BaseGraphQLContext>({ adapter, schema, storeId, }: Pick<CreateStoreOptions<GraphQLContext, Schema>, "schema" | "adapter" | "storeId">) => Promise<Accessor<Store<BaseGraphQLContext, Schema> | undefined>>;
-export declare const query: <TQuery extends LiveQueryAny>(query$: TQuery, initialValue: GetResult<TQuery>) => Accessor<GetResult<TQuery>>;
-export declare const row: <TTableDef extends DbSchema.TableDef<DbSchema.DefaultSqliteTableDef, boolean, DbSchema.TableOptions & {
-    isSingleton: false;
-    deriveMutations: {
-        enabled: true;
-    };
-}>>(table: TTableDef, id: string) => Accessor<RowResult<TTableDef> | undefined>;
+import type { BaseGraphQLContext, CreateStoreOptions, LiveStoreSchema, Store } from '@livestore/livestore';
+import * as Solid from 'solid-js';
+export declare const storeToExport: Solid.Accessor<Store<BaseGraphQLContext, LiveStoreSchema> | undefined>, setStoreToExport: Solid.Setter<Store<BaseGraphQLContext, LiveStoreSchema> | undefined>;
+export declare const getStore: <Schema extends LiveStoreSchema, GraphQLContext extends BaseGraphQLContext = BaseGraphQLContext>({ adapter, schema, storeId, }: Pick<CreateStoreOptions<GraphQLContext, Schema>, "schema" | "adapter" | "storeId">) => Promise<Solid.Accessor<Store<BaseGraphQLContext, Schema> | undefined>>;
 //# sourceMappingURL=store.d.ts.map

package/dist/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAElB,kBAAkB,EAClB,QAAQ,EACR,SAAS,EACT,YAAY,EAGZ,eAAe,EACf,SAAS,EACT,KAAK,EACN,MAAM,sBAAsB,CAAA;AAG7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAwIxC,eAAO,MAAM,QAAQ,GACnB,MAAM,SAAS,eAAe,EAC9B,cAAc,SAAS,kBAAkB,sDAKxC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC,KAAG,OAAO,CAC7F,QAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAaxD,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,MAAM,SAAS,YAAY,UACvC,MAAM,gBACA,SAAS,CAAC,MAAM,CAAC,KAC9B,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAU5B,CAAA;AAED,eAAO,MAAM,GAAG,GACd,SAAS,SAAS,QAAQ,CAAC,QAAQ,CACjC,QAAQ,CAAC,qBAAqB,EAC9B,OAAO,EACP,QAAQ,CAAC,YAAY,GAAG;IAAE,WAAW,EAAE,KAAK,CAAC;IAAC,eAAe,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAA;CAAE,CACnF,SAEM,SAAS,MACZ,MAAM,KACT,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,SAAS,CAU3C,CAAA"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAElB,kBAAkB,EAGlB,eAAe,EAEf,KAAK,EACN,MAAM,sBAAsB,CAAA;AAI7B,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AA8CjC,eAAO,MAAO,aAAa,0EAAE,gBAAgB,sEAA0D,CAAA;AAsGvG,eAAO,MAAM,QAAQ,GACnB,MAAM,SAAS,eAAe,EAC9B,cAAc,SAAS,kBAAkB,sDAKxC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC,KAAG,OAAO,CAC7F,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAc9D,CAAA"}

package/dist/store.js

@@ -1,10 +1,13 @@
-import { createStore, rowQuery, StoreAbort, StoreInterrupted } from '@livestore/livestore';
-import { Effect, FiberSet, Logger, LogLevel } from '@livestore/utils/effect';
-import { createEffect, createSignal, onCleanup } from 'solid-js';
-const interrupt = (fiberSet, error) => Effect.gen(function* () {
-    yield* FiberSet.clear(fiberSet);
-    yield* FiberSet.run(fiberSet, Effect.fail(error));
-}).pipe(Effect.tapErrorCause((cause) => Effect.logDebug(`[@livestore/livestore/react] interrupting`, cause)), Effect.runFork);
+import { provideOtel } from '@livestore/common';
+import { createStore, StoreAbort, StoreInterrupted } from '@livestore/livestore';
+import { LS_DEV } from '@livestore/utils';
+import { Deferred, Effect, Exit, identity, Logger, LogLevel, Scope, TaskTracing } from '@livestore/utils/effect';
+import * as Solid from 'solid-js';
+const interrupt = (componentScope, shutdownDeferred, error) => Effect.gen(function* () {
+    // console.log('[@livestore/livestore/react] interupting', error)
+    yield* Scope.close(componentScope, Exit.fail(error));
+    yield* Deferred.fail(shutdownDeferred, error);
+}).pipe(Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/solid] interrupting', cause)), Effect.runFork);
 const semaphoreMap = new Map();
 const withSemaphore = (schemaKey) => {
     let semaphore = semaphoreMap.get(schemaKey);
@@ -16,13 +19,14 @@ const withSemaphore = (schemaKey) => {
 };
 const storeValue = {
     value: { stage: 'loading' },
-    fiberSet: undefined,
+    shutdownDeferred: undefined,
+    componentScope: undefined,
     counter: 0,
 };
-const [, setInternalStore] = createSignal(storeValue);
-const [storeToExport, setStoreToExport] = createSignal();
-const setupStore = async ({ schema, storeId, graphQLOptions, otelOptions, boot, adapter, batchUpdates, disableDevtools, reactivityGraph, signal, }) => {
-    createEffect(async () => {
+const [, setInternalStore] = Solid.createSignal(storeValue);
+export const [storeToExport, setStoreToExport] = Solid.createSignal();
+const setupStore = async ({ schema, storeId, graphQLOptions, boot, adapter, batchUpdates, disableDevtools, signal, setupDone, }) => {
+    Solid.createEffect(() => {
         const counter = storeValue.counter;
         const setContextValue = (value) => {
             if (storeValue.counter !== counter)
@@ -30,7 +34,8 @@ const setupStore = async ({ schema, storeId, graphQLOptions, otelOptions, boot,
             storeValue.value = value;
             setInternalStore({
                 value: storeValue.value,
-                fiberSet: storeValue.fiberSet,
+                shutdownDeferred: storeValue.shutdownDeferred,
+                componentScope: storeValue.componentScope,
                 counter: counter + 1,
             });
             if (value.stage === 'running') {
@@ -38,24 +43,24 @@ const setupStore = async ({ schema, storeId, graphQLOptions, otelOptions, boot,
             }
         };
         signal?.addEventListener('abort', () => {
-            if (storeValue.fiberSet !== undefined && storeValue.counter === counter) {
-                interrupt(storeValue.fiberSet, new StoreAbort());
-                storeValue.fiberSet = undefined;
+            if (storeValue.componentScope !== undefined &&
+                storeValue.shutdownDeferred !== undefined &&
+                storeValue.counter === counter) {
+                interrupt(storeValue.componentScope, storeValue.shutdownDeferred, new StoreAbort());
+                storeValue.componentScope = undefined;
+                storeValue.shutdownDeferred = undefined;
             }
         });
-        await Effect.gen(function* () {
-            const fiberSet = yield* FiberSet.make();
-            storeValue.fiberSet = fiberSet;
+        Effect.gen(function* () {
+            const componentScope = yield* Scope.make();
+            const shutdownDeferred = yield* Deferred.make();
             yield* Effect.gen(function* () {
-                const newStore = yield* createStore({
-                    fiberSet,
+                const store = yield* createStore({
                     schema,
                     storeId,
                     graphQLOptions,
-                    otelOptions,
                     boot,
                     adapter,
-                    reactivityGraph,
                     batchUpdates,
                     disableDevtools,
                     onBootStatus: (status) => {
@@ -63,46 +68,31 @@ const setupStore = async ({ schema, storeId, graphQLOptions, otelOptions, boot,
                             return;
                         setContextValue(status);
                     },
-                });
-                setContextValue({ stage: 'running', store: newStore });
-                yield* Effect.never;
-            }).pipe(Effect.scoped, FiberSet.run(fiberSet));
+                }).pipe(Effect.tapErrorCause((cause) => Deferred.failCause(shutdownDeferred, cause)));
+                setContextValue({ stage: 'running', store });
+                setupDone();
+            }).pipe(Scope.extend(componentScope), Effect.forkIn(componentScope));
             const shutdownContext = (cause) => Effect.sync(() => setContextValue({ stage: 'shutdown', cause }));
-            yield* FiberSet.join(fiberSet).pipe(Effect.catchTag('LiveStore.IntentionalShutdownCause', (cause) => shutdownContext(cause)), Effect.catchTag('LiveStore.StoreAbort', (cause) => shutdownContext(cause)), Effect.tapError((error) => Effect.sync(() => setContextValue({ stage: 'error', error }))), Effect.tapDefect((defect) => Effect.sync(() => setContextValue({ stage: 'error', error: defect }))), Effect.exit);
-        }).pipe(Effect.scoped, withSemaphore(storeId), Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: 'window' }), Effect.provide(Logger.pretty), Logger.withMinimumLogLevel(LogLevel.Debug), Effect.runPromise);
-        onCleanup(() => {
-            if (storeValue.fiberSet !== undefined) {
-                interrupt(storeValue.fiberSet, new StoreInterrupted());
-                storeValue.fiberSet = undefined;
+            yield* Deferred.await(shutdownDeferred).pipe(Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/react] shutdown', cause)), Effect.catchTag('LiveStore.IntentionalShutdownCause', (cause) => shutdownContext(cause)), Effect.catchTag('LiveStore.StoreAbort', (cause) => shutdownContext(cause)), Effect.tapError((error) => Effect.sync(() => setContextValue({ stage: 'error', error }))), Effect.tapDefect((defect) => Effect.sync(() => setContextValue({ stage: 'error', error: defect }))), Effect.exit);
+        }).pipe(Effect.scoped, withSemaphore(storeId), Effect.withSpan('@livestore/solid:setupStore'), LS_DEV ? TaskTracing.withAsyncTaggingTracing((name) => console.createTask(name)) : identity, provideOtel({}), Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: 'window' }), Effect.provide(Logger.prettyWithThread('window')), Logger.withMinimumLogLevel(LogLevel.Debug), Effect.runFork);
+        Solid.onCleanup(() => {
+            if (storeValue.componentScope !== undefined && storeValue.shutdownDeferred !== undefined) {
+                interrupt(storeValue.componentScope, storeValue.shutdownDeferred, new StoreInterrupted());
+                storeValue.componentScope = undefined;
+                storeValue.shutdownDeferred = undefined;
             }
         });
     });
 };
 export const getStore = async ({ adapter, schema, storeId, }) => {
+    const setupDone = Promise.withResolvers();
     await setupStore({
         adapter,
         schema,
         storeId,
+        setupDone: setupDone.resolve,
     });
-    while (!storeToExport()) {
-        await new Promise((resolve) => setTimeout(resolve, 100));
-    }
+    await setupDone.promise;
     return storeToExport;
 };
-export const query = (query$, initialValue) => {
-    const [value, setValue] = createSignal(initialValue);
-    const unsubscribe = storeToExport()?.subscribe(query$, setValue);
-    onCleanup(() => {
-        unsubscribe?.();
-    });
-    return value;
-};
-export const row = (table, id) => {
-    const [value, setValue] = createSignal();
-    const unsubscribe = rowQuery(table, id).subscribe(setValue);
-    onCleanup(() => {
-        unsubscribe?.();
-    });
-    return value;
-};
 //# sourceMappingURL=store.js.map

package/dist/store.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/solid",
-  "version": "0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f",
+  "version": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230",
   "type": "module",
   "exports": {
     ".": {
@@ -10,22 +10,21 @@
   },
   "types": "./dist/mod.d.ts",
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
-    "@livestore/common": "0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f",
-    "@livestore/db-schema": "0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f",
-    "@livestore/livestore": "0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f",
-    "@livestore/utils": "0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f"
+    "@opentelemetry/api": "1.9.0",
+    "@livestore/common": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230",
+    "@livestore/db-schema": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230",
+    "@livestore/livestore": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230",
+    "@livestore/utils": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230"
   },
   "devDependencies": {
-    "@opentelemetry/sdk-trace-base": "1.27.0",
-    "jsdom": "^25.0.1",
-    "typescript": "5.5.4",
-    "vite": "5.4.10",
-    "vitest": "^2.1.4",
-    "@livestore/web": "0.0.0-snapshot-f2e552007b925ea180db22534afe9d5c076c470f"
+    "@opentelemetry/sdk-trace-base": "^1.30.1",
+    "jsdom": "^26.0.0",
+    "typescript": "^5.7.2",
+    "vite": "^6.0.11",
+    "vitest": "^2.1.4"
   },
   "peerDependencies": {
-    "solid-js": "^1.8.11"
+    "solid-js": "~1.9.0"
   },
   "publishConfig": {
     "access": "public"

package/src/mod.ts

@@ -1 +1,2 @@
-export { getStore, query, row } from './store.js'
+export { getStore } from './store.js'
+export { query } from './query.js'

package/src/query.ts

@@ -0,0 +1,23 @@
+import type { GetResult, LiveQueryDefAny } from '@livestore/livestore'
+import * as Solid from 'solid-js'
+
+import { storeToExport } from './store.js'
+
+export const query = <TQuery extends LiveQueryDefAny>(
+  queryDef: TQuery,
+  // TODO do we actually need an `initialValue` at all?
+  initialValue: GetResult<TQuery>,
+): Solid.Accessor<GetResult<TQuery>> => {
+  const [value, setValue] = Solid.createSignal(initialValue)
+
+  const store = storeToExport()
+
+  // TODO avoid null-optionality branching
+  const unsubscribe = store?.subscribe(queryDef, { onUpdate: setValue })
+
+  Solid.onCleanup(() => {
+    unsubscribe?.()
+  })
+
+  return value
+}

package/src/store.ts

@@ -1,28 +1,30 @@
-import type { IntentionalShutdownCause, UnexpectedError } from '@livestore/common'
+import { type IntentionalShutdownCause, provideOtel, type UnexpectedError } from '@livestore/common'
 import type {
   BaseGraphQLContext,
   BootStatus,
   CreateStoreOptions,
-  DbSchema,
-  GetResult,
-  LiveQueryAny,
   LiveStoreContext as StoreContext_,
   LiveStoreContextRunning,
   LiveStoreSchema,
-  RowResult,
+  ShutdownDeferred,
   Store,
 } from '@livestore/livestore'
-import { createStore, rowQuery, StoreAbort, StoreInterrupted } from '@livestore/livestore'
-import { Effect, FiberSet, Logger, LogLevel } from '@livestore/utils/effect'
-import type { Accessor } from 'solid-js'
-import { createEffect, createSignal, onCleanup } from 'solid-js'
-
-const interrupt = (fiberSet: FiberSet.FiberSet, error: StoreAbort | StoreInterrupted) =>
+import { createStore, StoreAbort, StoreInterrupted } from '@livestore/livestore'
+import { LS_DEV } from '@livestore/utils'
+import { Deferred, Effect, Exit, identity, Logger, LogLevel, Scope, TaskTracing } from '@livestore/utils/effect'
+import * as Solid from 'solid-js'
+
+const interrupt = (
+  componentScope: Scope.CloseableScope,
+  shutdownDeferred: ShutdownDeferred,
+  error: StoreAbort | StoreInterrupted,
+) =>
   Effect.gen(function* () {
-    yield* FiberSet.clear(fiberSet)
-    yield* FiberSet.run(fiberSet, Effect.fail(error))
+    // console.log('[@livestore/livestore/react] interupting', error)
+    yield* Scope.close(componentScope, Exit.fail(error))
+    yield* Deferred.fail(shutdownDeferred, error)
   }).pipe(
-    Effect.tapErrorCause((cause) => Effect.logDebug(`[@livestore/livestore/react] interrupting`, cause)),
+    Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/solid] interrupting', cause)),
     Effect.runFork,
   )
 
@@ -39,35 +41,37 @@ const withSemaphore = (schemaKey: SchemaKey) => {
 
 const storeValue: {
   value: StoreContext_ | BootStatus
-  fiberSet: FiberSet.FiberSet | undefined
+  shutdownDeferred: ShutdownDeferred | undefined
+  componentScope: Scope.CloseableScope | undefined
   counter: number
 } = {
   value: { stage: 'loading' },
-  fiberSet: undefined,
+  shutdownDeferred: undefined,
+  componentScope: undefined,
   counter: 0,
 }
 
-const [, setInternalStore] = createSignal<{
+const [, setInternalStore] = Solid.createSignal<{
   value: StoreContext_ | BootStatus
-  fiberSet: FiberSet.FiberSet | undefined
+  shutdownDeferred: ShutdownDeferred | undefined
+  componentScope: Scope.CloseableScope | undefined
   counter: number
 }>(storeValue)
 
-const [storeToExport, setStoreToExport] = createSignal<LiveStoreContextRunning['store']>()
+export const [storeToExport, setStoreToExport] = Solid.createSignal<LiveStoreContextRunning['store']>()
 
 const setupStore = async <GraphQLContext extends BaseGraphQLContext>({
   schema,
   storeId,
   graphQLOptions,
-  otelOptions,
   boot,
   adapter,
   batchUpdates,
   disableDevtools,
-  reactivityGraph,
   signal,
-}: CreateStoreOptions<GraphQLContext, LiveStoreSchema> & { signal?: AbortSignal }) => {
-  createEffect(async () => {
+  setupDone,
+}: CreateStoreOptions<GraphQLContext, LiveStoreSchema> & { signal?: AbortSignal; setupDone: () => void }) => {
+  Solid.createEffect(() => {
     const counter = storeValue.counter
 
     const setContextValue = (value: StoreContext_ | BootStatus) => {
@@ -75,7 +79,8 @@ const setupStore = async <GraphQLContext extends BaseGraphQLContext>({
       storeValue.value = value
       setInternalStore({
         value: storeValue.value,
-        fiberSet: storeValue.fiberSet,
+        shutdownDeferred: storeValue.shutdownDeferred,
+        componentScope: storeValue.componentScope,
         counter: counter + 1,
       })
       if (value.stage === 'running') {
@@ -84,47 +89,48 @@ const setupStore = async <GraphQLContext extends BaseGraphQLContext>({
     }
 
     signal?.addEventListener('abort', () => {
-      if (storeValue.fiberSet !== undefined && storeValue.counter === counter) {
-        interrupt(storeValue.fiberSet, new StoreAbort())
-        storeValue.fiberSet = undefined
+      if (
+        storeValue.componentScope !== undefined &&
+        storeValue.shutdownDeferred !== undefined &&
+        storeValue.counter === counter
+      ) {
+        interrupt(storeValue.componentScope, storeValue.shutdownDeferred, new StoreAbort())
+        storeValue.componentScope = undefined
+        storeValue.shutdownDeferred = undefined
       }
     })
 
-    await Effect.gen(function* () {
-      const fiberSet = yield* FiberSet.make<
-        unknown,
+    Effect.gen(function* () {
+      const componentScope = yield* Scope.make()
+      const shutdownDeferred = yield* Deferred.make<
+        void,
         UnexpectedError | IntentionalShutdownCause | StoreAbort | StoreInterrupted
       >()
 
-      storeValue.fiberSet = fiberSet
-
       yield* Effect.gen(function* () {
-        const newStore = yield* createStore({
-          fiberSet,
+        const store = yield* createStore({
           schema,
           storeId,
           graphQLOptions,
-          otelOptions,
           boot,
           adapter,
-          reactivityGraph,
           batchUpdates,
           disableDevtools,
           onBootStatus: (status) => {
             if (storeValue.value.stage === 'running' || storeValue.value.stage === 'error') return
             setContextValue(status)
           },
-        })
+        }).pipe(Effect.tapErrorCause((cause) => Deferred.failCause(shutdownDeferred, cause)))
 
-        setContextValue({ stage: 'running', store: newStore })
-
-        yield* Effect.never
-      }).pipe(Effect.scoped, FiberSet.run(fiberSet))
+        setContextValue({ stage: 'running', store })
+        setupDone()
+      }).pipe(Scope.extend(componentScope), Effect.forkIn(componentScope))
 
       const shutdownContext = (cause: IntentionalShutdownCause | StoreAbort) =>
         Effect.sync(() => setContextValue({ stage: 'shutdown', cause }))
 
-      yield* FiberSet.join(fiberSet).pipe(
+      yield* Deferred.await(shutdownDeferred).pipe(
+        Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/react] shutdown', cause)),
         Effect.catchTag('LiveStore.IntentionalShutdownCause', (cause) => shutdownContext(cause)),
         Effect.catchTag('LiveStore.StoreAbort', (cause) => shutdownContext(cause)),
         Effect.tapError((error) => Effect.sync(() => setContextValue({ stage: 'error', error }))),
@@ -134,17 +140,21 @@ const setupStore = async <GraphQLContext extends BaseGraphQLContext>({
     }).pipe(
       Effect.scoped,
       withSemaphore(storeId),
+      Effect.withSpan('@livestore/solid:setupStore'),
+      LS_DEV ? TaskTracing.withAsyncTaggingTracing((name: string) => (console as any).createTask(name)) : identity,
+      provideOtel({}),
       Effect.tapCauseLogPretty,
       Effect.annotateLogs({ thread: 'window' }),
-      Effect.provide(Logger.pretty),
+      Effect.provide(Logger.prettyWithThread('window')),
       Logger.withMinimumLogLevel(LogLevel.Debug),
-      Effect.runPromise,
+      Effect.runFork,
     )
 
-    onCleanup(() => {
-      if (storeValue.fiberSet !== undefined) {
-        interrupt(storeValue.fiberSet, new StoreInterrupted())
-        storeValue.fiberSet = undefined
+    Solid.onCleanup(() => {
+      if (storeValue.componentScope !== undefined && storeValue.shutdownDeferred !== undefined) {
+        interrupt(storeValue.componentScope, storeValue.shutdownDeferred, new StoreInterrupted())
+        storeValue.componentScope = undefined
+        storeValue.shutdownDeferred = undefined
       }
     })
   })
@@ -158,53 +168,18 @@ export const getStore = async <
   schema,
   storeId,
 }: Pick<CreateStoreOptions<GraphQLContext, Schema>, 'schema' | 'adapter' | 'storeId'>): Promise<
-  Accessor<Store<BaseGraphQLContext, Schema> | undefined>
+  Solid.Accessor<Store<BaseGraphQLContext, Schema> | undefined>
 > => {
+  const setupDone = Promise.withResolvers<void>()
+
   await setupStore({
     adapter,
     schema,
     storeId,
+    setupDone: setupDone.resolve,
   })
 
-  while (!storeToExport()) {
-    await new Promise((resolve) => setTimeout(resolve, 100))
-  }
-
-  return storeToExport as unknown as Accessor<Store<BaseGraphQLContext, Schema>>
-}
-
-export const query = <TQuery extends LiveQueryAny>(
-  query$: TQuery,
-  initialValue: GetResult<TQuery>,
-): Accessor<GetResult<TQuery>> => {
-  const [value, setValue] = createSignal(initialValue)
-
-  const unsubscribe = storeToExport()?.subscribe(query$ as any, setValue)
-
-  onCleanup(() => {
-    unsubscribe?.()
-  })
-
-  return value
-}
-
-export const row = <
-  TTableDef extends DbSchema.TableDef<
-    DbSchema.DefaultSqliteTableDef,
-    boolean,
-    DbSchema.TableOptions & { isSingleton: false; deriveMutations: { enabled: true } }
-  >,
->(
-  table: TTableDef,
-  id: string,
-): Accessor<RowResult<TTableDef> | undefined> => {
-  const [value, setValue] = createSignal<RowResult<TTableDef>>()
-
-  const unsubscribe = rowQuery(table, id).subscribe(setValue)
-
-  onCleanup(() => {
-    unsubscribe?.()
-  })
+  await setupDone.promise
 
-  return value
+  return storeToExport as unknown as Solid.Accessor<Store<BaseGraphQLContext, Schema>>
 }

package/tsconfig.json

@@ -14,7 +14,6 @@
   "references": [
     { "path": "../db-schema" },
     { "path": "../common" },
-    { "path": "../web" },
     { "path": "../livestore" },
     { "path": "../utils" }
   ]

package/vitest.config.js

@@ -1,17 +0,0 @@
-import { defineConfig } from 'vite'
-
-export default defineConfig({
-  test: {
-    // Needed for React hook tests
-    environment: 'jsdom',
-  },
-  esbuild: {
-    // TODO remove once `using` keyword supported OOTB with Vite https://github.com/vitejs/vite/issues/15464#issuecomment-1872485703
-    target: 'es2020',
-  },
-  resolve: {
-    alias: {
-      '@livestore/wa-sqlite/dist/wa-sqlite.mjs': '@livestore/wa-sqlite/dist/wa-sqlite.node.mjs',
-    },
-  },
-})