@h3ravel/core 1.17.0 → 1.18.1

package/dist/index.cjs

@@ -24,12 +24,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 require("reflect-metadata");
 let __h3ravel_shared = require("@h3ravel/shared");
 __h3ravel_shared = __toESM(__h3ravel_shared);
+let __h3ravel_support = require("@h3ravel/support");
+__h3ravel_support = __toESM(__h3ravel_support);
 let fast_glob = require("fast-glob");
 fast_glob = __toESM(fast_glob);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
-let __h3ravel_support = require("@h3ravel/support");
-__h3ravel_support = __toESM(__h3ravel_support);
 let detect_port = require("detect-port");
 detect_port = __toESM(detect_port);
 let dotenv = require("dotenv");
@@ -40,6 +40,8 @@ let node_fs_promises = require("node:fs/promises");
 node_fs_promises = __toESM(node_fs_promises);
 let semver = require("semver");
 semver = __toESM(semver);
+let __h3ravel_http = require("@h3ravel/http");
+__h3ravel_http = __toESM(__h3ravel_http);
 
 //#region src/Container.ts
 var Container = class {
@@ -55,6 +57,19 @@ var Container = class {
 		this.bindings.set(key, factory);
 	}
 	/**
+	* Remove one or more transient services from the container
+	*/
+	unbind(key) {
+		if (Array.isArray(key)) for (let i = 0; i < key.length; i++) {
+			this.bindings.delete(key[i]);
+			this.singletons.delete(key[i]);
+		}
+		else {
+			this.bindings.delete(key);
+			this.singletons.delete(key);
+		}
+	}
+	/**
 	* Bind a singleton service to the container
 	*/
 	singleton(key, factory) {
@@ -111,7 +126,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) => {
@@ -293,13 +309,15 @@ var ProviderRegistry = class {
 			"node_modules/h3ravel-*/package.json"
 		]);
 		const providers = [];
-		for (const manifestPath of manifests) {
-			const pkg = await this.getManifest(node_path.default.resolve(manifestPath));
-			if (pkg.h3ravel?.providers) providers.push(...await Promise.all(pkg.h3ravel.providers.map(async (name) => (await import(node_path.default.resolve(node_path.default.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(node_path.default.resolve(manifestPath));
+				if (pkg.h3ravel?.providers) providers.push(...await Promise.all(pkg.h3ravel.providers.map(async (name) => (await import(node_path.default.resolve(node_path.default.dirname(manifestPath), "dist/index.js")))[name])));
+			}
+			for (const provider of providers) {
+				const key = this.getKey(provider);
+				this.providers.set(key, provider);
+			}
 		}
 		return providers;
 	}
@@ -459,13 +477,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
@@ -513,7 +531,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
@@ -528,17 +546,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 __h3ravel_support.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 {
@@ -561,6 +572,7 @@ var Application = class Application extends Container {
 				[e.stack, "red"]
 			], "\n");
 		}
+		return this;
 	}
 	/**
 	* Get the base path of the app
@@ -659,6 +671,43 @@ 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) => {
+	let h3App;
+	const app = new Application(basePath);
+	await app.quickStartup(providers, config.filteredProviders, config.autoload);
+	try {
+		h3App = app.make("http.app");
+		const kernel = new Kernel((event) => __h3ravel_shared.HttpContext.init({
+			app,
+			request: new __h3ravel_http.Request(event, app),
+			response: new __h3ravel_http.Response(event, app)
+		}), [new __h3ravel_http.LogRequests()]);
+		h3App.use((event) => kernel.handle(event, middleware));
+	} catch {
+		if (!h3App && config.h3) h3App = config.h3;
+	}
+	const originalFire = app.fire.bind(app);
+	if (config.initialize && h3App) return await originalFire(h3App);
+	app.fire = () => {
+		if (!h3App) throw new ConfigException("Provide a H3 app instance in the config or install @h3ravel/http");
+		return originalFire(h3App);
+	};
+	return app;
+};
+
 //#endregion
 //#region src/Http/Kernel.ts
 /**
@@ -834,4 +883,5 @@ exports.Injectable = Injectable;
 exports.Kernel = Kernel;
 exports.ProviderRegistry = ProviderRegistry;
 exports.Registerer = Registerer;
-exports.ServiceProvider = ServiceProvider;
+exports.ServiceProvider = ServiceProvider;
+exports.h3ravel = h3ravel;

package/dist/index.d.cts

@@ -2,10 +2,16 @@
 import { Bindings, HttpContext, IApplication, IContainer, IController, IMiddleware, IPathName, IServiceProvider, PathLoader, UseKey } from "@h3ravel/shared";
 import { H3, H3Event } from "h3";
 
+//#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
+type IBinding = UseKey | (new (..._args: any[]) => unknown);
 declare class Container implements IContainer {
-  private bindings;
-  private singletons;
+  bindings: Map<IBinding, () => unknown>;
+  singletons: Map<IBinding, unknown>;
   /**
    * Check if the target has any decorators
    *
@@ -19,6 +25,10 @@ declare class Container implements IContainer {
    */
   bind<T>(key: new (...args: any[]) => T, factory: () => T): void;
   bind<T extends UseKey>(key: T, factory: () => Bindings[T]): void;
+  /**
+   * Remove one or more transient services from the container
+   */
+  unbind<T extends UseKey>(key: T | T[]): void;
   /**
    * Bind a singleton service to the container
    */
@@ -96,7 +106,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;
@@ -181,7 +190,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
    *
@@ -218,8 +228,32 @@ declare class Application extends Container implements IApplication {
   static getVersion(key: string): string;
 }
 //#endregion
-//#region src/Contracts/ServiceProviderConstructor.d.ts
-type ServiceProviderConstructor = (new (app: Application) => ServiceProvider) & IServiceProvider;
+//#region src/Contracts/H3ravelContract.d.ts
+interface EntryConfig {
+  /**
+   * @param h3 You can provide your own `H3` app instance, this is usefull when `@h3ravel/http`
+   * is not installed.
+   */
+  h3?: H3;
+  /**
+   * Determines if we should initialize the app on call.
+   *
+   * @default false
+   */
+  initialize?: boolean;
+  /**
+   * Determines if service providers should be auto discovered and registered or not.
+   *
+   * @default false
+   */
+  autoload?: boolean;
+  /**
+   * A list of service provider name strings we do not want to register at all cost
+   *
+   * @default []
+   */
+  filteredProviders?: string[];
+}
 //#endregion
 //#region src/Controller.d.ts
 /**
@@ -258,6 +292,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.
@@ -419,4 +479,4 @@ declare class Registerer {
   private databasePath;
 }
 //#endregion
-export { Application, ConfigException, Container, ContainerResolver, Controller, CoreServiceProvider, Inject, Injectable, Kernel, ProviderRegistry, Registerer, ServiceProvider, ServiceProviderConstructor };
+export { AServiceProvider, Application, ConfigException, Container, ContainerResolver, Controller, CoreServiceProvider, EntryConfig, Inject, Injectable, Kernel, OServiceProvider, ProviderRegistry, Registerer, ServiceProvider, ServiceProviderConstructor, h3ravel };

package/dist/index.d.ts

@@ -3,10 +3,16 @@ import "reflect-metadata";
 import { Bindings, HttpContext, IApplication, IContainer, IController, IMiddleware, IPathName, IServiceProvider, PathLoader, UseKey } from "@h3ravel/shared";
 import { H3, H3Event } from "h3";
 
+//#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
+type IBinding = UseKey | (new (..._args: any[]) => unknown);
 declare class Container implements IContainer {
-  private bindings;
-  private singletons;
+  bindings: Map<IBinding, () => unknown>;
+  singletons: Map<IBinding, unknown>;
   /**
    * Check if the target has any decorators
    *
@@ -20,6 +26,10 @@ declare class Container implements IContainer {
    */
   bind<T>(key: new (...args: any[]) => T, factory: () => T): void;
   bind<T extends UseKey>(key: T, factory: () => Bindings[T]): void;
+  /**
+   * Remove one or more transient services from the container
+   */
+  unbind<T extends UseKey>(key: T | T[]): void;
   /**
    * Bind a singleton service to the container
    */
@@ -97,7 +107,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;
@@ -182,7 +191,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
    *
@@ -219,8 +229,32 @@ declare class Application extends Container implements IApplication {
   static getVersion(key: string): string;
 }
 //#endregion
-//#region src/Contracts/ServiceProviderConstructor.d.ts
-type ServiceProviderConstructor = (new (app: Application) => ServiceProvider) & IServiceProvider;
+//#region src/Contracts/H3ravelContract.d.ts
+interface EntryConfig {
+  /**
+   * @param h3 You can provide your own `H3` app instance, this is usefull when `@h3ravel/http`
+   * is not installed.
+   */
+  h3?: H3;
+  /**
+   * Determines if we should initialize the app on call.
+   *
+   * @default false
+   */
+  initialize?: boolean;
+  /**
+   * Determines if service providers should be auto discovered and registered or not.
+   *
+   * @default false
+   */
+  autoload?: boolean;
+  /**
+   * A list of service provider name strings we do not want to register at all cost
+   *
+   * @default []
+   */
+  filteredProviders?: string[];
+}
 //#endregion
 //#region src/Controller.d.ts
 /**
@@ -259,6 +293,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.
@@ -420,4 +480,4 @@ declare class Registerer {
   private databasePath;
 }
 //#endregion
-export { Application, ConfigException, Container, ContainerResolver, Controller, CoreServiceProvider, Inject, Injectable, Kernel, ProviderRegistry, Registerer, ServiceProvider, ServiceProviderConstructor };
+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 { readFile } from "node:fs/promises";
 import semver from "semver";
+import { LogRequests, Request, Response } from "@h3ravel/http";
 
 //#region src/Container.ts
 var Container = class {
@@ -23,6 +24,19 @@ var Container = class {
 		this.bindings.set(key, factory);
 	}
 	/**
+	* Remove one or more transient services from the container
+	*/
+	unbind(key) {
+		if (Array.isArray(key)) for (let i = 0; i < key.length; i++) {
+			this.bindings.delete(key[i]);
+			this.singletons.delete(key[i]);
+		}
+		else {
+			this.bindings.delete(key);
+			this.singletons.delete(key);
+		}
+	}
+	/**
 	* Bind a singleton service to the container
 	*/
 	singleton(key, factory) {
@@ -79,7 +93,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 +276,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 +444,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 +498,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 +513,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 +539,7 @@ var Application = class Application extends Container {
 				[e.stack, "red"]
 			], "\n");
 		}
+		return this;
 	}
 	/**
 	* Get the base path of the app
@@ -627,6 +638,43 @@ 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) => {
+	let h3App;
+	const app = new Application(basePath);
+	await app.quickStartup(providers, config.filteredProviders, config.autoload);
+	try {
+		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));
+	} catch {
+		if (!h3App && config.h3) h3App = config.h3;
+	}
+	const originalFire = app.fire.bind(app);
+	if (config.initialize && h3App) return await originalFire(h3App);
+	app.fire = () => {
+		if (!h3App) throw new ConfigException("Provide a H3 app instance in the config or install @h3ravel/http");
+		return originalFire(h3App);
+	};
+	return app;
+};
+
 //#endregion
 //#region src/Http/Kernel.ts
 /**
@@ -791,4 +839,4 @@ var CoreServiceProvider = class extends ServiceProvider {
 };
 
 //#endregion
-export { Application, ConfigException, Container, ContainerResolver, Controller, CoreServiceProvider, Inject, Injectable, Kernel, ProviderRegistry, Registerer, ServiceProvider };
+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.17.0",
+  "version": "1.18.1",
   "description": "Core application container, lifecycle management and service providers for H3ravel.",
   "type": "module",
   "main": "./dist/index.js",