@evolu/common 3.1.2 → 3.1.3

package/src/Evolu.ts

@@ -297,7 +297,7 @@ export interface Evolu<S extends DatabaseSchema = DatabaseSchema> {
    * database.
    */
   readonly ensureSchema: <From, To extends S>(
-    schema: S.Schema<never, From, To>,
+    schema: S.Schema<To, From>,
   ) => void;
 
   /**
@@ -310,7 +310,7 @@ export interface Evolu<S extends DatabaseSchema = DatabaseSchema> {
   readonly sync: () => void;
 }
 
-export const Evolu = Context.Tag<Evolu>();
+export const Evolu = Context.GenericTag<Evolu>("@services/Evolu");
 
 type CreateQuery<S extends DatabaseSchema> = <R extends Row>(
   queryCallback: QueryCallback<S, R>,
@@ -374,7 +374,9 @@ export interface LoadingPromises {
   readonly release: () => void;
 }
 
-export const LoadingPromises = Context.Tag<LoadingPromises>();
+export const LoadingPromises = Context.GenericTag<LoadingPromises>(
+  "@services/LoadingPromises",
+);
 
 export type LoadingPromise<R extends Row> = Promise<QueryResult<R>> & {
   status?: "pending" | "fulfilled" | "rejected";
@@ -452,7 +454,7 @@ const setPromiseAsResolved =
 
 type LoadQuery = <R extends Row>(query: Query<R>) => Promise<QueryResult<R>>;
 
-const LoadQuery = Context.Tag<LoadQuery>();
+const LoadQuery = Context.GenericTag<LoadQuery>("@services/LoadQuery");
 
 const LoadQueryLive = Layer.effect(
   LoadQuery,
@@ -478,9 +480,9 @@ const LoadQueryLive = Layer.effect(
 
 type OnQuery = (
   dbWorkerOutputOnQuery: DbWorkerOutputOnQuery,
-) => Effect.Effect<never, never, void>;
+) => Effect.Effect<void>;
 
-const OnQuery = Context.Tag<OnQuery>();
+const OnQuery = Context.GenericTag<OnQuery>("@services/OnQuery");
 
 const OnQueryLive = Layer.effect(
   OnQuery,
@@ -528,7 +530,9 @@ export interface SubscribedQueries {
   readonly getSubscribedQueries: () => Queries;
 }
 
-export const SubscribedQueries = Context.Tag<SubscribedQueries>();
+export const SubscribedQueries = Context.GenericTag<SubscribedQueries>(
+  "@services/SubscribedQueries",
+);
 
 export const SubscribedQueriesLive = Layer.effect(
   SubscribedQueries,
@@ -604,7 +608,7 @@ export type Mutate<
   readonly id: S[K]["id"];
 };
 
-export const Mutate = Context.Tag<Mutate>();
+export const Mutate = Context.GenericTag<Mutate>("@services/Mutate");
 
 // https://stackoverflow.com/a/54713648/233902
 type PartialForNullable<
@@ -782,9 +786,9 @@ export const EvoluCommonLive = EvoluCommon.pipe(
 );
 
 export const makeCreateEvolu =
-  (EvoluLive: Layer.Layer<Config, never, Evolu>) =>
+  (EvoluLive: Layer.Layer<Evolu, never, Config>) =>
   <From, To extends DatabaseSchema>(
-    schema: S.Schema<never, From, To>,
+    schema: S.Schema<To, From>,
     config?: Partial<Config>,
   ): Evolu<To> => {
     // For https://nextjs.org/docs/architecture/fast-refresh etc.

package/src/Model.ts

@@ -21,7 +21,7 @@ export type Id = S.Schema.To<typeof Id>;
  */
 export const id = <T extends string>(
   table: T,
-): S.BrandSchema<never, string, string & Brand.Brand<"Id"> & Brand.Brand<T>> =>
+): S.BrandSchema<string & Brand.Brand<"Id"> & Brand.Brand<T>, string, never> =>
   Id.pipe(S.brand(table));
 
 /**

package/src/OnCompletes.ts

@@ -7,20 +7,20 @@ import * as ReadonlyArray from "effect/ReadonlyArray";
 import { NanoId } from "./Crypto.js";
 
 export interface OnCompletes {
-  readonly add: (
-    onComplete: OnComplete,
-  ) => Effect.Effect<never, never, OnCompleteId>;
+  readonly add: (onComplete: OnComplete) => Effect.Effect<OnCompleteId>;
 
   readonly complete: (
     onCompleteIds: readonly OnCompleteId[],
-  ) => Effect.Effect<never, never, void>;
+  ) => Effect.Effect<void>;
 }
 
 export type OnComplete = () => void;
 
 export type OnCompleteId = string & Brand.Brand<"OnCompleteId">;
 
-export const OnCompletes = Context.Tag<OnCompletes>();
+export const OnCompletes = Context.GenericTag<OnCompletes>(
+  "@services/OnCompletes",
+);
 
 export const OnCompletesLive = Layer.effect(
   OnCompletes,

package/src/Owner.ts

@@ -28,7 +28,7 @@ export interface Owner {
   readonly encryptionKey: Uint8Array;
 }
 
-export const Owner = Context.Tag<Owner>();
+export const Owner = Context.GenericTag<Owner>("@services/Owner");
 
 /**
  * The unique identifier of {@link Owner} safely derived from its
@@ -38,7 +38,7 @@ export type OwnerId = Id & Brand.Brand<"Owner">;
 
 export const makeOwner = (
   mnemonic?: Mnemonic,
-): Effect.Effect<Bip39, never, Owner> =>
+): Effect.Effect<Owner, never, Bip39> =>
   Effect.gen(function* (_) {
     const bip39 = yield* _(Bip39);
 

package/src/Platform.ts

@@ -8,31 +8,33 @@ export type PlatformName =
   | "web-without-opfs"
   | "react-native";
 
-export const PlatformName = Context.Tag<PlatformName>();
+export const PlatformName = Context.GenericTag<PlatformName>(
+  "@services/PlatformName",
+);
 
 export type FlushSync = (callback: () => void) => void;
 
-export const FlushSync = Context.Tag<FlushSync>();
+export const FlushSync = Context.GenericTag<FlushSync>("@services/FlushSync");
 
 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 const SyncLock = Context.Tag<SyncLock>();
+export const SyncLock = Context.GenericTag<SyncLock>("@services/SyncLock");
 
 export type Fetch = (
   url: string,
   body: Uint8Array,
-) => Effect.Effect<never, FetchError, Response>;
+) => Effect.Effect<Response, FetchError>;
 
-export const Fetch = Context.Tag<Fetch>();
+export const Fetch = Context.GenericTag<Fetch>("@services/Fetch");
 
 /**
  * This error occurs when there is a problem with the network connection, or the
@@ -66,10 +68,10 @@ interface AppStateConfig {
 
 export interface AppState {
   readonly init: (config: AppStateConfig) => void;
-  readonly reset: Effect.Effect<never, never, void>;
+  readonly reset: Effect.Effect<void>;
 }
 
-export const AppState = Context.Tag<AppState>();
+export const AppState = Context.GenericTag<AppState>("@services/AppState");
 
 /** To detect whether DOM can be used. */
 export const canUseDom = ((): boolean => {

package/src/Sqlite.ts

@@ -4,12 +4,10 @@ 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 const Sqlite = Context.Tag<Sqlite>();
+export const Sqlite = Context.GenericTag<Sqlite>("@services/Sqlite");
 
 export interface SqliteQuery {
   readonly sql: string;

package/src/Store.ts

@@ -10,12 +10,10 @@ export interface Store<T> {
   readonly getState: () => T;
 
   // Effect API because it's a side-effect.
-  readonly setState: (state: T) => Effect.Effect<never, never, void>;
+  readonly setState: (state: T) => Effect.Effect<void>;
 }
 
-export const makeStore = <T>(
-  initialState: T,
-): Effect.Effect<never, never, Store<T>> =>
+export const makeStore = <T>(initialState: T): Effect.Effect<Store<T>> =>
   Effect.sync(() => {
     const listeners = new Set<Listener>();
     let currentState = initialState;

package/src/SyncWorker.ts

@@ -37,11 +37,15 @@ export interface SyncWorker {
   onMessage: (output: SyncWorkerOutput) => void;
 }
 
-export const SyncWorker = Context.Tag<SyncWorker>();
+export const SyncWorker = Context.GenericTag<SyncWorker>(
+  "@services/SyncWorker",
+);
 
 export type SyncWorkerPostMessage = SyncWorker["postMessage"];
 
-export const SyncWorkerPostMessage = Context.Tag<SyncWorkerPostMessage>();
+export const SyncWorkerPostMessage = Context.GenericTag<SyncWorkerPostMessage>(
+  "@services/SyncWorkerPostMessage",
+);
 
 export type SyncWorkerInput =
   | SyncWorkerInputSync
@@ -83,7 +87,9 @@ interface SyncWorkerInputSyncCompleted {
 
 type SyncWorkerOnMessage = SyncWorker["onMessage"];
 
-const SyncWorkerOnMessage = Context.Tag<SyncWorkerOnMessage>();
+const SyncWorkerOnMessage = Context.GenericTag<SyncWorkerOnMessage>(
+  "@services/SyncWorkerOnMessage",
+);
 
 export type SyncWorkerOutput =
   | UnexpectedError
@@ -226,9 +232,9 @@ const binaryReadOptions = {
 const sync = (
   input: SyncWorkerInputSync,
 ): Effect.Effect<
-  SyncLock | SyncWorkerOnMessage | Fetch | SecretBox,
+  void,
   never,
-  void
+  SyncLock | SyncWorkerOnMessage | Fetch | SecretBox
 > =>
   Effect.gen(function* (_) {
     const syncLock = yield* _(SyncLock);
@@ -324,9 +330,7 @@ export const SyncWorkerLive = Layer.effect(
   Effect.gen(function* (_) {
     const syncLock = yield* _(SyncLock);
 
-    const onError = (
-      error: UnexpectedError,
-    ): Effect.Effect<never, never, void> =>
+    const onError = (error: UnexpectedError): Effect.Effect<void> =>
       Effect.sync(() => {
         syncWorker.onMessage(error);
       });