react-obsidian 0.0.9 → 0.0.13

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

@@ -0,0 +1,53 @@
+"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 });
+var lodash_1 = require("lodash");
+var Singleton_1 = require("../../../src/decorators/Singleton");
+var src_1 = require("../../../src");
+var SingletonGraph = /** @class */ (function (_super) {
+    __extends(SingletonGraph, _super);
+    function SingletonGraph() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.id = (0, lodash_1.uniqueId)();
+        return _this;
+    }
+    SingletonGraph.prototype.instanceId = function () {
+        return "graph".concat(this.id);
+    };
+    __decorate([
+        (0, src_1.Provides)(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", String)
+    ], SingletonGraph.prototype, "instanceId", null);
+    SingletonGraph = __decorate([
+        (0, Singleton_1.Singleton)(),
+        (0, src_1.Graph)()
+    ], SingletonGraph);
+    return SingletonGraph;
+}(src_1.ObjectGraph));
+exports.default = SingletonGraph;
+//# sourceMappingURL=SingletonGraph.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SingletonGraph.js","sourceRoot":"","sources":["../../../../test/integration/fixtures/SingletonGraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAkC;AAClC,+DAA8D;AAC9D,oCAA4D;AAG5D;IAA4C,kCAAW;IAAvD;QAAA,qEAOC;QANS,QAAE,GAAG,IAAA,iBAAQ,GAAE,CAAC;;IAM1B,CAAC;IAHC,mCAAU,GAAV;QACE,OAAO,eAAQ,IAAI,CAAC,EAAE,CAAE,CAAC;IAC3B,CAAC;IAFD;QADC,IAAA,cAAQ,GAAE;;;;oDAGV;IANkB,cAAc;QADlC,IAAA,qBAAS,GAAE;QAAE,IAAA,WAAK,GAAE;OACA,cAAc,CAOlC;IAAD,qBAAC;CAAA,AAPD,CAA4C,iBAAW,GAOtD;kBAPoB,cAAc"}

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

@@ -4,5 +4,6 @@ export default class Subgraph extends ObjectGraph {
     stringProvider(): StringProvider;
     stringFromSubgraph(): string;
     unusedDependency(): string;
+    instanceId(): string;
 }
 //# sourceMappingURL=Subgraph.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Subgraph.d.ts","sourceRoot":"","sources":["../../../../test/integration/fixtures/Subgraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,WAAW,EAAY,MAAM,cAAc,CAAC;AAE5D,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAG9C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAE/C,cAAc,IAAI,cAAc;IAKhC,kBAAkB,IAAI,MAAM;IAK5B,gBAAgB,IAAI,MAAM;CAG3B"}
+{"version":3,"file":"Subgraph.d.ts","sourceRoot":"","sources":["../../../../test/integration/fixtures/Subgraph.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,WAAW,EAAY,MAAM,cAAc,CAAC;AAE5D,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAG9C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAE/C,cAAc,IAAI,cAAc;IAKhC,kBAAkB,IAAI,MAAM;IAK5B,gBAAgB,IAAI,MAAM;IAK1B,UAAU,IAAI,MAAM;CAGrB"}

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

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var lodash_1 = require("lodash");
 var src_1 = require("../../../src");
 var injectedValues_1 = __importDefault(require("./injectedValues"));
 var StringProvider_1 = __importDefault(require("./StringProvider"));
@@ -42,7 +43,10 @@ var Subgraph = /** @class */ (function (_super) {
         return injectedValues_1.default.fromSubgraph;
     };
     Subgraph.prototype.unusedDependency = function () {
-        throw Error('This dependency should not have been resolved since it not required by anyone.');
+        throw Error('This dependency should not have been resolved since it is not required by anyone.');
+    };
+    Subgraph.prototype.instanceId = function () {
+        return (0, lodash_1.uniqueId)('graph');
     };
     __decorate([
         (0, src_1.Provides)(),
@@ -62,6 +66,12 @@ var Subgraph = /** @class */ (function (_super) {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", String)
     ], Subgraph.prototype, "unusedDependency", null);
+    __decorate([
+        (0, src_1.Provides)(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", String)
+    ], Subgraph.prototype, "instanceId", null);
     Subgraph = __decorate([
         (0, src_1.Graph)()
     ], Subgraph);

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

@@ -1 +1 @@
-{"version":3,"file":"Subgraph.js","sourceRoot":"","sources":["../../../../test/integration/fixtures/Subgraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA4D;AAC5D,oEAA8C;AAC9C,oEAA8C;AAG9C;IAAsC,4BAAW;IAAjD;;IAeA,CAAC;IAbC,iCAAc,GAAd;QACE,OAAO,IAAI,wBAAc,EAAE,CAAC;IAC9B,CAAC;IAGD,qCAAkB,GAAlB;QACE,OAAO,wBAAc,CAAC,YAAY,CAAC;IACrC,CAAC;IAGD,mCAAgB,GAAhB;QACE,MAAM,KAAK,CAAC,gFAAgF,CAAC,CAAC;IAChG,CAAC;IAZD;QADC,IAAA,cAAQ,GAAE;;;wCACO,wBAAc;kDAE/B;IAGD;QADC,IAAA,cAAQ,GAAE;;;;sDAGV;IAGD;QADC,IAAA,cAAQ,GAAE;;;;oDAGV;IAdkB,QAAQ;QAD5B,IAAA,WAAK,GAAE;OACa,QAAQ,CAe5B;IAAD,eAAC;CAAA,AAfD,CAAsC,iBAAW,GAehD;kBAfoB,QAAQ"}
+{"version":3,"file":"Subgraph.js","sourceRoot":"","sources":["../../../../test/integration/fixtures/Subgraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAkC;AAClC,oCAA4D;AAC5D,oEAA8C;AAC9C,oEAA8C;AAG9C;IAAsC,4BAAW;IAAjD;;IAoBA,CAAC;IAlBC,iCAAc,GAAd;QACE,OAAO,IAAI,wBAAc,EAAE,CAAC;IAC9B,CAAC;IAGD,qCAAkB,GAAlB;QACE,OAAO,wBAAc,CAAC,YAAY,CAAC;IACrC,CAAC;IAGD,mCAAgB,GAAhB;QACE,MAAM,KAAK,CAAC,mFAAmF,CAAC,CAAC;IACnG,CAAC;IAGD,6BAAU,GAAV;QACE,OAAO,IAAA,iBAAQ,EAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAjBD;QADC,IAAA,cAAQ,GAAE;;;wCACO,wBAAc;kDAE/B;IAGD;QADC,IAAA,cAAQ,GAAE;;;;sDAGV;IAGD;QADC,IAAA,cAAQ,GAAE;;;;oDAGV;IAGD;QADC,IAAA,cAAQ,GAAE;;;;8CAGV;IAnBkB,QAAQ;QAD5B,IAAA,WAAK,GAAE;OACa,QAAQ,CAoB5B;IAAD,eAAC;CAAA,AApBD,CAAsC,iBAAW,GAoBhD;kBApBoB,QAAQ"}

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

@@ -0,0 +1,8 @@
+import { ObjectGraph } from '../../../src';
+export declare class UniqueNumberGraph extends ObjectGraph {
+    private uniqueNumberGenerator;
+    constructor(uniqueNumberGenerator: () => number);
+    singletonNumber(): number;
+    instanceNumber(): number;
+}
+//# sourceMappingURL=UniqueNumberGraph.d.ts.map

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/package.json

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

package/src/GraphProperties.ts

@@ -8,4 +8,8 @@ export default class GraphProperties {
   getMangledProperty(unmangledProperty: string): string | undefined {
     return this.unmangledToMangledPropKeys.get(unmangledProperty);
   }
+
+  getMangledProperties(): string[] {
+    return Array.from(this.unmangledToMangledPropKeys.values());
+  }
 }

package/src/ProvidedPropertiesStore.ts

@@ -14,6 +14,10 @@ class ProvidedPropertiesStore {
     this.providedPropertiesForGraph.set(graph.name, graphProperties);
   }
 
+  getMangledProperties(graph: Graph): string[] {
+    return this.providedPropertiesForGraph.get(graph.name)?.getMangledProperties() ?? [];
+  }
+
   clear(graph: Graph) {
     this.providedPropertiesForGraph.delete(graph.name);
   }

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 'src';
+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/provides/MemoizeDescriptor.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-param-reassign */
+export function memoizeDescriptor(propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
+  const originalValue = descriptor.value;
+  descriptor.value = function value(...args: any[]) {
+    const memoizationTarget = Reflect.getMetadata('isSingleton', descriptor) ? descriptor : this;
+    const key = `memoized${propertyKey}`;
+    if (Reflect.hasMetadata(key, memoizationTarget)) return Reflect.getMetadata(key, memoizationTarget);
+    const result = originalValue.apply(this, args);
+    Reflect.defineMetadata(key, result, memoizationTarget);
+    return result;
+  };
+  return descriptor;
+}

package/src/decorators/provides/Provides.ts

@@ -1,16 +1,14 @@
-import { Scope } from '../../types';
 import { Graph } from '../../graph/Graph';
 import providedPropertiesStore from '../../ProvidedPropertiesStore';
-import makeSingleton from './PropertyDescriptorToSingleton';
+import { memoizeDescriptor } from './MemoizeDescriptor';
 
 interface ProvidesParams {
-  scope?: Scope;
   name: string;
 }
 
 export function Provides({ name }: Partial<ProvidesParams> = {}) {
   return function provide(graph: Graph, propertyKey: string, descriptor: PropertyDescriptor) {
     providedPropertiesStore.set(graph, propertyKey, name!);
-    return makeSingleton(descriptor);
+    return memoizeDescriptor(propertyKey, descriptor);
   };
 }

package/src/graph/ObjectGraph.ts

@@ -1,12 +1,10 @@
 import { uniqueId } from 'lodash';
 import Memoize from '../decorators/Memoize';
-import { Scope } from '../types';
+import { bindProviders } from './ProviderBinder';
 import { Graph } from './Graph';
 import PropertyRetriever from './PropertyRetriever';
 
 export abstract class ObjectGraph<T = unknown> implements Graph {
-  // TODO? rename scope to singleInstance
-  public scope!: Scope;
   private propertyRetriever = new PropertyRetriever(this);
 
   @Memoize()
@@ -14,8 +12,9 @@ export abstract class ObjectGraph<T = unknown> implements Graph {
     return uniqueId(this.constructor.name);
   }
 
-  // eslint-disable-next-line no-useless-constructor, no-unused-vars, no-empty-function
-  constructor(protected props?: T) {}
+  constructor(protected _props?: T) {
+    bindProviders(this);
+  }
 
   retrieve<Dependency>(property: string, receiver?: unknown): Dependency | undefined {
     return this.propertyRetriever.retrieve(property, receiver) as Dependency | undefined;

package/src/graph/ProviderBinder.ts

@@ -0,0 +1,12 @@
+/* eslint-disable no-param-reassign */
+import providedPropertiesStore from '../ProvidedPropertiesStore';
+import { Graph } from './Graph';
+
+export function bindProviders(graph: Graph & Record<string, any>) {
+  providedPropertiesStore.getMangledProperties(graph)
+    .forEach((method) => {
+      if (graph[method] !== undefined) {
+        graph[method] = graph[method].bind(graph);
+      }
+    });
+}

package/src/graph/registry/GraphRegistry.ts

@@ -1,37 +1,18 @@
-import { Constructable, Scope } from '../../types';
+import { Constructable } from '../../types';
 import { Graph } from '../Graph';
 import { Middleware } from './Middleware';
 import GraphMiddlewareChain from './GraphMiddlewareChain';
 
-class GraphRegistry {
-  private readonly scopedGraphs: Record<Scope, Constructable<Graph>> = {};
-  private readonly constructorToInstance = new Map<Constructable<Graph>, Graph>();
+export class GraphRegistry {
+  private readonly constructorToInstance = new Map<Constructable<Graph>, Set<Graph>>();
   private readonly instanceToConstructor = new Map<Graph, Constructable<Graph>>();
   private readonly graphToSubgraphs = new Map<Constructable<Graph>, Set<Constructable<Graph>>>();
-  private graphMiddlewares = new GraphMiddlewareChain();
+  private readonly graphMiddlewares = new GraphMiddlewareChain();
 
-  register(
-    constructor: Constructable<Graph>,
-    scope: Scope | undefined = undefined,
-    subgraphs: Constructable<Graph>[] = [],
-  ) {
-    if (scope) this.scopedGraphs[scope] = constructor;
+  register(constructor: Constructable<Graph>, subgraphs: Constructable<Graph>[] = []) {
     this.graphToSubgraphs.set(constructor, new Set(subgraphs));
   }
 
-  has(Graph: Constructable<Graph>) {
-    return this.constructorToInstance.has(Graph);
-  }
-
-  get<T extends Graph>(Graph: Constructable<T>): T {
-    return this.constructorToInstance.get(Graph)! as unknown as T;
-  }
-
-  set(Graph: Constructable<Graph>, graph: Graph) {
-    this.constructorToInstance.set(Graph, graph);
-    this.instanceToConstructor.set(graph, Graph);
-  }
-
   getSubgraphs(graph: Graph): Graph[] {
     const Graph = this.instanceToConstructor.get(graph)!;
     const subgraphs = this.graphToSubgraphs.get(Graph) ?? new Set();
@@ -39,23 +20,37 @@ class GraphRegistry {
   }
 
   resolve<T extends Graph>(Graph: Constructable<T>, props?: any): T {
-    if (this.has(Graph)) {
-      return this.get(Graph);
-      // const graph: T = this.get(Graph);
-      // const scope = Reflect.getMetadata('scope', Graph);
-      // if (scope) return graph;
-
-      // this.set(Graph, new Graph(props));
+    if (this.isSingleton(Graph) && this.has(Graph)) {
+      return this.getFirst(Graph);
     }
     const graph = this.graphMiddlewares.resolve(Graph, props);
     this.set(Graph, graph);
     return graph as T;
   }
 
+  private has(Graph: Constructable<Graph>) {
+    return this.constructorToInstance.has(Graph);
+  }
+
+  private getFirst<T extends Graph>(Graph: Constructable<T>): T {
+    return this.constructorToInstance.get(Graph)!.values().next().value;
+  }
+
+  private set(Graph: Constructable<Graph>, graph: Graph) {
+    const graphs = this.constructorToInstance.get(Graph) ?? new Set();
+    graphs.add(graph);
+    this.constructorToInstance.set(Graph, graphs);
+    this.instanceToConstructor.set(graph, Graph);
+  }
+
+  private isSingleton(Graph: Constructable<Graph>): boolean {
+    return Reflect.getMetadata('isSingleton', Graph) ?? false;
+  }
+
   clear(graph: Graph) {
     const Graph = this.instanceToConstructor.get(graph)!;
     this.instanceToConstructor.delete(graph);
-    this.constructorToInstance.delete(Graph);
+    this.constructorToInstance.get(Graph)!.delete(graph);
   }
 
   addGraphMiddleware(middleware: Middleware<Graph>) {

package/src/index.ts

@@ -8,6 +8,7 @@ import { Constructable } from './types';
 export * from './types';
 
 export { Graph } from './decorators/Graph';
+export { Singleton } from './decorators/Singleton';
 export { ObjectGraph } from './graph/ObjectGraph';
 export { Graph as IGraph } from './graph/Graph';
 export { Provides } from './decorators/provides/Provides';

package/src/types/index.ts

@@ -2,8 +2,6 @@ export type Constructable<T> = {
   new(...args: any): T;
 };
 
-export type Scope = string | number | symbol;
-
 export type Constructor = { new(...args: any[]): any };
 
 export type ServiceLocator<Clazz> = {

package/dist/src/ScopedValuesRegistry.d.ts

@@ -1,11 +0,0 @@
-import { Scope } from './types';
-declare class ScopedValuesRegistry {
-    private readonly values;
-    has(scope: Scope, property: string): boolean;
-    get(scope: Scope, property: string): any;
-    set(scope: Scope, property: string, value: any): void;
-    clear(scope: Scope, property: string): void;
-}
-declare const _default: ScopedValuesRegistry;
-export default _default;
-//# sourceMappingURL=ScopedValuesRegistry.d.ts.map

package/dist/src/ScopedValuesRegistry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ScopedValuesRegistry.d.ts","sourceRoot":"","sources":["../../src/ScopedValuesRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,cAAM,oBAAoB;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IAEtD,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI5C,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG;IAOxC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAI9C,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM;CAGrC;;AAED,wBAA0C"}

package/dist/src/ScopedValuesRegistry.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var ScopedValuesRegistry = /** @class */ (function () {
-    function ScopedValuesRegistry() {
-        this.values = new Map();
-    }
-    ScopedValuesRegistry.prototype.has = function (scope, property) {
-        return this.values.has(scope.toString() + property);
-    };
-    ScopedValuesRegistry.prototype.get = function (scope, property) {
-        if (this.values.has(scope.toString() + property)) {
-            return this.values.get(scope.toString() + property);
-        }
-        throw new Error("Property ".concat(property, " does not exist"));
-    };
-    ScopedValuesRegistry.prototype.set = function (scope, property, value) {
-        this.values.set(scope.toString() + property, value);
-    };
-    ScopedValuesRegistry.prototype.clear = function (scope, property) {
-        this.values.delete(scope.toString() + property);
-    };
-    return ScopedValuesRegistry;
-}());
-exports.default = new ScopedValuesRegistry();
-//# sourceMappingURL=ScopedValuesRegistry.js.map

package/dist/src/ScopedValuesRegistry.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ScopedValuesRegistry.js","sourceRoot":"","sources":["../../src/ScopedValuesRegistry.ts"],"names":[],"mappings":";;AAEA;IAAA;QACmB,WAAM,GAAqB,IAAI,GAAG,EAAE,CAAC;IAoBxD,CAAC;IAlBC,kCAAG,GAAH,UAAI,KAAY,EAAE,QAAgB;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,kCAAG,GAAH,UAAI,KAAY,EAAE,QAAgB;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,EAAE;YAChD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;SACrD;QACD,MAAM,IAAI,KAAK,CAAC,mBAAY,QAAQ,oBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,kCAAG,GAAH,UAAI,KAAY,EAAE,QAAgB,EAAE,KAAU;QAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,oCAAK,GAAL,UAAM,KAAY,EAAE,QAAgB;QAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;IAClD,CAAC;IACH,2BAAC;AAAD,CAAC,AArBD,IAqBC;AAED,kBAAe,IAAI,oBAAoB,EAAE,CAAC"}

package/dist/src/decorators/provides/PropertyDescriptorToSingleton.d.ts

@@ -1,2 +0,0 @@
-export default function makeSingleton(descriptor: PropertyDescriptor): PropertyDescriptor;
-//# sourceMappingURL=PropertyDescriptorToSingleton.d.ts.map

package/dist/src/decorators/provides/PropertyDescriptorToSingleton.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PropertyDescriptorToSingleton.d.ts","sourceRoot":"","sources":["../../../../src/decorators/provides/PropertyDescriptorToSingleton.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAAU,EAAE,kBAAkB,GAAG,kBAAkB,CASxF"}

package/dist/src/decorators/provides/PropertyDescriptorToSingleton.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable no-param-reassign */
-function makeSingleton(descriptor) {
-    var originalValue = descriptor.value;
-    var createdDependency;
-    descriptor.value = function value() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        if (createdDependency)
-            return createdDependency;
-        createdDependency = originalValue.apply(this, args);
-        return createdDependency;
-    };
-    return descriptor;
-}
-exports.default = makeSingleton;
-//# sourceMappingURL=PropertyDescriptorToSingleton.js.map

package/dist/src/decorators/provides/PropertyDescriptorToSingleton.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PropertyDescriptorToSingleton.js","sourceRoot":"","sources":["../../../../src/decorators/provides/PropertyDescriptorToSingleton.ts"],"names":[],"mappings":";;AAAA,sCAAsC;AACtC,SAAwB,aAAa,CAAC,UAA8B;IAClE,IAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC;IACvC,IAAI,iBAAsB,CAAC;IAC3B,UAAU,CAAC,KAAK,GAAG,SAAS,KAAK;QAAC,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAC9C,IAAI,iBAAiB;YAAE,OAAO,iBAAiB,CAAC;QAChD,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpD,OAAO,iBAAiB,CAAC;IAC3B,CAAC,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC;AATD,gCASC"}

package/src/ScopedValuesRegistry.ts

@@ -1,26 +0,0 @@
-import { Scope } from './types';
-
-class ScopedValuesRegistry {
-  private readonly values: Map<string, any> = new Map();
-
-  has(scope: Scope, property: string): boolean {
-    return this.values.has(scope.toString() + property);
-  }
-
-  get(scope: Scope, property: string): any {
-    if (this.values.has(scope.toString() + property)) {
-      return this.values.get(scope.toString() + property);
-    }
-    throw new Error(`Property ${property} does not exist`);
-  }
-
-  set(scope: Scope, property: string, value: any) {
-    this.values.set(scope.toString() + property, value);
-  }
-
-  clear(scope: Scope, property: string) {
-    this.values.delete(scope.toString() + property);
-  }
-}
-
-export default new ScopedValuesRegistry();

package/src/decorators/provides/PropertyDescriptorToSingleton.ts

@@ -1,11 +0,0 @@
-/* eslint-disable no-param-reassign */
-export default function makeSingleton(descriptor: PropertyDescriptor): PropertyDescriptor {
-  const originalValue = descriptor.value;
-  let createdDependency: any;
-  descriptor.value = function value(...args: any[]) {
-    if (createdDependency) return createdDependency;
-    createdDependency = originalValue.apply(this, args);
-    return createdDependency;
-  };
-  return descriptor;
-}