@adonisjs/assembler 5.7.0 → 5.8.0

package/build/ace-manifest.json

@@ -223,8 +223,8 @@
         {
           "name": "environment",
           "propertyName": "environment",
-          "type": "string",
-          "description": "Define the environment in which you want to load this file"
+          "type": "array",
+          "description": "Define the preload file environment. Accepted values \"console,web,repl,test\""
         }
       ]
     },

package/build/commands/Make/PreloadFile.d.ts

@@ -1,4 +1,5 @@
 import { BaseGenerator } from './Base';
+import type { AppEnvironments } from '@ioc:Adonis/Core/Application';
 /**
  * Command to make a new preloaded file
  */
@@ -8,10 +9,6 @@ export default class MakePreloadFile extends BaseGenerator {
      */
     protected resourceName: string;
     protected createExact: boolean;
-    /**
-     * List of allowed environments
-     */
-    private allowedEnvironments;
     /**
      * Command name
      */
@@ -21,12 +18,11 @@ export default class MakePreloadFile extends BaseGenerator {
      */
     static description: string;
     name: string;
-    environment: ('console' | 'web' | 'repl')[];
+    environment: AppEnvironments[];
     /**
-     * Validates environments to ensure they are allowed. Especially when
-     * defined as a flag.
+     * Check if the mentioned environments are valid
      */
-    private validateEnvironments;
+    private isValidEnviroment;
     /**
      * Returns the template stub path
      */
@@ -35,7 +31,6 @@ export default class MakePreloadFile extends BaseGenerator {
      * Path to the start directory
      */
     protected getDestinationPath(): string;
-    prepare(): Promise<void>;
     /**
      * Run command
      */

package/build/commands/Make/PreloadFile.js

@@ -47,6 +47,7 @@ const slash_1 = __importDefault(require("slash"));
 const path_1 = require("path");
 const standalone_1 = require("@adonisjs/core/build/standalone");
 const Base_1 = require("./Base");
+const ALLOWED_ENVIRONMENTS = ['console', 'web', 'repl', 'test'];
 /**
  * Command to make a new preloaded file
  */
@@ -54,17 +55,12 @@ class MakePreloadFile extends Base_1.BaseGenerator {
     constructor() {
         super(...arguments);
         this.createExact = true;
-        /**
-         * List of allowed environments
-         */
-        this.allowedEnvironments = ['console', 'web', 'repl'];
     }
     /**
-     * Validates environments to ensure they are allowed. Especially when
-     * defined as a flag.
+     * Check if the mentioned environments are valid
      */
-    validateEnvironments(environments) {
-        return !environments.find((environment) => !this.allowedEnvironments.includes(environment));
+    isValidEnviroment(environment) {
+        return !environment.find((one) => !ALLOWED_ENVIRONMENTS.includes(one));
     }
     /**
      * Returns the template stub path
@@ -78,40 +74,45 @@ class MakePreloadFile extends Base_1.BaseGenerator {
     getDestinationPath() {
         return this.application.rcFile.directories.start || 'start';
     }
-    async prepare() {
-        this.environment = await this.prompt.multiple('Select the environment(s) in which you want to load this file', [
-            {
-                name: 'console',
-                message: 'During ace commands',
-            },
-            {
-                name: 'repl',
-                message: 'During repl session',
-            },
-            {
-                name: 'web',
-                message: 'During HTTP server',
-            },
-        ], {
-            validate(choices) {
-                return choices && choices.length ? true : 'Use space to select the environment';
-            },
-        });
-    }
     /**
      * Run command
      */
     async run() {
-        const environments = typeof this.environment === 'string'
-            ? this.environment.split(',')
-            : this.environment;
         /**
-         * Show error when defined environments are invalid
+         * Ensure the environments are valid when provided via flag
          */
-        if (!this.validateEnvironments(environments)) {
-            this.logger.error(`Invalid environments "${environments}". Only "${this.allowedEnvironments}" are allowed`);
+        if (this.environment && this.environment.length && !this.isValidEnviroment(this.environment)) {
+            this.logger.error(`Invalid environment(s) "${this.environment}". Only "${ALLOWED_ENVIRONMENTS}" are allowed`);
             return;
         }
+        let environments = this.environment;
+        /**
+         * Prompt user to select one or more environments
+         */
+        if (!environments) {
+            environments = await this.prompt.multiple('Select the environment(s) in which you want to load this file', [
+                {
+                    name: 'all',
+                    message: 'Load file in all environments',
+                },
+                {
+                    name: 'console',
+                    message: 'Environment for ace commands',
+                },
+                {
+                    name: 'repl',
+                    message: 'Environment for the REPL session',
+                },
+                {
+                    name: 'web',
+                    message: 'Environment for HTTP requests',
+                },
+                {
+                    name: 'test',
+                    message: 'Environment for the test process',
+                },
+            ]);
+        }
         /**
          * Generate resource file
          */
@@ -126,11 +127,11 @@ class MakePreloadFile extends Base_1.BaseGenerator {
         const { files } = await Promise.resolve().then(() => __importStar(require('@adonisjs/sink')));
         const relativePath = file.toJSON().relativepath;
         const rcFile = new files.AdonisRcFile(this.application.appRoot);
-        if (environments && environments.length) {
-            rcFile.setPreload(`./${(0, slash_1.default)(relativePath).replace((0, path_1.extname)(relativePath), '')}`, environments);
+        if (!environments || !environments.length || environments.includes('all')) {
+            rcFile.setPreload(`./${(0, slash_1.default)(relativePath).replace((0, path_1.extname)(relativePath), '')}`);
         }
         else {
-            rcFile.setPreload(`./${(0, slash_1.default)(relativePath).replace((0, path_1.extname)(relativePath), '')}`);
+            rcFile.setPreload(`./${(0, slash_1.default)(relativePath).replace((0, path_1.extname)(relativePath), '')}`, environments);
         }
         rcFile.commit();
     }
@@ -148,8 +149,8 @@ __decorate([
     __metadata("design:type", String)
 ], MakePreloadFile.prototype, "name", void 0);
 __decorate([
-    standalone_1.flags.string({
-        description: 'Define the environment in which you want to load this file',
+    standalone_1.flags.array({
+        description: `Define the preload file environment. Accepted values "${ALLOWED_ENVIRONMENTS}"`,
     }),
     __metadata("design:type", Array)
 ], MakePreloadFile.prototype, "environment", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "description": "Core commands to compiler and build AdonisJs project",
   "main": "build/ace-manifest.json",
   "files": [
@@ -45,20 +45,20 @@
   "homepage": "https://github.com/adonisjs/assembler#readme",
   "devDependencies": {
     "@adonisjs/ace": "^11.3.1",
-    "@adonisjs/core": "^5.8.2",
+    "@adonisjs/core": "^5.8.3",
     "@adonisjs/mrm-preset": "^5.0.3",
     "@japa/assert": "^1.3.4",
     "@japa/run-failed-tests": "^1.0.7",
-    "@japa/runner": "^2.0.8",
+    "@japa/runner": "^2.0.9",
     "@japa/spec-reporter": "^1.1.12",
     "@poppinss/dev-utils": "^2.0.3",
-    "@types/node": "^17.0.35",
+    "@types/node": "^18.0.0",
     "commitizen": "^4.2.4",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "del-cli": "^4.0.1",
-    "eslint": "^8.16.0",
+    "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-adonis": "^2.1.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -66,8 +66,8 @@
     "husky": "^8.0.1",
     "mrm": "^4.0.0",
     "np": "^7.6.1",
-    "prettier": "^2.6.2",
-    "typescript": "^4.6.3"
+    "prettier": "^2.7.0",
+    "typescript": "^4.7.3"
   },
   "nyc": {
     "exclude": [
@@ -92,7 +92,7 @@
     "anyBranch": false
   },
   "dependencies": {
-    "@adonisjs/application": "^5.2.4",
+    "@adonisjs/application": "^5.2.5",
     "@adonisjs/env": "^3.0.9",
     "@adonisjs/ioc-transformer": "^2.3.4",
     "@adonisjs/require-ts": "^2.0.12",