@adonisjs/core 7.0.0-next.4 → 7.0.0-next.6

package/build/modules/hash/drivers/bcrypt.d.ts

@@ -1 +1,12 @@
+/**
+ * Bcrypt hash driver re-exports from @adonisjs/hash.
+ * Provides bcrypt password hashing functionality with configurable rounds.
+ *
+ * @example
+ * import { Bcrypt } from '@adonisjs/core/hash/drivers/bcrypt'
+ *
+ * const bcrypt = new Bcrypt({ rounds: 12 })
+ * const hashed = await bcrypt.make('password')
+ * const isValid = await bcrypt.verify(hashed, 'password')
+ */
 export * from '@adonisjs/hash/drivers/bcrypt';

package/build/modules/hash/drivers/bcrypt.js

@@ -6,4 +6,15 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+/**
+ * Bcrypt hash driver re-exports from @adonisjs/hash.
+ * Provides bcrypt password hashing functionality with configurable rounds.
+ *
+ * @example
+ * import { Bcrypt } from '@adonisjs/core/hash/drivers/bcrypt'
+ *
+ * const bcrypt = new Bcrypt({ rounds: 12 })
+ * const hashed = await bcrypt.make('password')
+ * const isValid = await bcrypt.verify(hashed, 'password')
+ */
 export * from '@adonisjs/hash/drivers/bcrypt';

package/build/modules/hash/main.d.ts

@@ -1,2 +1,20 @@
+/**
+ * Hash module provides password hashing functionality with multiple driver support.
+ * Re-exports all functionality from @adonisjs/hash along with configuration utilities.
+ *
+ * @example
+ * // Import the Hash manager and drivers
+ * import { HashManager, Hash } from '@adonisjs/core/hash'
+ *
+ * const manager = new HashManager(config)
+ * const hasher = manager.use('scrypt')
+ * const hashed = await hasher.make('password')
+ * const verified = await hasher.verify(hashed, 'password')
+ *
+ * @example
+ * // Import configuration and driver types
+ * import { defineConfig, drivers } from '@adonisjs/core/hash'
+ * import type { HashConfig, ScryptConfig } from '@adonisjs/core/types/hash'
+ */
 export * from '@adonisjs/hash';
 export { defineConfig, drivers } from './define_config.ts';

package/build/modules/hash/main.js

@@ -6,5 +6,23 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+/**
+ * Hash module provides password hashing functionality with multiple driver support.
+ * Re-exports all functionality from @adonisjs/hash along with configuration utilities.
+ *
+ * @example
+ * // Import the Hash manager and drivers
+ * import { HashManager, Hash } from '@adonisjs/core/hash'
+ *
+ * const manager = new HashManager(config)
+ * const hasher = manager.use('scrypt')
+ * const hashed = await hasher.make('password')
+ * const verified = await hasher.verify(hashed, 'password')
+ *
+ * @example
+ * // Import configuration and driver types
+ * import { defineConfig, drivers } from '@adonisjs/core/hash'
+ * import type { HashConfig, ScryptConfig } from '@adonisjs/core/types/hash'
+ */
 export * from '@adonisjs/hash';
 export { defineConfig, drivers } from "./define_config.js";

package/build/providers/app_provider.d.ts

@@ -187,19 +187,6 @@ export default class AppServiceProvider {
      * // Creates .adonisjs/server/routes.d.ts with route types
      */
     protected generateRoutesTypes(router: Router): Promise<void>;
-    /**
-     * Generates the routes JSON needed by the client integration
-     *
-     * Exports all registered routes as JSON for client-side
-     * applications that need route information.
-     *
-     * @param router - The router instance to export routes from
-     *
-     * @example
-     * await generateRoutesJSONFile(router)
-     * // Creates .adonisjs/client/routes.json
-     */
-    protected generateRoutesJSONFile(router: Router): Promise<void>;
     /**
      * Registers bindings
      *

package/build/providers/app_provider.js

@@ -269,37 +269,25 @@ export default class AppServiceProvider {
      * // Creates .adonisjs/server/routes.d.ts with route types
      */
     async generateRoutesTypes(router) {
-        const types = router.generateTypes(4);
-        const outputPath = this.app.generatedServerPath('routes.d.ts');
-        await mkdir(dirname(outputPath), { recursive: true });
-        await writeFile(outputPath, [
-            `import '@adonisjs/core/types/http'`,
-            '',
-            `declare module '@adonisjs/core/types/http' {`,
-            '  type ScannedRoutes = {',
-            types,
-            '  }',
-            'export interface RoutesList extends ScannedRoutes {}',
-            '}',
-        ].join('\n'));
-    }
-    /**
-     * Generates the routes JSON needed by the client integration
-     *
-     * Exports all registered routes as JSON for client-side
-     * applications that need route information.
-     *
-     * @param router - The router instance to export routes from
-     *
-     * @example
-     * await generateRoutesJSONFile(router)
-     * // Creates .adonisjs/client/routes.json
-     */
-    async generateRoutesJSONFile(router) {
-        const routes = router.toJSON();
-        const outputPath = this.app.makePath('.adonisjs/client/routes.json');
-        await mkdir(dirname(outputPath), { recursive: true });
-        await writeFile(outputPath, JSON.stringify(routes, null, 2));
+        try {
+            const types = router.generateTypes(2);
+            const outputPath = this.app.generatedServerPath('routes.d.ts');
+            await mkdir(dirname(outputPath), { recursive: true });
+            await writeFile(outputPath, [
+                `import '@adonisjs/core/types/http'`,
+                '',
+                'export type ScannedRoutes = {',
+                types,
+                '}',
+                `declare module '@adonisjs/core/types/http' {`,
+                '  export interface RoutesList extends ScannedRoutes {}',
+                '}',
+            ].join('\n'));
+        }
+        catch (error) {
+            console.error("Unable to generate routes types file due to the following error. This won't impact the dev-server");
+            console.error(error);
+        }
     }
     /**
      * Registers bindings
@@ -355,8 +343,8 @@ export default class AppServiceProvider {
         if (!this.app.inProduction) {
             const router = await this.app.container.make('router');
             if (router.commited) {
-                await this.generateRoutesJSONFile(router);
                 await this.generateRoutesTypes(router);
+                this.app.notify({ isAdonisJS: true, routes: JSON.stringify(router.toJSON()) });
             }
         }
     }

package/build/providers/edge_provider.js

@@ -8,7 +8,7 @@
  */
 import edge from 'edge.js';
 import { pluginEdgeDumper } from "../modules/dumper/plugins/edge.js";
-import { BriskRoute, HttpContext } from "../modules/http/main.js";
+import { BriskRoute, HttpContext, Qs } from "../modules/http/main.js";
 /**
  * The Edge service provider configures Edge to work within
  * an AdonisJS application environment
@@ -53,6 +53,7 @@ export default class EdgeServiceProvider {
      */
     async boot() {
         const app = this.app;
+        const qs = new Qs(app.config.get('app.http.qs', {}));
         const router = await this.app.container.make('router');
         const dumper = await this.app.container.make('dumper');
         function edgeConfigResolver(key, defaultValue) {
@@ -61,6 +62,25 @@ export default class EdgeServiceProvider {
         edgeConfigResolver.has = function (key) {
             return app.config.has(key);
         };
+        function clientRoutes() {
+            const routes = router.toJSON();
+            return Object.keys(routes).reduce((result, domain) => {
+                result[domain] = routes[domain].reduce((routesResult, route) => {
+                    if (!route.name) {
+                        return routesResult;
+                    }
+                    routesResult.push({
+                        domain: route.domain,
+                        methods: route.methods,
+                        pattern: route.pattern,
+                        tokens: route.tokens,
+                        name: route.name,
+                    });
+                    return routesResult;
+                }, []);
+                return result;
+            }, {});
+        }
         /**
          * Mount the default disk
          */
@@ -81,6 +101,12 @@ export default class EdgeServiceProvider {
         });
         edge.global('app', app);
         edge.global('config', edgeConfigResolver);
+        edge.global('routes', function () {
+            return clientRoutes();
+        });
+        edge.global('routesJSON', function () {
+            return JSON.stringify(clientRoutes());
+        });
         /**
          * Route helpers
          */
@@ -90,6 +116,31 @@ export default class EdgeServiceProvider {
         edge.global('signedUrlFor', function (...args) {
             return router.urlBuilder.signedUrlFor(...args);
         });
+        /**
+         * Sharing qs parser with templates
+         */
+        edge.global('qs', qs);
+        edge.global('formAttributes', function (route, method, params, options) {
+            /**
+             * Normalize method and keep a reference to the original method
+             */
+            options = options ?? {};
+            method = method.toUpperCase();
+            const original = method;
+            /**
+             * If method if not GET and POST, then use the querystring _method
+             * to and force update the method to "POST"
+             */
+            if (method !== 'GET' && method !== 'POST') {
+                method = 'POST';
+                options = { ...options, qs: { _method: original, ...options.qs } };
+            }
+            const { action } = router.urlBuilder.urlFor.method(original, route, params, options).form;
+            return {
+                action,
+                method,
+            };
+        });
         /**
          * Creating a isolated instance of edge renderer
          */

package/build/src/cli_formatters/routes_list.js

@@ -64,7 +64,9 @@ export class RoutesListFormatter {
         this.#router.commit();
     }
     /**
-     * Test if a route clears the applied filters
+     * Test if a route clears the applied filters based on middleware, name, pattern, and handler.
+     *
+     * @param route - The serialized route to test against filters
      */
     #isAllowedByFilters(route) {
         let allowRoute = true;
@@ -124,7 +126,10 @@ export class RoutesListFormatter {
         return false;
     }
     /**
-     * Serializes routes JSON to an object that can be used for pretty printing
+     * Serializes routes JSON to an object that can be used for pretty printing.
+     * Converts RouteJSON into a format suitable for display and filtering.
+     *
+     * @param route - The route JSON object to serialize
      */
     async #serializeRoute(route) {
         let methods = route.methods;
@@ -143,13 +148,17 @@ export class RoutesListFormatter {
         };
     }
     /**
-     * Formats the route method for the ansi list and table
+     * Formats the route method for the ansi list and table with dim styling.
+     *
+     * @param method - The HTTP method to format (GET, POST, etc.)
      */
     #formatRouteMethod(method) {
         return this.#colors.dim(method);
     }
     /**
-     * Formats route pattern for the ansi list and table
+     * Formats route pattern for the ansi list and table with colored parameters and route name.
+     *
+     * @param route - The serialized route containing pattern and name information
      */
     #formatRoutePattern(route) {
         const pattern = this.#router
@@ -170,7 +179,9 @@ export class RoutesListFormatter {
         return `${pattern === '/' ? pattern : `/${pattern}`}${route.name ? ` ${this.#colors.dim(`(${route.name})`)}` : ''} `;
     }
     /**
-     * Formats controller name for the ansi list and table
+     * Formats controller name for the ansi list and table with cyan coloring.
+     *
+     * @param route - The serialized route containing handler information
      */
     #formatControllerName(route) {
         return route.handler.type === 'controller'
@@ -178,7 +189,9 @@ export class RoutesListFormatter {
             : '';
     }
     /**
-     * Formats action name for the ansi list and table
+     * Formats action name for the ansi list and table with cyan coloring and arguments.
+     *
+     * @param route - The serialized route containing handler information
      */
     #formatAction(route) {
         if (route.handler.type === 'controller') {
@@ -191,7 +204,10 @@ export class RoutesListFormatter {
         return functionName;
     }
     /**
-     * Formats route middleware for the ansi list and table
+     * Formats route middleware for the ansi list and table with optional compacting.
+     *
+     * @param route - The serialized route containing middleware information
+     * @param mode - Display mode: 'normal' shows all middleware, 'compact' truncates long lists
      */
     #formatMiddleware(route, mode = 'normal') {
         if (mode === 'compact' && route.middleware.length > 3) {

package/build/src/helpers/http.d.ts

@@ -0,0 +1,20 @@
+/**
+ * HTTP helper utilities re-exported from @adonisjs/http-server. This module
+ * provides a convenient entry point for accessing all HTTP-related utilities
+ * including route helpers, middleware utilities, and request/response helpers.
+ *
+ * @example
+ * // Import specific HTTP helpers
+ * import { middlewareInfo, routeInfo } from '@adonisjs/core/helpers'
+ *
+ * const middleware = middlewareInfo('cors', CorsMiddleware)
+ * const route = routeInfo('users.show', '/users/:id')
+ *
+ * @example
+ * // Access all HTTP helpers
+ * import * as httpHelpers from '@adonisjs/core/helpers/http'
+ *
+ * // Use any helper from the http-server package
+ * const routeData = httpHelpers.routeInfo('api.posts', '/api/posts')
+ */
+export * from '@adonisjs/http-server/helpers';

package/build/src/helpers/http.js

@@ -0,0 +1,28 @@
+/*
+ * @adonisjs/core
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * HTTP helper utilities re-exported from @adonisjs/http-server. This module
+ * provides a convenient entry point for accessing all HTTP-related utilities
+ * including route helpers, middleware utilities, and request/response helpers.
+ *
+ * @example
+ * // Import specific HTTP helpers
+ * import { middlewareInfo, routeInfo } from '@adonisjs/core/helpers'
+ *
+ * const middleware = middlewareInfo('cors', CorsMiddleware)
+ * const route = routeInfo('users.show', '/users/:id')
+ *
+ * @example
+ * // Access all HTTP helpers
+ * import * as httpHelpers from '@adonisjs/core/helpers/http'
+ *
+ * // Use any helper from the http-server package
+ * const routeData = httpHelpers.routeInfo('api.posts', '/api/posts')
+ */
+export * from '@adonisjs/http-server/helpers';

package/build/src/helpers/main.d.ts

@@ -42,7 +42,3 @@ export { compose, Secret, safeEqual, MessageBuilder, defineStaticProperty } from
  * Verification token utility for creating secure tokens.
  */
 export { VerificationToken } from './verification_token.ts';
-/**
- * HTTP server helper functions for middleware and route information.
- */
-export { middlewareInfo, routeInfo } from '@adonisjs/http-server/helpers';

package/build/src/helpers/main.js

@@ -50,7 +50,3 @@ export { compose, Secret, safeEqual, MessageBuilder, defineStaticProperty } from
  * Verification token utility for creating secure tokens.
  */
 export { VerificationToken } from "./verification_token.js";
-/**
- * HTTP server helper functions for middleware and route information.
- */
-export { middlewareInfo, routeInfo } from '@adonisjs/http-server/helpers';

package/build/src/helpers/string.js

@@ -43,9 +43,21 @@ const stringHelpers = {
     prettyHrTime(time, options) {
         return prettyHrTime(time, options);
     },
+    /**
+     * Check if a string is empty or contains only whitespace characters.
+     *
+     * @param value - The string to check for emptiness
+     */
     isEmpty(value) {
         return value.trim().length === 0;
     },
+    /**
+     * Escape HTML entities to prevent XSS attacks and display HTML safely.
+     *
+     * @param value - The string containing HTML to escape
+     * @param options - Optional configuration for escaping behavior
+     * @param options.encodeSymbols - Whether to also encode Unicode symbols as HTML entities
+     */
     escapeHTML(value, options) {
         value = he.escape(value);
         if (options && options.encodeSymbols) {
@@ -53,6 +65,12 @@ const stringHelpers = {
         }
         return value;
     },
+    /**
+     * Encode Unicode symbols and special characters as HTML entities.
+     *
+     * @param value - The string containing symbols to encode
+     * @param options - Encoding options from the 'he' library
+     */
     encodeSymbols(value, options) {
         return he.encode(value, options);
     },

package/build/src/ignitor/http.js

@@ -32,7 +32,9 @@ export class HttpServerProcess {
         this.#ignitor = ignitor;
     }
     /**
-     * Calling this method closes the underlying HTTP server
+     * Calling this method closes the underlying HTTP server gracefully.
+     *
+     * @param nodeHttpServer - The Node.js HTTP or HTTPS server instance to close
      */
     #close(nodeHttpServer) {
         return new Promise((resolve) => {
@@ -42,7 +44,11 @@ export class HttpServerProcess {
     }
     /**
      * Monitors the app and the server to close the HTTP server when
-     * either one of them goes down
+     * either one of them goes down. Sets up event listeners for graceful shutdown.
+     *
+     * @param nodeHttpServer - The Node.js HTTP or HTTPS server instance to monitor
+     * @param app - The application service instance
+     * @param logger - The logger service for error reporting
      */
     #monitorAppAndServer(nodeHttpServer, app, logger) {
         /**
@@ -64,7 +70,9 @@ export class HttpServerProcess {
         });
     }
     /**
-     * Starts the http server a given host and port
+     * Starts the HTTP server on a given host and port using environment variables.
+     *
+     * @param nodeHttpServer - The Node.js HTTP or HTTPS server instance to start listening
      */
     #listen(nodeHttpServer) {
         return new Promise((resolve, reject) => {
@@ -81,8 +89,13 @@ export class HttpServerProcess {
         });
     }
     /**
-     * Notifies the app and the parent process that the
-     * HTTP server is ready
+     * Notifies the app and the parent process that the HTTP server is ready.
+     * Sends notifications through multiple channels: parent process, logger, and event emitter.
+     *
+     * @param app - The application service instance for parent process notification
+     * @param logger - The logger service for console output
+     * @param emitter - The event emitter for app-level notifications
+     * @param payload - Server startup information including host, port, and duration
      */
     #notifyServerHasStarted(app, logger, emitter, payload) {
         /**

package/build/src/vine.js

@@ -9,15 +9,21 @@
 import vine, { symbols, BaseLiteralType } from '@vinejs/vine';
 const MULTIPART_FILE = symbols.SUBTYPE ?? Symbol.for('subtype');
 /**
- * Checks if the value is an instance of multipart file
- * from bodyparser.
+ * Checks if the value is an instance of multipart file from bodyparser.
+ * Used internally for type guarding in file validation.
+ *
+ * @param file - The value to check for MultipartFile instance
  */
 function isBodyParserFile(file) {
     return !!(file && typeof file === 'object' && 'isMultipartFile' in file);
 }
 /**
- * VineJS validation rule that validates the file to be an
- * instance of BodyParser MultipartFile class.
+ * VineJS validation rule that validates the file to be an instance of BodyParser
+ * MultipartFile class and applies size/extension validation if configured.
+ *
+ * @param file - The file value to validate
+ * @param options - Validation options for file size and extensions
+ * @param field - The field context from VineJS validation
  */
 const isMultipartFile = vine.createRule((file, options, field) => {
     /**
@@ -26,7 +32,7 @@ const isMultipartFile = vine.createRule((file, options, field) => {
      */
     if (!isBodyParserFile(file)) {
         field.report('The {{ field }} must be a file', 'file', field);
-        return;
+        return false;
     }
     const validationOptions = typeof options === 'function' ? options(field) : options;
     /**
@@ -53,6 +59,7 @@ const isMultipartFile = vine.createRule((file, options, field) => {
     file.errors.forEach((error) => {
         field.report(error.message, `file.${error.type}`, field, validationOptions);
     });
+    return file.isValid;
 });
 /**
  * Represents a multipart file uploaded via multipart/form-data HTTP
@@ -84,8 +91,9 @@ export class VineMultipartFile extends BaseLiteralType {
      * @param validations - Array of validation functions to apply
      */
     constructor(validationOptions, options, validations) {
-        super(options, validations || [isMultipartFile(validationOptions || {})]);
+        super(options, validations || []);
         this.#validationOptions = validationOptions;
+        this.dataTypeValidator = isMultipartFile(validationOptions || {});
     }
     /**
      * Creates a clone of the current VineMultipartFile instance

package/build/types/helpers.d.ts

@@ -1,2 +1,22 @@
+/**
+ * Helper types and utilities for AdonisJS applications.
+ * Re-exports commonly used type utilities and file system operation types.
+ *
+ * @example
+ * // Use Opaque type for branded primitives
+ * import type { Opaque } from '@adonisjs/core/types/helpers'
+ *
+ * type UserId = Opaque<'UserId', number>
+ * const userId: UserId = 123 as UserId
+ *
+ * @example
+ * // Use file system option types
+ * import type { ImportAllFilesOptions } from '@adonisjs/core/types/helpers'
+ *
+ * const options: ImportAllFilesOptions = {
+ *   ignoreMissingExports: true,
+ *   transformKeys: (key) => key.toLowerCase()
+ * }
+ */
 export type { Opaque, NormalizeConstructor } from '@poppinss/utils/types';
 export type { ImportAllFilesOptions, ReadAllFilesOptions } from '@poppinss/utils/fs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/core",
   "description": "Core of AdonisJS",
-  "version": "7.0.0-next.4",
+  "version": "7.0.0-next.6",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -84,10 +84,10 @@
     "index:commands": "node --import=@poppinss/ts-exec toolkit/main.js index build/commands"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^8.0.0-next.12",
-    "@adonisjs/eslint-config": "^3.0.0-next.1",
+    "@adonisjs/assembler": "^8.0.0-next.14",
+    "@adonisjs/eslint-config": "^3.0.0-next.4",
     "@adonisjs/prettier-config": "^1.4.5",
-    "@adonisjs/tsconfig": "^2.0.0-next.0",
+    "@adonisjs/tsconfig": "^2.0.0-next.2",
     "@japa/assert": "^4.1.1",
     "@japa/expect-type": "^2.0.3",
     "@japa/file-system": "^2.3.2",
@@ -95,20 +95,20 @@
     "@japa/snapshot": "^2.0.9",
     "@poppinss/ts-exec": "^1.4.1",
     "@release-it/conventional-changelog": "^10.0.1",
-    "@types/node": "^24.5.2",
+    "@types/node": "^24.7.2",
     "@types/pretty-hrtime": "^1.0.3",
     "@types/sinon": "^17.0.4",
     "@types/supertest": "^6.0.3",
     "@types/test-console": "^2.0.3",
-    "@vinejs/vine": "^3.0.1",
+    "@vinejs/vine": "^4.0.0-next.1",
     "argon2": "^0.44.0",
     "bcrypt": "^6.0.0",
     "c8": "^10.1.3",
     "copyfiles": "^2.4.1",
-    "cross-env": "^10.0.0",
+    "cross-env": "^10.1.0",
     "del-cli": "^7.0.0",
     "edge.js": "^6.3.0",
-    "eslint": "^9.35.0",
+    "eslint": "^9.37.0",
     "execa": "^9.6.0",
     "get-port": "^7.1.0",
     "prettier": "^3.6.2",
@@ -117,12 +117,12 @@
     "supertest": "^7.1.4",
     "test-console": "^2.0.0",
     "timekeeper": "^2.3.1",
-    "typedoc": "^0.28.13",
-    "typescript": "^5.9.2",
+    "typedoc": "^0.28.14",
+    "typescript": "^5.9.3",
     "youch": "^4.1.0-beta.11"
   },
   "dependencies": {
-    "@adonisjs/ace": "^14.0.1-next.1",
+    "@adonisjs/ace": "^14.0.1-next.2",
     "@adonisjs/application": "^9.0.0-next.9",
     "@adonisjs/bodyparser": "^11.0.0-next.1",
     "@adonisjs/config": "^6.0.0-next.1",
@@ -132,8 +132,8 @@
     "@adonisjs/fold": "^11.0.0-next.2",
     "@adonisjs/hash": "^10.0.0-next.1",
     "@adonisjs/health": "^3.0.0-next.0",
-    "@adonisjs/http-server": "^8.0.0-next.8",
-    "@adonisjs/http-transformers": "^1.4.0",
+    "@adonisjs/http-server": "^8.0.0-next.11",
+    "@adonisjs/http-transformers": "^1.5.0",
     "@adonisjs/logger": "^7.1.0-next.0",
     "@adonisjs/repl": "^5.0.0-next.0",
     "@poppinss/colors": "^4.1.5",
@@ -149,7 +149,7 @@
   },
   "peerDependencies": {
     "@adonisjs/assembler": "^8.0.0-next.10",
-    "@vinejs/vine": "^3.0.0",
+    "@vinejs/vine": "^4.0.0-next.0",
     "argon2": "^0.43.0",
     "bcrypt": "^6.0.0",
     "edge.js": "^6.2.0",