# HG changeset patch
# User cin
# Date 2022-12-14 22:54:59
# Node ID 5683fe88e2a507228e588a0528dfd2c99df609fc
# Parent  83fa5814462d5ed3c76a4f227d0cb8c8b7249f51

Corrected method signatures

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
@@ -15,7 +15,7 @@ export class ContainerBuilder<S extends 
         this._services = Object.create(parentServices ? parentServices : null) as object;
     }
 
-    createServiceBuilder<K extends keyof S>(name: K): IDescriptorBuilder<S, NonNullable<S[K]>, object> {
+    createServiceBuilder<K extends keyof S>(name: K): IDescriptorBuilder<ContainerServices<S>, NonNullable<S[K]>, object, keyof S> {
         return new DescriptorBuilder(this._lifetimeManager, this._register(name), this._fail);
     }
 
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
@@ -8,7 +8,7 @@ import { each, isKey, isPromise, isStrin
  * @template {S} Карта доступных зависимостей, как правило `ContainerServices`
  * @template {T} Тип сервиса
  */
-export class DescriptorBuilder<S extends object, T, R extends object = object> implements IDescriptorBuilder<S, T, R> {
+export class DescriptorBuilder<S extends object, T, R extends object, O extends keyof S> implements IDescriptorBuilder<S, T, R, O> {
     private readonly _lifetimeManager: LifetimeManager;
     private readonly _cb: (d: Descriptor<S, T>) => void;
 
@@ -51,7 +51,7 @@ export class DescriptorBuilder<S extends
             X[k] extends keyof S ? NonNullable<S[X[k]]> :
             X[k] extends Ref<infer K, infer L, infer D> ? Resolved<S, K & keyof S, L, D> :
             never;
-        }> {
+        }, O> {
 
         each(refs, (v, k) => this._refs[k] = v);
 
@@ -60,7 +60,7 @@ export class DescriptorBuilder<S extends
             X[k] extends keyof S ? NonNullable<S[X[k]]> :
             X[k] extends Ref<infer K, infer L, infer D> ? Resolved<S, K & keyof S, L, D> :
             never;
-        }>;
+        }, O>;
     }
     factory(f: (refs: R) => T): void {
         this._assertBuilding();
@@ -79,9 +79,9 @@ export class DescriptorBuilder<S extends
         this._finalized = true;
     }
 
-    override<K extends ConfigurableKeys<S>>(name: K, builder: RegistrationBuilder<S, NonNullable<S[K]>>): this;
-    override<K extends ConfigurableKeys<S>>(services: { [k in K]: RegistrationBuilder<S, NonNullable<S[k]>> }): this;
-    override<K extends ConfigurableKeys<S>>(nameOrServices: K | { [name in K]: RegistrationBuilder<S, NonNullable<S[K]>> }, builder?: RegistrationBuilder<S, NonNullable<S[K]>>): this {
+    override<K extends O>(name: K, builder: RegistrationBuilder<S, NonNullable<S[K]>>): this;
+    override<K extends O>(services: { [k in K]: RegistrationBuilder<S, NonNullable<S[k]>> }): this;
+    override<K extends O>(nameOrServices: K | { [name in K]: RegistrationBuilder<S, NonNullable<S[K]>> }, builder?: RegistrationBuilder<S, NonNullable<S[K]>>): this {
         this._assertBuilding();
         const guard = (v: void | Promise<void>) => {
             if (isPromise(v))
@@ -91,7 +91,7 @@ export class DescriptorBuilder<S extends
         if (isKey(nameOrServices)) {
             if (builder) {
                 this._defer();
-                const d = new DescriptorBuilder<S, NonNullable<S[K]>>(
+                const d = new DescriptorBuilder<S, NonNullable<S[K]>, object, O>(
                     this._lifetimeManager,
                     result => {
                         this._overrides[nameOrServices] = result;
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
@@ -1,8 +1,7 @@
-import { Descriptor, ILifetime, ConfigurableKeys, DepsMap, Ref, IActivationContext } from "./interfaces";
-import { ActivationContext } from "./ActivationContext";
+import { Descriptor, ILifetime, DepsMap, Ref, IActivationContext } from "./interfaces";
 import { each, isKey, key } from "./traits";
 
-export type RegistrationOverridesMap<S extends object> = { [k in ConfigurableKeys<S>]?: Descriptor<S, NonNullable<S[k]>> };
+export type RegistrationOverridesMap<S extends object> = { [k in keyof S]?: Descriptor<S, NonNullable<S[k]>> };
 
 export interface DescriptorImplArgs<S extends object, T> {
     lifetime: ILifetime<T>;
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
@@ -1,4 +1,3 @@
-import { ActivationContext } from "./ActivationContext";
 import { key } from "./traits";
 
 export interface IDestroyable {
@@ -35,7 +34,7 @@ export type Ref<K extends key, L extends
 export type Resolved<S, K extends keyof S, L, D> =
     L extends true ? () => NonNullable<S[K]> | (unknown extends D ? never : D) : NonNullable<S[K]> | (unknown extends D ? never : D);
 
-export interface IDescriptorBuilder<S extends object, T, R extends object = object> {
+export interface IDescriptorBuilder<S extends object, T, R extends object, O extends keyof S> {
 
     /**
      * 
@@ -49,10 +48,10 @@ export interface IDescriptorBuilder<S ex
             X[k] extends keyof S ? NonNullable<S[X[k]]> :
             X[k] extends Ref<infer K, infer L, infer D> ? Resolved<S, K & keyof S, L, D> :
             never
-        }>
+        }, O>
 
-    override<K extends ConfigurableKeys<S>>(name: K, builder: RegistrationBuilder<S, NonNullable<S[K]>>): this;
-    override<K extends ConfigurableKeys<S>>(services: { [name in K]: RegistrationBuilder<S, NonNullable<S[K]>> }): this;
+    override<K extends O>(name: K, builder: RegistrationBuilder<S, NonNullable<S[K]>>): this;
+    override<K extends O>(services: { [name in K]: RegistrationBuilder<S, NonNullable<S[K]>> }): this;
 
     lifetime(lifetime: "singleton", typeId: string | number | object): this;
     lifetime(lifetime: ILifetime<T> | Exclude<ActivationType, "singleton">): this;
@@ -62,9 +61,9 @@ export interface IDescriptorBuilder<S ex
     value(v: T): void;
 }
 
-export type RegistrationBuilder<S extends object, T> = (d: IDescriptorBuilder<S, T>) => void;
+export type RegistrationBuilder<S extends object, T> = (d: IDescriptorBuilder<S, T, object, ConfigurableKeys<S>>) => void;
 
-export type RegistrationBuildersMap<S extends object, K extends ConfigurableKeys<S> = ConfigurableKeys<S>> = {
+export type RegistrationBuildersMap<S extends Configurable<S>, K extends keyof S = keyof S> = {
     [k in K]-?: RegistrationBuilder<ContainerServices<S>, NonNullable<S[k]>>
 };
 
@@ -78,8 +77,6 @@ export interface IActivationContext<S ex
     createContainerLifetime<T>(): ILifetime<T>;
 }
 
-export type ConfigurableDescriptor<S extends object, K extends ConfigurableKeys<S>> = Descriptor<ContainerServices<S>, S[K]>;
-
 export type RegistrationMap<S extends object, K extends keyof S = keyof S> = {
     [k in K]-?: Descriptor<S, S[k]>;
 };
@@ -119,7 +116,7 @@ export interface ServiceContainer<S exte
 }
 
 export interface IContainerBuilder<S extends Configurable<S>> {
-    createServiceBuilder<K extends keyof S>(name: K): IDescriptorBuilder<S, NonNullable<S[K]>>;
+    createServiceBuilder<K extends keyof S>(name: K): IDescriptorBuilder<S, NonNullable<S[K]>, object, keyof S>;
 
     build(): ServiceContainer<S>;
 }