implab/implabjs-di Commit - r11:dd37d4287c45

WIP lifetime services, change target to ES2018

cin -

r11:dd37d4287c45 default

parent child

Context file:

r11:dd37d4287c45

Collapse all files

src/main/ts/ActivationContext.ts +13 -12

+            import { ActivationError } from "./ActivationError";
             import { Descriptor, ILifetime, IActivationContext, DescriptorMap, ILifetimeManager } from "./interfaces";
-            import { argumentNotNull } from "./traits";
+            import { argumentNotNull, prototype } from "./traits";
             export interface ActivationContextInfo {
                 name: string;
                 service: string;
             }
             let nextId = 1;
             /** This object is created once per `Container.resolve` method call and used to
              * cache dependencies and to track created instances. The activation context
              * tracks services with `context` activation type.
              *
              * @template S The service map used in the activation context, services from
              *   this map are available to resolution.
              * @template U A set of keys from the service map which can be overridden in
              *   this activation context.
              */
             export class ActivationContext<S> implements IActivationContext<S> {
                 private readonly _cache: Record<string, unknown>;
                 private readonly _services: DescriptorMap<S>;
                 private readonly _name: string;
                 private readonly _service: Descriptor<S, unknown>;
                 private readonly _containerLifetimeManager: ILifetimeManager;
                 private readonly _parent: ActivationContext<S> | undefined;
                 /** Creates a new activation context with the specified parameters.
                  * @param containerLifetimeManager the container which starts the activation process
                  * @param services the initial service registrations
                  * @param name the name of the service being activated, this parameter is
                  *  used for the debug purpose.
                  * @param service the service to activate, this parameter is used for the
                  *  debug purpose.
                  */
                 constructor(containerLifetimeManager: ILifetimeManager, services: DescriptorMap<S>, name: string, service: Descriptor<S, unknown>, cache = {}) {
                     this._name = name;
                     this._service = service;
                     this._cache = cache;
                     this._services = services;
                     this._containerLifetimeManager = containerLifetimeManager;
                 }
                 /** the name of the current resolving dependency */
                 getName() {
                     return this._name;
                 }
                 createContainerLifetime<T>() {
                     return this._containerLifetimeManager.create<T>();
                 }
                 resolve<K extends keyof S>(name: K): NonNullable<S[K]>;
                 resolve<K extends keyof S, T>(name: K, def: T): NonNullable<S[K]> | T;
                 resolve<K extends keyof S, T>(name: K, def?: T): NonNullable<S[K]> | T | undefined {
                     const d = this._services[name];
                     if (d !== undefined) {
                         return this.activate(d, name.toString());
                     } else {
                         if (arguments.length > 1)
                             return def;
                         else
                             throw new Error(`Service ${String(name)} not found`);
                     }
                 }
                 /**
                  * registers services local to the the activation context
                  *
                  * @name{string} the name of the service
                  * @service{string} the service descriptor to register
                  */
                 register<K extends keyof S>(name: K, service: DescriptorMap<S>[K]) {
                     argumentNotNull(name, "name");
                     const d = this._services[name];
                     if (d !== undefined && !d.configurable)
                         throw new Error(`Service ${String(name)} can't be overridden`);
                     this._services[name] = service;
                 }
                 createLifetime<T>(): ILifetime<T> {
                     const id = nextId++;
                     return {
                         initialize() { },
                         has: () => id in this._cache,
                         get: () => {
                             const v = this._cache[id] as T;
                             if (v === undefined || v === null)
                                 throw new Error("The value isn't present in the activation context");
                             return v;
                         },
                         store: item => {
                             this._cache[id] = item;
                         }
                     };
                 }
                 activate<T>(d: Descriptor<S, T>, name: string) {
                     // TODO: add logging
                     // if (trace.isLogEnabled())
                     //    trace.log("enter {0} {1}", name, d);
-                    const ctx = this.enter(d, name);
+                    const ctx = new ActivationContext(
+                        this._containerLifetimeManager,
+                        d.hasOverrides ? prototype(this._services) : this._services,
+                        name,
+                        d,
+                        this._cache
+                    );
                     const v = d.activate(ctx);
                     // if (trace.isLogEnabled())
                     //    trace.log(`leave ${name}`);
                     return v;
                 }
                 getStack(): ActivationContextInfo[] {
                     const stack = [{
                         name: this._name,
                         service: this._service.toString()
                     }];
                     return this._parent ?
                         stack.concat(this._parent.getStack()) :
                         stack;
                 }
-                private enter(service: Descriptor<S, unknown>, name: string) {
+                fail(innerException: unknown): never {
-                    return new ActivationContext(
+                    throw new ActivationError(this._name, this.getStack(), innerException);
-                        this._containerLifetimeManager,
-                        service.hasOverrides ?
-                            Object.create(this._services) as typeof this._services :
-                            this._services,
-                        name,
-                        service,
-                        this._cache
-                    );
                 }
             }

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

             import { Container } from "./Container";
             import { DescriptorBuilder } from "./DescriptorBuilder";
             import { Descriptor, IContainerBuilder, IDescriptorBuilder, DescriptorMap, ServiceLocator, ILifetime, IDestroyable } from "./interfaces";
             import { emptyLifetime, LifetimeManager } from "./LifetimeManager";
-            import { isDestroyable } from "./traits";
+            import { isDestroyable, prototype } from "./traits";
             /**
              * Container builder used to prepare service descriptors and create a IoC container
              */
             export class ContainerBuilder<S, U extends keyof S> implements
                 IContainerBuilder<S, U> {
                 private _pending = 1;
                 private readonly _services: DescriptorMap<S>;
                 private readonly _lifetimeManager = new LifetimeManager();
                 private readonly _lifetime: ILifetime<IDestroyable>;
-                constructor(parentServices?: DescriptorMap<S>, lifetime?: ILifetime<IDestroyable>) {
+                constructor(parentServices: DescriptorMap<S> | null = null, lifetime?: ILifetime<IDestroyable>) {
-                    this._services = Object.create(parentServices ? parentServices : null) as DescriptorMap<S>;
+                    this._services = prototype(parentServices);
                     this._lifetimeManager = new LifetimeManager();
                     this._lifetime = lifetime ?? emptyLifetime();
                 }
                 createServiceBuilder<K extends U>(name: K):
                     IDescriptorBuilder<S, S[K], Record<never, never>, U> {
                     return new DescriptorBuilder(this._lifetimeManager, this._register(name), this._fail);
                 }
                 build(): ServiceLocator<S> {
                     this._assertBuilding();
                     if (!this._complete())
                         throw new Error("The configuration didn't complete.");
                     const lifetime = this._lifetime;
                     const detach = isDestroyable(lifetime) ? () => lifetime.destroy() : () => void (0);
                     const container = new Container(this._services, this._lifetimeManager, detach);
                     lifetime.store(container);
                     return container;
                 }
                 private readonly _register = <K extends U>(name: K) =>
                     (descriptor: Descriptor<S, S[K]>) => {
                         this._complete();
                         this._services[name] = descriptor;
                     };
                 private readonly _fail = (ex: unknown) => {
                     throw ex;
                 };
                 private _assertBuilding() {
                     if (!this._pending)
                         throw new Error("The descriptor builder is finalized");
                 }
                 private _complete() {
                     return !(--this._pending);
                 }
             }

src/main/ts/DescriptorImpl.ts +18 -9

+            import { ActivationError } from "./ActivationError";
             import { Descriptor, ILifetime, DepsMap, IActivationContext, DescriptorMap } from "./interfaces";
             import { each, key } from "./traits";
             export interface DescriptorImplArgs<S, T> {
                 lifetime: ILifetime<T>;
                 factory: (refs: Record<key, unknown>) => NonNullable<T>;
                 cleanup?: (item: NonNullable<T>) => void;
                 overrides?: DescriptorMap<S>;
                 dependencies?: DepsMap<S>;
             }
             export class DescriptorImpl<S, T> implements Descriptor<S, T> {
                 private readonly _overrides?: DescriptorMap<S>;
                 private readonly _lifetime: ILifetime<T>;
                 private readonly _factory: (refs: Record<key, unknown>) => NonNullable<T>;
                 private readonly _cleanup?: (item: NonNullable<T>) => void;
                 private readonly _deps?: DepsMap<S>;
                 readonly hasOverrides: boolean;
                 constructor({ lifetime, factory, cleanup, overrides, dependencies }: DescriptorImplArgs<S, T>) {
                     this._lifetime = lifetime;
                     this._factory = factory;
                     if (cleanup)
                         this._cleanup = cleanup;
                     if (overrides)
                         this._overrides = overrides;
                     if (dependencies)
                         this._deps = dependencies;
                     this.hasOverrides = !!overrides;
                 }
                 activate(context: IActivationContext<S>): NonNullable<T> {
                     if (this._lifetime.has())
                         return this._lifetime.get();
                     this._lifetime.initialize(context);
                     if (this._overrides)
                         each(this._overrides, (v, k) => context.register(k, v));
                     const resolve = <K extends keyof S>({ name, lazy, ...opts }: { name: K; lazy?: boolean; default?: S[K] | null; }) => {
                         if (lazy) {
-                            return () => "default" in opts ? context.resolve(name, opts.default) : context.resolve(name);
+                            return "default" in opts ?
+                                () => context.resolve(name, opts.default) :
+                                () => context.resolve(name);
                         } else {
-                            return "default" in opts ? context.resolve(name, opts.default) : context.resolve(name);
+                            return "default" in opts ?
+                                context.resolve(name, opts.default) :
+                                context.resolve(name);
                         }
                     };
-                    const makeRefs = (deps: typeof this._deps) => deps ?
+                    const deps = this._deps;
+                    const refs = deps ?
                         Object.keys(deps)
                             .map(k => {
                                 const ref = deps[k];
                                 return typeof ref !== "object" ?
                                     { [k]: resolve({ name: ref }) } :
                                     { [k]: resolve(ref) };
                             })
-                            .reduce((a, p) => ({ ...a, ...p }), {} ):
+                            .reduce((a, p) => ({ ...a, ...p }), {}) :
                         {};
-                    const instance = this._factory.call(undefined, makeRefs(this._deps));
+                    try {
+                        const instance = (0,this._factory)(refs);
-                    this._lifetime.store(instance, this._cleanup);
+                        this._lifetime.store(instance, this._cleanup);
+                        return instance;
-                    return instance;
+                    } catch(err) {
+                        context.fail(err);
+                    }
                 }
                 toString() {
                     return `[object DescriptorImpl, lifetime=${String(this._lifetime)}]`;
                 }
             }

src/main/ts/LifetimeManager.ts +22 -13

             import { IActivationContext, ILifetime, ILifetimeContext, ILifetimeManager, ILifetimeSlot } from "./interfaces";
             import { ActivationContext } from "./ActivationContext";
             import { argumentNotNull, isDestroyable } from "./traits";
             const safeCall = (item: () => void) => {
                 try {
                     item();
                 } catch {
                     // silence!
                 }
             };
+            const noop = () => {};
+            const fail = (message: string) => {
+                throw new Error(message);
+            };
             const _emptySlot = Object.freeze({
                 has: () => false,
-                initialize: () => void (0),
+                initialize: noop,
+                get: fail("The specified item isn't registered with a lifetime manager"),
-                get: () => {
+                store: noop,
-                    throw new Error("The specified item isn't registered with this lifetime manager");
-                },
-                store: () => void (0)
+                remove: noop
             });
             const _unknonwSlot = Object.freeze({
                 has: () => false,
                 initialize: () => {
                     throw new Error("Can't call initialize on the unknown lifetime object");
                 },
                 get: () => {
                     throw new Error("The lifetime object isn't initialized");
                 },
                 store: () => {
                     throw new Error("Can't store a value in the unknown lifetime object");
                 }
             });
-            let nextId = 0;
-            const singletons: { [K: string]: unknown } = {};
             const pendingSlot = <T>(store: (item: T) => void) => ({
                 has: () => false,
                 get: () => {
                     throw new Error("The value in this slot doesn't exist");
                 },
                 initialize: () => {
                     throw new Error("Cyclic reference detected");
                 },
                 store
             });
-            const noop = () => void(0);
             const valueSlot = <T>(value: T, cleanup: (item: T) => void) => ({
                 has: () => true,
                 get: () => value,
                 initialize: () => {
                     throw new Error("The slot already has a value");
                 },
                 store: () => {
                     throw new Error("The slot already has a value");
                 }
             });
+            const singletons: { [K: string]: unknown } = {};
             export class LifetimeManager implements ILifetimeManager {
                 private _destroyed = false;
                 private readonly _slots: Record<string, ILifetimeSlot<unknown>> = {};
                 slot<T>(cookie: string): ILifetimeSlot<T> {
                     if (cookie in this._slots)
                         return this._slots[cookie] as ILifetimeSlot<T>;
                     const store = (item: T, cleanup?: (item: T) => void) => {
                         this._assertNotDestroyed();
                         this._slots[cookie] = valueSlot(
                             item,
                             cleanup ?? isDestroyable(item) ? () => item.destroy() : noop
                         );
                     };
                     return {
                         has: () => false,
                         get: () => {
                             throw new Error("The value isn't stored in this slot");
                         },
                         store,
                         initialize: () => {
                             this._assertNotDestroyed();
                             this._slots[cookie] = pendingSlot(store);
                         }
                     };
                 }
+                remove(cookie: string) {
+                    delete this._slots[cookie];
+                }
                 private _assertNotDestroyed() {
                     if (this._destroyed)
                         throw new Error("The lifetime manager is destroyed");
                 }
                 destroy() {
                     if (!this._destroyed) {
                         this._destroyed = true;
-                        this._cleanup.forEach(safeCall);
+                        Object.values(this._slots).forEach(({clean}) => )
-                        this._cleanup.length = 0;
                     }
                 }
             }
             export const emptyLifetime = <T>(): ILifetime<T> => {
                 return _emptyLifetime;
             };
             export const hierarchyLifetime = <T>(): ILifetime<T> => {
+                // TODO: вот здесь ошибка, при первой активации сервиса будет получен и
+                // привязан lifetime из дочернего контейнера, при активации через второй
+                // дочерний контейнера это приведет к ошибке, точнее будет взят экземпляр
+                // из первого контейнера.
                 let _lifetime: ILifetime<T> = _unknownLifetime;
                 return {
                     initialize(context: ILifetimeContext) {
                         if (_lifetime !== _unknownLifetime)
                             throw new Error("Cyclic reference activation detected");
                         _lifetime = context.createContainerLifetime<T>();
                     },
                     get() {
                         return _lifetime.get();
                     },
                     has() {
                         return _lifetime.has();
                     },
                     store(item: NonNullable<T>, cleanup?: (item: NonNullable<T>) => void) {
                         return _lifetime.store(item, cleanup);
                     },
                     toString() {
                         return `[object HierarchyLifetime, has=${String(this.has())}]`;
                     }
                 };
             };
             /**
              * Creates a lifetime instance bound to the current activation context. This
              * lifetime will store the service instance per activation context. Every
              * top level service resolution will create a new activation context. This
              * context is propagated to subsequent service resolution thus all services
              * with context lifetime will be shared among their consumers.
              *
              * @returns The instance of the lifetime.
              */
             export const contextLifetime = <T>(): ILifetime<T> => {
                 let _lifetime: ILifetime<T> = _unknownLifetime;
                 return {
                     initialize(context: ILifetimeContext) {
                         if (_lifetime !== _unknownLifetime)
                             throw new Error("Cyclic reference detected");
                         _lifetime = context.createLifetime();
                     },
                     get() {
                         return _lifetime.get();
                     },
                     has() {
                         return _lifetime.has();
                     },
                     store(item: NonNullable<T>) {
                         _lifetime.store(item);
                     },
                     toString() {
                         return `[object ContextLifetime, has=${String(this.has())}]`;
                     }
                 };
             };
             /**
              * Creates the lifetime for the service which will allow existence only one
              * instance with the specified {@linkcode typeId}. If there will be created
              * several lifetime instances with same `typeId` in the runtime, they will
              * share the same service instance.
              *
              * @param typeId The identified for the global instance, usually this is a
              *   fully qualified class name
              * @returns The lifetime instance
              */
             export const singletonLifetime = <T>(typeId: string): ILifetime<T> => {
                 argumentNotNull(typeId, "typeId");
                 let pending = false;
                 return {
                     has() {
                         return typeId in singletons;
                     },
                     get() {
                         if (!this.has())
                             throw new Error(`The instance ${typeId} doesn't exists`);
                         return singletons[typeId] as NonNullable<T>;
                     },
                     initialize() {
                         if (pending)
                             throw new Error("Cyclic reference detected");
                         pending = true;
                     },
                     store(item: NonNullable<T>) {
                         singletons[typeId] = item;
                         pending = false;
                     },
                     toString() {
                         return `[object SingletonLifetime, has=${String(this.has())}, typeId=${typeId}]`;
                     }
                 };
             };
             /** Creates a lifetime bound to the specified container. Using this lifetime
              * will create a single service instance per the specified container.
              *
              * @param container The container which will manage the lifetime for the service
              */
             export const containerLifetime = <T>(container: { createLifetime<X>(): ILifetime<X> }) => {
                 let _lifetime: ILifetime<T> = _unknownLifetime;
                 return {
                     initialize() {
                         if (_lifetime !== _unknownLifetime)
                             throw new Error("Cyclic reference detected");
                         _lifetime = container.createLifetime();
                     },
                     get() {
                         return _lifetime.get();
                     },
                     has() {
                         return _lifetime.has();
                     },
                     store(item: NonNullable<T>, cleanup?: (item: NonNullable<T>) => void) {
                         _lifetime.store(item, cleanup);
                     },
                     toString() {
                         return `[object ContainerLifetime, has=${String(_lifetime.has())}]`;
                     }
                 };
             };

src/main/ts/interfaces.ts +4 -5

             import { key } from "./traits";
             export interface IDestroyable {
                 destroy(): void;
             }
             /**
              * @template S Карта доступных зависимостей
              */
             export interface Resolver<S> {
                 /**
                  * Функция для разрешения зависимостей, поддерживает создание фабричных методов,
                  * отложенную активацию и значение по-умолчанию для сервисов
                  * @template K Ключ сервиса из {@linkcode S}
                  * @template O Тип параметра {@linkcode opts} используется для выведения типа
                  *   возвращаемого значения.
                  * @param name Ключ сервиса, который будет разрешен.
                  * @param {boolean=} opts.lazy Признак того, что требуется отложенная активация,
                  *   будет возвращен фабричный метод для получения зависимости. Если не указан,
                  *   то считается `false`.
                  * @param {any=} opts.default Значение по умолчанию, если в контейнере указанный
                  *   сервис не зарегистрирован
                  * @returns Либо фабричный метод для получения зависимости, либо значение зависимости
                  * @throws Error Если зависимость не найдена и не предоставлено значение по-умолчанию
                  */
                 <K extends keyof S, O extends { lazy: true; }>(name: K, opts?: O): () => NonNullable<S[K]> | InferDefault<O>;
                 <K extends keyof S, O extends { lazy?: false; }>(name: K, opts?: O): NonNullable<S[K]> | InferDefault<O>;
             }
             export type DepsMap<S> = {
                 [k in key]: Refs<S> | keyof S;
             };
             export type Refs<S> = {
                 [k in keyof S]: Ref<k, S[k]>;
             }[keyof S];
             export type Ref<K extends key, D> = {
                 /** The name of the service */
                 name: K;
                 /** Make a lazy reference, the resolved dependency will be a function */
                 lazy?: boolean;
                 /** The default value for the case where the service isn't defined.
                  * When specified the dependency becomes optional, the default value can be
                  * `null` or `undefined`
                  */
                 default?: D | null
             };
             export type Lazy<T, L extends boolean> = L extends true ? () => T : T;
             /** Возвращает тип свойства `default` в типе {@link T} */
             export type InferDefault<T> = T extends { default: infer D } ? D : never;
             export type InferLazy<R> = R extends { lazy: infer L } ?
                 L extends true ? true : false :
                 false;
             export type Resolve<S, R> =
                 R extends keyof S ? NonNullable<S[R]> :
                 R extends Ref<infer K, unknown> ?
                 K extends keyof S ?
                 Lazy<NonNullable<S[K]> | InferDefault<R>, InferLazy<R>> :
                 never :
                 never;
             /**
              * Интерфейс для конфигурирования сервиса в контейнере. Конфигурирование сервиса
              * состоит из настройки различных параметров вызовами методов {@linkcode wants},
              * {@linkcode lifetime}, {@linkcode override}, {@linkcode cleanup}. Завершение настройки
              * сервиса осуществляется вызовом одного из методов {@linkcode factory} либо
              * {@linkcode value}.
              *
              * @template S Карта сервисов контейнера, доступных при описании дескриптора
              * @template T Тип сервиса
              * @template R Карта зависимостей, которая передается параметром фабрике
              * @template U Имена пользовательских сервисов, доступных для переопределения
              */
             export interface IDescriptorBuilder<S, T, R, U extends keyof S> {
                 /** Указывает фабрика для создания экземпляра сервиса, фабрика передается
                  * в виде параметра. При вызове фабрике будет передан объект с зависимостями,
                  * которые были предварительно указаны вызовами метода `wants(...)`
                  *
                  * Вызов данного метода завершает конфигурирование сервиса.
                  *
                  * @param f Фабрика для создания экземпляра сервиса.
                  */
                 factory(f: (refs: R) => NonNullable<T>): void;
                 /**
                  * Используется для указания зависимостей, которые потребуются фабричному
                  * методу при создании нового экземпляра сервиса. Данный метод может быть
                  * вызван несколько раз подряд, при этом вызовы этого метода имеют
                  * кумулятивный эффект.
                  *
                  * @template X Тип объекта с зависимостями, которые требуется получить при
                  *   создании экземпляра фабрики при помощи фабричного метода.
                  * @param refs Объект с описанием зависимостей
                  * @returns Возвращает дескриптор сервиса, в котором указаны необходимые
                  *   зависимости
                  */
                 wants<X extends DepsMap<S> & Record<keyof R & keyof X, never>>(refs: X):
                     IDescriptorBuilder<S, T, R & {
                         [k in keyof X]: Resolve<S, X[k]>;
                     }, U>
                 override<K extends U>(name: K, builder: BuildDescriptorFn<S, S[K], U>): this;
                 override<X extends ConfigurationMapConstraint<S, U, keyof X>>(services: X): this;
                 lifetime(lifetime: "singleton", typeId: string | number | object): this;
                 lifetime(lifetime: ILifetime<T> | Exclude<ActivationType, "singleton">): this;
                 /** Указывает функцию для освобождения экземпляра сервиса для случаев, когда
                  * время жизни привязано к контейнеру.
                  */
                 cleanup(cb: (item: T) => void): this;
                 /**
                  * Регистрирует в контейнере постоянное значение в качестве реализации сервиса.
                  *
                  * @param v Экземпляр реализации сервиса.
                  */
                 value(v: NonNullable<T>): void;
             }
             export type BuildDescriptorFn<S, T, U extends keyof S> = (d: IDescriptorBuilder<S, T, Record<never, never>, U>) => void;
             /**
              * Конфигурация контейнера, состоит из набора функций, которые выполняют конфигурацию.
              *
              * Все параметры конфигурации являются обязательными, если требуется ввести
              * необязательные параметры, то нужно ограничить параметр типа {@linkcode K}
              *
              * @template S Сервисы доступные в контейнере
              * @template K Сервисы участвующие в конфигурации
              */
             export type ConfigurationMap<S, K extends keyof S, U extends keyof S> = {
                 [k in K]-?: BuildDescriptorFn<S, S[k], U>
             };
             export type ConfigurationMapConstraint<S, U extends keyof S, X extends string | number | symbol> = {
                 [k in X]-?: k extends U ? BuildDescriptorFn<S, S[k], U> : never;
             };
             /**
              * The type constraint useful to restrict type parameters to prevent defining
              * the services with the {@link ContainerKeys} names.
              *
              * The constraint doesn't exclude using this keys but declares them as `never`
              * which effectively will lead using this keys to the error.
              */
             export type ContainerServicesConstraint<S> = {
                 [k in keyof S]: k extends ContainerKeys ? never : S[k];
             };
             export interface Descriptor<S, T> {
                 /** This flags indicates that this registration can be replaced or overridden. */
                 readonly configurable?: boolean;
                 /** If specified signals the activation context that a new service scope
                  * should be created to isolate service overrides.
                  */
                 readonly hasOverrides?: boolean;
                 activate(context: IActivationContext<S>): NonNullable<T>;
             }
             /** The context used to initialize lifetime instance {@linkcode ILifetime} */
             export interface ILifetimeContext {
-                createLifetime<T>(): ILifetime<T>;
+                contextSlot<T>(slotId: string): ILifetimeSlot<T>;
-                createContainerLifetime<T>(): ILifetime<T>;
+                containerSlot<T>(slotId: string): ILifetimeSlot<T>;
             }
             export interface IActivationContext<S> extends ILifetimeContext, ServiceLocator<S> {
                 register<K extends keyof S>(name: K, service: DescriptorMap<S>[K]): void;
+                fail(error: unknown): never;
             }
             /**
              * Descriptors map for the specified services {@linkcode S}. All entries are
              * optional regardless the required or optional services in the original map.
              *
              * @template S Сервисы контекста активации
              * @template U Карта сервисов которые создаются дескрипторами
              */
             export type DescriptorMap<S> = {
                 [k in keyof S]?: Descriptor<S, S[k]>;
             };
             type ContainerKeys = keyof ContainerProvided<object>;
             export type ContainerProvided<S extends ContainerServicesConstraint<S>> = {
                 container: ServiceLocator<ContainerServices<S>>;
                 childContainer: IContainerBuilder<ContainerServices<S>, Exclude<keyof S, ContainerKeys>>;
             };
             /**
              * Таблица сервисов, которые предоставляет контейнер.
              *
              * Сервисы, предоставляемые контейнером не могут быть null или undefined.
              */
             export type ContainerServices<S extends ContainerServicesConstraint<S>> = {
                 [k in keyof S | ContainerKeys]:
                     k extends ContainerKeys ? ContainerProvided<S>[k] :
                     k extends keyof S ? S[k] : never
             };
             /**
              * Returns the service declared in the type map {@link S}.
              *
              *
              */
             export interface ServiceLocator<S> {
                 resolve<K extends keyof S>(name: K): NonNullable<S[K]>;
                 resolve<K extends keyof S, T>(name: K, def: T): NonNullable<S[K]> | T;
             }
-            export interface LifetimeContainer {
-                createLifetime<T>(): ILifetime<T>;
             export interface IContainerBuilder<S, U extends keyof S> {
                 createServiceBuilder<K extends U>(name: K):
                     IDescriptorBuilder<S, S[K], Record<never, never>, U>;
                 build(): ServiceLocator<S>;
             }
             export type ActivationType = "singleton" | "container" | "hierarchy" | "context" | "call";
             /**
              * Интерфейс для управления жизнью экземпляра объекта. Каждая регистрация имеет
              * свой собственный объект `ILifetime`, который создается при первой активации
              */
             export interface ILifetime<T> {
                 /** Проверяет, что уже создан экземпляр объекта */
                 has(): boolean;
                 get(): NonNullable<T>;
                 initialize(context: ILifetimeContext): void;
                 store(item: NonNullable<T>, cleanup?: (item: NonNullable<T>) => void): void;
                 toString(): string;
             }
             export interface ILifetimeSlot<T> {
                 has: () => boolean;
                 get: () => T;
                 initialize: () => void;
                 store(item: T, cleanup?: (item: T) => void): void;
             }
             export interface ILifetimeManager extends IDestroyable {
                 create<T>(): ILifetime<T>;
             }
             export type ExtractRequired<T, K extends keyof T = keyof T> = { [p in K as (undefined extends T[p] ? never : p)]-?: T[p] };
             export type ExtractRequiredKeys<T, K extends keyof T = keyof T> = { [p in K]-?: undefined extends T[p] ? never : p }[K];

src/main/ts/traits.ts +4 -1

             import { FluentConfiguration } from "./FluentConfiguration";
             import { ContainerServices, ContainerServicesConstraint, IDestroyable } from "./interfaces";
             export function fluent<S extends ContainerServicesConstraint<S>>() {
                 return new FluentConfiguration<S>();
             }
             export type key = string | number | symbol;
             export const isKey = (v: unknown): v is key =>
                 typeof v === "string" || typeof v === "number" || typeof v === "symbol";
             export const isString = (v: unknown): v is string =>
                 typeof v === "string";
             export const isNotNull = <T>(v: T): v is NonNullable<T> => v !== null && v !== undefined;
             export const each = <T extends object>(obj: T, cb: <X extends Extract<keyof T, string>>(v: NonNullable<T[X]>, k: X) => void) =>
                 (Object.keys(obj) as (Extract<keyof T, string>)[])
                     .forEach(k => {
                         const v = obj[k];
                         isNotNull(v) && cb(v, k);
                     });
             export const argumentNotNull = (arg: unknown, name: string) => {
                 if (arg === null || arg === undefined)
                     throw new Error("The argument " + name + " can't be null or undefined");
             };
             export const isPromise = <T = unknown>(val: unknown): val is PromiseLike<T> =>
                 isNotNull(val) && typeof (val as PromiseLike<T>).then === "function";
             export const isDestroyable = (d: unknown): d is IDestroyable =>
                 isNotNull(d) && typeof (d as IDestroyable).destroy === "function";
             let _nextOid = 0;
             const _oid = typeof Symbol === "function" ?
                 Symbol.for("__implab__oid__") :
                 "__implab__oid__";
             type OidSlot = { [k in typeof _oid]?: string };
             export const oid = <T extends object>(instance: T): string => {
                 argumentNotNull(instance, "instance");
                 const val = (instance as OidSlot)[_oid];
                 return val ? val : ((instance as OidSlot)[_oid] = `oid_${++_nextOid}`);
-            };
  No newline at end of file
+            };
+            export const prototype = <T extends object>(instance: T | null): T =>
+                Object.create(instance) as T;
  No newline at end of file

src/tsconfig.json +2 -2

             {
                 "compilerOptions": {
                     "moduleResolution": "node",
                     "experimentalDecorators": true,
                     "noEmitOnError": true,
                     "listFiles": true,
                     "strict": true,
                     "types": [],
-                    "target": "ES5",
+                    "target": "ES2018",
-                    "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]
+                    "lib": ["ES2018", "DOM", "ScriptHost"]
                 }
             }

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