@illuma/core 1.1.0 → 1.3.0

package/dist/{plugin-container-CwkVlVS4.d.ts → plugin-container-GF2OqmiJ.d.ts}

@@ -1,4 +1,4 @@
-import { a as NodeToken, M as MultiNodeToken, N as NodeBase } from './providers-D9YA8L_g.js';
+import { N as NodeToken, M as MultiNodeToken, a as NodeBase } from './types-5mX9F_24.js';
 
 /**
  * Represents a single dependency injection point in the dependency graph.
@@ -12,6 +12,23 @@ interface iInjectionNode<T> {
     readonly optional: boolean;
 }
 
+/**
+ * An extension that can scan a factory function for dependency injections.
+ * Should return all detected injection nodes within the factory.
+ *
+ * It's run after default injection scanning and is meant to detect additional
+ * injection patterns (e.g., custom decorators or metadata).
+ */
+interface iContextScanner {
+    /**
+     * Scans the provided factory function for dependency injections.
+     *
+     * @param factory - The factory function to scan
+     * @returns A set of detected injection nodes
+     */
+    scan(factory: any): Set<iInjectionNode<any>>;
+}
+
 declare class ProtoNodeSingle<T = any> {
     readonly token: NodeToken<T>;
     readonly injections: Set<iInjectionNode<any>>;
@@ -38,7 +55,7 @@ declare class ProtoNodeMulti<T = any> {
     toString(): string;
 }
 
-type DependencyPool = Map<NodeBase<any>, TreeNode<any>>;
+type InjectionPool = Map<NodeBase<any>, TreeNode<any>> | WeakMap<NodeBase<any>, TreeNode<any>>;
 declare class TreeNodeSingle<T = any> {
     readonly proto: ProtoNodeSingle<T>;
     private readonly _transparent;
@@ -49,7 +66,8 @@ declare class TreeNodeSingle<T = any> {
     get instance(): T;
     constructor(proto: ProtoNodeSingle<T>);
     addDependency(node: TreeNode<any>): void;
-    instantiate(pool?: DependencyPool): void;
+    collectPool(pool: InjectionPool): void;
+    instantiate(pool?: InjectionPool): void;
     toString(): string;
 }
 declare class TreeNodeTransparent<T = any> {
@@ -62,7 +80,8 @@ declare class TreeNodeTransparent<T = any> {
     get instance(): T;
     constructor(proto: ProtoNodeTransparent<T>);
     addDependency(node: TreeNode<any>): void;
-    instantiate(pool?: DependencyPool): void;
+    collectPool(pool: InjectionPool): void;
+    instantiate(pool?: InjectionPool): void;
     toString(): string;
 }
 declare class TreeNodeMulti<T = any> {
@@ -72,29 +91,13 @@ declare class TreeNodeMulti<T = any> {
     private _resolved;
     allocations: number;
     constructor(proto: ProtoNodeMulti<T>);
-    instantiate(pool?: DependencyPool): void;
+    collectPool(pool: InjectionPool): void;
+    instantiate(pool?: InjectionPool): void;
     addDependency(...nodes: TreeNode[]): void;
     toString(): string;
 }
 type TreeNode<T = any> = TreeNodeSingle<T> | TreeNodeMulti<T> | TreeNodeTransparent<T>;
 
-/**
- * An extension that can scan a factory function for dependency injections.
- * Should return all detected injection nodes within the factory.
- *
- * It's run after default injection scanning and is meant to detect additional
- * injection patterns (e.g., custom decorators or metadata).
- */
-interface iContextScanner {
-    /**
-     * Scans the provided factory function for dependency injections.
-     *
-     * @param factory - The factory function to scan
-     * @returns A set of detected injection nodes
-     */
-    scan(factory: any): Set<iInjectionNode<any>>;
-}
-
 interface iDiagnosticsReport {
     readonly totalNodes: number;
     readonly unusedNodes: TreeNode<unknown>[];

package/dist/plugins.d.cts

@@ -1,6 +1,6 @@
-import { a as iDiagnosticsModule, b as iDiagnosticsReport } from './plugin-container-D8Zwpigq.cjs';
-export { I as Illuma, c as iContextScanner } from './plugin-container-D8Zwpigq.cjs';
-import './providers-D9YA8L_g.cjs';
+import { a as iDiagnosticsModule, b as iDiagnosticsReport } from './plugin-container-DkECHcvu.cjs';
+export { I as Illuma, c as iContextScanner } from './plugin-container-DkECHcvu.cjs';
+import './types-5mX9F_24.cjs';
 
 declare class DiagnosticsDefaultReporter implements iDiagnosticsModule {
     onReport(report: iDiagnosticsReport): void;

package/dist/plugins.d.ts

@@ -1,6 +1,6 @@
-import { a as iDiagnosticsModule, b as iDiagnosticsReport } from './plugin-container-CwkVlVS4.js';
-export { I as Illuma, c as iContextScanner } from './plugin-container-CwkVlVS4.js';
-import './providers-D9YA8L_g.js';
+import { a as iDiagnosticsModule, b as iDiagnosticsReport } from './plugin-container-GF2OqmiJ.js';
+export { I as Illuma, c as iContextScanner } from './plugin-container-GF2OqmiJ.js';
+import './types-5mX9F_24.js';
 
 declare class DiagnosticsDefaultReporter implements iDiagnosticsModule {
     onReport(report: iDiagnosticsReport): void;

package/dist/testkit.cjs

@@ -25,79 +25,6 @@ __export(testkit_exports, {
 });
 module.exports = __toCommonJS(testkit_exports);
 
-// src/lib/errors.ts
-var InjectionError = class _InjectionError extends Error {
-  static {
-    __name(this, "InjectionError");
-  }
-  code;
-  constructor(code, message) {
-    super(`[i${code}] ${message}`), this.code = code;
-    this.name = "InjectionError";
-  }
-  // Provider errors
-  static duplicate(token) {
-    return new _InjectionError(100, `Duplicate provider for token "${token.toString()}" detected.`);
-  }
-  static duplicateFactory(token) {
-    return new _InjectionError(101, `Tried to re-provide factory for token "${token.toString()}" detected.`);
-  }
-  static invalidCtor(ctor) {
-    return new _InjectionError(102, `Cannot use constructor for token "${ctor.name}". Please make sure to use @nodeInjectable() decorator`);
-  }
-  static invalidProvider(provider) {
-    return new _InjectionError(103, `Cannot use provider as it is neither a NodeToken nor MultiNodeToken nor a valid constructor.:
-${provider}`);
-  }
-  // Alias errors
-  static invalidAlias(alias) {
-    const aliasStr = typeof alias === "function" ? alias.name || "Unknown" : String(alias);
-    return new _InjectionError(200, `Invalid alias target "${aliasStr}". Alias must be a NodeToken, MultiNodeToken, or a class decorated with @NodeInjectable().`);
-  }
-  static loopAlias(alias) {
-    return new _InjectionError(201, `Token "${alias.toString()}" cannot alias itself in a loop.`);
-  }
-  // Bootstrap errors
-  static notBootstrapped() {
-    return new _InjectionError(300, "Cannot retrieve providers before the container has been bootstrapped.");
-  }
-  static bootstrapped() {
-    return new _InjectionError(301, "Cannot modify providers after the container has been bootstrapped.");
-  }
-  static doubleBootstrap() {
-    return new _InjectionError(302, "Container has already been bootstrapped and cannot be bootstrapped again.");
-  }
-  // Retrieval errors
-  static notFound(token) {
-    return new _InjectionError(400, `No provider found for "${token.toString()}".`);
-  }
-  static circularDependency(provider, path) {
-    const providerStr = provider instanceof NodeBase ? provider.toString() : provider.name;
-    const pathStr = path.map((p) => p instanceof NodeBase ? p.toString() : p.name).join(" -> ");
-    return new _InjectionError(401, `Circular dependency detected while resolving "${providerStr}":
-${pathStr}`);
-  }
-  // Instantiation errors
-  static untracked(token, parent) {
-    const tokenStr = token instanceof NodeBase ? token.toString() : token.name;
-    const parentStr = parent instanceof NodeBase ? parent.toString() : parent.name;
-    return new _InjectionError(500, `Cannot instantiate ${parentStr} because it depends on untracked injection ${tokenStr}. Please make sure all injections are properly tracked.`);
-  }
-  static outsideContext(token) {
-    const tokenStr = token instanceof NodeBase ? token.toString() : token.name;
-    return new _InjectionError(501, `Cannot inject "${tokenStr}" outside of an injection context.`);
-  }
-  static calledUtilsOutsideContext() {
-    return new _InjectionError(502, "Cannot call injection utilities outside of an injection context.");
-  }
-  static instanceAccessFailed(token) {
-    return new _InjectionError(503, `Failed to access instance for token "${token.toString()}". It was not properly instantiated.`);
-  }
-  static accessFailed() {
-    return new _InjectionError(504, "Failed to access the requested instance due to an unknown error.");
-  }
-};
-
 // src/lib/api/token.ts
 var NodeBase = class {
   static {
@@ -176,14 +103,115 @@ function extractToken(provider, isAlias = false) {
 }
 __name(extractToken, "extractToken");
 
+// src/lib/errors.ts
+var ERR_CODES = {
+  // Provider errors
+  DUPLICATE_PROVIDER: 100,
+  DUPLICATE_FACTORY: 101,
+  INVALID_CTOR: 102,
+  INVALID_PROVIDER: 103,
+  // Alias errors
+  INVALID_ALIAS: 200,
+  LOOP_ALIAS: 201,
+  // Bootstrap errors
+  NOT_BOOTSTRAPPED: 300,
+  BOOTSTRAPPED: 301,
+  DOUBLE_BOOTSTRAP: 302,
+  // Retrieval errors
+  NOT_FOUND: 400,
+  CIRCULAR_DEPENDENCY: 401,
+  // Instantiation errors
+  UNTRACKED: 500,
+  OUTSIDE_CONTEXT: 501,
+  CALLED_UTILS_OUTSIDE_CONTEXT: 502,
+  INSTANCE_ACCESS_FAILED: 503,
+  ACCESS_FAILED: 504
+};
+var InjectionError = class _InjectionError extends Error {
+  static {
+    __name(this, "InjectionError");
+  }
+  code;
+  constructor(code, message) {
+    super(`[i${code}] ${message}`), this.code = code;
+    this.name = "InjectionError";
+  }
+  // Provider errors
+  static duplicate(token) {
+    return new _InjectionError(ERR_CODES.DUPLICATE_PROVIDER, `Duplicate provider for token "${token.toString()}" detected.`);
+  }
+  static duplicateFactory(token) {
+    return new _InjectionError(ERR_CODES.DUPLICATE_FACTORY, `Tried to re-provide factory for token "${token.toString()}" detected.`);
+  }
+  static invalidCtor(ctor) {
+    return new _InjectionError(ERR_CODES.INVALID_CTOR, `Cannot use constructor for token "${ctor.name}". Please make sure to use @nodeInjectable() decorator`);
+  }
+  static invalidProvider(provider) {
+    return new _InjectionError(ERR_CODES.INVALID_PROVIDER, `Cannot use provider as it is neither a NodeToken nor MultiNodeToken nor a valid constructor.:
+${provider}`);
+  }
+  // Alias errors
+  static invalidAlias(alias) {
+    const aliasStr = typeof alias === "function" ? alias.name || "Unknown" : String(alias);
+    return new _InjectionError(ERR_CODES.INVALID_ALIAS, `Invalid alias target "${aliasStr}". Alias must be a NodeToken, MultiNodeToken, or a class decorated with @NodeInjectable().`);
+  }
+  static loopAlias(alias) {
+    return new _InjectionError(ERR_CODES.LOOP_ALIAS, `Token "${alias.toString()}" cannot alias itself in a loop.`);
+  }
+  // Bootstrap errors
+  static notBootstrapped() {
+    return new _InjectionError(ERR_CODES.NOT_BOOTSTRAPPED, "Cannot retrieve providers before the container has been bootstrapped.");
+  }
+  static bootstrapped() {
+    return new _InjectionError(ERR_CODES.BOOTSTRAPPED, "Cannot modify providers after the container has been bootstrapped.");
+  }
+  static doubleBootstrap() {
+    return new _InjectionError(ERR_CODES.DOUBLE_BOOTSTRAP, "Container has already been bootstrapped and cannot be bootstrapped again.");
+  }
+  // Retrieval errors
+  static notFound(token) {
+    return new _InjectionError(ERR_CODES.NOT_FOUND, `No provider found for "${token.toString()}".`);
+  }
+  static circularDependency(provider, path) {
+    const providerStr = provider instanceof NodeBase ? provider.toString() : provider.name;
+    const pathStr = path.map((p) => p instanceof NodeBase ? p.toString() : p.name).join(" -> ");
+    return new _InjectionError(ERR_CODES.CIRCULAR_DEPENDENCY, `Circular dependency detected while resolving "${providerStr}":
+${pathStr}`);
+  }
+  // Instantiation errors
+  static untracked(token, parent) {
+    const tokenStr = token instanceof NodeBase ? token.toString() : token.name;
+    const parentStr = parent instanceof NodeBase ? parent.toString() : parent.name;
+    return new _InjectionError(ERR_CODES.UNTRACKED, `Cannot instantiate ${parentStr} because it depends on untracked injection ${tokenStr}. Please make sure all injections are properly tracked.`);
+  }
+  static outsideContext(token) {
+    const tokenStr = token instanceof NodeBase ? token.toString() : token.name;
+    return new _InjectionError(ERR_CODES.OUTSIDE_CONTEXT, `Cannot inject "${tokenStr}" outside of an injection context.`);
+  }
+  static calledUtilsOutsideContext() {
+    return new _InjectionError(ERR_CODES.CALLED_UTILS_OUTSIDE_CONTEXT, "Cannot call injection utilities outside of an injection context.");
+  }
+  static instanceAccessFailed(token) {
+    return new _InjectionError(ERR_CODES.INSTANCE_ACCESS_FAILED, `Failed to access instance for token "${token.toString()}". It was not properly instantiated.`);
+  }
+  static accessFailed() {
+    return new _InjectionError(ERR_CODES.ACCESS_FAILED, "Failed to access the requested instance due to an unknown error.");
+  }
+};
+
 // src/lib/api/decorator.ts
+var tokenRegistry = /* @__PURE__ */ new WeakMap();
 var INJECTION_SYMBOL = Symbol("Injectable");
 function isInjectable(ctor) {
-  return typeof ctor === "function" && isConstructor(ctor) && INJECTION_SYMBOL in ctor && ctor[INJECTION_SYMBOL] instanceof NodeToken;
+  return typeof ctor === "function" && isConstructor(ctor) && (tokenRegistry.has(ctor) || INJECTION_SYMBOL in ctor);
 }
 __name(isInjectable, "isInjectable");
 function getInjectableToken(ctor) {
-  return ctor[INJECTION_SYMBOL];
+  if (tokenRegistry.has(ctor)) return tokenRegistry.get(ctor);
+  if (INJECTION_SYMBOL in ctor) {
+    return ctor[INJECTION_SYMBOL];
+  }
+  throw InjectionError.invalidCtor(ctor);
 }
 __name(getInjectableToken, "getInjectableToken");
 function isConstructor(fn) {
@@ -441,23 +469,29 @@ var TreeRootNode = class {
   static {
     __name(this, "TreeRootNode");
   }
+  instant;
   _deps = /* @__PURE__ */ new Set();
-  _treePool = /* @__PURE__ */ new Map();
+  _treePool = /* @__PURE__ */ new WeakMap();
+  constructor(instant = true) {
+    this.instant = instant;
+  }
   get dependencies() {
     return this._deps;
   }
   addDependency(node) {
     this._deps.add(node);
   }
-  instantiate() {
+  build() {
     for (const dep of this._deps) {
-      dep.instantiate(this._treePool);
       if ("token" in dep.proto) this._treePool.set(dep.proto.token, dep);
+      if (this.instant) dep.instantiate(this._treePool);
+      else dep.collectPool(this._treePool);
     }
   }
   find(token) {
     const node = this._treePool.get(token);
     if (!node) return null;
+    if (!this.instant) node.instantiate(this._treePool);
     return node;
   }
   toString() {
@@ -488,6 +522,11 @@ var TreeNodeSingle = class {
     else this._deps.set(node.proto.token, node);
     node.allocations++;
   }
+  collectPool(pool) {
+    for (const node of this._deps.values()) node.collectPool(pool);
+    for (const dep of this._transparent) dep.collectPool(pool);
+    pool.set(this.proto.token, this);
+  }
   instantiate(pool) {
     if (this._resolved) return;
     for (const node of this._deps.values()) node.instantiate(pool);
@@ -525,6 +564,10 @@ var TreeNodeTransparent = class _TreeNodeTransparent {
     else this._deps.set(node.proto.token, node);
     node.allocations++;
   }
+  collectPool(pool) {
+    for (const node of this._deps.values()) node.collectPool(pool);
+    for (const dep of this._transparent) dep.collectPool(pool);
+  }
   instantiate(pool) {
     if (this._resolved) return;
     for (const dep of this._transparent) dep.instantiate(pool);
@@ -549,6 +592,10 @@ var TreeNodeMulti = class _TreeNodeMulti {
   constructor(proto) {
     this.proto = proto;
   }
+  collectPool(pool) {
+    for (const dep of this._deps) dep.collectPool(pool);
+    pool.set(this.proto.token, this);
+  }
   instantiate(pool) {
     if (this._resolved) return;
     for (const dep of this._deps) {
@@ -854,7 +901,7 @@ var NodeContainer = class extends Illuma {
     return parentNode.findNode(token);
   }
   _buildInjectionTree() {
-    const root = new TreeRootNode();
+    const root = new TreeRootNode(this._opts?.instant);
     const cache = /* @__PURE__ */ new Map();
     const nodes = [
       ...this._protoNodes.values(),
@@ -899,7 +946,7 @@ var NodeContainer = class extends Illuma {
       value: new InjectorImpl(this)
     });
     this._rootNode = this._buildInjectionTree();
-    this._rootNode.instantiate();
+    this._rootNode.build();
     this._bootstrapped = true;
     const end = performance.now();
     const duration = end - start;