@gaganref/confect-server 10.3.1-fork.4 → 10.3.1-fork.40

package/src/RegisteredNodeFunction.ts

@@ -9,21 +9,21 @@ import type { Effect } from "effect";
 import type { Schema } from "effect";
 import * as Layer from "effect/Layer";
 import * as Match from "effect/Match";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import * as RegisteredFunction from "./RegisteredFunction";
-import * as FunctionRegistryItem from "./FunctionRegistryItem";
-import * as ResolvedMiddleware from "./ResolvedMiddleware";
-import * as GroupRegistry from "./GroupRegistry";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import * as RegisteredFunction from "./RegisteredFunction.js";
+import * as FunctionRegistryItem from "./FunctionRegistryItem.js";
+import * as ResolvedMiddleware from "./ResolvedMiddleware.js";
+import * as GroupRegistry from "./GroupRegistry.js";
 import type * as GroupSpec from "@confect/core/GroupSpec";
-import type * as GroupImpl from "./GroupImpl";
-import type * as RegisteredFunctions from "./RegisteredFunctions";
-import { mapLeaves } from "./internal/utils";
+import type * as GroupImpl from "./GroupImpl.js";
+import type * as RegisteredFunctions from "./RegisteredFunctions.js";
+import { mapLeaves } from "./internal/utils.js";
 
 export const buildForGroup = <Group extends GroupSpec.AnyWithProps>(
   databaseSchema: DatabaseSchema.AnyWithProps,
   groupLayer: Layer.Layer<GroupImpl.GroupImpl<"Finalized">>,
 ): RegisteredFunctions.RegisteredFunctionsForGroupSpec<Group> => {
-  const { functionRegistryItems, middlewareRegistryItems } =
+  const { functionRegistryItems, middlewareRegistryItems, observability } =
     GroupRegistry.make(groupLayer);
   return mapLeaves<FunctionRegistryItem.AnyWithProps, RegisteredFunction.Any>(
     functionRegistryItems as {
@@ -38,6 +38,7 @@ export const buildForGroup = <Group extends GroupSpec.AnyWithProps>(
             databaseSchema,
             confect,
             ResolvedMiddleware.resolve(confect, middlewareRegistryItems),
+            observability,
           ),
         ),
         Match.exhaustive,
@@ -49,6 +50,7 @@ export const make = (
   databaseSchema: DatabaseSchema.AnyWithProps,
   item: FunctionRegistryItem.ConfectFunctionRegistryItem,
   resolvedMiddlewares: ReadonlyArray<ResolvedMiddleware.ResolvedMiddleware> = [],
+  observability?: Layer.Layer<never>,
 ): RegisteredFunction.Any => {
   const genericFunction = Match.value(item.functionVisibility).pipe(
     Match.when("public", () => actionGeneric),
@@ -59,6 +61,7 @@ export const make = (
   return genericFunction(
     nodeActionFunction(databaseSchema, {
       name: item.name,
+      observability,
       functionVisibility: item.functionVisibility,
       args: item.args,
       returns: item.returns,
@@ -86,6 +89,7 @@ const nodeActionFunction = <
     error,
     handler,
     resolvedMiddlewares,
+    observability,
   }: {
     name: string;
     functionVisibility: FunctionVisibility;
@@ -101,6 +105,7 @@ const nodeActionFunction = <
       | NodeServices.NodeServices
     >;
     resolvedMiddlewares: ReadonlyArray<ResolvedMiddleware.ResolvedMiddleware>;
+    observability?: Layer.Layer<never> | undefined;
   },
 ) =>
   RegisteredFunction.actionFunctionBase({
@@ -112,6 +117,7 @@ const nodeActionFunction = <
     error,
     handler,
     resolvedMiddlewares,
+    observability,
     createLayer: (ctx) =>
       Layer.mergeAll(
         RegisteredFunction.actionLayer(databaseSchema, ctx),

package/src/Registry.ts

@@ -1,6 +1,6 @@
 import * as Context from "effect/Context";
 import * as Ref from "effect/Ref";
-import type { RegistryItems } from "./RegistryItems";
+import type { RegistryItems } from "./RegistryItems.js";
 
 /**
  * Effect `Context.Reference` shared by everything that touches a group's

package/src/RegistryItems.ts

@@ -1,8 +1,8 @@
 import * as Array from "effect/Array";
 import { pipe } from "effect/Function";
 import * as Record from "effect/Record";
-import * as FunctionRegistryItem from "./FunctionRegistryItem";
-import * as MiddlewareRegistryItem from "./MiddlewareRegistryItem";
+import * as FunctionRegistryItem from "./FunctionRegistryItem.js";
+import * as MiddlewareRegistryItem from "./MiddlewareRegistryItem.js";
 
 /**
  * Runtime tree that mirrors a `Spec`'s group structure. Values remain unknown
@@ -38,3 +38,34 @@ export const middlewareKeys = (items: RegistryItems): ReadonlyArray<string> =>
     Array.filter(MiddlewareRegistryItem.isMiddlewareRegistryItem),
     Array.map((item) => item.middlewareSpec.key),
   );
+
+export interface MissingMiddleware {
+  readonly functionName: string;
+  readonly middlewareKey: string;
+}
+
+export const missingRequired = (
+  items: RegistryItems,
+  required: ReadonlyArray<{ readonly key: string }>,
+  groupPath = "",
+): ReadonlyArray<MissingMiddleware> =>
+  Object.entries(items)
+    .sort(([left], [right]) => left.localeCompare(right))
+    .flatMap(([functionName, value]) =>
+      FunctionRegistryItem.isFunctionRegistryItem(value)
+        ? required.flatMap(({ key }) =>
+            value._tag === "Confect" &&
+            value.middlewareAttachments.some(({ spec }) => spec.key === key)
+              ? []
+              : [
+                  {
+                    functionName:
+                      groupPath === ""
+                        ? functionName
+                        : `${groupPath}.${functionName}`,
+                    middlewareKey: key,
+                  },
+                ],
+          )
+        : [],
+    );

package/src/ResolvedMiddleware.ts

@@ -1,8 +1,8 @@
 import * as MiddlewareAttachment from "@confect/core/MiddlewareAttachment";
 import type * as MiddlewareSpec from "@confect/core/MiddlewareSpec";
 import * as Result from "effect/Result";
-import type * as FunctionRegistryItem from "./FunctionRegistryItem";
-import type * as MiddlewareRegistryItem from "./MiddlewareRegistryItem";
+import type * as FunctionRegistryItem from "./FunctionRegistryItem.js";
+import type * as MiddlewareRegistryItem from "./MiddlewareRegistryItem.js";
 
 /**
  * A middleware spec paired with its implementation for one function's type—the

package/src/Storage.ts

@@ -3,9 +3,9 @@ import type { GenericId } from "convex/values";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { StorageActionWriter } from "./StorageActionWriter";
-import { StorageReader } from "./StorageReader";
-import { StorageWriter } from "./StorageWriter";
+import { StorageActionWriter } from "./StorageActionWriter.js";
+import { StorageReader } from "./StorageReader.js";
+import { StorageWriter } from "./StorageWriter.js";
 
 const make = Effect.gen(function* () {
   const reader = yield* StorageReader;

package/src/StorageActionWriter.ts

@@ -6,7 +6,7 @@ import { flow } from "effect/Function";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import { BlobNotFoundError } from "./BlobNotFoundError";
+import { BlobNotFoundError } from "./BlobNotFoundError.js";
 import type * as ScopedId from "@confect/core/GenericId";
 
 export type Service<Scope extends IdScope.IdScope = IdScope.App> = {

package/src/StorageReader.ts

@@ -7,7 +7,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
-import { BlobNotFoundError } from "./BlobNotFoundError";
+import { BlobNotFoundError } from "./BlobNotFoundError.js";
 import type * as ScopedId from "@confect/core/GenericId";
 
 export type Service<Scope extends IdScope.IdScope = IdScope.App> = {

package/src/StorageWriter.ts

@@ -6,7 +6,7 @@ import { pipe } from "effect/Function";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import { BlobNotFoundError } from "./BlobNotFoundError";
+import { BlobNotFoundError } from "./BlobNotFoundError.js";
 import type * as ScopedId from "@confect/core/GenericId";
 
 export type Service<Scope extends IdScope.IdScope = IdScope.App> = {

package/src/TableInfo.ts

@@ -12,8 +12,8 @@ import type {
 import type { GenericValidator } from "convex/values";
 import type { Schema, Types } from "effect";
 import type { WithSystemFields } from "@confect/core/SystemFields";
-import type * as Document_ from "./Document";
-import type * as Table from "./Table";
+import type * as Document_ from "./Document.js";
+import type * as Table from "./Table.js";
 
 export declare const TypeId: "~@confect/server/TableInfo";
 export type TypeId = typeof TypeId;

package/src/VectorSearch.ts

@@ -8,7 +8,7 @@ import type {
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import type * as DataModel from "./DataModel";
+import type * as DataModel from "./DataModel.js";
 
 type ConvexVectorSearch<DataModel_ extends DataModel.AnyWithProps> =
   GenericActionCtx<DataModel.ToConvex<DataModel_>>["vectorSearch"];

package/src/index.ts

@@ -1,87 +1,89 @@
-export * as AiGatewayDecisionClient from "./AiGatewayDecisionClient";
-export * as AiGatewayDecisionModel from "./AiGatewayDecisionModel";
-export * as AiGatewayLanguageClient from "./AiGatewayLanguageClient";
-export * as AiGatewayLanguageModel from "./AiGatewayLanguageModel";
-export * as ActionCtx from "./ActionCtx";
-export * as ActionRunner from "./ActionRunner";
-export * as Auth from "./Auth";
-export * as BlobNotFoundError from "./BlobNotFoundError";
-export * as Callback from "./Callback";
-export * as ConvexConfigProvider from "./ConvexConfigProvider";
-export * as ConvexFunctionDefinitions from "./ConvexFunctionDefinitions";
-export * as ConvexLogger from "./ConvexLogger";
-export * as CronJob from "./CronJob";
-export * as CronJobs from "./CronJobs";
-export * as DatabaseReader from "./DatabaseReader";
-export * as DatabaseSchema from "./DatabaseSchema";
-export * as DatabaseWriter from "./DatabaseWriter";
-export * as DataModel from "./DataModel";
-export * as Document from "./Document";
-export * as ExecutionMetadata from "./ExecutionMetadata";
-export * as FunctionImpl from "./FunctionImpl";
-export * as FunctionRegistryItem from "./FunctionRegistryItem";
-export * as GroupImpl from "./GroupImpl";
-export * as Handler from "./Handler";
-export * as HttpRouter from "./HttpRouter";
-export * as MiddlewareImpl from "./MiddlewareImpl";
-export * as MiddlewareRegistryItem from "./MiddlewareRegistryItem";
-export * as MutationCtx from "./MutationCtx";
-export * as MutationRunner from "./MutationRunner";
-export * as MutationTransactionContext from "./MutationTransactionContext";
-export * as OrderedQuery from "./OrderedQuery";
-export * as QueryCtx from "./QueryCtx";
-export * as QueryInitializer from "./QueryInitializer";
-export * as QueryRunner from "./QueryRunner";
-export * as QueryTransactionContext from "./QueryTransactionContext";
+export * as ActionCall from "./ActionCall.js";
+export * as AiGatewayDecisionClient from "./AiGatewayDecisionClient.js";
+export * as AiGatewayDecisionModel from "./AiGatewayDecisionModel.js";
+export * as AiGatewayLanguageClient from "./AiGatewayLanguageClient.js";
+export * as AiGatewayLanguageModel from "./AiGatewayLanguageModel.js";
+export * as ActionCtx from "./ActionCtx.js";
+export * as ActionRunner from "./ActionRunner.js";
+export * as Auth from "./Auth.js";
+export * as BlobNotFoundError from "./BlobNotFoundError.js";
+export * as Callback from "./Callback.js";
+export * as ConvexConfigProvider from "./ConvexConfigProvider.js";
+export * as ConvexFunctionDefinitions from "./ConvexFunctionDefinitions.js";
+export * as ConvexLogger from "./ConvexLogger.js";
+export * as CronJob from "./CronJob.js";
+export * as CronJobs from "./CronJobs.js";
+export * as DatabaseReader from "./DatabaseReader.js";
+export * as DatabaseSchema from "./DatabaseSchema.js";
+export * as DatabaseWriter from "./DatabaseWriter.js";
+export * as DataModel from "./DataModel.js";
+export * as Document from "./Document.js";
+export * as ExecutionMetadata from "./ExecutionMetadata.js";
+export * as FunctionImpl from "./FunctionImpl.js";
+export * as FunctionRegistryItem from "./FunctionRegistryItem.js";
+export * as GroupImpl from "./GroupImpl.js";
+export * as Handler from "./Handler.js";
+export * as HttpRouter from "./HttpRouter.js";
+export * as MiddlewareImpl from "./MiddlewareImpl.js";
+export * as MiddlewareRegistryItem from "./MiddlewareRegistryItem.js";
+export * as MutationCtx from "./MutationCtx.js";
+export * as MutationRunner from "./MutationRunner.js";
+export * as MutationTransactionContext from "./MutationTransactionContext.js";
+export * as OfficialComponent from "./OfficialComponent.js";
+export * as OrderedQuery from "./OrderedQuery.js";
+export * as QueryCtx from "./QueryCtx.js";
+export * as QueryInitializer from "./QueryInitializer.js";
+export * as QueryRunner from "./QueryRunner.js";
+export * as QueryTransactionContext from "./QueryTransactionContext.js";
 /**
  * @experimental
  */
-export * as QueryStream from "./QueryStream";
+export * as QueryStream from "./QueryStream.js";
 /**
  * @experimental
  */
-export * as QueryStreamCursor from "./QueryStreamCursor";
+export * as QueryStreamCursor from "./QueryStreamCursor.js";
 /**
  * @experimental
  */
-export * as QueryStreamKeyLabels from "./QueryStreamKeyLabels";
+export * as QueryStreamKeyLabels from "./QueryStreamKeyLabels.js";
 /**
  * @experimental
  */
-export * as QueryStreamKeyLayout from "./QueryStreamKeyLayout";
+export * as QueryStreamKeyLayout from "./QueryStreamKeyLayout.js";
 /**
  * @experimental
  */
-export * as QueryStreamOrderDirection from "./QueryStreamOrderDirection";
+export * as QueryStreamOrderDirection from "./QueryStreamOrderDirection.js";
 /**
  * @experimental
  */
-export * as QueryStreamKeyValues from "./QueryStreamKeyValues";
+export * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
 /**
  * @experimental
  */
-export * as QueryStreamKeyBounds from "./QueryStreamKeyBounds";
+export * as QueryStreamKeyBounds from "./QueryStreamKeyBounds.js";
 /**
  * @experimental
  */
-export * as QueryStreamIndexRange from "./QueryStreamIndexRange";
+export * as QueryStreamIndexRange from "./QueryStreamIndexRange.js";
 /**
  * @experimental
  */
-export * as QueryStreamReadBudget from "./QueryStreamReadBudget";
-export * as RegisteredConvexFunction from "./RegisteredConvexFunction";
-export * as RegisteredFunction from "./RegisteredFunction";
-export * as RegisteredFunctions from "./RegisteredFunctions";
-export * as Registry from "./Registry";
-export * as RegistryItems from "./RegistryItems";
-export * as ResolvedMiddleware from "./ResolvedMiddleware";
-export * as RequestMetadata from "./RequestMetadata";
-export * as Scheduler from "./Scheduler";
-export * as Storage from "./Storage";
-export * as StorageActionWriter from "./StorageActionWriter";
-export * as StorageReader from "./StorageReader";
-export * as StorageWriter from "./StorageWriter";
-export * as Table from "./Table";
-export * as TableInfo from "./TableInfo";
-export * as TransactionMetadata from "./TransactionMetadata";
-export * as VectorSearch from "./VectorSearch";
+export * as QueryStreamReadBudget from "./QueryStreamReadBudget.js";
+export * as RegisteredConvexFunction from "./RegisteredConvexFunction.js";
+export * as RegisteredFunction from "./RegisteredFunction.js";
+export * as RegisteredFunctions from "./RegisteredFunctions.js";
+export * as Registry from "./Registry.js";
+export * as RegistryItems from "./RegistryItems.js";
+export * as ResolvedMiddleware from "./ResolvedMiddleware.js";
+export * as RequestMetadata from "./RequestMetadata.js";
+export * as Scheduler from "./Scheduler.js";
+export * as Storage from "./Storage.js";
+export * as StorageActionWriter from "./StorageActionWriter.js";
+export * as StorageReader from "./StorageReader.js";
+export * as StorageWriter from "./StorageWriter.js";
+export * as Table from "./Table.js";
+export * as TableInfo from "./TableInfo.js";
+export * as TransactionMetadata from "./TransactionMetadata.js";
+export * as VectorSearch from "./VectorSearch.js";

package/src/internal/AiGatewayDecisionClient.ts

@@ -1,8 +1,8 @@
 import * as OpenRouterClient from "@effect/ai-openrouter/OpenRouterClient";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as AiGatewayServiceToken from "./AiGatewayServiceToken";
-import { AI_GATEWAY_API_URL } from "./constants";
+import * as AiGatewayServiceToken from "./AiGatewayServiceToken.js";
+import { AI_GATEWAY_API_URL } from "./constants.js";
 
 export const make = Effect.gen(function* () {
   const serviceToken = yield* AiGatewayServiceToken.AiGatewayServiceToken;

package/src/internal/AiGatewayLanguageClient.ts

@@ -1,8 +1,8 @@
 import * as OpenAiClient from "@effect/ai-openai-compat/OpenAiClient";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as AiGatewayServiceToken from "./AiGatewayServiceToken";
-import { AI_GATEWAY_API_URL } from "./constants";
+import * as AiGatewayServiceToken from "./AiGatewayServiceToken.js";
+import { AI_GATEWAY_API_URL } from "./constants.js";
 
 export const make = Effect.gen(function* () {
   const serviceToken = yield* AiGatewayServiceToken.AiGatewayServiceToken;

package/src/internal/DocumentPatch.ts

@@ -0,0 +1,87 @@
+import type { ReadonlyValue } from "@confect/core/SchemaToValidator";
+import { pipe } from "effect/Function";
+import * as Effect from "effect/Effect";
+import * as Record from "effect/Record";
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
+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>;
+
+const patchEncoders = new WeakMap<Table.AnyWithProps, PatchEncoder | null>();
+
+/**
+ * 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 const encoder = (
+  table: Table.AnyWithProps,
+): PatchEncoder | undefined => {
+  let cached = patchEncoders.get(table);
+  if (cached === undefined) {
+    cached = makePatchEncoder(table);
+    patchEncoders.set(table, cached);
+  }
+  return cached ?? undefined;
+};
+
+// A struct with no encoding of its own encodes each field through that field's
+// codec alone, so a patch encodes field by field. A union or a transformation
+// over the whole struct can make one field's encoding depend on another field.
+// A struct-level check must see the decoded fields before they are encoded,
+// and keys under an index signature have no field codec of their own.
+const makePatchEncoder = (table: Table.AnyWithProps): PatchEncoder | null => {
+  const ast = table.Fields.ast;
+  if (
+    !SchemaAST.isObjects(ast) ||
+    ast.encoding !== undefined ||
+    ast.checks !== undefined ||
+    ast.indexSignatures.length > 0
+  ) {
+    return null;
+  }
+  // A field's codec runs only when the patch gives the field a value, since a
+  // codec can handle a missing key. Each comes from the table, whose codecs
+  // need no services.
+  const fieldEncoders: Record.ReadonlyRecord<
+    string,
+    (
+      value: unknown,
+    ) => Effect.Effect<ReadonlyValue | undefined, Schema.SchemaError>
+  > = Object.fromEntries(
+    ast.propertySignatures.map(({ name, type }) => {
+      const key = String(name);
+      const encode = Schema.encodeUnknownEffect(
+        Schema.Struct({
+          [key]: Schema.optionalKey(
+            Schema.make<Schema.Codec<unknown, ReadonlyValue>>(type),
+          ),
+        }),
+      );
+      return [
+        key,
+        (value: unknown) =>
+          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] === undefined ? Effect.undefined : encode(patch[name]),
+      ),
+      Effect.all,
+    );
+};

package/src/internal/observability.ts

@@ -0,0 +1,27 @@
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Layer from "effect/Layer";
+import * as Scope from "effect/Scope";
+import * as ConvexConfigProvider from "../ConvexConfigProvider.js";
+
+const memoMap = Layer.makeMemoMapUnsafe();
+export const scope = Scope.makeUnsafe();
+const layers = new WeakMap<Layer.Layer<never>, Layer.Layer<never>>();
+
+export const memoized = (layer: Layer.Layer<never>): Layer.Layer<never> => {
+  const cached = layers.get(layer);
+  if (cached !== undefined) return cached;
+  const built = Layer.buildWithMemoMap(layer, memoMap, scope).pipe(
+    Effect.provide(ConvexConfigProvider.layer),
+    // A failed first build is retried on the next invocation instead of failing every later one.
+    Effect.cachedWithTTL((exit) =>
+      Exit.isSuccess(exit) ? Duration.infinity : Duration.zero,
+    ),
+    Effect.runSync,
+    Effect.uninterruptible,
+    Layer.effectContext,
+  );
+  layers.set(layer, built);
+  return built;
+};

package/src/node.ts

@@ -1 +1 @@
-export * as RegisteredNodeFunction from "./RegisteredNodeFunction";
+export * as RegisteredNodeFunction from "./RegisteredNodeFunction.js";