react-obsidian 0.0.6 → 0.0.8

package/dist/src/index.js

@@ -13,25 +13,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectHook = exports.injectComponent = exports.Obsidian = exports.Inject = exports.Injectable = exports.Provides = exports.ObjectGraph = exports.Graph = void 0;
-var Graph_1 = __importDefault(require("./decorators/Graph"));
-var ObjectGraph_1 = __importDefault(require("./graph/ObjectGraph"));
+exports.injectHook = exports.injectComponent = exports.Obsidian = exports.GraphMiddleware = exports.Inject = exports.Injectable = exports.Provides = exports.ObjectGraph = exports.Graph = void 0;
 var ComponentInjector_1 = __importDefault(require("./injectors/components/ComponentInjector"));
-var Provides_1 = __importDefault(require("./decorators/provides/Provides"));
-var injectClass_1 = require("./decorators/injectClass");
 var Obsidian_1 = __importDefault(require("./Obsidian"));
 var HookInjector_1 = __importDefault(require("./injectors/hooks/HookInjector"));
 __exportStar(require("./types"), exports);
-exports.Graph = Graph_1.default;
-exports.ObjectGraph = ObjectGraph_1.default;
-exports.Provides = Provides_1.default;
-exports.Injectable = injectClass_1.Injectable;
-exports.Inject = injectClass_1.Inject;
+var Graph_1 = require("./decorators/Graph");
+Object.defineProperty(exports, "Graph", { enumerable: true, get: function () { return Graph_1.Graph; } });
+var ObjectGraph_1 = require("./graph/ObjectGraph");
+Object.defineProperty(exports, "ObjectGraph", { enumerable: true, get: function () { return ObjectGraph_1.ObjectGraph; } });
+var Provides_1 = require("./decorators/provides/Provides");
+Object.defineProperty(exports, "Provides", { enumerable: true, get: function () { return Provides_1.Provides; } });
+var injectClass_1 = require("./decorators/injectClass");
+Object.defineProperty(exports, "Injectable", { enumerable: true, get: function () { return injectClass_1.Injectable; } });
+var injectClass_2 = require("./decorators/injectClass");
+Object.defineProperty(exports, "Inject", { enumerable: true, get: function () { return injectClass_2.Inject; } });
+var GraphMiddleware_1 = require("./graph/registry/GraphMiddleware");
+Object.defineProperty(exports, "GraphMiddleware", { enumerable: true, get: function () { return GraphMiddleware_1.GraphMiddleware; } });
 exports.Obsidian = new Obsidian_1.default();
 var componentInjector = new ComponentInjector_1.default();
-var injectComponent = function (__Target, __Graph) { return componentInjector.inject(__Target, __Graph); };
+var injectComponent = function (Target, Graph) { return componentInjector.inject(Target, Graph); };
 exports.injectComponent = injectComponent;
 var hookInjector = new HookInjector_1.default();
-var injectHook = function (hook, __Graph) { return hookInjector.inject(hook, __Graph); };
+var injectHook = function (hook, Graph) { return hookInjector.inject(hook, Graph); };
 exports.injectHook = injectHook;
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,6DAAwC;AACxC,oEAA+C;AAC/C,+FAAyE;AACzE,4EAAuD;AACvD,wDAAwF;AACxF,wDAAmC;AACnC,gFAA0D;AAG1D,0CAAwB;AAEX,QAAA,KAAK,GAAG,eAAM,CAAC;AACf,QAAA,WAAW,GAAG,qBAAY,CAAC;AAC3B,QAAA,QAAQ,GAAG,kBAAS,CAAC;AACrB,QAAA,UAAU,GAAG,wBAAW,CAAC;AACzB,QAAA,MAAM,GAAG,oBAAO,CAAC;AACjB,QAAA,QAAQ,GAAG,IAAI,kBAAS,EAAE,CAAC;AAExC,IAAM,iBAAiB,GAAG,IAAI,2BAAiB,EAAE,CAAC;AAC3C,IAAM,eAAe,GAAG,UAC7B,QAAoC,EACpC,OAAoC,IACjC,OAAA,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,EAA3C,CAA2C,CAAC;AAHpC,QAAA,eAAe,mBAGqB;AAEjD,IAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAC;AACjC,IAAM,UAAU,GAAG,UACxB,IAA4B,EAC5B,OAAoC,IACjC,OAAA,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,EAAlC,CAAkC,CAAC;AAH3B,QAAA,UAAU,cAGiB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,+FAAyE;AACzE,wDAAmC;AACnC,gFAA0D;AAG1D,0CAAwB;AAExB,4CAA2C;AAAlC,8FAAA,KAAK,OAAA;AACd,mDAAkD;AAAzC,0GAAA,WAAW,OAAA;AAEpB,2DAA0D;AAAjD,oGAAA,QAAQ,OAAA;AACjB,wDAAsD;AAA7C,yGAAA,UAAU,OAAA;AACnB,wDAAkD;AAAzC,qGAAA,MAAM,OAAA;AACf,oEAAmE;AAA1D,kHAAA,eAAe,OAAA;AAEX,QAAA,QAAQ,GAAG,IAAI,kBAAS,EAAE,CAAC;AAExC,IAAM,iBAAiB,GAAG,IAAI,2BAAiB,EAAE,CAAC;AAC3C,IAAM,eAAe,GAAG,UAC7B,MAAkC,EAClC,KAAkC,IAC/B,OAAA,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAvC,CAAuC,CAAC;AAHhC,QAAA,eAAe,mBAGiB;AAE7C,IAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAC;AACjC,IAAM,UAAU,GAAG,UACxB,IAA4B,EAC5B,KAAkC,IAC/B,OAAA,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EAAhC,CAAgC,CAAC;AAHzB,QAAA,UAAU,cAGe"}

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import 'reflect-metadata';
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 import { Constructable } from '../../types';
 export default class ComponentInjector {
     inject<P>(Target: React.FunctionComponent<P>, Graph: Constructable<ObjectGraph>): React.FunctionComponent<Partial<P>>;

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,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,kBAAkB,CAAC;AAC1B,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,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;CAUtB"}
+{"version":3,"file":"ComponentInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,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;CAUtB"}

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

@@ -1,4 +1,4 @@
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 export default class PropsInjector<Props> {
     private graph;
     constructor(graph: ObjectGraph);

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

@@ -1 +1 @@
-{"version":3,"file":"PropsInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/PropsInjector.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,KAAK;IAC1B,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,WAAW;IAEtC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAQ3C"}
+{"version":3,"file":"PropsInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/components/PropsInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,KAAK;IAC1B,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,WAAW;IAEtC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAQ3C"}

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

@@ -1,5 +1,5 @@
 import { Constructable } from '../../types';
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 declare const _default: <P>(Graph: Constructable<ObjectGraph>, props?: Partial<P> | undefined) => 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,WAAW,MAAM,yBAAyB,CAAC;mCAIxB,cAAc,WAAW,CAAC;AAApD,wBAOE"}
+{"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;AAApD,wBAOE"}

package/dist/src/injectors/hooks/HookInjector.d.ts

@@ -1,4 +1,4 @@
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 import { Constructable } from '../../types';
 export default class HookInjector {
     inject<Args, Result>(hook: (args: Args) => Result, Graph: Constructable<ObjectGraph>): (args?: Partial<Args>) => Result;

package/dist/src/injectors/hooks/HookInjector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HookInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/hooks/HookInjector.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,IAAI,EAAE,MAAM,EACjB,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,EAC5B,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,GAChC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM;CAMpC"}
+{"version":3,"file":"HookInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/hooks/HookInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,IAAI,EAAE,MAAM,EACjB,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,EAC5B,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,GAChC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM;CAMpC"}

package/dist/testkit/index.d.ts

@@ -1,5 +1,4 @@
-import ObjectGraph from '../src/graph/Graph';
-import { Constructable } from '../src';
+import { ObjectGraph, Constructable } from '../src';
 declare class Index {
     mockGraphs(graphNameToGraph: Record<string, Constructable<ObjectGraph>>): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAY,MAAM,QAAQ,CAAC;AAMjD,cAAM,KAAK;IACT,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CAYxE;;AAED,wBAA2B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EAId,MAAM,QAAQ,CAAC;AAMhB,cAAM,KAAK;IACT,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CAYxE;;AAED,wBAA2B"}

package/dist/testkit/index.js

@@ -15,7 +15,6 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var GraphMiddleware_1 = require("../src/graph/registry/GraphMiddleware");
 var src_1 = require("../src");
 beforeEach(function () {
     src_1.Obsidian.clearGraphMiddlewares();
@@ -37,7 +36,7 @@ var Index = /** @class */ (function () {
                 return resolveChain.proceed(Graph, props);
             };
             return class_1;
-        }(GraphMiddleware_1.GraphMiddleware))();
+        }(src_1.GraphMiddleware))();
         src_1.Obsidian.addGraphMiddleware(graphMiddleware);
     };
     return Index;

package/dist/testkit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yEAAsF;AAEtF,8BAAiD;AAEjD,UAAU,CAAC;IACT,cAAQ,CAAC,qBAAqB,EAAE,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH;IAAA;IAaA,CAAC;IAZC,0BAAU,GAAV,UAAW,gBAA4D;QACrE,IAAM,eAAe,GAAG;YAAkB,2BAAe;YAA7B;;YAQ5B,CAAC;YAPC,yBAAO,GAAP,UAAsC,YAA0B,EAAE,KAAuB,EAAE,KAAa;gBACtG,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBAChC,IAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9C,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAiB,CAAC;iBAC5C;gBACD,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC5C,CAAC;YACH,cAAC;QAAD,CAAC,AAR2B,CAAc,iCAAe,IAQtD,CAAC;QACJ,cAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IACH,YAAC;AAAD,CAAC,AAbD,IAaC;AAED,kBAAe,IAAI,KAAK,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8BAMgB;AAEhB,UAAU,CAAC;IACT,cAAQ,CAAC,qBAAqB,EAAE,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH;IAAA;IAaA,CAAC;IAZC,0BAAU,GAAV,UAAW,gBAA4D;QACrE,IAAM,eAAe,GAAG;YAAkB,2BAAe;YAA7B;;YAQ5B,CAAC;YAPC,yBAAO,GAAP,UAAe,YAAuC,EAAE,KAAiC,EAAE,KAAa;gBACtG,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBAChC,IAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9C,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;iBAC5B;gBACD,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC5C,CAAC;YACH,cAAC;QAAD,CAAC,AAR2B,CAAc,qBAAe,IAQtD,CAAC;QACJ,cAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IACH,YAAC;AAAD,CAAC,AAbD,IAaC;AAED,kBAAe,IAAI,KAAK,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-obsidian",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Dependency injection framework for React and React Native applications",
   "main": "src/index.ts",
   "directories": {

package/src/Obsidian.ts

@@ -1,7 +1,7 @@
 import graphRegistry from './graph/registry/GraphRegistry';
-import ObjectGraph from './graph/ObjectGraph';
-import { GraphMiddleware } from './graph/registry/GraphMiddleware';
+import { ObjectGraph } from './graph/ObjectGraph';
 import { Constructable, GraphInternals, ServiceLocator } from './types';
+import { GraphMiddleware } from './graph/registry/GraphMiddleware';
 
 export default class Obsidian {
   obtain<T extends ObjectGraph<P>, P = any>(

package/src/ProvidedPropertiesStore.ts

@@ -1,5 +1,5 @@
 import GraphProperties from './GraphProperties';
-import Graph from './graph/Graph';
+import { Graph } from './graph/Graph';
 
 class ProvidedPropertiesStore {
   private readonly providedPropertiesForGraph: Map<string, GraphProperties> = new Map();

package/src/decorators/Graph.ts

@@ -1,14 +1,14 @@
 import { Constructable, Scope } from '../types';
 import 'reflect-metadata';
 import graphRegistry from '../graph/registry/GraphRegistry';
-import ObjectGraph from '../graph/ObjectGraph';
+import { ObjectGraph } from '../graph/ObjectGraph';
 
 interface GraphParams {
   scope: Scope | undefined;
   subgraphs: Constructable<ObjectGraph>[];
 }
 
-export default function Graph({
+export function Graph({
   scope,
   subgraphs = [],
 }: Partial<GraphParams> = {}) {

package/src/decorators/Memoize.ts

@@ -0,0 +1,18 @@
+/* eslint-disable no-param-reassign */
+import 'reflect-metadata';
+
+export default function Memoize() {
+  return function provide(_Clazz: any, propertyKey: string, descriptor: PropertyDescriptor) {
+    const originalGet = descriptor.get!;
+    descriptor.get = function get() {
+      const key = `memoized${propertyKey}`;
+      if (Reflect.hasMetadata(key, this)) {
+        return Reflect.getMetadata(key, this);
+      }
+      const value = originalGet.call(this);
+      Reflect.defineMetadata(key, value, this);
+      return value;
+    };
+    return descriptor;
+  };
+}

package/src/decorators/injectClass.ts

@@ -1,6 +1,6 @@
 import { Constructable } from '../types';
 import graphRegistry from '../graph/registry/GraphRegistry';
-import ObjectGraph from '../graph/ObjectGraph';
+import { ObjectGraph } from '../graph/ObjectGraph';
 
 const injectionMetadataKey = 'injectionMetadata';
 

package/src/decorators/provides/Provides.ts

@@ -1,5 +1,5 @@
 import { Scope } from '../../types';
-import Graph from '../../graph/Graph';
+import { Graph } from '../../graph/Graph';
 import providedPropertiesStore from '../../ProvidedPropertiesStore';
 import makeSingleton from './PropertyDescriptorToSingleton';
 
@@ -8,10 +8,9 @@ interface ProvidesParams {
   name: string;
 }
 
-function Provides({ name }: Partial<ProvidesParams> = {}) {
+export function Provides({ name }: Partial<ProvidesParams> = {}) {
   return function provide(graph: Graph, propertyKey: string, descriptor: PropertyDescriptor) {
     providedPropertiesStore.set(graph, propertyKey, name!);
     return makeSingleton(descriptor);
   };
 }
-export default Provides;

package/src/graph/Graph.ts

@@ -1,7 +1,5 @@
 import PropertyRetrieverDelegate from './PropertyRetrieverDelegate';
 
-interface Graph extends PropertyRetrieverDelegate {
+export interface Graph extends PropertyRetrieverDelegate {
   get name(): string;
 }
-
-export default Graph;

package/src/graph/ObjectGraph.ts

@@ -1,13 +1,17 @@
+import { uniqueId } from 'lodash';
+import Memoize from '../decorators/Memoize';
 import { Scope } from '../types';
-import Graph from './Graph';
+import { Graph } from './Graph';
 import PropertyRetriever from './PropertyRetriever';
 
-export default abstract class ObjectGraph<T = unknown> implements Graph {
+export abstract class ObjectGraph<T = unknown> implements Graph {
   // TODO? rename scope to singleInstance
   public scope!: Scope;
   private propertyRetriever = new PropertyRetriever(this);
+
+  @Memoize()
   get name(): string {
-    return this.constructor.name;
+    return uniqueId(this.constructor.name);
   }
 
   // eslint-disable-next-line no-useless-constructor, no-unused-vars, no-empty-function

package/src/graph/PropertyRetriever.ts

@@ -1,5 +1,5 @@
 import graphRegistry from './registry/GraphRegistry';
-import Graph from './Graph';
+import { Graph } from './Graph';
 import providedPropertiesStore from '../ProvidedPropertiesStore';
 
 export default class PropertyRetriever {

package/src/graph/registry/DefaultGraphResolver.ts

@@ -1,9 +1,9 @@
 import { Constructable } from '../../types';
-import Graph from '../Graph';
-import { GraphMiddleware, ResolveChain } from './GraphMiddleware';
+import { Graph } from '../Graph';
+import { Middleware, ResolveChain } from './Middleware';
 
-export default class DefaultGraphMiddleware extends GraphMiddleware {
-  resolve<T extends Graph, Props>(_resolveChain: ResolveChain, Graph: Constructable<T>, props?: Props): T {
+export default class DefaultGraphMiddleware<T extends Graph> extends Middleware<T> {
+  resolve<Props>(_resolveChain: ResolveChain<T>, Graph: Constructable<T>, props?: Props): T {
     return new Graph(props);
   }
 }

package/src/graph/registry/GraphMiddleware.ts

@@ -1,24 +1,4 @@
-import { Constructable } from '../../types';
-import Graph from '../Graph';
+import { ObjectGraph } from '../ObjectGraph';
+import { Middleware } from './Middleware';
 
-export abstract class GraphMiddleware {
-  private next!: GraphMiddleware;
-
-  public setNext(next: GraphMiddleware) {
-    this.next = next;
-  }
-
-  public get resolveChain(): ResolveChain {
-    return {
-      proceed: <T extends Graph, Props>(Graph: Constructable<T>, props?: Props): T => {
-        return this.next.resolve(this.next.resolveChain, Graph, props);
-      },
-    };
-  }
-
-  abstract resolve<T extends Graph, Props>(resolveChain: ResolveChain, Graph: Constructable<T>, props?: Props): T;
-}
-
-export interface ResolveChain {
-  proceed<T extends Graph, Props>(Graph: Constructable<T>, props?: Props): T;
-}
+export abstract class GraphMiddleware extends Middleware<ObjectGraph> { }

package/src/graph/registry/GraphMiddlewareChain.ts

@@ -1,20 +1,20 @@
 import { Constructable } from '../../types';
-import Graph from '../Graph';
+import { Graph } from '../Graph';
 import DefaultGraphMiddleware from './DefaultGraphResolver';
-import { GraphMiddleware } from './GraphMiddleware';
+import { Middleware } from './Middleware';
 
-export default class GraphMiddlewareChain {
-  private middlewares: GraphMiddleware[];
+export default class GraphMiddlewareChain<T extends Graph> {
+  private middlewares: Middleware<T>[];
 
-  constructor(defaultMiddleware: GraphMiddleware = new DefaultGraphMiddleware()) {
+  constructor(defaultMiddleware: Middleware<T> = new DefaultGraphMiddleware()) {
     this.middlewares = [defaultMiddleware];
   }
 
-  resolve<T extends Graph>(Graph: Constructable<T>, props?: any): T {
+  resolve(Graph: Constructable<T>, props?: any): T {
     return this.middlewares[0].resolve(this.middlewares[0].resolveChain, Graph, props);
   }
 
-  add(middleware: GraphMiddleware) {
+  add(middleware: Middleware<T>) {
     this.middlewares.unshift(middleware);
     this.updateResolveChain();
   }

package/src/graph/registry/GraphRegistry.ts

@@ -1,6 +1,6 @@
 import { Constructable, Scope } from '../../types';
-import Graph from '../Graph';
-import { GraphMiddleware } from './GraphMiddleware';
+import { Graph } from '../Graph';
+import { Middleware } from './Middleware';
 import GraphMiddlewareChain from './GraphMiddlewareChain';
 
 class GraphRegistry {
@@ -49,7 +49,7 @@ class GraphRegistry {
     }
     const graph = this.graphMiddlewares.resolve(Graph, props);
     this.set(Graph, graph);
-    return graph;
+    return graph as T;
   }
 
   clear(graph: Graph) {
@@ -58,7 +58,7 @@ class GraphRegistry {
     this.constructorToInstance.delete(Graph);
   }
 
-  addGraphMiddleware(middleware: GraphMiddleware) {
+  addGraphMiddleware(middleware: Middleware<Graph>) {
     this.graphMiddlewares.add(middleware);
   }
 

package/src/graph/registry/Middleware.ts

@@ -0,0 +1,23 @@
+import { Constructable } from '../../types';
+
+export abstract class Middleware<T> {
+  private next!: Middleware<T>;
+
+  public setNext(next: Middleware<T>) {
+    this.next = next;
+  }
+
+  public get resolveChain(): ResolveChain<T> {
+    return {
+      proceed: <Props>(Graph: Constructable<T>, props?: Props): T => {
+        return this.next.resolve(this.next.resolveChain, Graph, props);
+      },
+    };
+  }
+
+  abstract resolve<Props>(resolveChain: ResolveChain<T>, Graph: Constructable<T>, props?: Props): T;
+}
+
+export interface ResolveChain<T> {
+  proceed<Props>(Graph: Constructable<T>, props?: Props): T;
+}

package/src/index.ts

@@ -1,30 +1,30 @@
 import React from 'react';
-import _Graph from './decorators/Graph';
-import _ObjectGraph from './graph/ObjectGraph';
+import { ObjectGraph as _ObjectGraph } from './graph/ObjectGraph';
 import ComponentInjector from './injectors/components/ComponentInjector';
-import _Provides from './decorators/provides/Provides';
-import { Inject as _Inject, Injectable as _Injectable } from './decorators/injectClass';
-import _obsidian from './Obsidian';
+import _Obsidian from './Obsidian';
 import HookInjector from './injectors/hooks/HookInjector';
 import { Constructable } from './types';
 
 export * from './types';
 
-export const Graph = _Graph;
-export const ObjectGraph = _ObjectGraph;
-export const Provides = _Provides;
-export const Injectable = _Injectable;
-export const Inject = _Inject;
-export const Obsidian = new _obsidian();
+export { Graph } from './decorators/Graph';
+export { ObjectGraph } from './graph/ObjectGraph';
+export { Graph as IGraph } from './graph/Graph';
+export { Provides } from './decorators/provides/Provides';
+export { Injectable } from './decorators/injectClass';
+export { Inject } from './decorators/injectClass';
+export { GraphMiddleware } from './graph/registry/GraphMiddleware';
+export { ResolveChain } from './graph/registry/Middleware';
+export const Obsidian = new _Obsidian();
 
 const componentInjector = new ComponentInjector();
 export const injectComponent = <P> (
-  __Target: React.FunctionComponent<P>,
-  __Graph: Constructable<_ObjectGraph>,
-) => componentInjector.inject(__Target, __Graph);
+  Target: React.FunctionComponent<P>,
+  Graph: Constructable<_ObjectGraph>,
+) => componentInjector.inject(Target, Graph);
 
 const hookInjector = new HookInjector();
 export const injectHook = <Args, Result> (
   hook: (args: Args) => Result,
-  __Graph: Constructable<_ObjectGraph>,
-) => hookInjector.inject(hook, __Graph);
+  Graph: Constructable<_ObjectGraph>,
+) => hookInjector.inject(hook, Graph);

package/src/injectors/components/ComponentInjector.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import 'reflect-metadata';
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 import PropsInjector from './PropsInjector';
 import useGraph from './useGraph';
 import { Constructable } from '../../types';

package/src/injectors/components/PropsInjector.ts

@@ -1,4 +1,4 @@
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 
 export default class PropsInjector<Props> {
   constructor(private graph: ObjectGraph) {}

package/src/injectors/components/useGraph.ts

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Constructable } from '../../types';
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 import graphRegistry from '../../graph/registry/GraphRegistry';
 import referenceCounter from '../../ReferenceCounter';
 

package/src/injectors/hooks/HookInjector.ts

@@ -1,5 +1,5 @@
-import ObjectGraph from '../../graph/ObjectGraph';
-import Graph from '../../graph/Graph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
+import { Graph } from '../../graph/Graph';
 import useGraph from '../components/useGraph';
 import { Constructable } from '../../types';
 

package/testkit/index.ts

@@ -1,6 +1,10 @@
-import { GraphMiddleware, ResolveChain } from '../src/graph/registry/GraphMiddleware';
-import ObjectGraph from '../src/graph/Graph';
-import { Constructable, Obsidian } from '../src';
+import {
+  ObjectGraph,
+  Constructable,
+  GraphMiddleware,
+  Obsidian,
+  ResolveChain,
+} from '../src';
 
 beforeEach(() => {
   Obsidian.clearGraphMiddlewares();
@@ -9,10 +13,10 @@ beforeEach(() => {
 class Index {
   mockGraphs(graphNameToGraph: Record<string, Constructable<ObjectGraph>>) {
     const graphMiddleware = new class extends GraphMiddleware {
-      resolve<T extends ObjectGraph, Props>(resolveChain: ResolveChain, Graph: Constructable<T>, props?: Props) {
+      resolve<Props>(resolveChain: ResolveChain<ObjectGraph>, Graph: Constructable<ObjectGraph>, props?: Props) {
         if (graphNameToGraph[Graph.name]) {
           const TheGraph = graphNameToGraph[Graph.name];
-          return new TheGraph(props) as unknown as T;
+          return new TheGraph(props);
         }
         return resolveChain.proceed(Graph, props);
       }