@confect/test 2.0.0 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @confect/test
 
+## 4.0.0
+
+### Patch Changes
+
+- Updated dependencies [60be7e6]
+- Updated dependencies [641fd99]
+- Updated dependencies [8ae4d51]
+  - @confect/server@4.0.0
+  - @confect/core@4.0.0
+
+## 3.0.0
+
+### Minor Changes
+
+- 5fb6a61: Add support for plain Convex functions. Plain Convex queries, mutations, and actions can now be included in your Confect spec and impl tree using new `FunctionSpec.convexPublic*` and `FunctionSpec.convexInternal*` constructors. This enables interop with Convex components and libraries (such as Workpool, Workflow, Migrations, and Better Auth) that require user-defined or -provided Convex functions.
+
+### Patch Changes
+
+- Updated dependencies [5fb6a61]
+  - @confect/core@3.0.0
+  - @confect/server@3.0.0
+
 ## 2.0.0
 
 ### Patch Changes

package/dist/TestConfect.d.ts

@@ -9,9 +9,9 @@ declare namespace TestConfect_d_exports {
   export { TestConfect, TestConfectWithoutIdentity, layer };
 }
 type TestConfectWithoutIdentity<ConfectSchema extends DatabaseSchema.AnyWithProps> = {
-  query: <QueryRef extends Ref.AnyQuery>(queryRef: QueryRef, args: Ref.Args<QueryRef>["Type"]) => Effect.Effect<Ref.Returns<QueryRef>["Type"], ParseResult.ParseError>;
-  mutation: <MutationRef extends Ref.AnyMutation>(mutationRef: MutationRef, args: Ref.Args<MutationRef>["Type"]) => Effect.Effect<Ref.Returns<MutationRef>["Type"], ParseResult.ParseError>;
-  action: <ActionRef extends Ref.AnyAction>(actionRef: ActionRef, args: Ref.Args<ActionRef>["Type"]) => Effect.Effect<Ref.Returns<ActionRef>["Type"], ParseResult.ParseError>;
+  query: <QueryRef extends Ref.AnyQuery>(queryRef: QueryRef, args: Ref.Args<QueryRef>) => Effect.Effect<Ref.Returns<QueryRef>, ParseResult.ParseError>;
+  mutation: <MutationRef extends Ref.AnyMutation>(mutationRef: MutationRef, args: Ref.Args<MutationRef>) => Effect.Effect<Ref.Returns<MutationRef>, ParseResult.ParseError>;
+  action: <ActionRef extends Ref.AnyAction>(actionRef: ActionRef, args: Ref.Args<ActionRef>) => Effect.Effect<Ref.Returns<ActionRef>, ParseResult.ParseError>;
   run: {
     <E>(handler: Effect.Effect<void, E, RegisteredConvexFunction.MutationServices<ConfectSchema>>): Effect.Effect<void>;
     <A, B extends Value, E>(handler: Effect.Effect<A, E, RegisteredConvexFunction.MutationServices<ConfectSchema>>, returns: Schema.Schema<A, B>): Effect.Effect<A, ParseResult.ParseError>;

package/dist/TestConfect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestConfect.d.ts","names":[],"sources":["../src/TestConfect.ts"],"mappings":";;;;;;;;;;KAaY,0BAAA,uBACY,cAAA,CAAe,YAAA;EAErC,KAAA,oBAAyB,GAAA,CAAI,QAAA,EAC3B,QAAA,EAAU,QAAA,EACV,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,QAAA,cACZ,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,QAAA,WAAmB,WAAA,CAAY,UAAA;EAC9D,QAAA,uBAA+B,GAAA,CAAI,WAAA,EACjC,WAAA,EAAa,WAAA,EACb,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,WAAA,cACZ,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,WAAA,WAAsB,WAAA,CAAY,UAAA;EACjE,MAAA,qBAA2B,GAAA,CAAI,SAAA,EAC7B,SAAA,EAAW,SAAA,EACX,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,SAAA,cACZ,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,SAAA,WAAoB,WAAA,CAAY,UAAA;EAC/D,GAAA;IAAA,IAEI,OAAA,EAAS,MAAA,CAAO,MAAA,OAEd,CAAA,EACA,wBAAA,CAAyB,gBAAA,CAAiB,aAAA,KAE3C,MAAA,CAAO,MAAA;IAAA,cACI,KAAA,KACZ,OAAA,EAAS,MAAA,CAAO,MAAA,CACd,CAAA,EACA,CAAA,EACA,wBAAA,CAAyB,gBAAA,CAAiB,aAAA,IAE5C,OAAA,EAAS,MAAA,CAAO,MAAA,CAAO,CAAA,EAAG,CAAA,IACzB,MAAA,CAAO,MAAA,CAAO,CAAA,EAAG,WAAA,CAAY,UAAA;EAAA;EAElC,KAAA,GACE,iBAAA,UACA,IAAA,GAAO,WAAA,KACJ,MAAA,CAAO,MAAA,CAAO,QAAA;EACnB,kCAAA,QAA0C,MAAA,CAAO,MAAA;EACjD,2BAAA,GACE,aAAA,iBACG,MAAA,CAAO,MAAA;AAAA;AAAA,KAGF,WAAA,uBAAkC,cAAA,CAAe,YAAA;EAC3D,YAAA,GACE,YAAA,EAAc,OAAA,CAAQ,YAAA,MACnB,0BAAA,CAA2B,aAAA;AAAA,IAC9B,0BAAA,CAA2B,aAAA;AAAA,cAElB,WAAA,yBACW,cAAA,CAAe,YAAA,OAAY,OAAA,CAAA,GAAA,CAAA,WAAA,CAAA,aAAA,GAAA,WAAA,CAAA,aAAA;AAAA,cA4LtC,KAAA,2BACc,cAAA,CAAe,YAAA,EACtC,cAAA,EAAgB,eAAA,EAChB,OAAA,EAAS,MAAA,eAAqB,OAAA,iBAE5B,KAAA,CAAM,KAAA,CAAM,WAAA,CAAY,eAAA"}
+{"version":3,"file":"TestConfect.d.ts","names":[],"sources":["../src/TestConfect.ts"],"mappings":";;;;;;;;;;KAaY,0BAAA,uBACY,cAAA,CAAe,YAAA;EAErC,KAAA,oBAAyB,GAAA,CAAI,QAAA,EAC3B,QAAA,EAAU,QAAA,EACV,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,QAAA,MACZ,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,QAAA,GAAW,WAAA,CAAY,UAAA;EACtD,QAAA,uBAA+B,GAAA,CAAI,WAAA,EACjC,WAAA,EAAa,WAAA,EACb,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,WAAA,MACZ,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,WAAA,GAAc,WAAA,CAAY,UAAA;EACzD,MAAA,qBAA2B,GAAA,CAAI,SAAA,EAC7B,SAAA,EAAW,SAAA,EACX,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,SAAA,MACZ,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,SAAA,GAAY,WAAA,CAAY,UAAA;EACvD,GAAA;IAAA,IAEI,OAAA,EAAS,MAAA,CAAO,MAAA,OAEd,CAAA,EACA,wBAAA,CAAyB,gBAAA,CAAiB,aAAA,KAE3C,MAAA,CAAO,MAAA;IAAA,cACI,KAAA,KACZ,OAAA,EAAS,MAAA,CAAO,MAAA,CACd,CAAA,EACA,CAAA,EACA,wBAAA,CAAyB,gBAAA,CAAiB,aAAA,IAE5C,OAAA,EAAS,MAAA,CAAO,MAAA,CAAO,CAAA,EAAG,CAAA,IACzB,MAAA,CAAO,MAAA,CAAO,CAAA,EAAG,WAAA,CAAY,UAAA;EAAA;EAElC,KAAA,GACE,iBAAA,UACA,IAAA,GAAO,WAAA,KACJ,MAAA,CAAO,MAAA,CAAO,QAAA;EACnB,kCAAA,QAA0C,MAAA,CAAO,MAAA;EACjD,2BAAA,GACE,aAAA,iBACG,MAAA,CAAO,MAAA;AAAA;AAAA,KAGF,WAAA,uBAAkC,cAAA,CAAe,YAAA;EAC3D,YAAA,GACE,YAAA,EAAc,OAAA,CAAQ,YAAA,MACnB,0BAAA,CAA2B,aAAA;AAAA,IAC9B,0BAAA,CAA2B,aAAA;AAAA,cAElB,WAAA,yBACW,cAAA,CAAe,YAAA,OAAY,OAAA,CAAA,GAAA,CAAA,WAAA,CAAA,aAAA,GAAA,WAAA,CAAA,aAAA;AAAA,cA0NtC,KAAA,2BACc,cAAA,CAAe,YAAA,EACtC,cAAA,EAAgB,eAAA,EAChB,OAAA,EAAS,MAAA,eAAqB,OAAA,iBAE5B,KAAA,CAAM,KAAA,CAAM,WAAA,CAAY,eAAA"}

package/dist/TestConfect.js

@@ -2,7 +2,7 @@ import { __exportAll } from "./_virtual/_rolldown/runtime.js";
 import { Ref } from "@confect/core";
 import { RegisteredConvexFunction } from "@confect/server";
 import { convexTest } from "convex-test";
-import { Context, Effect, Layer, Schema } from "effect";
+import { Context, Effect, Layer, Match, Schema } from "effect";
 
 //#region src/TestConfect.ts
 var TestConfect_exports = /* @__PURE__ */ __exportAll({
@@ -16,25 +16,31 @@ var TestConfectImplWithoutIdentity = class {
 		this.testConvex = testConvex;
 	}
 	query = (queryRef, args) => Effect.gen(this, function* () {
-		const query = Ref.getFunction(queryRef);
+		const querySpec = Ref.getFunctionSpec(queryRef);
 		const queryName = Ref.getConvexFunctionName(queryRef);
-		const encodedArgs = yield* Schema.encode(query.args)(args);
-		const encodedReturns = yield* Effect.promise(() => this.testConvex.query(queryName, encodedArgs));
-		return yield* Schema.decode(query.returns)(encodedReturns);
+		return yield* Match.value(querySpec.functionProvenance).pipe(Match.tag("Confect", (confect) => Effect.gen(this, function* () {
+			const encodedArgs = yield* Schema.encode(confect.args)(args);
+			const encodedReturns = yield* Effect.promise(() => this.testConvex.query(queryName, encodedArgs));
+			return yield* Schema.decode(confect.returns)(encodedReturns);
+		})), Match.tag("Convex", () => Effect.promise(() => this.testConvex.query(queryName, args))), Match.exhaustive);
 	});
 	mutation = (mutationRef, args) => Effect.gen(this, function* () {
-		const mutation = Ref.getFunction(mutationRef);
+		const mutationSpec = Ref.getFunctionSpec(mutationRef);
 		const mutationName = Ref.getConvexFunctionName(mutationRef);
-		const encodedArgs = yield* Schema.encode(mutation.args)(args);
-		const encodedReturns = yield* Effect.promise(() => this.testConvex.mutation(mutationName, encodedArgs));
-		return yield* Schema.decode(mutation.returns)(encodedReturns);
+		return yield* Match.value(mutationSpec.functionProvenance).pipe(Match.tag("Confect", (confect) => Effect.gen(this, function* () {
+			const encodedArgs = yield* Schema.encode(confect.args)(args);
+			const encodedReturns = yield* Effect.promise(() => this.testConvex.mutation(mutationName, encodedArgs));
+			return yield* Schema.decode(confect.returns)(encodedReturns);
+		})), Match.tag("Convex", () => Effect.promise(() => this.testConvex.mutation(mutationName, args))), Match.exhaustive);
 	});
 	action = (actionRef, args) => Effect.gen(this, function* () {
-		const action = Ref.getFunction(actionRef);
+		const actionSpec = Ref.getFunctionSpec(actionRef);
 		const actionName = Ref.getConvexFunctionName(actionRef);
-		const encodedArgs = yield* Schema.encode(action.args)(args);
-		const encodedReturns = yield* Effect.promise(() => this.testConvex.action(actionName, encodedArgs));
-		return yield* Schema.decode(action.returns)(encodedReturns);
+		return yield* Match.value(actionSpec.functionProvenance).pipe(Match.tag("Confect", (confect) => Effect.gen(this, function* () {
+			const encodedArgs = yield* Schema.encode(confect.args)(args);
+			const encodedReturns = yield* Effect.promise(() => this.testConvex.action(actionName, encodedArgs));
+			return yield* Schema.decode(confect.returns)(encodedReturns);
+		})), Match.tag("Convex", () => Effect.promise(() => this.testConvex.action(actionName, args))), Match.exhaustive);
 	});
 	run = ((handler, returns) => {
 		const makeMutationLayer = (mutationCtx) => RegisteredConvexFunction.mutationLayer(this.confectSchema, mutationCtx);

package/dist/TestConfect.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestConfect.js","names":[],"sources":["../src/TestConfect.ts"],"sourcesContent":["import { Ref } from \"@confect/core\";\nimport type { DatabaseSchema, DataModel } from \"@confect/server\";\nimport { RegisteredConvexFunction } from \"@confect/server\";\nimport type {\n  TestConvexForDataModel,\n  TestConvexForDataModelAndIdentity,\n} from \"convex-test\";\nimport { convexTest } from \"convex-test\";\nimport type { GenericMutationCtx, UserIdentity } from \"convex/server\";\nimport type { Value } from \"convex/values\";\nimport type { ParseResult } from \"effect\";\nimport { Context, Effect, Layer, Schema } from \"effect\";\n\nexport type TestConfectWithoutIdentity<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> = {\n  query: <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    args: Ref.Args<QueryRef>[\"Type\"],\n  ) => Effect.Effect<Ref.Returns<QueryRef>[\"Type\"], ParseResult.ParseError>;\n  mutation: <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    args: Ref.Args<MutationRef>[\"Type\"],\n  ) => Effect.Effect<Ref.Returns<MutationRef>[\"Type\"], ParseResult.ParseError>;\n  action: <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    args: Ref.Args<ActionRef>[\"Type\"],\n  ) => Effect.Effect<Ref.Returns<ActionRef>[\"Type\"], ParseResult.ParseError>;\n  run: {\n    <E>(\n      handler: Effect.Effect<\n        void,\n        E,\n        RegisteredConvexFunction.MutationServices<ConfectSchema>\n      >,\n    ): Effect.Effect<void>;\n    <A, B extends Value, E>(\n      handler: Effect.Effect<\n        A,\n        E,\n        RegisteredConvexFunction.MutationServices<ConfectSchema>\n      >,\n      returns: Schema.Schema<A, B>,\n    ): Effect.Effect<A, ParseResult.ParseError>;\n  };\n  fetch: (\n    pathQueryFragment: string,\n    init?: RequestInit,\n  ) => Effect.Effect<Response>;\n  finishInProgressScheduledFunctions: () => Effect.Effect<void>;\n  finishAllScheduledFunctions: (\n    advanceTimers: () => void,\n  ) => Effect.Effect<void>;\n};\n\nexport type TestConfect<ConfectSchema extends DatabaseSchema.AnyWithProps> = {\n  withIdentity: (\n    userIdentity: Partial<UserIdentity>,\n  ) => TestConfectWithoutIdentity<ConfectSchema>;\n} & TestConfectWithoutIdentity<ConfectSchema>;\n\nexport const TestConfect = <\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n>() =>\n  Context.GenericTag<TestConfect<ConfectSchema>>(\"@confect/test/TestConfect\");\n\nclass TestConfectImplWithoutIdentity<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> implements TestConfectWithoutIdentity<ConfectSchema> {\n  constructor(\n    private confectSchema: ConfectSchema,\n    private testConvex: TestConvexForDataModel<\n      DataModel.ToConvex<DataModel.FromSchema<ConfectSchema>>\n    >,\n  ) {}\n\n  readonly query = <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    args: Ref.Args<QueryRef>[\"Type\"],\n  ): Effect.Effect<Ref.Returns<QueryRef>[\"Type\"], ParseResult.ParseError> =>\n    Effect.gen(this, function* () {\n      const query = Ref.getFunction(queryRef);\n      const queryName = Ref.getConvexFunctionName(queryRef);\n\n      const encodedArgs = yield* Schema.encode(query.args)(args);\n\n      const encodedReturns = yield* Effect.promise(() =>\n        this.testConvex.query(queryName as any, encodedArgs),\n      );\n\n      return yield* Schema.decode(query.returns)(encodedReturns);\n    });\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    args: Ref.Args<MutationRef>[\"Type\"],\n  ): Effect.Effect<Ref.Returns<MutationRef>[\"Type\"], ParseResult.ParseError> =>\n    Effect.gen(this, function* () {\n      const mutation = Ref.getFunction(mutationRef);\n      const mutationName = Ref.getConvexFunctionName(mutationRef);\n\n      const encodedArgs = yield* Schema.encode(mutation.args)(args);\n\n      const encodedReturns = yield* Effect.promise(() =>\n        this.testConvex.mutation(mutationName as any, encodedArgs),\n      );\n\n      return yield* Schema.decode(mutation.returns)(encodedReturns);\n    });\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    args: Ref.Args<ActionRef>[\"Type\"],\n  ): Effect.Effect<Ref.Returns<ActionRef>[\"Type\"], ParseResult.ParseError> =>\n    Effect.gen(this, function* () {\n      const action = Ref.getFunction(actionRef);\n      const actionName = Ref.getConvexFunctionName(actionRef);\n\n      const encodedArgs = yield* Schema.encode(action.args)(args);\n\n      const encodedReturns = yield* Effect.promise(() =>\n        this.testConvex.action(actionName as any, encodedArgs),\n      );\n\n      return yield* Schema.decode(action.returns)(encodedReturns);\n    });\n\n  readonly run: TestConfectWithoutIdentity<ConfectSchema>[\"run\"] = (<\n    A,\n    B extends Value,\n    E,\n  >(\n    handler: Effect.Effect<\n      A,\n      E,\n      RegisteredConvexFunction.MutationServices<ConfectSchema>\n    >,\n    returns?: Schema.Schema<A, B>,\n  ): Effect.Effect<void> | Effect.Effect<A, ParseResult.ParseError> => {\n    const makeMutationLayer = (\n      mutationCtx: GenericMutationCtx<\n        DataModel.ToConvex<DataModel.FromSchema<ConfectSchema>>\n      >,\n    ): Layer.Layer<RegisteredConvexFunction.MutationServices<ConfectSchema>> =>\n      RegisteredConvexFunction.mutationLayer(\n        this.confectSchema,\n        mutationCtx,\n      ) as Layer.Layer<\n        RegisteredConvexFunction.MutationServices<ConfectSchema>\n      >;\n\n    return returns === undefined\n      ? Effect.promise(() =>\n          this.testConvex.run((mutationCtx) =>\n            Effect.runPromise(\n              handler.pipe(\n                Effect.asVoid,\n                Effect.provide(makeMutationLayer(mutationCtx)),\n              ),\n            ),\n          ),\n        )\n      : Effect.promise(() =>\n          this.testConvex.run((mutationCtx) =>\n            Effect.runPromise(\n              handler.pipe(\n                Effect.andThen(Schema.encode(returns)),\n                Effect.provide(makeMutationLayer(mutationCtx)),\n              ),\n            ),\n          ),\n        ).pipe(Effect.andThen(Schema.decode(returns)));\n  }) as TestConfectWithoutIdentity<ConfectSchema>[\"run\"];\n\n  readonly fetch = <PathQueryFragment extends string>(\n    pathQueryFragment: PathQueryFragment,\n    init?: RequestInit,\n  ) => Effect.promise(() => this.testConvex.fetch(pathQueryFragment, init));\n\n  readonly finishInProgressScheduledFunctions = () =>\n    Effect.promise(() => this.testConvex.finishInProgressScheduledFunctions());\n\n  readonly finishAllScheduledFunctions = (advanceTimers: () => void) =>\n    Effect.promise(() =>\n      this.testConvex.finishAllScheduledFunctions(advanceTimers),\n    );\n}\n\nclass TestConfectImpl<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> implements TestConfect<ConfectSchema> {\n  private readonly testConfectImplWithoutIdentity: TestConfectImplWithoutIdentity<ConfectSchema>;\n\n  constructor(\n    private confectSchema: ConfectSchema,\n    private testConvex: TestConvexForDataModelAndIdentity<\n      DataModel.ToConvex<DataModel.FromSchema<ConfectSchema>>\n    >,\n  ) {\n    this.testConvex = testConvex;\n    this.testConfectImplWithoutIdentity = new TestConfectImplWithoutIdentity(\n      confectSchema,\n      testConvex,\n    );\n  }\n\n  readonly withIdentity = (userIdentity: Partial<UserIdentity>) =>\n    new TestConfectImplWithoutIdentity(\n      this.confectSchema,\n      this.testConvex.withIdentity(userIdentity),\n    );\n\n  readonly query = <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    args: Ref.Args<QueryRef>[\"Type\"],\n  ) => this.testConfectImplWithoutIdentity.query(queryRef, args);\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    args: Ref.Args<MutationRef>[\"Type\"],\n  ) => this.testConfectImplWithoutIdentity.mutation(mutationRef, args);\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    args: Ref.Args<ActionRef>[\"Type\"],\n  ) => this.testConfectImplWithoutIdentity.action(actionRef, args);\n\n  readonly run: TestConfect<ConfectSchema>[\"run\"] = ((\n    handler: any,\n    returns?: any,\n  ) =>\n    this.testConfectImplWithoutIdentity.run(\n      handler,\n      returns,\n    )) as TestConfect<ConfectSchema>[\"run\"];\n\n  readonly fetch = <PathQueryFragment extends string>(\n    pathQueryFragment: PathQueryFragment,\n    init?: RequestInit,\n  ) => this.testConfectImplWithoutIdentity.fetch(pathQueryFragment, init);\n\n  readonly finishInProgressScheduledFunctions = () =>\n    this.testConfectImplWithoutIdentity.finishInProgressScheduledFunctions();\n\n  readonly finishAllScheduledFunctions = (advanceTimers: () => void) =>\n    this.testConfectImplWithoutIdentity.finishAllScheduledFunctions(\n      advanceTimers,\n    );\n}\n\nexport const layer =\n  <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(\n    databaseSchema: DatabaseSchema_,\n    modules: Record<string, () => Promise<any>>,\n  ) =>\n  (): Layer.Layer<TestConfect<DatabaseSchema_>> =>\n    Layer.sync(\n      TestConfect<DatabaseSchema_>(),\n      () =>\n        new TestConfectImpl(\n          databaseSchema,\n          convexTest(\n            databaseSchema.convexSchemaDefinition,\n            modules,\n          ) as unknown as TestConvexForDataModelAndIdentity<\n            DataModel.ToConvex<DataModel.FromSchema<DatabaseSchema_>>\n          >,\n        ),\n    );\n"],"mappings":"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"}
+{"version":3,"file":"TestConfect.js","names":[],"sources":["../src/TestConfect.ts"],"sourcesContent":["import { Ref } from \"@confect/core\";\nimport type { DatabaseSchema, DataModel } from \"@confect/server\";\nimport { RegisteredConvexFunction } from \"@confect/server\";\nimport type {\n  TestConvexForDataModel,\n  TestConvexForDataModelAndIdentity,\n} from \"convex-test\";\nimport { convexTest } from \"convex-test\";\nimport type { GenericMutationCtx, UserIdentity } from \"convex/server\";\nimport type { Value } from \"convex/values\";\nimport type { ParseResult } from \"effect\";\nimport { Context, Effect, Layer, Match, Schema } from \"effect\";\n\nexport type TestConfectWithoutIdentity<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> = {\n  query: <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    args: Ref.Args<QueryRef>,\n  ) => Effect.Effect<Ref.Returns<QueryRef>, ParseResult.ParseError>;\n  mutation: <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    args: Ref.Args<MutationRef>,\n  ) => Effect.Effect<Ref.Returns<MutationRef>, ParseResult.ParseError>;\n  action: <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    args: Ref.Args<ActionRef>,\n  ) => Effect.Effect<Ref.Returns<ActionRef>, ParseResult.ParseError>;\n  run: {\n    <E>(\n      handler: Effect.Effect<\n        void,\n        E,\n        RegisteredConvexFunction.MutationServices<ConfectSchema>\n      >,\n    ): Effect.Effect<void>;\n    <A, B extends Value, E>(\n      handler: Effect.Effect<\n        A,\n        E,\n        RegisteredConvexFunction.MutationServices<ConfectSchema>\n      >,\n      returns: Schema.Schema<A, B>,\n    ): Effect.Effect<A, ParseResult.ParseError>;\n  };\n  fetch: (\n    pathQueryFragment: string,\n    init?: RequestInit,\n  ) => Effect.Effect<Response>;\n  finishInProgressScheduledFunctions: () => Effect.Effect<void>;\n  finishAllScheduledFunctions: (\n    advanceTimers: () => void,\n  ) => Effect.Effect<void>;\n};\n\nexport type TestConfect<ConfectSchema extends DatabaseSchema.AnyWithProps> = {\n  withIdentity: (\n    userIdentity: Partial<UserIdentity>,\n  ) => TestConfectWithoutIdentity<ConfectSchema>;\n} & TestConfectWithoutIdentity<ConfectSchema>;\n\nexport const TestConfect = <\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n>() =>\n  Context.GenericTag<TestConfect<ConfectSchema>>(\"@confect/test/TestConfect\");\n\nclass TestConfectImplWithoutIdentity<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> implements TestConfectWithoutIdentity<ConfectSchema> {\n  constructor(\n    private confectSchema: ConfectSchema,\n    private testConvex: TestConvexForDataModel<\n      DataModel.ToConvex<DataModel.FromSchema<ConfectSchema>>\n    >,\n  ) {}\n\n  readonly query = <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    args: Ref.Args<QueryRef>,\n  ): Effect.Effect<Ref.Returns<QueryRef>, ParseResult.ParseError> =>\n    Effect.gen(this, function* () {\n      const querySpec = Ref.getFunctionSpec(queryRef);\n      const queryName = Ref.getConvexFunctionName(queryRef);\n\n      return yield* Match.value(querySpec.functionProvenance).pipe(\n        Match.tag(\"Confect\", (confect) =>\n          Effect.gen(this, function* () {\n            const encodedArgs = yield* Schema.encode(confect.args)(args);\n            const encodedReturns = yield* Effect.promise(() =>\n              this.testConvex.query(queryName as any, encodedArgs),\n            );\n            return yield* Schema.decode(confect.returns)(encodedReturns);\n          }),\n        ),\n        Match.tag(\"Convex\", () =>\n          Effect.promise(() =>\n            this.testConvex.query(queryName as any, args as any),\n          ),\n        ),\n        Match.exhaustive,\n      );\n    });\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    args: Ref.Args<MutationRef>,\n  ): Effect.Effect<Ref.Returns<MutationRef>, ParseResult.ParseError> =>\n    Effect.gen(this, function* () {\n      const mutationSpec = Ref.getFunctionSpec(mutationRef);\n      const mutationName = Ref.getConvexFunctionName(mutationRef);\n\n      return yield* Match.value(mutationSpec.functionProvenance).pipe(\n        Match.tag(\"Confect\", (confect) =>\n          Effect.gen(this, function* () {\n            const encodedArgs = yield* Schema.encode(confect.args)(args);\n            const encodedReturns = yield* Effect.promise(() =>\n              this.testConvex.mutation(mutationName as any, encodedArgs),\n            );\n            return yield* Schema.decode(confect.returns)(encodedReturns);\n          }),\n        ),\n        Match.tag(\"Convex\", () =>\n          Effect.promise(() =>\n            this.testConvex.mutation(mutationName as any, args as any),\n          ),\n        ),\n        Match.exhaustive,\n      );\n    });\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    args: Ref.Args<ActionRef>,\n  ): Effect.Effect<Ref.Returns<ActionRef>, ParseResult.ParseError> =>\n    Effect.gen(this, function* () {\n      const actionSpec = Ref.getFunctionSpec(actionRef);\n      const actionName = Ref.getConvexFunctionName(actionRef);\n\n      return yield* Match.value(actionSpec.functionProvenance).pipe(\n        Match.tag(\"Confect\", (confect) =>\n          Effect.gen(this, function* () {\n            const encodedArgs = yield* Schema.encode(confect.args)(args);\n            const encodedReturns = yield* Effect.promise(() =>\n              this.testConvex.action(actionName as any, encodedArgs),\n            );\n            return yield* Schema.decode(confect.returns)(encodedReturns);\n          }),\n        ),\n        Match.tag(\"Convex\", () =>\n          Effect.promise(() =>\n            this.testConvex.action(actionName as any, args as any),\n          ),\n        ),\n        Match.exhaustive,\n      );\n    });\n\n  readonly run: TestConfectWithoutIdentity<ConfectSchema>[\"run\"] = (<\n    A,\n    B extends Value,\n    E,\n  >(\n    handler: Effect.Effect<\n      A,\n      E,\n      RegisteredConvexFunction.MutationServices<ConfectSchema>\n    >,\n    returns?: Schema.Schema<A, B>,\n  ): Effect.Effect<void> | Effect.Effect<A, ParseResult.ParseError> => {\n    const makeMutationLayer = (\n      mutationCtx: GenericMutationCtx<\n        DataModel.ToConvex<DataModel.FromSchema<ConfectSchema>>\n      >,\n    ): Layer.Layer<RegisteredConvexFunction.MutationServices<ConfectSchema>> =>\n      RegisteredConvexFunction.mutationLayer(\n        this.confectSchema,\n        mutationCtx,\n      ) as Layer.Layer<\n        RegisteredConvexFunction.MutationServices<ConfectSchema>\n      >;\n\n    return returns === undefined\n      ? Effect.promise(() =>\n          this.testConvex.run((mutationCtx) =>\n            Effect.runPromise(\n              handler.pipe(\n                Effect.asVoid,\n                Effect.provide(makeMutationLayer(mutationCtx)),\n              ),\n            ),\n          ),\n        )\n      : Effect.promise(() =>\n          this.testConvex.run((mutationCtx) =>\n            Effect.runPromise(\n              handler.pipe(\n                Effect.andThen(Schema.encode(returns)),\n                Effect.provide(makeMutationLayer(mutationCtx)),\n              ),\n            ),\n          ),\n        ).pipe(Effect.andThen(Schema.decode(returns)));\n  }) as TestConfectWithoutIdentity<ConfectSchema>[\"run\"];\n\n  readonly fetch = <PathQueryFragment extends string>(\n    pathQueryFragment: PathQueryFragment,\n    init?: RequestInit,\n  ) => Effect.promise(() => this.testConvex.fetch(pathQueryFragment, init));\n\n  readonly finishInProgressScheduledFunctions = () =>\n    Effect.promise(() => this.testConvex.finishInProgressScheduledFunctions());\n\n  readonly finishAllScheduledFunctions = (advanceTimers: () => void) =>\n    Effect.promise(() =>\n      this.testConvex.finishAllScheduledFunctions(advanceTimers),\n    );\n}\n\nclass TestConfectImpl<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> implements TestConfect<ConfectSchema> {\n  private readonly testConfectImplWithoutIdentity: TestConfectImplWithoutIdentity<ConfectSchema>;\n\n  constructor(\n    private confectSchema: ConfectSchema,\n    private testConvex: TestConvexForDataModelAndIdentity<\n      DataModel.ToConvex<DataModel.FromSchema<ConfectSchema>>\n    >,\n  ) {\n    this.testConvex = testConvex;\n    this.testConfectImplWithoutIdentity = new TestConfectImplWithoutIdentity(\n      confectSchema,\n      testConvex,\n    );\n  }\n\n  readonly withIdentity = (userIdentity: Partial<UserIdentity>) =>\n    new TestConfectImplWithoutIdentity(\n      this.confectSchema,\n      this.testConvex.withIdentity(userIdentity),\n    );\n\n  readonly query = <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    args: Ref.Args<QueryRef>,\n  ) => this.testConfectImplWithoutIdentity.query(queryRef, args);\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    args: Ref.Args<MutationRef>,\n  ) => this.testConfectImplWithoutIdentity.mutation(mutationRef, args);\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    args: Ref.Args<ActionRef>,\n  ) => this.testConfectImplWithoutIdentity.action(actionRef, args);\n\n  readonly run: TestConfect<ConfectSchema>[\"run\"] = ((\n    handler: any,\n    returns?: any,\n  ) =>\n    this.testConfectImplWithoutIdentity.run(\n      handler,\n      returns,\n    )) as TestConfect<ConfectSchema>[\"run\"];\n\n  readonly fetch = <PathQueryFragment extends string>(\n    pathQueryFragment: PathQueryFragment,\n    init?: RequestInit,\n  ) => this.testConfectImplWithoutIdentity.fetch(pathQueryFragment, init);\n\n  readonly finishInProgressScheduledFunctions = () =>\n    this.testConfectImplWithoutIdentity.finishInProgressScheduledFunctions();\n\n  readonly finishAllScheduledFunctions = (advanceTimers: () => void) =>\n    this.testConfectImplWithoutIdentity.finishAllScheduledFunctions(\n      advanceTimers,\n    );\n}\n\nexport const layer =\n  <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(\n    databaseSchema: DatabaseSchema_,\n    modules: Record<string, () => Promise<any>>,\n  ) =>\n  (): Layer.Layer<TestConfect<DatabaseSchema_>> =>\n    Layer.sync(\n      TestConfect<DatabaseSchema_>(),\n      () =>\n        new TestConfectImpl(\n          databaseSchema,\n          convexTest(\n            databaseSchema.convexSchemaDefinition,\n            modules,\n          ) as unknown as TestConvexForDataModelAndIdentity<\n            DataModel.ToConvex<DataModel.FromSchema<DatabaseSchema_>>\n          >,\n        ),\n    );\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@confect/test",
-  "version": "2.0.0",
+  "version": "4.0.0",
   "description": "Utilities for testing Confect apps without a live Convex backend",
   "repository": {
     "type": "git",
@@ -53,8 +53,8 @@
     "convex": "^1.30.0",
     "convex-test": "^0.0.38",
     "effect": "^3.19.16",
-    "@confect/core": "2.0.0",
-    "@confect/server": "2.0.0"
+    "@confect/core": "4.0.0",
+    "@confect/server": "4.0.0"
   },
   "engines": {
     "node": ">=22",

package/src/TestConfect.ts

@@ -9,23 +9,23 @@ import { convexTest } from "convex-test";
 import type { GenericMutationCtx, UserIdentity } from "convex/server";
 import type { Value } from "convex/values";
 import type { ParseResult } from "effect";
-import { Context, Effect, Layer, Schema } from "effect";
+import { Context, Effect, Layer, Match, Schema } from "effect";
 
 export type TestConfectWithoutIdentity<
   ConfectSchema extends DatabaseSchema.AnyWithProps,
 > = {
   query: <QueryRef extends Ref.AnyQuery>(
     queryRef: QueryRef,
-    args: Ref.Args<QueryRef>["Type"],
-  ) => Effect.Effect<Ref.Returns<QueryRef>["Type"], ParseResult.ParseError>;
+    args: Ref.Args<QueryRef>,
+  ) => Effect.Effect<Ref.Returns<QueryRef>, ParseResult.ParseError>;
   mutation: <MutationRef extends Ref.AnyMutation>(
     mutationRef: MutationRef,
-    args: Ref.Args<MutationRef>["Type"],
-  ) => Effect.Effect<Ref.Returns<MutationRef>["Type"], ParseResult.ParseError>;
+    args: Ref.Args<MutationRef>,
+  ) => Effect.Effect<Ref.Returns<MutationRef>, ParseResult.ParseError>;
   action: <ActionRef extends Ref.AnyAction>(
     actionRef: ActionRef,
-    args: Ref.Args<ActionRef>["Type"],
-  ) => Effect.Effect<Ref.Returns<ActionRef>["Type"], ParseResult.ParseError>;
+    args: Ref.Args<ActionRef>,
+  ) => Effect.Effect<Ref.Returns<ActionRef>, ParseResult.ParseError>;
   run: {
     <E>(
       handler: Effect.Effect<
@@ -76,53 +76,83 @@ class TestConfectImplWithoutIdentity<
 
   readonly query = <QueryRef extends Ref.AnyQuery>(
     queryRef: QueryRef,
-    args: Ref.Args<QueryRef>["Type"],
-  ): Effect.Effect<Ref.Returns<QueryRef>["Type"], ParseResult.ParseError> =>
+    args: Ref.Args<QueryRef>,
+  ): Effect.Effect<Ref.Returns<QueryRef>, ParseResult.ParseError> =>
     Effect.gen(this, function* () {
-      const query = Ref.getFunction(queryRef);
+      const querySpec = Ref.getFunctionSpec(queryRef);
       const queryName = Ref.getConvexFunctionName(queryRef);
 
-      const encodedArgs = yield* Schema.encode(query.args)(args);
-
-      const encodedReturns = yield* Effect.promise(() =>
-        this.testConvex.query(queryName as any, encodedArgs),
+      return yield* Match.value(querySpec.functionProvenance).pipe(
+        Match.tag("Confect", (confect) =>
+          Effect.gen(this, function* () {
+            const encodedArgs = yield* Schema.encode(confect.args)(args);
+            const encodedReturns = yield* Effect.promise(() =>
+              this.testConvex.query(queryName as any, encodedArgs),
+            );
+            return yield* Schema.decode(confect.returns)(encodedReturns);
+          }),
+        ),
+        Match.tag("Convex", () =>
+          Effect.promise(() =>
+            this.testConvex.query(queryName as any, args as any),
+          ),
+        ),
+        Match.exhaustive,
       );
-
-      return yield* Schema.decode(query.returns)(encodedReturns);
     });
 
   readonly mutation = <MutationRef extends Ref.AnyMutation>(
     mutationRef: MutationRef,
-    args: Ref.Args<MutationRef>["Type"],
-  ): Effect.Effect<Ref.Returns<MutationRef>["Type"], ParseResult.ParseError> =>
+    args: Ref.Args<MutationRef>,
+  ): Effect.Effect<Ref.Returns<MutationRef>, ParseResult.ParseError> =>
     Effect.gen(this, function* () {
-      const mutation = Ref.getFunction(mutationRef);
+      const mutationSpec = Ref.getFunctionSpec(mutationRef);
       const mutationName = Ref.getConvexFunctionName(mutationRef);
 
-      const encodedArgs = yield* Schema.encode(mutation.args)(args);
-
-      const encodedReturns = yield* Effect.promise(() =>
-        this.testConvex.mutation(mutationName as any, encodedArgs),
+      return yield* Match.value(mutationSpec.functionProvenance).pipe(
+        Match.tag("Confect", (confect) =>
+          Effect.gen(this, function* () {
+            const encodedArgs = yield* Schema.encode(confect.args)(args);
+            const encodedReturns = yield* Effect.promise(() =>
+              this.testConvex.mutation(mutationName as any, encodedArgs),
+            );
+            return yield* Schema.decode(confect.returns)(encodedReturns);
+          }),
+        ),
+        Match.tag("Convex", () =>
+          Effect.promise(() =>
+            this.testConvex.mutation(mutationName as any, args as any),
+          ),
+        ),
+        Match.exhaustive,
       );
-
-      return yield* Schema.decode(mutation.returns)(encodedReturns);
     });
 
   readonly action = <ActionRef extends Ref.AnyAction>(
     actionRef: ActionRef,
-    args: Ref.Args<ActionRef>["Type"],
-  ): Effect.Effect<Ref.Returns<ActionRef>["Type"], ParseResult.ParseError> =>
+    args: Ref.Args<ActionRef>,
+  ): Effect.Effect<Ref.Returns<ActionRef>, ParseResult.ParseError> =>
     Effect.gen(this, function* () {
-      const action = Ref.getFunction(actionRef);
+      const actionSpec = Ref.getFunctionSpec(actionRef);
       const actionName = Ref.getConvexFunctionName(actionRef);
 
-      const encodedArgs = yield* Schema.encode(action.args)(args);
-
-      const encodedReturns = yield* Effect.promise(() =>
-        this.testConvex.action(actionName as any, encodedArgs),
+      return yield* Match.value(actionSpec.functionProvenance).pipe(
+        Match.tag("Confect", (confect) =>
+          Effect.gen(this, function* () {
+            const encodedArgs = yield* Schema.encode(confect.args)(args);
+            const encodedReturns = yield* Effect.promise(() =>
+              this.testConvex.action(actionName as any, encodedArgs),
+            );
+            return yield* Schema.decode(confect.returns)(encodedReturns);
+          }),
+        ),
+        Match.tag("Convex", () =>
+          Effect.promise(() =>
+            this.testConvex.action(actionName as any, args as any),
+          ),
+        ),
+        Match.exhaustive,
       );
-
-      return yield* Schema.decode(action.returns)(encodedReturns);
     });
 
   readonly run: TestConfectWithoutIdentity<ConfectSchema>["run"] = (<
@@ -212,17 +242,17 @@ class TestConfectImpl<
 
   readonly query = <QueryRef extends Ref.AnyQuery>(
     queryRef: QueryRef,
-    args: Ref.Args<QueryRef>["Type"],
+    args: Ref.Args<QueryRef>,
   ) => this.testConfectImplWithoutIdentity.query(queryRef, args);
 
   readonly mutation = <MutationRef extends Ref.AnyMutation>(
     mutationRef: MutationRef,
-    args: Ref.Args<MutationRef>["Type"],
+    args: Ref.Args<MutationRef>,
   ) => this.testConfectImplWithoutIdentity.mutation(mutationRef, args);
 
   readonly action = <ActionRef extends Ref.AnyAction>(
     actionRef: ActionRef,
-    args: Ref.Args<ActionRef>["Type"],
+    args: Ref.Args<ActionRef>,
   ) => this.testConfectImplWithoutIdentity.action(actionRef, args);
 
   readonly run: TestConfect<ConfectSchema>["run"] = ((