@adonisjs/core 6.1.5-7 → 6.1.5-9

package/build/factories/core/ignitor.js

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 import { Ignitor } from '../../src/ignitor/main.js';
-import { defineConfig as defineHttpConfig } from '../../modules/http.js';
+import { defineConfig as defineHttpConfig } from '../../modules/http/main.js';
 import { defineConfig as defineLoggerConfig } from '../../modules/logger.js';
 import { defineConfig as defineHashConfig } from '../../modules/hash/main.js';
 import { defineConfig as defineBodyParserConfig } from '../../modules/bodyparser/main.js';

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

@@ -0,0 +1,2 @@
+export * from '@adonisjs/http-server';
+export { RequestValidator } from './request_validator.js';

package/build/modules/http/main.js

@@ -0,0 +1,10 @@
+/*
+ * @adonisjs/core
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+export * from '@adonisjs/http-server';
+export { RequestValidator } from './request_validator.js';

package/build/modules/http/request_validator.d.ts

@@ -0,0 +1,44 @@
+import { type VineValidator } from '@vinejs/vine';
+import type { Infer, SchemaTypes, ValidationOptions, ErrorReporterContract, MessagesProviderContact } from '@vinejs/vine/types';
+import { type HttpContext } from '@adonisjs/http-server';
+/**
+ * Request validation options with custom data as well
+ */
+type RequestValidationOptions<MetaData extends undefined | Record<string, any>> = ValidationOptions<MetaData> & {
+    data?: any;
+};
+/**
+ * Request validator is used validate HTTP request data using
+ * VineJS validators. You may validate the request body,
+ * files, cookies, and headers.
+ */
+export declare class RequestValidator {
+    #private;
+    constructor(ctx: HttpContext);
+    /**
+     * The error reporter method returns the error reporter
+     * to use for reporting errors.
+     *
+     * You can use this function to pick a different error reporter
+     * for each HTTP request
+     */
+    static errorReporter?: (_: HttpContext) => ErrorReporterContract;
+    /**
+     * The messages provider method returns the messages provider to use
+     * finding custom error messages
+     *
+     * You can use this function to pick a different messages provider for
+     * each HTTP request
+     */
+    static messagesProvider?: (_: HttpContext) => MessagesProviderContact;
+    /**
+     * The validate method can be used to validate the request
+     * data for the current request using VineJS validators
+     */
+    validateUsing<Schema extends SchemaTypes, MetaData extends undefined | Record<string, any>>(validator: VineValidator<Schema, MetaData>, ...[options]: [undefined] extends MetaData ? [options?: RequestValidationOptions<MetaData> | undefined] : [options: RequestValidationOptions<MetaData>]): Promise<Infer<Schema>>;
+}
+declare module '@adonisjs/http-server' {
+    interface Request extends RequestValidator {
+    }
+}
+export {};

package/build/modules/http/request_validator.js

@@ -0,0 +1,74 @@
+/*
+ * @adonisjs/core
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+import { Request } from '@adonisjs/http-server';
+/**
+ * Request validator is used validate HTTP request data using
+ * VineJS validators. You may validate the request body,
+ * files, cookies, and headers.
+ */
+export class RequestValidator {
+    #ctx;
+    constructor(ctx) {
+        this.#ctx = ctx;
+    }
+    /**
+     * The error reporter method returns the error reporter
+     * to use for reporting errors.
+     *
+     * You can use this function to pick a different error reporter
+     * for each HTTP request
+     */
+    static errorReporter;
+    /**
+     * The messages provider method returns the messages provider to use
+     * finding custom error messages
+     *
+     * You can use this function to pick a different messages provider for
+     * each HTTP request
+     */
+    static messagesProvider;
+    /**
+     * The validate method can be used to validate the request
+     * data for the current request using VineJS validators
+     */
+    validateUsing(validator, ...[options]) {
+        const validatorOptions = options || {};
+        /**
+         * Assign request specific error reporter
+         */
+        if (RequestValidator.errorReporter) {
+            const errorReporter = RequestValidator.errorReporter(this.#ctx);
+            validatorOptions.errorReporter = () => errorReporter;
+        }
+        /**
+         * Assign request specific messages provider
+         */
+        if (RequestValidator.messagesProvider) {
+            validatorOptions.messagesProvider = RequestValidator.messagesProvider(this.#ctx);
+        }
+        /**
+         * Data to validate
+         */
+        const data = validatorOptions.data || {
+            ...this.#ctx.request.all(),
+            ...this.#ctx.request.allFiles(),
+            params: this.#ctx.request.params(),
+            headers: this.#ctx.request.headers(),
+            cookies: this.#ctx.request.cookiesList(),
+        };
+        return validator.validate(data, validatorOptions);
+    }
+}
+/**
+ * The validate method can be used to validate the request
+ * data for the current request using VineJS validators
+ */
+Request.macro('validateUsing', function (...args) {
+    return new RequestValidator(this.ctx).validateUsing(...args);
+});

package/build/providers/http_provider.js

@@ -6,7 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { Router, Server } from '../modules/http.js';
+import { Router, Server } from '../modules/http/main.js';
 import BodyParserMiddleware from '../modules/bodyparser/bodyparser_middleware.js';
 /**
  * Http Service provider binds the router and the HTTP server to

package/build/providers/repl_provider.js

@@ -6,6 +6,8 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import { join } from 'node:path';
+import { homedir } from 'node:os';
 export default class ReplServiceProvider {
     app;
     constructor(app) {
@@ -17,7 +19,9 @@ export default class ReplServiceProvider {
     register() {
         this.app.container.singleton('repl', async () => {
             const { Repl } = await import('../modules/repl.js');
-            return new Repl();
+            return new Repl({
+                historyFilePath: join(homedir(), '.adonisjs_v6_repl_history'),
+            });
         });
     }
     /**

package/build/src/cli_formatters/routes_list.d.ts

@@ -1,5 +1,5 @@
-import { type Router } from '../../modules/http.js';
 import type { UIPrimitives } from '../../types/ace.js';
+import { type Router } from '../../modules/http/main.js';
 /**
  * Shape of the serialized route specific to the formatter
  */

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

@@ -2,7 +2,7 @@
 import Macroable from '@poppinss/macroable';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { HttpServerUtils } from './http.js';
-import { CookieClient } from '../../modules/http.js';
+import { CookieClient } from '../../modules/http/main.js';
 import type { ApplicationService } from '../types.js';
 /**
  * Test utils has a collection of helper methods to make testing
@@ -33,5 +33,5 @@ export declare class TestUtils extends Macroable {
     createHttpContext(options?: {
         req?: IncomingMessage;
         res?: ServerResponse;
-    }): Promise<import("../../modules/http.js").HttpContext>;
+    }): Promise<import("../../modules/http/main.js").HttpContext>;
 }

package/build/src/test_utils/main.js

@@ -10,7 +10,7 @@ import { Socket } from 'node:net';
 import Macroable from '@poppinss/macroable';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { HttpServerUtils } from './http.js';
-import { CookieClient } from '../../modules/http.js';
+import { CookieClient } from '../../modules/http/main.js';
 /**
  * Test utils has a collection of helper methods to make testing
  * experience great for AdonisJS applications

package/build/src/types.d.ts

@@ -4,9 +4,9 @@ import type { Emitter } from '../modules/events.js';
 import type { Kernel } from '../modules/ace/main.js';
 import type { Application } from '../modules/app.js';
 import type { TestUtils } from './test_utils/main.js';
-import type { Router, Server } from '../modules/http.js';
 import type { LoggerManager } from '../modules/logger.js';
 import type { Encryption } from '../modules/encryption.js';
+import type { Router, Server } from '../modules/http/main.js';
 import type { HttpRequestFinishedPayload } from '../types/http.js';
 import type { ContainerResolveEventData } from '../types/container.js';
 import type { LoggerConfig, LoggerManagerConfig } from '../types/logger.js';

package/build/src/vinejs/extensions/main.d.ts

@@ -0,0 +1 @@
+import './validates_files.js';

package/build/{modules/http.js → src/vinejs/extensions/main.js}

@@ -6,4 +6,4 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-export * from '@adonisjs/http-server';
+import './validates_files.js';

package/build/src/vinejs/extensions/validates_files.d.ts

@@ -0,0 +1,22 @@
+import { BaseLiteralType } from '@vinejs/vine';
+import type { FieldContext, FieldOptions, Validation } from '@vinejs/vine/types';
+import type { MultipartFile, FileValidationOptions } from '@adonisjs/bodyparser/types';
+type ValidationOptions = Partial<FileValidationOptions> | ((field: FieldContext) => Partial<FileValidationOptions>);
+/**
+ * Represents a multipart file uploaded via multipart/form-data HTTP
+ * request.
+ */
+declare class VineMultipartFile extends BaseLiteralType<MultipartFile, MultipartFile> {
+    #private;
+    constructor(validationOptions?: ValidationOptions, options?: FieldOptions, validations?: Validation<any>[]);
+    clone(): this;
+}
+/**
+ * Notifying TypeScript
+ */
+declare module '@vinejs/vine' {
+    interface Vine {
+        file(options?: ValidationOptions): VineMultipartFile;
+    }
+}
+export {};

package/build/src/vinejs/extensions/validates_files.js

@@ -0,0 +1,76 @@
+/*
+ * @adonisjs/core
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+import vine, { BaseLiteralType, Vine } from '@vinejs/vine';
+/**
+ * Checks if the value is an instance of multipart file
+ * from bodyparser.
+ */
+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.
+ */
+const isMultipartFile = vine.createRule((file, options, field) => {
+    /**
+     * Report error when value is not a field multipart
+     * file object
+     */
+    if (!isBodyParserFile(file)) {
+        field.report('The {{ field }} must be a file', 'file', field);
+        return;
+    }
+    const validationOptions = typeof options === 'function' ? options(field) : options;
+    /**
+     * Set size when it's defined in the options and missing
+     * on the file instance
+     */
+    if (file.sizeLimit === undefined && validationOptions.size) {
+        file.sizeLimit = validationOptions.size;
+    }
+    /**
+     * Set extensions when it's defined in the options and missing
+     * on the file instance
+     */
+    if (file.allowedExtensions === undefined && validationOptions.extnames) {
+        file.allowedExtensions = validationOptions.extnames;
+    }
+    /**
+     * Validate file
+     */
+    file.validate();
+    /**
+     * Report errors
+     */
+    file.errors.forEach((error) => {
+        field.report(error.message, `file.${error.type}`, field, validationOptions);
+    });
+});
+/**
+ * Represents a multipart file uploaded via multipart/form-data HTTP
+ * request.
+ */
+class VineMultipartFile extends BaseLiteralType {
+    #validationOptions;
+    constructor(validationOptions, options, validations) {
+        super(options, validations || [isMultipartFile(validationOptions || {})]);
+        this.#validationOptions = validationOptions;
+    }
+    clone() {
+        return new VineMultipartFile(this.#validationOptions, this.cloneOptions(), this.cloneValidations());
+    }
+}
+/**
+ * The file method is used to validate a field to be a valid
+ * multipart file.
+ */
+Vine.macro('file', function (options) {
+    return new VineMultipartFile(options);
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/core",
   "description": "Core of AdonisJS",
-  "version": "6.1.5-7",
+  "version": "6.1.5-9",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -26,6 +26,7 @@
   },
   "exports": {
     ".": "./build/index.js",
+    "./commands": "./build/commands/main.js",
     "./commands/*": "./build/commands/*.js",
     "./factories": "./build/factories/core/main.js",
     "./factories/*": "./build/factories/*.js",
@@ -35,6 +36,7 @@
     "./providers/*": "./build/providers/*.js",
     "./helpers": "./build/src/helpers/main.js",
     "./helpers/*": "./build/src/helpers/*.js",
+    "./vinejs/extensions": "./build/src/vinejs/extensions/main.js",
     "./ace": "./build/modules/ace/main.js",
     "./ace/shell": "./build/modules/ace/shell.js",
     "./bodyparser": "./build/modules/bodyparser/main.js",
@@ -72,32 +74,33 @@
     "index:commands": "node --loader=ts-node/esm toolkit/main.js index build/commands"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^6.1.3-12",
-    "@adonisjs/eslint-config": "^1.1.7",
-    "@adonisjs/prettier-config": "^1.1.7",
-    "@adonisjs/tsconfig": "^1.1.7",
-    "@commitlint/cli": "^17.6.6",
-    "@commitlint/config-conventional": "^17.6.6",
+    "@adonisjs/assembler": "^6.1.3-13",
+    "@adonisjs/eslint-config": "^1.1.8",
+    "@adonisjs/prettier-config": "^1.1.8",
+    "@adonisjs/tsconfig": "^1.1.8",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-conventional": "^17.6.7",
     "@japa/assert": "2.0.0-1",
     "@japa/expect-type": "2.0.0-0",
     "@japa/file-system": "2.0.0-1",
     "@japa/runner": "^3.0.0-5",
-    "@swc/core": "^1.3.68",
-    "@types/node": "^20.4.1",
+    "@swc/core": "^1.3.70",
+    "@types/node": "^20.4.2",
     "@types/pretty-hrtime": "^1.0.1",
     "@types/sinon": "^10.0.15",
     "@types/supertest": "^2.0.12",
     "@types/test-console": "^2.0.0",
+    "@vinejs/vine": "^1.5.2",
     "c8": "^8.0.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "eslint": "^8.44.0",
+    "eslint": "^8.45.0",
     "get-port": "^7.0.0",
     "github-label-sync": "^2.3.1",
     "husky": "^8.0.3",
     "np": "^8.0.4",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0",
     "sinon": "^15.2.0",
     "supertest": "^6.3.3",
     "test-console": "^2.0.0",
@@ -114,14 +117,14 @@
     "@adonisjs/events": "^8.4.9-3",
     "@adonisjs/fold": "^9.9.3-6",
     "@adonisjs/hash": "^8.3.1-3",
-    "@adonisjs/http-server": "^6.8.2-8",
+    "@adonisjs/http-server": "^6.8.2-9",
     "@adonisjs/logger": "^5.4.2-3",
     "@adonisjs/repl": "^4.0.0-5",
     "@antfu/install-pkg": "^0.1.1",
     "@paralleldrive/cuid2": "^2.2.0",
     "@poppinss/macroable": "^1.0.0-7",
     "@poppinss/utils": "^6.5.0-3",
-    "@sindresorhus/is": "^5.4.1",
+    "@sindresorhus/is": "^5.5.2",
     "@types/he": "^1.2.0",
     "execa": "^7.1.1",
     "he": "^1.2.0",
@@ -133,6 +136,7 @@
   },
   "peerDependencies": {
     "@adonisjs/assembler": "^6.1.3-12",
+    "@vinejs/vine": "^1.5.2",
     "argon2": "^0.30.3",
     "bcrypt": "^5.0.1"
   },
@@ -145,6 +149,9 @@
     },
     "@adonisjs/assembler": {
       "optional": true
+    },
+    "@vinejs/vine": {
+      "optional": true
     }
   },
   "author": "virk,adonisjs",

package/build/modules/http.d.ts

@@ -1 +0,0 @@
-export * from '@adonisjs/http-server';