Remove double type df

TiMESPLiNTER · Feb 9, 2024 · 7f1b77e · 7f1b77e
1 parent abcd7d4
commit 7f1b77e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/cjs/pimple.d.ts b/lib/cjs/pimple.d.ts
@@ -6,7 +6,7 @@ type ProviderDeclaration<T> = ServiceProviderFunction<T> | ServiceProvider<T>;
 type LazyServiceDefinition<T, S> = (container: Pimple<T>) => S;
 type ProtectedServiceDefinition<T, S> = () => LazyServiceDefinition<T, S>;
 type PlainServiceDefinition<S> = S extends Function ? () => S : S;
-type ServiceDefinition<T, S> = PlainServiceDefinition<S> | LazyServiceDefinition<T, S> | ProtectedServiceDefinition<T, S> | (S extends Function ? () => S : S);
+type ServiceDefinition<T, S> = PlainServiceDefinition<S> | LazyServiceDefinition<T, S> | ProtectedServiceDefinition<T, S>;
 type ServiceMap<T> = {
     [key in ServiceKey<T>]: ServiceDefinition<T, T[ServiceKey<T>]>;
 };

diff --git a/lib/esm/pimple.d.ts b/lib/esm/pimple.d.ts
@@ -6,7 +6,7 @@ type ProviderDeclaration<T> = ServiceProviderFunction<T> | ServiceProvider<T>;
 type LazyServiceDefinition<T, S> = (container: Pimple<T>) => S;
 type ProtectedServiceDefinition<T, S> = () => LazyServiceDefinition<T, S>;
 type PlainServiceDefinition<S> = S extends Function ? () => S : S;
-type ServiceDefinition<T, S> = PlainServiceDefinition<S> | LazyServiceDefinition<T, S> | ProtectedServiceDefinition<T, S> | (S extends Function ? () => S : S);
+type ServiceDefinition<T, S> = PlainServiceDefinition<S> | LazyServiceDefinition<T, S> | ProtectedServiceDefinition<T, S>;
 type ServiceMap<T> = {
     [key in ServiceKey<T>]: ServiceDefinition<T, T[ServiceKey<T>]>;
 };

diff --git a/src/pimple.ts b/src/pimple.ts
@@ -9,7 +9,7 @@ type ProviderDeclaration<T> = ServiceProviderFunction<T>|ServiceProvider<T>;
 type LazyServiceDefinition<T, S> = (container: Pimple<T>) => S;
 type ProtectedServiceDefinition<T, S> = () => LazyServiceDefinition<T, S>;
 type PlainServiceDefinition<S> = S extends Function ? () => S : S; // If a function, it needs to be wrapped/protected
-type ServiceDefinition<T, S> = PlainServiceDefinition<S>|LazyServiceDefinition<T, S>|ProtectedServiceDefinition<T, S>|(S extends Function ? () => S : S);
+type ServiceDefinition<T, S> = PlainServiceDefinition<S>|LazyServiceDefinition<T, S>|ProtectedServiceDefinition<T, S>;
 type ServiceMap<T> = { [key in ServiceKey<T>]: ServiceDefinition<T, T[ServiceKey<T>]> };
 
 /**