From 722ee05a0a480aeb7ac9e59eeaacdfd164e3d66b Mon Sep 17 00:00:00 2001
From: Jos de Jong <wjosdejong@gmail.com>
Date: Thu, 14 Sep 2023 14:51:49 +0200
Subject: [PATCH] resolve any number of arguments

---
 src/infer.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/infer.ts b/src/infer.ts
index baf3d0c..7071c7b 100644
--- a/src/infer.ts
+++ b/src/infer.ts
@@ -36,21 +36,21 @@ function createFactory<BaseTypes extends Record<string, unknown>>() {
 
     type ResolveType<T extends K> = BaseTypes[T]
 
-    type ResolveTuple<T> =
-        T extends K ? [ResolveType<T>] :
-            T extends `${infer L extends K}, ${infer M extends K}` ? [ResolveType<L>, ResolveType<M>] :
-                T extends `${infer L extends K}, ${infer M extends K}, ${infer N extends K}`
-                    ? [ResolveType<L>, ResolveType<M>, ResolveType<N>]
-                    : never
+    type ResolveArguments<S extends string> =
+        S extends '' ? [] :
+          S extends `${infer T extends K}, ${infer U}`
+            ? [ResolveType<T>, ...ResolveArguments<U>]
+            : S extends `${infer T extends K}` ? [ResolveType<T>]
+              : never;
 
-    type ResolveFunction<T> =
+    type ResolveFunctionDef<T> =
         T extends `${infer Name}(${infer Args}) : ${infer L extends K}`
-            ? (...args: ResolveTuple<Args>) => ResolveType<L>
+            ? (...args: ResolveArguments<Args>) => ResolveType<L>
             : never
 
     return function create<T extends string, U extends string, V>(
         dependencies: { [L in T]: U },
-        callback: (deps: { [L in T]: ResolveFunction<U> }) => V
+        callback: (deps: { [L in T]: ResolveFunctionDef<U> }) => V
     ) {
         return callback
     }