@btravstack/graphql-server 0.37.0 → 0.39.0

package/dist/index.cjs

@@ -5,7 +5,6 @@ let _btravstack_core = require("@btravstack/core");
 let _btravstack_di = require("@btravstack/di");
 let _btravstack_http_server_internal = require("@btravstack/http-server/internal");
 let unthrown = require("unthrown");
-require("@btravstack/http-server");
 //#region src/field.ts
 /**
 * A resolver's answer from a `Result`, so a modeled failure is never thrown by
@@ -131,7 +130,7 @@ const graphql = (api, options) => {
 					}
 					let resolved;
 					if (requirements !== void 0) {
-						const result = await (0, _btravstack_http_server_internal.resolveScheme)(requirements, authenticators, request.headers).mapErrCases((matcher) => matcher.with(unthrown.P.tag("Unauthenticated"), () => 401).with(unthrown.P.tag("UnderScoped"), () => 403));
+						const result = await (0, _btravstack_http_server_internal.resolveRequestScheme)(requirements, authenticators, request).mapErrCases((matcher) => matcher.with(unthrown.P.tag("Unauthenticated"), () => 401).with(unthrown.P.tag("UnderScoped"), () => 403));
 						if (result.isDefect()) throw result.cause;
 						if (result.isErr()) {
 							await yoga.handle(request, response, {
@@ -165,27 +164,11 @@ const graphql = (api, options) => {
 	});
 };
 //#endregion
-//#region src/graphql-module.ts
-/** Declare a GraphQL HTTP application without repeating runtime or authenticator wiring. */
-const GraphqlModule = (name) => (options) => {
-	const starter = (0, _btravstack_http_server_internal.httpServer)({
-		...options,
-		unit: options.answerer.units
-	});
-	const imports = [...options.imports ?? [], starter];
-	const provides = [
-		options.answerer,
-		...options.answerer.authenticators,
-		...options.provides ?? []
-	];
-	return (0, _btravstack_di.Module)(name)({
-		imports,
-		provides,
-		exports: [...(0, _btravstack_http_server_internal.applicationExports)(imports, provides), ...options.exports ?? []],
-		needs: options.needs === void 0 ? void 0 : [...options.needs, _btravstack_config.Env]
-	});
-};
-//#endregion
-exports.GraphqlModule = GraphqlModule;
+Object.defineProperty(exports, "GraphqlModule", {
+	enumerable: true,
+	get: function() {
+		return _btravstack_http_server_internal.AnswererModule;
+	}
+});
 exports.fieldResult = fieldResult;
 exports.graphql = graphql;

package/dist/index.d.cts

@@ -1,13 +1,12 @@
 import { GraphQLError, GraphQLSchema } from "graphql";
 import { AsyncResult, Result } from "unthrown";
 import { IncomingMessage } from "node:http";
-import { ConfigInvalid, Env, EnvReading } from "@btravstack/config";
+import { ConfigInvalid, EnvReading } from "@btravstack/config";
 import { OneScheme, Requirements } from "@btravstack/contract";
 import { Observers } from "@btravstack/core";
-import { AnyModule, AnyPort, AnyProvider, Exportable, Module, NeedsGate, Provider, Scope } from "@btravstack/di";
-import { AnyUnitModule, Authenticators, CookieSchemes, HttpAuth, HttpConfig, HttpHandler, HttpServerEnv, HttpUnit, KindOf, Kinds, Principal, RequiresGate, SchemePortsOf, SchemesFrom, SchemesOf, UnitFor, UnitsNeedsOf, UnitsOf } from "@btravstack/http-server/internal";
+import { AnyPort, Provider, Scope } from "@btravstack/di";
+import { AnswererModule as GraphqlModule, Authenticators, HttpAuth, HttpConfig, HttpHandler, HttpUnit, KindOf, Kinds, Principal, RequiresGate, SchemePortsOf, SchemesFrom, SchemesOf, UnitFor, UnitsNeedsOf, UnitsOf } from "@btravstack/http-server/internal";
 import { Plugin, YogaInitialContext, YogaServerOptions } from "graphql-yoga";
-import { HttpConfig as HttpConfig$1, HttpHandler as HttpHandler$1, HttpOptions, HttpRuntime } from "@btravstack/http-server";
 //#region src/field.d.ts
 /**
  * A resolver's answer from a `Result`, so a modeled failure is never thrown by
@@ -94,28 +93,4 @@ export declare const graphql: <A extends Authenticators, Units extends UnitsOf<A
   units: (Units & { readonly [K in Exclude<keyof Units, Kinds<A>>]: never; }) | undefined;
 };
 //#endregion
-//#region src/graphql-module.d.ts
-type AnyAnswerer = Provider<InstanceType<typeof HttpHandler$1>, unknown, unknown> & {
-  readonly authenticators: readonly AnyProvider[];
-  readonly units: Readonly<Record<string, AnyUnitModule>> | undefined;
-};
-type UnitsOf$1<A> = A extends {
-  readonly units: infer U;
-} ? U : never;
-type AuthOf<A> = A extends {
-  readonly authenticators: readonly (infer P)[];
-} ? P : never;
-type HttpStarter<Units> = Module<HttpRuntime | HttpConfig$1 | InstanceType<typeof HttpHandler$1> | HttpUnit | CookieSchemes | Observers, ConfigInvalid, HttpServerEnv | UnitsNeedsOf<Units>>;
-type Imports<I extends readonly AnyModule[], A> = readonly [...I, HttpStarter<UnitsOf$1<A>>];
-type Provides<P extends readonly AnyProvider[], A> = readonly (A | AuthOf<A> | P[number])[];
-type EnvAnd<N extends readonly AnyPort[] | undefined> = N extends readonly AnyPort[] ? readonly [...N, typeof Env] : undefined;
-/** Declare a GraphQL HTTP application without repeating runtime or authenticator wiring. */
-export declare const GraphqlModule: <const Name extends string>(name: Name) => <A extends AnyAnswerer, const I extends readonly AnyModule[] = [], const P extends readonly AnyProvider[] = [], const X extends readonly Exportable<Imports<I, A>, Provides<P, A>>[] = [], const N extends readonly AnyPort[] | undefined = undefined>(options: Omit<HttpOptions, "unit" | "cors" | "compression"> & {
-  readonly answerer: A;
-  readonly imports?: I;
-  readonly provides?: P;
-  readonly exports?: X;
-  readonly needs?: N;
-} & NeedsGate<Imports<I, A>, Provides<P, A>, EnvAnd<N>>) => Module<(Extract<(readonly [typeof HttpRuntime, typeof HttpHandler$1, ...((import("@btravstack/core").HealthChecks extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").HealthChecks : never) | (import("@btravstack/core").Logger extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").Logger : never))[], ...X])[number], AnyModule> extends (infer T_3) ? T_3 extends Extract<(readonly [typeof HttpRuntime, typeof HttpHandler$1, ...((import("@btravstack/core").HealthChecks extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").HealthChecks : never) | (import("@btravstack/core").Logger extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").Logger : never))[], ...X])[number], AnyModule> ? T_3 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[0] | ((readonly [typeof HttpRuntime, typeof HttpHandler$1, ...((import("@btravstack/core").HealthChecks extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").HealthChecks : never) | (import("@btravstack/core").Logger extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").Logger : never))[], ...X])[number] extends (infer E_1) ? E_1 extends AnyPort ? InstanceType<E_1> : E_1 extends AnyProvider ? InstanceType<E_1["port"]> : never : never), ((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_4) ? T_4 extends P[number] ? T_4 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_5) ? T_5 extends AuthOf<A> ? T_5 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[1] | ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_6) ? T_6 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_6 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[1], Exclude<((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_7) ? T_7 extends P[number] ? T_7 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_8) ? T_8 extends AuthOf<A> ? T_8 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[2], ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_9) ? T_9 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_9 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[0] | ((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_7) ? T_7 extends P[number] ? T_7 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_8) ? T_8 extends AuthOf<A> ? T_8 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[0]> | Exclude<((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_9) ? T_9 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_9 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[2], ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_9) ? T_9 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_9 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[0] | ((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_7) ? T_7 extends P[number] ? T_7 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_8) ? T_8 extends AuthOf<A> ? T_8 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[0]>>;
-//#endregion
-export type { GraphqlContext, GraphqlOptions };
+export { type GraphqlContext, GraphqlModule, type GraphqlOptions };

package/dist/index.d.mts

@@ -1,10 +1,9 @@
 import { Plugin, YogaInitialContext, YogaServerOptions } from "graphql-yoga";
-import { ConfigInvalid, Env, EnvReading } from "@btravstack/config";
+import { ConfigInvalid, EnvReading } from "@btravstack/config";
 import { Observers } from "@btravstack/core";
-import { AnyModule, AnyPort, AnyProvider, Exportable, Module, NeedsGate, Provider, Scope } from "@btravstack/di";
-import { AnyUnitModule, Authenticators, CookieSchemes, HttpAuth, HttpConfig, HttpHandler, HttpServerEnv, HttpUnit, KindOf, Kinds, Principal, RequiresGate, SchemePortsOf, SchemesFrom, SchemesOf, UnitFor, UnitsNeedsOf, UnitsOf } from "@btravstack/http-server/internal";
+import { AnyPort, Provider, Scope } from "@btravstack/di";
+import { AnswererModule as GraphqlModule, Authenticators, HttpAuth, HttpConfig, HttpHandler, HttpUnit, KindOf, Kinds, Principal, RequiresGate, SchemePortsOf, SchemesFrom, SchemesOf, UnitFor, UnitsNeedsOf, UnitsOf } from "@btravstack/http-server/internal";
 import { AsyncResult, Result } from "unthrown";
-import { HttpConfig as HttpConfig$1, HttpHandler as HttpHandler$1, HttpOptions, HttpRuntime } from "@btravstack/http-server";
 import { GraphQLError, GraphQLSchema } from "graphql";
 import { IncomingMessage } from "node:http";
 import { OneScheme, Requirements } from "@btravstack/contract";
@@ -94,28 +93,4 @@ export declare const graphql: <A extends Authenticators, Units extends UnitsOf<A
   units: (Units & { readonly [K in Exclude<keyof Units, Kinds<A>>]: never; }) | undefined;
 };
 //#endregion
-//#region src/graphql-module.d.ts
-type AnyAnswerer = Provider<InstanceType<typeof HttpHandler$1>, unknown, unknown> & {
-  readonly authenticators: readonly AnyProvider[];
-  readonly units: Readonly<Record<string, AnyUnitModule>> | undefined;
-};
-type UnitsOf$1<A> = A extends {
-  readonly units: infer U;
-} ? U : never;
-type AuthOf<A> = A extends {
-  readonly authenticators: readonly (infer P)[];
-} ? P : never;
-type HttpStarter<Units> = Module<HttpRuntime | HttpConfig$1 | InstanceType<typeof HttpHandler$1> | HttpUnit | CookieSchemes | Observers, ConfigInvalid, HttpServerEnv | UnitsNeedsOf<Units>>;
-type Imports<I extends readonly AnyModule[], A> = readonly [...I, HttpStarter<UnitsOf$1<A>>];
-type Provides<P extends readonly AnyProvider[], A> = readonly (A | AuthOf<A> | P[number])[];
-type EnvAnd<N extends readonly AnyPort[] | undefined> = N extends readonly AnyPort[] ? readonly [...N, typeof Env] : undefined;
-/** Declare a GraphQL HTTP application without repeating runtime or authenticator wiring. */
-export declare const GraphqlModule: <const Name extends string>(name: Name) => <A extends AnyAnswerer, const I extends readonly AnyModule[] = [], const P extends readonly AnyProvider[] = [], const X extends readonly Exportable<Imports<I, A>, Provides<P, A>>[] = [], const N extends readonly AnyPort[] | undefined = undefined>(options: Omit<HttpOptions, "unit" | "cors" | "compression"> & {
-  readonly answerer: A;
-  readonly imports?: I;
-  readonly provides?: P;
-  readonly exports?: X;
-  readonly needs?: N;
-} & NeedsGate<Imports<I, A>, Provides<P, A>, EnvAnd<N>>) => Module<(Extract<(readonly [typeof HttpRuntime, typeof HttpHandler$1, ...((import("@btravstack/core").HealthChecks extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").HealthChecks : never) | (import("@btravstack/core").Logger extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").Logger : never))[], ...X])[number], AnyModule> extends (infer T_3) ? T_3 extends Extract<(readonly [typeof HttpRuntime, typeof HttpHandler$1, ...((import("@btravstack/core").HealthChecks extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").HealthChecks : never) | (import("@btravstack/core").Logger extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").Logger : never))[], ...X])[number], AnyModule> ? T_3 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[0] | ((readonly [typeof HttpRuntime, typeof HttpHandler$1, ...((import("@btravstack/core").HealthChecks extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").HealthChecks : never) | (import("@btravstack/core").Logger extends ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T) ? T extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T extends Module<infer X_1, infer _E, infer _N> ? X_1 : never : never : never) | (A extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never) | (P[number] extends (infer T_1) ? T_1 extends P[number] ? T_1 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) | (AuthOf<A> extends (infer T_2) ? T_2 extends AuthOf<A> ? T_2 extends Provider<infer X_2, infer _E_1, infer _N_1> ? X_2 : never : never : never) ? typeof import("@btravstack/core").Logger : never))[], ...X])[number] extends (infer E_1) ? E_1 extends AnyPort ? InstanceType<E_1> : E_1 extends AnyProvider ? InstanceType<E_1["port"]> : never : never), ((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_4) ? T_4 extends P[number] ? T_4 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_5) ? T_5 extends AuthOf<A> ? T_5 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[1] | ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_6) ? T_6 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_6 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[1], Exclude<((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_7) ? T_7 extends P[number] ? T_7 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_8) ? T_8 extends AuthOf<A> ? T_8 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[2], ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_9) ? T_9 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_9 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[0] | ((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_7) ? T_7 extends P[number] ? T_7 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_8) ? T_8 extends AuthOf<A> ? T_8 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[0]> | Exclude<((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_9) ? T_9 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_9 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[2], ((readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] extends (infer T_9) ? T_9 extends (readonly [...I, HttpStarter<UnitsOf$1<A>>])[number] ? T_9 extends Module<infer X_3, infer E, infer N_1> ? readonly [X_3, E, N_1] : never : never : never)[0] | ((A extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never) | (P[number] extends (infer T_7) ? T_7 extends P[number] ? T_7 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never) | (AuthOf<A> extends (infer T_8) ? T_8 extends AuthOf<A> ? T_8 extends Provider<infer P_1, infer E_2, infer N_2> ? readonly [P_1, E_2, N_2] : never : never : never))[0]>>;
-//#endregion
-export type { GraphqlContext, GraphqlOptions };
+export { type GraphqlContext, GraphqlModule, type GraphqlOptions };

package/dist/index.mjs

@@ -1,10 +1,9 @@
 import { createGraphQLError, createYoga, handleStreamOrSingleExecutionResult, maskError } from "graphql-yoga";
 import { Config, Env } from "@btravstack/config";
 import { Observers, observe } from "@btravstack/core";
-import { Module, Provider } from "@btravstack/di";
-import { HttpConfig, HttpHandler, HttpUnit, applicationExports, forkUnit, httpServer, principalOf, resolveScheme, schemeDeps, schemeServices } from "@btravstack/http-server/internal";
+import { Provider } from "@btravstack/di";
+import { AnswererModule as GraphqlModule, HttpConfig, HttpHandler, HttpUnit, forkUnit, principalOf, resolveRequestScheme, schemeDeps, schemeServices } from "@btravstack/http-server/internal";
 import { P } from "unthrown";
-import "@btravstack/http-server";
 //#region src/field.ts
 /**
 * A resolver's answer from a `Result`, so a modeled failure is never thrown by
@@ -130,7 +129,7 @@ const graphql = (api, options) => {
 					}
 					let resolved;
 					if (requirements !== void 0) {
-						const result = await resolveScheme(requirements, authenticators, request.headers).mapErrCases((matcher) => matcher.with(P.tag("Unauthenticated"), () => 401).with(P.tag("UnderScoped"), () => 403));
+						const result = await resolveRequestScheme(requirements, authenticators, request).mapErrCases((matcher) => matcher.with(P.tag("Unauthenticated"), () => 401).with(P.tag("UnderScoped"), () => 403));
 						if (result.isDefect()) throw result.cause;
 						if (result.isErr()) {
 							await yoga.handle(request, response, {
@@ -164,25 +163,4 @@ const graphql = (api, options) => {
 	});
 };
 //#endregion
-//#region src/graphql-module.ts
-/** Declare a GraphQL HTTP application without repeating runtime or authenticator wiring. */
-const GraphqlModule = (name) => (options) => {
-	const starter = httpServer({
-		...options,
-		unit: options.answerer.units
-	});
-	const imports = [...options.imports ?? [], starter];
-	const provides = [
-		options.answerer,
-		...options.answerer.authenticators,
-		...options.provides ?? []
-	];
-	return Module(name)({
-		imports,
-		provides,
-		exports: [...applicationExports(imports, provides), ...options.exports ?? []],
-		needs: options.needs === void 0 ? void 0 : [...options.needs, Env]
-	});
-};
-//#endregion
 export { GraphqlModule, fieldResult, graphql };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btravstack/graphql-server",
-  "version": "0.37.0",
+  "version": "0.39.0",
   "description": "The GraphQL Yoga answerer for @btravstack/http-server",
   "keywords": [
     "graphql",
@@ -41,11 +41,11 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@btravstack/config": "0.37.0",
-    "@btravstack/contract": "0.37.0",
-    "@btravstack/core": "0.37.0",
-    "@btravstack/di": "0.37.0",
-    "@btravstack/http-server": "0.37.0",
+    "@btravstack/config": "0.39.0",
+    "@btravstack/contract": "0.39.0",
+    "@btravstack/core": "0.39.0",
+    "@btravstack/di": "0.39.0",
+    "@btravstack/http-server": "0.39.0",
     "@btravstack/tsconfig": "0.4.0",
     "@types/node": "26.6.5",
     "@unthrown/vitest": "5.12.1",
@@ -59,11 +59,11 @@
     "vitest": "5.0.3"
   },
   "peerDependencies": {
-    "@btravstack/config": "^0.37.0",
-    "@btravstack/contract": "^0.37.0",
-    "@btravstack/core": "^0.37.0",
-    "@btravstack/di": "^0.37.0",
-    "@btravstack/http-server": "^0.37.0",
+    "@btravstack/config": "^0.39.0",
+    "@btravstack/contract": "^0.39.0",
+    "@btravstack/core": "^0.39.0",
+    "@btravstack/di": "^0.39.0",
+    "@btravstack/http-server": "^0.39.0",
     "graphql": "^16.6.0 || ^17.0.0",
     "graphql-yoga": "^5.24.1",
     "unthrown": "^5.7.0"