@livestore/common 0.3.0-dev.3 → 0.3.0-dev.31

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)] } },
     }),
-    completeTodo: defineMutation('completeTodo', 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)] },
         }),
     }),
-    uncompleteTodo: defineMutation('uncompleteTodo', 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)] },
         }),
     }),
-    completeTodos: defineMutation('completeTodos', 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,39 +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', {
-        localOnly: true,
+    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) => {
+export const toEventNodes = (partialEvents, eventDefs, clientId, sessionId) => {
     const nodesAcc = [rootEventNode];
     let currentEventId = EventId.ROOT;
-    const getNextEventId = (mutationDef) => {
-        if (mutationDef.options.localOnly) {
-            return { global: currentEventId.global, local: currentEventId.local + 1 };
-        }
-        return { global: currentEventId.global + 1, local: 0 };
-    };
     const eventNodes = partialEvents.map((partialEvent) => {
-        const mutationDef = mutationDefs[partialEvent.mutation];
-        const eventId = getNextEventId(mutationDef);
+        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') {
@@ -112,9 +141,9 @@ export const toEventNodes = (partialEvents, mutationDefs) => {
         //     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') {
@@ -130,19 +159,21 @@ export const toEventNodes = (partialEvents, mutationDefs) => {
         //   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,
+            sessionId,
         };
         nodesAcc.push(node);
         return node;
@@ -153,10 +184,10 @@ export const toEventNodes = (partialEvents, mutationDefs) => {
 };
 const getParentId = (eventId) => {
     const globalParentId = eventId.global;
-    const localParentId = eventId.local - 1;
-    if (localParentId < 0) {
-        return { global: globalParentId - 1, local: 0 };
+    const clientParentId = eventId.client - 1;
+    if (clientParentId < 0) {
+        return EventId.make({ global: globalParentId - 1, client: EventId.clientDefault });
     }
-    return { global: globalParentId, local: localParentId };
+    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

@@ -1,18 +1,44 @@
-import type { Effect, HttpClient, Option, Stream, SubscriptionRef } from '@livestore/utils/effect';
+import type { Effect, HttpClient, Option, Scope, Stream, SubscriptionRef } from '@livestore/utils/effect';
 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';
-export interface SyncBackendOptionsBase {
-    type: string;
-    [key: string]: Schema.JsonValue;
-}
+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.
+ */
+export type MakeBackendArgs = {
+    storeId: string;
+    clientId: string;
+    payload: Schema.JsonValue | undefined;
+};
+export type SyncOptions = {
+    backend?: SyncBackendConstructor<any>;
+    /** @default { _tag: 'Skip' } */
+    initialSyncOptions?: InitialSyncOptions;
+    /**
+     * What to do if there is an error during sync.
+     *
+     * Options:
+     * `shutdown` will stop the sync processor and cause the app to crash.
+     * `ignore` will log the error and let the app continue running acting as if it was offline.
+     *
+     * @default 'ignore'
+     * */
+    onSyncError?: 'shutdown' | 'ignore';
+};
+export type SyncBackendConstructor<TSyncMetadata = Schema.JsonValue> = (args: MakeBackendArgs) => Effect.Effect<SyncBackend<TSyncMetadata>, UnexpectedError, Scope.Scope | HttpClient.HttpClient>;
 export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
+    /**
+     * Can be implemented to prepare a connection to the sync backend to speed up the first pull/push.
+     */
+    connect: Effect.Effect<void, IsOfflineError | UnexpectedError, HttpClient.HttpClient | Scope.Scope>;
     pull: (args: Option.Option<{
         cursor: EventId.EventId;
         metadata: Option.Option<TSyncMetadata>;
     }>) => Stream.Stream<{
         batch: ReadonlyArray<{
-            mutationEventEncoded: MutationEvent.AnyEncoded;
+            eventEncoded: LiveStoreEvent.AnyEncodedGlobal;
             metadata: Option.Option<TSyncMetadata>;
         }>;
         remaining: number;
@@ -23,11 +49,15 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
      * - Number of events: 1-100
      * - event ids must be in ascending order
      * */
-    batch: ReadonlyArray<MutationEvent.AnyEncoded>) => Effect.Effect<{
-        /** Indexes are relative to `batch` */
-        metadata: ReadonlyArray<Option.Option<TSyncMetadata>>;
-    }, 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.)
+     */
+    metadata: {
+        name: string;
+        description: string;
+    } & Record<string, Schema.JsonValue>;
 };
 declare const IsOfflineError_base: Schema.TaggedErrorClass<IsOfflineError, "IsOfflineError", {
     readonly _tag: Schema.tag<"IsOfflineError">;
@@ -42,15 +72,6 @@ declare const InvalidPushError_base: Schema.TaggedErrorClass<InvalidPushError, "
     }>, Schema.TaggedStruct<"ServerAhead", {
         minimumExpectedId: typeof Schema.Number;
         providedId: typeof Schema.Number;
-    }>, Schema.TaggedStruct<"LeaderAhead", {
-        minimumExpectedId: Schema.Struct<{
-            global: typeof Schema.Number;
-            local: typeof Schema.Number;
-        }>;
-        providedId: Schema.Struct<{
-            global: typeof Schema.Number;
-            local: typeof Schema.Number;
-        }>;
     }>]>;
 }>;
 export declare class InvalidPushError extends InvalidPushError_base {
@@ -62,5 +83,19 @@ declare const InvalidPullError_base: Schema.TaggedErrorClass<InvalidPullError, "
 }>;
 export declare class InvalidPullError extends InvalidPullError_base {
 }
+declare const LeaderAheadError_base: Schema.TaggedErrorClass<LeaderAheadError, "LeaderAheadError", {
+    readonly _tag: Schema.tag<"LeaderAheadError">;
+} & {
+    minimumExpectedId: Schema.Struct<{
+        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventId">, number, never>;
+    }>;
+    providedId: Schema.Struct<{
+        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventId">, number, never>;
+    }>;
+}>;
+export declare class LeaderAheadError extends LeaderAheadError_base {
+}
 export {};
 //# sourceMappingURL=sync.d.ts.map

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,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAClG,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAEhE,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,SAAS,CAAA;CAChC;AAED,MAAM,MAAM,WAAW,CAAC,aAAa,GAAG,MAAM,CAAC,SAAS,IAAI;IAC1D,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,UAAU,CAAA;YAC9C,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,UAAU,CAAC,KAC3C,MAAM,CAAC,MAAM,CAChB;QACE,sCAAsC;QACtC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAA;KACtD,EACD,cAAc,GAAG,gBAAgB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAA;IACD,WAAW,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;CACtD,CAAA;;;;AAED,qBAAa,cAAe,SAAQ,mBAA0D;CAAG;;;;;;;;;;;;;;;;;;;;AACjG,qBAAa,gBAAiB,SAAQ,qBAcpC;CAAG;;;;;;AACL,qBAAa,gBAAiB,SAAQ,qBAEpC;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/sync.js

@@ -8,9 +8,6 @@ export class InvalidPushError extends Schema.TaggedError()('InvalidPushError', {
     }), Schema.TaggedStruct('ServerAhead', {
         minimumExpectedId: Schema.Number,
         providedId: Schema.Number,
-    }), Schema.TaggedStruct('LeaderAhead', {
-        minimumExpectedId: EventId.EventId,
-        providedId: EventId.EventId,
     })),
 }) {
 }
@@ -18,4 +15,11 @@ export class InvalidPullError extends Schema.TaggedError()('InvalidPullError', {
     message: Schema.String,
 }) {
 }
+export class LeaderAheadError extends Schema.TaggedError()('LeaderAheadError', {
+    minimumExpectedId: EventId.EventId,
+    providedId: EventId.EventId,
+    /** Generation number the client session should use for subsequent pushes */
+    // nextGeneration: Schema.Number,
+}) {
+}
 //# sourceMappingURL=sync.js.map

package/dist/sync/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AA4C/C,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,WAAW,EAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;CAAG;AACjG,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,MAAM,EAAE,MAAM,CAAC,KAAK,CAClB,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE;QACjC,iBAAiB,EAAE,MAAM,CAAC,MAAM;QAChC,UAAU,EAAE,MAAM,CAAC,MAAM;KAC1B,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE;QACjC,iBAAiB,EAAE,OAAO,CAAC,OAAO;QAClC,UAAU,EAAE,OAAO,CAAC,OAAO;KAC5B,CAAC,CACH;CACF,CAAC;CAAG;AACL,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAqE/C,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,WAAW,EAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;CAAG;AAEjG,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,MAAM,EAAE,MAAM,CAAC,KAAK,CAClB,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE;QACjC,iBAAiB,EAAE,MAAM,CAAC,MAAM;QAChC,UAAU,EAAE,MAAM,CAAC,MAAM;KAC1B,CAAC,CACH;CACF,CAAC;CAAG;AAEL,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG;AAEL,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE;IAC/F,iBAAiB,EAAE,OAAO,CAAC,OAAO;IAClC,UAAU,EAAE,OAAO,CAAC,OAAO;IAC3B,4EAA4E;IAC5E,iCAAiC;CAClC,CAAC;CAAG"}