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

package/dist/query-builder/mod.js

@@ -6,5 +6,12 @@ export * from './impl.js';
  * - Close abstraction to SQLite to provide a simple & convenient API with predictable behaviour
  * - Use table schema definitions to parse, map & validate query results
  * - Implementation detail: Separate type-level & AST-based runtime implementation
+ *
+ * Currently not supported (not exhaustive list):
+ * - Assumes a `id` column as primary key
+ * - Composite primary keys
+ *
+ * Other known limitations
+ * - Doesn't exclude all invalid query patterns on type level `e.g. `db.todos.returning('id')`
  */
 //# sourceMappingURL=mod.js.map

package/dist/query-builder/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/query-builder/mod.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AAEzB;;;;;;GAMG"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/query-builder/mod.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AAEzB;;;;;;;;;;;;;GAaG"}

package/dist/rehydrate-from-eventlog.d.ts

@@ -0,0 +1,14 @@
+import { Effect } from '@livestore/utils/effect';
+import { type SqliteDb, UnexpectedError } from './adapter-types.js';
+import type { ApplyEvent } from './leader-thread/mod.js';
+import type { LiveStoreSchema } from './schema/mod.js';
+export declare const rehydrateFromEventlog: ({ dbEventlog, schema, onProgress, applyEvent, }: {
+    dbEventlog: SqliteDb;
+    schema: LiveStoreSchema;
+    onProgress: (_: {
+        done: number;
+        total: number;
+    }) => Effect.Effect<void>;
+    applyEvent: ApplyEvent;
+}) => Effect.Effect<void, UnexpectedError | import("./adapter-types.js").SqliteError, never>;
+//# sourceMappingURL=rehydrate-from-eventlog.d.ts.map

package/dist/rehydrate-from-eventlog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rehydrate-from-eventlog.d.ts","sourceRoot":"","sources":["../src/rehydrate-from-eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,QAAQ,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAA6B,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAKjF,eAAO,MAAM,qBAAqB,GAAI,iDAOnC;IACD,UAAU,EAAE,QAAQ,CAAA;IAEpB,MAAM,EAAE,eAAe,CAAA;IACvB,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACvE,UAAU,EAAE,UAAU,CAAA;CACvB,2FA0FE,CAAA"}

package/dist/rehydrate-from-eventlog.js

@@ -0,0 +1,65 @@
+import { memoizeByRef } from '@livestore/utils';
+import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
+import { UnexpectedError } from './adapter-types.js';
+import { EventId, EVENTLOG_META_TABLE, getEventDef, LiveStoreEvent } from './schema/mod.js';
+import { sql } from './util.js';
+export const rehydrateFromEventlog = ({ dbEventlog, 
+// TODO re-use this db when bringing back the boot in-memory db implementation
+// db,
+schema, onProgress, applyEvent, }) => Effect.gen(function* () {
+    const eventsCount = dbEventlog.select(`SELECT COUNT(*) AS count FROM ${EVENTLOG_META_TABLE}`)[0]
+        .count;
+    const hashEvent = memoizeByRef((event) => Schema.hash(event.schema));
+    const processEvent = (row) => Effect.gen(function* () {
+        const eventDef = getEventDef(schema, row.name);
+        if (hashEvent(eventDef.eventDef) !== row.schemaHash) {
+            yield* Effect.logWarning(`Schema hash mismatch for mutation ${row.name}. Trying to apply mutation anyway.`);
+        }
+        const args = JSON.parse(row.argsJson);
+        // Checking whether the schema has changed in an incompatible way
+        yield* Schema.decodeUnknown(eventDef.eventDef.schema)(args).pipe(Effect.mapError((cause) => UnexpectedError.make({
+            cause,
+            note: `\
+There was an error during rehydrating from the eventlog while decoding
+the persisted mutation event args for mutation "${row.name}".
+This likely means the schema has changed in an incompatible way.
+`,
+        })));
+        const eventEncoded = LiveStoreEvent.EncodedWithMeta.make({
+            id: { global: row.idGlobal, client: row.idClient },
+            parentId: { global: row.parentIdGlobal, client: row.parentIdClient },
+            name: row.name,
+            args,
+            clientId: row.clientId,
+            sessionId: row.sessionId,
+        });
+        yield* applyEvent(eventEncoded, { skipEventlog: true });
+    }).pipe(Effect.withSpan(`@livestore/common:rehydrateFromEventlog:processEvent`));
+    const CHUNK_SIZE = 100;
+    const stmt = dbEventlog.prepare(sql `\
+SELECT * FROM ${EVENTLOG_META_TABLE} 
+WHERE idGlobal > $idGlobal OR (idGlobal = $idGlobal AND idClient > $idClient)
+ORDER BY idGlobal ASC, idClient ASC
+LIMIT ${CHUNK_SIZE}
+`);
+    let processedEvents = 0;
+    yield* Stream.unfoldChunk({ _tag: 'Initial ' }, (item) => {
+        // End stream if no more rows
+        if (Chunk.isChunk(item) && item.length === 0)
+            return Option.none();
+        const lastId = Chunk.isChunk(item)
+            ? Chunk.last(item).pipe(Option.map((_) => ({ global: _.idGlobal, client: _.idClient })), Option.getOrElse(() => EventId.ROOT))
+            : EventId.ROOT;
+        const nextItem = Chunk.fromIterable(stmt.select({
+            $idGlobal: lastId?.global,
+            $idClient: lastId?.client,
+        }));
+        const prevItem = Chunk.isChunk(item) ? item : Chunk.empty();
+        return Option.some([prevItem, nextItem]);
+    }).pipe(Stream.bufferChunks({ capacity: 2 }), Stream.tap((row) => Effect.gen(function* () {
+        yield* processEvent(row);
+        processedEvents++;
+        yield* onProgress({ done: processedEvents, total: eventsCount });
+    })), Stream.runDrain);
+}).pipe(Effect.withPerformanceMeasure('@livestore/common:rehydrateFromEventlog'), Effect.withSpan('@livestore/common:rehydrateFromEventlog'));
+//# sourceMappingURL=rehydrate-from-eventlog.js.map

package/dist/rehydrate-from-eventlog.js.map

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

package/dist/schema/EventDef.d.ts

@@ -0,0 +1,136 @@
+import type { SingleOrReadonlyArray } from '@livestore/utils';
+import { Schema } from '@livestore/utils/effect';
+import type { QueryBuilder } from '../query-builder/mod.js';
+import type { BindValues } from '../sql-queries/sql-queries.js';
+export type EventDefMap = {
+    map: Map<string | 'livestore.RawSql', EventDef.Any>;
+};
+export type EventDefRecord = {
+    'livestore.RawSql': RawSqlEvent;
+    [name: string]: EventDef.Any;
+};
+export type EventDef<TName extends string, TType, TEncoded = TType, TDerived extends boolean = false> = {
+    name: TName;
+    schema: Schema.Schema<TType, TEncoded>;
+    options: {
+        /**
+         * When set to true, the mutation won't be synced across clients but
+         */
+        clientOnly: boolean;
+        /** Warning: This feature is not fully implemented yet */
+        facts: FactsCallback<TType> | undefined;
+        derived: TDerived;
+    };
+    /** Helper function to construct a partial mutation event */
+    (args: TType): {
+        name: TName;
+        args: TType;
+    };
+    readonly Event: {
+        name: TName;
+        args: TType;
+    };
+};
+export type FactsCallback<TTo> = (args: TTo, currentFacts: EventDefFacts) => {
+    modify: {
+        set: Iterable<EventDefFactInput>;
+        unset: Iterable<EventDefFactInput>;
+    };
+    require: Iterable<EventDefFactInput>;
+};
+export declare namespace EventDef {
+    type Any = EventDef<string, any, any, boolean>;
+    type AnyWithoutFn = Pick<Any, 'name' | 'schema' | 'options'>;
+}
+export type EventDefKey = string;
+export type EventDefFact = string;
+export type EventDefFacts = ReadonlyMap<string, any>;
+export type EventDefFactsGroup = {
+    modifySet: EventDefFacts;
+    modifyUnset: EventDefFacts;
+    /**
+     * Events on independent "dependency" branches are commutative which can facilitate more prioritized syncing
+     */
+    depRequire: EventDefFacts;
+    depRead: EventDefFacts;
+};
+export type EventDefFactsSnapshot = Map<string, any>;
+export type EventDefFactInput = string | readonly [string, any];
+export declare const defineFacts: <TRecord extends Record<string, EventDefFactInput | ((...args: any[]) => EventDefFactInput)>>(record: TRecord) => TRecord;
+export type DefineEventOptions<TTo, TDerived extends boolean = false> = {
+    /** Warning: This feature is not fully implemented yet */
+    facts?: (args: TTo, currentFacts: EventDefFacts) => {
+        modify?: {
+            set?: Iterable<EventDefFactInput>;
+            unset?: Iterable<EventDefFactInput>;
+        };
+        /**
+         * Two purposes: constrain history and constrain compaction
+         */
+        require?: Iterable<EventDefFactInput>;
+    };
+    /**
+     * When set to true, the event won't be synced over the network
+     */
+    clientOnly?: boolean;
+    derived?: TDerived;
+};
+export declare const defineEvent: <TName extends string, TType, TEncoded = TType, TDerived extends boolean = false>(args: {
+    name: TName;
+    schema: Schema.Schema<TType, TEncoded>;
+} & DefineEventOptions<TType, TDerived>) => EventDef<TName, TType, TEncoded, TDerived>;
+export declare const synced: <TName extends string, TType, TEncoded = TType>(args: {
+    name: TName;
+    schema: Schema.Schema<TType, TEncoded>;
+} & Omit<DefineEventOptions<TType, false>, "derived" | "clientOnly">) => EventDef<TName, TType, TEncoded>;
+export declare const clientOnly: <TName extends string, TType, TEncoded = TType>(args: {
+    name: TName;
+    schema: Schema.Schema<TType, TEncoded>;
+} & Omit<DefineEventOptions<TType, false>, "derived" | "clientOnly">) => EventDef<TName, TType, TEncoded>;
+export type MaterializerResult = {
+    sql: string;
+    bindValues: BindValues;
+    writeTables?: ReadonlySet<string>;
+} | QueryBuilder.Any | string;
+export type Materializer<TEventDef extends EventDef.AnyWithoutFn = EventDef.AnyWithoutFn> = (event: TEventDef['schema']['Type'], context: {
+    currentFacts: EventDefFacts;
+    clientOnly: boolean;
+}) => SingleOrReadonlyArray<MaterializerResult>;
+export declare const defineMaterializer: <TEventDef extends EventDef.AnyWithoutFn>(eventDef: TEventDef, materializer: Materializer<TEventDef>) => Materializer<TEventDef>;
+export declare const materializers: <TInputRecord extends Record<string, EventDef.AnyWithoutFn>>(eventDefRecord: TInputRecord, handlers: { [TEventName in TInputRecord[keyof TInputRecord]["name"] as Extract<TInputRecord[keyof TInputRecord], {
+    name: TEventName;
+}>["options"]["derived"] extends true ? never : TEventName]: Materializer<Extract<TInputRecord[keyof TInputRecord], {
+    name: TEventName;
+}>>; }) => { [TEventName in TInputRecord[keyof TInputRecord]["name"] as Extract<TInputRecord[keyof TInputRecord], {
+    name: TEventName;
+}>["options"]["derived"] extends true ? never : TEventName]: Materializer<Extract<TInputRecord[keyof TInputRecord], {
+    name: TEventName;
+}>>; };
+export declare const rawSqlEvent: EventDef<"livestore.RawSql", {
+    readonly sql: string;
+    readonly bindValues?: {
+        readonly [x: string]: any;
+    } | undefined;
+    readonly writeTables?: ReadonlySet<string> | undefined;
+}, {
+    readonly sql: string;
+    readonly bindValues?: {
+        readonly [x: string]: any;
+    } | undefined;
+    readonly writeTables?: readonly string[] | undefined;
+}, true>;
+export declare const rawSqlMaterializer: Materializer<EventDef<"livestore.RawSql", {
+    readonly sql: string;
+    readonly bindValues?: {
+        readonly [x: string]: any;
+    } | undefined;
+    readonly writeTables?: ReadonlySet<string> | undefined;
+}, {
+    readonly sql: string;
+    readonly bindValues?: {
+        readonly [x: string]: any;
+    } | undefined;
+    readonly writeTables?: readonly string[] | undefined;
+}, true>>;
+export type RawSqlEvent = typeof rawSqlEvent;
+//# sourceMappingURL=EventDef.d.ts.map

package/dist/schema/EventDef.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventDef.d.ts","sourceRoot":"","sources":["../../src/schema/EventDef.ts"],"names":[],"mappings":"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"}

package/dist/schema/EventDef.js

@@ -0,0 +1,58 @@
+import { shouldNeverHappen } from '@livestore/utils';
+import { Schema } from '@livestore/utils/effect';
+export const defineFacts = (record) => record;
+export const defineEvent = (args) => {
+    const { name, schema, ...options } = args;
+    const makePartialEvent = (args) => {
+        const res = Schema.validateEither(schema)(args);
+        if (res._tag === 'Left') {
+            shouldNeverHappen(`Invalid event args for event '${name}':`, res.left.message, '\n');
+        }
+        return { name: name, args };
+    };
+    Object.defineProperty(makePartialEvent, 'name', { value: name });
+    Object.defineProperty(makePartialEvent, 'schema', { value: schema });
+    Object.defineProperty(makePartialEvent, 'options', {
+        value: {
+            clientOnly: options?.clientOnly ?? false,
+            facts: options?.facts
+                ? (args, currentFacts) => {
+                    const res = options.facts(args, currentFacts);
+                    return {
+                        modify: {
+                            set: res.modify?.set ? new Set(res.modify.set) : new Set(),
+                            unset: res.modify?.unset ? new Set(res.modify.unset) : new Set(),
+                        },
+                        require: res.require ? new Set(res.require) : new Set(),
+                    };
+                }
+                : undefined,
+            derived: options?.derived ?? false,
+        },
+    });
+    return makePartialEvent;
+};
+export const synced = (args) => defineEvent({ ...args, clientOnly: false });
+export const clientOnly = (args) => defineEvent({ ...args, clientOnly: true });
+export const defineMaterializer = (eventDef, materializer) => {
+    return materializer;
+};
+export const materializers = (eventDefRecord, handlers) => {
+    return handlers;
+};
+export const rawSqlEvent = defineEvent({
+    name: 'livestore.RawSql',
+    schema: Schema.Struct({
+        sql: Schema.String,
+        bindValues: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
+        writeTables: Schema.optional(Schema.ReadonlySet(Schema.String)),
+    }),
+    clientOnly: true,
+    derived: true,
+});
+export const rawSqlMaterializer = defineMaterializer(rawSqlEvent, ({ sql, bindValues, writeTables }) => ({
+    sql,
+    bindValues: bindValues ?? {},
+    writeTables,
+}));
+//# sourceMappingURL=EventDef.js.map

package/dist/schema/EventDef.js.map

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

package/dist/schema/EventId.d.ts

@@ -1,37 +1,57 @@
-import { Schema } from '@livestore/utils/effect';
+import { Brand, Schema } from '@livestore/utils/effect';
+export type ClientEventId = Brand.Branded<number, 'ClientEventId'>;
+export declare const localEventId: Brand.Brand.Constructor<ClientEventId>;
+export declare const ClientEventId: Schema.BrandSchema<number & Brand.Brand<"ClientEventId">, number, never>;
+export type GlobalEventId = Brand.Branded<number, 'GlobalEventId'>;
+export declare const globalEventId: Brand.Brand.Constructor<GlobalEventId>;
+export declare const GlobalEventId: Schema.BrandSchema<number & Brand.Brand<"GlobalEventId">, number, never>;
+export declare const clientDefault: ClientEventId;
 /**
  * LiveStore event id value consisting of a globally unique event sequence number
- * and a local sequence number.
+ * and a client sequence number.
  *
- * The local sequence number is only used for localOnly mutations and starts from 0 for each global sequence number.
+ * The client sequence number is only used for clientOnly events and starts from 0 for each global sequence number.
  */
 export type EventId = {
-    global: number;
-    local: number;
+    global: GlobalEventId;
+    client: ClientEventId;
 };
+/**
+ * NOTE: Client mutation events with a non-0 client id, won't be synced to the sync backend.
+ */
 export declare const EventId: Schema.Struct<{
-    global: typeof Schema.Number;
-    local: typeof Schema.Number;
+    global: Schema.BrandSchema<number & Brand.Brand<"GlobalEventId">, number, never>;
+    /** Only increments for clientOnly events */
+    client: Schema.BrandSchema<number & Brand.Brand<"ClientEventId">, number, never>;
 }>;
 /**
  * Compare two event ids i.e. checks if the first event id is less than the second.
  */
 export declare const compare: (a: EventId, b: EventId) => number;
+/**
+ * Convert an event id to a string representation.
+ */
+export declare const toString: (id: EventId) => string;
+/**
+ * Convert a string representation of an event id to an event id.
+ */
+export declare const fromString: (str: string) => EventId;
 export declare const isEqual: (a: EventId, b: EventId) => boolean;
 export type EventIdPair = {
     id: EventId;
     parentId: EventId;
 };
 export declare const ROOT: {
-    global: number;
-    local: number;
+    global: GlobalEventId;
+    client: ClientEventId;
 };
 export declare const isGreaterThan: (a: EventId, b: EventId) => boolean;
-export declare const nextPair: (id: EventId, isLocal: boolean) => {
-    id: {
-        global: number;
-        local: number;
-    };
-    parentId: EventId;
+export declare const isGreaterThanOrEqual: (a: EventId, b: EventId) => boolean;
+export declare const max: (a: EventId, b: EventId) => EventId;
+export declare const diff: (a: EventId, b: EventId) => {
+    global: number;
+    client: number;
 };
+export declare const make: (id: EventId | typeof EventId.Encoded) => EventId;
+export declare const nextPair: (id: EventId, isLocal: boolean) => EventIdPair;
 //# sourceMappingURL=EventId.d.ts.map

package/dist/schema/EventId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventId.d.ts","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvD,eAAO,MAAM,OAAO;;;EAG0B,CAAA;AAE9C;;GAEG;AACH,eAAO,MAAM,OAAO,MAAO,OAAO,KAAK,OAAO,WAK7C,CAAA;AAED,eAAO,MAAM,OAAO,MAAO,OAAO,KAAK,OAAO,YAAiD,CAAA;AAE/F,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAA;AAE5D,eAAO,MAAM,IAAI;;;CAA6C,CAAA;AAE9D,eAAO,MAAM,aAAa,MAAO,OAAO,KAAK,OAAO,YAEnD,CAAA;AAED,eAAO,MAAM,QAAQ,OAAQ,OAAO,WAAW,OAAO;;;;;;CAUrD,CAAA"}
+{"version":3,"file":"EventId.d.ts","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEvD,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAClE,eAAO,MAAM,YAAY,wCAAiC,CAAA;AAC1D,eAAO,MAAM,aAAa,0EAA6C,CAAA;AAEvE,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAClE,eAAO,MAAM,aAAa,wCAAiC,CAAA;AAC3D,eAAO,MAAM,aAAa,0EAA8C,CAAA;AAExE,eAAO,MAAM,aAAa,EAAe,aAAa,CAAA;AAEtD;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,CAAA;AAOtE;;GAEG;AACH,eAAO,MAAM,OAAO;;IAElB,4CAA4C;;EAQA,CAAA;AAE9C;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,WAK7C,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,GAAI,IAAI,OAAO,WAAuE,CAAA;AAE3G;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,KAAG,OAMxC,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,YAAmD,CAAA;AAEjG,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAA;AAE5D,eAAO,MAAM,IAAI;YAAyB,aAAa;;CAA2C,CAAA;AAElG,eAAO,MAAM,aAAa,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,YAEnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,YAE1D,CAAA;AAED,eAAO,MAAM,GAAG,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,YAEzC,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO;;;CAK1C,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,IAAI,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAG,OAE3D,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,IAAI,OAAO,EAAE,SAAS,OAAO,KAAG,WAUxD,CAAA"}

package/dist/schema/EventId.js

@@ -1,7 +1,24 @@
-import { Schema } from '@livestore/utils/effect';
+import { Brand, Schema } from '@livestore/utils/effect';
+export const localEventId = Brand.nominal();
+export const ClientEventId = Schema.fromBrand(localEventId)(Schema.Int);
+export const globalEventId = Brand.nominal();
+export const GlobalEventId = Schema.fromBrand(globalEventId)(Schema.Int);
+export const clientDefault = 0;
+// export const EventSequenceNumber = Schema.Struct({})
+// export const EventNumber = Schema.Struct({})
+// export const ClientEventNumber = Schema.Struct({})
+// export const GlobalEventNumber = Schema.Struct({})
+/**
+ * NOTE: Client mutation events with a non-0 client id, won't be synced to the sync backend.
+ */
 export const EventId = Schema.Struct({
-    global: Schema.Number,
-    local: Schema.Number,
+    global: GlobalEventId,
+    /** Only increments for clientOnly events */
+    client: ClientEventId,
+    // TODO also provide a way to see "confirmation level" of event (e.g. confirmed by leader/sync backend)
+    // TODO: actually add this field
+    // Client only
+    // generation: Schema.Number.pipe(Schema.optional),
 }).annotations({ title: 'LiveStore.EventId' });
 /**
  * Compare two event ids i.e. checks if the first event id is less than the second.
@@ -10,21 +27,50 @@ export const compare = (a, b) => {
     if (a.global !== b.global) {
         return a.global - b.global;
     }
-    return a.local - b.local;
+    return a.client - b.client;
+};
+/**
+ * Convert an event id to a string representation.
+ */
+export const toString = (id) => (id.client === 0 ? `e${id.global}` : `e${id.global}+${id.client}`);
+/**
+ * Convert a string representation of an event id to an event id.
+ */
+export const fromString = (str) => {
+    const [global, client] = str.slice(1, -1).split(',').map(Number);
+    if (global === undefined || client === undefined) {
+        throw new Error('Invalid event id string');
+    }
+    return { global, client };
 };
-export const isEqual = (a, b) => a.global === b.global && a.local === b.local;
-export const ROOT = { global: -1, local: 0 };
+export const isEqual = (a, b) => a.global === b.global && a.client === b.client;
+export const ROOT = { global: 0, client: clientDefault };
 export const isGreaterThan = (a, b) => {
-    return a.global > b.global || (a.global === b.global && a.local > b.local);
+    return a.global > b.global || (a.global === b.global && a.client > b.client);
+};
+export const isGreaterThanOrEqual = (a, b) => {
+    return a.global > b.global || (a.global === b.global && a.client >= b.client);
+};
+export const max = (a, b) => {
+    return a.global > b.global || (a.global === b.global && a.client > b.client) ? a : b;
+};
+export const diff = (a, b) => {
+    return {
+        global: a.global - b.global,
+        client: a.client - b.client,
+    };
+};
+export const make = (id) => {
+    return Schema.is(EventId)(id) ? id : Schema.decodeSync(EventId)(id);
 };
 export const nextPair = (id, isLocal) => {
     if (isLocal) {
-        return { id: { global: id.global, local: id.local + 1 }, parentId: id };
+        return { id: { global: id.global, client: (id.client + 1) }, parentId: id };
     }
     return {
-        id: { global: id.global + 1, local: 0 },
-        // NOTE we always point to `local: 0` for non-localOnly mutations
-        parentId: { global: id.global, local: 0 },
+        id: { global: (id.global + 1), client: clientDefault },
+        // NOTE we always point to `client: 0` for non-clientOnly events
+        parentId: { global: id.global, client: clientDefault },
     };
 };
 //# sourceMappingURL=EventId.js.map

package/dist/schema/EventId.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventId.js","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAUhD,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM;CACrB,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAA;AAE9C;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE;IAChD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;IAC5B,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAA;AAI/F,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAoB,CAAA;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE;IACtD,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EAAW,EAAE,OAAgB,EAAE,EAAE;IACxD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACzE,CAAC;IAED,OAAO;QACL,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;QACvC,iEAAiE;QACjE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE;KAC1C,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"EventId.js","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"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"}

package/dist/schema/EventId.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EventId.test.d.ts.map

package/dist/schema/EventId.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventId.test.d.ts","sourceRoot":"","sources":["../../src/schema/EventId.test.ts"],"names":[],"mappings":""}

package/dist/schema/EventId.test.js

@@ -0,0 +1,11 @@
+import { Vitest } from '@livestore/utils/node-vitest';
+import { expect } from 'vitest';
+import { EventId } from './mod.js';
+Vitest.describe('EventId', () => {
+    Vitest.test('nextPair', () => {
+        const e_0_0 = EventId.make({ global: 0, client: 0 });
+        expect(EventId.nextPair(e_0_0, false).id).toStrictEqual({ global: 1, client: 0 });
+        expect(EventId.nextPair(e_0_0, true).id).toStrictEqual({ global: 0, client: 1 });
+    });
+});
+//# sourceMappingURL=EventId.test.js.map

package/dist/schema/EventId.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventId.test.js","sourceRoot":"","sources":["../../src/schema/EventId.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAElC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IAC9B,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;QACpD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;QACjF,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;IAClF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}