Add ContextUpRef type

Author: surol

src/context-ref.ts

@@ -75,6 +75,10 @@ export interface ContextTarget<Src, Seed = unknown> extends ContextRequest<any,
 
 /**
  * Context value reference that can serve both as [[ContextRequest]] and as [[ContextTarget]].
+ *
+ * @typeparam Value  Context value type.
+ * @typeparam Src  Source value type.
+ * @typeparam Seed  Value seed type.
  */
 export interface ContextRef<Value, Src = Value, Seed = unknown>
     extends ContextRequest<Value, Seed>, ContextTarget<Src, Seed> {

src/context-up-key.ts

@@ -98,6 +98,15 @@ class ContextSeedUpKey<Src> extends ContextSeedKey<Src | EventKeeper<Src[]>, Aft
 
 }
 
+/**
+ * Updatable context value reference.
+ *
+ * @typeparam Value  Context value type.
+ * @typeparam Src  Source value type.
+ * @typeparam Seed  Value seed type.
+ */
+export type ContextUpRef<Value, Src, Seed = unknown> = ContextRef<Value, Src | EventKeeper<Src[]>, Seed>;
+
 /**
  * Abstract implementation of updatable context value key.
  *
@@ -108,7 +117,9 @@ class ContextSeedUpKey<Src> extends ContextSeedKey<Src | EventKeeper<Src[]>, Aft
  * @typeparam Value  Context value type.
  * @typeparam Src  Source value type.
  */
-export abstract class ContextUpKey<Value, Src> extends ContextKey<Value, Src | EventKeeper<Src[]>, AfterEvent<Src[]>> {
+export abstract class ContextUpKey<Value, Src>
+    extends ContextKey<Value, Src | EventKeeper<Src[]>, AfterEvent<Src[]>>
+    implements ContextUpRef<Value, Src, AfterEvent<Src[]>> {
 
   readonly seedKey: ContextSeedKey<Src | EventKeeper<Src[]>, AfterEvent<Src[]>>;
 
@@ -131,8 +142,7 @@ export abstract class ContextUpKey<Value, Src> extends ContextKey<Value, Src | E
  * @typeparam Value  Context value type.
  * @typeparam Seed  Value seed type.
  */
-export type SingleContextUpRef<Value, Seed = unknown> =
-    ContextRef<AfterEvent<[Value]>, Value | AfterEvent<Value[]>, Seed>;
+export type SingleContextUpRef<Value, Seed = unknown> = ContextUpRef<AfterEvent<[Value]>, Value, Seed>;
 
 /**
  * Single updatable context value key.
@@ -211,8 +221,7 @@ export class SingleContextUpKey<Value>
  * @typeparam Src  Source value type.
  * @typeparam Seed  Value seed type.
  */
-export type MultiContextUpRef<Src, Seed = unknown> =
-    ContextRef<AfterEvent<Src[]>, Src | AfterEvent<Src[]>, Seed>;
+export type MultiContextUpRef<Src, Seed = unknown> = ContextUpRef<AfterEvent<Src[]>, Src, Seed>;
 
 /**
  * Multiple updatable context values key.

src/fn-context-key.ts

@@ -1,8 +1,7 @@
 import { AfterEvent, EventKeeper } from 'fun-events';
 import { ContextSeedKey, ContextValueOpts } from './context-key';
 import { ContextKeyError } from './context-key-error';
-import { ContextRef } from './context-ref';
-import { ContextUpKey } from './context-up-key';
+import { ContextUpKey, ContextUpRef } from './context-up-key';
 import { ContextValues } from './context-values';
 
 /**
@@ -12,10 +11,8 @@ import { ContextValues } from './context-values';
  * @typeparam Ret  Function return value type.
  * @typeparam Seed  Value seed type.
  */
-export type FnContextRef<Args extends any[], Ret = void, Seed = unknown> = ContextRef<
-    (this: void, ...args: Args) => Ret,
-    ((this: void, ...args: Args) => Ret) | EventKeeper<((this: void, ...args: Args) => Ret)[]>,
-    Seed>;
+export type FnContextRef<Args extends any[], Ret = void, Seed = unknown> =
+    ContextUpRef<(this: void, ...args: Args) => Ret, (this: void, ...args: Args) => Ret, Seed>;
 
 /**
  * A key of updatable context function value.