react-obsidian 0.0.12 → 0.0.16

package/dist/test/integration/fixtures/UniqueNumberGraph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UniqueNumberGraph.d.ts","sourceRoot":"","sources":["../../../../test/integration/fixtures/UniqueNumberGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EAGZ,MAAM,cAAc,CAAC;AAEtB,qBACa,iBAAkB,SAAQ,WAAW;IACpC,OAAO,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,MAAM,MAAM;IAKvD,eAAe,IAAI,MAAM;IAKzB,cAAc,IAAI,MAAM;CAGzB"}

package/dist/test/integration/fixtures/UniqueNumberGraph.js

@@ -0,0 +1,62 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+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;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UniqueNumberGraph = void 0;
+var src_1 = require("../../../src");
+var UniqueNumberGraph = /** @class */ (function (_super) {
+    __extends(UniqueNumberGraph, _super);
+    function UniqueNumberGraph(uniqueNumberGenerator) {
+        var _this = _super.call(this) || this;
+        _this.uniqueNumberGenerator = uniqueNumberGenerator;
+        return _this;
+    }
+    UniqueNumberGraph.prototype.singletonNumber = function () {
+        return this.uniqueNumberGenerator();
+    };
+    UniqueNumberGraph.prototype.instanceNumber = function () {
+        return this.uniqueNumberGenerator();
+    };
+    __decorate([
+        (0, src_1.Provides)(),
+        (0, src_1.Singleton)(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Number)
+    ], UniqueNumberGraph.prototype, "singletonNumber", null);
+    __decorate([
+        (0, src_1.Provides)(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Number)
+    ], UniqueNumberGraph.prototype, "instanceNumber", null);
+    UniqueNumberGraph = __decorate([
+        (0, src_1.Graph)(),
+        __metadata("design:paramtypes", [Function])
+    ], UniqueNumberGraph);
+    return UniqueNumberGraph;
+}(src_1.ObjectGraph));
+exports.UniqueNumberGraph = UniqueNumberGraph;
+//# sourceMappingURL=UniqueNumberGraph.js.map

package/dist/test/integration/fixtures/UniqueNumberGraph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UniqueNumberGraph.js","sourceRoot":"","sources":["../../../../test/integration/fixtures/UniqueNumberGraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAKsB;AAGtB;IAAuC,qCAAW;IAChD,2BAAoB,qBAAmC;QAAvD,YACE,iBAAO,SACR;QAFmB,2BAAqB,GAArB,qBAAqB,CAAc;;IAEvD,CAAC;IAGD,2CAAe,GAAf;QACE,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAGD,0CAAc,GAAd;QACE,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAPD;QADC,IAAA,cAAQ,GAAE;QAAE,IAAA,eAAS,GAAE;;;;4DAGvB;IAGD;QADC,IAAA,cAAQ,GAAE;;;;2DAGV;IAbU,iBAAiB;QAD7B,IAAA,WAAK,GAAE;;OACK,iBAAiB,CAc7B;IAAD,wBAAC;CAAA,AAdD,CAAuC,iBAAW,GAcjD;AAdY,8CAAiB"}

package/dist/test/integration/fixtures/injectedValues.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     fromSubgraph: string;
     fromStringProvider: string;
+    anotherString: string;
 };
 export default _default;
 //# sourceMappingURL=injectedValues.d.ts.map

package/dist/test/integration/fixtures/injectedValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"injectedValues.d.ts","sourceRoot":"","sources":["../../../../test/integration/fixtures/injectedValues.ts"],"names":[],"mappings":";;;;AAAA,wBAGE"}
+{"version":3,"file":"injectedValues.d.ts","sourceRoot":"","sources":["../../../../test/integration/fixtures/injectedValues.ts"],"names":[],"mappings":";;;;;AAAA,wBAIE"}

package/dist/test/integration/fixtures/injectedValues.js

@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     fromSubgraph: 'FromSubgraph',
     fromStringProvider: 'Fear kills progress',
+    anotherString: 'Yet another injected string',
 };
 //# sourceMappingURL=injectedValues.js.map

package/dist/test/integration/fixtures/injectedValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectedValues.js","sourceRoot":"","sources":["../../../../test/integration/fixtures/injectedValues.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,YAAY,EAAE,cAAc;IAC5B,kBAAkB,EAAE,qBAAqB;CAC1C,CAAC"}
+{"version":3,"file":"injectedValues.js","sourceRoot":"","sources":["../../../../test/integration/fixtures/injectedValues.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,YAAY,EAAE,cAAc;IAC5B,kBAAkB,EAAE,qBAAqB;IACzC,aAAa,EAAE,6BAA6B;CAC7C,CAAC"}

package/dist/testkit/index.d.ts

@@ -1,7 +1,8 @@
-import { ObjectGraph, Constructable } from '../src';
-declare class Index {
-    mockGraphs(graphNameToGraph: Record<string, Constructable<ObjectGraph>>): void;
+import { ObjectGraph } from '../src/graph/ObjectGraph';
+import { Constructable } from '../src/types';
+declare class TestKit {
+    mockGraphs(graphNameToGraph: Record<string, Constructable<ObjectGraph> | ((props: any) => ObjectGraph)>): void;
 }
-declare const _default: Index;
-export default _default;
+export declare const testKit: TestKit;
+export {};
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAQ7C,cAAM,OAAO;IACJ,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,WAAW,CAAC,CAAC;CAY/G;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC"}

package/dist/testkit/index.js

@@ -14,15 +14,22 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var src_1 = require("../src");
+exports.testKit = void 0;
+var ObjectGraph_1 = require("../src/graph/ObjectGraph");
+var GraphMiddleware_1 = require("../src/graph/registry/GraphMiddleware");
+var GraphRegistry_1 = __importDefault(require("../src/graph/registry/GraphRegistry"));
 beforeEach(function () {
-    src_1.Obsidian.clearGraphMiddlewares();
+    GraphRegistry_1.default.clearGraphMiddlewares();
+    GraphRegistry_1.default.reset();
 });
-var Index = /** @class */ (function () {
-    function Index() {
+var TestKit = /** @class */ (function () {
+    function TestKit() {
     }
-    Index.prototype.mockGraphs = function (graphNameToGraph) {
+    TestKit.prototype.mockGraphs = function (graphNameToGraph) {
         var graphMiddleware = new /** @class */ (function (_super) {
             __extends(class_1, _super);
             function class_1() {
@@ -30,16 +37,16 @@ var Index = /** @class */ (function () {
             }
             class_1.prototype.resolve = function (resolveChain, Graph, props) {
                 if (graphNameToGraph[Graph.name]) {
-                    var TheGraph = graphNameToGraph[Graph.name];
-                    return new TheGraph(props);
+                    var GraphOrGenerator = graphNameToGraph[Graph.name];
+                    return (0, ObjectGraph_1.isGraph)(GraphOrGenerator) ? new GraphOrGenerator(props) : GraphOrGenerator(props);
                 }
                 return resolveChain.proceed(Graph, props);
             };
             return class_1;
-        }(src_1.GraphMiddleware))();
-        src_1.Obsidian.addGraphMiddleware(graphMiddleware);
+        }(GraphMiddleware_1.GraphMiddleware))();
+        GraphRegistry_1.default.addGraphMiddleware(graphMiddleware);
     };
-    return Index;
+    return TestKit;
 }());
-exports.default = new Index();
+exports.testKit = new TestKit();
 //# sourceMappingURL=index.js.map

package/dist/testkit/index.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA,wDAAgE;AAChE,yEAAwE;AAExE,sFAAgE;AAEhE,UAAU,CAAC;IACT,uBAAa,CAAC,qBAAqB,EAAE,CAAC;IACtC,uBAAa,CAAC,KAAK,EAAE,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH;IAAA;IAaA,CAAC;IAZQ,4BAAU,GAAjB,UAAkB,gBAA4F;QAC5G,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,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACtD,OAAO,IAAA,qBAAO,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;iBAC1F;gBACD,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC5C,CAAC;YACH,cAAC;QAAD,CAAC,AAR2B,CAAc,iCAAe,IAQtD,CAAC;QACJ,uBAAa,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACpD,CAAC;IACH,cAAC;AAAD,CAAC,AAbD,IAaC;AAEY,QAAA,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC"}

package/dist/transformers/{babel-plugin-obsidian-provide → babel-plugin-obsidian}/helpers/index.d.ts

@@ -1,9 +1,11 @@
-import { ClassMethod, Decorator, Identifier, ObjectExpression, ObjectPattern } from '@babel/types';
+import { ClassMethod, ClassProperty, Decorator, Identifier, ObjectExpression, ObjectPattern, TSParameterProperty } from '@babel/types';
+export declare type AcceptedNodeType = Identifier | TSParameterProperty | ClassProperty;
 export declare function providerIsNotNamed(decorator: Decorator): boolean;
 export declare function addNameToProviderArguments(node: ClassMethod, decorator: Decorator): void;
 export declare function getDecoratorArgument(decorator: Decorator): ObjectExpression | undefined;
 export declare function getMethodName(node: ClassMethod): string;
-export declare function getProviderDecorator(decorators: Array<Decorator> | undefined | null): Decorator | undefined;
+export declare function getDecoratorByName(decorators: Array<Decorator> | undefined | null, decoratorName: string): Decorator | undefined;
 export declare function getDecoratorName(decorator?: Decorator): string | undefined;
 export declare function paramsToDestructuringAssignment(params: (Identifier | any)[]): ObjectPattern;
+export declare function passParamNameAsInjectArgument(node: AcceptedNodeType, decorator: Decorator): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/transformers/babel-plugin-obsidian/helpers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,WAAW,EACX,aAAa,EACb,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAKtB,oBAAY,gBAAgB,GAAG,UAAU,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAEhF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAWhE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,QAOjF;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,CAKvF;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CAGvD;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,EAC/C,aAAa,EAAE,MAAM,GACpB,SAAS,GAAG,SAAS,CAEvB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,EAAE,GAAG,aAAa,CAI3F;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,SAAS,QAOrB"}

package/dist/transformers/{babel-plugin-obsidian-provide → babel-plugin-obsidian}/helpers/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paramsToDestructuringAssignment = exports.getDecoratorName = exports.getProviderDecorator = exports.getMethodName = exports.getDecoratorArgument = exports.addNameToProviderArguments = exports.providerIsNotNamed = void 0;
+exports.passParamNameAsInjectArgument = exports.paramsToDestructuringAssignment = exports.getDecoratorName = exports.getDecoratorByName = exports.getMethodName = exports.getDecoratorArgument = exports.addNameToProviderArguments = exports.providerIsNotNamed = void 0;
 /* eslint-disable no-param-reassign */
 var core_1 = require("@babel/core");
 var lodash_1 = require("lodash");
+var never = '';
 function providerIsNotNamed(decorator) {
     var argument = getDecoratorArgument(decorator);
     if (core_1.types.isObjectExpression(argument)) {
@@ -37,10 +38,10 @@ function getMethodName(node) {
     throw new Error("Tried to get class name but encountered unexpected key of type: ".concat(node.key.type));
 }
 exports.getMethodName = getMethodName;
-function getProviderDecorator(decorators) {
-    return decorators === null || decorators === void 0 ? void 0 : decorators.find(function (decorator) { return (0, lodash_1.get)(decorator, 'expression.callee.name') === 'Provides'; });
+function getDecoratorByName(decorators, decoratorName) {
+    return decorators === null || decorators === void 0 ? void 0 : decorators.find(function (decorator) { return (0, lodash_1.get)(decorator, 'expression.callee.name') === decoratorName; });
 }
-exports.getProviderDecorator = getProviderDecorator;
+exports.getDecoratorByName = getDecoratorByName;
 function getDecoratorName(decorator) {
     return (0, lodash_1.get)(decorator, 'expression.callee.name');
 }
@@ -51,4 +52,27 @@ function paramsToDestructuringAssignment(params) {
         .map(function (p) { return core_1.types.objectProperty(core_1.types.identifier(p.name), core_1.types.identifier(p.name)); }));
 }
 exports.paramsToDestructuringAssignment = paramsToDestructuringAssignment;
+function passParamNameAsInjectArgument(node, decorator) {
+    if (core_1.types.isCallExpression(decorator.expression)) {
+        decorator.expression.arguments = [
+            core_1.types.stringLiteral(getNodeName(node)),
+        ];
+    }
+}
+exports.passParamNameAsInjectArgument = passParamNameAsInjectArgument;
+function getNodeName(node) {
+    if (core_1.types.isTSParameterProperty(node)) {
+        if (core_1.types.isIdentifier(node.parameter)) {
+            return node.parameter.name;
+        }
+        return never;
+    }
+    if (core_1.types.isClassProperty(node)) {
+        if (core_1.types.isIdentifier(node.key)) {
+            return node.key.name;
+        }
+        return never;
+    }
+    return node.name;
+}
 //# sourceMappingURL=index.js.map

package/dist/transformers/babel-plugin-obsidian/helpers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"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"}

package/dist/transformers/babel-plugin-obsidian/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAY,SAAS,EAAE,MAAM,aAAa,CAAC;AAmClD,MAAM,CAAC,OAAO,UAAU,MAAM,gDAE7B"}

package/dist/transformers/babel-plugin-obsidian/index.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var unmagler_1 = __importDefault(require("./unmagler"));
+var providerArgumentsTransformer = {
+    visitor: {
+        Program: function (path) {
+            path.traverse(internalVisitor);
+        },
+    },
+};
+var internalVisitor = {
+    ClassMethod: {
+        enter: function (_a) {
+            var node = _a.node;
+            unmagler_1.default.saveClassMethod('Provides', node);
+        },
+    },
+    ClassProperty: {
+        enter: function (_a) {
+            var node = _a.node;
+            unmagler_1.default.saveClassProperty('Inject', node);
+            unmagler_1.default.saveClassProperty('LazyInject', node);
+        },
+    },
+    Identifier: {
+        enter: function (_a) {
+            var node = _a.node;
+            unmagler_1.default.saveIdentifier('Inject', node);
+        },
+    },
+    TSParameterProperty: {
+        enter: function (_a) {
+            var node = _a.node;
+            unmagler_1.default.saveTSParameterProperty('Inject', node);
+        },
+    },
+};
+function plugin() {
+    return providerArgumentsTransformer;
+}
+exports.default = plugin;
+//# sourceMappingURL=index.js.map

package/dist/transformers/babel-plugin-obsidian/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":";;;;;AASA,wDAAkC;AAElC,IAAM,4BAA4B,GAAc;IAC9C,OAAO,EAAE;QACP,OAAO,EAAP,UAAQ,IAAuB;YAC7B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACjC,CAAC;KACF;CACF,CAAC;AAEF,IAAM,eAAe,GAAG;IACtB,WAAW,EAAE;QACX,KAAK,EAAL,UAAM,EAA+B;gBAA7B,IAAI,UAAA;YACV,kBAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7C,CAAC;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAL,UAAM,EAAiC;gBAA/B,IAAI,UAAA;YACV,kBAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC3C,kBAAQ,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;KACF;IACD,UAAU,EAAE;QACV,KAAK,EAAL,UAAM,EAA8B;gBAA5B,IAAI,UAAA;YACV,kBAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC;KACF;IACD,mBAAmB,EAAE;QACnB,KAAK,EAAL,UAAM,EAAuC;gBAArC,IAAI,UAAA;YACV,kBAAQ,CAAC,uBAAuB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC;KACF;CACF,CAAC;AAEF,SAAwB,MAAM;IAC5B,OAAO,4BAA4B,CAAC;AACtC,CAAC;AAFD,yBAEC"}

package/dist/transformers/babel-plugin-obsidian/unmagler/index.d.ts

@@ -0,0 +1,10 @@
+import saveMethod from './method';
+import saveProperty from './property';
+declare const _default: {
+    saveClassMethod: typeof saveMethod;
+    saveClassProperty: typeof saveProperty;
+    saveIdentifier: typeof saveProperty;
+    saveTSParameterProperty: typeof saveProperty;
+};
+export default _default;
+//# sourceMappingURL=index.d.ts.map

package/dist/transformers/babel-plugin-obsidian/unmagler/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/index.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,UAAU,CAAC;AAClC,OAAO,YAAY,MAAM,YAAY,CAAC;;;;;;;AAEtC,wBAKE"}

package/dist/transformers/babel-plugin-obsidian/unmagler/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var method_1 = __importDefault(require("./method"));
+var property_1 = __importDefault(require("./property"));
+exports.default = {
+    saveClassMethod: method_1.default,
+    saveClassProperty: property_1.default,
+    saveIdentifier: property_1.default,
+    saveTSParameterProperty: property_1.default,
+};
+//# sourceMappingURL=index.js.map

package/dist/transformers/babel-plugin-obsidian/unmagler/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/index.ts"],"names":[],"mappings":";;;;;AAAA,oDAAkC;AAClC,wDAAsC;AAEtC,kBAAe;IACb,eAAe,EAAE,gBAAU;IAC3B,iBAAiB,EAAE,kBAAY;IAC/B,cAAc,EAAE,kBAAY;IAC5B,uBAAuB,EAAE,kBAAY;CACtC,CAAC"}

package/dist/transformers/babel-plugin-obsidian/unmagler/method.d.ts

@@ -0,0 +1,4 @@
+import { ClassMethod } from '@babel/types';
+declare function saveMethod(name: string, node: ClassMethod): void;
+export default saveMethod;
+//# sourceMappingURL=method.d.ts.map

package/dist/transformers/babel-plugin-obsidian/unmagler/method.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAStD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,QAMlD;AAeD,eAAe,UAAU,CAAC"}

package/dist/transformers/babel-plugin-obsidian/unmagler/method.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var helpers_1 = require("../helpers");
+function saveMethod(name, node) {
+    var decorator = (0, helpers_1.getDecoratorByName)(node.decorators, name);
+    if ((0, helpers_1.getDecoratorName)(decorator) === name) {
+        convertProviderParamsToDestructuringAssignment(node);
+        saveUnmangledMethodNameInProviderArguments(node, decorator);
+    }
+}
+function convertProviderParamsToDestructuringAssignment(node) {
+    if (node.params.length === 0) {
+        return;
+    }
+    var destructuredParams = (0, helpers_1.paramsToDestructuringAssignment)(node.params);
+    // eslint-disable-next-line no-param-reassign
+    node.params.length = 0;
+    node.params.push(destructuredParams);
+}
+function saveUnmangledMethodNameInProviderArguments(node, decorator) {
+    if ((0, helpers_1.providerIsNotNamed)(decorator)) {
+        (0, helpers_1.addNameToProviderArguments)(node, decorator);
+    }
+}
+exports.default = saveMethod;
+//# sourceMappingURL=method.js.map

package/dist/transformers/babel-plugin-obsidian/unmagler/method.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/method.ts"],"names":[],"mappings":";;AACA,sCAMoB;AAEpB,SAAS,UAAU,CAAC,IAAY,EAAE,IAAiB;IACjD,IAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,EAAE;QACxC,8CAA8C,CAAC,IAAI,CAAC,CAAC;QACrD,0CAA0C,CAAC,IAAI,EAAE,SAAU,CAAC,CAAC;KAC9D;AACH,CAAC;AAED,SAAS,8CAA8C,CAAC,IAAiB;IACvE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAAE,OAAO;KAAE;IACzC,IAAM,kBAAkB,GAAG,IAAA,yCAA+B,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxE,6CAA6C;IAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,0CAA0C,CAAC,IAAiB,EAAE,SAAoB;IACzF,IAAI,IAAA,4BAAkB,EAAC,SAAS,CAAC,EAAE;QACjC,IAAA,oCAA0B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC7C;AACH,CAAC;AACD,kBAAe,UAAU,CAAC"}

package/dist/transformers/babel-plugin-obsidian/unmagler/property.d.ts

@@ -0,0 +1,4 @@
+import { AcceptedNodeType } from '../helpers';
+declare function savePropertyName(name: string, node: AcceptedNodeType): void;
+export default savePropertyName;
+//# sourceMappingURL=property.d.ts.map

package/dist/transformers/babel-plugin-obsidian/unmagler/property.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/property.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,QAK7D;AAMD,eAAe,gBAAgB,CAAC"}

package/dist/transformers/babel-plugin-obsidian/unmagler/property.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var helpers_1 = require("../helpers");
+function savePropertyName(name, node) {
+    var decorator = (0, helpers_1.getDecoratorByName)(node.decorators, name);
+    if ((0, helpers_1.getDecoratorName)(decorator) === name && injectIsNotNamed(decorator)) {
+        (0, helpers_1.passParamNameAsInjectArgument)(node, decorator);
+    }
+}
+function injectIsNotNamed(decorator) {
+    return (0, helpers_1.getDecoratorArgument)(decorator) === undefined;
+}
+exports.default = savePropertyName;
+//# sourceMappingURL=property.js.map

package/dist/transformers/babel-plugin-obsidian/unmagler/property.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/property.ts"],"names":[],"mappings":";;AACA,sCAMoB;AAEpB,SAAS,gBAAgB,CAAC,IAAY,EAAE,IAAsB;IAC5D,IAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,EAAE;QACxE,IAAA,uCAA6B,EAAC,IAAI,EAAE,SAAU,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,IAAA,8BAAoB,EAAC,SAAS,CAAC,KAAK,SAAS,CAAC;AACvD,CAAC;AAED,kBAAe,gBAAgB,CAAC"}

package/example/babel.config.js

@@ -2,7 +2,7 @@ module.exports = {
   presets: ['module:metro-react-native-babel-preset'],
   plugins: [
     ['@babel/plugin-proposal-decorators', {legacy: true}],
-    ['@babel/plugin-proposal-class-properties', {legacy: true}],
-    [`${__dirname}/../dist/transformers/babel-plugin-obsidian-provide`],
+    ['@babel/plugin-proposal-class-properties', {loose: true}],
+    [`${__dirname}/../dist/transformers/babel-plugin-obsidian`],
   ],
 };

package/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/jest.config.js

@@ -7,6 +7,10 @@ const config = {
     'transformers',
     'test',
   ],
+  setupFilesAfterEnv: [
+    './jest.setup-after-env.js'
+  ],
+  testEnvironment: 'jsdom'
 };
 
 module.exports = config;

package/jest.setup-after-env.js

@@ -0,0 +1 @@
+require('setimmediate');

package/jest.setup.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/package.json

@@ -1,7 +1,13 @@
 {
   "name": "react-obsidian",
-  "version": "0.0.12",
+  "version": "0.0.16",
   "description": "Dependency injection framework for React and React Native applications",
+  "scripts": {
+    "prepack": "npm run lint && tsc --project tsconfig.prod.json",
+    "lint": "npx eslint src transformers test --ignore-pattern '*.d.ts' --ext .ts,.tsx,.js",
+    "pretest": "tsc",
+    "test": "npx jest"
+  },
   "main": "src/index.ts",
   "directories": {
     "test": "test"
@@ -11,14 +17,14 @@
     "reflect-metadata": "~0.1.13"
   },
   "peerDependencies": {
-    "react": "*"
+    "react": "*",
+    "lodash": "*"
   },
   "devDependencies": {
     "@babel/core": "7.16.x",
-    "@babel/generator": "7.16.x",
-    "@babel/plugin-proposal-class-properties": "7.16.x",
     "@babel/plugin-proposal-decorators": "7.16.x",
     "@babel/preset-env": "7.16.x",
+    "babel-plugin-parameter-decorator": "1.x.x",
     "@babel/preset-react": "7.16.x",
     "@babel/preset-typescript": "7.16.x",
     "@babel/types": "7.16.x",
@@ -40,17 +46,12 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "jest": "26.x.x",
+    "jest": "27.x.x",
     "lodash": "^4.17.21",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "typescript": "^4.4.4"
-  },
-  "scripts": {
-    "prepack": "npm run lint && tsc --project tsconfig.prod.json",
-    "lint": "npx eslint src transformers test --ignore-pattern '*.d.ts' --ext .ts,.tsx,.js",
-    "pretest": "tsc",
-    "test": "npx jest"
+    "typescript": "^4.5.4",
+    "setimmediate": "^1.0.5"
   },
   "repository": {
     "type": "git",

package/src/Obsidian.ts

@@ -2,6 +2,7 @@ import graphRegistry from './graph/registry/GraphRegistry';
 import { ObjectGraph } from './graph/ObjectGraph';
 import { Constructable, GraphInternals, ServiceLocator } from './types';
 import { GraphMiddleware } from './graph/registry/GraphMiddleware';
+import lazyInjector from './injectors/class/LazyInjector';
 
 export default class Obsidian {
   obtain<T extends ObjectGraph<P>, P = any>(
@@ -11,6 +12,10 @@ export default class Obsidian {
     return graphRegistry.resolve(Graph, props) as unknown as ServiceLocator<T>;
   }
 
+  inject<T extends object>(target: T) {
+    return lazyInjector.inject(target);
+  }
+
   addGraphMiddleware(middleware: GraphMiddleware) {
     graphRegistry.addGraphMiddleware(middleware);
   }

package/src/decorators/Graph.ts

@@ -1,20 +1,17 @@
-import { Constructable, Scope } from '../types';
+import { Constructable } from '../types';
 import 'reflect-metadata';
 import graphRegistry from '../graph/registry/GraphRegistry';
 import { ObjectGraph } from '../graph/ObjectGraph';
 
 interface GraphParams {
-  scope: Scope | undefined;
   subgraphs: Constructable<ObjectGraph>[];
 }
 
 export function Graph({
-  scope,
   subgraphs = [],
 }: Partial<GraphParams> = {}) {
   return <T extends ObjectGraph>(constructor: Constructable<T>) => {
-    Reflect.defineMetadata('scope', scope, constructor);
-    graphRegistry.register(constructor, scope, subgraphs);
+    graphRegistry.register(constructor, subgraphs);
     return constructor;
   };
 }

package/src/decorators/Singleton.ts

@@ -0,0 +1,14 @@
+import { Constructable } from '../types';
+import { ObjectGraph } from '../graph/ObjectGraph';
+
+export function Singleton() {
+  return function singleton(
+    constructorOrGraph: Constructable<ObjectGraph> | ObjectGraph,
+    _property?: string,
+    descriptor?: PropertyDescriptor,
+  ): any {
+    const target = descriptor || constructorOrGraph;
+    Reflect.defineMetadata('isSingleton', true, target);
+    return target;
+  };
+}

package/src/decorators/inject/Inject.ts

@@ -0,0 +1,17 @@
+import { isNumber } from 'lodash';
+import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+
+export function Inject(name?: string) {
+  return (
+    target: Object | any,
+    _propertyKey?: string,
+    indexOrPropertyDescriptor?: number | PropertyDescriptor,
+  ) => {
+    const metadata = new InjectionMetadata();
+    if (isNumber(indexOrPropertyDescriptor)) {
+      metadata.saveConstructorParamMetadata(target, name!, indexOrPropertyDescriptor);
+    } else {
+      metadata.savePropertyMetadata(target.constructor, name!);
+    }
+  };
+}

package/src/decorators/inject/Injectable.ts

@@ -0,0 +1,8 @@
+import { Constructable } from '../../types';
+import { Graph } from '../../graph/Graph';
+import graphRegistry from '../../graph/registry/GraphRegistry';
+import ClassInjector from '../../injectors/class/ClassInjector';
+
+export function Injectable(Graph: Constructable<Graph>): any {
+  return new ClassInjector(graphRegistry).inject(Graph);
+}

package/src/decorators/inject/LazyInject.ts

@@ -0,0 +1,8 @@
+import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+
+export function LazyInject(name?: string): any {
+  return (target: object) => {
+    const metadata = new InjectionMetadata();
+    metadata.saveLazyPropertyMetadata(target.constructor, name!);
+  };
+}