trpc-nuxt-module 3.9.0 → 4.1.0

package/dist/index.js

@@ -16,7 +16,7 @@ const WEBSOCKET_HANDLER_FILENAME = `#${MODULE_NAME}/webSocketHandler.mjs`;
 const trpcNuxtModule = defineNuxtModule({
 	defaults: { endpoint: DEFAULT_ENDPOINT },
 	meta: {
-		compatibility: { nuxt: ">=4.0.0" },
+		compatibility: { nuxt: ">=5.0.0-0" },
 		configKey: "trpc",
 		name: MODULE_NAME
 	},
@@ -29,17 +29,18 @@ const trpcNuxtModule = defineNuxtModule({
 			...createContext,
 			from: await resolvePath(createContext.from)
 		};
+		const routedEndpoint = `${nuxt.options.app.baseURL.replace(/\/$/u, "")}${endpoint}`;
 		addServerTemplate({
 			filename: EVENT_HANDLER_FILENAME,
-			getContents: () => getEventHandlerTemplate(resolvedRouter, endpoint, resolvedCreateContext)
+			getContents: () => getEventHandlerTemplate(resolvedRouter, routedEndpoint, resolvedCreateContext)
 		});
 		addServerHandler({
 			handler: EVENT_HANDLER_FILENAME,
 			route: `${endpoint}/**`
 		});
 		if (webSocket) {
-			nuxt.options.nitro.experimental = {
-				...nuxt.options.nitro.experimental,
+			nuxt.options.nitro.features = {
+				...nuxt.options.nitro.features,
 				websocket: true
 			};
 			addServerTemplate({

package/dist/runtime/client/models/SubscriptionStatus.d.ts

@@ -1,8 +1,9 @@
 //#region src/runtime/client/models/SubscriptionStatus.d.ts
-export declare enum SubscriptionStatus {
-  Connecting = "connecting",
-  Error = "error",
-  Idle = "idle",
-  Pending = "pending"
-}
+export declare const SubscriptionStatus: {
+  readonly Connecting: "connecting";
+  readonly Error: "error";
+  readonly Idle: "idle";
+  readonly Pending: "pending";
+};
+export type SubscriptionStatus = (typeof SubscriptionStatus)[keyof typeof SubscriptionStatus];
 //#endregion

package/dist/runtime/client/models/SubscriptionStatus.js

@@ -1,10 +1,9 @@
 //#region src/runtime/client/models/SubscriptionStatus.ts
-let SubscriptionStatus = /* @__PURE__ */ function(SubscriptionStatus) {
-	SubscriptionStatus["Connecting"] = "connecting";
-	SubscriptionStatus["Error"] = "error";
-	SubscriptionStatus["Idle"] = "idle";
-	SubscriptionStatus["Pending"] = "pending";
-	return SubscriptionStatus;
-}({});
+const SubscriptionStatus = {
+	Connecting: "connecting",
+	Error: "error",
+	Idle: "idle",
+	Pending: "pending"
+};
 //#endregion
 export { SubscriptionStatus };

package/dist/runtime/client/services/getLinkFetch.js

@@ -1,10 +1,11 @@
 import { useRequestEvent } from "nuxt/app";
 import { checkIsServer } from "@esposter/shared";
+import { fetchWithEvent } from "nitro/h3";
 //#region src/runtime/client/services/getLinkFetch.ts
 const getLinkFetch = () => {
 	if (checkIsServer()) {
 		const event = useRequestEvent();
-		if (event) return event.fetch;
+		if (event) return (url, options) => fetchWithEvent(event, url, options);
 	}
 	return (input, init) => fetch(new URL(input, window.location.href), init);
 };

package/dist/runtime/client/services/useProcedureMutation.js

@@ -16,7 +16,7 @@ const useProcedureMutation = (client, path, { mutationKey = getProcedureKey(path
 		mutationInput = input;
 		await asyncData.execute();
 		if (asyncData.error.value) throw asyncData.error.value;
-		return asyncData.data.value;
+		else return asyncData.data.value;
 	} });
 };
 //#endregion

package/dist/runtime/client/services/useProcedureSubscription.js

@@ -1,34 +1,34 @@
-import "../models/SubscriptionStatus.js";
+import { SubscriptionStatus } from "../models/SubscriptionStatus.js";
 import { getCurrentScope, onScopeDispose, shallowRef, toValue, watch } from "vue";
 import { checkIsServer } from "@esposter/shared";
 //#region src/runtime/client/services/useProcedureSubscription.ts
 const ConnectionStateSubscriptionStatusMap = {
-	connecting: "connecting",
-	idle: "idle",
-	pending: "pending"
+	connecting: SubscriptionStatus.Connecting,
+	idle: SubscriptionStatus.Idle,
+	pending: SubscriptionStatus.Pending
 };
 const useProcedureSubscription = (client, path, input, { enabled = true, ...options } = {}) => {
 	const data = shallowRef();
 	const error = shallowRef();
-	const status = shallowRef("idle");
+	const status = shallowRef(SubscriptionStatus.Idle);
 	let unsubscribable;
 	const unsubscribe = () => {
 		unsubscribable?.unsubscribe();
 		unsubscribable = void 0;
-		status.value = "idle";
+		status.value = SubscriptionStatus.Idle;
 	};
 	const subscribe = () => {
 		unsubscribable?.unsubscribe();
 		error.value = void 0;
-		status.value = "connecting";
+		status.value = SubscriptionStatus.Connecting;
 		unsubscribable = client.subscription(path, toValue(input), {
 			...options,
 			onComplete: () => {
-				status.value = "idle";
+				status.value = SubscriptionStatus.Idle;
 				options.onComplete?.();
 			},
 			onConnectionStateChange: (state) => {
-				status.value = state.error ? "error" : ConnectionStateSubscriptionStatusMap[state.state];
+				status.value = state.error ? SubscriptionStatus.Error : ConnectionStateSubscriptionStatusMap[state.state];
 				options.onConnectionStateChange?.(state);
 			},
 			onData: (value) => {
@@ -37,11 +37,11 @@ const useProcedureSubscription = (client, path, input, { enabled = true, ...opti
 			},
 			onError: (newError) => {
 				error.value = newError;
-				status.value = "error";
+				status.value = SubscriptionStatus.Error;
 				options.onError?.(newError);
 			},
 			onStarted: (startedOptions) => {
-				status.value = "pending";
+				status.value = SubscriptionStatus.Pending;
 				options.onStarted?.(startedOptions);
 			}
 		});
@@ -50,7 +50,9 @@ const useProcedureSubscription = (client, path, input, { enabled = true, ...opti
 		if (isEnabled) subscribe();
 		else unsubscribe();
 	}, { immediate: true });
-	if (getCurrentScope()) onScopeDispose(unsubscribe);
+	if (getCurrentScope()) onScopeDispose(() => {
+		unsubscribe();
+	});
 	return {
 		data,
 		error,

package/dist/runtime/server/createTRPCEventHandler.d.ts

@@ -1,6 +1,6 @@
 import { TRPCEventHandlerOptions } from "./models/TRPCEventHandlerOptions.js";
 import { AnyTRPCRouter } from "@trpc/server";
-import { EventHandler, EventHandlerRequest } from "h3";
+import { EventHandler } from "nitro/h3";
 //#region src/runtime/server/createTRPCEventHandler.d.ts
-export declare const createTRPCEventHandler: <TRouter extends AnyTRPCRouter>({ createContext, endpoint, ...options }: TRPCEventHandlerOptions<TRouter>) => EventHandler<EventHandlerRequest, Promise<Response | undefined>>;
+export declare const createTRPCEventHandler: <TRouter extends AnyTRPCRouter>({ createContext, endpoint, ...options }: TRPCEventHandlerOptions<TRouter>) => EventHandler;
 //#endregion

package/dist/runtime/server/createTRPCEventHandler.js

@@ -1,17 +1,31 @@
 import { DEFAULT_ENDPOINT } from "../constants.js";
-import { toRequest } from "./services/toRequest.js";
-import { defineEventHandler } from "h3";
+import { defineHandler } from "nitro/h3";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 //#region src/runtime/server/createTRPCEventHandler.ts
-const createTRPCEventHandler = ({ createContext, endpoint = DEFAULT_ENDPOINT, ...options }) => defineEventHandler(async (event) => {
+const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([
+	204,
+	205,
+	304
+]);
+const createTRPCEventHandler = ({ createContext, endpoint = DEFAULT_ENDPOINT, ...options }) => defineHandler(async (event) => {
 	const response = await fetchRequestHandler({
 		...options,
 		createContext: createContext && ((fetchCreateContextOptions) => createContext(event, fetchCreateContextOptions)),
 		endpoint,
-		req: await toRequest(event)
+		req: event.req
+	});
+	const { status } = event.res;
+	if (!status) return response;
+	else if (!NULL_BODY_STATUSES.has(status)) return new Response(response.body, {
+		headers: response.headers,
+		status
+	});
+	const headers = new Headers(response.headers);
+	headers.delete("content-length");
+	return new Response(null, {
+		headers,
+		status
 	});
-	if (event.handled) return void 0;
-	return response;
 });
 //#endregion
 export { createTRPCEventHandler };

package/dist/runtime/server/models/TRPCEventHandlerOptions.d.ts

@@ -1,5 +1,5 @@
 import { AnyTRPCRouter, inferRouterContext } from "@trpc/server";
-import { H3Event } from "h3";
+import { H3Event } from "nitro/h3";
 import { FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
 import { Promisable } from "type-fest";
 import { HTTPBaseHandlerOptions } from "@trpc/server/http";

package/dist/services/getWebSocketHandlerTemplate.js

@@ -2,13 +2,13 @@ import { MODULE_NAME } from "../runtime/constants.js";
 import { getImportStatement } from "./getImportStatement.js";
 //#region src/services/getWebSocketHandlerTemplate.ts
 const getWebSocketHandlerTemplate = (router, { keepAlive }, createContext) => [
-	`import { defineWebSocketHandler } from "h3";`,
-	`import { useNitroApp } from "nitropack/runtime";`,
+	`import { useNitroHooks } from "nitro/app";`,
+	`import { defineWebSocketHandler } from "nitro/h3";`,
 	`import { WEBSOCKET_CLOSE_HOOK, WEBSOCKET_OPEN_HOOK } from "${MODULE_NAME}/runtime/constants";`,
 	`import { createTRPCWebSocketHandler } from "${MODULE_NAME}/runtime/server/createTRPCWebSocketHandler";`,
 	getImportStatement(router, "router"),
 	createContext ? getImportStatement(createContext, "createContext") : "const createContext = () => ({});",
-	`const { hooks: nitroHooks } = useNitroApp();`,
+	`const nitroHooks = useNitroHooks();`,
 	`const { broadcastReconnectNotification, hooks } = createTRPCWebSocketHandler({`,
 	`  createContext,`,
 	`  keepAlive: ${JSON.stringify(keepAlive)},`,

package/dist/services/getWebSocketHooksTypeTemplate.js

@@ -5,7 +5,7 @@ const getWebSocketHooksTypeTemplate = ({ from, name }) => {
 	return [
 		`import type { inferRouterContext } from "@trpc/server";`,
 		`import type { TRPCWebSocketConnection } from "${MODULE_NAME}/runtime/server/models/TRPCWebSocketConnection";`,
-		`declare module "nitropack/types" {`,
+		`declare module "nitro/types" {`,
 		`  interface NitroRuntimeHooks {`,
 		`    ${JSON.stringify(WEBSOCKET_CLOSE_HOOK)}: (connection: ${connectionType}) => Promise<void> | void;`,
 		`    ${JSON.stringify(WEBSOCKET_OPEN_HOOK)}: (connection: ${connectionType}) => Promise<void> | void;`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trpc-nuxt-module",
-  "version": "3.9.0",
+  "version": "4.1.0",
   "description": "tRPC for Nuxt — a Nuxt module that registers your router's HTTP and WebSocket handlers, fetches through the request event during SSR, and decorates the typed client with useQuery, useMutation and useSubscription over useAsyncData.",
   "keywords": [
     "nitro",
@@ -82,33 +82,33 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@esposter/shared": "3.9.0",
-    "@nuxt/kit": "^4.5.2",
-    "@nuxt/schema": "^4.5.2",
+    "@esposter/shared": "4.1.0",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5x",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5x",
     "ohash": "^2.0.12",
     "type-fest": "^5.10.0"
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.5",
-    "@esposter/configuration": "3.9.0",
-    "@esposter/shared-node": "3.9.0",
-    "@nuxt/nitro-server": "^4.5.2",
-    "@nuxt/test-utils": "^4.3.2",
-    "@types/node": "^26.6.4",
-    "happy-dom": "^20.14.5",
+    "@esposter/configuration": "4.1.0",
+    "@esposter/shared-node": "4.1.0",
+    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@5x",
+    "@nuxt/test-utils": "^4.3.3",
+    "@types/node": "^26.6.5",
+    "happy-dom": "^21.0.1",
     "publint": "^0.3.25",
     "superjson": "^2.2.6",
-    "tsdown": "^0.23.0",
-    "vitest": "^5.0.3",
-    "zod": "^4.6.5"
+    "tsdown": "^0.23.1",
+    "vitest": "^5.0.4",
+    "zod": "^4.6.7"
   },
   "peerDependencies": {
     "@trpc/client": "^11.19.0",
     "@trpc/server": "^11.19.0",
-    "crossws": "^0.4.12",
-    "h3": "^1.15.11",
-    "nuxt": "^4.5.2",
-    "vue": "^3.5.43"
+    "crossws": "^0.4.15",
+    "nitro": "npm:nitro-nightly@latest",
+    "nuxt": "npm:nuxt-nightly@5x",
+    "vue": "^3.5.44"
   },
-  "gitHead": "f9f6208c35e6cff4ed33910623c798cd88f09301"
+  "gitHead": "68de4c22fa7591bf6f6cc0fab2c9a906d8c4d71a"
 }

package/dist/runtime/server/services/getRequestSignal.d.ts

@@ -1,4 +0,0 @@
-import { H3Event } from "h3";
-//#region src/runtime/server/services/getRequestSignal.d.ts
-export declare const getRequestSignal: (event: H3Event) => AbortSignal;
-//#endregion

package/dist/runtime/server/services/getRequestSignal.js

@@ -1,11 +0,0 @@
-//#region src/runtime/server/services/getRequestSignal.ts
-const getRequestSignal = (event) => {
-	const abortController = new AbortController();
-	const { res } = event.node;
-	res.once("close", () => {
-		if (!res.writableFinished) abortController.abort();
-	});
-	return abortController.signal;
-};
-//#endregion
-export { getRequestSignal };

package/dist/runtime/server/services/toRequest.d.ts

@@ -1,4 +0,0 @@
-import { H3Event } from "h3";
-//#region src/runtime/server/services/toRequest.d.ts
-export declare const toRequest: (event: H3Event) => Promise<Request>;
-//#endregion

package/dist/runtime/server/services/toRequest.js

@@ -1,20 +0,0 @@
-import { getRequestSignal } from "./getRequestSignal.js";
-import { getRequestHost, getRequestProtocol, isMethod, readRawBody } from "h3";
-//#region src/runtime/server/services/toRequest.ts
-const PAYLOAD_METHODS = [
-	"DELETE",
-	"PATCH",
-	"POST",
-	"PUT"
-];
-const toRequest = async (event) => {
-	const body = isMethod(event, PAYLOAD_METHODS) ? await readRawBody(event, false) : void 0;
-	return new Request(`${getRequestProtocol(event)}://${getRequestHost(event)}${event.path}`, {
-		body: body && new Uint8Array(body),
-		headers: event.headers,
-		method: event.method,
-		signal: getRequestSignal(event)
-	});
-};
-//#endregion
-export { toRequest };