@gaganref/confect-server 10.3.1-fork.3 → 10.3.1-fork.31

package/src/QueryStreamCursor.ts

@@ -1,12 +1,12 @@
 import * as Array from "effect/Array";
 import * as Effect from "effect/Effect";
-import * as QueryStreamKey from "./QueryStreamKey";
+import * as QueryStreamKey from "./QueryStreamKey.js";
 import * as SchemaIssue from "effect/SchemaIssue";
 import * as Match from "effect/Match";
 import * as Schema from "effect/Schema";
 import * as SchemaGetter from "effect/SchemaGetter";
-import * as QueryStreamKeyLayout from "./QueryStreamKeyLayout";
-import * as QueryStreamKeyValues from "./QueryStreamKeyValues";
+import * as QueryStreamKeyLayout from "./QueryStreamKeyLayout.js";
+import * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
 
 // Serialized labels are a cursor boundary representation. They include every
 // runtime position but do not preserve implicitness.

package/src/QueryStreamIndexPrefix.ts

@@ -1,8 +1,8 @@
 import * as Array from "effect/Array";
 import * as Data from "effect/Data";
 import * as Result from "effect/Result";
-import type * as QueryStreamKey from "./QueryStreamKey";
-import type * as QueryStreamKeyValues from "./QueryStreamKeyValues";
+import type * as QueryStreamKey from "./QueryStreamKey.js";
+import type * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
 
 const TypeId = "~@confect/server/QueryStreamIndexPrefix";
 

package/src/QueryStreamIndexRange.ts

@@ -11,10 +11,10 @@ import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as Result from "effect/Result";
 import type * as Types from "effect/Types";
-import * as QueryStreamIndexPrefix from "./QueryStreamIndexPrefix";
-import * as QueryStreamKeyBounds from "./QueryStreamKeyBounds";
-import * as QueryStreamKeyValues from "./QueryStreamKeyValues";
-import type * as QueryStreamOrderDirection from "./QueryStreamOrderDirection";
+import * as QueryStreamIndexPrefix from "./QueryStreamIndexPrefix.js";
+import * as QueryStreamKeyBounds from "./QueryStreamKeyBounds.js";
+import * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
+import type * as QueryStreamOrderDirection from "./QueryStreamOrderDirection.js";
 
 type Head<FieldPaths extends ReadonlyArray<string>> =
   FieldPaths extends readonly [infer H extends string, ...ReadonlyArray<string>]

package/src/QueryStreamKey.ts

@@ -1,8 +1,8 @@
 import * as Data from "effect/Data";
 import * as Predicate from "effect/Predicate";
 import * as Result from "effect/Result";
-import * as QueryStreamKeyLayout from "./QueryStreamKeyLayout";
-import type * as QueryStreamKeyValues from "./QueryStreamKeyValues";
+import * as QueryStreamKeyLayout from "./QueryStreamKeyLayout.js";
+import type * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
 
 const TypeId = "~@confect/server/QueryStreamKey";
 

package/src/QueryStreamKeyBounds.ts

@@ -3,9 +3,9 @@ import * as Data from "effect/Data";
 import * as Option from "effect/Option";
 import * as Order from "effect/Order";
 import * as Result from "effect/Result";
-import * as QueryStreamKey from "./QueryStreamKey";
-import * as QueryStreamKeyLayout from "./QueryStreamKeyLayout";
-import * as QueryStreamKeyValues from "./QueryStreamKeyValues";
+import * as QueryStreamKey from "./QueryStreamKey.js";
+import * as QueryStreamKeyLayout from "./QueryStreamKeyLayout.js";
+import * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
 
 // A bound's key may be a *prefix* of the full key: bounding by `["a"]` means
 // bounding by the whole family of keys that start with `"a"`. To compare

package/src/QueryStreamKeyLayout.ts

@@ -6,7 +6,7 @@ import * as Option from "effect/Option";
 import * as Result from "effect/Result";
 import type * as Types from "effect/Types";
 
-import * as QueryStreamKeyLabels from "./QueryStreamKeyLabels";
+import * as QueryStreamKeyLabels from "./QueryStreamKeyLabels.js";
 
 /**
  * One runtime position of a stream key. Explicit IDs and their aliases are

package/src/QueryStreamKeyValues.ts

@@ -12,7 +12,7 @@ import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as SchemaGetter from "effect/SchemaGetter";
 import * as SchemaIssue from "effect/SchemaIssue";
-import type * as QueryStreamOrderDirection from "./QueryStreamOrderDirection";
+import type * as QueryStreamOrderDirection from "./QueryStreamOrderDirection.js";
 
 const UNDEFINED_SENTINEL = { $undefined: true } as const;
 const KeyValue = Schema.Json.pipe(

package/src/QueryStreamPagination.ts

@@ -4,8 +4,8 @@ import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
-import type * as QueryStreamKey from "./QueryStreamKey";
-import * as QueryStreamKeyValues from "./QueryStreamKeyValues";
+import type * as QueryStreamKey from "./QueryStreamKey.js";
+import * as QueryStreamKeyValues from "./QueryStreamKeyValues.js";
 
 const PageSize = Schema.Natural.pipe(
   Schema.brand("~@confect/server/QueryStreamPagination/PageSize"),

package/src/QueryStreamReadBudget.ts

@@ -22,8 +22,9 @@ export interface QueryStreamReadBudget {
   readonly getReadCounts: Effect.Effect<ReadCounts>;
   /**
    * Returns a stream that records reads against this budget and stops
-   * requesting further batches once exhausted. Apply directly to the document
-   * source before buffering, filtering, or combining its output.
+   * requesting further batches once exhausted, except for one limit-boundary
+   * lookahead to detect completion. Apply directly to the document source
+   * before buffering, filtering, or combining its output.
    */
   readonly accountFor: (
     encodedDocuments: Stream.Stream<unknown>,
@@ -133,10 +134,22 @@ export const make = Effect.fnUntraced(function* (
         SynchronizedRef.modifyEffect(stateRef, (state) =>
           Effect.gen(function* () {
             if (isExhausted(state, limits)) {
-              return Tuple.make(
-                Option.none(),
-                State.Stopped(readCounts(state)),
-              );
+              const canProbeEnd =
+                State.$is("Active")(state) &&
+                !Option.exists(
+                  limits.maximumRowsRead,
+                  (limit) => state.rowsRead > limit,
+                ) &&
+                !Option.exists(
+                  limits.maximumBytesRead,
+                  (limit) => state.bytesRead > limit,
+                );
+              // Iterators expose completion only through a pull. Count a
+              // lookahead row, but never publish it beyond either limit.
+              const counts = canProbeEnd
+                ? record(state, yield* pull)
+                : readCounts(state);
+              return Tuple.make(Option.none(), State.Stopped(counts));
             }
             const documents = yield* pull;
             return Tuple.make(

package/src/RegisteredConvexFunction.ts

@@ -24,27 +24,27 @@ import * as Layer from "effect/Layer";
 import * as Match from "effect/Match";
 import * as Schema from "effect/Schema";
 import * as EffectScheduler from "effect/Scheduler";
-import * as Auth from "./Auth";
-import * as ConvexConfigProvider from "./ConvexConfigProvider";
-import * as DatabaseReader from "./DatabaseReader";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import * as DatabaseWriter from "./DatabaseWriter";
-import type * as DataModel from "./DataModel";
-import * as ExecutionMetadata from "./ExecutionMetadata";
-import * as RequestMetadata from "./RequestMetadata";
-import * as TransactionMetadata from "./TransactionMetadata";
-import * as MutationCtx from "./MutationCtx";
-import * as MutationRunner from "./MutationRunner";
-import * as MutationTransactionContext from "./MutationTransactionContext";
-import * as QueryCtx from "./QueryCtx";
-import * as QueryRunner from "./QueryRunner";
-import * as QueryTransactionContext from "./QueryTransactionContext";
-import * as RegisteredFunction from "./RegisteredFunction";
-import type * as FunctionRegistryItem from "./FunctionRegistryItem";
-import type * as ResolvedMiddleware from "./ResolvedMiddleware";
-import * as Scheduler from "./Scheduler";
-import { StorageWriter } from "./StorageWriter";
-import type * as Handler from "./Handler";
+import * as Auth from "./Auth.js";
+import * as ConvexConfigProvider from "./ConvexConfigProvider.js";
+import * as DatabaseReader from "./DatabaseReader.js";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import * as DatabaseWriter from "./DatabaseWriter.js";
+import type * as DataModel from "./DataModel.js";
+import * as ExecutionMetadata from "./ExecutionMetadata.js";
+import * as RequestMetadata from "./RequestMetadata.js";
+import * as TransactionMetadata from "./TransactionMetadata.js";
+import * as MutationCtx from "./MutationCtx.js";
+import * as MutationRunner from "./MutationRunner.js";
+import * as MutationTransactionContext from "./MutationTransactionContext.js";
+import * as QueryCtx from "./QueryCtx.js";
+import * as QueryRunner from "./QueryRunner.js";
+import * as QueryTransactionContext from "./QueryTransactionContext.js";
+import * as RegisteredFunction from "./RegisteredFunction.js";
+import type * as FunctionRegistryItem from "./FunctionRegistryItem.js";
+import type * as ResolvedMiddleware from "./ResolvedMiddleware.js";
+import * as Scheduler from "./Scheduler.js";
+import { StorageWriter } from "./StorageWriter.js";
+import type * as Handler from "./Handler.js";
 
 export type Definition = Data.TaggedEnum<{
   PublicQuery: ReturnType<typeof queryFunction>;

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";
@@ -25,24 +27,24 @@ import * as Result from "effect/Result";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
 import type * as EffectScheduler from "effect/Scheduler";
-import * as ActionCtx from "./ActionCtx";
-import * as ActionRunner from "./ActionRunner";
-import * as Auth from "./Auth";
-import * as ConvexLogger from "./ConvexLogger";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as DataModel from "./DataModel";
-import * as ExecutionMetadata from "./ExecutionMetadata";
-import * as RequestMetadata from "./RequestMetadata";
-import * as MutationRunner from "./MutationRunner";
-import * as QueryRunner from "./QueryRunner";
-import type * as ResolvedMiddleware from "./ResolvedMiddleware";
-import * as Scheduler from "./Scheduler";
-import * as Storage from "./Storage";
-import * as StorageActionWriter from "./StorageActionWriter";
-import type * as StorageReader from "./StorageReader";
-import * as StorageWriter from "./StorageWriter";
-import * as VectorSearch from "./VectorSearch";
-import type * as Handler from "./Handler";
+import * as ActionCtx from "./ActionCtx.js";
+import * as ActionRunner from "./ActionRunner.js";
+import * as Auth from "./Auth.js";
+import * as ConvexLogger from "./ConvexLogger.js";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DataModel from "./DataModel.js";
+import * as ExecutionMetadata from "./ExecutionMetadata.js";
+import * as RequestMetadata from "./RequestMetadata.js";
+import * as MutationRunner from "./MutationRunner.js";
+import * as QueryRunner from "./QueryRunner.js";
+import type * as ResolvedMiddleware from "./ResolvedMiddleware.js";
+import * as Scheduler from "./Scheduler.js";
+import * as Storage from "./Storage.js";
+import * as StorageActionWriter from "./StorageActionWriter.js";
+import type * as StorageReader from "./StorageReader.js";
+import * as StorageWriter from "./StorageWriter.js";
+import * as VectorSearch from "./VectorSearch.js";
+import type * as Handler from "./Handler.js";
 
 export type Any =
   | RegisteredQuery<FunctionVisibility, DefaultFunctionArgs, any>
@@ -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/RegisteredFunctions.ts

@@ -1,11 +1,11 @@
-import * as ConvexFunctionDefinitions from "./ConvexFunctionDefinitions";
+import * as ConvexFunctionDefinitions from "./ConvexFunctionDefinitions.js";
 import type * as FunctionSpec from "@confect/core/FunctionSpec";
 import type * as GroupSpec from "@confect/core/GroupSpec";
 import type * as Spec from "@confect/core/Spec";
 import type { Layer, Types } from "effect";
-import type * as DatabaseSchema from "./DatabaseSchema";
-import type * as GroupImpl from "./GroupImpl";
-import type * as RegisteredFunction from "./RegisteredFunction";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as GroupImpl from "./GroupImpl.js";
+import type * as RegisteredFunction from "./RegisteredFunction.js";
 
 export type RegisteredFunctions<Spec_ extends Spec.AnyWithProps> =
   Types.Simplify<RegisteredFunctionsHelper<Spec.Groups<Spec_>>>;

package/src/RegisteredNodeFunction.ts

@@ -9,15 +9,15 @@ 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,

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"];