json-server 0.12.2 → 0.14.2

package/lib/server/defaults.js

@@ -1,72 +1,79 @@
-'use strict';
-
-var fs = require('fs');
-var path = require('path');
-var express = require('express');
-var logger = require('morgan');
-var cors = require('cors');
-var compression = require('compression');
-var errorhandler = require('errorhandler');
-var objectAssign = require('object-assign');
-var bodyParser = require('./body-parser');
+"use strict";
 
-module.exports = function (opts) {
-  var userDir = path.join(process.cwd(), 'public');
-  var defaultDir = path.join(__dirname, 'public');
-  var staticDir = fs.existsSync(userDir) ? userDir : defaultDir;
+const fs = require('fs');
+
+const path = require('path');
+
+const express = require('express');
+
+const logger = require('morgan');
+
+const cors = require('cors');
+
+const compression = require('compression');
 
-  opts = objectAssign({ logger: true, static: staticDir }, opts);
+const errorhandler = require('errorhandler');
 
-  var arr = [];
+const objectAssign = require('object-assign');
+
+const bodyParser = require('./body-parser');
+
+module.exports = function (opts) {
+  const userDir = path.join(process.cwd(), 'public');
+  const defaultDir = path.join(__dirname, '../../dist');
+  const staticDir = fs.existsSync(userDir) ? userDir : defaultDir;
+  opts = objectAssign({
+    logger: true,
+    static: staticDir
+  }, opts);
+  const arr = []; // Compress all requests
 
-  // Compress all requests
   if (!opts.noGzip) {
     arr.push(compression());
-  }
+  } // Enable CORS for all the requests, including static files
+
 
-  // Enable CORS for all the requests, including static files
   if (!opts.noCors) {
-    arr.push(cors({ origin: true, credentials: true }));
+    arr.push(cors({
+      origin: true,
+      credentials: true
+    }));
   }
 
   if (process.env.NODE_ENV === 'development') {
     // only use in development
     arr.push(errorhandler());
-  }
+  } // Serve static files
+
 
-  // Serve static files
-  arr.push(express.static(opts.static));
+  arr.push(express.static(opts.static)); // Logger
 
-  // Logger
   if (opts.logger) {
     arr.push(logger('dev', {
-      skip: function skip(req) {
-        return process.env.NODE_ENV === 'test' || req.path === '/favicon.ico';
-      }
+      skip: req => process.env.NODE_ENV === 'test' || req.path === '/favicon.ico'
     }));
-  }
-
-  // No cache for IE
+  } // No cache for IE
   // https://support.microsoft.com/en-us/kb/234067
-  arr.push(function (req, res, next) {
+
+
+  arr.push((req, res, next) => {
     res.header('Cache-Control', 'no-cache');
     res.header('Pragma', 'no-cache');
     res.header('Expires', '-1');
     next();
-  });
+  }); // Read-only
 
-  // Read-only
   if (opts.readOnly) {
-    arr.push(function (req, res, next) {
+    arr.push((req, res, next) => {
       if (req.method === 'GET') {
         next(); // Continue
       } else {
         res.sendStatus(403); // Forbidden
       }
     });
-  }
+  } // Add middlewares
+
 
-  // Add middlewares
   if (opts.bodyParser) {
     arr.push(bodyParser);
   }

package/lib/server/index.js

@@ -1,11 +1,9 @@
-'use strict';
+"use strict";
 
-var express = require('express');
+const express = require('express');
 
 module.exports = {
-  create: function create() {
-    return express().set('json spaces', 2);
-  },
+  create: () => express().set('json spaces', 2),
   defaults: require('./defaults'),
   router: require('./router'),
   rewriter: require('./rewriter'),

package/lib/server/mixins.js

@@ -1,31 +1,39 @@
-'use strict';
+"use strict";
 
-var nanoid = require('nanoid');
-var pluralize = require('pluralize');
+const nanoid = require('nanoid');
+
+const pluralize = require('pluralize');
 
 module.exports = {
   getRemovable,
   createId,
-  deepQuery
-
-  // Returns document ids that have unsatisfied relations
+  deepQuery // Returns document ids that have unsatisfied relations
   // Example: a comment that references a post that doesn't exist
-};function getRemovable(db, opts) {
-  var _ = this;
-  var removable = [];
-  _.each(db, function (coll, collName) {
-    _.each(coll, function (doc) {
-      _.each(doc, function (value, key) {
+
+};
+
+function getRemovable(db, opts) {
+  const _ = this;
+
+  const removable = [];
+
+  _.each(db, (coll, collName) => {
+    _.each(coll, doc => {
+      _.each(doc, (value, key) => {
         if (new RegExp(`${opts.foreignKeySuffix}$`).test(key)) {
           // Remove foreign key suffix and pluralize it
           // Example postId -> posts
-          var refName = pluralize.plural(key.replace(new RegExp(`${opts.foreignKeySuffix}$`), ''));
-          // Test if table exists
+          const refName = pluralize.plural(key.replace(new RegExp(`${opts.foreignKeySuffix}$`), '')); // Test if table exists
+
           if (db[refName]) {
             // Test if references is defined in table
-            var ref = _.getById(db[refName], value);
+            const ref = _.getById(db[refName], value);
+
             if (_.isUndefined(ref)) {
-              removable.push({ name: collName, id: doc.id });
+              removable.push({
+                name: collName,
+                id: doc.id
+              });
             }
           }
         }
@@ -34,34 +42,37 @@ module.exports = {
   });
 
   return removable;
-}
-
-// Return incremented id or uuid
+} // Return incremented id or uuid
 // Used to override lodash-id's createId with utils.createId
+
+
 function createId(coll) {
-  var _ = this;
-  var idProperty = _.__id();
+  const _ = this;
+
+  const idProperty = _.__id();
+
   if (_.isEmpty(coll)) {
     return 1;
   } else {
-    var id = _(coll).maxBy(idProperty)[idProperty];
+    let id = _(coll).maxBy(idProperty)[idProperty]; // Increment integer id or generate string id
+
 
-    // Increment integer id or generate string id
     return _.isFinite(id) ? ++id : nanoid(7);
   }
 }
 
 function deepQuery(value, q) {
-  var _ = this;
+  const _ = this;
+
   if (value && q) {
     if (_.isArray(value)) {
-      for (var i = 0; i < value.length; i++) {
+      for (let i = 0; i < value.length; i++) {
         if (_.deepQuery(value[i], q)) {
           return true;
         }
       }
     } else if (_.isObject(value) && !_.isArray(value)) {
-      for (var k in value) {
+      for (let k in value) {
         if (_.deepQuery(value[k], q)) {
           return true;
         }

package/lib/server/rewriter.js

@@ -1,18 +1,16 @@
-'use strict';
+"use strict";
 
-var express = require('express');
-var rewrite = require('express-urlrewrite');
+const express = require('express');
 
-module.exports = function (routes) {
-  var router = express.Router();
+const rewrite = require('express-urlrewrite');
 
-  router.get('/__rules', function (req, res) {
+module.exports = routes => {
+  const router = express.Router();
+  router.get('/__rules', (req, res) => {
     res.json(routes);
   });
-
-  Object.keys(routes).forEach(function (key) {
+  Object.keys(routes).forEach(key => {
     router.use(rewrite(key, routes[key]));
   });
-
   return router;
 };

package/lib/server/router/delay.js

@@ -1,11 +1,12 @@
-'use strict';
+"use strict";
 
-var pause = require('connect-pause');
+const pause = require('connect-pause');
 
 module.exports = function delay(req, res, next) {
   // NOTE: for some reason unknown to me, if the default is 0, the tests seems to add 2 seconds
   // NOTE: to each test, a default value of 1 does not seem to be effected by that issue
-  var _delay = !isNaN(parseFloat(req.query._delay)) ? parseFloat(req.query._delay) : 1;
+  const _delay = !isNaN(parseFloat(req.query._delay)) ? parseFloat(req.query._delay) : 1;
+
   delete req.query._delay;
   pause(_delay)(req, res, next);
 };

package/lib/server/router/get-full-url.js

@@ -1,12 +1,11 @@
-'use strict';
+"use strict";
 
-var url = require('url');
+const url = require('url');
 
 module.exports = function getFullURL(req) {
-  var root = url.format({
+  const root = url.format({
     protocol: req.protocol,
     host: req.get('host')
   });
-
   return `${root}${req.originalUrl}`;
 };

package/lib/server/router/index.js

@@ -1,65 +1,70 @@
-'use strict';
-
-var express = require('express');
-var methodOverride = require('method-override');
-var _ = require('lodash');
-var lodashId = require('lodash-id');
-var low = require('lowdb');
-var fileAsync = require('lowdb/lib/storages/file-async');
-var bodyParser = require('../body-parser');
-var validateData = require('./validate-data');
-var plural = require('./plural');
-var nested = require('./nested');
-var singular = require('./singular');
-var mixins = require('../mixins');
-
-module.exports = function (source) {
-  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { foreignKeySuffix: 'Id' };
-
-  // Create router
-  var router = express.Router();
-
-  // Add middlewares
+"use strict";
+
+const express = require('express');
+
+const methodOverride = require('method-override');
+
+const _ = require('lodash');
+
+const lodashId = require('lodash-id');
+
+const low = require('lowdb');
+
+const Memory = require('lowdb/adapters/Memory');
+
+const FileSync = require('lowdb/adapters/FileSync');
+
+const bodyParser = require('../body-parser');
+
+const validateData = require('./validate-data');
+
+const plural = require('./plural');
+
+const nested = require('./nested');
+
+const singular = require('./singular');
+
+const mixins = require('../mixins');
+
+module.exports = (db, opts = {
+  foreignKeySuffix: 'Id',
+  _isFake: false
+}) => {
+  if (typeof db === 'string') {
+    db = low(new FileSync(db));
+  } else if (!_.has(db, '__chain__') || !_.has(db, '__wrapped__')) {
+    db = low(new Memory()).setState(db);
+  } // Create router
+
+
+  const router = express.Router(); // Add middlewares
+
   router.use(methodOverride());
   router.use(bodyParser);
+  validateData(db.getState()); // Add lodash-id methods to db
 
-  // Create database
-  var db = void 0;
-  if (_.isObject(source)) {
-    db = low();
-    db.setState(source);
-  } else {
-    db = low(source, { storage: fileAsync });
-  }
+  db._.mixin(lodashId); // Add specific mixins
 
-  validateData(db.getState());
 
-  // Add lodash-id methods to db
-  db._.mixin(lodashId);
+  db._.mixin(mixins); // Expose database
 
-  // Add specific mixins
-  db._.mixin(mixins);
 
-  // Expose database
-  router.db = db;
+  router.db = db; // Expose render
 
-  // Expose render
-  router.render = function (req, res) {
+  router.render = (req, res) => {
     res.jsonp(res.locals.data);
-  };
+  }; // GET /db
+
 
-  // GET /db
-  router.get('/db', function (req, res) {
+  router.get('/db', (req, res) => {
     res.jsonp(db.getState());
-  });
+  }); // Handle /:parent/:parentId/:resource
 
-  // Handle /:parent/:parentId/:resource
-  router.use(nested(opts));
+  router.use(nested(opts)); // Create routes
 
-  // Create routes
-  db.forEach(function (value, key) {
+  db.forEach((value, key) => {
     if (_.isPlainObject(value)) {
-      router.use(`/${key}`, singular(db, key));
+      router.use(`/${key}`, singular(db, key, opts));
       return;
     }
 
@@ -68,17 +73,14 @@ module.exports = function (source) {
       return;
     }
 
-    var sourceMessage = '';
-    if (!_.isObject(source)) {
-      sourceMessage = `in ${source}`;
-    }
-
-    var msg = `Type of "${key}" (${typeof value}) ${sourceMessage} is not supported. ` + `Use objects or arrays of objects.`;
+    var sourceMessage = ''; // if (!_.isObject(source)) {
+    //   sourceMessage = `in ${source}`
+    // }
 
+    const msg = `Type of "${key}" (${typeof value}) ${sourceMessage} is not supported. ` + `Use objects or arrays of objects.`;
     throw new Error(msg);
   }).value();
-
-  router.use(function (req, res) {
+  router.use((req, res) => {
     if (!res.locals.data) {
       res.status(404);
       res.locals.data = {};
@@ -86,11 +88,9 @@ module.exports = function (source) {
 
     router.render(req, res);
   });
-
-  router.use(function (err, req, res, next) {
+  router.use((err, req, res, next) => {
     console.error(err.stack);
     res.status(500).send(err.stack);
   });
-
   return router;
 };

package/lib/server/router/nested.js

@@ -1,24 +1,25 @@
-'use strict';
+"use strict";
 
-var express = require('express');
-var pluralize = require('pluralize');
-var delay = require('./delay');
+const express = require('express');
 
-module.exports = function (opts) {
-  var router = express.Router();
-  router.use(delay);
+const pluralize = require('pluralize');
+
+const delay = require('./delay');
+
+module.exports = opts => {
+  const router = express.Router();
+  router.use(delay); // Rewrite URL (/:resource/:id/:nested -> /:nested) and request query
 
-  // Rewrite URL (/:resource/:id/:nested -> /:nested) and request query
   function get(req, res, next) {
-    var prop = pluralize.singular(req.params.resource);
+    const prop = pluralize.singular(req.params.resource);
     req.query[`${prop}${opts.foreignKeySuffix}`] = req.params.id;
     req.url = `/${req.params.nested}`;
     next();
-  }
+  } // Rewrite URL (/:resource/:id/:nested -> /:nested) and request body
+
 
-  // Rewrite URL (/:resource/:id/:nested -> /:nested) and request body
   function post(req, res, next) {
-    var prop = pluralize.singular(req.params.resource);
+    const prop = pluralize.singular(req.params.resource);
     req.body[`${prop}${opts.foreignKeySuffix}`] = req.params.id;
     req.url = `/${req.params.nested}`;
     next();