effect-zero 0.8.0 → 0.9.0

package/dist/types.test.js

@@ -1,11 +1,13 @@
 import { describe, expectTypeOf, it } from "@effect/vitest";
 import { queryInternalsTag } from "@rocicorp/zero/bindings";
 import * as Context from "effect/Context";
+import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import * as SchemaGetter from "effect/SchemaGetter";
+import * as Client from "./client.js";
 import * as ClientTransaction from "./client-transaction.js";
-import * as Mutators from "./mutators.js";
+import * as Mutator from "./mutator.js";
 import * as Query from "./query.js";
 import * as Server from "./server.js";
 import * as ServerTransaction from "./server-transaction.js";
@@ -30,146 +32,109 @@ const mockZeroSchema = {
 const mockDatabase = {};
 describe("Type tests", () => {
     describe("Mutators", () => {
-        it("mutators should have correct argument types", () => {
-            const mutatorSchema = Mutators.schema({
-                messages: {
-                    create: Schema.Struct({
-                        id: Schema.String,
-                        body: Schema.String,
+        class DummyTag extends Context.Service()("effect-zero/test/DummyTag") {
+        }
+        class DummyTag2 extends Context.Service()("effect-zero/test/DummyTag2") {
+        }
+        class DummyError extends Data.TaggedError("DummyError") {
+        }
+        const clientTransaction = ClientTransaction.make("TestClientTransaction", mockZeroSchema);
+        const serverTransaction = ServerTransaction.make("TestServerTransaction", mockDatabase, clientTransaction);
+        const mutators = Mutator.registry(clientTransaction, {
+            messages: {
+                create: Mutator.make({
+                    payload: Schema.Struct({ id: Schema.String, body: Schema.String }),
+                    mutator: Effect.fn(function* (msg) {
+                        expectTypeOf(msg).toEqualTypeOf();
+                        yield* clientTransaction.use(async () => { });
                     }),
-                },
-                optionalVoidArg: Schema.Void,
-                noArgs: Schema.Void,
-                transformArgs: Schema.Struct({
-                    foo: Schema.NumberFromString,
                 }),
-            });
-            const clientTransaction = ClientTransaction.make("TestClientTransaction", mockZeroSchema);
-            const mutators = Mutators.make(mutatorSchema, {
-                messages: {
-                    create: (msg) => clientTransaction.use(async () => {
-                        // Use msg to verify type
-                        const _id = msg.id;
-                        const _body = msg.body;
+                deleteAll: Mutator.make({
+                    payload: Schema.Void,
+                    mutator: Effect.fn(function* () {
+                        yield* DummyTag;
+                        yield* clientTransaction.use(async () => { });
                     }),
-                },
-                optionalVoidArg: Effect.fn(function* (_a) { }),
-                noArgs: Effect.fn(function* () { }),
-                transformArgs: Effect.fn(function* (_a) { }),
-            });
-            // Test void/undefined optional parameter
-            expectTypeOf().toEqualTypeOf();
-            // Test no-arg mutator
+                }),
+            },
+            transformArgs: Mutator.make({
+                payload: Schema.Struct({ at: DateFromNumber }),
+                mutator: Effect.fn(function* ({ at }) {
+                    expectTypeOf(at).toEqualTypeOf();
+                    yield* DummyTag2;
+                    return yield* new DummyError();
+                }),
+            }),
+        });
+        it("mutators take their decoded args and produce requests", () => {
             expectTypeOf().toEqualTypeOf();
-            // Test nested mutator with struct schema
+            // A mutator without args is called without args.
+            mutators.messages.deleteAll();
             expectTypeOf().toEqualTypeOf();
-            // Test transformed args - mutator receives decoded (Type) version
+            const nullable = Mutator.make({ payload: Schema.NullOr(Schema.String), mutator: () => Effect.void });
             expectTypeOf().toEqualTypeOf();
+            // A request is also a Zero `MutateRequest`, so `zero.mutate(request)` accepts it.
+            expectTypeOf(mutators.messages.create({ id: "1", body: "a" })).toExtend();
+            expectTypeOf(mutators.messages.create.mutatorName).toEqualTypeOf();
         });
-        it("nested mutators using Effect.fn should have correct argument types", () => {
-            const mutatorSchema = Mutators.schema({
-                todo: {
-                    create: Schema.Struct({
-                        id: Schema.String,
-                        title: Schema.String,
-                    }),
-                    toggle: Schema.Struct({
-                        id: Schema.String,
-                        done: Schema.Boolean,
-                    }),
-                    delete: Schema.Void,
-                },
-            });
-            const clientTransaction = ClientTransaction.make("TestClientTransactionNested", mockZeroSchema);
-            // Note: When using Effect.fn with destructuring, TypeScript infers the parameter as `any`.
-            // The runtime still correctly validates/transforms args via the schema.
-            // To get proper type inference, use explicit parameter types or regular arrow functions.
-            const mutators = Mutators.make(mutatorSchema, {
-                todo: {
-                    // Using arrow function with explicit type for best inference
-                    create: (args) => clientTransaction.use(async () => {
-                        const _id = args.id;
-                        const _title = args.title;
-                    }),
-                    // Using Effect.fn with explicit type annotation
-                    toggle: Effect.fn(function* (args) {
-                        yield* clientTransaction.use(async () => { });
-                    }),
-                    // Using Effect.fn with no args (void schema)
-                    delete: Effect.fn(function* () {
-                        yield* clientTransaction.use(async () => { });
-                    }),
-                },
-            });
-            // Test nested mutator with arrow function - preserves type
+        it("mutate's outcomes fail with Zero's error details", () => {
+            const mutation = Client.mutate({}, mutators.transformArgs({ at: new Date() }));
+            expectTypeOf().toExtend();
             expectTypeOf().toEqualTypeOf();
-            // Test nested mutator with Effect.fn and explicit type annotation - preserves type
             expectTypeOf().toEqualTypeOf();
-            // Test nested mutator with void schema - delete
             expectTypeOf().toEqualTypeOf();
         });
-        it("nested mutator requirements should propagate", () => {
-            class NestedDummyTag extends Context.Service()("effect-zero/test/NestedDummyTag") {
-            }
-            class NestedDummyTag2 extends Context.Service()("effect-zero/test/NestedDummyTag2") {
-            }
-            const clientTransaction = ClientTransaction.make("TestClientTransactionNestedReq", mockZeroSchema);
-            const serverTransaction = ServerTransaction.make("TestServerTransactionNestedReq", mockDatabase, clientTransaction);
-            const mutatorSchema = Mutators.schema({
-                nested: {
-                    withTag1: Schema.Void,
-                    withTag2: Schema.Void,
-                    noTags: Schema.Void,
-                },
-            });
-            const mutators = Mutators.make(mutatorSchema, {
-                nested: {
-                    withTag1: Effect.fn(function* () {
-                        yield* NestedDummyTag;
-                    }),
-                    withTag2: Effect.fn(function* () {
-                        yield* NestedDummyTag2;
-                    }),
-                    noTags: Effect.fn(function* () { }),
-                },
-            });
-            const serverEffect = Server.handleMutate({ transaction: serverTransaction, mutators, query: {}, body: {}, userId: undefined });
-            // Server effect should require both NestedDummyTag and NestedDummyTag2
+        it("the registry's requirements propagate, without its client transaction", () => {
+            expectTypeOf().toEqualTypeOf();
+            const zero = Client.make(mutators, { userID: null, server: null });
             expectTypeOf().toEqualTypeOf();
         });
-        it("mutator requirements should propagate", () => {
-            class DummyTag extends Context.Service()("effect-zero/test/DummyTag") {
-            }
-            class DummyTag2 extends Context.Service()("effect-zero/test/DummyTag2") {
-            }
-            const clientTransaction = ClientTransaction.make("TestClientTransaction2", mockZeroSchema);
-            const serverTransaction = ServerTransaction.make("TestServerTransaction", mockDatabase, clientTransaction);
-            const mutatorSchema = Mutators.schema({
-                dummy: Schema.Void,
-                dummy2: Schema.Void,
+        it("handleMutate requires the shared bodies' services when nothing is overridden", () => {
+            const effect = Server.handleMutate({
+                transaction: serverTransaction,
+                mutators: Mutator.server(mutators, {}),
+                query: {},
+                body: {},
+                userId: undefined,
             });
-            const mutators = Mutators.make(mutatorSchema, {
-                dummy: Effect.fn(function* () {
-                    yield* DummyTag;
-                }),
-                dummy2: Effect.fn(function* () {
-                    yield* DummyTag2;
+            expectTypeOf().toEqualTypeOf();
+            // A registry goes through `ZfxMutator.server` before `handleMutate` takes it.
+            expectTypeOf(mutators).not.toExtend();
+        });
+        it("overrides replace the requirements of the mutators they override", () => {
+            const serverMutators = Mutator.server(mutators, {
+                messages: {
+                    deleteAll: Effect.fn(function* () { }),
+                },
+                transformArgs: Effect.fn(function* ({ at }) {
+                    expectTypeOf(at).toEqualTypeOf();
+                    yield* mutators.transformArgs.mutator({ at }).pipe(serverTransaction.execute);
                 }),
             });
-            const serverEffect = Server.handleMutate({ transaction: serverTransaction, mutators, query: {}, body: {}, userId: undefined });
-            // Server effect should require both DummyTag and DummyTag2
+            const effect = Server.handleMutate({
+                transaction: serverTransaction,
+                mutators: serverMutators,
+                query: {},
+                body: {},
+                userId: undefined,
+            });
+            // `deleteAll`'s override drops DummyTag; `transformArgs` reuses its body through the server transaction.
             expectTypeOf().toEqualTypeOf();
         });
         it("handleMutate has no extra requirements when mutators have none", () => {
-            const clientTransaction = ClientTransaction.make("TestClientTransaction3", mockZeroSchema);
-            const serverTransaction = ServerTransaction.make("TestServerTransaction2", mockDatabase, clientTransaction);
-            const mutatorSchema = Mutators.schema({
-                simple: Schema.Void,
+            const simple = Mutator.registry(clientTransaction, {
+                simple: Mutator.make({
+                    payload: Schema.Void,
+                    mutator: () => clientTransaction.use(async () => { }),
+                }),
             });
-            const mutators = Mutators.make(mutatorSchema, {
-                simple: Effect.fn(function* () { }),
+            const effect = Server.handleMutate({
+                transaction: serverTransaction,
+                mutators: Mutator.server(simple, {}),
+                query: {},
+                body: {},
+                userId: undefined,
             });
-            const effect = Server.handleMutate({ transaction: serverTransaction, mutators, query: {}, body: {}, userId: undefined });
             expectTypeOf().toEqualTypeOf();
         });
     });

package/dist/types.test.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect-zero",
   "type": "module",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "license": "MIT",
   "repository": {
     "url": "https://github.com/realms-labs/effect-zero"
@@ -51,16 +51,16 @@
         "default": "./dist/client.js"
       }
     },
-    "./server-transaction": {
+    "./mutator": {
       "import": {
-        "types": "./dist/server-transaction.d.ts",
-        "default": "./dist/server-transaction.js"
+        "types": "./dist/mutator.d.ts",
+        "default": "./dist/mutator.js"
       }
     },
-    "./mutators": {
+    "./server-transaction": {
       "import": {
-        "types": "./dist/mutators.d.ts",
-        "default": "./dist/mutators.js"
+        "types": "./dist/server-transaction.d.ts",
+        "default": "./dist/server-transaction.js"
       }
     },
     "./query": {

package/src/client.ts

@@ -1,78 +1,182 @@
-import { Zero, type ZeroOptions, type Schema as ZeroSchema, type Transaction as ZeroTransaction } from "@rocicorp/zero";
-import * as Cause from "effect/Cause";
+import {
+  type MutatorResultDetails,
+  type MutatorResultErrorDetails,
+  type MutatorResultSuccessDetails,
+  type ReadonlyJSONValue,
+  Zero,
+  type ZeroOptions,
+} from "@rocicorp/zero";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as Fn from "effect/Function";
 import type { NodeInspectSymbol } from "effect/Inspectable";
+import type * as LogLevel from "effect/LogLevel";
 import * as Match from "effect/Match";
+import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
 import * as Rec from "effect/Record";
-import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+import type * as Tracer from "effect/Tracer";
 import type * as Unify from "effect/Unify";
-import type * as ClientTransaction from "./client-transaction.js";
-import { ContextSymbol, SchemaSymbol } from "./client-transaction.js";
-import * as Mutators from "./mutators.js";
+import { type ContextSymbol, SchemaSymbol } from "./client-transaction.js";
+import * as Mutator from "./mutator.js";
 
 type _NodeInspectSymbol = NodeInspectSymbol;
 type _Unify = Unify.typeSymbol | Unify.unifySymbol | Unify.ignoreSymbol;
 
-export const make = Effect.fn(function* <TSchema extends ZeroSchema, TMutators extends Mutators.AnyMutators>(
-  transaction: ClientTransaction.Context<TSchema>,
-  mutators: TMutators,
-  options: Omit<ZeroOptions<TSchema, UnwrapMutators<TSchema, TMutators>>, "schema" | "mutators">,
+export type Options<TRegistry extends Mutator.AnyRegistry> = Omit<
+  ZeroOptions<Mutator.ZeroSchemaOf<TRegistry>>,
+  "schema" | "mutators" | "context"
+>;
+
+/**
+ * Makes a Zero client that runs the registry's mutators with the services in scope here.
+ * Run mutations with {@link mutate}.
+ */
+export const make = Effect.fn(function* <TRegistry extends Mutator.AnyRegistry>(
+  mutators: TRegistry,
+  options: Options<TRegistry>,
 ) {
-  const ctx =
+  const context =
     yield* Effect.context<
-      Exclude<Mutators.ExtractMutatorsRequirements<TMutators>, (typeof transaction)[typeof ContextSymbol]["Identifier"]>
+      Exclude<Mutator.Requirements<TRegistry>, Mutator.Transaction<TRegistry>[typeof ContextSymbol]["Identifier"]>
     >();
 
-  function unwrapMutator<E>(mutator: Mutators.AnyMutator<Mutators.ExtractMutatorsRequirements<TMutators>, E>) {
-    return (tx: ZeroTransaction<TSchema>, args: unknown, _ctx: unknown) =>
-      Schema.decodeUnknownEffect(mutator[Mutators.MutatorSchemaSymbol])(args).pipe(
-        Effect.catchTag("SchemaError", (e) => Effect.fail(new ClientArgsParseError({ cause: Cause.fail(e) }))),
-        Effect.flatMap(mutator),
-        Effect.provideService(transaction[ContextSymbol], tx),
-        Effect.runPromiseWith(ctx),
-      );
-  }
-
-  const unwrappedMutators = Rec.map(mutators, (v) =>
-    Match.value(v).pipe(Match.when(Predicate.isFunction, unwrapMutator), Match.orElse(Rec.map(unwrapMutator))),
-  ) as ZeroOptions<TSchema, UnwrapMutators<TSchema, TMutators>>["mutators"];
-
   return yield* Effect.acquireRelease(
-    Effect.sync(() => {
-      return new Zero({
-        ...options,
-        schema: transaction[SchemaSymbol],
-        mutators: unwrappedMutators,
-      });
-    }),
+    Effect.sync(
+      () =>
+        new Zero<Mutator.ZeroSchemaOf<TRegistry>>({
+          // Zero's own logs (at its `logLevel`, "warn" by default) go through Effect's logger, unless `options` sets
+          // a `logSink`.
+          logSink: {
+            log: (level, logContext, ...args) =>
+              Match.value(level).pipe(
+                Match.withReturnType<LogLevel.Severity>(),
+                Match.when("debug", () => "Debug"),
+                Match.when("info", () => "Info"),
+                Match.when("warn", () => "Warn"),
+                Match.when("error", () => "Error"),
+                Match.exhaustive,
+                (severity) => Effect.logWithLevel(severity)(...args),
+                Effect.annotateLogs({ ...logContext, logger: "zero" }),
+                Effect.runForkWith(context),
+              ),
+          },
+          ...options,
+          schema: mutators[Mutator.RegistryTypeId].transaction[SchemaSymbol],
+          mutators,
+          // The mutators run with these services.
+          context,
+        }),
+    ),
     (zero) => Effect.promise(() => zero.close()),
   );
 });
 
-type UnwrapMutator<TSchema extends ZeroSchema, TMutators extends Mutators.AnyMutator> = Parameters<TMutators> extends []
-  ? (transaction: ZeroTransaction<TSchema>) => Promise<void>
-  : (
-      transaction: ZeroTransaction<TSchema>,
-      args: Schema.Codec.Encoded<TMutators[typeof Mutators.MutatorSchemaSymbol]>,
-    ) => Promise<void>;
+/** A mutation sent with {@link mutate}. Its client and server outcomes settle independently. */
+export interface Mutation {
+  /** Completes once the mutation is applied locally; fails if Zero or the client mutator rejected it. */
+  readonly client: Effect.Effect<void, MutationError>;
+  /** Completes once the server applied the mutation; fails if it was rejected anywhere. */
+  readonly server: Effect.Effect<void, MutationError>;
+}
+
+/**
+ * Sends a mutation with `zero.mutate(request)` and traces it. Awaiting `client` or `server` is optional; both
+ * outcomes are always recorded on the `zero.mutation` span, as the `zero.mutation.client` and
+ * `zero.mutation.server` child spans.
+ */
+export const mutate = Effect.fn(function* <Type>(
+  // biome-ignore lint/suspicious/noExplicitAny: any Zero instance made with `make`
+  zero: Zero<any, any, any>,
+  request: Mutator.MutateRequest<Type>,
+) {
+  const mutator = request.mutator.mutatorName;
+  const connection = zero.connection.state.current;
+  // The span outlives this call: it ends when this scope closes, once both outcomes are known.
+  const scope = yield* Scope.make();
+  const span = yield* Effect.makeSpanScoped("zero.mutation", {
+    attributes: {
+      "zero.mutator": mutator,
+      "zero.clientID": zero.clientID,
+      "zero.connection.state": connection.name,
+      ...Rec.getSomes({
+        "zero.connection.reason": Option.fromNullishOr("reason" in connection ? connection.reason : undefined).pipe(
+          Option.map((reason) => (Predicate.isString(reason) ? reason : reason.type)),
+        ),
+      }),
+    },
+  }).pipe(Scope.provide(scope));
+
+  const result = yield* Effect.sync(() => zero.mutate(request)).pipe(
+    Effect.onError((cause) => Scope.close(scope, Exit.failCause(cause))),
+  );
+
+  const client = yield* Effect.promise(() => result.client).pipe(
+    Effect.filterOrElse(isApplied, (details) => new MutationError({ mutator, origin: "client", ...details.error })),
+    Effect.asVoid,
+    traceOutcome({ origin: "client", parent: span, mutator }),
+    Effect.forkDetach,
+  );
+  const server = yield* Effect.promise(() => result.server).pipe(
+    Effect.filterOrElse(
+      isApplied,
+      Effect.fnUntraced(function* (details) {
+        // A write the client rejected is never pushed; Zero reports the client's error for the server too.
+        const origin = Exit.isFailure(yield* Fiber.await(client)) ? "client" : "server";
+        return yield* new MutationError({ mutator, origin, ...details.error });
+      }),
+    ),
+    Effect.asVoid,
+    traceOutcome({ origin: "server", parent: span, mutator }),
+    Effect.forkDetach,
+  );
+
+  yield* Effect.gen(function* () {
+    span.attribute("zero.clientGroupID", yield* Effect.promise(() => zero.clientGroupID));
+    const clientExit = yield* Fiber.await(client);
+    const serverExit = yield* Fiber.await(server);
+    yield* Scope.close(scope, Exit.isFailure(clientExit) ? clientExit : serverExit);
+  }).pipe(Effect.forkDetach);
+
+  // Joining a fiber never re-runs it, so either outcome can be awaited any number of times.
+  return { client: Fiber.join(client), server: Fiber.join(server) };
+});
+
+const isApplied = (details: MutatorResultDetails): details is MutatorResultSuccessDetails => details.type === "success";
 
-type UnwrapMutators<TSchema extends ZeroSchema, TMutators extends Mutators.AnyMutators> = {
-  [A in keyof TMutators]: TMutators[A] extends Mutators.AnyMutator
-    ? UnwrapMutator<TSchema, TMutators[A]>
-    : {
-        [B in keyof TMutators[A]]: TMutators[A][B] extends Mutators.AnyMutator
-          ? UnwrapMutator<TSchema, TMutators[A][B]>
-          : never;
-      };
-} & {};
+/** Runs a mutation's outcome in its `zero.mutation.client` or `zero.mutation.server` span. */
+const traceOutcome: {
+  (options: TraceOutcomeOptions): (self: Effect.Effect<void, MutationError>) => Effect.Effect<void, MutationError>;
+  (self: Effect.Effect<void, MutationError>, options: TraceOutcomeOptions): Effect.Effect<void, MutationError>;
+} = Fn.dual(2, (self: Effect.Effect<void, MutationError>, { origin, parent, mutator }: TraceOutcomeOptions) =>
+  self.pipe(
+    Effect.tapError((error) =>
+      Effect.annotateCurrentSpan({
+        "zero.mutation.error.type": error.type,
+        "zero.mutation.error.origin": error.origin,
+      }),
+    ),
+    Effect.withSpan(`zero.mutation.${origin}`, { parent, attributes: { "zero.mutator": mutator } }),
+  ),
+);
 
-export class ClientArgsParseError extends Data.TaggedError("ClientArgsParseError")<{
-  readonly cause: Cause.Cause<unknown>;
-}> {
-  override get message() {
-    const error = Cause.squash(this.cause);
-    return Predicate.isError(error) && !Schema.isSchemaError(error) ? error.message : "Internal error";
-  }
+interface TraceOutcomeOptions {
+  readonly origin: "client" | "server";
+  readonly parent: Tracer.Span;
+  readonly mutator: string;
 }
+
+/**
+ * Zero rejected a mutation, with Zero's own error details: `type` is `"zero"` when Zero itself refused it
+ * (e.g. offline), and `"app"` when a mutator failed. `origin` is where it failed.
+ */
+export class MutationError extends Data.TaggedError("MutationError")<{
+  readonly mutator: string;
+  readonly origin: "client" | "server";
+  readonly type: MutatorResultErrorDetails["error"]["type"];
+  readonly message: string;
+  readonly details?: ReadonlyJSONValue | undefined;
+}> {}