From 92532128da5ef7fd0bb936d84e5209db2fee8b14 Mon Sep 17 00:00:00 2001 From: typicode Date: Mon, 20 Feb 2017 23:57:30 +0100 Subject: [PATCH] Use lodash-id --- package.json | 2 +- src/server/mixins.js | 2 +- src/server/router/index.js | 6 +++--- test/server/mixins.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index fe1bd45..41d5bd5 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "express": "^4.9.5", "json-parse-helpfulerror": "^1.0.3", "lodash": "^4.11.2", + "lodash-id": "^0.13.0", "lowdb": "^0.15.0", "method-override": "^2.1.2", "morgan": "^1.3.1", @@ -25,7 +26,6 @@ "request": "^2.72.0", "server-destroy": "^1.0.1", "shortid": "^2.2.6", - "underscore-db": "^0.12.2", "update-notifier": "^1.0.2", "yargs": "^6.0.0" }, diff --git a/src/server/mixins.js b/src/server/mixins.js index 1f980df..7079efb 100644 --- a/src/server/mixins.js +++ b/src/server/mixins.js @@ -34,7 +34,7 @@ function getRemovable (db) { } // Return incremented id or uuid -// Used to override underscore-db's createId with utils.createId +// Used to override lodash-id's createId with utils.createId function createId (coll) { const _ = this const idProperty = _.__id() diff --git a/src/server/router/index.js b/src/server/router/index.js index 1a3dd95..272cd1f 100644 --- a/src/server/router/index.js +++ b/src/server/router/index.js @@ -1,7 +1,7 @@ const express = require('express') const methodOverride = require('method-override') const _ = require('lodash') -const _db = require('underscore-db') +const lodashId = require('lodash-id') const low = require('lowdb') const fileAsync = require('lowdb/lib/storages/file-async') const bodyParser = require('../body-parser') @@ -30,8 +30,8 @@ module.exports = (source) => { validateData(db.getState()) - // Add underscore-db methods to db - db._.mixin(_db) + // Add lodash-id methods to db + db._.mixin(lodashId) // Add specific mixins db._.mixin(mixins) diff --git a/test/server/mixins.js b/test/server/mixins.js index 8707fd0..639a27a 100644 --- a/test/server/mixins.js +++ b/test/server/mixins.js @@ -1,13 +1,13 @@ const assert = require('assert') const _ = require('lodash') -const _db = require('underscore-db') +const lodashId = require('lodash-id') const mixins = require('../../src/server/mixins') describe('mixins', () => { let db before(() => { - _.mixin(_db) + _.mixin(lodashId) _.mixin(mixins) })