@adonisjs/core 6.1.5-9 → 6.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/core",
   "description": "Core of AdonisJS",
-  "version": "6.1.5-9",
+  "version": "6.2.1",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -10,7 +10,6 @@
   "files": [
     "build/modules",
     "build/commands",
-    "build/legacy",
     "build/providers",
     "build/services",
     "build/factories",
@@ -36,19 +35,23 @@
     "./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",
+    "./ace/codemods": "./build/modules/ace/codemods.js",
     "./bodyparser": "./build/modules/bodyparser/main.js",
     "./bodyparser_middleware": "./build/modules/bodyparser/bodyparser_middleware.js",
     "./hash": "./build/modules/hash/main.js",
+    "./hash/phc_formatter": "./build/modules/hash/phc_formatter.js",
+    "./hash/drivers/argon": "./build/modules/hash/drivers/argon.js",
+    "./hash/drivers/bcrypt": "./build/modules/hash/drivers/bcrypt.js",
+    "./hash/drivers/scrypt": "./build/modules/hash/drivers/scrypt.js",
     "./app": "./build/modules/app.js",
     "./config": "./build/modules/config.js",
     "./container": "./build/modules/container.js",
     "./encryption": "./build/modules/encryption.js",
-    "./env": "./build/modules/env.js",
+    "./env": "./build/modules/env/main.js",
+    "./env/editor": "./build/modules/env/editor.js",
     "./events": "./build/modules/events.js",
-    "./http": "./build/modules/http.js",
+    "./http": "./build/modules/http/main.js",
     "./logger": "./build/modules/logger.js",
     "./repl": "./build/modules/repl.js",
     "./package.json": "./package.json",
@@ -74,71 +77,74 @@
     "index:commands": "node --loader=ts-node/esm toolkit/main.js index build/commands"
   },
   "devDependencies": {
-    "@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.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",
+    "@adonisjs/assembler": "^7.1.0",
+    "@adonisjs/eslint-config": "^1.2.0",
+    "@adonisjs/prettier-config": "^1.2.0",
+    "@adonisjs/tsconfig": "^1.2.0",
+    "@commitlint/cli": "^18.5.0",
+    "@commitlint/config-conventional": "^18.5.0",
+    "@japa/assert": "^2.1.0",
+    "@japa/expect-type": "^2.0.1",
+    "@japa/file-system": "^2.2.0",
+    "@japa/runner": "^3.1.1",
+    "@swc/core": "^1.3.105",
+    "@types/node": "^20.11.5",
+    "@types/pretty-hrtime": "^1.0.3",
+    "@types/sinon": "^17.0.3",
+    "@types/supertest": "^6.0.2",
+    "@types/test-console": "^2.0.3",
+    "@vinejs/vine": "^1.7.0",
+    "argon2": "^0.31.1",
+    "bcrypt": "^5.1.1",
+    "c8": "^9.1.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "del-cli": "^5.0.0",
-    "eslint": "^8.45.0",
+    "del-cli": "^5.1.0",
+    "edge.js": "^6.0.1",
+    "eslint": "^8.56.0",
+    "execa": "^8.0.1",
     "get-port": "^7.0.0",
     "github-label-sync": "^2.3.1",
     "husky": "^8.0.3",
-    "np": "^8.0.4",
-    "prettier": "^3.0.0",
-    "sinon": "^15.2.0",
-    "supertest": "^6.3.3",
+    "np": "^9.2.0",
+    "prettier": "^3.2.4",
+    "sinon": "^17.0.1",
+    "supertest": "^6.3.4",
     "test-console": "^2.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@adonisjs/ace": "^12.3.1-8",
-    "@adonisjs/application": "^7.1.2-8",
-    "@adonisjs/bodyparser": "^9.3.2-6",
-    "@adonisjs/config": "^4.2.1-2",
-    "@adonisjs/encryption": "^5.1.2-2",
-    "@adonisjs/env": "^4.2.0-3",
-    "@adonisjs/events": "^8.4.9-3",
-    "@adonisjs/fold": "^9.9.3-6",
-    "@adonisjs/hash": "^8.3.1-3",
-    "@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.5.2",
-    "@types/he": "^1.2.0",
-    "execa": "^7.1.1",
+    "@adonisjs/ace": "^13.0.0",
+    "@adonisjs/application": "^8.0.0",
+    "@adonisjs/bodyparser": "^10.0.0",
+    "@adonisjs/config": "^5.0.0",
+    "@adonisjs/encryption": "^6.0.0",
+    "@adonisjs/env": "^5.0.0",
+    "@adonisjs/events": "^9.0.0",
+    "@adonisjs/fold": "^10.0.0",
+    "@adonisjs/hash": "^9.0.0",
+    "@adonisjs/http-server": "^7.0.1",
+    "@adonisjs/logger": "^6.0.0",
+    "@adonisjs/repl": "^4.0.0",
+    "@paralleldrive/cuid2": "^2.2.2",
+    "@poppinss/macroable": "^1.0.1",
+    "@poppinss/utils": "^6.7.1",
+    "@sindresorhus/is": "^6.0.1",
+    "@types/he": "^1.2.3",
     "he": "^1.2.0",
     "parse-imports": "^1.1.2",
     "pretty-hrtime": "^1.0.3",
-    "string-width": "^6.1.0",
-    "youch": "^3.2.3",
-    "youch-terminal": "^2.2.2"
+    "string-width": "^7.1.0",
+    "youch": "^3.3.2",
+    "youch-terminal": "^2.2.3"
   },
   "peerDependencies": {
-    "@adonisjs/assembler": "^6.1.3-12",
-    "@vinejs/vine": "^1.5.2",
-    "argon2": "^0.30.3",
-    "bcrypt": "^5.0.1"
+    "@adonisjs/assembler": "^7.0.0",
+    "@vinejs/vine": "^1.7.0",
+    "argon2": "^0.31.1",
+    "bcrypt": "^5.1.1",
+    "edge.js": "^6.0.1"
   },
   "peerDependenciesMeta": {
     "argon2": {
@@ -152,6 +158,9 @@
     },
     "@vinejs/vine": {
       "optional": true
+    },
+    "edge.js": {
+      "optional": true
     }
   },
   "author": "virk,adonisjs",
@@ -180,11 +189,11 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "next"
+    "tag": "latest"
   },
   "np": {
     "message": "chore(release): %s",
-    "tag": "next",
+    "tag": "latest",
     "branch": "main",
     "anyBranch": false
   },

package/build/commands/make/_base.d.ts

@@ -1,36 +0,0 @@
-import { BaseCommand } from '../../modules/ace/main.js';
-import type { CommandOptions } from '../../types/ace.js';
-/**
- * Base command for make commands
- */
-export default abstract class extends BaseCommand {
-    /**
-     * Allowing unknown flags to enable custom workflows
-     */
-    static options: CommandOptions;
-    /**
-     * Generates the resource from stub
-     */
-    protected generate(stubPath: string, stubState: Record<string, any>): Promise<{
-        relativeFileName: string;
-        contents: any;
-        destination: any;
-        attributes: any;
-        status: "created";
-        skipReason: null;
-    } | {
-        relativeFileName: string;
-        contents: any;
-        destination: any;
-        attributes: any;
-        status: "force_created";
-        skipReason: null;
-    } | {
-        relativeFileName: string;
-        contents: any;
-        destination: any;
-        attributes: any;
-        status: "skipped";
-        skipReason: string;
-    }>;
-}

package/build/commands/make/_base.js

@@ -1,27 +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 { stubsRoot } from '../../stubs/index.js';
-import { BaseCommand } from '../../modules/ace/main.js';
-/**
- * Base command for make commands
- */
-export default class default_1 extends BaseCommand {
-    /**
-     * Allowing unknown flags to enable custom workflows
-     */
-    static options = {
-        allowUnknownFlags: true,
-    };
-    /**
-     * Generates the resource from stub
-     */
-    async generate(stubPath, stubState) {
-        return this.makeUsingStub(stubPath, stubState, stubsRoot);
-    }
-}

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

@@ -1,12 +0,0 @@
-/// <reference types="@types/node" resolution-mode="require"/>
-/**
- * Ace shell is used to run the ace commands inside a TypeScript project
- * without pre-compiling TypeScript source files.
- *
- * Under the hood a child process is used to execute the "bin/console.ts" file. This
- * is required because we have to use "ts-node/esm" loader in order to run TypeScript
- * files.
- */
-export declare function aceShell(cwd: URL): {
-    handle(argv: string[]): Promise<void>;
-};

package/build/modules/ace/shell.js

@@ -1,49 +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.
- */
-const DEFAULT_NODE_ARGS = [
-    // Use ts-node/esm loader. The project must install it
-    '--loader=ts-node/esm',
-    // Disable annonying warnings
-    '--no-warnings',
-    // Enable expiremental meta resolve for cases where someone uses magic import string
-    '--experimental-import-meta-resolve',
-    // Enable source maps, since TSNode source maps are broken
-    '--enable-source-maps',
-];
-/**
- * Ace shell is used to run the ace commands inside a TypeScript project
- * without pre-compiling TypeScript source files.
- *
- * Under the hood a child process is used to execute the "bin/console.ts" file. This
- * is required because we have to use "ts-node/esm" loader in order to run TypeScript
- * files.
- */
-export function aceShell(cwd) {
-    return {
-        async handle(argv) {
-            const { execaNode } = await import('execa');
-            const childProcess = execaNode('bin/console.js', argv, {
-                nodeOptions: DEFAULT_NODE_ARGS,
-                preferLocal: true,
-                windowsHide: false,
-                localDir: cwd,
-                cwd,
-                buffer: false,
-                stdio: 'inherit',
-            });
-            try {
-                const result = await childProcess;
-                process.exitCode = result.exitCode;
-            }
-            catch (error) {
-                process.exitCode = 1;
-            }
-        },
-    };
-}

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

@@ -1,21 +0,0 @@
-import type { HashDriversList } from '../../src/types.js';
-/**
- * A global collection of Hash drivers
- */
-declare class HashDriversCollection {
-    /**
-     * List of registered drivers
-     */
-    list: Partial<HashDriversList>;
-    /**
-     * Extend drivers collection and add a custom
-     * driver to it.
-     */
-    extend<Name extends keyof HashDriversList>(driverName: Name, factoryCallback: HashDriversList[Name]): this;
-    /**
-     * Creates the driver instance with config
-     */
-    create<Name extends keyof HashDriversList>(name: Name, config: Parameters<HashDriversList[Name]>[0]): import("@adonisjs/hash").Bcrypt | import("@adonisjs/hash").Argon | import("@adonisjs/hash").Scrypt;
-}
-declare const _default: HashDriversCollection;
-export default _default;

package/build/modules/hash/drivers_collection.js

@@ -1,45 +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.
- */
-/**
- * This class exists in the core, because it maintains a list of
- * globally available drivers applicable to the hash manager
- * instance registered with the container.
- *
- * In other words, these drivers are not needed by the hash module
- * regular usage and specific to AdonisJS container flow.
- */
-import { RuntimeException } from '@poppinss/utils';
-/**
- * A global collection of Hash drivers
- */
-class HashDriversCollection {
-    /**
-     * List of registered drivers
-     */
-    list = {};
-    /**
-     * Extend drivers collection and add a custom
-     * driver to it.
-     */
-    extend(driverName, factoryCallback) {
-        this.list[driverName] = factoryCallback;
-        return this;
-    }
-    /**
-     * Creates the driver instance with config
-     */
-    create(name, config) {
-        const driverFactory = this.list[name];
-        if (!driverFactory) {
-            throw new RuntimeException(`Unknown hash driver "${String(name)}". Make sure the driver is registered`);
-        }
-        return driverFactory(config);
-    }
-}
-export default new HashDriversCollection();

package/build/providers/http_provider.d.ts

@@ -1,26 +0,0 @@
-import type { ApplicationService } from '../src/types.js';
-/**
- * Http Service provider binds the router and the HTTP server to
- * the container.
- */
-export default class HttpServiceProvider {
-    protected app: ApplicationService;
-    constructor(app: ApplicationService);
-    /**
-     * 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;
-}

package/build/providers/http_provider.js

@@ -1,61 +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 { 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
- * the container.
- */
-export default class HttpServiceProvider {
-    app;
-    constructor(app) {
-        this.app = app;
-    }
-    /**
-     * 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
-     */
-    register() {
-        this.registerServer();
-        this.registerRouter();
-        this.registerBodyParserMiddleware();
-    }
-}

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/vinejs/extensions/main.d.ts

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

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

@@ -1,22 +0,0 @@
-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 {};