implab/implabjs-core Commit - r132:0866c6259285

working on fluent configuration

cin -

r132:0866c6259285 ioc ts support

parent child

Context file:

r132:0866c6259285

Collapse all files

src/main/ts/di/fluent/ConfigBuilder.ts created 644 +17 0

@@ -0,0 +1,17
	1	import { Container } from "../Container";
	2	import { ExtractDependency, ServiceRecordBuilder } from "./interfaces";
	3
	4	export class ConfigBuilder<S extends object, Y extends keyof S = keyof S> {
	5	register<K extends Y>(name: K, builder: (t: ServiceRecordBuilder<S[K], S>) => void \| Promise<void>): ConfigBuilder<S, Exclude<Y, K>>;
	6	register<K extends Y, V>(name: S[K] extends ExtractDependency<V, S> ? K : never, value: V): ConfigBuilder<S, Exclude<Y, K>>;
	7	register<K extends Y>(name: K, value: S[K], raw: true): ConfigBuilder<S, Exclude<Y, K>>;
	8	register<K extends Y>(name: K, value: any, raw = false): ConfigBuilder<S, Exclude<Y, K>> {
	9
	10	return this;
	11	}
	12
	13	apply(container: Container<S>): PromiseLike<void> {
	14
	15	return Promise.resolve();
	16	}
	17	}

src/main/ts/di/fluent/ConstructorBuiler.ts created 644 +17 0

@@ -0,0 +1,17
	1	import { RegistrationBuilder } from "./RegistrationBuilder";
	2
	3	export class ConstructorBuilder<C extends new (...args: any[]) => any, S extends object>
	4	extends RegistrationBuilder<InstanceType<C>, S> {
	5
	6	$type: C;
	7
	8	_params: any;
	9
	10	constructor(target: C, params: any) {
	11	super();
	12	this.$type = target;
	13
	14	this._params = params;
	15	}
	16
	17	}

src/main/ts/di/fluent/FactoryBuilder.ts created 644 +14 0

@@ -0,0 +1,14
	1	import { RegistrationBuilder } from "./RegistrationBuilder";
	2
	3	export class FactoryBuilder<F extends (...args: any[]) => any, S extends object> extends RegistrationBuilder<ReturnType<F>, S> {
	4	$factory: F;
	5
	6	_params: any;
	7
	8	constructor(target: F, params: any) {
	9	super();
	10
	11	this.$factory = target;
	12	this._params = params;
	13	}
	14	}

src/main/ts/di/fluent/ServiceRecordBuilder.ts created 644 0 0

NO CONTENT: new file 100644

src/main/ts/di/ActivationContext.ts +7 0

             import { TraceSource } from "../log/TraceSource";
             import { argumentNotNull, argumentNotEmptyString } from "../safe";
             import { Descriptor, ContainerServiceMap, ContainerKeys, ContainerResolve } from "./interfaces";
             import { Container } from "./Container";
             import { MapOf } from "../interfaces";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
             export interface ActivationContextInfo {
                 name: string;
                 service: string;
             }
             export class ActivationContext<S extends object> {
                 _cache: MapOf<any>;
                 _services: ContainerServiceMap<S>;
                 _visited: MapOf<any>;
                 _name: string;
                 _service: Descriptor<S, any>;
                 _container: Container<S>;
                 _parent: ActivationContext<S> | undefined;
                 constructor(container: Container<S>, services: ContainerServiceMap<S>, name: string, service: Descriptor<S, any>) {
                     this._name = name;
                     this._service = service;
                     this._visited = {};
                     this._cache = {};
                     this._services = services;
                     this._container = container;
                 }
                 getName() {
                     return this._name;
                 }
                 getContainer() {
                     return this._container;
                 }
                 resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>) {
                     const d = this._services[name];
                     if (d !== undefined) {
                         return this.activate(d, name.toString());
                     } else {
                         if (def !== undefined && def !== null)
                             return def;
                         else
                             throw new Error(`Service ${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: Descriptor<S, S[K]>) {
                     argumentNotEmptyString(name, "name");
                     this._services[name] = service as any;
                 }
                 has(id: string) {
                     return id in this._cache;
                 }
                 get<T>(id: string) {
                     return this._cache[id];
                 }
                 store(id: string, value: any) {
                     return (this._cache[id] = value);
                 }
                 activate<T>(d: Descriptor<S, T>, name: string) {
                     if (trace.isLogEnabled())
                         trace.log(`enter ${name} ${d}`);
                     const ctx = this.enter(d, name);
                     const v = d.activate(ctx);
                     if (trace.isLogEnabled())
                         trace.log(`leave ${name}`);
                     return v;
                 }
                 visit(id: string) {
                     const count = this._visited[id] || 0;
                     this._visited[id] = count + 1;
                     return count;
                 }
                 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, any>, name: string): this {
                     const clone = Object.create(this);
                     clone._name = name;
                     clone._services = Object.create(this._services);
                     clone._parent = this;
                     clone._service = service;
                     return clone;
                 }
+                /** Creates a clone for the current context, used to protect it from modifications */
+                clone(): this {
+                    const clone = Object.create(this);
+                    clone._services = Object.create(this._services);
+                    return clone;
                 }
+            }

src/main/ts/di/Annotations.ts +5 0

             import { TypeRegistration } from "./Configuration";
             import { ExtractDependency } from "./fluent/interfaces";
+            import { RegistrationBuilder } from "./fluent/RegistrationBuilder";
             export class AnnotaionBuilder<T, S extends object> {
                 wire<P extends any[]>(...args: P) {
                     return <C extends new (...args: ExtractDependency<P, S>) => T>(constructor: C) => {
                     };
                 }
                 inject<P extends any[]>(...args: P) {
                     return <X extends { [m in M]: (...args: any) => any }, M extends keyof (T | X)>(
                         target: X,
                         memberName: M,
                         descriptor: TypedPropertyDescriptor< T[M] extends ((...args: ExtractDependency<P, S>) => any) ? any : never >
                     ) => {
                     };
                 }
                 getDescriptor(): TypeRegistration<new () => T, S> {
                     throw new Error();
                 }
+                getRegistrationBuilder(): RegistrationBuilder<T, S> {
+                    throw new Error();
                 }
+            }

src/main/ts/di/Configuration.ts +17 -4

             import {
                 PartialServiceMap,
                 ActivationType,
                 ContainerKeys,
                 ContainerResolve
             } from "./interfaces";
             import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get, primitive } from "../safe";
             import { AggregateDescriptor } from "./AggregateDescriptor";
             import { ValueDescriptor } from "./ValueDescriptor";
             import { Container } from "./Container";
             import { ReferenceDescriptor } from "./ReferenceDescriptor";
             import { TypeServiceDescriptor } from "./TypeServiceDescriptor";
             import { FactoryServiceDescriptor } from "./FactoryServiceDescriptor";
             import { TraceSource } from "../log/TraceSource";
             import { ConfigError } from "./ConfigError";
             import { Cancellation } from "../Cancellation";
             import { makeResolver } from "./ResolverHelper";
             import { ICancellation } from "../interfaces";
             import { isDescriptor } from "./traits";
             import { LazyReferenceDescriptor } from "./LazyReferenceDescriptor";
+            import { LifetimeManager } from "./LifetimeManager";
             export interface RegistrationScope<S extends object> {
                 /** сервисы, которые регистрируются в контексте активации и таким образом
                  * могут переопределять ранее зарегистрированные сервисы. за это свойство
                  * нужно платить, кроме того порядок активации будет влиять на результат
                  * разрешения зависимостей.
                  */
                 services?: RegistrationMap<S>;
             }
             /**
              * Базовый интефейс конфигурации сервисов
              */
             export interface ServiceRegistration<T, S extends object> extends RegistrationScope<S> {
                 activation?: ActivationType;
                 params?: any;
                 inject?: object | object[];
                 cleanup?: ((instance: T) => void) | string;
             }
             export interface TypeRegistration<C extends new (...args: any[]) => any, S extends object> extends ServiceRegistration<InstanceType<C>, S> {
                 $type: string | C;
                 params?: Registration<ConstructorParameters<C>, S>;
             }
             export interface StrictTypeRegistration<C extends new (...args: any[]) => any, S extends object> extends ServiceRegistration<InstanceType<C>, S> {
                 $type: C;
                 params?: Registration<ConstructorParameters<C>, S>;
             }
             export interface FactoryRegistration<F extends (...args: any[]) => any, S extends object> extends ServiceRegistration<ReturnType<F>, S> {
                 $factory: string | F;
             }
             export interface ValueRegistration<T> {
                 $value: T;
                 parse?: boolean;
             }
             export interface DependencyRegistration<S extends object, K extends ContainerKeys<S> = ContainerKeys<S>> extends RegistrationScope<S> {
                 $dependency: K;
                 lazy?: boolean;
                 optional?: boolean;
                 default?: ContainerResolve<S, K>;
             }
             export interface LazyDependencyRegistration<S extends object, K extends ContainerKeys<S> = ContainerKeys<S>> extends DependencyRegistration<S, K> {
                 lazy: true;
             }
-            type OfType<K extends keyof S, S, T> = Extract<{ [k in K]: T}, S>;
             export type Registration<T, S extends object> = T extends primitive ? T :
                 (
                     T |
                     { [k in keyof T]: Registration<T[k], S> } |
                     TypeRegistration<new (...args: any[]) => T, S> |
                     FactoryRegistration<(...args: any[]) => T, S> |
                     ValueRegistration<any> |
                     DependencyRegistration<S, keyof S>
                 );
             export type RegistrationMap<S extends object> = {
                 [k in keyof S]?: Registration<S[k], S>;
             };
             const _activationTypes: { [k in ActivationType]: number; } = {
                 singleton: 1,
                 container: 2,
                 hierarchy: 3,
                 context: 4,
                 call: 5
             };
             export function isTypeRegistration(x: any): x is TypeRegistration<new () => any, any> {
                 return (!isPrimitive(x)) && ("$type" in x);
             }
             export function isFactoryRegistration(x: any): x is FactoryRegistration<() => any, any> {
                 return (!isPrimitive(x)) && ("$factory" in x);
             }
             export function isValueRegistration(x: any): x is ValueRegistration<any> {
                 return (!isPrimitive(x)) && ("$value" in x);
             }
             export function isDependencyRegistration<S extends object>(x: any): x is DependencyRegistration<S, keyof S> {
                 return (!isPrimitive(x)) && ("$dependency" in x);
             }
             export function isActivationType(x: string): x is ActivationType {
                 return typeof x === "string" && x in _activationTypes;
             }
             const trace = TraceSource.get("@implab/core/di/Configuration");
             async function mapAll(data: any[], map?: (v: any, k: number) => any): Promise<any[]>;
             async function mapAll(data: any, map?: (v: any, k: string) => any): Promise<any>;
             async function mapAll(data: any, map?: (v: any, k: any) => any): Promise<any> {
                 if (data instanceof Array) {
                     return Promise.all(map ? data.map(map) : data);
                 } else {
                     const keys = Object.keys(data);
                     const o: any = {};
                     await Promise.all(keys.map(async k => {
                         const v = map ? map(data[k], k) : data[k];
                         o[k] = isPromise(v) ? await v : v;
                     }));
                     return o;
                 }
             }
             export type ModuleResolver = (moduleName: string, ct?: ICancellation) => any;
             export class Configuration<S extends object> {
                 _hasInnerDescriptors = false;
                 readonly _container: Container<S>;
                 _path: Array<string>;
                 _configName: string | undefined;
                 _require: ModuleResolver | undefined;
                 constructor(container: Container<S>) {
                     argumentNotNull(container, "container");
                     this._container = container;
                     this._path = [];
                 }
                 async loadConfiguration(moduleName: string, contextRequire?: any, ct = Cancellation.none) {
                     argumentNotEmptyString(moduleName, "moduleName");
                     trace.log(
                         "loadConfiguration moduleName={0}, contextRequire={1}",
                         moduleName,
                         contextRequire ? typeof (contextRequire) : "<nil>"
                     );
                     this._configName = moduleName;
                     const r = await makeResolver(undefined, contextRequire);
                     const config = await r(moduleName, ct);
                     await this._applyConfiguration(
                         config,
                         await makeResolver(moduleName, contextRequire),
                         ct
                     );
                 }
                 async applyConfiguration(data: RegistrationMap<S>, contextRequire?: any, ct = Cancellation.none) {
                     argumentNotNull(data, "data");
                     await this._applyConfiguration(data, await makeResolver(void (0), contextRequire), ct);
                 }
                 async _applyConfiguration(data: RegistrationMap<S>, resolver?: ModuleResolver, ct = Cancellation.none) {
                     trace.log("applyConfiguration");
                     this._configName = "$";
                     if (resolver)
                         this._require = resolver;
                     let services: PartialServiceMap<S>;
                     try {
                         services = await this._visitRegistrations(data, "$");
                     } catch (e) {
                         throw this._makeError(e);
                     }
                     this._container.register(services);
                 }
                 _makeError(inner: any) {
                     const e = new ConfigError("Failed to load configuration", inner);
                     e.configName = this._configName || "<inline>";
                     e.path = this._makePath();
                     return e;
                 }
                 _makePath() {
                     return this._path
                         .reduce(
                             (prev, cur) => typeof cur === "number" ?
                                 `${prev}[${cur}]` :
                                 `${prev}.${cur}`
                         )
                         .toString();
                 }
                 async _resolveType(moduleName: string, localName: string) {
                     trace.log("resolveType moduleName={0}, localName={1}", moduleName, localName);
                     try {
                         const m = await this._loadModule(moduleName);
                         return localName ? get(localName, m) : m;
                     } catch (e) {
                         trace.error("Failed to resolve type moduleName={0}, localName={1}", moduleName, localName);
                         throw e;
                     }
                 }
                 _loadModule(moduleName: string) {
                     trace.debug("loadModule {0}", moduleName);
                     if (!this._require)
                         throw new Error("Module loader isn't specified");
                     return this._require(moduleName);
                 }
                 async _visitRegistrations(data: RegistrationMap<S>, name: string) {
                     this._enter(name);
                     if (data.constructor &&
                         data.constructor.prototype !== Object.prototype)
                         throw new Error("Configuration must be a simple object");
                     const services = await mapAll(data, async (v, k) => {
                         const d = await this._visit(v, k.toString());
                         return isDescriptor(d) ? d : new AggregateDescriptor(d);
                     }) as PartialServiceMap<S>;
                     this._leave();
                     return services;
                 }
                 _enter(name: string) {
                     this._path.push(name.toString());
                     trace.debug(">{0}", name);
                 }
                 _leave() {
                     const name = this._path.pop();
                     trace.debug("<{0}", name);
                 }
                 async _visit(data: any, name: string): Promise<any> {
                     if (isPrimitive(data) || isDescriptor(data))
                         return data;
                     if (isDependencyRegistration<S>(data)) {
                         return this._visitDependencyRegistration(data, name);
                     } else if (isValueRegistration(data)) {
                         return this._visitValueRegistration(data, name);
                     } else if (isTypeRegistration(data)) {
                         return this._visitTypeRegistration(data, name);
                     } else if (isFactoryRegistration(data)) {
                         return this._visitFactoryRegistration(data, name);
                     } else if (data instanceof Array) {
                         return this._visitArray(data, name);
                     }
                     return this._visitObject(data, name);
                 }
                 async _visitObject(data: any, name: string) {
                     if (data.constructor &&
                         data.constructor.prototype !== Object.prototype)
                         return new ValueDescriptor(data);
                     this._enter(name);
                     const v = await mapAll(data, delegate(this, "_visit"));
                     // TODO: handle inline descriptors properly
                     // const ex = {
                     //     activate(ctx) {
                     //         const value = ctx.activate(this.prop, "prop");
                     //         // some code
                     //     },
                     //     // will be turned to ReferenceDescriptor
                     //     prop: { $dependency: "depName" }
                     // };
                     this._leave();
                     return v;
                 }
                 async _visitArray(data: any[], name: string) {
                     if (data.constructor &&
                         data.constructor.prototype !== Array.prototype)
                         return new ValueDescriptor(data);
                     this._enter(name);
                     const v = await mapAll(data, delegate(this, "_visit"));
                     this._leave();
                     return v;
                 }
                 _makeServiceParams(data: ServiceRegistration<any, S>) {
                     const opts: any = {
-                        owner: this._container
                     };
                     if (data.services)
                         opts.services = this._visitRegistrations(data.services, "services");
                     if (data.inject) {
                         this._enter("inject");
                         opts.inject = mapAll(
                             data.inject instanceof Array ?
                                 data.inject :
                                 [data.inject],
                             delegate(this, "_visitObject")
                         );
                         this._leave();
                     }
                     if ("params" in data)
                         opts.params = data.params instanceof Array ?
                             this._visitArray(data.params, "params") :
                             this._visit(data.params, "params");
                     if (data.activation) {
-                        opts.activation = data.activation;
+                        opts.activation = this._getLifetimeManager(data.activation);
                     }
                     if (data.cleanup)
                         opts.cleanup = data.cleanup;
                     return opts;
                 }
                 async _visitValueRegistration<T>(data: ValueRegistration<T>, name: string) {
                     this._enter(name);
                     const d = data.parse ? new AggregateDescriptor(data.$value) : new ValueDescriptor(data.$value);
                     this._leave();
                     return d;
                 }
                 async _visitDependencyRegistration<K extends keyof S>(data: DependencyRegistration<S, K>, name: string) {
                     argumentNotEmptyString(data && data.$dependency, "data.$dependency");
                     this._enter(name);
                     const options = {
                         name: data.$dependency,
                         optional: data.optional,
                         default: data.default,
                         services: data.services && await this._visitRegistrations(data.services, "services")
                     };
                     const d = data.lazy ? new LazyReferenceDescriptor<S, K>(options) : new ReferenceDescriptor<S, K>(options);
                     this._leave();
                     return d;
                 }
                 async _visitTypeRegistration(data: TypeRegistration<new () => any, S>, name: string) {
                     argumentNotNull(data.$type, "data.$type");
                     this._enter(name);
                     const opts = this._makeServiceParams(data);
                     if (data.$type instanceof Function) {
                         opts.type = data.$type;
                     } else {
                         const [moduleName, typeName] = data.$type.split(":", 2);
                         opts.type = this._resolveType(moduleName, typeName);
                     }
                     const d = new TypeServiceDescriptor<S, any, any[]>(
                         await mapAll(opts)
                     );
                     this._leave();
                     return d;
                 }
                 async _visitFactoryRegistration(data: FactoryRegistration<() => any, S>, name: string) {
                     argumentOfType(data.$factory, Function, "data.$factory");
                     this._enter(name);
                     const opts = this._makeServiceParams(data);
                     opts.factory = data.$factory;
                     const d = new FactoryServiceDescriptor<S, any, any[]>(
                         await mapAll(opts)
                     );
                     this._leave();
                     return d;
                 }
+                _getLifetimeManager(activation: ActivationType) {
+                    switch (activation) {
+                        case "container":
+                            return this._container.getLifetimeManager();
+                        case "hierarchy":
+                            return LifetimeManager.hierarchyLifetime;
+                        case "context":
+                            return LifetimeManager.contextLifetime;
+                        case "singleton":
+                            return LifetimeManager.singletonLifetime;
+                        default:
+                            return LifetimeManager.empty;
                     }
+                }
+            }

src/main/ts/di/LazyReferenceDescriptor.ts +1 -1

             import { argumentNotEmptyString, each } from "../safe";
             import { ActivationContext } from "./ActivationContext";
             import { Descriptor, PartialServiceMap, ContainerResolve, ContainerKeys } from "./interfaces";
             import { ActivationError } from "./ActivationError";
             export interface ReferenceDescriptorParams<S extends object, K extends ContainerKeys<S>> {
                 name: K;
                 optional?: boolean;
                 default?: ContainerResolve<S, K>;
                 services?: PartialServiceMap<S>;
             }
             export class LazyReferenceDescriptor<S extends object = any, K extends ContainerKeys<S> = ContainerKeys<S>>
                 implements Descriptor<S, ((args?: PartialServiceMap<S>) => ContainerResolve<S, K>)> {
                 _name: K;
                 _optional = false;
                 _default: ContainerResolve<S, K> | undefined;
                 _services: PartialServiceMap<S>;
                 constructor(opts: ReferenceDescriptorParams<S, K>) {
                     argumentNotEmptyString(opts && opts.name, "opts.name");
                     this._name = opts.name;
                     this._optional = !!opts.optional;
                     this._default = opts.default;
                     this._services = (opts.services || {}) as PartialServiceMap<S>;
                 }
                 activate(context: ActivationContext<S>) {
                     // добавляем сервисы
                     if (this._services) {
                         each(this._services, (v, k) => context.register(k, v));
                     }
                     const saved = context.clone();
                     return (cfg?: PartialServiceMap<S>) => {
                         // защищаем контекст на случай исключения в процессе
                         // активации
-                        const ct = saved.clone();
+                        const ct = cfg ? saved.clone() : saved;
                         try {
                             if (cfg) {
                                 each(cfg, (v, k) => ct.register(k, v));
                             }
                             return this._optional ? ct.resolve(this._name, this._default) : ct
                                 .resolve(this._name);
                         } catch (error) {
                             throw new ActivationError(this._name.toString(), ct.getStack(), error);
                         }
                     };
                 }
                 toString() {
                     const opts = [];
                     if (this._optional)
                         opts.push("optional");
                     opts.push("lazy");
                     const parts = [
                         "@ref "
                     ];
                     if (opts.length) {
                         parts.push("{");
                         parts.push(opts.join());
                         parts.push("} ");
                     }
                     parts.push(this._name.toString());
                     if (this._default !== undefined && this._default !== null) {
                         parts.push(" = ");
                         parts.push(String(this._default));
                     }
                     return parts.join("");
                 }
             }

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

             import { IDestroyable, MapOf } from "../interfaces";
             import { argumentNotNull, isDestroyable } from "../safe";
             import { ILifetimeManager, ILifetime } from "./interfaces";
             import { ActivationContext } from "./ActivationContext";
             function safeCall(item: () => void) {
                 try {
                     item();
                 } catch {
                     // silence!
                 }
             }
             const emptyLifetime: ILifetime = {
                 has() {
                     return false;
                 },
                 enter() {
                 },
                 get() {
                     throw new Error("The specified item isn't registered with this lifetime manager");
                 },
                 store() {
                     // does nothing
                 }
             };
             export class LifetimeManager implements IDestroyable, ILifetimeManager {
                 private _cleanup: (() => void)[] = [];
                 private _cache: MapOf<any> = {};
                 private _destroyed = false;
+                private _pending: MapOf<boolean> = {};
                 initialize(id: string): ILifetime {
                     const self = this;
-                    let pending = false;
                     return {
                         has() {
                             return (id in self._cache);
                         },
                         get() {
                             const t = self._cache[id];
                             if (t === undefined)
                                 throw new Error(`The item with with the key ${id} isn't found`);
                             return t;
                         },
                         enter() {
-                            if (pending)
+                            if (self._pending[id])
                                 throw Error(`Cyclic reference detected: the item with the key ${id} is already activating.`);
-                            pending = true;
+                            self._pending[id] = true;
                         },
                         store(item: any, cleanup?: (item: any) => void) {
                             argumentNotNull(id, "id");
                             argumentNotNull(item, "item");
                             if (this.has())
                                 throw new Error(`The item with with the key ${id} already registered with this lifetime manager`);
-                            pending = false;
+                            delete self._pending[id];
                             self._cache[id] = item;
                             if (self._destroyed)
                                 throw new Error("Lifetime manager is destroyed");
                             if (cleanup) {
                                 self._cleanup.push(() => cleanup(item));
                             } else if (isDestroyable(item)) {
                                 self._cleanup.push(() => item.destroy());
                             }
                         }
                     };
                 }
                 destroy() {
                     if (!this._destroyed) {
                         this._destroyed = true;
                         this._cleanup.forEach(safeCall);
                         this._cleanup.length = 0;
                     }
                 }
                 static readonly empty: ILifetimeManager = {
                     initialize(): ILifetime {
                         return emptyLifetime;
                     },
                     destroy() {
                         throw new Error("Trying to destroy empty lifetime manager, this is a bug.");
                     }
                 };
                 static readonly hierarchyLifetime: ILifetimeManager = {
                     initialize(id: string, context: ActivationContext<any>): ILifetime {
                         return context.getContainer().getLifetimeManager().initialize(id, context);
                     },
                     destroy() {
                         throw new Error("Trying to destroy hierarchy lifetime manager, this is a bug.");
                     }
                 };
                 static readonly singletonLifetime: ILifetimeManager = {
                     initialize(id: string): ILifetime {
                         return singletonLifetimeManager.initialize(id);
                     },
                     destroy() {
                         throw new Error("Trying to destroy singleton lifetime manager, this is a bug.");
                     }
                 };
                 static readonly contextLifetime: ILifetimeManager = {
                     initialize(id: string, context: ActivationContext<any>): ILifetime {
                         return {
                             enter() {
                                 if (context.visit(id))
                                     throw new Error("Cyclic reference detected");
                             },
                             get() {
                                 return context.get(id);
                             },
                             has() {
                                 return context.has(id);
                             },
                             store(item: any) {
                                 context.store(id, item);
                             }
                         };
                     },
                     destroy() {
                         throw new Error("Trying to destroy empty lifetime manager, this is a bug.");
                     }
                 };
             }
             const singletonLifetimeManager = new LifetimeManager();

src/main/ts/di/ServiceDescriptor.ts 0 -7

             import { ActivationContext } from "./ActivationContext";
             import { Descriptor, ServiceMap, PartialServiceMap, ILifetimeManager } from "./interfaces";
             import { argumentNotNull, isPrimitive, keys, isNull } from "../safe";
             import { TraceSource } from "../log/TraceSource";
             import { isDescriptor } from "./traits";
             import { LifetimeManager } from "./LifetimeManager";
             import { MatchingMemberKeys } from "../interfaces";
             import { Container } from "./Container";
             let cacheId = 0;
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
             function injectMethod<T, M extends keyof T, S extends object, A>(target: T, method: M, context: ActivationContext<S>, args: A) {
                 const m = target[method];
                 if (!m || typeof m !== "function")
                     throw new Error("Method '" + method + "' not found");
                 if (args instanceof Array)
                     return m.apply(target, _parse(args, context, "." + method));
                 else
                     return m.call(target, _parse(args, context, "." + method));
             }
             function makeCleanupCallback<T>(method: Cleaner<T>) {
                 if (typeof (method) === "function") {
                     return (target: T) => {
                         method(target);
                     };
                 } else {
                     return (target: T) => {
                         const m = target[method] as any;
                         m.apply(target);
                     };
                 }
             }
             function _parse(value: any, context: ActivationContext<any>, path: string): any {
                 if (isPrimitive(value))
                     return value as any;
                 trace.debug("parse {0}", path);
                 if (isDescriptor(value))
                     return context.activate(value, path);
                 if (value instanceof Array)
                     return value.map((x, i) => _parse(x, context, `${path}[${i}]`)) as any;
                 const t: any = {};
                 keys(value).forEach(p => t[p] = _parse(value[p], context, `${path}.${p}`));
                 return t;
             }
             export type Cleaner<T> = ((x: T) => void) | MatchingMemberKeys<() => void, T>;
             export type InjectionSpec<T> = {
                 [m in keyof T]?: any;
             };
             export interface ServiceDescriptorParams<S extends object, T, P extends any[]> {
-                owner: Container<S>;
                 lifetime?: ILifetimeManager;
                 params?: P;
                 inject?: InjectionSpec<T>[];
                 services?: PartialServiceMap<S>;
                 cleanup?: Cleaner<T>;
             }
             export class ServiceDescriptor<S extends object, T, P extends any[]> implements Descriptor<S, T> {
                 _services: ServiceMap<S>;
                 _params: P | undefined;
                 _inject: InjectionSpec<T>[];
                 _cleanup: ((item: T) => void) | undefined;
                 _cacheId = String(++cacheId);
                 _lifetime = LifetimeManager.empty;
-                _owner: Container<S>;
                 constructor(opts: ServiceDescriptorParams<S, T, P>) {
-                    argumentNotNull(opts && opts.owner, "opts.owner");
-                    this._owner = opts.owner;
                     if (opts.lifetime)
                         this._lifetime = opts.lifetime;
                     if (!isNull(opts.params))
                         this._params = opts.params;
                     this._inject = opts.inject || [];
                     this._services = (opts.services || {}) as ServiceMap<S>;
                     if (opts.cleanup) {
                         if (!(typeof (opts.cleanup) === "string" || opts.cleanup instanceof Function))
                             throw new Error(
                                 "The cleanup parameter must be either a function or a function name");
                         this._cleanup = makeCleanupCallback(opts.cleanup);
                     }
                 }
                 activate(context: ActivationContext<S>) {
                     const lifetime = this._lifetime.initialize(this._cacheId, context);
                     if (lifetime.has()) {
                         return lifetime.get();
                     } else {
                         lifetime.enter();
                         const instance = this._create(context);
                         lifetime.store(this._cacheId, this._cleanup);
                         return instance;
                     }
                 }
                 _factory(...params: any[]): T {
                     throw Error("Not implemented");
                 }
                 _create(context: ActivationContext<S>) {
                     trace.debug(`constructing ${context._name}`);
                     if (this._services) {
                         keys(this._services).forEach(p => context.register(p, this._services[p]));
                     }
                     let instance: T;
                     if (this._params === undefined) {
                         instance = this._factory();
                     } else if (this._params instanceof Array) {
                         instance = this._factory.apply(this, _parse(this._params, context, "args"));
                     } else {
                         instance = this._factory(_parse(this._params, context, "args"));
                     }
                     if (this._inject) {
                         this._inject.forEach(spec => {
                             for (const m in spec)
                                 injectMethod(instance, m, context, spec[m]);
                         });
                     }
                     return instance;
                 }
                 clone() {
                     return Object.create(this);
                 }
             }

src/main/ts/di/TypeServiceDescriptor.ts +5 -5

             import { ServiceDescriptor, ServiceDescriptorParams } from "./ServiceDescriptor";
-            import { Constructor, Factory } from "../interfaces";
             import { argumentNotNull, isPrimitive } from "../safe";
             export interface TypeServiceDescriptorParams<S extends object, T extends object, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
-                type: Constructor<T>;
+                type: new (...args: any[]) => T;
             }
             export class TypeServiceDescriptor<S extends object, T extends object, P extends any[]> extends ServiceDescriptor<S, T, P> {
-                _type: Constructor;
+                _type: new (...args: any[]) => T;
                 constructor(opts: TypeServiceDescriptorParams<S, T, P>) {
                     super(opts);
                     argumentNotNull(opts && opts.type, "opts.type");
                     const ctor = this._type = opts.type;
                     if (this._params) {
                         if (this._params.length) {
                             this._factory = (...args) => {
-                                const t = Object.create(ctor.prototype);
+                                /*const t = Object.create(ctor.prototype);
                                 const inst = ctor.apply(t, args);
-                                return isPrimitive(inst) ? t : inst;
+                                return isPrimitive(inst) ? t : inst;*/
+                                return new ctor(...args);
                             };
                         } else {
                             this._factory = arg => {
                                 return new ctor(arg);
                             };
                         }
                     } else {
                         this._factory = () => {
                             return new ctor();
                         };
                     }
                 }
                 toString() {
                     // @constructor {singleton} foo/bar/Baz
                     return ``;
                 }
             }

src/main/ts/di/fluent/RegistrationBuilder.ts +4 -4

-            import { ServiceRecordBuilder, ExtractDependency, RegistrationVisitor } from "./interfaces";
+            import { ServiceRecordBuilder, ExtractDependency, RegistrationVisitor, ServiceRegistration } from "./interfaces";
             import { ActivationType } from "../interfaces";
-            export class RegistrationBuilder<T, S extends object> {
+            export class RegistrationBuilder<T, S extends object> implements ServiceRegistration {
                 private _activationType: ActivationType = "call";
                 private _overrides: { [m in keyof S]?: (...args: any) => void } | undefined;
                 override<K extends keyof S>(name: K, builder: S[K], raw: true): this;
                 override<K extends keyof S>(name: K, builder: (t: ServiceRecordBuilder<S[K], S>) => void): this;
                 override<K extends keyof S, V>(name: S[K] extends ExtractDependency<V, S> ? K : never, value: V): this;
                 override<K extends keyof S>(name: K, builder: S[K] | ((t: ServiceRecordBuilder<S[K], S>) => void), raw: boolean = false) {
                     if (!this._overrides)
                         this._overrides = {};
                     if (raw) {
                     } else if (builder instanceof Function) {
                     } else {
                     }
                     return this;
                 }
                 activate(activation: ActivationType) {
                     this._activationType = activation;
                     return this;
                 }
                 inject<M extends keyof T, P extends any[]>(member: T[M] extends (...params: ExtractDependency<P, S>) => any ? M : never, ...params: P) {
                     return this;
                 }
-                visit(visitor: RegistrationVisitor<S>) {
+                visit(visitor: RegistrationVisitor) {
                 }
-            }
  No newline at end of file

src/main/ts/di/fluent/interfaces.ts +4 -21

             import { primitive } from "../../safe";
             import { ActivationType } from "../interfaces";
             import { AnnotaionBuilder } from "../Annotations";
             import { LazyDependencyRegistration, DependencyRegistration } from "../Configuration";
             import { Container } from "../Container";
             export interface DependencyOptions<T> {
                 optional?: boolean;
                 default?: T;
             }
             export interface LazyDependencyOptions<T> extends DependencyOptions<T> {
                 lazy: true;
             }
             export type ExtractService<K, S> = K extends keyof S ? S[K] : K;
             export type ExtractDependency<D, S> = D extends { $dependency: infer K } ?
                 D extends { lazy: true } ? () => ExtractService<K, S> : ExtractService<K, S> :
                 D extends { $type: new (...args: any[]) => infer I } ? I :
                 D extends { $factory: (...args: any[]) => infer R } ? R :
                 WalkDependencies<D, S>;
             export type WalkDependencies<D, S> = D extends primitive ? D :
                 { [K in keyof D]: ExtractDependency<D[K], S> };
             export type ServiceModule<T, S extends object, M extends keyof any = "service"> = {
                 [m in M]: AnnotaionBuilder<T, S>;
             };
             export interface ServiceRecordBuilder<T, S extends object> {
                 type<P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(
                     target: C, ...params: P): ConstructorBuilder<C, S>;
                 factory<P extends any[], F extends (...args: ExtractDependency<P, S>) => T>(
                     target: F, ...params: P): FactoryBuilder<F, S>;
                 wired<M extends keyof any>(module: ServiceModule<T, S, M>, m: M): RegistrationBuilder<T, S>;
                 wired(module: ServiceModule<T, S>): RegistrationBuilder<T, S>;
             }
-            export interface RegistrationVisitor<S extends object> {
+            export interface RegistrationVisitor {
                 visitDependency(): void;
                 visitObject(): void;
                 visitTypeRegistration(): void;
                 visitFactoryRegistration(): void;
             }
-            export interface RegistrationBuilder<T, S extends object> {
+            export interface ServiceRegistration {
-                override<K extends keyof S>(name: K, builder: S[K], raw: true): this;
+                visit(visitor: RegistrationVisitor): void;
-                override<K extends keyof S>(name: K, builder: (t: ServiceRecordBuilder<S[K], S>) => void): this;
-                override<K extends keyof S, V>(name: S[K] extends ExtractDependency<V, S> ? K : never, value: V): this;
-                activate(activation: ActivationType): this;
-                inject<M extends keyof T, P extends any[]>(member: T[M] extends (...params: ExtractDependency<P, S>) => any ? M : never, ...params: P): this;
-                visit(visitor: RegistrationVisitor<S>): void;
-            export interface ConstructorBuilder<C extends new (...args: any[]) => any, S extends object> extends RegistrationBuilder<InstanceType<C>, S> {
-                $type: C;
-            export interface FactoryBuilder<F extends (...args: any[]) => any, S extends object> extends RegistrationBuilder<ReturnType<F>, S> {
-                $factory: F;
             }
             export interface ConfigBuilder<S extends object, Y extends keyof S = keyof S> {
                 register<K extends Y>(name: K, builder: (t: ServiceRecordBuilder<S[K], S>) => void | Promise<void>): ConfigBuilder<S, Exclude<Y, K>>;
                 register<K extends Y, V>(name: S[K] extends ExtractDependency<V, S> ? K : never, value: V): ConfigBuilder<S, Exclude<Y, K>>;
                 register<K extends Y>(name: K, value: S[K], raw: true): ConfigBuilder<S, Exclude<Y, K>>;
                 apply(container: Container<S>): Promise<void>;
             }
-            interface ServicesDeclaration<S extends object> {
+            export interface ServicesDeclaration<S extends object> {
                 build<T>(this: void): ServiceRecordBuilder<T, S>;
                 annotate<T>(this: void): AnnotaionBuilder<T, S>;
                 dependency<K extends keyof S>(this: void, name: K, opts: LazyDependencyOptions<S[K]>): LazyDependencyRegistration<S, K>;
                 dependency<K extends keyof S>(this: void, name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>;
                 configure(): ConfigBuilder<S>;
             }
-            export declare function declare<S extends object>(): ServicesDeclaration<S>;

src/main/ts/di/interfaces.ts +1 -1

             import { ActivationContext } from "./ActivationContext";
             import { IDestroyable } from "../interfaces";
             export interface Descriptor<S extends object = any, T = any> {
                 activate(context: ActivationContext<S>): T;
             }
             export type ServiceMap<S extends object> = {
                 [k in keyof S]: Descriptor<S, S[k]>;
             };
             export type ContainerKeys<S extends object> = keyof S | keyof ContainerProvided<S>;
             export type ContainerResolve<S extends object, K> =
                 K extends keyof ContainerProvided<S> ? ContainerProvided<S>[K] :
                 K extends keyof S ? S[K] : never;
             export type ContainerServiceMap<S extends object> = {
                 [K in ContainerKeys<S>]: Descriptor<S, ContainerResolve<S, K>>;
             };
             export type PartialServiceMap<S extends object> = {
                 [k in keyof S]?: Descriptor<S, S[k]>;
             };
             export interface Resolver<S extends object> {
                 resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>): ContainerResolve<S, K>;
             }
             export interface ContainerProvided<S extends object> {
                 container: Resolver<S>;
             }
             export type ContainerRegistered<S extends object> = /*{
                 [K in Exclude<keyof S, keyof ContainerProvided<S>>]: S[K];
             };*/
                 Exclude<S, ContainerProvided<S>>;
             export type ActivationType = "singleton" | "container" | "hierarchy" | "context" | "call";
             export interface ILifetimeManager extends IDestroyable {
                 initialize(id: string, context: ActivationContext<any>): ILifetime;
             }
             export interface ILifetime {
                 has(): boolean;
                 get(): any;
                 enter(): void;
                 store(item: any, cleanup?: (item: any) => void): void;
-            }
  No newline at end of file

src/main/ts/di/traits.ts +44 -1

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

src/main/ts/log/writers/ConsoleWriter.ts +1 -1

	@@ -1,1 +1,1
	1	export { ConsoleLogger as ConsoleWriter } from "./ConsoleLogger"; No newline at end of file		1	export { ConsoleLogger as ConsoleWriter } from "./ConsoleLogger";

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