react-obsidian 0.0.14 → 0.0.15

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

@@ -1,6 +1,9 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var helpers_1 = require("./helpers");
+var unmagler_1 = __importDefault(require("./unmagler"));
 var providerArgumentsTransformer = {
     visitor: {
         Program: function (path) {
@@ -12,52 +15,29 @@ var internalVisitor = {
     ClassMethod: {
         enter: function (_a) {
             var node = _a.node;
-            var decorator = (0, helpers_1.getDecoratorByName)(node.decorators, 'Provides');
-            if ((0, helpers_1.getDecoratorName)(decorator) === 'Provides') {
-                convertProviderParamsToDestructuringAssignment(node);
-                saveUnmangledMethodNameInProviderArguments(node, decorator);
-            }
+            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;
-            var decorator = (0, helpers_1.getDecoratorByName)(node.decorators, 'Inject');
-            if ((0, helpers_1.getDecoratorName)(decorator) === 'Inject') {
-                saveUnmangledParamName(node, decorator);
-            }
+            unmagler_1.default.saveIdentifier('Inject', node);
         },
     },
     TSParameterProperty: {
         enter: function (_a) {
             var node = _a.node;
-            var decorator = (0, helpers_1.getDecoratorByName)(node.decorators, 'Inject');
-            if ((0, helpers_1.getDecoratorName)(decorator) === 'Inject') {
-                saveUnmangledParamName(node, decorator);
-            }
+            unmagler_1.default.saveTSParameterProperty('Inject', node);
         },
     },
 };
-function saveUnmangledParamName(node, decorator) {
-    if (injectIsNotNamed(decorator)) {
-        (0, helpers_1.passParamNameAsInjectArgument)(node, decorator);
-    }
-}
-function injectIsNotNamed(decorator) {
-    return (0, helpers_1.getDecoratorArgument)(decorator) === undefined;
-}
-function convertProviderParamsToDestructuringAssignment(node) {
-    if (node.params.length === 0)
-        return;
-    var destructuredParams = (0, helpers_1.paramsToDestructuringAssignment)(node.params);
-    node.params.length = 0;
-    node.params.push(destructuredParams);
-}
-function saveUnmangledMethodNameInProviderArguments(node, decorator) {
-    if ((0, helpers_1.providerIsNotNamed)(decorator)) {
-        (0, helpers_1.addNameToProviderArguments)(node, decorator);
-    }
-}
 function plugin() {
     return providerArgumentsTransformer;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":";;AASA,qCAQmB;AAEnB,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,IAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAClE,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,UAAU,EAAE;gBAC9C,8CAA8C,CAAC,IAAI,CAAC,CAAC;gBACrD,0CAA0C,CAAC,IAAI,EAAE,SAAU,CAAC,CAAC;aAC9D;QACH,CAAC;KACF;IACD,UAAU,EAAE;QACV,KAAK,EAAL,UAAM,EAA8B;gBAA5B,IAAI,UAAA;YACV,IAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAChE,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,QAAQ,EAAE;gBAC5C,sBAAsB,CAAC,IAAI,EAAE,SAAU,CAAC,CAAC;aAC1C;QACH,CAAC;KACF;IACD,mBAAmB,EAAE;QACnB,KAAK,EAAL,UAAM,EAAuC;gBAArC,IAAI,UAAA;YACV,IAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAChE,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,QAAQ,EAAE;gBAC5C,sBAAsB,CAAC,IAAI,EAAE,SAAU,CAAC,CAAC;aAC1C;QACH,CAAC;KACF;CACF,CAAC;AAEF,SAAS,sBAAsB,CAAC,IAAsC,EAAE,SAAoB;IAC1F,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE;QAC/B,IAAA,uCAA6B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAChD;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,IAAA,8BAAoB,EAAC,SAAS,CAAC,KAAK,SAAS,CAAC;AACvD,CAAC;AAED,SAAS,8CAA8C,CAAC,IAAiB;IACvE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACrC,IAAM,kBAAkB,GAAG,IAAA,yCAA+B,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxE,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;AAED,SAAwB,MAAM;IAC5B,OAAO,4BAA4B,CAAC;AACtC,CAAC;AAFD,yBAEC"}
+{"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}],
+    ['@babel/plugin-proposal-class-properties', {loose: true}],
     [`${__dirname}/../dist/transformers/babel-plugin-obsidian`],
   ],
 };

package/package.json

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

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/inject/Inject.ts

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

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!);
+  };
+}

package/src/graph/ProviderBinder.ts

@@ -4,9 +4,8 @@ import { Graph } from './Graph';
 
 export function bindProviders(graph: Graph & Record<string, any>) {
   providedPropertiesStore.getMangledProperties(graph)
+    .filter((method) => graph[method])
     .forEach((method) => {
-      if (graph[method] !== undefined) {
-        graph[method] = graph[method].bind(graph);
-      }
+      graph[method] = graph[method].bind(graph);
     });
 }

package/src/graph/registry/GraphRegistry.ts

@@ -6,6 +6,7 @@ import GraphMiddlewareChain from './GraphMiddlewareChain';
 export class GraphRegistry {
   private readonly constructorToInstance = new Map<Constructable<Graph>, Set<Graph>>();
   private readonly instanceToConstructor = new Map<Graph, Constructable<Graph>>();
+  private readonly nameToInstance = new Map<string, Graph>();
   private readonly graphToSubgraphs = new Map<Constructable<Graph>, Set<Constructable<Graph>>>();
   private readonly graphMiddlewares = new GraphMiddlewareChain();
 
@@ -19,6 +20,10 @@ export class GraphRegistry {
     return Array.from(subgraphs).map((G) => this.resolve(G));
   }
 
+  getGraphInstance(name: string): Graph {
+    return this.nameToInstance.get(name)!;
+  }
+
   resolve<T extends Graph>(Graph: Constructable<T>, props?: any): T {
     if (this.isSingleton(Graph) && this.has(Graph)) {
       return this.getFirst(Graph);
@@ -41,6 +46,7 @@ export class GraphRegistry {
     graphs.add(graph);
     this.constructorToInstance.set(Graph, graphs);
     this.instanceToConstructor.set(graph, Graph);
+    this.nameToInstance.set(graph.name, graph);
   }
 
   private isSingleton(Graph: Constructable<Graph>): boolean {
@@ -51,6 +57,7 @@ export class GraphRegistry {
     const Graph = this.instanceToConstructor.get(graph)!;
     this.instanceToConstructor.delete(graph);
     this.constructorToInstance.get(Graph)!.delete(graph);
+    this.nameToInstance.delete(graph.name);
   }
 
   addGraphMiddleware(middleware: Middleware<Graph>) {

package/src/index.ts

@@ -14,6 +14,7 @@ export { Graph as IGraph } from './graph/Graph';
 export { Provides } from './decorators/provides/Provides';
 export { Injectable } from './decorators/inject/Injectable';
 export { Inject } from './decorators/inject/Inject';
+export { LazyInject } from './decorators/inject/LazyInject';
 export { GraphMiddleware } from './graph/registry/GraphMiddleware';
 export { GraphResolveChain as ResolveChain } from './graph/registry/GraphResolveChain';
 export const Obsidian = new _Obsidian();

package/src/injectors/class/ClassInjector.ts

@@ -2,6 +2,7 @@ import { Constructable } from '../../types';
 import { GraphRegistry } from '../../graph/registry/GraphRegistry';
 import { Graph } from '../../graph/Graph';
 import InjectionMetadata from './InjectionMetadata';
+import { GRAPH_INSTANCE_NAME_KEY } from './LazyInjector';
 
 export default class ClassInjector {
   constructor(
@@ -23,11 +24,10 @@ export default class ClassInjector {
     return new class Handler implements ProxyHandler<any> {
       construct(target: any, args: any[], newTarget: Function): any {
         const graph = graphRegistry.resolve(Graph);
-
+        Reflect.defineMetadata(GRAPH_INSTANCE_NAME_KEY, graph.name, target);
         const argsToInject = this.injectConstructorArgs(args, graph, target);
         const createdObject = Reflect.construct(target, argsToInject, newTarget);
         this.injectProperties(target, createdObject, graph);
-
         return createdObject;
       }
 

package/src/injectors/class/InjectionMetadata.ts

@@ -3,13 +3,18 @@ import { ConstructorArgs } from './ConstructorArgs';
 export default class InjectionMetadata {
   private readonly injectionMetadataKey = 'injectionMetadata';
   private readonly injectedConstructorArgsKey = 'injectedConstructorArgsKey';
+  private readonly lazyInjectionMetadataKey = 'lazyInjectionMetadataKey';
 
   getConstructorArgsToInject(target: any): ConstructorArgs {
     return Reflect.getMetadata(this.injectedConstructorArgsKey, target) ?? new ConstructorArgs();
   }
 
   getPropertiesToInject(target: any): Set<string> {
-    return Reflect.getMetadata(this.injectionMetadataKey, target) ?? new Set();
+    return this.getProperties(this.injectionMetadataKey, target);
+  }
+
+  getLazyPropertiesToInject(target: any): Set<string> {
+    return this.getProperties(this.lazyInjectionMetadataKey, target);
   }
 
   saveConstructorParamMetadata(target: any, paramName: string, index: number) {
@@ -23,10 +28,30 @@ export default class InjectionMetadata {
   }
 
   savePropertyMetadata(target: any, property: string) {
-    Reflect.defineMetadata(
+    this.saveProperties(
       this.injectionMetadataKey,
       this.getPropertiesToInject(target).add(property),
       target,
     );
   }
+
+  saveLazyPropertyMetadata(target: any, property: string) {
+    this.saveProperties(
+      this.lazyInjectionMetadataKey,
+      this.getLazyPropertiesToInject(target).add(property),
+      target,
+    );
+  }
+
+  private saveProperties(key: string, properties: Set<string>, target: any) {
+    Reflect.defineMetadata(
+      key,
+      properties,
+      target,
+    );
+  }
+
+  private getProperties(key: string, target: any): Set<string> {
+    return Reflect.getMetadata(key, target) ?? new Set();
+  }
 }

package/src/injectors/class/LazyInjector.ts

@@ -0,0 +1,22 @@
+import graphRegistry from '../../graph/registry/GraphRegistry';
+import InjectionMetadata from './InjectionMetadata';
+
+export const GRAPH_INSTANCE_NAME_KEY = 'GRAPH_INSTANCE_NAME';
+
+class LazyInjector<T extends object> {
+  inject(target: T): T {
+    const injectionMetadata = new InjectionMetadata();
+    const graph = this.getGraphInstance(target);
+    injectionMetadata.getLazyPropertiesToInject(target.constructor).forEach((key) => {
+      Reflect.set(target, key, graph.retrieve(key));
+    });
+    return target;
+  }
+
+  private getGraphInstance(target: T) {
+    const graphInstanceName = Reflect.getMetadata(GRAPH_INSTANCE_NAME_KEY, target.constructor);
+    return graphRegistry.getGraphInstance(graphInstanceName);
+  }
+}
+
+export default new LazyInjector();

package/transformers/babel-plugin-obsidian/helpers/index.ts

@@ -3,6 +3,7 @@ import { types as t } from '@babel/core';
 import {
   CallExpression,
   ClassMethod,
+  ClassProperty,
   Decorator,
   Identifier,
   ObjectExpression,
@@ -13,6 +14,8 @@ import { get } from 'lodash';
 
 const never = '';
 
+export type AcceptedNodeType = Identifier | TSParameterProperty | ClassProperty;
+
 export function providerIsNotNamed(decorator: Decorator): boolean {
   const argument = getDecoratorArgument(decorator);
   if (t.isObjectExpression(argument)) {
@@ -64,20 +67,29 @@ export function paramsToDestructuringAssignment(params: (Identifier | any)[]): O
     .map((p) => t.objectProperty(t.identifier(p.name), t.identifier(p.name))));
 }
 
-export function passParamNameAsInjectArgument(node: Identifier | TSParameterProperty, decorator: Decorator) {
+export function passParamNameAsInjectArgument(
+  node: AcceptedNodeType,
+  decorator: Decorator,
+) {
   if (t.isCallExpression(decorator.expression)) {
     decorator.expression.arguments = [
-      t.stringLiteral(getIdentifierOrParamName(node)),
+      t.stringLiteral(getNodeName(node)),
     ];
   }
 }
 
-function getIdentifierOrParamName(node: Identifier | TSParameterProperty): string {
+function getNodeName(node: AcceptedNodeType): string {
   if (t.isTSParameterProperty(node)) {
     if (t.isIdentifier(node.parameter)) {
       return node.parameter.name;
     }
     return never;
   }
+  if (t.isClassProperty(node)) {
+    if (t.isIdentifier(node.key)) {
+      return node.key.name;
+    }
+    return never;
+  }
   return node.name;
 }

package/transformers/babel-plugin-obsidian/index.ts

@@ -1,21 +1,13 @@
 /* eslint-disable no-param-reassign */
 import {
   ClassMethod,
+  ClassProperty,
   Identifier,
-  Decorator,
   Program,
   TSParameterProperty,
 } from '@babel/types';
 import { NodePath, PluginObj } from '@babel/core';
-import {
-  addNameToProviderArguments,
-  getDecoratorName,
-  getDecoratorByName,
-  paramsToDestructuringAssignment,
-  providerIsNotNamed,
-  passParamNameAsInjectArgument,
-  getDecoratorArgument,
-} from './helpers';
+import unmagler from './unmagler';
 
 const providerArgumentsTransformer: PluginObj = {
   visitor: {
@@ -28,54 +20,27 @@ const providerArgumentsTransformer: PluginObj = {
 const internalVisitor = {
   ClassMethod: {
     enter({ node }: NodePath<ClassMethod>) {
-      const decorator = getDecoratorByName(node.decorators, 'Provides');
-      if (getDecoratorName(decorator) === 'Provides') {
-        convertProviderParamsToDestructuringAssignment(node);
-        saveUnmangledMethodNameInProviderArguments(node, decorator!);
-      }
+      unmagler.saveClassMethod('Provides', node);
+    },
+  },
+  ClassProperty: {
+    enter({ node }: NodePath<ClassProperty>) {
+      unmagler.saveClassProperty('Inject', node);
+      unmagler.saveClassProperty('LazyInject', node);
     },
   },
   Identifier: {
     enter({ node }: NodePath<Identifier>) {
-      const decorator = getDecoratorByName(node.decorators, 'Inject');
-      if (getDecoratorName(decorator) === 'Inject') {
-        saveUnmangledParamName(node, decorator!);
-      }
+      unmagler.saveIdentifier('Inject', node);
     },
   },
   TSParameterProperty: {
     enter({ node }: NodePath<TSParameterProperty>) {
-      const decorator = getDecoratorByName(node.decorators, 'Inject');
-      if (getDecoratorName(decorator) === 'Inject') {
-        saveUnmangledParamName(node, decorator!);
-      }
+      unmagler.saveTSParameterProperty('Inject', node);
     },
   },
 };
 
-function saveUnmangledParamName(node: Identifier | TSParameterProperty, decorator: Decorator) {
-  if (injectIsNotNamed(decorator)) {
-    passParamNameAsInjectArgument(node, decorator);
-  }
-}
-
-function injectIsNotNamed(decorator: Decorator): boolean {
-  return getDecoratorArgument(decorator) === undefined;
-}
-
-function convertProviderParamsToDestructuringAssignment(node: ClassMethod) {
-  if (node.params.length === 0) return;
-  const destructuredParams = paramsToDestructuringAssignment(node.params);
-  node.params.length = 0;
-  node.params.push(destructuredParams);
-}
-
-function saveUnmangledMethodNameInProviderArguments(node: ClassMethod, decorator: Decorator) {
-  if (providerIsNotNamed(decorator)) {
-    addNameToProviderArguments(node, decorator);
-  }
-}
-
 export default function plugin() {
   return providerArgumentsTransformer;
 }

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

@@ -0,0 +1,9 @@
+import saveMethod from './method';
+import saveProperty from './property';
+
+export default {
+  saveClassMethod: saveMethod,
+  saveClassProperty: saveProperty,
+  saveIdentifier: saveProperty,
+  saveTSParameterProperty: saveProperty,
+};

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

@@ -0,0 +1,31 @@
+import { ClassMethod, Decorator } from '@babel/types';
+import {
+  addNameToProviderArguments,
+  getDecoratorName,
+  getDecoratorByName,
+  paramsToDestructuringAssignment,
+  providerIsNotNamed,
+} from '../helpers';
+
+function saveMethod(name: string, node: ClassMethod) {
+  const decorator = getDecoratorByName(node.decorators, name);
+  if (getDecoratorName(decorator) === name) {
+    convertProviderParamsToDestructuringAssignment(node);
+    saveUnmangledMethodNameInProviderArguments(node, decorator!);
+  }
+}
+
+function convertProviderParamsToDestructuringAssignment(node: ClassMethod) {
+  if (node.params.length === 0) { return; }
+  const destructuredParams = paramsToDestructuringAssignment(node.params);
+  // eslint-disable-next-line no-param-reassign
+  node.params.length = 0;
+  node.params.push(destructuredParams);
+}
+
+function saveUnmangledMethodNameInProviderArguments(node: ClassMethod, decorator: Decorator) {
+  if (providerIsNotNamed(decorator)) {
+    addNameToProviderArguments(node, decorator);
+  }
+}
+export default saveMethod;

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

@@ -0,0 +1,21 @@
+import { Decorator } from '@babel/types';
+import {
+  getDecoratorName,
+  getDecoratorByName,
+  passParamNameAsInjectArgument,
+  getDecoratorArgument,
+  AcceptedNodeType,
+} from '../helpers';
+
+function savePropertyName(name: string, node: AcceptedNodeType) {
+  const decorator = getDecoratorByName(node.decorators, name);
+  if (getDecoratorName(decorator) === name && injectIsNotNamed(decorator!)) {
+    passParamNameAsInjectArgument(node, decorator!);
+  }
+}
+
+function injectIsNotNamed(decorator: Decorator): boolean {
+  return getDecoratorArgument(decorator) === undefined;
+}
+
+export default savePropertyName;