refactor: export class definition, not factories

stoplightio · Apr 17, 2019 · 6eeb56c · 6eeb56c
1 parent 0ddb47e
commit 6eeb56c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 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 { createHttpLoaderInstance } from '@stoplight/prism-core';
+import { HttpLoader } 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: createHttpLoaderInstance() }, config: { mock: false } }
+      { components: { loader: new HttpLoader() }, config: { mock: false } }
     );
   });
 });
diff --git a/packages/cli/src/util/createServer.ts b/packages/cli/src/util/createServer.ts
@@ -1,13 +1,13 @@
-import { createHttpLoaderInstance } from '@stoplight/prism-core';
+import { HttpLoader } 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: createHttpLoaderInstance() }, config }
-      )
+      { url: spec },
+      { components: { loader: new HttpLoader() }, config }
+    )
     : createHttpServer({ path: spec }, { config });
 }
 

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 = new GraphFacade()) { }
 
   /**
    * TODO(sl-732): we can't assure we will return an array of 'Resource'.
@@ -31,4 +31,4 @@ export class FilesystemLoader {
   }
 }
 
-export const createFilesystemLoaderInstance = () => new FilesystemLoader(new GraphFacade());
+export default FilesystemLoader;
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 = new GraphFacade()) { }
 
   public async load(opts?: IHttpLoaderOpts): Promise<IHttpOperation[]> {
     if (!opts || !opts.url) return [];
@@ -23,4 +23,4 @@ export class HttpLoader {
   }
 }
 
-export const createHttpLoaderInstance = () => new HttpLoader(new GraphFacade());
+export default HttpLoader;
diff --git a/packages/http/src/index.ts b/packages/http/src/index.ts
@@ -1,4 +1,4 @@
-import { createFilesystemLoaderInstance, factory, PartialPrismConfig } from '@stoplight/prism-core';
+import { FilesystemLoader, factory, 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: createFilesystemLoaderInstance(),
+      loader: new FilesystemLoader(),
       router,
       forwarder,
       validator,