refactor(resolver): refactor code to allow using strategy pattern

Refs #2744

src/index.js

@@ -1,7 +1,8 @@
 import Url from 'url';
 
 import Http, { makeHttp, serializeRes, serializeHeaders } from './http/index.js';
-import Resolver, { clearCache } from './resolver.js';
+import Resolver from './resolver/index.js';
+import { clearCache } from './resolver/strategies/openapi-2--3-0.js';
 import resolveSubtree from './subtree-resolver/index.js';
 import { makeApisTagOperation } from './interfaces.js';
 import { execute, buildRequest, baseUrl } from './execute/index.js';

src/resolver/index.js

@@ -0,0 +1,18 @@
+// eslint-disable-next-line camelcase
+import resolveOpenAPI2_30Strategy from './strategies/openapi-2--3-0.js';
+import { makeFetchJSON } from './utils/index.js';
+import * as optionsUtil from './utils/options.js';
+
+const resolve = async (options) => {
+  const { spec, requestInterceptor, responseInterceptor } = options;
+
+  const retrievalURI = optionsUtil.retrievalURI(options);
+  const httpClient = optionsUtil.httpClient(options);
+  const retrievedSpec =
+    spec ||
+    (await makeFetchJSON(httpClient, { requestInterceptor, responseInterceptor })(retrievalURI));
+
+  return resolveOpenAPI2_30Strategy({ ...options, spec: retrievedSpec });
+};
+
+export default resolve;

src/resolver.js → src/resolver/strategies/openapi-2--3-0.js

@@ -1,36 +1,18 @@
-import Http from './http/index.js';
-import mapSpec, { plugins } from './specmap/index.js';
+import mapSpec, { plugins } from '../../specmap/index.js';
 // eslint-disable-next-line camelcase
-import normalizeOpenAPI2__30 from './helpers/normalize/openapi-2--3-0.js';
-import { ACCEPT_HEADER_VALUE_FOR_DOCUMENTS } from './constants.js';
-
-export function makeFetchJSON(http, opts = {}) {
-  const { requestInterceptor, responseInterceptor } = opts;
-  // Set credentials with 'http.withCredentials' value
-  const credentials = http.withCredentials ? 'include' : 'same-origin';
-  return (docPath) =>
-    http({
-      url: docPath,
-      loadSpec: true,
-      requestInterceptor,
-      responseInterceptor,
-      headers: {
-        Accept: ACCEPT_HEADER_VALUE_FOR_DOCUMENTS,
-      },
-      credentials,
-    }).then((res) => res.body);
-}
+import normalizeOpenAPI2__30 from '../../helpers/normalize/openapi-2--3-0.js';
+import { makeFetchJSON } from '../utils/index.js';
+import * as optionsUtil from '../utils/options.js';
 
 // Wipe out the http cache
 export function clearCache() {
   plugins.refs.clearCache();
 }
 
-export default function resolve(obj) {
+// eslint-disable-next-line camelcase
+export default function resolveOpenAPI2_30Strategy(obj) {
   const {
-    fetch,
     spec,
-    url,
     mode,
     allowMetaPatches = true,
     pathDiscriminator,
@@ -43,20 +25,8 @@ export default function resolve(obj) {
   } = obj;
 
   let { http, baseDoc } = obj;
-
-  // @TODO Swagger-UI uses baseDoc instead of url, this is to allow both
-  // need to fix and pick one.
-  baseDoc = baseDoc || url;
-
-  // Provide a default fetch implementation
-  // TODO fetch should be removed, and http used instead
-  http = fetch || http || Http;
-
-  if (!spec) {
-    return makeFetchJSON(http, { requestInterceptor, responseInterceptor })(baseDoc).then(
-      doResolve
-    );
-  }
+  baseDoc = optionsUtil.retrievalURI(obj);
+  http = optionsUtil.httpClient(obj);
 
   return doResolve(spec);
 

src/resolver/utils/index.js

@@ -0,0 +1,19 @@
+import { ACCEPT_HEADER_VALUE_FOR_DOCUMENTS } from '../../constants.js';
+
+// eslint-disable-next-line import/prefer-default-export
+export function makeFetchJSON(http, opts = {}) {
+  const { requestInterceptor, responseInterceptor } = opts;
+  // Set credentials with 'http.withCredentials' value
+  const credentials = http.withCredentials ? 'include' : 'same-origin';
+  return (docPath) =>
+    http({
+      url: docPath,
+      loadSpec: true,
+      requestInterceptor,
+      responseInterceptor,
+      headers: {
+        Accept: ACCEPT_HEADER_VALUE_FOR_DOCUMENTS,
+      },
+      credentials,
+    }).then((res) => res.body);
+}

src/resolver/utils/options.js

@@ -0,0 +1,17 @@
+import Http from '../../http/index.js';
+
+export const retrievalURI = (options) => {
+  const { baseDoc, url } = options;
+
+  // @TODO Swagger-UI uses baseDoc instead of url, this is to allow both
+  // need to fix and pick one.
+  return baseDoc || url;
+};
+
+export const httpClient = (options) => {
+  const { fetch, http } = options;
+
+  // @TODO fetch should be removed, and http used instead
+  // provide a default fetch implementation
+  return fetch || http || Http;
+};

src/subtree-resolver/index.js

@@ -23,7 +23,7 @@
 
 import get from 'lodash/get';
 
-import resolve from '../resolver.js';
+import resolve from '../resolver/index.js';
 // eslint-disable-next-line camelcase
 import normalizeOpenAPI2__30 from '../helpers/normalize/openapi-2--3-0.js';
 

test/resolver.js → test/resolver/resolver.js

@@ -3,7 +3,7 @@ import path from 'path';
 import fs from 'fs';
 import jsYaml from 'js-yaml';
 
-import Swagger from '../src/index.js';
+import Swagger from '../../src/index.js';
 
 describe('resolver', () => {
   afterEach(() => {
@@ -721,7 +721,7 @@ describe('resolver', () => {
   test('should not throw errors on resvered-keywords in freely-named-fields', () => {
     // Given
     const ReservedKeywordSpec = jsYaml.load(
-      fs.readFileSync(path.resolve(__dirname, './data/reserved-keywords.yaml'), 'utf8')
+      fs.readFileSync(path.resolve(__dirname, '../data/reserved-keywords.yaml'), 'utf8')
     );
 
     // When