@fedify/solidstart 2.4.0-pr.934.40 → 2.4.0

package/dist/index.cjs

@@ -1,8 +1,55 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let _solidjs_start_middleware = require("@solidjs/start/middleware");
-//#region src/index.ts
+//#region src/handlers.ts
 const notAcceptableResponses = /* @__PURE__ */ new WeakMap();
 /**
+* Creates the `onRequest` handler wired into SolidStart by
+* `fedifyMiddleware()`.
+*
+* @template TContextData A type of the context data for the
+*                        {@link Federation} object.
+* @param federation A {@link Federation} object to integrate with SolidStart.
+* @param createContextData A function to create context data for the
+*                          {@link Federation} object.
+* @returns The `onRequest` handler.
+*/
+function createOnRequestHandler(federation, createContextData) {
+	return async (event) => {
+		const response = await federation.fetch(event.request, {
+			contextData: await createContextData(event),
+			onNotFound: () => new Response("Not Found", { status: 404 }),
+			onNotAcceptable: () => new Response("Not Acceptable", {
+				status: 406,
+				headers: {
+					"Content-Type": "text/plain",
+					Vary: "Accept"
+				}
+			})
+		});
+		if (response.status === 404) return;
+		if (response.status === 406) {
+			notAcceptableResponses.set(event.request, response);
+			return;
+		}
+		return response;
+	};
+}
+/**
+* Handles the response before SolidStart sends it to the client.
+*
+* @param event The SolidStart {@link FetchEvent} for the current request.
+* @returns The stored 406 response if SolidStart could not handle the route.
+*/
+function onBeforeResponse(event) {
+	const stored = notAcceptableResponses.get(event.request);
+	if (stored != null) {
+		notAcceptableResponses.delete(event.request);
+		if ((event.response.status ?? 200) === 404) return stored;
+	}
+}
+//#endregion
+//#region src/index.ts
+/**
 * Create a SolidStart middleware to integrate with the {@link Federation}
 * object.
 *
@@ -24,32 +71,8 @@ const notAcceptableResponses = /* @__PURE__ */ new WeakMap();
 */
 function fedifyMiddleware(federation, createContextData = () => void 0) {
 	return (0, _solidjs_start_middleware.createMiddleware)({
-		onRequest: async (event) => {
-			const response = await federation.fetch(event.request, {
-				contextData: await createContextData(event),
-				onNotFound: () => new Response("Not Found", { status: 404 }),
-				onNotAcceptable: () => new Response("Not Acceptable", {
-					status: 406,
-					headers: {
-						"Content-Type": "text/plain",
-						Vary: "Accept"
-					}
-				})
-			});
-			if (response.status === 404) return;
-			if (response.status === 406) {
-				notAcceptableResponses.set(event.request, response);
-				return;
-			}
-			return response;
-		},
-		onBeforeResponse: (event) => {
-			const stored = notAcceptableResponses.get(event.request);
-			if (stored != null) {
-				notAcceptableResponses.delete(event.request);
-				if ((event.response.status ?? 200) === 404) return stored;
-			}
-		}
+		onRequest: createOnRequestHandler(federation, createContextData),
+		onBeforeResponse
 	});
 }
 //#endregion

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { Federation } from "@fedify/fedify/federation";
 import { createMiddleware } from "@solidjs/start/middleware";
 import { FetchEvent } from "@solidjs/start/server";
 
-//#region src/index.d.ts
+//#region src/handlers.d.ts
 /**
 * A factory function that creates the context data for the
 * {@link Federation} object.
@@ -13,6 +13,8 @@ import { FetchEvent } from "@solidjs/start/server";
 * @since 2.2.0
 */
 type ContextDataFactory<TContextData> = (event: FetchEvent) => TContextData | Promise<TContextData>;
+//#endregion
+//#region src/index.d.ts
 /**
 * Create a SolidStart middleware to integrate with the {@link Federation}
 * object.
@@ -35,4 +37,4 @@ type ContextDataFactory<TContextData> = (event: FetchEvent) => TContextData | Pr
 */
 declare function fedifyMiddleware<TContextData>(federation: Federation<TContextData>, createContextData?: ContextDataFactory<TContextData>): ReturnType<typeof createMiddleware>;
 //#endregion
-export { ContextDataFactory, fedifyMiddleware };
+export { type ContextDataFactory, fedifyMiddleware };

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { createMiddleware } from "@solidjs/start/middleware";
 import { Federation } from "@fedify/fedify/federation";
 import { FetchEvent } from "@solidjs/start/server";
 
-//#region src/index.d.ts
+//#region src/handlers.d.ts
 /**
 * A factory function that creates the context data for the
 * {@link Federation} object.
@@ -13,6 +13,8 @@ import { FetchEvent } from "@solidjs/start/server";
 * @since 2.2.0
 */
 type ContextDataFactory<TContextData> = (event: FetchEvent) => TContextData | Promise<TContextData>;
+//#endregion
+//#region src/index.d.ts
 /**
 * Create a SolidStart middleware to integrate with the {@link Federation}
 * object.
@@ -35,4 +37,4 @@ type ContextDataFactory<TContextData> = (event: FetchEvent) => TContextData | Pr
 */
 declare function fedifyMiddleware<TContextData>(federation: Federation<TContextData>, createContextData?: ContextDataFactory<TContextData>): ReturnType<typeof createMiddleware>;
 //#endregion
-export { ContextDataFactory, fedifyMiddleware };
+export { type ContextDataFactory, fedifyMiddleware };

package/dist/index.js

@@ -1,7 +1,54 @@
 import { createMiddleware } from "@solidjs/start/middleware";
-//#region src/index.ts
+//#region src/handlers.ts
 const notAcceptableResponses = /* @__PURE__ */ new WeakMap();
 /**
+* Creates the `onRequest` handler wired into SolidStart by
+* `fedifyMiddleware()`.
+*
+* @template TContextData A type of the context data for the
+*                        {@link Federation} object.
+* @param federation A {@link Federation} object to integrate with SolidStart.
+* @param createContextData A function to create context data for the
+*                          {@link Federation} object.
+* @returns The `onRequest` handler.
+*/
+function createOnRequestHandler(federation, createContextData) {
+	return async (event) => {
+		const response = await federation.fetch(event.request, {
+			contextData: await createContextData(event),
+			onNotFound: () => new Response("Not Found", { status: 404 }),
+			onNotAcceptable: () => new Response("Not Acceptable", {
+				status: 406,
+				headers: {
+					"Content-Type": "text/plain",
+					Vary: "Accept"
+				}
+			})
+		});
+		if (response.status === 404) return;
+		if (response.status === 406) {
+			notAcceptableResponses.set(event.request, response);
+			return;
+		}
+		return response;
+	};
+}
+/**
+* Handles the response before SolidStart sends it to the client.
+*
+* @param event The SolidStart {@link FetchEvent} for the current request.
+* @returns The stored 406 response if SolidStart could not handle the route.
+*/
+function onBeforeResponse(event) {
+	const stored = notAcceptableResponses.get(event.request);
+	if (stored != null) {
+		notAcceptableResponses.delete(event.request);
+		if ((event.response.status ?? 200) === 404) return stored;
+	}
+}
+//#endregion
+//#region src/index.ts
+/**
 * Create a SolidStart middleware to integrate with the {@link Federation}
 * object.
 *
@@ -23,32 +70,8 @@ const notAcceptableResponses = /* @__PURE__ */ new WeakMap();
 */
 function fedifyMiddleware(federation, createContextData = () => void 0) {
 	return createMiddleware({
-		onRequest: async (event) => {
-			const response = await federation.fetch(event.request, {
-				contextData: await createContextData(event),
-				onNotFound: () => new Response("Not Found", { status: 404 }),
-				onNotAcceptable: () => new Response("Not Acceptable", {
-					status: 406,
-					headers: {
-						"Content-Type": "text/plain",
-						Vary: "Accept"
-					}
-				})
-			});
-			if (response.status === 404) return;
-			if (response.status === 406) {
-				notAcceptableResponses.set(event.request, response);
-				return;
-			}
-			return response;
-		},
-		onBeforeResponse: (event) => {
-			const stored = notAcceptableResponses.get(event.request);
-			if (stored != null) {
-				notAcceptableResponses.delete(event.request);
-				if ((event.response.status ?? 200) === 404) return stored;
-			}
-		}
+		onRequest: createOnRequestHandler(federation, createContextData),
+		onBeforeResponse
 	});
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/solidstart",
-  "version": "2.4.0-pr.934.40+3331d302",
+  "version": "2.4.0",
   "description": "Integrate Fedify with SolidStart",
   "keywords": [
     "Fedify",
@@ -47,7 +47,7 @@
   ],
   "peerDependencies": {
     "@solidjs/start": "^1.3.0",
-    "@fedify/fedify": "^2.4.0-pr.934.40+3331d302"
+    "@fedify/fedify": "^2.4.0"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
@@ -56,6 +56,8 @@
   "scripts": {
     "build:self": "tsdown",
     "build": "pnpm --filter @fedify/solidstart... run build:self",
-    "prepublish": "pnpm build"
+    "prepublish": "pnpm build",
+    "test": "node --experimental-transform-types --test",
+    "test:bun": "bun test"
   }
 }