effect-zero 0.1.1 → 0.3.0

package/README.md

@@ -1,64 +1,95 @@
 # effect-zero
 
-## Server Setup
+## Custom mutators
+### Defining mutators schema
+```ts
+// mutators.ts
+
+import * as Mutators from "effect-zero/mutators";
+
+// Define your mutators schema
+// Both root-level and nested mutators are supported (up to 1 level of nesting)
+export const mutatorSchema = Mutators.schema({
+  // root-level mutator
+  /*
+  foo: Schema.Struct({
+    message: Schema.String,
+  }),
+  // mutator without arguments
+  /*
+  bar: Schema.Void,
+  */
+  todo: {
+    // nested mutator
+    create: Schema.Struct({
+      id: Schema.String,
+      title: Schema.String,
+    }),
+    toggle: Schema.Struct({
+      id: Schema.String,
+      done: Schema.Boolean,
+    }),
+  },
+});
+```
+
+### Server setup
 
 ```ts
-// server/zero.ts
-import { PostgresJSConnection, ZQLDatabase } from "@rocicorp/zero/pg";
-import { ZeroPushResponse, ZeroPushParams, ZeroPushBody } from "effect-zero/types";
-import * as ZeroServer from "effect-zero/server";
+// server.ts
+
+import { zeroPostgresJS } from "@rocicorp/zero/server/adapters/postgresjs";
+import { PushResponse, PushParams, PushBody } from "effect-zero/types/push";
+import * as ServerTransaction from "effect-zero/server-transaction";
+import * as Server from "effect-zero/server";
 import * as Schema from "effect/Schema";
 import * as Effect from "effect/Effect";
 import postgres from "postgres";
-import { zeroClient } from '../client/zero'; // optional (see below)
+import { clientTransaction } from "./client"; // see below
+import { mutatorSchema } from "./mutators";
 
 // zero schema (define or use something like drizzle-zero)
 import { schema } from "./schema";
 
 // setup connection
-const connection = new PostgresJSConnection(postgres(process.env.DATABASE_URL!));
-const database = new ZQLDatabase(connection, schema);
+// for more driver options, see: https://zero.rocicorp.dev/docs/zql-on-the-server#creating-a-database
+const database = zeroPostgresJS(
+  schema,
+  postgres(process.env.ZERO_UPSTREAM_DB!),
+);
 
-// the "server-side" zero instance
-export const zero = ZeroServer.makeServer({
+// The "server-side" transaction
+const serverTransaction = ServerTransaction.make(
+  "ServerTransaction",
   database,
-  // this part is optional, but it allows us to use the client mutators on the server side
-  clientTransaction: zeroClient.Transaction,
-});
-
-// define mutators (same as client, see below)
-// in practice this can be a centralized file which is imported in both places
-export type MutatorArgs = {
-  todo: {
-    create: { id: string; title: string };
-    toggle: { id: string; done: boolean };
-  };
-};
+  // passing a client transaction allows us to use the client mutators on the server side
+  clientTransaction,
+);
 
-// define mutators.
-export const serverMutators = zero.mutators<MutatorArgs>()({
+// define server mutators
+export const serverMutators = Mutators.make(mutatorSchema, {
   todo: {
-    create: Effect.fn(function* ({ id, title }) {
+    create: ({ id, title }) => Effect.gen(function* () {
       // Note, we can run arbitrary logic before/after performing the zero transaction
       // this is a unique feature which is not supported by the default zero push processor implementation
       // shipped with the base `@rocicorp/zero` package
       
       // before the transaction
-      yield Effect.log("before the transaction");
+      yield* Effect.log("before the transaction");
 
       Effect.gen(function* () {
         // during the transaction
-        yield Effect.log("during the transaction");
-        yield* zero.Transaction.use((tx) => tx.mutate.TodoTable.insert({ id, title, createdAt: Date.now() }));
-        yield* zero.Transaction.use((tx) => tx.mutate.TodoTable.update({ id, done: false }));
+        yield* Effect.log("during the transaction");
+        yield* serverTransaction.use((tx) => tx.mutate.TodoTable.insert({ id, title, createdAt: Date.now() }));
+        yield* serverTransaction.use((tx) => tx.mutate.TodoTable.update({ id, done: false }));
         // ...
-      }).pipe(zero.Transaction.execute);
+      }).pipe(serverTransaction.execute);
 
       // after the transaction
-      yield Effect.log("after the transaction");
+      yield* Effect.log("after the transaction");
     }),
     toggle: Effect.fn(function* ({ id, done }) {
-      yield* zero.Transaction.use((tx) => tx.mutate.TodoTable.update({ id, done })).pipe(zero.Transaction.execute);
+      yield* serverTransaction.use((tx) => tx.mutate.TodoTable.update({ id, done })).pipe(serverTransaction.execute);
     }),
   },
 });
@@ -66,42 +97,36 @@ export const serverMutators = zero.mutators<MutatorArgs>()({
 // handler for push endpoint
 // Note: this is framework-agnostic so that is why Effect.runPromise is used below, however this is of course not needed
 // if your server framework is effect-based (like Effect HTTP module)
-
 export async function handleZeroPush(req: Request): Promise<Response> {
   const url = new URL(req.url);
-  const urlParams = Schema.decodeSync(ZeroPushParams)({
+  const urlParams = Schema.decodeSync(PushParams)({
     schema: url.searchParams.get("schema")!,
     appID: url.searchParams.get("appID")!,
   });
-  const payload = Schema.decodeSync(ZeroPushBody)(await req.json());
+  const payload = Schema.decodeSync(PushBody)(await req.json());
 
-  const result = await Effect.runPromise(zero.processPush(serverMutators, urlParams, payload));
-  const responseBody = Schema.encodeSync(ZeroPushResponse)(result);
+  const result = await Effect.runPromise(Server.processPush(serverTransaction, serverMutators, urlParams, payload));
+  const responseBody = Schema.encodeSync(PushResponse)(result);
   return new Response(JSON.stringify(responseBody), { status: 200, headers: { "content-type": "application/json" } });
 }
 ```
 
-## Client Setup
+### Client setup
 
 ```ts
-// client/zero.ts
+// client.ts
 import { Zero } from "@rocicorp/zero";
-import * as ZeroClient from "effect-zero/client";
+import * as ClientTransaction from "effect-zero/client-transaction";
 import * as Effect from "effect/Effect";
 import { schema } from "./schema"; // your schema
+import { mutatorSchema } from "./mutators"; // see below
 
-// as mentioned above, this can be centralized between client and server
-export type MutatorArgs = {
-  todo: {
-    create: { id: string; title: string };
-    toggle: { id: string; done: boolean };
-  };
-};
+const clientTransaction = ClientTransaction.make("ClientTransaction", schema);
 
-// The "client-side" zero instance
-export const zeroClient = ZeroClient.makeClient<typeof schema>();
+// The "client-side" transaction
+export const clientTransaction = ClientTransaction.make("ClientTransaction", schema);
 
-export const clientMutators = zeroClient.mutators<MutatorArgs>()({
+export const clientMutators = Mutators.make(mutatorSchema, {
   todo: {
     create: Effect.fn(function* ({ id, title }) {
       yield* zeroClient.Transaction.use((tx) => tx.mutate.TodoTable.insert({ id, title, createdAt: Date.now() }));
@@ -112,69 +137,131 @@ export const clientMutators = zeroClient.mutators<MutatorArgs>()({
   },
 });
 
-export async function createZero(opts: { userID: string; auth?: string; server: string }) {
-  const mutators = await Effect.runPromise(zeroClient.unwrapMutators(clientMutators));
-  return new Zero({
+// Helper to create a vanilla Zero client instance for querying and mutating
+export const createZero = Effect.fn(function* (opts: { userID: string; auth?: string; server: string }) {
+  // `Client.make` returns an Effect containing a Zero client instance
+  return yield* Client.make(clientTransaction, clientMutators, {
     userID: opts.userID,
     auth: opts.auth,
     server: opts.server, // your push/pull endpoint base URL
-    schema,
     kvStore: "idb", // or "mem" for in-memory
-    mutators,
+    // "mutators" and "schema" are inferred from other arguments, so we don't need to pass them here
   });
+});
+```
+
+## Synced queries
+
+### Defining queries
+```ts
+// queries.ts
+
+import { createBuilder } from "@rocicorp/zero";
+import * as Query from "effect-zero/query";
+import { schema } from "./schema"; // your schema
+
+const builder = createBuilder(schema);
+
+export const getTodoByIdQuery = Query.make({
+  name: "listTodos",
+  payload: Schema.Tuple(Schema.String),
+  query: Effect.fn(function* (id) {
+    return yield* Effect.succeed(builder.todos.where("id", id).one());
+  }),
+});
+
+// Add all your queries here
+export const queries = [
+  getTodoByIdQuery,
+];
+```
+
+### Server setup
+```ts
+// server.ts
+
+import * as Server from "effect-zero/server";
+import { TransformRequestMessage } from "effect-zero/types/queries";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import { queries } from "./queries";
+
+// See `handleZeroPush` notes
+export async function handleZeroGetQueries(req: Request): Promise<Response> {
+  const payload = Schema.decodeSync(TransformRequestMessage)(await req.json());
+  const result = await Effect.runPromise(Server.handleGetQueries(queries, schema, payload));
+  return new Response(JSON.stringify(result), { status: 200, headers: { "content-type": "application/json" } });
 }
 ```
 
-## Query Atoms
+### Client setup
+
+```ts
+// client.ts
+
+import * as Effect from 'effect/Effect';
+import * as Query from "effect-zero/query";
+import { getTodoByIdQuery } from "./queries";
+
+const getTodoById = Effect.fn(function* (id: string) {
+  // Create the query instance
+  const query = yield* getTodoByIdQuery(id);
+
+  // For `createZero` implementation, see "Custom mutators" -> "Client setup"
+  const zero = yield* createZero({ ... });
+
+// `Query.subscribe` creates an Effect's Stream from a query
+  const stream = Query.stream(zero, query);
+
+  // `Query.subscribe` creates an Effect's Subscribable from a query
+  const sub = Query.subscribable(zero, query);
+
+  // You can also use the query with the Zero client as usual
+  const view = yield* Effect.sync(() => zero.materialize(query));
+});
+```
+
+### Usage with [effect-atom](https://github.com/tim-smart/effect-atom)
+
+You might want to create atoms with query results. To do that, you can implement a `queryAtom` helper like this:
 
 ```ts
-// state/todos.ts
 import { Atom } from "@effect-atom/atom";
 import * as Effect from "effect/Effect";
-import * as Option from "effect/Option";
-import { createZero, zero } from "../client/zero";
-
-// build/load the zero instance
-const zeroAtom = Atom.make(
-  Effect.fn(function* (get) {
-    const zero = yield* Effect.promise(() => createZero({ ... }));
-    
-    //add finalizer
-    get.addFinalizer(() => {
-      zero.close();
-    });
-
-    return zero;
-  }),
-);
+import * as Subscribable from "effect/Subscribable";
+import * as Query from "effect-zero/query";
 
-// example query atom
-export const userAtom = Atom.make(
-  Effect.fn(function* (get) {
-    const zero = yield* get.result(zeroAtom);
-    const userId = yield* get.result(userIdAtom);
-    if (Option.isNone(userId)) {
-      return Option.none();
-    }
-    const query = zero.query.UserTable.where("id", "=", userId.value).one();
-    return yield* get.result(zeroClient.queryAtom(query)).pipe(Effect.map(Option.fromNullable));
-  }),
+import type { schema } from "./schema"; // your schema
+import { zeroAtom } from "./zero"; // you can create zeroAtom using `createZero` from the "Client setup" section as a reference
+
+type Schema = typeof schema;
+
+export const queryAtom = Atom.family(
+  <T extends keyof Schema["tables"] & string, R>(query: Query.Query<Schema, T, R>) => {
+    return Atom.subscribable(
+      Effect.fn(function* (get) {
+        const zero = yield* get.result(zeroAtom);
+        return Query.subscribable(zero, query).pipe(Subscribable.map(({ data }) => data));
+      }),
+    );
+  },
 );
 ```
 
-## Calling Mutations
+```ts
+// Usage
 
-With the `Zero` instance created using your unwrapped mutators, call them via `zero.mutate`:
+import { Atom } from "@effect-atom/atom";
 
-```ts
-export const deleteMessageAtom = Atom.fn(
-  Effect.fn(function* (messageId: MessageId) {
-    const zero = yield* Atom.getResult(zeroAtom);
-    yield* Effect.promise(() => zero.mutate.MessageTable.delete({ id: messageId }));
-  }),
-);
+const todoAtom = Atom.fn(Effect.fn(function* (id: string, get: Atom.FnContext) {
+  const query = yield* getTodoByIdQuery(id);
+  return yield* get.result(queryAtom(query));
+});
 ```
 
+> [!NOTE]
+> Queries created via `Query.make` implement the [`Equal` trait](https://effect.website/docs/trait/equal/), so `Atom.query` would properly cache the results when using queries as arguments.
+
 ## Differences from the original implementation
 
 One key difference is that `effect-zero` requires you to manually wrap your DB-related logic in a transaction inside a mutator code, whereas the original implementation automatically wraps the whole mutation in a transaction. This allows you to define some logic outside of transaction (either before or after), but it also creates some edge cases that are not possible in the original implementation, because now the transaction might succeed, but the code outside of it might fail. Below are the edge case rules that `effect-zero` follows during the mutation execution:

package/dist/client-transaction.d.ts

@@ -0,0 +1,22 @@
+import type { Schema as ZeroSchema, Transaction as ZeroTransaction } from "@rocicorp/zero";
+import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+export interface ClientTransaction {
+    readonly _tag: unique symbol;
+}
+export declare const make: <const Id extends string, TSchema extends ZeroSchema>(id: Id, schema: TSchema) => Context.TagClass<ClientTransaction, Id, ZeroTransaction<TSchema>> & {
+    use: <A>(fn: (transaction: ZeroTransaction<TSchema>, options: {
+        readonly signal: AbortSignal;
+    }) => PromiseLike<A>) => Effect.Effect<A, ClientTransactionError, ClientTransaction>;
+    schema: TSchema;
+};
+declare const ClientTransactionError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Cause.YieldableError & {
+    readonly _tag: "ClientTransactionError";
+} & Readonly<A>;
+declare class ClientTransactionError extends ClientTransactionError_base<{
+    readonly cause: Cause.Cause<unknown>;
+}> {
+}
+export {};
+//# sourceMappingURL=client-transaction.d.ts.map

package/dist/client-transaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-transaction.d.ts","sourceRoot":"","sources":["../src/client-transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,IAAI,GAAI,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,OAAO,SAAS,UAAU,EAAE,IAAI,EAAE,EAAE,QAAQ,OAAO;UAGlF,CAAC,MACR,CAAC,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;KAAE,KAAK,WAAW,CAAC,CAAC,CAAC;;CAU3G,CAAC;;;;AAEF,cAAM,sBAAuB,SAAQ,4BAA2C;IAC9E,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;CACtC,CAAC;CAAG"}

package/dist/client-transaction.js

@@ -0,0 +1,15 @@
+import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+export const make = (id, schema) => {
+    const ClientTransaction = Context.Tag(id)();
+    const use = (fn) => Effect.flatMap(ClientTransaction, (transaction) => Effect.tryPromise({
+        try: (signal) => fn(transaction, { signal }),
+        catch: (error) => new ClientTransactionError({ cause: Cause.fail(error) }),
+    }));
+    return Object.assign(ClientTransaction, { use, schema });
+};
+class ClientTransactionError extends Data.TaggedError("ClientTransactionError") {
+}
+//# sourceMappingURL=client-transaction.js.map

package/dist/client-transaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-transaction.js","sourceRoot":"","sources":["../src/client-transaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAOxC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAsD,EAAM,EAAE,MAAe,EAAE,EAAE;IACnG,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAA+C,CAAC;IAEzF,MAAM,GAAG,GAAG,CACV,EAAwG,EACxG,EAAE,CACF,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,WAAW,EAAE,EAAE,CAChD,MAAM,CAAC,UAAU,CAAC;QAChB,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC;QAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,sBAAsB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;KAC3E,CAAC,CACH,CAAC;IAEJ,OAAO,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,sBAAuB,SAAQ,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAE5E;CAAG"}

package/dist/client.d.ts

@@ -1,46 +1,18 @@
-import { Atom } from "@effect-atom/atom";
-import type { HumanReadable, Query, Transaction, Schema as ZeroSchema } from "@rocicorp/zero";
+import { Zero, type ZeroOptions, type Schema as ZeroSchema, type Transaction as ZeroTransaction } from "@rocicorp/zero";
 import * as Cause from "effect/Cause";
-import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import type * as ParseResult from "effect/ParseResult";
 import * as Schema from "effect/Schema";
-import * as Subscribable from "effect/Subscribable";
-import { type AnyMutator, type AnyMutators, type ExtractMutatorsRequirements, MutatorArgsSchemaSym } from "./mutators.js";
-export interface ZeroClientTransaction {
-    readonly _tag: unique symbol;
-}
-export declare const makeClient: <S extends ZeroSchema>() => {
-    unwrapMutators: <T extends AnyMutators>(mutators: T) => Effect.Effect<{ [A in keyof T]: T[A] extends AnyMutator ? UnwrapMutator<S, T[A]> : { [B in keyof T[A]]: T[A][B] extends AnyMutator ? UnwrapMutator<S, T[A][B]> : never; }; }, never, Exclude<ExtractMutatorsRequirements<T>, ZeroClientTransaction>>;
-    querySub: <T extends keyof S["tables"] & string, R>(query: Query<S, T, R>) => Effect.Effect<Subscribable.Subscribable<{
-        data: HumanReadable<R>;
-        status: "unknown" | "complete" | "error";
-    }, never, never>, never, import("effect/Scope").Scope>;
-    queryAtom: <T extends keyof S["tables"] & string, R_1>(arg: Query<S, T, R_1>) => Atom.Atom<import("@effect-atom/atom/Result").Result<HumanReadable<R_1>, never>>;
-    Transaction: Context.TagClass<ZeroClientTransaction, "effect-zero/ZeroClientTransaction", Transaction<S>> & {
-        use: <A>(fn: (transaction: Transaction<S>, options: {
-            readonly signal: AbortSignal;
-        }) => PromiseLike<A>) => Effect.Effect<A, ZeroClientTransactionError, ZeroClientTransaction>;
-    };
-};
-type UnwrapMutator<S extends ZeroSchema, T extends AnyMutator> = Parameters<T> extends [] ? (transaction: Transaction<S>) => Promise<void> : (transaction: Transaction<S>, args: Schema.Schema.Encoded<T[typeof MutatorArgsSchemaSym]>) => Promise<void>;
-export type UnwrapMutators<S extends ZeroSchema, T extends AnyMutators> = {
-    [A in keyof T]: T[A] extends AnyMutator ? UnwrapMutator<S, T[A]> : {
-        [B in keyof T[A]]: T[A][B] extends AnyMutator ? UnwrapMutator<S, T[A][B]> : never;
-    };
-} & {};
-declare const ZeroClientTransactionError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Cause.YieldableError & {
-    readonly _tag: "ZeroClientTransactionError";
-} & Readonly<A>;
-export declare class ZeroClientTransactionError extends ZeroClientTransactionError_base<{
-    cause: Cause.Cause<unknown>;
-}> {
-}
-declare const ZeroClientArgsParseError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Cause.YieldableError & {
-    readonly _tag: "ZeroClientArgsParseError";
+import type * as ClientTransaction from "./client-transaction.js";
+import * as Mutators from "./mutators.js";
+type ClientTransactionContext<TSchema extends ZeroSchema> = Omit<ReturnType<typeof ClientTransaction.make<string, TSchema>>, "use">;
+export declare const make: <TSchema extends ZeroSchema, TMutators extends Mutators.AnyMutators>(transaction: ClientTransactionContext<TSchema>, mutators: TMutators, options: Omit<ZeroOptions<TSchema, undefined>, "schema" | "mutators">) => Effect.Effect<Zero<TSchema, { [A in keyof TMutators]: TMutators[A] extends Mutators.AnyMutator<any, any> ? UnwrapMutator<TSchema, TMutators[A]> : { [B in keyof TMutators[A]]: TMutators[A][B] extends Mutators.AnyMutator<any, any> ? UnwrapMutator<TSchema, TMutators[A][B]> : never; }; }>, never, import("effect/Scope").Scope | Exclude<Mutators.ExtractMutatorsRequirements<TMutators>, ClientTransaction.ClientTransaction>>;
+type UnwrapMutator<TSchema extends ZeroSchema, TMutators extends Mutators.AnyMutator> = Parameters<TMutators> extends [] ? (transaction: ZeroTransaction<TSchema>) => Promise<void> : (transaction: ZeroTransaction<TSchema>, args: Schema.Schema.Encoded<TMutators[typeof Mutators.MutatorSchemaSymbol]>) => Promise<void>;
+declare const ClientArgsParseError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Cause.YieldableError & {
+    readonly _tag: "ClientArgsParseError";
 } & Readonly<A>;
-export declare class ZeroClientArgsParseError extends ZeroClientArgsParseError_base<{
-    cause: Cause.Cause<ParseResult.ParseError>;
+export declare class ClientArgsParseError extends ClientArgsParseError_base<{
+    readonly cause: Cause.Cause<ParseResult.ParseError>;
 }> {
 }
 export {};

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAqB,WAAW,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjH,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAIvD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EACL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,2BAA2B,EAChC,oBAAoB,EACrB,MAAM,eAAe,CAAC;AAOvB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,UAAU;qBAcD,CAAC,SAAS,WAAW,mCAuEhE,CAAC,oEAEK,CAAC;eAlD8B,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC;;;;gBA+B9C,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM;;cAhEtD,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE;YAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;SAAE,KAAK,WAAW,CAAC,CAAC,CAAC;;CA0E/G,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,GACrF,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC9C,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,oBAAoB,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,WAAW,IAAI;KACvE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GACnC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GACtB;SAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;KAAE;CAC1F,GAAG,EAAE,CAAC;;;;AAEP,qBAAa,0BAA2B,SAAQ,gCAA+C;IAC7F,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;CAC7B,CAAC;CAAG;;;;AAEL,qBAAa,wBAAyB,SAAQ,8BAA6C;IACzF,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;CAAG"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,KAAK,MAAM,IAAI,UAAU,EAAE,KAAK,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxH,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAIvD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,iBAAiB,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAE1C,KAAK,wBAAwB,CAAC,OAAO,SAAS,UAAU,IAAI,IAAI,CAC9D,UAAU,CAAC,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAC1D,KAAK,CACN,CAAC;AAEF,eAAO,MAAM,IAAI,GAAwB,OAAO,SAAS,UAAU,EAAE,SAAS,SAAS,QAAQ,CAAC,WAAW,gLAiDxG,CAAC,qHAGK,CAAC,6QAbR,CAAC;AAEH,KAAK,aAAa,CAAC,OAAO,SAAS,UAAU,EAAE,SAAS,SAAS,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,GACpH,CAAC,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GACxD,CACE,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,EACrC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KACxE,OAAO,CAAC,IAAI,CAAC,CAAC;;;;AAYvB,qBAAa,oBAAqB,SAAQ,0BAAyC;IACjF,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;CACrD,CAAC;CAAG"}

package/dist/client.js

@@ -1,6 +1,5 @@
-import { Atom } from "@effect-atom/atom";
+import { Zero } from "@rocicorp/zero";
 import * as Cause from "effect/Cause";
-import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
@@ -9,53 +8,27 @@ import * as Predicate from "effect/Predicate";
 import * as Rec from "effect/Record";
 import * as Runtime from "effect/Runtime";
 import * as Schema from "effect/Schema";
-import * as Stream from "effect/Stream";
-import * as Subscribable from "effect/Subscribable";
-import * as SubscriptionRef from "effect/SubscriptionRef";
-import { MutatorArgsSchemaSym, } from "./mutators.js";
-import { deepClone, getDefaultSnapshot, getSnapshot } from "./snapshot.js";
-import { prefixId } from "./utils.js";
-export const makeClient = () => {
-    // TODO: Maybe prefix this / suffix this with a tag passed in to `make`?
-    const ZeroClientTransaction = Context.Tag(prefixId("ZeroClientTransaction"))();
-    const use = (fn) => Effect.flatMap(ZeroClientTransaction, (transaction) => Effect.promise((signal) => fn(transaction, { signal }))).pipe(Effect.tapErrorCause((cause) => Effect.logError(cause)), Effect.sandbox, Effect.annotateLogs({ module: prefixId("ZeroClient.Transaction"), method: "use" }), Effect.mapError((cause) => new ZeroClientTransactionError({ cause })));
-    const unwrapMutators = Effect.fn(function* (mutators) {
-        const runtime = yield* Effect.runtime();
-        function unwrapMutator(mutator) {
-            return async (tx, args) => {
-                const exit = await Schema.decode(mutator[MutatorArgsSchemaSym])(args).pipe(Effect.catchTag("ParseError", (e) => new ZeroClientArgsParseError({ cause: Cause.fail(e) })), Effect.flatMap(mutator), Effect.provideService(ZeroClientTransaction, tx), Runtime.runPromiseExit(runtime));
-                return Exit.getOrElse(exit, (c) => {
-                    // Extract underlying error bypassing FiberFailure
-                    throw Cause.squash(c);
-                });
-            };
-        }
-        return Rec.map(mutators, (v) => Match.value(v).pipe(Match.when(Predicate.isFunction, unwrapMutator), Match.orElse(Rec.map(unwrapMutator))));
-    });
-    const querySub = Effect.fn(function* (query) {
-        const view = yield* Effect.acquireRelease(Effect.sync(() => query.materialize()), (view) => Effect.sync(() => view.destroy()));
-        const subscriptionRef = yield* SubscriptionRef.make(getDefaultSnapshot(query.format.singular));
-        yield* Stream.asyncEffect((emit) => Effect.sync(() => view.addListener((...args) => emit.single(args)))).pipe(Stream.mapEffect(([data, resultType]) => Effect.sync(() => {
-            // logic here borrowed from: https://github.com/rocicorp/mono/blob/288b00ec94f5a9ae6e988513423af25c281dbb2a/packages/zero-react/src/use-query.tsx#L295
-            const cloned = data === undefined ? data : deepClone(data);
-            return getSnapshot(query.format.singular, cloned, resultType);
-        })), Stream.runForEach((snapshot) => SubscriptionRef.set(subscriptionRef, snapshot)), Effect.forkScoped);
-        return subscriptionRef.pipe(Subscribable.map(([data, { type: status }]) => ({
-            data,
-            status,
-        })));
-    });
-    /** Create an Atom for the query */
-    const queryAtom = Atom.family((query) => Atom.subscribable(querySub(query)).pipe(Atom.mapResult((res) => res.data)));
-    return {
-        unwrapMutators,
-        querySub,
-        queryAtom,
-        Transaction: Object.assign(ZeroClientTransaction, { use }),
-    };
-};
-export class ZeroClientTransactionError extends Data.TaggedError("ZeroClientTransactionError") {
-}
-export class ZeroClientArgsParseError extends Data.TaggedError("ZeroClientArgsParseError") {
+import * as Mutators from "./mutators.js";
+export const make = Effect.fn(function* (transaction, mutators, options) {
+    const runtime = yield* Effect.runtime();
+    function unwrapMutator(mutator) {
+        return async (tx, args) => {
+            const exit = await Schema.decode(mutator[Mutators.MutatorSchemaSymbol])(args).pipe(Effect.catchTag("ParseError", (e) => new ClientArgsParseError({ cause: Cause.fail(e) })), Effect.flatMap(mutator), Effect.provideService(transaction, tx), Runtime.runPromiseExit(runtime));
+            return Exit.getOrElse(exit, (c) => {
+                // Extract underlying error bypassing FiberFailure
+                throw Cause.squash(c);
+            });
+        };
+    }
+    const unwrappedMutators = Rec.map(mutators, (v) => Match.value(v).pipe(Match.when(Predicate.isFunction, unwrapMutator), Match.orElse(Rec.map(unwrapMutator))));
+    return yield* Effect.acquireRelease(Effect.sync(() => {
+        return new Zero({
+            ...options,
+            schema: transaction.schema,
+            mutators: unwrappedMutators,
+        });
+    }), (zero) => Effect.promise(() => zero.close()));
+});
+export class ClientArgsParseError extends Data.TaggedError("ClientArgsParseError") {
 }
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAoF,MAAM,gBAAgB,CAAC;AACxH,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,GAAG,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAO1C,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EACrC,WAA8C,EAC9C,QAAmB,EACnB,OAA0D;IAE1D,MAAM,OAAO,GACX,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAElB,CAAC;IAEN,SAAS,aAAa,CAAI,OAAgF;QACxG,OAAO,KAAK,EAAE,EAA4B,EAAE,IAAa,EAAE,EAAE;YAC3D,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAChF,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EACxF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,EACtC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAChC,CAAC;YACF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;gBAChC,kDAAkD;gBAClD,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAChD,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CACrE,CAAC;IAExC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CACjC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACf,OAAO,IAAI,IAAI,CAAC;YACd,GAAG,OAAO;YACV,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,QAAQ,EAAE,iBAAiB;SAC5B,CAAC,CAAC;IACL,CAAC,CAAC,EACF,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAC7C,CAAC;AACJ,CAAC,CAAC,CAAC;AAmBH,MAAM,OAAO,oBAAqB,SAAQ,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAE/E;CAAG"}