webspresso 0.0.68 → 0.0.70

package/README.md

@@ -2151,10 +2151,15 @@ In production, keep the plugin disabled or protect it with `authorize` / your ow
 
 ## Development
 
+Native addons (**better-sqlite3**, **bcrypt**, **sharp**) are compiled for your current Node ABI. After switching Node major versions (e.g. nvm, fnm, Volta), run **`npm run rebuild:native`** or a clean install: `rm -rf node_modules && npm ci`. **chokidar** is not ABI-tied like those drivers; if file watching misbehaves, reinstall dependencies. The repo includes [`.nvmrc`](.nvmrc) (Node 20 LTS) as a known-good default for this project.
+
 ```bash
 # Install dependencies
 npm install
 
+# If you changed Node version and see MODULE_VERSION or .node load errors:
+npm run rebuild:native
+
 # Run tests
 npm test
 
@@ -2163,6 +2168,9 @@ npm run test:watch
 
 # Run tests with coverage
 npm run test:coverage
+
+# Micro-benchmarks (Vitest bench; also runs in CI on the test matrix)
+npm run bench
 ```
 
 ## License

package/bin/commands/new.js

@@ -9,6 +9,30 @@ const path = require('path');
 const { runInstallation, startDevServer } = require('../utils/project');
 const { getSeedFileTemplate } = require('../utils/seed');
 
+/** `.` / `./` mean scaffold into the current working directory */
+function isCurrentDirAlias(name) {
+  if (name == null || typeof name !== 'string') return false;
+  const t = name.trim();
+  return t === '.' || t === './';
+}
+
+/** package.json `name` from a directory path (must match interactive validator rules) */
+function derivePackageNameFromDir(dirPath) {
+  const base = path.basename(path.resolve(dirPath));
+  if (/^[a-z0-9-_]+$/i.test(base)) return base;
+  return 'webspresso-app';
+}
+
+function assertNotExistingWebspressoProject(projectPath) {
+  if (
+    fs.existsSync(path.join(projectPath, 'server.js')) ||
+    fs.existsSync(path.join(projectPath, 'pages'))
+  ) {
+    console.error('❌ Target directory already contains a Webspresso project (server.js or pages/).');
+    process.exit(1);
+  }
+}
+
 function registerCommand(program) {
   program
     .command('new [project-name]')
@@ -16,9 +40,12 @@ function registerCommand(program) {
     .option('-t, --template <template>', 'Template to use (minimal, full)', 'minimal')
     .option('--no-tailwind', 'Skip Tailwind CSS setup')
     .option('-i, --install', 'Auto install dependencies and build CSS')
+    .option('-y, --yes', 'Non-interactive: no database, skip install unless -i/--install, skip dev server')
     .action(async (projectNameArg, options) => {
       const useTailwind = options.tailwind !== false;
       const autoInstall = options.install === true;
+      const skipPrompts = options.yes === true;
+      const stdinNotTty = !process.stdin.isTTY;
       
       let projectName;
       let projectPath;
@@ -43,27 +70,27 @@ function registerCommand(program) {
           useCurrentDir = true;
           projectPath = process.cwd();
           
-          // Check for existing Webspresso files
-          if (fs.existsSync(path.join(projectPath, 'server.js')) || 
-              fs.existsSync(path.join(projectPath, 'pages'))) {
-            console.error('❌ Current directory already contains a Webspresso project!');
-            process.exit(1);
-          }
+          assertNotExistingWebspressoProject(projectPath);
           
           // Warn if there are existing files
           if (hasExistingFiles) {
-            const { continueAnyway } = await inquirer.prompt([
-              {
-                type: 'confirm',
-                name: 'continueAnyway',
-                message: '⚠️  Current directory is not empty. Continue anyway?',
-                default: false
+            const autoProceed = skipPrompts || stdinNotTty;
+            if (autoProceed) {
+              console.log('ℹ️  Current directory is not empty; scaffolding alongside existing files.');
+            } else {
+              const { continueAnyway } = await inquirer.prompt([
+                {
+                  type: 'confirm',
+                  name: 'continueAnyway',
+                  message: '⚠️  Current directory is not empty. Continue anyway?',
+                  default: true
+                }
+              ]);
+              
+              if (!continueAnyway) {
+                console.log('Cancelled.');
+                process.exit(0);
               }
-            ]);
-            
-            if (!continueAnyway) {
-              console.log('Cancelled.');
-              process.exit(0);
             }
           }
           
@@ -102,53 +129,92 @@ function registerCommand(program) {
           projectName = dirName;
           projectPath = path.resolve(dirName);
         }
+      } else if (isCurrentDirAlias(projectNameArg)) {
+        useCurrentDir = true;
+        projectPath = process.cwd();
+        projectName = derivePackageNameFromDir(projectPath);
+        
+        assertNotExistingWebspressoProject(projectPath);
+        
+        const currentDirFiles = fs.readdirSync(projectPath);
+        const hasExistingFiles = currentDirFiles.some((f) => !f.startsWith('.'));
+        if (hasExistingFiles) {
+          const autoProceed = skipPrompts || stdinNotTty;
+          if (autoProceed) {
+            console.log('ℹ️  Current directory is not empty; scaffolding alongside existing files.');
+          } else {
+            const { continueAnyway } = await inquirer.prompt([
+              {
+                type: 'confirm',
+                name: 'continueAnyway',
+                message: '⚠️  Current directory is not empty. Continue anyway?',
+                default: true
+              }
+            ]);
+            
+            if (!continueAnyway) {
+              console.log('Cancelled.');
+              process.exit(0);
+            }
+          }
+        }
       } else {
-        projectName = projectNameArg;
-        projectPath = path.resolve(projectNameArg);
+        const trimmed = projectNameArg.trim();
+        projectPath = path.resolve(trimmed);
+        projectName = derivePackageNameFromDir(projectPath);
         
         if (fs.existsSync(projectPath)) {
-          console.error(`❌ Directory ${projectName} already exists!`);
+          console.error(`❌ Directory ${trimmed} already exists!`);
           process.exit(1);
         }
       }
       
       console.log(`\n🚀 Creating new Webspresso project: ${projectName}\n`);
       
-      // Ask about database
-      const { useDatabase, databaseType } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'useDatabase',
-          message: 'Will you use a database?',
-          default: false
-        },
-        {
-          type: 'list',
-          name: 'databaseType',
-          message: 'Which database?',
-          choices: [
-            { name: 'SQLite (better-sqlite3)', value: 'better-sqlite3' },
-            { name: 'PostgreSQL (pg)', value: 'pg' },
-            { name: 'MySQL (mysql2)', value: 'mysql2' },
-            { name: 'None', value: null }
-          ],
-          default: 'better-sqlite3',
-          when: (answers) => answers.useDatabase
-        }
-      ]);
-      
-      // Ask about seed data if database is selected
+      let useDatabase = false;
+      let databaseType = null;
       let useSeed = false;
-      if (useDatabase && databaseType) {
-        const { generateSeed } = await inquirer.prompt([
+      
+      if (skipPrompts) {
+        useDatabase = false;
+        databaseType = null;
+        useSeed = false;
+      } else {
+        const dbAnswers = await inquirer.prompt([
           {
             type: 'confirm',
-            name: 'generateSeed',
-            message: 'Generate seed data based on existing models?',
+            name: 'useDatabase',
+            message: 'Will you use a database?',
             default: false
+          },
+          {
+            type: 'list',
+            name: 'databaseType',
+            message: 'Which database?',
+            choices: [
+              { name: 'SQLite (better-sqlite3)', value: 'better-sqlite3' },
+              { name: 'PostgreSQL (pg)', value: 'pg' },
+              { name: 'MySQL (mysql2)', value: 'mysql2' },
+              { name: 'None', value: null }
+            ],
+            default: 'better-sqlite3',
+            when: (answers) => answers.useDatabase
           }
         ]);
-        useSeed = generateSeed;
+        useDatabase = dbAnswers.useDatabase;
+        databaseType = dbAnswers.databaseType;
+        
+        if (useDatabase && databaseType) {
+          const { generateSeed } = await inquirer.prompt([
+            {
+              type: 'confirm',
+              name: 'generateSeed',
+              message: 'Generate seed data based on existing models?',
+              default: false
+            }
+          ]);
+          useSeed = generateSeed;
+        }
       }
       
       // Create directory structure (skip root if using current dir)
@@ -652,28 +718,46 @@ module.exports = {
       if (autoInstall) {
         await runInstallation(projectPath, useTailwind);
         
-        // Ask if user wants to start dev server
-        const { shouldStartDev } = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'shouldStartDev',
-            message: 'Start development server?',
-            default: true
-          }
-        ]);
-        
-        if (shouldStartDev) {
-          startDevServer(projectPath, useTailwind);
-        } else {
+        if (skipPrompts) {
           console.log('✅ Project ready!\n');
           console.log('Start developing:');
           if (!useCurrentDir) {
             console.log(`  cd ${projectName}`);
           }
           console.log('  npm run dev\n');
+        } else {
+          const { shouldStartDev } = await inquirer.prompt([
+            {
+              type: 'confirm',
+              name: 'shouldStartDev',
+              message: 'Start development server?',
+              default: true
+            }
+          ]);
+          
+          if (shouldStartDev) {
+            startDevServer(projectPath, useTailwind);
+          } else {
+            console.log('✅ Project ready!\n');
+            console.log('Start developing:');
+            if (!useCurrentDir) {
+              console.log(`  cd ${projectName}`);
+            }
+            console.log('  npm run dev\n');
+          }
+        }
+      } else if (skipPrompts) {
+        console.log('\n✅ Project created successfully!\n');
+        console.log('Next steps:');
+        if (!useCurrentDir) {
+          console.log(`  cd ${projectName}`);
+        }
+        console.log('  npm install');
+        if (useTailwind) {
+          console.log('  npm run build:css');
         }
+        console.log('  npm run dev\n');
       } else {
-        // Ask if user wants to install dependencies
         const { shouldInstall } = await inquirer.prompt([
           {
             type: 'confirm',
@@ -686,7 +770,6 @@ module.exports = {
         if (shouldInstall) {
           await runInstallation(projectPath, useTailwind);
           
-          // Ask if user wants to start dev server
           const { shouldStartDev } = await inquirer.prompt([
             {
               type: 'confirm',

package/index.d.ts

@@ -90,11 +90,17 @@ 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;
 
-export function extractMethodFromFilename(filename: string): string | null;
+export function extractMethodFromFilename(filename: string): {
+  method: string;
+  baseName: string;
+};
 
 export function scanDirectory(
   dir: string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.68",
+  "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",
@@ -15,7 +15,10 @@
     "test:e2e:ui": "playwright test --ui",
     "test:e2e:debug": "playwright test --debug",
     "test:e2e:headed": "playwright test --headed",
+    "bench": "vitest bench --run",
+    "bench:compare": "vitest bench --run --compare benchmark-results.json",
     "check:types": "tsc --project tests/ts-smoke/tsconfig.json",
+    "rebuild:native": "npm rebuild better-sqlite3 bcrypt sharp",
     "release": "release-it"
   },
   "keywords": [

package/src/file-router.js

@@ -16,6 +16,12 @@ const i18nCache = new Map();
 // Cache for route configs in production
 const configCache = new Map();
 
+// Dev-only: avoid require() on every SSR request when the .js file is unchanged (mtime)
+const routeConfigDevCache = new Map();
+
+// Cache for API filename -> { method, baseName } (basename keys; stable per process)
+const methodFromFilenameCache = new Map();
+
 /**
  * Convert a file path to an Express route pattern
  * @param {string} filePath - Relative path from pages/
@@ -51,26 +57,87 @@ function filePathToRoute(filePath, ext) {
   return route;
 }
 
+/**
+ * Metadata for ordering route registration: more specific Express paths must be
+ * registered before less specific ones (static before dynamic; more literal
+ * segments before fewer; deeper paths before shallower among same class).
+ * @param {string} routePath
+ * @returns {{ tier: number, literalSegCount: number, paramSegCount: number, depth: number, routePath: string }}
+ */
+function routeRegistrationMeta(routePath) {
+  const hasCatchAll = routePath.includes('*');
+  const hasDynamic = routePath.includes(':');
+  let tier;
+  if (hasCatchAll) tier = 2;
+  else if (hasDynamic) tier = 1;
+  else tier = 0;
+
+  const segments = routePath.split('/').filter(Boolean);
+  let literalSegCount = 0;
+  let paramSegCount = 0;
+  for (const seg of segments) {
+    if (seg === '*' || (seg.length > 0 && seg.includes('*'))) continue;
+    if (seg.includes(':')) paramSegCount += 1;
+    else literalSegCount += 1;
+  }
+
+  return {
+    tier,
+    literalSegCount,
+    paramSegCount,
+    depth: segments.length,
+    routePath,
+  };
+}
+
+/**
+ * Compare two routes for registration order (negative if a before b).
+ * @param {{ routePath: string }} a
+ * @param {{ routePath: string }} b
+ */
+function compareRouteRegistrationOrder(a, b) {
+  const ma = routeRegistrationMeta(a.routePath);
+  const mb = routeRegistrationMeta(b.routePath);
+  if (ma.tier !== mb.tier) return ma.tier - mb.tier;
+  if (ma.literalSegCount !== mb.literalSegCount) {
+    return mb.literalSegCount - ma.literalSegCount;
+  }
+  if (ma.depth !== mb.depth) return mb.depth - ma.depth;
+  if (ma.paramSegCount !== mb.paramSegCount) return ma.paramSegCount - mb.paramSegCount;
+  return ma.routePath.localeCompare(mb.routePath);
+}
+
 /**
  * Extract HTTP method from API filename
  * @param {string} filename - Filename like health.get.js
  * @returns {{ method: string, baseName: string }}
  */
 function extractMethodFromFilename(filename) {
+  const hit = methodFromFilenameCache.get(filename);
+  if (hit !== undefined) {
+    return hit;
+  }
+
   const methods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options'];
   const parts = filename.replace('.js', '').split('.');
-  
+  let result;
+
   if (parts.length > 1) {
     const lastPart = parts[parts.length - 1].toLowerCase();
     if (methods.includes(lastPart)) {
-      return {
+      result = {
         method: lastPart,
-        baseName: parts.slice(0, -1).join('.')
+        baseName: parts.slice(0, -1).join('.'),
       };
     }
   }
-  
-  return { method: 'get', baseName: parts.join('.') };
+
+  if (!result) {
+    result = { method: 'get', baseName: parts.join('.') };
+  }
+
+  methodFromFilenameCache.set(filename, result);
+  return result;
 }
 
 /**
@@ -201,25 +268,31 @@ function createTranslator(translations) {
  */
 function loadRouteConfig(configPath, isDev) {
   if (!fs.existsSync(configPath)) {
+    routeConfigDevCache.delete(configPath);
     return null;
   }
-  
+
   try {
-    // Clear cache in development mode
-    if (isDev && require.cache[require.resolve(configPath)]) {
-      delete require.cache[require.resolve(configPath)];
+    if (isDev) {
+      const stats = fs.statSync(configPath);
+      const devCached = routeConfigDevCache.get(configPath);
+      if (devCached && devCached.mtime >= stats.mtimeMs) {
+        return devCached.config;
+      }
+      if (require.cache[require.resolve(configPath)]) {
+        delete require.cache[require.resolve(configPath)];
+      }
+      const config = require(configPath);
+      routeConfigDevCache.set(configPath, { mtime: stats.mtimeMs, config });
+      return config;
     }
-    
-    if (!isDev && configCache.has(configPath)) {
+
+    if (configCache.has(configPath)) {
       return configCache.get(configPath);
     }
-    
+
     const config = require(configPath);
-    
-    if (!isDev) {
-      configCache.set(configPath, config);
-    }
-    
+    configCache.set(configPath, config);
     return config;
   } catch (err) {
     console.error(`Error loading route config ${configPath}:`, err.message);
@@ -431,25 +504,19 @@ function mountPages(app, options) {
     }
   }
   
-  // Sort routes: specific routes first, then dynamic, then catch-all
-  const sortRoutes = (routes) => {
-    return routes.sort((a, b) => {
-      const aHasCatchAll = a.routePath.includes('*');
-      const bHasCatchAll = b.routePath.includes('*');
-      const aHasDynamic = a.routePath.includes(':');
-      const bHasDynamic = b.routePath.includes(':');
-      
-      if (aHasCatchAll && !bHasCatchAll) return 1;
-      if (!aHasCatchAll && bHasCatchAll) return -1;
-      if (aHasDynamic && !bHasDynamic) return 1;
-      if (!aHasDynamic && bHasDynamic) return -1;
-      
-      return a.routePath.localeCompare(b.routePath);
-    });
-  };
-  
-  // Register API routes
-  for (const route of sortRoutes(apiRoutes)) {
+  // Sort routes: static before dynamic before catch-all; then more literal segments, then deeper paths
+  const sortRoutes = (routes) => routes.sort(compareRouteRegistrationOrder);
+  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;
@@ -523,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
@@ -655,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 => ({
@@ -674,8 +754,8 @@ function mountPages(app, options) {
       isDynamic: r.routePath.includes(':') || r.routePath.includes('*')
     }))
   ];
-  
-  return routeMetadata;
+
+  return { routeMetadata, registerDynamicFileRoutes };
 }
 
 module.exports = {
@@ -686,6 +766,8 @@ module.exports = {
   loadI18n,
   createTranslator,
   detectLocale,
-  resolveMiddlewares
+  resolveMiddlewares,
+  routeRegistrationMeta,
+  compareRouteRegistrationOrder,
 };
 

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}`;

package/templates/skills/webspresso-usage/SKILL.md

@@ -6,7 +6,7 @@ description: >-
   session auth (createAuth, quickAuth, webspresso/core/auth), Nunjucks/fsy helpers,
   i18n, lifecycle hooks, Zod API validation, ORM (zdb, defineModel, repository,
   query builder, migrations), plugins (admin, analytics, sitemap, SEO, audit,
-  recaptcha, rest resources, file upload), CLI, env vars, and testing. Use when working in this
+  recaptcha, rest resources, file upload), CLI (`new .`, `--yes`, `-i`), env vars, and testing. Use when working in this
   repo or any Webspresso app—adding routes, APIs, models, plugins, auth, client-side
   sprinkles or page transitions, or debugging routing, ctx.db, session, or templates.
 ---
@@ -220,6 +220,8 @@ Pass **`db`** into **`createApp({ db })`** so **`ctx.db`** works in pages and pl
 | Command | Role |
 |---------|------|
 | `webspresso new` | Scaffold project — includes **`config/load-env.js`** (`.env` chain), **`config/env.schema.js`** (Zod), **`config/app.js`** (`createApp` paths + optional `db` if `webspresso.db.js` exists), thin **`server.js`** |
+| `webspresso new .` / `new ./` | Scaffold **into the current directory** (same as interactive “install here”). `package.json` **`name`** = folder basename, or **`webspresso-app`** if basename is not npm-safe. **Aborts** if **`server.js`** or **`pages/`** already exists (already a Webspresso layout). |
+| `webspresso new … --yes` | **Non-interactive:** skips DB/seed prompts (no DB), skips “install now?” unless you pass **`-i` / `--install`**, skips “start dev server?” after install. Use for CI and agent tools. |
 | `webspresso dev` / `start` | Servers |
 | `webspresso page` / `api` | Interactive scaffolding |
 | `webspresso db:*` | migrate, rollback, status, make |
@@ -232,6 +234,12 @@ Pass **`db`** into **`createApp({ db })`** so **`ctx.db`** works in pages and pl
 | `webspresso admin:setup` / `admin:password` | Admin users |
 | `webspresso audit:prune` | Audit log retention |
 
+**`webspresso new` — current dir & automation**
+
+- **`new .`** does **not** treat the cwd as “directory already exists”; it scaffolds **in place** next to any existing non-dot files.
+- **Non-empty cwd:** interactive prompt defaults to **continue**; if **stdin is not a TTY** (piped/agent) or you pass **`--yes`**, the “continue?” step is skipped and a short **info** line is printed instead.
+- **Typical agent / vibe-coding one-liners:** `webspresso new . --yes --no-tailwind` · `webspresso new . --yes -i` (scaffold + install, no dev server prompt).
+
 ---
 
 ## 12. Environment variables (common)