Refactor and split code into multiple files

maxdome · Sep 24, 2017 · 32bee5e · 32bee5e
1 parent bec1205
commit 32bee5e
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 34 deletions.
diff --git a/examples/add-tags.js b/examples/add-tags.js
@@ -1,4 +1,4 @@
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const config = (module.exports = {
   "swagger": "2.0",

diff --git a/examples/basic.js b/examples/basic.js
@@ -1,4 +1,4 @@
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const config = (module.exports = {
   swagger: '2.0',

diff --git a/examples/filter.js b/examples/filter.js
@@ -1,4 +1,4 @@
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const config = (module.exports = {
   swagger: '2.0',

diff --git a/examples/middleware.js b/examples/middleware.js
@@ -1,5 +1,5 @@
 const app = (module.exports = require('express')());
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const basicConfig = require('./basic');
 

diff --git a/examples/rename.js b/examples/rename.js
@@ -1,4 +1,4 @@
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const config = (module.exports = {
   swagger: '2.0',

diff --git a/examples/security.js b/examples/security.js
@@ -1,4 +1,4 @@
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const config = (module.exports = {
   swagger: '2.0',

diff --git a/src/swagger-combine.js → src/SwaggerCombine.js b/src/swagger-combine.js → src/SwaggerCombine.js
@@ -1,6 +1,5 @@
 const $RefParser = require('json-schema-ref-parser');
 const SwaggerParser = require('swagger-parser');
-const maybe = require('call-me-maybe');
 const traverse = require('traverse');
 const urlJoin = require('url-join');
 const _ = require('lodash');
@@ -322,28 +321,4 @@ class SwaggerCombine {
   }
 }
 
-function swaggerCombine(config = 'docs/swagger.json', opts, cb) {
-  if (_.isFunction(opts)) {
-    cb = opts;
-    opts = null;
-  }
-
-  return maybe(cb, new SwaggerCombine(config, opts).combineAndReturn());
-}
-
-swaggerCombine.middleware = (config, opts = {}) => (req, res, next) => {
-  new SwaggerCombine(config, opts)
-    .combine()
-    .then(sc => {
-      if (opts && (opts.format === 'yaml' || opts.format === 'yml')) {
-        return res.type('yaml').send(sc.toString());
-      }
-
-      res.json(sc.combinedSchema);
-    })
-    .catch(err => next(err));
-};
-
-swaggerCombine.SwaggerCombine = SwaggerCombine;
-
-module.exports = swaggerCombine;
+module.exports = SwaggerCombine;
diff --git a/src/index.js b/src/index.js
@@ -0,0 +1,19 @@
+const _ = require('lodash');
+const maybe = require('call-me-maybe');
+
+const SwaggerCombine = require('./SwaggerCombine');
+const middleware = require('./middleware');
+
+function swaggerCombine(config = 'docs/swagger.json', opts, cb) {
+  if (_.isFunction(opts)) {
+    cb = opts;
+    opts = null;
+  }
+
+  return maybe(cb, new SwaggerCombine(config, opts).combineAndReturn());
+}
+
+swaggerCombine.SwaggerCombine = SwaggerCombine;
+swaggerCombine.middleware = middleware;
+
+module.exports = swaggerCombine;
diff --git a/src/middleware.js b/src/middleware.js
@@ -0,0 +1,16 @@
+const SwaggerCombine = require('./SwaggerCombine');
+
+module.exports = (config, opts = {}) => {
+  return function(req, res, next) {
+    new SwaggerCombine(config, opts)
+      .combine()
+      .then(sc => {
+        if (opts && (opts.format === 'yaml' || opts.format === 'yml')) {
+          return res.type('yaml').send(sc.toString());
+        }
+
+        res.json(sc.combinedSchema);
+      })
+      .catch(err => next(err));
+  };
+};
diff --git a/test/integration.spec.js b/test/integration.spec.js
@@ -4,7 +4,7 @@ chai.use(require('chai-somewhere'));
 chai.use(require('chai-http'));
 
 const expect = chai.expect;
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 const pkg = require('../package.json');
 const addTagsConfig = require('../examples/add-tags');
 const basicConfig = require('../examples/basic');

diff --git a/test/unit.spec.js b/test/unit.spec.js
@@ -4,7 +4,7 @@ chai.use(require('sinon-chai'));
 
 const expect = chai.expect;
 
-const swaggerCombine = require('../src/swagger-combine');
+const swaggerCombine = require('../src');
 
 const sandbox = sinon.sandbox.create();
 let instance;