webspresso 0.0.69 → 0.0.70

package/index.d.ts

@@ -90,7 +90,10 @@ export function setAppContext(partial: { db?: DatabaseInstance | null }): void;
 export function mountPages(
   app: Application,
   options: Record<string, unknown>
-): unknown;
+): {
+  routeMetadata: unknown[];
+  registerDynamicFileRoutes: () => void;
+};
 
 export function filePathToRoute(filePath: string, pagesDir: string): string;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.69",
+  "version": "0.0.70",
   "description": "Minimal, production-ready SSR framework for Node.js with file-based routing, Nunjucks templating, built-in i18n, and CLI tooling",
   "main": "index.js",
   "types": "index.d.ts",

package/src/file-router.js

@@ -506,9 +506,17 @@ function mountPages(app, options) {
   
   // Sort routes: static before dynamic before catch-all; then more literal segments, then deeper paths
   const sortRoutes = (routes) => routes.sort(compareRouteRegistrationOrder);
-  
-  // Register API routes
-  for (const route of sortRoutes(apiRoutes)) {
+  sortRoutes(apiRoutes);
+  sortRoutes(ssrRoutes);
+
+  const apiStatic = apiRoutes.filter((r) => routeRegistrationMeta(r.routePath).tier === 0);
+  const apiDynamic = apiRoutes.filter((r) => routeRegistrationMeta(r.routePath).tier !== 0);
+  const ssrStatic = ssrRoutes.filter((r) => routeRegistrationMeta(r.routePath).tier === 0);
+  const ssrDynamic = ssrRoutes.filter((r) => routeRegistrationMeta(r.routePath).tier !== 0);
+
+  /** Register API routes (shared by static phase and dynamic phase). */
+  const registerApiRoutes = (routes) => {
+    for (const route of routes) {
     const handler = require(route.fullPath);
     const handlerFn = typeof handler === 'function' ? handler : handler.default || handler.handler;
     const routeMiddleware = handler.middleware;
@@ -582,10 +590,12 @@ function mountPages(app, options) {
     });
     
     log(`  ${route.method.toUpperCase()} ${route.routePath} -> ${route.file}`);
-  }
-  
-  // Register SSR routes
-  for (const route of sortRoutes(ssrRoutes)) {
+    }
+  };
+
+  /** Register SSR GET routes (shared by static phase and dynamic phase). */
+  const registerSsrRoutes = (routes) => {
+    for (const route of routes) {
     app.get(route.routePath, async (req, res, next) => {
       try {
         // Detect locale
@@ -714,8 +724,19 @@ function mountPages(app, options) {
     });
     
     log(`  GET ${route.routePath} -> ${route.file}`);
-  }
-  
+    }
+  };
+
+  // Static / literal file routes first so plugins can register reserved paths (e.g. /_admin)
+  // before catch-all dynamics like /:slug shadow them.
+  registerApiRoutes(apiStatic);
+  registerSsrRoutes(ssrStatic);
+
+  const registerDynamicFileRoutes = () => {
+    registerApiRoutes(apiDynamic);
+    registerSsrRoutes(ssrDynamic);
+  };
+
   // Return route metadata for plugins
   const routeMetadata = [
     ...ssrRoutes.map(r => ({
@@ -733,8 +754,8 @@ function mountPages(app, options) {
       isDynamic: r.routePath.includes(':') || r.routePath.includes('*')
     }))
   ];
-  
-  return routeMetadata;
+
+  return { routeMetadata, registerDynamicFileRoutes };
 }
 
 module.exports = {

package/src/server.js

@@ -440,7 +440,7 @@ function createApp(options = {}) {
   if (!isTest) {
     console.log('\nMounting routes:');
   }
-  const routeMetadata = mountPages(app, {
+  const { routeMetadata, registerDynamicFileRoutes } = mountPages(app, {
     pagesDir,
     nunjucks: nunjucksEnv,
     middlewares,
@@ -449,7 +449,7 @@ function createApp(options = {}) {
     db: options.db ?? null,
     clientRuntime,
   });
-  
+
   // Set route metadata in plugin manager
   pluginManager.setRoutes(routeMetadata);
   
@@ -491,7 +491,11 @@ function createApp(options = {}) {
       clientRuntime,
     });
   }
-  
+
+  // Dynamic / catch-all file routes after plugins and setupRoutes so paths like /_admin
+  // or custom /login are not shadowed by pages/[slug].njk (/:slug).
+  registerDynamicFileRoutes();
+
   // Helper to create error page context with fsy
   function createErrorContext(req, extraData = {}) {
     const baseUrl = process.env.BASE_URL || `http://localhost:${process.env.PORT || 3000}`;