@adonisjs/core 6.1.5-16 → 6.1.5-18

package/build/commands/configure.d.ts

@@ -1,5 +1,6 @@
+import type { AddMiddlewareEntry, EnvValidationDefinition } from '@adonisjs/assembler/types';
+import type { CodeTransformer } from '@adonisjs/assembler/code_transformer';
 import { BaseCommand } from '../modules/ace/main.js';
-import { RcFileEditor } from '@adonisjs/application/rc_file_editor';
 /**
  * The configure command is used to configure packages after installation
  */
@@ -22,10 +23,18 @@ export default class Configure extends BaseCommand {
      * Define one or more environment variables
      */
     defineEnvVariables(environmentVariables: Record<string, number | string | boolean>): Promise<void>;
+    /**
+     * Define validations for the environment variables
+     */
+    defineEnvValidations(validations: EnvValidationDefinition): Promise<void>;
+    /**
+     * Define validations for the environment variables
+     */
+    registerMiddleware(stack: 'server' | 'router' | 'named', middleware: AddMiddlewareEntry[]): Promise<void>;
     /**
      * Update rcFile
      */
-    updateRcFile(callback: (rcFileEditor: RcFileEditor) => Promise<void> | void): Promise<void>;
+    updateRcFile(...params: Parameters<CodeTransformer['updateRcFile']>): Promise<void>;
     /**
      * Install packages using the correct package manager
      * You can specify version of each package by setting it in the

package/build/commands/configure.js

@@ -13,16 +13,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { slash } from '@poppinss/utils';
-import { installPackage, detectPackageManager } from '@antfu/install-pkg';
 import { EnvEditor } from '@adonisjs/env/editor';
+import { installPackage, detectPackageManager } from '@antfu/install-pkg';
 import { args, BaseCommand, flags } from '../modules/ace/main.js';
-import { RcFileEditor } from '@adonisjs/application/rc_file_editor';
 /**
  * The configure command is used to configure packages after installation
  */
 export default class Configure extends BaseCommand {
     static commandName = 'configure';
     static description = 'Configure a package post installation';
+    /**
+     * Flag to know if assembler is installed as a
+     * peer dependency or not.
+     */
+    #isAssemblerInstalled;
+    /**
+     * Reference to lazily imported assembler code transformer
+     */
+    #codeTransformer;
     /**
      * Returns the package main exports
      */
@@ -47,6 +55,15 @@ export default class Configure extends BaseCommand {
                 return `${this.colors.yellow(`pnpm add${devFlag}`)} ${packages.join(' ')}`;
         }
     }
+    /**
+     * Lazily installs assembler
+     */
+    async #installAssembler() {
+        if (this.#isAssemblerInstalled === undefined) {
+            this.#codeTransformer = await import('@adonisjs/assembler/code_transformer');
+            this.#isAssemblerInstalled = !!this.#codeTransformer;
+        }
+    }
     /**
      * Publish a stub file to the user project
      */
@@ -69,26 +86,70 @@ export default class Configure extends BaseCommand {
      * Define one or more environment variables
      */
     async defineEnvVariables(environmentVariables) {
-        const logs = [];
         const editor = new EnvEditor(this.app.appRoot);
         await editor.load();
         Object.keys(environmentVariables).forEach((key) => {
             const value = environmentVariables[key];
             editor.add(key, value);
-            logs.push(`               ${this.colors.dim(`${key}=${value}`)}`);
         });
         await editor.save();
         this.logger.action('update .env file').succeeded();
-        this.logger.log(logs.join('\n'));
+    }
+    /**
+     * Define validations for the environment variables
+     */
+    async defineEnvValidations(validations) {
+        await this.#installAssembler();
+        if (!this.#codeTransformer) {
+            this.logger.warning('Cannot update "start/env.ts" file. Install "@adonisjs/assembler" to modify source files');
+            return;
+        }
+        const transformer = new this.#codeTransformer.CodeTransformer(this.app.appRoot);
+        const action = this.logger.action('update start/env.ts file');
+        try {
+            await transformer.defineEnvValidations(validations);
+            action.succeeded();
+        }
+        catch (error) {
+            action.failed(error.message);
+        }
+    }
+    /**
+     * Define validations for the environment variables
+     */
+    async registerMiddleware(stack, middleware) {
+        await this.#installAssembler();
+        if (!this.#codeTransformer) {
+            this.logger.warning('Cannot update "start/kernel.ts" file. Install "@adonisjs/assembler" to modify source files');
+            return;
+        }
+        const transformer = new this.#codeTransformer.CodeTransformer(this.app.appRoot);
+        const action = this.logger.action('update start/kernel.ts file');
+        try {
+            await transformer.addMiddlewareToStack(stack, middleware);
+            action.succeeded();
+        }
+        catch (error) {
+            action.failed(error.message);
+        }
     }
     /**
      * Update rcFile
      */
-    async updateRcFile(callback) {
-        const rcFileEditor = new RcFileEditor(this.app.makeURL('.adonisrc.json'), this.app.rcFile.raw);
-        await callback(rcFileEditor);
-        await rcFileEditor.save();
-        this.logger.action('update .adonisrc.json file').succeeded();
+    async updateRcFile(...params) {
+        await this.#installAssembler();
+        if (!this.#codeTransformer) {
+            this.logger.warning('Cannot update "adonisrc.ts" file. Install "@adonisjs/assembler" to modify source files');
+            return;
+        }
+        const action = this.logger.action('update adonisrc.ts file');
+        try {
+            await new this.#codeTransformer.CodeTransformer(this.app.appRoot).updateRcFile(...params);
+            action.succeeded();
+        }
+        catch (error) {
+            action.failed(error.message);
+        }
     }
     /**
      * Install packages using the correct package manager

package/build/commands/main.d.ts

@@ -0,0 +1,4 @@
+import { CommandMetaData, Command } from '@adonisjs/ace/types';
+
+export function getMetaData(): Promise<CommandMetaData[]>
+export function getCommand(metaData: CommandMetaData): Promise<Command | null>

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

@@ -1,6 +1,10 @@
 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
  */
@@ -37,8 +41,4 @@ 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>>;
 }
-declare module '@adonisjs/http-server' {
-    interface Request extends RequestValidator {
-    }
-}
 export {};

package/build/providers/edge_provider.js

@@ -6,6 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import { bridgeEdgeAdonisJS } from '../src/bindings/edge.js';
 export default class EdgeServiceProvider {
     app;
     constructor(app) {
@@ -15,7 +16,6 @@ export default class EdgeServiceProvider {
      * Bridge AdonisJS and Edge
      */
     async boot() {
-        const { bridgeEdgeAdonisJS } = await import('../src/bindings/edge.js');
         bridgeEdgeAdonisJS(this.app, await this.app.container.make('router'));
     }
 }

package/build/providers/vinejs_provider.d.ts

@@ -1,9 +1,4 @@
-import type { ApplicationService } from '../src/types.js';
+import '../src/bindings/vinejs.js';
+import '../modules/http/request_validator.js';
 export default class VineJSServiceProvider {
-    protected app: ApplicationService;
-    constructor(app: ApplicationService);
-    /**
-     * Registering AdonisJS specific VineJS rules
-     */
-    boot(): Promise<void>;
 }

package/build/providers/vinejs_provider.js

@@ -6,16 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import '../src/bindings/vinejs.js';
+import '../modules/http/request_validator.js';
 export default class VineJSServiceProvider {
-    app;
-    constructor(app) {
-        this.app = app;
-    }
-    /**
-     * Registering AdonisJS specific VineJS rules
-     */
-    async boot() {
-        await import('../modules/http/request_validator.js');
-        await import('../src/bindings/vinejs.js');
-    }
 }

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/core",
   "description": "Core of AdonisJS",
-  "version": "6.1.5-16",
+  "version": "6.1.5-18",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -76,7 +76,7 @@
     "index:commands": "node --loader=ts-node/esm toolkit/main.js index build/commands"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^6.1.3-17",
+    "@adonisjs/assembler": "^6.1.3-18",
     "@adonisjs/eslint-config": "^1.1.8",
     "@adonisjs/prettier-config": "^1.1.8",
     "@adonisjs/tsconfig": "^1.1.8",
@@ -111,7 +111,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@adonisjs/ace": "^12.3.1-9",
+    "@adonisjs/ace": "^12.3.1-10",
     "@adonisjs/application": "^7.1.2-11",
     "@adonisjs/bodyparser": "^9.3.2-7",
     "@adonisjs/config": "^4.2.1-3",
@@ -138,7 +138,7 @@
     "youch-terminal": "^2.2.2"
   },
   "peerDependencies": {
-    "@adonisjs/assembler": "^6.1.3-17",
+    "@adonisjs/assembler": "^6.1.3-18",
     "@vinejs/vine": "^1.6.0",
     "argon2": "^0.30.3",
     "bcrypt": "^5.0.1",