udic 0.1.3 → 0.1.4

package/README.md

@@ -1,10 +1,9 @@
 A dependency injection library.
-
-# Examples
 ```ts
 import * as di from 'udic';
 ```
 
+# Examples
 Run code that depends on a service:
 ```ts
 // Create a service that generates random number

package/index.d.ts

@@ -1,6 +1,7 @@
 declare const _: unique symbol;
 type _ = typeof _;
 type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+type Prettify<T> = { [K in keyof T] : T[K] } & {};
 export interface Service<
 	T extends string | symbol,
 	K
@@ -16,11 +17,8 @@ export interface Compute<
 	0: R;
 	[_]: T;
 }
-export type AnyService = Service<string | symbol, any>;
-export type AnyCompute = Compute<any, any>;
-export type Dependency = AnyService | AnyCompute;
-export type InferDependencies<T extends Dependency[]> = { [K in keyof T] : T[K][0] };
-export type InferRecord<T extends Dependency[]> = UnionToIntersection<T[number][_]>;
+export type Dependency = Service<any, any> | Compute<any, any>;
+export type InferDependencies<T extends Dependency> = Prettify<UnionToIntersection<T[_]>>;
 /**
 * Create a service
 * @param name - The service name
@@ -34,14 +32,15 @@ export declare const service: <T extends string | symbol>(name: T) => (<K>() =>
 export declare const derive: <
 	const T extends Dependency[],
 	const R
->(deps: T, f: (...args: InferDependencies<T>) => R) => Compute<InferRecord<T>, R>;
+>(deps: T, f: (...args: { [K in keyof T] : T[K][0] }) => R) => Compute<InferDependencies<T[number]>, R>;
 /**
 * Inject some dependencies to the compute
 * @param compute
 * @param deps - Dependencies to inject
 */
 export declare const inject: <
-	T extends AnyCompute,
-	D extends Partial<T[_]>
->(compute: T, d: D) => Compute<Omit<T[_], keyof D>, T[0]>;
+	T,
+	R,
+	D extends Partial<T>
+>(compute: Compute<T, R>, d: D) => Compute<Prettify<Omit<T, keyof D>>, R>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "udic",
-"version": "0.1.3",
+"version": "0.1.4",
 "description": "A simple dependency injection library",
 "keywords": ["di"],
 "license": "MIT",