udic 0.1.4 → 0.2.0

package/index.d.ts

@@ -1,40 +1,41 @@
-declare const _: unique symbol;
-type _ = typeof _;
+declare const _t: unique symbol;
+declare const _d: unique symbol;
 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
 > {
-	0: K;
-	[_]: undefined extends K ? { [k in T]? : K } : { [k in T] : K };
+	[_t]: K;
+	[_d]: undefined extends K ? { [k in T]? : K } : { [k in T] : K };
 }
 export interface Compute<
 	T,
 	R
 > {
+	[_t]: R;
+	[_d]: T;
 	(c: T): R;
-	0: R;
-	[_]: T;
 }
 export type Dependency = Service<any, any> | Compute<any, any>;
-export type InferDependencies<T extends Dependency> = Prettify<UnionToIntersection<T[_]>>;
+export type InferResult<T extends Dependency> = T[typeof _t];
+export type InferDependency<T extends Dependency> = Prettify<UnionToIntersection<T[typeof _d]>>;
 /**
 * Create a service
 * @param name - The service name
 */
-export declare const service: <T extends string | symbol>(name: T) => (<K>() => Service<T, K>);
+export declare const service: <T extends string | symbol>(name: T) => (<K>() => Service<T, K> & T);
 /**
-* Create a service that relies on other services
+* Create a compute that relies on other services or computes
 * @param deps - The service dependencies
 * @param f
 */
 export declare const derive: <
 	const T extends Dependency[],
 	const R
->(deps: T, f: (...args: { [K in keyof T] : T[K][0] }) => R) => Compute<InferDependencies<T[number]>, R>;
+>(deps: T, f: (...args: { [K in keyof T] : InferResult<T[K]> }) => R) => Compute<InferDependency<T[number]>, R>;
 /**
-* Inject some dependencies to the compute
+* Inject dependencies to the compute
 * @param compute
 * @param deps - Dependencies to inject
 */

package/index.js

@@ -1 +1 @@
-export let service=e=>()=>e;export let derive=(e,t)=>n=>t(...e.map(e=>typeof e===`function`?n[e]??=e(n):n[e]));export let inject=(e,t)=>n=>e({...n,...t});
+;export let service=e=>()=>e;export let derive=(e,t)=>n=>t(...e.map(e=>typeof e===`function`?n[e]??=e(n):n[e]));export let inject=(e,t)=>n=>e({...n,...t});

package/package.json

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