npm - millas - Versions diffs - 0.2.10 → 0.2.12-beta - Mend

millas 0.2.10 → 0.2.12-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (48) hide show

package/package.json +17 -3
package/src/auth/AuthController.js +42 -133
package/src/auth/AuthMiddleware.js +12 -23
package/src/auth/RoleMiddleware.js +7 -17
package/src/commands/migrate.js +46 -31
package/src/commands/serve.js +266 -37
package/src/container/Application.js +88 -8
package/src/container/MillasApp.js +6 -14
package/src/controller/Controller.js +79 -300
package/src/errors/ErrorRenderer.js +640 -0
package/src/facades/Admin.js +49 -0
package/src/facades/Auth.js +46 -0
package/src/facades/Cache.js +17 -0
package/src/facades/Database.js +43 -0
package/src/facades/Events.js +24 -0
package/src/facades/Http.js +54 -0
package/src/facades/Log.js +56 -0
package/src/facades/Mail.js +40 -0
package/src/facades/Queue.js +23 -0
package/src/facades/Storage.js +17 -0
package/src/facades/Validation.js +69 -0
package/src/http/MillasRequest.js +253 -0
package/src/http/MillasResponse.js +196 -0
package/src/http/RequestContext.js +176 -0
package/src/http/ResponseDispatcher.js +144 -0
package/src/http/helpers.js +164 -0
package/src/http/index.js +13 -0
package/src/index.js +55 -2
package/src/logger/internal.js +76 -0
package/src/logger/patchConsole.js +135 -0
package/src/middleware/CorsMiddleware.js +22 -30
package/src/middleware/LogMiddleware.js +27 -59
package/src/middleware/Middleware.js +24 -15
package/src/middleware/MiddlewarePipeline.js +30 -67
package/src/middleware/MiddlewareRegistry.js +126 -0
package/src/middleware/ThrottleMiddleware.js +22 -26
package/src/orm/fields/index.js +124 -56
package/src/orm/migration/ModelInspector.js +7 -3
package/src/orm/model/Model.js +96 -6
package/src/orm/query/QueryBuilder.js +141 -3
package/src/providers/LogServiceProvider.js +88 -18
package/src/providers/ProviderRegistry.js +14 -1
package/src/providers/ServiceProvider.js +40 -8
package/src/router/Router.js +155 -223
package/src/scaffold/maker.js +24 -59
package/src/scaffold/templates.js +13 -12
package/src/validation/BaseValidator.js +193 -0
package/src/validation/Validator.js +680 -0

package/src/router/Router.js CHANGED Viewed

@@ -1,175 +1,31 @@
 'use strict';
 const MiddlewareRegistry = require('./MiddlewareRegistry');
+const ErrorRenderer      = require('../errors/ErrorRenderer');
+const MillasRequest      = require('../http/MillasRequest');
+const MillasResponse     = require('../http/MillasResponse');
+const ResponseDispatcher = require('../http/ResponseDispatcher');
+const RequestContext     = require('../http/RequestContext');
-// ── Welcome page — shown at / when no route is defined ────────────────────────
-const WELCOME_PAGE = `<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>Welcome to Millas</title>
-<link rel="stylesheet"
-href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css"
-crossorigin="anonymous" referrerpolicy="no-referrer"/>
-<style>
-body{
-  margin:0;
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto;
-  background:#fff;
-  color:#333;
-  display:flex;
-  align-items:center;
-  justify-content:center;
-  height:100vh;
-  text-align:center;
-}
-.container{
-  max-width:720px;
-  padding:40px;
-}
-.icon{
-  margin-bottom:20px;
-}
-h1{
-  font-size:32px;
-  margin-bottom:12px;
-}
-.subtitle{
-  color:#555;
-  font-size:16px;
-  line-height:1.7;
-  margin-bottom:25px;
-}
-code{
-  background:#fff4ed;
-  color:#ea580c;
-  padding:4px 8px;
-  border-radius:6px;
-  font-size:13px;
-}
-.steps{
-  margin-top:30px;
-  text-align:left;
-  display:inline-block;
-}
-.steps h3{
-  margin-bottom:10px;
-  font-size:16px;
-}
-.steps ul{
-  margin:0;
-  padding-left:20px;
-  color:#555;
-}
-.links{
-  margin-top:35px;
-  display:flex;
-  justify-content:center;
-  gap:18px;
-  flex-wrap:wrap;
-}
-.links a{
-  color:#f97316;
-  text-decoration:none;
-  font-size:14px;
-  display:flex;
-  align-items:center;
-  gap:6px;
-}
-.links a:hover{
-  text-decoration:underline;
-}
-.footer{
-  margin-top:35px;
-  font-size:13px;
-  color:#888;
-}
-</style>
-</head>
-<body>
-<div class="container">
-<div class="icon">
-<img src="https://www.saaspegasus.com/static/images/web/landing-page/rocket-laptop.39d6be7451e6.svg" alt="Millas" style="width:140px;height:auto;">
-</div>
-<h1>It worked!</h1>
-<p class="subtitle">
-Millas is installed and running correctly.
-</p>
-<div class="steps">
-<h3>Next steps</h3>
-<ul>
-<li>Create your first route in <code>routes/web.js</code></li>
-</ul>
-</div>
-<div class="links">
-<a href="/admin">
-<i class="fa-solid fa-gauge"></i>
-Admin panel
-</a>
-<a href="/api/health">
-<i class="fa-solid fa-heart-pulse"></i>
-Health check
-</a>
-<a href="https://github.com/millas-framework/millas" target="_blank">
-<i class="fa-brands fa-github"></i>
-GitHub
-</a>
-</div>
-<div class="footer">
-Millas v0.1.2
-</div>
-</div>
-</body>
-</html>`;
-/**
- * Router
- *
- * Takes a populated RouteRegistry and binds every route
- * onto a live Express app instance.
- *
- * Also wraps async controller methods so unhandled promise
- * rejections are forwarded to Express error handlers.
- */
 class Router {
-  constructor(expressApp, registry, middlewareRegistry) {
-    this._app      = expressApp;
-    this._registry = registry;
-    this._mw       = middlewareRegistry || new MiddlewareRegistry();
+  /**
+   * @param {object}             expressApp
+   * @param {RouteRegistry}      registry
+   * @param {MiddlewareRegistry} middlewareRegistry
+   * @param {Container|null}     container   — DI container, injected into RequestContext
+   */
+  constructor(expressApp, registry, middlewareRegistry, container = null) {
+    this._app       = expressApp;
+    this._registry  = registry;
+    this._mw        = middlewareRegistry || new MiddlewareRegistry();
+    this._container = container;
   }
+  /**
+   * Bind all registered routes onto the Express app.
+   * Does NOT add 404/error handlers — call mountFallbacks() after
+   * all other middleware (like Admin) has been registered.
+   */
   mountRoutes() {
     const routes = this._registry.all();
     for (const route of routes) {
@@ -178,59 +34,38 @@ class Router {
     return this;
   }
+  /**
+   * Add the 404 + global error handlers.
+   * Must be called LAST — after all routes and admin panels.
+   */
   mountFallbacks() {
-    const hasRootRoute = this._registry.all().some(
-      r => r.verb === 'GET' && r.path === '/'
-    );
-    if (!hasRootRoute) {
-      this._app.get('/', (req, res) => {
-        res.setHeader('Content-Type', 'text/html; charset=utf-8');
-        res.send(WELCOME_PAGE);
-      });
-    }
-    this._app.use((req, res) => {
-      res.status(404).json({
-        error:   'Not Found',
-        message: `Cannot ${req.method} ${req.path}`,
-        status:  404,
-      });
-    });
-    this._app.use((err, req, res, _next) => {
-      const status  = err.status || err.statusCode || 500;
-      const message = err.message || 'Internal Server Error';
-      if (status >= 500 && process.env.NODE_ENV !== 'production') {
-        console.error(err.stack);
-      }
-      res.status(status).json({
-        error:   status >= 500 ? 'Internal Server Error' : message,
-        message,
-        status,
-        ...(err.errors && { errors: err.errors }),
-        ...(status >= 500 && process.env.NODE_ENV !== 'production' && { stack: err.stack }),
-      });
-    });
+    this._app.use(ErrorRenderer.notFound());
+    this._app.use(ErrorRenderer.handler());
     return this;
   }
+  /**
+   * Bind all registered routes onto the Express app
+   * AND add 404/error handlers (original behaviour).
+   */
   mount() {
     const routes = this._registry.all();
     for (const route of routes) {
       this._bindRoute(route);
     }
-    this.mountFallbacks();
-    return this;
+    this._app.use(ErrorRenderer.notFound());
+    this._app.use(ErrorRenderer.handler());
   }
+  // ─── Private ──────────────────────────────────────────────────────────────
   _bindRoute(route) {
-    const verb       = route.verb.toLowerCase();
-    const path       = route.path;
+    const verb = route.verb.toLowerCase();
+    const path = route.path;
     const mwHandlers = this._resolveMiddleware(route.middleware || []);
-    const terminal   = this._resolveHandler(route.handler, route.method);
+    const terminal   = this._resolveHandler(route.handler, route.method, route.verb, path, route.name);
     this._app[verb](path, ...mwHandlers, terminal);
   }
@@ -245,35 +80,132 @@ class Router {
     });
   }
-  _resolveHandler(handler, method) {
+  _resolveHandler(handler, method, verb, path, routeName) {
+    let fn;
+    let inferredName;
     if (typeof handler === 'function' && !method) {
-      return this._wrapAsync(handler);
-    }
-    if (typeof handler === 'function' && typeof method === 'string') {
+      fn = handler;
+      // Use function name if it has one, otherwise build from route
+      inferredName = handler.name && handler.name !== 'anonymous' && handler.name !== ''
+        ? handler.name
+        : null;
+    } else if (typeof handler === 'function' && typeof method === 'string') {
       const instance = new handler();
       if (typeof instance[method] !== 'function') {
         throw new Error(`Method "${method}" not found on controller "${handler.name}".`);
       }
-      return this._wrapAsync(instance[method].bind(instance));
-    }
-    if (typeof handler === 'object' && handler !== null && typeof method === 'string') {
+      fn = instance[method].bind(instance);
+      inferredName = `${handler.name}.${method}`;
+    } else if (typeof handler === 'object' && handler !== null && typeof method === 'string') {
       if (typeof handler[method] !== 'function') {
         throw new Error(`Method "${method}" not found on handler object.`);
       }
-      return this._wrapAsync(handler[method].bind(handler));
+      fn = handler[method].bind(handler);
+      inferredName = `${handler.constructor?.name || 'Controller'}.${method}`;
+    } else if (typeof handler === 'function') {
+      fn = handler;
+      inferredName = handler.name && handler.name !== 'anonymous' ? handler.name : null;
+    } else {
+      throw new Error(`Invalid route handler: ${JSON.stringify(handler)}`);
     }
-    if (typeof handler === 'function') {
-      return this._wrapAsync(handler);
-    }
-    throw new Error(`Invalid route handler: ${JSON.stringify(handler)}`);
+    // Build the display name shown in error messages, priority:
+    //   1. Explicit route name (Route.get(...).name('users.index'))
+    //   2. Controller.method (UserController.index)
+    //   3. Named function   (async function getUsers)
+    //   4. Route signature  (GET /users/:id)
+    const displayName = routeName
+      || inferredName
+      || (verb && path ? `${verb.toUpperCase()} ${path}` : 'anonymous');
+    return this._buildKernelHandler(fn, displayName);
   }
-  _wrapAsync(fn) {
-    if (fn.constructor.name === 'AsyncFunction') {
-      return (req, res, next) => fn(req, res, next).catch(next);
-    }
-    return fn;
+  /**
+   * The kernel handler — the Promise wrapper that:
+   *   1. Wraps the raw Express req into a MillasRequest
+   *   2. Calls the route handler with only the MillasRequest
+   *   3. Receives a MillasResponse (or plain value, auto-wrapped)
+   *   4. Dispatches through ResponseDispatcher to Express res
+   *   5. Raises a clear error if the handler returned nothing
+   */
+  _buildKernelHandler(fn, displayName) {
+    const fnName    = displayName || fn.name || 'anonymous';
+    const container = this._container;
+    return (expressReq, expressRes, expressNext) => {
+      const millaReq = new MillasRequest(expressReq);
+      const ctx      = new RequestContext(millaReq, container);
+      let nextCalled = false;
+      const trackedNext = (...args) => {
+        nextCalled = true;
+        expressNext(...args);
+      };
+      new Promise((resolve, reject) => {
+        try {
+          resolve(fn(ctx, trackedNext));
+        } catch (err) {
+          reject(err);
+        }
+      })
+      .then(value => {
+        if (nextCalled) return;
+        if (expressRes.headersSent) return;
+        if (value === undefined || value === null) {
+          const err = Object.assign(
+            new Error(
+              `The route handler "${fnName}" did not return a response.\n` +
+              `Return a MillasResponse or a plain value:\n\n` +
+              `  return jsonify({ ok: true })\n` +
+              `  return { ok: true }           // auto-wrapped\n` +
+              `  return 'Hello world'          // auto-wrapped\n` +
+              `  return redirect('/login')\n` +
+              `  return view('home', { data })`
+            ),
+            { status: 500, statusCode: 500 }
+          );
+          return expressNext(err);
+        }
+        if (value instanceof Error) return expressNext(value);
+        try {
+          const response = MillasResponse.isResponse(value)
+            ? value
+            : ResponseDispatcher.autoWrap(value);
+          ResponseDispatcher.dispatch(response, expressRes);
+        } catch (dispatchErr) {
+          expressNext(dispatchErr);
+        }
+      })
+      .catch(expressNext);
+    };
   }
+  /**
+   * Wrap a route handler so that:
+   *
+   *   1. Async functions have their rejections forwarded to next(err)
+   *   2. Return values are automatically sent as a response — so developers
+   *      can write handlers without touching req/res at all:
+   *
+   *        Route.get('/', () => ({ status: 'ok' }))
+   *        Route.get('/hello', () => 'Hello world')
+   *        Route.get('/user', async () => await User.find(1))
+   *        Route.get('/ping', (req, res) => res.json({ pong: true }))  // still works
+   *
+   *   Return value rules:
+   *     string        → res.send(value)
+   *     number        → res.json(value)         (rarely useful but safe)
+   *     object/array  → res.json(value)
+   *     null/undefined → do nothing (handler called res itself, or next())
+   *     Error         → next(value)
+   */
 }
-module.exports = Router;
+module.exports = Router;

package/src/scaffold/maker.js CHANGED Viewed

@@ -38,6 +38,7 @@ async function makeController(name, options = {}) {
     ? `'use strict';
 const { Controller } = require('millas');
+const { string, email, number } = require('millas/validation');
 /**
  * ${className}
@@ -46,34 +47,32 @@ const { Controller } = require('millas');
  */
 class ${className} extends Controller {
   /** GET /${name.toLowerCase()}s */
-  async index(req, res) {
-    return this.ok(res, { data: [] });
+  async index({ query }) {
+    return this.ok({ data: [] });
   }
   /** GET /${name.toLowerCase()}s/:id */
-  async show(req, res) {
-    const id = this.param(req, 'id');
-    return this.ok(res, { data: { id } });
+  async show({ params }) {
+    return this.ok({ data: { id: params.id } });
   }
   /** POST /${name.toLowerCase()}s */
-  async store(req, res) {
-    const data = await this.validate(req, {
-      // 'name': 'required|string|max:255',
+  async store({ body }) {
+    const data = await body.validate({
+      // name: string().required().max(255),
     });
-    return this.created(res, { data });
+    return this.created({ data });
   }
   /** PUT /${name.toLowerCase()}s/:id */
-  async update(req, res) {
-    const id   = this.param(req, 'id');
-    const data = this.except(req, ['id']);
-    return this.ok(res, { data: { id, ...data } });
+  async update({ params, body }) {
+    const data = body.except(['id']);
+    return this.ok({ data: { id: params.id, ...data } });
   }
   /** DELETE /${name.toLowerCase()}s/:id */
-  async destroy(req, res) {
-    return this.noContent(res);
+  async destroy({ params }) {
+    return this.noContent();
   }
 }
@@ -87,8 +86,8 @@ const { Controller } = require('millas');
  * ${className}
  */
 class ${className} extends Controller {
-  async index(req, res) {
-    return this.ok(res, { message: 'Hello from ${className}' });
+  async index({ query }) {
+    return this.ok({ message: 'Hello from ${className}' });
   }
 }
@@ -105,58 +104,23 @@ async function makeModel(name, options = {}) {
   const content = `'use strict';
-const { Model, fields, HasMany, HasOne, BelongsTo, BelongsToMany } = require('millas');
+const { Model, fields } = require('millas');
 /**
  * ${className} Model
  *
- * Table: ${tableName}
- *
- * Edit this file, then run:
- *   millas makemigrations   — generates migration files from your changes
- *   millas migrate          — applies them to the database
+ * Represents the "${tableName}" table.
+ * Run: millas makemigrations  — to generate the migration.
+ * Run: millas migrate         — to apply it.
  */
 class ${className} extends Model {
   static table = '${tableName}';
-  // ── Fields ──────────────────────────────────────────────────────
   static fields = {
     id:         fields.id(),
     created_at: fields.timestamp(),
     updated_at: fields.timestamp(),
-    // deleted_at: fields.timestamp({ nullable: true }),  // uncomment + set softDeletes = true
   };
-  // ── Soft deletes ─────────────────────────────────────────────────
-  // static softDeletes = true;
-  // ── Relations ─────────────────────────────────────────────────────
-  // static relations = {
-  //   posts:   new HasMany(() => require('./Post'), 'user_id'),
-  //   profile: new HasOne(() => require('./Profile'), 'user_id'),
-  //   role:    new BelongsTo(() => require('./Role'), 'role_id'),
-  //   tags:    new BelongsToMany(() => require('./Tag'), '${tableName.replace(/s$/, '')}_tag', '${tableName.replace(/s$/, '')}_id', 'tag_id'),
-  // };
-  // ── Scopes ───────────────────────────────────────────────────────
-  // static scopes = {
-  //   active:  qb => qb.where('active', true),
-  //   recent:  qb => qb.latest().limit(10),
-  //   byUser: (qb, userId) => qb.where('user_id', userId),
-  // };
-  // ── Validation ───────────────────────────────────────────────────
-  // static validate(data) {
-  //   if (!data.name) throw new Error('name is required');
-  // }
-  // ── Lifecycle hooks ──────────────────────────────────────────────
-  // static async beforeCreate(data)    { return data; }
-  // static async afterCreate(instance) {}
-  // static async beforeUpdate(data)    { return data; }
-  // static async afterUpdate(instance) {}
-  // static async beforeDelete(instance){}
-  // static async afterDelete(instance) {}
 }
 module.exports = ${className};
@@ -194,10 +158,11 @@ class ${className} extends Middleware {
    * Handle the incoming request.
    * Call next() to continue, or return a response to halt the chain.
    */
-  async handle(req, res, next) {
-    // Your middleware logic here
+  async handle({ req }, next) {
+    // Destructure what you need: { params, body, query, user, headers, req }
+    // Return a MillasResponse to short-circuit, or call next() to continue.
-    next();
+    return next();
   }
 }

package/src/scaffold/templates.js CHANGED Viewed

@@ -130,12 +130,13 @@ module.exports = function (Route) {
 module.exports = function (Route) {
   Route.prefix('/api').group(() => {
-    Route.get('/health', (req, res) => {
-      res.json({ status: 'ok', timestamp: new Date().toISOString() });
-    });
+    Route.get('/health', () =>
+      jsonify({ status: 'ok', timestamp: new Date().toISOString() })
+    );
-    // Your API routes here
+    // Your API routes here:
     // Route.resource('/users', UserController);
+    // Route.auth('/auth');
   });
 };
@@ -248,22 +249,22 @@ const { ServiceProvider } = require('millas');
  *
  * Register and bootstrap your application services here.
  *
- * register()  — bind things into the container (synchronous)
- * boot()      — called after all providers have registered (async OK)
+ * beforeBoot(container) — runs first, before any register(). Synchronous.
+ *                         Good for patching globals, loading config.
+ * register(container)   — bind singletons, factories, instances.
+ * boot(container, app)  — all providers registered. Async OK.
+ *                         Good for routes, event listeners, admin resources.
  */
 class AppServiceProvider extends ServiceProvider {
   register(container) {
     // container.bind('UserService', UserService);
-    // container.singleton('Mailer', MailService);
+    // container.singleton('Cache', CacheService);
     // container.instance('Config', require('../config/app'));
   }
   async boot(container, app) {
-    // const { Log } = require('millas');
-    // Log.tag('AppServiceProvider').i('Booted');
-    // Register resources in the Admin panel:
-    // const { Admin, AdminResource } = require('millas');
+    // Register Admin resources:
+    // const { Admin } = require('millas');
     // const Post = require('../app/models/Post');
     // Admin.register(Post);
   }