@adonisjs/core 6.1.5-20 → 6.1.5-22

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

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

package/build/modules/http/main.js

@@ -7,3 +7,4 @@
  * 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

@@ -1,16 +1,7 @@
-import { type VineValidator } from '@vinejs/vine';
-import type { Infer, SchemaTypes, ValidationOptions, ErrorReporterContract, MessagesProviderContact } from '@vinejs/vine/types';
-import { type HttpContext } from '@adonisjs/http-server';
-declare module '@adonisjs/http-server' {
-    interface Request extends RequestValidator {
-    }
-}
-/**
- * Request validation options with custom data as well
- */
-type RequestValidationOptions<MetaData extends undefined | Record<string, any>> = ValidationOptions<MetaData> & {
-    data?: any;
-};
+import type { VineValidator } from '@vinejs/vine';
+import type { Infer, SchemaTypes, ErrorReporterContract, MessagesProviderContact } from '@vinejs/vine/types';
+import type { HttpContext } from './main.js';
+import type { RequestValidationOptions } from '../../types/http.js';
 /**
  * Request validator is used validate HTTP request data using
  * VineJS validators. You may validate the request body,
@@ -41,4 +32,3 @@ export declare class RequestValidator {
      */
     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>>;
 }
-export {};

package/build/modules/http/request_validator.js

@@ -6,7 +6,6 @@
  * 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,
@@ -65,10 +64,3 @@ export class RequestValidator {
         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/edge_provider.d.ts

@@ -1,5 +1,26 @@
-import '../src/bindings/edge/types.js';
+import { type Edge } from 'edge.js';
 import type { ApplicationService } from '../src/types.js';
+import { type Route } from '../modules/http/main.js';
+declare module '@adonisjs/core/http' {
+    interface HttpContext {
+        /**
+         * Reference to the edge renderer to render templates
+         * during an HTTP request
+         */
+        view: ReturnType<Edge['createRenderer']>;
+    }
+    interface BriskRoute {
+        /**
+         * Render an edge template without defining an
+         * explicit route handler
+         */
+        render(template: string, data?: Record<string, any>): Route;
+    }
+}
+/**
+ * The Edge service provider configures Edge to work within
+ * an AdonisJS application environment
+ */
 export default class EdgeServiceProvider {
     protected app: ApplicationService;
     constructor(app: ApplicationService);

package/build/providers/edge_provider.js

@@ -6,8 +6,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import '../src/bindings/edge/types.js';
-import { bridgeEdgeAdonisJS } from '../src/bindings/edge/main.js';
+import edge from 'edge.js';
+import { BriskRoute, HttpContext } from '../modules/http/main.js';
+/**
+ * The Edge service provider configures Edge to work within
+ * an AdonisJS application environment
+ */
 export default class EdgeServiceProvider {
     app;
     constructor(app) {
@@ -17,6 +21,49 @@ export default class EdgeServiceProvider {
      * Bridge AdonisJS and Edge
      */
     async boot() {
-        bridgeEdgeAdonisJS(this.app, await this.app.container.make('router'));
+        const app = this.app;
+        const router = await this.app.container.make('router');
+        function edgeConfigResolver(key, defaultValue) {
+            return app.config.get(key, defaultValue);
+        }
+        edgeConfigResolver.has = function (key) {
+            return app.config.has(key);
+        };
+        /**
+         * Mount the default disk
+         */
+        edge.mount(app.viewsPath());
+        /**
+         * Cache templates in production
+         */
+        edge.configure({ cache: app.inProduction });
+        /**
+         * Define Edge global helpers
+         */
+        edge.global('route', function (...args) {
+            return router.makeUrl(...args);
+        });
+        edge.global('signedRoute', function (...args) {
+            return router.makeSignedUrl(...args);
+        });
+        edge.global('app', app);
+        edge.global('config', edgeConfigResolver);
+        /**
+         * Creating a isolated instance of edge renderer
+         */
+        HttpContext.getter('view', function () {
+            return edge.createRenderer().share({
+                request: this.request,
+            });
+        }, true);
+        /**
+         * Adding brisk route to render templates without an
+         * explicit handler
+         */
+        BriskRoute.macro('render', function (template, data) {
+            return this.setHandler(({ view }) => {
+                return view.render(template, data);
+            });
+        });
     }
 }

package/build/providers/repl_provider.js

@@ -8,6 +8,14 @@
  */
 import { join } from 'node:path';
 import { homedir } from 'node:os';
+/**
+ * Resolves a container binding and sets it on the REPL
+ * context
+ */
+async function resolveBindingForRepl(app, repl, binding) {
+    repl.server.context[binding] = await app.container.make(binding);
+    repl.notify(`Loaded "${binding}" service. You can access it using the "${repl.colors.underline(binding)}" variable`);
+}
 export default class ReplServiceProvider {
     app;
     constructor(app) {
@@ -29,7 +37,62 @@ export default class ReplServiceProvider {
      */
     async boot() {
         const repl = await this.app.container.make('repl');
-        const { defineReplBindings } = await import('../src/bindings/repl.js');
-        defineReplBindings(this.app, repl);
+        repl.addMethod('importDefault', (_, modulePath) => {
+            return this.app.importDefault(modulePath);
+        }, {
+            description: 'Returns the default export for a module',
+        });
+        repl.addMethod('make', (_, service, runtimeValues) => {
+            return this.app.container.make(service, runtimeValues);
+        }, {
+            description: 'Make class instance using "container.make" method',
+        });
+        repl.addMethod('loadApp', () => {
+            return resolveBindingForRepl(this.app, repl, 'app');
+        }, {
+            description: 'Load "app" service in the REPL context',
+        });
+        repl.addMethod('loadEncryption', () => {
+            return resolveBindingForRepl(this.app, repl, 'encryption');
+        }, {
+            description: 'Load "encryption" service in the REPL context',
+        });
+        repl.addMethod('loadHash', () => {
+            return resolveBindingForRepl(this.app, repl, 'hash');
+        }, {
+            description: 'Load "hash" service in the REPL context',
+        });
+        repl.addMethod('loadRouter', () => {
+            return resolveBindingForRepl(this.app, repl, 'router');
+        }, {
+            description: 'Load "router" service in the REPL context',
+        });
+        repl.addMethod('loadConfig', () => {
+            return resolveBindingForRepl(this.app, repl, 'config');
+        }, {
+            description: 'Load "config" service in the REPL context',
+        });
+        repl.addMethod('loadTestUtils', () => {
+            return resolveBindingForRepl(this.app, repl, 'testUtils');
+        }, {
+            description: 'Load "testUtils" service in the REPL context',
+        });
+        repl.addMethod('loadHelpers', async () => {
+            const { default: isModule } = await import('../src/helpers/is.js');
+            const { default: stringModule } = await import('../src/helpers/string.js');
+            const { base64, cuid, fsReadAll, slash, parseImports } = await import('../src/helpers/main.js');
+            repl.server.context.helpers = {
+                string: stringModule,
+                is: isModule,
+                base64,
+                cuid,
+                fsReadAll,
+                slash,
+                parseImports,
+            };
+            repl.notify(`Loaded "helpers" module. You can access it using the "${repl.colors.underline('helpers')}" variable`);
+        }, {
+            description: 'Load "helpers" module in the REPL context',
+        });
     }
 }

package/build/providers/vinejs_provider.d.ts

@@ -1,5 +1,33 @@
-import '../src/bindings/vinejs/main.js';
-import '../src/bindings/vinejs/types.js';
-import '../modules/http/request_validator.js';
-export default class VineJSServiceProvider {
+import { BaseLiteralType } from '@vinejs/vine';
+import type { Validation, FieldContext, FieldOptions } from '@vinejs/vine/types';
+import type { MultipartFile, FileValidationOptions } from '@adonisjs/bodyparser/types';
+import { RequestValidator } from '../modules/http/main.js';
+/**
+ * Validation options accepted by the "file" rule
+ */
+export type FileRuleValidationOptions = Partial<FileValidationOptions> | ((field: FieldContext) => Partial<FileValidationOptions>);
+/**
+ * Extend VineJS
+ */
+declare module '@vinejs/vine' {
+    interface Vine {
+        file(options?: FileRuleValidationOptions): VineMultipartFile;
+    }
 }
+/**
+ * Extend HTTP request class
+ */
+declare module '@adonisjs/core/http' {
+    interface Request extends RequestValidator {
+    }
+}
+/**
+ * Represents a multipart file uploaded via multipart/form-data HTTP
+ * request.
+ */
+declare class VineMultipartFile extends BaseLiteralType<MultipartFile, MultipartFile> {
+    #private;
+    constructor(validationOptions?: FileRuleValidationOptions, options?: FieldOptions, validations?: Validation<any>[]);
+    clone(): this;
+}
+export {};

package/build/providers/vinejs_provider.js

@@ -6,8 +6,79 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import '../src/bindings/vinejs/main.js';
-import '../src/bindings/vinejs/types.js';
-import '../modules/http/request_validator.js';
-export default class VineJSServiceProvider {
+import vine, { BaseLiteralType, Vine } from '@vinejs/vine';
+import { Request, RequestValidator } from '../modules/http/main.js';
+/**
+ * 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);
+});
+/**
+ * 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/src/test_utils/main.d.ts

@@ -33,5 +33,5 @@ export declare class TestUtils extends Macroable {
     createHttpContext(options?: {
         req?: IncomingMessage;
         res?: ServerResponse;
-    }): Promise<import("../../modules/http/main.js").HttpContext>;
+    }): Promise<import("@adonisjs/core/http").HttpContext>;
 }

package/build/types/http.d.ts

@@ -1 +1,8 @@
 export * from '@adonisjs/http-server/types';
+import type { ValidationOptions } from '@vinejs/vine/types';
+/**
+ * Validation options accepted by the "request.validateUsing" method
+ */
+export type RequestValidationOptions<MetaData extends undefined | Record<string, any>> = ValidationOptions<MetaData> & {
+    data?: any;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/core",
   "description": "Core of AdonisJS",
-  "version": "6.1.5-20",
+  "version": "6.1.5-22",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -112,7 +112,7 @@
   },
   "dependencies": {
     "@adonisjs/ace": "^12.3.1-10",
-    "@adonisjs/application": "^7.1.2-12",
+    "@adonisjs/application": "^7.1.2-13",
     "@adonisjs/bodyparser": "^9.3.2-7",
     "@adonisjs/config": "^4.2.1-3",
     "@adonisjs/encryption": "^5.1.2-2",

package/build/src/bindings/edge/main.d.ts

@@ -1,7 +0,0 @@
-import './types.js';
-import type { ApplicationService } from '../../types.js';
-import { type Router } from '../../../modules/http/main.js';
-/**
- * Bridges AdonisJS with Edge
- */
-export declare function bridgeEdgeAdonisJS(app: ApplicationService, router: Router): void;

package/build/src/bindings/edge/main.js

@@ -1,58 +0,0 @@
-/*
- * @adonisjs/core
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import edge from 'edge.js';
-import './types.js';
-import { HttpContext, BriskRoute } from '../../../modules/http/main.js';
-/**
- * Bridges AdonisJS with Edge
- */
-export function bridgeEdgeAdonisJS(app, router) {
-    function edgeConfigResolver(key, defaultValue) {
-        return app.config.get(key, defaultValue);
-    }
-    edgeConfigResolver.has = function (key) {
-        return app.config.has(key);
-    };
-    /**
-     * Mount the default disk
-     */
-    edge.mount(app.viewsPath());
-    /**
-     * Cache templates in production
-     */
-    edge.configure({ cache: app.inProduction });
-    /**
-     * Define Edge global helpers
-     */
-    edge.global('route', function (...args) {
-        return router.makeUrl(...args);
-    });
-    edge.global('signedRoute', function (...args) {
-        return router.makeSignedUrl(...args);
-    });
-    edge.global('app', app);
-    edge.global('config', edgeConfigResolver);
-    /**
-     * Creating a isolated instance of edge renderer
-     */
-    HttpContext.getter('view', function () {
-        return edge.createRenderer().share({
-            request: this.request,
-        });
-    });
-    /**
-     * Adding brisk route to render templates without an
-     * explicit handler
-     */
-    BriskRoute.macro('render', function (template, data) {
-        return this.setHandler(({ view }) => {
-            return view.render(template, data);
-        });
-    });
-}

package/build/src/bindings/edge/types.d.ts

@@ -1,18 +0,0 @@
-import { type Edge } from 'edge.js';
-import type { Route } from '../../../modules/http/main.js';
-declare module '@adonisjs/http-server' {
-    interface HttpContext {
-        /**
-         * Reference to the edge renderer to render templates
-         * during an HTTP request
-         */
-        view: ReturnType<Edge['createRenderer']>;
-    }
-    interface BriskRoute {
-        /**
-         * Render an edge template without defining an
-         * explicit route handler
-         */
-        render(template: string, data?: Record<string, any>): Route;
-    }
-}

package/build/src/bindings/edge/types.js

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

package/build/src/bindings/repl.d.ts

@@ -1,6 +0,0 @@
-import type { Repl } from '../../modules/repl.js';
-import { ApplicationService } from '../types.js';
-/**
- * Registers REPL methods
- */
-export declare function defineReplBindings(app: ApplicationService, repl: Repl): void;

package/build/src/bindings/repl.js

@@ -1,78 +0,0 @@
-/*
- * @adonisjs/core
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Resolves a container binding and sets it on the REPL
- * context
- */
-async function resolveBindingForRepl(app, repl, binding) {
-    repl.server.context[binding] = await app.container.make(binding);
-    repl.notify(`Loaded "${binding}" service. You can access it using the "${repl.colors.underline(binding)}" variable`);
-}
-/**
- * Registers REPL methods
- */
-export function defineReplBindings(app, repl) {
-    repl.addMethod('importDefault', (_, modulePath) => {
-        return app.importDefault(modulePath);
-    }, {
-        description: 'Returns the default export for a module',
-    });
-    repl.addMethod('make', (_, service, runtimeValues) => {
-        return app.container.make(service, runtimeValues);
-    }, {
-        description: 'Make class instance using "container.make" method',
-    });
-    repl.addMethod('loadApp', () => {
-        return resolveBindingForRepl(app, repl, 'app');
-    }, {
-        description: 'Load "app" service in the REPL context',
-    });
-    repl.addMethod('loadEncryption', () => {
-        return resolveBindingForRepl(app, repl, 'encryption');
-    }, {
-        description: 'Load "encryption" service in the REPL context',
-    });
-    repl.addMethod('loadHash', () => {
-        return resolveBindingForRepl(app, repl, 'hash');
-    }, {
-        description: 'Load "hash" service in the REPL context',
-    });
-    repl.addMethod('loadRouter', () => {
-        return resolveBindingForRepl(app, repl, 'router');
-    }, {
-        description: 'Load "router" service in the REPL context',
-    });
-    repl.addMethod('loadConfig', () => {
-        return resolveBindingForRepl(app, repl, 'config');
-    }, {
-        description: 'Load "config" service in the REPL context',
-    });
-    repl.addMethod('loadTestUtils', () => {
-        return resolveBindingForRepl(app, repl, 'testUtils');
-    }, {
-        description: 'Load "testUtils" service in the REPL context',
-    });
-    repl.addMethod('loadHelpers', async () => {
-        const { default: isModule } = await import('../helpers/is.js');
-        const { default: stringModule } = await import('../helpers/string.js');
-        const { base64, cuid, fsReadAll, slash, parseImports } = await import('../helpers/main.js');
-        repl.server.context.helpers = {
-            string: stringModule,
-            is: isModule,
-            base64,
-            cuid,
-            fsReadAll,
-            slash,
-            parseImports,
-        };
-        repl.notify(`Loaded "helpers" module. You can access it using the "${repl.colors.underline('helpers')}" variable`);
-    }, {
-        description: 'Load "helpers" module in the REPL context',
-    });
-}

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

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

package/build/src/bindings/vinejs/main.js

@@ -1,76 +0,0 @@
-/*
- * @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.
- */
-export 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/build/src/bindings/vinejs/types.d.ts

@@ -1,12 +0,0 @@
-import type { FieldContext } from '@vinejs/vine/types';
-import type { FileValidationOptions } from '@adonisjs/bodyparser/types';
-import type { VineMultipartFile } from './main.js';
-export type ValidationOptions = Partial<FileValidationOptions> | ((field: FieldContext) => Partial<FileValidationOptions>);
-/**
- * Notifying TypeScript
- */
-declare module '@vinejs/vine' {
-    interface Vine {
-        file(options?: ValidationOptions): VineMultipartFile;
-    }
-}

package/build/src/bindings/vinejs/types.js

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