effect-zero 0.3.3 → 0.4.1

package/dist/types/queries.d.ts

@@ -5,7 +5,7 @@ export declare const TransformRequestMessage: Schema.Tuple2<Schema.Literal<["tra
     args: Schema.Array$<typeof Schema.Unknown>;
 }>>>;
 export type TransformRequestMessage = typeof TransformRequestMessage.Type;
-export declare const TransformResponseMessage: Schema.Tuple2<Schema.Literal<["transformed"]>, Schema.Array$<Schema.Union<[Schema.Struct<{
+export declare const TransformResponseMessage: Schema.Union<[Schema.Tuple2<Schema.Literal<["transformed"]>, Schema.Array$<Schema.Union<[Schema.Struct<{
     id: typeof Schema.String;
     name: typeof Schema.String;
     ast: typeof Schema.Unknown;
@@ -13,17 +13,36 @@ export declare const TransformResponseMessage: Schema.Tuple2<Schema.Literal<["tr
     error: Schema.Literal<["app"]>;
     id: typeof Schema.String;
     name: typeof Schema.String;
-    details: typeof Schema.Unknown;
+    message: Schema.optional<typeof Schema.String>;
+    details: Schema.optional<typeof Schema.Unknown>;
 }>, Schema.Struct<{
-    error: Schema.Literal<["http"]>;
+    error: Schema.Literal<["parse"]>;
     id: typeof Schema.String;
     name: typeof Schema.String;
+    message: typeof Schema.String;
+    details: Schema.optional<typeof Schema.Unknown>;
+}>]>]>>>, Schema.Tuple2<Schema.Literal<["transformFailed"]>, Schema.Union<[Schema.Struct<{
+    origin: Schema.Literal<["server"]>;
+    reason: Schema.Literal<["database", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["http"]>;
     status: typeof Schema.Number;
-    details: typeof Schema.Unknown;
+    bodyPreview: Schema.optional<typeof Schema.String>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
 }>, Schema.Struct<{
-    error: Schema.Literal<["zero"]>;
-    id: typeof Schema.String;
-    name: typeof Schema.String;
-    details: typeof Schema.Unknown;
-}>]>]>>>;
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["timeout", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>]>>]>;
 //# sourceMappingURL=queries.d.ts.map

package/dist/types/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAiDxC,eAAO,MAAM,uBAAuB;;;;IAAkE,CAAC;AACvG,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC,IAAI,CAAC;AAK1E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;QAAqE,CAAC"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA6CxC,eAAO,MAAM,uBAAuB;;;;IAAkE,CAAC;AACvG,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC,IAAI,CAAC;AAS1E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAA2D,CAAC"}

package/dist/types/queries.js

@@ -1,7 +1,8 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { TransformFailedBody } from "./error.js";
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/9fe2b3cb770bad269ecaf12296c64a0739c23e4e/packages/zero-protocol/src/custom-queries.ts#L14
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/custom-queries.ts
 /** TODO: Defined as unknown for now */
 const Ast = Schema.Unknown;
 const TransformRequestBody = Schema.Array(Schema.Struct({
@@ -14,29 +15,27 @@ const TransformedQuery = Schema.Struct({
     name: Schema.String,
     ast: Ast,
 });
-const AppQueryError = Schema.Struct({
+const AppErroredQuery = Schema.Struct({
     error: Schema.Literal("app"),
     id: Schema.String,
     name: Schema.String,
-    details: JsonSchema,
+    // optional for backwards compatibility
+    message: Schema.optional(Schema.String),
+    details: Schema.optional(JsonSchema),
 });
-const ErrorSchema = Schema.Struct({
-    error: Schema.Literal("zero"),
+const ParseErroredQuery = Schema.Struct({
+    error: Schema.Literal("parse"),
     id: Schema.String,
     name: Schema.String,
-    details: JsonSchema,
+    message: Schema.String,
+    details: Schema.optional(JsonSchema),
 });
-const HttpQueryError = Schema.Struct({
-    error: Schema.Literal("http"),
-    id: Schema.String,
-    name: Schema.String,
-    status: Schema.Number,
-    details: JsonSchema,
-});
-const ErroredQuery = Schema.Union(AppQueryError, HttpQueryError, ErrorSchema);
+const ErroredQuery = Schema.Union(AppErroredQuery, ParseErroredQuery);
 const TransformResponseBody = Schema.Array(Schema.Union(TransformedQuery, ErroredQuery));
 export const TransformRequestMessage = Schema.Tuple(Schema.Literal("transform"), TransformRequestBody);
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const TransformErrorMessage = Schema.Tuple(Schema.Literal("transformError"), Schema.Array(ErroredQuery));
-export const TransformResponseMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+const TransformFailedMessage = Schema.Tuple(Schema.Literal("transformFailed"), TransformFailedBody);
+const TransformOkMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+export const TransformResponseMessage = Schema.Union(TransformOkMessage, TransformFailedMessage);
 //# sourceMappingURL=queries.js.map

package/dist/types/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,sDAAsD;AACtD,kIAAkI;AAElI,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;AAE3B,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CACvC,MAAM,CAAC,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;CAC/B,CAAC,CACH,CAAC;AAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,GAAG,EAAE,GAAG;CACT,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;AAE9E,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAGvG,iEAAiE;AACjE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,sDAAsD;AACtD,8HAA8H;AAE9H,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;AAE3B,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CACvC,MAAM,CAAC,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;CAC/B,CAAC,CACH,CAAC;AAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,GAAG,EAAE,GAAG;CACT,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,uCAAuC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;AAEtE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAGvG,iEAAiE;AACjE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEzG,MAAM,sBAAsB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAEpG,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC"}

package/dist/types.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.test.d.ts.map

package/dist/types.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.test.d.ts","sourceRoot":"","sources":["../src/types.test.ts"],"names":[],"mappings":""}

package/dist/types.test.js

@@ -0,0 +1,268 @@
+import { describe, expectTypeOf, it } from "@effect/vitest";
+import { queryInternalsTag } from "@rocicorp/zero/bindings";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as ClientTransaction from "./client-transaction.js";
+import * as Mutators from "./mutators.js";
+import * as Query from "./query.js";
+import * as Server from "./server.js";
+import * as ServerTransaction from "./server-transaction.js";
+// Mock Zero schema for type tests
+const mockZeroSchema = {
+    tables: {
+        messages: {
+            tableName: "messages",
+            columns: {
+                id: { type: "string" },
+                body: { type: "string" },
+            },
+            primaryKey: ["id"],
+        },
+    },
+};
+// Mock database for type tests
+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,
+                    }),
+                },
+                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;
+                    }),
+                },
+                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
+            expectTypeOf().toEqualTypeOf();
+            // Test nested mutator with struct schema
+            expectTypeOf().toEqualTypeOf();
+            // Test transformed args - mutator receives decoded (Type) version
+            expectTypeOf().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
+            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 Effect.Service()("effect-zero/test/NestedDummyTag", {
+                succeed: {},
+            }) {
+            }
+            class NestedDummyTag2 extends Effect.Service()("effect-zero/test/NestedDummyTag2", {
+                succeed: {},
+            }) {
+            }
+            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.processPush(serverTransaction, mutators, {}, {});
+            // Server effect should require both NestedDummyTag and NestedDummyTag2
+            expectTypeOf().toEqualTypeOf();
+        });
+        it("mutator requirements should propagate", () => {
+            class DummyTag extends Effect.Service()("effect-zero/test/DummyTag", {
+                succeed: {},
+            }) {
+            }
+            class DummyTag2 extends Effect.Service()("effect-zero/test/DummyTag2", {
+                succeed: {},
+            }) {
+            }
+            const clientTransaction = ClientTransaction.make("TestClientTransaction2", mockZeroSchema);
+            const serverTransaction = ServerTransaction.make("TestServerTransaction", mockDatabase, clientTransaction);
+            const mutatorSchema = Mutators.schema({
+                dummy: Schema.Void,
+                dummy2: Schema.Void,
+            });
+            const mutators = Mutators.make(mutatorSchema, {
+                dummy: Effect.fn(function* () {
+                    yield* DummyTag;
+                }),
+                dummy2: Effect.fn(function* () {
+                    yield* DummyTag2;
+                }),
+            });
+            const serverEffect = Server.processPush(serverTransaction, mutators, {}, {});
+            // Server effect should require both DummyTag and DummyTag2
+            expectTypeOf().toEqualTypeOf();
+        });
+        it("processPush 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 mutators = Mutators.make(mutatorSchema, {
+                simple: Effect.fn(function* () { }),
+            });
+            const effect = Server.processPush(serverTransaction, mutators, {}, {});
+            expectTypeOf().toEqualTypeOf();
+        });
+    });
+    describe("Query", () => {
+        // biome-ignore lint/suspicious/noExplicitAny: allowed in tests
+        const makeMockQuery = () => {
+            const mockQuery = {
+                [queryInternalsTag]: true,
+                format: { singular: false },
+                nameAndArgs: () => mockQuery,
+            };
+            return mockQuery;
+        };
+        it("query should accept and passthrough encoded non-JSON args", () => {
+            const transformArgsQuery = Query.make({
+                name: "transformArgs",
+                payload: Schema.DateFromNumber,
+                query: Effect.fn(function* (a) {
+                    // Inside the query, 'a' should be the decoded type (Date)
+                    expectTypeOf().toEqualTypeOf();
+                    return yield* Effect.succeed(makeMockQuery());
+                }),
+            });
+            // Query function should accept decoded type (Date)
+            expectTypeOf().toEqualTypeOf();
+        });
+        it("query with string tuple should have correct parameter types", () => {
+            const stringQuery = Query.make({
+                name: "stringQuery",
+                payload: Schema.String,
+                query: Effect.fn(function* (s) {
+                    expectTypeOf().toEqualTypeOf();
+                    return yield* Effect.succeed(makeMockQuery());
+                }),
+            });
+            expectTypeOf().toEqualTypeOf();
+        });
+        // Queries were changed to only support a single argument in 0.25
+        //
+        // it("query with multiple args should have correct parameter types", () => {
+        //   const multiArgQuery = Query.make({
+        //     name: "multiArgQuery",
+        //     payload: Schema.Tuple(Schema.String, Schema.Number),
+        //     query: Effect.fn(function* (s, n) {
+        //       expectTypeOf<typeof s>().toEqualTypeOf<string>();
+        //       expectTypeOf<typeof n>().toEqualTypeOf<number>();
+        //       return yield* Effect.succeed(makeMockQuery());
+        //     }),
+        //   });
+        //   expectTypeOf<Parameters<typeof multiArgQuery>>().toEqualTypeOf<[string, number]>();
+        // });
+        it("query with no args should have empty parameter types", () => {
+            const noArgQuery = Query.make({
+                name: "noArgQuery",
+                payload: Schema.Void,
+                query: Effect.fn(function* () {
+                    return yield* Effect.succeed(makeMockQuery());
+                }),
+            });
+            // biome-ignore lint/suspicious/noConfusingVoidType: Necessary for type check
+            expectTypeOf().toEqualTypeOf();
+        });
+        it("query with complex struct arg should have correct parameter types", () => {
+            const complexQuery = Query.make({
+                name: "complexQuery",
+                payload: Schema.Struct({
+                    id: Schema.String,
+                    nested: Schema.Struct({ value: Schema.Number }),
+                }),
+                query: Effect.fn(function* (arg) {
+                    expectTypeOf().toEqualTypeOf();
+                    return yield* Effect.succeed(makeMockQuery());
+                }),
+            });
+            expectTypeOf().toEqualTypeOf();
+        });
+        it("MakeQueryResult should be satisfied by query results", () => {
+            const query1 = Query.make({
+                name: "q1",
+                payload: Schema.Tuple(Schema.String),
+                query: () => Effect.succeed(makeMockQuery()),
+            });
+            const query2 = Query.make({
+                name: "q2",
+                payload: Schema.Tuple(),
+                query: () => Effect.succeed(makeMockQuery()),
+            });
+            // This should compile without error
+            const queries = [query1, query2];
+            expectTypeOf(queries).toExtend();
+        });
+    });
+});
+//# sourceMappingURL=types.test.js.map

package/dist/types.test.js.map

@@ -0,0 +1 @@
+{"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.3.3",
+  "version": "0.4.1",
   "license": "MIT",
   "repository": {
     "url": "https://github.com/realms-labs/effect-zero"
@@ -19,7 +19,7 @@
     "@effect-atom/atom": "^0.4.3",
     "@effect/language-service": "^0.55.2",
     "@effect/vitest": "^0.27.0",
-    "@rocicorp/zero": "^0.24.3000000000",
+    "@rocicorp/zero": "^0.26.1",
     "@types/bun": "latest",
     "@types/fs-extra": "^11.0.4",
     "effect": "^3.19.3",
@@ -40,22 +40,16 @@
         "default": "./dist/server.js"
       }
     },
-    "./result": {
-      "import": {
-        "types": "./dist/result.d.ts",
-        "default": "./dist/result.js"
-      }
-    },
-    "./server-transaction": {
+    "./query": {
       "import": {
-        "types": "./dist/server-transaction.d.ts",
-        "default": "./dist/server-transaction.js"
+        "types": "./dist/query.d.ts",
+        "default": "./dist/query.js"
       }
     },
-    "./client-transaction": {
+    "./mutators": {
       "import": {
-        "types": "./dist/client-transaction.d.ts",
-        "default": "./dist/client-transaction.js"
+        "types": "./dist/mutators.d.ts",
+        "default": "./dist/mutators.js"
       }
     },
     "./snapshot": {
@@ -64,28 +58,28 @@
         "default": "./dist/snapshot.js"
       }
     },
-    "./mutators": {
+    "./client-transaction": {
       "import": {
-        "types": "./dist/mutators.d.ts",
-        "default": "./dist/mutators.js"
+        "types": "./dist/client-transaction.d.ts",
+        "default": "./dist/client-transaction.js"
       }
     },
-    "./client": {
+    "./server-transaction": {
       "import": {
-        "types": "./dist/client.d.ts",
-        "default": "./dist/client.js"
+        "types": "./dist/server-transaction.d.ts",
+        "default": "./dist/server-transaction.js"
       }
     },
-    "./query": {
+    "./result": {
       "import": {
-        "types": "./dist/query.d.ts",
-        "default": "./dist/query.js"
+        "types": "./dist/result.d.ts",
+        "default": "./dist/result.js"
       }
     },
-    "./types/common": {
+    "./client": {
       "import": {
-        "types": "./dist/types/common.d.ts",
-        "default": "./dist/types/common.js"
+        "types": "./dist/client.d.ts",
+        "default": "./dist/client.js"
       }
     },
     "./types/push": {
@@ -99,6 +93,18 @@
         "types": "./dist/types/queries.d.ts",
         "default": "./dist/types/queries.js"
       }
+    },
+    "./types/error": {
+      "import": {
+        "types": "./dist/types/error.d.ts",
+        "default": "./dist/types/error.js"
+      }
+    },
+    "./types/common": {
+      "import": {
+        "types": "./dist/types/common.d.ts",
+        "default": "./dist/types/common.js"
+      }
     }
   }
 }

package/src/client.ts

@@ -20,7 +20,7 @@ type ClientTransactionContext<TSchema extends ZeroSchema> = Omit<
 export const make = Effect.fn(function* <TSchema extends ZeroSchema, TMutators extends Mutators.AnyMutators>(
   transaction: ClientTransactionContext<TSchema>,
   mutators: TMutators,
-  options: Omit<ZeroOptions<TSchema>, "schema" | "mutators">,
+  options: Omit<ZeroOptions<TSchema, UnwrapMutators<TSchema, TMutators>>, "schema" | "mutators">,
 ) {
   const runtime =
     yield* Effect.runtime<
@@ -28,7 +28,7 @@ export const make = Effect.fn(function* <TSchema extends ZeroSchema, TMutators e
     >();
 
   function unwrapMutator<E>(mutator: Mutators.AnyMutator<Mutators.ExtractMutatorsRequirements<TMutators>, E>) {
-    return async (tx: ZeroTransaction<TSchema>, args: unknown) => {
+    return async (tx: ZeroTransaction<TSchema>, args: unknown, _ctx: unknown) => {
       const exit = await Schema.decode(mutator[Mutators.MutatorSchemaSymbol])(args).pipe(
         Effect.catchTag("ParseError", (e) => new ClientArgsParseError({ cause: Cause.fail(e) })),
         Effect.flatMap(mutator),
@@ -44,7 +44,7 @@ export const make = Effect.fn(function* <TSchema extends ZeroSchema, TMutators e
 
   const unwrappedMutators = Rec.map(mutators, (v) =>
     Match.value(v).pipe(Match.when(Predicate.isFunction, unwrapMutator), Match.orElse(Rec.map(unwrapMutator))),
-  ) as UnwrapMutators<TSchema, TMutators>;
+  ) as ZeroOptions<TSchema, UnwrapMutators<TSchema, TMutators>>["mutators"];
 
   return yield* Effect.acquireRelease(
     Effect.sync(() => {

package/src/internal/query-result.ts

@@ -1,8 +1,5 @@
-import type {
-  HumanReadable,
-  QueryResult as ZeroQueryResult,
-  QueryResultDetails as ZeroQueryResultDetails,
-} from "@rocicorp/zero/react";
+import type { HumanReadable, QueryResultDetails as ZeroQueryResultDetails } from "@rocicorp/zero";
+import type { QueryResult as ZeroQueryResult } from "@rocicorp/zero/react";
 import * as Match from "effect/Match";
 
 // Our internal representation of Zero's QueryResult type.