# HG changeset patch
# User cin
# Date 2020-07-02 00:32:06
# Node ID e81085d00fcbae18454702c2d0f48ac6a4f1bc53
# Parent  691199f665e0e96facb369a2231aa4172c901b9f

sync

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
@@ -1,64 +1,36 @@
 import { Foo } from "./Foo";
 import { Bar } from "./Bar";
-import { ActivationType } from "../di/interfaces";
-import { Builder } from "../di/Annotations";
 import { Box } from "./Box";
-
-interface RegistrationOptions {
-    activation?: ActivationType;
-}
-
-interface Dependency<K extends keyof any> {
-    $dependency: K;
-
-    lazy?: boolean;
-}
+import { primitive } from "../safe";
+import { Constructor } from "../interfaces";
 
-interface Lazy<K extends keyof any> extends Dependency<K> {
-    lazy: true;
-}
-
-type PromiseOrValue<T> = T | PromiseLike<T>;
-
-interface ConfigBuilder<S> {
-    build<K extends keyof S, T = S[K]>(name: K): Builder<T, S>;
-
-    dependency<K extends keyof S>(name: K): Dependency<K>;
-
-    lazy<K extends keyof S>(name: K): Lazy<K>;
-
-    mapTo<K extends keyof S>(name: K, ctor: () => PromiseOrValue<new (...args: any[]) => S[K]>): ConfigBuilder<S>;
-
-}
-
-interface ContainerServices {
-    barBox: Box<Bar>;
-
+interface Services {
     foo: Foo;
 
     bar: Bar;
 
-    password: string;
+    box: Box<Foo>;
+
+    host: string;
 
-    user: string;
+}
 
-    timeout: number;
+interface TypeDescriptor<T, C extends Constructor<T>> {
+    $type: C;
+
+    params: Wrap<ConstructorParameters<C>>;
 }
 
-declare function load<M, C extends keyof M>(m: PromiseLike<M>, name: C): () => PromiseLike<M[C]>;
+function typeRegistration<T, C extends Constructor<T>>(target: C, params: Wrap<ConstructorParameters<C>>): TypeDescriptor<T, C> {
+    throw new Error();
+}
 
-const t = {
-    barBox: load(import("./Box"), "Box"),
-
-    foo: async () => (await import("./Bar")).Bar,
-
-    bar: Bar,
+type Wrap<T> = T extends primitive ? T :
+    { [k in keyof T]: Wrap<T[k]> } | TypeDescriptor<T, Constructor<T>>;
 
-    password: String,
-
-    user: String,
-
-    timeout: Number
+const config: Wrap<Services> = {
+    foo: typeRegistration(Foo, []),
+    bar: typeRegistration(Bar, [{ foo: null as any, nested: null as any }]),
+    box: typeRegistration(Box, [{ $type: Bar, params: [] }]),
+    host: ""
 };
-
-export declare const config: ConfigBuilder<ContainerServices>;