json-server 0.14.2 → 0.16.1

package/.babelrc

@@ -4,7 +4,7 @@
       "@babel/preset-env",
       {
         "targets": {
-          "node": "6"
+          "node": "8"
         }
       }
     ]

package/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['standard', 'standard-preact', 'prettier'],
+  extends: ['standard', 'prettier'],
   plugins: ['prettier'],
   rules: {
     'prettier/prettier': [

package/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: typicode
+patreon: typicode

package/.github/workflows/main.yaml

@@ -0,0 +1,31 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest]
+        node: [ '10', '12' ]
+    name: Node ${{ matrix.node }} (${{ matrix.platform }})
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - name: install dependencies
+        run: npm i
+      - name: run tests
+        run: npm test
+  test_latest:
+    runs-on: ubuntu-latest
+    container: node:latest
+    name: Node latest (ubuntu-latest)
+    steps:
+      - uses: actions/checkout@v1
+      - name: install dependencies
+        run: npm i
+      - name: run tests
+        run: npm test

package/.travis.yml

@@ -1,4 +1,6 @@
 language: node_js
 node_js:
   - "node"
-  - "6"
+  - "12"
+  - "10"
+install: npm i

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+Changes for 0.15.1+ can now be found in https://github.com/typicode/json-server/releases
+
+## 0.15.0 - 2019-05-21
+
+* __Breaking__ Require Node 8
+* Upgrade dependencies
+* Reduce package size
+
 ## 0.14.2 - 2018-12-26
 
 * Fix `db.getState is not a function`

package/README.md

@@ -5,26 +5,45 @@ Get a full fake REST API with __zero coding__ in __less than 30 seconds__ (serio
 Created with <3 for front-end developers who need a quick back-end for prototyping and mocking.
 
 * [Egghead.io free video tutorial - Creating demo APIs with json-server](https://egghead.io/lessons/nodejs-creating-demo-apis-with-json-server)
-* [JSONPlaceholder - Live running version](http://jsonplaceholder.typicode.com)
+* [JSONPlaceholder - Live running version](https://jsonplaceholder.typicode.com)
+* [__My JSON Server__ - no installation required, use your own data](https://my-json-server.typicode.com)
 
 See also:
 * :dog: [husky - Git hooks made easy](https://github.com/typicode/husky)
 * :hotel: [hotel - developer tool with local .localhost domain and https out of the box](https://github.com/typicode/hotel)
-* ⚛️ 🔧 [react-lodash - lodash as React components](https://github.com/typicode/react-lodash)
 
-<a href="https://www.patreon.com/typicode">
-  <img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
-</a>
+<p>&nbsp;</p>
 
-## Sponsors
+<h2 align="center">Gold sponsors 🥇</h2>
 
-__[[Become a sponsor and have your company logo here]](https://patreon.com/typicode)__
+<p>&nbsp;</p>
+
+<p align="center">
+  <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=typicode" target="_blank">
+    <img src="https://i.imgur.com/IBItATn.png" height="70px">
+  </a>
+</p>
+
+<p>&nbsp;</p>
+
+<h2 align="center">Bronze sponsors 🥉</h2>
+
+<p>&nbsp;</p>
+
+<p align="center">
+  <a href="https://www.zinggrid.com/hello/json-server?utm_source=jsonserver&utm_medium=github&utm_campaign=sponsorship" target="_blank">
+    <img src="https://i.imgur.com/3mJGTAQ.png" height="30px">
+  </a>
+</p>
+
+<p>&nbsp;</p>
+
+[Become a sponsor and have your company logo here](https://github.com/users/typicode/sponsorship)
 
 ## Table of contents
 
 <!-- toc -->
 
-- [Sponsorship](#sponsorship)
 - [Getting started](#getting-started)
 - [Routes](#routes)
   * [Plural routes](#plural-routes)
@@ -574,7 +593,7 @@ You can deploy JSON Server. For example, [JSONPlaceholder](http://jsonplaceholde
 * [Node Module Of The Week - json-server](http://nmotw.in/json-server/)
 * [Mock up your REST API with JSON Server](http://www.betterpixels.co.uk/projects/2015/05/09/mock-up-your-rest-api-with-json-server/)
 * [ng-admin: Add an AngularJS admin GUI to any RESTful API](http://marmelab.com/blog/2014/09/15/easy-backend-for-your-restful-api.html)
-* [Fast prototyping using Restangular and Json-server](http://glebbahmutov.com/blog/fast-prototyping-using-restangular-and-json-server/)
+* [Fast prototyping using Restangular and Json-server](https://glebbahmutov.com/blog/fast-prototyping-restangular-and-json-server/)
 * [Create a Mock REST API in Seconds for Prototyping your Frontend](https://coligo.io/create-mock-rest-api-with-json-server/)
 * [No API? No Problem! Rapid Development via Mock APIs](https://medium.com/@housecor/rapid-development-via-mock-apis-e559087be066#.93d7w8oro)
 * [Zero Code REST With json-server](https://dzone.com/articles/zero-code-rest-with-json-server)
@@ -591,4 +610,4 @@ You can deploy JSON Server. For example, [JSONPlaceholder](http://jsonplaceholde
 
 MIT
 
-[Patreon](https://www.patreon.com/typicode) - [Supporters](https://thanks.typicode.com) ✨
+[Supporters](https://thanks.typicode.com) ✨

package/appveyor.yml

@@ -1,6 +1,6 @@
 # Test against this version of Node.js
 environment:
-  nodejs_version: "7"
+  nodejs_version: "8"
 
 # Install scripts. (runs after repo cloning)
 install:

package/lib/cli/run.js

@@ -25,7 +25,7 @@ function prettyPrint(argv, object, rules) {
   console.log();
   console.log(chalk.bold('  Resources'));
 
-  for (let prop in object) {
+  for (const prop in object) {
     console.log(`  ${root}/${prop}`);
   }
 
@@ -46,8 +46,10 @@ function prettyPrint(argv, object, rules) {
 
 function createApp(db, routes, middlewares, argv) {
   const app = jsonServer.create();
-  const foreignKeySuffix = argv.foreignKeySuffix;
-  let router = jsonServer.router(db, foreignKeySuffix ? {
+  const {
+    foreignKeySuffix
+  } = argv;
+  const router = jsonServer.router(db, foreignKeySuffix ? {
     foreignKeySuffix
   } : undefined);
   const defaultsOpts = {

package/lib/front/index.js

@@ -1,67 +1,71 @@
 "use strict";
 
-require("promise-polyfill/src/polyfill");
-
-require("whatwg-fetch");
-
-var _preact = require("preact");
-
-require("milligram/dist/milligram.css");
-
-require("./style.css");
-
-function ResourceItem(_ref) {
-  var name = _ref.name,
-      length = _ref.length;
-  return (0, _preact.h)("li", null, (0, _preact.h)("a", {
-    href: name
-  }, "/", name), " ", (0, _preact.h)("sup", null, length ? "".concat(length, "x") : 'object'));
+function ResourceItem({
+  name,
+  length
+}) {
+  return `
+    <li>
+      <a href="${name}">/${name}</a>
+      <sup>${length ? `${length}x` : 'object'}</sup>
+    </li>
+  `;
 }
 
-function ResourceList(_ref2) {
-  var db = _ref2.db;
-  return (0, _preact.h)("ul", null, Object.keys(db).map(function (name) {
-    return (0, _preact.h)(ResourceItem, {
-      name: name,
-      length: Array.isArray(db[name]) && db[name].length
-    });
-  }));
+function ResourceList({
+  db
+}) {
+  return `
+    <ul>
+      ${Object.keys(db).map(name => ResourceItem({
+    name,
+    length: Array.isArray(db[name]) && db[name].length
+  })).join('')}
+    </ul>
+  `;
 }
 
 function NoResources() {
-  return (0, _preact.h)("p", null, "No resources found");
+  return `<p>No resources found</p>`;
 }
 
-function ResourcesBlock(_ref3) {
-  var db = _ref3.db;
-  return (0, _preact.h)("div", null, (0, _preact.h)("h4", null, "Resources"), Object.keys(db).length ? (0, _preact.h)(ResourceList, {
-    db: db
-  }) : (0, _preact.h)(NoResources, null));
+function ResourcesBlock({
+  db
+}) {
+  return `
+    <div>
+      <h1>Resources</h1>
+      ${Object.keys(db).length ? ResourceList({
+    db
+  }) : NoResources()}
+    </div>
+  `;
 }
 
-window.fetch('db').then(function (response) {
-  return response.json();
-}).then(function (db) {
-  return (0, _preact.render)((0, _preact.h)(ResourcesBlock, {
-    db: db
-  }), document.getElementById('resources'));
-});
+window.fetch('db').then(response => response.json()).then(db => document.getElementById('resources').innerHTML = ResourcesBlock({
+  db
+}));
 
-function CustomRoutesBlock(_ref4) {
-  var customRoutes = _ref4.customRoutes;
-  var rules = Object.keys(customRoutes);
+function CustomRoutesBlock({
+  customRoutes
+}) {
+  const rules = Object.keys(customRoutes);
 
   if (rules.length) {
-    return (0, _preact.h)("div", null, (0, _preact.h)("h4", null, "Custom Routes"), (0, _preact.h)("table", null, rules.map(function (rule) {
-      return (0, _preact.h)("tr", null, (0, _preact.h)("td", null, rule), (0, _preact.h)("td", null, "\u21E2 ", customRoutes[rule]));
-    })));
+    return `
+      <div>
+        <h1>Custom Routes</h1>
+        <table>
+          ${rules.map(rule => `<tr>
+              <td>${rule}</td>
+              <td><code>⇢</code> ${customRoutes[rule]}</td>
+            </tr>`).join('')}
+        </table>
+      </div>
+    `;
   }
 }
 
-window.fetch('__rules').then(function (response) {
-  return response.json();
-}).then(function (customRoutes) {
-  (0, _preact.render)((0, _preact.h)(CustomRoutesBlock, {
-    customRoutes: customRoutes
-  }), document.getElementById('custom-routes'));
-});
+window.fetch('__rules').then(response => response.json()).then(customRoutes => document.getElementById('custom-routes').innerHTML = CustomRoutesBlock({
+  customRoutes
+}));

package/lib/front/script.js

@@ -0,0 +1,71 @@
+"use strict";
+
+function ResourceItem({
+  name,
+  length
+}) {
+  return `
+    <li>
+      <a href="${name}">/${name}</a>
+      <sup>${length ? `${length}x` : 'object'}</sup>
+    </li>
+  `;
+}
+
+function ResourceList({
+  db
+}) {
+  return `
+    <ul>
+      ${Object.keys(db).map(name => ResourceItem({
+    name,
+    length: Array.isArray(db[name]) && db[name].length
+  })).join('')}
+    </ul>
+  `;
+}
+
+function NoResources() {
+  return `<p>No resources found</p>`;
+}
+
+function ResourcesBlock({
+  db
+}) {
+  return `
+    <div>
+      <h1>Resources</h1>
+      ${Object.keys(db).length ? ResourceList({
+    db
+  }) : NoResources()}
+    </div>
+  `;
+}
+
+window.fetch('db').then(response => response.json()).then(db => document.getElementById('resources').innerHTML = ResourcesBlock({
+  db
+}));
+
+function CustomRoutesBlock({
+  customRoutes
+}) {
+  const rules = Object.keys(customRoutes);
+
+  if (rules.length) {
+    return `
+      <div>
+        <h1>Custom Routes</h1>
+        <table>
+          ${rules.map(rule => `<tr>
+              <td>${rule}</td>
+              <td><code>⇢</code> ${customRoutes[rule]}</td>
+            </tr>`).join('')}
+        </table>
+      </div>
+    `;
+  }
+}
+
+window.fetch('__rules').then(response => response.json()).then(customRoutes => document.getElementById('custom-routes').innerHTML = CustomRoutesBlock({
+  customRoutes
+}));

package/lib/server/defaults.js

@@ -14,15 +14,13 @@ const compression = require('compression');
 
 const errorhandler = require('errorhandler');
 
-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 defaultDir = path.join(__dirname, '../../public');
   const staticDir = fs.existsSync(userDir) ? userDir : defaultDir;
-  opts = objectAssign({
+  opts = Object.assign({
     logger: true,
     static: staticDir
   }, opts);

package/lib/server/mixins.js

@@ -7,10 +7,9 @@ const pluralize = require('pluralize');
 module.exports = {
   getRemovable,
   createId,
-  deepQuery // Returns document ids that have unsatisfied relations
-  // Example: a comment that references a post that doesn't exist
-
-};
+  deepQuery
+}; // Returns document ids that have unsatisfied relations
+// Example: a comment that references a post that doesn't exist
 
 function getRemovable(db, opts) {
   const _ = this;
@@ -72,7 +71,7 @@ function deepQuery(value, q) {
         }
       }
     } else if (_.isObject(value) && !_.isArray(value)) {
-      for (let k in value) {
+      for (const k in value) {
         if (_.deepQuery(value[k], q)) {
           return true;
         }

package/lib/server/router/index.js

@@ -26,10 +26,12 @@ const singular = require('./singular');
 
 const mixins = require('../mixins');
 
-module.exports = (db, opts = {
-  foreignKeySuffix: 'Id',
-  _isFake: false
-}) => {
+module.exports = (db, opts) => {
+  opts = Object.assign({
+    foreignKeySuffix: 'Id',
+    _isFake: false
+  }, opts);
+
   if (typeof db === 'string') {
     db = low(new FileSync(db));
   } else if (!_.has(db, '__chain__') || !_.has(db, '__wrapped__')) {

package/lib/server/router/plural.js

@@ -1,6 +1,8 @@
 "use strict";
 
-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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 
@@ -61,11 +63,11 @@ module.exports = (db, name, opts) => {
     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;
+    const _sort = req.query._sort;
+    const _order = req.query._order;
     let _limit = req.query._limit;
-    let _embed = req.query._embed;
-    let _expand = req.query._expand;
+    const _embed = req.query._embed;
+    const _expand = req.query._expand;
     delete req.query.q;
     delete req.query._start;
     delete req.query._end;
@@ -79,7 +81,7 @@ module.exports = (db, name, opts) => {
     Object.keys(req.query).forEach(query => {
       const arr = db.get(name).value();
 
-      for (let i in arr) {
+      for (const i in arr) {
         if (_.has(arr[i], query) || query === 'callback' || query === '_' || /_lte$/.test(query) || /_gte$/.test(query) || /_ne$/.test(query) || /_like$/.test(query)) return;
       }
 
@@ -94,7 +96,7 @@ module.exports = (db, name, opts) => {
 
       q = q.toLowerCase();
       chain = chain.filter(obj => {
-        for (let key in obj) {
+        for (const key in obj) {
           const value = obj[key];
 
           if (db._.deepQuery(value, q)) {
@@ -110,14 +112,14 @@ module.exports = (db, name, opts) => {
       if (key !== 'callback' && key !== '_') {
         // Always use an array, in case req.query is an array
         const arr = [].concat(req.query[key]);
+        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)$/, '');
         chain = chain.filter(element => {
           return arr.map(function (value) {
-            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
+            // get item value based on path
             // i.e post.title -> 'foo'
-
             const elementValue = _.get(element, path); // Prevent toString() failing on undefined or null values
 
 
@@ -135,7 +137,7 @@ module.exports = (db, name, opts) => {
             } else {
               return value === elementValue.toString();
             }
-          }).reduce((a, b) => a || b);
+          }).reduce((a, b) => isDifferent ? a && b : a || b);
         });
       }
     }); // Sort
@@ -252,7 +254,7 @@ module.exports = (db, name, opts) => {
       resource = db.get(name).getById(id).value();
 
       if (req.method === 'PATCH') {
-        resource = _objectSpread({}, resource, req.body);
+        resource = _objectSpread({}, resource, {}, req.body);
       } else {
         resource = _objectSpread({}, req.body, {
           id: resource.id

package/lib/server/router/singular.js

@@ -1,6 +1,8 @@
 "use strict";
 
-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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 
@@ -41,7 +43,7 @@ module.exports = (db, name, opts) => {
         res.locals.data = req.body;
       } else {
         const resource = db.get(name).value();
-        res.locals.data = _objectSpread({}, resource, req.body);
+        res.locals.data = _objectSpread({}, resource, {}, req.body);
       }
     } else {
       if (req.method === 'PUT') {