react-obsidian 0.0.33 → 0.0.34

package/README.md

@@ -14,7 +14,7 @@ React Obsidian is a dependency injection framework for React and React Native ap
   * [Getting Started](https://wix-incubator.github.io/obsidian/docs/documentation/#the-2-steps-tutorial-for-injecting-dependencies-with-obsidian)
   * [Installation](https://wix-incubator.github.io/obsidian/docs/documentation/installation)
   * [Guides](https://wix-incubator.github.io/obsidian/docs/guides/mockDependencies)
-* [Chat on Discord](https://discord.gg/2g5vhGQN)
+* [Chat on Discord](https://discord.gg/MDH2axwaPy)
 
 ## Example - Injecting a hook
 Obsidian supports injecting hooks, components and classes. The example below shows how to inject a hook.
@@ -28,7 +28,7 @@ In the `ApplicationGraph` below, we declare two dependencies:
 
 Both functions are annotated by the `@Provides()` annotation. This signals Obsidian that the results of these functions are provided by the graph and can be injected.
 
-Notice how the biLogger function receives an `httpClient` as an argument. This means that `biLogger` is dependent on `httpClient`. Obsidian will create an `httpClient` when `biLogger` is injected. 
+Notice how the `biLogger` function receives an `httpClient` as an argument. This means that `biLogger` is dependent on `httpClient`. Obsidian will create an `httpClient` when `biLogger` is injected. 
 
 ``` typescript
 @Singleton() @Graph()
@@ -48,7 +48,7 @@ class ApplicationGraph extends ObjectGraph {
 ### Step 2: Inject a dependency
 
 ```typescript
-interface Injected = DependenciesOf<ApplicationGraph, 'biLogger'>;
+type Injected = DependenciesOf<ApplicationGraph, 'biLogger'>; // { biLogger: BiLogger }
 
 interface UseButtonPress {
   usePress: () => void;
@@ -78,4 +78,4 @@ const Component = () => (
     <button onclick={onClick}>Click Me</button>
   </>
 );
-```
+```

package/dist/src/index.d.ts

@@ -15,6 +15,8 @@ export declare const Obsidian: _Obsidian;
 export { injectComponent } from './injectors/components/InjectComponent';
 export { injectHook, injectHookWithArguments } from './injectors/hooks/InjectHook';
 export { useObserver } from './observable/useObserver';
-export { Observable, OnNext } from './observable/Observable';
+export { Observable } from './observable/Observable';
+export { ObservableMediator } from './observable/ObservableMediator';
+export { OnNext, Unsubscribe } from './observable/types';
 export { testKit } from '../testkit';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,cAAc,SAAS,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,IAAI,MAAM,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,iBAAiB,IAAI,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvF,eAAO,MAAM,QAAQ,WAAkB,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,cAAc,SAAS,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,IAAI,MAAM,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,iBAAiB,IAAI,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvF,eAAO,MAAM,QAAQ,WAAkB,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC"}

package/dist/src/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testKit = exports.Observable = exports.useObserver = exports.injectHookWithArguments = exports.injectHook = exports.injectComponent = exports.Obsidian = exports.GraphMiddleware = exports.LifecycleBound = exports.LazyInject = exports.Inject = exports.Injectable = exports.Provides = exports.ObjectGraph = exports.Singleton = exports.Graph = void 0;
+exports.testKit = exports.ObservableMediator = exports.Observable = exports.useObserver = exports.injectHookWithArguments = exports.injectHook = exports.injectComponent = exports.Obsidian = exports.GraphMiddleware = exports.LifecycleBound = exports.LazyInject = exports.Inject = exports.Injectable = exports.Provides = exports.ObjectGraph = exports.Singleton = exports.Graph = void 0;
 var Obsidian_1 = __importDefault(require("./Obsidian"));
 __exportStar(require("./types"), exports);
 var Graph_1 = require("./decorators/Graph");
@@ -48,6 +48,8 @@ var useObserver_1 = require("./observable/useObserver");
 Object.defineProperty(exports, "useObserver", { enumerable: true, get: function () { return useObserver_1.useObserver; } });
 var Observable_1 = require("./observable/Observable");
 Object.defineProperty(exports, "Observable", { enumerable: true, get: function () { return Observable_1.Observable; } });
+var ObservableMediator_1 = require("./observable/ObservableMediator");
+Object.defineProperty(exports, "ObservableMediator", { enumerable: true, get: function () { return ObservableMediator_1.ObservableMediator; } });
 var testkit_1 = require("../testkit");
 Object.defineProperty(exports, "testKit", { enumerable: true, get: function () { return testkit_1.testKit; } });
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wDAAmC;AAEnC,0CAAwB;AAExB,4CAA2C;AAAlC,8FAAA,KAAK,OAAA;AACd,oDAAmD;AAA1C,sGAAA,SAAS,OAAA;AAClB,mDAAkD;AAAzC,0GAAA,WAAW,OAAA;AAEpB,2DAA0D;AAAjD,oGAAA,QAAQ,OAAA;AACjB,6DAA4D;AAAnD,wGAAA,UAAU,OAAA;AACnB,qDAAoD;AAA3C,gGAAA,MAAM,OAAA;AACf,6DAA4D;AAAnD,wGAAA,UAAU,OAAA;AACnB,8DAA6D;AAApD,gHAAA,cAAc,OAAA;AACvB,oEAAmE;AAA1D,kHAAA,eAAe,OAAA;AAGX,QAAA,QAAQ,GAAG,IAAI,kBAAS,EAAE,CAAC;AAExC,0EAAyE;AAAhE,kHAAA,eAAe,OAAA;AACxB,2DAAmF;AAA1E,wGAAA,UAAU,OAAA;AAAE,qHAAA,uBAAuB,OAAA;AAE5C,wDAAuD;AAA9C,0GAAA,WAAW,OAAA;AACpB,sDAA6D;AAApD,wGAAA,UAAU,OAAA;AAEnB,sCAAqC;AAA5B,kGAAA,OAAO,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wDAAmC;AAEnC,0CAAwB;AAExB,4CAA2C;AAAlC,8FAAA,KAAK,OAAA;AACd,oDAAmD;AAA1C,sGAAA,SAAS,OAAA;AAClB,mDAAkD;AAAzC,0GAAA,WAAW,OAAA;AAEpB,2DAA0D;AAAjD,oGAAA,QAAQ,OAAA;AACjB,6DAA4D;AAAnD,wGAAA,UAAU,OAAA;AACnB,qDAAoD;AAA3C,gGAAA,MAAM,OAAA;AACf,6DAA4D;AAAnD,wGAAA,UAAU,OAAA;AACnB,8DAA6D;AAApD,gHAAA,cAAc,OAAA;AACvB,oEAAmE;AAA1D,kHAAA,eAAe,OAAA;AAGX,QAAA,QAAQ,GAAG,IAAI,kBAAS,EAAE,CAAC;AAExC,0EAAyE;AAAhE,kHAAA,eAAe,OAAA;AACxB,2DAAmF;AAA1E,wGAAA,UAAU,OAAA;AAAE,qHAAA,uBAAuB,OAAA;AAE5C,wDAAuD;AAA9C,0GAAA,WAAW,OAAA;AACpB,sDAAqD;AAA5C,wGAAA,UAAU,OAAA;AACnB,sEAAqE;AAA5D,wHAAA,kBAAkB,OAAA;AAG3B,sCAAqC;AAA5B,kGAAA,OAAO,OAAA"}

package/dist/src/observable/Observable.d.ts

@@ -1,12 +1,10 @@
-export type OnNext<T> = (value: T) => void;
-type Unsubscribe = () => void;
-export declare class Observable<T> {
-    private _value;
+import { Observable as IObservable, OnNext, Unsubscribe } from './types';
+export declare class Observable<T> implements IObservable<T> {
     private subscribers;
-    constructor(_value: T);
+    private currentValue;
+    constructor(initialValue?: T);
     get value(): T;
     set value(value: T);
     subscribe(onNext: OnNext<T>): Unsubscribe;
 }
-export {};
 //# sourceMappingURL=Observable.d.ts.map

package/dist/src/observable/Observable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Observable.d.ts","sourceRoot":"","sources":["../../../src/observable/Observable.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAC3C,KAAK,WAAW,GAAG,MAAM,IAAI,CAAC;AAE9B,qBAAa,UAAU,CAAC,CAAC;IAGX,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,WAAW,CAA6B;gBAE5B,MAAM,EAAE,CAAC;IAE7B,IAAW,KAAK,IAAI,CAAC,CAEpB;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,CAAC,EAGxB;IAEM,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW;CAOjD"}
+{"version":3,"file":"Observable.d.ts","sourceRoot":"","sources":["../../../src/observable/Observable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEzE,qBAAa,UAAU,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAClD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,YAAY,CAAgB;gBAExB,YAAY,CAAC,EAAE,CAAC;IAI5B,IAAW,KAAK,IAAI,CAAC,CAEpB;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,CAAC,EAGxB;IAEM,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW;CAOjD"}

package/dist/src/observable/Observable.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Observable = void 0;
 var Observable = /** @class */ (function () {
-    function Observable(_value) {
-        this._value = _value;
+    function Observable(initialValue) {
         this.subscribers = new Set();
+        this.currentValue = initialValue;
     }
     Object.defineProperty(Observable.prototype, "value", {
         get: function () {
-            return this._value;
+            return this.currentValue;
         },
         set: function (value) {
-            this._value = value;
+            this.currentValue = value;
             this.subscribers.forEach(function (subscriber) { return subscriber(value); });
         },
         enumerable: false,

package/dist/src/observable/Observable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Observable.js","sourceRoot":"","sources":["../../../src/observable/Observable.ts"],"names":[],"mappings":";;;AAIA;IAGE,oBAAoB,MAAS;QAAT,WAAM,GAAN,MAAM,CAAG;QAFrB,gBAAW,GAAmB,IAAI,GAAG,EAAE,CAAC;IAEhB,CAAC;IAEjC,sBAAW,6BAAK;aAAhB;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;aAED,UAAiB,KAAQ;YACvB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAC,UAAU,IAAK,OAAA,UAAU,CAAC,KAAK,CAAC,EAAjB,CAAiB,CAAC,CAAC;QAC9D,CAAC;;;OALA;IAOM,8BAAS,GAAhB,UAAiB,MAAiB;QAAlC,iBAMC;QALC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,cAAM,OAAA,KAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAA/B,CAA+B,CAAC;IAC/C,CAAC;IACH,iBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,gCAAU"}
+{"version":3,"file":"Observable.js","sourceRoot":"","sources":["../../../src/observable/Observable.ts"],"names":[],"mappings":";;;AAEA;IAIE,oBAAY,YAAgB;QAHpB,gBAAW,GAAmB,IAAI,GAAG,EAAE,CAAC;QAI9C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,sBAAW,6BAAK;aAAhB;YACE,OAAO,IAAI,CAAC,YAAiB,CAAC;QAChC,CAAC;aAED,UAAiB,KAAQ;YACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAC,UAAU,IAAK,OAAA,UAAU,CAAC,KAAK,CAAC,EAAjB,CAAiB,CAAC,CAAC;QAC9D,CAAC;;;OALA;IAOM,8BAAS,GAAhB,UAAiB,MAAiB;QAAlC,iBAMC;QALC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,cAAM,OAAA,KAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAA/B,CAA+B,CAAC;IAC/C,CAAC;IACH,iBAAC;AAAD,CAAC,AAxBD,IAwBC;AAxBY,gCAAU"}

package/dist/src/observable/ObservableMediator.d.ts

@@ -0,0 +1,14 @@
+import { Observable } from './Observable';
+import { OnNext, Unsubscribe, Observable as IObservable } from './types';
+export declare class ObservableMediator<T> implements IObservable<T> {
+    private subscribers;
+    private currentValue;
+    private sources;
+    constructor(initialValue?: T);
+    addSource<S>(source: Observable<S>, onNext: OnNext<S>): ObservableMediator<T>;
+    get value(): T;
+    set value(value: T);
+    subscribe(onNext: OnNext<T>): Unsubscribe;
+    private subscribeToAllSources;
+}
+//# sourceMappingURL=ObservableMediator.d.ts.map

package/dist/src/observable/ObservableMediator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservableMediator.d.ts","sourceRoot":"","sources":["../../../src/observable/ObservableMediator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AAQzE,qBAAa,kBAAkB,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAC1D,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,OAAO,CAAqB;gBAExB,YAAY,CAAC,EAAE,CAAC;IAI5B,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC;IAK7E,IAAW,KAAK,IAAI,CAAC,CAEpB;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,CAAC,EAGxB;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW;IAczC,OAAO,CAAC,qBAAqB;CAQ9B"}

package/dist/src/observable/ObservableMediator.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObservableMediator = void 0;
+var ObservableMediator = /** @class */ (function () {
+    function ObservableMediator(initialValue) {
+        this.subscribers = new Set();
+        this.sources = [];
+        this.currentValue = initialValue;
+    }
+    ObservableMediator.prototype.addSource = function (source, onNext) {
+        this.sources.push({ source: source, onNext: onNext });
+        return this;
+    };
+    Object.defineProperty(ObservableMediator.prototype, "value", {
+        get: function () {
+            return this.currentValue;
+        },
+        set: function (value) {
+            this.currentValue = value;
+            this.subscribers.forEach(function (subscriber) { return subscriber(value); });
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ObservableMediator.prototype.subscribe = function (onNext) {
+        var _this = this;
+        if (this.subscribers.has(onNext)) {
+            throw new Error('Subscriber already subscribed');
+        }
+        this.subscribers.add(onNext);
+        this.subscribeToAllSources();
+        return function () {
+            _this.subscribers.delete(onNext);
+            _this.sources.forEach(function (_a) {
+                var unsubscribe = _a.unsubscribe;
+                return unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
+            });
+        };
+    };
+    ObservableMediator.prototype.subscribeToAllSources = function () {
+        var _this = this;
+        this.sources.forEach(function (_a, index) {
+            var source = _a.source, onNext = _a.onNext;
+            var unsubscribe = source.subscribe(function (value) {
+                onNext(value);
+            });
+            _this.sources[index].unsubscribe = unsubscribe;
+        });
+    };
+    return ObservableMediator;
+}());
+exports.ObservableMediator = ObservableMediator;
+//# sourceMappingURL=ObservableMediator.js.map

package/dist/src/observable/ObservableMediator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservableMediator.js","sourceRoot":"","sources":["../../../src/observable/ObservableMediator.ts"],"names":[],"mappings":";;;AASA;IAKE,4BAAY,YAAgB;QAJpB,gBAAW,GAAmB,IAAI,GAAG,EAAE,CAAC;QAExC,YAAO,GAAkB,EAAE,CAAC;QAGlC,IAAI,CAAC,YAAY,GAAG,YAAiB,CAAC;IACxC,CAAC;IAED,sCAAS,GAAT,UAAa,MAAqB,EAAE,MAAiB;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sBAAW,qCAAK;aAAhB;YACE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;aAED,UAAiB,KAAQ;YACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAC,UAAU,IAAK,OAAA,UAAU,CAAC,KAAK,CAAC,EAAjB,CAAiB,CAAC,CAAC;QAC9D,CAAC;;;OALA;IAOD,sCAAS,GAAT,UAAU,MAAiB;QAA3B,iBAYC;QAXC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,OAAO;YACL,KAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChC,KAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,EAAe;oBAAb,WAAW,iBAAA;gBAAO,OAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,EAAI;YAAf,CAAe,CAAC,CAAC;QAC7D,CAAC,CAAC;IACJ,CAAC;IAEO,kDAAqB,GAA7B;QAAA,iBAOC;QANC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,EAAkB,EAAE,KAAK;gBAAvB,MAAM,YAAA,EAAE,MAAM,YAAA;YACpC,IAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,UAAC,KAAK;gBACzC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,KAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC;QAChD,CAAC,CAAC,CAAC;IACL,CAAC;IACH,yBAAC;AAAD,CAAC,AA7CD,IA6CC;AA7CY,gDAAkB"}

package/dist/src/observable/types.d.ts

@@ -0,0 +1,7 @@
+export type OnNext<T> = (value: T) => void;
+export type Unsubscribe = () => void;
+export interface Observable<T> {
+    value: T;
+    subscribe(onNext: OnNext<T>): Unsubscribe;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/src/observable/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/observable/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAC3C,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,MAAM,WAAW,UAAU,CAAC,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC;IACT,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;CAC3C"}

package/dist/src/observable/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/src/observable/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/observable/types.ts"],"names":[],"mappings":""}

package/documentation/docs/documentation/documentation.mdx

@@ -47,7 +47,7 @@ Obsidian can inject dependencies into components, hooks, and classes.
 <Tabs>
   <TabItem value="functionalComponent" label="Functional component injection" default>
 
-Injecting React functional components essentially revolves around two things: declaring the required dependencies in the hook's prototype and exporting an injected hook using the `injectComponent` function.
+Injecting React functional components essentially revolves around two things: declaring the required dependencies in the components's props and exporting an injected component using the `injectComponent` function.
 
 ```ts title="MyComponent.tsx"
 import {DependenciesOf, injectComponent} from 'react-obsidian';

package/documentation/docs/documentation/usage/Graphs.mdx

@@ -115,15 +115,6 @@ class HomeGraph extends ObjectGraph<HomeScreenProps> {
 }
 ```
 
-## Typed dependencies
-The `DependenciesOf` utility type creates a type of the dependencies provided by a graph. This type can be used to type the dependencies of hooks or props required by components. This utility type takes two arguments: the graph and a union of the keys of the dependencies we want to inject.
-
-In this example we create a type called `ApplicationDependencies` which contains the dependencies `httpClient` and `databaseService` from the `ApplicationGraph` graph.
-
-```ts
-type ApplicationDependencies = DependenciesOf<ApplicationGraph, 'httpClient' | 'databaseService'>; // {httpClient: httpClient, databaseService: DatabaseService}
-```
-
 ## Graph composition
 Graph composition is a powerful feature that allows you to create complex dependency graphs by combining smaller graphs. Composing graphs is useful when you want to reuse a graph in multiple places. For example, you might have a singleton graph that provides application-level dependencies. You might also have a lifecycle-bound graph that provides dependencies for a specific UI flow. You can compose these graphs together so that the lifecycle-bound graph can also inject the dependencies provided by the singleton graph.
 
@@ -144,3 +135,20 @@ export class LoginGraph extends ObjectGraph {
   }
 }
 ```
+
+## Typed dependencies
+The `DependenciesOf` utility type creates a new type consisting the dependencies provided by a graph. This type can be used to type the dependencies of hooks or props required by components. This utility type takes two arguments: the graph and a union of the keys of the dependencies we want to inject.
+
+In this example we create a type called `ApplicationDependencies` which contains the dependencies `httpClient` and `databaseService` from the `ApplicationGraph` graph.
+
+```ts
+// {httpClient: HttpClient, databaseService: DatabaseService}
+type Dependencies = DependenciesOf<ApplicationGraph, 'httpClient' | 'databaseService'>;
+```
+
+In cases where a graph has subgraphs, we can pass an array of graphs to the `DependenciesOf` utility type to create a type that contains the dependencies from all the graphs. Using the `LoginGraph` from the example above, we create a type that contains dependencies from both the `LoginGraph` and the `ApplicationGraph`:
+
+```ts
+// {httpClient: HttpClient, loginService: LoginService}
+type Dependencies = DependenciesOf<[LoginGraph, ApplicationGraph], 'httpClient' | 'loginService'>;
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-obsidian",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "Dependency injection framework for React and React Native applications",
   "scripts": {
     "prepack": "npm run lint && tsc --project tsconfig.prod.json",

package/src/index.ts

@@ -20,6 +20,8 @@ export { injectComponent } from './injectors/components/InjectComponent';
 export { injectHook, injectHookWithArguments } from './injectors/hooks/InjectHook';
 
 export { useObserver } from './observable/useObserver';
-export { Observable, OnNext } from './observable/Observable';
+export { Observable } from './observable/Observable';
+export { ObservableMediator } from './observable/ObservableMediator';
+export { OnNext, Unsubscribe } from './observable/types';
 
 export { testKit } from '../testkit';

package/src/observable/Observable.ts

@@ -1,18 +1,19 @@
-/* eslint-disable no-underscore-dangle */
-export type OnNext<T> = (value: T) => void;
-type Unsubscribe = () => void;
+import { Observable as IObservable, OnNext, Unsubscribe } from './types';
 
-export class Observable<T> {
+export class Observable<T> implements IObservable<T> {
   private subscribers: Set<OnNext<T>> = new Set();
+  private currentValue: T | undefined;
 
-  constructor(private _value: T) {}
+  constructor(initialValue?: T) {
+    this.currentValue = initialValue;
+  }
 
   public get value(): T {
-    return this._value;
+    return this.currentValue as T;
   }
 
   public set value(value: T) {
-    this._value = value;
+    this.currentValue = value;
     this.subscribers.forEach((subscriber) => subscriber(value));
   }
 

package/src/observable/ObservableMediator.ts

@@ -0,0 +1,55 @@
+import { Observable } from './Observable';
+import { OnNext, Unsubscribe, Observable as IObservable } from './types';
+
+type Source<T> = {
+  source: Observable<T>;
+  onNext: OnNext<T>;
+  unsubscribe?: Unsubscribe;
+};
+
+export class ObservableMediator<T> implements IObservable<T> {
+  private subscribers: Set<OnNext<T>> = new Set();
+  private currentValue!: T;
+  private sources: Source<any>[] = [];
+
+  constructor(initialValue?: T) {
+    this.currentValue = initialValue as T;
+  }
+
+  addSource<S>(source: Observable<S>, onNext: OnNext<S>): ObservableMediator<T> {
+    this.sources.push({ source, onNext });
+    return this;
+  }
+
+  public get value(): T {
+    return this.currentValue;
+  }
+
+  public set value(value: T) {
+    this.currentValue = value;
+    this.subscribers.forEach((subscriber) => subscriber(value));
+  }
+
+  subscribe(onNext: OnNext<T>): Unsubscribe {
+    if (this.subscribers.has(onNext)) {
+      throw new Error('Subscriber already subscribed');
+    }
+    this.subscribers.add(onNext);
+
+    this.subscribeToAllSources();
+
+    return () => {
+      this.subscribers.delete(onNext);
+      this.sources.forEach(({ unsubscribe }) => unsubscribe?.());
+    };
+  }
+
+  private subscribeToAllSources() {
+    this.sources.forEach(({ source, onNext }, index) => {
+      const unsubscribe = source.subscribe((value) => {
+        onNext(value);
+      });
+      this.sources[index].unsubscribe = unsubscribe;
+    });
+  }
+}

package/src/observable/types.ts

@@ -0,0 +1,7 @@
+export type OnNext<T> = (value: T) => void;
+export type Unsubscribe = () => void;
+
+export interface Observable<T> {
+  value: T;
+  subscribe(onNext: OnNext<T>): Unsubscribe;
+}