@adonisjs/core 7.0.0-next.1 → 7.0.0-next.11

package/build/commands/list/routes.js

@@ -1,117 +1,247 @@
-/*
- * @adonisjs/core
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+import { f as BaseCommand, l as flags, o as args, s as cliHelpers } from "../../main-Cn_x9YY5.js";
+import { t as __decorate } from "../../decorate-DM0Sx1ye.js";
+import stringWidth from "string-width";
+import { middlewareInfo, routeInfo } from "@adonisjs/http-server/helpers";
+var RoutesListFormatter = class {
+	#router;
+	#colors;
+	#table;
+	#options;
+	#filters;
+	constructor(router, ui, options, filters) {
+		this.#router = router;
+		this.#colors = ui.colors;
+		this.#table = ui.table;
+		this.#filters = filters;
+		this.#options = options;
+		this.#router.commit();
+	}
+	#isAllowedByFilters(route) {
+		let allowRoute = true;
+		if (this.#filters.middleware) allowRoute = this.#filters.middleware.every((name) => {
+			if (name === "*") return route.middleware.length > 0;
+			return route.middleware.find((middleware) => middleware.name === name);
+		});
+		if (allowRoute && this.#filters.ignoreMiddleware) allowRoute = this.#filters.ignoreMiddleware.every((name) => {
+			if (name === "*") return route.middleware.length === 0;
+			return !route.middleware.find((middleware) => middleware.name === name);
+		});
+		if (!this.#filters.match) return allowRoute;
+		if (route.name.includes(this.#filters.match)) return true;
+		if (route.pattern.includes(this.#filters.match)) return true;
+		if (route.handler.type === "controller" ? route.handler.moduleNameOrPath.includes(this.#filters.match) : route.handler.name.includes(this.#filters.match)) return true;
+		return false;
+	}
+	async #serializeRoute(route) {
+		let methods = route.methods;
+		if (!this.#options.displayHeadRoutes) methods = methods.filter((method) => method !== "HEAD");
+		const middlewareList = await Promise.all([...route.middleware.all()].map((middleware) => {
+			return middlewareInfo(middleware);
+		}));
+		return {
+			name: route.name || "",
+			pattern: route.pattern,
+			methods,
+			handler: await routeInfo(route),
+			middleware: middlewareList.filter((info) => info.type !== "global")
+		};
+	}
+	#formatRouteMethod(method) {
+		return this.#colors.dim(method);
+	}
+	#formatRoutePattern(route) {
+		const pattern = this.#router.parsePattern(route.pattern).map((token) => {
+			if (token.type === 1) return this.#colors.yellow(`:${token.val}`);
+			if (token.type === 3) return this.#colors.yellow(`:${token.val}?`);
+			if (token.type === 2) return this.#colors.red(token.val);
+			return token.val;
+		}).join("/");
+		return `${pattern === "/" ? pattern : `/${pattern}`}${route.name ? ` ${this.#colors.dim(`(${route.name})`)}` : ""} `;
+	}
+	#formatControllerName(route) {
+		return route.handler.type === "controller" ? ` ${this.#colors.cyan(route.handler.moduleNameOrPath)}.` : "";
+	}
+	#formatAction(route) {
+		if (route.handler.type === "controller") return `${this.#colors.cyan(route.handler.method)}`;
+		const functionName = ` ${this.#colors.cyan(route.handler.name)}`;
+		if (route.handler.args) return ` ${functionName}${this.#colors.dim(`(${route.handler.args})`)}`;
+		return functionName;
+	}
+	#formatMiddleware(route, mode = "normal") {
+		if (mode === "compact" && route.middleware.length > 3) {
+			const firstMiddleware = route.middleware[0].name;
+			const secondMiddleware = route.middleware[1].name;
+			const diff = route.middleware.length - 2;
+			return this.#colors.dim(`${firstMiddleware}, ${secondMiddleware}, and ${diff} more`);
+		}
+		return this.#colors.dim(`${route.middleware.map((one) => one.name).filter((one) => one).join(", ")}`);
+	}
+	#formatDomainHeadline(domain) {
+		if (domain !== "root") return cliHelpers.justify([`${this.#colors.dim("..")} ${this.#colors.green(domain)} `], {
+			maxWidth: this.#options.maxPrettyPrintWidth || cliHelpers.TERMINAL_SIZE,
+			paddingChar: this.#colors.dim(".")
+		})[0];
+		return "";
+	}
+	#justifyListTables(tables) {
+		return tables.map((table) => {
+			const methods = table.rows.map((columns) => columns[0]);
+			const largestMethodsLength = Math.max(...methods.map((method) => stringWidth(method)));
+			const formattedMethods = cliHelpers.justify(methods, { maxWidth: largestMethodsLength });
+			const patterns = table.rows.map((columns) => columns[1]);
+			const largestPatternLength = Math.max(...patterns.map((pattern) => stringWidth(pattern)));
+			const formattedPatterns = cliHelpers.justify(patterns, {
+				maxWidth: largestPatternLength,
+				paddingChar: this.#colors.dim(".")
+			});
+			const middleware = table.rows.map((columns) => columns[3]);
+			const largestMiddlewareLength = Math.max(...middleware.map((one) => stringWidth(one)));
+			const formattedMiddleware = cliHelpers.justify(middleware, {
+				maxWidth: largestMiddlewareLength,
+				align: "right",
+				paddingChar: " "
+			});
+			const controllers = table.rows.map((columns) => columns[2]);
+			const largestControllerLength = (this.#options.maxPrettyPrintWidth || cliHelpers.TERMINAL_SIZE) - (largestPatternLength + largestMethodsLength + largestMiddlewareLength);
+			const formattedControllers = cliHelpers.truncate(cliHelpers.justify(controllers, {
+				maxWidth: largestControllerLength,
+				align: "right",
+				paddingChar: this.#colors.dim(".")
+			}), { maxWidth: largestControllerLength });
+			return {
+				heading: table.heading,
+				rows: formattedMethods.reduce((result, method, index) => {
+					result.push(`${method}${formattedPatterns[index]}${formattedControllers[index]}${formattedMiddleware[index]}`);
+					return result;
+				}, [])
+			};
+		});
+	}
+	async formatAsJSON() {
+		const routes = this.#router.toJSON();
+		const domains = Object.keys(routes);
+		let routesJSON = [];
+		for (let domain of domains) {
+			const domainRoutes = await Promise.all(routes[domain].map((route) => this.#serializeRoute(route)));
+			routesJSON.push({
+				domain,
+				routes: domainRoutes.filter((route) => this.#isAllowedByFilters(route))
+			});
+		}
+		return routesJSON;
+	}
+	async formatAsAnsiList() {
+		const routes = this.#router.toJSON();
+		const domains = Object.keys(routes);
+		const tables = [];
+		for (let domain of domains) {
+			const list = {
+				heading: this.#formatDomainHeadline(domain),
+				rows: [[
+					this.#colors.dim("METHOD"),
+					` ${this.#colors.dim("ROUTE")} `,
+					` ${this.#colors.dim("HANDLER")}`,
+					` ${this.#colors.dim("MIDDLEWARE")}`
+				]]
+			};
+			for (let route of routes[domain]) {
+				const serializedRoute = await this.#serializeRoute(route);
+				if (this.#isAllowedByFilters(serializedRoute)) serializedRoute.methods.forEach((method) => {
+					list.rows.push([
+						this.#formatRouteMethod(method),
+						` ${this.#formatRoutePattern(serializedRoute)}`,
+						`${this.#formatControllerName(serializedRoute)}${this.#formatAction(serializedRoute)}`,
+						` ${this.#formatMiddleware(serializedRoute, "compact")}`
+					]);
+				});
+			}
+			tables.push(list);
+		}
+		return this.#justifyListTables(tables);
+	}
+	async formatAsAnsiTable() {
+		const routes = this.#router.toJSON();
+		const domains = Object.keys(routes);
+		const tables = [];
+		for (let domain of domains) {
+			const list = {
+				heading: this.#formatDomainHeadline(domain),
+				table: this.#table().fullWidth().fluidColumnIndex(2).head([
+					this.#colors.dim("METHOD"),
+					this.#colors.dim("ROUTE"),
+					{
+						hAlign: "right",
+						content: this.#colors.dim("HANDLER")
+					},
+					{
+						content: this.#colors.dim("MIDDLEWARE"),
+						hAlign: "right"
+					}
+				])
+			};
+			for (let route of routes[domain]) {
+				const serializedRoute = await this.#serializeRoute(route);
+				if (this.#isAllowedByFilters(serializedRoute)) serializedRoute.methods.forEach((method) => {
+					list.table.row([
+						this.#formatRouteMethod(method),
+						this.#formatRoutePattern(serializedRoute),
+						{
+							content: `${this.#formatControllerName(serializedRoute)}${this.#formatAction(serializedRoute)}`,
+							hAlign: "right"
+						},
+						{
+							content: this.#formatMiddleware(serializedRoute),
+							hAlign: "right"
+						}
+					]);
+				});
+			}
+			tables.push(list);
+		}
+		return tables;
+	}
 };
-import { args, BaseCommand, flags } from "../../modules/ace/main.js";
-import { RoutesListFormatter } from "../../src/cli_formatters/routes_list.js";
-/**
- * Command to display a list of all registered routes in the application.
- * Supports filtering by keywords, middleware, and output formatting options.
- * Routes can be displayed as a formatted list, table, or JSON.
- *
- * @example
- * ```
- * ace list:routes
- * ace list:routes user
- * ace list:routes --middleware=auth
- * ace list:routes --ignore-middleware=guest
- * ace list:routes --json
- * ace list:routes --table
- * ```
- */
-export default class ListRoutes extends BaseCommand {
-    /**
-     * The command name
-     */
-    static commandName = 'list:routes';
-    /**
-     * The command description
-     */
-    static description = 'List application routes. This command will boot the application in the console environment';
-    /**
-     * Command options configuration.
-     * Requires the application to be started so routes are loaded.
-     */
-    static options = {
-        startApp: true,
-    };
-    /**
-     * Execute the command to list application routes.
-     * Creates a formatter with the specified filters and outputs routes
-     * in the requested format (JSON, table, or formatted list).
-     */
-    async run() {
-        const router = await this.app.container.make('router');
-        const formatter = new RoutesListFormatter(router, this.ui, {}, {
-            ignoreMiddleware: this.ignoreMiddleware,
-            middleware: this.middleware,
-            match: this.match,
-        });
-        /**
-         * Display as JSON
-         */
-        if (this.json) {
-            this.logger.log(JSON.stringify(await formatter.formatAsJSON(), null, 2));
-            return;
-        }
-        /**
-         * Display as a standard table
-         */
-        if (this.table) {
-            const tables = await formatter.formatAsAnsiTable();
-            tables.forEach((table) => {
-                this.logger.log('');
-                if (table.heading) {
-                    this.logger.log(table.heading);
-                    this.logger.log('');
-                }
-                table.table.render();
-            });
-            return;
-        }
-        /**
-         * Display as a list
-         */
-        const list = await formatter.formatAsAnsiList();
-        list.forEach((item) => {
-            this.logger.log('');
-            if (item.heading) {
-                this.logger.log(item.heading);
-                this.logger.log('');
-            }
-            this.logger.log(item.rows.join('\n'));
-        });
-    }
-}
-__decorate([
-    args.string({
-        description: 'Find routes matching the given keyword. Route name, pattern and controller name will be searched against the keyword',
-        required: false,
-    })
-], ListRoutes.prototype, "match", void 0);
-__decorate([
-    flags.array({
-        description: 'View routes that includes all the mentioned middleware names. Use * to see routes that are using one or more middleware',
-    })
-], ListRoutes.prototype, "middleware", void 0);
-__decorate([
-    flags.array({
-        description: 'View routes that does not include all the mentioned middleware names. Use * to see routes that are using zero middleware',
-    })
-], ListRoutes.prototype, "ignoreMiddleware", void 0);
-__decorate([
-    flags.boolean({ description: 'Get routes list as a JSON string' })
-], ListRoutes.prototype, "json", void 0);
-__decorate([
-    flags.boolean({ description: 'View list of routes as a table' })
-], ListRoutes.prototype, "table", void 0);
+var ListRoutes = class extends BaseCommand {
+	static commandName = "list:routes";
+	static description = "List application routes. This command will boot the application in the console environment";
+	static options = { startApp: true };
+	async run() {
+		const formatter = new RoutesListFormatter(await this.app.container.make("router"), this.ui, {}, {
+			ignoreMiddleware: this.ignoreMiddleware,
+			middleware: this.middleware,
+			match: this.match
+		});
+		if (this.json) {
+			this.logger.log(JSON.stringify(await formatter.formatAsJSON(), null, 2));
+			return;
+		}
+		if (this.table) {
+			(await formatter.formatAsAnsiTable()).forEach((table) => {
+				this.logger.log("");
+				if (table.heading) {
+					this.logger.log(table.heading);
+					this.logger.log("");
+				}
+				table.table.render();
+			});
+			return;
+		}
+		(await formatter.formatAsAnsiList()).forEach((item) => {
+			this.logger.log("");
+			if (item.heading) {
+				this.logger.log(item.heading);
+				this.logger.log("");
+			}
+			this.logger.log(item.rows.join("\n"));
+		});
+	}
+};
+__decorate([args.string({
+	description: "Find routes matching the given keyword. Route name, pattern and controller name will be searched against the keyword",
+	required: false
+})], ListRoutes.prototype, "match", void 0);
+__decorate([flags.array({ description: "View routes that includes all the mentioned middleware names. Use * to see routes that are using one or more middleware" })], ListRoutes.prototype, "middleware", void 0);
+__decorate([flags.array({ description: "View routes that does not include all the mentioned middleware names. Use * to see routes that are using zero middleware" })], ListRoutes.prototype, "ignoreMiddleware", void 0);
+__decorate([flags.boolean({ description: "Get routes list as a JSON string" })], ListRoutes.prototype, "json", void 0);
+__decorate([flags.boolean({ description: "View list of routes as a table" })], ListRoutes.prototype, "table", void 0);
+export { ListRoutes as default };

package/build/commands/make/command.js

@@ -1,58 +1,16 @@
-/*
- * @adonisjs/core
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+import { t as stubsRoot } from "../../main-kn40V-hF.js";
+import { f as BaseCommand, o as args } from "../../main-Cn_x9YY5.js";
+import { t as __decorate } from "../../decorate-DM0Sx1ye.js";
+var MakeCommand = class extends BaseCommand {
+	static commandName = "make:command";
+	static description = "Create a new ace command class";
+	stubPath = "make/command/main.stub";
+	async run() {
+		await (await this.createCodemods()).makeUsingStub(stubsRoot, this.stubPath, {
+			flags: this.parsed.flags,
+			entity: this.app.generators.createEntity(this.name)
+		});
+	}
 };
-import { stubsRoot } from "../../stubs/main.js";
-import { args } from "../../modules/ace/main.js";
-import { BaseCommand } from "../../modules/ace/main.js";
-/**
- * Command to create a new Ace command class.
- * Ace commands are CLI commands that can be executed via the `ace` binary,
- * allowing you to create custom functionality for your application's command line interface.
- *
- * @example
- * ```
- * ace make:command SendEmails
- * ace make:command ProcessPayments
- * ace make:command GenerateReports
- * ace make:command CleanupFiles
- * ```
- */
-export default class MakeCommand extends BaseCommand {
-    /**
-     * The command name
-     */
-    static commandName = 'make:command';
-    /**
-     * The command description
-     */
-    static description = 'Create a new ace command class';
-    /**
-     * The stub template file to use for generating the command class
-     */
-    stubPath = 'make/command/main.stub';
-    /**
-     * Execute the command to create a new Ace command class.
-     * Generates the command file with proper CLI command structure.
-     */
-    async run() {
-        const codemods = await this.createCodemods();
-        await codemods.makeUsingStub(stubsRoot, this.stubPath, {
-            flags: this.parsed.flags,
-            entity: this.app.generators.createEntity(this.name),
-        });
-    }
-}
-__decorate([
-    args.string({ description: 'Name of the command' })
-], MakeCommand.prototype, "name", void 0);
+__decorate([args.string({ description: "Name of the command" })], MakeCommand.prototype, "name", void 0);
+export { MakeCommand as default };

package/build/commands/make/controller.js

@@ -1,121 +1,44 @@
-/*
- * @adonisjs/core
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+import { t as stubsRoot } from "../../main-kn40V-hF.js";
+import { f as BaseCommand, l as flags, o as args } from "../../main-Cn_x9YY5.js";
+import { t as __decorate } from "../../decorate-DM0Sx1ye.js";
+import string from "@poppinss/utils/string";
+var MakeController = class extends BaseCommand {
+	static commandName = "make:controller";
+	static description = "Create a new HTTP controller class";
+	static options = { allowUnknownFlags: true };
+	stubPath = "make/controller/main.stub";
+	async prepare() {
+		if (this.actions) this.stubPath = "make/controller/actions.stub";
+		if (this.resource) if (this.actions) this.logger.warning("Cannot use --resource flag with actions. Ignoring --resource");
+		else this.stubPath = "make/controller/resource.stub";
+		if (this.api) if (this.actions) this.logger.warning("Cannot use --api flag with actions. Ignoring --api");
+		else this.stubPath = "make/controller/api.stub";
+		if (this.resource && this.api && !this.actions) this.logger.warning("--api and --resource flags cannot be used together. Ignoring --resource");
+	}
+	async run() {
+		await (await this.createCodemods()).makeUsingStub(stubsRoot, this.stubPath, {
+			flags: this.parsed.flags,
+			actions: this.actions?.map((action) => string.camelCase(action)),
+			entity: this.app.generators.createEntity(this.name),
+			singular: this.singular
+		});
+	}
 };
-import string from '@poppinss/utils/string';
-import { stubsRoot } from "../../stubs/main.js";
-import { args, flags, BaseCommand } from "../../modules/ace/main.js";
-/**
- * The make controller command to create an HTTP controller
- *
- * @example
- * ```
- * ace make:controller User
- * ace make:controller User store update
- * ace make:controller User --resource
- * ace make:controller User --api
- * ace make:controller User --singular
- * ```
- */
-export default class MakeController extends BaseCommand {
-    /**
-     * The command name
-     */
-    static commandName = 'make:controller';
-    /**
-     * The command description
-     */
-    static description = 'Create a new HTTP controller class';
-    /**
-     * Command options configuration
-     */
-    static options = {
-        allowUnknownFlags: true,
-    };
-    /**
-     * The stub to use for generating the controller
-     */
-    stubPath = 'make/controller/main.stub';
-    /**
-     * Preparing the command state
-     */
-    async prepare() {
-        /**
-         * Use actions stub
-         */
-        if (this.actions) {
-            this.stubPath = 'make/controller/actions.stub';
-        }
-        /**
-         * Use resource stub
-         */
-        if (this.resource) {
-            if (this.actions) {
-                this.logger.warning('Cannot use --resource flag with actions. Ignoring --resource');
-            }
-            else {
-                this.stubPath = 'make/controller/resource.stub';
-            }
-        }
-        /**
-         * Use api stub
-         */
-        if (this.api) {
-            if (this.actions) {
-                this.logger.warning('Cannot use --api flag with actions. Ignoring --api');
-            }
-            else {
-                this.stubPath = 'make/controller/api.stub';
-            }
-        }
-        /**
-         * Log warning when both flags are used together
-         */
-        if (this.resource && this.api && !this.actions) {
-            this.logger.warning('--api and --resource flags cannot be used together. Ignoring --resource');
-        }
-    }
-    async run() {
-        const codemods = await this.createCodemods();
-        await codemods.makeUsingStub(stubsRoot, this.stubPath, {
-            flags: this.parsed.flags,
-            actions: this.actions?.map((action) => string.camelCase(action)),
-            entity: this.app.generators.createEntity(this.name),
-            singular: this.singular,
-        });
-    }
-}
-__decorate([
-    args.string({ description: 'The name of the controller' })
-], MakeController.prototype, "name", void 0);
-__decorate([
-    args.spread({ description: 'Create controller with custom method names', required: false })
-], MakeController.prototype, "actions", void 0);
-__decorate([
-    flags.boolean({
-        description: 'Generate controller in singular form',
-        alias: 's',
-    })
-], MakeController.prototype, "singular", void 0);
-__decorate([
-    flags.boolean({
-        description: 'Generate resourceful controller with methods to perform CRUD actions on a resource',
-        alias: 'r',
-    })
-], MakeController.prototype, "resource", void 0);
-__decorate([
-    flags.boolean({
-        description: 'Generate resourceful controller without the "edit" and the "create" methods',
-        alias: 'a',
-    })
-], MakeController.prototype, "api", void 0);
+__decorate([args.string({ description: "The name of the controller" })], MakeController.prototype, "name", void 0);
+__decorate([args.spread({
+	description: "Create controller with custom method names",
+	required: false
+})], MakeController.prototype, "actions", void 0);
+__decorate([flags.boolean({
+	description: "Generate controller in singular form",
+	alias: "s"
+})], MakeController.prototype, "singular", void 0);
+__decorate([flags.boolean({
+	description: "Generate resourceful controller with methods to perform CRUD actions on a resource",
+	alias: "r"
+})], MakeController.prototype, "resource", void 0);
+__decorate([flags.boolean({
+	description: "Generate resourceful controller without the \"edit\" and the \"create\" methods",
+	alias: "a"
+})], MakeController.prototype, "api", void 0);
+export { MakeController as default };