# HG changeset patch
# User cin
# Date 2020-07-17 10:08:53
# Node ID 142c5f6dc2b5779d377d3686b409c07126fc8b7c
# Parent  a19ad0acfd39ac871f1ffa38d65275a00ec00514

sync

diff --git a/src/main/ts/di/Annotations.ts b/src/main/ts/di/Annotations.ts
--- a/src/main/ts/di/Annotations.ts
+++ b/src/main/ts/di/Annotations.ts
@@ -56,24 +56,7 @@ interface Declaration<S extends object> 
     dependency<K extends keyof S>(name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>;
 
     $type<T, P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(target: C, ...params: P): StrictTypeRegistration<C, S>;
-
-    configure(): Config<S>;
 }
 
-type ServiceModule<T, S extends object, M extends string = "service"> = {
-    [m in M]: Builder<T, S>;
-};
-
-type PromiseOrValue<T> = PromiseLike<T> | T;
-
 
-export interface Config<S extends object, Y extends keyof S = keyof S> {
-    register<K extends Y>(name: K, m: { $from: Promise<ServiceModule<S[K], S>> }): Config<S, Exclude<Y, K>>;
-    register<K extends Y, M extends string>(name: K, m: { $from: Promise<ServiceModule<S[K], S, M>>, service: M }): Config<S, Exclude<Y, K>>;
-
-    register<K extends Y>(name: K, m: Registration<S[K], S>): Config<S, Exclude<Y, K>>;
-    registerType<K extends Y, P extends any[]>(
-        name: K, $type: new (...args: ExtractDependency<P, S>) => S[K], ...params: P): Config<S, Exclude<Y, K>>;
-}
-
 export declare function declare<S extends object>(): Declaration<S>;
diff --git a/src/main/ts/di/fluent/interfaces.ts b/src/main/ts/di/fluent/interfaces.ts
--- a/src/main/ts/di/fluent/interfaces.ts
+++ b/src/main/ts/di/fluent/interfaces.ts
@@ -1,5 +1,6 @@
 import { primitive } from "../../safe";
 import { ActivationType } from "../interfaces";
+import { Builder } from "../Annotations";
 
 type ExtractService<K, S> = K extends keyof S ? S[K] : K;
 
@@ -12,11 +13,19 @@ type ExtractDependency<D, S> = D extends
 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> {
diff --git a/src/test/ts/mock/config.ts b/src/test/ts/mock/config.ts
--- a/src/test/ts/mock/config.ts
+++ b/src/test/ts/mock/config.ts
@@ -2,15 +2,17 @@ import { configure, dependency, Services
 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("box", { $from: import("./Box") })
+    .register("bar", s => s
+        .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,
diff --git a/src/test/ts/mock/services.ts b/src/test/ts/mock/services.ts
--- a/src/test/ts/mock/services.ts
+++ b/src/test/ts/mock/services.ts
@@ -22,4 +22,4 @@ export interface Services {
 /**
  * Экспортируем вспомогательные функции для описания сервисов и кинфогурации
  */
-export const { define, dependency, configure, $type } = declare<Services>();
+export const { define, dependency } = declare<Services>();