implab/implabjs-core Commit - r115:691199f665e0

corrected code to support ts strict mode...

cin -

r115:691199f665e0 ioc ts support

parent child

Context file:

r115:691199f665e0

Expand all files

src/main/ts/EventProvider.ts created 644 +41 0

@@ -0,0 +1,41
	1	import { IDestroyable } from "./interfaces";
	2	import { Observable } from "./Observable";
	3
	4	/**
	5	* Event proviers are used to produce events, throug this object you can feed
	6	* the Observable with input events. Once the EventProvider is destroyed the
	7	* bound obsevable is disconnected and marked as 'done'.
	8	*/
	9	export class EventProvider<T> implements IDestroyable {
	10
	11	_observable: Observable<T> \| undefined;
	12
	13	_next: ((evt: T) => void) \| undefined;
	14	_done: (() => void) \| undefined;
	15
	16	constructor() {
	17	this._observable = new Observable<T>((next, _error, done) => {
	18	this._next = next;
	19	this._done = done;
	20	});
	21	}
	22
	23	destroy(): void {
	24	if (this._observable) {
	25	// break all references
	26	this._observable = undefined;
	27	this._next = undefined;
	28	this._done = undefined;
	29	}
	30	}
	31	post(event: T) {
	32	return this._next && this._next(event);
	33	}
	34
	35	getObservable() {
	36	if (!this._observable)
	37	throw new Error("The object is destroyed");
	38
	39	return this._observable;
	40	}
	41	}

build.gradle +3 -1

                     types = []
                     declaration = true
                     experimentalDecorators = true
-                    //strict = true
+                    strict = true
+                    // dojo-typings are sick
+                    skipLibCheck = true
                     if(symbols != 'none') {
                         sourceMap = true

src/amd/ts/di/ResolverHelper.ts +1 -1

             trace.debug("globalRequire = {0}", globalRequire);
             class ModuleResolver {
-                _base: string;
+                _base: string | undefined;
                 _require: Require;
                 constructor(req: Require, base?: string) {

src/amd/ts/log/trace.ts +2 -2

                         cb = filter;
                         filter = undefined;
                     }
-                    let test: Predicate<string>;
+                    let test: Predicate<string> | undefined;
                     if (filter instanceof RegExp) {
                         test = chId => filter.test(chId);
                     } else if (filter instanceof Function) {
                     if (test) {
                         TraceSource.on(source => {
                             source.level = this.level;
-                            if (test(source.id))
+                            if (test && test(source.id))
                                 source.events.on(cb);
                         });
                     } else {

src/amd/ts/text/TemplateCompiler.ts +2 -1

             import { TraceSource, DebugLevel } from "../log/TraceSource";
             import { ITemplateParser, TokenType } from "./TemplateParser";
             import m = require("module");
+            import { isKeyof } from "../safe";
             const trace = TraceSource.get(m.id);
             // Escape a string for HTML interpolation.
             function escapeHtml(string: any) {
-                return ("" + string).replace(htmlEscaper, match => htmlEscapes[match]);
+                return ("" + string).replace(htmlEscaper, match => isKeyof(match, htmlEscapes) ? htmlEscapes[match] : "");
             }
             export class TemplateCompiler {

src/amd/ts/text/TemplateParser.ts +3 -1

                 _tokens: string[];
                 _pos = -1;
                 _type: TokenType;
-                _value: string;
+                _value: string | undefined;
                 constructor(text: string) {
                     argumentNotEmptyString(text, "text");
                 }
                 value() {
+                    if (!this._value)
+                        throw new Error("The current token doesn't have a value");
                     return this._value;
                 }

src/amd/ts/text/format.ts +13 -8

             import { format as dojoFormatDate } from "dojo/date/locale";
             import { Formatter, compile as _compile } from "./StringFormat";
-            import { isNumber, isNull } from "../safe";
+            import { isNumber, isNull, get } from "../safe";
             interface NumberFormatOptions {
                 round?: number;
                 pattern?: string;
             }
-            function convertNumber(value: any, pattern: string) {
+            function convertNumber(value: any, _pattern?: string) {
                 if (isNumber(value)) {
                     const nopt = {} as NumberFormatOptions;
-                    if (pattern.indexOf("!") === 0) {
+                    let pattern = _pattern;
+                    if (pattern && pattern.indexOf("!") === 0) {
                         nopt.round = -1;
                         pattern = pattern.substr(1);
                     }
                     nopt.pattern = pattern;
                     return dojoFormatNumber(value, nopt);
+                } else {
+                    return "";
                 }
             }
-            function convertDate(value: any, pattern: string) {
+            function convertDate(value: any, pattern?: string) {
                 if (value instanceof Date) {
-                    const m = pattern.match(/^(\w+)-(\w+)$/);
+                    const m = pattern && pattern.match(/^(\w+)-(\w+)$/);
                     if (m)
                         return dojoFormatDate(value, {
                             selector: m[2],
                             selector: "date",
                             datePattern: pattern
                         });
+                } else {
+                    return "";
                 }
             }
                 return _formatter.format(msg, ...args);
             }
-            function _convert(value: any, pattern: string) {
+            function _convert(value: any, pattern?: string) {
                 return _formatter.convert(value, pattern);
             }
                 export function compile(text: string) {
                     const template = _compile(text);
-                    return (...data) => {
+                    return (...data: any[]) => {
                         return template((name, pattern) => {
-                            const value = data[name];
+                            const value = get(name, data);
                             return !isNull(value) ? convert(value, pattern) : "";
                         });
                     };

src/amd/ts/text/template-compile.ts +1 -1

                     callback(cache[url]);
                 } else {
                     trace.debug("{0} -> {1}: load", id, url);
-                    request(url).then(compile).then((tc: TemplateFn) => {
+                    request<string>(url).then(compile).then((tc: TemplateFn) => {
                         trace.debug("{0}: compiled", url);
                         callback(cache[url] = tc);
                     }, (err: any) => {

src/cjs/ts/di/ResolverHelper.ts +2 -2

             const trace = TraceSource.get(module.id);
             const mainModule = require.main;
-            const mainRequire = (id: string) => mainModule.require(id);
+            const mainRequire = (id: string) => mainModule ? mainModule.require(id) : require;
             class ModuleResolver {
-                _base: string;
+                _base: string | undefined;
                 _require: NodeRequireFunction;
                 constructor(req: NodeRequireFunction, base?: string) {

src/main/ts/Cancellation.ts +4 -4

             export class Cancellation implements ICancellation {
                 private _reason: any;
-                private _cbs: Array<(e: any) => void>;
+                private _cbs: Array<(e: any) => void> | undefined;
                 constructor(action: (cancel: (e?: any) => void) => void) {
                     argumentNotNull(action, "action");
                     }
                 }
-                private _unregister(cb) {
+                private _unregister(cb: any) {
                     if (this._cbs) {
                         const i = this._cbs.indexOf(cb);
                         if (i >= 0)
                     }
                 }
-                private _cancel(reason) {
+                private _cancel(reason: any) {
                     if (this._reason)
                         return;
                     if (this._cbs) {
                         this._cbs.forEach(cb => cb(reason));
-                        this._cbs = null;
+                        this._cbs = undefined;
                     }
                 }

src/main/ts/Observable.ts +20 -23

             type Handler<T> = (x: T) => void;
-            type Initializer<T> = (notify: Handler<T>, error?: (e: any) => void, complete?: () => void) => void;
+            type Initializer<T> = (notify: Handler<T>, error: (e: any) => void, complete: () => void) => void;
             const noop = () => { };
+            const nulObserver: IObserver<any> = Object.freeze({
+                next: noop,
+                error: noop,
+                complete: noop
+            });
             function isObserver(val: any): val is IObserver<any> {
                 return val && (typeof val.next === "function");
             }
                 private _observers = new Array<IObserver<T>>();
-                private _complete: boolean;
+                private _complete = false;
                 private _error: any;
                     const me = this;
                     const observer: IObserver<T> & IDestroyable = {
-                        next,
+                        next: next.bind(null),
                         error: error ? error.bind(null) : noop,
                         complete: complete ? complete.bind(null) : noop,
                 subscribe(next: IObserver<T> | Handler<T>, error?: Handler<any>, complete?: () => void): IDestroyable {
                     if (isObserver(next)) {
-                        const me = this;
+                        this._addObserver(next);
-                        const subscription = {
+                        return {
-                            destroy() {
+                            destroy: () => this._removeObserver(next)
-                                me._removeObserver(next);
                         };
-                        this._addObserver(next);
+                    } else {
-                        return subscription;
-                    } else if (next) {
                         const observer = {
-                            next,
+                            next: next.bind(null),
-                            error,
+                            error: error ? error.bind(null) : noop,
-                            complete
+                            complete: complete ? complete.bind(null) : noop
                         };
-                        const me = this;
-                        const subscription = {
+                        this._addObserver(observer);
-                            destroy() {
+                        return {
-                                me._removeObserver(observer);
+                            destroy: () => this._removeObserver(observer)
                         };
-                        this._addObserver(observer);
-                        return subscription;
-                    } else {
-                        return destroyed;
                     }
                 }

src/main/ts/ObservableValue.ts +2 0

                 }
                 setValue(value: T) {
+                    if (this._value !== value) {
                         this._value = value;
                         this._notifyNext(value);
                     }
+                }
                 on(next: Handler<T>, error?: Handler<any>, complete?: () => void): IDestroyable {
                     argumentNotNull(next, "next");

src/main/ts/Uuid.ts +36 -20

             //     Copyright (c) 2010-2012 Robert Kieffer
             //     MIT License - http://opensource.org/licenses/mit-license.php
+            import { MapOf } from "./interfaces";
             declare const window: any;
-            declare const require;
+            declare const require: any;
-            declare const Buffer;
+            declare const Buffer: any;
             const _window: any = "undefined" !== typeof window ? window : null;
+            interface WritableArrayLike<T> {
+                length: number;
+                [n: number]: T;
+            }
             // Unique ID creation requires a high quality random # generator. We
             // feature
             // detect to determine the best RNG source, normalizing to a function
             // that
             // returns 128-bits of randomness, since that's what's usually required
-            let _rng;
+            let _rng: () => WritableArrayLike<number> = () => [];
             function setupBrowser() {
                 // Allow for MSIE11 msCrypto
                     // If all else fails, use Math.random(). It's fast, but is of
                     // unspecified
                     // quality.
-                    const _rnds = new Array(16);
+                    const _rnds = new Array<number>(16);
                     _rng = () => {
-                        for (let i = 0, r; i < 16; i++) {
+                        for (let i = 0, r = 0; i < 16; i++) {
                             if ((i & 0x03) === 0) {
                                 r = Math.random() * 0x100000000;
                             }
             const BufferClass = ("function" === typeof Buffer) ? Buffer : Array;
             // Maps for number <-> hex string conversion
-            const _byteToHex = [];
+            const _byteToHex: string[] = [];
-            const _hexToByte = {};
+            const _hexToByte: MapOf<number> = {};
             for (let i = 0; i < 256; i++) {
                 _byteToHex[i] = (i + 0x100).toString(16).substr(1);
                 _hexToByte[_byteToHex[i]] = i;
             }
             // **`parse()` - Parse a UUID into it's component bytes**
-            function _parse(s, buf?, offset?): Array<string> {
+            function _parse(s: string, buf: number[] = [], offset?: number): number[] {
                 const i = (buf && offset) || 0; let ii = 0;
-                buf = buf || [];
                 s.toLowerCase().replace(/[0-9a-f]{2}/g, oct => {
                     if (ii < 16) { // Don't overflow!
                         buf[i + ii++] = _hexToByte[oct];
                     }
+                    return "";
                 });
                 // Zero out remaining bytes if string was short
             }
             // **`unparse()` - Convert UUID byte array (ala parse()) into a string**
-            function _unparse(buf, offset?): string {
+            function _unparse(buf: ArrayLike<number>, offset?: number): string {
                 let i = offset || 0; const bth = _byteToHex;
                 return bth[buf[i++]] + bth[buf[i++]] + bth[buf[i++]] +
                     bth[buf[i++]] + "-" + bth[buf[i++]] + bth[buf[i++]] + "-" +
             // Previous uuid creation time
             let _lastMSecs = 0; let _lastNSecs = 0;
+            interface V1Options {
+                clockseq?: number;
+                msecs?: number;
+                nsecs?: number;
+                node?: number[];
+            }
             // See https://github.com/broofa/node-uuid for API details
-            function _v1(options?, buf?, offset?): string {
+            function _v1(options?: V1Options): string;
+            function _v1(options: V1Options, buf: number[], offset?: number): number[];
+            function _v1(options: V1Options = {}, buf?: number[], offset?: number): string | number[] {
                 let i = buf && offset || 0;
                 const b = buf || [];
-                options = options || {};
                 let clockseq = (options.clockseq != null) ? options.clockseq : _clockseq;
                 // UUID timestamps are 100 nano-second units since the Gregorian
                 return buf ? buf : _unparse(b);
             }
+            interface V4Opptions {
+                rng?: () => WritableArrayLike<number>;
+                random?: number[];
+            }
             // **`v4()` - Generate random UUID**
             // See https://github.com/broofa/node-uuid for API details
-            function _v4(options?, buf?, offset?): string {
+            function _v4(options?: V4Opptions): string;
+            function _v4(options: V4Opptions, buf: number[], offset?: number): number[];
+            function _v4(options: V4Opptions = {}, buf?: number[], offset?: number): string | number[] {
                 // Deprecated - 'format' argument, as supported in v1.2
                 const i = buf && offset || 0;
-                if (typeof (options) === "string") {
-                    buf = (options === "binary") ? new BufferClass(16) : null;
-                    options = null;
-                options = options || {};
                 const rnds = options.random || (options.rng || _rng)();
                 // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`

src/main/ts/components/ActivatableMixin.ts +8 -2

             export function ActivatableMixin<TBase extends Constructor<AsyncComponent>>(Base: TBase) {
                 return class extends Base implements IActivatable {
-                    _controller: IActivationController;
+                    _controller: IActivationController | undefined;
-                    _active: boolean;
+                    _active = false;
                     isActive() {
                         return this._active;
                     }
+                    hasActivationController() {
+                        return !!this._controller;
+                    }
                     getActivationController() {
+                        if (!this._controller)
+                            throw Error("Activation controller isn't set");
                         return this._controller;
                     }

src/main/ts/components/AsyncComponent.ts +2 -2

             import { destroy } from "../safe";
             export class AsyncComponent implements IAsyncComponent, ICancellable {
-                _cancel: (e: any) => void;
+                _cancel: ((e: any) => void) | undefined;
                 _completion: Promise<void> = Promise.resolve();
                             // after the operation is complete we need to cleanup the
                             // resources
                             destroy(h);
-                            this._cancel = null;
+                            this._cancel = undefined;
                         }
                     };

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

             import { TraceSource } from "../log/TraceSource";
             import { argumentNotNull, argumentNotEmptyString, isPrimitive, each, isNull } from "../safe";
-            import { Descriptor, ServiceMap } from "./interfaces";
+            import { Descriptor, ServiceMap, PartialServiceMap } from "./interfaces";
             import { Container } from "./Container";
             import { MapOf } from "../interfaces";
                 service: string;
-                scope: ServiceMap<S>;
+                scope: PartialServiceMap<S>;
             }
             export class ActivationContext<S> {
                 _cache: MapOf<any>;
-                _services: ServiceMap<S>;
+                _services: PartialServiceMap<S>;
                 _stack: ActivationContextInfo<S>[];
                 container: Container<S>;
-                constructor(container: Container<S>, services: ServiceMap<S>, name?: string, cache?: object, visited?: MapOf<any>) {
+                constructor(container: Container<S>, services: PartialServiceMap<S>, name?: string, cache?: object, visited?: MapOf<any>) {
                     argumentNotNull(container, "container");
                     argumentNotNull(services, "services");
                     return this._name;
                 }
-                resolve<K extends keyof S, T extends S[K]>(name: K, def?: T) {
+                resolve<K extends keyof S, T extends S[K]>(name: K, def?: T): T {
                     const d = this._services[name];
                     if (d !== undefined) {
-                        return this.activate(d as Descriptor<T>, name.toString());
+                        return this.activate(d as Descriptor<S, T>, name.toString());
                     } else {
                         if (def !== undefined && def !== null)
                             return def;
                  * @name{string} the name of the service
                  * @service{string} the service descriptor to register
                  */
-                register<K extends keyof S>(name: K, service: Descriptor<S[K]>) {
+                register<K extends keyof S>(name: K, service: Descriptor<S, S[K]>) {
                     argumentNotEmptyString(name, "name");
                     this._services[name] = service;
                 }
                 clone() {
-                    return new ActivationContext(
+                    return new ActivationContext<S>(
                         this.container,
                         this._services,
                         this._name,
                     return (this._cache[id] = value);
                 }
-                activate<T>(d: Descriptor<T>, name: string) {
+                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<S>(this);
+                    const v = d.activate(this);
                     this.leave();
                     if (trace.isLogEnabled())

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

-            import { Descriptor, isDescriptor } from "./interfaces";
+            import { Descriptor, isDescriptor, Parse } from "./interfaces";
             import { ActivationContext } from "./ActivationContext";
             import { isPrimitive } from "../safe";
-            type Parse<T> = T extends Descriptor<infer V> ? V :
-                    T extends {} ? { [K in keyof T]: Parse<T[K]> } :
-                    T;
             export class AggregateDescriptor<T> implements Descriptor<Parse<T>> {
                 _value: T;

src/main/ts/di/Annotations.ts 0 -3

             export class Builder<T, S> {
                 consume<P extends any[]>(...args: P) {
                     return <C extends new (...args: ExtractDependency<P, S>) => T>(constructor: C) => {
-                        return constructor;
                     };
                 }
                 }
             }

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

                 ActivationType,
                 isValueRegistration,
                 isTypeRegistration,
-                isFactoryRegistration
+                isFactoryRegistration,
+                PartialServiceMap
             } from "./interfaces";
             import { argumentNotEmptyString, isPrimitive, isPromise, delegate, argumentOfType, argumentNotNull, get } from "../safe";
             import { ICancellation } from "../interfaces";
             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 | any[], map?: (v: any, k: number | string) => 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 {
                     if (resolver)
                         this._require = resolver;
-                    let services: ServiceMap;
+                    let services: PartialServiceMap<S>;
                     try {
                         services = await this._visitRegistrations(data, "$");
                         data.constructor.prototype !== Object.prototype)
                         throw new Error("Configuration must be a simple object");
-                    const o: ServiceMap = {};
+                    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 ServiceMap;
+                    }) as PartialServiceMap<S>;
                     this._leave();
                     return services;
                 }
-                _enter(name: keyof any) {
+                _enter(name: string) {
                     this._path.push(name.toString());
                     trace.debug(">{0}", name);
                 }
                     trace.debug("<{0}", name);
                 }
-                async _visit<T>(data: T, name: string) {
+                async _visit<T>(data: T, name: string): Promise<any> {
                     if (isPrimitive(data) || isDescriptor(data))
                         return data;

src/main/ts/di/Container.ts +14 -13

             import { ActivationContext } from "./ActivationContext";
             import { ValueDescriptor } from "./ValueDescriptor";
             import { ActivationError } from "./ActivationError";
-            import { isDescriptor, ServiceMap, Descriptor } from "./interfaces";
+            import { isDescriptor, ServiceMap, Descriptor, PartialServiceMap, ContainerServices, Resolver } from "./interfaces";
             import { TraceSource } from "../log/TraceSource";
             import { Configuration } from "./Configuration";
             import { Cancellation } from "../Cancellation";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            export class Container<S extends { container?: Container<S> }> {
+            export class Container<S = any> implements Resolver<S> {
-                readonly _services: ServiceMap<S>;
+                readonly _services: PartialServiceMap<S, ContainerServices<S>>;
                 readonly _cache: MapOf<any>;
                     this._cache = {};
                     this._cleanup = [];
                     this._root = parent ? parent.getRootContainer() : this;
-                    this._services.container = new ValueDescriptor(this);
+                    this._services.container = new ValueDescriptor(this) as any;
                     this._disposed = false;
                 }
                     return this._parent;
                 }
-                resolve<K extends keyof S, T extends S[K] = S[K]>(name: K, def?: T) {
+                resolve<K extends keyof ContainerServices<S>, T extends ContainerServices<S>[K] = ContainerServices<S>[K]>(name: K, def?: T): T {
                     trace.debug("resolve {0}", name);
                     const d = this._services[name];
                     if (d === undefined) {
                         const context = new ActivationContext<S>(this, this._services);
                         try {
-                            return context.activate(d as Descriptor<T>, name.toString());
+                            return context.activate(d as Descriptor<S, T>, name.toString());
                         } catch (error) {
                             throw new ActivationError(name.toString(), context.getStack(), error);
                         }
                 /**
                  * @deprecated use resolve() method
                  */
-                getService<K extends keyof S>(name: K, def?: S[K]) {
+                getService<K extends keyof S, T extends ContainerServices<S>[K] = ContainerServices<S>[K]>(name: K, def?: T) {
                     return this.resolve(name, def);
                 }
-                register<K extends keyof S>(name: K, service: Descriptor<S[K]>): this;
+                register<K extends keyof S>(name: K, service: Descriptor<S, S[K]>): this;
-                register(services: ServiceMap<S>): this;
+                register(services: PartialServiceMap<S>): this;
-                register<K extends keyof S>(nameOrCollection: K | ServiceMap<S>, service?: Descriptor<S[K]>) {
+                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[keyof S]>);
+                                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;
+                        this._services[nameOrCollection as K] = service as any;
                     }
                     return this;
                 }
                  *
                  */
                 async configure(config: string | object, opts?: any, ct = Cancellation.none) {
-                    const c = new Configuration(this);
+                    const c = new Configuration<S>(this);
                     if (typeof (config) === "string") {
                         return c.loadConfiguration(config, opts && opts.contextRequire, ct);

src/main/ts/di/FactoryServiceDescriptor.ts +5 -6

             import { ServiceDescriptor, ServiceDescriptorParams } from "./ServiceDescriptor";
-            import { Factory } from "../interfaces";
             import { argumentNotNull, oid } from "../safe";
             import { ActivationType } from "./interfaces";
-            export interface FactoryServiceDescriptorParams extends ServiceDescriptorParams {
+            export interface FactoryServiceDescriptorParams<S, T, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
-                factory: Factory;
+                factory: (...args: P) => T;
             }
-            export class FactoryServiceDescriptor extends ServiceDescriptor {
+            export class FactoryServiceDescriptor<S, T, P extends any[]> extends ServiceDescriptor<S, T, P> {
-                constructor(opts: FactoryServiceDescriptorParams) {
+                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);
+                    this._factory = (...args) => opts.factory.apply(null, args as any);
                     if (opts.activation === ActivationType.Singleton) {
                         this._cacheId = oid(opts.factory);

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

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

src/main/ts/di/ServiceDescriptor.ts +43 -39

             import { ActivationContext } from "./ActivationContext";
-            import { Descriptor, ActivationType, ServiceMap, isDescriptor } from "./interfaces";
+            import { Descriptor, ActivationType, ServiceMap, isDescriptor, Parse, PartialServiceMap } from "./interfaces";
             import { Container } from "./Container";
-            import { argumentNotNull, isPrimitive } from "../safe";
+            import { argumentNotNull, isPrimitive, each, keys, isNull } from "../safe";
             import { TraceSource } from "../log/TraceSource";
             let cacheId = 0;
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
-            function injectMethod(target, method, context, args) {
+            function injectMethod<T, M extends keyof T, S, A>(target: T, method: M, context: ActivationContext<S>, args: A) {
                 const m = target[method];
-                if (!m)
+                if (!m || typeof m !== "function")
                     throw new Error("Method '" + method + "' not found");
                 if (args instanceof Array)
                     return m.call(target, _parse(args, context, "." + method));
             }
-            function makeClenupCallback(target, method: ((instance) => void) | string) {
+            function makeClenupCallback<T>(target: T, method: Cleaner<T>): () => void;
+            function makeClenupCallback(target: any, method: any) {
                 if (typeof (method) === "string") {
                     return () => {
                         target[method]();
                 }
             }
-            // TODO: make async
+            function _parse<T, S>(value: T, context: ActivationContext<S>, path: string): Parse<T> {
-            function _parse(value, context: ActivationContext, path: string) {
                 if (isPrimitive(value))
-                    return value;
+                    return value as any;
                 trace.debug("parse {0}", path);
                     return context.activate(value, path);
                 if (value instanceof Array)
-                    return value.map((x, i) => _parse(x, context, `${path}[${i}]`));
+                    return value.map((x, i) => _parse(x, context, `${path}[${i}]`)) as any;
-                const t = {};
+                const t: any = {};
-                for (const p of Object.keys(value))
-                    t[p] = _parse(value[p], context, `${path}.${p}`);
+                keys(value).forEach(p => t[p] = _parse(value[p], context, `${path}.${p}`));
                 return t;
             }
-            export interface ServiceDescriptorParams {
+            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[]> {
                 activation?: ActivationType;
-                owner: Container;
+                owner: Container<S>;
-                params?;
+                params?: P;
-                inject?: object[];
+                inject?: InjectionSpec<T>[];
-                services?: ServiceMap;
+                services?: PartialServiceMap<S>;
-                cleanup?: ((x) => void) | string;
+                cleanup?: Cleaner<T>;
             }
-            export class ServiceDescriptor implements Descriptor {
+            export class ServiceDescriptor<S, T, P extends any[]> implements Descriptor<S, T> {
-                _instance;
+                _instance: T | undefined;
                 _hasInstance = false;
                 _activationType = ActivationType.Call;
-                _services: ServiceMap;
+                _services: ServiceMap<S>;
-                _params;
+                _params: P | undefined;
-                _inject: object[];
+                _inject: InjectionSpec<T>[];
-                _cleanup: ((x) => void) | string;
+                _cleanup: Cleaner<T> | undefined;
                 _cacheId: any;
-                _owner: Container;
+                _owner: Container<S>;
-                constructor(opts: ServiceDescriptorParams) {
+                constructor(opts: ServiceDescriptorParams<S, T, P>) {
                     argumentNotNull(opts, "opts");
                     argumentNotNull(opts.owner, "owner");
                     this._owner = opts.owner;
-                    if ("activation" in opts)
+                    if (!isNull(opts.activation))
                         this._activationType = opts.activation;
-                    if ("params" in opts)
+                    if (!isNull(opts.params))
                         this._params = opts.params;
-                    if (opts.inject)
+                    this._inject = opts.inject || [];
-                        this._inject = opts.inject;
-                    if (opts.services)
+                    this._services = (opts.services || {}) as ServiceMap<S>;
-                        this._services = opts.services;
                     if (opts.cleanup) {
                         if (!(typeof (opts.cleanup) === "string" || opts.cleanup instanceof Function))
                     }
                 }
-                activate(context: ActivationContext) {
+                activate(context: ActivationContext<S>) {
                     // if we have a local service records, register them first
-                    let instance;
+                    let instance: T;
                     // ensure we have a cache id
                     if (!this._cacheId)
                     return this._instance;
                 }
-                _factory(...params: any[]): any {
+                _factory(...params: any[]): T {
                     throw Error("Not implemented");
                 }
-                _create(context: ActivationContext) {
+                _create(context: ActivationContext<S>) {
                     trace.debug(`constructing ${context._name}`);
                     if (this._activationType !== ActivationType.Call &&
                         throw new Error("Recursion detected");
                     if (this._services) {
-                        for (const p in this._services)
+                        keys(this._services).forEach(p => context.register(p, this._services[p]));
-                            context.register(p, this._services[p]);
                     }
-                    let instance;
+                    let instance: T;
                     if (this._params === undefined) {
                         instance = this._factory();

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

             import { Constructor, Factory } from "../interfaces";
             import { argumentNotNull, isPrimitive } from "../safe";
-            export interface TypeServiceDescriptorParams extends ServiceDescriptorParams {
+            export interface TypeServiceDescriptorParams<S, T extends object, P extends any[]> extends ServiceDescriptorParams<S, T, P> {
-                type: Constructor;
+                type: Constructor<T>;
             }
-            export class TypeServiceDescriptor extends ServiceDescriptor {
+            export class TypeServiceDescriptor<S, T extends object, P extends any[]> extends ServiceDescriptor<S, T, P> {
                 _type: Constructor;
-                constructor(opts: TypeServiceDescriptorParams) {
+                constructor(opts: TypeServiceDescriptorParams<S, T, P>) {
                     super(opts);
                     argumentNotNull(opts && opts.type, "opts.type");

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

             import { Descriptor } from "./interfaces";
-            export class ValueDescriptor<T> implements Descriptor<T> {
+            export class ValueDescriptor<T> implements Descriptor<any, T> {
                 _value: T;
                 constructor(value: T) {

src/main/ts/di/interfaces.ts +19 -6

-            import { isPrimitive } from "../safe";
+            import { isPrimitive, primitive } from "../safe";
             import { ActivationContext } from "./ActivationContext";
             import { Constructor, Factory } from "../interfaces";
-            export interface Descriptor<T = any> {
+            export interface Descriptor<S = any, T = any> {
-                activate<S>(context: ActivationContext<S>): T;
+                activate(context: ActivationContext<S>): T;
             }
             export function isDescriptor(x: any): x is Descriptor {
                     (x.activate instanceof Function);
             }
-            export type ServiceMap<S = any> = {
+            export type ServiceMap<S, S2 extends S = S> = {
-                [k in keyof S]: Descriptor<S[k]>;
+                [k in keyof S2]: Descriptor<S, S2[k]>;
+            };
+            export type PartialServiceMap<S, S2 extends S = S> = Partial<ServiceMap<S, S2>>;
             export enum ActivationType {
                 Singleton = 1,
                 default?: S[K];
             }
+            export type Parse<T> = T extends primitive ? T:
+                    T extends Descriptor<infer V> ? V :
+                    { [K in keyof T]: Parse<T[K]> };
+            export interface Resolver<S> {
+                resolve<K extends keyof ContainerServices<S>, T extends ContainerServices<S>[K] = ContainerServices<S>[K]>(name: K, def?: T): T;
+            }
+            export type ContainerServices<S> = S & {
+                container: Resolver<S>;
+            };
             export function isTypeRegistration(x: any): x is TypeRegistration<any, any, any> {
                 return (!isPrimitive(x)) && ("$type" in x);
             }

src/main/ts/interfaces.ts +5 0

                  */
                 setActivationController(controller: IActivationController): void;
+                /** Indicates whether this component has an activation controller */
+                hasActivationController(): boolean;
                 /**
                  * Gets the current activation controller for this component
                  */
                 activate(component: IActivatable, ct?: ICancellation): Promise<void>;
+                hasActive(): boolean;
                 getActive(): IActivatable;
             }

src/main/ts/log/Registry.ts +4 -4

             import { TraceSource } from "./TraceSource";
             import { argumentNotNull } from "../safe";
-            import { IDestroyable } from "../interfaces";
+            import { IDestroyable, MapOf } from "../interfaces";
             export class Registry {
                 static readonly instance = new Registry();
-                private _registry: object = new Object();
+                private _registry: MapOf<TraceSource> = {};
-                private _listeners: object = new Object();
+                private _listeners: MapOf<(source: TraceSource) => void> = {};
                 private _nextCookie: number = 1;
-                get(id: any): TraceSource {
+                get(id: string): TraceSource {
                     argumentNotNull(id, "id");
                     if (this._registry[id])

src/main/ts/log/TraceEventData.ts +1 -1

                 source: TraceSource;
                 level: number;
                 message: any;
-                args?: any[];
+                args: any[];
                 constructor(source: TraceSource, level: number, message: any, args: any[]) {
                     this.source = source;

src/main/ts/log/TraceSource.ts +8 -8

             import { Observable } from "../Observable";
             import { Registry } from "./Registry";
             import { TraceEventData } from "./TraceEventData";
+            import { EventProvider } from "../EventProvider";
             export const DebugLevel = 400;
             export class TraceSource {
                 readonly id: any;
-                level: number;
+                level = 0;
                 readonly events: Observable<TraceEvent>;
-                _notifyNext: (arg: TraceEvent) => void;
+                private readonly _provider: EventProvider<TraceEvent>;
-                constructor(id: any) {
+                constructor(id?: any) {
                     this.id = id || new Object();
-                    this.events = new Observable(next => {
+                    this._provider = new EventProvider();
-                        this._notifyNext = next;
+                    this.events = this._provider.getObservable();
-                    });
                 }
-                protected emit(level: number, message: any, args?: any[]) {
+                protected emit(level: number, message: any, args: any[]) {
-                    this._notifyNext(new TraceEventData(this, level, message, args));
+                    this._provider.post(new TraceEventData(this, level, message, args));
                 }
                 isDebugEnabled() {

src/main/ts/log/writers/ConsoleLogger.ts +4 0

                         this._writer.setLogLevel("error");
                     }
                     this._writer.write("{0}: ", next.source.id);
+                    if (next.args)
                         this._writer.writeLine(next.message, ...next.args);
+                    else
+                    this._writer.writeLine(next.message);
                 }
                 destroy() {

src/main/ts/safe.ts +67 -29

                 return isObject(arg) && arg ? Object.keys(arg) as (Extract<keyof T, string>)[] : [];
             }
+            export function isKeyof<T>(k: string, target: T): k is Extract<keyof T, string> {
+                return target && typeof target === "object" && k in target;
+            }
             export function argumentNotNull(arg: any, name: string) {
                 if (arg === null || arg === undefined)
                     throw new Error("The argument " + name + " can't be null or undefined");
                 return typeof val === "object";
             }
-            export function isNull(val: any) {
+            export function isNull(val: any): val is null | undefined {
                 return (val === null || val === undefined);
             }
-            export function isPrimitive(val: any): val is string | number | boolean | undefined | null {
+            export type primitive = symbol | string | number | boolean | undefined | null;
+            export function isPrimitive(val: any): val is primitive {
                 return (val === null || val === undefined || typeof (val) === "string" ||
                     typeof (val) === "number" || typeof (val) === "boolean");
             }
                 return typeof (val) === "string" || val instanceof String;
             }
-            export function isPromise(val: any): val is PromiseLike<any> {
+            export function isPromise<T = any>(val: any): val is PromiseLike<T> {
                 return val && typeof val.then === "function";
             }
                 return val && typeof val.cancel === "function";
             }
-            export function isNullOrEmptyString(val: any): val is (string | null | undefined) {
+            export function isNullOrEmptyString(val: any): val is ("" | null | undefined) {
                 return (val === null || val === undefined ||
-                    ((typeof (val) === "string" || val instanceof String) && val.length === 0))
+                    ((typeof (val) === "string" || val instanceof String) && val.length === 0));
             }
-            export function isNotEmptyArray(arg: any): arg is Array<any> {
+            export function isNotEmptyArray<T = any>(arg: any): arg is T[] {
                 return (arg instanceof Array && arg.length > 0);
             }
              * @returns Результат вызова функции <c>cb</c>, либо <c>undefined</c>
              *          если достигнут конец массива.
              */
-            export function each<T>(obj: T, cb: (v: T[keyof T], k: keyof T) => void): void;
+            export function each<T>(obj: T, cb: <X extends keyof T>(v: NonNullable<T[X]>, k: X) => void): void;
+            export function each<T>(array: T[], cb: (v: T, i: number) => void): void;
             export function each(obj: any, cb: any, thisArg?: any): any;
             export function each(obj: any, cb: any, thisArg?: any) {
                 argumentNotNull(cb, "cb");
              *  own properties of the source are entirely copied to the destination.
              *
              */
-            export function mixin<T extends object, S extends object>(dest: T, source: S, template?: string[] | object): T & S {
+            export function mixin<T extends object, S extends object>(dest: T, source: S, template?: keyof S[]): T & S;
-                argumentNotNull(dest, "to");
+            export function mixin<T extends object, S extends object, R extends object = T>(dest: T, source: S, template: { [p in keyof S]?: keyof R; }): T & R;
-                const _res = dest as T & S;
+            export function mixin<T extends object, S extends object>(dest: T, source: S, template?: any): any {
+                argumentNotNull(dest, "dest");
+                const _res: any = dest as any;
                 if (isPrimitive(source))
                     return _res;
                 if (template instanceof Array) {
-                    for (const p of template) {
+                    template.forEach(p => {
-                        if (p in source)
+                        if (isKeyof(p, source))
                             _res[p] = source[p];
+                    });
                 } else if (template) {
-                    const _keys = Object.keys(source);
+                    keys(source).forEach(p => {
-                    for (const p of _keys) {
+                        if (isKeyof(p, template))
-                        if (p in template)
                             _res[template[p]] = source[p];
+                    });
                 } else {
-                    const keys = Object.keys(source);
+                    keys(source).forEach(p => _res[p] = source[p]);
-                    for (const p of keys)
-                        _res[p] = source[p];
                 }
                 return _res;
              * @param{Object} thisArg [Optional] Object which will be passed as 'this' to the function.
              * @param{Function|String} fn [Required] Function wich will be wrapped.
              */
-            export function async(_fn: (...args: any[]) => any, thisArg: any): (...args: any[]) => PromiseLike<any> {
+            export function async<T, F extends (...args: any[]) => T | PromiseLike<T>>(
+                fn: F,
+                thisArg?: ThisParameterType<F>
+            ): (...args: Parameters<F>) => PromiseLike<T>;
+            export function async<T, M extends string, O extends { [m in M]?: (...args: any[]) => T | PromiseLike<T> }>(
+                fn: M,
+                thisArg: O
+            ): (...args: Parameters<NonNullable<O[M]>>) => PromiseLike<T>;
+            export function async(_fn: any, thisArg: any): (...args: any[]) => PromiseLike<any> {
                 let fn = _fn;
                 if (arguments.length === 2 && !(fn instanceof Function))
                 if (fn == null)
                     throw new Error("The function must be specified");
-                function wrapresult(x, e?): PromiseLike<any> {
+                function wrapresult(x: any, e?: any): PromiseLike<any> {
                     if (e) {
                         return {
                             then(cb, eb) {
                 };
             }
-            type _AnyFn = (...args) => any;
+            export function delegate<T extends object, F extends (this: T, ...args: any[]) => any>(
+                target: T,
-            export function delegate<T, K extends keyof T>(target: T, _method: (K | _AnyFn)) {
+                method: F
-                let method;
+            ): OmitThisParameter<F>;
+            export function delegate<M extends string, T extends { [m in M]?: (...args: any[]) => any; }>(
+                target: T,
+                method: M
+            ): OmitThisParameter<T[M]>;
+            export function delegate(target: any, _method: any): (...args: any[]) => any {
+                let method: any;
                 if (!(_method instanceof Function)) {
                     argumentNotNull(target, "target");
                     method = target[_method];
                 });
             }
+            /** Returns resolved promise, awaiting this method will cause the asynchronous
+             * completion of the rest of the code.
+             */
+            export function fork() {
+                return Promise.resolve();
+            }
+            /** Always throws Error, can be used as a stub for the methods which should be
+             * assigned later and are required to be not null.
+             */
+            export function notImplemented(): never {
+                throw new Error("Not implemeted");
+            }
             /**
              * Iterates over the specified array of items and calls the callback `cb`, if
              * the result of the callback is a promise the next item from the array will be
             export function first<T>(sequence: PromiseLike<ArrayLike<T>>): PromiseLike<T>;
             export function first<T>(
                 sequence: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
-                cb: (x: T) => void,
+                cb?: (x: T) => void,
                 err?: (x: Error) => void
             ): void;
             /**
                 err?: (x: Error) => void
             ) {
                 if (isPromise(sequence)) {
-                    return sequence.then(res => first(res, cb, err));
+                    return sequence.then(res => first(res, cb as any /* force to pass undefined cb */, err));
                 } else if (sequence && "length" in sequence) {
                     if (sequence.length === 0) {
                         if (err)
                 err?: (x: Error) => any
             ) {
                 if (isPromise(sequence)) {
-                    return sequence.then(res => firstWhere(res, predicate, cb, err));
+                    return sequence.then(res => firstWhere(
+                        res,
+                        predicate as any /* force to pass undefined predicate */,
+                        cb as any /* force to pass undefined cb */,
+                        err)
+                    );
                 } else if (sequence && "length" in sequence) {
                     if (sequence.length === 0) {
                         if (err)

src/main/ts/text/Converter.ts +2 -2

             export class Converter {
                 static readonly default = new Converter();
-                convert(value: any, pattern: string) {
+                convert(value: any, pattern?: string) {
                     if (pattern && pattern.toLocaleLowerCase() === "json") {
-                        const seen = [];
+                        const seen: any[] = [];
                         return JSON.stringify(value, (k, v) => {
                             if (!isPrimitive(v)) {
                                 const id = seen.indexOf(v);

src/main/ts/text/FormatCompiler.ts +20 -12

             export class FormatCompiler {
                 _scanner: FormatScanner;
-                _cache: MapOf<CompiledPattern> = {};
+                static _cache: MapOf<CompiledPattern> = {};
-                _parts: Array<string | { name: string; format: string; }>;
+                _parts: Array<string | { name: string; format?: string; }>;
-                compile(pattern: string) {
+                constructor(scanner: FormatScanner) {
-                    let compiledPattern = this._cache && this._cache[pattern];
+                    this._scanner = scanner;
-                    if (!compiledPattern) {
-                        this._scanner = new FormatScanner(pattern);
                     this._parts = [];
+                }
+                compile() {
                     this.visitText();
                     const parts = this._parts;
-                        compiledPattern = (writer: TextWriter, args: any) => {
+                    return (writer: TextWriter, args: any) => {
                         parts.forEach(x => {
                             if (isPrimitive(x))
                                 writer.writeValue(x);
                                 writer.writeValue(get(x.name, args), x.format);
                         });
                     };
-                        if (this._cache)
+                static compile(pattern: string) {
+                    let compiledPattern = this._cache && this._cache[pattern];
+                    if (!compiledPattern) {
+                        const compiler = new this(new FormatScanner(pattern));
+                        compiledPattern = compiler.compile();
                         this._cache[pattern] = compiledPattern;
                     }
                     return compiledPattern;
                         this.dieUnexpectedToken("TEXT");
                     const fieldName = this._scanner.getTokenValue();
-                    const filedFormat = this.readColon() ? this.readFieldFormat() : null;
+                    const filedFormat = this.readColon() ? this.readFieldFormat() : undefined;
                     if (this._scanner.getTokenType() !== TokeType.CurlClose)
                         this.dieUnexpectedToken("}");
                     return true;
                 }
-                pushSubst(fieldName: string, filedFormat: string) {
+                pushSubst(fieldName: string, filedFormat?: string) {
                     // console.log("pushSubst ", fieldName, filedFormat);
                     this._parts.push({ name: fieldName, format: filedFormat });
                 }
                     this._parts.push(text);
                 }
-                dieUnexpectedToken(expected?: string) {
+                dieUnexpectedToken(expected?: string): never {
                     throw new Error(isNullOrEmptyString(expected) ?
                         `Unexpected token ${this._scanner.getTokenValue()}` :
                         `Unexpected token ${this._scanner.getTokenValue()}, expected ${expected}`
                     );
                 }
-                dieUnexpectedEnd(expected?: string) {
+                dieUnexpectedEnd(expected?: string): never {
                     throw new Error(isNullOrEmptyString(expected) ? "Unexpected end of the string" : `Unexpected end of the string, expected ${expected}`);
                 }
             }

src/main/ts/text/FormatScanner.ts +10 -2

             export class FormatScanner {
                 private _text: string;
-                private _tokenType: TokeType;
+                private _tokenType: TokeType | undefined;
-                private _tokenValue: string;
+                private _tokenValue: string | undefined;
                 private _rx = /[^{}:]+|(.)/g;
                 constructor(text: string) {
                         return false;
                     const match = this._rx.exec(this._text);
+                    if (match === null)
+                        return false;
                     this._tokenType = typeMap[match[1]] || TokeType.Text;
                     this._tokenValue = match[0];
                 }
                 getTokenValue() {
+                    if (this._tokenValue === undefined)
+                        throw new Error("The scanner is before the first element");
                     return this._tokenValue;
                 }
                 getTokenType() {
+                    if (this._tokenType === undefined)
+                        throw new Error("The scanner is before the first element");
                     return this._tokenType;
                 }
             }

src/main/ts/text/StringBuilder.ts +1 -1

             export function format(format: string, ...args: any): string;
             export function format() {
                 sb.clear();
-                sb.write.apply(sb, arguments);
+                sb.write.apply<StringBuilder, any, void>(sb, arguments);
                 return sb.toString();
             }

src/main/ts/text/StringFormat.ts +15 -14

-            import { isPrimitive, isNull, each } from "../safe";
+            import { isPrimitive, isNull, each, isKeyof, get } from "../safe";
             import { MapOf } from "../interfaces";
             type SubstFn = (name: string, format?: string) => string;
-            type TemplateFn = (subst: SubstFn) => string;
+            type TemplateFn = (subst: SubstFn) => string | undefined;
             type ConvertFn = (value: any, format?: string) => string;
             const map = {
             function encode(s: string) {
                 if (!s)
                     return s;
-                return s.replace(/\\{|\\}|&|\\:|\n/g, m => map[m] || m);
+                return s.replace(/\\{|\\}|&|\\:|\n/g, m => isKeyof(m, map) ? map[m] : m);
             }
             function decode(s: string) {
                 if (!s)
                     return s;
-                return s.replace(/&(\w+);/g, (m, $1) => rev[$1] || m);
+                return s.replace(/&(\w+);/g, (m, $1) => isKeyof($1, rev) ? rev[$1] : m);
             }
             function subst(s: string) {
                 const i = s.indexOf(":");
                 let name: string;
-                let pattern: string;
+                let pattern: string | undefined;
                 if (i >= 0) {
                     name = s.substr(0, i);
                     pattern = s.substr(i + 1);
                 if (pattern)
                     return [
                         espaceString(decode(name)),
-                        espaceString(decode(pattern))];
+                        espaceString(decode(pattern))
+                    ];
                 else
                     return [espaceString(decode(name))];
             }
                 return compiled;
             }
-            function defaultConverter(value: any, pattern: string) {
+            function defaultConverter(value: any, pattern?: string) {
                 if (pattern && pattern.toLocaleLowerCase() === "json") {
-                    const seen = [];
+                    const seen: any = [];
                     return JSON.stringify(value, (k, v) => {
                         if (!isPrimitive(v)) {
                             const id = seen.indexOf(v);
                                 return "@ref-" + id;
                             else {
                                 seen.push(v);
-                                return v;
+                                return v.toString() as string;
                             }
                         } else {
-                            return v;
+                            return isNull(v) ? "" : v.toString();
                         }
                     }, 2);
                 } else if (isNull(value)) {
                 } else if (value instanceof Date) {
                     return value.toISOString();
                 } else {
-                    return value.toString();
+                    return value.toString() as string;
                 }
             }
                     this._converters.push(defaultConverter);
                 }
-                convert(value: any, pattern: string) {
+                convert(value: any, pattern?: string) {
                     for (const c of this._converters) {
                         const res = c(value, pattern);
                         if (!isNull(res))
                     const template = compile(msg);
                     return template((name, pattern) => {
-                        const value = args[name];
+                        const value = get(name, args);
                         return !isNull(value) ? this.convert(value, pattern) : "";
                     });
                     const template = compile(msg);
                     return (...args: any[]) => {
                         return template((name, pattern) => {
-                            const value = args[name];
+                            const value = get(name, args);
                             return !isNull(value) ? this.convert(value, pattern) : "";
                         });
                     };

src/main/ts/text/TextWriterBase.ts +4 -6

             import { isString, argumentNotNull } from "../safe";
             import { Converter } from "./Converter";
-            const compiler = new FormatCompiler();
             export abstract class TextWriterBase implements TextWriter {
                 private _converter: Converter;
                 write(format: string, ...args: any[]): void;
                 write(format: any, ...args: any[]): void {
                     if (args.length) {
-                        const compiled = compiler.compile(format);
+                        const compiled = FormatCompiler.compile(format);
                         compiled(this, args);
                     } else {
                         this.writeValue(format);
                 writeLine(format: string, ...args: any[]): void;
                 writeLine(): void {
                     if (arguments.length)
-                        this.write.apply(this, arguments);
+                        this.write.apply<this, any, void>(this, arguments);
                     this.writeNewLine();
                 }
-                writeValue(value: any, spec?: string): void {
+                writeValue(value: any, spec?: string) {
                     this.writeText(
                         isString(value) ?
                             value :
                     );
                 }
-                abstract writeText(text: string);
+                abstract writeText(text: string): void;
             }

src/test/ts/mock/Bar.ts +11 -11

             import { Foo } from "./Foo";
-            import { config } from "./config";
+            // import { config } from "./config";
-            const service = config.build("bar");
+            // const service = config.build("bar");
-            @service.consume({
+            // @service.consume({
-                f: config.dependency("foo"),
+            //     f: config.dependency("foo"),
-                nested: {
+            //     nested: {
-                    lazy: config.lazy("foo")
+            //         lazy: config.lazy("foo")
+            //     }
-            })
+            // })
             export class Bar {
                 barName = "bar";
                 _v: Foo | undefined;
                 constructor(_opts: {
-                    f: Foo;
+                    foo: Foo;
                     nested: {
                         lazy: () => Foo
                     }
                 }) {
-                    if (_opts && _opts.f)
+                    if (_opts && _opts.foo)
-                        this._v = _opts.f;
+                        this._v = _opts.foo;
                 }
                 getFoo() {

src/test/ts/mock/Box.ts +8 -8

-            import { services } from "../di/Annotations";
+            // import { services } from "../di/Annotations";
-            import { Bar } from "./Bar";
+            // import { Bar } from "./Bar";
             // declare required dependencies
-            const config = services<{
+            // const config = services<{
-                bar: Bar;
+            //     bar: Bar;
-            }>();
+            // }>();
             // export service descriptor
-            export const service = config.build<Box<Bar>>();
+            // export const service = config.build<Box<Bar>>();
-            @service.consume(config.dependency("bar"))
+            // @service.consume(config.dependency("bar"))
             export class Box<T> {
                 private _value: T | undefined;
                     this._value = value;
                 }
-                @service.inject("bar")
+                // @service.inject("bar")
                 setValue(value: T) {
                     this._value = value;
                 }

src/test/ts/mock/MockActivationController.ts +7 -1

             export class MockActivationController implements IActivationController {
-                _active: IActivatable = null;
+                _active: IActivatable | null = null;
+                hasActive() {
+                    return !!this._active;
+                }
                 getActive(): IActivatable {
+                    if (!this._active)
+                        throw new Error("No active component is set");
                     return this._active;
                 }

src/test/ts/mock/config.ts 0 -4

                 timeout: Number
             };
-            declare const bc: typeof Box;
-            const x = new bc();
             export declare const config: ConfigBuilder<ContainerServices>;

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

                 const c = new MockActivationController();
                 t.false(a.isActive(), "the component is not active by default");
-                t.assert(c.getActive() == null, "the activation controller doesn't have an active component by default");
+                t.false(c.hasActive(), "the activation controller doesn't have an active component by default");
-                t.assert(a.getActivationController() == null, "the component doesn't have an activation controller by default");
+                try {
+                    c.getActive();
+                    t.fail("Should fail when no active component is set");
+                } catch (e) {
+                }
+                t.false(a.hasActivationController(), "the component doesn't have an activation controller by default");
+                try {
+                    a.getActivationController();
+                    t.fail("Should fail when no activation controller is set");
+                } catch (e) {
+                }
                 t.comment("Active the component through the controller");
                 await c.activate(a);
                 await c.deactivate();
                 t.false(a.isActive(), "The component should successfully deactivate");
-                t.equal(c.getActive(), null, "The controller shouldn't point to any component");
+                t.false(c.hasActive(), "The controller shouldn't point to any component");
                 t.equal(a.getActivationController(), c, "The componet should point to it's controller");
             });

src/test/ts/tests/CancellationTests.ts +2 -2

             import { Cancellation } from "../Cancellation";
-            import { delay } from "../safe";
+            import { delay, notImplemented } from "../safe";
             import { test } from "./TestTraits";
             test("standalone cancellation", async t => {
-                let doCancel: (e) => void;
+                let doCancel: (e: any) => void = notImplemented;
                 const ct = new Cancellation(cancel => {
                     doCancel = cancel;

src/test/ts/tests/ContainerTests.ts +2 -1

             import { Foo } from "../mock/Foo";
             import { Bar } from "../mock/Bar";
             import { isNull } from "../safe";
+            import { Descriptor } from "../di/interfaces";
             test("Container register/resolve tests", async t => {
                 const container = new Container();
                 const connection1 = "db://localhost";
                 t.throws(
-                    () => container.register("bla-bla", "bla-bla"),
+                    () => container.register("bla-bla", "bla-bla" as any),
                     "Do not allow to register anything other than descriptors"
                 );

src/test/ts/tests/ObservableTests.ts +11 -6

             import { TraceSource } from "../log/TraceSource";
             import { Observable } from "../Observable";
             import { IObservable } from "../interfaces";
-            import { delay } from "../safe";
+            import { delay, fork } from "../safe";
             import { test } from "./TestTraits";
             const trace = TraceSource.get("ObservableTests");
             test("events sequence example", async t => {
-                let events: IObservable<number>;
+                let events: IObservable<number> | undefined;
                 const done = new Promise<void>(resolve => {
                     events = new Observable<number>(async (notify, fail, finish) => {
                         for (let i = 0; i < 10; i++) {
-                            await delay(0);
+                            await fork();
                             notify(i);
                         }
                         finish();
                 let count = 0;
                 let complete = false;
-                events.on(x => count = count + x, null, () => complete = true);
+                if (!events)
+                    throw new Error("events === undefined");
+                events.on(x => count = count + x, undefined, () => complete = true);
                 const first = await events.next();
             });
             test("event sequence termination", async t => {
-                let events: IObservable<number>;
+                let events: IObservable<number> | undefined;
                 const done = new Promise<void>(resolve => {
                     events = new Observable<number>(async (notify, fail, complete) => {
-                        await delay(0);
+                        await fork();
                         notify(1);
                         complete();
                         notify(2);
                     });
                 });
+                if (!events)
+                    throw new Error("events === undefined");
                 let count = 0;
                 events.on(() => {}, e => count++, () => count++);

src/test/ts/tests/SafeTests.ts +6 -6

             import { Cancellation } from "../Cancellation";
-            import { first, isPromise, firstWhere, delay, nowait } from "../safe";
+            import { first, isPromise, firstWhere, delay, nowait, notImplemented } from "../safe";
             import { test } from "./TestTraits";
             test("await delay test", async t => {
                 t.pass("await delay");
                 // create cancellation token
-                let cancel: (e?: any) => void;
+                let cancel: (e?: any) => void = notImplemented;
                 const ct = new Cancellation(c => cancel = c);
                 // schedule delay
             test("sequemce test", async t => {
                 const sequence = ["a", "b", "c"];
-                const empty = [];
+                const empty: string[] = [];
                 // synchronous tests
                 t.equals(first(sequence), "a", "Should return the first element");
                 t.equals(firstWhere(sequence, x => x === "b"), "b", "Should get the second element");
-                let v: string;
+                let v: string | undefined;
-                let e: Error;
+                let e: Error | undefined;
                 first(sequence, x => v = x);
                 t.equal(v, "a", "The callback should be called for the first element");
                 firstWhere(sequence, x => x === "b", x => v = x);
                     firstWhere(sequence, x => x === "z", x => v = x);
                 }, "Should throw when the element isn't found");
-                first(empty, null, x => e = x);
+                first(empty, undefined, x => e = x);
                 t.true(e, "The errorback should be called for the empty sequence");
                 // async tests

src/test/ts/tests/TestTraits.ts +4 -1

                 private readonly _tape: tape.Test;
                 private readonly _subscriptions = new Array<IDestroyable>();
-                private _destroyed;
+                private _destroyed = false;
                 constructor(t: tape.Test) {
                     argumentNotNull(t, "tape");
                 }
                 destroy() {
+                    if (this._destroyed)
+                        return;
+                    this._destroyed = true;
                     this._subscriptions.forEach(destroy);
                 }
             }

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