@livestore/common 0.4.0 → 0.5.0-dev.1

package/dist/sync/syncstate.js

@@ -1,7 +1,7 @@
 import { casesHandled } from '@livestore/utils';
 import { Effect, Match, ReadonlyArray, Schema } from '@livestore/utils/effect';
-import * as EventSequenceNumber from "../schema/EventSequenceNumber/mod.js";
-import * as LiveStoreEvent from "../schema/LiveStoreEvent/mod.js";
+import * as EventSequenceNumber from '../schema/EventSequenceNumber/mod.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent/mod.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.
@@ -55,25 +55,20 @@ export class SyncState extends Schema.Class('SyncState')({
 /**
  * This payload propagates a rebase from the upstream node
  */
-export class PayloadUpstreamRebase extends Schema.TaggedStruct('upstream-rebase', {
+export const PayloadUpstreamRebase = Schema.TaggedStruct('upstream-rebase', {
     /** Events which need to be rolled back */
     rollbackEvents: Schema.Array(LiveStoreEvent.Client.EncodedWithMeta),
     /** Events which need to be applied after the rollback (already rebased by the upstream node) */
     newEvents: Schema.Array(LiveStoreEvent.Client.EncodedWithMeta),
-}) {
-}
-export class PayloadUpstreamAdvance extends Schema.TaggedStruct('upstream-advance', {
+});
+export const PayloadUpstreamAdvance = Schema.TaggedStruct('upstream-advance', {
     newEvents: Schema.Array(LiveStoreEvent.Client.EncodedWithMeta),
-}) {
-}
-export class PayloadLocalPush extends Schema.TaggedStruct('local-push', {
+});
+export const PayloadLocalPush = Schema.TaggedStruct('local-push', {
     newEvents: Schema.Array(LiveStoreEvent.Client.EncodedWithMeta),
-}) {
-}
-export class Payload extends Schema.Union(PayloadUpstreamRebase, PayloadUpstreamAdvance, PayloadLocalPush) {
-}
-export class PayloadUpstream extends Schema.Union(PayloadUpstreamRebase, PayloadUpstreamAdvance) {
-}
+});
+export const Payload = Schema.Union([PayloadUpstreamRebase, PayloadUpstreamAdvance, PayloadLocalPush]);
+export const PayloadUpstream = Schema.Union([PayloadUpstreamRebase, PayloadUpstreamAdvance]);
 /** Only used for debugging purposes */
 export class MergeContext extends Schema.Class('MergeContext')({
     payload: Payload,
@@ -147,8 +142,7 @@ export class MergeResultReject extends Schema.Class('MergeResultReject')({
         };
     };
 }
-export class MergeResult extends Schema.Union(MergeResultAdvance, MergeResultRebase, MergeResultReject) {
-}
+export const MergeResult = Schema.Union([MergeResultAdvance, MergeResultRebase, MergeResultReject]);
 export const payloadFromMergeResult = (mergeResult) => Match.value(mergeResult).pipe(Match.tag('advance', (result) => ({
     _tag: 'upstream-advance',
     newEvents: result.newEvents,
@@ -164,7 +158,7 @@ The same applies to even further hierarchy levels
 
 TODO: possibly even keep the client events in a separate table in the client leader
 */
-export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClientEvent, isEqualEvent, ignoreClientEvents = false, }) {
+export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClientOnlyEvent, isEqualEvent, ignoreClientOnlyEvents = false, }) {
     yield* validateSyncState(syncState);
     yield* validatePayload(payload);
     const mergeContext = MergeContext.make({ payload, syncState });
@@ -177,7 +171,7 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
             const rebasedPending = rebaseEvents({
                 events: syncState.pending,
                 baseEventSequenceNumber: newUpstreamHead,
-                isClientEvent,
+                isClientOnlyEvent,
             });
             return yield* validateMergeResult(MergeResultRebase.make({
                 _tag: 'rebase',
@@ -223,8 +217,8 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
                 existingEvents: syncState.pending,
                 incomingEvents: payload.newEvents,
                 isEqualEvent,
-                isClientEvent,
-                ignoreClientEvents,
+                isClientOnlyEvent,
+                ignoreClientOnlyEvents,
             });
             // No divergent pending events, thus we can just advance (some of) the pending events
             if (divergentPendingIndex === -1) {
@@ -237,7 +231,7 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
                 // The `clientIndexOffset` is used to account for the client events that are being ignored
                 let clientIndexOffset = 0;
                 const [pendingMatching, pendingRemaining] = ReadonlyArray.splitWhere(syncState.pending, (pendingEvent, index) => {
-                    if (ignoreClientEvents === true && isClientEvent(pendingEvent) === true) {
+                    if (ignoreClientOnlyEvents === true && isClientOnlyEvent(pendingEvent) === true) {
                         clientIndexOffset++;
                         return false;
                     }
@@ -264,14 +258,14 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
                 const rebasedPending = rebaseEvents({
                     events: divergentPending,
                     baseEventSequenceNumber: newUpstreamHead,
-                    isClientEvent,
+                    isClientOnlyEvent: isClientOnlyEvent,
                 });
                 const divergentNewEventsIndex = findDivergencePoint({
                     existingEvents: payload.newEvents,
                     incomingEvents: syncState.pending,
                     isEqualEvent,
-                    isClientEvent,
-                    ignoreClientEvents,
+                    isClientOnlyEvent: isClientOnlyEvent,
+                    ignoreClientOnlyEvents: ignoreClientOnlyEvents,
                 });
                 return yield* validateMergeResult(MergeResultRebase.make({
                     _tag: 'rebase',
@@ -303,7 +297,7 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
             if (invalidEventSequenceNumber === true) {
                 const expectedMinimumId = EventSequenceNumber.Client.nextPair({
                     seqNum: syncState.localHead,
-                    isClient: true,
+                    isClientOnly: true,
                 }).seqNum;
                 return yield* validateMergeResult(MergeResultReject.make({
                     _tag: 'reject',
@@ -312,8 +306,10 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
                 }));
             }
             else {
-                const nonClientEvents = ignoreClientEvents === true ? payload.newEvents.filter((event) => !isClientEvent(event)) : payload.newEvents;
-                const newPending = [...syncState.pending, ...nonClientEvents];
+                const nonClientOnlyEvents = ignoreClientOnlyEvents === true
+                    ? payload.newEvents.filter((event) => !isClientOnlyEvent(event))
+                    : payload.newEvents;
+                const newPending = [...syncState.pending, ...nonClientOnlyEvents];
                 const newLocalHead = newPending.at(-1)?.seqNum ?? EventSequenceNumber.Client.max(syncState.localHead, syncState.upstreamHead);
                 return yield* validateMergeResult(MergeResultAdvance.make({
                     _tag: 'advance',
@@ -336,19 +332,19 @@ export const merge = Effect.fnUntraced(function* ({ syncState, payload, isClient
  * Gets the index relative to `existingEvents` where the divergence point is
  * by comparing each event in `existingEvents` to the corresponding event in `incomingEvents`
  */
-export const findDivergencePoint = ({ existingEvents, incomingEvents, isEqualEvent, isClientEvent, ignoreClientEvents, }) => {
-    if (ignoreClientEvents === true) {
-        const filteredExistingEvents = existingEvents.filter((event) => !isClientEvent(event));
-        const divergencePointWithoutClientEvents = findDivergencePoint({
+export const findDivergencePoint = ({ existingEvents, incomingEvents, isEqualEvent, isClientOnlyEvent, ignoreClientOnlyEvents, }) => {
+    if (ignoreClientOnlyEvents === true) {
+        const filteredExistingEvents = existingEvents.filter((event) => !isClientOnlyEvent(event));
+        const divergencePointWithoutClientOnlyEvents = findDivergencePoint({
             existingEvents: filteredExistingEvents,
             incomingEvents,
             isEqualEvent,
-            isClientEvent,
-            ignoreClientEvents: false,
+            isClientOnlyEvent,
+            ignoreClientOnlyEvents: false,
         });
-        if (divergencePointWithoutClientEvents === -1)
+        if (divergencePointWithoutClientOnlyEvents === -1)
             return -1;
-        const divergencePointEventSequenceNumber = existingEvents[divergencePointWithoutClientEvents].seqNum;
+        const divergencePointEventSequenceNumber = existingEvents[divergencePointWithoutClientOnlyEvents].seqNum;
         // Now find the divergence point in the original array
         return existingEvents.findIndex((event) => EventSequenceNumber.Client.isEqual(event.seqNum, divergencePointEventSequenceNumber));
     }
@@ -358,14 +354,15 @@ export const findDivergencePoint = ({ existingEvents, incomingEvents, isEqualEve
         return incomingEvent !== undefined && isEqualEvent(existingEvent, incomingEvent) === false;
     });
 };
-const rebaseEvents = ({ events, baseEventSequenceNumber, isClientEvent, }) => {
+const rebaseEvents = ({ events, baseEventSequenceNumber, isClientOnlyEvent, }) => {
     let prevEventSequenceNumber = baseEventSequenceNumber;
     const rebaseGeneration = baseEventSequenceNumber.rebaseGeneration + 1;
     return events.map((event) => {
-        const isClient = isClientEvent(event);
+        // Rebasing must preserve whether an event is client-only: client-only
+        // events become eN.1/eN.2, while synced events become eN+1.
         const newEvent = event.rebase({
             parentSeqNum: prevEventSequenceNumber,
-            isClient,
+            isClientOnly: isClientOnlyEvent(event),
             rebaseGeneration,
         });
         prevEventSequenceNumber = newEvent.seqNum;

package/dist/sync/syncstate.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncstate.js","sourceRoot":"","sources":["../../src/sync/syncstate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAE9E,OAAO,KAAK,mBAAmB,MAAM,sCAAsC,CAAA;AAC3E,OAAO,KAAK,cAAc,MAAM,iCAAiC,CAAA;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,KAAK,CAAY,WAAW,CAAC,CAAC;IAClE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;IAC5D,kFAAkF;IAClF,YAAY,EAAE,mBAAmB,CAAC,MAAM,CAAC,SAAS;IAClD,qEAAqE;IACrE,SAAS,EAAE,mBAAmB,CAAC,MAAM,CAAC,SAAS;CAChD,CAAC;IACA,MAAM,GAAG,GAAQ,EAAE,CAAC,CAAC;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5C,YAAY,EAAE,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;QACpE,SAAS,EAAE,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;KAC/D,CAAC,CAAA;CACH;AAED;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE;IAChF,0CAA0C;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;IACnE,gGAAgG;IAChG,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;CAC/D,CAAC;CAAG;AAEL,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE;IAClF,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;CAC/D,CAAC;CAAG;AAEL,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE;IACtE,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;CAC/D,CAAC;CAAG;AAEL,MAAM,OAAO,OAAQ,SAAQ,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,sBAAsB,EAAE,gBAAgB,CAAC;CAAG;AAE7G,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;CAAG;AAEnG,uCAAuC;AACvC,MAAM,OAAO,YAAa,SAAQ,MAAM,CAAC,KAAK,CAAe,cAAc,CAAC,CAAC;IAC3E,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,SAAS;CACrB,CAAC;IACA,MAAM,GAAG,GAAQ,EAAE;QACjB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAC5C,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACzD,CAAC,CAAC,EACH,KAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC;YACnC,IAAI,EAAE,kBAAkB;YACxB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACzD,CAAC,CAAC,EACH,KAAK,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,EAAE,iBAAiB;YACvB,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YACnD,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAC9D,CAAC,CAAC,EACH,KAAK,CAAC,UAAU,CACjB,CAAA;QACD,OAAO;YACL,OAAO;YACP,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;SACnC,CAAA;IACH,CAAC,CAAA;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC,KAAK,CAAqB,oBAAoB,CAAC,CAAC;IAC7F,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/B,YAAY,EAAE,SAAS;IACvB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;IAC9D,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;IACpE,YAAY,EAAE,YAAY;CAC3B,CAAC;IACA,MAAM,GAAG,GAAQ,EAAE;QACjB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAChD,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC5D,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;SACzC,CAAA;IACH,CAAC,CAAA;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,KAAK,CAAoB,mBAAmB,CAAC,CAAC;IAC1F,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC9B,YAAY,EAAE,SAAS;IACvB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;IAC9D,0CAA0C;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC;IACnE,YAAY,EAAE,YAAY;CAC3B,CAAC;IACA,MAAM,GAAG,GAAQ,EAAE;QACjB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAChD,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC1D,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;SACzC,CAAA;IACH,CAAC,CAAA;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,KAAK,CAAoB,mBAAmB,CAAC,CAAC;IAC1F,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC9B,mDAAmD;IACnD,iBAAiB,EAAE,mBAAmB,CAAC,MAAM,CAAC,SAAS;IACvD,YAAY,EAAE,YAAY;CAC3B,CAAC;IACA,MAAM,GAAG,GAAQ,EAAE;QACjB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,iBAAiB,EAAE,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC;YAC9E,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;SACzC,CAAA;IACH,CAAC,CAAA;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,MAAM,CAAC,KAAK,CAC3C,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,CAClB;CAAG;AAEJ,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,WAA2E,EAC9C,EAAE,CAC/B,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAC3B,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAChC,IAAI,EAAE,kBAA2B;IACjC,SAAS,EAAE,MAAM,CAAC,SAAS;CAC5B,CAAC,CAAC,EACH,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,iBAA0B;IAChC,SAAS,EAAE,MAAM,CAAC,SAAS;IAC3B,cAAc,EAAE,MAAM,CAAC,cAAc;CACtC,CAAC,CAAC,EACH,KAAK,CAAC,UAAU,CACjB,CAAA;AAEH,6DAA6D;AAC7D;;;;;EAKE;AACF,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAChD,SAAS,EACT,OAAO,EACP,aAAa,EACb,YAAY,EACZ,kBAAkB,GAAG,KAAK,GAQ3B;IACC,KAAK,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACnC,KAAK,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAE/B,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,iBAAiB,CAAC,CAAC,CAAC;YACvB,MAAM,cAAc,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;YAExE,uDAAuD;YACvD,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,SAAS,CAAC,YAAY,CAAA;YAElF,iDAAiD;YACjD,MAAM,cAAc,GAAG,YAAY,CAAC;gBAClC,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,uBAAuB,EAAE,eAAe;gBACxC,aAAa;aACd,CAAC,CAAA;YAEF,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,iBAAiB,CAAC,IAAI,CAAC;gBACrB,IAAI,EAAE,QAAQ;gBACd,YAAY,EAAE,IAAI,SAAS,CAAC;oBAC1B,OAAO,EAAE,cAAc;oBACvB,YAAY,EAAE,eAAe;oBAC7B,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,eAAe;iBAC5D,CAAC;gBACF,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,cAAc,CAAC;gBACpD,cAAc;gBACd,YAAY;aACb,CAAC,CACH,CAAA;QACH,CAAC;QAED,0BAA0B;QAC1B,KAAK,kBAAkB,CAAC,CAAC,CAAC;YACxB,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,kBAAkB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,SAAS;oBACf,YAAY,EAAE,IAAI,SAAS,CAAC;wBAC1B,OAAO,EAAE,SAAS,CAAC,OAAO;wBAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;wBACpC,SAAS,EAAE,SAAS,CAAC,SAAS;qBAC/B,CAAC;oBACF,SAAS,EAAE,EAAE;oBACb,eAAe,EAAE,EAAE;oBACnB,YAAY,EAAE,YAAY;iBAC3B,CAAC,CACH,CAAA;YACH,CAAC;YAED,oEAAoE;YACpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAClD,IACE,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;oBACxG,IAAI,EACJ,CAAC;oBACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAC9B,wEAAwE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAClK,CAAA;gBACH,CAAC;YACH,CAAC;YAED,8DAA8D;YAC9D,IACE,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,KAAK,IAAI;gBACvG,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EACjG,CAAC;gBACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAC9B,8EAA8E,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,gBAAgB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACnP,CAAA;YACH,CAAC;YAED,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,CAAA;YAExD,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;gBAChD,cAAc,EAAE,SAAS,CAAC,OAAO;gBACjC,cAAc,EAAE,OAAO,CAAC,SAAS;gBACjC,YAAY;gBACZ,aAAa;gBACb,kBAAkB;aACnB,CAAC,CAAA;YAEF,qFAAqF;YACrF,IAAI,qBAAqB,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjC,MAAM,2BAA2B,GAAG,IAAI,GAAG,CACzC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CACtE,CAAA;gBACD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAA2B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CACjF,CAAA;gBAED,4EAA4E;gBAC5E,uDAAuD;gBACvD,yFAAyF;gBACzF,8FAA8F;gBAC9F,0FAA0F;gBAC1F,IAAI,iBAAiB,GAAG,CAAC,CAAA;gBACzB,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,GAAG,aAAa,CAAC,UAAU,CAClE,SAAS,CAAC,OAAO,EACjB,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE;oBACtB,IAAI,kBAAkB,KAAK,IAAI,IAAI,aAAa,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;wBACxE,iBAAiB,EAAE,CAAA;wBACnB,OAAO,KAAK,CAAA;oBACd,CAAC;oBAED,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,GAAG,iBAAiB,CAAC,CAAA;oBAChE,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;wBACrB,OAAO,IAAI,CAAA;oBACb,CAAC;oBACD,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;gBAC9C,CAAC,CACF,CAAA;gBAED,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,kBAAkB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,SAAS;oBACf,YAAY,EAAE,IAAI,SAAS,CAAC;wBAC1B,OAAO,EAAE,gBAAgB;wBACzB,YAAY,EAAE,eAAe;wBAC7B,SAAS,EACP,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC;qBAC1G,CAAC;oBACF,SAAS;oBACT,eAAe,EAAE,eAAe;oBAChC,YAAY,EAAE,YAAY;iBAC3B,CAAC,CACH,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;gBACvE,MAAM,cAAc,GAAG,YAAY,CAAC;oBAClC,MAAM,EAAE,gBAAgB;oBACxB,uBAAuB,EAAE,eAAe;oBACxC,aAAa;iBACd,CAAC,CAAA;gBAEF,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;oBAClD,cAAc,EAAE,OAAO,CAAC,SAAS;oBACjC,cAAc,EAAE,SAAS,CAAC,OAAO;oBACjC,YAAY;oBACZ,aAAa;oBACb,kBAAkB;iBACnB,CAAC,CAAA;gBAEF,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,iBAAiB,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,QAAQ;oBACd,YAAY,EAAE,IAAI,SAAS,CAAC;wBAC1B,OAAO,EAAE,cAAc;wBACvB,YAAY,EAAE,eAAe;wBAC7B,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM;qBACzC,CAAC;oBACF,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE,GAAG,cAAc,CAAC;oBACnF,cAAc,EAAE,gBAAgB;oBAChC,YAAY;iBACb,CAAC,CACH,CAAA;YACH,CAAC;QACH,CAAC;QACD,6BAA6B;QAE7B,yDAAyD;QACzD,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,kBAAkB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,SAAS;oBACf,YAAY,EAAE,SAAS;oBACvB,SAAS,EAAE,EAAE;oBACb,eAAe,EAAE,EAAE;oBACnB,YAAY,EAAE,YAAY;iBAC3B,CAAC,CACH,CAAA;YACH,CAAC;YAED,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAE,CAAA;YAC/C,MAAM,0BAA0B,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAC1E,cAAc,CAAC,MAAM,EACrB,SAAS,CAAC,SAAS,CACpB,CAAA;YAED,IAAI,0BAA0B,KAAK,IAAI,EAAE,CAAC;gBACxC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC;oBAC5D,MAAM,EAAE,SAAS,CAAC,SAAS;oBAC3B,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC,MAAM,CAAA;gBACT,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,iBAAiB,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,QAAQ;oBACd,iBAAiB;oBACjB,YAAY;iBACb,CAAC,CACH,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,eAAe,GACnB,kBAAkB,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAA;gBAC9G,MAAM,UAAU,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,CAAA;gBAC7D,MAAM,YAAY,GAChB,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAE1G,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAC/B,kBAAkB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,SAAS;oBACf,YAAY,EAAE,IAAI,SAAS,CAAC;wBAC1B,OAAO,EAAE,UAAU;wBACnB,YAAY,EAAE,SAAS,CAAC,YAAY;wBACpC,SAAS,EAAE,YAAY;qBACxB,CAAC;oBACF,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,eAAe,EAAE,EAAE;oBACnB,YAAY,EAAE,YAAY;iBAC3B,CAAC,CACH,CAAA;YACH,CAAC;QACH,CAAC;QAED;YACE,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;AACD,CAAC,CAAC,CAAA;AAEJ;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,cAAc,EACd,cAAc,EACd,YAAY,EACZ,aAAa,EACb,kBAAkB,GAOnB,EAAU,EAAE;IACX,IAAI,kBAAkB,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,sBAAsB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;QACtF,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;YAC7D,cAAc,EAAE,sBAAsB;YACtC,cAAc;YACd,YAAY;YACZ,aAAa;YACb,kBAAkB,EAAE,KAAK;SAC1B,CAAC,CAAA;QAEF,IAAI,kCAAkC,KAAK,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,CAAA;QAExD,MAAM,kCAAkC,GAAG,cAAc,CAAC,kCAAkC,CAAE,CAAC,MAAM,CAAA;QACrG,sDAAsD;QACtD,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CACxC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,kCAAkC,CAAC,CACrF,CAAA;IACH,CAAC;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;QACvD,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;QAC3C,uEAAuE;QACvE,OAAO,aAAa,KAAK,SAAS,IAAI,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,KAAK,CAAA;IAC5F,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,EACpB,MAAM,EACN,uBAAuB,EACvB,aAAa,GAKd,EAAwD,EAAE;IACzD,IAAI,uBAAuB,GAAG,uBAAuB,CAAA;IACrD,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,gBAAgB,GAAG,CAAC,CAAA;IACrE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;QACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC;YAC5B,YAAY,EAAE,uBAAuB;YACrC,QAAQ;YACR,gBAAgB;SACjB,CAAC,CAAA;QACF,uBAAuB,GAAG,QAAQ,CAAC,MAAM,CAAA;QACzC,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,CAAC,cAA0C,EAAE,EAAE,GAAE,CAAC,CAAA;AAE/E,MAAM,eAAe,GAAG,CAAC,OAA4B,EAAE,EAAE,CACvD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,IACE,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,CAC7C,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,MAAM,EAChC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,MAAM,CAC7B,KAAK,IAAI,EACV,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAC9B,mFAAmF,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC7K,CAAA;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACnD,SAAoB;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAE,CAAA;QACnC,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1C,IAAI,SAAS,KAAK,SAAS;YAAE,MAAK,CAAC,uBAAuB;QAE1D,IAAI,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7F,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAC9B,mFAAmF,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAC5K,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAA;QACH,CAAC;QAED,+DAA+D;QAC/D,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAA;QAC1E,IAAI,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAClC,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAC9B,8EAA8E,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EACtI,SAAS,CAAC,OAAO,EACjB,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAA;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,0EAA0E;YAC1E,IAAI,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC;gBACvF,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAC9B,kEAAkE,EAClE,SAAS,CAAC,OAAO,EACjB,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAA;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACrD,WAAoC;IAEpC,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,WAAW,CAAA;IAErD,KAAK,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAElD,qEAAqE;IACrE,IACE,mBAAmB,CAAC,MAAM,CAAC,aAAa,CACtC,WAAW,CAAC,YAAY,CAAC,YAAY,EACrC,WAAW,CAAC,YAAY,CAAC,SAAS,CACnC,KAAK,IAAI,EACV,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,2DAA2D,EAAE;YAC5F,SAAS,EAAE,WAAW,CAAC,YAAY,CAAC,SAAS;YAC7C,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,YAAY;SACpD,CAAC,CAAA;IACJ,CAAC;IAED,4EAA4E;IAC5E,IACE,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,CAC7C,WAAW,CAAC,YAAY,CAAC,SAAS,EAClC,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAC7C,KAAK,KAAK,EACX,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,yEAAyE,EAAE;YAC1G,SAAS,EAAE,WAAW,CAAC,YAAY,CAAC,SAAS;YAC7C,iBAAiB,EAAE,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS;SAChE,CAAC,CAAA;IACJ,CAAC;IAED,kFAAkF;IAClF,IACE,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,CAC7C,WAAW,CAAC,YAAY,CAAC,YAAY,EACrC,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAChD,KAAK,KAAK,EACX,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,+EAA+E,EAAE;YAChH,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,YAAY;YACnD,oBAAoB,EAAE,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY;SACtE,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"syncstate.js","sourceRoot":"","sources":["../../src/sync/syncstate.ts"],"names":[],"mappings":"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"}

package/dist/sync/syncstate.test.js

@@ -1,41 +1,75 @@
+import { assert, expect } from 'vitest';
 import { Vitest } from '@livestore/utils-dev/node-vitest';
 import { Cause, Effect, Exit, Schema } from '@livestore/utils/effect';
-import { assert, expect } from 'vitest';
-import * as EventSequenceNumber from "../schema/EventSequenceNumber/mod.js";
-import * as LiveStoreEvent from "../schema/LiveStoreEvent/mod.js";
-import * as SyncState from "./syncstate.js";
-class TestEvent extends LiveStoreEvent.Client.EncodedWithMeta {
-    payload = 'uninitialized';
-    isClient = false;
-    static new = (seqNum, parentSeqNum, payload, isClient) => {
-        const event = new TestEvent({
-            seqNum: EventSequenceNumber.Client.Composite.make(seqNum),
-            parentSeqNum: EventSequenceNumber.Client.Composite.make(parentSeqNum),
-            name: 'a',
-            args: payload,
-            clientId: 'static-local-id',
-            sessionId: 'static-session-id',
-        });
-        event.payload = payload;
-        event.isClient = isClient;
-        return event;
-    };
-    rebase_ = (parentSeqNum, rebaseGeneration) => {
-        return this.rebase({ parentSeqNum, isClient: this.isClient, rebaseGeneration });
-    };
-}
-const e0_1 = TestEvent.new({ global: 0, client: 1 }, EventSequenceNumber.Client.ROOT, 'a', true);
-const e1_0 = TestEvent.new({ global: 1, client: 0 }, EventSequenceNumber.Client.ROOT, 'a', false);
-const e1_1 = TestEvent.new({ global: 1, client: 1 }, e1_0.seqNum, 'a', true);
-const e1_2 = TestEvent.new({ global: 1, client: 2 }, e1_1.seqNum, 'a', true);
-const e1_3 = TestEvent.new({ global: 1, client: 3 }, e1_2.seqNum, 'a', true);
-const e2_0 = TestEvent.new({ global: 2, client: 0 }, e1_0.seqNum, 'a', false);
-const e2_1 = TestEvent.new({ global: 2, client: 1 }, e2_0.seqNum, 'a', true);
+import * as EventSequenceNumber from '../schema/EventSequenceNumber/mod.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent/mod.js';
+import * as SyncState from './syncstate.js';
+/** Module-scoped JSON codecs; keeping the sync codecs out of Effect generators avoids `schemaSyncInEffect`. */
+const jsonStringify = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
+const jsonParse = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
+const makeTestEvent = ({ seqNum, parentSeqNum, payload, isClientOnly, }) => new LiveStoreEvent.Client.EncodedWithMeta({
+    seqNum: EventSequenceNumber.Client.Composite.make(seqNum),
+    parentSeqNum: EventSequenceNumber.Client.Composite.make(parentSeqNum),
+    name: 'a',
+    // Effect v4 normalizes nested Schema.Class values to their declared schema fields.
+    // Keep this test-only flag inside `args`, which is part of EncodedWithMeta,
+    // instead of relying on subclass fields that are stripped during parsing.
+    args: { payload, isClientOnly },
+    clientId: 'static-local-id',
+    sessionId: 'static-session-id',
+});
+const e0_1 = makeTestEvent({
+    seqNum: { global: 0, client: 1 },
+    parentSeqNum: EventSequenceNumber.Client.ROOT,
+    payload: 'a',
+    isClientOnly: true,
+});
+const e1_0 = makeTestEvent({
+    seqNum: { global: 1, client: 0 },
+    parentSeqNum: EventSequenceNumber.Client.ROOT,
+    payload: 'a',
+    isClientOnly: false,
+});
+const e1_1 = makeTestEvent({
+    seqNum: { global: 1, client: 1 },
+    parentSeqNum: e1_0.seqNum,
+    payload: 'a',
+    isClientOnly: true,
+});
+const e1_2 = makeTestEvent({
+    seqNum: { global: 1, client: 2 },
+    parentSeqNum: e1_1.seqNum,
+    payload: 'a',
+    isClientOnly: true,
+});
+const e1_3 = makeTestEvent({
+    seqNum: { global: 1, client: 3 },
+    parentSeqNum: e1_2.seqNum,
+    payload: 'a',
+    isClientOnly: true,
+});
+const e2_0 = makeTestEvent({
+    seqNum: { global: 2, client: 0 },
+    parentSeqNum: e1_0.seqNum,
+    payload: 'a',
+    isClientOnly: false,
+});
+const e2_1 = makeTestEvent({
+    seqNum: { global: 2, client: 1 },
+    parentSeqNum: e2_0.seqNum,
+    payload: 'a',
+    isClientOnly: true,
+});
 const isEqualEvent = LiveStoreEvent.Client.isEqualEncoded;
-const isClientEvent = (event) => event.isClient;
+const isClientOnlyEvent = (event) => typeof event.args === 'object' &&
+    event.args !== null &&
+    'isClientOnly' in event.args &&
+    event.args.isClientOnly === true;
+const rebaseTestEvent = ({ event, parentSeqNum, rebaseGeneration, }) => event.rebase({ parentSeqNum, isClientOnly: isClientOnlyEvent(event), rebaseGeneration });
+/** Verifies: LS.SYS.SYNC.SS-R01, LS.SYS.SYNC.SS-R02, LS.SYS.SYNC.SS-R03, LS.SYS.SYNC.SS-R05, LS.SYS.SYNC.SS-R06 */
 Vitest.describe('syncstate', () => {
     Vitest.describe('merge', () => {
-        const merge = ({ syncState, payload, ignoreClientEvents = false, }) => SyncState.merge({ syncState, payload, isClientEvent, isEqualEvent, ignoreClientEvents });
+        const merge = ({ syncState, payload, ignoreClientOnlyEvents = false, }) => SyncState.merge({ syncState, payload, isClientOnlyEvent, isEqualEvent, ignoreClientOnlyEvents });
         Vitest.describe('upstream-rebase', () => {
             Vitest.it.effect('should rollback until start', () => Effect.gen(function* () {
                 const syncState = new SyncState.SyncState({
@@ -43,8 +77,8 @@ Vitest.describe('syncstate', () => {
                     upstreamHead: EventSequenceNumber.Client.ROOT,
                     localHead: e2_0.seqNum,
                 });
-                const e1_0_e2_0 = e1_0.rebase_(e2_0.seqNum, 0);
-                const e1_1_e2_1 = e1_1.rebase_(e1_0_e2_0.seqNum, 0);
+                const e1_0_e2_0 = rebaseTestEvent({ event: e1_0, parentSeqNum: e2_0.seqNum, rebaseGeneration: 0 });
+                const e1_1_e2_1 = rebaseTestEvent({ event: e1_1, parentSeqNum: e1_0_e2_0.seqNum, rebaseGeneration: 0 });
                 const result = yield* merge({
                     syncState,
                     payload: SyncState.PayloadUpstreamRebase.make({
@@ -52,7 +86,7 @@ Vitest.describe('syncstate', () => {
                         newEvents: [e1_0_e2_0, e1_1_e2_1],
                     }),
                 });
-                const e2_0_e3_0 = e2_0.rebase_(e1_0_e2_0.seqNum, 1);
+                const e2_0_e3_0 = rebaseTestEvent({ event: e2_0, parentSeqNum: e1_0_e2_0.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e2_0_e3_0]);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e1_1_e2_1.seqNum);
@@ -66,7 +100,7 @@ Vitest.describe('syncstate', () => {
                     upstreamHead: EventSequenceNumber.Client.ROOT,
                     localHead: e2_0.seqNum,
                 });
-                const e1_1_e2_0 = e1_1.rebase_(e1_0.seqNum, 0);
+                const e1_1_e2_0 = rebaseTestEvent({ event: e1_1, parentSeqNum: e1_0.seqNum, rebaseGeneration: 0 });
                 const result = yield* merge({
                     syncState,
                     payload: SyncState.PayloadUpstreamRebase.make({
@@ -74,7 +108,7 @@ Vitest.describe('syncstate', () => {
                         rollbackEvents: [e1_1],
                     }),
                 });
-                const e2_0_e3_0 = e2_0.rebase_(e1_1_e2_0.seqNum, 1);
+                const e2_0_e3_0 = rebaseTestEvent({ event: e2_0, parentSeqNum: e1_1_e2_0.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e2_0_e3_0]);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e1_1_e2_0.seqNum);
@@ -96,7 +130,7 @@ Vitest.describe('syncstate', () => {
                 expectEventArraysEqual(result.newSyncState.pending, []);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.seqNum);
                 expect(result.newSyncState.localHead).toMatchObject(e2_0.seqNum);
-                expect(result.newEvents).toStrictEqual([e2_0]);
+                expectEventArraysEqual(result.newEvents, [e2_0]);
             }));
         });
         Vitest.describe('upstream-advance: advance', () => {
@@ -108,7 +142,7 @@ Vitest.describe('syncstate', () => {
                 });
                 const exit = yield* merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_1, e1_0] } }).pipe(Effect.exit);
                 assert(Exit.isFailure(exit));
-                expect(Cause.isDie(exit.cause)).toBe(true);
+                expect(Cause.hasDies(exit.cause)).toBe(true);
             }));
             Vitest.it.effect('should die if newEvents are not sorted in ascending order by event number (global)', () => Effect.gen(function* () {
                 const syncState = new SyncState.SyncState({
@@ -118,7 +152,7 @@ Vitest.describe('syncstate', () => {
                 });
                 const exit = yield* merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e2_0, e1_0] } }).pipe(Effect.exit);
                 assert(Exit.isFailure(exit));
-                expect(Cause.isDie(exit.cause)).toBe(true);
+                expect(Cause.hasDies(exit.cause)).toBe(true);
             }));
             Vitest.it.effect('should die if incoming event is < expected upstream head', () => Effect.gen(function* () {
                 const syncState = new SyncState.SyncState({
@@ -128,7 +162,7 @@ Vitest.describe('syncstate', () => {
                 });
                 const exit = yield* merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0] } }).pipe(Effect.exit);
                 assert(Exit.isFailure(exit));
-                expect(Cause.isDie(exit.cause)).toBe(true);
+                expect(Cause.hasDies(exit.cause)).toBe(true);
             }));
             Vitest.it.effect('should die if incoming event is = expected upstream head', () => Effect.gen(function* () {
                 const syncState = new SyncState.SyncState({
@@ -138,7 +172,7 @@ Vitest.describe('syncstate', () => {
                 });
                 const exit = yield* merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e2_0] } }).pipe(Effect.exit);
                 assert(Exit.isFailure(exit));
-                expect(Cause.isDie(exit.cause)).toBe(true);
+                expect(Cause.hasDies(exit.cause)).toBe(true);
             }));
             Vitest.it.effect('should confirm pending event when receiving matching event', () => Effect.gen(function* () {
                 const syncState = new SyncState.SyncState({
@@ -182,7 +216,7 @@ Vitest.describe('syncstate', () => {
                 expectEventArraysEqual(result.newSyncState.pending, []);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e1_1.seqNum);
                 expect(result.newSyncState.localHead).toMatchObject(e1_1.seqNum);
-                expect(result.newEvents).toStrictEqual([e1_1]);
+                expectEventArraysEqual(result.newEvents, [e1_1]);
                 expectEventArraysEqual(result.confirmedEvents, [e1_0]);
             }));
             Vitest.it.effect('should confirm pending event and add multiple new events', () => Effect.gen(function* () {
@@ -199,7 +233,7 @@ Vitest.describe('syncstate', () => {
                 expectEventArraysEqual(result.newSyncState.pending, []);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e2_1.seqNum);
                 expect(result.newSyncState.localHead).toMatchObject(e2_1.seqNum);
-                expect(result.newEvents).toStrictEqual([e1_2, e1_3, e2_0, e2_1]);
+                expectEventArraysEqual(result.newEvents, [e1_2, e1_3, e2_0, e2_1]);
                 expectEventArraysEqual(result.confirmedEvents, [e1_1]);
             }));
             Vitest.it.effect('should confirm pending global event while keep pending client events', () => Effect.gen(function* () {
@@ -228,7 +262,7 @@ Vitest.describe('syncstate', () => {
                 const result = yield* merge({
                     syncState,
                     payload: { _tag: 'upstream-advance', newEvents: [e1_0] },
-                    ignoreClientEvents: true,
+                    ignoreClientOnlyEvents: true,
                 });
                 expectAdvance(result);
                 expectEventArraysEqual(result.newSyncState.pending, []);
@@ -246,7 +280,7 @@ Vitest.describe('syncstate', () => {
                 const result = yield* merge({
                     syncState,
                     payload: { _tag: 'upstream-advance', newEvents: [e1_0] },
-                    ignoreClientEvents: true,
+                    ignoreClientOnlyEvents: true,
                 });
                 expectAdvance(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e2_0]);
@@ -264,13 +298,13 @@ Vitest.describe('syncstate', () => {
                 const result = yield* merge({
                     syncState,
                     payload: { _tag: 'upstream-advance', newEvents: [e1_0, e2_0] },
-                    ignoreClientEvents: true,
+                    ignoreClientOnlyEvents: true,
                 });
                 expectAdvance(result);
                 expectEventArraysEqual(result.newSyncState.pending, []);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.seqNum);
                 expect(result.newSyncState.localHead).toMatchObject(e2_0.seqNum);
-                expect(result.newEvents).toStrictEqual([e2_0]);
+                expectEventArraysEqual(result.newEvents, [e2_0]);
                 expectEventArraysEqual(result.confirmedEvents, [e0_1, e1_0, e1_1]);
             }));
             Vitest.it.effect('should die if incoming event is ≤ local head', () => Effect.gen(function* () {
@@ -281,16 +315,16 @@ Vitest.describe('syncstate', () => {
                 });
                 const exit = yield* merge({ syncState, payload: { _tag: 'upstream-advance', newEvents: [e1_0] } }).pipe(Effect.exit);
                 assert(Exit.isFailure(exit));
-                expect(Cause.isDie(exit.cause)).toBe(true);
+                expect(Cause.hasDies(exit.cause)).toBe(true);
             }));
             Vitest.it.effect('should advance (not rebase) when pending event has undefined-valued key dropped by JSON wire round-trip', () => Effect.gen(function* () {
                 const argsSchema = Schema.Struct({
                     id: Schema.String,
-                    flag: Schema.UndefinedOr(Schema.Boolean),
+                    flag: Schema.optional(Schema.Boolean),
                 });
-                const localArgs = Schema.encodeUnknownSync(argsSchema)({ id: 'abc' });
-                const wireArgs = JSON.parse(JSON.stringify(localArgs));
-                const localPending = new TestEvent({
+                const localArgs = yield* Schema.encodeUnknownEffect(argsSchema)({ id: 'abc' }).pipe(Effect.orDie);
+                const wireArgs = jsonParse(jsonStringify(localArgs));
+                const localPending = new LiveStoreEvent.Client.EncodedWithMeta({
                     seqNum: e1_0.seqNum,
                     parentSeqNum: e1_0.parentSeqNum,
                     name: e1_0.name,
@@ -298,7 +332,7 @@ Vitest.describe('syncstate', () => {
                     clientId: e1_0.clientId,
                     sessionId: e1_0.sessionId,
                 });
-                const fromUpstream = new TestEvent({
+                const fromUpstream = new LiveStoreEvent.Client.EncodedWithMeta({
                     seqNum: e1_0.seqNum,
                     parentSeqNum: e1_0.parentSeqNum,
                     name: e1_0.name,
@@ -331,7 +365,7 @@ Vitest.describe('syncstate', () => {
                     syncState,
                     payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_1] }),
                 });
-                const e1_0_e1_2 = e1_0.rebase_(e1_1.seqNum, 1);
+                const e1_0_e1_2 = rebaseTestEvent({ event: e1_0, parentSeqNum: e1_1.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e1_0_e1_2]);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e1_1.seqNum);
@@ -340,7 +374,12 @@ Vitest.describe('syncstate', () => {
                 expectEventArraysEqual(result.newEvents, [e1_1, e1_0_e1_2]);
             }));
             Vitest.it.effect('should rebase different event with same id', () => Effect.gen(function* () {
-                const e2_0_b = TestEvent.new({ global: 1, client: 0 }, e1_0.seqNum, '1_0_b', false);
+                const e2_0_b = makeTestEvent({
+                    seqNum: { global: 1, client: 0 },
+                    parentSeqNum: e1_0.seqNum,
+                    payload: '1_0_b',
+                    isClientOnly: false,
+                });
                 const syncState = new SyncState.SyncState({
                     pending: [e2_0_b],
                     upstreamHead: EventSequenceNumber.Client.ROOT,
@@ -350,7 +389,7 @@ Vitest.describe('syncstate', () => {
                     syncState,
                     payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e2_0] }),
                 });
-                const e2_0_e3_0 = e2_0_b.rebase_(e2_0.seqNum, 1);
+                const e2_0_e3_0 = rebaseTestEvent({ event: e2_0_b, parentSeqNum: e2_0.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e2_0_e3_0]);
                 expectEventArraysEqual(result.newEvents, [e2_0, e2_0_e3_0]);
@@ -368,7 +407,7 @@ Vitest.describe('syncstate', () => {
                     syncState,
                     payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_1, e1_2, e1_3, e2_0] }),
                 });
-                const e1_0_e3_0 = e1_0.rebase_(e2_0.seqNum, 1);
+                const e1_0_e3_0 = rebaseTestEvent({ event: e1_0, parentSeqNum: e2_0.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e1_0_e3_0]);
                 expect(result.newSyncState.upstreamHead).toMatchObject(e2_0.seqNum);
@@ -384,7 +423,7 @@ Vitest.describe('syncstate', () => {
                     syncState,
                     payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_0, e1_2, e1_3, e2_0] }),
                 });
-                const e1_1_e2_1 = e1_1.rebase_(e2_0.seqNum, 1);
+                const e1_1_e2_1 = rebaseTestEvent({ event: e1_1, parentSeqNum: e2_0.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e1_1_e2_1]);
                 expectEventArraysEqual(result.rollbackEvents, [e1_1]);
@@ -402,8 +441,8 @@ Vitest.describe('syncstate', () => {
                     syncState,
                     payload: SyncState.PayloadUpstreamAdvance.make({ newEvents: [e1_1, e1_2, e1_3, e2_0] }),
                 });
-                const e1_0_e2_1 = e1_0.rebase_(e2_0.seqNum, 1);
-                const e1_1_e2_2 = e1_1.rebase_(e1_0_e2_1.seqNum, 1);
+                const e1_0_e2_1 = rebaseTestEvent({ event: e1_0, parentSeqNum: e2_0.seqNum, rebaseGeneration: 1 });
+                const e1_1_e2_2 = rebaseTestEvent({ event: e1_1, parentSeqNum: e1_0_e2_1.seqNum, rebaseGeneration: 1 });
                 expectRebase(result);
                 expectEventArraysEqual(result.newSyncState.pending, [e1_0_e2_1, e1_1_e2_2]);
                 expectEventArraysEqual(result.newEvents, [e1_1, e1_2, e1_3, e2_0, e1_0_e2_1, e1_1_e2_2]);
@@ -441,7 +480,7 @@ Vitest.describe('syncstate', () => {
                         const result = yield* merge({
                             syncState,
                             payload: SyncState.PayloadLocalPush.make({ newEvents: [e0_1] }),
-                            ignoreClientEvents: true,
+                            ignoreClientOnlyEvents: true,
                         });
                         expectAdvance(result);
                         expectEventArraysEqual(result.newSyncState.pending, []);
@@ -458,7 +497,7 @@ Vitest.describe('syncstate', () => {
                         const result = yield* merge({
                             syncState,
                             payload: SyncState.PayloadLocalPush.make({ newEvents: [e0_1, e1_0] }),
-                            ignoreClientEvents: true,
+                            ignoreClientOnlyEvents: true,
                         });
                         expectAdvance(result);
                         expectEventArraysEqual(result.newSyncState.pending, [e1_0]);