feat: do not create singleton grahite and loaders

stoplightio · Apr 16, 2019 · a33b860 · a33b860
1 parent 4b5415f
commit a33b860
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/packages/cli/src/util/__tests__/createServer.unit.ts b/packages/cli/src/util/__tests__/createServer.unit.ts
@@ -1,4 +1,4 @@
-import { httpLoaderInstance } from '@stoplight/prism-core';
+import { createHttpLoaderInstance } from '@stoplight/prism-core';
 import { createServer as createPrismServer } from '@stoplight/prism-http-server';
 import { createServer } from '../createServer';
 
@@ -26,7 +26,7 @@ describe('server command', () => {
 
     expect(createPrismServer).toHaveBeenLastCalledWith(
       { url: 'http://path.to/spec.oas2.yaml' },
-      { components: { loader: httpLoaderInstance }, config: { mock: false } }
+      { components: { loader: createHttpLoaderInstance() }, config: { mock: false } }
     );
   });
 });
diff --git a/packages/cli/src/util/createServer.ts b/packages/cli/src/util/createServer.ts
@@ -1,10 +1,10 @@
-import { httpLoaderInstance } from '@stoplight/prism-core';
+import { createHttpLoaderInstance } from '@stoplight/prism-core';
 import { IHttpConfig } from '@stoplight/prism-http';
 import { createServer as createHttpServer } from '@stoplight/prism-http-server';
 
 export function createServer(spec: string, config: IHttpConfig) {
   return spec && isHttp(spec)
-    ? createHttpServer({ url: spec }, { components: { loader: httpLoaderInstance }, config })
+    ? createHttpServer({ url: spec }, { components: { loader: createHttpLoaderInstance() }, config })
     : createHttpServer({ path: spec }, { config });
 }
 

diff --git a/packages/core/src/factory.ts b/packages/core/src/factory.ts
@@ -5,9 +5,9 @@ export function factory<Resource, Input, Output, Config, LoadOpts>(
   defaultConfig: PrismConfig<Config, Input>,
   defaultComponents: Partial<IPrismComponents<Resource, Input, Output, Config, LoadOpts>>
 ): (
-  customConfig?: PartialPrismConfig<Config, Input>,
-  customComponents?: Partial<IPrismComponents<Resource, Input, Output, Config, LoadOpts>>
-) => IPrism<Resource, Input, Output, Config, LoadOpts> {
+    customConfig?: PartialPrismConfig<Config, Input>,
+    customComponents?: Partial<IPrismComponents<Resource, Input, Output, Config, LoadOpts>>
+  ) => IPrism<Resource, Input, Output, Config, LoadOpts> {
   const prism = (
     customConfig?: PartialPrismConfig<Config, Input>,
     customComponents?: Partial<IPrismComponents<Resource, Input, Output, Config, LoadOpts>>

diff --git a/packages/core/src/loaders/filesystem/filesystemLoader.ts b/packages/core/src/loaders/filesystem/filesystemLoader.ts
@@ -6,7 +6,7 @@ import { GraphFacade } from '../../utils/graphFacade';
 const DEFAULT_PATH = '.';
 
 export class FilesystemLoader {
-  constructor(private graphFacade: GraphFacade) {}
+  constructor(private graphFacade: GraphFacade) { }
 
   /**
    * TODO(sl-732): we can't assure we will return an array of 'Resource'.
@@ -31,4 +31,4 @@ export class FilesystemLoader {
   }
 }
 
-export const filesystemLoaderInstance = new FilesystemLoader(new GraphFacade());
+export const createFilesystemLoaderInstance = () => new FilesystemLoader(new GraphFacade());
diff --git a/packages/core/src/loaders/http/httpLoader.ts b/packages/core/src/loaders/http/httpLoader.ts
@@ -7,7 +7,7 @@ import { IHttpLoaderOpts } from '../../types';
 import { GraphFacade } from '../../utils/graphFacade';
 
 export class HttpLoader {
-  constructor(private graphFacade: GraphFacade) {}
+  constructor(private graphFacade: GraphFacade) { }
 
   public async load(opts?: IHttpLoaderOpts): Promise<IHttpOperation[]> {
     if (!opts || !opts.url) return [];
@@ -23,4 +23,4 @@ export class HttpLoader {
   }
 }
 
-export const httpLoaderInstance = new HttpLoader(new GraphFacade());
+export const createHttpLoaderInstance = () => new HttpLoader(new GraphFacade());
diff --git a/packages/http/src/__tests__/http-prism-instance.spec.ts b/packages/http/src/__tests__/http-prism-instance.spec.ts
@@ -129,7 +129,7 @@ describe('Http Prism Instance function tests', () => {
       path: relative(process.cwd(), resolve(__dirname, 'fixtures', 'petstore.oas2.yaml')),
     });
 
-    expect(prism.resources).toHaveLength(5);
+    expect(prism.resources).toHaveLength(3);
   });
 
   test('returns stringified static example when one defined in spec', async () => {

diff --git a/packages/http/src/index.ts b/packages/http/src/index.ts
@@ -1,4 +1,4 @@
-import { factory, filesystemLoaderInstance, PartialPrismConfig } from '@stoplight/prism-core';
+import { factory, createFilesystemLoaderInstance, PartialPrismConfig } from '@stoplight/prism-core';
 import { IHttpOperation } from '@stoplight/types';
 
 import { forwarder } from './forwarder';
@@ -25,7 +25,7 @@ const createInstance = <LoaderInput>(
   return factory<IHttpOperation, IHttpRequest, IHttpResponse, IHttpConfig, LoaderInput>(
     { mock: true },
     {
-      loader: filesystemLoaderInstance,
+      loader: createFilesystemLoaderInstance(),
       router,
       forwarder,
       validator,