@africode/core 5.0.1 → 5.0.2

package/core/compliance.js

@@ -10,6 +10,7 @@
  */
 
 import { z } from 'zod';
+import { frameworkLog } from './logging.js';
 
 /**
  * NIDA Identity Infrastructure Integration
@@ -532,7 +533,7 @@ export class AMLComplianceEngine {
      */
     async _scheduleReporting(report, hours) {
         // Implementation would use job queue system
-        console.warn(`Scheduling FIU report in ${hours} hours for transaction ${report.transactionId}`);
+        frameworkLog('warn', `Scheduling FIU report in ${hours} hours for transaction ${report.transactionId}`);
     }
 }
 
@@ -571,7 +572,7 @@ export class ComplianceMiddleware {
                         await this._updateUserKYC(userId, verification);
                     }
                 } catch (error) {
-                    console.error('NIDA verification failed:', error);
+                    frameworkLog('error', 'NIDA verification failed:', error);
                     // Allow request to continue but log failure
                 }
             }
@@ -590,7 +591,7 @@ export class ComplianceMiddleware {
             const evaluation = await this.aml.evaluateTransaction(transaction, customer);
 
             if (evaluation.suspicious) {
-                console.warn(`Suspicious transaction detected: ${transaction.id}`);
+                frameworkLog('warn', `Suspicious transaction detected: ${transaction.id}`);
                 // Could block transaction or flag for review
             }
 
@@ -611,7 +612,7 @@ export class ComplianceMiddleware {
      */
     async _updateUserKYC(userId, verification) {
         // Implementation would update user database
-        console.warn(`Updated KYC for user ${userId}:`, verification);
+        frameworkLog('warn', `Updated KYC for user ${userId}:`, verification);
     }
 
     /**
@@ -625,4 +626,4 @@ export class ComplianceMiddleware {
             address: { country: 'TZ' }
         };
     }
-}
+}

package/core/config.js

@@ -13,6 +13,8 @@
  * @module core/config
  */
 
+import { frameworkLog } from './logging.js';
+
 /**
  * @typedef {Object} AfriCodeConfig
  *
@@ -192,7 +194,7 @@ export function emitValidationError(error) {
   const hook = _config.hooks?.onValidationError;
   if (typeof hook === 'function') {
     try { hook(error); } catch (e) {
-      console.error('[AfriCode] Hook error in onValidationError:', e);
+      frameworkLog('error', '[AfriCode] Hook error in onValidationError:', e);
     }
   }
 }
@@ -205,7 +207,7 @@ export function emitSecurityViolation(error) {
   const hook = _config.hooks?.onSecurityViolation;
   if (typeof hook === 'function') {
     try { hook(error); } catch (e) {
-      console.error('[AfriCode] Hook error in onSecurityViolation:', e);
+      frameworkLog('error', '[AfriCode] Hook error in onSecurityViolation:', e);
     }
   }
 }
@@ -219,7 +221,7 @@ export function emitRateLimit(key, request = null) {
   const hook = _config.hooks?.onRateLimit;
   if (typeof hook === 'function') {
     try { hook(key, request); } catch (e) {
-      console.error('[AfriCode] Hook error in onRateLimit:', e);
+      frameworkLog('error', '[AfriCode] Hook error in onRateLimit:', e);
     }
   }
 }
@@ -232,7 +234,7 @@ export function emitDatabaseError(error) {
   const hook = _config.hooks?.onDatabaseError;
   if (typeof hook === 'function') {
     try { hook(error); } catch (e) {
-      console.error('[AfriCode] Hook error in onDatabaseError:', e);
+      frameworkLog('error', '[AfriCode] Hook error in onDatabaseError:', e);
     }
   }
 }
@@ -245,7 +247,7 @@ export function emitRequest(request) {
   const hook = _config.hooks?.onRequest;
   if (typeof hook === 'function') {
     try { hook(request); } catch (e) {
-      console.error('[AfriCode] Hook error in onRequest:', e);
+      frameworkLog('error', '[AfriCode] Hook error in onRequest:', e);
     }
   }
 }

package/core/enhanced-hmr.js

@@ -12,6 +12,7 @@
 
 import { watch } from 'node:fs';
 import { join, extname, dirname } from 'node:path';
+import { frameworkLog } from './logging.js';
 
 export class EnhancedHMRMiddleware {
     constructor(options = {}) {
@@ -44,7 +45,7 @@ export class EnhancedHMRMiddleware {
      * Initialize HMR server with Bun.serve integration
      */
     async initialize(devServer) {
-        console.log(`[HMR] Initializing enhanced hot reload on port ${this.options.port}`);
+        frameworkLog('log', `[HMR] Initializing enhanced hot reload on port ${this.options.port}`);
 
         // Setup WebSocket upgrade handler
         devServer.upgrade({
@@ -56,14 +57,14 @@ export class EnhancedHMRMiddleware {
         // Start file watching
         await this.startFileWatching();
 
-        console.log(`[HMR] Watching ${this.options.watchPaths.length} paths for changes...`);
+        frameworkLog('log', `[HMR] Watching ${this.options.watchPaths.length} paths for changes...`);
     }
 
     /**
      * Handle new client connection
      */
     handleClientConnect(ws) {
-        console.log(`[HMR] Client connected from ${ws.remoteAddress}`);
+        frameworkLog('log', `[HMR] Client connected from ${ws.remoteAddress}`);
         this.clients.add(ws);
 
         // Send welcome message with current state
@@ -97,10 +98,11 @@ export class EnhancedHMRMiddleware {
                     break;
 
                 default:
-                    console.log(`[HMR] Unknown message type: ${data.type}`);
+                    frameworkLog('log', `[HMR] Unknown message type: ${data.type}`);
+                    break;
             }
         } catch (error) {
-            console.error('[HMR] Error parsing client message:', error);
+            frameworkLog('error', '[HMR] Error parsing client message:', error);
         }
     }
 
@@ -108,7 +110,7 @@ export class EnhancedHMRMiddleware {
      * Handle client disconnection
      */
     handleClientDisconnect(ws) {
-        console.log('[HMR] Client disconnected');
+        frameworkLog('log', '[HMR] Client disconnected');
         this.clients.delete(ws);
     }
 
@@ -151,10 +153,10 @@ export class EnhancedHMRMiddleware {
             });
 
             this.watchers.set(dirPath, watcher);
-            console.log(`[HMR] Watching directory: ${dirPath}`);
+            frameworkLog('log', `[HMR] Watching directory: ${dirPath}`);
 
         } catch (error) {
-            console.error(`[HMR] Failed to watch ${dirPath}:`, error.message);
+            frameworkLog('error', `[HMR] Failed to watch ${dirPath}:`, error.message);
         }
     }
 
@@ -181,7 +183,7 @@ export class EnhancedHMRMiddleware {
         const ext = extname(filename);
         const relativePath = this.getRelativePath(fullPath);
 
-        console.log(`[HMR] File changed: ${relativePath}`);
+        frameworkLog('log', `[HMR] File changed: ${relativePath}`);
 
         // Determine change type and reload strategy
         const changeType = this.classifyChange(filename, ext);
@@ -269,7 +271,7 @@ export class EnhancedHMRMiddleware {
      * Handle core module changes (full reload required)
      */
     handleCoreChange(relativePath) {
-        console.log(`[HMR] Core module changed, triggering full reload: ${relativePath}`);
+        frameworkLog('log', `[HMR] Core module changed, triggering full reload: ${relativePath}`);
 
         this.broadcast({
             type: 'core-update',
@@ -297,7 +299,7 @@ export class EnhancedHMRMiddleware {
      * Handle config changes (server restart)
      */
     handleConfigChange(relativePath) {
-        console.log(`[HMR] Config changed, server restart required: ${relativePath}`);
+        frameworkLog('log', `[HMR] Config changed, server restart required: ${relativePath}`);
 
         this.broadcast({
             type: 'config-update',
@@ -329,7 +331,7 @@ export class EnhancedHMRMiddleware {
             try {
                 client.send(messageStr);
             } catch (error) {
-                console.error('[HMR] Failed to send to client:', error);
+                frameworkLog('error', '[HMR] Failed to send to client:', error);
                 this.clients.delete(client);
             }
         }
@@ -375,7 +377,7 @@ export class EnhancedHMRMiddleware {
      * Cleanup watchers on shutdown
      */
     async shutdown() {
-        console.log('[HMR] Shutting down...');
+        frameworkLog('log', '[HMR] Shutting down...');
 
         // Close all watchers
         for (const [path, watcher] of this.watchers) {
@@ -397,7 +399,7 @@ export class EnhancedHMRMiddleware {
         this.sessions.clear();
         this.dbConnections.clear();
 
-        console.log('[HMR] Shutdown complete');
+        frameworkLog('log', '[HMR] Shutdown complete');
     }
 }
 

package/core/file-router.js

@@ -1,290 +1,50 @@
 /**
- * File-Based Router for Bun Runtime
- * Automatic mapping of /pages directory to URLs
- * Supports dynamic routes, nested layouts, and API routes
+ * Compatibility router for legacy runtime entry points.
+ * The canonical route scanner lives in core/router.js.
  */
 
-import { readdirSync, statSync } from 'fs';
-import { join, extname, dirname, relative } from 'path';
-import { fileURLToPath } from 'url';
+import { FileSystemRouter } from './router.js';
+import { join } from 'path';
 
 export class FileBasedRouter {
-    constructor(options = {}) {
-        this.options = {
-            pagesDir: options.pagesDir || 'pages',
-            apiDir: options.apiDir || 'pages/api',
-            layoutsDir: options.layoutsDir || 'layouts',
-            middlewareDir: options.middlewareDir || 'middleware',
-            ...options
-        };
-
-        this.routes = new Map();
-        this.apiRoutes = new Map();
-        this.layouts = new Map();
-        this.middleware = new Map();
-
-        this._scanRoutes();
-    }
-
-    /**
-     * Scan pages directory and build route mappings
-     */
-    _scanRoutes() {
-        const pagesPath = join(process.cwd(), this.options.pagesDir);
-
-        try {
-            this._scanDirectory(pagesPath, '');
-        } catch (error) {
-            console.warn('[Router] Pages directory not found:', pagesPath);
-        }
-    }
-
-    /**
-     * Recursively scan directory for route files
-     */
-    _scanDirectory(dirPath, routePrefix) {
-        const items = readdirSync(dirPath);
-
-        for (const item of items) {
-            const itemPath = join(dirPath, item);
-            const stat = statSync(itemPath);
-
-            if (stat.isDirectory()) {
-                // Handle nested directories
-                const subRoute = routePrefix + '/' + item;
-                this._scanDirectory(itemPath, subRoute);
-            } else if (stat.isFile()) {
-                // Handle route files
-                this._processRouteFile(itemPath, item, routePrefix);
-            }
-        }
-    }
-
-    /**
-     * Process individual route file
-     */
-    _processRouteFile(filePath, filename, routePrefix) {
-        const ext = extname(filename);
-        const name = filename.replace(ext, '');
-
-        // Skip non-route files
-        if (!['.js', '.ts', '.mjs'].includes(ext)) return;
-
-        // Handle API routes
-        if (filePath.includes('/api/') || routePrefix.includes('/api')) {
-            this._addApiRoute(filePath, filename, routePrefix);
-            return;
-        }
-
-        // Handle page routes
-        this._addPageRoute(filePath, filename, routePrefix);
-    }
-
-    /**
-     * Add API route mapping
-     */
-    _addApiRoute(filePath, filename, routePrefix) {
-        let routePath = routePrefix + '/' + filename.replace(/\.(js|ts|mjs)$/, '');
-
-        // Handle dynamic routes
-        routePath = routePath.replace(/\[([^\]]+)\]/g, ':$1');
-
-        // Handle catch-all routes
-        routePath = routePath.replace(/\[\.\.\.([^\]]+)\]/g, '*$1');
-
-        this.apiRoutes.set(routePath, {
-            filePath,
-            handler: null, // Lazy load
-            methods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH']
-        });
-
-        console.log(`[Router] API Route: ${routePath} -> ${relative(process.cwd(), filePath)}`);
-    }
-
-    /**
-     * Add page route mapping
-     */
-    _addPageRoute(filePath, filename, routePrefix) {
-        let routePath = routePrefix;
-
-        // Handle index files
-        if (filename === 'index.js' || filename === 'index.ts' || filename === 'index.mjs') {
-            // Keep routePrefix as is
-        } else {
-            routePath += '/' + filename.replace(/\.(js|ts|mjs)$/, '');
-        }
-
-        // Handle dynamic routes
-        routePath = routePath.replace(/\[([^\]]+)\]/g, ':$1');
-
-        // Handle catch-all routes
-        routePath = routePath.replace(/\[\.\.\.([^\]]+)\]/g, '*$1');
-
-        // Ensure root route
-        if (routePath === '') routePath = '/';
-
-        this.routes.set(routePath, {
-            filePath,
-            component: null, // Lazy load
-            layout: this._findLayoutForRoute(routePath)
-        });
-
-        console.log(`[Router] Page Route: ${routePath} -> ${relative(process.cwd(), filePath)}`);
-    }
-
-    /**
-     * Find appropriate layout for route
-     */
-    _findLayoutForRoute(routePath) {
-        // Check for nested layouts
-        const segments = routePath.split('/').filter(Boolean);
-        let layoutPath = null;
-
-        // Walk up the route hierarchy
-        for (let i = segments.length; i >= 0; i--) {
-            const testPath = '/' + segments.slice(0, i).join('/');
-            const layoutFile = join(process.cwd(), this.options.layoutsDir, testPath, 'layout.js');
-
-            try {
-                statSync(layoutFile);
-                layoutPath = layoutFile;
-                break;
-            } catch {
-                // Continue searching
-            }
-        }
-
-        // Fallback to root layout
-        if (!layoutPath) {
-            const rootLayout = join(process.cwd(), this.options.layoutsDir, 'layout.js');
-            try {
-                statSync(rootLayout);
-                layoutPath = rootLayout;
-            } catch {
-                // No layout found
-            }
-        }
-
-        return layoutPath;
-    }
-
-    /**
-     * Match incoming request to route
-     */
-    matchRoute(pathname, method = 'GET') {
-        // Check API routes first
-        for (const [routePath, route] of this.apiRoutes) {
-            const params = this._matchRoutePattern(routePath, pathname);
-            if (params && route.methods.includes(method)) {
-                return {
-                    type: 'api',
-                    route: routePath,
-                    filePath: route.filePath,
-                    params,
-                    handler: route.handler
-                };
-            }
-        }
-
-        // Check page routes
-        for (const [routePath, route] of this.routes) {
-            const params = this._matchRoutePattern(routePath, pathname);
-            if (params) {
-                return {
-                    type: 'page',
-                    route: routePath,
-                    filePath: route.filePath,
-                    params,
-                    component: route.component,
-                    layout: route.layout
-                };
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Match route pattern with pathname
-     */
-    _matchRoutePattern(pattern, pathname) {
-        const patternParts = pattern.split('/').filter(Boolean);
-        const pathParts = pathname.split('/').filter(Boolean);
-
-        if (pattern === '/' && pathname === '/') {
-            return {};
-        }
-
-        if (patternParts.length !== pathParts.length && !pattern.includes('*')) {
-            return null;
-        }
-
-        const params = {};
-
-        for (let i = 0; i < patternParts.length; i++) {
-            const patternPart = patternParts[i];
-            const pathPart = pathParts[i];
-
-            if (patternPart.startsWith(':')) {
-                // Dynamic parameter
-                const paramName = patternPart.slice(1);
-                params[paramName] = pathPart;
-            } else if (patternPart.startsWith('*')) {
-                // Catch-all parameter
-                const paramName = patternPart.slice(1);
-                params[paramName] = pathParts.slice(i).join('/');
-                return params; // Catch-all consumes rest
-            } else if (patternPart !== pathPart) {
-                return null;
-            }
-        }
-
-        return params;
-    }
-
-    /**
-     * Load route handler/component lazily
-     */
-    async loadRoute(routeMatch) {
-        if (routeMatch.type === 'api') {
-            if (!routeMatch.handler) {
-                const module = await import(routeMatch.filePath);
-                routeMatch.handler = module.default || module;
-                this.apiRoutes.get(routeMatch.route).handler = routeMatch.handler;
-            }
-            return routeMatch.handler;
-        } else {
-            if (!routeMatch.component) {
-                const module = await import(routeMatch.filePath);
-                routeMatch.component = module.default || module;
-                this.routes.get(routeMatch.route).component = routeMatch.component;
-            }
-            return routeMatch.component;
-        }
-    }
-
-    /**
-     * Get all registered routes
-     */
-    getRoutes() {
-        return {
-            pages: Array.from(this.routes.keys()),
-            apis: Array.from(this.apiRoutes.keys())
-        };
-    }
-
-    /**
-     * Clear route cache (for hot reloading)
-     */
-    clearCache() {
-        for (const route of this.apiRoutes.values()) {
-            route.handler = null;
-        }
-        for (const route of this.routes.values()) {
-            route.component = null;
-        }
-        console.log('[Router] Route cache cleared');
-    }
+  constructor(options = {}) {
+    this.router = new FileSystemRouter(join(process.cwd(), options.pagesDir || 'pages'));
+  }
+
+  matchRoute(pathname) {
+    const resolved = this.router.resolve(pathname);
+    if (!resolved) return null;
+
+    return {
+      type: resolved.isApi ? "api" : "page",
+      route: pathname,
+      filePath: resolved.filePath,
+      params: resolved.params || {},
+      isDynamic: Boolean(resolved.isDynamic),
+      isApi: Boolean(resolved.isApi),
+      handler: null,
+      component: null
+    };
+  }
+
+  async loadRoute(routeMatch) {
+    const module = await import(routeMatch.filePath);
+    if (routeMatch.type === "api") {
+      routeMatch.handler = module.default || module;
+      return routeMatch.handler;
+    }
+
+    routeMatch.component = module.default || module;
+    return routeMatch.component;
+  }
+
+  getRoutes() {
+    return this.router.getRoutes();
+  }
+
+  clearCache() {
+    return;
+  }
 }
 
 export default FileBasedRouter;

package/core/hmr.js

@@ -10,6 +10,7 @@
 
 import * as nodePath from 'node:path';
 import { watch } from 'node:fs';
+import { frameworkLog } from './logging.js';
 
 export class HMRServer {
     constructor(port = 3001) {
@@ -28,7 +29,7 @@ export class HMRServer {
         // Upgrade HTTP connections to WebSocket
         devServer.upgrade({
             open(ws) {
-                console.log(`[HMR] Client connected from ${ws.remoteAddress}`);
+                frameworkLog('log', `[HMR] Client connected from ${ws.remoteAddress}`);
                 this.clients.add(ws);
             },
             message(ws, message) {
@@ -44,13 +45,13 @@ export class HMRServer {
             },
             close(ws) {
                 this.clients.delete(ws);
-                console.log(`[HMR] Client disconnected`);
+                frameworkLog('log', `[HMR] Client disconnected`);
             }
         });
 
         // Start file watching
         this.watchDirectory(process.cwd());
-        console.log(`[HMR] Watching for changes...`);
+        frameworkLog('log', `[HMR] Watching for changes...`);
     }
 
     /**
@@ -94,7 +95,7 @@ export class HMRServer {
 
             this.watchers.set(dir, watcher);
         } catch (err) {
-            console.error(`[HMR] Failed to watch ${dir}:`, err.message);
+            frameworkLog('error', `[HMR] Failed to watch ${dir}:`, err.message);
         }
     }
 
@@ -111,7 +112,7 @@ export class HMRServer {
         if (normalizedPath.includes('.test.')) return;
         if (normalizedPath.includes('test/')) return;
 
-        console.log(`[HMR] File changed: ${normalizedPath}`);
+        frameworkLog('log', `[HMR] File changed: ${normalizedPath}`);
 
         // Determine module type and extract clean path
         let moduleType = 'unknown';
@@ -165,7 +166,7 @@ export class HMRServer {
         }
 
         if (successCount > 0) {
-            console.log(`[HMR] Broadcasted update to ${successCount} client(s)`);
+            frameworkLog('log', `[HMR] Broadcasted update to ${successCount} client(s)`);
         }
     }
 
@@ -182,7 +183,7 @@ export class HMRServer {
         }
         this.watchers.clear();
         this.clients.clear();
-        console.log(`[HMR] Server stopped`);
+        frameworkLog('log', `[HMR] Server stopped`);
     }
 }