bun-plugin-stx 0.2.415 → 0.2.416

package/dist/chunk-fqkc01ey.js

@@ -0,0 +1,125 @@
+// @bun
+// ../router/src/layout-metadata.ts
+function deriveLayoutGroup(layoutPath) {
+  const normalized = layoutPath.replace(/\\/g, "/");
+  const segments = normalized.split("/").filter(Boolean);
+  const layoutsIndex = segments.lastIndexOf("layouts");
+  const layoutSegment = layoutsIndex >= 0 ? segments[layoutsIndex + 1] : segments.at(-1);
+  if (!layoutSegment)
+    return "app";
+  return layoutSegment.replace(/\.stx$/i, "") || "app";
+}
+function extractLayoutMetadata(html) {
+  const layoutMeta = html.match(/<meta\b[^>]*name=["']stx-layout["'][^>]*content=["']([^"']+)["'][^>]*>/i);
+  const groupMeta = html.match(/<meta\b[^>]*name=["']stx-layout-group["'][^>]*content=["']([^"']+)["'][^>]*>/i);
+  const layoutComment = html.match(/<!--\s*stx-layout:\s*([^ ]+)\s*-->/i);
+  const layout = layoutMeta?.[1] || layoutComment?.[1] || "";
+  return {
+    layout,
+    group: groupMeta?.[1] || deriveLayoutGroup(layout)
+  };
+}
+
+// ../router/src/file-requests.ts
+var FILE_REQUEST_EXTENSIONS = Object.freeze([
+  "ico",
+  "png",
+  "jpg",
+  "jpeg",
+  "gif",
+  "webp",
+  "avif",
+  "svg",
+  "bmp",
+  "tif",
+  "tiff",
+  "heic",
+  "css",
+  "js",
+  "mjs",
+  "cjs",
+  "map",
+  "wasm",
+  "webmanifest",
+  "json",
+  "xml",
+  "txt",
+  "rss",
+  "atom",
+  "woff",
+  "woff2",
+  "ttf",
+  "otf",
+  "eot",
+  "mp3",
+  "mp4",
+  "m4a",
+  "m4v",
+  "mov",
+  "webm",
+  "ogg",
+  "ogv",
+  "oga",
+  "wav",
+  "flac",
+  "avi",
+  "mkv",
+  "pdf",
+  "csv",
+  "doc",
+  "docx",
+  "xls",
+  "xlsx",
+  "ppt",
+  "pptx",
+  "rtf",
+  "odt",
+  "zip",
+  "gz",
+  "tgz",
+  "tar",
+  "rar",
+  "7z",
+  "bz2",
+  "xz",
+  "php",
+  "phtml",
+  "asp",
+  "aspx",
+  "jsp",
+  "cgi",
+  "env",
+  "ini",
+  "yml",
+  "yaml",
+  "toml",
+  "sql",
+  "bak",
+  "old",
+  "swp",
+  "log",
+  "conf",
+  "cfg",
+  "exe",
+  "dmg",
+  "pkg",
+  "apk",
+  "ipa",
+  "msi",
+  "iso",
+  "bin",
+  "dll"
+]);
+var alternation = FILE_REQUEST_EXTENSIONS.flatMap((ext) => ext === ext.toUpperCase() ? [ext] : [ext, ext.toUpperCase()]).join("|");
+var FILE_SEGMENT = new RegExp(`\\.(?:${alternation})$`);
+var FILE_SEGMENT_GUARD = `(?![^/]*\\.(?:${alternation})$)`;
+function isFileRequestPath(pathname) {
+  let path = pathname;
+  const cut = path.search(/[?#]/);
+  if (cut !== -1)
+    path = path.slice(0, cut);
+  const last = path.slice(path.lastIndexOf("/") + 1);
+  return last.length > 0 && FILE_SEGMENT.test(last);
+}
+
+export { extractLayoutMetadata, FILE_SEGMENT_GUARD, isFileRequestPath };

package/dist/{chunk-jmbnee6y.js → chunk-zv29b5s3.js}

@@ -1,4 +1,8 @@
 // @bun
+import {
+  FILE_SEGMENT_GUARD
+} from "./chunk-fqkc01ey.js";
+
 // ../router/src/file-router.ts
 import fs3 from "fs";
 import path4 from "path";
@@ -86,7 +90,8 @@ function filePathToPattern(filePath, pagesDir) {
   route = route.replace(/:\.\.\.([^/]+)/g, ":$1*");
   return `/${route}`;
 }
-function patternToRegex(pattern) {
+function patternToRegex(pattern, options = {}) {
+  const guard = options.page ? FILE_SEGMENT_GUARD : "";
   const params = [];
   let regexStr = "";
   let i = 0;
@@ -95,7 +100,8 @@ function patternToRegex(pattern) {
     const optional = /^\/:([^/?*]+)\?/.exec(rest);
     if (optional) {
       params.push(optional[1]);
-      regexStr += "(?:/([^/]+))?";
+      const last = i + optional[0].length === pattern.length;
+      regexStr += `(?:/${last ? guard : ""}([^/]+))?`;
       i += optional[0].length;
       continue;
     }
@@ -109,7 +115,8 @@ function patternToRegex(pattern) {
     const required = /^:([^/?*]+)/.exec(rest);
     if (required) {
       params.push(required[1]);
-      regexStr += "([^/]+)";
+      const last = i + required[0].length === pattern.length;
+      regexStr += `${last ? guard : ""}([^/]+)`;
       i += required[0].length;
       continue;
     }
@@ -210,7 +217,7 @@ class Router {
         if (seenPatterns.has(identity))
           continue;
         seenPatterns.add(identity);
-        const { regex, params } = patternToRegex(pattern);
+        const { regex, params } = patternToRegex(pattern, { page: true });
         const layouts = config.layouts !== false ? resolveLayoutChain(filePath, dir) : [];
         this.routes.push({
           pattern,

package/dist/serve.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env bun
 // @bun
 import {
-  extractLayoutMetadata
-} from "./chunk-qcdy1k88.js";
+  extractLayoutMetadata,
+  FILE_SEGMENT_GUARD,
+  isFileRequestPath
+} from "./chunk-fqkc01ey.js";
 
 // src/serve.ts
 var {serve: bunServe, Glob } = globalThis.Bun;
@@ -9003,7 +9005,7 @@ function csrfCookieHeader(token, secure) {
   ].filter(Boolean).join("; ");
 }
 function buildDynamicRouteRegexes(fileRouteBase) {
-  const toPattern = (p) => p.replace(/\[\.\.\.([^\]]+)\]/g, "(.+)").replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
+  const toPattern = (p) => p.replace(/\[\.\.\.([^\]]+)\]/g, "(.+)").replace(/\[([^\]]+)\]/g, (param, _name, offset, whole) => offset + param.length === whole.length ? `${FILE_SEGMENT_GUARD}([^/]+)` : "([^/]+)").replace(/\//g, "\\/");
   const patterns = [new RegExp(`^${toPattern(fileRouteBase)}$`)];
   const noIndex = fileRouteBase.replace(/\/index$/, "");
   if (noIndex !== fileRouteBase)
@@ -9620,7 +9622,7 @@ function __stxOverlay(errs){
   const pageMiddlewarePatterns = [];
   function compileRoutePattern(urlPath) {
     const names = [];
-    const re = urlPath.split("/").map((seg) => {
+    const re = urlPath.split("/").map((seg, index, all) => {
       if (!seg)
         return "";
       const catchAll = seg.match(/^\[\.\.\.(.+)\]$/);
@@ -9631,7 +9633,7 @@ function __stxOverlay(errs){
       const param = seg.match(/^\[(.+)\]$/);
       if (param) {
         names.push(param[1]);
-        return "([^/]+)";
+        return index === all.length - 1 ? `${FILE_SEGMENT_GUARD}([^/]+)` : "([^/]+)";
       }
       return seg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     }).join("/");
@@ -9925,7 +9927,7 @@ function __stxOverlay(errs){
     rebuildDiscoveredPagePaths(kept);
     await indexPageMiddleware(kept);
     try {
-      const { Router } = await import("./chunk-jmbnee6y.js");
+      const { Router } = await import("./chunk-zv29b5s3.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName(), exclude: options.exclude });
       if (!options.quiet)
@@ -11243,10 +11245,16 @@ ${trailingPageScripts.join(`
                     }
                   }
                 }
-                if (path === "/favicon.ico") {
+                const isProd = isProductionServe();
+                if (path === "/favicon.ico" && !isProd) {
                   return new Response(null, { status: 204 });
                 }
-                const isProd = isProductionServe();
+                if (isFileRequestPath(path)) {
+                  return new Response("Not Found", {
+                    status: 404,
+                    headers: { "Content-Type": "text/plain; charset=utf-8", "Cache-Control": "no-store" }
+                  });
+                }
                 for (const custom404 of ["/404", "/errors/404"]) {
                   try {
                     const customContent = await getRoute(custom404, reqCtx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.415",
+  "version": "0.2.416",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.415",
-    "stx-router": "0.2.415"
+    "@stacksjs/stx": "0.2.416",
+    "stx-router": "0.2.416"
   }
 }

package/dist/chunk-qcdy1k88.js

@@ -1,23 +0,0 @@
-// @bun
-// ../router/src/layout-metadata.ts
-function deriveLayoutGroup(layoutPath) {
-  const normalized = layoutPath.replace(/\\/g, "/");
-  const segments = normalized.split("/").filter(Boolean);
-  const layoutsIndex = segments.lastIndexOf("layouts");
-  const layoutSegment = layoutsIndex >= 0 ? segments[layoutsIndex + 1] : segments.at(-1);
-  if (!layoutSegment)
-    return "app";
-  return layoutSegment.replace(/\.stx$/i, "") || "app";
-}
-function extractLayoutMetadata(html) {
-  const layoutMeta = html.match(/<meta\b[^>]*name=["']stx-layout["'][^>]*content=["']([^"']+)["'][^>]*>/i);
-  const groupMeta = html.match(/<meta\b[^>]*name=["']stx-layout-group["'][^>]*content=["']([^"']+)["'][^>]*>/i);
-  const layoutComment = html.match(/<!--\s*stx-layout:\s*([^ ]+)\s*-->/i);
-  const layout = layoutMeta?.[1] || layoutComment?.[1] || "";
-  return {
-    layout,
-    group: groupMeta?.[1] || deriveLayoutGroup(layout)
-  };
-}
-
-export { extractLayoutMetadata };