implab/implabjs-core Commit - r126:142c5f6dc2b5

sync

cin -

r126:142c5f6dc2b5 ioc ts support

parent child

Context file:

r126:142c5f6dc2b5

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

@@ -56,24 +56,7 interface Declaration<S extends object>
56	dependency<K extends keyof S>(name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>;	56	dependency<K extends keyof S>(name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>;
57		57
58	$type<T, P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(target: C, ...params: P): StrictTypeRegistration<C, S>;	58	$type<T, P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(target: C, ...params: P): StrictTypeRegistration<C, S>;
59
60	configure(): Config<S>;
61	}	59	}
62		60
63	type ServiceModule<T, S extends object, M extends string = "service"> = {
64	[m in M]: Builder<T, S>;
65	};
66
67	type PromiseOrValue<T> = PromiseLike<T> \| T;
68
69		61
70	export interface Config<S extends object, Y extends keyof S = keyof S> {
71	register<K extends Y>(name: K, m: { $from: Promise<ServiceModule<S[K], S>> }): Config<S, Exclude<Y, K>>;
72	register<K extends Y, M extends string>(name: K, m: { $from: Promise<ServiceModule<S[K], S, M>>, service: M }): Config<S, Exclude<Y, K>>;
73
74	register<K extends Y>(name: K, m: Registration<S[K], S>): Config<S, Exclude<Y, K>>;
75	registerType<K extends Y, P extends any[]>(
76	name: K, $type: new (...args: ExtractDependency<P, S>) => S[K], ...params: P): Config<S, Exclude<Y, K>>;
77	}
78
79	export declare function declare<S extends object>(): Declaration<S>;	62	export declare function declare<S extends object>(): Declaration<S>;

src/main/ts/di/fluent/interfaces.ts +9 0

             import { primitive } from "../../safe";
             import { ActivationType } from "../interfaces";
+            import { Builder } from "../Annotations";
             type ExtractService<K, S> = K extends keyof S ? S[K] : K;
             type WalkDependencies<D, S> = D extends primitive ? D :
                 { [K in keyof D]: ExtractDependency<D[K], S> };
+            type ServiceModule<T, S extends object, M extends keyof any = "service"> = {
+                [m in M]: Builder<T, S>;
+            };
+            type PromiseOrValue<T> = T | PromiseLike<T>;
             export interface TypeBuilder<T, S extends object> {
                 type<P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(
                     target: C, ...params: P): ConstructorBuilder<C, S>;
                 factory<P extends any[], F extends (...args: ExtractDependency<P, S>) => T>(
                     target: F, ...params: P): FactoryBuilder<F, S>;
+                wire<M extends keyof any>(module: PromiseOrValue<ServiceModule<T, S, M>>, m: M): ServiceBuilder<T, S>;
+                wire(module: PromiseOrValue<ServiceModule<T, S>>): ServiceBuilder<T, S>;
             }
             export interface ServiceBuilder<T, S extends object> {

src/test/ts/mock/config.ts +5 -3

             import { Foo } from "./Foo";
             import { Bar } from "./Bar";
             import { Box } from "./Box";
-            import { declare } from "../di/Annotations";
             import { ConfigBuilder, TypeBuilder } from "../di/fluent/interfaces";
             export declare function build<T>(): TypeBuilder<T, Services>;
             export declare const config: ConfigBuilder<Services>;
             config
-                //.register("bar", { $from: import("./Bar"), service: "service" })
+                .register("bar", s => s
-                // .register("box", { $from: import("./Box") })
+                    .wire(import("./Bar"), "service")
+                    .inject("setName", "heell")
+                )
+                .register("box", s => s.wire(import("./Box")))
                 .register("host", "example.com")
                 // .registerType("bar2", Bar, [{ foo: dependency("foo"), host: "" }]);
                 .register("bar2", s => s.type(Bar,

src/test/ts/mock/services.ts +1 -1

             /**
              * Экспортируем вспомогательные функции для описания сервисов и кинфогурации
              */
-            export const { define, dependency, configure, $type } = declare<Services>();
+            export const { define, dependency } = declare<Services>();

General Comments 0

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

No TODOs yet

	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