udic 2.0.5 → 2.0.7

package/index.d.ts

@@ -2,48 +2,56 @@ type ObjectUnionToIntersect<T> = { [K in T as K & string] : K }[any];
 export type ContextArgs = {
 	[key: string | symbol]: any
 } | ((...args: any[]) => any);
-export type Context<Deps extends ContextArgs> = ObjectUnionToIntersect<Deps extends ImplTag<infer C> ? C : Deps extends (c: infer C, ...args: any[]) => any ? C : Deps>;
-export interface ImplTag<Context> {
-	"~infer": Context;
+export type Context<Deps extends ContextArgs> = ObjectUnionToIntersect<Deps extends ImplTag<any, any> ? Deps["~infer"] : Deps extends (c: infer C, ...args: any[]) => any ? C : Deps>;
+export interface ImplTag<
+	In,
+	Out
+> {
+	"~in": In;
+	"~infer": In & Out;
+}
+export interface SyncImplTag<
+	In,
+	Out
+> extends ImplTag<In, Out> {
+	"~sync": 1;
 }
 export interface Impl {
-	<const F>(fn: F): F & ImplTag<F extends (() => infer Out extends {}) ? Out : F extends ((c: infer In extends {}) => infer Out extends {}) ? In & Out : never>;
-	<const Out extends ContextArgs>(fn: () => Context<Out>): (() => Context<Out>) & ImplTag<Context<Out>>;
+	<const F extends (...args: any[]) => any>(fn: F): F & (F extends (() => infer Out extends {}) ? SyncImplTag<{}, Out> : F extends ((c: infer In extends {}) => infer Out extends {}) ? SyncImplTag<In, Out> : never);
+	<const Out extends ContextArgs>(fn: (c: {}) => Context<Out>): ((c: {}) => Context<Out>) & SyncImplTag<{}, Context<Out>>;
 	<
 		const In extends ContextArgs,
 		const Out extends ContextArgs
-	>(fn: (c: Context<In>) => Context<Out>): ((c: Context<In>) => Context<Out>) & ImplTag<Context<In> & Context<Out>>;
+	>(fn: (c: Context<In>) => Context<Out>): ((c: Context<In>) => Context<Out>) & SyncImplTag<Context<In>, Context<Out>>;
 }
 /**
 * Create a sync implementation of a dependency.
 */
 export declare const impl: Impl;
 export interface ImplAsync {
-	<const F>(fn: F): F & ImplTag<F extends (() => infer Out extends {} | Promise<{}>) ? Awaited<Out> : F extends ((c: infer In extends {}) => infer Out extends {} | Promise<{}>) ? In & Awaited<Out> : never>;
-	<const Out extends ContextArgs>(fn: () => Context<Out> | Promise<Context<Out>>): (() => Context<Out>) & ImplTag<Context<Out>>;
+	<const F extends (...args: any[]) => any>(fn: F): F & (F extends (() => infer Out extends {} | Promise<{}>) ? ImplTag<{}, Awaited<Out>> : F extends ((c: infer In extends {}) => infer Out extends {} | Promise<{}>) ? ImplTag<In, Awaited<Out>> : never);
+	<const Out extends ContextArgs>(fn: (c: {}) => Context<Out> | Promise<Context<Out>>): ((c: {}) => Context<Out>) & ImplTag<{}, Context<Out>>;
 	<
 		const In extends ContextArgs,
 		const Out extends ContextArgs
-	>(fn: (c: Context<In>) => Context<Out> | Promise<Context<Out>>): ((c: Context<In>) => Context<Out> | Promise<Context<Out>>) & ImplTag<Context<In> & Context<Out>>;
+	>(fn: (c: Context<In>) => Context<Out> | Promise<Context<Out>>): ((c: Context<In>) => Context<Out> | Promise<Context<Out>>) & ImplTag<Context<In>, Context<Out>>;
 }
 /**
 * Create an async implementation of a dependency.
 */
 export declare const implAsync: ImplAsync;
-type _ImplFn = (() => {} | Promise<{}>) | ((c: any) => {} | Promise<{}>);
-type _ImplFns = [_ImplFn, ..._ImplFn[]];
 /**
 * Link sync implementations.
 */
 export declare const link: <
-	const In extends {},
-	Impls extends _ImplFns
->(c: In, ...impls: Impls) => Context<Impls[number]>;
+	Impls extends [SyncImplTag<any, any>, ...SyncImplTag<any, any>[]],
+	const In extends ObjectUnionToIntersect<Impls[number]["~in"]>
+>(c: In, ...impls: Impls) => In & Context<Impls[number]>;
 /**
 * Link async implementations concurrently.
 */
 export declare const linkAsync: <
-	const In extends {},
-	Impls extends _ImplFns
->(c: In, ...impls: Impls) => Promise<Context<Impls[number]>>;
+	Impls extends [ImplTag<any, any>, ...ImplTag<any, any>[]],
+	const In extends ObjectUnionToIntersect<Impls[number]["~in"]>
+>(c: In, ...impls: Impls) => Promise<In & Context<Impls[number]>>;
 export {};

package/index.js

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

package/package.json

@@ -1 +1 @@
-{"name":"udic","version":"2.0.5","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.7","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"}}