@fedify/nuxt 2.2.0-dev.898 → 2.2.0-dev.924

package/dist/mod.js

@@ -7,6 +7,9 @@ function resolveModulePath(modulePath, aliases, rootDir) {
 	if (resolved.startsWith("./") || resolved.startsWith("../")) return resolve(rootDir, resolved);
 	return resolved;
 }
+function resolveRuntimeServerPath(resolver, fileName) {
+	return resolver.resolve(`../dist/runtime/server/${fileName}`);
+}
 function buildContextFactoryResolver(contextDataFactoryModule) {
 	if (contextDataFactoryModule == null) return "const contextDataFactory = undefined;";
 	return `
@@ -42,10 +45,12 @@ const fedifyNuxtModule = defineNuxtModule({
 		const federationModule = resolveModulePath(options.federationModule, nuxt.options.alias, rootDir);
 		const contextDataFactoryModule = options.contextDataFactoryModule == null ? void 0 : resolveModulePath(options.contextDataFactoryModule, nuxt.options.alias, rootDir);
 		const middlewareFilename = "fedify-nuxt-options.mjs";
+		const middlewareModule = resolveRuntimeServerPath(resolver, "middleware.js");
+		const pluginModule = resolveRuntimeServerPath(resolver, "plugin.js");
 		addServerTemplate({
 			filename: middlewareFilename,
 			getContents: () => {
-				const imports = [`import * as federationModule from ${JSON.stringify(federationModule)};`, `import { createFedifyMiddleware } from ${JSON.stringify(resolver.resolve("../src/runtime/server/middleware.ts"))};`];
+				const imports = [`import * as federationModule from ${JSON.stringify(federationModule)};`, `import { createFedifyMiddleware } from ${JSON.stringify(middlewareModule)};`];
 				if (contextDataFactoryModule != null) imports.push(`import * as contextFactoryModule from ${JSON.stringify(contextDataFactoryModule)};`);
 				return [
 					...imports,
@@ -61,7 +66,7 @@ const fedifyNuxtModule = defineNuxtModule({
 			middleware: true,
 			handler: middlewareFilename
 		});
-		addServerPlugin(resolver.resolve("../src/runtime/server/plugin.ts"));
+		addServerPlugin(pluginModule);
 	}
 });
 //#endregion

package/dist/runtime/server/middleware.cjs

@@ -0,0 +1,24 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_logic = require("../../logic-CVtLv4lJ.cjs");
+let h3 = require("h3");
+//#region src/runtime/server/middleware.ts
+function assertFederation(federation) {
+	const candidate = federation;
+	if (candidate == null || typeof candidate.fetch !== "function") throw new TypeError("@fedify/nuxt: Federation instance is missing. Export default Federation (or named 'federation') from the configured module.");
+}
+function createFedifyMiddleware(federation, contextDataFactory) {
+	assertFederation(federation);
+	return (0, h3.defineEventHandler)(async (event) => {
+		const request = (0, h3.toWebRequest)(event);
+		const contextData = typeof contextDataFactory === "function" ? await contextDataFactory(event, request) : void 0;
+		const result = await require_logic.fetchWithFedify(federation.fetch.bind(federation), request, contextData);
+		if (result.kind === "not-found") return;
+		if (result.kind === "not-acceptable") {
+			event.context[require_logic.DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] = true;
+			return;
+		}
+		return result.response;
+	});
+}
+//#endregion
+exports.createFedifyMiddleware = createFedifyMiddleware;

package/dist/runtime/server/middleware.d.cts

@@ -0,0 +1,7 @@
+import * as _$h3 from "h3";
+import { H3Event } from "h3";
+
+//#region src/runtime/server/middleware.d.ts
+declare function createFedifyMiddleware(federation: unknown, contextDataFactory?: (event: H3Event, request: Request) => unknown): _$h3.EventHandler<_$h3.EventHandlerRequest, Promise<Response>>;
+//#endregion
+export { createFedifyMiddleware };

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

@@ -0,0 +1,7 @@
+import * as _$h3 from "h3";
+import { H3Event } from "h3";
+
+//#region src/runtime/server/middleware.d.ts
+declare function createFedifyMiddleware(federation: unknown, contextDataFactory?: (event: H3Event, request: Request) => unknown): _$h3.EventHandler<_$h3.EventHandlerRequest, Promise<Response>>;
+//#endregion
+export { createFedifyMiddleware };

package/dist/runtime/server/middleware.js

@@ -0,0 +1,23 @@
+import { r as DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY, t as fetchWithFedify } from "../../logic-66Hndkgv.js";
+import { defineEventHandler, toWebRequest } from "h3";
+//#region src/runtime/server/middleware.ts
+function assertFederation(federation) {
+	const candidate = federation;
+	if (candidate == null || typeof candidate.fetch !== "function") throw new TypeError("@fedify/nuxt: Federation instance is missing. Export default Federation (or named 'federation') from the configured module.");
+}
+function createFedifyMiddleware(federation, contextDataFactory) {
+	assertFederation(federation);
+	return defineEventHandler(async (event) => {
+		const request = toWebRequest(event);
+		const contextData = typeof contextDataFactory === "function" ? await contextDataFactory(event, request) : void 0;
+		const result = await fetchWithFedify(federation.fetch.bind(federation), request, contextData);
+		if (result.kind === "not-found") return;
+		if (result.kind === "not-acceptable") {
+			event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] = true;
+			return;
+		}
+		return result.response;
+	});
+}
+//#endregion
+export { createFedifyMiddleware };

package/dist/runtime/server/plugin.cjs

@@ -0,0 +1,18 @@
+const require_logic = require("../../logic-CVtLv4lJ.cjs");
+let h3 = require("h3");
+//#region src/runtime/server/plugin.ts
+const fedifyPlugin = (nitroApp) => {
+	nitroApp.hooks.hook("beforeResponse", (event, payload) => {
+		const deferred = event.context[require_logic.DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] === true;
+		delete event.context[require_logic.DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY];
+		const negotiatedResponse = require_logic.resolveDeferredNotAcceptable(deferred, (0, h3.getResponseStatus)(event), event.context.matchedRoute != null);
+		if (negotiatedResponse == null) return;
+		(0, h3.setResponseStatus)(event, negotiatedResponse.status);
+		negotiatedResponse.headers.forEach((value, key) => {
+			(0, h3.setResponseHeader)(event, key, value);
+		});
+		payload.body = require_logic.NOT_ACCEPTABLE_BODY;
+	});
+};
+//#endregion
+module.exports = fedifyPlugin;

package/dist/runtime/server/plugin.d.cts

@@ -0,0 +1,14 @@
+import { H3Event } from "h3";
+
+//#region src/runtime/server/plugin.d.ts
+interface ResponsePayload {
+  body?: unknown;
+}
+interface MinimalNitroApp {
+  hooks: {
+    hook(name: "beforeResponse", callback: (event: H3Event, payload: ResponsePayload) => void): void;
+  };
+}
+type NitroAppPlugin = (nitroApp: MinimalNitroApp) => void;
+declare const fedifyPlugin: NitroAppPlugin;
+export = fedifyPlugin;

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

@@ -0,0 +1,15 @@
+import { H3Event } from "h3";
+
+//#region src/runtime/server/plugin.d.ts
+interface ResponsePayload {
+  body?: unknown;
+}
+interface MinimalNitroApp {
+  hooks: {
+    hook(name: "beforeResponse", callback: (event: H3Event, payload: ResponsePayload) => void): void;
+  };
+}
+type NitroAppPlugin = (nitroApp: MinimalNitroApp) => void;
+declare const fedifyPlugin: NitroAppPlugin;
+//#endregion
+export { fedifyPlugin as default };

package/dist/runtime/server/plugin.js

@@ -0,0 +1,18 @@
+import { i as NOT_ACCEPTABLE_BODY, n as resolveDeferredNotAcceptable, r as DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY } from "../../logic-66Hndkgv.js";
+import { getResponseStatus, setResponseHeader, setResponseStatus } from "h3";
+//#region src/runtime/server/plugin.ts
+const fedifyPlugin = (nitroApp) => {
+	nitroApp.hooks.hook("beforeResponse", (event, payload) => {
+		const deferred = event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] === true;
+		delete event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY];
+		const negotiatedResponse = resolveDeferredNotAcceptable(deferred, getResponseStatus(event), event.context.matchedRoute != null);
+		if (negotiatedResponse == null) return;
+		setResponseStatus(event, negotiatedResponse.status);
+		negotiatedResponse.headers.forEach((value, key) => {
+			setResponseHeader(event, key, value);
+		});
+		payload.body = NOT_ACCEPTABLE_BODY;
+	});
+};
+//#endregion
+export { fedifyPlugin as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/nuxt",
-  "version": "2.2.0-dev.898+44ea8f2f",
+  "version": "2.2.0-dev.924+c82ee90a",
   "description": "Integrate Fedify with Nuxt",
   "keywords": [
     "Fedify",
@@ -46,18 +46,17 @@
   },
   "files": [
     "dist/",
-    "src/runtime/",
     "package.json"
   ],
   "peerDependencies": {
-    "@nuxt/kit": "^4.4.0",
+    "@nuxt/kit": "^4.4.2",
+    "@nuxt/schema": "^4.4.2",
     "h3": "^1.15.0",
     "nuxt": "^4.4.2",
-    "@fedify/fedify": "^2.2.0-dev.898+44ea8f2f"
+    "@fedify/fedify": "^2.2.0-dev.924+c82ee90a"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",
-    "@nuxt/schema": "^4.4.0",
     "tsdown": "^0.21.6",
     "typescript": "^5.9.2",
     "@fedify/fixture": "^2.0.0"
@@ -66,6 +65,7 @@
     "build:self": "tsdown",
     "build": "pnpm --filter @fedify/nuxt... run build:self",
     "prepublish": "pnpm build",
+    "pretest": "pnpm build:self",
     "test": "node --experimental-transform-types --test"
   }
 }

package/src/runtime/server/lib.ts

@@ -1,4 +0,0 @@
-export const NOT_ACCEPTABLE_BODY = "Not acceptable";
-
-export const DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY =
-  "__fedify_deferred_not_acceptable__";

package/src/runtime/server/logic.test.ts

@@ -1,50 +0,0 @@
-import { test } from "@fedify/fixture";
-import { equal, ok, strictEqual } from "node:assert/strict";
-import { fetchWithFedify, resolveDeferredNotAcceptable } from "./logic.ts";
-
-test(
-  "genuine handler 406 must be classified as handled",
-  async () => {
-    const handlerBody = JSON.stringify({ error: "custom reason" });
-    const handlerResponse = new Response(handlerBody, {
-      status: 406,
-      headers: { "Content-Type": "application/json" },
-    });
-
-    const result = await fetchWithFedify(
-      () => Promise.resolve(handlerResponse),
-      new Request("https://example.com/inbox"),
-      undefined,
-    );
-
-    equal(result.kind, "handled");
-    if (result.kind === "handled") {
-      strictEqual(result.response, handlerResponse);
-    }
-  },
-);
-
-test(
-  "framework intentional 404 on shared route must not become 406",
-  () => {
-    // When a route handler ran (routeHandled=true), preserve the
-    // framework's 404 instead of rewriting it to 406.
-    const result = resolveDeferredNotAcceptable(true, 404, true);
-    equal(
-      result,
-      undefined,
-      "should preserve framework 404 when route was handled",
-    );
-  },
-);
-
-test(
-  "deferred 406 fires when no route handler matched",
-  () => {
-    // When no route handler matched (routeHandled=false), the 404
-    // is a genuine route miss and should be converted to 406.
-    const result = resolveDeferredNotAcceptable(true, 404, false);
-    ok(result, "should return 406 when no route handled the request");
-    equal(result!.status, 406);
-  },
-);

package/src/runtime/server/logic.ts

@@ -1,60 +0,0 @@
-import type { FederationFetchOptions } from "@fedify/fedify/federation";
-import { NOT_ACCEPTABLE_BODY } from "./lib.ts";
-
-export { DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY } from "./lib.ts";
-
-const DUMMY_NOT_FOUND_RESPONSE = new Response("", { status: 404 });
-
-const createNotAcceptableResponse = () =>
-  new Response(NOT_ACCEPTABLE_BODY, {
-    status: 406,
-    headers: {
-      "Content-Type": "text/plain",
-      Vary: "Accept",
-    },
-  });
-
-export type FetchResult =
-  | { kind: "handled"; response: Response }
-  | { kind: "not-found" }
-  | { kind: "not-acceptable" };
-
-export async function fetchWithFedify<TContextData = unknown>(
-  fetcher: (
-    request: Request,
-    options: FederationFetchOptions<TContextData>,
-  ) => Promise<Response>,
-  request: Request,
-  contextData: TContextData,
-): Promise<FetchResult> {
-  let notAcceptableResponse: Response | null = null;
-
-  const response = await fetcher(request, {
-    contextData,
-    onNotFound: () => DUMMY_NOT_FOUND_RESPONSE,
-    onNotAcceptable: () => {
-      notAcceptableResponse = createNotAcceptableResponse();
-      return notAcceptableResponse;
-    },
-  });
-
-  if (response === DUMMY_NOT_FOUND_RESPONSE) {
-    return { kind: "not-found" };
-  }
-
-  if (notAcceptableResponse != null && response === notAcceptableResponse) {
-    return { kind: "not-acceptable" };
-  }
-
-  return { kind: "handled", response };
-}
-
-export function resolveDeferredNotAcceptable(
-  isDeferred: boolean,
-  frameworkStatus: number,
-  routeHandled?: boolean,
-): Response | undefined {
-  if (!isDeferred || frameworkStatus !== 404) return undefined;
-  if (routeHandled) return undefined;
-  return createNotAcceptableResponse();
-}

package/src/runtime/server/middleware.ts

@@ -1,44 +0,0 @@
-import type { Federation } from "@fedify/fedify/federation";
-import { defineEventHandler, type H3Event, toWebRequest } from "h3";
-import { DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY } from "./lib.ts";
-import { fetchWithFedify } from "./logic.ts";
-
-function assertFederation(
-  federation: unknown,
-): asserts federation is Federation<unknown> {
-  const candidate = federation as { fetch?: unknown } | null | undefined;
-  if (candidate == null || typeof candidate.fetch !== "function") {
-    throw new TypeError(
-      "@fedify/nuxt: Federation instance is missing. " +
-        "Export default Federation (or named 'federation') from the configured module.",
-    );
-  }
-}
-
-export function createFedifyMiddleware(
-  federation: unknown,
-  contextDataFactory?: (event: H3Event, request: Request) => unknown,
-) {
-  assertFederation(federation);
-
-  return defineEventHandler(async (event) => {
-    const request = toWebRequest(event);
-    const contextData = typeof contextDataFactory === "function"
-      ? await contextDataFactory(event, request)
-      : undefined;
-
-    const result = await fetchWithFedify(
-      federation.fetch.bind(federation),
-      request,
-      contextData,
-    );
-
-    if (result.kind === "not-found") return;
-    if (result.kind === "not-acceptable") {
-      event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] = true;
-      return;
-    }
-
-    return result.response;
-  });
-}

package/src/runtime/server/plugin.test.ts

@@ -1,118 +0,0 @@
-import { test } from "@fedify/fixture";
-import type { H3Event } from "h3";
-import { equal, ok } from "node:assert/strict";
-import {
-  DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY,
-  NOT_ACCEPTABLE_BODY,
-} from "./lib.ts";
-import fedifyPlugin from "./plugin.ts";
-
-interface MockResponse {
-  statusCode: number;
-  statusMessage?: string;
-  setHeader(name: string, value: string): void;
-  getHeader(name: string): string | undefined;
-}
-
-function createMockResponse(statusCode: number): MockResponse {
-  const headers = new Map<string, string>();
-  return {
-    statusCode,
-    setHeader(name: string, value: string) {
-      headers.set(name.toLowerCase(), value);
-    },
-    getHeader(name: string) {
-      return headers.get(name.toLowerCase());
-    },
-  };
-}
-
-function registerBeforeResponseHook() {
-  let callback:
-    | ((event: H3Event, payload: { body?: unknown }) => void)
-    | undefined;
-
-  fedifyPlugin({
-    hooks: {
-      hook(name, registeredCallback) {
-        equal(name, "beforeResponse");
-        callback = registeredCallback;
-      },
-    },
-  });
-
-  ok(callback, "beforeResponse hook should be registered");
-  return callback;
-}
-
-test(
-  "plugin rewrites deferred 404 without matched route to 406",
-  () => {
-    const beforeResponse = registerBeforeResponseHook();
-    const response = createMockResponse(404);
-    const payload = { body: "original body" };
-    const event = {
-      context: {
-        [DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY]: true,
-      },
-      node: { res: response },
-    };
-
-    beforeResponse(event as unknown as H3Event, payload);
-
-    equal(response.statusCode, 406);
-    equal(response.getHeader("content-type"), "text/plain");
-    equal(response.getHeader("vary"), "Accept");
-    equal(payload.body, NOT_ACCEPTABLE_BODY);
-    equal(
-      event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY],
-      undefined,
-    );
-  },
-);
-
-test(
-  "plugin ignores 404 when deferred flag is absent",
-  () => {
-    const beforeResponse = registerBeforeResponseHook();
-    const response = createMockResponse(404);
-    const payload = { body: "regular 404" };
-    const event: H3Event = {
-      context: {},
-      node: { res: response },
-    } as unknown as H3Event;
-
-    beforeResponse(event, payload);
-
-    equal(response.statusCode, 404);
-    equal(response.getHeader("content-type"), undefined);
-    equal(payload.body, "regular 404");
-  },
-);
-
-test(
-  "plugin preserves shared-route 404 when Nuxt matched the route",
-  () => {
-    const beforeResponse = registerBeforeResponseHook();
-    const response = createMockResponse(404);
-    const payload = { body: "missing actor page" };
-    const event = {
-      context: {
-        [DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY]: true,
-        matchedRoute: {},
-      },
-      node: { res: response },
-    };
-
-    beforeResponse(event as unknown as H3Event, payload);
-
-    equal(response.statusCode, 404);
-    equal(response.getHeader("content-type"), undefined);
-    equal(response.getHeader("vary"), undefined);
-    equal(payload.body, "missing actor page");
-    equal(
-      event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY],
-      undefined,
-    );
-  },
-);

package/src/runtime/server/plugin.ts

@@ -1,49 +0,0 @@
-import type { H3Event } from "h3";
-import { getResponseStatus, setResponseHeader, setResponseStatus } from "h3";
-import {
-  DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY,
-  NOT_ACCEPTABLE_BODY,
-} from "./lib.ts";
-import { resolveDeferredNotAcceptable } from "./logic.ts";
-
-interface ResponsePayload {
-  body?: unknown;
-}
-
-interface MinimalNitroApp {
-  hooks: {
-    hook(
-      name: "beforeResponse",
-      callback: (event: H3Event, payload: ResponsePayload) => void,
-    ): void;
-  };
-}
-
-type NitroAppPlugin = (nitroApp: MinimalNitroApp) => void;
-
-const fedifyPlugin: NitroAppPlugin = (nitroApp: MinimalNitroApp) => {
-  nitroApp.hooks.hook(
-    "beforeResponse",
-    (event: H3Event, payload: ResponsePayload) => {
-      const deferred =
-        event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] === true;
-      delete event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY];
-
-      const negotiatedResponse = resolveDeferredNotAcceptable(
-        deferred,
-        getResponseStatus(event),
-        event.context.matchedRoute != null,
-      );
-      if (negotiatedResponse == null) return;
-
-      setResponseStatus(event, negotiatedResponse.status);
-      negotiatedResponse.headers.forEach((value: string, key: string) => {
-        setResponseHeader(event, key, value);
-      });
-
-      payload.body = NOT_ACCEPTABLE_BODY;
-    },
-  );
-};
-
-export default fedifyPlugin;