react-obsidian 2.9.1 → 2.10.1

package/dist/src/decorators/LifecycleBound.d.ts

@@ -1,2 +1,6 @@
-export declare function LifecycleBound(): (constructor: any) => any;
+type Options = {
+    scope?: 'component' | 'feature';
+};
+export declare function LifecycleBound(options?: Options): (constructor: any) => any;
+export {};
 //# sourceMappingURL=LifecycleBound.d.ts.map

package/dist/src/decorators/LifecycleBound.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LifecycleBound.d.ts","sourceRoot":"","sources":["../../../src/decorators/LifecycleBound.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,kBACP,GAAG,SAIzB"}
+{"version":3,"file":"LifecycleBound.d.ts","sourceRoot":"","sources":["../../../src/decorators/LifecycleBound.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,iBACzB,GAAG,SAKzB"}

package/dist/src/decorators/LifecycleBound.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LifecycleBound = void 0;
-function LifecycleBound() {
+function LifecycleBound(options) {
     return (constructor) => {
+        var _a;
         Reflect.defineMetadata('isLifecycleBound', true, constructor);
+        Reflect.defineMetadata('lifecycleScope', (_a = options === null || options === void 0 ? void 0 : options.scope) !== null && _a !== void 0 ? _a : 'feature', constructor);
         return constructor;
     };
 }

package/dist/src/decorators/LifecycleBound.js.map

@@ -1 +1 @@
-{"version":3,"file":"LifecycleBound.js","sourceRoot":"","sources":["../../../src/decorators/LifecycleBound.ts"],"names":[],"mappings":";;;AAAA,SAAgB,cAAc;IAC5B,OAAO,CAAC,WAAgB,EAAE,EAAE;QAC1B,OAAO,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9D,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AALD,wCAKC"}
+{"version":3,"file":"LifecycleBound.js","sourceRoot":"","sources":["../../../src/decorators/LifecycleBound.ts"],"names":[],"mappings":";;;AAIA,SAAgB,cAAc,CAAC,OAAiB;IAC9C,OAAO,CAAC,WAAgB,EAAE,EAAE;;QAC1B,OAAO,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9D,OAAO,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,SAAS,EAAE,WAAW,CAAC,CAAC;QACnF,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAND,wCAMC"}

package/dist/src/graph/registry/GraphRegistry.d.ts

@@ -4,6 +4,8 @@ import { Middleware } from './Middleware';
 export declare class GraphRegistry {
     private readonly constructorToInstance;
     private readonly instanceToConstructor;
+    private readonly injectionTokenToInstance;
+    private readonly instanceToInjectionToken;
     private readonly nameToInstance;
     private readonly graphToSubgraphs;
     private readonly graphMiddlewares;
@@ -11,12 +13,14 @@ export declare class GraphRegistry {
     ensureRegistered(graph: Graph): void;
     getSubgraphs(graph: Graph): Graph[];
     getGraphInstance(name: string): Graph;
-    resolve<T extends Graph>(Graph: Constructable<T>, source?: 'lifecycleOwner' | 'classInjection' | 'serviceLocator', props?: any): T;
+    resolve<T extends Graph>(Graph: Constructable<T>, source?: 'lifecycleOwner' | 'classInjection' | 'serviceLocator', props?: any, injectionToken?: string): T;
     private has;
     private getFirst;
+    private getByInjectionToken;
     private set;
     private isSingleton;
     private isBoundToReactLifecycle;
+    private isComponentScopedLifecycleBound;
     clearGraphAfterItWasMockedInTests(graphName: string): void;
     clear(graph: Graph): void;
     addGraphMiddleware(middleware: Middleware<Graph>): void;

package/dist/src/graph/registry/GraphRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphRegistry.d.ts","sourceRoot":"","sources":["../../../../src/graph/registry/GraphRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA+C;IACrF,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0C;IAChF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8D;IAC/F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8B;IAE/D,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,SAAS,GAAE,aAAa,CAAC,KAAK,CAAC,EAAO;IAIlF,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAK7B,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE;IAMnC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAIrC,OAAO,CAAC,CAAC,SAAS,KAAK,EACrB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,MAAM,GAAE,gBAAgB,GAAG,gBAAgB,GAAG,gBAAmC,EACjF,KAAK,GAAE,GAAe,GACrB,CAAC;IAYJ,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,GAAG;IAQX,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,uBAAuB;IAI/B,iCAAiC,CAAC,SAAS,EAAE,MAAM;IAgBnD,KAAK,CAAC,KAAK,EAAE,KAAK;IAQlB,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC;IAIhD,qBAAqB;IAIrB,QAAQ;CAKT;;AAKD,wBAAqD"}
+{"version":3,"file":"GraphRegistry.d.ts","sourceRoot":"","sources":["../../../../src/graph/registry/GraphRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA+C;IACrF,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0C;IAChF,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4B;IACrE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4B;IACrE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8D;IAC/F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8B;IAE/D,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,SAAS,GAAE,aAAa,CAAC,KAAK,CAAC,EAAO;IAIlF,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAK7B,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE;IAMnC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAIrC,OAAO,CAAC,CAAC,SAAS,KAAK,EACrB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,MAAM,GAAE,gBAAgB,GAAG,gBAAgB,GAAG,gBAAmC,EACjF,KAAK,GAAE,GAAe,EACtB,cAAc,CAAC,EAAE,MAAM,GACtB,CAAC;IAcJ,OAAO,CAAC,GAAG;IAaX,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,GAAG;IAYX,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,+BAA+B;IAIvC,iCAAiC,CAAC,SAAS,EAAE,MAAM;IAqBnD,KAAK,CAAC,KAAK,EAAE,KAAK;IAalB,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC;IAIhD,qBAAqB;IAIrB,QAAQ;CAOT;;AAKD,wBAAqD"}

package/dist/src/graph/registry/GraphRegistry.js

@@ -10,6 +10,8 @@ class GraphRegistry {
     constructor() {
         this.constructorToInstance = new Map();
         this.instanceToConstructor = new Map();
+        this.injectionTokenToInstance = new Map();
+        this.instanceToInjectionToken = new Map();
         this.nameToInstance = new Map();
         this.graphToSubgraphs = new Map();
         this.graphMiddlewares = new GraphMiddlewareChain_1.default();
@@ -31,27 +33,48 @@ class GraphRegistry {
     getGraphInstance(name) {
         return this.nameToInstance.get(name);
     }
-    resolve(Graph, source = 'lifecycleOwner', props = undefined) {
-        if ((this.isSingleton(Graph) || this.isBoundToReactLifecycle(Graph)) && this.has(Graph)) {
-            return this.getFirst(Graph);
+    resolve(Graph, source = 'lifecycleOwner', props = undefined, injectionToken) {
+        if ((this.isSingleton(Graph) || this.isBoundToReactLifecycle(Graph)) && this.has(Graph, injectionToken)) {
+            return this.isComponentScopedLifecycleBound(Graph) ?
+                this.getByInjectionToken(Graph, injectionToken) :
+                this.getFirst(Graph);
         }
         if (this.isBoundToReactLifecycle(Graph) && source !== 'lifecycleOwner') {
             throw new ObtainLifecycleBoundGraphException_1.ObtainLifecycleBoundGraphException(Graph);
         }
         const graph = this.graphMiddlewares.resolve(Graph, props);
-        this.set(Graph, graph);
+        this.set(Graph, graph, injectionToken);
         return graph;
     }
-    has(Graph) {
+    has(Graph, injectionToken) {
         var _a, _b;
+        const instances = this.constructorToInstance.get(Graph);
+        if (!instances)
+            return false;
+        if (this.isComponentScopedLifecycleBound(Graph)) {
+            return Array
+                .from(instances)
+                .some((graph) => this.instanceToInjectionToken.get(graph) === injectionToken);
+        }
         return ((_b = (_a = this.constructorToInstance.get(Graph)) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0) > 0;
     }
     getFirst(Graph) {
         return this.constructorToInstance.get(Graph).values().next().value;
     }
-    set(Graph, graph) {
+    getByInjectionToken(Graph, injectionToken) {
+        return Array
+            .from(this.constructorToInstance.get(Graph))
+            .find((graph) => {
+            return this.instanceToInjectionToken.get(graph) === injectionToken;
+        });
+    }
+    set(Graph, graph, injectionToken) {
         var _a;
         const graphs = (_a = this.constructorToInstance.get(Graph)) !== null && _a !== void 0 ? _a : new Set();
+        if (injectionToken && this.isComponentScopedLifecycleBound(Graph)) {
+            this.injectionTokenToInstance.set(injectionToken, graph);
+            this.instanceToInjectionToken.set(graph, injectionToken);
+        }
         graphs.add(graph);
         this.constructorToInstance.set(Graph, graphs);
         this.instanceToConstructor.set(graph, Graph);
@@ -65,6 +88,9 @@ class GraphRegistry {
         var _a;
         return (_a = Reflect.getMetadata('isLifecycleBound', Graph)) !== null && _a !== void 0 ? _a : false;
     }
+    isComponentScopedLifecycleBound(Graph) {
+        return Reflect.getMetadata('lifecycleScope', Graph) === 'component';
+    }
     clearGraphAfterItWasMockedInTests(graphName) {
         const graphNames = this.nameToInstance.keys();
         for (const name of graphNames) {
@@ -78,6 +104,11 @@ class GraphRegistry {
                 this.instanceToConstructor.delete(graph);
                 this.constructorToInstance.get(Graph).delete(graph);
                 this.nameToInstance.delete(graph.name);
+                const token = this.instanceToInjectionToken.get(graph);
+                if (token) {
+                    this.injectionTokenToInstance.delete(token);
+                    this.instanceToInjectionToken.delete(graph);
+                }
             }
         }
     }
@@ -88,6 +119,11 @@ class GraphRegistry {
         this.instanceToConstructor.delete(graph);
         this.constructorToInstance.get(Graph).delete(graph);
         this.nameToInstance.delete(graph.name);
+        const token = this.instanceToInjectionToken.get(graph);
+        if (token) {
+            this.injectionTokenToInstance.delete(token);
+            this.instanceToInjectionToken.delete(graph);
+        }
     }
     addGraphMiddleware(middleware) {
         this.graphMiddlewares.add(middleware);
@@ -99,6 +135,8 @@ class GraphRegistry {
         this.instanceToConstructor.clear();
         this.constructorToInstance.clear();
         this.nameToInstance.clear();
+        this.injectionTokenToInstance.clear();
+        this.instanceToInjectionToken.clear();
     }
 }
 exports.GraphRegistry = GraphRegistry;

package/dist/src/graph/registry/GraphRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"GraphRegistry.js","sourceRoot":"","sources":["../../../../src/graph/registry/GraphRegistry.ts"],"names":[],"mappings":";;;;;;AAGA,kFAA0D;AAC1D,6FAA0F;AAE1F,MAAa,aAAa;IAA1B;QACmB,0BAAqB,GAAG,IAAI,GAAG,EAAoC,CAAC;QACpE,0BAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;QAC/D,mBAAc,GAAG,IAAI,GAAG,EAAiB,CAAC;QAC1C,qBAAgB,GAAG,IAAI,GAAG,EAAmD,CAAC;QAC9E,qBAAgB,GAAG,IAAI,8BAAoB,EAAE,CAAC;IAkGjE,CAAC;IAhGC,QAAQ,CAAC,WAAiC,EAAE,YAAoC,EAAE;QAChF,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO;QAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAkB,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,YAAY,CAAC,KAAY;;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;QACrD,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;QAChE,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,gBAAgB,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IACxC,CAAC;IAED,OAAO,CACL,KAAuB,EACvB,SAAiE,gBAAgB,EACjF,QAAa,SAAS;QAEtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvF,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC7B;QACD,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,IAAI,MAAM,KAAK,gBAAgB,EAAE;YACtE,MAAM,IAAI,uEAAkC,CAAC,KAAK,CAAC,CAAC;SACrD;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACvB,OAAO,KAAU,CAAC;IACpB,CAAC;IAEO,GAAG,CAAC,KAA2B;;QACrC,OAAO,CAAC,MAAA,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,IAAI,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IAEO,QAAQ,CAAkB,KAAuB;QACvD,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;IACtE,CAAC;IAEO,GAAG,CAAC,KAA2B,EAAE,KAAY;;QACnD,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;QAClE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEO,WAAW,CAAC,KAA2B;;QAC7C,OAAO,MAAA,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,mCAAI,KAAK,CAAC;IAC5D,CAAC;IAEO,uBAAuB,CAAC,KAA2B;;QACzD,OAAO,MAAA,OAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,KAAK,CAAC,mCAAI,KAAK,CAAC;IACjE,CAAC;IAED,iCAAiC,CAAC,SAAiB;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5C,IAAI,CAAC,KAAK;oBAAE,OAAO;gBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK;oBAAE,OAAO;gBAEnB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACzC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACrD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACxC;SACF;IACH,CAAC;IAED,KAAK,CAAC,KAAY;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO;QAC9C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,kBAAkB,CAAC,UAA6B;QAC9C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;CACF;AAvGD,sCAuGC;AAED,aAAa;AACb,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,IAAI,aAAa,EAAE,CAAC;AACnE,aAAa;AACb,kBAAe,MAAM,CAAC,aAA8B,CAAC"}
+{"version":3,"file":"GraphRegistry.js","sourceRoot":"","sources":["../../../../src/graph/registry/GraphRegistry.ts"],"names":[],"mappings":";;;;;;AAGA,kFAA0D;AAC1D,6FAA0F;AAE1F,MAAa,aAAa;IAA1B;QACmB,0BAAqB,GAAG,IAAI,GAAG,EAAoC,CAAC;QACpE,0BAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;QAC/D,6BAAwB,GAAG,IAAI,GAAG,EAAiB,CAAC;QACpD,6BAAwB,GAAG,IAAI,GAAG,EAAiB,CAAC;QACpD,mBAAc,GAAG,IAAI,GAAG,EAAiB,CAAC;QAC1C,qBAAgB,GAAG,IAAI,GAAG,EAAmD,CAAC;QAC9E,qBAAgB,GAAG,IAAI,8BAAoB,EAAE,CAAC;IA0IjE,CAAC;IAxIC,QAAQ,CAAC,WAAiC,EAAE,YAAoC,EAAE;QAChF,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO;QAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAkB,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,YAAY,CAAC,KAAY;;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;QACrD,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;QAChE,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,gBAAgB,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IACxC,CAAC;IAED,OAAO,CACL,KAAuB,EACvB,SAAiE,gBAAgB,EACjF,QAAa,SAAS,EACtB,cAAuB;QAEvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE;YACvG,OAAO,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC;gBAClD,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;gBACjD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACxB;QACD,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,IAAI,MAAM,KAAK,gBAAgB,EAAE;YACtE,MAAM,IAAI,uEAAkC,CAAC,KAAK,CAAC,CAAC;SACrD;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QACvC,OAAO,KAAU,CAAC;IACpB,CAAC;IAEO,GAAG,CAAC,KAA2B,EAAE,cAAuB;;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAE7B,IAAI,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,EAAE;YAC/C,OAAO,KAAK;iBACT,IAAI,CAAC,SAAS,CAAC;iBACf,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC,CAAC;SACjF;QAED,OAAO,CAAC,MAAA,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,IAAI,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IAEO,QAAQ,CAAkB,KAAuB;QACvD,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;IACtE,CAAC;IAEO,mBAAmB,CAAkB,KAAuB,EAAE,cAAuB;QAC3F,OAAO,KAAK;aACT,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;aAC5C,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,OAAO,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC;QACrE,CAAC,CAAM,CAAC;IACZ,CAAC;IAEO,GAAG,CAAC,KAA2B,EAAE,KAAY,EAAE,cAAuB;;QAC5E,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;QAClE,IAAI,cAAc,IAAI,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,EAAE;YACjE,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACzD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;SAC1D;QACD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEO,WAAW,CAAC,KAA2B;;QAC7C,OAAO,MAAA,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,mCAAI,KAAK,CAAC;IAC5D,CAAC;IAEO,uBAAuB,CAAC,KAA2B;;QACzD,OAAO,MAAA,OAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,KAAK,CAAC,mCAAI,KAAK,CAAC;IACjE,CAAC;IAEO,+BAA+B,CAAC,KAA2B;QACjE,OAAO,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,KAAK,CAAC,KAAK,WAAW,CAAC;IACtE,CAAC;IAED,iCAAiC,CAAC,SAAiB;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5C,IAAI,CAAC,KAAK;oBAAE,OAAO;gBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK;oBAAE,OAAO;gBAEnB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACzC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACrD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACvD,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC5C,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC7C;aACF;SACF;IACH,CAAC;IAED,KAAK,CAAC,KAAY;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO;QAC9C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC7C;IACH,CAAC;IAED,kBAAkB,CAAC,UAA6B;QAC9C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACtC,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;IACxC,CAAC;CACF;AAjJD,sCAiJC;AAED,aAAa;AACb,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,IAAI,aAAa,EAAE,CAAC;AACnE,aAAa;AACb,kBAAe,MAAM,CAAC,aAA8B,CAAC"}

package/dist/src/injectors/components/ComponentInjector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ComponentInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,MAAM,CAAC,CAAC,EACN,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAClC,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,GAChC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAMtC,OAAO,CAAC,aAAa;CAetB"}
+{"version":3,"file":"ComponentInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAK5C,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,MAAM,CAAC,CAAC,EACN,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAClC,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,GAChC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAMtC,OAAO,CAAC,aAAa;CAoBtB"}

package/dist/src/injectors/components/ComponentInjector.js

@@ -8,6 +8,8 @@ const hoist_non_react_statics_1 = __importDefault(require("hoist-non-react-stati
 const PropsInjector_1 = __importDefault(require("./PropsInjector"));
 const useGraph_1 = __importDefault(require("./useGraph"));
 const React_1 = require("../../utils/React");
+const graphContext_1 = require("./graphContext");
+const useInjectionToken_1 = require("./useInjectionToken");
 class ComponentInjector {
     inject(Target, Graph) {
         const Wrapped = this.wrapComponent(Target, Graph);
@@ -19,9 +21,10 @@ class ComponentInjector {
         const Target = isMemoized ? InjectionCandidate.type : InjectionCandidate;
         const compare = isMemoized ? InjectionCandidate.compare : undefined;
         return (0, React_1.genericMemo)((passedProps) => {
-            const graph = (0, useGraph_1.default)(Graph, Target, passedProps);
+            const injectionToken = (0, useInjectionToken_1.useInjectionToken)(Graph);
+            const graph = (0, useGraph_1.default)(Graph, Target, passedProps, injectionToken);
             const proxiedProps = new PropsInjector_1.default(graph).inject(passedProps);
-            return react_1.default.createElement(react_1.default.Fragment, null, Target(proxiedProps));
+            return (react_1.default.createElement(graphContext_1.GraphContext.Provider, { value: { injectionToken } }, Target(proxiedProps)));
         }, compare);
     }
 }

package/dist/src/injectors/components/ComponentInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComponentInjector.js","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAiD;AACjD,sFAA2D;AAE3D,oEAA4C;AAC5C,0DAAkC;AAElC,6CAAqE;AAErE,MAAqB,iBAAiB;IACpC,MAAM,CACJ,MAAkC,EAClC,KAAiC;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAA,iCAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,aAAa,CACnB,kBAA8C,EAC9C,KAAiC;QAEjC,MAAM,UAAU,GAAG,IAAA,2BAAmB,EAAC,kBAAkB,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;QACzE,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpE,OAAO,IAAA,mBAAW,EAAC,CAAC,WAAc,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAI,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YACtD,MAAM,YAAY,GAAG,IAAI,uBAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAElE,OAAO,8DAAG,MAAM,CAAC,YAA+C,CAAC,CAAI,CAAC;QACxE,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;CACF;AAzBD,oCAyBC"}
+{"version":3,"file":"ComponentInjector.js","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAiD;AACjD,sFAA2D;AAE3D,oEAA4C;AAC5C,0DAAkC;AAElC,6CAAqE;AACrE,iDAA8C;AAC9C,2DAAwD;AAExD,MAAqB,iBAAiB;IACpC,MAAM,CACJ,MAAkC,EAClC,KAAiC;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAA,iCAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,aAAa,CACnB,kBAA8C,EAC9C,KAAiC;QAEjC,MAAM,UAAU,GAAG,IAAA,2BAAmB,EAAC,kBAAkB,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;QACzE,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpE,OAAO,IAAA,mBAAW,EAAC,CAAC,WAAc,EAAE,EAAE;YACpC,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,KAAK,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAI,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YACtE,MAAM,YAAY,GAAG,IAAI,uBAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAElE,OAAO,CACL,8BAAC,2BAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAC,cAAc,EAAC,IAC3C,MAAM,CAAC,YAA+C,CAAC,CAClC,CACzB,CAAC;QACJ,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;CACF;AA9BD,oCA8BC"}

package/dist/src/injectors/components/graphContext.d.ts

@@ -0,0 +1,6 @@
+interface Context {
+    injectionToken: string;
+}
+export declare const GraphContext: import("react").Context<Context | undefined>;
+export {};
+//# sourceMappingURL=graphContext.d.ts.map

package/dist/src/injectors/components/graphContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphContext.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/graphContext.ts"],"names":[],"mappings":"AAEA,UAAU,OAAO;IACf,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,8CAAgD,CAAC"}

package/dist/src/injectors/components/graphContext.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphContext = void 0;
+const react_1 = require("react");
+exports.GraphContext = (0, react_1.createContext)(undefined);
+//# sourceMappingURL=graphContext.js.map

package/dist/src/injectors/components/graphContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphContext.js","sourceRoot":"","sources":["../../../../src/injectors/components/graphContext.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AAMzB,QAAA,YAAY,GAAG,IAAA,qBAAa,EAAsB,SAAS,CAAC,CAAC"}

package/dist/src/injectors/components/useGraph.d.ts

@@ -1,5 +1,5 @@
 import { Constructable } from '../../types';
 import { ObjectGraph } from '../../graph/ObjectGraph';
-declare const _default: <P>(Graph: Constructable<ObjectGraph>, target: any, props?: Partial<P> | undefined) => ObjectGraph<unknown>;
+declare const _default: <P>(Graph: Constructable<ObjectGraph>, target: any, props?: Partial<P> | undefined, injectionToken?: string) => ObjectGraph<unknown>;
 export default _default;
 //# sourceMappingURL=useGraph.d.ts.map

package/dist/src/injectors/components/useGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGraph.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/useGraph.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;mCAI5B,cAAc,WAAW,CAAC,UAAU,GAAG;AAAjE,wBAWE"}
+{"version":3,"file":"useGraph.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/useGraph.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;mCAK7C,cAAc,WAAW,CAAC,UACzB,GAAG,mDAEM,MAAM;AAJzB,wBAiBE"}

package/dist/src/injectors/components/useGraph.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const GraphRegistry_1 = __importDefault(require("../../graph/registry/GraphRegistry"));
 const ReferenceCounter_1 = __importDefault(require("../../ReferenceCounter"));
-exports.default = (Graph, target, props) => {
+exports.default = (Graph, target, props, injectionToken) => {
     const [graph] = (0, react_1.useState)(() => {
-        const resolvedGraph = GraphRegistry_1.default.resolve(Graph, 'lifecycleOwner', props);
+        const resolvedGraph = GraphRegistry_1.default.resolve(Graph, 'lifecycleOwner', props, injectionToken);
         resolvedGraph.onBind(target);
         return resolvedGraph;
     });

package/dist/src/injectors/components/useGraph.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGraph.js","sourceRoot":"","sources":["../../../../src/injectors/components/useGraph.ts"],"names":[],"mappings":";;;;;AAAA,iCAA4C;AAG5C,uFAA+D;AAC/D,8EAAsD;AAEtD,kBAAe,CAAI,KAAiC,EAAE,MAAW,EAAE,KAAkB,EAAE,EAAE;IACvF,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE;QAC5B,MAAM,aAAa,GAAG,uBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAC5E,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,0BAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,GAAG,EAAE,CAAC,0BAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"useGraph.js","sourceRoot":"","sources":["../../../../src/injectors/components/useGraph.ts"],"names":[],"mappings":";;;;;AAAA,iCAA4C;AAG5C,uFAA+D;AAC/D,8EAAsD;AAEtD,kBAAe,CACb,KAAiC,EACjC,MAAW,EACX,KAAkB,EAClB,cAAuB,EACvB,EAAE;IAEF,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE;QAC5B,MAAM,aAAa,GAAG,uBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAC5F,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,0BAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,GAAG,EAAE,CAAC,0BAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/dist/src/injectors/components/useInjectionToken.d.ts

@@ -0,0 +1,3 @@
+import type { Constructable, ObjectGraph } from '../..';
+export declare const useInjectionToken: (Graph: Constructable<ObjectGraph>) => string;
+//# sourceMappingURL=useInjectionToken.d.ts.map

package/dist/src/injectors/components/useInjectionToken.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useInjectionToken.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/useInjectionToken.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAGxD,eAAO,MAAM,iBAAiB,UAAW,cAAc,WAAW,CAAC,WAIlE,CAAC"}

package/dist/src/injectors/components/useInjectionToken.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useInjectionToken = void 0;
+const react_1 = require("react");
+const graphContext_1 = require("./graphContext");
+const uniqueId_1 = require("../../utils/uniqueId");
+const useInjectionToken = (Graph) => {
+    const ctx = (0, react_1.useContext)(graphContext_1.GraphContext);
+    const [injectionToken] = (0, react_1.useState)(() => { var _a; return (_a = ctx === null || ctx === void 0 ? void 0 : ctx.injectionToken) !== null && _a !== void 0 ? _a : (0, uniqueId_1.uniqueId)(Graph.name); });
+    return injectionToken;
+};
+exports.useInjectionToken = useInjectionToken;
+//# sourceMappingURL=useInjectionToken.js.map

package/dist/src/injectors/components/useInjectionToken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useInjectionToken.js","sourceRoot":"","sources":["../../../../src/injectors/components/useInjectionToken.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAC7C,iDAA8C;AAE9C,mDAAgD;AAEzC,MAAM,iBAAiB,GAAG,CAAC,KAAiC,EAAE,EAAE;IACrE,MAAM,GAAG,GAAG,IAAA,kBAAU,EAAC,2BAAY,CAAC,CAAC;IACrC,MAAM,CAAC,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE,WAAC,OAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,cAAc,mCAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,CAAA,EAAA,CAAC,CAAC;IACrF,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAJW,QAAA,iBAAiB,qBAI5B"}

package/dist/test/fixtures/ScopedLifecycleBoundGraph.d.ts

@@ -0,0 +1,7 @@
+import { ObjectGraph } from '../../src';
+export type Props = Record<string, any> & {
+    stringFromProps: string;
+};
+export declare class ScopedLifecycleBoundGraph extends ObjectGraph<Props> {
+}
+//# sourceMappingURL=ScopedLifecycleBoundGraph.d.ts.map

package/dist/test/fixtures/ScopedLifecycleBoundGraph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScopedLifecycleBoundGraph.d.ts","sourceRoot":"","sources":["../../../test/fixtures/ScopedLifecycleBoundGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,WAAW,EAAE,MAAM,WAAW,CAAC;AAG/C,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,qBACa,yBAA0B,SAAQ,WAAW,CAAC,KAAK,CAAC;CAEhE"}

package/dist/test/fixtures/ScopedLifecycleBoundGraph.js

@@ -0,0 +1,19 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopedLifecycleBoundGraph = void 0;
+const src_1 = require("../../src");
+const LifecycleBound_1 = require("../../src/decorators/LifecycleBound");
+let ScopedLifecycleBoundGraph = class ScopedLifecycleBoundGraph extends src_1.ObjectGraph {
+};
+ScopedLifecycleBoundGraph = __decorate([
+    (0, LifecycleBound_1.LifecycleBound)({ scope: 'component' }),
+    (0, src_1.Graph)()
+], ScopedLifecycleBoundGraph);
+exports.ScopedLifecycleBoundGraph = ScopedLifecycleBoundGraph;
+//# sourceMappingURL=ScopedLifecycleBoundGraph.js.map

package/dist/test/fixtures/ScopedLifecycleBoundGraph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScopedLifecycleBoundGraph.js","sourceRoot":"","sources":["../../../test/fixtures/ScopedLifecycleBoundGraph.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAA+C;AAC/C,wEAAqE;AAK9D,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,iBAAkB;CAEhE,CAAA;AAFY,yBAAyB;IADrC,IAAA,+BAAc,EAAC,EAAC,KAAK,EAAE,WAAW,EAAC,CAAC;IAAE,IAAA,WAAK,GAAE;GACjC,yBAAyB,CAErC;AAFY,8DAAyB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-obsidian",
-  "version": "2.9.1",
+  "version": "2.10.1",
   "description": "Dependency injection framework for React and React Native applications",
   "scripts": {
     "prepack": "npm run lint && tsc --project tsconfig.prod.json",
@@ -47,7 +47,7 @@
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-import-newlines": "^1.1.5",
     "eslint-plugin-jest-formatting": "^3.1.0",
-    "eslint-plugin-obsidian": "2.9.1",
+    "eslint-plugin-obsidian": "2.10.1",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-unused-imports": "3.1.x",

package/src/decorators/LifecycleBound.ts

@@ -1,6 +1,11 @@
-export function LifecycleBound() {
+type Options = {
+  scope?: 'component' | 'feature';
+};
+
+export function LifecycleBound(options?: Options) {
   return (constructor: any) => {
     Reflect.defineMetadata('isLifecycleBound', true, constructor);
+    Reflect.defineMetadata('lifecycleScope', options?.scope ?? 'feature', constructor);
     return constructor;
   };
 }

package/src/graph/registry/GraphRegistry.ts

@@ -7,6 +7,8 @@ import { ObtainLifecycleBoundGraphException } from './ObtainLifecycleBoundGraphE
 export class GraphRegistry {
   private readonly constructorToInstance = new Map<Constructable<Graph>, Set<Graph>>();
   private readonly instanceToConstructor = new Map<Graph, Constructable<Graph>>();
+  private readonly injectionTokenToInstance = new Map<string, Graph>();
+  private readonly instanceToInjectionToken = new Map<Graph, string>();
   private readonly nameToInstance = new Map<string, Graph>();
   private readonly graphToSubgraphs = new Map<Constructable<Graph>, Set<Constructable<Graph>>>();
   private readonly graphMiddlewares = new GraphMiddlewareChain();
@@ -34,19 +36,31 @@ export class GraphRegistry {
     Graph: Constructable<T>,
     source: 'lifecycleOwner' | 'classInjection' | 'serviceLocator' = 'lifecycleOwner',
     props: any = undefined,
+    injectionToken?: string,
   ): T {
-    if ((this.isSingleton(Graph) || this.isBoundToReactLifecycle(Graph)) && this.has(Graph)) {
-      return this.getFirst(Graph);
+    if ((this.isSingleton(Graph) || this.isBoundToReactLifecycle(Graph)) && this.has(Graph, injectionToken)) {
+      return this.isComponentScopedLifecycleBound(Graph) ?
+        this.getByInjectionToken(Graph, injectionToken) :
+        this.getFirst(Graph);
     }
     if (this.isBoundToReactLifecycle(Graph) && source !== 'lifecycleOwner') {
       throw new ObtainLifecycleBoundGraphException(Graph);
     }
     const graph = this.graphMiddlewares.resolve(Graph, props);
-    this.set(Graph, graph);
+    this.set(Graph, graph, injectionToken);
     return graph as T;
   }
 
-  private has(Graph: Constructable<Graph>): boolean {
+  private has(Graph: Constructable<Graph>, injectionToken?: string): boolean {
+    const instances = this.constructorToInstance.get(Graph);
+    if (!instances) return false;
+
+    if (this.isComponentScopedLifecycleBound(Graph)) {
+      return Array
+        .from(instances)
+        .some((graph) => this.instanceToInjectionToken.get(graph) === injectionToken);
+    }
+
     return (this.constructorToInstance.get(Graph)?.size ?? 0) > 0;
   }
 
@@ -54,8 +68,20 @@ export class GraphRegistry {
     return this.constructorToInstance.get(Graph)!.values().next().value;
   }
 
-  private set(Graph: Constructable<Graph>, graph: Graph) {
+  private getByInjectionToken<T extends Graph>(Graph: Constructable<T>, injectionToken?: string): T {
+    return Array
+      .from(this.constructorToInstance.get(Graph)!)
+      .find((graph) => {
+        return this.instanceToInjectionToken.get(graph) === injectionToken;
+      }) as T;
+  }
+
+  private set(Graph: Constructable<Graph>, graph: Graph, injectionToken?: string) {
     const graphs = this.constructorToInstance.get(Graph) ?? new Set();
+    if (injectionToken && this.isComponentScopedLifecycleBound(Graph)) {
+      this.injectionTokenToInstance.set(injectionToken, graph);
+      this.instanceToInjectionToken.set(graph, injectionToken);
+    }
     graphs.add(graph);
     this.constructorToInstance.set(Graph, graphs);
     this.instanceToConstructor.set(graph, Graph);
@@ -70,6 +96,10 @@ export class GraphRegistry {
     return Reflect.getMetadata('isLifecycleBound', Graph) ?? false;
   }
 
+  private isComponentScopedLifecycleBound(Graph: Constructable<Graph>): boolean {
+    return Reflect.getMetadata('lifecycleScope', Graph) === 'component';
+  }
+
   clearGraphAfterItWasMockedInTests(graphName: string) {
     const graphNames = this.nameToInstance.keys();
     for (const name of graphNames) {
@@ -82,6 +112,11 @@ export class GraphRegistry {
         this.instanceToConstructor.delete(graph);
         this.constructorToInstance.get(Graph)!.delete(graph);
         this.nameToInstance.delete(graph.name);
+        const token = this.instanceToInjectionToken.get(graph);
+        if (token) {
+          this.injectionTokenToInstance.delete(token);
+          this.instanceToInjectionToken.delete(graph);
+        }
       }
     }
   }
@@ -92,6 +127,11 @@ export class GraphRegistry {
     this.instanceToConstructor.delete(graph);
     this.constructorToInstance.get(Graph)!.delete(graph);
     this.nameToInstance.delete(graph.name);
+    const token = this.instanceToInjectionToken.get(graph);
+    if (token) {
+      this.injectionTokenToInstance.delete(token);
+      this.instanceToInjectionToken.delete(graph);
+    }
   }
 
   addGraphMiddleware(middleware: Middleware<Graph>) {
@@ -106,6 +146,8 @@ export class GraphRegistry {
     this.instanceToConstructor.clear();
     this.constructorToInstance.clear();
     this.nameToInstance.clear();
+    this.injectionTokenToInstance.clear();
+    this.instanceToInjectionToken.clear();
   }
 }
 

package/src/injectors/components/ComponentInjector.tsx

@@ -5,6 +5,8 @@ import PropsInjector from './PropsInjector';
 import useGraph from './useGraph';
 import { Constructable } from '../../types';
 import { genericMemo, isMemoizedComponent } from '../../utils/React';
+import { GraphContext } from './graphContext';
+import { useInjectionToken } from './useInjectionToken';
 
 export default class ComponentInjector {
   inject<P>(
@@ -25,10 +27,15 @@ export default class ComponentInjector {
     const compare = isMemoized ? InjectionCandidate.compare : undefined;
 
     return genericMemo((passedProps: P) => {
-      const graph = useGraph<P>(Graph, Target, passedProps);
+      const injectionToken = useInjectionToken(Graph);
+      const graph = useGraph<P>(Graph, Target, passedProps, injectionToken);
       const proxiedProps = new PropsInjector(graph).inject(passedProps);
 
-      return <>{Target(proxiedProps as unknown as PropsWithChildren<P>)}</>;
+      return (
+        <GraphContext.Provider value={{injectionToken}}>
+          {Target(proxiedProps as unknown as PropsWithChildren<P>)}
+        </GraphContext.Provider>
+      );
     }, compare);
   }
 }

package/src/injectors/components/graphContext.ts

@@ -0,0 +1,7 @@
+import { createContext } from 'react';
+
+interface Context {
+  injectionToken: string;
+}
+
+export const GraphContext = createContext<Context | undefined>(undefined);

package/src/injectors/components/useGraph.ts

@@ -4,9 +4,15 @@ import { ObjectGraph } from '../../graph/ObjectGraph';
 import graphRegistry from '../../graph/registry/GraphRegistry';
 import referenceCounter from '../../ReferenceCounter';
 
-export default <P>(Graph: Constructable<ObjectGraph>, target: any, props?: Partial<P>) => {
+export default <P>(
+  Graph: Constructable<ObjectGraph>,
+  target: any,
+  props?: Partial<P>,
+  injectionToken?: string,
+) => {
+
   const [graph] = useState(() => {
-    const resolvedGraph = graphRegistry.resolve(Graph, 'lifecycleOwner', props);
+    const resolvedGraph = graphRegistry.resolve(Graph, 'lifecycleOwner', props, injectionToken);
     resolvedGraph.onBind(target);
     return resolvedGraph;
   });

package/src/injectors/components/useInjectionToken.ts

@@ -0,0 +1,10 @@
+import { useContext, useState } from 'react';
+import { GraphContext } from './graphContext';
+import type { Constructable, ObjectGraph } from '../..';
+import { uniqueId } from '../../utils/uniqueId';
+
+export const useInjectionToken = (Graph: Constructable<ObjectGraph>) => {
+  const ctx = useContext(GraphContext);
+  const [injectionToken] = useState(() => ctx?.injectionToken ?? uniqueId(Graph.name));
+  return injectionToken;
+};