| @@ -1,62 +1,25 | |||
|
|
1 |
import { |
|
|
|
2 | import { TypeRegistration, DependencyRegistration, LazyDependencyRegistration, Registration, StrictTypeRegistration } from "./Configuration"; | |
|
|
3 | ||
|
|
4 | export interface InjectOptions { | |
|
|
5 | lazy?: boolean; | |
|
|
6 | } | |
|
|
7 | ||
|
|
8 | type Compatible<T1, T2> = T2 extends T1 ? any : never; | |
|
|
9 | ||
|
|
10 | type ExtractService<K, S> = K extends keyof S ? S[K] : K; | |
|
|
1 | import { TypeRegistration } from "./Configuration"; | |
|
|
2 | import { ExtractDependency } from "./fluent/interfaces"; | |
|
|
11 | 3 | |
|
|
12 | type ExtractDependency<D, S> = D extends { $dependency: infer K } ? | |
|
|
13 | D extends { lazy: true } ? () => ExtractService<K, S> : ExtractService<K, S> : | |
|
|
14 | D extends { $type: new (...args: any[]) => infer I } ? I : | |
|
|
15 | WalkDependencies<D, S>; | |
|
|
16 | ||
|
|
17 | type WalkDependencies<D, S> = D extends primitive ? D : | |
|
|
18 | { [K in keyof D]: ExtractDependency<D[K], S> }; | |
|
|
19 | ||
|
|
20 | export class Builder<T, S extends object> { | |
|
|
21 | declare<P extends any[]>(...args: P) { | |
|
|
4 | export class AnnotaionBuilder<T, S extends object> { | |
|
|
5 | wire<P extends any[]>(...args: P) { | |
|
|
22 | 6 | return <C extends new (...args: ExtractDependency<P, S>) => T>(constructor: C) => { |
|
|
23 | 7 | |
|
|
24 | 8 | }; |
|
|
25 | 9 | } |
|
|
26 | 10 | |
|
|
27 | 11 | inject<P extends any[]>(...args: P) { |
|
|
28 | 12 | return <X extends { [m in M]: (...args: any) => any }, M extends keyof (T | X)>( |
|
|
29 | 13 | target: X, |
|
|
30 | 14 | memberName: M, |
|
|
31 |
descriptor: TypedPropertyDescriptor< |
|
|
|
15 | descriptor: TypedPropertyDescriptor< T[M] extends ((...args: ExtractDependency<P, S>) => any) ? any : never > | |
|
|
32 | 16 | ) => { |
|
|
33 | 17 | |
|
|
34 | 18 | }; |
|
|
35 | 19 | } |
|
|
36 | 20 | |
|
|
37 | 21 | getDescriptor(): TypeRegistration<new () => T, S> { |
|
|
38 | 22 | throw new Error(); |
|
|
39 | 23 | } |
|
|
40 | 24 | |
|
|
41 | 25 | } |
|
|
42 | ||
|
|
43 | export interface DependencyOptions<T> { | |
|
|
44 | optional?: boolean; | |
|
|
45 | default?: T; | |
|
|
46 | } | |
|
|
47 | ||
|
|
48 | export interface LazyDependencyOptions<T> extends DependencyOptions<T> { | |
|
|
49 | lazy: true; | |
|
|
50 | } | |
|
|
51 | ||
|
|
52 | interface Declaration<S extends object> { | |
|
|
53 | define<T>(): Builder<T, S>; | |
|
|
54 | ||
|
|
55 | dependency<K extends keyof S>(name: K, opts: LazyDependencyOptions<S[K]>): LazyDependencyRegistration<S, K>; | |
|
|
56 | dependency<K extends keyof S>(name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>; | |
|
|
57 | ||
|
|
58 | $type<T, P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>(target: C, ...params: P): StrictTypeRegistration<C, S>; | |
|
|
59 | } | |
|
|
60 | ||
|
|
61 | ||
|
|
62 | export declare function declare<S extends object>(): Declaration<S>; | |
| @@ -1,47 +1,68 | |||
|
|
1 | 1 | import { primitive } from "../../safe"; |
|
|
2 | 2 | import { ActivationType } from "../interfaces"; |
|
|
3 | import { Builder } from "../Annotations"; | |
|
|
3 | import { AnnotaionBuilder } from "../Annotations"; | |
|
|
4 | import { LazyDependencyRegistration, DependencyRegistration } from "../Configuration"; | |
|
|
5 | import { PromiseOrValue } from "../../interfaces"; | |
|
|
4 | 6 | |
|
|
5 | type ExtractService<K, S> = K extends keyof S ? S[K] : K; | |
|
|
7 | export interface DependencyOptions<T> { | |
|
|
8 | optional?: boolean; | |
|
|
9 | default?: T; | |
|
|
10 | } | |
|
|
6 | 11 | |
|
|
7 | type ExtractDependency<D, S> = D extends { $dependency: infer K } ? | |
|
|
12 | export interface LazyDependencyOptions<T> extends DependencyOptions<T> { | |
|
|
13 | lazy: true; | |
|
|
14 | } | |
|
|
15 | ||
|
|
16 | export type ExtractService<K, S> = K extends keyof S ? S[K] : K; | |
|
|
17 | ||
|
|
18 | export type ExtractDependency<D, S> = D extends { $dependency: infer K } ? | |
|
|
8 | 19 | D extends { lazy: true } ? () => ExtractService<K, S> : ExtractService<K, S> : |
|
|
9 | 20 | D extends { $type: new (...args: any[]) => infer I } ? I : |
|
|
10 | 21 | D extends { $factory: (...args: any[]) => infer R } ? R : |
|
|
11 | 22 | WalkDependencies<D, S>; |
|
|
12 | 23 | |
|
|
13 | type WalkDependencies<D, S> = D extends primitive ? D : | |
|
|
24 | export type WalkDependencies<D, S> = D extends primitive ? D : | |
|
|
14 | 25 | { [K in keyof D]: ExtractDependency<D[K], S> }; |
|
|
15 | 26 | |
|
|
16 | type ServiceModule<T, S extends object, M extends keyof any = "service"> = { | |
|
|
17 | [m in M]: Builder<T, S>; | |
|
|
27 | export type ServiceModule<T, S extends object, M extends keyof any = "service"> = { | |
|
|
28 | [m in M]: AnnotaionBuilder<T, S>; | |
|
|
18 | 29 | }; |
|
|
19 | 30 | |
|
|
20 | type PromiseOrValue<T> = T | PromiseLike<T>; | |
|
|
21 | ||
|
|
22 | export interface TypeBuilder<T, S extends object> { | |
|
|
31 | export interface ServiceBuilder<T, S extends object> { | |
|
|
23 | 32 | type<P extends any[], C extends new (...args: ExtractDependency<P, S>) => T>( |
|
|
24 | 33 | target: C, ...params: P): ConstructorBuilder<C, S>; |
|
|
25 | 34 | factory<P extends any[], F extends (...args: ExtractDependency<P, S>) => T>( |
|
|
26 | 35 | target: F, ...params: P): FactoryBuilder<F, S>; |
|
|
27 |
wire<M extends keyof any>(module: PromiseOrValue<ServiceModule<T, S, M>>, m: M): |
|
|
|
28 |
wire(module: PromiseOrValue<ServiceModule<T, S>>): |
|
|
|
36 | wired<M extends keyof any>(module: PromiseOrValue<ServiceModule<T, S, M>>, m: M): RegistrationBuilder<T, S>; | |
|
|
37 | wired(module: PromiseOrValue<ServiceModule<T, S>>): RegistrationBuilder<T, S>; | |
|
|
29 | 38 | } |
|
|
30 | 39 | |
|
|
31 |
export interface |
|
|
|
32 |
override<K extends keyof S>(name: K, builder: S[K] | ((t: |
|
|
|
40 | export interface RegistrationBuilder<T, S extends object> { | |
|
|
41 | override<K extends keyof S>(name: K, builder: S[K] | ((t: ServiceBuilder<S[K], S>) => any)): this; | |
|
|
33 | 42 | activate(activation: ActivationType): this; |
|
|
34 | 43 | inject<M extends keyof T, P extends any[]>(member: T[M] extends (...params: ExtractDependency<P, S>) => any ? M : never, ...params: P): this; |
|
|
35 | 44 | } |
|
|
36 | 45 | |
|
|
37 |
export interface ConstructorBuilder<C extends new (...args: any[]) => any, S extends object> extends |
|
|
|
46 | export interface ConstructorBuilder<C extends new (...args: any[]) => any, S extends object> extends RegistrationBuilder<InstanceType<C>, S> { | |
|
|
38 | 47 | $type: C; |
|
|
39 | 48 | } |
|
|
40 | 49 | |
|
|
41 |
export interface FactoryBuilder<F extends (...args: any[]) => any, S extends object> extends |
|
|
|
50 | export interface FactoryBuilder<F extends (...args: any[]) => any, S extends object> extends RegistrationBuilder<ReturnType<F>, S> { | |
|
|
42 | 51 | $factory: F; |
|
|
43 | 52 | } |
|
|
44 | 53 | |
|
|
45 | 54 | export interface ConfigBuilder<S extends object, Y extends keyof S = keyof S> { |
|
|
46 |
register<K extends Y>(name: K, builder: S[K] | ((t: |
|
|
|
55 | register<K extends Y>(name: K, builder: S[K] | ((t: ServiceBuilder<S[K], S>) => any)): ConfigBuilder<S, Exclude<Y, K>>; | |
|
|
47 | 56 | } |
|
|
57 | ||
|
|
58 | interface ServicesDeclaration<S extends object> { | |
|
|
59 | build<T>(this: void): ServiceBuilder<T, S>; | |
|
|
60 | annotate<T>(this: void): AnnotaionBuilder<T, S>; | |
|
|
61 | ||
|
|
62 | dependency<K extends keyof S>(this: void, name: K, opts: LazyDependencyOptions<S[K]>): LazyDependencyRegistration<S, K>; | |
|
|
63 | dependency<K extends keyof S>(this: void, name: K, opts?: DependencyOptions<S[K]>): DependencyRegistration<S, K>; | |
|
|
64 | ||
|
|
65 | configure(): ConfigBuilder<S>; | |
|
|
66 | } | |
|
|
67 | ||
|
|
68 | export declare function declare<S extends object>(): ServicesDeclaration<S>; | |
| @@ -1,116 +1,118 | |||
|
|
1 | 1 | export interface Constructor<T = {}> { |
|
|
2 | 2 | new(...args: any[]): T; |
|
|
3 | 3 | prototype: T; |
|
|
4 | 4 | } |
|
|
5 | 5 | |
|
|
6 | export type PromiseOrValue<T> = T | PromiseLike<T>; | |
|
|
7 | ||
|
|
6 | 8 | export type Factory<T = {}> = (...args: any[]) => T; |
|
|
7 | 9 | |
|
|
8 | 10 | export type Predicate<T = any> = (x: T) => boolean; |
|
|
9 | 11 | |
|
|
10 | 12 | export interface MapOf<T> { |
|
|
11 | 13 | [key: string]: T; |
|
|
12 | 14 | } |
|
|
13 | 15 | |
|
|
14 | 16 | export interface IDestroyable { |
|
|
15 | 17 | destroy(): void; |
|
|
16 | 18 | } |
|
|
17 | 19 | |
|
|
18 | 20 | export interface IRemovable { |
|
|
19 | 21 | remove(): void; |
|
|
20 | 22 | } |
|
|
21 | 23 | |
|
|
22 | 24 | export interface ICancellation { |
|
|
23 | 25 | throwIfRequested(): void; |
|
|
24 | 26 | isRequested(): boolean; |
|
|
25 | 27 | isSupported(): boolean; |
|
|
26 | 28 | register(cb: (e: any) => void): IDestroyable; |
|
|
27 | 29 | } |
|
|
28 | 30 | |
|
|
29 | 31 | /** |
|
|
30 | 32 | * Интерфейс поддерживающий асинхронную активацию |
|
|
31 | 33 | */ |
|
|
32 | 34 | export interface IActivatable { |
|
|
33 | 35 | /** |
|
|
34 | 36 | * @returns Boolean indicates the current state |
|
|
35 | 37 | */ |
|
|
36 | 38 | isActive(): boolean; |
|
|
37 | 39 | |
|
|
38 | 40 | /** |
|
|
39 | 41 | * Starts the component activation |
|
|
40 | 42 | * @param ct cancellation token for this operation |
|
|
41 | 43 | */ |
|
|
42 | 44 | activate(ct?: ICancellation): Promise<void>; |
|
|
43 | 45 | |
|
|
44 | 46 | /** |
|
|
45 | 47 | * Starts the component deactivation |
|
|
46 | 48 | * @param ct cancellation token for this operation |
|
|
47 | 49 | */ |
|
|
48 | 50 | deactivate(ct?: ICancellation): Promise<void>; |
|
|
49 | 51 | |
|
|
50 | 52 | /** |
|
|
51 | 53 | * Sets the activation controller for this component |
|
|
52 | 54 | * @param controller The activation controller |
|
|
53 | 55 | * |
|
|
54 | 56 | * Activation controller checks whether this component |
|
|
55 | 57 | * can be activated and manages the active state of the |
|
|
56 | 58 | * component |
|
|
57 | 59 | */ |
|
|
58 | 60 | setActivationController(controller: IActivationController): void; |
|
|
59 | 61 | |
|
|
60 | 62 | /** Indicates whether this component has an activation controller */ |
|
|
61 | 63 | hasActivationController(): boolean; |
|
|
62 | 64 | |
|
|
63 | 65 | /** |
|
|
64 | 66 | * Gets the current activation controller for this component |
|
|
65 | 67 | */ |
|
|
66 | 68 | getActivationController(): IActivationController; |
|
|
67 | 69 | } |
|
|
68 | 70 | |
|
|
69 | 71 | export interface IActivationController { |
|
|
70 | 72 | activating(component: IActivatable, ct?: ICancellation): Promise<void>; |
|
|
71 | 73 | |
|
|
72 | 74 | activated(component: IActivatable, ct?: ICancellation): Promise<void>; |
|
|
73 | 75 | |
|
|
74 | 76 | deactivating(component: IActivatable, ct?: ICancellation): Promise<void>; |
|
|
75 | 77 | |
|
|
76 | 78 | deactivated(component: IActivatable, ct?: ICancellation): Promise<void>; |
|
|
77 | 79 | |
|
|
78 | 80 | deactivate(ct?: ICancellation): Promise<void>; |
|
|
79 | 81 | |
|
|
80 | 82 | activate(component: IActivatable, ct?: ICancellation): Promise<void>; |
|
|
81 | 83 | |
|
|
82 | 84 | hasActive(): boolean; |
|
|
83 | 85 | |
|
|
84 | 86 | getActive(): IActivatable; |
|
|
85 | 87 | } |
|
|
86 | 88 | |
|
|
87 | 89 | export interface IAsyncComponent { |
|
|
88 | 90 | getCompletion(): Promise<void>; |
|
|
89 | 91 | } |
|
|
90 | 92 | |
|
|
91 | 93 | export interface ICancellable { |
|
|
92 | 94 | cancel(reason?: any): void; |
|
|
93 | 95 | } |
|
|
94 | 96 | |
|
|
95 | 97 | export interface IObservable<T> { |
|
|
96 | 98 | on(next: (x: T) => void, error?: (e: any) => void, complete?: () => void): IDestroyable; |
|
|
97 | 99 | next(ct?: ICancellation): Promise<T>; |
|
|
98 | 100 | } |
|
|
99 | 101 | |
|
|
100 | 102 | export interface IObserver<T> { |
|
|
101 | 103 | next(event: T): void; |
|
|
102 | 104 | |
|
|
103 | 105 | error(e: any): void; |
|
|
104 | 106 | |
|
|
105 | 107 | complete(): void; |
|
|
106 | 108 | } |
|
|
107 | 109 | |
|
|
108 | 110 | export interface TextWriter { |
|
|
109 | 111 | write(obj: any): void; |
|
|
110 | 112 | write(format: string, ...args: any[]): void; |
|
|
111 | 113 | |
|
|
112 | 114 | writeLine(obj?: any): void; |
|
|
113 | 115 | writeLine(format: string, ...args: any[]): void; |
|
|
114 | 116 | |
|
|
115 | 117 | writeValue(value: any, spec?: string): void; |
|
|
116 | 118 | } |
| @@ -1,39 +1,39 | |||
|
|
1 | 1 | import { Foo } from "./Foo"; |
|
|
2 |
import { |
|
|
|
2 | import { annotate, dependency } from "./services"; | |
|
|
3 | 3 | |
|
|
4 |
export const service = |
|
|
|
4 | export const service = annotate<Bar>(); | |
|
|
5 | 5 | |
|
|
6 |
@service. |
|
|
|
6 | @service.wire({ | |
|
|
7 | 7 | foo: dependency("foo"), |
|
|
8 | 8 | nested: { |
|
|
9 | 9 | lazy: dependency("foo", { lazy: true }) |
|
|
10 | 10 | }, |
|
|
11 | 11 | host: dependency("host") |
|
|
12 | 12 | }, "") |
|
|
13 | 13 | export class Bar { |
|
|
14 |
barName = " |
|
|
|
14 | barName = "Twister"; | |
|
|
15 | 15 | |
|
|
16 | 16 | _v: Foo | undefined; |
|
|
17 | 17 | |
|
|
18 | 18 | constructor(_opts: { |
|
|
19 | 19 | foo?: Foo; |
|
|
20 | 20 | nested?: { |
|
|
21 | 21 | lazy: () => Foo |
|
|
22 | 22 | }, |
|
|
23 | 23 | host: string |
|
|
24 | 24 | }, s: string) { |
|
|
25 | 25 | |
|
|
26 | 26 | if (_opts && _opts.foo) |
|
|
27 | 27 | this._v = _opts.foo; |
|
|
28 | 28 | } |
|
|
29 | 29 | |
|
|
30 | 30 | setName(name: string) { |
|
|
31 | 31 | |
|
|
32 | 32 | } |
|
|
33 | 33 | |
|
|
34 | 34 | getFoo() { |
|
|
35 | 35 | if (this._v === undefined) |
|
|
36 | 36 | throw new Error("The foo isn't set"); |
|
|
37 | 37 | return this._v; |
|
|
38 | 38 | } |
|
|
39 | 39 | } |
| @@ -1,33 +1,29 | |||
|
|
1 | 1 | import { Bar } from "./Bar"; |
|
|
2 |
import { |
|
|
|
2 | import { annotate, dependency } from "./services"; | |
|
|
3 | 3 | |
|
|
4 | 4 | // export service descriptor |
|
|
5 | 5 | // через service передается информация о типе зависимости |
|
|
6 | 6 | // даже если это шаблон. |
|
|
7 |
export const service = |
|
|
|
7 | export const service = annotate<Box<Bar>>(); | |
|
|
8 | 8 | |
|
|
9 | @service.declare(dependency("bar")) | |
|
|
9 | @service.wire() | |
|
|
10 | 10 | export class Box<T> { |
|
|
11 | 11 | private _value: T | undefined; |
|
|
12 | 12 | |
|
|
13 | constructor(value: T) { | |
|
|
13 | constructor(value?: T) { | |
|
|
14 | 14 | this._value = value; |
|
|
15 | 15 | } |
|
|
16 | 16 | |
|
|
17 | 17 | @service.inject(dependency("bar")) |
|
|
18 | 18 | setValue(value: T) { |
|
|
19 | 19 | this._value = value; |
|
|
20 | 20 | return value; |
|
|
21 | 21 | } |
|
|
22 | 22 | |
|
|
23 | setObj(value: any) { | |
|
|
24 | ||
|
|
25 | } | |
|
|
26 | ||
|
|
27 | 23 | getValue() { |
|
|
28 | 24 | if (this._value === undefined) |
|
|
29 | 25 | throw new Error("Trying to get a value from the empty box"); |
|
|
30 | 26 | |
|
|
31 | 27 | return this._value; |
|
|
32 | 28 | } |
|
|
33 | 29 | } |
| @@ -1,32 +1,28 | |||
|
|
1 |
import { configure, dependency, |
|
|
|
1 | import { configure, dependency, build } from "./services"; | |
|
|
2 | 2 | import { Foo } from "./Foo"; |
|
|
3 | 3 | import { Bar } from "./Bar"; |
|
|
4 | 4 | import { Box } from "./Box"; |
|
|
5 | import { ConfigBuilder, TypeBuilder } from "../di/fluent/interfaces"; | |
|
|
6 | 5 | |
|
|
7 | export declare function build<T>(): TypeBuilder<T, Services>; | |
|
|
8 | ||
|
|
9 | export declare const config: ConfigBuilder<Services>; | |
|
|
10 | config | |
|
|
6 | export const config = configure() | |
|
|
11 | 7 | .register("bar", s => s |
|
|
12 | .wire(import("./Bar"), "service") | |
|
|
8 | .wired(import("./Bar"), "service") | |
|
|
13 | 9 | .inject("setName", "heell") |
|
|
14 | 10 | ) |
|
|
15 | .register("box", s => s.wire(import("./Box"))) | |
|
|
11 | .register("box", s => s.wired(import("./Box"))) | |
|
|
16 | 12 | .register("host", "example.com") |
|
|
17 | 13 | // .registerType("bar2", Bar, [{ foo: dependency("foo"), host: "" }]); |
|
|
18 | 14 | .register("bar2", s => s.type(Bar, |
|
|
19 | 15 | { |
|
|
20 | 16 | foo: build().type(Foo) |
|
|
21 | 17 | .activate("context"), |
|
|
22 | 18 | nested: { lazy: dependency("foo", {lazy: true}) }, |
|
|
23 | 19 | host: dependency("host") |
|
|
24 | 20 | }, |
|
|
25 | 21 | "") |
|
|
26 | 22 | .inject("setName", dependency("host")) |
|
|
27 | 23 | ) |
|
|
28 | 24 | .register("box", s => s |
|
|
29 | 25 | .type(Box, dependency("bar")) |
|
|
30 | 26 | .activate("context") |
|
|
31 | 27 | ); |
|
|
32 | 28 | |
| @@ -1,25 +1,25 | |||
|
|
1 | 1 | import { Foo } from "./Foo"; |
|
|
2 | 2 | import { Bar } from "./Bar"; |
|
|
3 | 3 | import { Box } from "./Box"; |
|
|
4 |
import { declare } from "../di/ |
|
|
|
4 | import { declare } from "../di/fluent/interfaces"; | |
|
|
5 | 5 | |
|
|
6 | 6 | /** |
|
|
7 | 7 | * Сервисы доступные внутри контейнера |
|
|
8 | 8 | */ |
|
|
9 | 9 | export interface Services { |
|
|
10 | 10 | foo: Foo; |
|
|
11 | 11 | |
|
|
12 | 12 | bar: Bar; |
|
|
13 | 13 | |
|
|
14 | 14 | bar2: Bar; |
|
|
15 | 15 | |
|
|
16 | 16 | box: Box<Bar>; |
|
|
17 | 17 | |
|
|
18 | 18 | host: string; |
|
|
19 | 19 | |
|
|
20 | 20 | } |
|
|
21 | 21 | |
|
|
22 | 22 | /** |
|
|
23 | 23 | * Экспортируем вспомогательные функции для описания сервисов и кинфогурации |
|
|
24 | 24 | */ |
|
|
25 |
export const { de |
|
|
|
25 | export const { dependency, build, annotate, configure } = declare<Services>(); | |
General Comments 0
You need to be logged in to leave comments.
Login now
