webspresso 0.0.97 → 0.0.98

package/bin/commands/add-esbuild.js

@@ -0,0 +1,80 @@
+/**
+ * Add esbuild Command
+ * Add esbuild client bundling and incremental watch to the project
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+function registerCommand(program) {
+  program
+    .command('add esbuild')
+    .alias('add:esbuild')
+    .description('Add esbuild client bundling and incremental watch to the project')
+    .action(async () => {
+      if (!fs.existsSync('package.json')) {
+        console.error('❌ Not a Webspresso project! Run this command in your project directory.');
+        process.exit(1);
+      }
+
+      console.log('\n⚡ Adding esbuild client bundler to your project...\n');
+
+      // Read package.json
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      packageJson.devDependencies = packageJson.devDependencies || {};
+      packageJson.devDependencies['esbuild'] = '^0.25.0';
+
+      packageJson.scripts = packageJson.scripts || {};
+      packageJson.scripts['build:js'] = 'esbuild src/client/main.js --bundle --outdir=public/js --minify --sourcemap';
+      packageJson.scripts['watch:js'] = 'esbuild src/client/main.js --bundle --outdir=public/js --sourcemap --watch';
+
+      fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2) + '\n');
+      console.log('✅ Updated package.json (esbuild devDependency and build:js / watch:js scripts)');
+
+      // Create src/client directory
+      if (!fs.existsSync('src/client')) {
+        fs.mkdirSync('src/client', { recursive: true });
+      }
+
+      // Create src/client/main.js if not exists
+      const mainJsPath = path.join('src', 'client', 'main.js');
+      if (!fs.existsSync(mainJsPath)) {
+        const clientStarterCode = `// Client-side JavaScript entry point
+console.log('⚡ Webspresso client script loaded');
+
+document.addEventListener('DOMContentLoaded', () => {
+  // Client interactivity
+});
+`;
+        fs.writeFileSync(mainJsPath, clientStarterCode);
+        console.log('✅ Created src/client/main.js');
+      }
+
+      // Create public/js directory
+      if (!fs.existsSync(path.join('public', 'js'))) {
+        fs.mkdirSync(path.join('public', 'js'), { recursive: true });
+      }
+
+      // Update layout.njk to include script if not present
+      const layoutPath = path.join('views', 'layout.njk');
+      if (fs.existsSync(layoutPath)) {
+        let layoutContent = fs.readFileSync(layoutPath, 'utf-8');
+        if (!layoutContent.includes('/js/main.js')) {
+          layoutContent = layoutContent.replace(
+            /(<\/head>)/,
+            '  <script defer src="/js/main.js"></script>\n$1'
+          );
+          fs.writeFileSync(layoutPath, layoutContent);
+          console.log('✅ Updated views/layout.njk (<script defer src="/js/main.js"></script>)');
+        }
+      }
+
+      console.log('\n✅ esbuild setup complete!\n');
+      console.log('Next steps:');
+      console.log('  npm install');
+      console.log('  npm run build:js');
+      console.log('  npm run dev\n');
+    });
+}
+
+module.exports = { registerCommand };

package/bin/commands/add-tailwind.js

@@ -10,14 +10,26 @@ const { execSync } = require('child_process');
 function registerCommand(program) {
   program
     .command('add tailwind')
+    .alias('add:tailwind')
     .description('Add Tailwind CSS to the project with build process')
-    .action(async () => {
+    .option('--v4', 'Use Tailwind CSS v4 (Oxide engine, LightningCSS, zero postcss config)')
+    .option('--v3', 'Use Tailwind CSS v3 (legacy PostCSS engine)')
+    .option('-v, --tailwind-version <version>', 'Tailwind version (3 or 4)', '3')
+    .option('--upgrade', 'Upgrade existing Tailwind v3 project to Tailwind v4')
+    .action(async (...actionArgs) => {
+      const cmd = actionArgs[actionArgs.length - 1];
+      const options = (cmd && typeof cmd.opts === 'function')
+        ? cmd.opts()
+        : (actionArgs.find(a => a && typeof a === 'object') || {});
+
       if (!fs.existsSync('package.json')) {
         console.error('❌ Not a Webspresso project! Run this command in your project directory.');
         process.exit(1);
       }
       
-      console.log('\n🎨 Adding Tailwind CSS to your project...\n');
+      const isV4 = Boolean(options.v4 || options.upgrade || options.tailwindVersion === '4');
+
+      console.log(`\n🎨 Adding Tailwind CSS ${isV4 ? 'v4 (Oxide engine, zero-config)' : 'v3'} to your project...\n`);
       
       // Read package.json
       const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
@@ -27,17 +39,26 @@ function registerCommand(program) {
         packageJson.devDependencies = {};
       }
       
-      packageJson.devDependencies['tailwindcss'] = '^3.4.1';
-      packageJson.devDependencies['postcss'] = '^8.4.35';
-      packageJson.devDependencies['autoprefixer'] = '^10.4.17';
-      
-      // Add build scripts
       if (!packageJson.scripts) {
         packageJson.scripts = {};
       }
-      
-      packageJson.scripts['build:css'] = 'tailwindcss -i ./src/input.css -o ./public/css/style.css --minify';
-      packageJson.scripts['watch:css'] = 'tailwindcss -i ./src/input.css -o ./public/css/style.css --watch';
+
+      if (isV4) {
+        packageJson.devDependencies['@tailwindcss/cli'] = '^4.0.0';
+        packageJson.devDependencies['tailwindcss'] = '^4.0.0';
+        delete packageJson.devDependencies['postcss'];
+        delete packageJson.devDependencies['autoprefixer'];
+
+        packageJson.scripts['build:css'] = '@tailwindcss/cli -i ./src/input.css -o ./public/css/style.css --minify';
+        packageJson.scripts['watch:css'] = '@tailwindcss/cli -i ./src/input.css -o ./public/css/style.css --watch';
+      } else {
+        packageJson.devDependencies['tailwindcss'] = '^3.4.1';
+        packageJson.devDependencies['postcss'] = '^8.4.35';
+        packageJson.devDependencies['autoprefixer'] = '^10.4.17';
+
+        packageJson.scripts['build:css'] = 'tailwindcss -i ./src/input.css -o ./public/css/style.css --minify';
+        packageJson.scripts['watch:css'] = 'tailwindcss -i ./src/input.css -o ./public/css/style.css --watch';
+      }
       
       // Update dev script to include CSS watch
       if (packageJson.scripts.dev) {
@@ -50,24 +71,48 @@ function registerCommand(program) {
       }
       
       fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2) + '\n');
-      console.log('✅ Updated package.json');
+      console.log(`✅ Updated package.json (${isV4 ? 'Tailwind v4' : 'Tailwind v3'})`);
       
       // Create src directory if it doesn't exist
       if (!fs.existsSync('src')) {
         fs.mkdirSync('src', { recursive: true });
       }
       
-      // Create input.css
-      const inputCss = `@tailwind base;
+      if (isV4) {
+        // Create v4 input.css
+        const inputCss = `@import "tailwindcss";
+
+@source "../pages/**/*.{njk,js}";
+@source "../views/**/*.njk";
+@source "../src/**/*.js";
+`;
+        fs.writeFileSync('src/input.css', inputCss);
+        console.log('✅ Created src/input.css (@import "tailwindcss"; + @source directives)');
+
+        // If upgrading from v3, clean up obsolete configs
+        if (fs.existsSync('postcss.config.js')) {
+          try {
+            fs.unlinkSync('postcss.config.js');
+            console.log('🧹 Removed obsolete postcss.config.js (not needed in v4)');
+          } catch (_) {}
+        }
+        if (fs.existsSync('tailwind.config.js')) {
+          try {
+            fs.renameSync('tailwind.config.js', 'tailwind.config.js.backup');
+            console.log('ℹ️  Renamed tailwind.config.js to tailwind.config.js.backup (v4 is CSS-first)');
+          } catch (_) {}
+        }
+      } else {
+        // Create v3 input.css
+        const inputCss = `@tailwind base;
 @tailwind components;
 @tailwind utilities;
 `;
-      
-      fs.writeFileSync('src/input.css', inputCss);
-      console.log('✅ Created src/input.css');
-      
-      // Create tailwind.config.js
-      const tailwindConfig = `/** @type {import('tailwindcss').Config} */
+        fs.writeFileSync('src/input.css', inputCss);
+        console.log('✅ Created src/input.css');
+        
+        // Create tailwind.config.js
+        const tailwindConfig = `/** @type {import('tailwindcss').Config} */
 module.exports = {
   content: [
     './pages/**/*.{njk,js}',
@@ -80,21 +125,20 @@ module.exports = {
   plugins: [],
 }
 `;
-      
-      fs.writeFileSync('tailwind.config.js', tailwindConfig);
-      console.log('✅ Created tailwind.config.js');
-      
-      // Create postcss.config.js
-      const postcssConfig = `module.exports = {
+        fs.writeFileSync('tailwind.config.js', tailwindConfig);
+        console.log('✅ Created tailwind.config.js');
+        
+        // Create postcss.config.js
+        const postcssConfig = `module.exports = {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},
   },
 }
 `;
-      
-      fs.writeFileSync('postcss.config.js', postcssConfig);
-      console.log('✅ Created postcss.config.js');
+        fs.writeFileSync('postcss.config.js', postcssConfig);
+        console.log('✅ Created postcss.config.js');
+      }
       
       // Check if layout.njk exists and update it (before creating CSS)
       const layoutPath = 'views/layout.njk';
@@ -128,9 +172,10 @@ module.exports = {
       fs.writeFileSync('public/css/style.css', '/* Run npm run build:css */\n');
       console.log('✅ Created public/css/style.css');
       
-      // Try to build CSS if tailwindcss is already installed
+      // Try to build CSS if tailwindcss / @tailwindcss/cli is already installed
       const tailwindBin = path.join(process.cwd(), 'node_modules', '.bin', 'tailwindcss');
-      if (fs.existsSync(tailwindBin)) {
+      const tailwindCliBin = path.join(process.cwd(), 'node_modules', '.bin', '@tailwindcss/cli');
+      if (fs.existsSync(tailwindBin) || fs.existsSync(tailwindCliBin)) {
         try {
           console.log('\n🎨 Building Tailwind CSS from your templates...');
           execSync('npm run build:css', { stdio: 'inherit', cwd: process.cwd() });
@@ -139,7 +184,7 @@ module.exports = {
           console.log('\n⚠️  CSS build failed. Run "npm run build:css" manually.\n');
         }
       } else {
-        console.log('\n✅ Tailwind CSS added successfully!\n');
+        console.log(`\n✅ Tailwind CSS ${isV4 ? 'v4' : 'v3'} added successfully!\n`);
         console.log('Next steps:');
         console.log('  npm install');
         console.log('  npm run build:css');

package/bin/commands/analytics-prune.js

@@ -0,0 +1,57 @@
+/**
+ * Prune old site analytics records (CLI)
+ */
+
+const { loadDbConfig, createDbInstance } = require('../utils/db');
+
+function registerCommand(program) {
+  program
+    .command('analytics:prune')
+    .description('Delete analytics page views and client errors older than the given retention window')
+    .option('--days <n>', 'Delete page views older than this many days', '90')
+    .option('--error-days <n>', 'Delete client errors older than this many days', '30')
+    .option('--table <name>', 'Page views table name', 'analytics_page_views')
+    .option('--errors-table <name>', 'Client errors table name', 'analytics_client_errors')
+    .option('-e, --env <environment>', 'Environment (development, production)', 'development')
+    .option('-c, --config <path>', 'Path to database config file')
+    .action(async (options) => {
+      const days = parseInt(options.days, 10);
+      if (Number.isNaN(days) || days < 1) {
+        console.error('❌ --days must be a positive integer');
+        process.exit(1);
+      }
+
+      const errorDays = parseInt(options.errorDays, 10);
+      if (Number.isNaN(errorDays) || errorDays < 1) {
+        console.error('❌ --error-days must be a positive integer');
+        process.exit(1);
+      }
+
+      const { config, path: configPath } = loadDbConfig(options.config);
+      console.log(`\n📦 Using config: ${configPath}`);
+      console.log(`   Environment: ${options.env}\n`);
+
+      const knex = await createDbInstance(config, options.env);
+
+      try {
+        const { purgeAnalyticsData } = require('../../plugins/site-analytics/purge');
+        const result = await purgeAnalyticsData(knex, {
+          days,
+          errorDays,
+          tableName: options.table,
+          errorsTableName: options.errorsTable,
+        });
+
+        console.log(`✅ Analytics purge completed:`);
+        console.log(`   - Page views deleted: ${result.viewsDeleted} (cutoff: ${result.viewsCutoff})`);
+        console.log(`   - Client errors deleted: ${result.errorsDeleted} (cutoff: ${result.errorsCutoff})\n`);
+      } catch (err) {
+        console.error('❌ analytics:prune failed:', err.message);
+        process.exit(1);
+      } finally {
+        await knex.destroy();
+      }
+    });
+}
+
+module.exports = { registerCommand };

package/bin/commands/api.js

@@ -2,7 +2,7 @@
 
 /**
  * API Command
- * Add a new API endpoint with modern Webspresso schema & handler contract
+ * Add a new API endpoint or full REST CRUD suite with modern Webspresso schema & handler contract
  * @module bin/commands/api
  */
 
@@ -18,6 +18,31 @@ const path = require('path');
 
 const VALID_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
 
+function singularize(word) {
+  if (!word) return '';
+  const lower = word.toLowerCase();
+  if (lower.endsWith('ies')) {
+    return lower.slice(0, -3) + 'y';
+  }
+  if (lower.endsWith('ses')) {
+    return lower.slice(0, -2);
+  }
+  if (lower.endsWith('s') && !lower.endsWith('ss')) {
+    return lower.slice(0, -1);
+  }
+  return lower;
+}
+
+function toPascalCase(str) {
+  if (!str) return '';
+  const clean = str.replace(/[^a-zA-Z0-9]/g, ' ');
+  return clean
+    .split(' ')
+    .filter(Boolean)
+    .map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase())
+    .join('');
+}
+
 function parseRouteAndMethod(rawInput, optionMethod) {
   let route = String(rawInput || '').trim();
   let method = optionMethod ? String(optionMethod).toUpperCase() : null;
@@ -45,18 +70,160 @@ function parseRouteAndMethod(rawInput, optionMethod) {
   };
 }
 
+function generateCrudFiles(apiDir, route, modelName, middlewareStr) {
+  const cleanRoute = route.replace(/^\/+|\/+$/g, '');
+  const baseDir = path.join(apiDir, cleanRoute);
+  const detailDir = path.join(baseDir, '[id]');
+  fs.mkdirSync(detailDir, { recursive: true });
+
+  const files = [
+    {
+      path: path.join(apiDir, `${cleanRoute}.get.js`),
+      label: `GET /api/${cleanRoute} (List)`,
+      content: `'use strict';
+
+const { defineApi } = require('webspresso');
+
+module.exports = defineApi({
+  schema: ({ z }) => ({
+    query: z.object({
+      page: z.coerce.number().optional().default(1),
+      limit: z.coerce.number().optional().default(20),
+    }),
+  }),${middlewareStr}
+  handler: async (req, res) => {
+    const repo = req.db ? req.db.getRepository('${modelName}') : null;
+    const { page, limit } = req.input.query;
+    const items = repo ? await repo.query().paginate({ page, limit }) : [];
+    return res.json(items);
+  },
+});
+`,
+    },
+    {
+      path: path.join(apiDir, `${cleanRoute}.post.js`),
+      label: `POST /api/${cleanRoute} (Create)`,
+      content: `'use strict';
+
+const { defineApi } = require('webspresso');
+
+module.exports = defineApi({
+  schema: ({ z }) => ({
+    body: z.object({
+      title: z.string().min(1).optional(),
+    }).passthrough(),
+  }),${middlewareStr}
+  handler: async (req, res) => {
+    const repo = req.db ? req.db.getRepository('${modelName}') : null;
+    const created = repo ? await repo.create(req.input.body) : req.input.body;
+    return res.status(201).json(created);
+  },
+});
+`,
+    },
+    {
+      path: path.join(detailDir, '[id].get.js'),
+      label: `GET /api/${cleanRoute}/:id (Detail)`,
+      content: `'use strict';
+
+const { defineApi } = require('webspresso');
+
+module.exports = defineApi({
+  schema: ({ z }) => ({
+    params: z.object({
+      id: z.coerce.number().or(z.string().min(1)),
+    }),
+  }),${middlewareStr}
+  handler: async (req, res) => {
+    const repo = req.db ? req.db.getRepository('${modelName}') : null;
+    const item = repo ? await repo.findById(req.params.id) : null;
+    if (!item) {
+      return res.status(404).json({ error: '${modelName} not found' });
+    }
+    return res.json(item);
+  },
+});
+`,
+    },
+    {
+      path: path.join(detailDir, '[id].patch.js'),
+      label: `PATCH /api/${cleanRoute}/:id (Update)`,
+      content: `'use strict';
+
+const { defineApi } = require('webspresso');
+
+module.exports = defineApi({
+  schema: ({ z }) => ({
+    params: z.object({
+      id: z.coerce.number().or(z.string().min(1)),
+    }),
+    body: z.record(z.unknown()).optional(),
+  }),${middlewareStr}
+  handler: async (req, res) => {
+    const repo = req.db ? req.db.getRepository('${modelName}') : null;
+    const updated = repo ? await repo.update(req.params.id, req.input.body || {}) : null;
+    if (!updated) {
+      return res.status(404).json({ error: '${modelName} not found' });
+    }
+    return res.json(updated);
+  },
+});
+`,
+    },
+    {
+      path: path.join(detailDir, '[id].delete.js'),
+      label: `DELETE /api/${cleanRoute}/:id (Delete)`,
+      content: `'use strict';
+
+const { defineApi } = require('webspresso');
+
+module.exports = defineApi({
+  schema: ({ z }) => ({
+    params: z.object({
+      id: z.coerce.number().or(z.string().min(1)),
+    }),
+  }),${middlewareStr}
+  handler: async (req, res) => {
+    const repo = req.db ? req.db.getRepository('${modelName}') : null;
+    if (repo) {
+      await repo.delete(req.params.id);
+    }
+    return res.status(204).end();
+  },
+});
+`,
+    },
+  ];
+
+  for (const f of files) {
+    fs.writeFileSync(f.path, f.content, 'utf8');
+  }
+
+  return files;
+}
+
 function registerCommand(program) {
   program
     .command('api [route]')
+    .alias('make:api')
+    .alias('api:make')
     .description('Add a new API endpoint to pages/api/ with schema validation and handler')
     .option('-m, --method <method>', 'HTTP method (GET, POST, PUT, PATCH, DELETE)', 'GET')
+    .option('--crud', 'Generate full REST CRUD endpoints (list, create, get, update, delete)')
+    .option('--model <model>', 'Associated ORM model name for repository calls')
     .option('--auth', 'Protect with session auth middleware')
     .option('--jwt', 'Protect with JWT bearer middleware')
+    .option('--root <dir>', 'Root directory of the project', process.cwd())
     .action(async (routeArg, options) => {
-      const pagesDir = path.resolve(process.cwd(), 'pages');
+      const rootDir = path.resolve(options.root || process.cwd());
+      const pagesDir = path.join(rootDir, 'pages');
       if (!fs.existsSync(pagesDir)) {
-        console.error('❌ Not a Webspresso project! (pages/ directory not found)');
-        process.exit(1);
+        fs.mkdirSync(pagesDir, { recursive: true });
+      }
+
+      const apiDir = path.join(pagesDir, 'api');
+      if (!fs.existsSync(apiDir)) {
+        fs.mkdirSync(apiDir, { recursive: true });
       }
 
       let route;
@@ -83,17 +250,39 @@ function registerCommand(program) {
             message: 'HTTP method:',
             choices: VALID_METHODS,
             default: options.method ? options.method.toUpperCase() : 'GET',
+            when: () => !options.crud,
           },
         ]);
 
-        const parsed = parseRouteAndMethod(answers.route, answers.method);
+        const parsed = parseRouteAndMethod(answers.route, answers.method || options.method);
         route = parsed.route;
         method = parsed.method;
       }
 
+      const middlewares = [];
+      if (options.auth) middlewares.push("'auth'");
+      if (options.jwt) middlewares.push("'jwt'");
+      const middlewareStr = middlewares.length > 0 ? `\n  middleware: [${middlewares.join(', ')}],` : '';
+
+      // CRUD Generation Mode
+      if (options.crud) {
+        const lastSegment = route.split('/').filter(Boolean).pop() || route;
+        const singular = singularize(lastSegment);
+        const modelName = options.model ? String(options.model).trim() : toPascalCase(singular);
+
+        const createdFiles = generateCrudFiles(apiDir, route, modelName, middlewareStr);
+        console.log(`\n✅ Generated REST CRUD API endpoints for "${modelName}" in pages/api/${route}:`);
+        for (const cf of createdFiles) {
+          console.log(`   - ${cf.label} → ${path.relative(process.cwd(), cf.path)}`);
+        }
+        console.log('');
+        return;
+      }
+
+      // Single Route Generation Mode
       const methodUpper = String(method).toUpperCase();
       const methodLower = methodUpper.toLowerCase();
-      const routePath = path.join(pagesDir, 'api', route);
+      const routePath = path.join(apiDir, route);
       const dirPath = path.dirname(routePath);
       const fileName = path.basename(routePath);
 
@@ -101,11 +290,6 @@ function registerCommand(program) {
 
       const apiFile = path.join(dirPath, `${fileName}.${methodLower}.js`);
 
-      const middlewares = [];
-      if (options.auth) middlewares.push("'auth'");
-      if (options.jwt) middlewares.push("'jwt'");
-      const middlewareStr = middlewares.length > 0 ? `\n  middleware: [${middlewares.join(', ')}],` : '';
-
       const hasParams = route.includes('[');
       const hasBody = ['POST', 'PUT', 'PATCH'].includes(methodUpper);
 
@@ -114,10 +298,12 @@ function registerCommand(program) {
 /**
  * ${methodUpper} /api/${route}
  */
-module.exports = {
+const { defineApi } = require('webspresso');
+
+module.exports = defineApi({
   // Input validation schema (Zod)
   schema: ({ z }) => ({
-    ${hasParams ? 'params: z.object({ id: z.string().min(1) }),\n    ' : ''}${hasBody ? 'body: z.object({\n      // Define body schema here\n    }),\n    ' : ''}query: z.object({\n      // Define query params here\n    }),
+    ${hasParams ? 'params: z.object({ id: z.coerce.number().or(z.string().min(1)) }),\n    ' : ''}${hasBody ? 'body: z.object({\n      // Define body schema here\n    }).passthrough(),\n    ' : ''}query: z.object({\n      // Define query params here\n    }),
   }),${middlewareStr}
 
   // Request Handler
@@ -131,7 +317,7 @@ module.exports = {
       timestamp: new Date().toISOString(),
     });
   },
-};
+});
 `;
 
       fs.writeFileSync(apiFile, apiContent, 'utf8');
@@ -139,4 +325,10 @@ module.exports = {
     });
 }
 
-module.exports = { registerCommand, parseRouteAndMethod };
+module.exports = {
+  registerCommand,
+  parseRouteAndMethod,
+  singularize,
+  toPascalCase,
+  generateCrudFiles,
+};