@adonisjs/assembler 5.6.2 → 5.8.1

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\""
         }
       ]
     },
@@ -259,6 +259,37 @@
         }
       ]
     },
+    "make:suite": {
+      "settings": {},
+      "commandPath": "./commands/Make/Suite",
+      "commandName": "make:suite",
+      "description": "Create a new test suite",
+      "args": [
+        {
+          "type": "string",
+          "propertyName": "suite",
+          "name": "suite",
+          "required": true,
+          "description": "Name of the test suite"
+        },
+        {
+          "type": "string",
+          "propertyName": "location",
+          "name": "location",
+          "required": false,
+          "description": "Path to the test suite directory"
+        }
+      ],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "with-example-test",
+          "propertyName": "withExampleTest",
+          "type": "boolean",
+          "description": "Add a sample test file"
+        }
+      ]
+    },
     "make:test": {
       "settings": {},
       "commandPath": "./commands/Make/Test",
@@ -441,6 +472,12 @@
           "type": "array",
           "description": "Filter tests by ignoring tags"
         },
+        {
+          "name": "tests",
+          "propertyName": "tests",
+          "type": "array",
+          "description": "Filter tests by title"
+        },
         {
           "name": "timeout",
           "propertyName": "timeout",

package/build/commands/Invoke.d.ts

@@ -11,6 +11,10 @@ export default class Configure extends BaseCommand {
      * Use yarn when building for production to install dependencies
      */
     packages: string[];
+    /**
+     * Returns package manager for installing dependencies
+     */
+    private getPackageManager;
     /**
      * Configure encore
      */

package/build/commands/Invoke.js

@@ -29,6 +29,15 @@ class Configure extends standalone_1.BaseCommand {
         super(...arguments);
         this.appType = process.env['ADONIS_CREATE_APP_BOILERPLATE'] || 'web';
     }
+    /**
+     * Returns package manager for installing dependencies
+     */
+    getPackageManager() {
+        if (process.env['ADONIS_CREATE_APP_CLIENT']) {
+            return process.env['ADONIS_CREATE_APP_CLIENT'];
+        }
+        return sink_1.utils.getPackageManager(this.application.appRoot);
+    }
     /**
      * Configure encore
      */
@@ -54,6 +63,7 @@ class Configure extends standalone_1.BaseCommand {
          */
         const pkgFile = new sink_1.files.PackageJsonFile(this.application.appRoot);
         pkgFile.install('@symfony/webpack-encore');
+        pkgFile.useClient(this.getPackageManager());
         const spinner = sink_1.logger.await(sink_1.logger.colors.gray('installing @symfony/webpack-encore'));
         try {
             await pkgFile.commitAsync();
@@ -158,6 +168,7 @@ class Configure extends standalone_1.BaseCommand {
         const pkgFile = new sink_1.files.PackageJsonFile(this.application.appRoot);
         pkgFile.install('@japa/runner');
         pkgFile.install('@japa/preset-adonis');
+        pkgFile.useClient(this.getPackageManager());
         const spinner = sink_1.logger.await(sink_1.logger.colors.gray('installing @japa/runner, @japa/preset-adonis'));
         try {
             await pkgFile.commitAsync();

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/build/commands/Make/Suite.d.ts

@@ -0,0 +1,41 @@
+import { BaseCommand } from '@adonisjs/core/build/standalone';
+/**
+ * Create a new test suite
+ */
+export default class CreateSuite extends BaseCommand {
+    static commandName: string;
+    static description: string;
+    /**
+     * Name of the test suite to be created
+     */
+    suite: string;
+    /**
+     * Glob pattern for the test suite, or only location to the test suite
+     */
+    location: string;
+    /**
+     * Should add a sample test file
+     */
+    withExampleTest: boolean;
+    /**
+     * Get the destination path for the sample test file
+     */
+    private getExampleTestDestinationPath;
+    /**
+     * Generate suite glob pattern based on `location` argument
+     */
+    private generateSuiteGlobPattern;
+    /**
+     * Check if the suite name is already defined in RcFile
+     */
+    private checkIfSuiteExists;
+    /**
+     * Add the new test suite to the AdonisRC File and save it
+     */
+    private addSuiteToRcFile;
+    /**
+     * Add a sample test file to the new suite folder
+     */
+    private createSampleTestFile;
+    run(): Promise<void>;
+}

package/build/commands/Make/Suite.js

@@ -0,0 +1,120 @@
+"use strict";
+/*
+ * @adonisjs/assembler
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const standalone_1 = require("@adonisjs/core/build/standalone");
+const sink_1 = require("@adonisjs/sink");
+const glob_parent_1 = __importDefault(require("glob-parent"));
+const path_1 = require("path");
+/**
+ * Create a new test suite
+ */
+class CreateSuite extends standalone_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        /**
+         * Glob pattern for the test suite, or only location to the test suite
+         */
+        this.location = '';
+        /**
+         * Should add a sample test file
+         */
+        this.withExampleTest = true;
+    }
+    /**
+     * Get the destination path for the sample test file
+     */
+    getExampleTestDestinationPath() {
+        return (0, glob_parent_1.default)(this.location) + '/test.spec.ts';
+    }
+    /**
+     * Generate suite glob pattern based on `location` argument
+     */
+    generateSuiteGlobPattern() {
+        if (!this.location) {
+            this.location = `tests/${this.suite}`;
+        }
+        if (!['*', '.js', '.ts'].find((keyword) => this.location.includes(keyword))) {
+            this.location = `${this.location}/**/*.spec(.ts|.js)`;
+        }
+    }
+    /**
+     * Check if the suite name is already defined in RcFile
+     */
+    checkIfSuiteExists(rcFile) {
+        const existingSuites = rcFile.get('tests.suites') || [];
+        const existingSuitesNames = existingSuites.map((suite) => suite.name);
+        return existingSuitesNames.includes(this.suite);
+    }
+    /**
+     * Add the new test suite to the AdonisRC File and save it
+     */
+    async addSuiteToRcFile() {
+        const rcFile = new sink_1.files.AdonisRcFile(this.application.appRoot);
+        const existingSuites = rcFile.get('tests.suites') || [];
+        if (this.checkIfSuiteExists(rcFile)) {
+            return sink_1.logger.action('update').skipped(`Suite ${this.suite} already exists`);
+        }
+        rcFile.set('tests.suites', [
+            ...existingSuites,
+            {
+                name: this.suite,
+                files: [this.location],
+                timeout: 60 * 1000,
+            },
+        ]);
+        rcFile.commit();
+        sink_1.logger.action('update').succeeded('.adonisrc.json');
+    }
+    /**
+     * Add a sample test file to the new suite folder
+     */
+    createSampleTestFile() {
+        const path = this.getExampleTestDestinationPath();
+        const testFile = new sink_1.files.MustacheFile(this.application.appRoot, path, (0, path_1.join)(__dirname, '../..', 'templates/test.txt'));
+        if (!testFile.exists()) {
+            testFile.apply({}).commit();
+            sink_1.logger.action('create').succeeded(path);
+        }
+    }
+    async run() {
+        this.generateSuiteGlobPattern();
+        await this.addSuiteToRcFile();
+        if (this.withExampleTest) {
+            this.createSampleTestFile();
+        }
+    }
+}
+CreateSuite.commandName = 'make:suite';
+CreateSuite.description = 'Create a new test suite';
+__decorate([
+    standalone_1.args.string({ description: 'Name of the test suite' }),
+    __metadata("design:type", String)
+], CreateSuite.prototype, "suite", void 0);
+__decorate([
+    standalone_1.args.string({ description: 'Path to the test suite directory', required: false }),
+    __metadata("design:type", String)
+], CreateSuite.prototype, "location", void 0);
+__decorate([
+    standalone_1.flags.boolean({ description: 'Add a sample test file' }),
+    __metadata("design:type", Boolean)
+], CreateSuite.prototype, "withExampleTest", void 0);
+exports.default = CreateSuite;

package/build/commands/Test.d.ts

@@ -33,6 +33,10 @@ export default class Test extends BaseCommand {
      * Filter by tags
      */
     ignoreTags: string[];
+    /**
+     * Filter by test title
+     */
+    tests: string[];
     /**
      * Customize tests timeout
      */

package/build/commands/Test.js

@@ -75,6 +75,9 @@ class Test extends standalone_1.BaseCommand {
         if (this.ignoreTags) {
             filters['--ignore-tags'] = this.ignoreTags;
         }
+        if (this.tests) {
+            filters['--tests'] = this.tests;
+        }
         return filters;
     }
     async run() {
@@ -134,6 +137,10 @@ __decorate([
     standalone_1.flags.array({ description: 'Filter tests by ignoring tags' }),
     __metadata("design:type", Array)
 ], Test.prototype, "ignoreTags", void 0);
+__decorate([
+    standalone_1.flags.array({ description: 'Filter tests by title' }),
+    __metadata("design:type", Array)
+], Test.prototype, "tests", void 0);
 __decorate([
     standalone_1.flags.number({ description: 'Customize tests timeout' }),
     __metadata("design:type", Number)

package/build/src/Test/process.js

@@ -35,11 +35,13 @@ class TestProcess {
         this.logger.info('running tests...');
         const filters = Object.keys(this.filters).reduce((result, filter) => {
             const value = this.filters[filter];
-            if (filter !== '_') {
-                result.push(filter);
+            if (filter === '_') {
+                result.push(...value);
+                return result;
             }
+            result.push(filter);
             if (Array.isArray(value)) {
-                result.push(...value);
+                result.push(value.join(','));
             }
             else {
                 result.push(value);

package/build/templates/validator.txt

@@ -1,4 +1,4 @@
-import { schema } from '@ioc:Adonis/Core/Validator'
+import { schema, CustomMessages } from '@ioc:Adonis/Core/Validator'
 import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
 
 export default class {{ filename }} {
@@ -36,5 +36,5 @@ export default class {{ filename }} {
    * }
    *
    */
-  public messages = {}
+  public messages: CustomMessages = {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "5.6.2",
+  "version": "5.8.1",
   "description": "Core commands to compiler and build AdonisJs project",
   "main": "build/ace-manifest.json",
   "files": [
@@ -15,9 +15,9 @@
   "scripts": {
     "mrm": "mrm --preset=@adonisjs/mrm-preset",
     "pretest": "npm run lint",
-    "test": "cross-env FORCE_COLOR=true node .bin/test.js",
+    "test": "cross-env FORCE_COLOR=true node -r @adonisjs/require-ts/build/register ./bin/test.ts",
     "lint": "eslint . --ext=.ts",
-    "clean": "del build",
+    "clean": "del-cli build",
     "compile": "npm run lint && npm run clean && tsc",
     "build": "npm run compile && node build/bin/index.js && copyfiles \"templates/**\" build",
     "commit": "git-cz",
@@ -44,27 +44,30 @@
   },
   "homepage": "https://github.com/adonisjs/assembler#readme",
   "devDependencies": {
-    "@adonisjs/ace": "^11.2.3",
-    "@adonisjs/core": "^5.7.4",
+    "@adonisjs/ace": "^11.3.1",
+    "@adonisjs/core": "^5.8.5",
     "@adonisjs/mrm-preset": "^5.0.3",
+    "@japa/assert": "^1.3.4",
+    "@japa/run-failed-tests": "^1.0.7",
+    "@japa/runner": "^2.0.9",
+    "@japa/spec-reporter": "^1.1.12",
     "@poppinss/dev-utils": "^2.0.3",
-    "@types/node": "^17.0.24",
-    "commitizen": "^4.2.4",
+    "@types/node": "^18.0.6",
+    "commitizen": "^4.2.5",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
-    "del-cli": "^4.0.1",
-    "eslint": "^8.13.0",
+    "del-cli": "^5.0.0",
+    "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-adonis": "^2.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "github-label-sync": "^2.2.0",
-    "husky": "^7.0.4",
-    "japa": "^4.0.0",
+    "husky": "^8.0.1",
     "mrm": "^4.0.0",
-    "np": "^7.6.1",
-    "prettier": "^2.6.2",
-    "typescript": "^4.6.3"
+    "np": "^7.6.2",
+    "prettier": "^2.7.1",
+    "typescript": "^4.7.4"
   },
   "nyc": {
     "exclude": [
@@ -89,16 +92,16 @@
     "anyBranch": false
   },
   "dependencies": {
-    "@adonisjs/application": "^5.2.4",
+    "@adonisjs/application": "^5.2.5",
     "@adonisjs/env": "^3.0.9",
-    "@adonisjs/ioc-transformer": "^2.3.3",
-    "@adonisjs/require-ts": "^2.0.11",
-    "@adonisjs/sink": "^5.2.3",
+    "@adonisjs/ioc-transformer": "^2.3.4",
+    "@adonisjs/require-ts": "^2.0.12",
+    "@adonisjs/sink": "^5.4.0",
     "@poppinss/chokidar-ts": "^3.3.5",
     "@poppinss/cliui": "^3.0.2",
     "@poppinss/utils": "^4.0.4",
     "cpy": "^8.1.2",
-    "emittery": "^0.10.2",
+    "emittery": "^0.11.0",
     "execa": "^5.1.1",
     "fs-extra": "^10.0.1",
     "get-port": "^5.1.1",