# HG changeset patch
# User cin
# Date 2023-10-01 10:26:32
# Node ID 3f8a82c8ce7388337215bfb9ba15addddb85845a
# Parent  dc3d64c435739f44e7236416243b2d995b2d2f8c

WIP lifetime, service descriptors

diff --git a/src/main/ts/ActivationContext.ts b/src/main/ts/ActivationContext.ts
--- a/src/main/ts/ActivationContext.ts
+++ b/src/main/ts/ActivationContext.ts
@@ -1,5 +1,5 @@
 import { ActivationError } from "./ActivationError";
-import { Descriptor, ILifetime, IActivationContext, DescriptorMap, ILifetimeManager } from "./interfaces";
+import { Descriptor, ILifetime, IActivationContext, DescriptorMap, ILifetimeManager, ILifetimeSlot } from "./interfaces";
 import { argumentNotNull, prototype } from "./traits";
 
 export interface ActivationContextInfo {
@@ -85,6 +85,18 @@ export class ActivationContext<S> implem
         this._services[name] = service;
     }
 
+    ownerSlot<T>(slotId: string | number): ILifetimeSlot<T> {
+        return this._lifetimeManagers[this._service.level].slot(slotId);
+    }
+
+    containerSlot<T>(slotId: string | number): ILifetimeSlot<T> {
+        return this._lifetimeManagers[this._lifetimeManagers.length - 1].slot(slotId);
+    }
+
+    contextSlot<T>(slotId: string | number): ILifetimeSlot<T> {
+        
+    }
+
     createLifetime<T>(): ILifetime<T> {
         const id = nextId++;
         return {
diff --git a/src/main/ts/ContainerBuilder.ts b/src/main/ts/ContainerBuilder.ts
--- a/src/main/ts/ContainerBuilder.ts
+++ b/src/main/ts/ContainerBuilder.ts
@@ -8,7 +8,7 @@ import { isDestroyable, prototype } from
 /**
  * Container builder used to prepare service descriptors and create a IoC container
  */
-export class ContainerBuilder<S extends ContainerServicesConstraint<S>, U extends keyof S> implements
+export class ContainerBuilder<S, U extends keyof S> implements
     IContainerBuilder<S, U> {
 
     private _pending = 1;
@@ -20,12 +20,7 @@ export class ContainerBuilder<S extends 
     private readonly _lifetime: ILifetime<IDestroyable>;
 
     constructor(parentServices: DescriptorMap<S> | null = null, lifetime?: ILifetime<IDestroyable>) {
-        this._services = {
-            ...parentServices,
-            container: containerSelfDescriptor as any,
-            childContainer: containerSelfDescriptor as any
-        };
-        this._lifetimeManager = new LifetimeManager();
+        this._services = { ...parentServices }; // create a copy
         this._lifetime = lifetime ?? emptyLifetime();
     }
     createServiceBuilder<K extends U>(name: K):
diff --git a/src/main/ts/DescriptorBuilder.ts b/src/main/ts/DescriptorBuilder.ts
--- a/src/main/ts/DescriptorBuilder.ts
+++ b/src/main/ts/DescriptorBuilder.ts
@@ -1,7 +1,7 @@
 import { BuildDescriptorFn, IDescriptorBuilder, DepsMap, Resolve, DescriptorMap } from "./interfaces";
 import { Descriptor, ILifetime, ActivationType } from "./interfaces";
 import { DescriptorImpl } from "./DescriptorImpl";
-import { contextLifetime, emptyLifetime, hierarchyLifetime, LifetimeManager, singletonLifetime } from "./LifetimeManager";
+import { containerLifetime, contextLifetime, emptyLifetime, hierarchyLifetime, LifetimeManager, singletonLifetime } from "./LifetimeManager";
 import { each, isPromise, isString, key, oid } from "./traits";
 
 /**
@@ -9,14 +9,13 @@ import { each, isPromise, isString, key,
  * @template {T} Тип сервиса
  */
 export class DescriptorBuilder<S, T, R, U extends keyof S> implements IDescriptorBuilder<S, T, R, U> {
-    private readonly _lifetimeManager: LifetimeManager;
     private readonly _cb: (d: Descriptor<S, T>) => void;
 
     private readonly _eb: (err: unknown) => void;
 
     private readonly _refs: DepsMap<R>;
 
-    private _lifetime = emptyLifetime<T>();
+    private _lifetime: ILifetime<T> = emptyLifetime<T>();
 
     private _overrides: DescriptorMap<S>;
 
@@ -34,12 +33,10 @@ export class DescriptorBuilder<S, T, R, 
      * Creates new DescriptorBuilder. Accepts a lifetime container for resolving "container"
      * lifetime.
      * 
-     * @param lifetimeManager The lifetime container is the container where the service is to be registered.
      * @param cb The callback to receive the built service descriptor
      * @param eb The callback to receive the error due 
      */
-    constructor(lifetimeManager: LifetimeManager, cb: (d: Descriptor<S, T>) => void, eb: (err: unknown) => void) {
-        this._lifetimeManager = lifetimeManager;
+    constructor(cb: (d: Descriptor<S, T>) => void, eb: (err: unknown) => void) {
         this._cb = cb;
         this._eb = eb;
         this._overrides = {};
@@ -88,7 +85,6 @@ export class DescriptorBuilder<S, T, R, 
             if (builder) {
                 this._defer();
                 const d = new DescriptorBuilder<S, NonNullable<S[K]>, object, U>(
-                    this._lifetimeManager,
                     result => {
                         this._overrides[nameOrServices] = result;
                         this._complete();
@@ -149,7 +145,7 @@ export class DescriptorBuilder<S, T, R, 
     _resolveLifetime<T>(activation: ActivationType, typeId?: string | object): ILifetime<T> {
         switch (activation) {
             case "container":
-                return this._lifetimeManager.create();
+                return containerLifetime();
             case "hierarchy":
                 return hierarchyLifetime();
             case "context":
diff --git a/src/main/ts/DescriptorImpl.ts b/src/main/ts/DescriptorImpl.ts
--- a/src/main/ts/DescriptorImpl.ts
+++ b/src/main/ts/DescriptorImpl.ts
@@ -2,15 +2,16 @@ import { Descriptor, ILifetime, DepsMap,
 import { each, key } from "./traits";
 
 export interface DescriptorImplArgs<S, T> {
-    lifetime: ILifetime<T>;
 
-    factory: (refs: Record<key, unknown>) => NonNullable<T>;
+    readonly lifetime: ILifetime<NonNullable<T>>;
+
+    readonly factory: (refs: Record<key, unknown>) => NonNullable<T>;
 
-    cleanup?: (item: NonNullable<T>) => void;
+    readonly cleanup?: (item: NonNullable<T>) => void;
 
-    overrides?: DescriptorMap<S>;
+    readonly overrides?: DescriptorMap<S>;
 
-    dependencies?: DepsMap<S>;
+    readonly dependencies?: DepsMap<S>;
 }
 
 export const containerSelfDescriptor = <S>() => Object.freeze({
@@ -25,7 +26,7 @@ export class DescriptorImpl<S, T> implem
 
     private readonly _overrides?: DescriptorMap<S>;
 
-    private readonly _lifetime: ILifetime<T>;
+    private readonly _lifetime: ILifetime<NonNullable<T>>;
 
     private readonly _factory: (refs: Record<key, unknown>) => NonNullable<T>;
 
@@ -54,7 +55,7 @@ export class DescriptorImpl<S, T> implem
 
         if (has())
             return get();
-        
+
         initialize();
 
         if (this._overrides)
@@ -87,12 +88,12 @@ export class DescriptorImpl<S, T> implem
 
         try {
             // call the factory method
-            const instance = (0,this._factory)(refs);
-            
+            const instance = (0, this._factory)(refs);
+
             // store the instance
             store(instance, this._cleanup);
             return instance;
-        } catch(err) {
+        } catch (err) {
             context.fail(err);
         }
     }
diff --git a/src/main/ts/interfaces.ts b/src/main/ts/interfaces.ts
--- a/src/main/ts/interfaces.ts
+++ b/src/main/ts/interfaces.ts
@@ -158,10 +158,6 @@ export type ContainerServicesConstraint<
 
 export interface Descriptor<S, T> {
 
-    /** The level of the service in the containers chain.
-    */
-    readonly level: number;
-
     /** This flags indicates that this registration can be replaced or overridden. */
     readonly configurable?: boolean;
 
@@ -252,7 +248,7 @@ export type ActivationType = "singleton"
  * Интерфейс для управления жизнью экземпляра объекта. Каждая регистрация имеет
  * свой собственный объект `ILifetime`, который создается при первой активации
  */
-export type ILifetime<T> = (context: ILifetimeContext) => ILifetimeSlot<NonNullable<T>>;
+export type ILifetime<T> = (context: ILifetimeContext) => ILifetimeSlot<T>;
 
 export interface ILifetimeSlot<T> {
     readonly has: () => boolean;