@btravstack/pothos 0.29.0 → 0.30.1

package/README.md

@@ -24,8 +24,8 @@ Every dependency is a peer: Pothos plugins and `graphql` each need one copy.
 
 ```sh
 pnpm add @btravstack/pothos @pothos/core @pothos/plugin-errors @pothos/plugin-relay \
-  @unthrown/pothos@^0.1.0 graphql unthrown zod \
-  @orpc/client@2.0.0-beta.28 @orpc/contract@2.0.0-beta.28
+  @unthrown/pothos@^0.1.2 graphql unthrown zod \
+  @orpc/client@2.0.0-beta.34 @orpc/contract@2.0.0-beta.34
 ```
 
 See

package/dist/index.d.mts

@@ -1,13 +1,16 @@
 import { BasePlugin, FieldKind, FieldNullability, InputFieldMap, InputShapeFromFields, ObjectRef, OutputType, SchemaTypes, ShapeFromTypeParam, TypeParam } from "@pothos/core";
+import { AsyncResult } from "unthrown";
+import { GraphQLFieldResolver } from "graphql";
 import { ResultConnectionOptions } from "@unthrown/pothos/relay";
 import { CaseOf, Caseable, Refusals, ResultFieldOptions } from "@unthrown/pothos";
-import { AsyncResult } from "unthrown";
 import { z } from "zod";
 import { AnySchema, ErrorMap, ProcedureContract } from "@orpc/contract";
 import { ConnectionShapeForType, DefaultConnectionArguments } from "@pothos/plugin-relay";
 //#region src/plugin.d.ts
 declare const pluginName = "orpc";
-declare class PothosOrpcPlugin<Types extends SchemaTypes> extends BasePlugin<Types> {}
+declare class PothosOrpcPlugin<Types extends SchemaTypes> extends BasePlugin<Types> {
+  wrapArgMappers(resolve: GraphQLFieldResolver<unknown, Types["Context"], object>): GraphQLFieldResolver<unknown, Types["Context"], object>;
+}
 declare global {
   export namespace PothosSchemaTypes {
     interface Plugins<Types extends SchemaTypes> {

package/dist/index.mjs

@@ -1,10 +1,24 @@
 import SchemaBuilder, { BasePlugin, RootFieldBuilder } from "@pothos/core";
+import { Err, P, TaggedError, fromPromise, fromSafePromise, fromSafeThrowable } from "unthrown";
+import { GraphQLError } from "graphql";
 import { ORPCError } from "@orpc/client";
 import "@unthrown/pothos/relay";
 import { outcomeOf } from "@unthrown/pothos";
-import { GraphQLError } from "graphql";
-import { Err, P, TaggedError, fromPromise, fromSafePromise, fromSafeThrowable } from "unthrown";
 import { z } from "zod";
+//#region src/access-refusal.ts
+const accessMarker = Symbol("AccessRefusal");
+var AccessRefusal = class extends GraphQLError {
+	[accessMarker] = this;
+	constructor(code) {
+		super("Service refused access", { extensions: { code } });
+	}
+};
+const accessRefusal = (cause) => {
+	const marked = typeof cause === "object" && cause !== null && accessMarker in cause ? cause[accessMarker] : cause;
+	if (marked instanceof AccessRefusal) return marked;
+	return typeof cause === "object" && cause !== null && "cause" in cause && cause.cause instanceof AccessRefusal ? cause.cause : void 0;
+};
+//#endregion
 //#region src/contract.ts
 /**
 * The one Zod schema a procedure's contract declares for its input, typed as
@@ -55,7 +69,7 @@ const refusalsOf = (registry, procedure) => Object.fromEntries([...Object.keys(p
 	const Refusal = ACCESS_CODES.has(code) ? void 0 : registry[code];
 	return Refusal === void 0 ? [] : [[code, Refusal]];
 }));
-const accessRefusalOf = (cause) => cause instanceof ORPCError && (cause.code === "UNAUTHORIZED" || cause.code === "FORBIDDEN") ? new GraphQLError("Service refused access", { extensions: { code: cause.code } }) : void 0;
+const accessRefusalOf = (cause) => cause instanceof ORPCError && (cause.code === "UNAUTHORIZED" || cause.code === "FORBIDDEN") ? new AccessRefusal(cause.code) : void 0;
 /**
 * `call` handed the input the procedure's contract accepts, its answer decoded
 * by `output`. `UNAUTHORIZED` and `FORBIDDEN`, declared or not, leave the
@@ -76,7 +90,10 @@ function withoutAccess(called) {
 * **It answers a `Promise`, and that is the boundary**: a DataLoader's batch
 * function answers a value or an `Error` per key.
 */
-const loadProcedure = async (registry, procedure, call, input, output) => outcomeOf(callProcedure(procedure, input, call, output), refusalsOf(registry, procedure));
+const loadProcedure = async (registry, procedure, call, input, output) => {
+	const called = await callProcedure(procedure, input, call, output);
+	return called.isDefect() && called.cause instanceof AccessRefusal ? called.cause : outcomeOf(called, refusalsOf(registry, procedure));
+};
 /**
 * The `errors` option of a field that reads `procedure` through
 * `loadProcedure`: the registered refusals it can answer, as the field's
@@ -105,7 +122,17 @@ const defineProcedureFields = () => {
 //#endregion
 //#region src/plugin.ts
 const pluginName = "orpc";
-var PothosOrpcPlugin = class extends BasePlugin {};
+var PothosOrpcPlugin = class extends BasePlugin {
+	wrapArgMappers(resolve) {
+		return (parent, args, context, info) => fromSafePromise(Promise.resolve(resolve(parent, args, context, info))).map((value) => {
+			const refusal = accessRefusal(value);
+			if (refusal !== void 0) throw refusal;
+			return value;
+		}).recoverDefect((cause) => {
+			throw accessRefusal(cause) ?? cause;
+		}).get();
+	}
+};
 SchemaBuilder.registerPlugin(pluginName, PothosOrpcPlugin);
 defineProcedureFields();
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btravstack/pothos",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "description": "Pothos fields that call oRPC procedures, each declared error answered as a typed GraphQL refusal",
   "keywords": [
     "graphql",
@@ -41,20 +41,22 @@
   },
   "devDependencies": {
     "@btravstack/tsconfig": "0.4.0",
-    "@orpc/client": "2.0.0-beta.28",
-    "@orpc/contract": "2.0.0-beta.28",
+    "@orpc/client": "2.0.0-beta.34",
+    "@orpc/contract": "2.0.0-beta.34",
     "@pothos/core": "4.15.1",
     "@pothos/plugin-errors": "4.9.3",
     "@pothos/plugin-relay": "4.8.1",
     "@types/node": "26.6.4",
-    "@unthrown/pothos": "0.1.0",
-    "@unthrown/vitest": "5.12.0",
+    "@unthrown/pothos": "0.1.2",
+    "@unthrown/vitest": "5.12.1",
     "@vitest/coverage-v8": "5.0.3",
+    "dataloader": "2.2.3",
     "graphql": "17.0.2",
+    "graphql-yoga": "5.24.1",
     "tsdown": "0.23.0",
     "typescript": "7.0.2",
     "typescript-consumer": "npm:typescript@5.9.3",
-    "unthrown": "5.12.0",
+    "unthrown": "5.12.1",
     "vitest": "5.0.3",
     "zod": "4.6.5"
   },
@@ -64,9 +66,9 @@
     "@pothos/core": "^4.15.0",
     "@pothos/plugin-errors": "^4.9.0",
     "@pothos/plugin-relay": "^4.8.0",
-    "@unthrown/pothos": "^0.1.0",
+    "@unthrown/pothos": "^0.1.2",
     "graphql": "^16.10.0 || ^17.0.0",
-    "unthrown": "^5.12.0",
+    "unthrown": "^5.12.1",
     "zod": "^4.3.0"
   },
   "engines": {