implab/implabjs-core Commit - r133:09ea4b9e3735

working on fluent configuration

cin -

r133:09ea4b9e3735 ioc ts support

parent child

Context file:

r133:09ea4b9e3735

Expand all files

src/main/ts/di/fluent/Configuration.ts created 644 +59 0

@@ -0,0 +1,59
	1	import { Container } from "../Container";
	2	import { argumentNotNull, each } from "../../safe";
	3	import { DescriptorBuilder } from "./DescriptorBuilder";
	4
	5	enum State {
	6	ready,
	7
	8	pending
	9	}
	10
	11	export class Configuration<S extends object, Y extends keyof S = keyof S> {
	12
	13	private _state = State.ready;
	14
	15	_completion: PromiseLike<void> = Promise.resolve();
	16
	17	_builders: { [k in keyof S]?: (service: DescriptorBuilder<S[k], S>) => void } = {};
	18
	19	register<K extends Y>(name: K, builder: (service: DescriptorBuilder<S[K], S>) => void): Configuration<S, Exclude<Y, K>> {
	20	argumentNotNull(builder, "builder");
	21
	22	return this;
	23	}
	24
	25	private _moveStart() {
	26	if (this._state !== State.ready)
	27	throw new Error("Invalid operation");
	28
	29	this._state = State.pending;
	30	}
	31
	32	private _moveDone() {
	33	this._state = State.ready;
	34	}
	35
	36	apply(target: Container<S>) {
	37	this._moveStart();
	38
	39	let pending = 1;
	40
	41	this._completion = new Promise((resolve, reject) => {
	42	each(this._builders, (v, k) => {
	43	pending++;
	44	const d = new DescriptorBuilder<any, S>(target, result => {
	45	target.register(k, result);
	46	if (!--pending)
	47	resolve();
	48	});
	49
	50	try {
	51	v(d);
	52	} catch (e) {
	53	reject(e);
	54	}
	55	});
	56	}).then(() => this._moveDone());
	57	}
	58
	59	}

src/main/ts/di/fluent/DescriptorBuilder.ts created 644 +58 0

@@ -0,0 +1,58
	1	import { Resolver, ServiceModule, LazyDependencyOptions, DependencyOptions } from "./interfaces";
	2	import { AnnotationBuilder } from "../Annotations";
	3	import { Container } from "../Container";
	4	import { Descriptor, ILifetime, ContainerKeys } from "../interfaces";
	5	import { ActivationContext } from "../ActivationContext";
	6
	7	export class DescriptorBuilder<T, S extends object> {
	8	readonly _container: Container<S>;
	9	readonly _cb: (d: Descriptor<S, T>) => void;
	10
	11	constructor(container: Container<S>, cb: (d: Descriptor<S, T>) => void) {
	12	this._container = container;
	13	this._cb = cb;
	14	}
	15	service(service: AnnotationBuilder<T, S> \| ServiceModule<T, S>) {
	16
	17	}
	18
	19	factory(f: (resolve: Resolver<S>, activate: (lifetime: ILifetime, factory: () => any, cleanup?: (item: any) => void) => any) => T): void {
	20	this._cb({
	21	activate(context: ActivationContext<S>) {
	22	const resolve = (name: ContainerKeys<S>, opts?: DependencyOptions \| LazyDependencyOptions) => {
	23	if (opts && "lazy" in opts && opts.lazy) {
	24	const c2 = context.clone();
	25	return () => {
	26	return opts.optional ? c2.resolve(name, opts.default) : c2.resolve(name);
	27	};
	28	} else {
	29	return opts && opts.optional ? context.resolve(name, opts.default) : context.resolve(name);
	30	}
	31	};
	32
	33	const activate = (lifetime: ILifetime, factory: () => any, cleanup?: (item: any) => void) => {
	34	if (lifetime.has()) {
	35	return lifetime.get();
	36	} else {
	37	lifetime.enter();
	38	const instance = factory();
	39	lifetime.store(instance, cleanup);
	40	return instance;
	41	}
	42
	43	};
	44
	45	return f(resolve, activate);
	46	}
	47	});
	48	}
	49
	50	value(v: T): void {
	51	this._cb({
	52	activate() {
	53	return v;
	54	}
	55	});
	56	}
	57
	58	}

docs/ru/observable.md +10 -10

             самостоятельных событий, например, связанных с действиями пользователя.
             Является реализацией классического шаблона наблюдателя с возможность сообщить
-            о коце потока событий. Данная реализация не содержит никаких дополнительных
+            о конце потока событий. Данная реализация не содержит никаких дополнительных
             функций, таких как фильтрация, канал с состоянием, преобразования сообщений и
             т.п. Это сделано специально, чтобы реализация оставалась максимально простой.
                     notify(i);
                 }
                 // по окончании последовательности информируем, что событий больше не будет
-                compelte();
+                complete();
             });
             // создаем окно с отображением хода событий
             `Observable` можно создавать из событий другого объекта, например, виджета:
             ```ts
-            // клсс
+            // класс
             class Canvas {
-                readonly mouseMove: IObservable<[number,number]>
+                mouseMove: IObservable<[number,number]>;
                 postCreate() {
                     // превращаем события виджета в Observable
             }
             ```
-            Существует также несколько варинатов получения сообщений
+            Существует также несколько вариантов получения сообщений
             ```ts
             // регистрация метода для получений событий
                     let evt = this.viewport.click.next(ct);
                     // преобразуем позицию на экране в координаты карты
-                    return this.clientToCoodinates([evt.clientx,evt.clientY]);
+                    return this.clientToCoordinates([evt.clientX,evt.clientY]);
                 }
             }
             ## Observable и последовательности
-            Можно сичтать, что `Observable` это некоторая аналогия итератора только в
+            Можно считать, что `Observable` это некоторая аналогия итератора только в
-            парадигме событийного (или реактивного) программировния. Следует также понимать,
+            парадигме событийного (или реактивного) программирования. Следует также понимать,
             что при переходе от синхронного процедурного программирования к событийному так
             же меняется и направление управления (Inverse Of Control), что означает
             следующее:
             * при работе с `Observable` клиенты вынуждены обрабатывать эти события по мере
               их поступления и не могут на это повлиять.
-            Последний пункт можно изменить применив, например, буффер или канал с
+            Последний пункт можно изменить применив, например, буфер или канал с
             состоянием, т.е. очередь, но данные механизмы выходят за рамки простого шаблона
             наблюдателя.
                 // будет вызван для всех сообщений
                 processEvent(data);
             });
-            ```
  No newline at end of file
+            ```

src/main/ts/Observable.ts +1 -7

             import { IObservable, IDestroyable, ICancellation, IObserver } from "./interfaces";
             import { Cancellation } from "./Cancellation";
-            import { argumentNotNull, destroyed } from "./safe";
+            import { argumentNotNull } from "./safe";
             type Handler<T> = (x: T) => void;
             const noop = () => { };
-            const nulObserver: IObserver<any> = Object.freeze({
-                next: noop,
-                error: noop,
-                complete: noop
-            });
             function isObserver(val: any): val is IObserver<any> {
                 return val && (typeof val.next === "function");
             }

src/main/ts/di/ActivationContext.ts +7 -4

             import { TraceSource } from "../log/TraceSource";
-            import { argumentNotNull, argumentNotEmptyString } from "../safe";
+            import { argumentNotEmptyString } from "../safe";
-            import { Descriptor, ContainerServiceMap, ContainerKeys, ContainerResolve } from "./interfaces";
+            import { Descriptor, ContainerServiceMap, ContainerKeys, TypeOfService } from "./interfaces";
             import { Container } from "./Container";
             import { MapOf } from "../interfaces";
                     return this._container;
                 }
-                resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>) {
+                resolve<K extends ContainerKeys<S>>(name: K): TypeOfService<S, K>;
+                resolve<K extends ContainerKeys<S>, T>(name: K, def: T): TypeOfService<S, K> | T;
+                resolve<K extends ContainerKeys<S>>(name: K, def: undefined): TypeOfService<S, K> | undefined;
+                resolve<K extends ContainerKeys<S>, T>(name: K, def?: T): TypeOfService<S, K> | T | undefined {
                     const d = this._services[name];
                     if (d !== undefined) {
                         return this.activate(d, name.toString());
                     } else {
-                        if (def !== undefined && def !== null)
+                        if (arguments.length > 1)
                             return def;
                         else
                             throw new Error(`Service ${name} not found`);

src/main/ts/di/Annotations.ts +1 -6

             import { TypeRegistration } from "./Configuration";
             import { ExtractDependency } from "./fluent/interfaces";
-            import { RegistrationBuilder } from "./fluent/RegistrationBuilder";
-            export class AnnotaionBuilder<T, S extends object> {
+            export class AnnotationBuilder<T, S extends object> {
                 wire<P extends any[]>(...args: P) {
                     return <C extends new (...args: ExtractDependency<P, S>) => T>(constructor: C) => {
                     throw new Error();
                 }
-                getRegistrationBuilder(): RegistrationBuilder<T, S> {
-                    throw new Error();
             }

src/main/ts/di/Configuration.ts +26 -8

                 PartialServiceMap,
                 ActivationType,
                 ContainerKeys,
-                ContainerResolve
+                TypeOfService,
+                ILifetimeManager
             } from "./interfaces";
             import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get, primitive } from "../safe";
             }
             /**
-             * Базовый интефейс конфигурации сервисов
+             * Базовый интерфейс конфигурации сервисов
              */
             export interface ServiceRegistration<T, S extends object> extends RegistrationScope<S> {
                 params?: any;
+                /** Специальный идентификатор используется при активации singleton, если
+                 * не указан для TypeRegistration вычисляется как oid($type)
+                 */
+                typeId?: string;
                 inject?: object | object[];
                 cleanup?: ((instance: T) => void) | string;
                 $dependency: K;
                 lazy?: boolean;
                 optional?: boolean;
-                default?: ContainerResolve<S, K>;
+                default?: TypeOfService<S, K>;
             }
             export interface LazyDependencyRegistration<S extends object, K extends ContainerKeys<S> = ContainerKeys<S>> extends DependencyRegistration<S, K> {
                     trace.log("resolveType moduleName={0}, localName={1}", moduleName, localName);
                     try {
                         const m = await this._loadModule(moduleName);
-                        return localName ? get(localName, m) : m;
+                        if (localName) {
+                            return get(localName, m);
+                        } else {
+                            if (m instanceof Function)
+                                return m;
+                            if ("default" in m)
+                                return m.default;
+                            return m;
+                        }
                     } catch (e) {
                         trace.error("Failed to resolve type moduleName={0}, localName={1}", moduleName, localName);
                         throw e;
                             this._visit(data.params, "params");
                     if (data.activation) {
-                        opts.activation = this._getLifetimeManager(data.activation);
+                        opts.activation = this._getLifetimeManager(data.activation, data.typeId);
                     }
                     if (data.cleanup)
                         opts.type = data.$type;
                     } else {
                         const [moduleName, typeName] = data.$type.split(":", 2);
-                        opts.type = this._resolveType(moduleName, typeName);
+                        const t = opts.type = this._resolveType(moduleName, typeName);
+                        if (!(t instanceof Function))
+                            throw Error("$type (" + data.$type + ") is not a constructable");
                     }
                     const d = new TypeServiceDescriptor<S, any, any[]>(
                     return d;
                 }
-                _getLifetimeManager(activation: ActivationType) {
+                _getLifetimeManager(activation: ActivationType, typeId: string | undefined): ILifetimeManager {
                     switch (activation) {
                         case "container":
                             return this._container.getLifetimeManager();
                         case "context":
                             return LifetimeManager.contextLifetime;
                         case "singleton":
-                            return LifetimeManager.singletonLifetime;
+                            if (typeId === undefined)
+                                throw Error("The singleton activation requires a typeId");
+                            return LifetimeManager.singletonLifetime(typeId);
                         default:
                             return LifetimeManager.empty;
                     }

src/main/ts/di/Container.ts +4 -7

             import { ActivationContext } from "./ActivationContext";
             import { ValueDescriptor } from "./ValueDescriptor";
             import { ActivationError } from "./ActivationError";
-            import { ServiceMap, Descriptor, PartialServiceMap, ContainerProvided, Resolver, ContainerServiceMap, ContainerKeys, ContainerResolve, ILifetimeManager } from "./interfaces";
+            import { ServiceMap, Descriptor, PartialServiceMap, ContainerProvided, ServiceLocator, ContainerServiceMap, ContainerKeys, TypeOfService, ILifetimeManager } from "./interfaces";
             import { TraceSource } from "../log/TraceSource";
             import { Configuration, RegistrationMap } from "./Configuration";
             import { Cancellation } from "../Cancellation";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            export class Container<S extends object = any> implements Resolver<S>, IDestroyable {
+            export class Container<S extends object = any> implements ServiceLocator<S>, IDestroyable {
                 readonly _services: ContainerServiceMap<S>;
-                readonly _cache: MapOf<any>;
                 readonly _lifetimeManager: ILifetimeManager;
                 readonly _cleanup: (() => void)[];
                 constructor(parent?: Container<S>) {
                     this._parent = parent;
                     this._services = parent ? Object.create(parent._services) : {};
-                    this._cache = {};
                     this._cleanup = [];
                     this._root = parent ? parent.getRootContainer() : this;
                     this._services.container = new ValueDescriptor(this) as any;
                     return this._lifetimeManager;
                 }
-                resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>): ContainerResolve<S, K> {
+                resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K> {
                     trace.debug("resolve {0}", name);
                     const d = this._services[name];
                     if (d === undefined) {
                 /**
                  * @deprecated use resolve() method
                  */
-                getService<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>) {
+                getService<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>) {
                     return this.resolve(name, def);
                 }

src/main/ts/di/LazyReferenceDescriptor.ts +4 -5

             import { argumentNotEmptyString, each } from "../safe";
             import { ActivationContext } from "./ActivationContext";
-            import { Descriptor, PartialServiceMap, ContainerResolve, ContainerKeys } from "./interfaces";
+            import { Descriptor, PartialServiceMap, TypeOfService, ContainerKeys } from "./interfaces";
             import { ActivationError } from "./ActivationError";
             export interface ReferenceDescriptorParams<S extends object, K extends ContainerKeys<S>> {
                 name: K;
                 optional?: boolean;
-                default?: ContainerResolve<S, K>;
+                default?: TypeOfService<S, K>;
                 services?: PartialServiceMap<S>;
             }
             export class LazyReferenceDescriptor<S extends object = any, K extends ContainerKeys<S> = ContainerKeys<S>>
-                implements Descriptor<S, ((args?: PartialServiceMap<S>) => ContainerResolve<S, K>)> {
+                implements Descriptor<S, ((args?: PartialServiceMap<S>) => TypeOfService<S, K>)> {
                 _name: K;
                 _optional = false;
-                _default: ContainerResolve<S, K> | undefined;
+                _default: TypeOfService<S, K> | undefined;
                 _services: PartialServiceMap<S>;
                             throw new ActivationError(this._name.toString(), ct.getStack(), error);
                         }
                     };
                 }
                 toString() {

src/main/ts/di/LifetimeManager.ts +16 -26

             };
+            let nextId = 0;
             export class LifetimeManager implements IDestroyable, ILifetimeManager {
                 private _cleanup: (() => void)[] = [];
                 private _cache: MapOf<any> = {};
                 private _pending: MapOf<boolean> = {};
-                initialize(id: string): ILifetime {
+                initialize(): ILifetime {
                     const self = this;
+                    const id = ++nextId;
                     return {
                         has() {
                             return (id in self._cache);
                 static readonly empty: ILifetimeManager = {
                     initialize(): ILifetime {
                         return emptyLifetime;
-                    },
-                    destroy() {
-                        throw new Error("Trying to destroy empty lifetime manager, this is a bug.");
                     }
                 };
                 static readonly hierarchyLifetime: ILifetimeManager = {
-                    initialize(id: string, context: ActivationContext<any>): ILifetime {
+                    initialize(context: ActivationContext<any>): ILifetime {
-                        return context.getContainer().getLifetimeManager().initialize(id, context);
+                        return context.getContainer().getLifetimeManager().initialize(context);
-                    },
-                    destroy() {
-                        throw new Error("Trying to destroy hierarchy lifetime manager, this is a bug.");
-                };
-                static readonly singletonLifetime: ILifetimeManager = {
-                    initialize(id: string): ILifetime {
-                        return singletonLifetimeManager.initialize(id);
-                    },
-                    destroy() {
-                        throw new Error("Trying to destroy singleton lifetime manager, this is a bug.");
                     }
                 };
                 static readonly contextLifetime: ILifetimeManager = {
-                    initialize(id: string, context: ActivationContext<any>): ILifetime {
+                    initialize(context: ActivationContext<any>): ILifetime {
+                        const id = String(++nextId);
                         return {
                             enter() {
                                 if (context.visit(id))
                             store(item: any) {
                                 context.store(id, item);
                             }
+                        };
+                    }
                 };
-                    },
-                    destroy() {
+                static singletonLifetime(typeId: string): ILifetimeManager {
-                        throw new Error("Trying to destroy empty lifetime manager, this is a bug.");
+                    return {
+                        initialize() {
+                            return emptyLifetime;
                         }
                     };
                 }
+            }
-            const singletonLifetimeManager = new LifetimeManager();

src/main/ts/di/ReferenceDescriptor.ts +4 -4

             import { argumentNotEmptyString, each } from "../safe";
             import { ActivationContext } from "./ActivationContext";
-            import { Descriptor, PartialServiceMap, ContainerResolve, ContainerKeys } from "./interfaces";
+            import { Descriptor, PartialServiceMap, TypeOfService, ContainerKeys } from "./interfaces";
             export interface ReferenceDescriptorParams<S extends object, K extends ContainerKeys<S>> {
                 name: K;
                 optional?: boolean;
-                default?: ContainerResolve<S, K>;
+                default?: TypeOfService<S, K>;
                 services?: PartialServiceMap<S>;
             }
             export class ReferenceDescriptor<S extends object = any, K extends ContainerKeys<S> = ContainerKeys<S>>
-                implements Descriptor<S, ContainerResolve<S, K>> {
+                implements Descriptor<S, TypeOfService<S, K>> {
                 _name: K;
                 _optional = false;
-                _default: ContainerResolve<S, K> | undefined;
+                _default: TypeOfService<S, K> | undefined;
                 _services: PartialServiceMap<S>;

src/main/ts/di/ServiceDescriptor.ts +10 -10

             import { ActivationContext } from "./ActivationContext";
-            import { Descriptor, ServiceMap, PartialServiceMap, ILifetimeManager } from "./interfaces";
+            import { Descriptor, ServiceMap, PartialServiceMap, ILifetimeManager, ILifetime } from "./interfaces";
-            import { argumentNotNull, isPrimitive, keys, isNull } from "../safe";
+            import { isPrimitive, keys, isNull } from "../safe";
             import { TraceSource } from "../log/TraceSource";
             import { isDescriptor } from "./traits";
             import { LifetimeManager } from "./LifetimeManager";
             import { MatchingMemberKeys } from "../interfaces";
-            import { Container } from "./Container";
-            let cacheId = 0;
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
                 _cleanup: ((item: T) => void) | undefined;
-                _cacheId = String(++cacheId);
+                _lifetimeManager = LifetimeManager.empty;
-                _lifetime = LifetimeManager.empty;
+                _objectLifetime: ILifetime | undefined;
                 constructor(opts: ServiceDescriptorParams<S, T, P>) {
                     if (opts.lifetime)
-                        this._lifetime = opts.lifetime;
+                        this._lifetimeManager = opts.lifetime;
                     if (!isNull(opts.params))
                         this._params = opts.params;
                 }
                 activate(context: ActivationContext<S>) {
-                    const lifetime = this._lifetime.initialize(this._cacheId, context);
+                    if (!this._objectLifetime)
+                        this._objectLifetime = this._lifetimeManager.initialize(context);
+                    const lifetime = this._objectLifetime;
                     if (lifetime.has()) {
                         return lifetime.get();
                     } else {
                         lifetime.enter();
                         const instance = this._create(context);
-                        lifetime.store(this._cacheId, this._cleanup);
+                        lifetime.store(instance, this._cleanup);
                         return instance;
                     }
                 }

src/main/ts/di/fluent/interfaces.ts +20 -43

@@ -1,19 +1,17
1	import { primitive } from "../../safe";	1	import { primitive } from "../../safe";
2	import { A~~ctivationType~~ } from "../~~interface~~s";	2	import { AnnotationBuilder } from "../Annotations";
3	import { AnnotaionBuilder } from "../Annotations";	3	import { ILifetime, TypeOfService, ContainerKeys } from "../interfaces";
4	import { LazyDependencyRegistration, DependencyRegistration } from "../Configuration";
5	import { Container } from "../Container";
6		4
7	export interface DependencyOptions<T> {	5	export interface DependencyOptions {
8	optional?: boolean;	6	optional?: boolean;
9	default?: T;	7	default?: any;
10	}	8	}
11		9
12	export interface LazyDependencyOptions<T> extends DependencyOptions<T> {	10	export interface LazyDependencyOptions extends DependencyOptions {
13	lazy: true;	11	lazy: true;
14	}	12	}
15		13
16	export type ExtractService<K, S> = K extends keyof S ? S[K] : K;	14	export type ExtractService<K, S> = K extends keyof S ? S[K] : never;
17		15
18	export type ExtractDependency<D, S> = D extends { $dependency: infer K } ?	16	export type ExtractDependency<D, S> = D extends { $dependency: infer K } ?
19	D extends { lazy: true } ? () => ExtractService<K, S> : ExtractService<K, S> :	17	D extends { lazy: true } ? () => ExtractService<K, S> : ExtractService<K, S> :
@@ -25,47 +23,26 export type WalkDependencies<D, S> = D e
25	{ [K in keyof D]: ExtractDependency<D[K], S> };	23	{ [K in keyof D]: ExtractDependency<D[K], S> };
26		24
27	export type ServiceModule<T, S extends object, M extends keyof any = "service"> = {	25	export type ServiceModule<T, S extends object, M extends keyof any = "service"> = {
28	[m in M]: AnnotaionBuilder<T, S>;	26	[m in M]: AnnotationBuilder<T, S>;
29	};	27	};
30		28
31	export interface ServiceRecordBuilder<T, S extends object> {	29	export type InferReferenceType<S extends object, K extends keyof ContainerKeys<S>, O> = O extends { default: infer X } ? (TypeOfService<S, K> \| X) :
32	type<P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(	30	O extends { optional: true } ? (TypeOfService<S, K> \| undefined) :
33	target: C, ...params: P): ConstructorBuilder<C, S>;	31	TypeOfService<S, K>;
34	factory<P extends any[], F extends (...args: ExtractDependency<P, S>) => T>(	32
35	target: F, ...params: P): FactoryBuilder<F, S>;	33	export interface Resolver<S extends object> {
36	wired<M extends keyof any>(module: ServiceModule<T, S, M>, m: M): RegistrationBuilder<T, S>;	34	<K extends keyof ContainerKeys<S>, O extends LazyDependencyOptions>(this: void, name: K, opts: O): () => InferReferenceType<S, K, O>;
37	wired(module: ServiceModule<T, S>): RegistrationBuilder<T, S>;	35	<K extends keyof ContainerKeys<S>, O extends DependencyOptions>(this: void, name: K, opts?: O): InferReferenceType<S, K, O>;
38	}	36	}
39		37
40	export interface RegistrationVisitor {	38	export interface DescriptorBuilder<T, S extends object> {
41	visitDependency(): void;	39	service(service: AnnotationBuilder<T, S> \| ServiceModule<T, S>): void;
42
43	visitObject(): void;
44
45	visitTypeRegistration(): void;
46		40
47	visitFactoryRegistration(): void;	41	factory(f: (resolve: Resolver<S>, activate: <T2>(lifetime: ILifetime, factory: () => T2, cleanup?: (item: T2) => void) => T2) => T): void;
48		42
49	}	43	value(v: T): void;
50
51	export interface ServiceRegistration {
52	visit(visitor: RegistrationVisitor): void;
53	}	44	}
54		45
55	export interface ConfigBu~~ilde~~r<S extends object, Y extends keyof S = keyof S> {	46	export interface Configuration<S extends object, Y extends keyof S = keyof S> {
56	register<K extends Y>(name: K, builder: (t: ~~ServiceRecord~~Builder<S[K], S>) => void \| ~~Promise~~<~~void~~>): ConfigBu~~ilde~~r<S, Exclude<Y, K>>;	47	register<K extends Y>(name: K, builder: (d: DescriptorBuilder<S[K], S>) => void): Configuration<S, Exclude<Y, K>>;
57	register<K extends Y, V>(name: S[K] extends ExtractDependency<V, S> ? K : never, value: V): ConfigBuilder<S, Exclude<Y, K>>;
58	register<K extends Y>(name: K, value: S[K], raw: true): ConfigBuilder<S, Exclude<Y, K>>;
59
60	apply(container: Container<S>): Promise<void>;
61	}	48	}
62
63	export interface ServicesDeclaration<S extends object> {
64	build<T>(this: void): ServiceRecordBuilder<T, S>;
65	annotate<T>(this: void): AnnotaionBuilder<T, S>;
66
67	dependency<K extends keyof S>(this: void, name: K, opts: LazyDependencyOptions<S[K]>): LazyDependencyRegistration<S, K>;
68	dependency<K extends keyof S>(this: void, name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>;
69
70	configure(): ConfigBuilder<S>;
71	}

src/main/ts/di/interfaces.ts +12 -8

             import { ActivationContext } from "./ActivationContext";
-            import { IDestroyable } from "../interfaces";
             export interface Descriptor<S extends object = any, T = any> {
                 activate(context: ActivationContext<S>): T;
             export type ContainerKeys<S extends object> = keyof S | keyof ContainerProvided<S>;
-            export type ContainerResolve<S extends object, K> =
+            export type TypeOfService<S extends object, K> =
                 K extends keyof ContainerProvided<S> ? ContainerProvided<S>[K] :
                 K extends keyof S ? S[K] : never;
             export type ContainerServiceMap<S extends object> = {
-                [K in ContainerKeys<S>]: Descriptor<S, ContainerResolve<S, K>>;
+                [K in ContainerKeys<S>]: Descriptor<S, TypeOfService<S, K>>;
             };
             export type PartialServiceMap<S extends object> = {
                 [k in keyof S]?: Descriptor<S, S[k]>;
             };
-            export interface Resolver<S extends object> {
+            export interface ServiceLocator<S extends object> {
-                resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>): ContainerResolve<S, K>;
+                resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K>;
             }
             export interface ContainerProvided<S extends object> {
-                container: Resolver<S>;
+                container: ServiceLocator<S>;
             }
             export type ContainerRegistered<S extends object> = /*{
             export type ActivationType = "singleton" | "container" | "hierarchy" | "context" | "call";
-            export interface ILifetimeManager extends IDestroyable {
+            export interface ILifetimeManager {
-                initialize(id: string, context: ActivationContext<any>): ILifetime;
+                initialize(context: ActivationContext<any>): ILifetime;
             }
+            /**
+             * Интерфейс для управления жизнью экземпляра объекта. Каждая регистрация имеет
+             * свой собственный объект `ILifetime`, который создается при первой активации
+             */
             export interface ILifetime {
+                /** Проверяет, что уже создан экземпляр объекта */
                 has(): boolean;
                 get(): any;

src/main/ts/di/traits.ts +5 -32

@@ -1,46 +1,19
1	import { isPrimitive } from "../safe";	1	import { isPrimitive } from "../safe";
2	import { Descriptor } from "./interfaces";	2	import { Descriptor } from "./interfaces";
3	import { ServicesDeclaration, ServiceRecordBuilder, ServiceModule, RegistrationBuilder, ExtractDependency } from "./fluent/interfaces";	3	import { AnnotationBuilder } from "./Annotations";
4	import { ~~AnnotaionBuilder~~ } from "./~~Annotations~~";	4	import { Configuration } from "./fluent/Configuration";
5	import { FactoryBuilder } from "./fluent/FactoryBuilder";
6	import { ConstructorBuilder } from "./fluent/ConstructorBuiler";
7		5
8	export function isDescriptor(x: any): x is Descriptor {	6	export function isDescriptor(x: any): x is Descriptor {
9	return (!isPrimitive(x)) &&	7	return (!isPrimitive(x)) &&
10	(x.activate instanceof Function);	8	(x.activate instanceof Function);
11	}	9	}
12		10
13	export function declare<S extends object>(): ~~ServicesDeclaration~~<S> {	11	export function declare<S extends object>() {
14	return {	12	return {
15	annotate<T>() {	13	annotate<T>() {
16	return new AnnotaionBuilder<T, S>();	14	return new AnnotationBuilder<T, S>();
17	},
18	build<T>(): ServiceRecordBuilder<T, S> {
19	return {
20	factory<P extends any[], F extends (...args: ExtractDependency<P, S>) => T>(
21	target: F,
22	...params: P
23	): FactoryBuilder<F, S> {
24	return new FactoryBuilder(target, params);
25	},	15	},
26		16	configure(): Configuration<S> {
27	type<P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(
28	target: C, ...params: P
29	): ConstructorBuilder<C, S> {
30	return new ConstructorBuilder(target, params);
31	},
32
33	wired<M extends keyof any>(module: ServiceModule<T, S, M>, m?: M): RegistrationBuilder<T, S> {
34	const service = m ?
35	module[m] :
36	(module as ServiceModule<T, S>).service;
37	if (!service)
38	throw new Error("The specified module doen's provides a service annotation");
39	return service.getRegistrationBuilder();
40	}
41	};
42	},
43	configure() {
44	throw new Error();	17	throw new Error();
45	},	18	},
46	dependency() {	19	dependency() {

src/test/ts/mock/config.ts +16 -13

@@ -1,17 +1,20
1	import { configure, ~~dependency~~, ~~build~~ } from "./services";	1	import { configure } from "./services";
2		2
3	export const config = configure()	3	export const config = configure()
4	.register("bar", async s => s.wired(await import("./Bar"), "service"))	4	.register("host", s => s.value("example.com"))
5	.register("box", s => import("./Box").then(m => s.wired(m)))	5	.register("bar2", bar2 => Promise.all([import("./Foo"), import("./Bar")])
6	.register("host", "example.com")	6	.then(([{ Foo }, { Bar }]) => {
7	// .registerType("bar2", Bar, [{ foo: dependency("foo"), host: "" }]);	7	const lifetime: any = undefined; // new HierarchyLifetime()
8	.register("bar2", async s => s.type((await import("./Bar")).Bar,	8	bar2.factory((resolve, activate) => {
9	{	9	const bar = new Bar({
10	foo: build().type((await import("./Foo")).Foo)	10	foo: activate(lifetime, () => new Foo()),
11	.activate("context"),	11	nested: {
12	~~nested~~: { lazy: ~~dependency~~("foo", { lazy: true }) },	12	lazy: resolve("foo", { lazy: true })
13	host: dependency("host")
14	},	13	},
15	"")	14	host: resolve("host")
16	.inject("setName", dependency("host"))	15	}, "some text");
		16	bar.setName(resolve("host"));
		17	return bar;
		18	});
		19	})
17	);	20	);

src/test/ts/mock/services.ts +2 -2

             import { Foo } from "./Foo";
             import { Bar } from "./Bar";
             import { Box } from "./Box";
-            import { declare } from "../di/fluent/interfaces";
+            import { declare } from "../di/traits";
             /**
              * Сервисы доступные внутри контейнера
             /**
              * Экспортируем вспомогательные функции для описания сервисов и кинфогурации
              */
-            export const { dependency, build, annotate, configure } = declare<Services>();
+            export const { dependency, annotate, configure } = declare<Services>();

src/main/ts/di/fluent/ConfigBuilder.ts removed 0 -17

NO CONTENT: file was removed

src/main/ts/di/fluent/ConstructorBuiler.ts removed 0 -17

NO CONTENT: file was removed

src/main/ts/di/fluent/FactoryBuilder.ts removed 0 -14

NO CONTENT: file was removed

src/main/ts/di/fluent/RegistrationBuilder.ts removed 0 -37

NO CONTENT: file was removed

src/main/ts/di/fluent/ServiceRecordBuilder.ts removed 0 0

NO CONTENT: file was removed

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