@gaganref/confect-server 10.3.1-fork.26 → 10.3.1-fork.27

package/dist/index.js

@@ -1,5 +1,14 @@
 import { ActionCtx_exports } from "./ActionCtx.js";
 import { ActionRunner_exports } from "./ActionRunner.js";
+import { Registry_exports } from "./Registry.js";
+import { MiddlewareRegistryItem_exports } from "./MiddlewareRegistryItem.js";
+import { MiddlewareImpl_exports } from "./MiddlewareImpl.js";
+import { MutationTransactionContext_exports } from "./MutationTransactionContext.js";
+import { MutationRunner_exports } from "./MutationRunner.js";
+import { QueryTransactionContext_exports } from "./QueryTransactionContext.js";
+import { QueryRunner_exports } from "./QueryRunner.js";
+import { Scheduler_exports } from "./Scheduler.js";
+import { ActionCall_exports } from "./ActionCall.js";
 import { AiGatewayDecisionClient_exports } from "./AiGatewayDecisionClient.js";
 import { AiGatewayDecisionModel_exports } from "./AiGatewayDecisionModel.js";
 import { AiGatewayLanguageClient_exports } from "./AiGatewayLanguageClient.js";
@@ -8,8 +17,6 @@ import { Auth_exports } from "./Auth.js";
 import { BlobNotFoundError_exports } from "./BlobNotFoundError.js";
 import { Callback_exports } from "./Callback.js";
 import { ConvexConfigProvider_exports } from "./ConvexConfigProvider.js";
-import { Registry_exports } from "./Registry.js";
-import { MiddlewareRegistryItem_exports } from "./MiddlewareRegistryItem.js";
 import { FunctionRegistryItem_exports } from "./FunctionRegistryItem.js";
 import { DatabaseSchema_exports } from "./DatabaseSchema.js";
 import { Document_exports } from "./Document.js";
@@ -31,13 +38,8 @@ import { ExecutionMetadata_exports } from "./ExecutionMetadata.js";
 import { RequestMetadata_exports } from "./RequestMetadata.js";
 import { TransactionMetadata_exports } from "./TransactionMetadata.js";
 import { MutationCtx_exports } from "./MutationCtx.js";
-import { MutationTransactionContext_exports } from "./MutationTransactionContext.js";
-import { MutationRunner_exports } from "./MutationRunner.js";
 import { QueryCtx_exports } from "./QueryCtx.js";
-import { QueryTransactionContext_exports } from "./QueryTransactionContext.js";
-import { QueryRunner_exports } from "./QueryRunner.js";
 import { ConvexLogger_exports } from "./ConvexLogger.js";
-import { Scheduler_exports } from "./Scheduler.js";
 import { StorageActionWriter_exports } from "./StorageActionWriter.js";
 import { StorageReader_exports } from "./StorageReader.js";
 import { StorageWriter_exports } from "./StorageWriter.js";
@@ -55,8 +57,7 @@ import { RegistryItems_exports } from "./RegistryItems.js";
 import { GroupImpl_exports } from "./GroupImpl.js";
 import { Handler_exports } from "./Handler.js";
 import { HttpRouter_exports } from "./HttpRouter.js";
-import { MiddlewareImpl_exports } from "./MiddlewareImpl.js";
 import { OfficialComponent_exports } from "./OfficialComponent.js";
 import { RegisteredFunctions_exports } from "./RegisteredFunctions.js";
 import { TableInfo_exports } from "./TableInfo.js";
-export { ActionCtx_exports as ActionCtx, ActionRunner_exports as ActionRunner, AiGatewayDecisionClient_exports as AiGatewayDecisionClient, AiGatewayDecisionModel_exports as AiGatewayDecisionModel, AiGatewayLanguageClient_exports as AiGatewayLanguageClient, AiGatewayLanguageModel_exports as AiGatewayLanguageModel, Auth_exports as Auth, BlobNotFoundError_exports as BlobNotFoundError, Callback_exports as Callback, ConvexConfigProvider_exports as ConvexConfigProvider, ConvexFunctionDefinitions_exports as ConvexFunctionDefinitions, ConvexLogger_exports as ConvexLogger, CronJob_exports as CronJob, CronJobs_exports as CronJobs, DataModel_exports as DataModel, DatabaseReader_exports as DatabaseReader, DatabaseSchema_exports as DatabaseSchema, DatabaseWriter_exports as DatabaseWriter, Document_exports as Document, ExecutionMetadata_exports as ExecutionMetadata, FunctionImpl_exports as FunctionImpl, FunctionRegistryItem_exports as FunctionRegistryItem, GroupImpl_exports as GroupImpl, Handler_exports as Handler, HttpRouter_exports as HttpRouter, MiddlewareImpl_exports as MiddlewareImpl, MiddlewareRegistryItem_exports as MiddlewareRegistryItem, MutationCtx_exports as MutationCtx, MutationRunner_exports as MutationRunner, MutationTransactionContext_exports as MutationTransactionContext, OfficialComponent_exports as OfficialComponent, OrderedQuery_exports as OrderedQuery, QueryCtx_exports as QueryCtx, QueryInitializer_exports as QueryInitializer, QueryRunner_exports as QueryRunner, QueryStream_exports as QueryStream, QueryStreamCursor_exports as QueryStreamCursor, QueryStreamIndexRange_exports as QueryStreamIndexRange, QueryStreamKeyBounds_exports as QueryStreamKeyBounds, QueryStreamKeyLabels_exports as QueryStreamKeyLabels, QueryStreamKeyLayout_exports as QueryStreamKeyLayout, QueryStreamKeyValues_exports as QueryStreamKeyValues, QueryStreamOrderDirection_exports as QueryStreamOrderDirection, QueryStreamReadBudget_exports as QueryStreamReadBudget, QueryTransactionContext_exports as QueryTransactionContext, RegisteredConvexFunction_exports as RegisteredConvexFunction, RegisteredFunction_exports as RegisteredFunction, RegisteredFunctions_exports as RegisteredFunctions, Registry_exports as Registry, RegistryItems_exports as RegistryItems, RequestMetadata_exports as RequestMetadata, ResolvedMiddleware_exports as ResolvedMiddleware, Scheduler_exports as Scheduler, Storage_exports as Storage, StorageActionWriter_exports as StorageActionWriter, StorageReader_exports as StorageReader, StorageWriter_exports as StorageWriter, Table_exports as Table, TableInfo_exports as TableInfo, TransactionMetadata_exports as TransactionMetadata, VectorSearch_exports as VectorSearch };
+export { ActionCall_exports as ActionCall, ActionCtx_exports as ActionCtx, ActionRunner_exports as ActionRunner, AiGatewayDecisionClient_exports as AiGatewayDecisionClient, AiGatewayDecisionModel_exports as AiGatewayDecisionModel, AiGatewayLanguageClient_exports as AiGatewayLanguageClient, AiGatewayLanguageModel_exports as AiGatewayLanguageModel, Auth_exports as Auth, BlobNotFoundError_exports as BlobNotFoundError, Callback_exports as Callback, ConvexConfigProvider_exports as ConvexConfigProvider, ConvexFunctionDefinitions_exports as ConvexFunctionDefinitions, ConvexLogger_exports as ConvexLogger, CronJob_exports as CronJob, CronJobs_exports as CronJobs, DataModel_exports as DataModel, DatabaseReader_exports as DatabaseReader, DatabaseSchema_exports as DatabaseSchema, DatabaseWriter_exports as DatabaseWriter, Document_exports as Document, ExecutionMetadata_exports as ExecutionMetadata, FunctionImpl_exports as FunctionImpl, FunctionRegistryItem_exports as FunctionRegistryItem, GroupImpl_exports as GroupImpl, Handler_exports as Handler, HttpRouter_exports as HttpRouter, MiddlewareImpl_exports as MiddlewareImpl, MiddlewareRegistryItem_exports as MiddlewareRegistryItem, MutationCtx_exports as MutationCtx, MutationRunner_exports as MutationRunner, MutationTransactionContext_exports as MutationTransactionContext, OfficialComponent_exports as OfficialComponent, OrderedQuery_exports as OrderedQuery, QueryCtx_exports as QueryCtx, QueryInitializer_exports as QueryInitializer, QueryRunner_exports as QueryRunner, QueryStream_exports as QueryStream, QueryStreamCursor_exports as QueryStreamCursor, QueryStreamIndexRange_exports as QueryStreamIndexRange, QueryStreamKeyBounds_exports as QueryStreamKeyBounds, QueryStreamKeyLabels_exports as QueryStreamKeyLabels, QueryStreamKeyLayout_exports as QueryStreamKeyLayout, QueryStreamKeyValues_exports as QueryStreamKeyValues, QueryStreamOrderDirection_exports as QueryStreamOrderDirection, QueryStreamReadBudget_exports as QueryStreamReadBudget, QueryTransactionContext_exports as QueryTransactionContext, RegisteredConvexFunction_exports as RegisteredConvexFunction, RegisteredFunction_exports as RegisteredFunction, RegisteredFunctions_exports as RegisteredFunctions, Registry_exports as Registry, RegistryItems_exports as RegistryItems, RequestMetadata_exports as RequestMetadata, ResolvedMiddleware_exports as ResolvedMiddleware, Scheduler_exports as Scheduler, Storage_exports as Storage, StorageActionWriter_exports as StorageActionWriter, StorageReader_exports as StorageReader, StorageWriter_exports as StorageWriter, Table_exports as Table, TableInfo_exports as TableInfo, TransactionMetadata_exports as TransactionMetadata, VectorSearch_exports as VectorSearch };

package/dist/internal/AiGatewayDecisionClient.js

@@ -1,7 +1,7 @@
 import { AiGatewayServiceToken, transformClientRequest } from "./AiGatewayServiceToken.js";
 import { AI_GATEWAY_API_URL } from "./constants.js";
-import * as Layer from "effect/Layer";
 import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import * as OpenRouterClient from "@effect/ai-openrouter/OpenRouterClient";
 //#region src/internal/AiGatewayDecisionClient.ts
 const make = Effect.gen(function* () {

package/dist/internal/AiGatewayLanguageClient.js

@@ -1,7 +1,7 @@
 import { AiGatewayServiceToken, transformClientRequest } from "./AiGatewayServiceToken.js";
 import { AI_GATEWAY_API_URL } from "./constants.js";
-import * as Layer from "effect/Layer";
 import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import * as OpenAiClient from "@effect/ai-openai-compat/OpenAiClient";
 //#region src/internal/AiGatewayLanguageClient.ts
 const make = Effect.gen(function* () {

package/dist/internal/AiGatewayServiceToken.js

@@ -1,6 +1,6 @@
 import * as Context from "effect/Context";
-import * as Layer from "effect/Layer";
 import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import { getServiceToken } from "convex/server";
 import * as Schema from "effect/Schema";
 import * as HttpClient from "effect/http/HttpClient";

package/dist/internal/DocumentPatch.js

@@ -1,8 +1,8 @@
 import * as Effect from "effect/Effect";
+import * as Record from "effect/Record";
 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();
 /**

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@gaganref/confect-server",
-  "version": "10.3.1-fork.26",
+  "version": "10.3.1-fork.27",
   "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.26",
+    "@confect/core": "npm:@gaganref/confect-core@10.3.1-fork.27",
     "@effect/platform-node": "^4.0.0",
     "convex": "^1.45.0",
     "effect": "^4.0.4"

package/src/ActionCall.ts

@@ -0,0 +1,82 @@
+import * as ActionCall from "@confect/core/ActionCall";
+import * as Ref from "@confect/core/Ref";
+import type { FunctionReference } from "convex/server";
+import * as Context from "effect/Context";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as ActionCtx from "./ActionCtx.js";
+import * as ActionRunner from "./ActionRunner.js";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DataModel from "./DataModel.js";
+import type * as Handler from "./Handler.js";
+import * as MiddlewareImpl from "./MiddlewareImpl.js";
+import * as MutationRunner from "./MutationRunner.js";
+import * as QueryRunner from "./QueryRunner.js";
+import * as Scheduler from "./Scheduler.js";
+
+export class ActionCallAlreadyUsed extends Data.TaggedError(
+  "ActionCallAlreadyUsed",
+)<{}> {}
+export class ActionCallNotUsed extends Data.TaggedError(
+  "ActionCallNotUsed",
+)<{}> {}
+export class MissingFunctionType extends Data.TaggedError(
+  "MissingFunctionType",
+)<{}> {}
+export class NestedActionNotAllowed extends Data.TaggedError(
+  "NestedActionNotAllowed",
+)<{}> {}
+
+export class SchedulingNotAllowed extends Data.TaggedError(
+  "SchedulingNotAllowed",
+)<{}> {}
+
+export const layer = <S extends DatabaseSchema.AnyWithProps>(schema: S) =>
+  MiddlewareImpl.make(schema, ActionCall.Middleware, (effect) =>
+    Effect.gen(function* () {
+      const ctx = yield* ActionCtx.ActionCtx<
+        DataModel.ToConvex<DataModel.FromSchema<S>>,
+        DatabaseSchema.Scope<S>
+      >();
+      let claimed = false;
+      const call: ActionCall.Call = <
+        Target extends Ref.AnyQuery | Ref.AnyMutation,
+      >(
+        ref: Target,
+        ...args: Ref.OptionalArgs<NoInfer<Target>>
+      ) =>
+        Effect.suspend(() => {
+          if (claimed) return Effect.die(new ActionCallAlreadyUsed());
+          claimed = true;
+          if (ref.functionType !== "query" && ref.functionType !== "mutation")
+            return Effect.die(new MissingFunctionType());
+          return Ref.runWithCodec(
+            ref,
+            (args[0] ?? {}) as Ref.Args<Target>,
+            (native, encoded) =>
+              ref.functionType === "query"
+                ? ctx.runQuery(
+                    native as FunctionReference<"query">,
+                    encoded as never,
+                  )
+                : ctx.runMutation(
+                    native as FunctionReference<"mutation">,
+                    encoded as never,
+                  ),
+          );
+        });
+      return yield* effect.pipe(
+        Effect.provideService(ActionCall.ActionCall, call),
+        Effect.updateContext(
+          (context: Context.Context<Handler.ActionServices<S>>) =>
+            Context.omit(
+              QueryRunner.QueryRunner,
+              MutationRunner.MutationRunner,
+              ActionRunner.ActionRunner,
+              ActionCtx.ActionCtx(),
+              Scheduler.Scheduler,
+            )(context),
+        ),
+      );
+    }),
+  );

package/src/Handler.ts

@@ -1,3 +1,4 @@
+import type { ActionCall } from "@confect/core/ActionCall";
 import type { FunctionSpec, RuntimeAndFunctionType } from "@confect/core";
 import type * as FunctionProvenance from "@confect/core/FunctionProvenance";
 import type * as NodeServices from "@effect/platform-node/NodeServices";
@@ -114,9 +115,7 @@ export type MutationServices<
 /**
  * Shared by both action runtimes.
  */
-export type ActionServices<
-  DatabaseSchema_ extends DatabaseSchema.AnyWithProps,
-> =
+type RawActionServices<DatabaseSchema_ extends DatabaseSchema.AnyWithProps> =
   | Scheduler.ForScope<DatabaseSchema.Scope<DatabaseSchema_>>
   | (DatabaseSchema_["target"]["kind"] extends "component" ? never : Auth.Auth)
   | StorageReader.ForScope<DatabaseSchema.Scope<DatabaseSchema_>>
@@ -134,6 +133,22 @@ export type ActionServices<
       DatabaseSchema.Scope<DatabaseSchema_>
     >;
 
+export type ActionServices<S extends DatabaseSchema.AnyWithProps, R = never> = [
+  Extract<R, ActionCall>,
+] extends [never]
+  ? RawActionServices<S>
+  : Exclude<
+      RawActionServices<S>,
+      | Scheduler.ForScope<DatabaseSchema.Scope<S>>
+      | QueryRunner.QueryRunner
+      | MutationRunner.MutationRunner
+      | ActionRunner.ActionRunner
+      | ActionCtx.ActionCtx<
+          DataModel.ToConvex<DataModel.FromSchema<S>>,
+          DatabaseSchema.Scope<S>
+        >
+    >;
+
 export type ConfectProvenanceQuery<
   DatabaseSchema_ extends DatabaseSchema.AnyWithProps,
   FunctionSpec_ extends
@@ -153,7 +168,7 @@ export type ConvexRuntimeAction<
   FunctionSpec_ extends
     FunctionSpec.AnyWithPropsWithFunctionType<RuntimeAndFunctionType.AnyAction>,
   R = never,
-> = Base<FunctionSpec_, ActionServices<DatabaseSchema_> | R>;
+> = Base<FunctionSpec_, ActionServices<DatabaseSchema_, R> | R>;
 
 export type NodeRuntimeAction<
   DatabaseSchema_ extends DatabaseSchema.AnyWithProps,
@@ -162,7 +177,7 @@ export type NodeRuntimeAction<
   R = never,
 > = Base<
   FunctionSpec_,
-  ActionServices<DatabaseSchema_> | NodeServices.NodeServices | R
+  ActionServices<DatabaseSchema_, R> | NodeServices.NodeServices | R
 >;
 
 type Base<FunctionSpec_ extends FunctionSpec.AnyWithProps, R> = (

package/src/RegisteredFunction.ts

@@ -1,3 +1,5 @@
+import * as ActionCallSpec from "@confect/core/ActionCall";
+import * as ActionCall from "./ActionCall.js";
 import type { FunctionSpec, RuntimeAndFunctionType } from "@confect/core";
 import * as IdScope from "@confect/core/IdScope";
 import type * as FunctionProvenance from "@confect/core/FunctionProvenance";
@@ -299,6 +301,12 @@ export const actionFunctionBase = <
         Schema.decodeUnknownEffect(args),
         Effect.catchTag("SchemaError", Effect.die),
       );
+      const restricted = resolvedMiddlewares.some(
+        ({ middlewareSpec }) =>
+          middlewareSpec.key === ActionCallSpec.Middleware.key,
+      )
+        ? restrict(ctx)
+        : undefined;
       // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context -- Middleware errors are intentionally erased here and validated by runHandlerPromise against the combined error schema below.
       const decodedReturns = yield* applyMiddleware(
         handler(decodedArgs),
@@ -309,7 +317,8 @@ export const actionFunctionBase = <
           functionVisibility,
           args: decodedArgs,
         },
-      ).pipe(Effect.provide(createLayer(ctx)));
+      ).pipe(Effect.provide(createLayer(restricted?.ctx ?? ctx)));
+      if (restricted !== undefined) yield* restricted.check;
       return yield* pipe(
         decodedReturns,
         Schema.encodeEffect(returns),
@@ -389,3 +398,47 @@ export const storageLayer = <Scope extends IdScope.IdScope>(
   Storage.layer(reader) as Layer.Layer<
     Storage.Storage | StorageReader.ForScope<Scope>
   >;
+
+/**
+ * Shares one dispatch budget across the entire middleware chain.
+ */
+const restrict = <Model extends GenericDataModel>(
+  ctx: GenericActionCtx<Model>,
+) => {
+  let dispatched = false;
+  const claim = () => {
+    if (dispatched) throw new ActionCall.ActionCallAlreadyUsed();
+    dispatched = true;
+  };
+  const restricted: GenericActionCtx<Model> = {
+    ...ctx,
+    scheduler: {
+      runAfter: () => {
+        throw new ActionCall.SchedulingNotAllowed();
+      },
+      runAt: () => {
+        throw new ActionCall.SchedulingNotAllowed();
+      },
+      cancel: () => {
+        throw new ActionCall.SchedulingNotAllowed();
+      },
+    },
+    runQuery: (...args) => {
+      claim();
+      return ctx.runQuery(...args);
+    },
+    runMutation: (...args) => {
+      claim();
+      return ctx.runMutation(...args);
+    },
+    runAction: () => {
+      throw new ActionCall.NestedActionNotAllowed();
+    },
+  };
+  return {
+    ctx: restricted,
+    check: Effect.suspend(() =>
+      dispatched ? Effect.void : Effect.die(new ActionCall.ActionCallNotUsed()),
+    ),
+  };
+};

package/src/index.ts

@@ -1,3 +1,4 @@
+export * as ActionCall from "./ActionCall.js";
 export * as AiGatewayDecisionClient from "./AiGatewayDecisionClient.js";
 export * as AiGatewayDecisionModel from "./AiGatewayDecisionModel.js";
 export * as AiGatewayLanguageClient from "./AiGatewayLanguageClient.js";