json-server 0.16.2 → 0.16.3

package/README.md

@@ -24,15 +24,9 @@ See also:
   </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 href="https://mockend.com/" target="_blank">
+    <img src="https://i.imgur.com/Gwaqv3q.png" height="70px">
   </a>
 </p>
 

package/lib/cli/run.js

@@ -33,7 +33,7 @@ function prettyPrint(argv, object, rules) {
     console.log();
     console.log(chalk.bold('  Other routes'));
 
-    for (var rule in rules) {
+    for (const rule in rules) {
       console.log(`  ${rule} -> ${rules[rule]}`);
     }
   }

package/lib/server/mixins.js

@@ -1,6 +1,8 @@
 "use strict";
 
-const nanoid = require('nanoid');
+const {
+  nanoid
+} = require('nanoid');
 
 const pluralize = require('pluralize');
 

package/lib/server/router/index.js

@@ -75,7 +75,7 @@ module.exports = (db, opts) => {
       return;
     }
 
-    var sourceMessage = ''; // if (!_.isObject(source)) {
+    const sourceMessage = ''; // if (!_.isObject(source)) {
     //   sourceMessage = `in ${source}`
     // }
 

package/lib/server/router/plural.js

@@ -103,6 +103,8 @@ module.exports = (db, name, opts) => {
             return true;
           }
         }
+
+        return false;
       });
     }
 
@@ -124,7 +126,7 @@ module.exports = (db, name, opts) => {
 
 
             if (elementValue === undefined || elementValue === null) {
-              return;
+              return undefined;
             }
 
             if (isRange) {
@@ -230,7 +232,7 @@ module.exports = (db, name, opts) => {
 
     if (opts._isFake) {
       const id = db.get(name).createId().value();
-      resource = _objectSpread({}, req.body, {
+      resource = _objectSpread(_objectSpread({}, req.body), {}, {
         id
       });
     } else {
@@ -254,9 +256,9 @@ module.exports = (db, name, opts) => {
       resource = db.get(name).getById(id).value();
 
       if (req.method === 'PATCH') {
-        resource = _objectSpread({}, resource, {}, req.body);
+        resource = _objectSpread(_objectSpread({}, resource), req.body);
       } else {
-        resource = _objectSpread({}, req.body, {
+        resource = _objectSpread(_objectSpread({}, req.body), {}, {
           id: resource.id
         });
       }

package/lib/server/router/singular.js

@@ -43,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(_objectSpread({}, resource), req.body);
       }
     } else {
       if (req.method === 'PUT') {

package/lib/server/utils.js

@@ -5,9 +5,9 @@ module.exports = {
 };
 
 function getPage(array, page, perPage) {
-  var obj = {};
-  var start = (page - 1) * perPage;
-  var end = page * perPage;
+  const obj = {};
+  const start = (page - 1) * perPage;
+  const end = page * perPage;
   obj.items = array.slice(start, end);
 
   if (obj.items.length === 0) {

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "json-server",
-  "version": "0.16.2",
+  "version": "0.16.3",
   "description": "Get a full fake REST API with zero coding in less than 30 seconds",
   "main": "./lib/server/index.js",
   "bin": "./lib/cli/bin.js",
+  "files": [
+    "lib",
+    "public"
+  ],
   "scripts": {
+    "_postinstall": "husky install",
     "test": "npm run build && cross-env NODE_ENV=test jest && npm run lint",
     "start": "babel-node -- src/cli/bin db.json -r routes.json",
     "lint": "eslint . --ignore-path .gitignore",
@@ -12,55 +17,57 @@
     "build": "babel src -d lib",
     "toc": "markdown-toc -i README.md",
     "postversion": "git push && git push --tags",
-    "prepublishOnly": "npm test && npm run build && pkg-ok"
+    "prepublish": "npm test && npm run build && pkg-ok && pinst --disable",
+    "postpublish": "pinst --enable"
   },
   "dependencies": {
     "body-parser": "^1.19.0",
-    "chalk": "^3.0.0",
+    "chalk": "^4.1.0",
     "compression": "^1.7.4",
     "connect-pause": "^0.1.1",
     "cors": "^2.8.5",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
-    "express-urlrewrite": "^1.2.0",
+    "express-urlrewrite": "^1.3.0",
     "json-parse-helpfulerror": "^1.0.3",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "lodash-id": "^0.14.0",
     "lowdb": "^1.0.0",
     "method-override": "^3.0.0",
-    "morgan": "^1.9.1",
-    "nanoid": "^2.1.11",
+    "morgan": "^1.10.0",
+    "nanoid": "^3.1.16",
     "please-upgrade-node": "^3.2.0",
     "pluralize": "^8.0.0",
     "server-destroy": "^1.0.1",
-    "update-notifier": "^4.0.0",
-    "yargs": "^15.1.0"
+    "update-notifier": "^5.0.1",
+    "yargs": "^16.1.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.4",
-    "@babel/node": "^7.8.4",
-    "@babel/preset-env": "^7.8.4",
-    "cross-env": "^7.0.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-config-standard": "^14.1.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "@babel/cli": "^7.12.1",
+    "@babel/core": "^7.12.3",
+    "@babel/node": "^7.12.6",
+    "@babel/preset-env": "^7.12.1",
+    "cross-env": "^7.0.2",
+    "eslint": "^7.13.0",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-config-standard": "^16.0.1",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "husky": "^4.2.1",
-    "jest": "^25.1.0",
+    "eslint-plugin-standard": "^4.1.0",
+    "husky": "^5.0.0-beta.0",
+    "jest": "^26.6.3",
     "markdown-toc": "^1.2.0",
-    "mkdirp": "^1.0.3",
+    "mkdirp": "^1.0.4",
     "npm-run-all": "^4.1.5",
     "os-tmpdir": "^2.0.0",
+    "pinst": "^2.1.1",
     "pkg-ok": "^2.3.1",
-    "prettier": "^1.19.1",
+    "prettier": "^2.1.2",
     "rimraf": "^3.0.2",
     "server-ready": "^0.3.1",
-    "supertest": "^4.0.2",
+    "supertest": "^6.0.1",
     "temp-write": "^4.0.0"
   },
   "repository": {
@@ -92,11 +99,6 @@
   "engines": {
     "node": ">=10"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm test"
-    }
-  },
   "jest": {
     "testURL": "http://localhost/"
   }

package/public/script.js

@@ -11,10 +11,10 @@ function ResourceList({ db }) {
   return `
     <ul>
       ${Object.keys(db)
-        .map(name =>
+        .map((name) =>
           ResourceItem({
             name,
-            length: Array.isArray(db[name]) && db[name].length
+            length: Array.isArray(db[name]) && db[name].length,
           })
         )
         .join('')}
@@ -37,9 +37,9 @@ function ResourcesBlock({ db }) {
 
 window
   .fetch('db')
-  .then(response => response.json())
+  .then((response) => response.json())
   .then(
-    db =>
+    (db) =>
       (document.getElementById('resources').innerHTML = ResourcesBlock({ db }))
   )
 
@@ -52,7 +52,7 @@ function CustomRoutesBlock({ customRoutes }) {
         <table>
           ${rules
             .map(
-              rule =>
+              (rule) =>
                 `<tr>
               <td>${rule}</td>
               <td><code>⇢</code> ${customRoutes[rule]}</td>
@@ -67,10 +67,10 @@ function CustomRoutesBlock({ customRoutes }) {
 
 window
   .fetch('__rules')
-  .then(response => response.json())
+  .then((response) => response.json())
   .then(
-    customRoutes =>
+    (customRoutes) =>
       (document.getElementById('custom-routes').innerHTML = CustomRoutesBlock({
-        customRoutes
+        customRoutes,
       }))
   )

package/.babelrc

@@ -1,12 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": "8"
-        }
-      }
-    ]
-  ]
-}

package/.eslintignore

@@ -1,2 +0,0 @@
-src/server/public
-lib

package/.eslintrc.js

@@ -1,14 +0,0 @@
-module.exports = {
-  extends: ['standard', 'prettier'],
-  plugins: ['prettier'],
-  rules: {
-    'prettier/prettier': [
-      'error',
-      {
-        singleQuote: true,
-        semi: false,
-      },
-    ]
-  },
-  env: { jest: true }
-}

package/.github/FUNDING.yml

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

package/.github/workflows/main.yaml

@@ -1,31 +0,0 @@
-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,6 +0,0 @@
-language: node_js
-node_js:
-  - "node"
-  - "12"
-  - "10"
-install: npm i

package/appveyor.yml

@@ -1,21 +0,0 @@
-# Test against this version of Node.js
-environment:
-  nodejs_version: "8"
-
-# Install scripts. (runs after repo cloning)
-install:
-  # Get the latest stable version of Node.js
-  - ps: Install-Product node $env:nodejs_version
-  # install modules
-  - npm install
-
-# Post-install test scripts.
-test_script:
-  # Output useful info for debugging.
-  - node --version
-  - npm --version
-  # run tests
-  - npm test
-
-# Don't actually build.
-build: off

package/db.json

@@ -1,9 +0,0 @@
-{
-  "posts": [
-    { "id": 1, "title": "json-server", "author": "typicode" }
-  ],
-  "comments": [
-    { "id": 1, "body": "some comment", "postId": 1 }
-  ],
-  "profile": { "name": "typicode" }
-}

package/postinstall.js

@@ -1,10 +0,0 @@
-const chalk = require('chalk')
-
-console.log(
-  'Like JSON Server? You can support the project on',
-  chalk.bold('GitHub Sponsors')
-)
-console.log(
-  chalk.underline('https://github.com/users/typicode/sponsorship'),
-  chalk.red('❤')
-)

package/routes.json

@@ -1,5 +0,0 @@
-{
-  "/api/": "/",
-  "/blog/:resource/:id/show": "/:resource/:id",
-  "/blog/:category": "/posts?category=:category"
-}