@livestore/common 0.3.0-dev.5 → 0.3.0-dev.51

package/dist/sync/next/facts.js

@@ -1,22 +1,22 @@
 import { notYetImplemented } from '@livestore/utils';
 import { graphologyDag } from './graphology_.js';
 import { EMPTY_FACT_VALUE } from './history-dag-common.js';
-export const factsSnapshotForEvents = (events, endEventId) => {
+export const factsSnapshotForEvents = (events, endEventSequenceNumber) => {
     const facts = new Map();
     for (const event of events) {
-        if (compareEventIds(event.id, endEventId) > 0) {
+        if (compareEventSequenceNumbers(event.seqNum, endEventSequenceNumber) > 0) {
             return facts;
         }
         applyFactGroup(event.factsGroup, facts);
     }
     return facts;
 };
-export const factsSnapshotForDag = (dag, endEventId) => {
+export const factsSnapshotForDag = (dag, endEventSequenceNumber) => {
     const facts = new Map();
-    const orderedEventIdStrs = graphologyDag.topologicalSort(dag);
-    for (let i = 0; i < orderedEventIdStrs.length; i++) {
-        const event = dag.getNodeAttributes(orderedEventIdStrs[i]);
-        if (endEventId !== undefined && compareEventIds(event.id, endEventId) > 0) {
+    const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag);
+    for (let i = 0; i < orderedEventSequenceNumberStrs.length; i++) {
+        const event = dag.getNodeAttributes(orderedEventSequenceNumberStrs[i]);
+        if (endEventSequenceNumber !== undefined && compareEventSequenceNumbers(event.seqNum, endEventSequenceNumber) > 0) {
             return facts;
         }
         applyFactGroup(event.factsGroup, facts);
@@ -107,7 +107,7 @@ export const factsIntersect = (setA, setB) => {
     }
     return false;
 };
-export const getFactsGroupForMutationArgs = ({ factsCallback, args, currentFacts, }) => {
+export const getFactsGroupForEventArgs = ({ factsCallback, args, currentFacts, }) => {
     const depRead = new Map();
     const factsSnapshotProxy = new Proxy(currentFacts, {
         get: (target, prop) => {
@@ -123,7 +123,7 @@ export const getFactsGroupForMutationArgs = ({ factsCallback, args, currentFacts
                     return target.get(key);
                 };
             }
-            notYetImplemented(`getFactsGroupForMutationArgs: ${prop.toString()} is not yet implemented`);
+            notYetImplemented(`getFactsGroupForEventArgs: ${prop.toString()} is not yet implemented`);
         },
     });
     const factsRes = factsCallback?.(args, factsSnapshotProxy);
@@ -147,10 +147,10 @@ export const getFactsGroupForMutationArgs = ({ factsCallback, args, currentFacts
     };
     return facts;
 };
-export const compareEventIds = (a, b) => {
+export const compareEventSequenceNumbers = (a, b) => {
     if (a.global !== b.global) {
         return a.global - b.global;
     }
-    return a.local - b.local;
+    return a.client - b.client;
 };
 //# sourceMappingURL=facts.js.map

package/dist/sync/next/facts.js.map

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

package/dist/sync/next/history-dag-common.d.ts

@@ -1,5 +1,5 @@
-import * as EventId from '../../schema/EventId.js';
-import type { MutationEventFactsGroup } from '../../schema/mutations.js';
+import type { EventDefFactsGroup } from '../../schema/EventDef.js';
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
 import { graphology } from './graphology_.js';
 export declare const connectionTypeOptions: readonly ["parent", "facts"];
 export type ConnectionType = (typeof connectionTypeOptions)[number];
@@ -12,15 +12,17 @@ export type HistoryDag = graphology.IGraph<HistoryDagNode, {
     type: ConnectionType;
 }>;
 export declare const emptyHistoryDag: () => HistoryDag;
-export declare const rootParentId: EventId.EventId;
+export declare const rootParentNum: EventSequenceNumber.EventSequenceNumber;
 export type HistoryDagNode = {
-    id: EventId.EventId;
-    parentId: EventId.EventId;
-    mutation: string;
+    seqNum: EventSequenceNumber.EventSequenceNumber;
+    parentSeqNum: EventSequenceNumber.EventSequenceNumber;
+    name: string;
     args: any;
     /** Facts are being used for conflict detection and history compaction */
-    factsGroup: MutationEventFactsGroup;
+    factsGroup: EventDefFactsGroup;
     meta?: any;
+    clientId: string;
+    sessionId: string | undefined;
 };
 export declare const rootEventNode: HistoryDagNode;
 export declare const EMPTY_FACT_VALUE: unique symbol;

package/dist/sync/next/history-dag-common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history-dag-common.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,yBAAyB,CAAA;AAClD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,eAAO,MAAM,qBAAqB,8BAA+B,CAAA;AACjE,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEnE;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,CAAA;AAEpF,eAAO,MAAM,eAAe,QAAO,UAK/B,CAAA;AAGJ,eAAO,MAAM,YAAY,iBAAiF,CAAA;AAE1G,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,OAAO,CAAC,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,GAAG,CAAA;IACT,yEAAyE;IACzE,UAAU,EAAE,uBAAuB,CAAA;IACnC,IAAI,CAAC,EAAE,GAAG,CAAA;CACX,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,cAO3B,CAAA;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAA"}
+{"version":3,"file":"history-dag-common.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,KAAK,mBAAmB,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,eAAO,MAAM,qBAAqB,8BAA+B,CAAA;AACjE,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEnE;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,CAAA;AAEpF,eAAO,MAAM,eAAe,QAAO,UAK/B,CAAA;AAGJ,eAAO,MAAM,aAAa,yCAGxB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,YAAY,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IACrD,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,GAAG,CAAA;IACT,yEAAyE;IACzE,UAAU,EAAE,kBAAkB,CAAA;IAC9B,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,cAS3B,CAAA;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAA"}

package/dist/sync/next/history-dag-common.js

@@ -1,4 +1,4 @@
-import * as EventId from '../../schema/EventId.js';
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
 import { graphology } from './graphology_.js';
 export const connectionTypeOptions = ['parent', 'facts'];
 export const emptyHistoryDag = () => new graphology.Graph({
@@ -7,14 +7,19 @@ export const emptyHistoryDag = () => new graphology.Graph({
     type: 'directed',
 });
 // TODO consider making `ROOT_ID` parent to itself
-export const rootParentId = EventId.make({ global: EventId.ROOT.global - 1, local: EventId.localDefault });
+export const rootParentNum = EventSequenceNumber.make({
+    global: EventSequenceNumber.ROOT.global - 1,
+    client: EventSequenceNumber.clientDefault,
+});
 export const rootEventNode = {
-    id: EventId.ROOT,
-    parentId: rootParentId,
+    seqNum: EventSequenceNumber.ROOT,
+    parentSeqNum: rootParentNum,
     // unused below
-    mutation: '__Root__',
+    name: '__Root__',
     args: {},
     factsGroup: { modifySet: new Map(), modifyUnset: new Map(), depRequire: new Map(), depRead: new Map() },
+    clientId: 'root',
+    sessionId: undefined,
 };
 export const EMPTY_FACT_VALUE = Symbol('EMPTY_FACT_VALUE');
 //# sourceMappingURL=history-dag-common.js.map

package/dist/sync/next/history-dag-common.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-dag-common.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAU,CAAA;AAUjE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAe,EAAE,CAC9C,IAAI,UAAU,CAAC,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK;IACrB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,UAAU;CACjB,CAAC,CAAA;AAEJ,kDAAkD;AAClD,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAA;AAY1G,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C,EAAE,EAAE,OAAO,CAAC,IAAI;IAChB,QAAQ,EAAE,YAAY;IACtB,eAAe;IACf,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,EAAE;IACR,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE;CACxG,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAA"}
+{"version":3,"file":"history-dag-common.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,mBAAmB,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAU,CAAA;AAUjE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAe,EAAE,CAC9C,IAAI,UAAU,CAAC,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK;IACrB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,UAAU;CACjB,CAAC,CAAA;AAEJ,kDAAkD;AAClD,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC;IACpD,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;IAC3C,MAAM,EAAE,mBAAmB,CAAC,aAAa;CAC1C,CAAC,CAAA;AAcF,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C,MAAM,EAAE,mBAAmB,CAAC,IAAI;IAChC,YAAY,EAAE,aAAa;IAC3B,eAAe;IACf,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,EAAE;IACR,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE;IACvG,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,SAAS;CACrB,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAA"}

package/dist/sync/next/history-dag.d.ts

@@ -1,6 +1,4 @@
-import type * as EventId from '../../schema/EventId.js';
 import { type HistoryDagNode } from './history-dag-common.js';
-export declare const eventIdToString: (eventId: EventId.EventId) => string;
 export declare const historyDagFromNodes: (dagNodes: HistoryDagNode[], options?: {
     skipFactsCheck: boolean;
 }) => import("./history-dag-common.js").HistoryDag;

package/dist/sync/next/history-dag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history-dag.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,yBAAyB,CAAA;AAEvD,OAAO,EAAmB,KAAK,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAE5F,eAAO,MAAM,eAAe,YAAa,OAAO,CAAC,OAAO,WACgC,CAAA;AAExF,eAAO,MAAM,mBAAmB,aAAc,cAAc,EAAE,YAAY;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,iDA2DpG,CAAA"}
+{"version":3,"file":"history-dag.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,cAAc,EAAiB,MAAM,yBAAyB,CAAA;AAE7F,eAAO,MAAM,mBAAmB,GAAI,UAAU,cAAc,EAAE,EAAE,UAAU;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,iDA6DpG,CAAA"}

package/dist/sync/next/history-dag.js

@@ -1,6 +1,6 @@
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
 import { factsToString, validateFacts } from './facts.js';
-import { emptyHistoryDag, rootParentId } from './history-dag-common.js';
-export const eventIdToString = (eventId) => eventId.local === 0 ? eventId.global.toString() : `${eventId.global}.${eventId.local}`;
+import { emptyHistoryDag, rootParentNum } from './history-dag-common.js';
 export const historyDagFromNodes = (dagNodes, options) => {
     if (options?.skipFactsCheck !== true) {
         const validationResult = validateFacts({
@@ -8,14 +8,16 @@ export const historyDagFromNodes = (dagNodes, options) => {
             initialSnapshot: new Map(),
         });
         if (validationResult.success === false) {
-            throw new Error(`Mutation ${dagNodes[validationResult.index].mutation} requires facts that have not been set yet.\nRequires: ${factsToString(validationResult.requiredFacts)}\nFacts Snapshot: ${factsToString(validationResult.currentSnapshot)}`);
+            throw new Error(`Event ${dagNodes[validationResult.index].name} requires facts that have not been set yet.\nRequires: ${factsToString(validationResult.requiredFacts)}\nFacts Snapshot: ${factsToString(validationResult.currentSnapshot)}`);
         }
     }
     const dag = emptyHistoryDag();
-    dagNodes.forEach((node) => dag.addNode(eventIdToString(node.id), node));
+    dagNodes.forEach((node) => dag.addNode(EventSequenceNumber.toString(node.seqNum), node));
     dagNodes.forEach((node) => {
-        if (eventIdToString(node.parentId) !== eventIdToString(rootParentId)) {
-            dag.addEdge(eventIdToString(node.parentId), eventIdToString(node.id), { type: 'parent' });
+        if (EventSequenceNumber.toString(node.parentSeqNum) !== EventSequenceNumber.toString(rootParentNum)) {
+            dag.addEdge(EventSequenceNumber.toString(node.parentSeqNum), EventSequenceNumber.toString(node.seqNum), {
+                type: 'parent',
+            });
         }
     });
     dagNodes.forEach((node) => {
@@ -23,23 +25,23 @@ export const historyDagFromNodes = (dagNodes, options) => {
         for (const factKey of factKeys) {
             // Find the first ancestor node with a matching fact key (via modifySet or modifyUnset) by traversing the graph backwards via the parent edges
             const depNode = (() => {
-                let currentIdStr = eventIdToString(node.id);
-                while (currentIdStr !== eventIdToString(rootParentId)) {
-                    const parentEdge = dag.inEdges(currentIdStr).find((e) => dag.getEdgeAttribute(e, 'type') === 'parent');
+                let currentSeqNumStr = EventSequenceNumber.toString(node.seqNum);
+                while (currentSeqNumStr !== EventSequenceNumber.toString(rootParentNum)) {
+                    const parentEdge = dag.inEdges(currentSeqNumStr).find((e) => dag.getEdgeAttribute(e, 'type') === 'parent');
                     if (!parentEdge)
                         return null;
-                    const parentIdStr = dag.source(parentEdge);
-                    const parentNode = dag.getNodeAttributes(parentIdStr);
+                    const parentSeqNumStr = dag.source(parentEdge);
+                    const parentNode = dag.getNodeAttributes(parentSeqNumStr);
                     if (parentNode.factsGroup.modifySet.has(factKey) || parentNode.factsGroup.modifyUnset.has(factKey)) {
                         return parentNode;
                     }
-                    currentIdStr = parentIdStr;
+                    currentSeqNumStr = parentSeqNumStr;
                 }
                 return null;
             })();
             if (depNode) {
-                const depNodeIdStr = eventIdToString(depNode.id);
-                const nodeIdStr = eventIdToString(node.id);
+                const depNodeIdStr = EventSequenceNumber.toString(depNode.seqNum);
+                const nodeIdStr = EventSequenceNumber.toString(node.seqNum);
                 if (dag.edges(depNodeIdStr, nodeIdStr).filter((e) => dag.getEdgeAttributes(e).type === 'facts').length === 0) {
                     dag.addEdge(depNodeIdStr, nodeIdStr, { type: 'facts' });
                 }

package/dist/sync/next/history-dag.js.map

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

package/dist/sync/next/rebase-events.d.ts

@@ -1,5 +1,5 @@
-import type * as MutationEvent from '../../schema/MutationEvent.js';
-import type { MutationDef, MutationEventFactsSnapshot } from '../../schema/mutations.js';
+import type { EventDef, EventDefFactsSnapshot } from '../../schema/EventDef.js';
+import type * as LiveStoreEvent from '../../schema/LiveStoreEvent.js';
 import { type FactValidationResult } from './facts.js';
 import type { HistoryDagNode } from './history-dag-common.js';
 export type RebaseEventWithConflict = HistoryDagNode & {
@@ -10,19 +10,21 @@ export type RebaseInput = {
     newRemoteEvents: RebaseEventWithConflict[];
     pendingLocalEvents: RebaseEventWithConflict[];
     validate: (args: {
-        rebasedLocalEvents: MutationEvent.PartialAny[];
-        mutationDefs: Record<string, MutationDef.Any>;
+        rebasedLocalEvents: LiveStoreEvent.PartialAnyDecoded[];
+        eventDefs: Record<string, EventDef.Any>;
     }) => FactValidationResult;
 };
 export type RebaseOutput = {
-    rebasedLocalEvents: MutationEvent.PartialAny[];
+    rebasedLocalEvents: LiveStoreEvent.PartialAnyDecoded[];
 };
 export type RebaseFn = (input: RebaseInput) => RebaseOutput;
 export declare const defaultRebaseFn: RebaseFn;
-export declare const rebaseEvents: ({ rebaseFn, pendingLocalEvents, newRemoteEvents, currentFactsSnapshot, }: {
+export declare const rebaseEvents: ({ rebaseFn, pendingLocalEvents, newRemoteEvents, currentFactsSnapshot, clientId, sessionId, }: {
     pendingLocalEvents: HistoryDagNode[];
     newRemoteEvents: HistoryDagNode[];
     rebaseFn: RebaseFn;
-    currentFactsSnapshot: MutationEventFactsSnapshot;
-}) => ReadonlyArray<MutationEvent.AnyDecoded>;
+    currentFactsSnapshot: EventDefFactsSnapshot;
+    clientId: string;
+    sessionId: string;
+}) => ReadonlyArray<LiveStoreEvent.AnyDecoded>;
 //# sourceMappingURL=rebase-events.d.ts.map

package/dist/sync/next/rebase-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebase-events.d.ts","sourceRoot":"","sources":["../../../src/sync/next/rebase-events.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,aAAa,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAA;AACxF,OAAO,EAGL,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG;IACrD,YAAY,EAAE,SAAS,GAAG,qBAAqB,CAAA;IAC/C,iBAAiB,EAAE,cAAc,EAAE,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,uBAAuB,EAAE,CAAA;IAC1C,kBAAkB,EAAE,uBAAuB,EAAE,CAAA;IAC7C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,kBAAkB,EAAE,aAAa,CAAC,UAAU,EAAE,CAAA;QAC9C,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;KAC9C,KAAK,oBAAoB,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,aAAa,CAAC,UAAU,EAAE,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,YAAY,CAAA;AAE3D,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAA;AAED,eAAO,MAAM,YAAY,6EAKtB;IACD,kBAAkB,EAAE,cAAc,EAAE,CAAA;IACpC,eAAe,EAAE,cAAc,EAAE,CAAA;IACjC,QAAQ,EAAE,QAAQ,CAAA;IAClB,oBAAoB,EAAE,0BAA0B,CAAA;CACjD,KAAG,aAAa,CAAC,aAAa,CAAC,UAAU,CA+CzC,CAAA"}
+{"version":3,"file":"rebase-events.d.ts","sourceRoot":"","sources":["../../../src/sync/next/rebase-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAE/E,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAGL,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG;IACrD,YAAY,EAAE,SAAS,GAAG,qBAAqB,CAAA;IAC/C,iBAAiB,EAAE,cAAc,EAAE,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,uBAAuB,EAAE,CAAA;IAC1C,kBAAkB,EAAE,uBAAuB,EAAE,CAAA;IAC7C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,kBAAkB,EAAE,cAAc,CAAC,iBAAiB,EAAE,CAAA;QACtD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KACxC,KAAK,oBAAoB,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,cAAc,CAAC,iBAAiB,EAAE,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,YAAY,CAAA;AAE3D,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,+FAO1B;IACD,kBAAkB,EAAE,cAAc,EAAE,CAAA;IACpC,eAAe,EAAE,cAAc,EAAE,CAAA;IACjC,QAAQ,EAAE,QAAQ,CAAA;IAClB,oBAAoB,EAAE,qBAAqB,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,KAAG,aAAa,CAAC,cAAc,CAAC,UAAU,CAuD1C,CAAA"}

package/dist/sync/next/rebase-events.js

@@ -1,12 +1,12 @@
-import * as EventId from '../../schema/EventId.js';
-import { applyFactGroups, factsIntersect, getFactsGroupForMutationArgs, validateFacts, } from './facts.js';
+import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
+import { applyFactGroups, factsIntersect, getFactsGroupForEventArgs, validateFacts, } from './facts.js';
 export const defaultRebaseFn = ({ pendingLocalEvents }) => {
     if (pendingLocalEvents.some((_) => _.conflictType === 'missing-requirement')) {
         throw new Error('missing-requirement conflicts must be resolved before rebasing');
     }
     return { rebasedLocalEvents: pendingLocalEvents };
 };
-export const rebaseEvents = ({ rebaseFn, pendingLocalEvents, newRemoteEvents, currentFactsSnapshot, }) => {
+export const rebaseEvents = ({ rebaseFn, pendingLocalEvents, newRemoteEvents, currentFactsSnapshot, clientId, sessionId, }) => {
     const initialSnapshot = new Map(currentFactsSnapshot);
     applyFactGroups(newRemoteEvents.map((event) => event.factsGroup), initialSnapshot);
     // TODO detect and set actual conflict type (overlap or missing-requirement)
@@ -22,21 +22,29 @@ export const rebaseEvents = ({ rebaseFn, pendingLocalEvents, newRemoteEvents, cu
             conflictType: 'overlap',
             conflictingEvents: pendingLocalEvents.filter((pending) => factsIntersect(pending.factsGroup.modifySet, remote.factsGroup.modifySet)),
         })),
-        validate: ({ rebasedLocalEvents, mutationDefs }) => validateFacts({
-            factGroups: rebasedLocalEvents.map((event) => getFactsGroupForMutationArgs({
-                factsCallback: mutationDefs[event.mutation].options.facts,
+        validate: ({ rebasedLocalEvents, eventDefs }) => validateFacts({
+            factGroups: rebasedLocalEvents.map((event) => getFactsGroupForEventArgs({
+                factsCallback: eventDefs[event.name].options.facts,
                 args: event.args,
                 currentFacts: new Map(),
             })),
             initialSnapshot,
         }),
     });
-    const headGlobalId = newRemoteEvents.at(-1).id.global;
+    const headGlobalId = newRemoteEvents.at(-1).seqNum.global;
     return rebasedLocalEvents.map((event, index) => ({
-        id: EventId.make({ global: headGlobalId + index + 1, local: EventId.localDefault }),
-        parentId: EventId.make({ global: headGlobalId + index, local: EventId.localDefault }),
-        mutation: event.mutation,
+        seqNum: EventSequenceNumber.make({
+            global: headGlobalId + index + 1,
+            client: EventSequenceNumber.clientDefault,
+        }),
+        parentSeqNum: EventSequenceNumber.make({
+            global: headGlobalId + index,
+            client: EventSequenceNumber.clientDefault,
+        }),
+        name: event.name,
         args: event.args,
+        clientId,
+        sessionId,
     }));
 };
 //# sourceMappingURL=rebase-events.js.map

package/dist/sync/next/rebase-events.js.map

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

package/dist/sync/next/test/compact-events.calculator.test.js

@@ -1,25 +1,30 @@
-import { defineMutation } from '@livestore/common/schema';
+import { defineEvent } from '@livestore/common/schema';
 import { Schema } from '@livestore/utils/effect';
 import { describe, expect, it } from 'vitest';
 import { compactEvents } from '../compact-events.js';
 import { historyDagFromNodes } from '../history-dag.js';
 import { customSerializer } from './compact-events.test.js';
-import { toEventNodes } from './mutation-fixtures.js';
+import { printEvent, toEventNodes } from './event-fixtures.js';
 expect.addSnapshotSerializer(customSerializer);
 const compact = (events) => {
-    const dag = historyDagFromNodes(toEventNodes(events, mutations));
+    const dag = historyDagFromNodes(toEventNodes(events, eventDefs, 'client-id', 'session-id'));
     const compacted = compactEvents(dag);
     return Array.from(compacted.dag.nodeEntries())
         .map((_) => _.attributes)
-        .map(({ factsGroup, ...rest }) => ({ ...rest, facts: factsGroup }))
+        .map(printEvent)
         .slice(1);
 };
 const facts = {
     multiplyByZero: `multiplyByZero`,
 };
-const mutations = {
-    add: defineMutation('add', Schema.Struct({ value: Schema.Number }), 'UPDATE values SET value = value + $value', {}),
-    multiply: defineMutation('multiply', Schema.Struct({ value: Schema.Number }), 'UPDATE values SET value = value * $value', {
+const eventDefs = {
+    add: defineEvent({
+        name: 'add',
+        schema: Schema.Struct({ value: Schema.Number }),
+    }),
+    multiply: defineEvent({
+        name: 'multiply',
+        schema: Schema.Struct({ value: Schema.Number }),
         facts: ({ value }, currentFacts) => ({
             modify: {
                 set: value === 0 || currentFacts.has(facts.multiplyByZero) ? [facts.multiplyByZero] : [],
@@ -32,68 +37,68 @@ const mutations = {
 describe('compactEvents calculator', () => {
     it('1 + 1', () => {
         const expected = compact([
-            mutations.add({ value: 1 }), // 0
-            mutations.add({ value: 1 }), // 1
+            eventDefs.add({ value: 1 }), // 0
+            eventDefs.add({ value: 1 }), // 1
         ]);
         expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "add", args: { value: 1 }, facts: "" }
-        { id: 1, parentId: 0, mutation: "add", args: { value: 1 }, facts: "" }
+        { seqNum: "e1", parentSeqNum: "e0", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
+        { seqNum: "e2", parentSeqNum: "e1", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
       ]
     `);
     });
     it('2 * 2', () => {
         const expected = compact([
-            mutations.multiply({ value: 2 }), // 0
-            mutations.multiply({ value: 2 }), // 1
+            eventDefs.multiply({ value: 2 }), // 0
+            eventDefs.multiply({ value: 2 }), // 1
         ]);
         expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "multiply", args: { value: 2 }, facts: "?multiplyByZero -multiplyByZero" }
-        { id: 1, parentId: 0, mutation: "multiply", args: { value: 2 }, facts: "?multiplyByZero -multiplyByZero" }
+        { seqNum: "e1", parentSeqNum: "e0", name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero -multiplyByZero" }
+        { seqNum: "e2", parentSeqNum: "e1", name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero -multiplyByZero" }
       ]
     `);
     });
     it('2 * 2 * 0', () => {
         const expected = compact([
-            mutations.multiply({ value: 2 }), // 0
-            mutations.multiply({ value: 2 }), // 1
-            mutations.multiply({ value: 0 }), // 2
+            eventDefs.multiply({ value: 2 }), // 0
+            eventDefs.multiply({ value: 2 }), // 1
+            eventDefs.multiply({ value: 0 }), // 2
         ]);
         expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 2, parentId: -1, mutation: "multiply", args: { value: 0 }, facts: "+multiplyByZero" }
+        { seqNum: "e3", parentSeqNum: "e0", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
       ]
     `);
     });
     it('2 * 2 * 0 + 1', () => {
         const expected = compact([
-            mutations.multiply({ value: 2 }), // 0
-            mutations.multiply({ value: 2 }), // 1
-            mutations.multiply({ value: 0 }), // 2
-            mutations.add({ value: 1 }), // 3
+            eventDefs.multiply({ value: 2 }), // 0
+            eventDefs.multiply({ value: 2 }), // 1
+            eventDefs.multiply({ value: 0 }), // 2
+            eventDefs.add({ value: 1 }), // 3
         ]);
         expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 2, parentId: -1, mutation: "multiply", args: { value: 0 }, facts: "+multiplyByZero" }
-        { id: 3, parentId: 2, mutation: "add", args: { value: 1 }, facts: "" }
+        { seqNum: "e3", parentSeqNum: "e0", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
+        { seqNum: "e4", parentSeqNum: "e3", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
       ]
     `);
     });
     it('1 + 2 * 0 * 2 + 1', () => {
         const expected = compact([
-            mutations.add({ value: 1 }), // 0
-            mutations.multiply({ value: 2 }), // 1
-            mutations.multiply({ value: 0 }), // 2
-            mutations.multiply({ value: 2 }), // 3
-            mutations.add({ value: 1 }), // 4
+            eventDefs.add({ value: 1 }), // 0
+            eventDefs.multiply({ value: 2 }), // 1
+            eventDefs.multiply({ value: 0 }), // 2
+            eventDefs.multiply({ value: 2 }), // 3
+            eventDefs.add({ value: 1 }), // 4
         ]);
         expect(expected).toMatchInlineSnapshot(`
       [
-        { id: 0, parentId: -1, mutation: "add", args: { value: 1 }, facts: "" }
-        { id: 2, parentId: 0, mutation: "multiply", args: { value: 0 }, facts: "+multiplyByZero" }
-        { id: 3, parentId: 2, mutation: "multiply", args: { value: 2 }, facts: "?multiplyByZero +multiplyByZero -multiplyByZero" }
-        { id: 4, parentId: 3, mutation: "add", args: { value: 1 }, facts: "" }
+        { seqNum: "e1", parentSeqNum: "e0", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
+        { seqNum: "e3", parentSeqNum: "e1", name: "multiply", args: { value: 0 }, clientId: "client-id", sessionId: "session-id", facts: "+multiplyByZero" }
+        { seqNum: "e4", parentSeqNum: "e3", name: "multiply", args: { value: 2 }, clientId: "client-id", sessionId: "session-id", facts: "?multiplyByZero +multiplyByZero -multiplyByZero" }
+        { seqNum: "e5", parentSeqNum: "e4", name: "add", args: { value: 1 }, clientId: "client-id", sessionId: "session-id", facts: "" }
       ]
     `);
     });

package/dist/sync/next/test/compact-events.calculator.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"compact-events.calculator.test.js","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.calculator.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compact-events.calculator.test.js","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.calculator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAE9D,MAAM,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAA;AAE9C,MAAM,OAAO,GAAG,CAAC,MAAa,EAAE,EAAE;IAChC,MAAM,GAAG,GAAG,mBAAmB,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;IAC3F,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IAEpC,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;SAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SACxB,GAAG,CAAC,UAAU,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,CAAA;AACb,CAAC,CAAA;AAED,MAAM,KAAK,GAAG;IACZ,cAAc,EAAE,gBAAgB;CACjC,CAAA;AAED,MAAM,SAAS,GAAG;IAChB,GAAG,EAAE,WAAW,CAAC;QACf,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;KAChD,CAAC;IACF,QAAQ,EAAE,WAAW,CAAC;QACpB,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAC/C,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;YACnC,MAAM,EAAE;gBACN,GAAG,EAAE,KAAK,KAAK,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;gBACxF,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;aACjD;SACF,CAAC;KACH,CAAC;IACF,sBAAsB;CACvB,CAAA;AAED,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACf,MAAM,QAAQ,GAAG,OAAO,CAAC;YACvB,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACjC,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;SAClC,CAAC,CAAA;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC;;;;;KAKtC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACf,MAAM,QAAQ,GAAG,OAAO,CAAC;YACvB,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;SACvC,CAAC,CAAA;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC;;;;;KAKtC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;QACnB,MAAM,QAAQ,GAAG,OAAO,CAAC;YACvB,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;SACvC,CAAC,CAAA;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC;;;;KAItC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC;YACvB,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;SAClC,CAAC,CAAA;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC;;;;;KAKtC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC;YACvB,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACjC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;YACtC,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;SAClC,CAAC,CAAA;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC;;;;;;;KAOtC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}