@h3ravel/core 1.13.0 → 1.15.0

package/dist/index.d.cts

@@ -24,7 +24,7 @@ declare class Container implements IContainer {
   /**
    * Bind a singleton service to the container
    */
-  singleton<T extends UseKey>(key: T | (new (..._args: any[]) => Bindings[T]), factory: () => Bindings[T]): void;
+  singleton<T extends UseKey>(key: T | (new (..._args: any[]) => Bindings[T]), factory: (app: this) => Bindings[T]): void;
   /**
    * Resolve a service from the container
    */
@@ -128,13 +128,17 @@ declare class Application extends Container implements IApplication {
    *
    * @param providers All regitererable service providers
    * @param filtered A list of service provider name strings we do not want to register at all cost
+   * @param autoRegisterProviders If set to false, service providers will not be auto discovered and registered.
+   *
    * @returns
    */
-  quickStartup(providers: Array<AServiceProvider>, filtered?: string[]): Promise<void>;
+  quickStartup(providers: Array<AServiceProvider>, filtered?: string[], autoRegisterProviders?: boolean): Promise<void>;
   /**
    * Dynamically register all configured providers
+   *
+   * @param autoRegister If set to false, service providers will not be auto discovered and registered.
    */
-  registerConfiguredProviders(): Promise<void>;
+  registerConfiguredProviders(autoRegister?: boolean): Promise<void>;
   /**
    * Register service providers
    *
@@ -266,6 +270,58 @@ declare class ConsoleCommand {
   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
+   */
+  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 a debug message
+   */
+  debug(message: string | string[]): this;
 }
 //#endregion
 //#region src/Contracts/ServiceProviderConstructor.d.ts
@@ -352,6 +408,13 @@ declare class ProviderRegistry {
   private static providers;
   private static priorityMap;
   private static filteredProviders;
+  private static sortable;
+  /**
+   * Set wether providers should be sorted or not.
+   *
+   * @returns
+   */
+  static setSortable(sort?: boolean): void;
   /**
    * Get a unique identifier for the Provider.
    *
@@ -394,6 +457,10 @@ declare class ProviderRegistry {
    * @returns
    */
   static sort(providers: ProviderCtor[]): ProviderCtor[];
+  /**
+   * Sort service providers
+   */
+  static doSort(): void;
   /**
    * Log the service providers in a table
    *
@@ -413,6 +480,20 @@ declare class ProviderRegistry {
    * @returns
    */
   static has(provider: ProviderCtor): boolean;
+  /**
+   * Automatically search for and discover service providers in packages.
+   *
+   * @param autoRegister
+   * @returns
+   */
+  static discoverProviders(autoRegister?: boolean): Promise<ProviderCtor[]>;
+  /**
+   * Get the content of the package.json file
+   *
+   * @param manifestPath
+   * @returns
+   */
+  private static getManifest;
 }
 //#endregion
 //#region src/Providers/CoreServiceProvider.d.ts

package/dist/index.d.ts

@@ -25,7 +25,7 @@ declare class Container implements IContainer {
   /**
    * Bind a singleton service to the container
    */
-  singleton<T extends UseKey>(key: T | (new (..._args: any[]) => Bindings[T]), factory: () => Bindings[T]): void;
+  singleton<T extends UseKey>(key: T | (new (..._args: any[]) => Bindings[T]), factory: (app: this) => Bindings[T]): void;
   /**
    * Resolve a service from the container
    */
@@ -129,13 +129,17 @@ declare class Application extends Container implements IApplication {
    *
    * @param providers All regitererable service providers
    * @param filtered A list of service provider name strings we do not want to register at all cost
+   * @param autoRegisterProviders If set to false, service providers will not be auto discovered and registered.
+   *
    * @returns
    */
-  quickStartup(providers: Array<AServiceProvider>, filtered?: string[]): Promise<void>;
+  quickStartup(providers: Array<AServiceProvider>, filtered?: string[], autoRegisterProviders?: boolean): Promise<void>;
   /**
    * Dynamically register all configured providers
+   *
+   * @param autoRegister If set to false, service providers will not be auto discovered and registered.
    */
-  registerConfiguredProviders(): Promise<void>;
+  registerConfiguredProviders(autoRegister?: boolean): Promise<void>;
   /**
    * Register service providers
    *
@@ -267,6 +271,58 @@ declare class ConsoleCommand {
   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
+   */
+  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 a debug message
+   */
+  debug(message: string | string[]): this;
 }
 //#endregion
 //#region src/Contracts/ServiceProviderConstructor.d.ts
@@ -353,6 +409,13 @@ declare class ProviderRegistry {
   private static providers;
   private static priorityMap;
   private static filteredProviders;
+  private static sortable;
+  /**
+   * Set wether providers should be sorted or not.
+   *
+   * @returns
+   */
+  static setSortable(sort?: boolean): void;
   /**
    * Get a unique identifier for the Provider.
    *
@@ -395,6 +458,10 @@ declare class ProviderRegistry {
    * @returns
    */
   static sort(providers: ProviderCtor[]): ProviderCtor[];
+  /**
+   * Sort service providers
+   */
+  static doSort(): void;
   /**
    * Log the service providers in a table
    *
@@ -414,6 +481,20 @@ declare class ProviderRegistry {
    * @returns
    */
   static has(provider: ProviderCtor): boolean;
+  /**
+   * Automatically search for and discover service providers in packages.
+   *
+   * @param autoRegister
+   * @returns
+   */
+  static discoverProviders(autoRegister?: boolean): Promise<ProviderCtor[]>;
+  /**
+   * Get the content of the package.json file
+   *
+   * @param manifestPath
+   * @returns
+   */
+  private static getManifest;
 }
 //#endregion
 //#region src/Providers/CoreServiceProvider.d.ts

package/dist/index.js

@@ -1,7 +1,8 @@
 import "reflect-metadata";
 import { FileSystem, Logger, PathLoader } from "@h3ravel/shared";
-import { 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";
@@ -26,7 +27,7 @@ var Container = class {
 	*/
 	singleton(key, factory) {
 		this.bindings.set(key, () => {
-			if (!this.singletons.has(key)) this.singletons.set(key, factory());
+			if (!this.singletons.has(key)) this.singletons.set(key, factory(this));
 			return this.singletons.get(key);
 		});
 	}
@@ -96,6 +97,15 @@ var ProviderRegistry = class {
 	static providers = /* @__PURE__ */ new Map();
 	static priorityMap = /* @__PURE__ */ new Map();
 	static filteredProviders = [];
+	static sortable = true;
+	/**
+	* Set wether providers should be sorted or not.
+	* 
+	* @returns 
+	*/
+	static setSortable(sort = true) {
+		this.sortable = sort;
+	}
 	/**
 	* Get a unique identifier for the Provider.
 	* 
@@ -116,7 +126,8 @@ var ProviderRegistry = class {
 	* @returns 
 	*/
 	static register(...providers) {
-		for (const provider of this.sort(providers.concat(...this.providers.values()))) {
+		const list = this.sortable ? this.sort(providers.concat(...this.providers.values())) : providers.concat(...this.providers.values());
+		for (const provider of list) {
 			const key = this.getKey(provider);
 			this.providers.set(key, provider);
 		}
@@ -128,7 +139,8 @@ var ProviderRegistry = class {
 	* @returns 
 	*/
 	static registerMany(providers) {
-		for (const provider of this.sort(providers.concat(...this.providers.values()))) {
+		const list = this.sortable ? this.sort(providers.concat(...this.providers.values())) : providers.concat(...this.providers.values());
+		for (const provider of list) {
 			const key = this.getKey(provider);
 			this.providers.set(key, provider);
 		}
@@ -194,6 +206,18 @@ var ProviderRegistry = class {
 		});
 	}
 	/**
+	* Sort service providers
+	*/
+	static doSort() {
+		const raw = this.sort(Array.from(this.providers.values()));
+		const providers = /* @__PURE__ */ new Map();
+		for (const provider of raw) {
+			const key = this.getKey(provider);
+			providers.set(key, provider);
+		}
+		this.providers = providers;
+	}
+	/**
 	* Log the service providers in a table
 	* 
 	* @param priorityMap 
@@ -224,6 +248,45 @@ var ProviderRegistry = class {
 	static has(provider) {
 		return this.providers.has(this.getKey(provider));
 	}
+	/**
+	* Automatically search for and discover service providers in packages.
+	* 
+	* @param autoRegister 
+	* @returns 
+	*/
+	static async discoverProviders(autoRegister = true) {
+		const manifests = await fg([
+			"node_modules/@h3ravel/*/package.json",
+			"node_modules/@h3ravel-community/*/package.json",
+			"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);
+		}
+		return providers;
+	}
+	/**
+	* Get the content of the package.json file
+	* 
+	* @param manifestPath 
+	* @returns 
+	*/
+	static async getManifest(manifestPath) {
+		let pkg;
+		try {
+			pkg = (await import(manifestPath)).default;
+		} catch {
+			const { createRequire } = await import("module");
+			pkg = createRequire(import.meta.url)(manifestPath);
+		}
+		return pkg;
+	}
 };
 
 //#endregion
@@ -345,20 +408,27 @@ var Application = class Application extends Container {
 	* 
 	* @param providers All regitererable service providers
 	* @param filtered A list of service provider name strings we do not want to register at all cost
+	* @param autoRegisterProviders If set to false, service providers will not be auto discovered and registered.
+	* 
 	* @returns 
 	*/
-	async quickStartup(providers, filtered = []) {
+	async quickStartup(providers, filtered = [], autoRegisterProviders = true) {
 		this.registerProviders(providers, filtered);
-		await this.registerConfiguredProviders();
+		await this.registerConfiguredProviders(autoRegisterProviders);
 		return this.boot();
 	}
 	/**
 	* Dynamically register all configured providers
+	* 
+	* @param autoRegister If set to false, service providers will not be auto discovered and registered.
 	*/
-	async registerConfiguredProviders() {
+	async registerConfiguredProviders(autoRegister = true) {
 		const providers = await this.getAllProviders();
+		ProviderRegistry.setSortable(false);
 		ProviderRegistry.setFiltered(this.filteredProviders);
 		ProviderRegistry.registerMany(providers);
+		if (autoRegister) await ProviderRegistry.discoverProviders();
+		ProviderRegistry.doSort();
 		for (const ProviderClass of ProviderRegistry.all()) {
 			if (!ProviderClass) continue;
 			const provider = new ProviderClass(this);
@@ -549,6 +619,11 @@ var ConsoleCommand = class {
 		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")
+		});
 	}
 	getSignature() {
 		return this.signature;
@@ -571,10 +646,91 @@ var ConsoleCommand = class {
 		return this.input.arguments;
 	}
 	loadBaseFlags() {
-		this.input.options.lock = this.program.getOptionValue("lock") ?? false;
 		this.input.options.quiet = this.program.getOptionValue("quiet") ?? false;
 		this.input.options.silent = this.program.getOptionValue("silent") ?? false;
-		this.input.options.verbose = this.program.getOptionValue("verbose") ?? 0;
+		this.input.options.verbose = Number(this.program.getOptionValue("verbose") ?? 0);
+		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);
+		return this;
+	}
+	/**
+	* Log a debug message
+	*/
+	debug(message) {
+		Logger.debug(message);
+		return this;
 	}
 };