udic 0.2.3 → 0.3.0

package/index.d.ts

@@ -3,11 +3,11 @@ 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,
-	K
+	K extends string,
+	T
 > {
-	[_t]: K;
-	[_d]: undefined extends K ? { [k in T]? : K } : { [k in T] : K };
+	[_t]: T;
+	[_d]: undefined extends T ? { [k in K]? : T } : { [k in K] : T };
 }
 export interface Compute<
 	T,
@@ -17,9 +17,21 @@ export interface Compute<
 	[_d]: T;
 	(c: T): R;
 }
-export type Dependency = Service<any, any> | Compute<any, any>;
-export type InferResult<T extends Dependency> = T[typeof _t];
-export type InferDependency<T extends Dependency> = Prettify<UnionToIntersection<T[typeof _d]>>;
+export interface Layer<
+	K extends string,
+	C extends Compute<any, any>
+> {
+	[_t]: { [k in K] : InferResult<C> };
+	[_d]: InferDependency<C>;
+	0: K;
+	1: C;
+}
+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
@@ -31,7 +43,7 @@ export declare const service: <T extends string>(name: T) => (<K>() => Service<T
 * @param f
 */
 export declare const derive: <
-	const T extends Dependency[],
+	const T extends (Service<any, any> | Compute<any, any>)[],
 	const R
 >(deps: T, f: (...args: { [K in keyof T] : InferResult<T[K]> }) => R) => Compute<InferDependency<T[number]>, R>;
 /**
@@ -45,7 +57,12 @@ export declare const inject: <
 	D extends Partial<T>
 >(compute: Compute<T, R>, d: D) => Compute<Prettify<Omit<T, keyof D>>, R>;
 export declare const layer: <
-	C extends Record<string, Compute<any, any>>,
-	D extends InferDependency<C[keyof C]>
->(r: C, d: D) => Prettify<{ [K in keyof C] : InferResult<C[K]> } & D>;
+	T,
+	K extends string,
+	const C extends Compute<any, T>
+>(service: Service<K, T>, compute: C) => Layer<K, C>;
+export declare const provide: <
+	const T extends Layer<any, any>[],
+	const D extends InferDependency<T[number]>
+>(layers: T, deps: D) => Prettify<D & InferResult<T[number]>>;
 export {};

package/index.js

@@ -1 +1 @@
-let _t=Symbol();export let service=e=>()=>e;let tag=r=>(r[_t]=Symbol(),r);export let derive=(r,a)=>tag(i=>a(...r.map(r=>typeof r===`function`?i[r[_t]]??=r(i):i[r])));export let inject=(e,r)=>tag(i=>e({...i,...r}));export let layer=(e,r)=>{for(let i in e)e[i]=e[i](r);return Object.assign(e,r)};
+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 layer=(e,i)=>[e,i];export let provide=(e,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.2.3",
+"version": "0.3.0",
 "description": "A simple dependency injection library",
 "keywords": ["di"],
 "license": "MIT",