implab/implabjs-core Commit - r154:8e623248bc9d

minor fixed, improved typings

cin -

r154:8e623248bc9d v1.4.0-rc12 default

parent child

Context file:

r154:8e623248bc9d

Collapse all files

src/main/ts/di/Container.ts +6 -3

             import { ActivationContext } from "./ActivationContext";
             import { ValueDescriptor } from "./ValueDescriptor";
             import { ActivationError } from "./ActivationError";
             import { ServiceMap, Descriptor, PartialServiceMap, ContainerServiceMap, ContainerKeys, TypeOfService, ServiceContainer } from "./interfaces";
             import { TraceSource } from "../log/TraceSource";
             import { Configuration, RegistrationMap } from "./Configuration";
             import { Cancellation } from "../Cancellation";
             import { ICancellation } from "../interfaces";
             import { isDescriptor } from "./traits";
             import { LifetimeManager } from "./LifetimeManager";
             import { each, isString } from "../safe";
             import { ContainerConfiguration, FluentRegistrations } from "./fluent/interfaces";
             import { FluentConfiguration } from "./fluent/FluentConfiguration";
             const trace = TraceSource.get("@implab/core/di/ActivationContext");
             export class Container<S extends object = any> implements ServiceContainer<S> {
                 readonly _services: ContainerServiceMap<S>;
                 readonly _lifetimeManager: LifetimeManager;
                 readonly _cleanup: (() => void)[];
                 readonly _root: Container<S>;
                 readonly _parent?: Container<S>;
                 _disposed: boolean;
                 constructor(parent?: Container<S>) {
                     this._parent = parent;
                     this._services = Object.create(parent ? parent._services : null);
                     this._cleanup = [];
                     this._root = parent ? parent.getRootContainer() : this;
                     this._services.container = new ValueDescriptor(this) as any;
                     this._services.childContainer = { activate: () => this.createChildContainer() };
                     this._disposed = false;
                     this._lifetimeManager = new LifetimeManager();
                 }
                 getRootContainer() {
                     return this._root;
                 }
                 getParent() {
                     return this._parent;
                 }
                 getLifetimeManager() {
                     return this._lifetimeManager;
                 }
-                resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K> {
+                resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K>;
+                resolve<K extends ContainerKeys<S>>(name: K, def: undefined): TypeOfService<S, K> | undefined;
+                resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K> | undefined {
                     trace.debug("resolve {0}", name);
                     const d = this._services[name];
                     if (d === undefined) {
-                        if (def !== undefined)
+                        if (arguments.length > 1)
                             return def;
                         else
                             throw new Error("Service '" + name + "' isn't found");
                     } else {
                         const context = new ActivationContext<S>(this, this._services, String(name), d);
                         try {
                             return d.activate(context);
                         } catch (error) {
                             throw new ActivationError(name.toString(), context.getStack(), error);
                         }
                     }
                 }
                 /**
                  * @deprecated use resolve() method
                  */
                 getService<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>) {
-                    return this.resolve(name, def);
+                    return arguments.length === 1 ? this.resolve(name) : 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>;
                         each(data, (v, k) => this.register(k, v));
                     } else {
                         if (!isDescriptor(service))
                             throw new Error("The service parameter must be a descriptor");
                         this._services[nameOrCollection as K] = service as any;
                     }
                     return this;
                 }
                 /** @deprecated use getLifetimeManager() */
                 onDispose(callback: () => void) {
                     if (!(callback instanceof Function))
                         throw new Error("The callback must be a function");
                     this._cleanup.push(callback);
                 }
                 destroy() {
                     return this.dispose();
                 }
                 dispose() {
                     if (this._disposed)
                         return;
                     this._disposed = true;
                     for (const f of this._cleanup)
                         f();
+                    this._lifetimeManager.destroy();
                 }
                 /**
                  * @param{String|Object} config
                  *  The configuration of the container. 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 registered in the container.
                  *
                  * @param{Function} opts.contextRequire
                  *  The function which will be used to load a configuration or types for services.
                  *
                  */
                 async configure(config: string | RegistrationMap<S>, opts?: { contextRequire: any; baseModule?: string }, ct = Cancellation.none) {
                     const _opts = Object.create(opts || null);
                     if (typeof (config) === "string") {
                         _opts.baseModule = config;
                         const module = await import(config);
                         if (module && module.default && typeof (module.default.apply) === "function")
                             return module.default.apply(this);
                         else
                             return this._applyLegacyConfig(module, _opts, ct);
                     } else {
                         return this._applyLegacyConfig(config, _opts, ct);
                     }
                 }
                 applyConfig<S2 extends object>(config: Promise<{ default: ContainerConfiguration<S2>; }>, ct?: ICancellation): Promise<ServiceContainer<S & S2>>;
                 applyConfig<S2 extends object, P extends string>(config: Promise<{ [p in P]: ContainerConfiguration<S2>; }>, prop: P, ct?: ICancellation): Promise<ServiceContainer<S & S2>>;
                 async applyConfig<S2 extends object, P extends string>(
                     config: Promise<{ [p in P | "default"]: ContainerConfiguration<S2>; }>,
                     propOrCt?: P | ICancellation,
                     ct?: ICancellation
                 ): Promise<ServiceContainer<S & S2>> {
                     const mod = await config;
                     let _ct: ICancellation;
                     let _prop: P | "default";
                     if (isString(propOrCt)) {
                         _prop = propOrCt;
                         _ct = ct || Cancellation.none;
                     } else {
                         _ct = propOrCt || Cancellation.none;
                         _prop = "default";
                     }
                     return mod[_prop].apply(this, _ct);
                 }
                 async _applyLegacyConfig(config: RegistrationMap<S>, opts: { contextRequire: any; baseModule?: string }, ct = Cancellation.none) {
                     return new Configuration<S>(this).applyConfiguration(config, opts);
                 }
                 async fluent<K extends keyof S>(config: FluentRegistrations<K, S>, ct = Cancellation.none): Promise<this> {
                     await new FluentConfiguration<S>().register(config).apply(this, ct);
                     return this;
                 }
                 createChildContainer<S2 extends object = S>(): Container<S & S2> {
                     return new Container<S & S2>(this as any);
                 }
             }

src/main/ts/di/LifetimeManager.ts +3 -1

             import { IDestroyable, MapOf } from "../interfaces";
-            import { argumentNotNull, isDestroyable, argumentNotEmptyString } from "../safe";
+            import { argumentNotNull, isDestroyable, argumentNotEmptyString, isRemovable } from "../safe";
             import { ILifetime, ServiceContainer } from "./interfaces";
             import { ActivationContext } from "./ActivationContext";
             function safeCall(item: () => void) {
                 try {
                     item();
                 } catch {
                     // silence!
                 }
             }
             const emptyLifetime: ILifetime = Object.freeze({
                 has() {
                     return false;
                 },
                 initialize() {
                 },
                 get() {
                     throw new Error("The specified item isn't registered with this lifetime manager");
                 },
                 store() {
                     // does nothing
                 }
             });
             const unknownLifetime: ILifetime = Object.freeze({
                 has() {
                     return false;
                 },
                 initialize() {
                     throw new Error("Can't call initialize on the unknown lifetime object");
                 },
                 get() {
                     throw new Error("The lifetime object isn't initialized");
                 },
                 store() {
                     throw new Error("Can't store a value in the unknown lifetime object");
                 }
             });
             let nextId = 0;
             const singletons: any = {};
             export class LifetimeManager implements IDestroyable {
                 private _cleanup: (() => void)[] = [];
                 private _cache: MapOf<any> = {};
                 private _destroyed = false;
                 private _pending: MapOf<boolean> = {};
                 create(): ILifetime {
                     const self = this;
                     const id = ++nextId;
                     return {
                         has() {
                             return (id in self._cache);
                         },
                         get() {
                             const t = self._cache[id];
                             if (t === undefined)
                                 throw new Error(`The item with with the key ${id} isn't found`);
                             return t;
                         },
                         initialize() {
                             if (self._pending[id])
                                 throw Error(`Cyclic reference detected: the item with the key ${id} is already activating.`);
                             self._pending[id] = true;
                         },
                         store(item: any, cleanup?: (item: any) => void) {
                             argumentNotNull(id, "id");
                             argumentNotNull(item, "item");
                             if (this.has())
                                 throw new Error(`The item with with the key ${id} already registered with this lifetime manager`);
                             delete self._pending[id];
                             self._cache[id] = item;
                             if (self._destroyed)
                                 throw new Error("Lifetime manager is destroyed");
                             if (cleanup) {
                                 self._cleanup.push(() => cleanup(item));
                             } else if (isDestroyable(item)) {
                                 self._cleanup.push(() => item.destroy());
+                            } else if (isRemovable(item)) {
+                                self._cleanup.push(() => item.remove());
                             }
                         }
                     };
                 }
                 destroy() {
                     if (!this._destroyed) {
                         this._destroyed = true;
                         this._cleanup.forEach(safeCall);
                         this._cleanup.length = 0;
                     }
                 }
                 static empty(): ILifetime {
                     return emptyLifetime;
                 }
                 static hierarchyLifetime(): ILifetime {
                     let _lifetime = unknownLifetime;
                     return {
                         initialize(context: ActivationContext<any>) {
                             if (_lifetime !== unknownLifetime)
                                 throw new Error("Cyclic reference activation detected");
                             _lifetime = context.getContainer().getLifetimeManager().create();
                         },
                         get() {
                             return _lifetime.get();
                         },
                         has() {
                             return _lifetime.has();
                         },
                         store(item: any, cleanup?: (item: any) => void) {
                             return _lifetime.store(item, cleanup);
                         }
                     };
                 }
                 static contextLifetime(): ILifetime {
                     let _lifetime = unknownLifetime;
                     return {
                         initialize(context: ActivationContext<any>) {
                             if (_lifetime !== unknownLifetime)
                                 throw new Error("Cyclic reference detected");
                             _lifetime = context.createLifetime();
                         },
                         get() {
                             return _lifetime.get();
                         },
                         has() {
                             return _lifetime.has();
                         },
                         store(item: any) {
                             _lifetime.store(item);
                         }
                     };
                 }
                 static singletonLifetime(typeId: string): ILifetime {
                     argumentNotEmptyString(typeId, "typeId");
                     let pending = false;
                     return {
                         has() {
                             return typeId in singletons;
                         },
                         get() {
                             if (!this.has())
                                 throw new Error(`The instance ${typeId} doesn't exists`);
                             return singletons[typeId];
                         },
                         initialize() {
                             if (pending)
                                 throw new Error("Cyclic reference detected");
                             pending = true;
                         },
                         store(item: any) {
                             singletons[typeId] = item;
                             pending = false;
                         }
                     };
                 }
                 static containerLifetime(container: ServiceContainer<any>) {
                     let _lifetime = unknownLifetime;
                     return {
                         initialize(context: ActivationContext<any>) {
                             if (_lifetime !== unknownLifetime)
                                 throw new Error("Cyclic reference detected");
                             _lifetime = container.getLifetimeManager().create();
                         },
                         get() {
                             return _lifetime.get();
                         },
                         has() {
                             return _lifetime.has();
                         },
                         store(item: any) {
                             _lifetime.store(item);
                         }
                     };
                 }
             }

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

             import { IDestroyable } from "../interfaces";
             import { ActivationContext } from "./ActivationContext";
             import { LifetimeManager } from "./LifetimeManager";
             export interface Descriptor<S extends object = any, T = any> {
                 activate(context: ActivationContext<S>): T;
             }
             export type ServiceMap<S extends object> = {
                 [k in keyof S]: Descriptor<S, S[k]>;
             };
             export type ContainerKeys<S extends object> = keyof S | keyof ContainerProvided<S>;
             export type TypeOfService<S extends object, K> =
                 K extends keyof ContainerProvided<S> ? ContainerProvided<S>[K] :
                 K extends keyof S ? S[K] : never;
             export type ContainerServiceMap<S extends object> = {
                 [K in ContainerKeys<S>]: Descriptor<S, TypeOfService<S, K>>;
             };
             export type PartialServiceMap<S extends object> = {
                 [k in keyof S]?: Descriptor<S, S[k]>;
             };
             export interface ServiceLocator<S extends object> {
                 resolve<K extends ContainerKeys<S>>(name: K, def?: TypeOfService<S, K>): TypeOfService<S, K>;
+                resolve<K extends ContainerKeys<S>>(name: K, def?: undefined): TypeOfService<S, K> | undefined;
             }
             export interface ServiceContainer<S extends object> extends ServiceLocator<S>, IDestroyable {
                 getLifetimeManager(): LifetimeManager;
                 register<K extends keyof S>(name: K, service: Descriptor<S, S[K]>): this;
                 register(services: PartialServiceMap<S>): this;
                 createChildContainer(): ServiceContainer<S>;
             }
             export interface ContainerProvided<S extends object> {
                 container: ServiceLocator<S>;
                 childContainer: ServiceContainer<S>;
             }
             export type ContainerRegistered<S extends object> = /*{
                 [K in Exclude<keyof S, keyof ContainerProvided<S>>]: S[K];
             };*/
                 Exclude<S, ContainerProvided<S>>;
             export type ActivationType = "singleton" | "container" | "hierarchy" | "context" | "call";
             /**
              * Интерфейс для управления жизнью экземпляра объекта. Каждая регистрация имеет
              * свой собственный объект `ILifetime`, который создается при первой активации
              */
             export interface ILifetime {
                 /** Проверяет, что уже создан экземпляр объекта */
                 has(): boolean;
                 get(): any;
                 initialize(context: ActivationContext<any>): void;
                 store(item: any, cleanup?: (item: any) => void): void;
             }

src/main/ts/safe.ts +15 -13

-            import { ICancellable, Constructor, IDestroyable, ICancellation } from "./interfaces";
+            import { ICancellable, Constructor, IDestroyable, ICancellation, IRemovable } from "./interfaces";
             let _nextOid = 0;
             const _oid = typeof Symbol === "function" ?
                 Symbol("__implab__oid__") :
                 "__implab__oid__";
             export function oid(instance: null | undefined): undefined;
             export function oid(instance: NonNullable<any>): string;
             export function oid(instance: any): string | undefined {
                 if (isNull(instance))
                     return undefined;
                 if (_oid in instance)
                     return instance[_oid];
                 else
                     return (instance[_oid] = "oid_" + (++_nextOid));
             }
             const cancellationNone: ICancellation = {
                 isSupported(): boolean {
                     return false;
                 },
                 throwIfRequested(): void {
                 },
                 isRequested(): boolean {
                     return false;
                 },
                 register(_cb: (e: any) => void): IDestroyable {
                     return destroyed;
                 }
             };
             export function keys<T>(arg: T): (Extract<keyof T, string>)[] {
                 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");
             }
             export function argumentNotEmptyString(arg: any, name: string) {
                 if (typeof (arg) !== "string" || !arg.length)
                     throw new Error("The argument '" + name + "' must be a not empty string");
             }
             export function argumentNotEmptyArray(arg: any, name: string) {
                 if (!(arg instanceof Array) || !arg.length)
                     throw new Error("The argument '" + name + "' must be a not empty array");
             }
             export function argumentOfType(arg: any, type: Constructor<{}>, name: string) {
                 if (!(arg instanceof type))
                     throw new Error("The argument '" + name + "' type doesn't match");
             }
-            export function isObject(val: any): val is object {
-                return typeof val === "object";
             export function isNull(val: any): val is null | undefined {
                 return (val === null || val === undefined);
             }
             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");
             }
+            export function isObject<T>(value: T): value is Exclude<T & object, primitive> {
+                return !!(value && typeof value === "object");
+            }
             export function isInteger(val: any): val is number {
                 return parseInt(val, 10) === val;
             }
             export function isNumber(val: any): val is number {
                 return parseFloat(val) === val;
             }
             export function isString(val: any): val is string {
-                return typeof (val) === "string" || val instanceof String;
+                return typeof (val) === "string";
             }
             export function isPromise<T = any>(val: any): val is PromiseLike<T> {
-                return val && typeof val.then === "function";
+                return !!(val && typeof val.then === "function");
             }
             export function isCancellable(val: any): val is ICancellable {
-                return val && typeof val.cancel === "function";
+                return !!(val && typeof val.cancel === "function");
             }
             export function isNullOrEmptyString(val: any): val is ("" | null | undefined) {
                 return (val === null || val === undefined ||
                     ((typeof (val) === "string" || val instanceof String) && val.length === 0));
             }
             export function isNotEmptyArray<T = any>(arg: any): arg is T[] {
                 return (arg instanceof Array && arg.length > 0);
             }
             function _isStrictMode(this: any) {
                 return !this;
             }
             function _getNonStrictGlobal(this: any) {
                 return this;
             }
             export function getGlobal() {
                 // in es3 we can't use indirect call to eval, since it will
                 // be executed in the current call context.
                 if (!_isStrictMode()) {
                     return _getNonStrictGlobal();
                 } else {
                     // tslint:disable-next-line:no-eval
                     return eval.call(null, "this");
                 }
             }
             export function get(member: string, context?: object) {
                 argumentNotEmptyString(member, "member");
                 let that = context || getGlobal();
                 const parts = member.split(".");
                 for (const m of parts) {
                     if (!m)
                         continue;
                     if (isNull(that = that[m]))
                         break;
                 }
                 return that;
             }
             /**
              * Выполняет метод для каждого элемента массива, останавливается, когда
              * либо достигнут конец массива, либо функция <c>cb</c> вернула
              * значение.
              *
              * @param {Array | Object} obj массив элементов для просмотра
              * @param {Function} cb функция, вызываемая для каждого элемента
              * @param {Object} thisArg значение, которое будет передано в качестве
              *                <c>this</c> в <c>cb</c>.
              * @returns {void}
              */
             export function each<T>(obj: T, cb: <X extends Extract<keyof T, string>>(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");
                 if (obj instanceof Array) {
                     let v: any;
                     for (let i = 0; i < obj.length; i++) {
                         v = obj[i];
                         if (v !== undefined)
                             cb.call(thisArg, v, i);
                     }
                 } else {
                     Object.keys(obj).forEach(k => obj[k] !== undefined && cb.call(thisArg, obj[k], k));
                 }
             }
             /** Copies property values from a source object to the destination and returns
              * the destination object.
              *
              * @param dest The destination object into which properties from the source
              *  object will be copied.
              * @param source The source of values which will be copied to the destination
              *  object.
              * @param template An optional parameter specifies which properties should be
              *  copied from the source and how to map them to the destination. If the
              *  template is an array it contains the list of property names to copy from the
              *  source to the destination. In case of object the templates contains the map
              *  where keys are property names in the source and the values are property
              *  names in the destination object. If the template isn't specified then the
              *  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?: (keyof S)[]): T & S;
             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;
             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) {
                     template.forEach(p => {
                         if (isKeyof(p, source))
                             _res[p] = source[p];
                     });
                 } else if (template) {
                     keys(source).forEach(p => {
                         if (isKeyof(p, template))
                             _res[template[p]] = source[p];
                     });
                 } else {
                     keys(source).forEach(p => _res[p] = source[p]);
                 }
                 return _res;
             }
             /** Wraps the specified function to emulate an asynchronous execution.
              * @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<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))
                     fn = thisArg[fn];
                 if (fn == null)
                     throw new Error("The function must be specified");
                 function wrapresult(x: any, e?: any): PromiseLike<any> {
                     if (e) {
                         return {
                             then(cb, eb) {
                                 try {
                                     return eb ? wrapresult(eb(e)) : this;
                                 } catch (e2) {
                                     return wrapresult(null, e2);
                                 }
                             }
                         };
                     } else {
                         if (x && x.then)
                             return x;
                         return {
                             then(cb) {
                                 try {
                                     return cb ? wrapresult(cb(x)) : this;
                                 } catch (e2) {
                                     return wrapresult(e2);
                                 }
                             }
                         };
                     }
                 }
                 return (...args) => {
                     try {
                         return wrapresult(fn.apply(thisArg, args));
                     } catch (e) {
                         return wrapresult(null, e);
                     }
                 };
             }
             export function delegate<T extends object, F extends (this: T, ...args: any[]) => any>(
                 target: T,
                 method: F
             ): 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];
                     if (!(method instanceof Function))
                         throw new Error("'method' argument must be a Function or a method name");
                 } else {
                     method = _method;
                 }
                 return (...args) => {
                     return method.apply(target, args);
                 };
             }
             export function delay(timeMs: number, ct = cancellationNone) {
                 ct.throwIfRequested();
                 return new Promise((resolve, reject) => {
                     const h = ct.register(e => {
                         clearTimeout(id);
                         reject(e);
                         // we don't nedd to unregister h, since ct is already disposed
                     });
                     const id = setTimeout(() => {
                         h.destroy();
                         resolve();
                     }, timeMs);
                 });
             }
             /** 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");
+                throw new Error("Not implemented");
             }
             /**
              * 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
              * proceeded after the promise is resolved.
              *
              */
             export function pmap<T, T2>(
                 items: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
                 cb: (item: T, i: number) => T2 | PromiseLike<T2>
             ): T2[] | PromiseLike<T2[]> {
                 argumentNotNull(cb, "cb");
                 if (isPromise(items)) {
                     return items.then(data => pmap(data, cb));
                 } else {
                     if (isNull(items) || !items.length)
                         return [];
                     let i = 0;
                     const result = new Array<T2>();
                     const next = (): any => {
                         while (i < items.length) {
                             const r = cb(items[i], i);
                             const ri = i;
                             i++;
                             if (isPromise(r)) {
                                 return r.then(x => {
                                     result[ri] = x;
                                     return next();
                                 });
                             } else {
                                 result[ri] = r;
                             }
                         }
                         return result;
                     };
                     return next();
                 }
             }
             export function pfor<T>(
                 items: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
                 cb: (item: T, i: number) => any
             ): void | PromiseLike<void> {
                 argumentNotNull(cb, "cb");
                 if (isPromise(items)) {
                     return items.then(data => pfor(data, cb));
                 } else {
                     if (isNull(items) || !items.length)
                         return;
                     let i = 0;
                     const next = (): any => {
                         while (i < items.length) {
                             const r = cb(items[i], i);
                             i++;
                             if (isPromise(r))
                                 return r.then(next);
                         }
                     };
                     return next();
                 }
             }
             export function first<T>(sequence: ArrayLike<T>): T;
             export function first<T>(sequence: PromiseLike<ArrayLike<T>>): PromiseLike<T>;
             export function first<T>(
                 sequence: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
                 cb?: (x: T) => void,
                 err?: (x: Error) => void
             ): void;
             /**
              * Выбирает первый элемент из последовательности, или обещания, если в
              * качестве параметра используется обещание, оно должно вернуть массив.
              *
              * @param {Function} cb обработчик результата, ему будет передан первый
              *                  элемент последовательности в случае успеха
              * @param {Function} err обработчик исключения, если массив пустой, либо
              *                  не массив
              *
              * @remarks Если не указаны ни cb ни err, тогда функция вернет либо
              *          обещание, либо первый элемент.
              * @async
              */
             export function first<T>(
                 sequence: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
                 cb?: (x: T) => void,
                 err?: (x: Error) => void
             ) {
                 if (isPromise(sequence)) {
                     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)
                             return err(new Error("The sequence is empty"));
                         else
                             throw new Error("The sequence is empty");
                     } else if (cb) {
                         return cb(sequence[0]);
                     } else {
                         return sequence[0];
                     }
                 } else {
                     if (err)
                         return err(new Error("The sequence is required"));
                     else
                         throw new Error("The sequence is required");
                 }
             }
             export function firstWhere<T>(
                 sequence: ArrayLike<T>,
                 predicate: (x: T) => boolean
             ): T;
             export function firstWhere<T>(
                 sequence: PromiseLike<ArrayLike<T>>,
                 predicate: (x: T) => boolean
             ): PromiseLike<T>;
             export function firstWhere<T>(
                 sequence: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
                 predicate: (x: T) => boolean,
                 cb: (x: T) => void,
                 err?: (x: Error) => void
             ): void;
             export function firstWhere<T>(
                 sequence: ArrayLike<T> | PromiseLike<ArrayLike<T>>,
                 predicate?: (x: T) => boolean,
                 cb?: (x: T) => any,
                 err?: (x: Error) => any
             ) {
                 if (isPromise(sequence)) {
                     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)
                             err(new Error("The sequence is empty"));
                         else
                             throw new Error("The sequence is empty");
                     } else {
                         if (!predicate) {
                             return cb ? cb(sequence[0]) && void (0) : sequence[0];
                         } else {
                             for (let i = 0; i < sequence.length; i++) {
                                 const v = sequence[i];
                                 if (predicate(v))
                                     return cb ? cb(v) : v;
                             }
                             if (err)
                                 err(new Error("The sequence doesn't contain matching items"));
                             else
                                 throw new Error("The sequence doesn't contain matching items");
                         }
                     }
                 } else {
                     if (err)
                         err(new Error("The sequence is required"));
                     else
                         throw new Error("The sequence is required");
                 }
             }
             export function isDestroyable(d: any): d is IDestroyable {
-                if (d && "destroy" in d && typeof (destroy) === "function")
+                return !!(d && typeof d.destroy === "function");
-                    return true;
-                return false;
+            export function isRemovable(value: any): value is IRemovable {
+                return !!(value && typeof value.remove === "function");
             }
             export function destroy(d: any) {
-                if (d && "destroy" in d)
+                if (isDestroyable(d))
                     d.destroy();
             }
             /**
              * Used to mark that the async operation isn't awaited intentionally.
              * @param p The promise which represents the async operation.
              */
             export function nowait(p: Promise<any>) {
             }
             /** represents already destroyed object.
              */
             export const destroyed = {
                 /** Calling to this method doesn't affect anything, noop.
                  */
                 destroy() {
                 }
             };

src/tsconfig.json +1 -1

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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages