@livestore/adapter-node 0.3.1-dev.0 → 0.3.2-dev.0

package/src/devtools/vite-dev-server.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 
 import type { Devtools } from '@livestore/common'
 import { UnexpectedError } from '@livestore/common'
@@ -25,8 +24,6 @@ export type ViteDevtoolsOptions = {
   mode: Extract<Devtools.DevtoolsMode, { _tag: 'node' }>
 }
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
 // NOTE this is currently also used in @livestore/devtools-expo
 export const makeViteMiddleware = (options: ViteDevtoolsOptions): Effect.Effect<Vite.ViteDevServer, UnexpectedError> =>
   Effect.gen(function* () {
@@ -44,7 +41,6 @@ export const makeViteMiddleware = (options: ViteDevtoolsOptions): Effect.Effect<
         fs: { strict: process.env.LS_DEV ? false : true },
       },
       appType: 'spa',
-      root: __dirname,
       base: '/_livestore/',
       plugins: [
         livestoreDevtoolsPlugin({

package/src/leader-thread-shared.ts

@@ -21,11 +21,17 @@ import type * as WorkerSchema from './worker-schema.js'
 
 export type TestingOverrides = {
   clientSession?: {
-    leaderThreadProxy?: Partial<ClientSessionLeaderThreadProxy>
-  }
-  makeLeaderThread?: {
-    dbEventlog?: (makeSqliteDb: MakeSqliteDb) => Effect.Effect<SqliteDb, UnexpectedError>
+    leaderThreadProxy?: (
+      original: ClientSessionLeaderThreadProxy.ClientSessionLeaderThreadProxy,
+    ) => Partial<ClientSessionLeaderThreadProxy.ClientSessionLeaderThreadProxy>
   }
+  makeLeaderThread?: (makeSqliteDb: MakeSqliteDb) => Effect.Effect<
+    {
+      dbEventlog: SqliteDb
+      dbState: SqliteDb
+    },
+    UnexpectedError
+  >
 }
 
 export interface MakeLeaderThreadArgs {
@@ -62,8 +68,10 @@ export const makeLeaderThread = ({
       schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString()
 
     const makeDb = (kind: 'state' | 'eventlog') => {
-      if (testing?.makeLeaderThread?.dbEventlog && kind === 'eventlog') {
-        return testing.makeLeaderThread.dbEventlog(makeSqliteDb)
+      if (testing?.makeLeaderThread) {
+        return testing
+          .makeLeaderThread(makeSqliteDb)
+          .pipe(Effect.map(({ dbEventlog, dbState }) => (kind === 'state' ? dbState : dbEventlog)))
       }
 
       return storage.type === 'in-memory'

package/src/make-leader-worker.ts

@@ -47,7 +47,7 @@ export type WorkerOptions = {
 export const getWorkerArgs = () => Schema.decodeSync(WorkerSchema.WorkerArgv)(process.argv[2]!)
 
 export const makeWorker = (options: WorkerOptions) => {
-  makeWorkerEffect(options).pipe(Effect.runFork)
+  makeWorkerEffect(options).pipe(PlatformNode.NodeRuntime.runMain)
 }
 
 export const makeWorkerEffect = (options: WorkerOptions) => {

package/src/webchannel.ts

@@ -1,4 +1,4 @@
-import { type BroadcastChannel as NodeBroadcastChannel } from 'node:worker_threads'
+import type { BroadcastChannel as NodeBroadcastChannel } from 'node:worker_threads'
 
 import type { Either, ParseResult } from '@livestore/utils/effect'
 import { Deferred, Effect, Exit, Schema, Scope, Stream, WebChannel } from '@livestore/utils/effect'

package/src/worker-schema.ts

@@ -1,12 +1,4 @@
-import {
-  BootStatus,
-  Devtools,
-  LeaderAheadError,
-  LeaderPullCursor,
-  MigrationsReport,
-  SyncState,
-  UnexpectedError,
-} from '@livestore/common'
+import { BootStatus, Devtools, LeaderAheadError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common'
 import { EventSequenceNumber, LiveStoreEvent } from '@livestore/common/schema'
 import { Schema, Transferable } from '@livestore/utils/effect'
 
@@ -91,11 +83,10 @@ export namespace LeaderWorkerInner {
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {
     payload: {
-      cursor: LeaderPullCursor,
+      cursor: EventSequenceNumber.EventSequenceNumber,
     },
     success: Schema.Struct({
       payload: SyncState.PayloadUpstream,
-      mergeCounter: Schema.Number,
     }),
     failure: UnexpectedError,
   }) {}