@qwik.dev/router 2.0.0-beta.1 → 2.0.0-beta.10

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@qwik.dev/router/middleware/node");function c(r){r.qwikCityPlan&&!r.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),r.qwikRouterConfig=r.qwikCityPlan);try{const{router:i,staticFile:n,notFound:a}=u.createQwikRouter({render:r.render,qwikRouterConfig:r.qwikRouterConfig,manifest:r.manifest,static:{cacheControl:"public, max-age=31557600"},getOrigin(e){return process.env.IS_OFFLINE?`http://${e.headers.host}`:null}}),o=e=>{if(!globalThis.__NO_TRAILING_SLASH__){const t=new URL(e,"http://aws-qwik.local");if(t.pathname.includes(".",t.pathname.lastIndexOf("/")))return e;if(!t.pathname.endsWith("/"))return t.pathname+"/"+t.search}return e};return{fixPath:o,router:i,staticFile:n,notFound:a,handle:(e,t)=>{e.url=o(e.url),n(e,t,()=>{i(e,t,()=>{a(e,t,()=>{})})})}}}catch(i){throw new Error(i.message)}}const l=c;exports.createQwikCity=l;exports.createQwikRouter=c;

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

@@ -11,8 +11,9 @@ import { ServerResponse } from 'http';
 declare interface AwsOpt {
     render: Render;
     manifest?: QwikManifest;
-    qwikRouterConfig: QwikRouterConfig;
-    /** @deprecated Use `QwikRouterConfig` instead. Will be removed in V3 */
+    /** @deprecated Not used */
+    qwikRouterConfig?: QwikRouterConfig;
+    /** @deprecated Not used */
     qwikCityPlan?: QwikCityPlan;
 }
 

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

@@ -1,55 +1,41 @@
-// 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.");
-  }
+import { createQwikRouter as c } from "@qwik.dev/router/middleware/node";
+function u(r) {
+  r.qwikCityPlan && !r.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), r.qwikRouterConfig = r.qwikCityPlan);
   try {
-    const { router, staticFile, notFound } = createQwikRouterNode({
-      render: opts.render,
-      qwikRouterConfig: opts.qwikRouterConfig,
-      manifest: opts.manifest,
+    const { router: n, staticFile: i, notFound: a } = c({
+      render: r.render,
+      qwikRouterConfig: r.qwikRouterConfig,
+      manifest: r.manifest,
       static: {
         cacheControl: "public, max-age=31557600"
       },
-      getOrigin(req) {
-        if (process.env.IS_OFFLINE) {
-          return `http://${req.headers.host}`;
-        }
-        return null;
+      getOrigin(e) {
+        return process.env.IS_OFFLINE ? `http://${e.headers.host}` : 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;
-        }
+    }), o = (e) => {
+      if (!globalThis.__NO_TRAILING_SLASH__) {
+        const t = new URL(e, "http://aws-qwik.local");
+        if (t.pathname.includes(".", t.pathname.lastIndexOf("/")))
+          return e;
+        if (!t.pathname.endsWith("/"))
+          return t.pathname + "/" + t.search;
       }
-      return pathT;
+      return e;
     };
-    const handle = (req, res) => {
-      req.url = fixPath(req.url);
-      staticFile(req, res, () => {
-        router(req, res, () => {
-          notFound(req, res, () => {
+    return { fixPath: o, router: n, staticFile: i, notFound: a, handle: (e, t) => {
+      e.url = o(e.url), i(e, t, () => {
+        n(e, t, () => {
+          a(e, t, () => {
           });
         });
       });
-    };
-    return { fixPath, router, staticFile, notFound, handle };
-  } catch (err) {
-    throw new Error(err.message);
+    } };
+  } catch (n) {
+    throw new Error(n.message);
   }
 }
-var createQwikCity = createQwikRouter;
+const s = u;
 export {
-  createQwikCity,
-  createQwikRouter
+  s as createQwikCity,
+  u as createQwikRouter
 };

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("@qwik.dev/core/server"),c=require("@qwik.dev/router/middleware/request-handler"),g=require("set-cookie-parser");function u(t){t.qwikCityPlan&&!t.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),t.qwikRouterConfig=t.qwikCityPlan),t.manifest&&b.setServerPlatform(t.manifest);async function l(y,e){try{const r=new URL(e.headers["x-ms-original-url"]),h={method:e.method||"GET",headers:e.headers,body:e.bufferBody||e.rawBody||e.body},f={mode:"server",locale:void 0,url:r,platform:y,env:{get(o){return process.env[o]}},request:new Request(r,h),getWritableStream:(o,i,m,p)=>{const n={status:o,body:new Uint8Array,headers:{},cookies:m.headers().map(a=>g.parseString(a))};return i.forEach((a,s)=>n.headers[s]=a),new WritableStream({write(a){if(n.body instanceof Uint8Array){const s=new Uint8Array(n.body.length+a.length);s.set(n.body),s.set(a,n.body.length),n.body=s}},close(){p(n)}})},getClientConn:()=>({ip:e.headers["x-forwarded-client-Ip"],country:void 0})},d=await c.requestHandler(f,t);if(d){d.completion.then(i=>{i&&console.error(i)});const o=await d.response;if(o)return o}const w=!e.headers.accept?.includes("text/html")||c.isStaticPath(e.method||"GET",r)?"Not Found":c.getNotFound(r.pathname);return{status:404,headers:{"Content-Type":"text/html; charset=utf-8","X-Not-Found":r.pathname},body:w}}catch(r){return console.error(r),{status:500,headers:{"Content-Type":"text/plain; charset=utf-8"}}}}return l}const C=u;exports.createQwikCity=C;exports.createQwikRouter=u;

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

@@ -1,297 +1,74 @@
-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) {
+import { setServerPlatform as w } from "@qwik.dev/core/server";
+import { requestHandler as p, isStaticPath as b, getNotFound as g } from "@qwik.dev/router/middleware/request-handler";
+import { parseString as C } from "set-cookie-parser";
+function v(t) {
+  t.qwikCityPlan && !t.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), t.qwikRouterConfig = t.qwikCityPlan), t.manifest && w(t.manifest);
+  async function c(u, e) {
     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 = {
+      const n = new URL(e.headers["x-ms-original-url"]), l = {
+        method: e.method || "GET",
+        headers: e.headers,
+        body: e.bufferBody || e.rawBody || e.body
+      }, f = {
         mode: "server",
         locale: void 0,
-        url,
-        platform: context,
+        url: n,
+        platform: u,
         env: {
-          get(key) {
-            return process.env[key];
+          get(o) {
+            return process.env[o];
           }
         },
-        request: new Request(url, options),
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const response = {
-            status,
+        request: new Request(n, l),
+        getWritableStream: (o, i, m, y) => {
+          const r = {
+            status: o,
             body: new Uint8Array(),
             headers: {},
-            cookies: cookies.headers().map((header) => (0, import_set_cookie_parser.parseString)(header))
+            cookies: m.headers().map((a) => C(a))
           };
-          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;
+          return i.forEach((a, s) => r.headers[s] = a), new WritableStream({
+            write(a) {
+              if (r.body instanceof Uint8Array) {
+                const s = new Uint8Array(r.body.length + a.length);
+                s.set(r.body), s.set(a, r.body.length), r.body = s;
               }
             },
             close() {
-              resolve(response);
+              y(r);
             }
           });
         },
-        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);
-          }
+        getClientConn: () => ({
+          ip: e.headers["x-forwarded-client-Ip"],
+          country: void 0
+        })
+      }, d = await p(f, t);
+      if (d) {
+        d.completion.then((i) => {
+          i && console.error(i);
         });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
+        const o = await d.response;
+        if (o)
+          return o;
       }
-      const notFoundHtml = isStaticPath(req.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
+      const h = !e.headers.accept?.includes("text/html") || b(e.method || "GET", n) ? "Not Found" : g(n.pathname);
       return {
         status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname },
-        body: notFoundHtml
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": n.pathname },
+        body: h
       };
-    } catch (e) {
-      console.error(e);
-      return {
+    } catch (n) {
+      return console.error(n), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8" }
       };
     }
   }
-  return onAzureSwaRequest;
+  return c;
 }
-var createQwikCity = createQwikRouter;
+const x = v;
 export {
-  createQwikCity,
-  createQwikRouter
+  x as createQwikCity,
+  v as createQwikRouter
 };

package/lib/middleware/bun/index.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("@qwik.dev/core/server"),s=require("@qwik.dev/router/middleware/request-handler"),c=require("node:path");var d=typeof document<"u"?document.currentScript:null;const R={"3gp":"video/3gpp","3gpp":"video/3gpp",asf:"video/x-ms-asf",asx:"video/x-ms-asf",avi:"video/x-msvideo",avif:"image/avif",bmp:"image/x-ms-bmp",css:"text/css",flv:"video/x-flv",gif:"image/gif",htm:"text/html",html:"text/html",ico:"image/x-icon",jng:"image/x-jng",jpeg:"image/jpeg",jpg:"image/jpeg",js:"application/javascript",json:"application/json",kar:"audio/midi",m4a:"audio/x-m4a",m4v:"video/x-m4v",mid:"audio/midi",midi:"audio/midi",mng:"video/x-mng",mov:"video/quicktime",mp3:"audio/mpeg",mp4:"video/mp4",mpeg:"video/mpeg",mpg:"video/mpeg",ogg:"audio/ogg",pdf:"application/pdf",png:"image/png",rar:"application/x-rar-compressed",shtml:"text/html",svg:"image/svg+xml",svgz:"image/svg+xml",tif:"image/tiff",tiff:"image/tiff",ts:"video/mp2t",txt:"text/plain",wbmp:"image/vnd.wap.wbmp",webm:"video/webm",webp:"image/webp",wmv:"video/x-ms-wmv",woff:"font/woff",woff2:"font/woff2",xml:"text/xml",zip:"application/zip"};function p(i){i.qwikCityPlan&&!i.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),i.qwikRouterConfig=i.qwikCityPlan),globalThis.TextEncoderStream||=s._TextEncoderStream_polyfill,i.manifest&&C.setServerPlatform(i.manifest);const m=i.static?.root??c.join(Bun.fileURLToPath(typeof document>"u"?require("url").pathToFileURL(__filename).href:d&&d.tagName.toUpperCase()==="SCRIPT"&&d.src||new URL("index.cjs",document.baseURI).href),"..","..","dist");async function f(t){try{const r={mode:"server",locale:void 0,url:new URL(t.url),env:{get(o){return Bun.env[o]}},request:t,getWritableStream:(o,a,l,u)=>{const{readable:v,writable:w}=new TransformStream,x=new Response(v,{status:o,headers:s.mergeHeadersCookies(a,l)});return u(x),w},platform:{ssr:!0},getClientConn:()=>i.getClientConn?i.getClientConn(t):{}},n=await s.requestHandler(r,i);if(n){n.completion.then(a=>{a&&console.error(a)});const o=await n.response;if(o){const a=o.status,l=o.headers.get("Location");return a>=301&&a<=308&&l?new Response(null,o):o}}return null}catch(e){return console.error(e),new Response(String(e||"Error"),{status:500,headers:{"Content-Type":"text/plain; charset=utf-8","X-Error":"bun-server"}})}}const g=async t=>{try{const e=new URL(t.url),r=!t.headers.get("accept")?.includes("text/html")||s.isStaticPath(t.method||"GET",e)?"Not Found":s.getNotFound(e.pathname);return new Response(r,{status:404,headers:{"Content-Type":"text/html; charset=utf-8","X-Not-Found":e.pathname}})}catch(e){return console.error(e),new Response(String(e||"Error"),{status:500,headers:{"Content-Type":"text/plain; charset=utf-8","X-Error":"bun-server"}})}},h=async t=>{const e=t.pathname,r=e.slice(t.pathname.lastIndexOf("/"));let n;return r.includes(".")?n=c.join(m,e):globalThis.__NO_TRAILING_SLASH__?n=c.join(m,e,"index.html"):n=c.join(m,e+"index.html"),{filePath:n,content:Bun.file(n)}};return{router:f,notFound:g,staticFile:async t=>{try{const e=new URL(t.url);if(s.isStaticPath(t.method||"GET",e)){const{filePath:r,content:n}=await h(e);if(!await n.exists())return new Response("Not Found",{status:404,headers:{"Content-Type":"text/plain; charset=utf-8","X-Not-Found":e.pathname}});const o=c.extname(r).replace(/^\./,"");return new Response(await n.stream(),{status:200,headers:{"content-type":R[o]||"text/plain; charset=utf-8","Cache-Control":i.static?.cacheControl||"max-age=3600"}})}return null}catch(e){return console.error(e),new Response(String(e||"Error"),{status:500,headers:{"Content-Type":"text/plain; charset=utf-8","X-Error":"bun-server"}})}}}}const y=p;exports.createQwikCity=y;exports.createQwikRouter=p;