udic 0.4.0 → 1.1.0

package/index.d.ts

@@ -1,50 +1,49 @@
 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 MergeUnion<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+type UnwrapReturn<T> = T extends () => infer R ? R : T;
 type Prettify<T> = { [K in keyof T] : T[K] } & {};
+type List<T> = [T, ...T[]];
+export type Dependency = (() => Service) | Compute;
+export type TDependency<T extends Dependency | Impl> = MergeUnion<UnwrapReturn<T>[typeof _d]>;
+export type TResult<T extends Dependency | Impl> = UnwrapReturn<T>[typeof _t];
 export interface Service<
-	K extends string,
-	T
+	K extends string = any,
+	T = any
 > {
 	[_t]: T;
 	[_d]: undefined extends T ? { [k in K]? : T } : { [k in K] : T };
 }
 export interface Compute<
-	T,
-	R
+	T = any,
+	R = any
 > {
 	[_t]: R;
 	[_d]: T;
 	(c: T): R;
 }
-export interface ServiceImpl<
-	K extends string,
-	D,
-	R
+export interface Impl<
+	K extends string = any,
+	D = any,
+	R = any
 > {
 	[_t]: { [k in K] : R };
 	[_d]: D;
 }
-export type InferResult<T extends {
-	[_t]: any
-}> = T[typeof _t];
-export type InferDependency<T extends {
-	[_d]: any
-}> = Prettify<UnionToIntersection<T[typeof _d]>>;
 /**
 * Create a service
 * @param name - The service name
 */
-export declare const service: <const T extends string>(name: T) => (<K>() => Service<T, K> & T);
+export declare const service: <const T extends string>(name: T) => (<K>() => Service<T, K>);
 /**
 * Create a compute that relies on other services or computes
 * @param deps - The service dependencies
 * @param f
 */
-export declare const derive: <
-	const T extends (Service<any, any> | Compute<any, any>)[],
+export declare const use: <
+	const T extends List<(() => Service<any, any>) | Compute<any, any>>,
 	R
->(deps: T, f: (...args: { [K in keyof T] : InferResult<T[K]> }) => R) => Compute<InferDependency<T[number]>, R>;
+>(deps: T, f: (...args: { [K in keyof T] : TResult<T[K]> }) => R) => Compute<TDependency<T[number]>, R>;
 /**
 * Inject dependencies to the compute
 * @param compute
@@ -55,13 +54,23 @@ export declare const inject: <
 	R,
 	D extends Partial<T>
 >(compute: Compute<T, R>, d: D) => Compute<Prettify<Omit<T, keyof D>>, R>;
+/**
+* Create an implementation of the service that depends on other services
+* @param service
+* @param compute
+*/
 export declare const impl: <
 	K extends string,
 	T,
 	D
->(service: Service<K, T>, compute: Compute<D, T>) => ServiceImpl<K, D, T>;
-export declare const merge: <
-	const T extends ServiceImpl<any, any, any>[],
-	D extends InferDependency<T[number]>
->(layers: T, deps: D) => Prettify<D & InferResult<T[number]>>;
+>(service: () => Service<K, T>, compute: Compute<D, T>) => Impl<K, D, T>;
+/**
+* Provide dependencies to implementations
+* @param impls
+* @param deps
+*/
+export declare const link: <
+	const T extends List<Impl>,
+	D extends TDependency<T[number]>
+>(impls: T, deps: D) => Prettify<D & TResult<T[number]>>;
 export {};

package/index.js

@@ -1 +1 @@
-let _t=Symbol();export let service=e=>()=>e;let tag=i=>(i[_t]=Symbol(),i);export let derive=(i,o)=>tag(a=>o(...i.map(i=>typeof i===`function`?a[i[_t]]??=i(a):a[i])));export let inject=(e,i)=>tag(a=>e({...a,...i}));export let impl=(e,i)=>[e,i];export let merge=(e,i)=>{i={...i};for(let a=0;a<e.length;a++)i[e[a][0]]=e[a][1](i);return i};
+let _t=Symbol();export let service=e=>e;let _=i=>(i[_t]=Symbol(),i);export let use=(i,o)=>_(a=>o(...i.map(i=>typeof i===`function`?a[i[_t]]??=i(a):a[i])));export let inject=(e,i)=>_(a=>e({...a,...i}));export let impl=(e,i)=>[e,i];export let link=(e,i)=>{i={...i};for(let a=0;a<e.length;a++)i[e[a][0]]=e[a][1](i);return i};

package/package.json

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