implab/implabjs-di Commit - r6:5683fe88e2a5

Corrected method signatures

cin -

r6:5683fe88e2a5 default

parent child

Context file:

r6:5683fe88e2a5

Collapse all files

src/main/ts/ContainerBuilder.ts +1 -1

                     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);
                 }

src/main/ts/DescriptorBuilder.ts +7 -7

              * @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;
                         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);
                         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();
                     this._finalized = true;
                 }
-                override<K extends ConfigurableKeys<S>>(name: K, builder: RegistrationBuilder<S, NonNullable<S[K]>>): this;
+                override<K extends O>(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 O>(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>(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))
                     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;

src/main/ts/DescriptorImpl.ts +2 -3

-            import { Descriptor, ILifetime, ConfigurableKeys, DepsMap, Ref, IActivationContext } from "./interfaces";
+            import { Descriptor, ILifetime, DepsMap, Ref, IActivationContext } from "./interfaces";
-            import { ActivationContext } from "./ActivationContext";
             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>;

src/main/ts/interfaces.ts +7 -10

-            import { ActivationContext } from "./ActivationContext";
             import { key } from "./traits";
             export interface IDestroyable {
             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> {
                 /**
                  *
                         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 O>(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>(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;
                 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]>>
             };
                 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]>;
             };
             }
             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>;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages