opensource/json-server
1
0
Fork 0
mirror of https://github.com/typicode/json-server.git synced 2025-07-28 20:52:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from syzer/master

Browse Source 
FIXED #135 generate.js with watch
This commit is contained in:
typicode
2015-07-01 00:20:47 +02:00
parent ab479fa58a 34434329fe
commit b7f7129985
2 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,3 +2,5 @@
node_modules node_modules
db.json db.json
.DS_Store .DS_Store
.idea
generate.js

16
bin/index.js
View File

@ -8,6 +8,7 @@ var chalk = require('chalk')
var got = require('got') var got = require('got')
var pkg = require('../package.json') var pkg = require('../package.json')
var jsonServer = require('../src') var jsonServer = require('../src')
var jsMockGenerator = null
updateNotifier({packageName: pkg.name, packageVersion: pkg.version}).notify() updateNotifier({packageName: pkg.name, packageVersion: pkg.version}).notify()
@ -84,7 +85,7 @@ function start (object, filename) {
var router = jsonServer.router(filename ? filename : object) var router = jsonServer.router(filename ? filename : object)
// Watcher // Watcher
if (filename && argv.watch) { if (argv.watch) {
console.log('Watching', chalk.cyan(source)) console.log('Watching', chalk.cyan(source))
var db = router.db var db = router.db
@ -94,12 +95,16 @@ function start (object, filename) {
fs.watch(watchedDir, function (event, changedFile) { fs.watch(watchedDir, function (event, changedFile) {
// lowdb generates 'rename' event on watchedFile // lowdb generates 'rename' event on watchedFile
// using it to know if file has been modified by the user // using it to know if file has been modified by the user
if (event === 'change' && changedFile === watchedFile) { if ((event === 'change' || event === 'rename') && (changedFile === watchedFile || changedFile === source)) {
console.log(chalk.cyan(source), 'has changed, reloading database') console.log(chalk.cyan(source), 'has changed, reloading database')
try { try {
var watchedFileObject = JSON.parse(fs.readFileSync(filename)) if (filename) {
db.object = watchedFileObject db.object = JSON.parse(fs.readFileSync(filename))
} else {
require.cache[jsMockGenerator] = null
db.object = require(jsMockGenerator)()
}
showResources(hostname, port, db.object) showResources(hostname, port, db.object)
} catch (e) { } catch (e) {
console.log('Can\'t parse', chalk.cyan(source)) console.log('Can\'t parse', chalk.cyan(source))
@ -154,6 +159,7 @@ if (/^(http|https):/.test(source)) {
start(object, filename) start(object, filename)
// JS file // JS file
} else if (/\.js$/.test(source)) { } else if (/\.js$/.test(source)) {
var object = require(process.cwd() + '/' + source)() jsMockGenerator = process.cwd() + '/' + source
var object = require(jsMockGenerator)()
start(object) start(object)
} }