@livestore/common 0.3.0-dev.27 → 0.3.0-dev.29

package/dist/sync/next/test/{mutation-fixtures.js → event-fixtures.js}

@@ -1,7 +1,7 @@
 import { Schema } from '@livestore/utils/effect';
+import { defineEvent, defineFacts } from '../../../schema/EventDef.js';
 import * as EventId from '../../../schema/EventId.js';
-import { defineFacts, defineMutation } from '../../../schema/mutations.js';
-import { factsSnapshotForDag, getFactsGroupForMutationArgs } from '../facts.js';
+import { factsSnapshotForDag, getFactsGroupForEventArgs } from '../facts.js';
 import { historyDagFromNodes } from '../history-dag.js';
 import { rootEventNode } from '../history-dag-common.js';
 /** Used for conflict detection and event history compaction */
@@ -12,24 +12,35 @@ export const facts = defineFacts({
     todoTextUpdated: (id) => `todo-text-updated-${id}`,
     inputValue: (id) => `input-value-${id}`,
 });
-export const mutations = {
-    createTodo: defineMutation('createTodo', Schema.Struct({ id: Schema.String, text: Schema.String }), 'INSERT INTO todos (id, text) VALUES ($id, $text)', {
+export const events = {
+    createTodo: defineEvent({
+        name: 'createTodo',
+        schema: Schema.Struct({ id: Schema.String, text: Schema.String }),
+        // 'INSERT INTO todos (id, text) VALUES ($id, $text)',
+        // {
         facts: ({ id }) => ({
             modify: {
                 set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoCompleted(id, false)],
             },
         }),
     }),
-    upsertTodo: defineMutation('upsertTodo', Schema.Struct({ id: Schema.String, text: Schema.optional(Schema.String) }), 'INSERT INTO todos (id, text) VALUES ($id, $text) ON CONFLICT (id) DO UPDATE SET text = $text', {
+    upsertTodo: defineEvent({
+        name: 'upsertTodo',
+        schema: Schema.Struct({ id: Schema.String, text: Schema.optional(Schema.String) }),
+        // 'INSERT INTO todos (id, text) VALUES ($id, $text) ON CONFLICT (id) DO UPDATE SET text = $text',
+        // {
         facts: ({ id }, currentFacts) => 
         // TODO enable an API along the lines of `map.has(key, value)`
         currentFacts.has(facts.todoExists(id)) && currentFacts.get(facts.todoIsWriteable(id, true)[0]) === false
             ? { require: [facts.todoExists(id), facts.todoIsWriteable(id, true)] }
             : { modify: { set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoTextUpdated(id)] } },
     }),
-    todoCompleted: defineMutation('todoCompleted', Schema.Struct({ id: Schema.String }), 
-    // consider `RETURNING` to validate before applying facts
-    'UPDATE todos SET completed = true WHERE id = $id', {
+    todoCompleted: defineEvent({
+        name: 'todoCompleted',
+        schema: Schema.Struct({ id: Schema.String }),
+        // consider `RETURNING` to validate before applying facts
+        // 'UPDATE todos SET completed = true WHERE id = $id',
+        // {
         // prewrite assertions from DB
         // enables more concurrency
         // turning database inside out
@@ -39,19 +50,31 @@ export const mutations = {
             modify: { set: [facts.todoCompleted(id, true)] },
         }),
     }),
-    todoUncompleted: defineMutation('todoUncompleted', Schema.Struct({ id: Schema.String }), 'UPDATE todos SET completed = false WHERE id = $id', {
+    todoUncompleted: defineEvent({
+        name: 'todoUncompleted',
+        schema: Schema.Struct({ id: Schema.String }),
+        // 'UPDATE todos SET completed = false WHERE id = $id',
+        // {
         facts: ({ id }) => ({
             require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
             modify: { set: [facts.todoCompleted(id, false)] },
         }),
     }),
-    todoCompleteds: defineMutation('todoCompleteds', Schema.Struct({ ids: Schema.Array(Schema.String) }), 'UPDATE todos SET completed = true WHERE id IN ($ids:csv)', {
+    todoCompleteds: defineEvent({
+        name: 'todoCompleteds',
+        schema: Schema.Struct({ ids: Schema.Array(Schema.String) }),
+        // 'UPDATE todos SET completed = true WHERE id IN ($ids:csv)',
+        // {
         facts: ({ ids }) => ({
             require: ids.flatMap((id) => [facts.todoExists(id), facts.todoIsWriteable(id, true)]),
             modify: { set: ids.map((id) => facts.todoCompleted(id, true)) },
         }),
     }),
-    toggleTodo: defineMutation('toggleTodo', Schema.Struct({ id: Schema.String }), 'UPDATE todos SET completed = NOT completed WHERE id = $id', {
+    toggleTodo: defineEvent({
+        name: 'toggleTodo',
+        schema: Schema.Struct({ id: Schema.String }),
+        // 'UPDATE todos SET completed = NOT completed WHERE id = $id',
+        // {
         facts: ({ id }, currentFacts) => {
             const currentIsCompleted = currentFacts.get(facts.todoCompleted(id, true)[0]) === true;
             return {
@@ -63,33 +86,45 @@ export const mutations = {
             };
         },
     }),
-    setReadonlyTodo: defineMutation('setReadonlyTodo', Schema.Struct({ id: Schema.String, readonly: Schema.Boolean }), 'UPDATE todos SET readonly = $readonly WHERE id = $id', {
+    setReadonlyTodo: defineEvent({
+        name: 'setReadonlyTodo',
+        schema: Schema.Struct({ id: Schema.String, readonly: Schema.Boolean }),
+        // 'UPDATE todos SET readonly = $readonly WHERE id = $id',
+        // {
         facts: ({ id, readonly }) => ({
             require: [facts.todoExists(id)],
             modify: { set: [facts.todoIsWriteable(id, !readonly)] },
         }),
     }),
-    setTextTodo: defineMutation('setTextTodo', Schema.Struct({ id: Schema.String, text: Schema.String }), 'UPDATE todos SET text = $text WHERE id = $id', {
+    setTextTodo: defineEvent({
+        name: 'setTextTodo',
+        schema: Schema.Struct({ id: Schema.String, text: Schema.String }),
+        // 'UPDATE todos SET text = $text WHERE id = $id',
+        // {
         facts: ({ id }) => ({
             require: [facts.todoExists(id), facts.todoIsWriteable(id, true)],
             modify: { set: [facts.todoTextUpdated(id)] },
         }),
     }),
-    setInputValue: defineMutation('setInputValue', Schema.Struct({ id: Schema.String, text: Schema.String }), 'UPDATE todos SET text = $text WHERE id = $id', {
+    setInputValue: defineEvent({
+        name: 'setInputValue',
+        schema: Schema.Struct({ id: Schema.String, text: Schema.String }),
+        // 'UPDATE todos SET text = $text WHERE id = $id',
+        // {
         clientOnly: true,
         facts: ({ id }) => ({ modify: { set: [facts.inputValue(id)] } }),
     }),
 };
-export const toEventNodes = (partialEvents, mutationDefs, clientId, sessionId) => {
+export const toEventNodes = (partialEvents, eventDefs, clientId, sessionId) => {
     const nodesAcc = [rootEventNode];
     let currentEventId = EventId.ROOT;
     const eventNodes = partialEvents.map((partialEvent) => {
-        const mutationDef = mutationDefs[partialEvent.mutation];
-        const eventId = EventId.nextPair(currentEventId, mutationDef.options.clientOnly).id;
+        const eventDef = eventDefs[partialEvent.name];
+        const eventId = EventId.nextPair(currentEventId, eventDef.options.clientOnly).id;
         currentEventId = eventId;
         const factsSnapshot = factsSnapshotForDag(historyDagFromNodes(nodesAcc, { skipFactsCheck: true }), undefined);
         // console.log('factsSnapshot', eventId, factsSnapshot)
-        // const depRead: MutationEventFactsSnapshot = new Map<string, any>()
+        // const depRead: EventDefFactsSnapshot = new Map<string, any>()
         // const factsSnapshotProxy = new Proxy(factsSnapshot, {
         //   get: (target, prop) => {
         //     if (prop === 'has') {
@@ -106,9 +141,9 @@ export const toEventNodes = (partialEvents, mutationDefs, clientId, sessionId) =
         //     notYetImplemented(`toEventNodes: ${prop.toString()} is not yet implemented`)
         //   },
         // })
-        // const factsRes = mutationDef.options.facts?.(partialEvent.args, factsSnapshotProxy)
+        // const factsRes = eventDef.options.facts?.(partialEvent.args, factsSnapshotProxy)
         // console.log('factsRes', factsRes?.modify, factsRes?.require)
-        // const iterableToMap = (iterable: Iterable<MutationEventFactInput>) => {
+        // const iterableToMap = (iterable: Iterable<EventDefFactInput>) => {
         //   const map = new Map()
         //   for (const item of iterable) {
         //     if (typeof item === 'string') {
@@ -124,17 +159,17 @@ export const toEventNodes = (partialEvents, mutationDefs, clientId, sessionId) =
         //   modifyRemove: factsRes?.modify.remove ? iterableToMap(factsRes.modify.remove) : new Map(),
         //   depRequire: factsRes?.require ? iterableToMap(factsRes.require) : new Map(),
         //   depRead,
-        // } satisfies MutationEventFactsGroup
+        // } satisfies EventDefFactsGroup
         // applyFactGroup(facts, factsSnapshot)
-        const facts = getFactsGroupForMutationArgs({
-            factsCallback: mutationDef.options.facts,
+        const facts = getFactsGroupForEventArgs({
+            factsCallback: eventDef.options.facts,
             args: partialEvent.args,
             currentFacts: factsSnapshot,
         });
         const node = {
             id: eventId,
             parentId: getParentId(eventId),
-            mutation: partialEvent.mutation,
+            name: partialEvent.name,
             args: partialEvent.args,
             factsGroup: facts,
             clientId,
@@ -155,4 +190,4 @@ const getParentId = (eventId) => {
     }
     return EventId.make({ global: globalParentId, client: clientParentId });
 };
-//# sourceMappingURL=mutation-fixtures.js.map
+//# sourceMappingURL=event-fixtures.js.map

package/dist/sync/next/test/event-fixtures.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-fixtures.js","sourceRoot":"","sources":["../../../../src/sync/next/test/event-fixtures.ts"],"names":[],"mappings":"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"}

package/dist/sync/next/test/mod.d.ts

@@ -1,2 +1,2 @@
-export * from './mutation-fixtures.js';
+export * from './event-fixtures.js';
 //# sourceMappingURL=mod.d.ts.map

package/dist/sync/next/test/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../src/sync/next/test/mod.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../src/sync/next/test/mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA"}

package/dist/sync/next/test/mod.js

@@ -1,2 +1,2 @@
-export * from './mutation-fixtures.js';
+export * from './event-fixtures.js';
 //# sourceMappingURL=mod.js.map

package/dist/sync/next/test/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../../src/sync/next/test/mod.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../../src/sync/next/test/mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA"}

package/dist/sync/sync.d.ts

@@ -3,7 +3,7 @@ import { Schema } from '@livestore/utils/effect';
 import type { UnexpectedError } from '../adapter-types.js';
 import type { InitialSyncOptions } from '../leader-thread/types.js';
 import * as EventId from '../schema/EventId.js';
-import type * as MutationEvent from '../schema/MutationEvent.js';
+import type * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
 /**
  * Those arguments can be used to implement multi-tenancy etc and are passed in from the store.
  */
@@ -38,7 +38,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
         metadata: Option.Option<TSyncMetadata>;
     }>) => Stream.Stream<{
         batch: ReadonlyArray<{
-            mutationEventEncoded: MutationEvent.AnyEncodedGlobal;
+            eventEncoded: LiveStoreEvent.AnyEncodedGlobal;
             metadata: Option.Option<TSyncMetadata>;
         }>;
         remaining: number;
@@ -49,7 +49,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
      * - Number of events: 1-100
      * - event ids must be in ascending order
      * */
-    batch: ReadonlyArray<MutationEvent.AnyEncodedGlobal>) => Effect.Effect<void, IsOfflineError | InvalidPushError, HttpClient.HttpClient>;
+    batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>) => Effect.Effect<void, IsOfflineError | InvalidPushError, HttpClient.HttpClient>;
     isConnected: SubscriptionRef.SubscriptionRef<boolean>;
     /**
      * Metadata describing the sync backend. (Currently only used by devtools.)

package/dist/sync/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzG,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAEhE;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACrC,gCAAgC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC;;;;;;;;SAQK;IACL,WAAW,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,sBAAsB,CAAC,aAAa,GAAG,MAAM,CAAC,SAAS,IAAI,CACrE,IAAI,EAAE,eAAe,KAClB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;AAEpG,MAAM,MAAM,WAAW,CAAC,aAAa,GAAG,MAAM,CAAC,SAAS,IAAI;IAC1D;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,eAAe,EAAE,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;IACnG,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAA;QACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;KACvC,CAAC,KACC,MAAM,CAAC,MAAM,CAChB;QACE,KAAK,EAAE,aAAa,CAAC;YACnB,oBAAoB,EAAE,aAAa,CAAC,gBAAgB,CAAA;YACpD,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;SACvC,CAAC,CAAA;QACF,SAAS,EAAE,MAAM,CAAA;KAClB,EACD,cAAc,GAAG,gBAAgB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAA;IAED,IAAI,EAAE;IACJ;;;;SAIK;IACL,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,gBAAgB,CAAC,KACjD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;IAClF,WAAW,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IACrD;;OAEG;IACH,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;CACnF,CAAA;;;;AAED,qBAAa,cAAe,SAAQ,mBAA0D;CAAG;;;;;;;;;;;AAEjG,qBAAa,gBAAiB,SAAQ,qBAUpC;CAAG;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;;;;;;;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzG,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAElE;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAA;IACrC,gCAAgC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC;;;;;;;;SAQK;IACL,WAAW,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,sBAAsB,CAAC,aAAa,GAAG,MAAM,CAAC,SAAS,IAAI,CACrE,IAAI,EAAE,eAAe,KAClB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;AAEpG,MAAM,MAAM,WAAW,CAAC,aAAa,GAAG,MAAM,CAAC,SAAS,IAAI;IAC1D;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,eAAe,EAAE,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;IACnG,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAA;QACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;KACvC,CAAC,KACC,MAAM,CAAC,MAAM,CAChB;QACE,KAAK,EAAE,aAAa,CAAC;YACnB,YAAY,EAAE,cAAc,CAAC,gBAAgB,CAAA;YAC7C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;SACvC,CAAC,CAAA;QACF,SAAS,EAAE,MAAM,CAAA;KAClB,EACD,cAAc,GAAG,gBAAgB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAA;IAED,IAAI,EAAE;IACJ;;;;SAIK;IACL,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,gBAAgB,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;IAClF,WAAW,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IACrD;;OAEG;IACH,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;CACnF,CAAA;;;;AAED,qBAAa,cAAe,SAAQ,mBAA0D;CAAG;;;;;;;;;;;AAEjG,qBAAa,gBAAiB,SAAQ,qBAUpC;CAAG;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;;;;;;;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG"}

package/dist/sync/syncstate.d.ts

@@ -1,8 +1,8 @@
 import { Schema } from '@livestore/utils/effect';
 import { UnexpectedError } from '../adapter-types.js';
-import * as MutationEvent from '../schema/MutationEvent.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
 declare const SyncState_base: Schema.Class<SyncState, {
-    pending: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    pending: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** What this node expects the next upstream node to have as its own local head */
     upstreamHead: Schema.Struct<{
         global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
@@ -14,7 +14,7 @@ declare const SyncState_base: Schema.Class<SyncState, {
         client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventId">, number, never>;
     }>;
 }, Schema.Struct.Encoded<{
-    pending: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    pending: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** What this node expects the next upstream node to have as its own local head */
     upstreamHead: Schema.Struct<{
         global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
@@ -26,7 +26,7 @@ declare const SyncState_base: Schema.Class<SyncState, {
         client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventId">, number, never>;
     }>;
 }>, never, {
-    readonly pending: readonly MutationEvent.EncodedWithMeta[];
+    readonly pending: readonly LiveStoreEvent.EncodedWithMeta[];
 } & {
     readonly upstreamHead: {
         readonly global: number & import("effect/Brand").Brand<"GlobalEventId">;
@@ -80,9 +80,9 @@ export declare class SyncState extends SyncState_base {
 }
 declare const PayloadUpstreamRebase_base: Schema.TaggedStruct<"upstream-rebase", {
     /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    rollbackEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** Events which need to be applied after the rollback (already rebased by the upstream node) */
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
 }>;
 /**
  * This payload propagates a rebase from the upstream node
@@ -90,12 +90,12 @@ declare const PayloadUpstreamRebase_base: Schema.TaggedStruct<"upstream-rebase",
 export declare class PayloadUpstreamRebase extends PayloadUpstreamRebase_base {
 }
 declare const PayloadUpstreamAdvance_base: Schema.TaggedStruct<"upstream-advance", {
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
 }>;
 export declare class PayloadUpstreamAdvance extends PayloadUpstreamAdvance_base {
 }
 declare const PayloadLocalPush_base: Schema.TaggedStruct<"local-push", {
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
 }>;
 export declare class PayloadLocalPush extends PayloadLocalPush_base {
 }
@@ -114,14 +114,14 @@ declare const MergeContext_base: Schema.Class<MergeContext, {
 }>, never, {
     readonly payload: {
         readonly _tag: "upstream-rebase";
-        readonly rollbackEvents: readonly MutationEvent.EncodedWithMeta[];
-        readonly newEvents: readonly MutationEvent.EncodedWithMeta[];
+        readonly rollbackEvents: readonly LiveStoreEvent.EncodedWithMeta[];
+        readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
     } | {
         readonly _tag: "upstream-advance";
-        readonly newEvents: readonly MutationEvent.EncodedWithMeta[];
+        readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
     } | {
         readonly _tag: "local-push";
-        readonly newEvents: readonly MutationEvent.EncodedWithMeta[];
+        readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
     };
 } & {
     readonly syncState: SyncState;
@@ -133,27 +133,27 @@ export declare class MergeContext extends MergeContext_base {
 declare const MergeResultAdvance_base: Schema.Class<MergeResultAdvance, {
     _tag: Schema.Literal<["advance"]>;
     newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** Events which were previously pending but are now confirmed */
-    confirmedEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    confirmedEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     mergeContext: typeof MergeContext;
 }, Schema.Struct.Encoded<{
     _tag: Schema.Literal<["advance"]>;
     newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** Events which were previously pending but are now confirmed */
-    confirmedEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    confirmedEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     mergeContext: typeof MergeContext;
 }>, never, {
     readonly _tag: "advance";
 } & {
-    readonly newEvents: readonly MutationEvent.EncodedWithMeta[];
+    readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
 } & {
     readonly newSyncState: SyncState;
 } & {
     readonly mergeContext: MergeContext;
 } & {
-    readonly confirmedEvents: readonly MutationEvent.EncodedWithMeta[];
+    readonly confirmedEvents: readonly LiveStoreEvent.EncodedWithMeta[];
 }, {}, {}>;
 export declare class MergeResultAdvance extends MergeResultAdvance_base {
     toJSON: () => any;
@@ -161,23 +161,23 @@ export declare class MergeResultAdvance extends MergeResultAdvance_base {
 declare const MergeResultRebase_base: Schema.Class<MergeResultRebase, {
     _tag: Schema.Literal<["rebase"]>;
     newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    rollbackEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     mergeContext: typeof MergeContext;
 }, Schema.Struct.Encoded<{
     _tag: Schema.Literal<["rebase"]>;
     newSyncState: typeof SyncState;
-    newEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    newEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array$<typeof MutationEvent.EncodedWithMeta>;
+    rollbackEvents: Schema.Array$<typeof LiveStoreEvent.EncodedWithMeta>;
     mergeContext: typeof MergeContext;
 }>, never, {
     readonly _tag: "rebase";
 } & {
-    readonly rollbackEvents: readonly MutationEvent.EncodedWithMeta[];
+    readonly rollbackEvents: readonly LiveStoreEvent.EncodedWithMeta[];
 } & {
-    readonly newEvents: readonly MutationEvent.EncodedWithMeta[];
+    readonly newEvents: readonly LiveStoreEvent.EncodedWithMeta[];
 } & {
     readonly newSyncState: SyncState;
 } & {
@@ -222,9 +222,9 @@ declare const MergeResultUnexpectedError_base: Schema.Class<MergeResultUnexpecte
     _tag: Schema.Literal<["unexpected-error"]>;
     cause: typeof UnexpectedError;
 }>, never, {
-    readonly _tag: "unexpected-error";
-} & {
     readonly cause: UnexpectedError;
+} & {
+    readonly _tag: "unexpected-error";
 }, {}, {}>;
 export declare class MergeResultUnexpectedError extends MergeResultUnexpectedError_base {
 }
@@ -234,8 +234,8 @@ export declare class MergeResult extends MergeResult_base {
 export declare const merge: ({ syncState, payload, isClientEvent, isEqualEvent, ignoreClientEvents, }: {
     syncState: SyncState;
     payload: typeof Payload.Type;
-    isClientEvent: (event: MutationEvent.EncodedWithMeta) => boolean;
-    isEqualEvent: (a: MutationEvent.EncodedWithMeta, b: MutationEvent.EncodedWithMeta) => boolean;
+    isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean;
+    isEqualEvent: (a: LiveStoreEvent.EncodedWithMeta, b: LiveStoreEvent.EncodedWithMeta) => boolean;
     /** This is used in the leader which should ignore client events when receiving an upstream-advance payload */
     ignoreClientEvents?: boolean;
 }) => typeof MergeResult.Type;
@@ -244,10 +244,10 @@ export declare const merge: ({ syncState, payload, isClientEvent, isEqualEvent,
  * by comparing each event in `existingEvents` to the corresponding event in `incomingEvents`
  */
 export declare const findDivergencePoint: ({ existingEvents, incomingEvents, isEqualEvent, isClientEvent, ignoreClientEvents, }: {
-    existingEvents: ReadonlyArray<MutationEvent.EncodedWithMeta>;
-    incomingEvents: ReadonlyArray<MutationEvent.EncodedWithMeta>;
-    isEqualEvent: (a: MutationEvent.EncodedWithMeta, b: MutationEvent.EncodedWithMeta) => boolean;
-    isClientEvent: (event: MutationEvent.EncodedWithMeta) => boolean;
+    existingEvents: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>;
+    incomingEvents: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>;
+    isEqualEvent: (a: LiveStoreEvent.EncodedWithMeta, b: LiveStoreEvent.EncodedWithMeta) => boolean;
+    isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean;
     ignoreClientEvents: boolean;
 }) => number;
 export {};

package/dist/sync/syncstate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncstate.d.ts","sourceRoot":"","sources":["../../src/sync/syncstate.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAA;;;IAyCzD,kFAAkF;;;;;IAElF,qEAAqE;;;;;;;IAFrE,kFAAkF;;;;;IAElF,qEAAqE;;;;;;;;;;;;;;;;;;AAzCvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,qBAAa,SAAU,SAAQ,cAM7B;IACA,MAAM,QAAO,GAAG,CAId;CACH;;IAMC,0CAA0C;;IAE1C,gGAAgG;;;AANlG;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,0BAKzC;CAAG;;;;AAEL,qBAAa,sBAAuB,SAAQ,2BAE1C;CAAG;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;AAEL,qBAAa,OAAQ,SAAQ,YAA6E;CAAG;;AAE7G,qBAAa,eAAgB,SAAQ,oBAA2D;CAAG;;;;;;;;;;;;;;;;;;;;;;AAEnG,uCAAuC;AACvC,qBAAa,YAAa,SAAQ,iBAGhC;IACA,MAAM,QAAO,GAAG,CAqBf;CACF;;;;;IAMC,iEAAiE;;;;;;;IAAjE,iEAAiE;;;;;;;;;;;;;;AAJnE,qBAAa,kBAAmB,SAAQ,uBAOtC;IACA,MAAM,QAAO,GAAG,CAQf;CACF;;;;;IAMC,0CAA0C;;;;;;;IAA1C,0CAA0C;;;;;;;;;;;;;;AAJ5C,qBAAa,iBAAkB,SAAQ,sBAOrC;IACA,MAAM,QAAO,GAAG,CAQf;CACF;;;IAIC,mDAAmD;;;;;;;;IAAnD,mDAAmD;;;;;;;;;;;;;;;;AAFrD,qBAAa,iBAAkB,SAAQ,sBAKrC;IACA,MAAM,QAAO,GAAG,CAMf;CACF;;;;;;;;;;;;AAED,qBAAa,0BAA2B,SAAQ,+BAG9C;CAAG;;AAEL,qBAAa,WAAY,SAAQ,gBAKhC;CAAG;AAeJ,eAAO,MAAM,KAAK,GAAI,0EAMnB;IACD,SAAS,EAAE,SAAS,CAAA;IACpB,OAAO,EAAE,OAAO,OAAO,CAAC,IAAI,CAAA;IAC5B,aAAa,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,eAAe,KAAK,OAAO,CAAA;IAChE,YAAY,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,eAAe,EAAE,CAAC,EAAE,aAAa,CAAC,eAAe,KAAK,OAAO,CAAA;IAC7F,8GAA8G;IAC9G,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,KAAG,OAAO,WAAW,CAAC,IAoNtB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,sFAMjC;IACD,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;IAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;IAC5D,YAAY,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,eAAe,EAAE,CAAC,EAAE,aAAa,CAAC,eAAe,KAAK,OAAO,CAAA;IAC7F,aAAa,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,eAAe,KAAK,OAAO,CAAA;IAChE,kBAAkB,EAAE,OAAO,CAAA;CAC5B,KAAG,MAuBH,CAAA"}
+{"version":3,"file":"syncstate.d.ts","sourceRoot":"","sources":["../../src/sync/syncstate.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;;;IAyC3D,kFAAkF;;;;;IAElF,qEAAqE;;;;;;;IAFrE,kFAAkF;;;;;IAElF,qEAAqE;;;;;;;;;;;;;;;;;;AAzCvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,qBAAa,SAAU,SAAQ,cAM7B;IACA,MAAM,QAAO,GAAG,CAId;CACH;;IAMC,0CAA0C;;IAE1C,gGAAgG;;;AANlG;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,0BAKzC;CAAG;;;;AAEL,qBAAa,sBAAuB,SAAQ,2BAE1C;CAAG;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;AAEL,qBAAa,OAAQ,SAAQ,YAA6E;CAAG;;AAE7G,qBAAa,eAAgB,SAAQ,oBAA2D;CAAG;;;;;;;;;;;;;;;;;;;;;;AAEnG,uCAAuC;AACvC,qBAAa,YAAa,SAAQ,iBAGhC;IACA,MAAM,QAAO,GAAG,CAqBf;CACF;;;;;IAMC,iEAAiE;;;;;;;IAAjE,iEAAiE;;;;;;;;;;;;;;AAJnE,qBAAa,kBAAmB,SAAQ,uBAOtC;IACA,MAAM,QAAO,GAAG,CAQf;CACF;;;;;IAMC,0CAA0C;;;;;;;IAA1C,0CAA0C;;;;;;;;;;;;;;AAJ5C,qBAAa,iBAAkB,SAAQ,sBAOrC;IACA,MAAM,QAAO,GAAG,CAQf;CACF;;;IAIC,mDAAmD;;;;;;;;IAAnD,mDAAmD;;;;;;;;;;;;;;;;AAFrD,qBAAa,iBAAkB,SAAQ,sBAKrC;IACA,MAAM,QAAO,GAAG,CAMf;CACF;;;;;;;;;;;;AAED,qBAAa,0BAA2B,SAAQ,+BAG9C;CAAG;;AAEL,qBAAa,WAAY,SAAQ,gBAKhC;CAAG;AAoBJ,eAAO,MAAM,KAAK,GAAI,0EAMnB;IACD,SAAS,EAAE,SAAS,CAAA;IACpB,OAAO,EAAE,OAAO,OAAO,CAAC,IAAI,CAAA;IAC5B,aAAa,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,eAAe,KAAK,OAAO,CAAA;IACjE,YAAY,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC,EAAE,cAAc,CAAC,eAAe,KAAK,OAAO,CAAA;IAC/F,8GAA8G;IAC9G,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,KAAG,OAAO,WAAW,CAAC,IA0MtB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,sFAMjC;IACD,cAAc,EAAE,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,CAAA;IAC7D,cAAc,EAAE,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,CAAA;IAC7D,YAAY,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC,EAAE,cAAc,CAAC,eAAe,KAAK,OAAO,CAAA;IAC/F,aAAa,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,eAAe,KAAK,OAAO,CAAA;IACjE,kBAAkB,EAAE,OAAO,CAAA;CAC5B,KAAG,MAuBH,CAAA"}

package/dist/sync/syncstate.js

@@ -1,8 +1,8 @@
-import { casesHandled, shouldNeverHappen } from '@livestore/utils';
+import { casesHandled, LS_DEV, shouldNeverHappen } from '@livestore/utils';
 import { Match, ReadonlyArray, Schema } from '@livestore/utils/effect';
 import { UnexpectedError } from '../adapter-types.js';
 import * as EventId from '../schema/EventId.js';
-import * as MutationEvent from '../schema/MutationEvent.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
 /**
  * SyncState represents the current sync state of a sync node relative to an upstream node.
  * Events flow from local to upstream, with each state maintaining its own event head.
@@ -41,7 +41,7 @@ import * as MutationEvent from '../schema/MutationEvent.js';
  * handling cases such as upstream rebase, advance and local push.
  */
 export class SyncState extends Schema.Class('SyncState')({
-    pending: Schema.Array(MutationEvent.EncodedWithMeta),
+    pending: Schema.Array(LiveStoreEvent.EncodedWithMeta),
     /** What this node expects the next upstream node to have as its own local head */
     upstreamHead: EventId.EventId,
     /** Equivalent to `pending.at(-1)?.id` if there are pending events */
@@ -58,17 +58,17 @@ export class SyncState extends Schema.Class('SyncState')({
  */
 export class PayloadUpstreamRebase extends Schema.TaggedStruct('upstream-rebase', {
     /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    rollbackEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
     /** Events which need to be applied after the rollback (already rebased by the upstream node) */
-    newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
 }) {
 }
 export class PayloadUpstreamAdvance extends Schema.TaggedStruct('upstream-advance', {
-    newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
 }) {
 }
 export class PayloadLocalPush extends Schema.TaggedStruct('local-push', {
-    newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
 }) {
 }
 export class Payload extends Schema.Union(PayloadUpstreamRebase, PayloadUpstreamAdvance, PayloadLocalPush) {
@@ -101,9 +101,9 @@ export class MergeContext extends Schema.Class('MergeContext')({
 export class MergeResultAdvance extends Schema.Class('MergeResultAdvance')({
     _tag: Schema.Literal('advance'),
     newSyncState: SyncState,
-    newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
     /** Events which were previously pending but are now confirmed */
-    confirmedEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    confirmedEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
     mergeContext: MergeContext,
 }) {
     toJSON = () => {
@@ -119,9 +119,9 @@ export class MergeResultAdvance extends Schema.Class('MergeResultAdvance')({
 export class MergeResultRebase extends Schema.Class('MergeResultRebase')({
     _tag: Schema.Literal('rebase'),
     newSyncState: SyncState,
-    newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
     /** Events which need to be rolled back */
-    rollbackEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+    rollbackEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
     mergeContext: MergeContext,
 }) {
     toJSON = () => {
@@ -155,10 +155,15 @@ export class MergeResultUnexpectedError extends Schema.Class('MergeResultUnexpec
 }
 export class MergeResult extends Schema.Union(MergeResultAdvance, MergeResultRebase, MergeResultReject, MergeResultUnexpectedError) {
 }
-const unexpectedError = (cause) => MergeResultUnexpectedError.make({
-    _tag: 'unexpected-error',
-    cause: new UnexpectedError({ cause }),
-});
+const unexpectedError = (cause) => {
+    if (LS_DEV) {
+        debugger;
+    }
+    return MergeResultUnexpectedError.make({
+        _tag: 'unexpected-error',
+        cause: new UnexpectedError({ cause }),
+    });
+};
 // TODO Idea: call merge recursively through hierarchy levels
 /*
 Idea: have a map that maps from `globalEventId` to Array<ClientEvents>
@@ -168,6 +173,7 @@ TODO: possibly even keep the client events in a separate table in the client lea
 */
 export const merge = ({ syncState, payload, isClientEvent, isEqualEvent, ignoreClientEvents = false, }) => {
     validateSyncState(syncState);
+    validatePayload(payload);
     const mergeContext = MergeContext.make({ payload, syncState });
     switch (payload._tag) {
         case 'upstream-rebase': {
@@ -218,14 +224,6 @@ export const merge = ({ syncState, payload, isClientEvent, isEqualEvent, ignoreC
                 EventId.isEqual(syncState.upstreamHead, payload.newEvents[0].id)) {
                 return unexpectedError(`Incoming events must be greater than upstream head. Expected greater than: ${EventId.toString(syncState.upstreamHead)}. Received: [${payload.newEvents.map((e) => EventId.toString(e.id)).join(', ')}]`);
             }
-            // Validate that the parent id of the first incoming event is known
-            const knownEventGlobalIds = [...syncState.pending].flatMap((e) => [e.id.global, e.parentId.global]);
-            knownEventGlobalIds.push(syncState.upstreamHead.global);
-            const firstNewEvent = payload.newEvents[0];
-            const hasUnknownParentId = knownEventGlobalIds.includes(firstNewEvent.parentId.global) === false;
-            if (hasUnknownParentId) {
-                return unexpectedError(`Incoming events must have a known parent id. Received: [${payload.newEvents.map((e) => EventId.toString(e.id)).join(', ')}]`);
-            }
             const newUpstreamHead = payload.newEvents.at(-1).id;
             const divergentPendingIndex = findDivergencePoint({
                 existingEvents: syncState.pending,
@@ -378,14 +376,21 @@ const rebaseEvents = ({ events, baseEventId, isClientEvent, }) => {
  * can process more efficiently which avoids push-threshing
  */
 const _flattenMergeResults = (_updateResults) => { };
+const validatePayload = (payload) => {
+    for (let i = 1; i < payload.newEvents.length; i++) {
+        if (EventId.isGreaterThanOrEqual(payload.newEvents[i - 1].id, payload.newEvents[i].id)) {
+            return unexpectedError(`Events must be ordered in monotonically ascending order by eventId. Received: [${payload.newEvents.map((e) => EventId.toString(e.id)).join(', ')}]`);
+        }
+    }
+};
 const validateSyncState = (syncState) => {
     for (let i = 0; i < syncState.pending.length; i++) {
         const event = syncState.pending[i];
         const nextEvent = syncState.pending[i + 1];
         if (nextEvent === undefined)
             break; // Reached end of chain
-        if (EventId.isGreaterThan(event.id, nextEvent.id)) {
-            shouldNeverHappen('Events must be sorted in ascending order by eventId', {
+        if (EventId.isGreaterThanOrEqual(event.id, nextEvent.id)) {
+            shouldNeverHappen(`Events must be ordered in monotonically ascending order by eventId. Received: [${syncState.pending.map((e) => EventId.toString(e.id)).join(', ')}]`, {
                 event,
                 nextEvent,
             });
@@ -414,6 +419,7 @@ const validateSyncState = (syncState) => {
 const validateMergeResult = (mergeResult) => {
     if (mergeResult._tag === 'unexpected-error' || mergeResult._tag === 'reject')
         return mergeResult;
+    validateSyncState(mergeResult.newSyncState);
     // Ensure local head is always greater than or equal to upstream head
     if (EventId.isGreaterThan(mergeResult.newSyncState.upstreamHead, mergeResult.newSyncState.localHead)) {
         shouldNeverHappen('Local head must be greater than or equal to upstream head', {