@livestore/common 0.3.0-dev.42 → 0.3.0-dev.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/common",
-  "version": "0.3.0-dev.42",
+  "version": "0.3.0-dev.44",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -54,12 +54,12 @@
     "graphology": "0.26.0-alpha1",
     "graphology-dag": "0.4.1",
     "graphology-types": "0.24.8",
-    "@livestore/utils": "0.3.0-dev.42",
-    "@livestore/webmesh": "0.3.0-dev.42"
+    "@livestore/utils": "0.3.0-dev.44",
+    "@livestore/webmesh": "0.3.0-dev.44"
   },
   "devDependencies": {
-    "vitest": "^3.1.1",
-    "@livestore/utils-dev": "0.3.0-dev.42"
+    "vitest": "^3.1.2",
+    "@livestore/utils-dev": "0.3.0-dev.44"
   },
   "files": [
     "package.json",

package/src/make-client-session.ts

@@ -11,6 +11,7 @@ import type {
   UnexpectedError,
 } from './adapter-types.js'
 import * as Devtools from './devtools/mod.js'
+import { liveStoreVersion } from './version.js'
 
 declare global {
   // eslint-disable-next-line no-var
@@ -30,6 +31,7 @@ export const makeClientSession = <R>({
   shutdown,
   connectWebmeshNode,
   webmeshMode,
+  registerBeforeUnload,
 }: AdapterArgs & {
   clientId: string
   sessionId: string
@@ -41,6 +43,7 @@ export const makeClientSession = <R>({
     sessionInfo: Devtools.SessionInfo.SessionInfo
   }) => Effect.Effect<void, UnexpectedError, Scope.Scope | R>
   webmeshMode: 'direct' | 'proxy'
+  registerBeforeUnload: (onBeforeUnload: () => void) => () => void
 }): Effect.Effect<ClientSession, never, Scope.Scope | R> =>
   Effect.gen(function* () {
     const devtools: ClientSession['devtools'] = devtoolsEnabled
@@ -92,6 +95,17 @@ export const makeClientSession = <R>({
                   mode: webmeshMode,
                 })
 
+                const onBeforeUnload = () => {
+                  clientSessionDevtoolsChannel
+                    .send(Devtools.ClientSession.Disconnect.make({ clientId, liveStoreVersion, sessionId }))
+                    .pipe(Effect.runFork)
+                }
+
+                yield* Effect.acquireRelease(
+                  Effect.sync(() => registerBeforeUnload(onBeforeUnload)),
+                  (unsub) => Effect.sync(() => unsub()),
+                )
+
                 yield* connectDevtoolsToStore(clientSessionDevtoolsChannel)
               },
               Effect.tapCauseLogPretty,

package/src/schema/schema.ts

@@ -11,17 +11,17 @@ import type { TableDef } from './state/sqlite/table-def.js'
 export const LiveStoreSchemaSymbol = Symbol.for('livestore.LiveStoreSchema')
 export type LiveStoreSchemaSymbol = typeof LiveStoreSchemaSymbol
 
-export type LiveStoreSchema<
+export interface LiveStoreSchema<
   TDbSchema extends SqliteDsl.DbSchema = SqliteDsl.DbSchema,
   TEventsDefRecord extends EventDefRecord = EventDefRecord,
-> = {
+> {
   readonly LiveStoreSchemaSymbol: LiveStoreSchemaSymbol
   /** Only used on type-level */
   readonly _DbSchemaType: TDbSchema
   /** Only used on type-level */
   readonly _EventDefMapType: TEventsDefRecord
 
-  readonly state: State
+  readonly state: InternalState
   readonly eventsDefsMap: Map<string, EventDef.AnyWithoutFn>
   readonly devtools: {
     /** @default 'default' */
@@ -30,7 +30,7 @@ export type LiveStoreSchema<
 }
 
 // TODO abstract this further away from sqlite/tables
-export type State = {
+export interface InternalState {
   readonly sqlite: {
     readonly tables: Map<string, TableDef.Any>
     readonly migrations: MigrationOptions
@@ -40,9 +40,9 @@ export type State = {
   readonly materializers: Map<string, Materializer>
 }
 
-export type InputSchema = {
+export interface InputSchema {
   readonly events: ReadonlyArray<EventDef.AnyWithoutFn> | Record<string, EventDef.AnyWithoutFn>
-  readonly state: State
+  readonly state: InternalState
   readonly devtools?: {
     /**
      * This alias value is used to disambiguate between multiple schemas in the devtools.

package/src/schema/state/sqlite/mod.ts

@@ -2,7 +2,7 @@ import { shouldNeverHappen } from '@livestore/utils'
 
 import type { MigrationOptions } from '../../../adapter-types.js'
 import { type Materializer, rawSqlEvent, rawSqlMaterializer } from '../../EventDef.js'
-import type { State } from '../../schema.js'
+import type { InternalState } from '../../schema.js'
 import { ClientDocumentTableDefSymbol, tableIsClientDocumentTable } from './client-document-def.js'
 import { SqliteAst } from './db-schema/mod.js'
 import { stateSystemTables } from './system-tables.js'
@@ -18,7 +18,7 @@ export {
 } from './client-document-def.js'
 export * from '../../EventDef.js'
 
-export const makeState = <TStateInput extends InputState>(inputSchema: TStateInput): State => {
+export const makeState = <TStateInput extends InputState>(inputSchema: TStateInput): InternalState => {
   const inputTables: ReadonlyArray<TableDef> = Array.isArray(inputSchema.tables)
     ? inputSchema.tables
     : Object.values(inputSchema.tables)

package/src/version.ts

@@ -2,7 +2,7 @@
 // import packageJson from '../package.json' with { type: 'json' }
 // export const liveStoreVersion = packageJson.version
 
-export const liveStoreVersion = '0.3.0-dev.42' as const
+export const liveStoreVersion = '0.3.0-dev.44' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.