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

              import { TraceSource } from "../log/TraceSource";
              import { Configuration, RegistrationMap } from "./Configuration";
              import { Cancellation } from "../Cancellation";
-             import { MapOf, IDestroyable } from "../interfaces";
+             import { IDestroyable, PromiseOrValue, ICancellation } from "../interfaces";
              import { isDescriptor } from "./traits";
              import { LifetimeManager } from "./LifetimeManager";
-             import { each } from "../safe";
-             import { FluentRegistrations } from "./fluent/interfaces";
+             import { each, isString } from "../safe";
+             import { ContainerConfiguration, FluentRegistrations } from "./fluent/interfaces";
              import { FluentConfiguration } from "./fluent/FluentConfiguration";
              const trace = TraceSource.get("@implab/core/di/ActivationContext");
                      }
                  }
+                 applyConfig<S2 extends object>(config: Promise<{ default: ContainerConfiguration<S2>; }>, ct?: ICancellation): Promise<Container<S & S2>>;
+                 applyConfig<S2 extends object, P extends string>(config: Promise<{ [p in P]: ContainerConfiguration<S2>; }>, prop: P, ct?: ICancellation): Promise<Container<S & S2>>;
+                 async applyConfig<S2 extends object, P extends string>(
+                     config: Promise<{ [p in P | "default"]: ContainerConfiguration<S2>; }>,
+                     propOrCt?: P | ICancellation,
+                     ct?: ICancellation
+                 ): Promise<Container<S & S2>> {
+                     const mod = await config;
+                     let _ct: ICancellation;
+                     let _prop: P | "default";
+                     if (isString(propOrCt)) {
+                         _prop = propOrCt;
+                         _ct = ct || Cancellation.none;
+                     } else {
+                         _ct = propOrCt || Cancellation.none;
+                         _prop = "default";
+                     }
+                     return mod[_prop].apply(this, _ct);
+                 }
                  async _applyLegacyConfig(config: RegistrationMap<S>, opts: { contextRequire: any; baseModule?: string }, ct = Cancellation.none) {
                      return new Configuration<S>(this).applyConfiguration(config, opts);
                  }

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

                  t.assert(container.resolve("host"), "Should resolve simple value");
              });
+             test("Container applyConfig", async t => {
+                 const container = await new Container<{}>().applyConfig(import("../mock/config"));
+                 t.assert(container.resolve("host"), "Should resolve simple value");
+             });

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