udic 1.2.2 → 2.0.0

package/index.d.ts

@@ -1,76 +1,53 @@
-declare const _t: unique symbol;
-declare const _d: unique symbol;
-type UnionToIntersect<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 Evaluate<T> = { [K in keyof T] : T[K] } & {};
-type List<T> = [T, ...T[]];
-export type Dependency = (() => Service) | Compute;
-export type TDependency<T extends Dependency | Impl> = UnionToIntersect<UnwrapReturn<T>[typeof _d]>;
-export type TResult<T extends Dependency | Impl> = UnwrapReturn<T>[typeof _t];
-export interface Service<
-	K extends string = any,
-	T = any
-> {
-	[_t]: T;
-	[_d]: undefined extends T ? { [k in K]? : T } : { [k in K] : T };
-}
-export interface Compute<
-	T = any,
-	R = any
-> {
-	[_t]: R;
-	[_d]: T;
-	(c: T): R;
-}
+type ObjectUnionToIntersect<T> = { [K in T as K & string] : K }[any];
+export type ContextArgs = {
+	[key: string | symbol]: any
+} | ((c: {}, ...args: any[]) => any) | Impl;
+export type Context<Deps extends ContextArgs> = ObjectUnionToIntersect<Deps extends Impl ? Awaited<Deps["infer"]> : Deps extends (c: infer C, ...args: any[]) => any ? C : Deps>;
 export interface Impl<
-	K extends string = any,
-	D = any,
-	R = any
+	In = any,
+	Out extends {} = {}
 > {
-	[_t]: { [k in K] : R };
-	[_d]: D;
+	infer: Out;
+	(c: In): Out;
+}
+export interface ImplFn {
+	<const F extends () => {}>(fn: F): F extends (() => infer Out extends {}) ? Impl<{}, Out> : never;
+	<const F extends (c: any) => {}>(fn: F): F extends ((c: infer In) => infer Out extends {}) ? Impl<In, Out> : never;
+	<const Out extends ContextArgs>(fn: (c: {}) => Context<Out>): Impl<{}, Context<Out>>;
+	<
+		const In extends ContextArgs,
+		const Out extends ContextArgs
+	>(fn: (c: Context<In>) => Context<Out>): Impl<Context<In>, Context<Out>>;
 }
 /**
-* Create a service
-* @param name - The service name
-*/
-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
+* Create a sync implementation of a dependency.
 */
-export declare const use: <
-	const T extends List<Dependency>,
-	R
->(deps: T, f: (...args: { [K in keyof T] : TResult<T[K]> }) => R) => Compute<TDependency<T[number]>, R>;
+export declare const impl: ImplFn;
+export interface ImplAsyncFn {
+	<const F extends () => Promise<{}>>(fn: F): F extends (() => infer Out extends {}) ? Impl<{}, Out> : never;
+	<const F extends (c: any) => Promise<{}>>(fn: F): F extends ((c: infer In) => infer Out extends {}) ? Impl<In, Out> : never;
+	<const Out extends ContextArgs>(fn: (c: {}) => Promise<Context<Out>>): Impl<{}, Promise<Context<Out>>>;
+	<
+		const In extends ContextArgs,
+		const Out extends ContextArgs
+	>(fn: (c: Context<In>) => Promise<Context<Out>>): Impl<Context<In>, Promise<Context<Out>>>;
+}
 /**
-* Inject dependencies to the compute
-* @param compute
-* @param deps - Dependencies to inject
+* Create an async implementation of a dependency.
 */
-export declare const inject: <
-	T,
-	R,
-	D extends Partial<T>
->(compute: Compute<T, R>, d: D) => Compute<Evaluate<Omit<T, keyof D>>, R>;
+export declare const implAsync: ImplAsyncFn;
 /**
-* Create an implementation of the service that depends on other services
-* @param service
-* @param compute
+* Link sync implementations.
 */
-export declare const impl: <
-	K extends string,
-	T,
-	D
->(service: () => Service<K, T>, compute: Compute<D, T>) => Impl<K, D, T>;
+export declare const link: <
+	const In extends {},
+	Impls extends [Impl<In, any>, ...Impl<In, any>[]]
+>(c: In, ...impls: Impls) => In & ReturnType<Impls[number]>;
 /**
-* Provide dependencies to implementations
-* @param impls
-* @param deps
+* Link async implementations concurrently.
 */
-export declare const link: <
-	const T extends List<Impl>,
-	D extends TDependency<T[number]>
->(impls: T, deps: D) => Evaluate<D & UnionToIntersect<TResult<T[number]>>>;
+export declare const linkAsync: <
+	const In extends {},
+	Impls extends [Impl<In, any>, ...Impl<In, any>[]]
+>(c: In, ...impls: Impls) => Promise<In & Awaited<ReturnType<Impls[number]>>>;
 export {};

package/index.js

@@ -1 +1 @@
-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};
+export let impl=e=>e;export let implAsync=e=>e;export let link=(e,t,...n)=>{e=Object.assign(t(e),e);for(let t=0;t<n.length;t++)Object.assign(e,n[t](e));return e};export let linkAsync=async(e,...t)=>{if(t.length===1)return Object.assign(await t[0](e),e);let n=Array(t.length);for(let r=0;r<t.length;r++)n[r]=t[r](e);return Object.assign(...await Promise.all(n),e)};

package/package.json

@@ -1,18 +1 @@
-{
-"name": "udic",
-"version": "1.2.2",
-"description": "A simple dependency injection library",
-"keywords": ["di"],
-"license": "MIT",
-"homepage": "https://re-utils.pages.dev/di",
-"repository": {
-"type": "git",
-"url": "git+https://github.com/re-utils/di.git"
-},
-"type": "module",
-"main": "./index.js",
-"types": "./index.d.ts",
-"exports": {
-".": "./index.js"
-}
-}
+{"name":"udic","version":"2.0.0","description":"A simple dependency injection library","keywords":["di"],"license":"MIT","homepage":"https://re-utils.pages.dev/di","repository":{"type":"git","url":"git+https://github.com/re-utils/di.git"},"type":"module","main":"./index.js","types":"./index.d.ts","exports":{".":"./index.js"}}