implab/implabjs-di Commit - r5:83fa5814462d

Working on container builder

cin -

r5:83fa5814462d default

parent child

Context file:

r5:83fa5814462d

Collapse all files

src/main/ts/ContainerBuilder.ts created 644 +46 0

@@ -0,0 +1,46
	1	import { Container } from "./Container";
	2	import { DescriptorBuilder } from "./DescriptorBuilder";
	3	import { Configurable, ConfigurableKeys, ContainerServices, Descriptor, IContainerBuilder, IDescriptorBuilder, RegistrationMap, ServiceContainer } from "./interfaces";
	4	import { LifetimeManager } from "./LifetimeManager";
	5
	6	export class ContainerBuilder<S extends Configurable<S>> implements IContainerBuilder<S>{
	7
	8	private _pending = 1;
	9
	10	private readonly _services: Partial<RegistrationMap<ContainerServices<S>>>;
	11
	12	private readonly _lifetimeManager = new LifetimeManager();
	13
	14	constructor(parentServices?: object) {
	15	this._services = Object.create(parentServices ? parentServices : null) as object;
	16	}
	17
	18	createServiceBuilder<K extends keyof S>(name: K): IDescriptorBuilder<S, NonNullable<S[K]>, object> {
	19	return new DescriptorBuilder(this._lifetimeManager, this._register(name), this._fail);
	20	}
	21
	22	build(): ServiceContainer<S> {
	23	this._assertBuilding();
	24	if(!this._complete())
	25	throw new Error("The configuration didn't complete.");
	26	return new Container(this._services, this._lifetimeManager);
	27	}
	28
	29	private readonly _register = <K extends ConfigurableKeys<S>>(name: K) => (descriptor: Descriptor<S, NonNullable<S[K]>>) => {
	30	this._complete();
	31	this._services[name] = descriptor;
	32	};
	33
	34	private readonly _fail = (ex: unknown) => {
	35
	36	};
	37
	38	private _assertBuilding() {
	39	throw new Error("The descriptor builder is finalized");
	40	}
	41
	42	private _complete() {
	43	return !(--this._pending);
	44	}
	45
	46	} No newline at end of file

.eslintrc.json +1 0

             {
                 "root": true,
                 "extends": [
                     "plugin:react/recommended",
                     "eslint:recommended",
                     "plugin:@typescript-eslint/eslint-recommended",
                     "plugin:@typescript-eslint/recommended",
                     "plugin:@typescript-eslint/recommended-requiring-type-checking"
                 ],
                 "parser": "@typescript-eslint/parser",
                 "parserOptions": {
                     "ecmaFeatures": {
                         "jsx": true
                     },
                     "ecmaVersion": 5,
                     "tsconfigRootDir": "src",
                     "project": ["tsconfig.eslint.json", "*/tsconfig.json"]
                 },
                 "plugins": [
                     "@typescript-eslint"
                 ],
                 "rules": {
                     "@typescript-eslint/no-empty-function": "off",
                     "max-classes-per-file": [
                         "error",
                         { "ignoreExpressions": true, "max": 1 }
                     ],
                     "@typescript-eslint/prefer-readonly": ["error"],
+                    "semi": "off",
                     "@typescript-eslint/semi": ["error"]
                 }
             }

src/main/ts/ActivationContext.ts +4 -3

             import { Descriptor, ILifetime, RegistrationMap, LifetimeContainer, ConfigurableKeys } from "./interfaces";
+            import { LifetimeManager } from "./LifetimeManager";
             import { argumentNotNull } from "./traits";
             export interface ActivationContextInfo {
                 name: string;
                 service: string;
             }
             let nextId = 1;
             /** This class 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.
              */
             export class ActivationContext<S extends object> {
                 private readonly _cache: Record<string, unknown>;
                 private readonly _services: Partial<RegistrationMap<S>>;
                 private readonly _name: string;
                 private readonly _service: Descriptor<S, unknown>;
-                private readonly _containerLifetimeManager: LifetimeContainer;
+                private readonly _containerLifetimeManager: LifetimeManager;
                 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: LifetimeContainer, services: Partial<RegistrationMap<S>>, name: string, service: Descriptor<S, unknown>, cache = {}) {
+                constructor(containerLifetimeManager: LifetimeManager, services: Partial<RegistrationMap<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.createLifetime<T>();
+                    return this._containerLifetimeManager.create<T>();
                 }
                 /** Resolves the specified dependency in the current context
                  * @param name The name of the dependency being resolved
                  */
                 resolve<K extends keyof S>(name: K): NonNullable<S[K]>;
                 /** Resolves the specified dependency with the specified default value if
                  * the dependency is missing.
                  *
                  * @param name The name of the dependency being resolved
                  * @param def A default value to return in case of the specified dependency
                  *   is missing.
                  */
                 resolve<K extends keyof S, T>(name: K, def: T): NonNullable<S[K]> | T;
                 resolve<K extends keyof S, T>(name: K, def?: T): 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 ConfigurableKeys<S>>(name: K, service: RegistrationMap<S>[K]) {
                     argumentNotNull(name, "name");
                     this._services[name] = service;
                 }
                 createLifetime<T>(): ILifetime<T> {
                     const id = nextId++;
                     return {
                         initialize() {},
                         has: () => id in this._cache,
                         get: () => this._cache[id] as T,
                         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 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) {
                     return new ActivationContext(
                         this._containerLifetimeManager,
                         Object.create(this._services) as typeof this._services,
                         name,
                         service,
                         this._cache
                     );
                 }
             }

src/main/ts/Container.ts +14 -39

             import { ActivationContext } from "./ActivationContext";
             import { ActivationError } from "./ActivationError";
-            import { RegistrationMap, ContainerKeys, ServiceContainer, ContainerServices, ConfigurableServices, ConfigurableKeys, ServiceLocator, Descriptor} from "./interfaces";
+            import { ContainerBuilder } from "./ContainerBuilder";
+            import { RegistrationMap, ServiceContainer, ContainerServices, ServiceLocator, IContainerBuilder, Configurable, ContainerKeys} from "./interfaces";
             import { LifetimeManager } from "./LifetimeManager";
-            import { each, isKey } from "./traits";
-            export class Container<S extends object > implements ServiceContainer<S> {
+            export class Container<S extends Configurable<S>> implements ServiceContainer<S> {
                 private readonly _services: Partial<RegistrationMap<ContainerServices<S>>>;
                 private readonly _lifetimeManager: LifetimeManager;
-                private readonly _cleanup: (() => void)[];
                 private _disposed: boolean;
-                constructor(parent?: Container<S>) {
+                constructor(services: Partial<RegistrationMap<ContainerServices<S>>>, lifetimeManager: LifetimeManager) {
-                    this._services = Object.create(parent ? parent._services : null) as typeof this._services;
+                    this._services = services;
-                    this._cleanup = [];
+                    this._services.container = { activate: () => this as ContainerServices<S>["container"]};
-                    this._services.container = { activate: () => this  as ServiceLocator<ContainerServices<S>>};
+                    this._services.childContainer = { activate: () => this.createChildContainer() as ContainerServices<S>["childContainer"] };
-                    this._services.childContainer = { activate: () => this.createChildContainer() };
                     this._disposed = false;
-                    this._lifetimeManager = new LifetimeManager();
+                    this._lifetimeManager = lifetimeManager;
                 }
-                register<K extends ConfigurableKeys<S>>(name: K, service: Descriptor<ContainerServices<S>, ConfigurableServices<S>[K]>): void;
+                createChildContainer(): IContainerBuilder<S> {
-                register<K extends ConfigurableKeys<S>>(services: {[k in K]: Descriptor<ContainerServices<S>, ConfigurableServices<S>[k]>}): void;
+                    return new ContainerBuilder(this._services);
-                register<K extends ConfigurableKeys<S>>(nameOrCollection: K | {[k in K]: Descriptor<ContainerServices<S>, ConfigurableServices<S>[k]>}, service?: RegistrationMap<ContainerServices<S>>[K]) {
-                    if (!isKey(nameOrCollection)) {
-                        each(nameOrCollection, (v, k) => this.register(k, v));
-                    } else {
-                        if (!service)
-                            throw new Error("The service parameter must be a descriptor");
-                        this._services[nameOrCollection] = service;
                 }
-                createChildContainer(): ServiceContainer<S> {
+                resolve<K extends keyof ContainerServices<S>>(name: K): NonNullable<ContainerServices<S>[K]>;
-                    return new Container(this);
+                resolve<K extends keyof ContainerServices<S>, T>(name: K, def: T): NonNullable<ContainerServices<S>[K]> | T;
+                resolve<K extends keyof ContainerServices<S>, T>(name: K, def?: T) {
-                resolve<K extends ContainerKeys<S>>(name: K): NonNullable<ContainerServices<S>[K]>;
-                resolve<K extends ContainerKeys<S>>(name: K, def: ContainerServices<S>[K]): ContainerServices<S>[K];
-                resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerServices<S>[K]): ContainerServices<S>[K] | undefined {
                     // TODO: add logging
                     // trace.debug("resolve {0}", name);
                     const d = this._services[name];
                     if (d === undefined) {
                         if (arguments.length > 1)
                             return def;
                         else
                             throw new Error(`Service '${String(name)}' isn't found`);
                     } else {
-                        const context = new ActivationContext(this, this._services, String(name), d);
+                        const context = new ActivationContext(this._lifetimeManager, this._services, String(name), d);
                         try {
                             return d.activate(context);
                         } catch (error) {
                             throw new ActivationError(name.toString(), context.getStack(), error);
                         }
                     }
                 }
-                createLifetime<T>() {
-                    return this._lifetimeManager.create<T>();
                 destroy() {
-                    return this.dispose();
-                dispose() {
                     if (this._disposed)
                         return;
                     this._disposed = true;
-                    for (const f of this._cleanup)
-                        f();
                     this._lifetimeManager.destroy();
                 }
             }

src/main/ts/DescriptorBuilder.ts +6 -13

             import { RegistrationBuilder, LifetimeContainer, ConfigurableKeys, IDescriptorBuilder, Ref, Resolved, DepsMap } from "./interfaces";
             import { Descriptor, ILifetime, ActivationType } from "./interfaces";
             import { DescriptorImpl, RegistrationOverridesMap } from "./DescriptorImpl";
             import { LifetimeManager } from "./LifetimeManager";
             import { each, isKey, isPromise, isString, key, oid } from "./traits";
             /**
              * @template {S} Карта доступных зависимостей, как правило `ContainerServices`
              * @template {T} Тип сервиса
              */
             export class DescriptorBuilder<S extends object, T, R extends object = object> implements IDescriptorBuilder<S, T, R> {
-                private readonly _lifetimeContainer: LifetimeContainer;
+                private readonly _lifetimeManager: LifetimeManager;
                 private readonly _cb: (d: Descriptor<S, T>) => void;
                 private readonly _eb: (err: unknown) => void;
                 private readonly _refs: DepsMap<key, keyof S>;
                 private _lifetime = LifetimeManager.empty<T>();
                 private _overrides: RegistrationOverridesMap<S>;
                 private _cleanup?: (item: T) => void;
                 private _factory?: (refs: R) => T;
                 private _pending = 1;
                 private _failed = false;
                 private _finalized = false;
                 /**
                  * Creates new DescriptorBuilder. Accepts a lifetime container for resolving "container"
                  * lifetime.
                  *
-                 * @param container The lifetime container is the container where the service is to be registered.
+                 * @param lifetimeManager The lifetime container is the container where the service is to be registered.
                  * @param cb The callback to receive the built service descriptor
                  * @param eb The callback to receive the error due
                  */
-                constructor(container: LifetimeContainer, cb: (d: Descriptor<S, T>) => void, eb: (err: unknown) => void) {
+                constructor(lifetimeManager: LifetimeManager, cb: (d: Descriptor<S, T>) => void, eb: (err: unknown) => void) {
-                    this._lifetimeContainer = container;
+                    this._lifetimeManager = lifetimeManager;
                     this._cb = cb;
                     this._eb = eb;
                     this._overrides = {};
                     this._refs = {};
                 }
                 wants<X extends { [k in Exclude<key, keyof R>]: keyof S | Ref<keyof S, boolean, unknown>; }>(refs: X):
                     IDescriptorBuilder<S, T, R & {
                         [k in keyof X]:
                         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;
                     }> {
                     each(refs, (v, k) => this._refs[k] = v);
                     return this as IDescriptorBuilder<S, T, R & {
                         [k in keyof X]:
                         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;
                     }>;
                 }
                 factory(f: (refs: R) => T): void {
                     this._assertBuilding();
                     this._factory = f;
                     this._finalize();
                     this._complete();
                 }
                 private _assertBuilding() {
                     if (this._finalized)
                         throw new Error("The descriptor builder is finalized");
                 }
                 private _finalize() {
                     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 {
                     this._assertBuilding();
                     const guard = (v: void | Promise<void>) => {
                         if (isPromise(v))
                             v.catch(err => this._fail(err));
                     };
                     if (isKey(nameOrServices)) {
                         if (builder) {
                             this._defer();
                             const d = new DescriptorBuilder<S, NonNullable<S[K]>>(
-                                this._lifetimeContainer,
+                                this._lifetimeManager,
                                 result => {
                                     this._overrides[nameOrServices] = result;
                                     this._complete();
                                 },
                                 err => this._fail(err)
                             );
                             try {
                                 guard(builder(d));
                             } catch (err) {
                                 this._fail(err);
                             }
                         }
                     } else {
                         each(nameOrServices, (v, k) => this.override(k, v));
                     }
                     return this;
                 }
                 lifetime(lifetime: "singleton", typeId: string): this;
                 lifetime(lifetime: ILifetime<T> | Exclude<ActivationType, "singleton">): this;
                 lifetime(lifetime: ILifetime<T> | ActivationType, typeId?: string): this {
                     this._assertBuilding();
                     if (isString(lifetime)) {
                         this._lifetime = this._resolveLifetime(lifetime, typeId);
                     } else {
                         this._lifetime = lifetime;
                     }
                     return this;
                 }
                 cleanup(cb: (item: T) => void): this {
                     this._assertBuilding();
                     this._cleanup = cb;
                     return this;
                 }
-                /*factory(f: (resolve: Resolver<S>) => T): void {
-                    this._assertBuilding();
-                    this._factory = f;
-                    this._finalize();
-                    this._complete();
-                }*/
                 value(v: T): void {
                     this._assertBuilding();
                     this._cb({
                         activate() {
                             return v;
                         }
                     });
                     this._finalize();
                 }
                 _resolveLifetime<T>(activation: ActivationType, typeId?: string | object): ILifetime<T> {
                     switch (activation) {
                         case "container":
-                            return LifetimeManager.containerLifetime(this._lifetimeContainer);
+                            return this._lifetimeManager.create();
                         case "hierarchy":
                             return LifetimeManager.hierarchyLifetime();
                         case "context":
                             return LifetimeManager.contextLifetime();
                         case "singleton": {
                             if (!typeId)
                                 throw Error("The singleton activation requires a typeId");
                             const _oid = isString(typeId) ? typeId : oid(typeId);
                             return LifetimeManager.singletonLifetime(_oid);
                         }
                         default:
                             return LifetimeManager.empty();
                     }
                 }
                 _defer() {
                     this._pending++;
                 }
                 _complete() {
                     if (--this._pending === 0) {
                         if (!this._factory)
                             throw new Error("The factory must be specified");
                         this._cb(new DescriptorImpl<S, T>({
                             lifetime: this._lifetime,
                             factory: this._factory,
                             overrides: this._overrides,
                             cleanup: this._cleanup
                         }));
                     }
                 }
                 _fail(err: unknown) {
                     if (!this._failed) {
                         this._failed = true;
                         this._eb.call(undefined, err);
                     }
                 }
             }

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

-            import { Descriptor, ILifetime, ConfigurableKeys, DepsMap, Ref } from "./interfaces";
+            import { Descriptor, ILifetime, ConfigurableKeys, 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 interface DescriptorImplArgs<S extends object, T> {
                 lifetime: ILifetime<T>;
                 factory: (refs: Record<key, never>) => T;
                 cleanup?: (item: T) => void;
                 overrides?: RegistrationOverridesMap<S>;
                 dependencies?: DepsMap<key, keyof S>;
             }
             export class DescriptorImpl<S extends object, T> implements Descriptor<S, T> {
                 private readonly _overrides?: RegistrationOverridesMap<S>;
                 private readonly _lifetime: ILifetime<T>;
                 private readonly _factory: (refs: Record<key, never>) => T;
                 private readonly _cleanup?: (item: T) => void;
                 private readonly _deps?: DepsMap<key, keyof S>;
                 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;
                 }
-                activate(context: ActivationContext<S>): T {
+                activate(context: IActivationContext<S>): 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, L extends boolean, D = never>({ name, lazy, ...opts }: Ref<K, L, D>) => {
                         if (lazy) {
                             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);
                         }
                     };
-                    const makeRefs = (deps?: DepsMap<key, keyof S>) => deps ?
+                    const makeRefs = (deps: typeof this._deps) => deps ?
                         Object.keys(deps)
                             .map(k => {
                                 const ref = deps[k];
                                 return isKey(ref) ?
                                     { [k]: resolve({ name: ref }) } :
                                     { [k]: resolve(ref) };
                             })
                             .reduce((a, p) => ({ ...a, ...p }), {} ) as Record<key, never>:
                         {} as Record<key, never>;
                     const instance = this._factory.call(undefined, makeRefs(this._deps));
                     this._lifetime.store(instance, this._cleanup);
                     return instance;
                 }
                 toString() {
                     return `[object DescriptorImpl, lifetime=${String(this._lifetime)}]`;
                 }
             }

src/main/ts/FluentConfiguration.ts +4 -26

             import { DescriptorBuilder } from "./DescriptorBuilder";
-            import { ConfigurableKeys, ContainerServices, ConfigurableServices, RegistrationBuildersMap, ExtractRequired } from "./interfaces";
+            import { ConfigurableKeys, ContainerServices, RegistrationBuildersMap, ExtractRequired, IContainerBuilder } from "./interfaces";
             import { ServiceContainer } from "./interfaces";
             import { argumentNotNull, each, isKey } from "./traits";
             export class FluentConfiguration<S extends object, Y extends ConfigurableKeys<S> = ConfigurableKeys<S>> {
                 private _builders: Partial<RegistrationBuildersMap<S>> = {};
                 /** Adds a declaration of the services to the current config.
                  *
                  * @template D The map of the services
                  * @returns self
                  */
                 declare<D extends Partial<Pick<S, keyof D & keyof S>>>(): FluentConfiguration<S & D, Y | ConfigurableKeys<D>> {
                     return this as FluentConfiguration<S & D, Y | ConfigurableKeys<D>>;
                 }
                 /** Adds compile-time information about the already provided services
                  *
                  * @template P The map of the provided services
                  * @returns self
                  */
                 provided<P extends Pick<S, keyof P & keyof S>>(): FluentConfiguration<S & P, Exclude<Y, keyof P>> {
                     return this as FluentConfiguration<S & P, Exclude<Y, keyof P>>;
                 }
                 /** Register the service.
                  *
                  * @param name The name of the service
                  * @param builder The service builder
                  * @returns self
                  */
                 register<K extends Y>(name: K, builder: RegistrationBuildersMap<S>[K]): FluentConfiguration<S, Exclude<Y, K>>;
                 /** Registers the collection of services
                  * @param config The collection of services to register.
                  * @returns self
                  */
                 register<K extends Y>(config: RegistrationBuildersMap<S, K>): FluentConfiguration<S, Exclude<Y, K>>;
                 register<K extends Y>(nameOrConfig: K | RegistrationBuildersMap<S, K>, builder?: RegistrationBuildersMap<S>[K]) {
                     if (isKey(nameOrConfig)) {
                         argumentNotNull(builder, "builder");
                         this._builders[nameOrConfig] = builder;
                     } else {
                         each(nameOrConfig, (v, k) => this.register(k, v));
                     }
                     return this as FluentConfiguration<S, Exclude<Y, K>>;
                 }
                 /**
                  * This method is used to enable a compile time check of the configuration.
                  * If there are not configured services in the configuration the compiler
                  * will trigger the error.
                  *
                  * @param missing Empty object literal should always be specified.
                  * @returns self
                  */
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 done<M extends ExtractRequired<S,Y>>(missing: M) {
                     return this;
                 }
+                configure<T extends IContainerBuilder<S>>(builder: T) {
-                apply<T extends ServiceContainer<S>>(target: T) {
-                    let pending = 1;
-                    const reject = (ex: unknown) => { throw ex; };
-                    const complete = () => !--pending;
                     each(this._builders, (v, k) => {
-                        pending++;
+                        v(builder.createServiceBuilder(k));
-                        const d = new DescriptorBuilder<ContainerServices<S>, NonNullable<ConfigurableServices<S>[typeof k]>>(
-                            target,
-                            result => {
-                                target.register(k, result);
-                                complete();
-                            },
-                            reject
-                        );
-                        v(d);
                     });
-                    if (!complete())
+                    builder.build() as T & ServiceContainer<S>;
-                        throw new Error("The configuration didn't complete.");
-                    return target as T & ServiceContainer<S>;
                 }
             }

src/main/ts/LifetimeManager.ts +2 -2

-            import { IDestroyable, ILifetime } from "./interfaces";
+            import { IActivationContext, IDestroyable, ILifetime } from "./interfaces";
             import { ActivationContext } from "./ActivationContext";
             import { argumentNotNull, isDestroyable } from "./traits";
             const safeCall = (item: () => void) => {
                 try {
                     item();
                 } catch {
                     // silence!
                 }
             };
             const emptyLifetime = Object.freeze({
                 has() {
                     return false;
                 },
                 initialize() {
                 },
                 get() {
                     throw new Error("The specified item isn't registered with this lifetime manager");
                 },
                 store() {
                     // does nothing
                 },
                 toString() {
                     return `[object EmptyLifetime]`;
                 }
             });
             const unknownLifetime = Object.freeze({
                 has() {
                     return 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");
                 },
                 toString() {
                     return `[object UnknownLifetime]`;
                 }
             });
             let nextId = 0;
             const singletons: { [K:string]: unknown} = {};
             export class LifetimeManager implements IDestroyable {
                 private _cleanup: (() => void)[] = [];
                 private readonly _cache: {[K: string]: unknown} = {};
                 private _destroyed = false;
                 private readonly _pending: {[K: string]: unknown} = {};
                 create<T>(): ILifetime<T> {
                     const id = ++nextId;
                     return {
                         has: () => id in this._cache,
                         get: () => {
                             const t = this._cache[id];
                             if (t === undefined)
                                 throw new Error(`The item with with the key ${id} isn't found`);
                             return t as T;
                         },
                         initialize: () => {
                             if (this._pending[id])
                                 throw Error(`Cyclic reference detected: the item with the key ${id} is already activating.`);
                             this._pending[id] = true;
                         },
                         store: (item: T, cleanup?: (item: T) => void) => {
                             argumentNotNull(id, "id");
                             argumentNotNull(item, "item");
                             if (id in this._cache)
                                 throw new Error(`The item with with the key ${id} already registered with this lifetime manager`);
                             delete this._pending[id];
                             this._cache[id] = item;
                             if (this._destroyed)
                                 throw new Error("Lifetime manager is destroyed");
                             if (cleanup) {
                                 this._cleanup.push(() => cleanup(item));
                             } else if (isDestroyable(item)) {
                                 this._cleanup.push(() => item.destroy());
                             }
                         }
                     };
                 }
                 destroy() {
                     if (!this._destroyed) {
                         this._destroyed = true;
                         this._cleanup.forEach(safeCall);
                         this._cleanup.length = 0;
                     }
                 }
                 static empty<T>(): ILifetime<T> {
                     return emptyLifetime;
                 }
                 static hierarchyLifetime<T>() {
                     let _lifetime: ILifetime<T> = unknownLifetime;
                     return {
-                        initialize(context: ActivationContext<object>) {
+                        initialize(context: IActivationContext<object>) {
                             if (_lifetime !== unknownLifetime)
                                 throw new Error("Cyclic reference activation detected");
                             _lifetime = context.createContainerLifetime<T>();
                         },
                         get() {
                             return _lifetime.get();
                         },
                         has() {
                             return _lifetime.has();
                         },
                         store(item: T, cleanup?: (item: T) => void) {
                             return _lifetime.store(item, cleanup);
                         },
                         toString() {
                             return `[object HierarchyLifetime, has=${String(this.has())}]`;
                         }
                     };
                 }
                 static contextLifetime<T>() {
                     let _lifetime: ILifetime<T> = unknownLifetime;
                     return {
                         initialize(context: ActivationContext<object>) {
                             if (_lifetime !== unknownLifetime)
                                 throw new Error("Cyclic reference detected");
                             _lifetime = context.createLifetime();
                         },
                         get() {
                             return _lifetime.get();
                         },
                         has() {
                             return _lifetime.has();
                         },
                         store(item: T) {
                             _lifetime.store(item);
                         },
                         toString() {
                             return `[object ContextLifetime, has=${String(this.has())}]`;
                         }
                     };
                 }
                 static singletonLifetime<T>(typeId: string) {
                     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 T;
                         },
                         initialize() {
                             if (pending)
                                 throw new Error("Cyclic reference detected");
                             pending = true;
                         },
                         store(item: T) {
                             singletons[typeId] = item;
                             pending = false;
                         },
                         toString() {
                             return `[object SingletonLifetime, has=${String(this.has())}, typeId=${typeId}]`;
                         }
                     };
                 }
                 static 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: T) {
                             _lifetime.store(item);
                         },
                         toString() {
                             return `[object ContainerLifetime, has=${String(_lifetime.has())}]`;
                         }
                     };
                 }
             }

src/main/ts/interfaces.ts +29 -20

             import { ActivationContext } from "./ActivationContext";
             import { key } from "./traits";
-            export type primitive = number | string | null | undefined | symbol;
             export interface IDestroyable {
                 destroy(): void;
             }
             /**
              * @template S Карта доступных зависимостей
              */
             export interface Resolver<S extends object> {
                 /**
                  * Функция для разрешения зависимостей, поддерживает создание фабричных методов,
                  * отложенную активацию и значение по-умолчанию для сервисов
                  * @template K Ключ сервиса из {@link S}
                  * @template O Тип параметра {@link opts} используется для выведения типа
                  *   возвращаемого значения.
                  * @param name Ключ сервиса, который будет разрешен.
                  * @param {boolean=} opts.lazy Признак того, что требуется отложенная активация,
                  *   будет возвращен фабричный метод для получения зависимости. Если не указан,
                  *   то считается `false`.
                  * @param {any=} opts.default Значение по умолчанию, если в контейнере указанный
                  *   сервис не зарегистрирован
                  * @returns Либо фабричный метод для получения зависимости, либо значение зависимости
                  * @throws Error Если зависимость не найдена и не предоставлено значение по-умолчанию
                  */
                 <K extends keyof S, O extends { lazy: true; default?: unknown }>(name: K, opts?: O): () => (O extends { default: infer T } ? T : never) | NonNullable<S[K]>;
                 <K extends keyof S, O extends { lazy?: false; default?: unknown }>(name: K, opts?: O): (O extends { default: infer T } ? T : never) | NonNullable<S[K]>;
             }
             export type DepsMap<K extends key, SK extends key> = { [k in K]: SK | Ref<SK, boolean, unknown> };
-            export type Ref<K extends key, L extends boolean, D> = { name: K, lazy?: L} | { name: K, lazy?: L, default: D };
+            export type Ref<K extends key, L extends boolean, D> = { name: K, lazy?: L } | { name: K, lazy?: L, default: D };
             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);
+                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> {
                 /**
                  *
                  * @param f
                  */
                 factory(f: (refs: R) => T): void;
                 wants<X extends DepsMap<Exclude<key, keyof R>, keyof S>>(refs: X):
                     IDescriptorBuilder<S, T, R & {
                         [k in keyof X]:
                         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>:
+                        X[k] extends Ref<infer K, infer L, infer D> ? Resolved<S, K & keyof S, L, D> :
                         never
                     }>
                 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;
                 lifetime(lifetime: "singleton", typeId: string | number | object): this;
                 lifetime(lifetime: ILifetime<T> | Exclude<ActivationType, "singleton">): this;
                 cleanup(cb: (item: T) => void): this;
                 value(v: T): void;
             }
             export type RegistrationBuilder<S extends object, T> = (d: IDescriptorBuilder<S, T>) => void;
             export type RegistrationBuildersMap<S extends object, K extends ConfigurableKeys<S> = ConfigurableKeys<S>> = {
-                [k in K]-?: RegistrationBuilder<ContainerServices<S>, NonNullable<ConfigurableServices<S>[k]>>
+                [k in K]-?: RegistrationBuilder<ContainerServices<S>, NonNullable<S[k]>>
             };
             export interface Descriptor<S extends object, T> {
-                activate(context: ActivationContext<S>): T;
+                activate(context: IActivationContext<S>): T;
             }
-            export type ConfigurableDescriptor<S extends object, K extends ConfigurableKeys<S>> = Descriptor<ContainerServices<S>, ConfigurableServices<S>[K]>;
+            export interface IActivationContext<S extends object> extends ServiceLocator<S> {
+                createLifetime<T>(): ILifetime<T>;
+                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 ProvidedServices<S extends object> {
+            export interface ContainerProvided<S extends Configurable<S>> {
                 container: ServiceLocator<ContainerServices<S>>;
-                childContainer: ServiceContainer<S>;
+                childContainer: IContainerBuilder<S>;
             }
-            export type ProvidedKeys = keyof ProvidedServices<object>;
+            export type Configurable<S> = { [k in keyof S & (keyof ContainerProvided<never>)]: never; };
-            export type ContainerKeys<S extends object> = keyof ContainerServices<S>;
-            export type Mix<S, X> = { [k in keyof (S & X)]: k extends keyof X ? X[k] : S[k & keyof S] };
+            export type ProvidedKeys = keyof ContainerProvided<never>;
-            export type ContainerServices<S extends object> = Mix<S, ProvidedServices<S>>;
+            export type ContainerServices<S extends Configurable<S>> = S & ContainerProvided<S>;
             export type ConfigurableKeys<S extends object> = Exclude<keyof S, ProvidedKeys>;
             export type ConfigurableServices<S extends object> = Pick<S, ConfigurableKeys<S>>;
+            export type ContainerKeys<S extends Configurable<S>> = keyof S | keyof ContainerProvided<never>;
             export interface ServiceLocator<S extends object> {
                 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 ServiceContainer<S extends object> extends ServiceLocator<ContainerServices<S>>, LifetimeContainer, IDestroyable {
+            export interface ServiceContainer<S extends Configurable<S>> extends
+                ServiceLocator<ContainerServices<S>>,
+                IDestroyable {
-                register<K extends ConfigurableKeys<S>>(name: K, service: ConfigurableDescriptor<S, K>): void;
+                createChildContainer(): IContainerBuilder<S>;
-                register<K extends ConfigurableKeys<S>>(services: { [k in K]: ConfigurableDescriptor<S, K> }): void;
-                createChildContainer(): ServiceContainer<S>;
+            export interface IContainerBuilder<S extends Configurable<S>> {
+                createServiceBuilder<K extends keyof S>(name: K): IDescriptorBuilder<S, NonNullable<S[K]>>;
+                build(): ServiceContainer<S>;
             }
             export type ActivationType = "singleton" | "container" | "hierarchy" | "context" | "call";
             /**
              * Интерфейс для управления жизнью экземпляра объекта. Каждая регистрация имеет
              * свой собственный объект `ILifetime`, который создается при первой активации
              */
             export interface ILifetime<T> {
                 /** Проверяет, что уже создан экземпляр объекта */
                 has(): boolean;
                 get(): T;
-                initialize(context: ActivationContext<object>): void;
+                initialize(context: IActivationContext<object>): void;
                 store(item: T, cleanup?: (item: T) => void): void;
             }
             export type ExtractRequired<T, K extends keyof T = keyof T> = { [p in K as (undefined extends T[p] ? never : p)]-?: T[p] };

src/test/ts/t/container.ts +8 -3

             /* eslint max-classes-per-file: ["error", 20] */
             import { describe, it } from "mocha";
             import { Container } from "../Container";
+            import { ContainerServices } from "../interfaces";
             import { fluent } from "../traits";
             class Foo {
                 foo = "foo";
             }
             class Bar {
                 bar = "bar";
                 constructor(foo?: () => Foo) { }
             }
             interface Services {
                 foo: Foo;
                 bar?: Bar;
                 baz: Foo;
             }
             interface ServicesB {
                 // will give errors
                 // baz: Bar;
                 baz: Foo;
                 zoo?: Foo;
             }
             interface SharedServices {
                 foo: Foo;
                 bar?: Bar;
                 baz: Bar;
             }
             const config = fluent()
                 .declare<Services>()
                 .declare<ServicesB>()
                 .register({
                     bar: it => it
                         .lifetime("context") // тип активации, время жизни
                         .wants({
                             zoo: "zoo", // зависимость
                             zoo$: { name: "zoo", lazy: true } // отложенная активация,
                             //фабричный метод
                         })
                         .factory(({ zoo$ }) => // фабрика получает объект с именованными зависимостями
                             // удобно для деструктурирования
                             new Bar(zoo$) // создается экземпляр сервиса
                         ),
                     foo: it => it.factory(() => new Foo()),
                     baz: it => it.value(new Foo())
                 })
                 .done({});
-            declare const container: Container<Record<string, never>>;
+            declare const container: Container<object>;
-            const c2 = config.apply(container);
+            const c2 = config.configure(container);
-            c2.resolve("foo");
  No newline at end of file
+            c2.resolve("foo");
+            declare const m :ContainerServices<{foo: Foo}>["container"];
+            m.resolve("container").resolve("container");
  No newline at end of file

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