react-obsidian 0.0.3 → 0.0.8

package/src/graph/registry/Middleware.ts

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

package/src/index.ts

@@ -1,28 +1,30 @@
 import React from 'react';
-import { Constructable } from '@Obsidian';
-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 './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 { ResolveChain } from './graph/registry/Middleware';
+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,10 +1,10 @@
 import React, { useState } from 'react';
-import { Constructable } from '@Obsidian';
 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 'src/graph/ObjectGraph';
+import { ObjectGraph } from '../../graph/ObjectGraph';
 
 export default class PropsInjector<Props> {
   constructor(private graph: ObjectGraph) {}

package/src/injectors/components/useGraph.ts

@@ -1,6 +1,6 @@
-import { Constructable } from '@Obsidian';
 import { useEffect, useState } from 'react';
-import ObjectGraph from 'src/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 { Constructable } from '@Obsidian';
-import ObjectGraph from 'src/graph/ObjectGraph';
+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>(
@@ -15,7 +16,7 @@ export default class HookInjector {
 }
 
 class Injector implements ProxyHandler<any> {
-  constructor(private graph: ObjectGraph) {}
+  constructor(private graph: Graph) {}
 
   get(obj: any, property: string, receiver: any): any {
     return property in obj ? obj[property] : this.graph.retrieve(property, receiver);

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,7 +1,10 @@
-import { GraphMiddleware, ResolveChain } from '../src/graph/registry/GraphMiddleware';
-import ObjectGraph from '../src/graph/Graph';
-import { Constructable } from '../src/@types/obsidian';
-import { Obsidian } from '../src';
+import {
+  ObjectGraph,
+  Constructable,
+  GraphMiddleware,
+  Obsidian,
+  ResolveChain,
+} from '../src';
 
 beforeEach(() => {
   Obsidian.clearGraphMiddlewares();
@@ -10,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: ResolveChain<ObjectGraph>, 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/transformers/babel-plugin-obsidian-provide/index.ts

@@ -30,6 +30,7 @@ const internalVisitor = {
 };
 
 function convertProviderParamsToDestructuringAssignment(node: ClassMethod) {
+  if (node.params.length === 0) return;
   const destructuredParams = paramsToDestructuringAssignment(node.params);
   node.params.length = 0;
   node.params.push(destructuredParams);

package/tsconfig.base.json

@@ -35,9 +35,6 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "types": ["reflect-metadata", "jest"],
-    "baseUrl": "./",
-    "paths": {
-      "@Obsidian": ["./src/@types/obsidian.d.ts"]
-    },
+    "baseUrl": "./"
   }
 }

package/.nvmrc

@@ -1 +0,0 @@
-12

package/dist/src/Provides.d.ts

@@ -1,9 +0,0 @@
-import { Scope } from '@Obsidian';
-import Graph from './graph/Graph';
-interface ProvidesParams {
-    scope?: Scope;
-    name: string;
-}
-declare function Provides({ name }?: Partial<ProvidesParams>): (graph: Graph, propertyKey: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
-export default Provides;
-//# sourceMappingURL=Provides.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Provides.d.ts","sourceRoot":"","sources":["../../src/Provides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,eAAe,CAAC;AAGlC,UAAU,cAAc;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,iBAAS,QAAQ,CAAC,EAAE,IAAI,EAAE,GAAE,OAAO,CAAC,cAAc,CAAM,WACvB,KAAK,eAAe,MAAM,cAAc,kBAAkB,wBAI1F;AACD,eAAe,QAAQ,CAAC"}

package/dist/src/Provides.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Provides.js","sourceRoot":"","sources":["../../src/Provides.ts"],"names":[],"mappings":";;;;;AAEA,sFAAgE;AAOhE,SAAS,QAAQ,CAAC,EAAsC;QAAtC,qBAAoC,EAAE,KAAA,EAApC,IAAI,UAAA;IACtB,OAAO,SAAS,OAAO,CAAC,KAAY,EAAE,WAAmB,EAAE,UAA8B;QACvF,iCAAuB,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,IAAK,CAAC,CAAC;QACvD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AACD,kBAAe,QAAQ,CAAC"}

package/src/@types/obsidian.d.ts

@@ -1,19 +0,0 @@
-import ObjectGraph from '../graph/ObjectGraph';
-
-type Constructable<T> = {
-  new(...args: any): T;
-};
-
-type GraphClass<T extends ObjectGraph<P>, P> = {
-  new(props?: P): T;
-};
-
-type Scope = string | number | symbol;
-
-type Constructor = { new(...args: any[]): any };
-
-type GraphType = { new(...args: any[]): ObjectGraph };
-
-type ServiceLocator<Clazz> = {
-  [Key in keyof Clazz]: Function
-};

package/src/Provides.ts

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