react-obsidian 0.0.5 → 0.0.10

package/src/graph/registry/DefaultGraphResolver.ts

@@ -1,8 +1,10 @@
-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,23 +1,5 @@
-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,19 +1,20 @@
-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,5 +1,6 @@
-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 {
@@ -48,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) {
@@ -57,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;
+}

package/src/graph/registry/ResolveChain.ts

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

package/src/index.ts

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

package/src/injectors/components/ComponentInjector.tsx

@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import 'reflect-metadata';
-import ObjectGraph from '../../graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 import PropsInjector from './PropsInjector';
 import useGraph from './useGraph';
+import { Constructable } from '../../types';
 
 export default class ComponentInjector {
   inject<P>(

package/src/injectors/components/PropsInjector.ts

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

package/src/injectors/components/useGraph.ts

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

package/src/injectors/hooks/HookInjector.ts

@@ -1,6 +1,7 @@
-import ObjectGraph from '../../graph/ObjectGraph';
-import Graph from '../../graph/Graph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
+import { Graph } from '../../graph/Graph';
 import useGraph from '../components/useGraph';
+import { Constructable } from '../../types';
 
 export default class HookInjector {
   inject<Args, Result>(

package/src/types/index.ts

@@ -0,0 +1,13 @@
+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> = {
+  [Key in keyof Clazz]: Function
+};
+
+export type GraphInternals = 'retrieve' | 'name' | 'scope';

package/testkit/index.ts

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

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/@types/index.d.ts

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

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;
-}