implab/implabjs-core Commit - r142:be7edf08a115

added provided and configure methods to the fluent container configuration, added applyConfig method to the container

cin -

r142:be7edf08a115 v1.4.0-rc3 default

parent child

Context file:

r142:be7edf08a115

Collapse all files

src/test/ts/mock/config2.ts created 644 +10 0

@@ -0,0 +1,10
	1	import { fluent } from "../di/traits";
	2	import { Bar } from "./Bar";
	3	import { ChildServices, Services } from "./services";
	4
	5	export default fluent<ChildServices>()
	6	.provided<keyof Services>()
	7	.configure({
	8	bar: it => it
	9	.factory($ => new Bar({ foo: $("foo"), host: $("host") }, "bar"))
	10	});

src/main/ts/di/Container.ts +26 -3

@@ -5,11 +5,11 import { ServiceMap, Descriptor, Partial
5	import { TraceSource } from "../log/TraceSource";	5	import { TraceSource } from "../log/TraceSource";
6	import { Configuration, RegistrationMap } from "./Configuration";	6	import { Configuration, RegistrationMap } from "./Configuration";
7	import { Cancellation } from "../Cancellation";	7	import { Cancellation } from "../Cancellation";
8	import { ~~MapOf~~, ~~IDestroyable~~ } from "../interfaces";	8	import { IDestroyable, PromiseOrValue, ICancellation } from "../interfaces";
9	import { isDescriptor } from "./traits";	9	import { isDescriptor } from "./traits";
10	import { LifetimeManager } from "./LifetimeManager";	10	import { LifetimeManager } from "./LifetimeManager";
11	import { each } from "../safe";	11	import { each, isString } from "../safe";
12	import { FluentRegistrations } from "./fluent/interfaces";	12	import { ContainerConfiguration, FluentRegistrations } from "./fluent/interfaces";
13	import { FluentConfiguration } from "./fluent/FluentConfiguration";	13	import { FluentConfiguration } from "./fluent/FluentConfiguration";
14		14
15	const trace = TraceSource.get("@implab/core/di/ActivationContext");	15	const trace = TraceSource.get("@implab/core/di/ActivationContext");
@@ -134,6 +134,29 export class Container<S extends object
134	}	134	}
135	}	135	}
136		136
		137	applyConfig<S2 extends object>(config: Promise<{ default: ContainerConfiguration<S2>; }>, ct?: ICancellation): Promise<Container<S & S2>>;
		138	applyConfig<S2 extends object, P extends string>(config: Promise<{ [p in P]: ContainerConfiguration<S2>; }>, prop: P, ct?: ICancellation): Promise<Container<S & S2>>;
		139	async applyConfig<S2 extends object, P extends string>(
		140	config: Promise<{ [p in P \| "default"]: ContainerConfiguration<S2>; }>,
		141	propOrCt?: P \| ICancellation,
		142	ct?: ICancellation
		143	): Promise<Container<S & S2>> {
		144	const mod = await config;
		145
		146	let _ct: ICancellation;
		147	let _prop: P \| "default";
		148
		149	if (isString(propOrCt)) {
		150	_prop = propOrCt;
		151	_ct = ct \|\| Cancellation.none;
		152	} else {
		153	_ct = propOrCt \|\| Cancellation.none;
		154	_prop = "default";
		155	}
		156
		157	return mod[_prop].apply(this, _ct);
		158	}
		159
137	async _applyLegacyConfig(config: RegistrationMap<S>, opts: { contextRequire: any; baseModule?: string }, ct = Cancellation.none) {	160	async _applyLegacyConfig(config: RegistrationMap<S>, opts: { contextRequire: any; baseModule?: string }, ct = Cancellation.none) {
138	return new Configuration<S>(this).applyConfiguration(config, opts);	161	return new Configuration<S>(this).applyConfiguration(config, opts);
139	}	162	}

src/main/ts/di/fluent/FluentConfiguration.ts +9 -1

             import { Container } from "../Container";
             import { argumentNotNull, each, isPrimitive, isPromise } from "../../safe";
             import { DescriptorBuilder } from "./DescriptorBuilder";
-            import { RegistrationBuilder, FluentRegistrations } from "./interfaces";
+            import { RegistrationBuilder, FluentRegistrations, ContainerConfiguration } from "./interfaces";
             import { Cancellation } from "../../Cancellation";
             export class FluentConfiguration<S extends object, Y extends keyof S = keyof S> {
                 _builders: { [k in keyof S]?: RegistrationBuilder<S, S[k]> } = {};
+                provided<K extends Y>(): FluentConfiguration<S, Exclude<Y, K>> {
+                    return this;
+                }
                 register<K extends Y>(name: K, builder: RegistrationBuilder<S, S[K]>): FluentConfiguration<S, Exclude<Y, K>>;
                 register<K extends Y>(config: FluentRegistrations<K, S>): FluentConfiguration<S, Exclude<Y, K>>;
                 register<K extends Y>(nameOrConfig: K | FluentRegistrations<K, S>, builder?: RegistrationBuilder<S, S[K]>): FluentConfiguration<S, Exclude<Y, K>> {
                     return this;
                 }
+                configure(config: FluentRegistrations<Y, S>): ContainerConfiguration<S> {
+                    return this.register(config);
+                }
                 apply<SC extends object>(target: Container<SC>, ct = Cancellation.none) {
                     let pending = 1;

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

             import { primitive } from "../../safe";
             import { TypeOfService, ContainerKeys, ActivationType, ILifetime } from "../interfaces";
             import { ICancellation } from "../../interfaces";
+            import { Container } from "../Container";
             export interface DependencyOptions {
                 optional?: boolean;
                 value(v: T): void;
             }
+            export interface ContainerConfiguration<S extends object> {
+                apply<S2 extends object>(target: Container<S2>, ct: ICancellation): Promise<Container<S2 & S>>;
+            }
             export type RegistrationBuilder<S extends object, T> = (d: DescriptorBuilder<S, T>, ct?: ICancellation) => void | Promise<void>;
             export type FluentRegistrations<K extends keyof S, S extends object> = { [k in K]: RegistrationBuilder<S, S[k]> };

src/main/ts/safe.ts +1 -1

             }
             /** Copies property values from a source object to the destination and returns
-             * the destination onject.
+             * the destination object.
              *
              * @param dest The destination object into which properties from the source
              *  object will be copied.

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

             import { fluent } from "../di/traits";
             import { Box } from "./Box";
-            export default fluent<Services>().register({
+            export default fluent<Services>().configure({
                 host: it => it.value("example.com"),
                 foo: it => import("./Foo").then(({ Foo }) => it

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

             import { Foo } from "./Foo";
+            import { Box } from "./Box";
             import { Bar } from "./Bar";
-            import { Box } from "./Box";
             /**
              * Сервисы доступные внутри контейнера
                 host: string;
             }
+            export interface ChildServices extends Services {
+                foo2?: Foo;
+                bar: Bar;
+            }

src/test/ts/tests/FluentContainerTests.ts +6 0

@@ -61,3 +61,9 test("Load fluent config", async t => {
61		61
62	t.assert(container.resolve("host"), "Should resolve simple value");	62	t.assert(container.resolve("host"), "Should resolve simple value");
63	});	63	});
		64
		65	test("Container applyConfig", async t => {
		66	const container = await new Container<{}>().applyConfig(import("../mock/config"));
		67
		68	t.assert(container.resolve("host"), "Should resolve simple value");
		69	});

src/tsconfig.json +1 -1

                     "experimentalDecorators": true,
                     "noEmitOnError": true,
                     "listFiles": true,
-                    "strict": true,
+                    //"strict": true,
                     "types": [],
                     "target": "ES5",
                     "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]

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