@evolu/common 1.0.17 → 2.0.1

package/dist/src/DbWorker.d.ts

@@ -1,11 +1,13 @@
-import { Brand, Context, Effect, Layer, ReadonlyArray, ReadonlyRecord } from "effect";
+import { Context, Effect, Layer, ReadonlyArray, ReadonlyRecord } from "effect";
 import { Config } from "./Config.js";
 import { Bip39, Mnemonic, NanoId } from "./Crypto.js";
-import { Owner, Tables } from "./Db.js";
+import { Queries, Query, Tables } from "./Db.js";
 import { QueryPatches } from "./Diff.js";
-import { EvoluError } from "./Errors.js";
+import { EvoluError } from "./ErrorStore.js";
 import { Id, SqliteDate } from "./Model.js";
-import { Query, Row, Sqlite, Value } from "./Sqlite.js";
+import { OnCompleteId } from "./OnCompletes.js";
+import { Owner } from "./Owner.js";
+import { Sqlite, Value } from "./Sqlite.js";
 import { NewMessage, SyncState, SyncWorker, SyncWorkerOutputSyncResponse } from "./SyncWorker.js";
 export interface DbWorker {
     readonly postMessage: (input: DbWorkerInput) => void;
@@ -16,7 +18,6 @@ export type DbWorkerInput = DbWorkerInputInit | DbWorkerInputQuery | DbWorkerInp
 interface DbWorkerInputInit {
     readonly _tag: "init";
     readonly config: Config;
-    readonly tables: Tables;
 }
 interface DbWorkerInputQuery {
     readonly _tag: "query";
@@ -24,12 +25,12 @@ interface DbWorkerInputQuery {
 }
 interface DbWorkerInputMutate {
     readonly _tag: "mutate";
-    readonly items: ReadonlyArray.NonEmptyReadonlyArray<MutateItem>;
-    readonly queries: ReadonlyArray<Query>;
+    readonly mutations: ReadonlyArray.NonEmptyReadonlyArray<Mutation>;
+    readonly queries: Queries;
 }
 interface DbWorkerInputSync {
     readonly _tag: "sync";
-    readonly queries: ReadonlyArray<Query>;
+    readonly queries: Queries;
 }
 interface DbWorkerInputReset {
     readonly _tag: "reset";
@@ -40,11 +41,11 @@ interface DbWorkerInputEnsureSchema {
     readonly tables: Tables;
 }
 export type DbWorkerOutput = DbWorkerOutputOnError | DbWorkerOutputOnOwner | DbWorkerOutputOnQuery | DbWorkerOutputOnReceive | DbWorkerOutputOnResetOrRestore | DbWorkerOutputOnSyncState;
-interface DbWorkerOutputOnError {
+export interface DbWorkerOutputOnError {
     readonly _tag: "onError";
     readonly error: EvoluError;
 }
-interface DbWorkerOutputOnOwner {
+export interface DbWorkerOutputOnOwner {
     readonly _tag: "onOwner";
     readonly owner: Owner;
 }
@@ -53,7 +54,6 @@ export interface DbWorkerOutputOnQuery {
     readonly queriesPatches: ReadonlyArray<QueryPatches>;
     readonly onCompleteIds: ReadonlyArray<OnCompleteId>;
 }
-export type OnCompleteId = string & Brand.Brand<"Id"> & Brand.Brand<"OnComplete">;
 interface DbWorkerOutputOnReceive {
     readonly _tag: "onReceive";
 }
@@ -64,7 +64,7 @@ interface DbWorkerOutputOnSyncState {
     readonly _tag: "onSyncState";
     readonly state: SyncState;
 }
-export interface MutateItem {
+export interface Mutation {
     readonly table: string;
     readonly id: Id;
     readonly values: ReadonlyRecord.ReadonlyRecord<Value | Date | boolean | undefined>;
@@ -72,8 +72,7 @@ export interface MutateItem {
     readonly now: SqliteDate;
     readonly onCompleteId: OnCompleteId | null;
 }
-export type RowsCacheMap = ReadonlyMap<Query, ReadonlyArray<Row>>;
-export declare const mutateItemsToNewMessages: (items: ReadonlyArray<MutateItem>) => ReadonlyArray<NewMessage>;
+export declare const mutationsToNewMessages: (mutations: ReadonlyArray<Mutation>) => ReadonlyArray<NewMessage>;
 export declare const upsertValueIntoTableRowColumn: (message: NewMessage, messages: ReadonlyArray<NewMessage>) => Effect.Effect<Sqlite, never, void>;
 export declare const DbWorkerLive: Layer.Layer<Bip39 | NanoId | Sqlite | SyncWorker, never, DbWorker>;
 export {};

package/dist/src/DbWorker.d.ts.map

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

package/dist/src/DbWorker.js

@@ -1,36 +1,36 @@
 import { hexToBytes } from "@noble/ciphers/utils";
-import { Context, Effect, Function, Layer, Option, ReadonlyArray, Ref, pipe, } from "effect";
+import { Context, Effect, Function, Layer, Match, Option, ReadonlyArray, pipe, } from "effect";
 import { Config, ConfigLive } from "./Config.js";
 import { Time, TimeLive, diffMerkleTrees, insertIntoMerkleTree, makeSyncTimestamp, merkleTreeToString, receiveTimestamp, sendTimestamp, timestampToString, unsafeTimestampFromString, } from "./Crdt.js";
 import { Bip39, NanoId } from "./Crypto.js";
-import { Owner, ensureSchema, lazyInit, someDefectToNoSuchTableOrColumnError, transaction, } from "./Db.js";
+import { RowsStore, RowsStoreLive, deserializeQuery, ensureSchema, lazyInit, someDefectToNoSuchTableOrColumnError, transaction, } from "./Db.js";
 import { makePatches } from "./Diff.js";
-import { makeUnexpectedError } from "./Errors.js";
+import { makeUnexpectedError } from "./ErrorStore.js";
 import { cast } from "./Model.js";
+import { Owner } from "./Owner.js";
 import * as Sql from "./Sql.js";
-import { Sqlite, queryObjectFromQuery } from "./Sqlite.js";
+import { Sqlite } from "./Sqlite.js";
 import { NewMessageEquivalence, SyncWorker, SyncWorkerPostMessage, } from "./SyncWorker.js";
-export const DbWorker = Context.Tag("evolu/DbWorker");
-const DbWorkerOnMessage = Context.Tag("evolu/DbWorkerOnMessage");
-const init = (input) => Effect.gen(function* (_) {
+export const DbWorker = Context.Tag();
+const DbWorkerOnMessage = Context.Tag();
+const init = Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
     return yield* _(sqlite.exec(Sql.selectOwner), Effect.map(({ rows: [row] }) => ({
         id: row.id,
         mnemonic: row.mnemonic,
         // expo-sqlite 11.3.2 doesn't support Uint8Array
         encryptionKey: hexToBytes(row.encryptionKey),
-    })), someDefectToNoSuchTableOrColumnError, Effect.catchTag("NoSuchTableOrColumnError", () => lazyInit()), Effect.tap(() => ensureSchema(input.tables)));
+    })), someDefectToNoSuchTableOrColumnError, Effect.catchTag("NoSuchTableOrColumnError", () => lazyInit()));
 });
-const RowsCacheRef = Context.Tag("evolu/RowsCacheRef");
 const query = ({ queries, onCompleteIds = [], }) => Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
-    const rowsCache = yield* _(RowsCacheRef);
+    const rowsStore = yield* _(RowsStore);
     const dbWorkerOnMessage = yield* _(DbWorkerOnMessage);
-    const queriesRows = yield* _(Effect.forEach(queries, (query) => sqlite
-        .exec(queryObjectFromQuery(query))
+    const queriesRows = yield* _(ReadonlyArray.dedupe(queries), Effect.forEach((query) => sqlite
+        .exec(deserializeQuery(query))
         .pipe(Effect.map((result) => [query, result.rows]))));
-    const previous = yield* _(Ref.get(rowsCache));
-    yield* _(Ref.set(rowsCache, new Map([...previous, ...queriesRows])));
+    const previous = rowsStore.getState();
+    yield* _(rowsStore.setState(new Map([...previous, ...queriesRows])));
     const queriesPatches = queriesRows.map(([query, rows]) => ({
         query,
         patches: makePatches(previous.get(query), rows),
@@ -41,7 +41,7 @@ const readTimestampAndMerkleTree = Sqlite.pipe(Effect.flatMap((sqlite) => sqlite
     timestamp: unsafeTimestampFromString(timestamp),
     merkleTree: merkleTree,
 })));
-export const mutateItemsToNewMessages = (items) => pipe(items, ReadonlyArray.map(({ id, isInsert, now, table, values }) => pipe(Object.entries(values), ReadonlyArray.filterMap(([key, value]) => 
+export const mutationsToNewMessages = (mutations) => pipe(mutations, ReadonlyArray.map(({ id, isInsert, now, table, values }) => pipe(Object.entries(values), ReadonlyArray.filterMap(([key, value]) => 
 // The value can be undefined if exactOptionalPropertyTypes isn't true.
 // Don't insert nulls because null is the default value.
 value === undefined || (isInsert && value == null)
@@ -125,15 +125,15 @@ const writeTimestampAndMerkleTree = ({ timestamp, merkleTree, }) => Effect.flatM
         merkleTreeToString(merkleTree),
     ],
 }));
-const mutate = ({ items, queries, }) => Effect.gen(function* (_) {
-    const [toSync, localOnlyItems] = ReadonlyArray.partition(items, (item) => item.table.startsWith("_"));
-    const [toUpsert, toDelete] = ReadonlyArray.partition(localOnlyItems, (item) => mutateItemsToNewMessages([item]).some((message) => message.column === "isDeleted" && message.value === 1)).map(mutateItemsToNewMessages);
+const mutate = ({ mutations, queries, }) => Effect.gen(function* (_) {
+    const [toSync, localOnly] = ReadonlyArray.partition(mutations, (item) => item.table.startsWith("_"));
+    const [toUpsert, toDelete] = ReadonlyArray.partition(localOnly, (item) => mutationsToNewMessages([item]).some((message) => message.column === "isDeleted" && message.value === 1)).map(mutationsToNewMessages);
     yield* _(Effect.forEach(toUpsert, (message) => upsertValueIntoTableRowColumn(message, toUpsert)));
     const { exec } = yield* _(Sqlite);
     yield* _(Effect.forEach(toDelete, ({ table, row }) => exec({ sql: Sql.deleteTableRow(table), parameters: [row] })));
     if (toSync.length > 0) {
         let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
-        const messages = yield* _(mutateItemsToNewMessages(toSync), Effect.forEach((message) => Effect.map(sendTimestamp(timestamp), (nextTimestamp) => {
+        const messages = yield* _(mutationsToNewMessages(toSync), Effect.forEach((message) => Effect.map(sendTimestamp(timestamp), (nextTimestamp) => {
             timestamp = nextTimestamp;
             return { ...message, timestamp: timestampToString(timestamp) };
         })));
@@ -149,20 +149,20 @@ const mutate = ({ items, queries, }) => Effect.gen(function* (_) {
             syncLoopCount: 0,
         });
     }
-    const onCompleteIds = ReadonlyArray.filterMap(items, (item) => Option.fromNullable(item.onCompleteId));
+    const onCompleteIds = ReadonlyArray.filterMap(mutations, (item) => Option.fromNullable(item.onCompleteId));
     if (queries.length > 0 || onCompleteIds.length > 0)
         yield* _(query({ queries, onCompleteIds }));
 });
 const handleSyncResponse = ({ messages, ...response }) => Effect.gen(function* (_) {
     let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
+    const dbWorkerOnMessage = yield* _(DbWorkerOnMessage);
     if (messages.length > 0) {
         for (const message of messages)
             timestamp = yield* _(unsafeTimestampFromString(message.timestamp), (remote) => receiveTimestamp({ local: timestamp, remote }));
         merkleTree = yield* _(applyMessages({ merkleTree, messages }));
         yield* _(writeTimestampAndMerkleTree({ timestamp, merkleTree }));
+        dbWorkerOnMessage({ _tag: "onReceive" });
     }
-    const dbWorkerOnMessage = yield* _(DbWorkerOnMessage);
-    dbWorkerOnMessage({ _tag: "onReceive" });
     const diff = diffMerkleTrees(response.merkleTree, merkleTree);
     const syncWorkerPostMessage = yield* _(SyncWorkerPostMessage);
     if (Option.isNone(diff)) {
@@ -176,11 +176,19 @@ const handleSyncResponse = ({ messages, ...response }) => Effect.gen(function* (
         });
         return;
     }
-    const [sqlite, config, owner] = yield* _(Effect.all([Sqlite, Config, Owner]));
+    const sqlite = yield* _(Sqlite);
+    const config = yield* _(Config);
+    const owner = yield* _(Owner);
     const messagesToSync = yield* _(sqlite.exec({
         sql: Sql.selectMessagesToSync,
         parameters: [timestampToString(makeSyncTimestamp(diff.value))],
     }), Effect.map(({ rows }) => rows));
+    if (response.syncLoopCount > 100) {
+        // TODO: dbWorkerOnMessage({ _tag: "onError" });
+        // eslint-disable-next-line no-console
+        console.error("Evolu: syncLoopCount > 100");
+        return;
+    }
     syncWorkerPostMessage({
         _tag: "sync",
         syncUrl: config.syncUrl,
@@ -194,12 +202,10 @@ const handleSyncResponse = ({ messages, ...response }) => Effect.gen(function* (
 const sync = ({ queries, }) => Effect.gen(function* (_) {
     if (queries.length > 0)
         yield* _(query({ queries }));
-    const [syncWorkerPostMessage, config, owner, timestampAndMerkleTree] = yield* _(Effect.all([
-        SyncWorkerPostMessage,
-        Config,
-        Owner,
-        readTimestampAndMerkleTree,
-    ]));
+    const syncWorkerPostMessage = yield* _(SyncWorkerPostMessage);
+    const config = yield* _(Config);
+    const owner = yield* _(Owner);
+    const timestampAndMerkleTree = yield* _(readTimestampAndMerkleTree);
     syncWorkerPostMessage({
         ...timestampAndMerkleTree,
         _tag: "sync",
@@ -224,7 +230,6 @@ const reset = (input) => Effect.gen(function* (_) {
 });
 export const DbWorkerLive = Layer.effect(DbWorker, Effect.gen(function* (_) {
     const syncWorker = yield* _(SyncWorker);
-    const rowsCacheRef = yield* _(Ref.make(new Map()));
     const onError = (error) => Effect.sync(() => {
         dbWorker.onMessage({ _tag: "onError", error });
     });
@@ -240,49 +245,43 @@ export const DbWorkerLive = Layer.effect(DbWorker, Effect.gen(function* (_) {
                 dbWorker.onMessage({ _tag: "onSyncState", state: output });
         }
     };
-    const context = Context.empty().pipe(Context.add(Sqlite, yield* _(Sqlite)), Context.add(Bip39, yield* _(Bip39)), Context.add(NanoId, yield* _(NanoId)));
-    const run = (effect) => effect.pipe(Effect.catchAllDefect(makeUnexpectedError), transaction, Effect.catchAll(onError), Effect.provide(context), Effect.runPromise);
+    const runContext = Context.empty().pipe(Context.add(Sqlite, yield* _(Sqlite)), Context.add(Bip39, yield* _(Bip39)), Context.add(NanoId, yield* _(NanoId)), Context.add(DbWorkerOnMessage, (output) => {
+        dbWorker.onMessage(output);
+    }));
+    const run = (effect) => effect.pipe(Effect.catchAllDefect(makeUnexpectedError), transaction, Effect.catchAll(onError), Effect.provide(runContext), Effect.runPromise);
     // Write for reset only in case init fails.
     const writeForInitFail = (input) => {
         if (input._tag !== "reset")
             return Promise.resolve(undefined);
-        return reset(input).pipe(Effect.provideService(DbWorkerOnMessage, dbWorker.onMessage), Effect.provide(context), run);
+        return reset(input).pipe(run);
     };
-    const makeWriteForInitSuccess = (owner, config) => {
+    const makeWriteForInitSuccess = (config, owner) => {
         let skipAllBecauseOfReset = false;
-        const layer = Layer.mergeAll(ConfigLive(config), Layer.succeed(DbWorkerOnMessage, dbWorker.onMessage), Layer.succeed(Owner, owner), Layer.succeed(SyncWorkerPostMessage, syncWorker.postMessage), Layer.succeed(RowsCacheRef, rowsCacheRef), TimeLive);
-        const mapInputToEffect = (input) => {
-            switch (input._tag) {
-                case "init":
-                    return makeUnexpectedError(new Error("init must be called once"));
-                case "query":
-                    return query(input);
-                case "mutate":
-                    return mutate(input);
-                case "sync":
-                    return sync(input);
-                case "reset":
-                    skipAllBecauseOfReset = true;
-                    return reset(input);
-                case "ensureSchema":
-                    return ensureSchema(input.tables);
-                case "SyncWorkerOutputSyncResponse":
-                    return handleSyncResponse(input);
-            }
-        };
+        const layer = Layer.mergeAll(ConfigLive(config), Layer.succeed(Owner, owner), Layer.succeed(SyncWorkerPostMessage, syncWorker.postMessage), RowsStoreLive, TimeLive);
         return (input) => {
             if (skipAllBecauseOfReset)
                 return Promise.resolve(undefined);
-            return mapInputToEffect(input).pipe(Effect.provide(layer), run);
+            return Match.value(input).pipe(Match.tagsExhaustive({
+                init: () => makeUnexpectedError(new Error("init must be called once")),
+                query,
+                mutate,
+                sync,
+                reset: (input) => {
+                    skipAllBecauseOfReset = true;
+                    return reset(input);
+                },
+                ensureSchema: ({ tables }) => ensureSchema(tables),
+                SyncWorkerOutputSyncResponse: handleSyncResponse,
+            }), Effect.provide(layer), run);
         };
     };
     let write = (input) => {
         if (input._tag !== "init")
             return run(makeUnexpectedError(new Error("init must be called first")));
         write = writeForInitFail;
-        return init(input).pipe(Effect.map((owner) => {
+        return init.pipe(Effect.map((owner) => {
             dbWorker.onMessage({ _tag: "onOwner", owner });
-            write = makeWriteForInitSuccess(owner, input.config);
+            write = makeWriteForInitSuccess(input.config, owner);
         }), run);
     };
     let messageQueue = Promise.resolve(undefined);

package/dist/src/Diff.d.ts

@@ -1,4 +1,6 @@
-import { Query, Row, Value } from "./Sqlite.js";
+import { ReadonlyArray } from "effect";
+import { Query, Row } from "./Db.js";
+import { Value } from "./Sqlite.js";
 export interface QueryPatches {
     readonly query: Query;
     readonly patches: ReadonlyArray<Patch>;

package/dist/src/Diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diff.d.ts","sourceRoot":"","sources":["../../src/Diff.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,KAAK,GAAG,eAAe,GAAG,cAAc,CAAC;AAErD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC;CACrB;AAED,eAAO,MAAM,YAAY,YACb,cAAc,KAAK,CAAC,eACpB,cAAc,GAAG,CAAC,KAAG,cAAc,GAAG,CAYnC,CAAC;AAQhB,eAAO,MAAM,WAAW,iBACR,cAAc,GAAG,CAAC,GAAG,SAAS,YAClC,cAAc,GAAG,CAAC,KAC3B,SAAS,KAAK,EA2BhB,CAAC;AAEF,eAAO,MAAM,QAAQ,MAChB,KAAK,GAAG,GAAG,GAAG,cAAc,GAAG,CAAC,KAChC,KAAK,GAAG,GAAG,GAAG,cAAc,GAAG,CAAC,KAClC,OAkCF,CAAC"}
+{"version":3,"file":"Diff.d.ts","sourceRoot":"","sources":["../../src/Diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,KAAK,GAAG,eAAe,GAAG,cAAc,CAAC;AAErD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC;CACrB;AAED,eAAO,MAAM,YAAY,YACb,cAAc,KAAK,CAAC,eACpB,cAAc,GAAG,CAAC,KAAG,cAAc,GAAG,CASnC,CAAC;AAQhB,eAAO,MAAM,WAAW,iBACR,cAAc,GAAG,CAAC,GAAG,SAAS,YAClC,cAAc,GAAG,CAAC,KAC3B,SAAS,KAAK,EA2BhB,CAAC;AAEF,eAAO,MAAM,QAAQ,MAChB,KAAK,GAAG,GAAG,GAAG,cAAc,GAAG,CAAC,KAChC,KAAK,GAAG,GAAG,GAAG,cAAc,GAAG,CAAC,KAClC,OAkCF,CAAC"}

package/dist/src/Diff.js

@@ -1,14 +1,10 @@
-import { Predicate } from "effect";
-export const applyPatches = (patches) => (current) => patches.reduce((a, patch) => {
+import { Predicate, ReadonlyArray } from "effect";
+export const applyPatches = (patches) => (current) => patches.reduce((next, patch) => {
     switch (patch.op) {
         case "replaceAll":
             return patch.value;
         case "replaceAt": {
-            if (a === undefined)
-                return a;
-            const next = [...a];
-            next[patch.index] = patch.value;
-            return next;
+            return ReadonlyArray.replace(next, patch.index, patch.value);
         }
     }
 }, current);

package/dist/src/{Errors.d.ts → ErrorStore.d.ts}

@@ -1,19 +1,26 @@
 import { Effect } from "effect";
 import { TimestampError } from "./Crdt.js";
+export declare const makeErrorStore: Effect.Effect<never, never, import("./Store.js").Store<EvoluError | null>>;
+/** The EvoluError type is used to represent errors that can occur in Evolu. */
 export type EvoluError = UnexpectedError | TimestampError;
+/**
+ * The UnexpectedError interface is designed to represent errors that can occur
+ * unexpectedly anywhere, even in third-party libraries, because Evolu uses
+ * Effect to track all errors.
+ */
+export interface UnexpectedError {
+    readonly _tag: "UnexpectedError";
+    readonly error: TransferableError;
+}
+export declare const makeUnexpectedError: (error: unknown) => Effect.Effect<never, UnexpectedError, never>;
 /**
  * We can't use the whole error because of WebWorker postMessage DataCloneError
- * in Safari and Firefox.
+ * in Safari and Firefox. TODO:
  * https://discord.com/channels/795981131316985866/795983589644304396/1096736473396564079
  */
 interface TransferableError {
     readonly message: string;
     readonly stack: string | undefined;
 }
-export interface UnexpectedError {
-    readonly _tag: "UnexpectedError";
-    readonly error: TransferableError;
-}
-export declare const makeUnexpectedError: (error: unknown) => Effect.Effect<never, UnexpectedError, never>;
 export {};
-//# sourceMappingURL=Errors.d.ts.map
+//# sourceMappingURL=ErrorStore.d.ts.map

package/dist/src/ErrorStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ErrorStore.d.ts","sourceRoot":"","sources":["../../src/ErrorStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG3C,eAAO,MAAM,cAAc,4EAAqC,CAAC;AAEjE,+EAA+E;AAC/E,MAAM,MAAM,UAAU,GAAG,eAAe,GAAG,cAAc,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;CACnC;AAED,eAAO,MAAM,mBAAmB,UACvB,OAAO,KACb,aAAa,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAU7C,CAAC;AAEF;;;;GAIG;AACH,UAAU,iBAAiB;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC"}

package/dist/src/{Errors.js → ErrorStore.js}

@@ -1,4 +1,6 @@
 import { Effect } from "effect";
+import { makeStore } from "./Store.js";
+export const makeErrorStore = makeStore(null);
 export const makeUnexpectedError = (error) => {
     const isError = error instanceof Error;
     return Effect.fail({