implab/implabjs-core Commit - r121:876264d00a17

sync

cin -

r121:876264d00a17 ioc ts support

parent child

Context file:

r121:876264d00a17

Collapse all files

src/main/ts/di/Annotations.ts +13 -8

                 $dependency: K;
                 lazy?: boolean;
             }
             export interface Lazy<K extends keyof any> extends Dependency<K> {
                 }
                 inject<P extends any[]>(...args: P) {
-                    // K = "bar"
-                    // M = "setValue"
-                    // S[K] = Bar
-                    // T[M] = (value: string) => void
-                    // P[m] = (value: V) => void
                     return <X extends { [m in M]: (...args: any) => any }, M extends keyof (T | X)>(
                         target: X,
                         memberName: M,
                     };
                 }
-                getDescriptor(): TypeRegistration<T, any, S> {
+                getDescriptor(): TypeRegistration<new () => T, S> {
                     throw new Error();
                 }
             }
+            export interface DependencyOptions<T> {
+                optional?: boolean;
+                default?: T;
+            }
+            export interface LazyDependencyOptions<T> extends DependencyOptions<T> {
+                lazy: true;
+            }
             interface Declaration<S extends object> {
                 define<T>(): Builder<T, S>;
-                dependency<K extends keyof S>(name: K, opts: { lazy: true }): Lazy<K>;
+                dependency<K extends keyof S>(name: K, opts: LazyDependencyOptions<S[K]>): Lazy<K>;
-                dependency<K extends keyof S>(name: K, opts?: any): Dependency<K>;
+                dependency<K extends keyof S>(name: K, opts?: DependencyOptions<S[K]>): Dependency<K>;
                 config(): Config<S>;
             }

src/main/ts/di/Configuration.ts +17 -14

             /**
              * Базовый интефейс конфигурации сервисов
              */
-            export interface ServiceRegistration<T, P, S extends object> extends RegistrationScope<S> {
+            export interface ServiceRegistration<T, S extends object> extends RegistrationScope<S> {
                 activation?: ActivationType;
-                params?: P;
+                params?: any;
                 inject?: object | object[];
                 cleanup?: ((instance: T) => void) | string;
             }
-            export interface TypeRegistration<T, P extends any[], S extends object> extends ServiceRegistration<T, P, S> {
+            export interface TypeRegistration<C extends new () => any, S extends object> extends ServiceRegistration<InstanceType<C>, S> {
-                $type: string | (new (...params: P) => T);
+                $type: string | C;
             }
-            export interface FactoryRegistration<T, P extends any[], S extends object> extends ServiceRegistration<T, P, S> {
+            export interface FactoryRegistration<F extends () => any, S extends object> extends ServiceRegistration<ReturnType<F>, S> {
-                $factory: string | ((...params: P) => T);
+                $factory: string | F;
             }
             export interface ValueRegistration<T> {
                 default?: ContainerResolve<S, K>;
             }
+            export interface LazyDependencyRegistration<S extends object, K extends ContainerKeys<S> = ContainerKeys<S>> extends DependencyRegistration<S, K> {
+                lazy: true;
+            }
             export type Registration<T, S extends object> = T extends primitive ? T :
                 (
                     T |
                     { [k in keyof T]: Registration<T[k], S> } |
-                    TypeRegistration<T, any, S> |
+                    TypeRegistration<new () => T, S> |
-                    FactoryRegistration<T, any, S> |
+                    FactoryRegistration<() => T, S> |
                     ValueRegistration<any> |
                     DependencyRegistration<S, keyof S>
                 );
                 call: 5
             };
-            export function isTypeRegistration(x: any): x is TypeRegistration<any, any, any> {
+            export function isTypeRegistration(x: any): x is TypeRegistration<new () => any, any> {
                 return (!isPrimitive(x)) && ("$type" in x);
             }
-            export function isFactoryRegistration(x: any): x is FactoryRegistration<any, any, any> {
+            export function isFactoryRegistration(x: any): x is FactoryRegistration<() => any, any> {
                 return (!isPrimitive(x)) && ("$factory" in x);
             }
                     return v;
                 }
-                _makeServiceParams(data: ServiceRegistration<any, any, S>) {
+                _makeServiceParams(data: ServiceRegistration<any, S>) {
                     const opts: any = {
                         owner: this._container
                     };
                     return d;
                 }
-                async _visitTypeRegistration(data: TypeRegistration<any, any, S>, name: string) {
+                async _visitTypeRegistration(data: TypeRegistration<new () => any, S>, name: string) {
                     argumentNotNull(data.$type, "data.$type");
                     this._enter(name);
                     return d;
                 }
-                async _visitFactoryRegistration(data: FactoryRegistration<any, any, S>, name: string) {
+                async _visitFactoryRegistration(data: FactoryRegistration<() => any, S>, name: string) {
                     argumentOfType(data.$factory, Function, "data.$factory");
                     this._enter(name);

src/test/ts/mock/Bar.ts +4 -2

                 foo: dependency("foo"),
                 nested: {
                     lazy: dependency("foo", { lazy: true })
+                },
+                host: "value"
             })
             export class Bar {
                 barName = "bar";
                     foo?: Foo;
                     nested?: {
                         lazy: () => Foo
+                    },
+                    host: string
                 }) {
                     if (_opts && _opts.foo)

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