@livestore/common 0.0.0-snapshot-f0abb7780ec63d606e59654d2c8a98d4a7f53569 → 0.0.0-snapshot-2411da6706c12365b5aa4533b551b9b6554d4617

package/src/schema/schema.ts

@@ -72,29 +72,32 @@ export const makeSchema = <TInputSchema extends InputSchema>(
     tables.set(tableDef.sqliteDef.name, tableDef)
   }
 
-  const mutations: MutationDefMap = new Map()
+  const mutations: MutationDefMap = {
+    map: new Map(),
+    wasProvided: inputSchema.mutations !== undefined,
+  }
 
   if (isReadonlyArray(inputSchema.mutations)) {
     for (const mutation of inputSchema.mutations) {
-      mutations.set(mutation.name, mutation)
+      mutations.map.set(mutation.name, mutation)
     }
   } else {
     for (const mutation of Object.values(inputSchema.mutations ?? {})) {
-      if (mutations.has(mutation.name)) {
+      if (mutations.map.has(mutation.name)) {
         shouldNeverHappen(`Duplicate mutation name: ${mutation.name}. Please use unique names for mutations.`)
       }
-      mutations.set(mutation.name, mutation)
+      mutations.map.set(mutation.name, mutation)
     }
   }
 
-  mutations.set(rawSqlMutation.name, rawSqlMutation)
+  mutations.map.set(rawSqlMutation.name, rawSqlMutation)
 
   for (const tableDef of tables.values()) {
     if (tableHasDerivedMutations(tableDef)) {
       const derivedMutationDefs = makeDerivedMutationDefsForTable(tableDef)
-      mutations.set(derivedMutationDefs.insert.name, derivedMutationDefs.insert)
-      mutations.set(derivedMutationDefs.update.name, derivedMutationDefs.update)
-      mutations.set(derivedMutationDefs.delete.name, derivedMutationDefs.delete)
+      mutations.map.set(derivedMutationDefs.insert.name, derivedMutationDefs.insert)
+      mutations.map.set(derivedMutationDefs.update.name, derivedMutationDefs.update)
+      mutations.map.set(derivedMutationDefs.delete.name, derivedMutationDefs.delete)
     }
   }
 
@@ -114,6 +117,15 @@ export const makeSchema = <TInputSchema extends InputSchema>(
   } satisfies LiveStoreSchema
 }
 
+export const getMutationDef = <TSchema extends LiveStoreSchema>(schema: TSchema, mutationName: string) => {
+  const mutationDef = schema.mutations.map.get(mutationName)
+  if (mutationDef === undefined) {
+    const extraInfo = schema.mutations.wasProvided ? '' : ' Please provide \`mutations\` in the schema options.'
+    return shouldNeverHappen(`No mutation definition found for \`${mutationName}\`.${extraInfo}`)
+  }
+  return mutationDef
+}
+
 export namespace FromInputSchema {
   export type DeriveSchema<TInputSchema extends InputSchema> = LiveStoreSchema<
     DbSchemaFromInputSchemaTables<TInputSchema['tables']>,

package/src/schema-management/validate-mutation-defs.ts

@@ -11,7 +11,7 @@ export const validateSchema = (schema: LiveStoreSchema, schemaManager: SchemaMan
     const registeredMutationDefInfos = schemaManager.getMutationDefInfos()
 
     const missingMutationDefs = registeredMutationDefInfos.filter(
-      (registeredMutationDefInfo) => !schema.mutations.has(registeredMutationDefInfo.mutationName),
+      (registeredMutationDefInfo) => !schema.mutations.map.has(registeredMutationDefInfo.mutationName),
     )
 
     if (missingMutationDefs.length > 0) {
@@ -20,7 +20,7 @@ export const validateSchema = (schema: LiveStoreSchema, schemaManager: SchemaMan
       })
     }
 
-    for (const [, mutationDef] of schema.mutations) {
+    for (const [, mutationDef] of schema.mutations.map) {
       const registeredMutationDefInfo = registeredMutationDefInfos.find(
         (info) => info.mutationName === mutationDef.name,
       )

package/src/sync/ClientSessionSyncProcessor.ts

@@ -5,7 +5,7 @@ import * as otel from '@opentelemetry/api'
 
 import type { ClientSession, UnexpectedError } from '../adapter-types.js'
 import * as EventId from '../schema/EventId.js'
-import { type LiveStoreSchema } from '../schema/mod.js'
+import { getMutationDef, type LiveStoreSchema } from '../schema/mod.js'
 import * as MutationEvent from '../schema/MutationEvent.js'
 import * as SyncState from './syncstate.js'
 
@@ -58,10 +58,8 @@ export const makeClientSessionSyncProcessor = ({
   }
 
   const syncStateUpdateQueue = Queue.unbounded<SyncState.SyncState>().pipe(Effect.runSync)
-  const isLocalEvent = (mutationEventEncoded: MutationEvent.EncodedWithMeta) => {
-    const mutationDef = schema.mutations.get(mutationEventEncoded.mutation)!
-    return mutationDef.options.clientOnly
-  }
+  const isLocalEvent = (mutationEventEncoded: MutationEvent.EncodedWithMeta) =>
+    getMutationDef(schema, mutationEventEncoded.mutation).options.clientOnly
 
   /** We're queuing push requests to reduce the number of messages sent to the leader by batching them */
   const leaderPushQueue = BucketQueue.make<MutationEvent.EncodedWithMeta>().pipe(Effect.runSync)
@@ -71,7 +69,7 @@ export const makeClientSessionSyncProcessor = ({
 
     let baseEventId = syncStateRef.current.localHead
     const encodedMutationEvents = batch.map((mutationEvent) => {
-      const mutationDef = schema.mutations.get(mutationEvent.mutation)!
+      const mutationDef = getMutationDef(schema, mutationEvent.mutation)
       const nextIdPair = EventId.nextPair(baseEventId, mutationDef.options.clientOnly)
       baseEventId = nextIdPair.id
       return new MutationEvent.EncodedWithMeta(

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.16' as const
+export const liveStoreVersion = '0.3.0-dev.17' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.