implab/implabjs-core Commit - r120:1b124b65514a

improved interfaces and more tight type checking

cin -

r120:1b124b65514a ioc ts support

parent child

Context file:

r120:1b124b65514a

Collapse all files

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

             import { TraceSource } from "../log/TraceSource";
-            import { argumentNotNull, argumentNotEmptyString, isPrimitive, each, isNull } from "../safe";
+            import { argumentNotNull, argumentNotEmptyString } from "../safe";
-            import { Descriptor, ServiceMap, PartialServiceMap } from "./interfaces";
+            import { Descriptor, ContainerProvided, ContainerServiceMap, ContainerKeys, ContainerResolve } from "./interfaces";
             import { Container } from "./Container";
             import { MapOf } from "../interfaces";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            export interface ActivationContextInfo<S> {
+            export interface ActivationContextInfo<S extends object> {
                 name: string;
                 service: string;
-                scope: PartialServiceMap<S>;
+                scope: ContainerServiceMap<S>;
             }
-            export class ActivationContext<S> {
+            export class ActivationContext<S extends object> {
                 _cache: MapOf<any>;
-                _services: PartialServiceMap<S>;
+                _services: ContainerServiceMap<S>;
                 _stack: ActivationContextInfo<S>[];
                 _visited: MapOf<any>;
                 _name: string;
                 _localized: boolean = false;
                 container: Container<S>;
-                constructor(container: Container<S>, services: PartialServiceMap<S>, name?: string, cache?: object, visited?: MapOf<any>) {
+                constructor(container: Container<S>, services: ContainerServiceMap<S>, name?: string, cache?: object, visited?: MapOf<any>) {
                     argumentNotNull(container, "container");
                     argumentNotNull(services, "services");
                     this._name = name || "<unnamed>";
                     this._visited = visited || {};
                     this._stack = [];
                     this._cache = cache || {};
                     this._services = services;
                     this.container = container;
                 }
                 getName() {
                     return this._name;
                 }
-                resolve<K extends keyof S, T extends S[K]>(name: K, def?: T): T {
+                resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>) {
                     const d = this._services[name];
                     if (d !== undefined) {
-                        return this.activate(d as Descriptor<S, T>, name.toString());
+                        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;
+                    this._services[name] = service as any;
                 }
                 clone() {
                     return new ActivationContext<S>(
                         this.container,
                         this._services,
                         this._name,
                         this._cache,
                         this._visited
                     );
                 }
                 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}`);
                     this.enter(name, d.toString());
                     const v = d.activate(this);
                     this.leave();
                     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() {
                     return this._stack.slice().reverse();
                 }
                 private enter(name: string, service: string) {
                     this._stack.push({
                         name,
                         service,
                         scope: this._services
                     });
                     this._name = name;
                     this._services = Object.create(this._services);
                 }
                 private leave() {
                     const ctx = this._stack.pop();
                     if (ctx) {
                         this._services = ctx.scope;
                         this._name = ctx.name;
                     } else {
                         trace.error("Trying to leave the last activation scope");
                     }
                 }
             }

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

             import { Descriptor } from "./interfaces";
             import { ActivationContext } from "./ActivationContext";
             import { isPrimitive } from "../safe";
             import { isDescriptor } from "./traits";
-            export class AggregateDescriptor<S, T> implements Descriptor<S, T> {
+            export class AggregateDescriptor<S extends object, T> implements Descriptor<S, T> {
                 _value: any;
                 constructor(value: any) {
                     this._value = value;
                 }
                 activate(context: ActivationContext<S>): T {
                     return this._parse(this._value, context, "$value");
                 }
                 _parse(value: any, context: ActivationContext<S>, path: string): any {
                     if (isPrimitive(value))
                         return value as any;
                     if (isDescriptor(value))
                         return context.activate(value, path);
                     if (value instanceof Array)
                         return value.map((x, i) => this._parse(x, context, `${path}[${i}]`)) as any;
                     const t: any = {};
                     for (const p in value)
                         t[p] = this._parse(value[p], context, `${path}.${p}`);
                     return t;
                 }
                 toString() {
                     return "@walk";
                 }
             }

src/main/ts/di/Annotations.ts +11 -9

             import { primitive } from "../safe";
             import { TypeRegistration } from "./Configuration";
             export interface InjectOptions {
                 lazy?: boolean;
             }
             export interface Dependency<K extends keyof any> {
                 $dependency: K;
                 lazy?: boolean;
             }
             export interface Lazy<K extends keyof any> extends Dependency<K> {
                 lazy: true;
             }
             type Compatible<T1, T2> = T2 extends T1 ? any : never;
             type ExtractService<K, S> = K extends keyof S ? S[K] : K;
             type ExtractDependency<D, S> = D extends { $dependency: infer K } ?
                 D extends { lazy: true } ? () => ExtractService<K, S> : ExtractService<K, S> :
                 WalkDependencies<D, S>;
             type WalkDependencies<D, S> = D extends primitive ? D :
                 { [K in keyof D]: ExtractDependency<D[K], S> };
-            export class Builder<T, S> {
+            export class Builder<T, S extends object> {
                 declare<P extends any[]>(...args: P) {
                     return <C extends new (...args: ExtractDependency<P, S>) => T>(constructor: C) => {
-                        return constructor as C & { service: Builder<T, S> };
                     };
                 }
                 inject<P extends any[]>(...args: P) {
                     // K = "bar"
                     // M = "setValue"
                     // S[K] = Bar
                     // T[M] = (value: string) => void
                     // P[m] = (value: V) => void
                     return <X extends { [m in M]: (...args: any) => any }, M extends keyof (T | X)>(
                         target: X,
                         memberName: M,
                         descriptor: TypedPropertyDescriptor<Compatible<(...args: ExtractDependency<P, S>) => any, T[M]>>
                     ) => {
                     };
                 }
                 getDescriptor(): TypeRegistration<T, any, S> {
                     throw new Error();
                 }
             }
-            interface Declaration<S> {
+            interface Declaration<S extends object> {
                 define<T>(): Builder<T, S>;
                 dependency<K extends keyof S>(name: K, opts: { lazy: true }): Lazy<K>;
                 dependency<K extends keyof S>(name: K, opts?: any): Dependency<K>;
                 config(): Config<S>;
             }
-            interface ServiceModule<T, S> {
+            type ServiceModule<T, S extends object, M extends string = "service"> = {
-                service: Builder<T, S>;
+                [m in M]: Builder<T, S>;
+            };
-            interface Config<S> {
+            export interface Config<S extends object, Y extends keyof S = keyof S> {
-                register<K extends keyof S>(name: K, builder: Builder<S[K], S>): Config<Omit<S, K>>;
+                register<K extends Y>(name: K, builder: Builder<S[K], S>): Config<S, Exclude<Y, K>>;
-                register<K extends keyof S>(name: K, m: Promise<ServiceModule<S[K], S>>): Config<Omit<S, K>>;
+                register<K extends Y>(name: K, m: Promise<ServiceModule<S[K], S>>): Config<S, Exclude<Y, K>>;
+                register<K extends Y, M extends string>(name: K, m: Promise<ServiceModule<S[K], S, M>>, x: M): Config<S, Exclude<Y, K>>;
             }
             export declare function declare<S extends object>(): Declaration<S>;

src/main/ts/di/Configuration.ts +33 -20

             import {
                 PartialServiceMap,
-                ActivationType
+                ActivationType,
+                ContainerKeys,
+                ContainerResolve
             } from "./interfaces";
-            import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get } from "../safe";
+            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, Constructor, Factory } from "../interfaces";
+            import { ICancellation } from "../interfaces";
             import { isDescriptor } from "./traits";
-            export interface RegistrationScope<S> {
+            export interface RegistrationScope<S extends object> {
                 /** сервисы, которые регистрируются в контексте активации и таким образом
                  * могут переопределять ранее зарегистрированные сервисы. за это свойство
                  * нужно платить, кроме того порядок активации будет влиять на результат
                  * разрешения зависимостей.
                  */
-                services?: PartialServiceMap<S>;
+                services?: RegistrationMap<S>;
             }
             /**
              * Базовый интефейс конфигурации сервисов
              */
-            export interface ServiceRegistration<T, P, S> extends RegistrationScope<S> {
+            export interface ServiceRegistration<T, P, S extends object> extends RegistrationScope<S> {
                 activation?: ActivationType;
                 params?: P;
                 inject?: object | object[];
                 cleanup?: ((instance: T) => void) | string;
             }
-            export interface TypeRegistration<T, P extends any[], S> extends ServiceRegistration<T, P, S> {
+            export interface TypeRegistration<T, P extends any[], S extends object> extends ServiceRegistration<T, P, S> {
                 $type: string | (new (...params: P) => T);
             }
-            export interface FactoryRegistration<T, P extends any[], S> extends ServiceRegistration<T, P, S> {
+            export interface FactoryRegistration<T, P extends any[], S extends object> extends ServiceRegistration<T, P, S> {
                 $factory: string | ((...params: P) => T);
             }
             export interface ValueRegistration<T> {
                 $value: T;
                 parse?: boolean;
             }
-            export interface DependencyRegistration<S, K extends keyof S> extends RegistrationScope<S> {
+            export interface DependencyRegistration<S extends object, K extends ContainerKeys<S> = ContainerKeys<S>> extends RegistrationScope<S> {
                 $dependency: K;
                 lazy?: boolean;
                 optional?: boolean;
-                default?: S[K];
+                default?: ContainerResolve<S, K>;
             }
+            export type Registration<T, S extends object> = T extends primitive ? T :
+                (
+                    T |
+                    { [k in keyof T]: Registration<T[k], S> } |
+                    TypeRegistration<T, any, S> |
+                    FactoryRegistration<T, any, 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<any, any, any> {
                 return (!isPrimitive(x)) && ("$type" in x);
             }
             export function isFactoryRegistration(x: any): x is FactoryRegistration<any, 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>(x: any): x is DependencyRegistration<S, keyof S> {
+            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> {
+            export class Configuration<S extends object> {
                 _hasInnerDescriptors = false;
-                _container: Container<S>;
+                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: object, contextRequire?: any, ct = Cancellation.none) {
+                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: object, resolver?: ModuleResolver, ct = Cancellation.none) {
+                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: any, name: string) {
+                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 o: PartialServiceMap<S> = {};
-                    const keys = Object.keys(data);
                     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<T, P>(data: ServiceRegistration<T, P, S>) {
+                _makeServiceParams(data: ServiceRegistration<any, 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;
                     }
                     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 d = new ReferenceDescriptor<S, K>({
                         name: data.$dependency,
                         lazy: data.lazy,
                         optional: data.optional,
                         default: data.default,
                         services: data.services && await this._visitRegistrations(data.services, "services")
                     });
                     this._leave();
                     return d;
                 }
                 async _visitTypeRegistration(data: TypeRegistration<any, 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, 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;
                 }
             }

src/main/ts/di/Container.ts +9 -9

             import { ActivationContext } from "./ActivationContext";
             import { ValueDescriptor } from "./ValueDescriptor";
             import { ActivationError } from "./ActivationError";
-            import { ServiceMap, Descriptor, PartialServiceMap, ContainerServices, Resolver } from "./interfaces";
+            import { ServiceMap, Descriptor, PartialServiceMap, ContainerProvided, Resolver, ContainerServiceMap, ContainerKeys, ContainerResolve } from "./interfaces";
             import { TraceSource } from "../log/TraceSource";
-            import { Configuration } from "./Configuration";
+            import { Configuration, RegistrationMap } from "./Configuration";
             import { Cancellation } from "../Cancellation";
             import { MapOf } from "../interfaces";
             import { isDescriptor } from "./traits";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            export class Container<S = any> implements Resolver<S> {
+            export class Container<S extends object = any> implements Resolver<S> {
-                readonly _services: PartialServiceMap<ContainerServices<S>>;
+                readonly _services: ContainerServiceMap<S>;
                 readonly _cache: MapOf<any>;
                 readonly _cleanup: (() => void)[];
                 readonly _root: Container<S>;
                 readonly _parent?: Container<S>;
                 _disposed: boolean;
                 constructor(parent?: Container<S>) {
                     this._parent = parent;
                     this._services = parent ? Object.create(parent._services) : {};
                     this._cache = {};
                     this._cleanup = [];
                     this._root = parent ? parent.getRootContainer() : this;
                     this._services.container = new ValueDescriptor(this) as any;
                     this._disposed = false;
                 }
                 getRootContainer() {
                     return this._root;
                 }
                 getParent() {
                     return this._parent;
                 }
-                resolve<K extends keyof ContainerServices<S>, T extends ContainerServices<S>[K] = ContainerServices<S>[K]>(name: K, def?: T): T {
+                resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>): ContainerResolve<S, K> {
                     trace.debug("resolve {0}", name);
                     const d = this._services[name];
                     if (d === undefined) {
                         if (def !== undefined)
                             return def;
                         else
                             throw new Error("Service '" + name + "' isn't found");
                     } else {
                         const context = new ActivationContext<S>(this, this._services);
                         try {
-                            return context.activate(d as Descriptor<S, T>, name.toString());
+                            return context.activate(d, name.toString());
                         } catch (error) {
                             throw new ActivationError(name.toString(), context.getStack(), error);
                         }
                     }
                 }
                 /**
                  * @deprecated use resolve() method
                  */
-                getService<K extends keyof S, T extends ContainerServices<S>[K] = ContainerServices<S>[K]>(name: K, def?: T) {
+                getService<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>) {
                     return this.resolve(name, def);
                 }
                 register<K extends keyof S>(name: K, service: Descriptor<S, S[K]>): this;
                 register(services: PartialServiceMap<S>): this;
                 register<K extends keyof S>(nameOrCollection: K | ServiceMap<S>, service?: Descriptor<S, S[K]>) {
                     if (arguments.length === 1) {
                         const data = nameOrCollection as ServiceMap<S>;
                         for (const name in data) {
                             if (Object.prototype.hasOwnProperty.call(data, name)) {
                                 this.register(name, data[name] as Descriptor<S, S[keyof S]>);
                             }
                         }
                     } else {
                         if (!isDescriptor(service))
                             throw new Error("The service parameter must be a descriptor");
                         this._services[nameOrCollection as K] = service as any;
                     }
                     return this;
                 }
                 onDispose(callback: () => void) {
                     if (!(callback instanceof Function))
                         throw new Error("The callback must be a function");
                     this._cleanup.push(callback);
                 }
                 dispose() {
                     if (this._disposed)
                         return;
                     this._disposed = true;
                     for (const f of this._cleanup)
                         f();
                 }
                 /**
                  * @param{String|Object} config
                  *  The configuration of the contaier. Can be either a string or an object,
                  *  if the configuration is an object it's treated as a collection of
                  *  services which will be registed in the contaier.
                  *
                  * @param{Function} opts.contextRequire
                  *  The function which will be used to load a configuration or types for services.
                  *
                  */
-                async configure(config: string | object, opts?: any, ct = Cancellation.none) {
+                async configure(config: string | RegistrationMap<S>, opts?: any, ct = Cancellation.none) {
                     const c = new Configuration<S>(this);
                     if (typeof (config) === "string") {
                         return c.loadConfiguration(config, opts && opts.contextRequire, ct);
                     } else {
                         return c.applyConfiguration(config, opts && opts.contextRequire, ct);
                     }
                 }
-                createChildContainer<S2 extends { container?: Container<S & S2> } = S>(): Container<S & S2> {
+                createChildContainer<S2 extends object = S>(): Container<S & S2> {
                     return new Container<S & S2>(this as any);
                 }
                 has(id: string | number) {
                     return id in this._cache;
                 }
                 get(id: string | number) {
                     return this._cache[id];
                 }
                 store(id: string | number, value: any) {
                     return (this._cache[id] = value);
                 }
             }

src/main/ts/di/FactoryServiceDescriptor.ts +2 -2

             import { ServiceDescriptor, ServiceDescriptorParams } from "./ServiceDescriptor";
             import { argumentNotNull, oid } from "../safe";
-            export interface FactoryServiceDescriptorParams<S, T, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
+            export interface FactoryServiceDescriptorParams<S extends object, T, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
                 factory: (...args: P) => T;
             }
-            export class FactoryServiceDescriptor<S, T, P extends any[]> extends ServiceDescriptor<S, T, P> {
+            export class FactoryServiceDescriptor<S extends object, T, P extends any[]> extends ServiceDescriptor<S, T, P> {
                 constructor(opts: FactoryServiceDescriptorParams<S, T, P>) {
                     super(opts);
                     argumentNotNull(opts && opts.factory, "opts.factory");
                     // bind to null
                     this._factory = (...args) => opts.factory.apply(null, args as any);
                     if (opts.activation === "singleton") {
                         this._cacheId = oid(opts.factory);
                     }
                 }
             }

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

-            import { isNull, argumentNotEmptyString, each, keys } from "../safe";
+            import { argumentNotEmptyString, each } from "../safe";
             import { ActivationContext } from "./ActivationContext";
-            import { ServiceMap, Descriptor, PartialServiceMap } from "./interfaces";
+            import { Descriptor, PartialServiceMap, ContainerResolve, ContainerKeys } from "./interfaces";
             import { ActivationError } from "./ActivationError";
-            export interface ReferenceDescriptorParams<S, K extends keyof S> {
+            export interface ReferenceDescriptorParams<S extends object, K extends ContainerKeys<S>> {
                 name: K;
                 lazy?: boolean;
                 optional?: boolean;
-                default?: S[K];
+                default?: ContainerResolve<S, K>;
                 services?: PartialServiceMap<S>;
             }
-            function defined<T>(v: T | undefined) {
+            export class ReferenceDescriptor<S extends object = any, K extends ContainerKeys<S> = ContainerKeys<S>>
-                if (v === undefined)
+                implements Descriptor<S, ContainerResolve<S, K> | ((args?: PartialServiceMap<S>) => ContainerResolve<S, K>)> {
-                    throw Error();
-                return v;
-            export class ReferenceDescriptor<S = any, K extends keyof S = keyof S> implements Descriptor<S, S[K] | ((args?: PartialServiceMap<S> ) => S[K])> {
                 _name: K;
                 _lazy = false;
                 _optional = false;
-                _default: S[K] | undefined;
+                _default: ContainerResolve<S, K> | undefined;
                 _services: PartialServiceMap<S>;
                 constructor(opts: ReferenceDescriptorParams<S, K>) {
                     argumentNotEmptyString(opts && opts.name, "opts.name");
                     this._name = opts.name;
                     this._lazy = !!opts.lazy;
                     this._optional = !!opts.optional;
                     this._default = opts.default;
-                    this._services = (opts.services || {}) as ServiceMap<S>;
+                    this._services = (opts.services || {}) as PartialServiceMap<S>;
                 }
                 activate(context: ActivationContext<S>) {
                     // добавляем сервисы
                     if (this._services) {
                         each(this._services, (v, k) => context.register(k, v));
                     }
                     if (this._lazy) {
                         const saved = context.clone();
                         return (cfg?: PartialServiceMap<S>) => {
                             // защищаем контекст на случай исключения в процессе
                             // активации
                             const ct = saved.clone();
                             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);
                             }
                         };
                     } else {
                         const v = this._optional ?
                             context.resolve(this._name, this._default) :
                             context.resolve(this._name);
                         return v;
                     }
                 }
                 toString() {
                     const opts = [];
                     if (this._optional)
                         opts.push("optional");
                     if (this._lazy)
                         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/ServiceDescriptor.ts +3 -3

             import { ActivationContext } from "./ActivationContext";
             import { Descriptor, ServiceMap, PartialServiceMap, ActivationType } from "./interfaces";
             import { Container } from "./Container";
             import { argumentNotNull, isPrimitive, keys, isNull } from "../safe";
             import { TraceSource } from "../log/TraceSource";
             import { isDescriptor } from "./traits";
             let cacheId = 0;
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            function injectMethod<T, M extends keyof T, S, A>(target: T, method: M, context: ActivationContext<S>, args: A) {
+            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 makeClenupCallback<T>(target: T, method: Cleaner<T>): () => void;
             function makeClenupCallback(target: any, method: any) {
                 if (typeof (method) === "string") {
                     return () => {
                         target[method]();
                     };
                 } else {
                     return () => {
                         method(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) | keyof Extract<T, { [M in keyof T]: () => void }>;
             export type InjectionSpec<T> = {
                 [m in keyof T]?: any;
             };
-            export interface ServiceDescriptorParams<S, T, P extends any[]> {
+            export interface ServiceDescriptorParams<S extends object, T, P extends any[]> {
                 activation?: ActivationType;
                 owner: Container<S>;
                 params?: P;
                 inject?: InjectionSpec<T>[];
                 services?: PartialServiceMap<S>;
                 cleanup?: Cleaner<T>;
             }
-            export class ServiceDescriptor<S, T, P extends any[]> implements Descriptor<S, T> {
+            export class ServiceDescriptor<S extends object, T, P extends any[]> implements Descriptor<S, T> {
                 _instance: T | undefined;
                 _hasInstance = false;
                 _activationType: ActivationType = "call";
                 _services: ServiceMap<S>;
                 _params: P | undefined;
                 _inject: InjectionSpec<T>[];
                 _cleanup: Cleaner<T> | undefined;
                 _cacheId: any;
                 _owner: Container<S>;
                 constructor(opts: ServiceDescriptorParams<S, T, P>) {
                     argumentNotNull(opts, "opts");
                     argumentNotNull(opts.owner, "owner");
                     this._owner = opts.owner;
                     if (!isNull(opts.activation))
                         this._activationType = opts.activation;
                     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 = opts.cleanup;
                     }
                 }
                 activate(context: ActivationContext<S>) {
                     // if we have a local service records, register them first
                     let instance: T;
                     // ensure we have a cache id
                     if (!this._cacheId)
                         this._cacheId = ++cacheId;
                     switch (this._activationType) {
                         case "singleton": // SINGLETON
                             // if the value is cached return it
                             if (this._hasInstance)
                                 return this._instance;
                             // singletons are bound to the root container
                             const container = context.container.getRootContainer();
                             if (container.has(this._cacheId)) {
                                 instance = container.get(this._cacheId);
                             } else {
                                 instance = this._create(context);
                                 container.store(this._cacheId, instance);
                                 if (this._cleanup)
                                     container.onDispose(
                                         makeClenupCallback(instance, this._cleanup));
                             }
                             this._hasInstance = true;
                             return (this._instance = instance);
                         case "container": // CONTAINER
                             // return a cached value
                             if (this._hasInstance)
                                 return this._instance;
                             // create an instance
                             instance = this._create(context);
                             // the instance is bound to the container
                             if (this._cleanup)
                                 this._owner.onDispose(
                                     makeClenupCallback(instance, this._cleanup));
                             // cache and return the instance
                             this._hasInstance = true;
                             return (this._instance = instance);
                         case "context": // CONTEXT
                             // return a cached value if one exists
                             if (context.has(this._cacheId))
                                 return context.get(this._cacheId);
                             // context context activated instances are controlled by callers
                             return context.store(this._cacheId, this._create(context));
                         case "call": // CALL
                             // per-call created instances are controlled by callers
                             return this._create(context);
                         case "hierarchy": // HIERARCHY
                             // hierarchy activated instances are behave much like container activated
                             // except they are created and bound to the child container
                             // return a cached value
                             if (context.container.has(this._cacheId))
                                 return context.container.get(this._cacheId);
                             instance = this._create(context);
                             if (this._cleanup)
                                 context.container.onDispose(makeClenupCallback(
                                     instance,
                                     this._cleanup));
                             return context.container.store(this._cacheId, instance);
                         default:
                             throw new Error("Invalid activation type: " + this._activationType);
                     }
                 }
                 isInstanceCreated() {
                     return this._hasInstance;
                 }
                 getInstance() {
                     return this._instance;
                 }
                 _factory(...params: any[]): T {
                     throw Error("Not implemented");
                 }
                 _create(context: ActivationContext<S>) {
                     trace.debug(`constructing ${context._name}`);
                     if (this._activationType !== "call" &&
                         context.visit(this._cacheId) > 0)
                         throw new Error("Recursion detected");
                     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;
                 }
             }

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

             import { ServiceDescriptor, ServiceDescriptorParams } from "./ServiceDescriptor";
             import { Constructor, Factory } from "../interfaces";
             import { argumentNotNull, isPrimitive } from "../safe";
-            export interface TypeServiceDescriptorParams<S, T extends object, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
+            export interface TypeServiceDescriptorParams<S extends object, T extends object, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
                 type: Constructor<T>;
             }
-            export class TypeServiceDescriptor<S, T extends object, P extends any[]> extends ServiceDescriptor<S, T, P> {
+            export class TypeServiceDescriptor<S extends object, T extends object, P extends any[]> extends ServiceDescriptor<S, T, P> {
                 _type: Constructor;
                 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 inst = ctor.apply(t, args);
                                 return isPrimitive(inst) ? t : inst;
                             };
                         } 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/interfaces.ts +25 -8

@@ -1,21 +1,38
1	import { ActivationContext } from "./ActivationContext";	1	import { ActivationContext } from "./ActivationContext";
2		2
3	export interface Descriptor<S = any, T = any> {	3	export interface Descriptor<S extends object = any, T = any> {
4	activate(context: ActivationContext<S>): T;	4	activate(context: ActivationContext<S>): T;
5	}	5	}
6		6
7	export type ServiceMap<S> = {	7	export type ServiceMap<S extends object> = {
8	[k in keyof S]: Descriptor<S, S[k]>;	8	[k in keyof S]: Descriptor<S, S[k]>;
9	};	9	};
10		10
11	export type PartialServiceMap<S> = {	11	export type ContainerKeys<S extends object> = keyof S \| keyof ContainerProvided<S>;
		12
		13	export type ContainerResolve<S extends object, K> =
		14	K extends keyof ContainerProvided<S> ? ContainerProvided<S>[K] :
		15	K extends keyof S ? S[K] : never;
		16
		17	export type ContainerServiceMap<S extends object> = {
		18	[K in ContainerKeys<S>]: Descriptor<S, ContainerResolve<S, K>>;
		19	};
		20
		21	export type PartialServiceMap<S extends object> = {
12	[k in keyof S]?: Descriptor<S, S[k]>;	22	[k in keyof S]?: Descriptor<S, S[k]>;
13	};	23	};
14		24
15	export interface Resolver<S> {	25	export interface Resolver<S extends object> {
16	resolve<K extends keyof ContainerServices<S>, T extends ContainerServices<S>[K] = ContainerServices<S>[K]>(name: K, def?: T): T;	26	resolve<K extends ContainerKeys<S>>(name: K, def?: ContainerResolve<S, K>): ContainerResolve<S, K>;
		27	}
		28
		29	export interface ContainerProvided<S extends object> {
		30	container: Resolver<S>;
17	}	31	}
18	export type ContainerServices<S> = S & {	32
19	container: Resolver<S>;	33	export type ContainerRegistered<S extends object> = /*{
20	};	34	[K in Exclude<keyof S, keyof ContainerProvided<S>>]: S[K];
		35	};*/
		36	Exclude<S, ContainerProvided<S>>;
		37
21	export type ActivationType = "singleton" \| "container" \| "hierarchy" \| "context" \| "call";	38	export type ActivationType = "singleton" \| "container" \| "hierarchy" \| "context" \| "call";

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

             import { isPrimitive } from "../safe";
             import { Descriptor } from "./interfaces";
             export function isDescriptor(x: any): x is Descriptor {
                 return (!isPrimitive(x)) &&
                     (x.activate instanceof Function);
+            }
  No newline at end of file

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

             import { config } from "./services";
             config()
                 .register("bar", import("./Bar"))
-                .register("box", import("./Box"))
+                .register("box", import("./Box"), "service");
-                .register("foo", import("./Foo"), "Foo");
+                //.register("foo", import("./Foo"), "Foo");

src/test/ts/tests/ContainerTests.ts +14 -3

             import { test } from "./TestTraits";
             import { Container } from "../di/Container";
             import { ReferenceDescriptor } from "../di/ReferenceDescriptor";
             import { AggregateDescriptor } from "../di/AggregateDescriptor";
             import { ValueDescriptor } from "../di/ValueDescriptor";
             import { Foo } from "../mock/Foo";
             import { Bar } from "../mock/Bar";
             import { isNull } from "../safe";
-            import { Descriptor } from "../di/interfaces";
+            import { Box } from "ts/mock/Box";
             test("Container register/resolve tests", async t => {
-                const container = new Container();
+                const container = new Container<{
+                    "bla-bla": string;
+                    "connection": string;
+                    "dbParams": {
+                        timeout: number;
+                        connection: string;
+                    }
+                }>();
                 const connection1 = "db://localhost";
                 t.throws(
                     () => container.register("bla-bla", "bla-bla" as any),
                     "Do not allow to register anything other than descriptors"
                 );
                 t.doesNotThrow(
                     () => container.register("connection", new ValueDescriptor(connection1)),
                     "register ValueDescriptor"
                 );
                 t.equals(container.resolve("connection"), connection1, "resolve string value");
                 t.doesNotThrow(
                     () => container.register(
                         "dbParams",
                         new AggregateDescriptor({
                             timeout: 10,
                             connection: new ReferenceDescriptor({ name: "connection" })
                         })
                     ),
                     "register AggregateDescriptor"
                 );
                 const dbParams = container.resolve("dbParams");
                 t.equals(dbParams.connection, connection1, "should get string value 'dbParams.connection'");
             });
             test("Container configure/resolve tests", async t => {
-                const container = new Container();
+                const container = new Container<{
+                    foo: Foo;
+                    box: Bar;
+                    bar: Bar;
+                }>();
                 await container.configure({
                     foo: {
                         $type: Foo
                     },
                     box: {
                         $type: Bar,
                         params: {
                             $dependency: "foo"
                         }
                     },
                     bar: {
                         $type: Bar,
                         params: {
                             db: {
                                 provider: {
                                     $dependency: "db"
                                 }
                             }
                         }
                     }
                 });
                 t.pass("should configure from js object");
                 const f1 = container.resolve("foo");
                 t.assert(!isNull(f1), "foo should be not null");
                 t.throws(() => container.resolve("bar"), "should not resolve dependency 'db'");
             });
             test("Load configuration from module", async t => {
                 const container = new Container();
                 await container.configure("../mock/config1", { contextRequire: require });
                 t.pass("The configuration should load");
                 const f1 = container.resolve("foo");
                 t.assert(!isNull(f1), "foo should be not null");
                 const b1 = container.resolve("bar") as Bar;
                 t.assert(!isNull(b1), "bar should not be null");
                 t.assert(!isNull(b1._v), "bar.foo should not be null");
             });

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