@adonisjs/core 6.1.5-26 → 6.1.5-28

package/build/commands/configure.js

@@ -61,6 +61,7 @@ export default class Configure extends BaseCommand {
         const codemods = await this.createCodemods();
         await codemods.updateRcFile((rcFile) => {
             rcFile.addProvider('@adonisjs/core/providers/edge_provider');
+            rcFile.addMetaFile('resources/views/**/*.edge', false);
         });
     }
     /**

package/build/factories/core/ace.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@types/node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { Ignitor } from '../../src/ignitor/main.js';
 import type { IgnitorOptions } from '../../src/types.js';
 import type { Kernel } from '../../modules/ace/kernel.js';

package/build/factories/core/ignitor.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@types/node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { Ignitor } from '../../src/ignitor/main.js';
 import type { ApplicationService, IgnitorOptions } from '../../src/types.js';
 type FactoryParameters = {

package/build/factories/core/ignitor.js

@@ -7,6 +7,7 @@
  * file that was distributed with this source code.
  */
 import { Ignitor } from '../../src/ignitor/main.js';
+import { drivers } from '../../modules/hash/define_config.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';
@@ -35,7 +36,6 @@ export class IgnitorFactory {
         return [
             '@adonisjs/core/providers/app_provider',
             '@adonisjs/core/providers/hash_provider',
-            '@adonisjs/core/providers/http_provider',
             '@adonisjs/core/providers/repl_provider',
         ].concat(providers || []);
     }
@@ -74,9 +74,7 @@ export class IgnitorFactory {
                 hash: defineHashConfig({
                     default: 'scrypt',
                     list: {
-                        scrypt: {
-                            driver: 'scrypt',
-                        },
+                        scrypt: drivers.scrypt({}),
                     },
                 }),
                 logger: defineLoggerConfig({

package/build/factories/core/main.d.ts

@@ -1,4 +1,3 @@
 export { AceFactory } from './ace.js';
-export { StubsFactory } from '../stubs.js';
 export { IgnitorFactory } from './ignitor.js';
 export { TestUtilsFactory } from './test_utils.js';

package/build/factories/core/main.js

@@ -7,6 +7,5 @@
  * file that was distributed with this source code.
  */
 export { AceFactory } from './ace.js';
-export { StubsFactory } from '../stubs.js';
 export { IgnitorFactory } from './ignitor.js';
 export { TestUtilsFactory } from './test_utils.js';

package/build/factories/core/test_utils.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@types/node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { Ignitor } from '../../index.js';
 import type { IgnitorOptions } from '../../src/types.js';
 import { TestUtils } from '../../src/test_utils/main.js';

package/build/factories/stubs.d.ts

@@ -16,10 +16,10 @@ export declare class StubsFactory {
      * Prepares a stub
      */
     prepare(stubPath: string, data: Record<string, any>): Promise<{
-        contents: any;
+        contents: string;
         destination: any;
         force: any;
-        attributes: any;
+        attributes: Record<string, any>;
     }>;
 }
 export {};

package/build/index.d.ts

@@ -1,145 +1,16 @@
-/// <reference types="@types/node" resolution-mode="require"/>
+import { errors as aceErrors } from '@adonisjs/ace';
+import { errors as envErrors } from '@adonisjs/env';
+import { errors as appErrors } from '@adonisjs/application';
+import { errors as encryptionErrors } from '@adonisjs/encryption';
+import { errors as httpServerErrors } from '@adonisjs/http-server';
 export { stubsRoot } from './stubs/main.js';
 export { inject } from './modules/container.js';
 export { Ignitor } from './src/ignitor/main.js';
-export declare const errors: {
-    E_INVALID_ENV_VARIABLES: {
-        new (message?: string | undefined, options?: (ErrorOptions & {
-            code?: string | undefined;
-            status?: number | undefined;
-        }) | undefined): {
-            help: string;
-            name: string;
-            code?: string | undefined;
-            status: number;
-            toString(): string;
-            message: string;
-            stack?: string | undefined;
-            cause?: unknown;
-            readonly [Symbol.toStringTag]: string;
-        };
-        message: string;
-        code: string;
-        help?: string | undefined;
-        status?: number | undefined;
-        captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
-        prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
-        stackTraceLimit: number;
-    };
-    E_COMMAND_NOT_FOUND: {
-        new (args: [command: string]): {
-            commandName: string;
-            name: string;
-            help?: string | undefined;
-            code?: string | undefined;
-            status: number;
-            toString(): string;
-            message: string;
-            stack?: string | undefined;
-            cause?: unknown;
-            readonly [Symbol.toStringTag]: string;
-        };
-        help?: string | undefined;
-        code?: string | undefined;
-        status?: number | undefined;
-        message?: string | undefined;
-        captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
-        prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
-        stackTraceLimit: number;
-    };
-    E_INVALID_FLAG: new (args: [flag: string, expectedDataType: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_ARG: new (args: [arg: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_ARG_VALUE: new (args: [arg: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_COMMAND_NAME: new (args: [command: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_FLAG: new (args: [flag: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_FLAG_VALUE: new (args: [flag: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_UNKNOWN_FLAG: new (args: [flag: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_METAFILE_PATTERN: new (args: [fileProperty: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_PRELOAD_FILE: new (args: [preloadProperty: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_PROVIDER_FILE: new (args: [preloadProperty: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_SUITE_NAME: new (args: [suiteProperty: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_SUITE_FILES: new (args: [suiteProperty: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_BUNDLER_DEV_COMMAND: new (args?: any, options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_BUNDLER_BUILD_COMMAND: new (args?: any, options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_BUNDLER_NAME: new (args?: any, options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_ROUTE_NOT_FOUND: new (args: [method: string, url: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_CANNOT_LOOKUP_ROUTE: new (args: [routeIdentifier: string], options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_HTTP_EXCEPTION: {
-        new (message?: string | undefined, options?: (ErrorOptions & {
-            code?: string | undefined;
-            status?: number | undefined;
-        }) | undefined): {
-            body: any;
-            name: string;
-            help?: string | undefined;
-            code?: string | undefined;
-            status: number;
-            toString(): string;
-            message: string;
-            stack?: string | undefined;
-            cause?: unknown;
-            readonly [Symbol.toStringTag]: string;
-        };
-        code: string;
-        invoke(body: any, status: number, code?: string | undefined): {
-            body: any;
-            name: string;
-            help?: string | undefined;
-            code?: string | undefined;
-            status: number;
-            toString(): string;
-            message: string;
-            stack?: string | undefined;
-            cause?: unknown;
-            readonly [Symbol.toStringTag]: string;
-        };
-        help?: string | undefined;
-        status?: number | undefined;
-        message?: string | undefined;
-        captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
-        prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
-        stackTraceLimit: number;
-    };
-    E_HTTP_REQUEST_ABORTED: {
-        new (message?: string | undefined, options?: (ErrorOptions & {
-            code?: string | undefined;
-            status?: number | undefined;
-        }) | undefined): {
-            handle(error: any, ctx: import("@adonisjs/http-server").HttpContext): void;
-            body: any;
-            name: string;
-            help?: string | undefined;
-            code?: string | undefined;
-            status: number;
-            toString(): string;
-            message: string;
-            stack?: string | undefined;
-            cause?: unknown;
-            readonly [Symbol.toStringTag]: string;
-        };
-        code: string;
-        invoke(body: any, status: number, code?: string | undefined): {
-            body: any;
-            name: string;
-            help?: string | undefined;
-            code?: string | undefined;
-            status: number;
-            toString(): string;
-            message: string;
-            stack?: string | undefined;
-            cause?: unknown;
-            readonly [Symbol.toStringTag]: string;
-        };
-        help?: string | undefined;
-        status?: number | undefined;
-        message?: string | undefined;
-        captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
-        prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
-        stackTraceLimit: number;
-    };
-    E_INSECURE_APP_KEY: new (args?: any, options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-    E_MISSING_APP_KEY: new (args?: any, options?: ErrorOptions | undefined) => import("@poppinss/utils").Exception;
-};
+export { configProvider } from './src/config_provider.js';
+/**
+ * Aggregated errors from all modules.
+ */
+export declare const errors: typeof encryptionErrors & typeof httpServerErrors & typeof appErrors & typeof aceErrors & typeof envErrors;
 /**
  * Pretty prints an error with colorful output using
  * Youch terminal

package/build/index.js

@@ -14,6 +14,10 @@ import { errors as httpServerErrors } from '@adonisjs/http-server';
 export { stubsRoot } from './stubs/main.js';
 export { inject } from './modules/container.js';
 export { Ignitor } from './src/ignitor/main.js';
+export { configProvider } from './src/config_provider.js';
+/**
+ * Aggregated errors from all modules.
+ */
 export const errors = {
     ...encryptionErrors,
     ...httpServerErrors,

package/build/modules/ace/codemods.d.ts

@@ -31,23 +31,28 @@ export declare class Codemods {
      */
     makeUsingStub(stubsRoot: string, stubPath: string, stubState: Record<string, any>): Promise<{
         relativeFileName: string;
-        contents: any;
+        contents: string; /**
+         * Reference to lazily imported assembler code transformer
+         */
         destination: any;
-        attributes: any;
+        attributes: Record<string, any>;
         status: "created";
         skipReason: null;
     } | {
         relativeFileName: string;
-        contents: any;
+        contents: string;
         destination: any;
-        attributes: any;
+        attributes: Record<string, any>;
+        /**
+         * Reference to CLI logger to write logs
+         */
         status: "force_created";
         skipReason: null;
     } | {
         relativeFileName: string;
-        contents: any;
+        contents: string;
         destination: any;
-        attributes: any;
+        attributes: Record<string, any>;
         status: "skipped";
         skipReason: string;
     }>;

package/build/modules/ace/shell.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@types/node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 /**
  * Ace shell is used to run the ace commands inside a TypeScript project
  * without pre-compiling TypeScript source files.

package/build/modules/env/editor.d.ts

@@ -0,0 +1 @@
+export * from '@adonisjs/env/editor';

package/build/modules/env/editor.js

@@ -0,0 +1,9 @@
+/*
+ * @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/env/editor';

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

@@ -1,19 +1,35 @@
-import type { HashDriversList } from '../../src/types.js';
-import type { ManagerDriverFactory } from '../../types/hash.js';
+import type { Argon } from './drivers/argon.js';
+import type { Scrypt } from './drivers/scrypt.js';
+import type { Bcrypt } from './drivers/bcrypt.js';
+import type { ConfigProvider } from '../../src/types.js';
+import type { ArgonConfig, BcryptConfig, ScryptConfig, ManagerDriverFactory } from '../../types/hash.js';
 /**
- * Define config for the hash service.
+ * Resolved config from the config provider will be
+ * the config accepted by the hash manager
  */
-export declare function defineConfig<KnownHashers extends Record<string, {
-    [K in keyof HashDriversList]: {
-        driver: K;
-    } & Parameters<HashDriversList[K]>[0];
-}[keyof HashDriversList]>>(config: {
-    default?: keyof KnownHashers;
-    list: KnownHashers;
-}): {
+type ResolvedConfig<KnownHashers extends Record<string, ManagerDriverFactory | ConfigProvider<ManagerDriverFactory>>> = {
     default?: keyof KnownHashers;
-    driversInUse: Set<keyof HashDriversList>;
     list: {
-        [K in keyof KnownHashers]: ManagerDriverFactory;
+        [K in keyof KnownHashers]: KnownHashers[K] extends ConfigProvider<infer A> ? A : KnownHashers[K];
     };
 };
+/**
+ * Define config for the hash service.
+ */
+export declare function defineConfig<KnownHashers extends Record<string, ManagerDriverFactory | ConfigProvider<ManagerDriverFactory>>>(config: {
+    default?: keyof KnownHashers;
+    list: KnownHashers;
+}): ConfigProvider<ResolvedConfig<KnownHashers>>;
+/**
+ * Helpers to configure drivers inside the config file. The
+ * drivers will be imported and constructed lazily.
+ *
+ * - Import happens when you first use the hash module
+ * - Construction of drivers happens when you first use a driver
+ */
+export declare const drivers: {
+    argon2: (config: ArgonConfig) => ConfigProvider<() => Argon>;
+    bcrypt: (config: BcryptConfig) => ConfigProvider<() => Bcrypt>;
+    scrypt: (config: ScryptConfig) => ConfigProvider<() => Scrypt>;
+};
+export {};

package/build/modules/hash/define_config.js

@@ -7,7 +7,8 @@
  * file that was distributed with this source code.
  */
 import { InvalidArgumentsException } from '@poppinss/utils';
-import driversCollection from './drivers_collection.js';
+import debug from '../../src/debug.js';
+import { configProvider } from '../../src/config_provider.js';
 /**
  * Define config for the hash service.
  */
@@ -25,18 +26,52 @@ export function defineConfig(config) {
         throw new InvalidArgumentsException(`Missing "list.${String(config.default)}" in hash config. It is referenced by the "default" property`);
     }
     /**
-     * Converting list config to a collection that hash manager can use
+     * Config provider to lazily import drivers as they are used inside
+     * the user application
      */
-    const driversInUse = new Set();
-    const managerHashers = Object.keys(config.list).reduce((result, disk) => {
-        const hasherConfig = config.list[disk];
-        driversInUse.add(hasherConfig.driver);
-        result[disk] = () => driversCollection.create(hasherConfig.driver, hasherConfig);
-        return result;
-    }, {});
-    return {
-        driversInUse,
-        default: config.default,
-        list: managerHashers,
-    };
+    return configProvider.create(async (app) => {
+        debug('resolving hash config');
+        const hashersList = Object.keys(config.list);
+        const hashers = {};
+        for (let hasherName of hashersList) {
+            const hasher = config.list[hasherName];
+            if (typeof hasher === 'function') {
+                hashers[hasherName] = hasher;
+            }
+            else {
+                hashers[hasherName] = await hasher.resolver(app);
+            }
+        }
+        return {
+            default: config.default,
+            list: hashers,
+        };
+    });
 }
+/**
+ * Helpers to configure drivers inside the config file. The
+ * drivers will be imported and constructed lazily.
+ *
+ * - Import happens when you first use the hash module
+ * - Construction of drivers happens when you first use a driver
+ */
+export const drivers = {
+    argon2: (config) => {
+        return configProvider.create(async () => {
+            const { Argon } = await import('./drivers/argon.js');
+            return () => new Argon(config);
+        });
+    },
+    bcrypt: (config) => {
+        return configProvider.create(async () => {
+            const { Bcrypt } = await import('./drivers/bcrypt.js');
+            return () => new Bcrypt(config);
+        });
+    },
+    scrypt: (config) => {
+        return configProvider.create(async () => {
+            const { Scrypt } = await import('./drivers/scrypt.js');
+            return () => new Scrypt(config);
+        });
+    },
+};

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

@@ -1,3 +1,2 @@
 export * from '@adonisjs/hash';
-export { defineConfig } from './define_config.js';
-export { default as driversList } from './drivers_collection.js';
+export { defineConfig, drivers } from './define_config.js';

package/build/modules/hash/main.js

@@ -7,5 +7,4 @@
  * file that was distributed with this source code.
  */
 export * from '@adonisjs/hash';
-export { defineConfig } from './define_config.js';
-export { default as driversList } from './drivers_collection.js';
+export { defineConfig, drivers } from './define_config.js';

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

@@ -0,0 +1 @@
+export * from '@adonisjs/hash/phc_formatter';

package/build/modules/hash/phc_formatter.js

@@ -0,0 +1,9 @@
+/*
+ * @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/hash/phc_formatter';

package/build/modules/http/main.js

@@ -6,5 +6,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+/// <reference types="@adonisjs/bodyparser/bodyparser_middleware" />
 export * from '@adonisjs/http-server';
 export { RequestValidator } from './request_validator.js';

package/build/modules/http/request_validator.js

@@ -41,14 +41,14 @@ export class RequestValidator {
         /**
          * Assign request specific error reporter
          */
-        if (RequestValidator.errorReporter) {
+        if (RequestValidator.errorReporter && !validatorOptions.errorReporter) {
             const errorReporter = RequestValidator.errorReporter(this.#ctx);
             validatorOptions.errorReporter = () => errorReporter;
         }
         /**
          * Assign request specific messages provider
          */
-        if (RequestValidator.messagesProvider) {
+        if (RequestValidator.messagesProvider && !validatorOptions.messagesProvider) {
             validatorOptions.messagesProvider = RequestValidator.messagesProvider(this.#ctx);
         }
         /**

package/build/providers/app_provider.d.ts

@@ -38,8 +38,22 @@ export default class AppServiceProvider {
      * Register the encryption service to the container
      */
     protected registerEncryption(): void;
+    /**
+     * Registers the HTTP server with the container as a singleton
+     */
+    protected registerServer(): void;
+    /**
+     * Registers router with the container as a singleton
+     */
+    protected registerRouter(): void;
+    /**
+     * Self construct bodyparser middleware class, since it needs
+     * config that cannot be resolved by the container
+     */
+    protected registerBodyParserMiddleware(): void;
     /**
      * Registers bindings
      */
     register(): void;
+    boot(): Promise<void>;
 }

package/build/providers/app_provider.js

@@ -8,7 +8,10 @@
  */
 import { Config } from '../modules/config.js';
 import { Logger } from '../modules/logger.js';
+import { BaseEvent } from '../modules/events.js';
 import { Encryption } from '../modules/encryption.js';
+import { Router, Server } from '../modules/http/main.js';
+import BodyParserMiddleware from '../modules/bodyparser/bodyparser_middleware.js';
 /**
  * The Application Service provider registers all the baseline
  * features required to run the framework.
@@ -87,6 +90,39 @@ export default class AppServiceProvider {
         });
         this.app.container.alias('encryption', Encryption);
     }
+    /**
+     * Registers the HTTP server with the container as a singleton
+     */
+    registerServer() {
+        this.app.container.singleton(Server, async (resolver) => {
+            const encryption = await resolver.make('encryption');
+            const emitter = await resolver.make('emitter');
+            const logger = await resolver.make('logger');
+            const config = this.app.config.get('app.http');
+            return new Server(this.app, encryption, emitter, logger, config);
+        });
+        this.app.container.alias('server', Server);
+    }
+    /**
+     * Registers router with the container as a singleton
+     */
+    registerRouter() {
+        this.app.container.singleton(Router, async (resolver) => {
+            const server = await resolver.make('server');
+            return server.getRouter();
+        });
+        this.app.container.alias('router', Router);
+    }
+    /**
+     * Self construct bodyparser middleware class, since it needs
+     * config that cannot be resolved by the container
+     */
+    registerBodyParserMiddleware() {
+        this.app.container.bind(BodyParserMiddleware, () => {
+            const config = this.app.config.get('bodyparser');
+            return new BodyParserMiddleware(config);
+        });
+    }
     /**
      * Registers bindings
      */
@@ -99,5 +135,11 @@ export default class AppServiceProvider {
         this.registerEmitter();
         this.registerEncryption();
         this.registerTestUtils();
+        this.registerServer();
+        this.registerRouter();
+        this.registerBodyParserMiddleware();
+    }
+    async boot() {
+        BaseEvent.useEmitter(await this.app.container.make('emitter'));
     }
 }

package/build/providers/edge_provider.d.ts

@@ -1,7 +1,7 @@
 import { type Edge } from 'edge.js';
 import type { ApplicationService } from '../src/types.js';
 import { type Route } from '../modules/http/main.js';
-declare module '@adonisjs/http-server' {
+declare module '@adonisjs/core/http' {
     interface HttpContext {
         /**
          * Reference to the edge renderer to render templates

package/build/providers/hash_provider.d.ts

@@ -1,14 +1,10 @@
-import type { ApplicationService, HashDriversList } from '../src/types.js';
+import type { ApplicationService } from '../src/types.js';
 /**
  * Registers the passwords hasher with the container
  */
 export default class HashServiceProvider {
     protected app: ApplicationService;
     constructor(app: ApplicationService);
-    /**
-     * Lazily registers a hash driver with the driversList collection
-     */
-    protected registerHashDrivers(driversInUse: Set<keyof HashDriversList>): Promise<void>;
     /**
      * Registering the hash class to resolve an instance with the
      * default hasher.
@@ -22,8 +18,4 @@ export default class HashServiceProvider {
      * Registers bindings
      */
     register(): void;
-    /**
-     * Register drivers based upon hash config
-     */
-    boot(): void;
 }