@adonisjs/core 5.4.1 → 5.5.1

package/build/src/utils/index.js

@@ -8,16 +8,11 @@
  * file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsHook = exports.isMissingModuleError = void 0;
+exports.loadAceCommands = exports.createHttpServer = exports.registerTsHook = void 0;
+const path_1 = require("path");
+const http_1 = require("http");
+const ace_1 = require("@adonisjs/ace");
 const helpers_1 = require("@poppinss/utils/build/helpers");
-/**
- * Helper to know if error belongs to a missing module
- * error
- */
-function isMissingModuleError(error) {
-    return ['MODULE_NOT_FOUND', 'ENOENT'].includes(error.code);
-}
-exports.isMissingModuleError = isMissingModuleError;
 /**
  * Registers the ts hook to compile typescript code within the memory
  */
@@ -26,10 +21,62 @@ function registerTsHook(appRoot) {
         require((0, helpers_1.resolveFrom)(appRoot, '@adonisjs/assembler/build/src/requireHook')).default(appRoot);
     }
     catch (error) {
-        if (isMissingModuleError(error)) {
+        if (['MODULE_NOT_FOUND', 'ENOENT'].includes(error.code)) {
             throw new Error('AdonisJS requires "@adonisjs/assembler" in order to run typescript source directly');
         }
         throw error;
     }
 }
 exports.registerTsHook = registerTsHook;
+/**
+ * Creates the AdonisJS HTTP server. The method is abstracted to be used by
+ * test utils and the HTTP server process both.
+ */
+function createHttpServer(application, server, callback) {
+    /**
+     * Optimizing the server by pre-compiling routes and middleware
+     */
+    application.logger.trace('optimizing http server handler');
+    server.optimize();
+    /**
+     * Bind exception handler to handle exceptions occured during HTTP requests.
+     */
+    if (application.exceptionHandlerNamespace) {
+        application.logger.trace('binding %s exception handler', application.exceptionHandlerNamespace);
+        server.errorHandler(application.exceptionHandlerNamespace);
+    }
+    const handler = server.handle.bind(server);
+    server.instance = callback ? callback(handler) : (0, http_1.createServer)(handler);
+}
+exports.createHttpServer = createHttpServer;
+/**
+ * Helper function to optionally resolve files from a given path
+ */
+function resolve(fromPath, resolvePath, onMatch) {
+    try {
+        onMatch((0, helpers_1.resolveFrom)(fromPath, resolvePath));
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Loads ace commands from the assembler manifest and the app manifest files
+ */
+function loadAceCommands(application, ace) {
+    const manifestFiles = [];
+    resolve(application.appRoot, '@adonisjs/assembler/build/ace-manifest.json', (manifestAbsPath) => {
+        const basePath = (0, path_1.join)(manifestAbsPath, '../');
+        manifestFiles.push({ manifestAbsPath, basePath });
+    });
+    resolve(application.appRoot, './ace-manifest.json', (manifestAbsPath) => {
+        const basePath = (0, path_1.join)(manifestAbsPath, '../');
+        manifestFiles.push({ manifestAbsPath, basePath });
+    });
+    /**
+     * Load commands using manifest loader
+     */
+    ace.useManifest(new ace_1.ManifestLoader(manifestFiles));
+    return ace.preloadManifest();
+}
+exports.loadAceCommands = loadAceCommands;

package/build/standalone.js

@@ -9,7 +9,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/templates/contracts/env.txt

@@ -18,7 +18,7 @@ declare module '@ioc:Adonis/Core/Env' {
   |
   */
 
-	type CustomTypes = typeof import("../env").default;
-  interface EnvTypes extends CustomTypes {
-  }
+	type CustomTypes = typeof import('../env').default
+	interface EnvTypes extends CustomTypes {
+	}
 }

package/build/templates/env.txt

@@ -15,11 +15,11 @@
 import Env from '@ioc:Adonis/Core/Env'
 
 export default Env.rules({
-	PORT: Env.schema.number(),
-	HOST: Env.schema.string({ format: 'host' }),
-	APP_KEY: Env.schema.string(),
-	APP_NAME: Env.schema.string(),
-	NODE_ENV: Env.schema.enum(['development', 'production', 'testing'] as const),
+  PORT: Env.schema.number(),
+  HOST: Env.schema.string({ format: 'host' }),
+  APP_KEY: Env.schema.string(),
+  APP_NAME: Env.schema.string(),
+  NODE_ENV: Env.schema.enum(['development', 'production', 'testing'] as const),
   /**
    * Feel free to change the enum options to the actual disk names
    * you have defined inside the "contracts/drive.ts" file.

package/build/templates/tests/bootstrap.txt

@@ -0,0 +1,71 @@
+/**
+ * File source: https://bit.ly/3BUZKtR
+ *
+ * Feel free to let us know via PR, if you find something broken in this contract
+ * file.
+ */
+
+import { assert } from '@japa/assert'
+import type { Suite } from '@japa/core'
+import { specReporter } from '@japa/spec-reporter'
+import TestUtils from '@ioc:Adonis/Core/TestUtils'
+import type { PluginFn, RunnerHooksHandler, TestContext, ReporterContract } from '@japa/runner'
+
+/*
+|--------------------------------------------------------------------------
+| Japa Plugins
+|--------------------------------------------------------------------------
+|
+| Japa plugins allows you to add additional features to Japa. By default
+| we register the assertion plugin.
+|
+| Feel free to remove existing plugins or add more.
+|
+*/
+export const plugins: PluginFn[] = [assert()]
+
+/*
+|--------------------------------------------------------------------------
+| Japa Reporters
+|--------------------------------------------------------------------------
+|
+| Japa reporters displays/saves the progress of tests as they are executed.
+| By default, we register the spec reporter to show a detailed report
+| of tests on the terminal.
+|
+*/
+export const reporters: ReporterContract[] = [specReporter()]
+
+/*
+|--------------------------------------------------------------------------
+| Runner hooks
+|--------------------------------------------------------------------------
+|
+| Runner hooks are executed after booting the AdonisJS app and
+| before the test files are imported.
+|
+| You can perform actions like starting the HTTP server or running migrations
+| within the runner hooks
+|
+*/
+export const runnerHooks: { setup: RunnerHooksHandler[]; teardown: RunnerHooksHandler[] } = {
+  setup: [() => TestUtils.ace().loadCommands()],
+  teardown: [],
+}
+
+/*
+|--------------------------------------------------------------------------
+| Configure individual suites
+|--------------------------------------------------------------------------
+|
+| The configureSuite method gets called for every test suite registered
+| within ".adonisrc.json" file.
+|
+| You can use this method to configure suites. For example: Only start
+| the HTTP server when it is a feature suite.
+*/
+export const configureSuite = (suite: Suite<TestContext>) => {
+  if (suite.name === 'feature') {
+    suite.setup(() => TestUtils.httpServer().start())
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adonisjs/core",
-	"version": "5.4.1",
+	"version": "5.5.1",
 	"description": "Core of AdonisJS",
 	"exports": {
 		".": {
@@ -34,12 +34,12 @@
 	"scripts": {
 		"mrm": "mrm --preset=@adonisjs/mrm-preset",
 		"pretest": "npm run lint",
-		"test": "node japaFile.js",
-		"clean": "del build",
+		"test": "node -r @adonisjs/require-ts/build/register bin/test.ts",
+		"clean": "del-cli build",
 		"compile": "npm run lint && npm run clean && tsc && copyfiles templates/**/* templates/* build",
 		"build": "npm run compile",
 		"commit": "git-cz",
-		"release": "np",
+		"release": "np --message=\"chore(release): %s\"",
 		"version": "npm run build",
 		"prepublishOnly": "npm run build",
 		"lint": "eslint . --ext=.ts",
@@ -63,35 +63,40 @@
 	},
 	"homepage": "https://github.com/adonisjs/core#readme",
 	"devDependencies": {
-		"@adonisjs/assembler": "^5.3.8",
-		"@adonisjs/mrm-preset": "^4.1.2",
-		"@adonisjs/repl": "^3.1.7",
-		"@adonisjs/require-ts": "^2.0.8",
-		"@adonisjs/sink": "^5.2.0",
-		"@poppinss/dev-utils": "^1.1.5",
-		"@types/node": "^16.11.9",
+		"@adonisjs/assembler": "^5.4.1",
+		"@adonisjs/mrm-preset": "^5.0.2",
+		"@adonisjs/repl": "^3.1.9",
+		"@adonisjs/require-ts": "^2.0.10",
+		"@adonisjs/sink": "^5.2.2",
+		"@japa/assert": "^1.2.3",
+		"@japa/run-failed-tests": "^1.0.3",
+		"@japa/runner": "^1.2.0",
+		"@japa/spec-reporter": "^1.1.7",
+		"@poppinss/dev-utils": "^2.0.2",
+		"@types/node": "^17.0.21",
 		"@types/supertest": "^2.0.11",
 		"clear-module": "^4.1.2",
+		"commitizen": "^4.2.4",
 		"copyfiles": "^2.4.1",
+		"cz-conventional-changelog": "^3.3.0",
 		"del-cli": "^4.0.1",
-		"eslint": "^8.3.0",
-		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-adonis": "^2.0.0",
+		"eslint": "^8.10.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-adonis": "^2.1.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"etag": "^1.8.1",
 		"github-label-sync": "^2.0.2",
 		"husky": "^7.0.4",
-		"japa": "^4.0.0",
 		"mrm": "^3.0.10",
 		"np": "^7.6.0",
-		"prettier": "^2.4.1",
+		"prettier": "^2.5.1",
 		"reflect-metadata": "^0.1.13",
 		"strip-ansi": "^6.0.0",
-		"supertest": "^6.1.6",
+		"supertest": "^6.2.2",
 		"test-console": "^2.0.0",
-		"typescript": "^4.5.2",
-		"youch": "^2.2.2",
-		"youch-terminal": "^1.1.1"
+		"typescript": "^4.6.2",
+		"youch": "^3.1.1",
+		"youch-terminal": "^2.1.3"
 	},
 	"nyc": {
 		"exclude": [
@@ -112,21 +117,22 @@
 		}
 	},
 	"dependencies": {
-		"@adonisjs/ace": "^11.0.5",
-		"@adonisjs/application": "^5.1.7",
-		"@adonisjs/bodyparser": "^8.0.1",
-		"@adonisjs/drive": "^2.0.7",
-		"@adonisjs/encryption": "^4.0.5",
-		"@adonisjs/events": "^7.1.2",
-		"@adonisjs/hash": "^7.0.8",
-		"@adonisjs/http-server": "^5.5.7",
-		"@adonisjs/validator": "^12.1.1",
-		"@poppinss/cliui": "^2.2.5",
-		"@poppinss/manager": "^4.0.4",
-		"@poppinss/utils": "^3.3.1",
-		"fs-extra": "^10.0.0",
-		"memfs": "^3.3.0",
-		"serve-static": "^1.14.1",
+		"@adonisjs/ace": "^11.1.0",
+		"@adonisjs/application": "^5.2.0",
+		"@adonisjs/bodyparser": "^8.1.0",
+		"@adonisjs/drive": "^2.0.9",
+		"@adonisjs/encryption": "^4.0.7",
+		"@adonisjs/events": "^7.1.3",
+		"@adonisjs/hash": "^7.0.10",
+		"@adonisjs/http-server": "^5.6.1",
+		"@adonisjs/validator": "^12.2.2",
+		"@poppinss/cliui": "^3.0.1",
+		"@poppinss/manager": "^5.0.1",
+		"@poppinss/utils": "^4.0.2",
+		"fs-extra": "^10.0.1",
+		"macroable": "^6.0.1",
+		"memfs": "^3.4.1",
+		"serve-static": "^1.14.2",
 		"stringify-attributes": "^2.0.0"
 	},
 	"np": {
@@ -185,5 +191,49 @@
 	"publishConfig": {
 		"access": "public",
 		"tag": "latest"
+	},
+	"mrmConfig": {
+		"core": true,
+		"license": "MIT",
+		"services": [
+			"github-actions"
+		],
+		"minNodeVersion": "14.15.4",
+		"probotApps": [
+			"stale",
+			"lock"
+		],
+		"runGhActionsOnWindows": true
+	},
+	"main": "build/index.js",
+	"eslintConfig": {
+		"extends": [
+			"plugin:adonis/typescriptPackage",
+			"prettier"
+		],
+		"plugins": [
+			"prettier"
+		],
+		"rules": {
+			"prettier/prettier": [
+				"error",
+				{
+					"endOfLine": "auto"
+				}
+			]
+		}
+	},
+	"eslintIgnore": [
+		"build"
+	],
+	"prettier": {
+		"trailingComma": "es5",
+		"semi": false,
+		"singleQuote": true,
+		"useTabs": false,
+		"quoteProps": "consistent",
+		"bracketSpacing": true,
+		"arrowParens": "always",
+		"printWidth": 100
 	}
 }

package/build/src/Ignitor/Ace/ErrorHandler/index.d.ts

@@ -1,16 +0,0 @@
-import { ApplicationContract } from '@ioc:Adonis/Core/Application';
-/**
- * Handles ignitor bootstrapping errors by pretty printing them in development
- */
-export declare class ErrorHandler {
-    private application;
-    constructor(application: ApplicationContract);
-    /**
-     * Pretty prints a given error on the terminal
-     */
-    private prettyPrintError;
-    /**
-     * Handles ignitor boot errors
-     */
-    handleError(error: any): Promise<void>;
-}

package/build/src/Ignitor/Ace/ErrorHandler/index.js

@@ -1,47 +0,0 @@
-"use strict";
-/*
- * @adonisjs/core
- *
- * (c) Harminder Virk <virk@adonisjs.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorHandler = void 0;
-/**
- * Handles ignitor bootstrapping errors by pretty printing them in development
- */
-class ErrorHandler {
-    constructor(application) {
-        this.application = application;
-    }
-    /**
-     * Pretty prints a given error on the terminal
-     */
-    async prettyPrintError(error) {
-        try {
-            const Youch = require('youch');
-            const output = await new Youch(error, {}).toJSON();
-            console.log(require('youch-terminal')(output));
-        }
-        catch (err) {
-            console.log(error.stack);
-        }
-    }
-    /**
-     * Handles ignitor boot errors
-     */
-    async handleError(error) {
-        if (typeof error.handle === 'function') {
-            error.handle(error);
-        }
-        else if (this.application.inDev) {
-            await this.prettyPrintError(error);
-        }
-        else {
-            console.error(error.stack);
-        }
-    }
-}
-exports.ErrorHandler = ErrorHandler;

package/build/src/Ignitor/HttpServer/ErrorHandler/index.d.ts

@@ -1,16 +0,0 @@
-import { ApplicationContract } from '@ioc:Adonis/Core/Application';
-/**
- * Handles ignitor bootstrapping errors by pretty printing them in development
- */
-export declare class ErrorHandler {
-    private application;
-    constructor(application: ApplicationContract);
-    /**
-     * Pretty prints a given error on the terminal
-     */
-    private prettyPrintError;
-    /**
-     * Handles ignitor boot errors
-     */
-    handleError(error: any): Promise<void>;
-}

package/build/src/Ignitor/HttpServer/ErrorHandler/index.js

@@ -1,44 +0,0 @@
-"use strict";
-/*
- * @adonisjs/core
- *
- * (c) Harminder Virk <virk@adonisjs.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorHandler = void 0;
-/**
- * Handles ignitor bootstrapping errors by pretty printing them in development
- */
-class ErrorHandler {
-    constructor(application) {
-        this.application = application;
-    }
-    /**
-     * Pretty prints a given error on the terminal
-     */
-    async prettyPrintError(error) {
-        try {
-            const Youch = require('youch');
-            const output = await new Youch(error, {}).toJSON();
-            console.log(require('youch-terminal')(output));
-        }
-        catch (err) {
-            console.log(error.stack);
-        }
-    }
-    /**
-     * Handles ignitor boot errors
-     */
-    async handleError(error) {
-        if (this.application.inDev) {
-            await this.prettyPrintError(error);
-        }
-        else {
-            console.error(error.stack);
-        }
-    }
-}
-exports.ErrorHandler = ErrorHandler;