@qwik.dev/router 2.0.0-alpha.9 → 2.0.0-beta.10

package/lib/middleware/deno/index.mjs

@@ -1,12 +1,7 @@
-// packages/qwik-router/src/middleware/deno/index.ts
-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 { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
-
-// packages/qwik-router/src/middleware/request-handler/mime-types.ts
-var MIME_TYPES = {
+import { setServerPlatform as w } from "@qwik.dev/core/server";
+import { mergeHeadersCookies as C, requestHandler as y, isStaticPath as c, getNotFound as R } from "@qwik.dev/router/middleware/request-handler";
+import { join as m, fromFileUrl as b, extname as S } from "https://deno.land/std/path/mod.ts";
+const j = {
   "3gp": "video/3gpp",
   "3gpp": "video/3gpp",
   asf: "video/x-ms-asf",
@@ -56,140 +51,98 @@ var MIME_TYPES = {
   xml: "text/xml",
   zip: "application/zip"
 };
-
-// packages/qwik-router/src/middleware/deno/index.ts
-import { extname, fromFileUrl, join } from "https://deno.land/std/path/mod.ts";
-function createQwikRouter(opts) {
-  var _a;
-  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);
-  }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
-  async function router(request, info) {
+function E(n) {
+  n.qwikCityPlan && !n.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), n.qwikRouterConfig = n.qwikCityPlan), n.manifest && w(n.manifest);
+  const l = n.static?.root ?? m(b(import.meta.url), "..", "..", "dist");
+  async function p(t, e) {
     try {
-      const url = new URL(request.url);
-      const serverRequestEv = {
+      const i = {
         mode: "server",
         locale: void 0,
-        url,
+        url: new URL(t.url),
         // @ts-ignore
         env: Deno.env,
-        request,
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
+        request: t,
+        getWritableStream: (a, s, g, u) => {
+          const { readable: v, writable: h } = new TransformStream(), x = new Response(v, {
+            status: a,
+            headers: C(s, g)
           });
-          resolve(response);
-          return writable;
+          return u(x), h;
         },
         platform: {
-          ssr: true
+          ssr: !0
         },
-        getClientConn: () => {
-          return opts.getClientConn ? opts.getClientConn(request, info) : {
-            ip: info.remoteAddr.hostname
-          };
+        getClientConn: () => n.getClientConn ? n.getClientConn(t, e) : {
+          ip: e.remoteAddr.hostname
         }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
-      if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
-          }
+      }, r = await y(i, n);
+      if (r) {
+        r.completion.then((s) => {
+          s && console.error(s);
         });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
+        const a = await r.response;
+        if (a)
+          return a;
       }
       return null;
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
+    } catch (o) {
+      return console.error(o), new Response(String(o || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });
     }
   }
-  const notFound = async (request) => {
+  const d = async (t) => {
     try {
-      const url = new URL(request.url);
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return new Response(notFoundHtml, {
+      const e = new URL(t.url), o = !t.headers.get("accept")?.includes("text/html") || c(t.method || "GET", e) ? "Not Found" : R(e.pathname);
+      return new Response(o, {
         status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": e.pathname }
       });
     } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
+      return console.error(e), new Response(String(e || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });
     }
-  };
-  const openStaticFile = async (url) => {
-    const pathname = url.pathname;
-    const fileName = pathname.slice(url.pathname.lastIndexOf("/"));
-    let filePath;
-    if (fileName.includes(".")) {
-      filePath = join(staticFolder, pathname);
-    } else if (opts.qwikRouterConfig.trailingSlash) {
-      filePath = join(staticFolder, pathname + "index.html");
-    } else {
-      filePath = join(staticFolder, pathname, "index.html");
-    }
-    return {
-      filePath,
+  }, f = async (t) => {
+    const e = t.pathname, o = e.slice(t.pathname.lastIndexOf("/"));
+    let i;
+    return o.includes(".") ? i = m(l, e) : globalThis.__NO_TRAILING_SLASH__ ? i = m(l, e, "index.html") : i = m(l, e + "index.html"), {
+      filePath: i,
       // @ts-ignore
-      content: await Deno.open(filePath, { read: true })
+      content: await Deno.open(i, { read: !0 })
     };
   };
-  const staticFile = async (request) => {
-    var _a2;
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method || "GET", url)) {
-        const { filePath, content } = await openStaticFile(url);
-        const ext = extname(filePath).replace(/^\./, "");
-        return new Response(content.readable, {
-          status: 200,
-          headers: {
-            "content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
-            "Cache-Control": ((_a2 = opts.static) == null ? void 0 : _a2.cacheControl) || "max-age=3600"
-          }
+  return {
+    router: p,
+    notFound: d,
+    staticFile: async (t) => {
+      try {
+        const e = new URL(t.url);
+        if (c(t.method || "GET", e)) {
+          const { filePath: o, content: i } = await f(e), r = S(o).replace(/^\./, "");
+          return new Response(i.readable, {
+            status: 200,
+            headers: {
+              "content-type": j[r] || "text/plain; charset=utf-8",
+              "Cache-Control": n.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": "deno-server" }
         });
       }
-      return null;
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
-        status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
-      });
     }
   };
-  return {
-    router,
-    notFound,
-    staticFile
-  };
 }
-var createQwikCity = createQwikRouter;
+const _ = E;
 export {
-  createQwikCity,
-  createQwikRouter
+  _ as createQwikCity,
+  E as createQwikRouter
 };

package/lib/middleware/firebase/index.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@qwik.dev/router/middleware/node");function r(e){e.qwikCityPlan&&!e.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),e.qwikRouterConfig=e.qwikCityPlan);const{staticFile:n,notFound:o,router:a}=c.createQwikRouter({render:e.render,manifest:e.manifest,qwikRouterConfig:e.qwikRouterConfig,static:{cacheControl:"public, max-age=31557600"},getOrigin(i){return process.env.IS_OFFLINE?`http://${i.headers.host}`:null}});return(i,t)=>n(i,t,()=>{a(i,t,()=>o(i,t,()=>{}))})}const u=r;exports.createQwikCity=u;exports.createQwikRouter=r;

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

@@ -1,26 +1,26 @@
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: QwikRouterFirebaseOptions): (req: any, res: any) => Promise<void>;
-
-/** @public */
-export declare interface PlatformFirebase extends Object {
-}
-
-/**
- * @deprecated Use `QwikRouterFirebaseOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityFirebaseOptions = QwikRouterFirebaseOptions;
-
-/** @public */
-export declare interface QwikRouterFirebaseOptions extends ServerRenderOptions {
-}
-
-export { }
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: QwikRouterFirebaseOptions): (req: any, res: any) => Promise<void>;
+
+/** @public */
+export declare interface PlatformFirebase extends Object {
+}
+
+/**
+ * @deprecated Use `QwikRouterFirebaseOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityFirebaseOptions = QwikRouterFirebaseOptions;
+
+/** @public */
+export declare interface QwikRouterFirebaseOptions extends ServerRenderOptions {
+}
+
+export { }

package/lib/middleware/firebase/index.mjs

@@ -1,36 +1,24 @@
-// packages/qwik-router/src/middleware/firebase/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.");
-  }
-  const { staticFile, notFound, router } = createQwikRouterNode({
-    render: opts.render,
-    manifest: opts.manifest,
-    qwikRouterConfig: opts.qwikRouterConfig,
+import { createQwikRouter as a } from "@qwik.dev/router/middleware/node";
+function c(e) {
+  e.qwikCityPlan && !e.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), e.qwikRouterConfig = e.qwikCityPlan);
+  const { staticFile: r, notFound: n, router: o } = a({
+    render: e.render,
+    manifest: e.manifest,
+    qwikRouterConfig: e.qwikRouterConfig,
     static: {
       cacheControl: "public, max-age=31557600"
     },
-    getOrigin(req) {
-      if (process.env.IS_OFFLINE) {
-        return `http://${req.headers.host}`;
-      }
-      return null;
+    getOrigin(i) {
+      return process.env.IS_OFFLINE ? `http://${i.headers.host}` : null;
     }
   });
-  const qwikApp = (req, res) => {
-    return staticFile(req, res, () => {
-      router(req, res, () => notFound(req, res, () => {
-      }));
-    });
-  };
-  return qwikApp;
+  return (i, t) => r(i, t, () => {
+    o(i, t, () => n(i, t, () => {
+    }));
+  });
 }
-var createQwikCity = createQwikRouter;
+const k = c;
 export {
-  createQwikCity,
-  createQwikRouter
+  k as createQwikCity,
+  c as createQwikRouter
 };

package/lib/middleware/netlify-edge/index.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("@qwik.dev/core/server"),n=require("@qwik.dev/router/middleware/request-handler");function c(t){t.qwikCityPlan&&!t.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),t.qwikRouterConfig=t.qwikCityPlan),t.manifest&&p.setServerPlatform(t.manifest);async function l(r,o){try{const e=new URL(r.url);if(n.isStaticPath(r.method,e)||e.pathname.startsWith("/.netlify"))return o.next();const u={mode:"server",locale:void 0,url:e,env:Deno.env,request:r,getWritableStream:(i,a,f,m)=>{const{readable:h,writable:w}=new TransformStream,y=new Response(h,{status:i,headers:n.mergeHeadersCookies(a,f)});return m(y),w},getClientConn:()=>({ip:o.ip,country:o.geo.country?.code}),platform:o},s=await n.requestHandler(u,t);if(s){s.completion.then(a=>{a&&console.error(a)});const i=await s.response;if(i)return i}const d=!r.headers.get("accept")?.includes("text/html")||n.isStaticPath(r.method||"GET",e)?"Not Found":n.getNotFound(e.pathname);return new Response(d,{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":"netlify-edge"}})}}return l}const g=c;exports.createQwikCity=g;exports.createQwikRouter=c;

package/lib/middleware/netlify-edge/index.d.ts

@@ -1,27 +1,27 @@
-import type { Context } from '@netlify/edge-functions';
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: QwikRouterNetlifyOptions): (request: Request, context: Context) => Promise<Response>;
-
-/** @public */
-export declare interface PlatformNetlify extends Partial<Omit<Context, 'next' | 'cookies'>> {
-}
-
-/**
- * @deprecated Use `QwikRouterNetlifyOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityNetlifyOptions = QwikRouterNetlifyOptions;
-
-/** @public */
-export declare interface QwikRouterNetlifyOptions extends ServerRenderOptions {
-}
-
-export { }
+import type { Context } from '@netlify/edge-functions';
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: QwikRouterNetlifyOptions): (request: Request, context: Context) => Promise<Response>;
+
+/** @public */
+export declare interface PlatformNetlify extends Partial<Omit<Context, 'next' | 'cookies'>> {
+}
+
+/**
+ * @deprecated Use `QwikRouterNetlifyOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityNetlifyOptions = QwikRouterNetlifyOptions;
+
+/** @public */
+export declare interface QwikRouterNetlifyOptions extends ServerRenderOptions {
+}
+
+export { }

package/lib/middleware/netlify-edge/index.mjs

@@ -1,83 +1,55 @@
-// packages/qwik-router/src/middleware/netlify-edge/index.ts
-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 { mergeHeadersCookies, 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 onNetlifyEdgeRequest(request, context) {
+import { setServerPlatform as w } from "@qwik.dev/core/server";
+import { isStaticPath as s, mergeHeadersCookies as y, requestHandler as g, getNotFound as C } from "@qwik.dev/router/middleware/request-handler";
+function R(t) {
+  t.qwikCityPlan && !t.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), t.qwikRouterConfig = t.qwikCityPlan), t.manifest && w(t.manifest);
+  async function l(n, r) {
     try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) {
-        return context.next();
-      }
-      const serverRequestEv = {
+      const e = new URL(n.url);
+      if (s(n.method, e) || e.pathname.startsWith("/.netlify"))
+        return r.next();
+      const c = {
         mode: "server",
         locale: void 0,
-        url,
+        url: e,
         env: Deno.env,
-        request,
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
+        request: n,
+        getWritableStream: (o, a, u, d) => {
+          const { readable: f, writable: h } = new TransformStream(), p = new Response(f, {
+            status: o,
+            headers: y(a, u)
           });
-          resolve(response);
-          return writable;
-        },
-        getClientConn: () => {
-          var _a;
-          return {
-            ip: context.ip,
-            country: (_a = context.geo.country) == null ? void 0 : _a.code
-          };
+          return d(p), h;
         },
-        platform: context
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
-      if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
-          }
+        getClientConn: () => ({
+          ip: r.ip,
+          country: r.geo.country?.code
+        }),
+        platform: r
+      }, i = await g(c, t);
+      if (i) {
+        i.completion.then((a) => {
+          a && console.error(a);
         });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
+        const o = await i.response;
+        if (o)
+          return o;
       }
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return new Response(notFoundHtml, {
+      const m = !n.headers.get("accept")?.includes("text/html") || s(n.method || "GET", e) ? "Not Found" : C(e.pathname);
+      return new Response(m, {
         status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": e.pathname }
       });
     } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
+      return console.error(e), new Response(String(e || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "netlify-edge" }
       });
     }
   }
-  return onNetlifyEdgeRequest;
+  return l;
 }
-var createQwikCity = createQwikRouter;
+const S = R;
 export {
-  createQwikCity,
-  createQwikRouter
+  S as createQwikCity,
+  R as createQwikRouter
 };