implab/implabjs-core Commit - r109:f71c50acc9f9

working on di decorators

cin -

r109:f71c50acc9f9 ioc ts support

parent child

Context file:

r109:f71c50acc9f9

Collapse all files

src/test/ts/mock/config.ts created 644 0 0

NO CONTENT: new file 100644

build.gradle +2 0

                 compilerOptions {
                     types = []
                     declaration = true
+                    experimentalDecorators = true
+                    //strict = true
                     if(symbols != 'none') {
                         sourceMap = true

src/main/ts/di/Annotations.ts +25 -12

@@ -10,28 +10,41 type Injector<T> = {
10	[k in keyof T]: Setter;	10	[k in keyof T]: Setter;
11	};	11	};
12		12
		13	type Compatible<T1, T2> = T1 extends T2 ? any : never;
		14
		15	type SetterType<T> = T extends (v: infer V) => void ? V : never;
		16
		17	type Tuple<T = any> = Parameters<(...args: T[]) => void>;
		18
		19	interface Newable<A extends Tuple, T> {
		20	new (...params: A): T;
		21	prototype: T;
		22	}
		23
		24	type MapTuple<T, A extends (keyof T)[]> = { [K in keyof A] : K extends number ? T[ A[K] ] : A[K] };
		25
13	export class Builder<T, S> {	26	export class Builder<T, S> {
14	provides(~~name~~: ~~string~~) {	27	provides() {
15	return <C extends Constructor<T>>(constructor: C) => {	28	return <C extends Constructor<T>>(constructor: C) => {
16	return constructor;	29	return constructor;
17	};	30	};
18	}	31	}
19		32
20	inject<K extends keyof S>(dependency: K) {	33	inject<K extends keyof S>(dependency: K) {
21	return <M extends keyof T>(target: any, memberName: M, descriptor: TypedPropertyDescriptor<Setter<S[K]>> ) => {	34	// K = "bar"
		35	// M = "setValue"
		36	// S[K] = Bar
		37	// T[M] = (value: string) => void
		38	// P[m] = (value: V) => void
		39	return <P, M extends keyof (T \| P)>(target: P, memberName: M, descriptor: TypedPropertyDescriptor<Compatible<T[M], Setter<S[K]>>>) => {
22		40
23	};	41	};
24	}	42	}
25		43
26	~~prop~~<K extends keyof S>(~~dependency~~: K) {	44	dependencies<D extends (keyof S)[]>(...deps: D) {
27	return <M extends keyof T>(target: any, memberName: M, descriptor: TypedPropertyDescriptor<S[K]> ) => {	45	return <C extends Constructor<T>>(constructor: MapTuple<S, D> extends ConstructorParameters<C> ? C : never) => {
		46	return constructor;
		47	} ;
		48	}
28		49
29	};
30	}
31	}	50	}
32
33	export function inject<I extends Injector<I> >(dependency: string) {
34	return <M extends keyof I>(target: any, memberName: M, descriptor: TypedPropertyDescriptor<I[M]> ) => {
35
36	};
37	}

src/test/ts/mock/Bar.ts +8 -2

             export class Bar {
                 name = "bar";
-                foo: Foo;
+                foo: Foo | undefined;
-                constructor(_opts) {
+                constructor(_opts?: { foo?: Foo; }) {
                     if (_opts && _opts.foo)
                         this.foo = _opts.foo;
                 }
+                getFoo() {
+                    if (this.foo === undefined)
+                        throw new Error("The foo isn't set");
+                    return this.foo;
+                }
             }

src/test/ts/mock/Box.ts +18 -8

             import { Bar } from "./Bar";
             import { Foo } from "./Foo";
-            export interface Injector<T> {
+            const builder = new Builder<Box<Bar>, { bar: Bar; foo: Foo; obj: object }>();
-                setValue(value: T);
-            const builder = new Builder<Box<any>, { bar: Bar; foo: Foo}>();
+            @builder.provides()
+            @builder.dependencies("bar")
+            export class Box<T> {
+                private _value: T | undefined;
-            @builder.provides("barBox")
+                constructor(value: T) {
-            export class Box<T> implements Injector<T> {
+                    this._value = value;
-                private _value: T;
                 @builder.inject("bar")
                 setValue(value: T) {
                     this._value = value;
                 }
+                @builder.inject("foo")
+                setObj(value: object) {
+                }
                 getValue() {
+                    if (this._value === undefined)
+                        throw new Error("Trying to get a value from the empty box");
                     return this._value;
                 }
+            }
  No newline at end of file

src/test/tsconfig.json +1 -1

             {
                 "extends": "../tsconfig",
                 "compilerOptions": {
-                    "rootDir": "ts",
+                    //"rootDir": "ts",
                     "baseUrl": ".",
                     "rootDirs": [
                         "ts",

src/tsconfig.json +1 0

                     "experimentalDecorators": true,
                     "noEmitOnError": true,
                     "listFiles": 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