@livestore/common 0.0.56-dev.0 → 0.0.56-dev.1

package/src/devtools/devtools-bridge.ts

@@ -0,0 +1,13 @@
+import type { Effect, PubSub } from '@livestore/utils/effect'
+
+import type * as Devtools from './devtools-messages.js'
+
+export type PrepareDevtoolsBridge = {
+  /** Messages coming from the app host (usually responses to requests) */
+  responsePubSub: PubSub.PubSub<Devtools.MessageFromAppHostCoordinator | Devtools.MessageFromAppHostStore>
+  sendToAppHost: (msg: Devtools.MessageToAppHostCoordinator | Devtools.MessageToAppHostStore) => Effect.Effect<void>
+  channelId: string
+  copyToClipboard: (text: string) => Effect.Effect<void>
+  sendEscapeKey?: Effect.Effect<void>
+  isLeaderTab: boolean
+}

package/src/devtools/index.ts

@@ -1,8 +1,9 @@
 import type { Effect, Scope } from '@livestore/utils/effect'
-import { BrowserChannel, Schema } from '@livestore/utils/effect'
+import { Schema, WebChannel } from '@livestore/utils/effect'
 
 export * from './devtools-messages.js'
 export * from './devtools-window-message.js'
+export * from './devtools-bridge.js'
 
 export namespace WebBridge {
   export class AppHostReady extends Schema.TaggedStruct('LSD.WebBridge.AppHostReady', {
@@ -37,8 +38,8 @@ export namespace WebBridge {
 
   export const makeBroadcastChannel = (
     key?: string,
-  ): Effect.Effect<BrowserChannel.BrowserChannel<typeof All.Type, typeof All.Type>, never, Scope.Scope> =>
-    BrowserChannel.broadcastChannel({
+  ): Effect.Effect<WebChannel.WebChannel<typeof All.Type, typeof All.Type>, never, Scope.Scope> =>
+    WebChannel.broadcastChannel({
       channelName: `livestore-web-bridge-devtools${key ? `-${key}` : ''}`,
       listenSchema: All,
       sendSchema: All,

package/src/init-singleton-tables.ts

@@ -1,9 +1,9 @@
-import type { InMemoryDatabase } from './adapter-types.js'
+import type { SynchronousDatabase } from './adapter-types.js'
 import type { LiveStoreSchema } from './schema/index.js'
 import { getDefaultValuesEncoded } from './schema/schema-helpers.js'
 import { prepareBindValues, sql } from './util.js'
 
-export const initializeSingletonTables = (schema: LiveStoreSchema, db: InMemoryDatabase) => {
+export const initializeSingletonTables = (schema: LiveStoreSchema, db: SynchronousDatabase) => {
   for (const [, tableDef] of schema.tables) {
     if (tableDef.options.isSingleton) {
       const defaultValues = getDefaultValuesEncoded(tableDef, undefined)

package/src/mutation.ts

@@ -1,5 +1,7 @@
+import { memoizeByRef, shouldNeverHappen } from '@livestore/utils'
 import { Schema } from '@livestore/utils/effect'
 
+import type { LiveStoreSchema } from './schema/index.js'
 import type { MutationDef, MutationEvent } from './schema/mutations.js'
 import type { PreparedBindValues } from './util.js'
 import { prepareBindValues } from './util.js'
@@ -48,3 +50,20 @@ export const getExecArgsFromMutation = ({
     return { statementSql, bindValues: prepareBindValues(bindValues ?? {}, statementSql), writeTables }
   })
 }
+
+export const makeShouldExcludeMutationFromLog = memoizeByRef((schema: LiveStoreSchema) => {
+  const migrationOptions = schema.migrationOptions
+  const mutationLogExclude =
+    migrationOptions.strategy === 'from-mutation-log'
+      ? (migrationOptions.excludeMutations ?? new Set(['livestore.RawSql']))
+      : new Set(['livestore.RawSql'])
+
+  return (mutationName: string, mutationEventDecoded: MutationEvent.Any): boolean => {
+    if (mutationLogExclude.has(mutationName)) return true
+
+    const mutationDef = schema.mutations.get(mutationName) ?? shouldNeverHappen(`Unknown mutation: ${mutationName}`)
+    const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded })
+
+    return execArgsArr.some((_) => _.statementSql.includes('__livestore'))
+  }
+})

package/src/rehydrate-from-mutationlog.ts

@@ -2,9 +2,9 @@ import { memoizeByRef, shouldNeverHappen } from '@livestore/utils'
 import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect'
 
 import {
-  type InMemoryDatabase,
   type MigrationOptionsFromMutationLog,
   SqliteError,
+  type SynchronousDatabase,
   UnexpectedError,
 } from './adapter-types.js'
 import { getExecArgsFromMutation } from './mutation.js'
@@ -20,8 +20,8 @@ export const rehydrateFromMutationLog = ({
   migrationOptions,
   onProgress,
 }: {
-  logDb: InMemoryDatabase
-  db: InMemoryDatabase
+  logDb: SynchronousDatabase
+  db: SynchronousDatabase
   schema: LiveStoreSchema
   migrationOptions: MigrationOptionsFromMutationLog
   onProgress: (_: { done: number; total: number }) => Effect.Effect<void>

package/src/schema-management/common.ts

@@ -1,4 +1,4 @@
-import type { InMemoryDatabase } from '../adapter-types.js'
+import type { SynchronousDatabase } from '../adapter-types.js'
 import type { ParamsObject } from '../util.js'
 import { prepareBindValues } from '../util.js'
 
@@ -6,7 +6,7 @@ import { prepareBindValues } from '../util.js'
 // will require proper scope-aware cleanup etc (for testing and apps with multiple LiveStore instances)
 // const cachedStmts = new Map<string, PreparedStatement>()
 
-export const dbExecute = (db: InMemoryDatabase, queryStr: string, bindValues?: ParamsObject) => {
+export const dbExecute = (db: SynchronousDatabase, queryStr: string, bindValues?: ParamsObject) => {
   // let stmt = cachedStmts.get(queryStr)
   // if (!stmt) {
   const stmt = db.prepare(queryStr)
@@ -18,7 +18,7 @@ export const dbExecute = (db: InMemoryDatabase, queryStr: string, bindValues?: P
   stmt.execute(preparedBindValues)
 }
 
-export const dbSelect = <T>(db: InMemoryDatabase, queryStr: string, bindValues?: ParamsObject) => {
+export const dbSelect = <T>(db: SynchronousDatabase, queryStr: string, bindValues?: ParamsObject) => {
   // let stmt = cachedStmts.get(queryStr)
   // if (!stmt) {
   const stmt = db.prepare(queryStr)

package/src/schema-management/migrations.ts

@@ -2,7 +2,7 @@ import { memoizeByStringifyArgs } from '@livestore/utils'
 import { Effect, Schema as EffectSchema } from '@livestore/utils/effect'
 import { SqliteAst, SqliteDsl } from 'effect-db-schema'
 
-import type { InMemoryDatabase } from '../adapter-types.js'
+import type { SynchronousDatabase } from '../adapter-types.js'
 import type { LiveStoreSchema } from '../schema/index.js'
 import type { SchemaMetaRow, SchemaMutationsMetaRow } from '../schema/system-tables.js'
 import {
@@ -19,7 +19,7 @@ import { validateSchema } from './validate-mutation-defs.js'
 
 const getMemoizedTimestamp = memoizeByStringifyArgs(() => new Date().toISOString())
 
-export const makeSchemaManager = (db: InMemoryDatabase): Effect.Effect<SchemaManager> =>
+export const makeSchemaManager = (db: SynchronousDatabase): Effect.Effect<SchemaManager> =>
   Effect.gen(function* () {
     yield* migrateTable({
       db,
@@ -56,7 +56,7 @@ export const migrateDb = ({
   schema,
   onProgress,
 }: {
-  db: InMemoryDatabase
+  db: SynchronousDatabase
   schema: LiveStoreSchema
   onProgress?: (opts: { done: number; total: number }) => Effect.Effect<void>
 }) =>
@@ -121,7 +121,7 @@ export const migrateTable = ({
   behaviour,
   skipMetaTable = false,
 }: {
-  db: InMemoryDatabase
+  db: SynchronousDatabase
   tableAst: SqliteAst.Table
   schemaHash?: number
   behaviour: 'drop-and-recreate' | 'create-if-not-exists'

package/dist/schema/parse-utils.d.ts

@@ -1,4 +0,0 @@
-import { type FromColumns, type FromTable, type TableDef } from './table-def.js';
-export declare const many: <TTableDef extends TableDef>(table: TTableDef) => ((rawRows: ReadonlyArray<any>) => ReadonlyArray<FromTable.RowDecoded<TTableDef>>);
-export declare const first: <TTableDef extends TableDef>(table: TTableDef, fallback?: FromColumns.InsertRowDecoded<TTableDef["sqliteDef"]["columns"]>) => (rawRows: ReadonlyArray<any>) => any;
-//# sourceMappingURL=parse-utils.d.ts.map

package/dist/schema/parse-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parse-utils.d.ts","sourceRoot":"","sources":["../../src/schema/parse-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEhF,eAAO,MAAM,IAAI,GAAI,SAAS,SAAS,QAAQ,SACtC,SAAS,KACf,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAElF,CAAA;AAED,eAAO,MAAM,KAAK,GACf,SAAS,SAAS,QAAQ,SAClB,SAAS,aACL,WAAW,CAAC,gBAAgB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,eAElE,aAAa,CAAC,GAAG,CAAC,QAuB3B,CAAA"}

package/dist/schema/parse-utils.js

@@ -1,22 +0,0 @@
-import { shouldNeverHappen } from '@livestore/utils';
-import { pipe, ReadonlyRecord, Schema, TreeFormatter } from '@livestore/utils/effect';
-import { getDefaultValuesDecoded } from './schema-helpers.js';
-export const many = (table) => {
-    return Schema.decodeSync(Schema.Array(table.schema));
-};
-export const first = (table, fallback) => (rawRows) => {
-    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?.[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];
-};
-//# sourceMappingURL=parse-utils.js.map

package/dist/schema/parse-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parse-utils.js","sourceRoot":"","sources":["../../src/schema/parse-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAGrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAG7D,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,KAAgB,EACmE,EAAE;IACrF,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAS,CAAA;AAC9D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAChB,CACE,KAAgB,EAChB,QAA0E,EAC1E,EAAE,CACJ,CAAC,OAA2B,EAAE,EAAE;IAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAEnE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAE1D,MAAM,mBAAmB,GAAG,IAAI,CAC9B,KAAK,CAAC,SAAS,CAAC,OAAO,EACvB,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAE,QAAgB,EAAE,CAAC,UAAU,CAAC,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC,EAC/G,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CACpC,CAAA;QAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACzC,OAAO,mBAAmB,CAAC,KAAK,CAAA;QAClC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,aAAa,CAAC,eAAe,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAA;YACtF,OAAO,iBAAiB,CACtB,6BAA6B,KAAK,CAAC,SAAS,CAAC,IAAI,kHAAkH,CACpK,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC,CAAC,CAAE,CAAA;AACjB,CAAC,CAAA"}