@adonisjs/core 6.1.1-0 → 6.1.3-0

package/build/commands/build.d.ts

@@ -0,0 +1,10 @@
+import { BaseCommand } from '../modules/ace/main.js';
+export default class Build extends BaseCommand {
+    #private;
+    static commandName: string;
+    static description: string;
+    watch?: boolean;
+    ignoreTsErrors?: boolean;
+    packageManager?: 'npm' | 'pnpm' | 'yarn';
+    run(): Promise<void>;
+}

package/build/commands/build.js

@@ -0,0 +1,72 @@
+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);
+};
+import { BaseCommand, flags } from '../modules/ace/main.js';
+export default class Build extends BaseCommand {
+    static commandName = 'build';
+    static description = 'Build application for production by compiling frontend assets and TypeScript source to JavaScript';
+    async #importAssembler() {
+        try {
+            return await this.app.import('@adonisjs/assembler');
+        }
+        catch {
+            this.logger.error([
+                'Unable to import "@adonisjs/assembler"',
+                '',
+                'The "@adonisjs/assembler" package is a development dependency and therefore you should use the build command during development only.',
+                '',
+                'If you are using the build command inside a CI or with a deployment platform, make sure the NODE_ENV is set to "development"',
+            ].join('\n'));
+            this.exitCode = 1;
+        }
+    }
+    async #importTypeScript() {
+        try {
+            return await this.app.import('typescript');
+        }
+        catch {
+            this.logger.error([
+                'Unable to import "typescript"',
+                '',
+                'The "typescript" package is a development dependency and therefore you should use the build command during development only.',
+                '',
+                'If you are using the build command inside a CI or with a deployment platform, make sure the NODE_ENV is set to "development"',
+            ].join('\n'));
+            this.exitCode = 1;
+        }
+    }
+    async run() {
+        const assembler = await this.#importAssembler();
+        const ts = await this.#importTypeScript();
+        if (!assembler || !ts) {
+            return;
+        }
+        const bundler = new assembler.Bundler(this.app.appRoot, ts.default, {});
+        bundler.setLogger(this.logger);
+        const stopOnError = this.ignoreTsErrors === true ? false : true;
+        const builtSuccessfully = await bundler.bundle(stopOnError, this.packageManager);
+        if (!builtSuccessfully) {
+            this.exitCode = 1;
+        }
+    }
+}
+__decorate([
+    flags.boolean({ description: 'Watch filesystem and restart the HTTP server on file change' }),
+    __metadata("design:type", Boolean)
+], Build.prototype, "watch", void 0);
+__decorate([
+    flags.boolean({ description: 'Ignore TypeScript errors and continue with the build process' }),
+    __metadata("design:type", Boolean)
+], Build.prototype, "ignoreTsErrors", void 0);
+__decorate([
+    flags.string({
+        description: 'Select the package manager you want to use to install production dependencies',
+    }),
+    __metadata("design:type", String)
+], Build.prototype, "packageManager", void 0);

package/build/commands/commands.json

@@ -1 +1 @@
-{"commands":[{"commandName":"configure","description":"Configure a package post installation","help":"","namespace":null,"aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Package name","type":"string"}],"options":{},"filePath":"configure.js"},{"commandName":"eject","description":"Eject scaffolding stubs to your application root","help":"","namespace":null,"aliases":[],"flags":[{"name":"pkg","flagName":"pkg","required":false,"type":"string","description":"Mention package name for searching stubs","default":"@adonisjs/core"}],"args":[{"name":"stubPath","argumentName":"stub-path","required":true,"description":"Path to the stubs directory or a single stub file","type":"string"}],"options":{},"filePath":"eject.js"},{"commandName":"generate:key","description":"Generate a secure random application key","help":"","namespace":"generate","aliases":[],"flags":[{"name":"show","flagName":"show","required":false,"type":"boolean","description":"Display the key on the terminal, instead of writing it to .env file"},{"name":"force","flagName":"force","required":false,"type":"boolean","description":"Force update .env file in production environment"}],"args":[],"options":{},"filePath":"generate_key.js"},{"commandName":"make:command","description":"Create a new ace command class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the command","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/command.js"},{"commandName":"make:controller","description":"Create a new HTTP controller class","help":"","namespace":"make","aliases":[],"flags":[{"name":"singular","flagName":"singular","required":false,"type":"boolean","description":"Convert controller class and file name to its singular form","alias":"r"},{"name":"resource","flagName":"resource","required":false,"type":"boolean","description":"Generate controller with resource actions","alias":"r"},{"name":"api","flagName":"api","required":false,"type":"boolean","description":"Generate controller with api resource actions","alias":"a"}],"args":[{"name":"name","argumentName":"name","required":true,"description":"The name of the controller","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/controller.js"},{"commandName":"make:event","description":"Create a new event class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the event","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/event.js"},{"commandName":"make:listener","description":"Create a new event listener class","help":"","namespace":"make","aliases":[],"flags":[{"name":"event","flagName":"event","required":false,"type":"string","description":"Generate an event class alongside the listener","alias":"e"}],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the listener","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/listener.js"},{"commandName":"make:middleware","description":"Create a new middleware class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the middleware","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/middleware.js"},{"commandName":"make:provider","description":"Create a new service provider class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the provider","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/provider.js"}],"version":1}
+{"commands":[{"commandName":"build","description":"Build application for production by compiling frontend assets and TypeScript source to JavaScript","help":"","namespace":null,"aliases":[],"flags":[{"name":"watch","flagName":"watch","required":false,"type":"boolean","description":"Watch filesystem and restart the HTTP server on file change"},{"name":"ignoreTsErrors","flagName":"ignore-ts-errors","required":false,"type":"boolean","description":"Ignore TypeScript errors and continue with the build process"},{"name":"packageManager","flagName":"package-manager","required":false,"type":"string","description":"Select the package manager you want to use to install production dependencies"}],"args":[],"options":{},"filePath":"build.js"},{"commandName":"configure","description":"Configure a package post installation","help":"","namespace":null,"aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Package name","type":"string"}],"options":{},"filePath":"configure.js"},{"commandName":"eject","description":"Eject scaffolding stubs to your application root","help":"","namespace":null,"aliases":[],"flags":[{"name":"pkg","flagName":"pkg","required":false,"type":"string","description":"Mention package name for searching stubs","default":"@adonisjs/core"}],"args":[{"name":"stubPath","argumentName":"stub-path","required":true,"description":"Path to the stubs directory or a single stub file","type":"string"}],"options":{},"filePath":"eject.js"},{"commandName":"generate:key","description":"Generate a secure random application key","help":"","namespace":"generate","aliases":[],"flags":[{"name":"show","flagName":"show","required":false,"type":"boolean","description":"Display the key on the terminal, instead of writing it to .env file"},{"name":"force","flagName":"force","required":false,"type":"boolean","description":"Force update .env file in production environment"}],"args":[],"options":{},"filePath":"generate_key.js"},{"commandName":"make:command","description":"Create a new ace command class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the command","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/command.js"},{"commandName":"make:controller","description":"Create a new HTTP controller class","help":"","namespace":"make","aliases":[],"flags":[{"name":"singular","flagName":"singular","required":false,"type":"boolean","description":"Convert controller class and file name to its singular form","alias":"r"},{"name":"resource","flagName":"resource","required":false,"type":"boolean","description":"Generate controller with resource actions","alias":"r"},{"name":"api","flagName":"api","required":false,"type":"boolean","description":"Generate controller with api resource actions","alias":"a"}],"args":[{"name":"name","argumentName":"name","required":true,"description":"The name of the controller","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/controller.js"},{"commandName":"make:event","description":"Create a new event class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the event","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/event.js"},{"commandName":"make:listener","description":"Create a new event listener class","help":"","namespace":"make","aliases":[],"flags":[{"name":"event","flagName":"event","required":false,"type":"string","description":"Generate an event class alongside the listener","alias":"e"}],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the listener","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/listener.js"},{"commandName":"make:middleware","description":"Create a new middleware class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the middleware","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/middleware.js"},{"commandName":"make:provider","description":"Create a new service provider class","help":"","namespace":"make","aliases":[],"flags":[],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the provider","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make/provider.js"},{"commandName":"serve","description":"Start the development HTTP server along with the file watcher to perform restarts on file change","help":"","namespace":null,"aliases":[],"flags":[{"name":"watch","flagName":"watch","required":false,"type":"boolean","description":"Watch filesystem and restart the HTTP server on file change"},{"name":"poll","flagName":"poll","required":false,"type":"boolean","description":"Use polling to detect filesystem changes"}],"args":[],"options":{"staysAlive":true},"filePath":"serve.js"}],"version":1}

package/build/commands/serve.d.ts

@@ -0,0 +1,11 @@
+import { BaseCommand } from '../modules/ace/main.js';
+import { CommandOptions } from '../types/ace.js';
+export default class Serve extends BaseCommand {
+    #private;
+    static commandName: string;
+    static description: string;
+    static options: CommandOptions;
+    watch?: boolean;
+    poll?: boolean;
+    run(): Promise<void>;
+}

package/build/commands/serve.js

@@ -0,0 +1,83 @@
+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);
+};
+import { BaseCommand, flags } from '../modules/ace/main.js';
+export default class Serve extends BaseCommand {
+    static commandName = 'serve';
+    static description = 'Start the development HTTP server along with the file watcher to perform restarts on file change';
+    static options = {
+        staysAlive: true,
+    };
+    async #importAssembler() {
+        try {
+            return await this.app.import('@adonisjs/assembler');
+        }
+        catch {
+            this.logger.error([
+                'Unable to import "@adonisjs/assembler"',
+                '',
+                'The "@adonisjs/assembler" package is a development dependency and therefore you should use the serve command during development only.',
+                '',
+                'If you are running your application in production, then use "node bin/server.js" command to start the HTTP server',
+            ].join('\n'));
+            this.exitCode = 1;
+        }
+    }
+    async #importTypeScript() {
+        try {
+            return await this.app.import('typescript');
+        }
+        catch {
+            this.logger.error([
+                'Unable to import "typescript"',
+                '',
+                'The "typescript" package is a development dependency and therefore you should use the serve command during development only.',
+                '',
+                'If you are running your application in production, then use "node bin/server.js" command to start the HTTP server',
+            ].join('\n'));
+            this.exitCode = 1;
+        }
+    }
+    async run() {
+        const assembler = await this.#importAssembler();
+        if (!assembler) {
+            return;
+        }
+        const devServer = new assembler.DevServer(this.app.appRoot, {
+            nodeArgs: this.parsed.nodeArgs,
+            scriptArgs: [],
+            metaFiles: this.app.rcFile.metaFiles,
+        });
+        devServer.setLogger(this.logger);
+        devServer.onClose((exitCode) => {
+            this.exitCode = exitCode;
+        });
+        devServer.onError(() => {
+            this.exitCode = 1;
+        });
+        if (this.watch) {
+            const ts = await this.#importTypeScript();
+            if (!ts) {
+                return;
+            }
+            await devServer.startAndWatch(ts.default, { poll: this.poll || false });
+        }
+        else {
+            await devServer.start();
+        }
+    }
+}
+__decorate([
+    flags.boolean({ description: 'Watch filesystem and restart the HTTP server on file change' }),
+    __metadata("design:type", Boolean)
+], Serve.prototype, "watch", void 0);
+__decorate([
+    flags.boolean({ description: 'Use polling to detect filesystem changes' }),
+    __metadata("design:type", Boolean)
+], Serve.prototype, "poll", void 0);

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

@@ -0,0 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
+export declare function aceShell(cwd: URL): {
+    handle(argv: string[]): Promise<void>;
+};

package/build/modules/ace/shell.js

@@ -0,0 +1,29 @@
+const DEFAULT_NODE_ARGS = [
+    '--loader=ts-node/esm',
+    '--no-warnings',
+    '--experimental-import-meta-resolve',
+];
+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) {
+                console.error(error);
+                process.exitCode = 1;
+            }
+        },
+    };
+}

package/build/stubs/make/command/main.stub

@@ -5,7 +5,7 @@
 to: {{ app.commandsPath(entity.path, commandFileName) }}
 ---
 import { BaseCommand } from '@adonisjs/core/ace'
-import { CommandOptions } from '@adonisjs/core/types'
+import { CommandOptions } from '@adonisjs/core/types/ace'
 
 export default class {{ commandName }} extends BaseCommand {
   static commandName = '{{ commandTerminalName }}'
@@ -14,6 +14,6 @@ export default class {{ commandName }} extends BaseCommand {
   static options: CommandOptions = {}
 
   async run() {
-    this.info('Hello world from "{{ commandName }}"')
+    this.logger.info('Hello world from "{{ commandName }}"')
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/core",
-  "version": "6.1.1-0",
+  "version": "6.1.3-0",
   "description": "Core of AdonisJS",
   "main": "build/index.js",
   "type": "module",
@@ -48,6 +48,7 @@
     "./services/logger": "./build/services/logger.js",
     "./services/router": "./build/services/router.js",
     "./services/server": "./build/services/server.js",
+    "./services/test_utils": "./build/services/test_utils.js",
     "./providers/app_provider": "./build/providers/app_provider.js",
     "./providers/hash_provider": "./build/providers/hash_provider.js",
     "./providers/http_provider": "./build/providers/http_provider.js",
@@ -57,6 +58,7 @@
     "./helpers/types": "./build/src/helpers/types.js",
     "./helpers/string": "./build/src/helpers/string.js",
     "./helpers/string_builder": "./build/src/helpers/string_builder.js",
+    "./ace/shell": "./build/modules/ace/shell.js",
     "./ace": "./build/modules/ace/main.js",
     "./bodyparser": "./build/modules/bodyparser/main.js",
     "./bodyparser_middleware": "./build/modules/bodyparser/bodyparser_middleware.js",
@@ -97,6 +99,7 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
+    "@adonisjs/assembler": "^6.1.0-0",
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
     "@japa/assert": "^1.4.1",
@@ -106,9 +109,9 @@
     "@japa/run-failed-tests": "^1.1.1",
     "@japa/runner": "^2.5.0",
     "@japa/spec-reporter": "^1.3.3",
-    "@swc/core": "^1.3.35",
+    "@swc/core": "^1.3.37",
     "@types/fs-extra": "^11.0.1",
-    "@types/node": "^18.14.0",
+    "@types/node": "^18.14.2",
     "@types/pretty-hrtime": "^1.0.1",
     "@types/sinon": "^10.0.13",
     "@types/supertest": "^2.0.12",
@@ -117,7 +120,7 @@
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
@@ -135,7 +138,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@adonisjs/ace": "^12.2.0-0",
+    "@adonisjs/ace": "^12.3.0-0",
     "@adonisjs/application": "^7.1.0-0",
     "@adonisjs/bodyparser": "^9.3.0-0",
     "@adonisjs/config": "^4.2.0-0",
@@ -152,12 +155,14 @@
     "@sindresorhus/is": "^5.3.0",
     "@types/he": "^1.2.0",
     "cuid": "^3.0.0",
+    "execa": "^7.0.0",
     "he": "^1.2.0",
     "pretty-hrtime": "^1.0.3",
     "youch": "^3.2.3",
     "youch-terminal": "^2.2.0"
   },
   "peerDependencies": {
+    "@adonisjs/assembler": "^6.1.0-0",
     "argon2": "^0.30.3",
     "bcrypt": "^5.0.1"
   },
@@ -167,6 +172,9 @@
     },
     "bcrypt": {
       "optional": true
+    },
+    "@adonisjs/assembler": {
+      "optional": true
     }
   },
   "repository": {