fix: registerValue constrains

Author: castarco

lambda-ioc/deno/container.ts

@@ -141,7 +141,14 @@ export interface WritableContainer<
    * @param name The "name" of the dependency (can be a symbol).
    * @param dependency An already instantiated value.
    */
-  registerValue<TName extends ContainerKey, TDependency>(
+  registerValue<
+    TName extends ContainerKey,
+    TDependency extends TName extends keyof TSyncDependencies
+      ? TSyncDependencies[TName]
+      : TName extends keyof TAsyncDependencies
+      ? never
+      : unknown,
+  >(
     name: TName,
     dependency: TDependency,
   ): Container<
@@ -280,13 +287,21 @@ function __createContainer<
         Container<TSyncDependencies, {}>
       >,
     ): ContainerWithNewSyncDep<TName, TDependency> {
-      return __createContainer(
-        {
-          ...syncDependencies,
-          [name]: dependency,
-        },
-        asyncDependencies,
-      ) as ContainerWithNewSyncDep<TName, TDependency>
+      if (name in syncDependencies) {
+        return __createContainer(
+          {
+            ...syncDependencies,
+            [name]: dependency,
+          },
+          asyncDependencies,
+        ) as ContainerWithNewSyncDep<TName, TDependency>
+      } else {
+        ;(syncDependencies as Record<TName, unknown>)[name] = dependency
+        return __createContainer(
+          syncDependencies,
+          asyncDependencies,
+        ) as ContainerWithNewSyncDep<TName, TDependency>
+      }
     },
 
     registerAsync<TName extends ContainerKey, TDependency>(
@@ -296,23 +311,39 @@ function __createContainer<
         Container<TSyncDependencies, TAsyncDependencies>
       >,
     ): ContainerWithNewAsyncDep<TName, TDependency> {
-      return __createContainer(syncDependencies, {
-        ...asyncDependencies,
-        [name]: dependency,
-      }) as ContainerWithNewAsyncDep<TName, TDependency>
+      if (name in asyncDependencies) {
+        return __createContainer(syncDependencies, {
+          ...asyncDependencies,
+          [name]: dependency,
+        }) as ContainerWithNewAsyncDep<TName, TDependency>
+      } else {
+        ;(asyncDependencies as Record<TName, unknown>)[name] = dependency
+        return __createContainer(
+          syncDependencies,
+          asyncDependencies,
+        ) as ContainerWithNewAsyncDep<TName, TDependency>
+      }
     },
 
     registerValue<TName extends ContainerKey, TDependency>(
       name: TName,
       dependency: TDependency,
     ): ContainerWithNewSyncDep<TName, TDependency> {
-      return __createContainer(
-        {
-          ...syncDependencies,
-          [name]: () => dependency,
-        },
-        asyncDependencies,
-      ) as ContainerWithNewSyncDep<TName, TDependency>
+      if (name in syncDependencies) {
+        return __createContainer(
+          {
+            ...syncDependencies,
+            [name]: () => dependency,
+          },
+          asyncDependencies,
+        ) as ContainerWithNewSyncDep<TName, TDependency>
+      } else {
+        ;(syncDependencies as Record<TName, unknown>)[name] = () => dependency
+        return __createContainer(
+          syncDependencies,
+          asyncDependencies,
+        ) as ContainerWithNewSyncDep<TName, TDependency>
+      }
     },
 
     resolve<TName extends keyof TSyncDependencies>(

lambda-ioc/src/__tests__/container.test.ts

@@ -55,12 +55,15 @@ describe('container', () => {
         async (c) => c.resolve('a') * (await c.resolveAsync('c')),
       )
     const c2 = c1.register('a', () => 7)
+    const c3 = c2.registerValue('a', 13)
 
     expect(c1.resolve('ab')).toBe(15)
     expect(c2.resolve('ab')).toBe(35)
+    expect(c3.resolve('ab')).toBe(65)
 
     expect(await c1.resolveAsync('ac')).toBe(33)
     expect(await c2.resolveAsync('ac')).toBe(77)
+    expect(await c3.resolveAsync('ac')).toBe(143)
   })
 
   it('can re-register async dependencies (without changing the "original" container)', async () => {

lambda-ioc/src/container.ts

@@ -141,7 +141,14 @@ export interface WritableContainer<
    * @param name The "name" of the dependency (can be a symbol).
    * @param dependency An already instantiated value.
    */
-  registerValue<TName extends ContainerKey, TDependency>(
+  registerValue<
+    TName extends ContainerKey,
+    TDependency extends TName extends keyof TSyncDependencies
+      ? TSyncDependencies[TName]
+      : TName extends keyof TAsyncDependencies
+      ? never
+      : unknown,
+  >(
     name: TName,
     dependency: TDependency,
   ): Container<