@livestore/common 0.0.55-dev.2 → 0.0.55

package/src/devtools/devtools-messages.ts

@@ -135,7 +135,10 @@ export class MessagePortForStoreRes extends LSDReqResMessage('LSD.MessagePortFor
   port: Transferable.MessagePort,
 }) {}
 
-export class NetworkStatusChanged extends LSDChannelMessage('LSD.NetworkStatusChanged', {
+export class NetworkStatusSubscribe extends LSDReqResMessage('LSD.NetworkStatusSubscribe', {}) {}
+export class NetworkStatusUnsubscribe extends LSDReqResMessage('LSD.NetworkStatusUnsubscribe', {}) {}
+
+export class NetworkStatusRes extends LSDReqResMessage('LSD.NetworkStatusRes', {
   networkStatus: NetworkStatus,
 }) {}
 
@@ -158,7 +161,7 @@ export class AppHostReady extends LSDChannelMessage('LSD.AppHostReady', {
   isLeaderTab: Schema.Boolean,
 }) {}
 
-export class Disconnect extends LSDReqResMessage('LSD.Disconnect', {}) {}
+export class Disconnect extends LSDChannelMessage('LSD.Disconnect', {}) {}
 
 export class Ping extends LSDReqResMessage('LSD.Ping', {}) {}
 
@@ -170,6 +173,8 @@ export const MessageToAppHostCoordinator = Schema.Union(
   MutationLogReq,
   ResetAllDataReq,
   MessagePortForStoreRes,
+  NetworkStatusSubscribe,
+  NetworkStatusUnsubscribe,
   DevtoolsReady,
   Disconnect,
   DevtoolsConnected,
@@ -205,7 +210,7 @@ export const MessageFromAppHostCoordinator = Schema.Union(
   Disconnect,
   MutationBroadcast,
   AppHostReady,
-  NetworkStatusChanged,
+  NetworkStatusRes,
   RunMutationRes,
   Pong,
   DatabaseFileInfoRes,

package/src/devtools/devtools-window-message.ts

@@ -4,7 +4,7 @@ const channelId = Schema.String
 
 export namespace DevtoolsWindowMessage {
   /** Message is being created in contentscript-iframe, sent to contentscript and then sent to Store */
-  export class MessagePortReady extends Schema.TaggedStruct('LSD.WindowMessage.MessagePortForStore', {
+  export class MessagePortReady extends Schema.TaggedStruct('LSD.WindowMessage.MessagePortReady', {
     port: Transferable.MessagePort,
     channelId,
   }) {}

package/src/devtools/index.ts

@@ -1,13 +1,46 @@
+import type { Effect, Scope } from '@livestore/utils/effect'
 import { BrowserChannel, Schema } from '@livestore/utils/effect'
 
 export * from './devtools-messages.js'
 export * from './devtools-window-message.js'
 
 export namespace WebBridge {
-  export const makeBroadcastChannel = (key?: string) =>
+  export class AppHostReady extends Schema.TaggedStruct('LSD.WebBridge.AppHostReady', {
+    channelId: Schema.String,
+    isLeader: Schema.Boolean,
+  }) {}
+
+  export class DevtoolsReady extends Schema.TaggedStruct('LSD.WebBridge.DevtoolsReady', {
+    devtoolsId: Schema.String,
+  }) {}
+
+  export class ConnectToDevtools extends Schema.TaggedStruct('LSD.WebBridge.ConnectToDevtools', {
+    devtoolsId: Schema.String,
+    channelId: Schema.String,
+    /**
+     * Given the m:n relationship between devtools and app hosts and the fact that channelIds are usually
+     * sticky, we generate a new unique id for the lifetime of the web bridge.
+     */
+    webBridgeId: Schema.String,
+    isLeader: Schema.Boolean,
+  }) {}
+
+  export class AppHostWillDisconnect extends Schema.TaggedStruct('LSD.WebBridge.AppHostWillDisconnect', {
+    channelId: Schema.String,
+  }) {}
+
+  // export class DevtoolsWillDisconnect extends Schema.TaggedStruct('LSD.WebBridge.DevtoolsWillDisconnect', {
+  //   channelId: Schema.String,
+  // }) {}
+
+  export class All extends Schema.Union(AppHostReady, DevtoolsReady, ConnectToDevtools, AppHostWillDisconnect) {}
+
+  export const makeBroadcastChannel = (
+    key?: string,
+  ): Effect.Effect<BrowserChannel.BrowserChannel<typeof All.Type, typeof All.Type>, never, Scope.Scope> =>
     BrowserChannel.broadcastChannel({
       channelName: `livestore-web-bridge-devtools${key ? `-${key}` : ''}`,
-      listenSchema: Schema.Never,
-      sendSchema: Schema.Never,
+      listenSchema: All,
+      sendSchema: All,
     })
 }

package/src/schema/index.ts

@@ -1,5 +1,4 @@
 import { isReadonlyArray, shouldNeverHappen } from '@livestore/utils'
-import type { ReadonlyArray } from '@livestore/utils/effect'
 import type { SqliteDsl } from 'effect-db-schema'
 import { SqliteAst } from 'effect-db-schema'
 
@@ -17,7 +16,6 @@ import { type TableDef, tableHasDerivedMutations } from './table-def.js'
 
 export * from './system-tables.js'
 export * as DbSchema from './table-def.js'
-export * as ParseUtils from './parse-utils.js'
 export * from './mutations.js'
 export * from './schema-helpers.js'
 
@@ -40,11 +38,20 @@ export type LiveStoreSchema<
   readonly hash: number
 
   migrationOptions: MigrationOptions
+
+  key: string
 }
 
 export type InputSchema = {
   readonly tables: Record<string, TableDef> | ReadonlyArray<TableDef>
   readonly mutations?: ReadonlyArray<MutationDef.Any> | Record<string, MutationDef.Any>
+  /**
+   * Can be used to isolate multiple LiveStore apps running in the same origin
+   *
+   * Make sure you also use this key in the `storage` options (e.g. directory, prefix etc) to make sure
+   * different instances of LiveStore aren't overlapping on the storage level.
+   */
+  readonly key?: string
 }
 
 export const makeSchema = <TInputSchema extends InputSchema>(
@@ -111,6 +118,7 @@ export const makeSchema = <TInputSchema extends InputSchema>(
     mutations,
     migrationOptions: inputSchema.migrations ?? { strategy: 'hard-reset' },
     hash,
+    key: inputSchema.key ?? '',
   } satisfies LiveStoreSchema
 }
 

package/src/schema/parse-utils.ts

@@ -1,43 +0,0 @@
-import { shouldNeverHappen } from '@livestore/utils'
-import type { ReadonlyArray } from '@livestore/utils/effect'
-import { pipe, ReadonlyRecord, Schema, TreeFormatter } from '@livestore/utils/effect'
-import { SqliteDsl as __SqliteDsl } from 'effect-db-schema'
-
-import { getDefaultValuesDecoded } from './schema-helpers.js'
-import { type FromColumns, type FromTable, type TableDef } from './table-def.js'
-
-export const many = <TTableDef extends TableDef>(
-  table: TTableDef,
-): ((rawRows: ReadonlyArray<any>) => ReadonlyArray<FromTable.RowDecoded<TTableDef>>) => {
-  return Schema.decodeSync(Schema.Array(table.schema)) as TODO
-}
-
-export const first =
-  <TTableDef extends TableDef>(
-    table: TTableDef,
-    fallback?: FromColumns.InsertRowDecoded<TTableDef['sqliteDef']['columns']>,
-  ) =>
-  (rawRows: ReadonlyArray<any>) => {
-    const rows = Schema.decodeSync(Schema.Array(table.schema))(rawRows)
-
-    if (rows.length === 0) {
-      const schemaDefaultValues = getDefaultValuesDecoded(table)
-
-      const defaultValuesResult = pipe(
-        table.sqliteDef.columns,
-        ReadonlyRecord.map((_column, columnName) => (fallback as any)?.[columnName] ?? schemaDefaultValues[columnName]),
-        Schema.validateEither(table.schema),
-      )
-
-      if (defaultValuesResult._tag === 'Right') {
-        return defaultValuesResult.right
-      } else {
-        console.error('decode error', TreeFormatter.formatErrorSync(defaultValuesResult.left))
-        return shouldNeverHappen(
-          `Expected query (for table ${table.sqliteDef.name}) to return at least one result but found none. Also can't fallback to default values as some were not provided.`,
-        )
-      }
-    }
-
-    return rows[0]!
-  }