Skip to content

Commit ea5da88

Browse files
Merge pull request #181 from DrSammyD/master
Remove internal module from d.ts file
2 parents d16d06f + af6df83 commit ea5da88

21 files changed

+2643
-2675
lines changed

dist/amd/aurelia-dependency-injection.js

+654-656
Large diffs are not rendered by default.

dist/aurelia-dependency-injection.d.ts

+25-56
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ export type PrimitiveOrDependencyCtorOrFunctor<
3939
> = DependencyCtor<TBase, TImpl, TArgs>
4040
| DependencyFunctor<TBase, TImpl, TArgs>
4141
| Primitive;
42-
export declare function invoker<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(value: Invoker<TBase, TImpl, TArgs>): any;
43-
export declare function invokeAsFactory(potentialTarget?: any): any;
44-
export interface Invoker<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> {
45-
invoke(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, dependencies: TArgs): ImplOrAny<TImpl>;
46-
invokeWithDynamicDependencies(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, staticDependencies: TArgs[number][], dynamicDependencies: TArgs[number][]): ImplOrAny<TImpl>;
47-
}
48-
export declare class FactoryInvoker<TBase = any, TArgs extends Args<TBase> = Args<TBase>, TImpl extends Impl<TBase> = Impl<TBase>> {
49-
static instance: FactoryInvoker;
50-
invoke(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, dependencies: TArgs): ImplOrAny<TImpl>;
51-
invokeWithDynamicDependencies(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, staticDependencies: TArgs[number][], dynamicDependencies: TArgs[number][]): ImplOrAny<TImpl>;
52-
}
5342
export declare const resolver: {
5443
decorates?: (key: any) => key is {
5544
get(container: Container, key: any): any;
@@ -85,40 +74,31 @@ export declare class StrategyResolver<TBase, TImpl extends Impl<TBase>, TArgs ex
8574
get(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>): TImpl;
8675
}
8776
export declare class Lazy<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>> {
88-
_key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>;
8977
constructor(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>);
9078
get(container: Container): () => ImplOrAny<TImpl>;
9179
static of<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>): Lazy<TBase, TImpl, TArgs>;
9280
}
9381
export declare class All<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>> {
94-
_key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>;
9582
constructor(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>);
9683
get(container: Container): any[];
9784
static of<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>): All<TBase, TImpl, TArgs>;
9885
}
9986
export declare class Optional<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>> {
100-
_key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>;
101-
_checkParent: boolean;
10287
constructor(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, checkParent?: boolean);
10388
get(container: Container): any;
10489
static of<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, checkParent?: boolean): Optional<TBase, TImpl, TArgs>;
10590
}
10691
export declare class Parent<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>> {
107-
_key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>;
10892
constructor(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>);
10993
get(container: Container): any;
11094
static of<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>): Parent<TBase, TImpl, TArgs>;
11195
}
11296
export declare class Factory<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>> {
113-
_key: PrimitiveOrDependencyCtorOrFunctor<TBase, TImpl, TArgs>;
11497
constructor(key: PrimitiveOrDependencyCtorOrFunctor<TBase, TImpl, TArgs>);
11598
get(container: Container): DependencyFunctor<TBase, TImpl, TArgs>;
11699
static of<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(key: DependencyCtor<TBase, TImpl, TArgs>): Factory<TBase, TImpl, TArgs>;
117100
}
118101
export declare class NewInstance<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>> {
119-
key: PrimitiveOrDependencyCtorOrFunctor<TBase, TImpl, TArgs>;
120-
asKey: PrimitiveOrDependencyCtorOrFunctor<TBase, TImpl, TArgs>;
121-
dynamicDependencies: TArgs[number][];
122102
constructor(key: PrimitiveOrDependencyCtorOrFunctor<TBase, TImpl, TArgs>, ...dynamicDependencies: TArgs[number][]);
123103
get(container: Container): ImplOrAny<TImpl>;
124104
as(key: PrimitiveOrDependencyCtorOrFunctor<TBase, TImpl, TArgs>): this;
@@ -147,38 +127,16 @@ export declare function newInstance<TBase, TImpl extends Impl<TBase> = Impl<TBas
147127
}, ...dynamicDependencies: TArgs[number][]): (target: DependencyCtor<TBase, TImpl, TArgs> & {
148128
inject?: TArgs[number][];
149129
}, _key: any, index: number) => void;
150-
export declare function registration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(value: Registration<TBase, TImpl, TArgs>): any;
151-
export declare function transient<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(key?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>): any;
152-
export declare function singleton(registerInChild?: boolean): any;
153-
export declare function singleton<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(key?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, registerInChild?: boolean): any;
154-
export interface Registration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> {
155-
registerResolver(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>): Resolver;
156-
}
157-
export declare class TransientRegistration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> implements Registration<TBase, TImpl, TArgs> {
158-
_key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>;
159-
constructor(key?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>);
160-
registerResolver(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>): Resolver;
161-
}
162-
export declare class SingletonRegistration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> implements Registration<TBase, TImpl, TArgs> {
163-
_registerInChild: boolean;
164-
_key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>;
165-
constructor(keyOrRegisterInChild?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs> | boolean, registerInChild?: boolean);
166-
registerResolver(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>): Resolver;
130+
export declare function invoker<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(value: Invoker<TBase, TImpl, TArgs>): any;
131+
export declare function invokeAsFactory(potentialTarget?: any): any;
132+
export interface Invoker<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> {
133+
invoke(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, dependencies: TArgs): ImplOrAny<TImpl>;
134+
invokeWithDynamicDependencies(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, staticDependencies: TArgs[number][], dynamicDependencies: TArgs[number][]): ImplOrAny<TImpl>;
167135
}
168-
/** @internal */
169-
export declare module 'aurelia-metadata' {
170-
interface MetadataType {
171-
invoker: 'aurelia:invoker';
172-
getOwn(
173-
metadataKey: 'aurelia:invoker',
174-
target: DependencyCtorOrFunctor<any, any, any>
175-
): Invoker<any, any, any>;
176-
registration: 'aurelia:registration';
177-
get(
178-
metadataKey: 'aurelia:registration',
179-
target: any
180-
): SingletonRegistration<any, any, any> | TransientRegistration<any, any, any>;
181-
}
136+
export declare class FactoryInvoker<TBase = any, TArgs extends Args<TBase> = Args<TBase>, TImpl extends Impl<TBase> = Impl<TBase>> {
137+
static instance: FactoryInvoker;
138+
invoke(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, dependencies: TArgs): ImplOrAny<TImpl>;
139+
invokeWithDynamicDependencies(container: Container, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>, staticDependencies: TArgs[number][], dynamicDependencies: TArgs[number][]): ImplOrAny<TImpl>;
182140
}
183141
export declare const _emptyParameters: [];
184142
export declare class InvocationHandler<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> {
@@ -196,10 +154,6 @@ export declare class Container {
196154
static instance: Container;
197155
parent: Container;
198156
root: Container;
199-
_configuration: ContainerConfiguration;
200-
_onHandlerCreated: (handler: InvocationHandler<any, any, any>) => InvocationHandler<any, any, any>;
201-
_handlers: Map<any, any>;
202-
_resolvers: Map<any, any>;
203157
constructor(configuration?: ContainerConfiguration);
204158
makeGlobal(): Container;
205159
setHandlerCreatedCallback<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(onHandlerCreated: (handler: InvocationHandler<TBase, TImpl, TArgs>) => InvocationHandler<TBase, TImpl, TArgs>): void;
@@ -227,4 +181,19 @@ export declare class Container {
227181
}): InvocationHandler<TBase, TImpl, TArgs>;
228182
}
229183
export declare function autoinject(potentialTarget?: DependencyCtor<any, any, any>): any;
230-
export declare function inject<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(...rest: TArgs[number][]): any;
184+
export declare function inject<TBase, TImpl extends Impl<TBase> = Impl<TBase>, TArgs extends Args<TBase> = Args<TBase>>(...rest: TArgs[number][]): any;
185+
export declare function registration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(value: Registration<TBase, TImpl, TArgs>): any;
186+
export declare function transient<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(key?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>): any;
187+
export declare function singleton(registerInChild?: boolean): any;
188+
export declare function singleton<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>>(key?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, registerInChild?: boolean): any;
189+
export interface Registration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> {
190+
registerResolver(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>): Resolver;
191+
}
192+
export declare class TransientRegistration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> implements Registration<TBase, TImpl, TArgs> {
193+
constructor(key?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>);
194+
registerResolver(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>): Resolver;
195+
}
196+
export declare class SingletonRegistration<TBase, TImpl extends Impl<TBase>, TArgs extends Args<TBase>> implements Registration<TBase, TImpl, TArgs> {
197+
constructor(keyOrRegisterInChild?: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs> | boolean, registerInChild?: boolean);
198+
registerResolver(container: Container, key: PrimitiveOrDependencyCtor<TBase, TImpl, TArgs>, fn: DependencyCtorOrFunctor<TBase, TImpl, TArgs>): Resolver;
199+
}

dist/commonjs/aurelia-dependency-injection.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,7 @@ function invokeWithDynamicDependencies(container, fn, staticDependencies, dynami
370370
var classInvoker = {
371371
invoke: function (container, Type, deps) {
372372
var instances = deps.map(function (dep) { return container.get(dep); });
373-
var inst = Object.create(Type.prototype);
374-
Type.apply(inst, instances);
375-
return inst;
373+
return Reflect.construct(Type, instances);
376374
},
377375
invokeWithDynamicDependencies: invokeWithDynamicDependencies
378376
};

dist/es2015/aurelia-dependency-injection.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ function invokeWithDynamicDependencies(container, fn, staticDependencies, dynami
319319
const classInvoker = {
320320
invoke(container, Type, deps) {
321321
const instances = deps.map((dep) => container.get(dep));
322-
const inst = Object.create(Type.prototype);
323-
Type.apply(inst, instances);
324-
return inst;
322+
return Reflect.construct(Type, instances);
325323
},
326324
invokeWithDynamicDependencies
327325
};

dist/es2017/aurelia-dependency-injection.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ function invokeWithDynamicDependencies(container, fn, staticDependencies, dynami
319319
const classInvoker = {
320320
invoke(container, Type, deps) {
321321
const instances = deps.map((dep) => container.get(dep));
322-
const inst = Object.create(Type.prototype);
323-
Type.apply(inst, instances);
324-
return inst;
322+
return Reflect.construct(Type, instances);
325323
},
326324
invokeWithDynamicDependencies
327325
};

dist/native-modules/aurelia-dependency-injection.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,7 @@ function invokeWithDynamicDependencies(container, fn, staticDependencies, dynami
366366
var classInvoker = {
367367
invoke: function (container, Type, deps) {
368368
var instances = deps.map(function (dep) { return container.get(dep); });
369-
var inst = Object.create(Type.prototype);
370-
Type.apply(inst, instances);
371-
return inst;
369+
return Reflect.construct(Type, instances);
372370
},
373371
invokeWithDynamicDependencies: invokeWithDynamicDependencies
374372
};

0 commit comments

Comments
 (0)