@confect/test 9.0.0-next.6 → 9.0.0-next.8

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @confect/test
 
+## 9.0.0-next.8
+
+### Patch Changes
+
+- 3fec285: Import Effect from its submodule paths internally to shrink per-function cold-start bundles.
+
+  Confect's packages now import Effect modules from their submodule paths (`import * as Schema from "effect/Schema"`) instead of the `"effect"` barrel (`import { Schema } from "effect"`).
+
+  ### Why
+
+  A barrel import of a namespace re-export defeats esbuild's tree-shaking: accessing `Schema.X` from `import { Schema } from "effect"` retains the _entire_ `Schema` namespace, because the bundler can't prune property access on the barrel's `export * as Schema`. So every Convex function's cold-start bundle was pulling all of `effect/Schema` and `effect/Stream` — and, transitively through Schema's `Arbitrary`, `fast-check` — whether the function used them or not.
+
+  Importing from the submodule path tree-shakes normally. On a minimal function this cut the bundle esbuild produces by ~54% (the `effect/Schema` module alone by ~75%) and its cold-start module-evaluation time by ~35%, with `fast-check` dropped entirely. This is also the import style Effect v4 recommends, so it's forward-compatible. A `no-restricted-imports` ESLint rule now enforces it across the codebase (type-only imports and `@effect/vitest` are exempt).
+
+  No API changes — your existing code keeps working.
+
+  ### Getting the full win in your own code
+
+  This change shrinks the Confect code in every function bundle, but a function's bundle also includes your own `confect/tables/*` and `*.spec.ts` files. esbuild retains the union across all importers, so a single barrel import anywhere in a function's module graph re-pins the whole `effect/Schema` namespace and undoes the reduction. To get the full bundle/cold-start savings, import Effect from its submodule paths in your own Confect files too:
+
+  ```diff
+  - import { Schema } from "effect";
+  + import * as Schema from "effect/Schema";
+  ```
+
+  Bare helpers (`pipe`, `flow`, `identity`) come from `"effect/Function"`.
+
+- Updated dependencies [3fec285]
+  - @confect/core@9.0.0-next.8
+  - @confect/server@9.0.0-next.8
+
+## 9.0.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [5d19484]
+  - @confect/core@9.0.0-next.7
+  - @confect/server@9.0.0-next.7
+
 ## 9.0.0-next.6
 
 ### Major Changes

package/dist/TestConfect.d.ts

@@ -1,8 +1,12 @@
 import { Ref } from "@confect/core";
 import { DatabaseSchema, RegisteredConvexFunction } from "@confect/server";
-import { Context, Effect, Layer, ParseResult, Schema } from "effect";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
 import { GenericSchema, SchemaDefinition, UserIdentity } from "convex/server";
 import { Value } from "convex/values";
+import { ParseResult } from "effect";
 
 //#region src/TestConfect.d.ts
 declare namespace TestConfect_d_exports {

package/dist/TestConfect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestConfect.d.ts","names":[],"sources":["../src/TestConfect.ts"],"mappings":";;;;;;;;;;KAkBY,0BAAA,uBACY,cAAA,CAAe,YAAA;EAErC,KAAA,oBAAyB,GAAA,CAAI,QAAA,EAC3B,QAAA,EAAU,QAAA,KACP,IAAA,EAAM,GAAA,CAAI,YAAA,CAAa,QAAA,MACvB,MAAA,CAAO,MAAA,CACV,GAAA,CAAI,OAAA,CAAQ,QAAA,GACZ,GAAA,CAAI,KAAA,CAAM,QAAA,IAAY,WAAA,CAAY,UAAA;EAEpC,QAAA,uBAA+B,GAAA,CAAI,WAAA,EACjC,WAAA,EAAa,WAAA,KACV,IAAA,EAAM,GAAA,CAAI,YAAA,CAAa,WAAA,MACvB,MAAA,CAAO,MAAA,CACV,GAAA,CAAI,OAAA,CAAQ,WAAA,GACZ,GAAA,CAAI,KAAA,CAAM,WAAA,IAAe,WAAA,CAAY,UAAA;EAEvC,MAAA,qBAA2B,GAAA,CAAI,SAAA,EAC7B,SAAA,EAAW,SAAA,KACR,IAAA,EAAM,GAAA,CAAI,YAAA,CAAa,SAAA,MACvB,MAAA,CAAO,MAAA,CACV,GAAA,CAAI,OAAA,CAAQ,SAAA,GACZ,GAAA,CAAI,KAAA,CAAM,SAAA,IAAa,WAAA,CAAY,UAAA;EAErC,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,cAmLtC,KAAA,2BACc,cAAA,CAAe,YAAA,EACtC,cAAA,EAAgB,eAAA,EAChB,sBAAA,EAAwB,gBAAA,CAAiB,aAAA,SACzC,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":";;;;;;;;;;;;;;KAqBY,0BAAA,uBACY,cAAA,CAAe,YAAA;EAErC,KAAA,oBAAyB,GAAA,CAAI,QAAA,EAC3B,QAAA,EAAU,QAAA,KACP,IAAA,EAAM,GAAA,CAAI,YAAA,CAAa,QAAA,MACvB,MAAA,CAAO,MAAA,CACV,GAAA,CAAI,OAAA,CAAQ,QAAA,GACZ,GAAA,CAAI,KAAA,CAAM,QAAA,IAAY,WAAA,CAAY,UAAA;EAEpC,QAAA,uBAA+B,GAAA,CAAI,WAAA,EACjC,WAAA,EAAa,WAAA,KACV,IAAA,EAAM,GAAA,CAAI,YAAA,CAAa,WAAA,MACvB,MAAA,CAAO,MAAA,CACV,GAAA,CAAI,OAAA,CAAQ,WAAA,GACZ,GAAA,CAAI,KAAA,CAAM,WAAA,IAAe,WAAA,CAAY,UAAA;EAEvC,MAAA,qBAA2B,GAAA,CAAI,SAAA,EAC7B,SAAA,EAAW,SAAA,KACR,IAAA,EAAM,GAAA,CAAI,YAAA,CAAa,SAAA,MACvB,MAAA,CAAO,MAAA,CACV,GAAA,CAAI,OAAA,CAAQ,SAAA,GACZ,GAAA,CAAI,KAAA,CAAM,SAAA,IAAa,WAAA,CAAY,UAAA;EAErC,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,cAmLtC,KAAA,2BACc,cAAA,CAAe,YAAA,EACtC,cAAA,EAAgB,eAAA,EAChB,sBAAA,EAAwB,gBAAA,CAAiB,aAAA,SACzC,OAAA,EAAS,MAAA,eAAqB,OAAA,iBAE5B,KAAA,CAAM,KAAA,CAAM,WAAA,CAAY,eAAA"}

package/dist/TestConfect.js

@@ -2,7 +2,10 @@ 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 * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
 
 //#region src/TestConfect.ts
 var TestConfect_exports = /* @__PURE__ */ __exportAll({

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 {\n  GenericMutationCtx,\n  GenericSchema,\n  SchemaDefinition,\n  UserIdentity,\n} 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.OptionalArgs<QueryRef>\n  ) => Effect.Effect<\n    Ref.Returns<QueryRef>,\n    Ref.Error<QueryRef> | ParseResult.ParseError\n  >;\n  mutation: <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    ...args: Ref.OptionalArgs<MutationRef>\n  ) => Effect.Effect<\n    Ref.Returns<MutationRef>,\n    Ref.Error<MutationRef> | ParseResult.ParseError\n  >;\n  action: <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    ...args: Ref.OptionalArgs<ActionRef>\n  ) => Effect.Effect<\n    Ref.Returns<ActionRef>,\n    Ref.Error<ActionRef> | ParseResult.ParseError\n  >;\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.OptionalArgs<QueryRef>\n  ): Effect.Effect<\n    Ref.Returns<QueryRef>,\n    Ref.Error<QueryRef> | ParseResult.ParseError\n  > =>\n    Ref.runWithCodec(\n      queryRef,\n      (args[0] ?? {}) as Ref.Args<QueryRef>,\n      (functionReference, encodedArgs) =>\n        this.testConvex.query(functionReference as any, encodedArgs),\n    );\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    ...args: Ref.OptionalArgs<MutationRef>\n  ): Effect.Effect<\n    Ref.Returns<MutationRef>,\n    Ref.Error<MutationRef> | ParseResult.ParseError\n  > =>\n    Ref.runWithCodec(\n      mutationRef,\n      (args[0] ?? {}) as Ref.Args<MutationRef>,\n      (functionReference, encodedArgs) =>\n        this.testConvex.mutation(functionReference as any, encodedArgs),\n    );\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    ...args: Ref.OptionalArgs<ActionRef>\n  ): Effect.Effect<\n    Ref.Returns<ActionRef>,\n    Ref.Error<ActionRef> | ParseResult.ParseError\n  > =>\n    Ref.runWithCodec(\n      actionRef,\n      (args[0] ?? {}) as Ref.Args<ActionRef>,\n      (functionReference, encodedArgs) =>\n        this.testConvex.action(functionReference as any, encodedArgs),\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.OptionalArgs<QueryRef>\n  ) => this.testConfectImplWithoutIdentity.query(queryRef, ...args);\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    ...args: Ref.OptionalArgs<MutationRef>\n  ) => this.testConfectImplWithoutIdentity.mutation(mutationRef, ...args);\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    ...args: Ref.OptionalArgs<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    convexSchemaDefinition: SchemaDefinition<GenericSchema, true>,\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(convexSchemaDefinition, modules) as any,\n        ),\n    );\n"],"mappings":";;;;;;;;;;;AA2EA,MAAa,oBAGX,QAAQ,WAAuC,4BAA4B;AAE7E,IAAM,iCAAN,MAEuD;CACrD,YACE,AAAQ,eACR,AAAQ,YAGR;EAJQ;EACA;;CAKV,AAAS,SACP,UACA,GAAG,SAKH,IAAI,aACF,UACC,KAAK,MAAM,EAAE,GACb,mBAAmB,gBAClB,KAAK,WAAW,MAAM,mBAA0B,YAAY,CAC/D;CAEH,AAAS,YACP,aACA,GAAG,SAKH,IAAI,aACF,aACC,KAAK,MAAM,EAAE,GACb,mBAAmB,gBAClB,KAAK,WAAW,SAAS,mBAA0B,YAAY,CAClE;CAEH,AAAS,UACP,WACA,GAAG,SAKH,IAAI,aACF,WACC,KAAK,MAAM,EAAE,GACb,mBAAmB,gBAClB,KAAK,WAAW,OAAO,mBAA0B,YAAY,CAChE;CAEH,AAAS,QAKP,SAKA,YACmE;EACnE,MAAM,qBACJ,gBAIA,yBAAyB,cACvB,KAAK,eACL,YACD;AAIH,SAAO,YAAY,SACf,OAAO,cACL,KAAK,WAAW,KAAK,gBACnB,OAAO,WACL,QAAQ,KACN,OAAO,QACP,OAAO,QAAQ,kBAAkB,YAAY,CAAC,CAC/C,CACF,CACF,CACF,GACD,OAAO,cACL,KAAK,WAAW,KAAK,gBACnB,OAAO,WACL,QAAQ,KACN,OAAO,QAAQ,OAAO,OAAO,QAAQ,CAAC,EACtC,OAAO,QAAQ,kBAAkB,YAAY,CAAC,CAC/C,CACF,CACF,CACF,CAAC,KAAK,OAAO,QAAQ,OAAO,OAAO,QAAQ,CAAC,CAAC;;CAGpD,AAAS,SACP,mBACA,SACG,OAAO,cAAc,KAAK,WAAW,MAAM,mBAAmB,KAAK,CAAC;CAEzE,AAAS,2CACP,OAAO,cAAc,KAAK,WAAW,oCAAoC,CAAC;CAE5E,AAAS,+BAA+B,kBACtC,OAAO,cACL,KAAK,WAAW,4BAA4B,cAAc,CAC3D;;AAGL,IAAM,kBAAN,MAEwC;CACtC,AAAiB;CAEjB,YACE,AAAQ,eACR,AAAQ,YAGR;EAJQ;EACA;AAIR,OAAK,aAAa;AAClB,OAAK,iCAAiC,IAAI,+BACxC,eACA,WACD;;CAGH,AAAS,gBAAgB,iBACvB,IAAI,+BACF,KAAK,eACL,KAAK,WAAW,aAAa,aAAa,CAC3C;CAEH,AAAS,SACP,UACA,GAAG,SACA,KAAK,+BAA+B,MAAM,UAAU,GAAG,KAAK;CAEjE,AAAS,YACP,aACA,GAAG,SACA,KAAK,+BAA+B,SAAS,aAAa,GAAG,KAAK;CAEvE,AAAS,UACP,WACA,GAAG,SACA,KAAK,+BAA+B,OAAO,WAAW,GAAG,KAAK;CAEnE,AAAS,QACP,SACA,YAEA,KAAK,+BAA+B,IAClC,SACA,QACD;CAEH,AAAS,SACP,mBACA,SACG,KAAK,+BAA+B,MAAM,mBAAmB,KAAK;CAEvE,AAAS,2CACP,KAAK,+BAA+B,oCAAoC;CAE1E,AAAS,+BAA+B,kBACtC,KAAK,+BAA+B,4BAClC,cACD;;AAGL,MAAa,SAET,gBACA,wBACA,kBAGA,MAAM,KACJ,aAA8B,QAE5B,IAAI,gBACF,gBACA,WAAW,wBAAwB,QAAQ,CAC5C,CACJ"}
+{"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 {\n  GenericMutationCtx,\n  GenericSchema,\n  SchemaDefinition,\n  UserIdentity,\n} from \"convex/server\";\nimport type { Value } from \"convex/values\";\nimport type { ParseResult } from \"effect\";\nimport * as Context from \"effect/Context\";\nimport * as Effect from \"effect/Effect\";\nimport * as Layer from \"effect/Layer\";\nimport * as Schema from \"effect/Schema\";\n\nexport type TestConfectWithoutIdentity<\n  ConfectSchema extends DatabaseSchema.AnyWithProps,\n> = {\n  query: <QueryRef extends Ref.AnyQuery>(\n    queryRef: QueryRef,\n    ...args: Ref.OptionalArgs<QueryRef>\n  ) => Effect.Effect<\n    Ref.Returns<QueryRef>,\n    Ref.Error<QueryRef> | ParseResult.ParseError\n  >;\n  mutation: <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    ...args: Ref.OptionalArgs<MutationRef>\n  ) => Effect.Effect<\n    Ref.Returns<MutationRef>,\n    Ref.Error<MutationRef> | ParseResult.ParseError\n  >;\n  action: <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    ...args: Ref.OptionalArgs<ActionRef>\n  ) => Effect.Effect<\n    Ref.Returns<ActionRef>,\n    Ref.Error<ActionRef> | ParseResult.ParseError\n  >;\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.OptionalArgs<QueryRef>\n  ): Effect.Effect<\n    Ref.Returns<QueryRef>,\n    Ref.Error<QueryRef> | ParseResult.ParseError\n  > =>\n    Ref.runWithCodec(\n      queryRef,\n      (args[0] ?? {}) as Ref.Args<QueryRef>,\n      (functionReference, encodedArgs) =>\n        this.testConvex.query(functionReference as any, encodedArgs),\n    );\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    ...args: Ref.OptionalArgs<MutationRef>\n  ): Effect.Effect<\n    Ref.Returns<MutationRef>,\n    Ref.Error<MutationRef> | ParseResult.ParseError\n  > =>\n    Ref.runWithCodec(\n      mutationRef,\n      (args[0] ?? {}) as Ref.Args<MutationRef>,\n      (functionReference, encodedArgs) =>\n        this.testConvex.mutation(functionReference as any, encodedArgs),\n    );\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    ...args: Ref.OptionalArgs<ActionRef>\n  ): Effect.Effect<\n    Ref.Returns<ActionRef>,\n    Ref.Error<ActionRef> | ParseResult.ParseError\n  > =>\n    Ref.runWithCodec(\n      actionRef,\n      (args[0] ?? {}) as Ref.Args<ActionRef>,\n      (functionReference, encodedArgs) =>\n        this.testConvex.action(functionReference as any, encodedArgs),\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.OptionalArgs<QueryRef>\n  ) => this.testConfectImplWithoutIdentity.query(queryRef, ...args);\n\n  readonly mutation = <MutationRef extends Ref.AnyMutation>(\n    mutationRef: MutationRef,\n    ...args: Ref.OptionalArgs<MutationRef>\n  ) => this.testConfectImplWithoutIdentity.mutation(mutationRef, ...args);\n\n  readonly action = <ActionRef extends Ref.AnyAction>(\n    actionRef: ActionRef,\n    ...args: Ref.OptionalArgs<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    convexSchemaDefinition: SchemaDefinition<GenericSchema, true>,\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(convexSchemaDefinition, modules) as any,\n        ),\n    );\n"],"mappings":";;;;;;;;;;;;;;AA8EA,MAAa,oBAGX,QAAQ,WAAuC,4BAA4B;AAE7E,IAAM,iCAAN,MAEuD;CACrD,YACE,AAAQ,eACR,AAAQ,YAGR;EAJQ;EACA;;CAKV,AAAS,SACP,UACA,GAAG,SAKH,IAAI,aACF,UACC,KAAK,MAAM,EAAE,GACb,mBAAmB,gBAClB,KAAK,WAAW,MAAM,mBAA0B,YAAY,CAC/D;CAEH,AAAS,YACP,aACA,GAAG,SAKH,IAAI,aACF,aACC,KAAK,MAAM,EAAE,GACb,mBAAmB,gBAClB,KAAK,WAAW,SAAS,mBAA0B,YAAY,CAClE;CAEH,AAAS,UACP,WACA,GAAG,SAKH,IAAI,aACF,WACC,KAAK,MAAM,EAAE,GACb,mBAAmB,gBAClB,KAAK,WAAW,OAAO,mBAA0B,YAAY,CAChE;CAEH,AAAS,QAKP,SAKA,YACmE;EACnE,MAAM,qBACJ,gBAIA,yBAAyB,cACvB,KAAK,eACL,YACD;AAIH,SAAO,YAAY,SACf,OAAO,cACL,KAAK,WAAW,KAAK,gBACnB,OAAO,WACL,QAAQ,KACN,OAAO,QACP,OAAO,QAAQ,kBAAkB,YAAY,CAAC,CAC/C,CACF,CACF,CACF,GACD,OAAO,cACL,KAAK,WAAW,KAAK,gBACnB,OAAO,WACL,QAAQ,KACN,OAAO,QAAQ,OAAO,OAAO,QAAQ,CAAC,EACtC,OAAO,QAAQ,kBAAkB,YAAY,CAAC,CAC/C,CACF,CACF,CACF,CAAC,KAAK,OAAO,QAAQ,OAAO,OAAO,QAAQ,CAAC,CAAC;;CAGpD,AAAS,SACP,mBACA,SACG,OAAO,cAAc,KAAK,WAAW,MAAM,mBAAmB,KAAK,CAAC;CAEzE,AAAS,2CACP,OAAO,cAAc,KAAK,WAAW,oCAAoC,CAAC;CAE5E,AAAS,+BAA+B,kBACtC,OAAO,cACL,KAAK,WAAW,4BAA4B,cAAc,CAC3D;;AAGL,IAAM,kBAAN,MAEwC;CACtC,AAAiB;CAEjB,YACE,AAAQ,eACR,AAAQ,YAGR;EAJQ;EACA;AAIR,OAAK,aAAa;AAClB,OAAK,iCAAiC,IAAI,+BACxC,eACA,WACD;;CAGH,AAAS,gBAAgB,iBACvB,IAAI,+BACF,KAAK,eACL,KAAK,WAAW,aAAa,aAAa,CAC3C;CAEH,AAAS,SACP,UACA,GAAG,SACA,KAAK,+BAA+B,MAAM,UAAU,GAAG,KAAK;CAEjE,AAAS,YACP,aACA,GAAG,SACA,KAAK,+BAA+B,SAAS,aAAa,GAAG,KAAK;CAEvE,AAAS,UACP,WACA,GAAG,SACA,KAAK,+BAA+B,OAAO,WAAW,GAAG,KAAK;CAEnE,AAAS,QACP,SACA,YAEA,KAAK,+BAA+B,IAClC,SACA,QACD;CAEH,AAAS,SACP,mBACA,SACG,KAAK,+BAA+B,MAAM,mBAAmB,KAAK;CAEvE,AAAS,2CACP,KAAK,+BAA+B,oCAAoC;CAE1E,AAAS,+BAA+B,kBACtC,KAAK,+BAA+B,4BAClC,cACD;;AAGL,MAAa,SAET,gBACA,wBACA,kBAGA,MAAM,KACJ,aAA8B,QAE5B,IAAI,gBACF,gBACA,WAAW,wBAAwB,QAAQ,CAC5C,CACJ"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@confect/test",
   "description": "Utilities for testing Confect apps without a live Convex backend",
-  "version": "9.0.0-next.6",
+  "version": "9.0.0-next.8",
   "author": "RJ Dellecese",
   "bugs": {
     "url": "https://github.com/rjdellecese/confect/issues"
@@ -52,8 +52,8 @@
     "convex": "1.39.1",
     "convex-test": "^0.0.50",
     "effect": "^3.21.2",
-    "@confect/core": "^9.0.0-next.6",
-    "@confect/server": "^9.0.0-next.6"
+    "@confect/core": "^9.0.0-next.8",
+    "@confect/server": "^9.0.0-next.8"
   },
   "repository": {
     "type": "git",

package/src/TestConfect.ts

@@ -14,7 +14,10 @@ import type {
 } from "convex/server";
 import type { Value } from "convex/values";
 import type { ParseResult } from "effect";
-import { Context, Effect, Layer, Schema } from "effect";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
 
 export type TestConfectWithoutIdentity<
   ConfectSchema extends DatabaseSchema.AnyWithProps,