@aurelia/kernel - npm Package Compare versions

Comparing version 0.3.0-dev.20181025 to 0.3.0-dev.20181026

dist/di.d.ts

 import { Constructable, IIndexable, Injectable, Primitive } from './interfaces';
 export declare type ResolveCallback<T = any> = (handler?: IContainer, requestor?: IContainer, resolver?: IResolver) => T;
 export declare type Key<T> = InterfaceSymbol<T> | Primitive | IIndexable | Function;
-export declare type InterfaceSymbol<T> = (target: Injectable, property: string, index: number) => any;
+export declare type InterfaceSymbol<T> = (target: Injectable<T>, property: string, index: number) => any;
 export interface IDefaultableInterfaceSymbol<T> extends InterfaceSymbol<T> {
@@ -23,6 +23,4 @@ withDefault(configure: (builder: IResolverBuilder<T>) => IResolver): InterfaceSymbol<T>;
     has(key: any, searchAncestors: boolean): boolean;
-    get<T>(key: Key<T>): T;
-    get<T extends Constructable>(key: T): InstanceType<T>;
-    getAll<T>(key: Key<T>): ReadonlyArray<T>;
-    getAll<T extends Constructable>(key: T): ReadonlyArray<InstanceType<T>>;
+    get<K>(key: Constructable<unknown> | Key<unknown> | IResolver<unknown> | K): K extends InterfaceSymbol<infer T> ? T : K extends Constructable ? InstanceType<K> : K extends IResolver<infer T1> ? T1 extends Constructable ? InstanceType<T1> : T1 : K;
+    getAll<K>(key: Constructable<unknown> | Key<unknown> | IResolver<unknown> | K): K extends InterfaceSymbol<infer T> ? ReadonlyArray<T> : K extends Constructable ? ReadonlyArray<InstanceType<K>> : K extends IResolver<infer T1> ? T1 extends Constructable ? ReadonlyArray<InstanceType<T1>> : ReadonlyArray<T1> : ReadonlyArray<K>;
 }
@@ -29,0 +27,0 @@ export interface IRegistry {

package.json

 {
   "name": "@aurelia/kernel",
-  "version": "0.3.0-dev.20181025",
+  "version": "0.3.0-dev.20181026",
   "main": "dist/index.umd.js",
@@ -79,3 +79,3 @@ "module": "dist/index.es6.js",
   },
-  "gitHead": "acf6a8f8feb6a3d128572a56f03e8099788beb99"
+  "gitHead": "a0478483d64f14d6c1aa216cffaffaa043511669"
 }

src/di.ts

@@ -10,3 +10,3 @@ // tslint:disable:no-reserved-keywords
 
-export type InterfaceSymbol<T> = (target: Injectable, property: string, index: number) => any;
+export type InterfaceSymbol<T> = (target: Injectable<T>, property: string, index: number) => any;
 
@@ -36,7 +36,13 @@ export interface IDefaultableInterfaceSymbol<T> extends InterfaceSymbol<T> {
 
-  get<T>(key: Key<T>): T;
-  get<T extends Constructable>(key: T): InstanceType<T>;
+  get<K>(key: Constructable<unknown> | Key<unknown> | IResolver<unknown> | K):
+    K extends InterfaceSymbol<infer T> ? T :
+    K extends Constructable ? InstanceType<K> :
+    K extends IResolver<infer T1> ? T1 extends Constructable ? InstanceType<T1> : T1 :
+    K;
 
-  getAll<T>(key: Key<T>): ReadonlyArray<T>;
-  getAll<T extends Constructable>(key: T): ReadonlyArray<InstanceType<T>>;
+  getAll<K>(key: Constructable<unknown> | Key<unknown> | IResolver<unknown> | K):
+    K extends InterfaceSymbol<infer T> ? ReadonlyArray<T> :
+    K extends Constructable ? ReadonlyArray<InstanceType<K>> :
+    K extends IResolver<infer T1> ? T1 extends Constructable ? ReadonlyArray<InstanceType<T1>> : ReadonlyArray<T1> :
+    ReadonlyArray<K>;
 }
@@ -475,3 +481,3 @@
 
-  public getAll(key: any): ReadonlyArray<any> {
+  public getAll(key: any): any {
     validateKey(key);
@@ -478,0 +484,0 @@

No alert changes

Improved metrics

Total package byte prevSize

179150

increased by1.12%

Lines of code

1986

increased by0.25%

No dependency changes