npm - millas - Versions diffs - 0.2.11 → 0.2.12-beta-1 - Mend

millas 0.2.11 → 0.2.12-beta-1

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 (74) hide show

package/package.json +6 -5
package/src/auth/Auth.js +13 -8
package/src/auth/AuthController.js +45 -134
package/src/auth/AuthMiddleware.js +12 -23
package/src/auth/AuthUser.js +98 -0
package/src/auth/RoleMiddleware.js +7 -17
package/src/cli.js +1 -1
package/src/commands/migrate.js +46 -31
package/src/commands/serve.js +238 -38
package/src/container/AppInitializer.js +158 -0
package/src/container/Application.js +288 -183
package/src/container/HttpServer.js +156 -0
package/src/container/MillasApp.js +23 -280
package/src/container/MillasConfig.js +163 -0
package/src/controller/Controller.js +79 -300
package/src/core/auth.js +9 -0
package/src/core/db.js +8 -0
package/src/core/foundation.js +67 -0
package/src/core/http.js +11 -0
package/src/core/mail.js +6 -0
package/src/core/queue.js +7 -0
package/src/core/validation.js +29 -0
package/src/errors/ErrorRenderer.js +640 -0
package/src/facades/Admin.js +49 -0
package/src/facades/Auth.js +29 -0
package/src/facades/Cache.js +28 -0
package/src/facades/Database.js +43 -0
package/src/facades/Events.js +25 -0
package/src/facades/Facade.js +197 -0
package/src/facades/Http.js +51 -0
package/src/facades/Log.js +32 -0
package/src/facades/Mail.js +35 -0
package/src/facades/Queue.js +30 -0
package/src/facades/Storage.js +25 -0
package/src/facades/Url.js +53 -0
package/src/http/HttpClient.js +673 -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 +51 -0
package/src/http/UrlGenerator.js +375 -0
package/src/http/WelcomePage.js +273 -0
package/src/http/adapters/ExpressAdapter.js +315 -0
package/src/http/adapters/HttpAdapter.js +168 -0
package/src/http/adapters/index.js +9 -0
package/src/http/helpers.js +164 -0
package/src/http/index.js +13 -0
package/src/index.js +5 -91
package/src/logger/formatters/PrettyFormatter.js +15 -5
package/src/logger/internal.js +76 -0
package/src/logger/patchConsole.js +145 -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 +106 -0
package/src/middleware/ThrottleMiddleware.js +22 -26
package/src/orm/fields/index.js +124 -56
package/src/orm/migration/ModelInspector.js +339 -336
package/src/orm/model/Model.js +96 -6
package/src/orm/query/QueryBuilder.js +141 -3
package/src/providers/AuthServiceProvider.js +9 -5
package/src/providers/CacheStorageServiceProvider.js +3 -1
package/src/providers/EventServiceProvider.js +2 -1
package/src/providers/LogServiceProvider.js +88 -17
package/src/providers/MailServiceProvider.js +3 -2
package/src/providers/ProviderRegistry.js +14 -1
package/src/providers/QueueServiceProvider.js +3 -2
package/src/providers/ServiceProvider.js +40 -8
package/src/router/Router.js +121 -222
package/src/scaffold/maker.js +24 -59
package/src/scaffold/templates.js +21 -19
package/src/validation/BaseValidator.js +193 -0
package/src/validation/Validator.js +680 -0

package/src/router/Router.js CHANGED Viewed

@@ -1,278 +1,177 @@
 'use strict';
-const MiddlewareRegistry = require('./MiddlewareRegistry');
-// ── 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.
+ * Bridges the Millas RouteRegistry to any HttpAdapter.
+ * Zero knowledge of Express (or any HTTP engine) — it only calls
+ * the adapter interface defined in HttpAdapter.js.
  *
- * Also wraps async controller methods so unhandled promise
- * rejections are forwarded to Express error handlers.
+ * Responsibilities:
+ *   - Resolve route handlers from the RouteRegistry
+ *   - Resolve middleware aliases from the MiddlewareRegistry
+ *   - Ask the adapter to mount each route
+ *   - Ask the adapter to mount the welcome page, 404, and error handler
  */
 class Router {
-  constructor(expressApp, registry, middlewareRegistry) {
-    this._app      = expressApp;
-    this._registry = registry;
-    this._mw       = middlewareRegistry || new MiddlewareRegistry();
+  /**
+   * @param {import('../http/adapters/HttpAdapter')} adapter
+   * @param {import('./RouteRegistry')}              registry
+   * @param {import('./MiddlewareRegistry')}         middlewareRegistry
+   * @param {import('../container/Container')|null}  container
+   */
+  constructor(adapter, registry, middlewareRegistry, container = null) {
+    this._adapter   = adapter;
+    this._registry  = registry;
+    this._mw        = middlewareRegistry;
+    this._container = container;
   }
+  // ── Public API ─────────────────────────────────────────────────────────────
+  /**
+   * Mount all registered routes onto the adapter.
+   * Does NOT add fallbacks — call mountFallbacks() after all routes
+   * and any extra middleware (e.g. Admin panel) have been added.
+   */
   mountRoutes() {
-    const routes = this._registry.all();
-    for (const route of routes) {
+    for (const route of this._registry.all()) {
       this._bindRoute(route);
     }
     return this;
   }
+  /**
+   * Mount the 404 + error handlers.
+   * Must be called LAST — after all routes and the admin panel.
+   */
   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._maybeInjectWelcome();
+    this._adapter.mountNotFound();
+    this._adapter.mountErrorHandler();
     return this;
   }
+  /**
+   * Mount routes + fallbacks in one call.
+   */
   mount() {
-    const routes = this._registry.all();
-    for (const route of routes) {
-      this._bindRoute(route);
-    }
-    this.mountFallbacks();
+    this.mountRoutes();
+    this._maybeInjectWelcome();
+    this._adapter.mountNotFound();
+    this._adapter.mountErrorHandler();
     return this;
   }
+  // ── Private ────────────────────────────────────────────────────────────────
   _bindRoute(route) {
-    const verb       = route.verb.toLowerCase();
-    const path       = route.path;
-    const mwHandlers = this._resolveMiddleware(route.middleware || []);
-    const terminal   = this._resolveHandler(route.handler, route.method);
-    this._app[verb](path, ...mwHandlers, terminal);
+    const middlewareHandlers = this._resolveMiddleware(route.middleware || []);
+    const terminalHandler    = this._resolveTerminalHandler(
+      route.handler,
+      route.method,
+      route.verb,
+      route.path,
+      route.name
+    );
+    this._adapter.mountRoute(route.verb, route.path, [
+      ...middlewareHandlers,
+      terminalHandler,
+    ]);
   }
   _resolveMiddleware(list) {
     return list.map(alias => {
       try {
-        return this._mw.resolve(alias);
+        return this._mw.resolve(alias, this._adapter, this._container);
       } catch (err) {
-        console.warn(`[Millas] Warning: ${err.message} — skipping.`);
-        return (_req, _res, next) => next();
+        console.warn(`[Millas] Middleware warning: ${err.message} — skipping.`);
+        return this._mw.resolvePassthrough(this._adapter);
       }
     });
   }
-  _resolveHandler(handler, method) {
+  _resolveTerminalHandler(handler, method, verb, path, routeName) {
+    const kernelFn    = this._extractKernelFn(handler, method);
+    const displayName = this._buildDisplayName(handler, method, verb, path, routeName);
+    return this._adapter.wrapKernelHandler(kernelFn, displayName, this._container);
+  }
+  /**
+   * Pull the actual function out of the handler definition.
+   * Three forms:
+   *   1. Bare function/arrow:          Route.get('/', () => jsonify({}))
+   *   2. Controller class + method:    Route.get('/', UserController, 'index')
+   *   3. Controller instance + method: Route.get('/', controllerInstance, 'index')
+   */
+  _extractKernelFn(handler, method) {
     if (typeof handler === 'function' && !method) {
-      return this._wrapAsync(handler);
+      return handler;
     }
     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}".`);
+        throw new Error(
+          `Method "${method}" not found on controller "${handler.name}".`
+        );
       }
-      return this._wrapAsync(instance[method].bind(instance));
+      return instance[method].bind(instance);
     }
     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));
+      return handler[method].bind(handler);
     }
     if (typeof handler === 'function') {
-      return this._wrapAsync(handler);
+      return handler;
     }
     throw new Error(`Invalid route handler: ${JSON.stringify(handler)}`);
   }
-  _wrapAsync(fn) {
-    if (fn.constructor.name === 'AsyncFunction') {
-      return (req, res, next) => fn(req, res, next).catch(next);
+  _buildDisplayName(handler, method, verb, path, routeName) {
+    if (routeName) return routeName;
+    if (typeof handler === 'function' && method) {
+      return `${handler.name}.${method}`;
+    }
+    if (
+      typeof handler === 'function' &&
+      handler.name &&
+      handler.name !== 'anonymous' &&
+      handler.name !== ''
+    ) {
+      return handler.name;
+    }
+    return verb && path ? `${verb.toUpperCase()} ${path}` : 'anonymous';
+  }
+  /**
+   * If no user-defined GET / route exists, ask the adapter to serve
+   * a developer-friendly welcome page.
+   * Only active outside production — silently skipped in prod.
+   */
+  _maybeInjectWelcome() {
+    if (process.env.NODE_ENV === 'production') return;
+    const hasRoot = this._registry.all().some(
+      r => r.verb === 'GET' && (r.path === '/' || r.path === '')
+    );
+    if (!hasRoot) {
+      let version = '';
+      try { version = require('../../package.json').version; } catch {}
+      this._adapter.mountWelcome(
+        this._adapter.makeWelcomeHandler(version)
+      );
     }
-    return fn;
   }
 }

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

@@ -12,6 +12,8 @@ function getProjectFiles(projectName) {
       scripts: {
         start: 'node bootstrap/app.js',
         dev:   'millas serve',
+        makemigrations:   'millas makemigration',
+        migrate:   'millas migrate',
         serve: 'millas serve',
       },
       dependencies: {
@@ -88,18 +90,17 @@ module.exports = {
 require('dotenv').config();
-const { MillasApp } = require('millas');
+const { Millas } = require('millas');
 const AppServiceProvider = require('../providers/AppServiceProvider');
-const app = MillasApp.create()
+module.exports = Millas.config()
   .providers([AppServiceProvider])
   .routes(Route => {
     require('../routes/web')(Route);
     require('../routes/api')(Route);
   })
-  .withAdmin();
-module.exports = app.start();
+  .withAdmin()
+  .create();
 `,
     // ─── routes/web.js ────────────────────────────────────────────
@@ -130,12 +131,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');
   });
 };
@@ -241,29 +243,29 @@ module.exports = {
     // ─── providers/AppServiceProvider.js ──────────────────────────
     'providers/AppServiceProvider.js': `'use strict';
-const { ServiceProvider } = require('millas');
+const { ServiceProvider } = require('millas/core/foundation');
 /**
  * AppServiceProvider
  *
  * 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);
   }
@@ -325,4 +327,4 @@ providers/        # Service providers
   };
 }
-module.exports = { getProjectFiles };
+module.exports = { getProjectFiles };