react-obsidian 0.0.4 → 0.0.9

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

@@ -0,0 +1 @@
+{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../../../src/graph/registry/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,8BAAsB,UAAU,CAAC,CAAC,GAAG,KAAK,EAAE,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;IAC9D,OAAO,CAAC,IAAI,CAAkC;IAEvC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAInD,IAAW,YAAY,IAAI,YAAY,CAAC,CAAC,CAAC,CAMzC;IAED,QAAQ,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC;CAC3F"}

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Middleware = void 0;
+var Middleware = /** @class */ (function () {
+    function Middleware() {
+    }
+    Middleware.prototype.setNext = function (next) {
+        this.next = next;
+    };
+    Object.defineProperty(Middleware.prototype, "resolveChain", {
+        get: function () {
+            var _this = this;
+            return {
+                proceed: function (Graph, props) {
+                    return _this.next.resolve(_this.next.resolveChain, Graph, props);
+                },
+            };
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return Middleware;
+}());
+exports.Middleware = Middleware;
+//# sourceMappingURL=Middleware.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../../../../src/graph/registry/Middleware.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAgBA,CAAC;IAbQ,4BAAO,GAAd,UAAe,IAAoC;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,sBAAW,oCAAY;aAAvB;YAAA,iBAMC;YALC,OAAO;gBACL,OAAO,EAAE,UAAQ,KAAuB,EAAE,KAAa;oBACrD,OAAO,KAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;gBACjE,CAAC;aACF,CAAC;QACJ,CAAC;;;OAAA;IAGH,iBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBqB,gCAAU"}

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

@@ -0,0 +1,5 @@
+import { Constructable } from '../../types';
+export interface ResolveChain<T> {
+    proceed<Props = any>(Graph: Constructable<T>, props?: Props): T;
+}
+//# sourceMappingURL=ResolveChain.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ResolveChain.d.ts","sourceRoot":"","sources":["../../../../src/graph/registry/ResolveChain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC;CACjE"}

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

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

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

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

package/dist/src/index.d.ts

@@ -1,16 +1,17 @@
 import React from 'react';
-import { Constructable } from '@Obsidian';
-import _Graph from './decorators/Graph';
-import _ObjectGraph from './graph/ObjectGraph';
-import _Provides from './decorators/provides/Provides';
-import { Inject as _Inject, Injectable as _Injectable } from './decorators/injectClass';
-import _obsidian from './Obsidian';
-export declare const Graph: typeof _Graph;
-export declare const ObjectGraph: typeof _ObjectGraph;
-export declare const Provides: typeof _Provides;
-export declare const Injectable: typeof _Injectable;
-export declare const Inject: typeof _Inject;
-export declare const Obsidian: _obsidian;
-export declare const injectComponent: <P>(__Target: React.FunctionComponent<P>, __Graph: Constructable<_ObjectGraph>) => React.FunctionComponent<Partial<P>>;
-export declare const injectHook: <Args, Result>(hook: (args: Args) => Result, __Graph: Constructable<_ObjectGraph>) => (args?: Partial<Args> | undefined) => Result;
+import { ObjectGraph as _ObjectGraph } from './graph/ObjectGraph';
+import _Obsidian from './Obsidian';
+import { Constructable } from './types';
+export * from './types';
+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 { GraphResolveChain as ResolveChain } from './graph/registry/GraphResolveChain';
+export declare const Obsidian: _Obsidian;
+export declare const injectComponent: <P>(Target: React.FunctionComponent<P>, Graph: Constructable<_ObjectGraph>) => React.FunctionComponent<Partial<P>>;
+export declare const injectHook: <Args, Result>(hook: (args: Args) => Result, Graph: Constructable<_ObjectGraph>) => (args?: Partial<Args> | undefined) => Result;
 //# 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,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,SAAS,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,SAAS,MAAM,YAAY,CAAC;AAGnC,eAAO,MAAM,KAAK,eAAS,CAAC;AAC5B,eAAO,MAAM,WAAW,qBAAe,CAAC;AACxC,eAAO,MAAM,QAAQ,kBAAY,CAAC;AAClC,eAAO,MAAM,UAAU,oBAAc,CAAC;AACtC,eAAO,MAAM,MAAM,gBAAU,CAAC;AAC9B,eAAO,MAAM,QAAQ,WAAkB,CAAC;AAGxC,eAAO,MAAM,eAAe,qDAEjB,cAAc,YAAY,CAAC,wCACU,CAAC;AAGjD,eAAO,MAAM,UAAU,wDAEZ,cAAc,YAAY,CAAC,iDACC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,cAAc,SAAS,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,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,0BAA0B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,iBAAiB,IAAI,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvF,eAAO,MAAM,QAAQ,WAAkB,CAAC;AAGxC,eAAO,MAAM,eAAe,iDAEnB,cAAc,YAAY,CAAC,wCACQ,CAAC;AAG7C,eAAO,MAAM,UAAU,sDAEd,cAAc,YAAY,CAAC,iDACC,CAAC"}

package/dist/src/index.js

@@ -1,26 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 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"));
-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;
+__exportStar(require("./types"), exports);
+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":";;;;;;AAEA,6DAAwC;AACxC,oEAA+C;AAC/C,+FAAyE;AACzE,4EAAuD;AACvD,wDAAwF;AACxF,wDAAmC;AACnC,gFAA0D;AAE7C,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,7 +1,7 @@
 import React from 'react';
-import { Constructable } from '@Obsidian';
 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>>;
     private wrapComponent;

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;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,kBAAkB,CAAC;AAC1B,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAIlD,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/ComponentInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComponentInjector.js","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AAExC,oFAA2D;AAC3D,4BAA0B;AAE1B,kEAA4C;AAC5C,wDAAkC;AAElC;IAAA;IAoBA,CAAC;IAnBC,kCAAM,GAAN,UACE,MAAkC,EAClC,KAAiC;QAEjC,IAAM,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,yCAAa,GAArB,UACE,MAAkC,EAClC,KAAiC;QAEjC,OAAO,UAAC,WAAuB;YAC7B,IAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACpC,IAAA,YAAY,GAAI,IAAA,gBAAQ,EAAC,IAAI,uBAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAA1D,CAA2D;YAC9E,OAAO,8DAAG,MAAM,CAAC,YAA4B,CAAC,CAAI,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC;IACH,wBAAC;AAAD,CAAC,AApBD,IAoBC"}
+{"version":3,"file":"ComponentInjector.js","sourceRoot":"","sources":["../../../../src/injectors/components/ComponentInjector.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,oFAA2D;AAC3D,4BAA0B;AAE1B,kEAA4C;AAC5C,wDAAkC;AAGlC;IAAA;IAoBA,CAAC;IAnBC,kCAAM,GAAN,UACE,MAAkC,EAClC,KAAiC;QAEjC,IAAM,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,yCAAa,GAArB,UACE,MAAkC,EAClC,KAAiC;QAEjC,OAAO,UAAC,WAAuB;YAC7B,IAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACpC,IAAA,YAAY,GAAI,IAAA,gBAAQ,EAAC,IAAI,uBAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAA1D,CAA2D;YAC9E,OAAO,8DAAG,MAAM,CAAC,YAA4B,CAAC,CAAI,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC;IACH,wBAAC;AAAD,CAAC,AApBD,IAoBC"}

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

@@ -1,4 +1,4 @@
-import ObjectGraph from 'src/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,uBAAuB,CAAC;AAEhD,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 '@Obsidian';
-import ObjectGraph from 'src/graph/ObjectGraph';
+import { Constructable } from '../../types';
+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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,WAAW,MAAM,uBAAuB,CAAC;mCAItB,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/components/useGraph.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGraph.js","sourceRoot":"","sources":["../../../../src/injectors/components/useGraph.ts"],"names":[],"mappings":";;;;;AACA,+BAA4C;AAE5C,qFAA+D;AAC/D,4EAAsD;AAEtD,mBAAe,UAAI,KAAiC,EAAE,KAAkB;IAC/D,IAAA,KAAK,GAAI,IAAA,gBAAQ,EAAC,uBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAjD,CAAkD;IAC9D,IAAA,iBAAS,EAAC;QACR,0BAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,cAAM,OAAA,0BAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAC,CAAC,IAAK,OAAA,uBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAtB,CAAsB,CAAC,EAA9D,CAA8D,CAAC;IAC9E,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,OAAO,KAAK,CAAC;AACf,CAAC,EAAC"}
+{"version":3,"file":"useGraph.js","sourceRoot":"","sources":["../../../../src/injectors/components/useGraph.ts"],"names":[],"mappings":";;;;;AAAA,+BAA4C;AAG5C,qFAA+D;AAC/D,4EAAsD;AAEtD,mBAAe,UAAI,KAAiC,EAAE,KAAkB;IAC/D,IAAA,KAAK,GAAI,IAAA,gBAAQ,EAAC,uBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAjD,CAAkD;IAC9D,IAAA,iBAAS,EAAC;QACR,0BAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,cAAM,OAAA,0BAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAC,CAAC,IAAK,OAAA,uBAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAtB,CAAsB,CAAC,EAA9D,CAA8D,CAAC;IAC9E,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,OAAO,KAAK,CAAC;AACf,CAAC,EAAC"}

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

@@ -1,5 +1,5 @@
-import { Constructable } from '@Obsidian';
-import ObjectGraph from 'src/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,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAGhD,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/src/injectors/hooks/HookInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"HookInjector.js","sourceRoot":"","sources":["../../../../src/injectors/hooks/HookInjector.ts"],"names":[],"mappings":";;;;;AAEA,oEAA8C;AAE9C;IAAA;IAUA,CAAC;IATC,6BAAM,GAAN,UACE,IAA4B,EAC5B,KAAiC;QAEjC,OAAO,UAAC,IAAoB;YAC1B,IAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,EAAE,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC;IACH,mBAAC;AAAD,CAAC,AAVD,IAUC;;AAED;IACE,kBAAoB,KAAkB;QAAlB,UAAK,GAAL,KAAK,CAAa;IAAG,CAAC;IAE1C,sBAAG,GAAH,UAAI,GAAQ,EAAE,QAAgB,EAAE,QAAa;QAC3C,OAAO,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACnF,CAAC;IACH,eAAC;AAAD,CAAC,AAND,IAMC"}
+{"version":3,"file":"HookInjector.js","sourceRoot":"","sources":["../../../../src/injectors/hooks/HookInjector.ts"],"names":[],"mappings":";;;;;AAEA,oEAA8C;AAG9C;IAAA;IAUA,CAAC;IATC,6BAAM,GAAN,UACE,IAA4B,EAC5B,KAAiC;QAEjC,OAAO,UAAC,IAAoB;YAC1B,IAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,EAAE,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC;IACH,mBAAC;AAAD,CAAC,AAVD,IAUC;;AAED;IACE,kBAAoB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAEpC,sBAAG,GAAH,UAAI,GAAQ,EAAE,QAAgB,EAAE,QAAa;QAC3C,OAAO,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACnF,CAAC;IACH,eAAC;AAAD,CAAC,AAND,IAMC"}

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

@@ -0,0 +1,12 @@
+export declare type Constructable<T> = {
+    new (...args: any): T;
+};
+export declare type Scope = string | number | symbol;
+export declare type Constructor = {
+    new (...args: any[]): any;
+};
+export declare type ServiceLocator<Clazz> = {
+    [Key in keyof Clazz]: Function;
+};
+export declare type GraphInternals = 'retrieve' | 'name' | 'scope';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa,CAAC,CAAC,IAAI;IAC7B,KAAI,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;CACtB,CAAC;AAEF,oBAAY,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,oBAAY,WAAW,GAAG;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;CAAE,CAAC;AAEvD,oBAAY,cAAc,CAAC,KAAK,IAAI;KACjC,GAAG,IAAI,MAAM,KAAK,GAAG,QAAQ;CAC/B,CAAC;AAEF,oBAAY,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC"}

package/dist/src/types/index.js

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

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

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

package/dist/testkit/index.d.ts

@@ -1,5 +1,4 @@
-import ObjectGraph from '../src/graph/Graph';
-import { Constructable } from '../src/@types/obsidian';
+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,EAAE,MAAM,wBAAwB,CAAC;AAOvD,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":"AACA,OAAO,EACL,WAAW,EACX,aAAa,EAGd,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;AAGtF,8BAAkC;AAElC,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":";;;;;;;;;;;;;;;;;AACA,8BAKgB;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,YAA+B,EAAE,KAAiC,EAAE,KAAa;gBAC9F,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/example/tsconfig.json

@@ -38,8 +38,5 @@
     "types": ["reflect-metadata", "jest"],
     "emitDecoratorMetadata": true,
     "baseUrl": "./",
-    "paths": {
-      "@Obsidian": ["../src/@types/obsidian.d.ts"]
-    }
   }
 }

package/package.json

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

package/src/Obsidian.ts

@@ -1,10 +1,13 @@
-import { Constructable, ServiceLocator } from '@Obsidian';
 import graphRegistry from './graph/registry/GraphRegistry';
-import ObjectGraph from './graph/ObjectGraph';
+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>(Graph: Constructable<T>, props?: P): ServiceLocator<T> {
+  obtain<T extends ObjectGraph<P>, P = any>(
+    Graph: Constructable<T>,
+    props?: P,
+  ): ServiceLocator<Omit<T, GraphInternals>> {
     return graphRegistry.resolve(Graph, props) as unknown as ServiceLocator<T>;
   }
 

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/ScopedValuesRegistry.ts

@@ -1,4 +1,4 @@
-import { Scope } from '@Obsidian';
+import { Scope } from './types';
 
 class ScopedValuesRegistry {
   private readonly values: Map<string, any> = new Map();

package/src/decorators/Graph.ts

@@ -1,14 +1,14 @@
-import { Constructable, Scope } from '@Obsidian';
+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 '@Obsidian';
+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 '@Obsidian';
-import Graph from '../../graph/Graph';
+import { Scope } from '../../types';
+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 { Scope } from '@Obsidian';
-import Graph from './Graph';
+import { uniqueId } from 'lodash';
+import Memoize from '../decorators/Memoize';
+import { Scope } from '../types';
+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,10 @@
-import { Constructable } from '@Obsidian';
-import Graph from '../Graph';
-import { GraphMiddleware, ResolveChain } from './GraphMiddleware';
+import { Constructable } from '../../types';
+import { Graph } from '../Graph';
+import { Middleware } from './Middleware';
+import { ResolveChain } from './ResolveChain';
 
-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(_resolveChain: ResolveChain<T>, Graph: Constructable<T>, props?: any): T {
     return new Graph(props);
   }
 }

package/src/graph/registry/GraphMiddleware.ts

@@ -1,24 +1,5 @@
-import { Constructable } from '@Obsidian';
-import Graph from '../Graph';
+import { ObjectGraph } from '../ObjectGraph';
+import { GraphResolveChain } from './GraphResolveChain';
+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, GraphResolveChain> { }

package/src/graph/registry/GraphMiddlewareChain.ts

@@ -1,20 +1,20 @@
-import { Constructable } from '@Obsidian';
-import Graph from '../Graph';
+import { Constructable } from '../../types';
+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 '@Obsidian';
-import Graph from '../Graph';
-import { GraphMiddleware } from './GraphMiddleware';
+import { Constructable, Scope } from '../../types';
+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/GraphResolveChain.ts

@@ -0,0 +1,4 @@
+import { ObjectGraph } from '../ObjectGraph';
+import { ResolveChain } from './ResolveChain';
+
+export type GraphResolveChain = ResolveChain<ObjectGraph>;

package/src/graph/registry/Middleware.ts

@@ -0,0 +1,21 @@
+import { Constructable } from '../../types';
+import { Graph } from '../Graph';
+import { ResolveChain } from './ResolveChain';
+
+export abstract class Middleware<T = Graph, RC = ResolveChain<T>> {
+  private next!: Middleware<T, ResolveChain<T>>;
+
+  public setNext(next: Middleware<T, ResolveChain<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 = any>(resolveChain: RC, Graph: Constructable<T>, props?: Props): T;
+}