json-server 0.12.2 → 0.14.2

package/lib/server/router/plural.js

@@ -1,62 +1,71 @@
-'use strict';
+"use strict";
 
-var express = require('express');
-var _ = require('lodash');
-var pluralize = require('pluralize');
-var write = require('./write');
-var getFullURL = require('./get-full-url');
-var utils = require('../utils');
-var delay = require('./delay');
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
 
-module.exports = function (db, name, opts) {
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const express = require('express');
+
+const _ = require('lodash');
+
+const pluralize = require('pluralize');
+
+const write = require('./write');
+
+const getFullURL = require('./get-full-url');
+
+const utils = require('../utils');
+
+const delay = require('./delay');
+
+module.exports = (db, name, opts) => {
   // Create router
-  var router = express.Router();
-  router.use(delay);
+  const router = express.Router();
+  router.use(delay); // Embed function used in GET /name and GET /name/id
 
-  // Embed function used in GET /name and GET /name/id
   function embed(resource, e) {
-    e && [].concat(e).forEach(function (externalResource) {
+    e && [].concat(e).forEach(externalResource => {
       if (db.get(externalResource).value) {
-        var query = {};
-        var singularResource = pluralize.singular(name);
+        const query = {};
+        const singularResource = pluralize.singular(name);
         query[`${singularResource}${opts.foreignKeySuffix}`] = resource.id;
         resource[externalResource] = db.get(externalResource).filter(query).value();
       }
     });
-  }
+  } // Expand function used in GET /name and GET /name/id
+
 
-  // Expand function used in GET /name and GET /name/id
   function expand(resource, e) {
-    e && [].concat(e).forEach(function (innerResource) {
-      var plural = pluralize(innerResource);
+    e && [].concat(e).forEach(innerResource => {
+      const plural = pluralize(innerResource);
+
       if (db.get(plural).value()) {
-        var prop = `${innerResource}${opts.foreignKeySuffix}`;
+        const prop = `${innerResource}${opts.foreignKeySuffix}`;
         resource[innerResource] = db.get(plural).getById(resource[prop]).value();
       }
     });
-  }
-
-  // GET /name
+  } // GET /name
   // GET /name?q=
   // GET /name?attr=&attr=
   // GET /name?_end=&
   // GET /name?_start=&_end=&
   // GET /name?_embed=&_expand=
+
+
   function list(req, res, next) {
     // Resource chain
-    var chain = db.get(name);
-
-    // Remove q, _start, _end, ... from req.query to avoid filtering using those
+    let chain = db.get(name); // Remove q, _start, _end, ... from req.query to avoid filtering using those
     // parameters
-    var q = req.query.q;
-    var _start = req.query._start;
-    var _end = req.query._end;
-    var _page = req.query._page;
-    var _sort = req.query._sort;
-    var _order = req.query._order;
-    var _limit = req.query._limit;
-    var _embed = req.query._embed;
-    var _expand = req.query._expand;
+
+    let q = req.query.q;
+    let _start = req.query._start;
+    let _end = req.query._end;
+    let _page = req.query._page;
+    let _sort = req.query._sort;
+    let _order = req.query._order;
+    let _limit = req.query._limit;
+    let _embed = req.query._embed;
+    let _expand = req.query._expand;
     delete req.query.q;
     delete req.query._start;
     delete req.query._end;
@@ -64,15 +73,16 @@ module.exports = function (db, name, opts) {
     delete req.query._order;
     delete req.query._limit;
     delete req.query._embed;
-    delete req.query._expand;
-
-    // Automatically delete query parameters that can't be found
+    delete req.query._expand; // Automatically delete query parameters that can't be found
     // in the database
-    Object.keys(req.query).forEach(function (query) {
-      var arr = db.get(name).value();
-      for (var i in arr) {
+
+    Object.keys(req.query).forEach(query => {
+      const arr = db.get(name).value();
+
+      for (let i in arr) {
         if (_.has(arr[i], query) || query === 'callback' || query === '_' || /_lte$/.test(query) || /_gte$/.test(query) || /_ne$/.test(query) || /_like$/.test(query)) return;
       }
+
       delete req.query[query];
     });
 
@@ -83,10 +93,10 @@ module.exports = function (db, name, opts) {
       }
 
       q = q.toLowerCase();
+      chain = chain.filter(obj => {
+        for (let key in obj) {
+          const value = obj[key];
 
-      chain = chain.filter(function (obj) {
-        for (var key in obj) {
-          var value = obj[key];
           if (db._.deepQuery(value, q)) {
             return true;
           }
@@ -94,31 +104,29 @@ module.exports = function (db, name, opts) {
       });
     }
 
-    Object.keys(req.query).forEach(function (key) {
+    Object.keys(req.query).forEach(key => {
       // Don't take into account JSONP query parameters
       // jQuery adds a '_' query parameter too
       if (key !== 'callback' && key !== '_') {
         // Always use an array, in case req.query is an array
-        var arr = [].concat(req.query[key]);
-
-        chain = chain.filter(function (element) {
+        const arr = [].concat(req.query[key]);
+        chain = chain.filter(element => {
           return arr.map(function (value) {
-            var isDifferent = /_ne$/.test(key);
-            var isRange = /_lte$/.test(key) || /_gte$/.test(key);
-            var isLike = /_like$/.test(key);
-            var path = key.replace(/(_lte|_gte|_ne|_like)$/, '');
-            // get item value based on path
+            const isDifferent = /_ne$/.test(key);
+            const isRange = /_lte$/.test(key) || /_gte$/.test(key);
+            const isLike = /_like$/.test(key);
+            const path = key.replace(/(_lte|_gte|_ne|_like)$/, ''); // get item value based on path
             // i.e post.title -> 'foo'
-            var elementValue = _.get(element, path);
 
-            // Prevent toString() failing on undefined or null values
+            const elementValue = _.get(element, path); // Prevent toString() failing on undefined or null values
+
+
             if (elementValue === undefined || elementValue === null) {
               return;
             }
 
             if (isRange) {
-              var isLowerThan = /_gte$/.test(key);
-
+              const isLowerThan = /_gte$/.test(key);
               return isLowerThan ? value <= elementValue : value >= elementValue;
             } else if (isDifferent) {
               return value !== elementValue.toString();
@@ -127,23 +135,20 @@ module.exports = function (db, name, opts) {
             } else {
               return value === elementValue.toString();
             }
-          }).reduce(function (a, b) {
-            return a || b;
-          });
+          }).reduce((a, b) => a || b);
         });
       }
-    });
+    }); // Sort
 
-    // Sort
     if (_sort) {
-      var _sortSet = _sort.split(',');
-      var _orderSet = (_order || '').split(',').map(function (s) {
-        return s.toLowerCase();
-      });
+      const _sortSet = _sort.split(',');
+
+      const _orderSet = (_order || '').split(',').map(s => s.toLowerCase());
+
       chain = chain.orderBy(_sortSet, _orderSet);
-    }
+    } // Slice result
+
 
-    // Slice result
     if (_end || _limit || _page) {
       res.setHeader('X-Total-Count', chain.size());
       res.setHeader('Access-Control-Expose-Headers', `X-Total-Count${_page ? ', Link' : ''}`);
@@ -153,9 +158,9 @@ module.exports = function (db, name, opts) {
       _page = parseInt(_page, 10);
       _page = _page >= 1 ? _page : 1;
       _limit = parseInt(_limit, 10) || 10;
-      var page = utils.getPage(chain.value(), _page, _limit);
-      var links = {};
-      var fullURL = getFullURL(req);
+      const page = utils.getPage(chain.value(), _page, _limit);
+      const links = {};
+      const fullURL = getFullURL(req);
 
       if (page.first) {
         links.first = fullURL.replace(`page=${page.current}`, `page=${page.first}`);
@@ -183,82 +188,104 @@ module.exports = function (db, name, opts) {
       _start = parseInt(_start, 10) || 0;
       _limit = parseInt(_limit, 10);
       chain = chain.slice(_start, _start + _limit);
-    }
+    } // embed and expand
+
 
-    // embed and expand
     chain = chain.cloneDeep().forEach(function (element) {
       embed(element, _embed);
       expand(element, _expand);
     });
-
     res.locals.data = chain.value();
     next();
-  }
-
-  // GET /name/:id
+  } // GET /name/:id
   // GET /name/:id?_embed=&_expand
+
+
   function show(req, res, next) {
-    var _embed = req.query._embed;
-    var _expand = req.query._expand;
-    var resource = db.get(name).getById(req.params.id).value();
+    const _embed = req.query._embed;
+    const _expand = req.query._expand;
+    const resource = db.get(name).getById(req.params.id).value();
 
     if (resource) {
       // Clone resource to avoid making changes to the underlying object
-      var clone = _.cloneDeep(resource);
-
-      // Embed other resources based on resource id
+      const clone = _.cloneDeep(resource); // Embed other resources based on resource id
       // /posts/1?_embed=comments
-      embed(clone, _embed);
 
-      // Expand inner resources based on id
+
+      embed(clone, _embed); // Expand inner resources based on id
       // /posts/1?_expand=user
-      expand(clone, _expand);
 
+      expand(clone, _expand);
       res.locals.data = clone;
     }
 
     next();
-  }
+  } // POST /name
+
 
-  // POST /name
   function create(req, res, next) {
-    var resource = db.get(name).insert(req.body).value();
+    let resource;
+
+    if (opts._isFake) {
+      const id = db.get(name).createId().value();
+      resource = _objectSpread({}, req.body, {
+        id
+      });
+    } else {
+      resource = db.get(name).insert(req.body).value();
+    }
 
     res.setHeader('Access-Control-Expose-Headers', 'Location');
     res.location(`${getFullURL(req)}/${resource.id}`);
-
     res.status(201);
     res.locals.data = resource;
-
     next();
-  }
-
-  // PUT /name/:id
+  } // PUT /name/:id
   // PATCH /name/:id
+
+
   function update(req, res, next) {
-    var id = req.params.id;
-    var chain = db.get(name);
+    const id = req.params.id;
+    let resource;
 
-    chain = req.method === 'PATCH' ? chain.updateById(id, req.body) : chain.replaceById(id, req.body);
+    if (opts._isFake) {
+      resource = db.get(name).getById(id).value();
 
-    var resource = chain.value();
+      if (req.method === 'PATCH') {
+        resource = _objectSpread({}, resource, req.body);
+      } else {
+        resource = _objectSpread({}, req.body, {
+          id: resource.id
+        });
+      }
+    } else {
+      let chain = db.get(name);
+      chain = req.method === 'PATCH' ? chain.updateById(id, req.body) : chain.replaceById(id, req.body);
+      resource = chain.value();
+    }
 
     if (resource) {
       res.locals.data = resource;
     }
 
     next();
-  }
+  } // DELETE /name/:id
+
 
-  // DELETE /name/:id
   function destroy(req, res, next) {
-    var resource = db.get(name).removeById(req.params.id).value();
+    let resource;
 
-    // Remove dependents documents
-    var removable = db._.getRemovable(db.getState(), opts);
-    removable.forEach(function (item) {
-      db.get(item.name).removeById(item.id).value();
-    });
+    if (opts._isFake) {
+      resource = db.get(name).value();
+    } else {
+      resource = db.get(name).removeById(req.params.id).value(); // Remove dependents documents
+
+      const removable = db._.getRemovable(db.getState(), opts);
+
+      removable.forEach(item => {
+        db.get(item.name).removeById(item.id).value();
+      });
+    }
 
     if (resource) {
       res.locals.data = {};
@@ -267,11 +294,8 @@ module.exports = function (db, name, opts) {
     next();
   }
 
-  var w = write(db);
-
+  const w = write(db);
   router.route('/').get(list).post(create, w);
-
   router.route('/:id').get(show).put(update, w).patch(update, w).delete(destroy, w);
-
   return router;
 };

package/lib/server/router/singular.js

@@ -1,12 +1,19 @@
-'use strict';
+"use strict";
 
-var express = require('express');
-var write = require('./write');
-var getFullURL = require('./get-full-url');
-var delay = require('./delay');
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
 
-module.exports = function (db, name) {
-  var router = express.Router();
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const express = require('express');
+
+const write = require('./write');
+
+const getFullURL = require('./get-full-url');
+
+const delay = require('./delay');
+
+module.exports = (db, name, opts) => {
+  const router = express.Router();
   router.use(delay);
 
   function show(req, res, next) {
@@ -15,30 +22,41 @@ module.exports = function (db, name) {
   }
 
   function create(req, res, next) {
-    db.set(name, req.body).value();
-    res.locals.data = db.get(name).value();
+    if (opts._isFake) {
+      res.locals.data = req.body;
+    } else {
+      db.set(name, req.body).value();
+      res.locals.data = db.get(name).value();
+    }
 
     res.setHeader('Access-Control-Expose-Headers', 'Location');
     res.location(`${getFullURL(req)}`);
-
     res.status(201);
     next();
   }
 
   function update(req, res, next) {
-    if (req.method === 'PUT') {
-      db.set(name, req.body).value();
+    if (opts._isFake) {
+      if (req.method === 'PUT') {
+        res.locals.data = req.body;
+      } else {
+        const resource = db.get(name).value();
+        res.locals.data = _objectSpread({}, resource, req.body);
+      }
     } else {
-      db.get(name).assign(req.body).value();
+      if (req.method === 'PUT') {
+        db.set(name, req.body).value();
+      } else {
+        db.get(name).assign(req.body).value();
+      }
+
+      res.locals.data = db.get(name).value();
     }
 
-    res.locals.data = db.get(name).value();
     next();
   }
 
-  var w = write(db);
-
+  const w = write(db);
   router.route('/').get(show).post(create, w).put(update, w).patch(update, w);
-
   return router;
 };

package/lib/server/router/validate-data.js

@@ -1,15 +1,15 @@
-'use strict';
+"use strict";
 
-var _ = require('lodash');
+const _ = require('lodash');
 
 function validateKey(key) {
   if (key.indexOf('/') !== -1) {
-    var msg = [`Oops, found / character in database property '${key}'.`, '', "/ aren't supported, if you want to tweak default routes, see", 'https://github.com/typicode/json-server/#add-custom-routes'].join('\n');
+    const msg = [`Oops, found / character in database property '${key}'.`, '', "/ aren't supported, if you want to tweak default routes, see", 'https://github.com/typicode/json-server/#add-custom-routes'].join('\n');
     throw new Error(msg);
   }
 }
 
-module.exports = function (obj) {
+module.exports = obj => {
   if (_.isPlainObject(obj)) {
     Object.keys(obj).forEach(validateKey);
   } else {

package/lib/server/router/write.js

@@ -1,7 +1,7 @@
 "use strict";
 
 module.exports = function write(db) {
-  return function (req, res, next) {
+  return (req, res, next) => {
     db.write();
     next();
   };

package/lib/server/utils.js

@@ -8,8 +8,8 @@ function getPage(array, page, perPage) {
   var obj = {};
   var start = (page - 1) * perPage;
   var end = page * perPage;
-
   obj.items = array.slice(start, end);
+
   if (obj.items.length === 0) {
     return obj;
   }

package/package.json

@@ -1,74 +1,94 @@
 {
   "name": "json-server",
-  "version": "0.12.2",
+  "version": "0.14.2",
   "description": "Serves JSON files through REST routes.",
   "main": "./lib/server/index.js",
-  "bin": "./bin/index.js",
+  "bin": "./lib/cli/bin.js",
   "directories": {
     "test": "test"
   },
+  "scripts": {
+    "test": "npm run build && cross-env NODE_ENV=test jest && npm run lint",
+    "start": "run-p start:**",
+    "start:babel-node": "babel-node src/cli/bin db.json -r routes.json",
+    "start:webpack": "webpack -d --watch",
+    "lint": "eslint . --ignore-path .gitignore",
+    "fix": "npm run lint -- --fix",
+    "build": "babel src -d lib && webpack -p",
+    "toc": "markdown-toc -i README.md",
+    "prepublishOnly": "npm test && npm run build && pkg-ok"
+  },
   "dependencies": {
-    "body-parser": "^1.18.2",
-    "chalk": "^2.3.0",
-    "compression": "^1.7.1",
-    "connect-pause": "^0.1.0",
-    "cors": "^2.8.4",
+    "body-parser": "^1.18.3",
+    "chalk": "^2.4.1",
+    "compression": "^1.7.3",
+    "connect-pause": "^0.1.1",
+    "cors": "^2.8.5",
     "errorhandler": "^1.2.0",
-    "express": "^4.16.2",
+    "express": "^4.16.4",
     "express-urlrewrite": "^1.2.0",
     "json-parse-helpfulerror": "^1.0.3",
-    "lodash": "^4.11.2",
+    "lodash": "^4.17.11",
     "lodash-id": "^0.14.0",
-    "lowdb": "^0.15.0",
-    "method-override": "^2.3.10",
-    "morgan": "^1.9.0",
-    "nanoid": "^1.0.1",
+    "lowdb": "^1.0.0",
+    "method-override": "^3.0.0",
+    "morgan": "^1.9.1",
+    "nanoid": "^2.0.0",
     "object-assign": "^4.0.1",
-    "please-upgrade-node": "^3.0.2",
+    "please-upgrade-node": "^3.1.1",
     "pluralize": "^7.0.0",
-    "request": "^2.83.0",
+    "request": "^2.88.0",
     "server-destroy": "^1.0.1",
-    "update-notifier": "^2.3.0",
-    "yargs": "^10.0.3"
+    "update-notifier": "^2.5.0",
+    "yargs": "^12.0.2"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-register": "^6.26.0",
-    "crlf": "^1.1.1",
-    "cross-env": "^5.1.1",
-    "eslint": "^4.10.0",
-    "eslint-config-prettier": "^2.7.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-node": "^5.2.1",
-    "eslint-plugin-prettier": "^2.3.1",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "husky": "^0.14.3",
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.2.2",
+    "@babel/node": "^7.2.2",
+    "@babel/plugin-syntax-jsx": "^7.2.0",
+    "@babel/plugin-transform-react-jsx": "^7.2.0",
+    "@babel/plugin-transform-regenerator": "^7.0.0",
+    "@babel/polyfill": "^7.2.5",
+    "@babel/preset-env": "^7.2.3",
+    "@babel/register": "^7.0.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-loader": "^8.0.4",
+    "babel-preset-preact": "^1.1.0",
+    "babel-preset-react": "^6.24.1",
+    "clean-webpack-plugin": "^0.1.19",
+    "cross-env": "^5.2.0",
+    "css-loader": "^1.0.1",
+    "eslint": "^5.11.0",
+    "eslint-config-prettier": "^3.3.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-config-standard-preact": "^1.1.6",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-prettier": "^3.0.0",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-react": "^7.10.0",
+    "eslint-plugin-standard": "^4.0.0",
+    "html-webpack-plugin": "^3.2.0",
+    "husky": "^1.2.1",
+    "jest": "^23.6.0",
     "markdown-toc": "^1.2.0",
+    "milligram": "^1.3.0",
+    "mini-css-extract-plugin": "^0.4.5",
     "mkdirp": "^0.5.1",
-    "mocha": "^4.0.1",
-    "os-tmpdir": "^1.0.1",
-    "pkg-ok": "^1.0.1",
-    "prettier": "^1.7.4",
+    "npm-run-all": "^4.1.5",
+    "os-tmpdir": "^2.0.0",
+    "pkg-ok": "^2.3.1",
+    "preact": "^8.4.2",
+    "prettier": "^1.15.3",
+    "promise-polyfill": "^8.1.0",
     "rimraf": "^2.6.2",
     "server-ready": "^0.3.1",
-    "standard": "^10.0.3",
-    "supertest": "^3.0.0",
-    "temp-write": "^3.3.0"
-  },
-  "scripts": {
-    "test": "npm run test:cli && npm run test:server && eslint .",
-    "test:cli": "npm run build && cross-env NODE_ENV=test mocha test/cli/*.js",
-    "test:server": "cross-env NODE_ENV=test mocha test/server/*.js",
-    "start": "babel-node src/cli/bin",
-    "fix": "eslint . --fix",
-    "build": "babel src -d lib --copy-files",
-    "toc": "markdown-toc -i README.md",
-    "lf": "crlf --set=LF ./bin/index.js",
-    "prepublishOnly": "npm run build && npm run lf && pkg-ok",
-    "precommit": "npm test"
+    "supertest": "^3.3.0",
+    "temp-write": "^3.4.0",
+    "webpack": "^4.28.2",
+    "webpack-cli": "^3.1.2",
+    "whatwg-fetch": "^3.0.0"
   },
   "repository": {
     "type": "git",
@@ -97,6 +117,14 @@
   },
   "homepage": "https://github.com/typicode/json-server",
   "engines": {
-    "node": ">=4"
+    "node": ">=6"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm test"
+    }
+  },
+  "jest": {
+    "testURL": "http://localhost/"
   }
 }