@qwik.dev/router 2.0.0-beta.4 → 2.0.0-beta.41

package/lib/middleware/aws-lambda/index.d.ts

@@ -1,19 +1,14 @@
-import { Http2ServerRequest } from 'http2';
-import { IncomingMessage } from 'http';
-import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
-import type { QwikCityPlan } from '@qwik.dev/router';
+import type { Http2ServerRequest } from 'node:http2';
+import type { IncomingMessage } from 'node:http';
+import type { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
 import type { QwikManifest } from '@qwik.dev/core/optimizer';
-import type { QwikRouterConfig } from '@qwik.dev/router';
 import type { Render } from '@qwik.dev/core/server';
 import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-import { ServerResponse } from 'http';
+import type { ServerResponse } from 'node:http';
 
 declare interface AwsOpt {
     render: Render;
     manifest?: QwikManifest;
-    qwikRouterConfig: QwikRouterConfig;
-    /** @deprecated Use `QwikRouterConfig` instead. Will be removed in V3 */
-    qwikCityPlan?: QwikCityPlan;
 }
 
 /**
@@ -23,13 +18,7 @@ declare interface AwsOpt {
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: AwsOpt): {
-    fixPath: (pathT: string) => string;
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
-    handle: (req: any, res: any) => void;
-};
+export declare function createQwikRouter(opts: AwsOpt): QwikRouterAwsLambdaMiddleware;
 
 /** @public */
 export declare interface PlatformAwsLambda extends Object {
@@ -41,6 +30,16 @@ export declare interface PlatformAwsLambda extends Object {
  */
 export declare type QwikCityAwsLambdaOptions = QwikRouterAwsLambdaOptions;
 
+/** @public */
+export declare interface QwikRouterAwsLambdaMiddleware {
+    fixPath: (pathT: string) => string;
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    handle: (req: any, res: any) => void;
+}
+
 /** @public */
 export declare interface QwikRouterAwsLambdaOptions extends ServerRenderOptions {
 }

package/lib/middleware/aws-lambda/index.mjs

@@ -1,55 +1,46 @@
-// packages/qwik-router/src/middleware/aws-lambda/index.ts
-import { createQwikRouter as createQwikRouterNode } from "@qwik.dev/router/middleware/node";
-function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  try {
-    const { router, staticFile, notFound } = createQwikRouterNode({
-      render: opts.render,
-      qwikRouterConfig: opts.qwikRouterConfig,
-      manifest: opts.manifest,
-      static: {
-        cacheControl: "public, max-age=31557600"
-      },
-      getOrigin(req) {
-        if (process.env.IS_OFFLINE) {
-          return `http://${req.headers.host}`;
-        }
-        return null;
-      }
-    });
-    const fixPath = (pathT) => {
-      if (opts.qwikRouterConfig.trailingSlash) {
-        const url = new URL(pathT, "http://aws-qwik.local");
-        if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) {
-          return pathT;
-        }
-        if (!url.pathname.endsWith("/")) {
-          return url.pathname + "/" + url.search;
-        }
-      }
-      return pathT;
-    };
-    const handle = (req, res) => {
-      req.url = fixPath(req.url);
-      staticFile(req, res, () => {
-        router(req, res, () => {
-          notFound(req, res, () => {
-          });
-        });
-      });
-    };
-    return { fixPath, router, staticFile, notFound, handle };
-  } catch (err) {
-    throw new Error(err.message);
-  }
+import { t as ensureSlash } from "../../chunks/pathname.mjs";
+import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+/** @public */ function createQwikRouter(opts) {
+	try {
+		const { router, staticFile } = createQwikRouter$1({
+			render: opts.render,
+			manifest: opts.manifest,
+			static: { cacheControl: "public, max-age=31557600" },
+			getOrigin(req) {
+				if (process.env.IS_OFFLINE) return `http://${req.headers.host}`;
+				return null;
+			}
+		});
+		const fixPath = (pathT) => {
+			if (!globalThis.__NO_TRAILING_SLASH__) {
+				const url = new URL(pathT, "http://aws-qwik.local");
+				if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) return pathT;
+				if (!url.pathname.endsWith("/")) return ensureSlash(url.pathname) + url.search;
+			}
+			return pathT;
+		};
+		const handle = (req, res) => {
+			req.url = fixPath(req.url);
+			staticFile(req, res, () => {
+				router(req, res, () => {});
+			});
+		};
+		/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_req, _res, next) => {
+			next();
+		};
+		return {
+			fixPath,
+			router,
+			staticFile,
+			notFound,
+			handle
+		};
+	} catch (err) {
+		throw new Error(err.message);
+	}
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
+export { createQwikCity, createQwikRouter };

package/lib/middleware/azure-swa/index.mjs

@@ -1,297 +1,87 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// node_modules/.pnpm/set-cookie-parser@2.6.0/node_modules/set-cookie-parser/lib/set-cookie.js
-var require_set_cookie = __commonJS({
-  "node_modules/.pnpm/set-cookie-parser@2.6.0/node_modules/set-cookie-parser/lib/set-cookie.js"(exports, module) {
-    "use strict";
-    var defaultParseOptions = {
-      decodeValues: true,
-      map: false,
-      silent: false
-    };
-    function isNonEmptyString(str) {
-      return typeof str === "string" && !!str.trim();
-    }
-    function parseString2(setCookieValue, options) {
-      var parts = setCookieValue.split(";").filter(isNonEmptyString);
-      var nameValuePairStr = parts.shift();
-      var parsed = parseNameValuePair(nameValuePairStr);
-      var name = parsed.name;
-      var value = parsed.value;
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
-      try {
-        value = options.decodeValues ? decodeURIComponent(value) : value;
-      } catch (e) {
-        console.error(
-          "set-cookie-parser encountered an error while decoding a cookie with value '" + value + "'. Set options.decodeValues to false to disable this feature.",
-          e
-        );
-      }
-      var cookie = {
-        name,
-        value
-      };
-      parts.forEach(function(part) {
-        var sides = part.split("=");
-        var key = sides.shift().trimLeft().toLowerCase();
-        var value2 = sides.join("=");
-        if (key === "expires") {
-          cookie.expires = new Date(value2);
-        } else if (key === "max-age") {
-          cookie.maxAge = parseInt(value2, 10);
-        } else if (key === "secure") {
-          cookie.secure = true;
-        } else if (key === "httponly") {
-          cookie.httpOnly = true;
-        } else if (key === "samesite") {
-          cookie.sameSite = value2;
-        } else {
-          cookie[key] = value2;
-        }
-      });
-      return cookie;
-    }
-    function parseNameValuePair(nameValuePairStr) {
-      var name = "";
-      var value = "";
-      var nameValueArr = nameValuePairStr.split("=");
-      if (nameValueArr.length > 1) {
-        name = nameValueArr.shift();
-        value = nameValueArr.join("=");
-      } else {
-        value = nameValuePairStr;
-      }
-      return { name, value };
-    }
-    function parse(input, options) {
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
-      if (!input) {
-        if (!options.map) {
-          return [];
-        } else {
-          return {};
-        }
-      }
-      if (input.headers) {
-        if (typeof input.headers.getSetCookie === "function") {
-          input = input.headers.getSetCookie();
-        } else if (input.headers["set-cookie"]) {
-          input = input.headers["set-cookie"];
-        } else {
-          var sch = input.headers[Object.keys(input.headers).find(function(key) {
-            return key.toLowerCase() === "set-cookie";
-          })];
-          if (!sch && input.headers.cookie && !options.silent) {
-            console.warn(
-              "Warning: set-cookie-parser appears to have been called on a request object. It is designed to parse Set-Cookie headers from responses, not Cookie headers from requests. Set the option {silent: true} to suppress this warning."
-            );
-          }
-          input = sch;
-        }
-      }
-      if (!Array.isArray(input)) {
-        input = [input];
-      }
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
-      if (!options.map) {
-        return input.filter(isNonEmptyString).map(function(str) {
-          return parseString2(str, options);
-        });
-      } else {
-        var cookies = {};
-        return input.filter(isNonEmptyString).reduce(function(cookies2, str) {
-          var cookie = parseString2(str, options);
-          cookies2[cookie.name] = cookie;
-          return cookies2;
-        }, cookies);
-      }
-    }
-    function splitCookiesString(cookiesString) {
-      if (Array.isArray(cookiesString)) {
-        return cookiesString;
-      }
-      if (typeof cookiesString !== "string") {
-        return [];
-      }
-      var cookiesStrings = [];
-      var pos = 0;
-      var start;
-      var ch;
-      var lastComma;
-      var nextStart;
-      var cookiesSeparatorFound;
-      function skipWhitespace() {
-        while (pos < cookiesString.length && /\s/.test(cookiesString.charAt(pos))) {
-          pos += 1;
-        }
-        return pos < cookiesString.length;
-      }
-      function notSpecialChar() {
-        ch = cookiesString.charAt(pos);
-        return ch !== "=" && ch !== ";" && ch !== ",";
-      }
-      while (pos < cookiesString.length) {
-        start = pos;
-        cookiesSeparatorFound = false;
-        while (skipWhitespace()) {
-          ch = cookiesString.charAt(pos);
-          if (ch === ",") {
-            lastComma = pos;
-            pos += 1;
-            skipWhitespace();
-            nextStart = pos;
-            while (pos < cookiesString.length && notSpecialChar()) {
-              pos += 1;
-            }
-            if (pos < cookiesString.length && cookiesString.charAt(pos) === "=") {
-              cookiesSeparatorFound = true;
-              pos = nextStart;
-              cookiesStrings.push(cookiesString.substring(start, lastComma));
-              start = pos;
-            } else {
-              pos = lastComma + 1;
-            }
-          } else {
-            pos += 1;
-          }
-        }
-        if (!cookiesSeparatorFound || pos >= cookiesString.length) {
-          cookiesStrings.push(cookiesString.substring(start, cookiesString.length));
-        }
-      }
-      return cookiesStrings;
-    }
-    module.exports = parse;
-    module.exports.parse = parse;
-    module.exports.parseString = parseString2;
-    module.exports.splitCookiesString = splitCookiesString;
-  }
-});
-
-// packages/qwik-router/src/middleware/azure-swa/index.ts
-var import_set_cookie_parser = __toESM(require_set_cookie(), 1);
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
 import { setServerPlatform } from "@qwik.dev/core/server";
-import { requestHandler } from "../request-handler/index.mjs";
-function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onAzureSwaRequest(context, req) {
-    try {
-      const url = new URL(req.headers["x-ms-original-url"]);
-      const options = {
-        method: req.method || "GET",
-        headers: req.headers,
-        body: req.bufferBody || req.rawBody || req.body
-      };
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        platform: context,
-        env: {
-          get(key) {
-            return process.env[key];
-          }
-        },
-        request: new Request(url, options),
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const response = {
-            status,
-            body: new Uint8Array(),
-            headers: {},
-            cookies: cookies.headers().map((header) => (0, import_set_cookie_parser.parseString)(header))
-          };
-          headers.forEach((value, key) => response.headers[key] = value);
-          return new WritableStream({
-            write(chunk) {
-              if (response.body instanceof Uint8Array) {
-                const newBuffer = new Uint8Array(response.body.length + chunk.length);
-                newBuffer.set(response.body);
-                newBuffer.set(chunk, response.body.length);
-                response.body = newBuffer;
-              }
-            },
-            close() {
-              resolve(response);
-            }
-          });
-        },
-        getClientConn: () => {
-          return {
-            ip: req.headers["x-forwarded-client-Ip"],
-            country: void 0
-          };
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
-      if (handledResponse) {
-        handledResponse.completion.then((err) => {
-          if (err) {
-            console.error(err);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
-      }
-      const notFoundHtml = isStaticPath(req.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return {
-        status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname },
-        body: notFoundHtml
-      };
-    } catch (e) {
-      console.error(e);
-      return {
-        status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8" }
-      };
-    }
-  }
-  return onAzureSwaRequest;
+import { getErrorHtml, isStaticPath, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+import { parseString } from "set-cookie-parser";
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onAzureSwaRequest(context, req) {
+		try {
+			const url = new URL(req.headers["x-ms-original-url"]);
+			const options = {
+				method: req.method || "GET",
+				headers: req.headers,
+				body: req.bufferBody || req.rawBody || req.body
+			};
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url,
+				platform: context,
+				env: { get(key) {
+					return process.env[key];
+				} },
+				request: new Request(url, options),
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const chunks = [];
+					let bodyLength = 0;
+					const response = {
+						status,
+						headers: {},
+						cookies: cookies.headers().map((header) => parseString(header))
+					};
+					headers.forEach((value, key) => response.headers[key] = value);
+					return new WritableStream({
+						write(chunk) {
+							chunks.push(chunk.slice());
+							bodyLength += chunk.length;
+						},
+						close() {
+							const body = new Uint8Array(bodyLength);
+							let offset = 0;
+							for (const chunk of chunks) {
+								body.set(chunk, offset);
+								offset += chunk.length;
+							}
+							response.body = body;
+							resolve(response);
+						}
+					});
+				},
+				getClientConn: () => {
+					return {
+						ip: req.headers["x-forwarded-client-Ip"],
+						country: void 0
+					};
+				}
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((err) => {
+					if (err) console.error(err);
+				});
+				const response = await handledResponse.response;
+				if (response) return response;
+			}
+			const notFoundHtml = !req.headers.accept?.includes("text/html") || isStaticPath(req.method || "GET", url) ? "Not Found" : getErrorHtml(404, "Not Found");
+			return {
+				status: 404,
+				headers: {
+					"Content-Type": "text/html; charset=utf-8",
+					"X-Not-Found": url.pathname
+				},
+				body: notFoundHtml
+			};
+		} catch (e) {
+			console.error(e);
+			return {
+				status: 500,
+				headers: { "Content-Type": "text/plain; charset=utf-8" }
+			};
+		}
+	}
+	return onAzureSwaRequest;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
+export { createQwikCity, createQwikRouter };

package/lib/middleware/bun/index.d.ts

@@ -8,11 +8,7 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterBunOptions): {
-    router: (request: Request) => Promise<Response | null>;
-    notFound: (request: Request) => Promise<Response>;
-    staticFile: (request: Request) => Promise<Response | null>;
-};
+export declare function createQwikRouter(opts: QwikRouterBunOptions): QwikRouterBunMiddleware;
 
 /**
  * @deprecated Use `QwikRouterBunOptions` instead. Will be removed in V3
@@ -20,6 +16,14 @@ export declare function createQwikRouter(opts: QwikRouterBunOptions): {
  */
 export declare type QwikCityBunOptions = QwikRouterBunOptions;
 
+/** @public */
+export declare interface QwikRouterBunMiddleware {
+    router: (request: Request) => Promise<Response | null>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (request: Request) => Promise<Response>;
+    staticFile: (request: Request) => Promise<Response | null>;
+}
+
 /** @public */
 export declare interface QwikRouterBunOptions extends ServerRenderOptions {
     /** Options for serving static files */
@@ -29,6 +33,17 @@ export declare interface QwikRouterBunOptions extends ServerRenderOptions {
         /** Set the Cache-Control header for all static files */
         cacheControl?: string;
     };
+    /**
+     * Provide a function that computes the origin of the server, used to resolve relative URLs and
+     * validate the request origin against CSRF attacks.
+     *
+     * When not specified, it defaults to the `ORIGIN` environment variable (if set).
+     *
+     * If `ORIGIN` is not set, it's derived from the incoming request, which is not recommended for
+     * production use.
+     */
+    getOrigin?: (request: Request) => string | null;
+    /** Provide a function that returns a `ClientConn` for the given request. */
     getClientConn?: (request: Request) => ClientConn;
 }