@gaganref/confect-server 10.3.1-fork.2 → 10.3.1-fork.21

package/dist/internal/DocumentPatch.d.ts

@@ -0,0 +1,16 @@
+import type { ReadonlyValue } from "@confect/core/SchemaToValidator";
+import * as Effect from "effect/Effect";
+import * as Record from "effect/Record";
+import * as Schema from "effect/Schema";
+import type * as Table from "../Table.js";
+export type EncodedPatch = Record.ReadonlyRecord<string, ReadonlyValue | undefined>;
+export type PatchEncoder = (patch: Record.ReadonlyRecord<string, unknown>) => Effect.Effect<EncodedPatch, Schema.SchemaError>;
+/**
+ * Returns the encoder for patches to the table's documents, or `undefined` when
+ * the table's codec does not encode each field independently. The encoder maps
+ * every patched field of the table to its encoded value, or to `undefined` when
+ * the patch unsets the field or the field's codec encodes the value as an
+ * absent key. Keys outside the table's fields are left out.
+ */
+export declare const encoder: (table: Table.AnyWithProps) => PatchEncoder | undefined;
+//# sourceMappingURL=DocumentPatch.d.ts.map

package/dist/internal/DocumentPatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DocumentPatch.d.ts","sourceRoot":"","sources":["../../src/internal/DocumentPatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAC;AAE1C,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAC9C,MAAM,EACN,aAAa,GAAG,SAAS,CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,CACzB,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1C,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAIrD;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,UACX,KAAK,CAAC,YAAY,KACxB,YAAY,GAAG,SAOjB,CAAC"}

package/dist/internal/DocumentPatch.js

@@ -0,0 +1,36 @@
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import { pipe } from "effect/Function";
+import * as SchemaAST from "effect/SchemaAST";
+import * as Record from "effect/Record";
+//#region src/internal/DocumentPatch.ts
+const patchEncoders = /* @__PURE__ */ new WeakMap();
+/**
+* Returns the encoder for patches to the table's documents, or `undefined` when
+* the table's codec does not encode each field independently. The encoder maps
+* every patched field of the table to its encoded value, or to `undefined` when
+* the patch unsets the field or the field's codec encodes the value as an
+* absent key. Keys outside the table's fields are left out.
+*/
+const encoder = (table) => {
+	let cached = patchEncoders.get(table);
+	if (cached === void 0) {
+		cached = makePatchEncoder(table);
+		patchEncoders.set(table, cached);
+	}
+	return cached ?? void 0;
+};
+const makePatchEncoder = (table) => {
+	const ast = table.Fields.ast;
+	if (!SchemaAST.isObjects(ast) || ast.encoding !== void 0 || ast.checks !== void 0 || ast.indexSignatures.length > 0) return null;
+	const fieldEncoders = Object.fromEntries(ast.propertySignatures.map(({ name, type }) => {
+		const key = String(name);
+		const encode = Schema.encodeUnknownEffect(Schema.Struct({ [key]: Schema.optionalKey(Schema.make(type)) }));
+		return [key, (value) => Effect.map(encode({ [key]: value }), (encoded) => encoded[key])];
+	}));
+	return (patch) => pipe(fieldEncoders, Record.filter((_, name) => Object.hasOwn(patch, name)), Record.map((encode, name) => patch[name] === void 0 ? Effect.undefined : encode(patch[name])), Effect.all);
+};
+//#endregion
+export { encoder };
+
+//# sourceMappingURL=DocumentPatch.js.map

package/dist/internal/DocumentPatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DocumentPatch.js","names":[],"sources":["../../src/internal/DocumentPatch.ts"],"sourcesContent":["import type { ReadonlyValue } from \"@confect/core/SchemaToValidator\";\nimport { pipe } from \"effect/Function\";\nimport * as Effect from \"effect/Effect\";\nimport * as Record from \"effect/Record\";\nimport * as Schema from \"effect/Schema\";\nimport * as SchemaAST from \"effect/SchemaAST\";\nimport type * as Table from \"../Table.js\";\n\nexport type EncodedPatch = Record.ReadonlyRecord<\n  string,\n  ReadonlyValue | undefined\n>;\n\nexport type PatchEncoder = (\n  patch: Record.ReadonlyRecord<string, unknown>,\n) => Effect.Effect<EncodedPatch, Schema.SchemaError>;\n\nconst patchEncoders = new WeakMap<Table.AnyWithProps, PatchEncoder | null>();\n\n/**\n * Returns the encoder for patches to the table's documents, or `undefined` when\n * the table's codec does not encode each field independently. The encoder maps\n * every patched field of the table to its encoded value, or to `undefined` when\n * the patch unsets the field or the field's codec encodes the value as an\n * absent key. Keys outside the table's fields are left out.\n */\nexport const encoder = (\n  table: Table.AnyWithProps,\n): PatchEncoder | undefined => {\n  let cached = patchEncoders.get(table);\n  if (cached === undefined) {\n    cached = makePatchEncoder(table);\n    patchEncoders.set(table, cached);\n  }\n  return cached ?? undefined;\n};\n\n// A struct with no encoding of its own encodes each field through that field's\n// codec alone, so a patch encodes field by field. A union or a transformation\n// over the whole struct can make one field's encoding depend on another field.\n// A struct-level check must see the decoded fields before they are encoded,\n// and keys under an index signature have no field codec of their own.\nconst makePatchEncoder = (table: Table.AnyWithProps): PatchEncoder | null => {\n  const ast = table.Fields.ast;\n  if (\n    !SchemaAST.isObjects(ast) ||\n    ast.encoding !== undefined ||\n    ast.checks !== undefined ||\n    ast.indexSignatures.length > 0\n  ) {\n    return null;\n  }\n  // A field's codec runs only when the patch gives the field a value, since a\n  // codec can handle a missing key. Each comes from the table, whose codecs\n  // need no services.\n  const fieldEncoders: Record.ReadonlyRecord<\n    string,\n    (\n      value: unknown,\n    ) => Effect.Effect<ReadonlyValue | undefined, Schema.SchemaError>\n  > = Object.fromEntries(\n    ast.propertySignatures.map(({ name, type }) => {\n      const key = String(name);\n      const encode = Schema.encodeUnknownEffect(\n        Schema.Struct({\n          [key]: Schema.optionalKey(\n            Schema.make<Schema.Codec<unknown, ReadonlyValue>>(type),\n          ),\n        }),\n      );\n      return [\n        key,\n        (value: unknown) =>\n          Effect.map(encode({ [key]: value }), (encoded) => encoded[key]),\n      ];\n    }),\n  );\n  return (patch) =>\n    pipe(\n      fieldEncoders,\n      Record.filter((_, name) => Object.hasOwn(patch, name)),\n      Record.map((encode, name) =>\n        patch[name] === undefined ? Effect.undefined : encode(patch[name]),\n      ),\n      Effect.all,\n    );\n};\n"],"mappings":";;;;;;AAiBA,MAAM,gCAAgB,IAAI,QAAiD;;;;;;;;AAS3E,MAAa,WACX,UAC6B;CAC7B,IAAI,SAAS,cAAc,IAAI,KAAK;CACpC,IAAI,WAAW,KAAA,GAAW;EACxB,SAAS,iBAAiB,KAAK;EAC/B,cAAc,IAAI,OAAO,MAAM;CACjC;CACA,OAAO,UAAU,KAAA;AACnB;AAOA,MAAM,oBAAoB,UAAmD;CAC3E,MAAM,MAAM,MAAM,OAAO;CACzB,IACE,CAAC,UAAU,UAAU,GAAG,KACxB,IAAI,aAAa,KAAA,KACjB,IAAI,WAAW,KAAA,KACf,IAAI,gBAAgB,SAAS,GAE7B,OAAO;CAKT,MAAM,gBAKF,OAAO,YACT,IAAI,mBAAmB,KAAK,EAAE,MAAM,WAAW;EAC7C,MAAM,MAAM,OAAO,IAAI;EACvB,MAAM,SAAS,OAAO,oBACpB,OAAO,OAAO,GACX,MAAM,OAAO,YACZ,OAAO,KAA2C,IAAI,CACxD,EACF,CAAC,CACH;EACA,OAAO,CACL,MACC,UACC,OAAO,IAAI,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,YAAY,QAAQ,IAAI,CAClE;CACF,CAAC,CACH;CACA,QAAQ,UACN,KACE,eACA,OAAO,QAAQ,GAAG,SAAS,OAAO,OAAO,OAAO,IAAI,CAAC,GACrD,OAAO,KAAK,QAAQ,SAClB,MAAM,UAAU,KAAA,IAAY,OAAO,YAAY,OAAO,MAAM,KAAK,CACnE,GACA,OAAO,GACT;AACJ"}

package/dist/node.d.ts

@@ -1,2 +1,2 @@
-export * as RegisteredNodeFunction from "./RegisteredNodeFunction";
+export * as RegisteredNodeFunction from "./RegisteredNodeFunction.js";
 //# sourceMappingURL=node.d.ts.map

package/dist/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,sBAAsB,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@gaganref/confect-server",
-  "version": "10.3.1-fork.2",
+  "version": "10.3.1-fork.21",
   "dependencies": {
     "@effect/ai-openai-compat": "4.0.4",
     "@effect/ai-openrouter": "4.0.4"
   },
   "peerDependencies": {
-    "@confect/core": "npm:@gaganref/confect-core@10.3.1-fork.2",
+    "@confect/core": "npm:@gaganref/confect-core@10.3.1-fork.21",
     "@effect/platform-node": "^4.0.0",
     "convex": "^1.45.0",
     "effect": "^4.0.4"

package/src/ActionCtx.ts

@@ -1,7 +1,7 @@
 import type * as IdScope from "@confect/core/IdScope";
 import type { GenericActionCtx, GenericDataModel } from "convex/server";
 import * as Context from "effect/Context";
-import type * as ComponentCtx from "./ComponentCtx";
+import type * as ComponentCtx from "./ComponentCtx.js";
 import * as Layer from "effect/Layer";
 
 export type ActionCtxTag<

package/src/AiGatewayDecisionClient.ts

@@ -2,14 +2,14 @@ import * as OpenRouterClient from "@effect/ai-openrouter/OpenRouterClient";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import type * as HttpClient from "effect/http/HttpClient";
-import * as InternalAiGatewayDecisionClient from "./internal/AiGatewayDecisionClient";
-import * as AiGatewayServiceToken from "./internal/AiGatewayServiceToken";
+import * as InternalAiGatewayDecisionClient from "./internal/AiGatewayDecisionClient.js";
+import * as AiGatewayServiceToken from "./internal/AiGatewayServiceToken.js";
 
 export {
   AiGatewayDisabled,
   AiGatewayError,
   AiGatewayUnavailable,
-} from "./internal/AiGatewayServiceToken";
+} from "./internal/AiGatewayServiceToken.js";
 
 /**
  * The client configured for Convex AI gateway decisions.

package/src/AiGatewayLanguageClient.ts

@@ -2,14 +2,14 @@ import * as OpenAiClient from "@effect/ai-openai-compat/OpenAiClient";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import type * as HttpClient from "effect/http/HttpClient";
-import * as InternalAiGatewayLanguageClient from "./internal/AiGatewayLanguageClient";
-import * as AiGatewayServiceToken from "./internal/AiGatewayServiceToken";
+import * as InternalAiGatewayLanguageClient from "./internal/AiGatewayLanguageClient.js";
+import * as AiGatewayServiceToken from "./internal/AiGatewayServiceToken.js";
 
 export {
   AiGatewayDisabled,
   AiGatewayError,
   AiGatewayUnavailable,
-} from "./internal/AiGatewayServiceToken";
+} from "./internal/AiGatewayServiceToken.js";
 
 /**
  * The client service configured for Convex AI gateway language models.

package/src/Auth.ts

@@ -6,7 +6,7 @@ import * as Layer from "effect/Layer";
 import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
-import type * as DatabaseSchema from "./DatabaseSchema";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
 
 const make = (auth: ConvexAuth) => ({
   getUserIdentity: Effect.promise(() => auth.getUserIdentity()).pipe(

package/src/ComponentCtx.ts

@@ -17,7 +17,7 @@ import type {
   VectorIndexNames,
   VectorSearchQuery,
 } from "convex/server";
-import type { PatchValue } from "./DatabaseWriter";
+import type { PatchValue } from "./DatabaseWriter.js";
 
 /**
  * Distinguishes raw component services from structurally compatible app ctxs.

package/src/ConvexFunctionDefinitions.ts

@@ -3,14 +3,14 @@ import * as Match from "effect/Match";
 import * as Record from "effect/Record";
 import type * as GroupSpec from "@confect/core/GroupSpec";
 import type * as FunctionSpec from "@confect/core/FunctionSpec";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as GroupImpl from "./GroupImpl";
-import * as GroupRegistry from "./GroupRegistry";
-import * as FunctionRegistryItem from "./FunctionRegistryItem";
-import * as RegisteredConvexFunction from "./RegisteredConvexFunction";
-import type * as RegisteredFunctions from "./RegisteredFunctions";
-import * as ResolvedMiddleware from "./ResolvedMiddleware";
-import { mapLeaves } from "./internal/utils";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as GroupImpl from "./GroupImpl.js";
+import * as GroupRegistry from "./GroupRegistry.js";
+import * as FunctionRegistryItem from "./FunctionRegistryItem.js";
+import * as RegisteredConvexFunction from "./RegisteredConvexFunction.js";
+import type * as RegisteredFunctions from "./RegisteredFunctions.js";
+import * as ResolvedMiddleware from "./ResolvedMiddleware.js";
+import { mapLeaves } from "./internal/utils.js";
 
 export interface Definitions {
   readonly [name: string]: RegisteredConvexFunction.Definition | Definitions;

package/src/CronJobs.ts

@@ -11,7 +11,7 @@ import * as Option from "effect/Option";
 import * as Order from "effect/Order";
 import * as Predicate from "effect/Predicate";
 import * as Record from "effect/Record";
-import type * as CronJob from "./CronJob";
+import type * as CronJob from "./CronJob.js";
 
 export const TypeId = "~@confect/server/CronJobs";
 export type TypeId = typeof TypeId;

package/src/DataModel.ts

@@ -1,6 +1,6 @@
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as Table from "./Table";
-import type * as TableInfo from "./TableInfo";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as Table from "./Table.js";
+import type * as TableInfo from "./TableInfo.js";
 import type * as GenericId from "@confect/core/GenericId";
 
 export declare const TypeId: "~@confect/server/DataModel";

package/src/DatabaseReader.ts

@@ -2,10 +2,10 @@ import type { GenericDatabaseReader } from "convex/server";
 import * as Context from "effect/Context";
 import * as Layer from "effect/Layer";
 import type { BaseDatabaseReader } from "@confect/core/Types";
-import * as DatabaseSchema from "./DatabaseSchema";
-import type * as DataModel from "./DataModel";
-import * as QueryInitializer from "./QueryInitializer";
-import * as Table from "./Table";
+import * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DataModel from "./DataModel.js";
+import * as QueryInitializer from "./QueryInitializer.js";
+import * as Table from "./Table.js";
 
 type IncludedTables<DatabaseSchema_ extends DatabaseSchema.AnyWithProps> =
   | DatabaseSchema.Tables<DatabaseSchema_>

package/src/DatabaseSchema.ts

@@ -3,7 +3,7 @@ import * as Data from "effect/Data";
 import * as Result from "effect/Result";
 import * as Predicate from "effect/Predicate";
 import * as Record from "effect/Record";
-import type * as Table from "./Table";
+import type * as Table from "./Table.js";
 
 export class EmptyDatabaseScopeError extends Data.TaggedError(
   "EmptyDatabaseScopeError",

package/src/DatabaseWriter.ts

@@ -10,13 +10,16 @@ import { pipe } from "effect/Function";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Predicate from "effect/Predicate";
 import * as Record from "effect/Record";
-import * as DatabaseSchema from "./DatabaseSchema";
-import type * as DataModel from "./DataModel";
-import type { DocumentByName as DocumentByName_ } from "./DataModel";
-import * as Document from "./Document";
-import * as QueryInitializer from "./QueryInitializer";
-import type * as Table from "./Table";
+import * as Result from "effect/Result";
+import * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DataModel from "./DataModel.js";
+import type { DocumentByName as DocumentByName_ } from "./DataModel.js";
+import * as Document from "./Document.js";
+import * as DocumentPatch from "./internal/DocumentPatch.js";
+import * as QueryInitializer from "./QueryInitializer.js";
+import type * as Table from "./Table.js";
 
 /**
  * The argument accepted by `patch`: like `Partial<Doc>` without system fields,
@@ -131,38 +134,108 @@ export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
       return id as unknown as DataModel.Id<DataModel_, TableName>;
     });
 
+    // A codec whose encoding spans fields cannot encode a patch on its own, so
+    // the patch is merged into the decoded document and the result replaces it.
+    const replacePatched = (
+      id: DataModel.Id<DataModel_, TableName>,
+      patchedValues: PatchValue<
+        Document.WithoutSystemFields<DocumentByName_<DataModel_, TableName>>
+      >,
+    ) =>
+      Effect.gen(function* () {
+        const originalDecodedDoc = yield* QueryInitializer.getById<
+          Table.AnyWithProps,
+          TableName
+        >(
+          convexDatabaseWriter as any,
+          tableDef,
+        )(id as unknown as GenericId<TableName>);
+
+        const updatedEncodedDoc = yield* pipe(
+          patchedValues,
+          Record.reduce(originalDecodedDoc, (acc, value, key) =>
+            value === undefined
+              ? Record.remove(acc, key)
+              : Record.set(acc, key, value),
+          ),
+          Document.encode(tableDef),
+        );
+
+        yield* Effect.promise(() =>
+          convexDatabaseWriter.replace(
+            id as unknown as GenericId<TableName>,
+            updatedEncodedDoc as Expand<
+              BetterOmit<
+                DocumentByName<DataModel.ToConvex<DataModel_>, TableName>,
+                "_creationTime" | "_id"
+              >
+            >,
+          ),
+        );
+      });
+
     const patch = Effect.fn("DatabaseWriter.patch")(function* (
       id: DataModel.Id<DataModel_, TableName>,
       patchedValues: PatchValue<
         Document.WithoutSystemFields<DocumentByName_<DataModel_, TableName>>
       >,
     ) {
-      const originalDecodedDoc = yield* QueryInitializer.getById<
-        Table.AnyWithProps,
-        TableName
-      >(
-        convexDatabaseWriter as any,
-        tableDef,
-      )(id as unknown as GenericId<TableName>);
-
-      const updatedEncodedDoc = yield* pipe(
-        patchedValues,
-        Record.reduce(originalDecodedDoc, (acc, value, key) =>
-          value === undefined
-            ? Record.remove(acc, key)
-            : Record.set(acc, key, value),
+      const encodePatch = DocumentPatch.encoder(tableDef);
+      if (encodePatch === undefined) {
+        return yield* replacePatched(id, patchedValues);
+      }
+
+      const storedDoc = yield* pipe(
+        Effect.promise(() =>
+          convexDatabaseWriter.get(id as unknown as GenericId<TableName>),
+        ),
+        Effect.andThen((value) =>
+          Effect.fromResult(
+            Result.fromNullishOr(
+              value,
+              () =>
+                new QueryInitializer.GetByIdFailure({
+                  tableName,
+                  id,
+                }),
+            ),
+          ),
+        ),
+      );
+      // The patch must encode and the patched document must decode. When
+      // either fails, the stored document decides whose fault that is.
+      const encodedPatch = yield* pipe(
+        encodePatch(patchedValues),
+        Effect.mapError(({ message }) => message),
+        Effect.tap((delta) =>
+          pipe(
+            { ...storedDoc, ...delta },
+            Record.filter(Predicate.isNotUndefined),
+            Document.decode(tableDef),
+            Effect.mapError(({ parseError }) => parseError),
+          ),
+        ),
+        Effect.catch((parseError) =>
+          pipe(
+            Document.decode(storedDoc, tableDef),
+            Effect.andThen(
+              Effect.fail(
+                new Document.DocumentEncodeError({
+                  tableName,
+                  id,
+                  parseError,
+                }),
+              ),
+            ),
+          ),
         ),
-        Document.encode(tableDef),
       );
 
       yield* Effect.promise(() =>
-        convexDatabaseWriter.replace(
+        convexDatabaseWriter.patch(
           id as unknown as GenericId<TableName>,
-          updatedEncodedDoc as Expand<
-            BetterOmit<
-              DocumentByName<DataModel.ToConvex<DataModel_>, TableName>,
-              "_creationTime" | "_id"
-            >
+          encodedPatch as Partial<
+            DocumentByName<DataModel.ToConvex<DataModel_>, TableName>
           >,
         ),
       );

package/src/Document.ts

@@ -4,10 +4,10 @@ import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
 import * as Schema from "effect/Schema";
 import type { ReadonlyRecord } from "effect/Record";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as DataModel from "./DataModel";
-import type * as TableInfo from "./TableInfo";
-import type * as Table from "./Table";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DataModel from "./DataModel.js";
+import type * as TableInfo from "./TableInfo.js";
+import type * as Table from "./Table.js";
 
 export type Document<
   Schema_ extends DatabaseSchema.AnyWithProps,

package/src/FunctionImpl.ts

@@ -1,15 +1,15 @@
 import type * as FunctionSpec from "@confect/core/FunctionSpec";
 import type * as GroupSpec from "@confect/core/GroupSpec";
 import type * as MiddlewareSpec from "@confect/core/MiddlewareSpec";
-import * as Registry from "./Registry";
+import * as Registry from "./Registry.js";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as Handler from "./Handler";
-import { setNestedProperty } from "./internal/utils";
-import * as FunctionRegistryItem from "./FunctionRegistryItem";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as Handler from "./Handler.js";
+import { setNestedProperty } from "./internal/utils.js";
+import * as FunctionRegistryItem from "./FunctionRegistryItem.js";
 
 export interface FunctionImpl<Name_ extends string> {
   readonly name: Name_;

package/src/FunctionRegistryItem.ts

@@ -5,7 +5,7 @@ import type { FunctionType, FunctionVisibility } from "convex/server";
 import * as Match from "effect/Match";
 import * as Predicate from "effect/Predicate";
 import type * as Schema from "effect/Schema";
-import type * as Handler from "./Handler";
+import type * as Handler from "./Handler.js";
 
 export const TypeId = "~@confect/server/FunctionRegistryItem";
 export type TypeId = typeof TypeId;

package/src/GroupImpl.ts

@@ -1,17 +1,18 @@
 import type * as GroupSpec from "@confect/core/GroupSpec";
 import type * as MiddlewareSpec from "@confect/core/MiddlewareSpec";
-import * as Registry from "./Registry";
-import * as RegistryItems from "./RegistryItems";
+import * as Registry from "./Registry.js";
+import * as RegistryItems from "./RegistryItems.js";
 import * as Array from "effect/Array";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as Data from "effect/Data";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
 import * as Ref from "effect/Ref";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as FunctionImpl from "./FunctionImpl";
-import type * as MiddlewareImpl from "./MiddlewareImpl";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as FunctionImpl from "./FunctionImpl.js";
+import type * as MiddlewareImpl from "./MiddlewareImpl.js";
 
 export const TypeId = "~@confect/server/GroupImpl";
 export type TypeId = typeof TypeId;
@@ -111,10 +112,20 @@ export const make = <
     FunctionImpl.FromGroupSpec<Group> | MiddlewareImpl.FromGroupSpec<Group>
   >;
 
-const findUnfinalizedGroupImpl = <S>(
-  context: Context.Context<S>,
-): Option.Option<AnyUnfinalized> =>
-  Array.findFirst(context.mapUnsafe.values(), isUnfinalizedGroupImpl);
+const findGroupImpl = <S>(context: Context.Context<S>): Option.Option<Any> =>
+  Array.findFirst(context.mapUnsafe.values(), isGroupImpl);
+
+export class MissingRequiredMiddlewareError extends Data.TaggedError(
+  "MissingRequiredMiddlewareError",
+)<{
+  readonly missing: ReadonlyArray<RegistryItems.MissingMiddleware>;
+}> {
+  override get message(): string {
+    return `GroupImpl.finalize: ${this.missing.map(({ functionName, middlewareKey }) => `${functionName} requires middleware "${middlewareKey}"`).join("\n")}`;
+  }
+}
+
+type Finalizable = Layer.Layer<AnyUnfinalized> | Layer.Layer<AnyFinalized>;
 
 /**
  * Mark a `GroupImpl` layer as fully implemented. The parameter type defaults
@@ -127,20 +138,52 @@ const findUnfinalizedGroupImpl = <S>(
  * registered into this group's scope are snapshotted onto the produced service
  * value's `registeredFunctionNames` field, so consumers can verify impl
  * completeness against a `GroupSpec`'s expected functions without having to
- * inspect the `Registry` themselves.
+ * inspect the `Registry` themselves. Pass `{ required }` to check every
+ * registered function's middleware at layer build, including internal
+ * functions. This form also accepts a finalized layer so generated registration
+ * can enforce the backend declaration without changing authored impls. Pass
+ * `groupPath` to qualify uncovered function names in the diagnostic.
  */
-export const finalize = (
+export function finalize(options: {
+  readonly groupPath?: string;
+  readonly required: ReadonlyArray<
+    Pick<MiddlewareSpec.AnyMiddlewareSpec, "key">
+  >;
+}): (group: Finalizable) => Layer.Layer<GroupImpl<"Finalized">>;
+export function finalize(
   group: Layer.Layer<GroupImpl<"Unfinalized">>,
+): Layer.Layer<GroupImpl<"Finalized">>;
+export function finalize(
+  input:
+    | Finalizable
+    | {
+        readonly groupPath?: string;
+        readonly required: ReadonlyArray<
+          Pick<MiddlewareSpec.AnyMiddlewareSpec, "key">
+        >;
+      },
+):
+  | Layer.Layer<GroupImpl<"Finalized">>
+  | ((group: Finalizable) => Layer.Layer<GroupImpl<"Finalized">>) {
+  return "required" in input
+    ? (group) => finalizeWith(group, input.required, input.groupPath)
+    : finalizeWith(input, []);
+}
+
+const finalizeWith = (
+  group: Layer.Layer<never>,
+  required: ReadonlyArray<Pick<MiddlewareSpec.AnyMiddlewareSpec, "key">>,
+  groupPath = "",
 ): Layer.Layer<GroupImpl<"Finalized">> =>
   Layer.flatMap(group, (context): Layer.Layer<GroupImpl<"Finalized">> =>
-    findUnfinalizedGroupImpl(context).pipe(
+    findGroupImpl(context).pipe(
       Option.match({
         onNone: () =>
           Layer.effect(
             GroupImpl<"Finalized">({ finalizationStatus: "Finalized" }),
             Effect.die(
               new Error(
-                "GroupImpl.finalize: no Unfinalized GroupImpl service was found in the layer's context.",
+                "GroupImpl.finalize: no GroupImpl service was found in the layer's context.",
               ),
             ),
           ),
@@ -150,6 +193,16 @@ export const finalize = (
             Effect.gen(function* () {
               const registry = yield* Registry.Registry;
               const items = yield* Ref.get(registry);
+              const missing = RegistryItems.missingRequired(
+                items,
+                required,
+                groupPath,
+              );
+              if (missing.length > 0) {
+                return yield* Effect.die(
+                  new MissingRequiredMiddlewareError({ missing }),
+                );
+              }
               return {
                 [TypeId]: TypeId,
                 finalizationStatus: "Finalized" as const,

package/src/GroupRegistry.ts

@@ -1,10 +1,10 @@
 import * as Effect from "effect/Effect";
 import type * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
-import * as Registry from "./Registry";
-import type * as RegistryItems from "./RegistryItems";
-import type * as GroupImpl from "./GroupImpl";
-import * as MiddlewareRegistryItem from "./MiddlewareRegistryItem";
+import * as Registry from "./Registry.js";
+import type * as RegistryItems from "./RegistryItems.js";
+import type * as GroupImpl from "./GroupImpl.js";
+import * as MiddlewareRegistryItem from "./MiddlewareRegistryItem.js";
 
 export const make = (
   groupLayer: Layer.Layer<GroupImpl.GroupImpl<"Finalized">>,

package/src/Handler.ts

@@ -2,29 +2,29 @@ import type { FunctionSpec, RuntimeAndFunctionType } from "@confect/core";
 import type * as FunctionProvenance from "@confect/core/FunctionProvenance";
 import type * as NodeServices from "@effect/platform-node/NodeServices";
 import type { Effect } from "effect";
-import type * as ActionCtx from "./ActionCtx";
-import type * as ActionRunner from "./ActionRunner";
-import type * as Auth from "./Auth";
-import type * as DatabaseReader from "./DatabaseReader";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as DatabaseWriter from "./DatabaseWriter";
-import type * as DataModel from "./DataModel";
-import type { ExecutionMetadata } from "./ExecutionMetadata";
-import type { RequestMetadata } from "./RequestMetadata";
-import type { TransactionMetadata } from "./TransactionMetadata";
-import type * as MutationCtx from "./MutationCtx";
-import type * as MutationRunner from "./MutationRunner";
-import type { MutationTransactionContext } from "./MutationTransactionContext";
-import type * as QueryCtx from "./QueryCtx";
-import type * as QueryRunner from "./QueryRunner";
-import type { QueryTransactionContext } from "./QueryTransactionContext";
-import type * as RegisteredFunction from "./RegisteredFunction";
-import type * as Scheduler from "./Scheduler";
-import type { Storage } from "./Storage";
-import type * as StorageActionWriter from "./StorageActionWriter";
-import type * as StorageReader from "./StorageReader";
-import type * as StorageWriter from "./StorageWriter";
-import type * as VectorSearch from "./VectorSearch";
+import type * as ActionCtx from "./ActionCtx.js";
+import type * as ActionRunner from "./ActionRunner.js";
+import type * as Auth from "./Auth.js";
+import type * as DatabaseReader from "./DatabaseReader.js";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DatabaseWriter from "./DatabaseWriter.js";
+import type * as DataModel from "./DataModel.js";
+import type { ExecutionMetadata } from "./ExecutionMetadata.js";
+import type { RequestMetadata } from "./RequestMetadata.js";
+import type { TransactionMetadata } from "./TransactionMetadata.js";
+import type * as MutationCtx from "./MutationCtx.js";
+import type * as MutationRunner from "./MutationRunner.js";
+import type { MutationTransactionContext } from "./MutationTransactionContext.js";
+import type * as QueryCtx from "./QueryCtx.js";
+import type * as QueryRunner from "./QueryRunner.js";
+import type { QueryTransactionContext } from "./QueryTransactionContext.js";
+import type * as RegisteredFunction from "./RegisteredFunction.js";
+import type * as Scheduler from "./Scheduler.js";
+import type { Storage } from "./Storage.js";
+import type * as StorageActionWriter from "./StorageActionWriter.js";
+import type * as StorageReader from "./StorageReader.js";
+import type * as StorageWriter from "./StorageWriter.js";
+import type * as VectorSearch from "./VectorSearch.js";
 
 export type Handler<
   DatabaseSchema_ extends DatabaseSchema.AnyWithProps,