@h3ravel/core 1.16.2 → 1.18.0

package/dist/index.d.ts

@@ -1,10 +1,13 @@
 /// <reference path="./app.globals.d.ts" />
 import "reflect-metadata";
 import { Bindings, HttpContext, IApplication, IContainer, IController, IMiddleware, IPathName, IServiceProvider, PathLoader, UseKey } from "@h3ravel/shared";
-import { XGeneric } from "@h3ravel/support";
 import { H3, H3Event } from "h3";
-import { Argument, Command } from "commander";
 
+//#region src/Contracts/ServiceProviderConstructor.d.ts
+type ServiceProviderConstructor = (new (app: Application) => ServiceProvider) & IServiceProvider;
+type AServiceProvider = (new (_app: Application) => ServiceProvider) & Partial<ServiceProvider>;
+type OServiceProvider = (new (_app: Application) => Partial<ServiceProvider>) & Partial<ServiceProvider>;
+//#endregion
 //#region src/Container.d.ts
 declare class Container implements IContainer {
   private bindings;
@@ -99,7 +102,6 @@ declare abstract class ServiceProvider extends Inference {
 }
 //#endregion
 //#region src/Application.d.ts
-type AServiceProvider = (new (_app: Application) => ServiceProvider) & Partial<ServiceProvider>;
 declare class Application extends Container implements IApplication {
   paths: PathLoader;
   private tries;
@@ -184,7 +186,8 @@ declare class Application extends Container implements IApplication {
    * @param h3App The current H3 app instance
    * @param preferedPort If provided, this will overide the port set in the evironment
    */
-  fire(h3App: H3, preferedPort?: number): Promise<void>;
+  fire(): Promise<this>;
+  fire(h3App: H3, preferredPort?: number): Promise<this>;
   /**
    * Get the base path of the app
    *
@@ -221,138 +224,28 @@ declare class Application extends Container implements IApplication {
   static getVersion(key: string): string;
 }
 //#endregion
-//#region src/Console/ConsoleKernel.d.ts
-declare class ConsoleKernel {
-  app: Application;
-  cwd: string;
-  output: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
-  basePath: string;
-  modulePath: string;
-  consolePath: string;
-  modulePackage: XGeneric<{
-    version: string;
-  }>;
-  consolePackage: XGeneric<{
-    version: string;
-  }>;
-  constructor(app: Application);
-  ensureDirectoryExists(dir: string): Promise<void>;
-}
-//#endregion
-//#region src/Console/ConsoleCommand.d.ts
-declare class ConsoleCommand {
-  protected app: Application;
-  protected kernel: ConsoleKernel;
-  constructor(app: Application, kernel: ConsoleKernel);
+//#region src/Contracts/H3ravelContract.d.ts
+interface EntryConfig {
   /**
-   * The underlying commander instance.
+   * Determines if we should initialize the app on call.
    *
-   * @var Command
+   * @default false
    */
-  program: Command;
+  initialize?: boolean;
   /**
-   * The name and signature of the console command.
+   * Determines if service providers should be auto discovered and registered or not.
    *
-   * @var string
+   * @default false
    */
-  protected signature: string;
+  autoload?: boolean;
   /**
-   * A dictionary of signatures or what not.
+   * A list of service provider name strings we do not want to register at all cost
    *
-   * @var object
-   */
-  protected dictionary: Record<string, any>;
-  /**
-   * The console command description.
-   *
-   * @var string
-   */
-  protected description?: string;
-  /**
-   * The console command input.
-   *
-   * @var object
-   */
-  private input;
-  /**
-   * Execute the console command.
-   */
-  handle(..._args: any[]): Promise<void>;
-  setApplication(app: Application): void;
-  setInput(options: XGeneric, args: string[], regArgs: readonly Argument[], dictionary: Record<string, any>, program: Command): this;
-  setOption(key: string, value: unknown): this;
-  setProgram(program: Command): this;
-  getSignature(): string;
-  getDescription(): string | undefined;
-  option(key: string, def?: any): any;
-  options(key?: string): any;
-  argument(key: string, def?: any): any;
-  arguments(): Record<string, any>;
-  loadBaseFlags(): void;
-  /**
-   * Check if the command is quiet
-   *
-   * @returns
-   */
-  isQuiet(): any;
-  /**
-   * Check if the command is silent
-   *
-   * @returns
-   */
-  isSilent(): any;
-  /**
-   * Check if the command is non interactive
-   *
-   * @returns
-   */
-  isNonInteractive(): boolean;
-  /**
-   * Get the verbosity of the command
-   *
-   * @returns
+   * @default []
    */
-  getVerbosity(): number;
-  /**
-   * Log an info message
-   */
-  info(message: string): this;
-  /**
-   * Log a warning message
-   */
-  warn(message: string): this;
-  /**
-   * Log a line message
-   */
-  line(message: string): this;
-  /**
-   * Log a new line
-   */
-  newLine(count?: number): this;
-  /**
-   * Log a success message
-   */
-  success(message: string): this;
-  /**
-   * Log an error message
-   */
-  error(message: string): this;
-  /**
-   * Log an error message and terminate execution of the command
-   * return an exit code of 1
-   *
-   * This method is not chainable
-   */
-  fail(message: string): void;
-  /**
-   * Log a debug message
-   */
-  debug(message: string | string[]): this;
+  filteredProviders?: string[];
 }
 //#endregion
-//#region src/Contracts/ServiceProviderConstructor.d.ts
-type ServiceProviderConstructor = (new (app: Application) => ServiceProvider) & IServiceProvider;
-//#endregion
 //#region src/Controller.d.ts
 /**
  * Base controller class
@@ -390,6 +283,32 @@ declare class ConfigException extends Error {
   constructor(key: string, type?: 'any' | 'config' | 'env', cause?: unknown);
 }
 //#endregion
+//#region src/H3ravel.d.ts
+/**
+ * Simple global entry point for H3ravel applications
+ *
+ * @param providers
+ * @param basePath
+ * @param callback
+ */
+declare const h3ravel: (
+/**
+ * List of intial service providers to register with your app
+ */
+providers?: Exclude<OServiceProvider, "app" | "commands">[],
+/**
+ * Entry path of your app
+ */
+basePath?: string,
+/**
+ * Configuration option to pass to the initializer
+ */
+config?: EntryConfig,
+/**
+ * final middleware function to call once the server is fired up
+ */
+middleware?: (ctx: HttpContext) => Promise<unknown>) => Promise<Application>;
+//#endregion
 //#region src/Http/Kernel.d.ts
 /**
  * Kernel class handles middleware execution and response transformations.
@@ -551,5 +470,4 @@ declare class Registerer {
   private databasePath;
 }
 //#endregion
-export { Application, ConfigException, ConsoleCommand, ConsoleKernel, Container, ContainerResolver, Controller, CoreServiceProvider, Inject, Injectable, Kernel, ProviderRegistry, Registerer, ServiceProvider, ServiceProviderConstructor };
-//# sourceMappingURL=index.d.ts.map
+export { AServiceProvider, Application, ConfigException, Container, ContainerResolver, Controller, CoreServiceProvider, EntryConfig, Inject, Injectable, Kernel, OServiceProvider, ProviderRegistry, Registerer, ServiceProvider, ServiceProviderConstructor, h3ravel };

package/dist/index.js

@@ -1,13 +1,14 @@
 import "reflect-metadata";
-import { FileSystem, Logger, PathLoader } from "@h3ravel/shared";
+import { FileSystem, HttpContext, Logger, PathLoader } from "@h3ravel/shared";
+import { InvalidArgumentException, Str, dd, dump, str } from "@h3ravel/support";
 import fg from "fast-glob";
 import path from "node:path";
-import { Str, dd, dump, str } from "@h3ravel/support";
 import { detect } from "detect-port";
 import dotenv from "dotenv";
 import dotenvExpand from "dotenv-expand";
-import { mkdir, readFile } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import semver from "semver";
+import { LogRequests, Request, Response } from "@h3ravel/http";
 
 //#region src/Container.ts
 var Container = class {
@@ -79,7 +80,8 @@ var ContainerResolver = class ContainerResolver {
 		/**
 		* Resolve the bound dependencies
 		*/
-		const args = params.filter((e) => ContainerResolver.isClass(e)).map((type) => {
+		const args = params.filter((e) => ContainerResolver.isClass(e) || e instanceof Application).map((type) => {
+			if (type instanceof Application) return type;
 			return this.app.make(type);
 		});
 		return new Promise((resolve) => {
@@ -261,13 +263,15 @@ var ProviderRegistry = class {
 			"node_modules/h3ravel-*/package.json"
 		]);
 		const providers = [];
-		for (const manifestPath of manifests) {
-			const pkg = await this.getManifest(path.resolve(manifestPath));
-			if (pkg.h3ravel?.providers) providers.push(...await Promise.all(pkg.h3ravel.providers.map(async (name) => (await import(path.resolve(path.dirname(manifestPath), "dist/index.js")))[name])));
-		}
-		if (autoRegister) for (const provider of providers) {
-			const key = this.getKey(provider);
-			this.providers.set(key, provider);
+		if (autoRegister) {
+			for (const manifestPath of manifests) {
+				const pkg = await this.getManifest(path.resolve(manifestPath));
+				if (pkg.h3ravel?.providers) providers.push(...await Promise.all(pkg.h3ravel.providers.map(async (name) => (await import(path.resolve(path.dirname(manifestPath), "dist/index.js")))[name])));
+			}
+			for (const provider of providers) {
+				const key = this.getKey(provider);
+				this.providers.set(key, provider);
+			}
 		}
 		return providers;
 	}
@@ -427,13 +431,13 @@ var Application = class Application extends Container {
 		ProviderRegistry.setSortable(false);
 		ProviderRegistry.setFiltered(this.filteredProviders);
 		ProviderRegistry.registerMany(providers);
-		if (autoRegister) await ProviderRegistry.discoverProviders();
+		if (autoRegister) await ProviderRegistry.discoverProviders(autoRegister);
 		ProviderRegistry.doSort();
-		for (const ProviderClass of ProviderRegistry.all()) {
-			if (!ProviderClass) continue;
+		ProviderRegistry.all().forEach(async (ProviderClass) => {
+			if (!ProviderClass) return;
 			const provider = new ProviderClass(this);
 			await this.register(provider);
-		}
+		});
 	}
 	/**
 	* Register service providers
@@ -481,7 +485,7 @@ var Application = class Application extends Container {
 		/**
 		* If debug is enabled, let's show the loaded service provider info
 		*/
-		if (process.env.APP_DEBUG === "true" && process.env.EXTENDED_DEBUG !== "false" && !this.providers.some((e) => e.runsInConsole)) ProviderRegistry.log(this.providers);
+		if ((process.env.APP_DEBUG === "true" && process.env.EXTENDED_DEBUG !== "false" || Number(process.env.VERBOSE) > 1) && !this.providers.some((e) => e.runsInConsole)) ProviderRegistry.log(this.providers);
 		for (const provider of this.providers) if (provider.boot) if (Container.hasAnyDecorator(provider.boot))
  /**
 		* If the service provider is decorated use the IoC container
@@ -496,17 +500,10 @@ var Application = class Application extends Container {
 		this.booted = true;
 		return this;
 	}
-	/**
-	* Fire up the developement server using the user provided arguments
-	* 
-	* Port will be auto assigned if provided one is not available
-	* 
-	* @param h3App The current H3 app instance
-	* @param preferedPort If provided, this will overide the port set in the evironment
-	*/
-	async fire(h3App, preferedPort) {
+	async fire(h3App, preferredPort) {
+		if (!h3App) throw new InvalidArgumentException("No valid H3 app instance was provided.");
 		const serve = this.make("http.serve");
-		const port = preferedPort ?? env("PORT", 3e3);
+		const port = preferredPort ?? env("PORT", 3e3);
 		const tries = env("RETRIES", 1);
 		const hostname = env("HOSTNAME", "localhost");
 		try {
@@ -529,6 +526,7 @@ var Application = class Application extends Container {
 				[e.stack, "red"]
 			], "\n");
 		}
+		return this;
 	}
 	/**
 	* Get the base path of the app
@@ -576,215 +574,6 @@ var Application = class Application extends Container {
 	}
 };
 
-//#endregion
-//#region src/Console/ConsoleCommand.ts
-var ConsoleCommand = class {
-	constructor(app, kernel) {
-		this.app = app;
-		this.kernel = kernel;
-	}
-	/**
-	* The underlying commander instance.
-	*
-	* @var Command
-	*/
-	program;
-	/**
-	* The name and signature of the console command.
-	*
-	* @var string
-	*/
-	signature;
-	/**
-	* A dictionary of signatures or what not.
-	*
-	* @var object
-	*/
-	dictionary = {};
-	/**
-	* The console command description.
-	*
-	* @var string
-	*/
-	description;
-	/**
-	* The console command input.
-	*
-	* @var object
-	*/
-	input = {
-		options: {},
-		arguments: {}
-	};
-	/**
-	* Execute the console command.
-	*/
-	async handle(..._args) {}
-	setApplication(app) {
-		this.app = app;
-	}
-	setInput(options, args, regArgs, dictionary, program) {
-		this.program = program;
-		this.dictionary = dictionary;
-		this.input.options = options;
-		this.input.arguments = regArgs.map((e, i) => ({ [e.name()]: args[i] })).reduce((e, x) => Object.assign(e, x), {});
-		this.loadBaseFlags();
-		Logger.configure({
-			verbosity: this.option("verbose"),
-			silent: this.option("silent"),
-			quiet: this.option("quiet")
-		});
-		return this;
-	}
-	setOption(key, value) {
-		this.program.setOptionValue(key, value);
-		return this;
-	}
-	setProgram(program) {
-		this.program = program;
-		return this;
-	}
-	getSignature() {
-		return this.signature;
-	}
-	getDescription() {
-		return this.description;
-	}
-	option(key, def) {
-		const option = this.input.options[key] ?? def;
-		return option === "null" || option === "undefined" ? void 0 : option;
-	}
-	options(key) {
-		if (key) return this.input.options[key];
-		return this.input.options;
-	}
-	argument(key, def) {
-		return this.input.arguments[key] ?? def;
-	}
-	arguments() {
-		return this.input.arguments;
-	}
-	loadBaseFlags() {
-		let verbose = 0;
-		if (this.program.getOptionValue("verbose") == "v") verbose = 2;
-		else if (this.program.getOptionValue("verbose") == "vv") verbose = 3;
-		else verbose = Number(this.program.getOptionValue("verbose") ?? 0);
-		this.input.options.quiet = this.program.getOptionValue("quiet") ?? false;
-		this.input.options.silent = this.program.getOptionValue("silent") ?? false;
-		this.input.options.verbose = verbose;
-		this.input.options.interaction = this.program.getOptionValue("interaction") ?? false;
-	}
-	/**
-	* Check if the command is quiet
-	* 
-	* @returns 
-	*/
-	isQuiet() {
-		return this.option("quiet");
-	}
-	/**
-	* Check if the command is silent
-	* 
-	* @returns 
-	*/
-	isSilent() {
-		return this.option("silent");
-	}
-	/**
-	* Check if the command is non interactive
-	* 
-	* @returns 
-	*/
-	isNonInteractive() {
-		return this.option("interaction") === false;
-	}
-	/**
-	* Get the verbosity of the command
-	* 
-	* @returns 
-	*/
-	getVerbosity() {
-		return Number(this.option("verbose"));
-	}
-	/**
-	* Log an info message
-	*/
-	info(message) {
-		Logger.info(message);
-		return this;
-	}
-	/**
-	* Log a warning message
-	*/
-	warn(message) {
-		Logger.warn(message);
-		return this;
-	}
-	/**
-	* Log a line message
-	*/
-	line(message) {
-		Logger.log(message, "white");
-		return this;
-	}
-	/**
-	* Log a new line
-	*/
-	newLine(count = 1) {
-		if (Number(this.getVerbosity()) >= 3 || !this.isSilent() && !this.isQuiet()) for (let i = 0; i < count; i++) console.log("");
-		return this;
-	}
-	/**
-	* Log a success message
-	*/
-	success(message) {
-		Logger.success(message);
-		return this;
-	}
-	/**
-	* Log an error message
-	*/
-	error(message) {
-		Logger.error(message, false);
-		return this;
-	}
-	/**
-	* Log an error message and terminate execution of the command
-	* return an exit code of 1
-	* 
-	* This method is not chainable
-	*/
-	fail(message) {
-		this.error(message);
-		process.exit(1);
-	}
-	/**
-	* Log a debug message
-	*/
-	debug(message) {
-		Logger.debug(message);
-		return this;
-	}
-};
-
-//#endregion
-//#region src/Console/ConsoleKernel.ts
-var ConsoleKernel = class {
-	cwd;
-	output = typeof Logger;
-	basePath = "";
-	modulePath;
-	consolePath;
-	modulePackage;
-	consolePackage;
-	constructor(app) {
-		this.app = app;
-	}
-	async ensureDirectoryExists(dir) {
-		await mkdir(dir, { recursive: true });
-	}
-};
-
 //#endregion
 //#region src/Controller.ts
 /**
@@ -836,6 +625,35 @@ var ConfigException = class extends Error {
 	}
 };
 
+//#endregion
+//#region src/H3ravel.ts
+/**
+* Simple global entry point for H3ravel applications
+* 
+* @param providers 
+* @param basePath 
+* @param callback 
+*/
+const h3ravel = async (providers = [], basePath = process.cwd(), config = {
+	initialize: false,
+	autoload: false,
+	filteredProviders: []
+}, middleware = async () => void 0) => {
+	const app = new Application(basePath);
+	await app.quickStartup(providers, config.filteredProviders, config.autoload);
+	const h3App = app.make("http.app");
+	const kernel = new Kernel((event) => HttpContext.init({
+		app,
+		request: new Request(event, app),
+		response: new Response(event, app)
+	}), [new LogRequests()]);
+	h3App.use((event) => kernel.handle(event, middleware));
+	const originalFire = app.fire.bind(app);
+	if (config.initialize) return await originalFire(h3App);
+	app.fire = () => originalFire(h3App);
+	return app;
+};
+
 //#endregion
 //#region src/Http/Kernel.ts
 /**
@@ -1000,5 +818,4 @@ var CoreServiceProvider = class extends ServiceProvider {
 };
 
 //#endregion
-export { Application, ConfigException, ConsoleCommand, ConsoleKernel, Container, ContainerResolver, Controller, CoreServiceProvider, Inject, Injectable, Kernel, ProviderRegistry, Registerer, ServiceProvider };
-//# sourceMappingURL=index.js.map
+export { Application, ConfigException, Container, ContainerResolver, Controller, CoreServiceProvider, Inject, Injectable, Kernel, ProviderRegistry, Registerer, ServiceProvider, h3ravel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/core",
-  "version": "1.16.2",
+  "version": "1.18.0",
   "description": "Core application container, lifecycle management and service providers for H3ravel.",
   "type": "module",
   "main": "./dist/index.js",
@@ -54,8 +54,8 @@
     "semver": "^7.7.2",
     "srvx": "^0.8.7",
     "tslib": "^2.8.1",
-    "@h3ravel/support": "^0.14.1",
-    "@h3ravel/shared": "^0.22.2"
+    "@h3ravel/shared": "^0.22.3",
+    "@h3ravel/support": "^0.14.2"
   },
   "devDependencies": {
     "@types/semver": "^7.7.1",