webspresso 0.0.97 → 0.0.99

package/plugins/dashboard/app.js

@@ -10,6 +10,8 @@ const state = {
   filter: 'all',
   search: '',
   routes: window.__DASHBOARD_DATA__.routes || [],
+  models: window.__DASHBOARD_DATA__.models || [],
+  services: window.__DASHBOARD_DATA__.services || [],
   plugins: window.__DASHBOARD_DATA__.plugins || [],
   config: window.__DASHBOARD_DATA__.config || {}
 };
@@ -29,18 +31,27 @@ const Icons = {
 // Components
 const Header = {
   view: () => m('.header', [
-    m('h1', [
-      Icons.logo(),
-      'Webspresso Dashboard'
+    m('div', [
+      m('h1', [
+        Icons.logo(),
+        'Webspresso Dashboard'
+      ]),
+      m('span.dev-badge', 'development')
     ]),
-    m('span.dev-badge', 'development')
+    m('.header-actions', [
+      m('a.action-link', { href: '/_admin', target: '_blank', rel: 'noopener' }, '⚙️ Admin Panel ↗'),
+      m('a.action-link', { href: '/_swagger', target: '_blank', rel: 'noopener' }, '📖 API Docs ↗'),
+      m('a.action-link', { href: '/_schema', target: '_blank', rel: 'noopener' }, '🗂️ Schema Explorer ↗')
+    ])
   ])
 };
 
 const Tabs = {
   view: () => m('.tabs', [
-    ['routes', 'Routes'],
-    ['plugins', 'Plugins'],
+    ['routes', 'Routes (' + state.routes.length + ')'],
+    ['models', 'Models (' + state.models.length + ')'],
+    ['services', 'Services (' + state.services.length + ')'],
+    ['plugins', 'Plugins (' + state.plugins.length + ')'],
     ['config', 'Config']
   ].map(([id, label]) => 
     m('button.tab', {
@@ -72,32 +83,36 @@ const FilterBar = {
 };
 
 const MethodBadge = {
-  view: (vnode) => m('span.method-badge.method-' + vnode.attrs.method, 
-    vnode.attrs.method.toUpperCase()
+  view: (vnode) => m('span.method-badge.method-' + (vnode.attrs.method || 'get').toLowerCase(), 
+    (vnode.attrs.method || 'GET').toUpperCase()
   )
 };
 
 const TypeBadge = {
-  view: (vnode) => m('span.type-badge.type-' + vnode.attrs.type, 
-    vnode.attrs.type.toUpperCase()
-  )
+  view: (vnode) => {
+    const rawType = vnode.attrs.type || 'page';
+    const label = rawType === 'page' ? 'SSR' : rawType.toUpperCase();
+    return m('span.type-badge.type-' + (rawType === 'page' ? 'ssr' : rawType), label);
+  }
 };
 
 const RoutesTable = {
   view: () => {
     let routes = state.routes;
     
-    // Apply filter
-    if (state.filter !== 'all') {
-      routes = routes.filter(r => r.type === state.filter);
+    // Apply filter: SSR matches both 'ssr' and 'page'
+    if (state.filter === 'ssr') {
+      routes = routes.filter(r => r.type === 'ssr' || r.type === 'page');
+    } else if (state.filter === 'api') {
+      routes = routes.filter(r => r.type === 'api');
     }
     
-    // Apply search
+    // Apply search: checks path or pattern or file
     if (state.search) {
       const search = state.search.toLowerCase();
       routes = routes.filter(r => 
-        r.pattern.toLowerCase().includes(search) ||
-        r.file.toLowerCase().includes(search)
+        ((r.path || r.pattern || '')).toLowerCase().includes(search) ||
+        ((r.file || '')).toLowerCase().includes(search)
       );
     }
     
@@ -121,17 +136,18 @@ const RoutesTable = {
           ])
         ),
         m('tbody',
-          routes.map(route =>
-            m('tr', [
+          routes.map(route => {
+            const displayPath = route.path || route.pattern || '/';
+            return m('tr', [
               m('td', m(MethodBadge, { method: route.method })),
               m('td', [
-                m('span.code', route.pattern),
+                m('span.code', displayPath),
                 route.isDynamic ? m('span.dynamic-indicator', '⚡ dynamic') : null
               ]),
-              m('td', m('span.file-path', route.file)),
+              m('td', m('span.file-path', route.file || 'custom')),
               m('td', m(TypeBadge, { type: route.type }))
-            ])
-          )
+            ]);
+          })
         )
       ])
     );
@@ -140,7 +156,7 @@ const RoutesTable = {
 
 const StatsGrid = {
   view: () => {
-    const ssrCount = state.routes.filter(r => r.type === 'ssr').length;
+    const ssrCount = state.routes.filter(r => r.type === 'ssr' || r.type === 'page').length;
     const apiCount = state.routes.filter(r => r.type === 'api').length;
     const dynamicCount = state.routes.filter(r => r.isDynamic).length;
     
@@ -173,6 +189,116 @@ const RoutesView = {
   ])
 };
 
+const ModelsView = {
+  view: () => {
+    const models = state.models || [];
+    if (models.length === 0) {
+      return m('.table-container',
+        m('.empty-state', [
+          Icons.empty(),
+          m('p', 'No ORM models registered in core/orm')
+        ])
+      );
+    }
+
+    return m('div', [
+      m('.stats-grid', [
+        m('.card', [
+          m('.card-title', 'Total Models'),
+          m('.card-value', models.length)
+        ]),
+        m('.card', [
+          m('.card-title', 'Cached Models'),
+          m('.card-value', models.filter(m => Boolean(m.cache)).length)
+        ]),
+        m('.card', [
+          m('.card-title', 'Soft-Delete Enabled'),
+          m('.card-value', models.filter(m => Boolean(m.softDelete)).length)
+        ])
+      ]),
+      m('.table-container',
+        m('table', [
+          m('thead',
+            m('tr', [
+              m('th', 'Model'),
+              m('th', 'Table'),
+              m('th', 'Primary Key'),
+              m('th', 'Columns'),
+              m('th', 'Soft Delete'),
+              m('th', 'Cache')
+            ])
+          ),
+          m('tbody',
+            models.map(mod =>
+              m('tr', [
+                m('td', m('strong', mod.name)),
+                m('td', m('span.code-badge', mod.table)),
+                m('td', m('span.badge.badge-blue', mod.primaryKey || 'id')),
+                m('td', (mod.columnCount || 0) + ' columns'),
+                m('td', mod.softDelete ? m('span.badge.badge-green', 'Enabled') : m('span.badge.badge-gray', 'Disabled')),
+                m('td', mod.cache ? m('span.badge.badge-purple', String(mod.cache)) : m('span.badge.badge-gray', 'None'))
+              ])
+            )
+          )
+        ])
+      )
+    ]);
+  }
+};
+
+const ServicesView = {
+  view: () => {
+    const services = state.services || [];
+    if (services.length === 0) {
+      return m('.table-container',
+        m('.empty-state', [
+          Icons.empty(),
+          m('p', 'No services registered in services/ or ServiceRegistry')
+        ])
+      );
+    }
+
+    return m('div', [
+      m('.stats-grid', [
+        m('.card', [
+          m('.card-title', 'Total Services'),
+          m('.card-value', services.length)
+        ]),
+        m('.card', [
+          m('.card-title', 'ACID Transactions'),
+          m('.card-value', services.filter(s => s.transaction).length)
+        ]),
+        m('.card', [
+          m('.card-title', 'Auth Protected'),
+          m('.card-value', services.filter(s => s.auth).length)
+        ])
+      ]),
+      m('.table-container',
+        m('table', [
+          m('thead',
+            m('tr', [
+              m('th', 'Service Name'),
+              m('th', 'Transaction (ACID)'),
+              m('th', 'Auth Guard'),
+              m('th', 'Schema Validation')
+            ])
+          ),
+          m('tbody',
+            services.map(srv =>
+              m('tr', [
+                m('td', m('span.code-badge', srv.name)),
+                m('td', srv.transaction ? m('span.badge.badge-green', 'Active') : m('span.badge.badge-gray', 'No')),
+                m('td', srv.auth ? m('span.badge.badge-orange', String(srv.auth)) : m('span.badge.badge-gray', 'Public')),
+                m('td', srv.hasSchema ? m('span.badge.badge-blue', 'Zod Schema') : m('span.badge.badge-gray', 'None'))
+              ])
+            )
+          )
+        ])
+      )
+    ]);
+  }
+};
+
 const PluginsView = {
   view: () => {
     if (state.plugins.length === 0) {
@@ -254,6 +380,8 @@ const App = {
     m(Header),
     m(Tabs),
     state.activeTab === 'routes' ? m(RoutesView) : null,
+    state.activeTab === 'models' ? m(ModelsView) : null,
+    state.activeTab === 'services' ? m(ServicesView) : null,
     state.activeTab === 'plugins' ? m(PluginsView) : null,
     state.activeTab === 'config' ? m(ConfigView) : null
   ])
@@ -262,6 +390,3 @@ const App = {
 // Mount app
 m.mount(document.getElementById('app'), App);
 `;
-
-
-

package/plugins/dashboard/index.js

@@ -1,29 +1,92 @@
+'use strict';
+
 /**
  * Webspresso Dashboard Plugin
- * Development dashboard for monitoring routes, plugins, and configuration
+ * Development dashboard for monitoring routes, ORM models, services, plugins, and configuration
  * Uses Mithril.js for the SPA interface
+ * @module plugins/dashboard
  */
 
 const styles = require('./styles');
 const appScript = require('./app');
+const { getAllModels } = require('../../core/orm/model');
+const { getServiceRegistry, hasServiceRegistry, hasDb, getDb } = require('../../src/app-context');
 
 /**
  * Filter sensitive environment variables
+ * @param {Object} env
+ * @returns {Object}
  */
 function filterSensitiveEnv(env) {
   const sensitiveKeys = ['SECRET', 'PASSWORD', 'KEY', 'TOKEN', 'CREDENTIAL', 'PRIVATE'];
   const filtered = {};
-  
+
   for (const [key, value] of Object.entries(env)) {
-    const isSensitive = sensitiveKeys.some(s => key.toUpperCase().includes(s));
+    const isSensitive = sensitiveKeys.some((s) => key.toUpperCase().includes(s));
     filtered[key] = isSensitive ? '••••••••' : value;
   }
-  
+
   return filtered;
 }
 
+/**
+ * Safely collects all registered ORM models
+ * @returns {Array<Object>}
+ */
+function collectModels() {
+  try {
+    const models = getAllModels();
+    const result = [];
+    for (const [name, model] of models.entries()) {
+      result.push({
+        name,
+        table: model.table || name.toLowerCase(),
+        primaryKey: model.primaryKey || 'id',
+        columns: model.schema && model.schema.shape ? Object.keys(model.schema.shape) : [],
+        columnCount: model.schema && model.schema.shape ? Object.keys(model.schema.shape).length : 0,
+        relations: Object.keys(model.relations || {}),
+        scopes: Object.keys(model.scopes || {}),
+        softDelete: Boolean(model.scopes?.softDelete || model.scopes?.notDeleted || model.softDelete || model.paranoid),
+        cache: model.cache || false,
+      });
+    }
+    return result;
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Safely collects all registered business services
+ * @returns {Array<Object>}
+ */
+function collectServices() {
+  try {
+    if (!hasServiceRegistry()) return [];
+    const registry = getServiceRegistry();
+    const result = [];
+    if (registry && registry.services) {
+      for (const [name, def] of registry.services.entries()) {
+        result.push({
+          name,
+          transaction: Boolean(def.transaction),
+          auth: def.auth !== undefined ? def.auth : false,
+          timeout: def.timeout || null,
+          hasSchema: Boolean(def.schema),
+          cache: def.cache ? true : false,
+        });
+      }
+    }
+    return result;
+  } catch {
+    return [];
+  }
+}
+
 /**
  * Generate the dashboard HTML
+ * @param {Object} data
+ * @returns {string}
  */
 function generateDashboardHtml(data) {
   return `<!DOCTYPE html>
@@ -48,25 +111,25 @@ function generateDashboardHtml(data) {
 /**
  * Create the dashboard plugin
  * @param {Object} options - Plugin options
- * @param {string} options.path - Dashboard path (default: '/_webspresso')
- * @param {boolean} options.enabled - Force enable/disable (default: auto based on NODE_ENV)
+ * @param {string} [options.path='/_webspresso'] - Dashboard path
+ * @param {boolean} [options.enabled] - Force enable/disable (default: auto based on NODE_ENV)
  */
 function dashboardPlugin(options = {}) {
   const {
     path: dashboardPath = '/_webspresso',
-    enabled
+    enabled,
   } = options;
-  
+
   // Determine if enabled (default: only in development)
-  const isEnabled = enabled !== undefined 
-    ? enabled 
+  const isEnabled = enabled !== undefined
+    ? enabled
     : process.env.NODE_ENV !== 'production';
-  
+
   return {
     name: 'dashboard',
     version: '1.0.0',
-    description: 'Development dashboard for monitoring routes and configuration',
-    
+    description: 'Development dashboard for monitoring routes, models, services, and configuration',
+
     /**
      * Called after routes are mounted
      */
@@ -75,68 +138,109 @@ function dashboardPlugin(options = {}) {
       if (!isEnabled) {
         return;
       }
-      
-      const { app, routes, options: appOptions } = ctx;
-      
+
+      const { app, routes = [], options: appOptions = {} } = ctx;
+
       // Collect plugin info
-      const pluginManager = ctx.pluginManager || (appOptions && appOptions.pluginManager);
+      const pluginManager = ctx.pluginManager || appOptions.pluginManager;
       const plugins = [];
-      
+
       // Get plugins from plugin manager if available
       if (pluginManager && pluginManager.plugins) {
         for (const [name, plugin] of pluginManager.plugins) {
           plugins.push({
             name: plugin.name || name,
             version: plugin.version || '0.0.0',
-            description: plugin.description || ''
+            description: plugin.description || '',
           });
         }
       }
-      
+
+      // Collect models and services
+      const models = collectModels();
+      const services = collectServices();
+
       // Build config data
       const config = {
         env: filterSensitiveEnv({
           NODE_ENV: process.env.NODE_ENV || 'development',
           PORT: process.env.PORT || '3000',
-          BASE_URL: process.env.BASE_URL || 'http://localhost:3000'
+          BASE_URL: process.env.BASE_URL || 'http://localhost:3000',
         }),
         i18n: {
           defaultLocale: process.env.DEFAULT_LOCALE || 'en',
-          supportedLocales: (process.env.SUPPORTED_LOCALES || 'en').split(',')
+          supportedLocales: (process.env.SUPPORTED_LOCALES || 'en').split(','),
         },
         server: {
           port: process.env.PORT || '3000',
-          baseUrl: process.env.BASE_URL || 'http://localhost:3000'
-        }
+          baseUrl: process.env.BASE_URL || 'http://localhost:3000',
+        },
+        database: {
+          connected: hasDb(),
+          dialect: hasDb() ? (getDb().client || getDb().knex?.client?.config?.client || 'knex') : 'none',
+        },
       };
-      
-      // Dashboard HTML endpoint
+
+      const overview = {
+        routesCount: routes.length,
+        modelsCount: models.length,
+        servicesCount: services.length,
+        pluginsCount: plugins.length,
+        uptime: process.uptime(),
+        memoryUsage: process.memoryUsage(),
+      };
+
+      // 1. Dashboard HTML endpoint
       ctx.addRoute('get', dashboardPath, (req, res) => {
-        const data = { routes, plugins, config };
+        const data = { routes, plugins, config, models, services, overview };
         res.type('text/html');
         res.send(generateDashboardHtml(data));
       });
-      
-      // JSON API endpoints
-      ctx.addRoute('get', dashboardPath + '/api/routes', (req, res) => {
+
+      // 2. JSON API endpoints
+      ctx.addRoute('get', `${dashboardPath}/api/routes`, (req, res) => {
         res.json(routes);
       });
-      
-      ctx.addRoute('get', dashboardPath + '/api/plugins', (req, res) => {
+
+      ctx.addRoute('get', `${dashboardPath}/api/plugins`, (req, res) => {
         res.json(plugins);
       });
-      
-      ctx.addRoute('get', dashboardPath + '/api/config', (req, res) => {
+
+      ctx.addRoute('get', `${dashboardPath}/api/config`, (req, res) => {
         res.json(config);
       });
-      
+
+      ctx.addRoute('get', `${dashboardPath}/api/models`, (req, res) => {
+        res.json(collectModels());
+      });
+
+      ctx.addRoute('get', `${dashboardPath}/api/services`, (req, res) => {
+        res.json(collectServices());
+      });
+
+      ctx.addRoute('get', `${dashboardPath}/api/overview`, (req, res) => {
+        res.json({
+          routesCount: (ctx.routes || []).length,
+          modelsCount: collectModels().length,
+          servicesCount: collectServices().length,
+          pluginsCount: plugins.length,
+          nodeVersion: process.version,
+          platform: process.platform,
+          uptime: process.uptime(),
+          memoryUsage: process.memoryUsage(),
+        });
+      });
+
       // Log dashboard URL
       console.log(`\n📊 Dashboard available at: http://localhost:${process.env.PORT || 3000}${dashboardPath}\n`);
-    }
+    },
   };
 }
 
 module.exports = dashboardPlugin;
-
-
-
+module.exports.dashboardPlugin = dashboardPlugin;
+module.exports.devToolbarPlugin = dashboardPlugin;
+module.exports.devtoolsPlugin = dashboardPlugin;
+module.exports.generateDashboardHtml = generateDashboardHtml;
+module.exports.collectModels = collectModels;
+module.exports.collectServices = collectServices;

package/plugins/dashboard/styles.js

@@ -378,6 +378,84 @@ tr:hover td {
   animation: spin 0.8s linear infinite;
   margin-right: 12px;
 }
+
+/* Header Actions */
+.header-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.action-link {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  font-size: 13px;
+  font-weight: 500;
+  text-decoration: none;
+  background: var(--bg-tertiary);
+  border: 1px solid var(--border);
+  color: var(--text-primary);
+  transition: all 0.15s ease;
+}
+
+.action-link:hover {
+  background: var(--border);
+  border-color: var(--accent);
+  color: var(--text-primary);
+}
+
+/* Badges */
+.badge {
+  display: inline-block;
+  padding: 2px 8px;
+  border-radius: 10px;
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+}
+
+.badge-green {
+  background: rgba(63, 185, 80, 0.15);
+  color: var(--green);
+  border: 1px solid rgba(63, 185, 80, 0.3);
+}
+
+.badge-blue {
+  background: rgba(88, 166, 255, 0.15);
+  color: var(--accent);
+  border: 1px solid rgba(88, 166, 255, 0.3);
+}
+
+.badge-purple {
+  background: rgba(163, 113, 247, 0.15);
+  color: var(--purple);
+  border: 1px solid rgba(163, 113, 247, 0.3);
+}
+
+.badge-orange {
+  background: rgba(210, 153, 34, 0.15);
+  color: var(--orange);
+  border: 1px solid rgba(210, 153, 34, 0.3);
+}
+
+.badge-gray {
+  background: rgba(110, 118, 129, 0.15);
+  color: var(--text-muted);
+  border: 1px solid rgba(110, 118, 129, 0.3);
+}
+
+.code-badge {
+  font-family: 'SF Mono', SFMono-Regular, ui-monospace, monospace;
+  font-size: 12px;
+  background: var(--bg-tertiary);
+  padding: 2px 6px;
+  border-radius: 4px;
+  border: 1px solid var(--border);
+  color: var(--accent);
+}
 `;
 
 

package/plugins/data-exchange/export-xlsx.js

@@ -3,7 +3,13 @@
  * @module plugins/data-exchange/export-xlsx
  */
 
-const ExcelJS = require('exceljs');
+let ExcelJS = null;
+function getExcelJS() {
+  if (!ExcelJS) {
+    ExcelJS = require('exceljs');
+  }
+  return ExcelJS;
+}
 const { sanitizeForOutput } = require('../../core/orm/utils');
 const { resolveExportRecords } = require('./record-selection');
 
@@ -42,7 +48,8 @@ async function buildXlsxBuffer(model, records) {
   const clean = sanitizeForOutput(records, model);
   const columns = getModelExportColumns(model, clean);
 
-  const wb = new ExcelJS.Workbook();
+  const ExcelLib = getExcelJS();
+  const wb = new ExcelLib.Workbook();
   const ws = wb.addWorksheet('Export', {
     views: [{ state: 'frozen', ySplit: 1 }],
   });

package/plugins/data-exchange/import.js

@@ -4,7 +4,13 @@
  */
 
 const multer = require('multer');
-const ExcelJS = require('exceljs');
+let ExcelJS = null;
+function getExcelJS() {
+  if (!ExcelJS) {
+    ExcelJS = require('exceljs');
+  }
+  return ExcelJS;
+}
 const { parse: parseCsv } = require('csv-parse/sync');
 const { buildHeaderMapping, dataRowsToObjects } = require('./parse-table');
 
@@ -132,7 +138,8 @@ function parseCsvToRows(buffer) {
 }
 
 async function parseXlsxToRows(buffer) {
-  const wb = new ExcelJS.Workbook();
+  const ExcelLib = getExcelJS();
+  const wb = new ExcelLib.Workbook();
   await wb.xlsx.load(buffer);
   const ws = wb.worksheets[0];
   if (!ws) return [];

package/plugins/data-exchange/index.js

@@ -76,14 +76,17 @@ function dataExchangePlugin(options = {}) {
           models: '*',
           confirm: false,
           handler: async (records, modelName, { db: d }) => {
+            const targetModel = typeof modelName === 'object' && modelName !== null
+              ? (modelName.name || modelName.modelName || modelName.model || String(modelName))
+              : String(modelName);
             const { getModel } = require('../../core/orm/model');
-            const model = d.getModel ? d.getModel(modelName) : getModel(modelName);
+            const model = d.getModel ? d.getModel(targetModel) : getModel(targetModel);
             const pk = model?.primaryKey || 'id';
             const ids = records.map((r) => r[pk]).join(',');
             return {
               download: true,
-              url: `${adminPath}/api/data-exchange/export/${modelName}?ids=${encodeURIComponent(ids)}`,
-              filename: `${modelName}_export.xlsx`,
+              url: `${adminPath}/api/data-exchange/export/${targetModel}?ids=${encodeURIComponent(ids)}`,
+              filename: `${targetModel}_export.xlsx`,
             };
           },
         });