implab/implabjs-core Commit - r113:22cf333c0b34

working on IoC configuration

cin -

r113:22cf333c0b34 ioc ts support

parent child

Context file:

r113:22cf333c0b34

Collapse all files

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

                 message: string;
-                constructor(service: string, activationStack: ActivationContextInfo[], innerException) {
+                constructor(service: string, activationStack: ActivationContextInfo[], innerException: any) {
                     this.message = "Failed to activate the service";
                     this.activationStack = activationStack;
                     this.service = service;

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

             import { ActivationContext } from "./ActivationContext";
             import { isPrimitive } from "../safe";
-            export class AggregateDescriptor implements Descriptor {
+            export class AggregateDescriptor<T> implements Descriptor<T> {
-                _value: object;
+                _value: T;
-                constructor(value: object) {
+                constructor(value: T) {
                     this._value = value;
                 }
                 }
                 // TODO: make async
-                _parse(value, context: ActivationContext, path: string) {
+                _parse(value: T, context: ActivationContext, path: string) {
                     if (isPrimitive(value))
                         return value;

src/main/ts/di/Configuration.ts +18 -16

             const trace = TraceSource.get("@implab/core/di/Configuration");
-            async function mapAll(data: object | any[], map?: (v, k) => any): Promise<any> {
+            async function mapAll(data: any | any[], map?: (v: any, k: keyof any) => any): Promise<any> {
                 if (data instanceof Array) {
                     return Promise.all(map ? data.map(map) : data);
                 } else {
                 _path: Array<_key>;
-                _configName: string;
+                _configName: string | undefined;
-                _require: ModuleResolver;
+                _require: ModuleResolver | undefined;
                 constructor(container: Container) {
                     argumentNotNull(container, "container");
                     this._configName = moduleName;
-                    const r = await makeResolver(null, contextRequire);
+                    const r = await makeResolver(undefined, contextRequire);
                     const config = await r(moduleName, ct);
                     this._container.register(services);
                 }
-                _makeError(inner) {
+                _makeError(inner: any) {
                     const e = new ConfigError("Failed to load configuration", inner);
-                    e.configName = this._configName;
+                    e.configName = this._configName || "<inline>";
                     e.path = this._makePath();
                     return e;
                 }
                 _loadModule(moduleName: string) {
                     trace.debug("loadModule {0}", moduleName);
+                    if (!this._require)
+                        throw new Error("Module loader isn't specified");
                     return this._require(moduleName);
                 }
-                async _visitRegistrations(data, name: _key) {
+                async _visitRegistrations(data: any, name: _key) {
                     this._enter(name);
                     if (data.constructor &&
                     return services;
                 }
-                _enter(name: _key) {
+                _enter(name: keyof any) {
-                    this._path.push(name);
+                    this._path.push(name.toString());
                     trace.debug(">{0}", name);
                 }
                     trace.debug("<{0}", name);
                 }
-                async _visit(data, name: string) {
+                async _visit<T extends object>(data: T, name: keyof T) {
                     if (isPrimitive(data) || isDescriptor(data))
                         return data;
                     return v;
                 }
-                _makeServiceParams(data: ServiceRegistration) {
+                _makeServiceParams<T, P, S>(data: ServiceRegistration<T, P, S>) {
                     const opts: any = {
                         owner: this._container
                     };
                     return opts;
                 }
-                async _visitValueRegistration(data: ValueRegistration, name: _key) {
+                async _visitValueRegistration<T>(data: ValueRegistration<T>, name: _key) {
                     this._enter(name);
                     const d = data.parse ? new AggregateDescriptor(data.$value) : new ValueDescriptor(data.$value);
                     this._leave();
                     return d;
                 }
-                async _visitDependencyRegistration(data: DependencyRegistration, name: _key) {
+                async _visitDependencyRegistration<S, K extends keyof S>(data: DependencyRegistration<S, K>, name: keyof S) {
                     argumentNotEmptyString(data && data.$dependency, "data.$dependency");
                     this._enter(name);
-                    const d = new ReferenceDescriptor({
+                    const d = new ReferenceDescriptor<S, K>({
                         name: data.$dependency,
                         lazy: data.lazy,
                         optional: data.optional,
                     return d;
                 }
-                async _visitTypeRegistration(data: TypeRegistration, name: _key) {
+                async _visitTypeRegistration<T, P, S>(data: TypeRegistration<T, P, S>, name: _key) {
                     argumentNotNull(data.$type, "data.$type");
                     this._enter(name);
                     return d;
                 }
-                async _visitFactoryRegistration(data: FactoryRegistration, name: _key) {
+                async _visitFactoryRegistration<T, P, S>(data: FactoryRegistration<T, P, S>, name: _key) {
                     argumentOfType(data.$factory, Function, "data.$factory");
                     this._enter(name);

src/main/ts/di/ReferenceDescriptor.ts +10 -9

             import { ServiceMap, Descriptor } from "./interfaces";
             import { ActivationError } from "./ActivationError";
-            export interface ReferenceDescriptorParams {
+            export interface ReferenceDescriptorParams<S, K extends keyof S> {
-                name: string;
+                name: K;
                 lazy?: boolean;
                 optional?: boolean;
-                default?;
+                default?: S[K];
                 services?: ServiceMap;
             }
-            export class ReferenceDescriptor implements Descriptor {
+            export class ReferenceDescriptor<S, K extends keyof S> implements Descriptor<S[K]> {
-                _name: string;
+                _name: K;
                 _lazy = false;
                 _services: ServiceMap;
-                constructor(opts: ReferenceDescriptorParams) {
+                constructor(opts: ReferenceDescriptorParams<S, K>) {
                     argumentNotEmptyString(opts && opts.name, "opts.name");
                     this._name = opts.name;
                     this._lazy = !!opts.lazy;
                     this._optional = !!opts.optional;
                     this._default = opts.default;
-                    this._services = opts.services;
+                    this._services = opts.services || {};
                 }
                 activate(context: ActivationContext, name: string) {
                                 return this._optional ? ct.resolve(this._name, this._default) : ct
                                     .resolve(this._name);
                             } catch (error) {
-                                throw new ActivationError(this._name, ct.getStack(), error);
+                                throw new ActivationError(this._name.toString(), ct.getStack(), error);
                             }
                         };
                     } else {
                         parts.push("} ");
                     }
-                    parts.push(this._name);
+                    parts.push(this._name.toString());
                     if (!isNull(this._default)) {
                         parts.push(" = ");

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

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

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

-            import { isNull, isPrimitive } from "../safe";
+            import { isPrimitive } from "../safe";
             import { ActivationContext } from "./ActivationContext";
             import { Constructor, Factory } from "../interfaces";
-            export interface Descriptor {
+            export interface Descriptor<T = any> {
-                activate(context: ActivationContext, name?: string);
+                activate(context: ActivationContext, name?: string): T;
             }
-            export function isDescriptor(x): x is Descriptor {
+            export function isDescriptor(x: any): x is Descriptor {
                 return (!isPrimitive(x)) &&
                     (x.activate instanceof Function);
             }
-            export interface ServiceMap {
+            export type ServiceMap<S = any> = {
-                [s: string]: Descriptor;
+                [k in keyof S]: Descriptor<S[k]>;
             }
             export enum ActivationType {
                 Call
             }
-            export interface RegistrationWithServices {
+            export interface RegistrationWithServices<S> {
-                services?: object;
+                services?: ServiceMap<S>;
             }
-            export interface ServiceRegistration extends RegistrationWithServices {
+            export interface ServiceRegistration<T, P, S> extends RegistrationWithServices<S> {
                 activation?: "singleton" | "container" | "hierarchy" | "context" | "call";
-                params?;
+                params?: P;
                 inject?: object | object[];
-                cleanup?: (instance) => void | string;
+                cleanup?: ((instance: T) => void) | string;
             }
-            export interface TypeRegistration extends ServiceRegistration {
+            export interface TypeRegistration<T, P, S> extends ServiceRegistration<T, P, S> {
-                $type: string | Constructor;
+                $type: string | Constructor<T>;
             }
-            export interface FactoryRegistration extends ServiceRegistration {
+            export interface FactoryRegistration<T, P, S> extends ServiceRegistration<T, P, S> {
-                $factory: string | Factory;
+                $factory: string | Factory<T>;
             }
-            export interface ValueRegistration {
+            export interface ValueRegistration<T> {
-                $value;
+                $value: T;
                 parse?: boolean;
             }
-            export interface DependencyRegistration extends RegistrationWithServices {
+            export interface DependencyRegistration<S, K extends keyof S> extends RegistrationWithServices<S> {
-                $dependency: string;
+                $dependency: K;
                 lazy?: boolean;
                 optional?: boolean;
-                default?;
+                default?: S[K];
             }
-            export function isTypeRegistration(x): x is TypeRegistration {
+            export function isTypeRegistration(x: any): x is TypeRegistration<any, any, any> {
                 return (!isPrimitive(x)) && ("$type" in x);
             }
-            export function isFactoryRegistration(x): x is FactoryRegistration {
+            export function isFactoryRegistration(x: any): x is FactoryRegistration<any, any, any> {
                 return (!isPrimitive(x)) && ("$factory" in x);
             }
-            export function isValueRegistration(x): x is ValueRegistration {
+            export function isValueRegistration(x: any): x is ValueRegistration<any> {
                 return (!isPrimitive(x)) && ("$value" in x);
             }
-            export function isDependencyRegistration(x): x is DependencyRegistration {
+            export function isDependencyRegistration(x: any): x is DependencyRegistration<any, string | number | symbol> {
                 return (!isPrimitive(x)) && ("$dependency" in x);
             }

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