@h3ravel/core 1.29.0-alpha.16 → 2.0.0-alpha.16

package/dist/index.d.ts

@@ -2,11 +2,12 @@
 import { PathLoader } from "@h3ravel/shared";
 import { H3, H3Event } from "h3";
 import { Bindings, CallableConstructor, ClassConstructor, ConcreteConstructor, ExtractClassMethods, GenericObject, IApplication, IBinding, IBootstraper, IContainer, IController, IHttpContext, IMiddleware, IPathName, IRegisterer, IRouter, IServiceProvider, IUrl, UseKey } from "@h3ravel/contracts";
-import { AppBuilder, Inject, Injectable, MiddlewareHandler, ResponseCodes } from "@h3ravel/foundation";
 import { ServiceProvider } from "@h3ravel/support";
+import { AppBuilder, Inject, Injectable, MiddlewareHandler, ResponseCodes } from "@h3ravel/foundation";
 
 //#region src/Container.d.ts
 declare class Container extends IContainer {
+  private static readonly containerToken;
   bindings: Map<IBinding, () => unknown>;
   singletons: Map<IBinding, unknown>;
   middlewareHandler?: MiddlewareHandler;
@@ -25,23 +26,23 @@ declare class Container extends IContainer {
   /**
    * All of the registered rebound callbacks.
    */
-  protected reboundCallbacks: Map<string | (new (...args: any[]) => unknown), ((...args: any[]) => any)[]>;
+  protected reboundCallbacks: Map<string | symbol | (new (...args: any[]) => unknown), ((...args: any[]) => any)[]>;
   /**
    * The container's shared instances.
    */
-  protected instances: Map<string | (new (...args: any[]) => unknown), new (...args: any[]) => any>;
+  protected instances: Map<string | symbol | (new (...args: any[]) => unknown), new (...args: any[]) => any>;
   /**
    * The container's resolved instances.
    */
-  protected resolvedInstances: Map<string | (new (...args: any[]) => unknown), any>;
+  protected resolvedInstances: Map<string | symbol | (new (...args: any[]) => unknown), any>;
   /**
    * The registered type alias.
    */
-  protected aliases: Map<string | ClassConstructor, any>;
+  protected aliases: Map<IBinding, any>;
   /**
    * The registered aliases keyed by the abstract name.
    */
-  protected abstractAliases: Map<string | ClassConstructor, any[]>;
+  protected abstractAliases: Map<IBinding, any[]>;
   /**
    * The registered aliases keyed by the abstract name.
    */
@@ -49,7 +50,7 @@ declare class Container extends IContainer {
   /**
    * The extension closures for services.
    */
-  protected extenders: Map<string | (new (...args: any[]) => unknown), CallableConstructor[]>;
+  protected extenders: Map<string | symbol | (new (...args: any[]) => unknown), CallableConstructor[]>;
   /**
    * Check if the target has any decorators
    *
@@ -179,6 +180,13 @@ declare class Container extends IContainer {
    * @param  abstract
    */
   getAlias(abstract: any): any;
+  /**
+   * Convert contract constructors to stable keys shared across module loaders.
+   *
+   * @param key
+   * @returns
+   */
+  private normalizeKey;
   /**
    * Get the extender callbacks for a given type.
    *

package/dist/index.js

@@ -1,12 +1,11 @@
-import { createRequire } from "node:module";
 import "reflect-metadata";
-import { FileSystem, Logger, PathLoader, Resolver } from "@h3ravel/shared";
+import { FileSystem, Logger, PathLoader, Resolver, importFile } from "@h3ravel/shared";
 import { H3, serve } from "h3";
 import { CKernel, IApplication, IContainer, IController, IKernel, IRegisterer } from "@h3ravel/contracts";
 import { Arr, InvalidArgumentException, Obj, RuntimeException, ServiceProvider, Str, data_get, dd, dump, str } from "@h3ravel/support";
 import { AppBuilder, ConfigException, Helpers, HttpException, Inject, Injectable, MiddlewareHandler, NotFoundHttpException } from "@h3ravel/foundation";
-import { createRequire as createRequire$1 } from "module";
 import fg from "fast-glob";
+import { readFileSync } from "node:fs";
 import path from "node:path";
 import { detect } from "detect-port";
 import dotenv from "dotenv";
@@ -53,6 +52,7 @@ var ContainerResolver = class ContainerResolver {
 //#endregion
 //#region src/Container.ts
 var Container = class Container extends IContainer {
+	static containerToken = Symbol.for("@h3ravel/contracts/container-token");
 	bindings = /* @__PURE__ */ new Map();
 	singletons = /* @__PURE__ */ new Map();
 	middlewareHandler;
@@ -144,6 +144,7 @@ var Container = class Container extends IContainer {
 		}
 	}
 	singleton(key, factory) {
+		key = this.getAlias(key);
 		this.bindings.set(key, () => {
 			if (!this.singletons.has(key)) this.singletons.set(key, this.call(factory));
 			return this.singletons.get(key);
@@ -230,11 +231,13 @@ var Container = class Container extends IContainer {
 		return resolved;
 	}
 	afterResolving(key, callback) {
+		key = this.getAlias(key);
 		const existing = this.afterResolvingCallbacks.get(key) || [];
 		existing.push(callback);
 		this.afterResolvingCallbacks.set(key, existing);
 	}
 	beforeResolving(key, callback) {
+		key = this.getAlias(key);
 		const existing = this.beforeResolvingCallbacks.get(key) || [];
 		existing.push(callback);
 		this.beforeResolvingCallbacks.set(key, existing);
@@ -280,6 +283,7 @@ var Container = class Container extends IContainer {
 	* @param name
 	*/
 	isAlias(name) {
+		name = this.normalizeKey(name);
 		return this.aliases.has(name) && typeof this.aliases.get(name) !== "undefined";
 	}
 	/**
@@ -288,11 +292,22 @@ var Container = class Container extends IContainer {
 	* @param  abstract
 	*/
 	getAlias(abstract) {
-		if (typeof abstract === "string" && this.aliases.has(abstract)) return this.getAlias(this.aliases.get(abstract));
+		abstract = this.normalizeKey(abstract);
+		if (this.aliases.has(abstract)) return this.getAlias(this.aliases.get(abstract));
 		if (abstract == null) return abstract;
 		return this.aliases.get(abstract) ?? abstract;
 	}
 	/**
+	* Convert contract constructors to stable keys shared across module loaders.
+	*
+	* @param key
+	* @returns
+	*/
+	normalizeKey(key) {
+		if (key != null && Object.prototype.hasOwnProperty.call(key, Container.containerToken)) return key[Container.containerToken];
+		return key;
+	}
+	/**
 	* Get the extender callbacks for a given type.
 	*
 	* @param  abstract
@@ -309,8 +324,8 @@ var Container = class Container extends IContainer {
 		this.extenders.delete(this.getAlias(abstract));
 	}
 	alias(key, target) {
-		if (Array.isArray(key)) for (const [tokn, targ] of key) this.aliases.set(tokn, targ);
-		else this.aliases.set(key, target);
+		if (Array.isArray(key)) for (const [tokn, targ] of key) this.aliases.set(this.normalizeKey(tokn), this.normalizeKey(targ));
+		else this.aliases.set(this.normalizeKey(key), this.normalizeKey(target));
 		return this;
 	}
 	rebinding(abstract, callback) {
@@ -319,6 +334,7 @@ var Container = class Container extends IContainer {
 		if (this.bound(abstract)) return this.make(abstract);
 	}
 	bound(abstract) {
+		abstract = this.getAlias(abstract);
 		return this.bindings.has(abstract) || !!this.instances.get(abstract) || this.isAlias(abstract);
 	}
 	has(key) {
@@ -330,7 +346,7 @@ var Container = class Container extends IContainer {
 	* @param abstract
 	*/
 	resolved(abstract) {
-		if (this.isAlias(abstract)) abstract = this.getAlias(abstract);
+		abstract = this.getAlias(abstract);
 		return this.resolvedInstances.has(abstract) || this.instances.has(abstract);
 	}
 	extend(abstract, closure) {
@@ -570,7 +586,7 @@ var ProviderRegistry = class {
 		if (autoRegister) {
 			for (const manifestPath of manifests) {
 				const pkg = 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 (pkg.h3ravel?.providers) providers.push(...await Promise.all(pkg.h3ravel.providers.map(async (name) => (await importFile(path.resolve(path.dirname(manifestPath), "dist/index.js")))[name])));
 			}
 			for (const provider of providers.filter((e) => typeof e !== "undefined")) {
 				const key = this.getKey(provider);
@@ -586,7 +602,7 @@ var ProviderRegistry = class {
 	* @returns 
 	*/
 	static getManifest(manifestPath) {
-		return createRequire$1(import.meta.url)(manifestPath);
+		return JSON.parse(readFileSync(manifestPath, "utf8"));
 	}
 };
 //#endregion
@@ -1153,7 +1169,7 @@ var Application = class Application extends Container {
 	*/
 	getNamespace() {
 		if (this.namespace != null) return this.namespace;
-		const pkg = createRequire(import.meta.url)(path.join(process.cwd(), "package.json"));
+		const pkg = JSON.parse(readFileSync(path.join(this.basePath, "package.json"), "utf8"));
 		for (const [namespace, pathChoice] of Object.entries(data_get(pkg, "autoload.namespaces"))) if (this.getPath("app", "/") === this.getPath("src", pathChoice)) return this.namespace = namespace;
 		throw new RuntimeException("Unable to detect application namespace.");
 	}

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@h3ravel/core",
-  "version": "1.29.0-alpha.16",
+  "version": "2.0.0-alpha.16",
   "description": "Core application container, lifecycle management and service providers for H3ravel.",
   "type": "module",
-  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
-  "module": "./dist/index.js",
   "exports": {
     ".": {
       "import": "./dist/index.js",
@@ -43,9 +41,9 @@
     "laravel"
   ],
   "dependencies": {
-    "@h3ravel/shared": "^1.29.0-alpha.16",
-    "@h3ravel/support": "^1.29.0-alpha.16",
-    "@h3ravel/foundation": "^1.29.0-alpha.16",
+    "@h3ravel/shared": "^2.0.0-alpha.16",
+    "@h3ravel/support": "^2.0.0-alpha.16",
+    "@h3ravel/foundation": "^2.0.0-alpha.16",
     "chalk": "^5.6.2",
     "commander": "^14.0.1",
     "detect-port": "^2.1.0",
@@ -59,13 +57,13 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@h3ravel/contracts": "^1.29.0-alpha.16",
+    "@h3ravel/contracts": "^2.0.0-alpha.16",
     "@types/semver": "^7.7.1",
     "typescript": "^6.0.0"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",
-    "dev": "tsx watch src/index.ts",
+    "dev": "tsdown --watch --config-loader unrun",
     "start": "node dist/index.js",
     "lint": "eslint . --ext .ts",
     "test": "jest --passWithNoTests",