@livestore/solid 0.4.0-dev.22 → 0.4.0-dev.24

package/src/useStore.ts

@@ -0,0 +1,179 @@
+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 { useStoreRegistry } from './StoreRegistryContext.tsx'
+import { type UseClientDocumentResult, useClientDocument } from './useClientDocument.ts'
+import { useQuery } from './useQuery.ts'
+import { type AccessorMaybe, resolve } from './utils.ts'
+import { every, when } from './whenever.ts'
+
+/**
+ * Solid-specific methods added to the store Resource returned by `useStore()`.
+ *
+ * These methods handle the case where the store might not be loaded yet,
+ * returning `undefined` or buffering locally until ready.
+ */
+export type SolidApi = {
+  useClientDocument: {
+    // case: table has default id → id is optional
+    <
+      TTableDef extends State.SQLite.ClientDocumentTableDef.Trait<
+        any,
+        any,
+        any,
+        {
+          partialSet: boolean
+          default: { id: string | SessionIdSymbol; value: any }
+        }
+      >,
+    >(
+      table: AccessorMaybe<TTableDef>,
+      id?: AccessorMaybe<State.SQLite.ClientDocumentTableDef.DefaultIdType<TTableDef> | SessionIdSymbol>,
+      options?: Partial<RowQuery.GetOrCreateOptions<TTableDef>>,
+    ): UseClientDocumentResult<TTableDef>
+
+    // case: table has no default id → id is required
+    <
+      TTableDef extends State.SQLite.ClientDocumentTableDef.Trait<
+        any,
+        any,
+        any,
+        { partialSet: boolean; default: { id: undefined; value: any } }
+      >,
+    >(
+      table: AccessorMaybe<TTableDef>,
+      id: AccessorMaybe<string | SessionIdSymbol>,
+      options?: Partial<RowQuery.GetOrCreateOptions<TTableDef>>,
+    ): UseClientDocumentResult<TTableDef>
+  }
+  /**
+   * Creates a reactive query that subscribes to store updates.
+   *
+   * @returns An accessor that returns:
+   *   - `undefined` while the store is loading
+   *   - The query result once the store is ready
+   */
+  useQuery<TQueryable extends Queryable<any>>(
+    queryDef: AccessorMaybe<TQueryable>,
+  ): Solid.Accessor<Queryable.Result<TQueryable> | undefined>
+}
+
+/**
+ * Returns a store resource that suspends until the store is loaded.
+ * The store is cached by its `storeId` in the `StoreRegistry`.
+ *
+ * @example
+ * ```tsx
+ * import { Suspense } from 'solid-js'
+ *
+ * function Issue(props: { issueId: string }) {
+ *   const store = useStore(issueStoreOptions(props.issueId))
+ *   const issues = store()?.useQuery(queryDb(tables.issue.select()))
+ *
+ *   return (
+ *     <Show when={store()}>
+ *       {(s) => <IssueView store={s()} />}
+ *     </Show>
+ *   )
+ * }
+ *
+ * // With Suspense boundary
+ * function App() {
+ *   return (
+ *     <Suspense fallback={<div>Loading...</div>}>
+ *       <Issue issueId="abc123" />
+ *     </Suspense>
+ *   )
+ * }
+ * ```
+ *
+ * @remarks
+ * - Suspends until the store is loaded when used within a Suspense boundary.
+ * - Store is cached by its `storeId` in the `StoreRegistry`. Multiple calls with the same `storeId` return the same store instance.
+ * - Store is cached as long as it's being used, and after `unusedCacheTime` expires (default `60_000` ms in browser, `Infinity` in non-browser)
+ * - Default store options can be configured in `StoreRegistry` constructor.
+ * - Store options are only applied when the store is loaded. Subsequent calls with different options will not affect the store if it's already loaded and cached in the registry.
+ *
+ * @typeParam TSchema - The schema type for the store
+ * @typeParam TContext - User-defined context attached to the store
+ * @typeParam TSyncPayloadSchema - Schema for the sync payload sent to the backend
+ * @returns A Resource that resolves to the loaded store instance augmented with Solid hooks
+ */
+export const useStore = <
+  TSchema extends LiveStoreSchema,
+  TContext = {},
+  TSyncPayloadSchema extends Schema.Schema<any> = typeof Schema.JsonValue,
+>(
+  options: AccessorMaybe<RegistryStoreOptions<TSchema, TContext, TSyncPayloadSchema>>,
+): Solid.Resource<Store<TSchema, TContext>> & SolidApi => {
+  const storeRegistry = useStoreRegistry()
+
+  const [storeResource] = Solid.createResource(
+    () => resolve(options),
+    (opts) => {
+      const release = storeRegistry.retain(opts)
+      Solid.onCleanup(release)
+
+      return storeRegistry.getOrLoadPromise(opts)
+    },
+  )
+
+  return withSolidApi(storeResource)
+}
+
+/**
+ * Augments a Store instance with Solid-specific methods (`useQuery`, `useClientDocument`).
+ *
+ * This is called automatically by `useStore()`. You typically don't need to call it
+ * directly unless you're building custom integrations.
+ *
+ * @internal
+ */
+export const withSolidApi = <T extends Store<any, any> | Solid.Accessor<Store<any, any> | undefined>>(
+  store: T,
+): T & SolidApi => {
+  return Object.assign(store, {
+    useQuery(queryDef) {
+      const memo = Solid.createMemo(when(store, (store) => useQuery(queryDef, { store })))
+      return () => memo()?.()
+    },
+
+    useClientDocument(table: any, id: any, options: any) {
+      const [localState, setLocalState] = Solid.createSignal()
+
+      const getClient = Solid.createMemo<UseClientDocumentResult<any> | undefined>(
+        when(
+          every(store, table),
+          ([store, table]) => {
+            const client = useClientDocument(table, id, options, { store: store })
+            const _localState = Solid.untrack(localState)
+            if (_localState !== undefined) {
+              client[1](_localState)
+              setLocalState(undefined)
+            }
+            return client
+          },
+          (previous: UseClientDocumentResult<any> | undefined) => previous,
+        ),
+      )
+
+      // State accessor: return store state if available, otherwise local buffer
+      const state = when(getClient, ([state]) => state(), localState)
+
+      // Setter: update store if ready, otherwise buffer locally
+      const setState = when(getClient, ([, set], value: any) => set(value), setLocalState)
+
+      // ID accessor
+      const idAccessor = when(getClient, ([, , id]) => id())
+
+      // Query accessor
+      const queryAccessor = when(getClient, ([, , , query]) => query())
+
+      return [state, setState, idAccessor, queryAccessor] as UseClientDocumentResult<any>
+    },
+  } as SolidApi)
+}

package/src/utils.ts

@@ -0,0 +1,10 @@
+import type { Accessor } from 'solid-js'
+
+export type AccessorMaybe<T> = Accessor<T> | T
+
+export const resolve = <T>(value: AccessorMaybe<T>): T => {
+  if (typeof value === 'function') {
+    return (value as Accessor<T>)()
+  }
+  return value
+}

package/src/whenever.ts

@@ -0,0 +1,80 @@
+/**
+ * Reactive utilities to ease working with nullable signals.
+ * Inlined from @bigmistqke/solid-whenever to reduce external dependencies.
+ */
+
+import { type AccessorMaybe, resolve } from './utils.ts'
+
+type NonNullable<T> = Exclude<T, null | undefined | false | 0 | ''>
+type InferNonNullable<T> = T extends AccessorMaybe<infer TValue> | undefined ? NonNullable<TValue> : never
+type InferNonNullableTuple<TAccessors extends Array<AccessorMaybe<any>>> = {
+  [TKey in keyof TAccessors]: InferNonNullable<TAccessors[TKey]>
+}
+
+/**
+ * Checks if the accessor's value is truthy and executes a callback with that value.
+ * @param accessor - The value or function returning a value to check for truthiness
+ * @param callback - The callback function to execute if the value is truthy
+ * @param fallback - Optional callback function to execute if the value is falsy
+ * @returns The result of the callback if truthy, fallback result if falsy, or undefined if no fallback
+ */
+const check = <TValue, TResult, TFallbackResult = undefined>(
+  accessor: AccessorMaybe<TValue>,
+  callback: (value: NonNullable<TValue>) => TResult,
+  fallback?: () => TFallbackResult,
+): TResult | TFallbackResult | undefined => {
+  const value = resolve(accessor)
+  return Boolean(value) === true
+    ? callback(value as NonNullable<TValue>)
+    : fallback !== undefined
+      ? fallback()
+      : undefined
+}
+
+/**
+ * Returns a function that conditionally executes a callback based on the truthiness of an accessor's value,
+ * suitable for use in reactive programming contexts.
+ * @param accessor - The value or function returning a value that is checked for truthiness
+ * @param callback - The callback function to be executed if the accessor's value is truthy
+ * @param fallback - Optional callback function to be executed if the accessor's value is falsy
+ * @returns A function that conditionally executes the callback or fallback based on the accessor's value
+ */
+export const when: {
+  <Args extends any[], TValue, TResult>(
+    accessor: AccessorMaybe<TValue>,
+    callback: (value: NonNullable<TValue>, ...args: Args) => TResult,
+  ): (...args: Args) => TResult | undefined
+  <Args extends any[], TValue, TResult, TFallbackResult>(
+    accessor: AccessorMaybe<TValue>,
+    callback: (value: NonNullable<TValue>, ...args: Args) => TResult,
+    fallback: (...args: Args) => TFallbackResult,
+  ): (...args: Args) => TResult | TFallbackResult
+} = <Args extends any[], TValue, TResult, TFallbackResult>(
+  accessor: AccessorMaybe<TValue>,
+  callback: (value: NonNullable<TValue>, ...args: Args) => TResult,
+  fallback?: (...args: Args) => TFallbackResult,
+): ((...args: Args) => TResult | TFallbackResult | undefined) => {
+  return (...args: Args) =>
+    check(accessor, (value) => callback(value, ...args), fallback !== undefined ? () => fallback(...args) : undefined)
+}
+
+/**
+ * Returns a function that conditionally executes and aggregates results from multiple accessors if all values are truthy.
+ *
+ * @param accessors Multiple accessors to be checked for truthiness.
+ * @returns A function that can be called to conditionally execute based on the truthiness of all accessor values,
+ *          returning their results as an array or undefined if any are not truthy.
+ */
+export const every = <TAccessors extends Array<AccessorMaybe<any>>>(
+  ...accessors: TAccessors
+): (() => InferNonNullableTuple<TAccessors> | undefined) => {
+  return () => {
+    const values = new Array(accessors.length) as InferNonNullableTuple<TAccessors>
+    for (let i = 0; i < accessors.length; i++) {
+      const _value = resolve(accessors[i])
+      if (_value == null) return undefined
+      values[i] = _value
+    }
+    return values
+  }
+}

package/dist/query.d.ts

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

package/dist/query.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAGjC,eAAO,MAAM,KAAK,GAAI,OAAO,EAC3B,UAAU,SAAS,CAAC,OAAO,CAAC,EAE5B,cAAc,OAAO,KACpB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAaxB,CAAA"}

package/dist/query.js

@@ -1,15 +0,0 @@
-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, (value) => setValue(value));
-    Solid.onCleanup(() => {
-        unsubscribe?.();
-    });
-    return value;
-};
-//# sourceMappingURL=query.js.map

package/dist/query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,QAA4B;AAC5B,qDAAqD;AACrD,YAAqB,EACI,EAAE;IAC3B,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,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAY,CAAC,CAAC,CAAA;IAEjF,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,6 +0,0 @@
-import { LogConfig } from '@livestore/common';
-import type { CreateStoreOptions, LiveStoreSchema, Store } from '@livestore/livestore';
-import * as Solid from 'solid-js';
-export declare const storeToExport: Solid.Accessor<Store<any, {}> | undefined>, setStoreToExport: Solid.Setter<Store<any, {}> | undefined>;
-export declare const getStore: <Schema extends LiveStoreSchema>({ adapter, schema, storeId, logger, logLevel, }: Pick<CreateStoreOptions<Schema>, "schema" | "adapter" | "storeId"> & LogConfig.WithLoggerOptions) => Promise<Solid.Accessor<Store<Schema> | undefined>>;
-//# sourceMappingURL=store.d.ts.map

package/dist/store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAIV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAEV,kBAAkB,EAClB,eAAe,EAEf,KAAK,EAEN,MAAM,sBAAsB,CAAA;AAI7B,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AA4CjC,eAAO,MAAO,aAAa,8CAAE,gBAAgB,0CAGe,CAAA;AA2G5D,eAAO,MAAM,QAAQ,GAAU,MAAM,SAAS,eAAe,EAAE,iDAM5D,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC,iBAAiB,KAAG,OAAO,CAC3G,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAgB1C,CAAA"}

package/dist/store.js

@@ -1,99 +0,0 @@
-import { LogConfig, provideOtel, StoreInterrupted, } from '@livestore/common';
-import { createStore, makeShutdownDeferred } from '@livestore/livestore';
-import { LS_DEV, omitUndefineds } from '@livestore/utils';
-import { Cause, Deferred, Effect, Exit, identity, Scope, TaskTracing } from '@livestore/utils/effect';
-import * as Solid from 'solid-js';
-const interrupt = (componentScope, shutdownDeferred, error) => Effect.gen(function* () {
-    // console.log('[@livestore/livestore/solid] 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);
-    if (!semaphore) {
-        semaphore = Effect.makeSemaphore(1).pipe(Effect.runSync);
-        semaphoreMap.set(schemaKey, semaphore);
-    }
-    return semaphore.withPermits(1);
-};
-const storeValue = {
-    value: { stage: 'loading' },
-    shutdownDeferred: undefined,
-    componentScope: undefined,
-    counter: 0,
-};
-const [, setInternalStore] = Solid.createSignal(storeValue);
-// TODO remove `any` store type
-// this will require fixing: error TS2742: The inferred type of 'storeToExport' cannot be named without a reference to '../node_modules/@livestore/common/src/schema/state/sqlite/db-schema/dsl/mod.ts'. This is likely not portable. A type annotation is necessary.
-export const [storeToExport, setStoreToExport] = Solid.createSignal();
-const setupStore = async ({ schema, storeId, boot, adapter, batchUpdates, disableDevtools, signal, setupDone, logger, logLevel, }) => {
-    Solid.createEffect(() => {
-        const counter = storeValue.counter;
-        const setContextValue = (value) => {
-            if (storeValue.counter !== counter)
-                return;
-            storeValue.value = value;
-            setInternalStore({
-                value: storeValue.value,
-                shutdownDeferred: storeValue.shutdownDeferred,
-                componentScope: storeValue.componentScope,
-                counter: counter + 1,
-            });
-            if (value.stage === 'running') {
-                setStoreToExport(value.store);
-            }
-        };
-        signal?.addEventListener('abort', () => {
-            if (storeValue.componentScope !== undefined &&
-                storeValue.shutdownDeferred !== undefined &&
-                storeValue.counter === counter) {
-                interrupt(storeValue.componentScope, storeValue.shutdownDeferred, new StoreInterrupted({ reason: 'Aborted via provided AbortController' }));
-                storeValue.componentScope = undefined;
-                storeValue.shutdownDeferred = undefined;
-            }
-        });
-        Effect.gen(function* () {
-            const componentScope = yield* Scope.make();
-            const shutdownDeferred = yield* makeShutdownDeferred;
-            yield* Effect.gen(function* () {
-                const store = yield* createStore({
-                    schema,
-                    storeId,
-                    adapter,
-                    ...omitUndefineds({ boot, 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 });
-                setupDone();
-            }).pipe(Scope.extend(componentScope), Effect.forkIn(componentScope));
-            const shutdownContext = (cause) => Effect.sync(() => setContextValue({ stage: 'shutdown', cause }));
-            yield* Deferred.await(shutdownDeferred).pipe(Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/solid] shutdown', Cause.pretty(cause))), Effect.tap((intentionalShutdown) => shutdownContext(intentionalShutdown)), Effect.catchTag('InvalidPullError', (cause) => shutdownContext(cause)), Effect.catchTag('InvalidPushError', (cause) => shutdownContext(cause)), Effect.catchTag('LiveStore.StoreInterrupted', (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' }), LogConfig.withLoggerConfig({ logger, logLevel }, { threadName: 'window' }), Effect.runFork);
-        Solid.onCleanup(() => {
-            if (storeValue.componentScope !== undefined && storeValue.shutdownDeferred !== undefined) {
-                interrupt(storeValue.componentScope, storeValue.shutdownDeferred, new StoreInterrupted({ reason: 'unmounting component' }));
-                storeValue.componentScope = undefined;
-                storeValue.shutdownDeferred = undefined;
-            }
-        });
-    });
-};
-export const getStore = async ({ adapter, schema, storeId, logger, logLevel, }) => {
-    const setupDone = Promise.withResolvers();
-    await setupStore({
-        adapter,
-        schema,
-        storeId,
-        logger,
-        logLevel,
-        setupDone: setupDone.resolve,
-    });
-    await setupDone.promise;
-    return storeToExport;
-};
-//# sourceMappingURL=store.js.map

package/dist/store.js.map

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

package/src/query.ts

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

package/src/store.ts

@@ -1,196 +0,0 @@
-import {
-  type IntentionalShutdownCause,
-  LogConfig,
-  provideOtel,
-  StoreInterrupted,
-  type SyncError,
-} from '@livestore/common'
-import type {
-  BootStatus,
-  CreateStoreOptions,
-  LiveStoreSchema,
-  ShutdownDeferred,
-  Store,
-  LiveStoreContext as StoreContext_,
-} from '@livestore/livestore'
-import { createStore, makeShutdownDeferred } from '@livestore/livestore'
-import { LS_DEV, omitUndefineds } from '@livestore/utils'
-import { Cause, Deferred, Effect, Exit, identity, Scope, TaskTracing } from '@livestore/utils/effect'
-import * as Solid from 'solid-js'
-
-const interrupt = (componentScope: Scope.CloseableScope, shutdownDeferred: ShutdownDeferred, error: StoreInterrupted) =>
-  Effect.gen(function* () {
-    // console.log('[@livestore/livestore/solid] 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,
-  )
-
-type SchemaKey = string
-const semaphoreMap = new Map<SchemaKey, Effect.Semaphore>()
-const withSemaphore = (schemaKey: SchemaKey) => {
-  let semaphore = semaphoreMap.get(schemaKey)
-  if (!semaphore) {
-    semaphore = Effect.makeSemaphore(1).pipe(Effect.runSync)
-    semaphoreMap.set(schemaKey, semaphore)
-  }
-  return semaphore.withPermits(1)
-}
-
-const storeValue: {
-  value: StoreContext_ | BootStatus
-  shutdownDeferred: ShutdownDeferred | undefined
-  componentScope: Scope.CloseableScope | undefined
-  counter: number
-} = {
-  value: { stage: 'loading' },
-  shutdownDeferred: undefined,
-  componentScope: undefined,
-  counter: 0,
-}
-
-const [, setInternalStore] = Solid.createSignal<{
-  value: StoreContext_ | BootStatus
-  shutdownDeferred: ShutdownDeferred | undefined
-  componentScope: Scope.CloseableScope | undefined
-  counter: number
-}>(storeValue)
-
-// TODO remove `any` store type
-// this will require fixing: error TS2742: The inferred type of 'storeToExport' cannot be named without a reference to '../node_modules/@livestore/common/src/schema/state/sqlite/db-schema/dsl/mod.ts'. This is likely not portable. A type annotation is necessary.
-export const [storeToExport, setStoreToExport]: [
-  Solid.Accessor<Store<any> | undefined>,
-  Solid.Setter<Store<any> | undefined>,
-] = Solid.createSignal<Store<LiveStoreSchema> | undefined>()
-
-const setupStore = async ({
-  schema,
-  storeId,
-  boot,
-  adapter,
-  batchUpdates,
-  disableDevtools,
-  signal,
-  setupDone,
-  logger,
-  logLevel,
-}: CreateStoreOptions<LiveStoreSchema> &
-  LogConfig.WithLoggerOptions & { signal?: AbortSignal; setupDone: () => void }) => {
-  Solid.createEffect(() => {
-    const counter = storeValue.counter
-
-    const setContextValue = (value: StoreContext_ | BootStatus) => {
-      if (storeValue.counter !== counter) return
-      storeValue.value = value
-      setInternalStore({
-        value: storeValue.value,
-        shutdownDeferred: storeValue.shutdownDeferred,
-        componentScope: storeValue.componentScope,
-        counter: counter + 1,
-      })
-      if (value.stage === 'running') {
-        setStoreToExport(value.store)
-      }
-    }
-
-    signal?.addEventListener('abort', () => {
-      if (
-        storeValue.componentScope !== undefined &&
-        storeValue.shutdownDeferred !== undefined &&
-        storeValue.counter === counter
-      ) {
-        interrupt(
-          storeValue.componentScope,
-          storeValue.shutdownDeferred,
-          new StoreInterrupted({ reason: 'Aborted via provided AbortController' }),
-        )
-        storeValue.componentScope = undefined
-        storeValue.shutdownDeferred = undefined
-      }
-    })
-
-    Effect.gen(function* () {
-      const componentScope = yield* Scope.make()
-      const shutdownDeferred = yield* makeShutdownDeferred
-
-      yield* Effect.gen(function* () {
-        const store = yield* createStore({
-          schema,
-          storeId,
-          adapter,
-          ...omitUndefineds({ boot, 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 })
-        setupDone()
-      }).pipe(Scope.extend(componentScope), Effect.forkIn(componentScope))
-
-      const shutdownContext = (cause: IntentionalShutdownCause | StoreInterrupted | SyncError) =>
-        Effect.sync(() => setContextValue({ stage: 'shutdown', cause }))
-
-      yield* Deferred.await(shutdownDeferred).pipe(
-        Effect.tapErrorCause((cause) => Effect.logDebug('[@livestore/livestore/solid] shutdown', Cause.pretty(cause))),
-        Effect.tap((intentionalShutdown) => shutdownContext(intentionalShutdown)),
-        Effect.catchTag('InvalidPullError', (cause) => shutdownContext(cause)),
-        Effect.catchTag('InvalidPushError', (cause) => shutdownContext(cause)),
-        Effect.catchTag('LiveStore.StoreInterrupted', (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: string) => (console as any).createTask(name)) : identity,
-      provideOtel({}),
-      Effect.tapCauseLogPretty,
-      Effect.annotateLogs({ thread: 'window' }),
-      LogConfig.withLoggerConfig({ logger, logLevel }, { threadName: 'window' }),
-      Effect.runFork,
-    )
-
-    Solid.onCleanup(() => {
-      if (storeValue.componentScope !== undefined && storeValue.shutdownDeferred !== undefined) {
-        interrupt(
-          storeValue.componentScope,
-          storeValue.shutdownDeferred,
-          new StoreInterrupted({ reason: 'unmounting component' }),
-        )
-        storeValue.componentScope = undefined
-        storeValue.shutdownDeferred = undefined
-      }
-    })
-  })
-}
-
-export const getStore = async <Schema extends LiveStoreSchema>({
-  adapter,
-  schema,
-  storeId,
-  logger,
-  logLevel,
-}: Pick<CreateStoreOptions<Schema>, 'schema' | 'adapter' | 'storeId'> & LogConfig.WithLoggerOptions): Promise<
-  Solid.Accessor<Store<Schema> | undefined>
-> => {
-  const setupDone = Promise.withResolvers<void>()
-
-  await setupStore({
-    adapter,
-    schema,
-    storeId,
-    logger,
-    logLevel,
-    setupDone: setupDone.resolve,
-  })
-
-  await setupDone.promise
-
-  return storeToExport as unknown as Solid.Accessor<Store<Schema>>
-}