@evolu/common 3.1.2 → 3.1.3

package/dist/src/Owner.js

@@ -2,7 +2,7 @@ import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import { urlAlphabet } from "nanoid";
 import { Bip39, slip21Derive } from "./Crypto.js";
-export const Owner = Context.Tag();
+export const Owner = Context.GenericTag("@services/Owner");
 export const makeOwner = (mnemonic) => Effect.gen(function* (_) {
     const bip39 = yield* _(Bip39);
     if (mnemonic == null)

package/dist/src/Platform.d.ts

@@ -10,12 +10,12 @@ export interface SyncLock {
      * Try to acquire a sync lock. The caller must not call sync if a sync lock
      * can't be acquired.
      */
-    readonly acquire: Effect.Effect<never, never, boolean>;
+    readonly acquire: Effect.Effect<boolean>;
     /** Release a sync lock. */
-    readonly release: Effect.Effect<never, never, void>;
+    readonly release: Effect.Effect<void>;
 }
 export declare const SyncLock: Context.Tag<SyncLock, SyncLock>;
-export type Fetch = (url: string, body: Uint8Array) => Effect.Effect<never, FetchError, Response>;
+export type Fetch = (url: string, body: Uint8Array) => Effect.Effect<Response, FetchError>;
 export declare const Fetch: Context.Tag<Fetch, Fetch>;
 /**
  * This error occurs when there is a problem with the network connection, or the
@@ -24,13 +24,13 @@ export declare const Fetch: Context.Tag<Fetch, Fetch>;
 export interface FetchError {
     readonly _tag: "FetchError";
 }
-export declare const FetchLive: Layer.Layer<never, never, Fetch>;
+export declare const FetchLive: Layer.Layer<Fetch, never, never>;
 interface AppStateConfig {
     readonly onRequestSync: () => void;
 }
 export interface AppState {
     readonly init: (config: AppStateConfig) => void;
-    readonly reset: Effect.Effect<never, never, void>;
+    readonly reset: Effect.Effect<void>;
 }
 export declare const AppState: Context.Tag<AppState, AppState>;
 /** To detect whether DOM can be used. */

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

@@ -1 +1 @@
-{"version":3,"file":"Platform.d.ts","sourceRoot":"","sources":["../../src/Platform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,eAAe,GACf,kBAAkB,GAClB,cAAc,CAAC;AAEnB,eAAO,MAAM,YAAY,yCAA8B,CAAC;AAExD,MAAM,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;AAEvD,eAAO,MAAM,SAAS,mCAA2B,CAAC;AAElD,MAAM,WAAW,QAAQ;IACvB;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAEvD,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,QAAQ,iCAA0B,CAAC;AAEhD,MAAM,MAAM,KAAK,GAAG,CAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,KACb,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AAEhD,eAAO,MAAM,KAAK,2BAAuB,CAAC;AAE1C;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;CAC7B;AAED,eAAO,MAAM,SAAS,kCAgBrB,CAAC;AAEF,UAAU,cAAc;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,QAAQ,iCAA0B,CAAC;AAEhD,yCAAyC;AACzC,eAAO,MAAM,SAAS,SAYlB,CAAC"}
+{"version":3,"file":"Platform.d.ts","sourceRoot":"","sources":["../../src/Platform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,eAAe,GACf,kBAAkB,GAClB,cAAc,CAAC;AAEnB,eAAO,MAAM,YAAY,yCAExB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;AAEvD,eAAO,MAAM,SAAS,mCAAuD,CAAC;AAE9E,MAAM,WAAW,QAAQ;IACvB;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEzC,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,eAAO,MAAM,QAAQ,iCAAqD,CAAC;AAE3E,MAAM,MAAM,KAAK,GAAG,CAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,KACb,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AAEzC,eAAO,MAAM,KAAK,2BAA+C,CAAC;AAElE;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;CAC7B;AAED,eAAO,MAAM,SAAS,kCAgBrB,CAAC;AAEF,UAAU,cAAc;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CACrC;AAED,eAAO,MAAM,QAAQ,iCAAqD,CAAC;AAE3E,yCAAyC;AACzC,eAAO,MAAM,SAAS,SAYlB,CAAC"}

package/dist/src/Platform.js

@@ -1,10 +1,10 @@
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-export const PlatformName = Context.Tag();
-export const FlushSync = Context.Tag();
-export const SyncLock = Context.Tag();
-export const Fetch = Context.Tag();
+export const PlatformName = Context.GenericTag("@services/PlatformName");
+export const FlushSync = Context.GenericTag("@services/FlushSync");
+export const SyncLock = Context.GenericTag("@services/SyncLock");
+export const Fetch = Context.GenericTag("@services/Fetch");
 export const FetchLive = Layer.succeed(Fetch, Fetch.of((url, body) => Effect.tryPromise({
     try: () => fetch(url, {
         method: "POST",
@@ -16,7 +16,7 @@ export const FetchLive = Layer.succeed(Fetch, Fetch.of((url, body) => Effect.try
     }),
     catch: () => ({ _tag: "FetchError" }),
 })));
-export const AppState = Context.Tag();
+export const AppState = Context.GenericTag("@services/AppState");
 /** To detect whether DOM can be used. */
 export const canUseDom = (() => {
     // IDK why try-catch is necessary, but it is.

package/dist/src/Sqlite.d.ts

@@ -3,7 +3,7 @@ import * as Effect from "effect/Effect";
 import * as Predicate from "effect/Predicate";
 import * as ReadonlyRecord from "effect/ReadonlyRecord";
 export interface Sqlite {
-    readonly exec: (arg: string | SqliteQuery) => Effect.Effect<never, never, ExecResult>;
+    readonly exec: (arg: string | SqliteQuery) => Effect.Effect<ExecResult>;
 }
 export declare const Sqlite: Context.Tag<Sqlite, Sqlite>;
 export interface SqliteQuery {

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

@@ -1 +1 @@
-{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../src/Sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,CACb,GAAG,EAAE,MAAM,GAAG,WAAW,KACtB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;CAC9C;AAED,eAAO,MAAM,MAAM,6BAAwB,CAAC;AAE5C,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;CAC9B;AAED,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,iBAAiB,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAC9D,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAC;AACvD,KAAK,UAAU,GAAG,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACtD,KAAK,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AACrC,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,GAAG,SAAS,CAAC;AAEtE,UAAU,UAAU;IAClB,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,EAAE,SAAS,CAAC,UAAU,CACpD,KAAK,EACL,iBAAiB,CAE4D,CAAC;AAEhF,eAAO,MAAM,oBAAoB,WACvB,cAAc,KAAK,CAAC,KAC3B,WAAW,EAGX,CAAC;AAEJ,eAAO,MAAM,iBAAiB,QAAS,MAAM,GAAG,WAAW,KAAG,WAG7D,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,SAAS,EAAE,KAAG,SAAS,EAC1C,CAAC;AA0BnB,eAAO,MAAM,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CACpB,CAAC"}
+{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../src/Sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,KAAK,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CACzE;AAED,eAAO,MAAM,MAAM,6BAAiD,CAAC;AAErE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;CAC9B;AAED,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,iBAAiB,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAC9D,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAC;AACvD,KAAK,UAAU,GAAG,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACtD,KAAK,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AACrC,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,GAAG,SAAS,CAAC;AAEtE,UAAU,UAAU;IAClB,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,EAAE,SAAS,CAAC,UAAU,CACpD,KAAK,EACL,iBAAiB,CAE4D,CAAC;AAEhF,eAAO,MAAM,oBAAoB,WACvB,cAAc,KAAK,CAAC,KAC3B,WAAW,EAGX,CAAC;AAEJ,eAAO,MAAM,iBAAiB,QAAS,MAAM,GAAG,WAAW,KAAG,WAG7D,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,SAAS,EAAE,KAAG,SAAS,EAC1C,CAAC;AA0BnB,eAAO,MAAM,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CACpB,CAAC"}

package/dist/src/Sqlite.js

@@ -1,6 +1,6 @@
 import * as Context from "effect/Context";
 import * as Predicate from "effect/Predicate";
-export const Sqlite = Context.Tag();
+export const Sqlite = Context.GenericTag("@services/Sqlite");
 export const isJsonObjectOrArray = (value) => value !== null && typeof value === "object" && !Predicate.isUint8Array(value);
 export const valuesToSqliteValues = (values) => values.map((value) => isJsonObjectOrArray(value) ? JSON.stringify(value) : value);
 export const ensureSqliteQuery = (arg) => {

package/dist/src/Store.d.ts

@@ -4,7 +4,7 @@ export type Unsubscribe = () => void;
 export interface Store<T> {
     readonly subscribe: (listener: Listener) => Unsubscribe;
     readonly getState: () => T;
-    readonly setState: (state: T) => Effect.Effect<never, never, void>;
+    readonly setState: (state: T) => Effect.Effect<void>;
 }
-export declare const makeStore: <T>(initialState: T) => Effect.Effect<never, never, Store<T>>;
+export declare const makeStore: <T>(initialState: T) => Effect.Effect<Store<T>, never, never>;
 //# sourceMappingURL=Store.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../src/Store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,MAAM,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,MAAM,WAAW,KAAK,CAAC,CAAC;IAEtB,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,WAAW,CAAC;IACxD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAG3B,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;CACpE;AAED,eAAO,MAAM,SAAS,+DA4BlB,CAAC"}
+{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../src/Store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,MAAM,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,MAAM,WAAW,KAAK,CAAC,CAAC;IAEtB,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,WAAW,CAAC;IACxD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAG3B,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CACtD;AAED,eAAO,MAAM,SAAS,+DA0BlB,CAAC"}

package/dist/src/SyncWorker.d.ts

@@ -76,6 +76,6 @@ export interface SyncStateServerError {
 export interface SyncStatePaymentRequiredError {
     readonly _tag: "PaymentRequiredError";
 }
-export declare const SyncWorkerLive: Layer.Layer<SecretBox | SyncLock | Fetch, never, SyncWorker>;
+export declare const SyncWorkerLive: Layer.Layer<SyncWorker, never, SecretBox | SyncLock | Fetch>;
 export {};
 //# sourceMappingURL=SyncWorker.d.ts.map

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

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

package/dist/src/SyncWorker.js

@@ -15,13 +15,13 @@ import { SecretBox } from "./Crypto.js";
 import { makeUnexpectedError } from "./ErrorStore.js";
 import { Fetch, SyncLock } from "./Platform.js";
 import { MessageContent, SyncRequest, SyncResponse, } from "./Protobuf.js";
-export const SyncWorker = Context.Tag();
-export const SyncWorkerPostMessage = Context.Tag();
+export const SyncWorker = Context.GenericTag("@services/SyncWorker");
+export const SyncWorkerPostMessage = Context.GenericTag("@services/SyncWorkerPostMessage");
 export const NewMessageEquivalence = (a, b) => a.table === b.table &&
     a.row === b.row &&
     a.column === b.column &&
     JSON.stringify(a.value) === JSON.stringify(b.value);
-const SyncWorkerOnMessage = Context.Tag();
+const SyncWorkerOnMessage = Context.GenericTag("@services/SyncWorkerOnMessage");
 const version1 = new Uint8Array([0, 1]);
 const valueToProtobuf = (value) => {
     switch (typeof value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/common",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Local-first platform designed for privacy, ease of use, and no vendor lock-in to sync and backup people's lifetime data",
   "keywords": [
     "evolu",
@@ -44,7 +44,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@noble/ciphers": "^0.4.1",
+    "@noble/ciphers": "^0.5.1",
     "@noble/hashes": "^1.3.3",
     "@protobuf-ts/runtime": "^2.9.3",
     "@scure/bip39": "^1.2.2",
@@ -52,11 +52,11 @@
     "nanoid": "^5.0.5"
   },
   "devDependencies": {
-    "@effect/schema": "^0.61.7",
+    "@effect/schema": "^0.62.1",
     "@protobuf-ts/plugin": "^2.9.3",
     "@protobuf-ts/protoc": "^2.9.3",
     "array-shuffle": "^3.0.0",
-    "effect": "2.2.5",
+    "effect": "2.3.1",
     "eslint": "^8.56.0",
     "typescript": "^5.3.3",
     "vitest": "^1.2.2",
@@ -64,8 +64,8 @@
     "eslint-config-evolu": "1.0.0"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.61.7",
-    "effect": "2.2.5"
+    "@effect/schema": "^0.62.1",
+    "effect": "2.3.1"
   },
   "publishConfig": {
     "access": "public"

package/src/Config.ts

@@ -18,11 +18,9 @@ export interface Config {
   readonly maxDrift: number;
 }
 
-export const Config = Context.Tag<Config>();
+export const Config = Context.GenericTag<Config>("@services/Config");
 
-export const ConfigLive = (
-  config?: Partial<Config>,
-): Layer.Layer<never, never, Config> =>
+export const ConfigLive = (config?: Partial<Config>): Layer.Layer<Config> =>
   Layer.succeed(
     Config,
     Config.of({

package/src/Crdt.ts

@@ -98,10 +98,10 @@ export const makeInitialTimestamp = NanoId.pipe(
 );
 
 export interface Time {
-  readonly now: Effect.Effect<never, TimestampTimeOutOfRangeError, Millis>;
+  readonly now: Effect.Effect<Millis, TimestampTimeOutOfRangeError>;
 }
 
-export const Time = Context.Tag<Time>();
+export const Time = Context.GenericTag<Time>("@services/Time");
 
 export const TimeLive = Layer.succeed(
   Time,
@@ -149,9 +149,9 @@ export interface TimestampTimeOutOfRangeError {
 const getNextMillis = (
   millis: ReadonlyArray<Millis>,
 ): Effect.Effect<
-  Time | Config,
+  Millis,
   TimestampDriftError | TimestampTimeOutOfRangeError,
-  Millis
+  Time | Config
 > =>
   Effect.gen(function* (_) {
     const time = yield* _(Time);
@@ -186,11 +186,11 @@ const counterMin = S.decodeSync(Counter)(0);
 export const sendTimestamp = (
   timestamp: Timestamp,
 ): Effect.Effect<
-  Time | Config,
+  Timestamp,
   | TimestampDriftError
   | TimestampCounterOverflowError
   | TimestampTimeOutOfRangeError,
-  Timestamp
+  Time | Config
 > =>
   Effect.gen(function* (_) {
     const millis = yield* _(getNextMillis([timestamp.millis]));
@@ -208,12 +208,12 @@ export const receiveTimestamp = ({
   readonly local: Timestamp;
   readonly remote: Timestamp;
 }): Effect.Effect<
-  Time | Config,
+  Timestamp,
   | TimestampDriftError
   | TimestampCounterOverflowError
   | TimestampDuplicateNodeError
   | TimestampTimeOutOfRangeError,
-  Timestamp
+  Time | Config
 > =>
   Effect.gen(function* (_) {
     if (local.node === remote.node)

package/src/Crypto.ts

@@ -12,18 +12,16 @@ import { customAlphabet, nanoid } from "nanoid";
 
 // TODO: Add dynamic import error.
 export interface Bip39 {
-  readonly make: Effect.Effect<never, never, Mnemonic>;
+  readonly make: Effect.Effect<Mnemonic>;
 
-  readonly toSeed: (
-    mnemonic: Mnemonic,
-  ) => Effect.Effect<never, never, Uint8Array>;
+  readonly toSeed: (mnemonic: Mnemonic) => Effect.Effect<Uint8Array>;
 
   readonly parse: (
     mnemonic: string,
-  ) => Effect.Effect<never, InvalidMnemonicError, Mnemonic>;
+  ) => Effect.Effect<Mnemonic, InvalidMnemonicError>;
 }
 
-export const Bip39 = Context.Tag<Bip39>();
+export const Bip39 = Context.GenericTag<Bip39>("@services/Bip39");
 
 export interface InvalidMnemonicError {
   readonly _tag: "InvalidMnemonicError";
@@ -39,11 +37,11 @@ export interface InvalidMnemonicError {
 export type Mnemonic = string & Brand.Brand<"Mnemonic">;
 
 export interface NanoId {
-  readonly nanoid: Effect.Effect<never, never, string>;
-  readonly nanoidAsNodeId: Effect.Effect<never, never, NodeId>;
+  readonly nanoid: Effect.Effect<string>;
+  readonly nanoidAsNodeId: Effect.Effect<NodeId>;
 }
 
-export const NanoId = Context.Tag<NanoId>();
+export const NanoId = Context.GenericTag<NanoId>("@services/NanoId");
 
 export const NodeId = S.string.pipe(
   S.pattern(/^[\w-]{16}$/),
@@ -66,7 +64,7 @@ export const NanoIdLive = Layer.succeed(
 export const slip21Derive = (
   seed: Uint8Array,
   path: ReadonlyArray<string>,
-): Effect.Effect<never, never, Uint8Array> =>
+): Effect.Effect<Uint8Array> =>
   Effect.sync(() => {
     let m = hmac(sha512, "Symmetric key seed", seed);
     for (let i = 0; i < path.length; i++) {
@@ -84,15 +82,15 @@ export interface SecretBox {
   readonly seal: (
     key: Uint8Array,
     plaintext: Uint8Array,
-  ) => Effect.Effect<never, never, Uint8Array>;
+  ) => Effect.Effect<Uint8Array>;
 
   readonly open: (
     key: Uint8Array,
     ciphertext: Uint8Array,
-  ) => Effect.Effect<never, never, Uint8Array>;
+  ) => Effect.Effect<Uint8Array>;
 }
 
-export const SecretBox = Context.Tag<SecretBox>();
+export const SecretBox = Context.GenericTag<SecretBox>("@services/SecretBox");
 
 export const SecretBoxLive = Layer.succeed(
   SecretBox,

package/src/Db.ts

@@ -73,12 +73,11 @@ export const table = <Fields extends TableFields>(
   ? ValidateFieldsNames<Fields> extends true
     ? ValidateFieldsHasId<Fields> extends true
       ? S.Schema<
-          never,
           Types.Simplify<
-            S.FromStruct<Fields> & S.Schema.From<typeof ReservedColumns>
+            S.ToStruct<Fields> & S.Schema.To<typeof ReservedColumns>
           >,
           Types.Simplify<
-            S.ToStruct<Fields> & S.Schema.To<typeof ReservedColumns>
+            S.FromStruct<Fields> & S.Schema.From<typeof ReservedColumns>
           >
         >
       : EvoluTypeError<"table() called without id column.">
@@ -92,7 +91,7 @@ const ReservedColumns = S.struct({
   isDeleted: SqliteBoolean,
 });
 
-type TableFields = Record<string, S.Schema<never, any, any>>;
+type TableFields = Record<string, S.Schema<any>>;
 
 type ValidateFieldsTypes<Fields extends TableFields> =
   keyof Fields extends infer K
@@ -100,7 +99,7 @@ type ValidateFieldsTypes<Fields extends TableFields> =
       ? Fields[K] extends TableFields
         ? ValidateFieldsTypes<Fields[K]>
         : // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          Fields[K] extends S.Schema<never, infer _I, infer A>
+          Fields[K] extends S.Schema<infer A, infer _I>
           ? A extends Value
             ? true
             : false
@@ -259,9 +258,9 @@ export interface Table {
 
 // https://github.com/Effect-TS/schema/releases/tag/v0.18.0
 const getPropertySignatures = <I extends { [K in keyof A]: any }, A>(
-  schema: S.Schema<never, I, A>,
-): { [K in keyof A]: S.Schema<never, I[K], A[K]> } => {
-  const out: Record<PropertyKey, S.Schema<never, any, any>> = {};
+  schema: S.Schema<A, I>,
+): { [K in keyof A]: S.Schema<A[K], I[K]> } => {
+  const out: Record<PropertyKey, S.Schema<any>> = {};
   const propertySignatures = AST.getPropertySignatures(schema.ast);
   for (let i = 0; i < propertySignatures.length; i++) {
     const propertySignature = propertySignatures[i];
@@ -271,7 +270,7 @@ const getPropertySignatures = <I extends { [K in keyof A]: any }, A>(
   return out as any;
 };
 
-export const schemaToTables = (schema: S.Schema<never, any, any>): Tables =>
+export const schemaToTables = (schema: S.Schema<any>): Tables =>
   pipe(
     getPropertySignatures(schema),
     ReadonlyRecord.toEntries,
@@ -284,8 +283,8 @@ export const schemaToTables = (schema: S.Schema<never, any, any>): Tables =>
   );
 
 export const transaction = <R, E, A>(
-  effect: Effect.Effect<R, E, A>,
-): Effect.Effect<Sqlite | R, E, A> =>
+  effect: Effect.Effect<A, E, R>,
+): Effect.Effect<A, E, Sqlite | R> =>
   Effect.flatMap(Sqlite, (sqlite) =>
     Effect.acquireUseRelease(
       sqlite.exec("BEGIN"),
@@ -323,7 +322,7 @@ export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect(
 
 export const lazyInit = (
   mnemonic?: Mnemonic,
-): Effect.Effect<Sqlite | Bip39 | NanoId, never, Owner> =>
+): Effect.Effect<Owner, never, Sqlite | Bip39 | NanoId> =>
   Effect.gen(function* (_) {
     const [owner, sqlite, initialTimestampString] = yield* _(
       Effect.all([makeOwner(mnemonic), Sqlite, makeInitialTimestamp], {
@@ -354,9 +353,9 @@ export const lazyInit = (
   });
 
 const getTables: Effect.Effect<
-  Sqlite,
+  ReadonlyArray<string>,
   never,
-  ReadonlyArray<string>
+  Sqlite
 > = Sqlite.pipe(
   Effect.flatMap((sqlite) =>
     sqlite.exec(`SELECT "name" FROM "sqlite_schema" WHERE "type" = 'table'`),
@@ -370,7 +369,7 @@ const getTables: Effect.Effect<
 const updateTable = ({
   name,
   columns,
-}: Table): Effect.Effect<Sqlite, never, void> =>
+}: Table): Effect.Effect<void, never, Sqlite> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
     const sql = yield* _(
@@ -396,7 +395,7 @@ const updateTable = ({
 const createTable = ({
   name,
   columns,
-}: Table): Effect.Effect<Sqlite, never, void> =>
+}: Table): Effect.Effect<void, never, Sqlite> =>
   Effect.flatMap(Sqlite, (sqlite) =>
     sqlite.exec(`
       CREATE TABLE ${name} (
@@ -414,7 +413,7 @@ const createTable = ({
 
 export const ensureSchema = (
   tables: Tables,
-): Effect.Effect<Sqlite, never, void> =>
+): Effect.Effect<void, never, Sqlite> =>
   Effect.flatMap(getTables, (existingTables) =>
     Effect.forEach(
       tables,
@@ -427,7 +426,7 @@ export const ensureSchema = (
   );
 
 export type RowsStore = Store<RowsStoreValue>;
-export const RowsStore = Context.Tag<RowsStore>();
+export const RowsStore = Context.GenericTag<RowsStore>("@services/RowsStore");
 
 type RowsStoreValue = ReadonlyMap<Query, ReadonlyArray<Row>>;
 

package/src/DbWorker.ts

@@ -64,7 +64,7 @@ export interface DbWorker {
   onMessage: (output: DbWorkerOutput) => void;
 }
 
-export const DbWorker = Context.Tag<DbWorker>();
+export const DbWorker = Context.GenericTag<DbWorker>("@services/DbWorker");
 
 export type DbWorkerInput =
   | DbWorkerInputInit
@@ -108,7 +108,9 @@ interface DbWorkerInputEnsureSchema {
 
 type DbWorkerOnMessage = DbWorker["onMessage"];
 
-const DbWorkerOnMessage = Context.Tag<DbWorkerOnMessage>();
+const DbWorkerOnMessage = Context.GenericTag<DbWorkerOnMessage>(
+  "@services/DbWorkerOnMessage",
+);
 
 export type DbWorkerOutput =
   | DbWorkerOutputOnError
@@ -182,7 +184,7 @@ const query = ({
 }: {
   readonly queries: Queries;
   readonly onCompleteIds?: ReadonlyArray<OnCompleteId>;
-}): Effect.Effect<Sqlite | RowsStore | DbWorkerOnMessage, never, void> =>
+}): Effect.Effect<void, never, Sqlite | RowsStore | DbWorkerOnMessage> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
     const rowsStore = yield* _(RowsStore);
@@ -271,7 +273,7 @@ export const mutationsToNewMessages = (
 
 const ensureSchemaByNewMessages = (
   messages: ReadonlyArray<NewMessage>,
-): Effect.Effect<Sqlite, never, void> =>
+): Effect.Effect<void, never, Sqlite> =>
   Effect.gen(function* (_) {
     const tablesMap = new Map<string, Table>();
     messages.forEach((message) => {
@@ -295,7 +297,7 @@ const ensureSchemaByNewMessages = (
 export const upsertValueIntoTableRowColumn = (
   message: NewMessage,
   messages: ReadonlyArray<NewMessage>,
-): Effect.Effect<Sqlite, never, void> =>
+): Effect.Effect<void, never, Sqlite> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
 
@@ -320,7 +322,7 @@ const applyMessages = ({
 }: {
   merkleTree: MerkleTree;
   messages: ReadonlyArray<Message>;
-}): Effect.Effect<Sqlite, never, MerkleTree> =>
+}): Effect.Effect<MerkleTree, never, Sqlite> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
 
@@ -366,7 +368,7 @@ const applyMessages = ({
 const writeTimestampAndMerkleTree = ({
   timestamp,
   merkleTree,
-}: TimestampAndMerkleTree): Effect.Effect<Sqlite, never, void> =>
+}: TimestampAndMerkleTree): Effect.Effect<void, never, Sqlite> =>
   Effect.flatMap(Sqlite, (sqlite) =>
     sqlite.exec({
       sql: Sql.updateOwnerTimestampAndMerkleTree,
@@ -381,17 +383,17 @@ const mutate = ({
   mutations,
   queries,
 }: DbWorkerInputMutate): Effect.Effect<
+  void,
+  | TimestampDriftError
+  | TimestampCounterOverflowError
+  | TimestampTimeOutOfRangeError,
   | Sqlite
   | Owner
   | Time
   | Config
   | RowsStore
   | DbWorkerOnMessage
-  | SyncWorkerPostMessage,
-  | TimestampDriftError
-  | TimestampCounterOverflowError
-  | TimestampTimeOutOfRangeError,
-  void
+  | SyncWorkerPostMessage
 > =>
   Effect.gen(function* (_) {
     const [toSync, localOnly] = ReadonlyArray.partition(mutations, (item) =>
@@ -455,9 +457,9 @@ const handleSyncResponse = ({
   messages,
   ...response
 }: SyncWorkerOutputSyncResponse): Effect.Effect<
-  Sqlite | Time | Config | DbWorkerOnMessage | SyncWorkerPostMessage | Owner,
+  void,
   TimestampError,
-  void
+  Sqlite | Time | Config | DbWorkerOnMessage | SyncWorkerPostMessage | Owner
 > =>
   Effect.gen(function* (_) {
     let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
@@ -523,14 +525,14 @@ const handleSyncResponse = ({
 const sync = ({
   queries,
 }: DbWorkerInputSync): Effect.Effect<
+  void,
+  never,
   | Sqlite
   | Config
   | DbWorkerOnMessage
   | SyncWorkerPostMessage
   | Owner
-  | RowsStore,
-  never,
-  void
+  | RowsStore
 > =>
   Effect.gen(function* (_) {
     if (queries.length > 0) yield* _(query({ queries }));
@@ -547,7 +549,7 @@ const sync = ({
 
 const reset = (
   input: DbWorkerInputReset,
-): Effect.Effect<Sqlite | Bip39 | NanoId | DbWorkerOnMessage, never, void> =>
+): Effect.Effect<void, never, Sqlite | Bip39 | NanoId | DbWorkerOnMessage> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
 
@@ -577,7 +579,7 @@ export const DbWorkerLive = Layer.effect(
   Effect.gen(function* (_) {
     const syncWorker = yield* _(SyncWorker);
 
-    const onError = (error: EvoluError): Effect.Effect<never, never, void> =>
+    const onError = (error: EvoluError): Effect.Effect<void> =>
       Effect.sync(() => {
         dbWorker.onMessage({ _tag: "onError", error });
       });
@@ -606,9 +608,9 @@ export const DbWorkerLive = Layer.effect(
 
     const run = (
       effect: Effect.Effect<
-        Sqlite | Bip39 | NanoId | DbWorkerOnMessage,
+        void,
         EvoluError,
-        void
+        Sqlite | Bip39 | NanoId | DbWorkerOnMessage
       >,
     ): Promise<void> =>
       effect.pipe(
@@ -636,7 +638,7 @@ export const DbWorkerLive = Layer.effect(
         Layer.succeed(SyncWorkerPostMessage, syncWorker.postMessage),
         RowsStoreLive,
         TimeLive,
-      );
+      ).pipe(Layer.memoize, Effect.scoped, Effect.runSync);
 
       return (input) => {
         if (skipAllBecauseOfReset) return Promise.resolve(undefined);

package/src/ErrorStore.ts

@@ -19,7 +19,7 @@ export interface UnexpectedError {
 
 export const makeUnexpectedError = (
   error: unknown,
-): Effect.Effect<never, UnexpectedError, never> => {
+): Effect.Effect<never, UnexpectedError> => {
   const isError = error instanceof Error;
 
   return Effect.fail({