implab/implabjs-core Commit - r130:1af015b1d265

working on services lifetime

cin -

r130:1af015b1d265 ioc ts support

parent child

Context file:

r130:1af015b1d265

Collapse all files

src/main/ts/di/LifetimeManager.ts +45 -23

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

src/main/ts/di/ServiceDescriptor.ts +5 -3

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

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

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

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