@keyv/mongo 1.0.4 → 1.2.2

package/.nyc_output/5820d74a-2c5d-4545-b2e1-19b4fc0d16f0.json

@@ -0,0 +1 @@
+{}

package/.nyc_output/e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b.json

@@ -0,0 +1 @@
+{"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/src/index.js":{"path":"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/src/index.js","statementMap":{"0":{"start":{"line":3,"column":21},"end":{"line":3,"column":38}},"1":{"start":{"line":4,"column":16},"end":{"line":4,"column":34}},"2":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"3":{"start":{"line":9,"column":2},"end":{"line":9,"column":10}},"4":{"start":{"line":10,"column":2},"end":{"line":10,"column":26}},"5":{"start":{"line":11,"column":2},"end":{"line":11,"column":18}},"6":{"start":{"line":12,"column":2},"end":{"line":14,"column":3}},"7":{"start":{"line":13,"column":3},"end":{"line":13,"column":17}},"8":{"start":{"line":16,"column":2},"end":{"line":18,"column":3}},"9":{"start":{"line":17,"column":3},"end":{"line":17,"column":46}},"10":{"start":{"line":20,"column":2},"end":{"line":23,"column":19}},"11":{"start":{"line":24,"column":2},"end":{"line":24,"column":35}},"12":{"start":{"line":26,"column":21},"end":{"line":26,"column":61}},"13":{"start":{"line":27,"column":2},"end":{"line":30,"column":5}},"14":{"start":{"line":31,"column":2},"end":{"line":34,"column":5}},"15":{"start":{"line":35,"column":2},"end":{"line":38,"column":9}},"16":{"start":{"line":36,"column":3},"end":{"line":36,"column":62}},"17":{"start":{"line":37,"column":3},"end":{"line":37,"column":17}},"18":{"start":{"line":40,"column":2},"end":{"line":40,"column":58}},"19":{"start":{"line":40,"column":31},"end":{"line":40,"column":56}},"20":{"start":{"line":44,"column":2},"end":{"line":51,"column":6}},"21":{"start":{"line":46,"column":4},"end":{"line":48,"column":5}},"22":{"start":{"line":47,"column":5},"end":{"line":47,"column":22}},"23":{"start":{"line":50,"column":4},"end":{"line":50,"column":21}},"24":{"start":{"line":55,"column":20},"end":{"line":55,"column":81}},"25":{"start":{"line":56,"column":2},"end":{"line":56,"column":91}},"26":{"start":{"line":60,"column":2},"end":{"line":62,"column":3}},"27":{"start":{"line":61,"column":3},"end":{"line":61,"column":33}},"28":{"start":{"line":64,"column":2},"end":{"line":65,"column":33}},"29":{"start":{"line":65,"column":19},"end":{"line":65,"column":31}},"30":{"start":{"line":69,"column":2},"end":{"line":70,"column":26}},"31":{"start":{"line":70,"column":15},"end":{"line":70,"column":24}},"32":{"start":{"line":74,"column":0},"end":{"line":74,"column":27}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":8,"column":1},"end":{"line":8,"column":2}},"loc":{"start":{"line":8,"column":27},"end":{"line":41,"column":2}},"line":8},"1":{"name":"(anonymous_1)","decl":{"start":{"line":35,"column":54},"end":{"line":35,"column":55}},"loc":{"start":{"line":35,"column":74},"end":{"line":38,"column":3}},"line":35},"2":{"name":"(anonymous_2)","decl":{"start":{"line":40,"column":22},"end":{"line":40,"column":23}},"loc":{"start":{"line":40,"column":31},"end":{"line":40,"column":56}},"line":40},"3":{"name":"(anonymous_3)","decl":{"start":{"line":43,"column":1},"end":{"line":43,"column":2}},"loc":{"start":{"line":43,"column":10},"end":{"line":52,"column":2}},"line":43},"4":{"name":"(anonymous_4)","decl":{"start":{"line":45,"column":9},"end":{"line":45,"column":10}},"loc":{"start":{"line":45,"column":16},"end":{"line":51,"column":4}},"line":45},"5":{"name":"(anonymous_5)","decl":{"start":{"line":54,"column":1},"end":{"line":54,"column":2}},"loc":{"start":{"line":54,"column":22},"end":{"line":57,"column":2}},"line":54},"6":{"name":"(anonymous_6)","decl":{"start":{"line":59,"column":1},"end":{"line":59,"column":2}},"loc":{"start":{"line":59,"column":13},"end":{"line":66,"column":2}},"line":59},"7":{"name":"(anonymous_7)","decl":{"start":{"line":65,"column":9},"end":{"line":65,"column":10}},"loc":{"start":{"line":65,"column":19},"end":{"line":65,"column":31}},"line":65},"8":{"name":"(anonymous_8)","decl":{"start":{"line":68,"column":1},"end":{"line":68,"column":2}},"loc":{"start":{"line":68,"column":9},"end":{"line":71,"column":2}},"line":68},"9":{"name":"(anonymous_9)","decl":{"start":{"line":70,"column":9},"end":{"line":70,"column":10}},"loc":{"start":{"line":70,"column":15},"end":{"line":70,"column":24}},"line":70}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":8},"end":{"line":11,"column":17}},"type":"binary-expr","locations":[{"start":{"line":11,"column":8},"end":{"line":11,"column":11}},{"start":{"line":11,"column":15},"end":{"line":11,"column":17}}],"line":11},"1":{"loc":{"start":{"line":12,"column":2},"end":{"line":14,"column":3}},"type":"if","locations":[{"start":{"line":12,"column":2},"end":{"line":14,"column":3}},{"start":{"line":12,"column":2},"end":{"line":14,"column":3}}],"line":12},"2":{"loc":{"start":{"line":16,"column":2},"end":{"line":18,"column":3}},"type":"if","locations":[{"start":{"line":16,"column":2},"end":{"line":18,"column":3}},{"start":{"line":16,"column":2},"end":{"line":18,"column":3}}],"line":16},"3":{"loc":{"start":{"line":46,"column":4},"end":{"line":48,"column":5}},"type":"if","locations":[{"start":{"line":46,"column":4},"end":{"line":48,"column":5}},{"start":{"line":46,"column":4},"end":{"line":48,"column":5}}],"line":46},"4":{"loc":{"start":{"line":55,"column":20},"end":{"line":55,"column":81}},"type":"cond-expr","locations":[{"start":{"line":55,"column":48},"end":{"line":55,"column":74}},{"start":{"line":55,"column":77},"end":{"line":55,"column":81}}],"line":55},"5":{"loc":{"start":{"line":60,"column":2},"end":{"line":62,"column":3}},"type":"if","locations":[{"start":{"line":60,"column":2},"end":{"line":62,"column":3}},{"start":{"line":60,"column":2},"end":{"line":62,"column":3}}],"line":60}},"s":{"0":1,"1":1,"2":1,"3":157,"4":157,"5":157,"6":157,"7":154,"8":157,"9":1,"10":157,"11":157,"12":157,"13":157,"14":157,"15":157,"16":471,"17":471,"18":157,"19":0,"20":25,"21":25,"22":8,"23":17,"24":26,"25":26,"26":7,"27":1,"28":6,"29":6,"30":129,"31":129,"32":1},"f":{"0":157,"1":471,"2":0,"3":25,"4":25,"5":26,"6":7,"7":6,"8":129,"9":129},"b":{"0":[157,1],"1":[154,3],"2":[1,156],"3":[8,17],"4":[1,25],"5":[1,6]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"476cb42cd1352543dc6c059664b734698fa13176","contentHash":"de28073ec4cda2eeada2d5d2a61686fd7ca7e66537795de14b90ad61d1cd6a55"}}

package/.nyc_output/processinfo/5820d74a-2c5d-4545-b2e1-19b4fc0d16f0.json

@@ -0,0 +1 @@
+{"parent":null,"pid":22835,"argv":["/Users/jaredwray/.nvm/versions/node/v16.13.1/bin/node","/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/node_modules/.bin/ava"],"execArgv":[],"cwd":"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo","time":1641079896700,"ppid":22834,"coverageFilename":"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/.nyc_output/5820d74a-2c5d-4545-b2e1-19b4fc0d16f0.json","externalId":"","uuid":"5820d74a-2c5d-4545-b2e1-19b4fc0d16f0","files":[]}

package/.nyc_output/processinfo/e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b.json

@@ -0,0 +1 @@
+{"parent":"5820d74a-2c5d-4545-b2e1-19b4fc0d16f0","pid":22836,"argv":["/Users/jaredwray/.nvm/versions/node/v16.13.1/bin/node","/Users/jaredwray/src/github.com/jaredwray/keyv/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo","time":1641079896918,"ppid":22835,"coverageFilename":"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/.nyc_output/e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b.json","externalId":"","uuid":"e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b","files":["/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/src/index.js"]}

package/.nyc_output/processinfo/index.json

@@ -0,0 +1 @@
+{"processes":{"5820d74a-2c5d-4545-b2e1-19b4fc0d16f0":{"parent":null,"children":["e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b"]},"e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b":{"parent":"5820d74a-2c5d-4545-b2e1-19b4fc0d16f0","children":[]}},"files":{"/Users/jaredwray/src/github.com/jaredwray/keyv/packages/mongo/src/index.js":["e600d32e-2bd2-4fcc-ba04-b79d5cfa2d6b"]},"externalIds":{}}

package/README.md

@@ -1,12 +1,12 @@
-# @keyv/mongo [<img width="100" align="right" src="https://rawgit.com/lukechilds/keyv/master/media/logo.svg" alt="keyv">](https://github.com/lukechilds/keyv)
+# @keyv/mongo [<img width="100" align="right" src="https://jaredwray.com/images/keyv.svg" alt="keyv">](https://github.com/jaredwra/keyv)
 
 > MongoDB storage adapter for Keyv
 
-[![Build Status](https://travis-ci.org/lukechilds/keyv-mongo.svg?branch=master)](https://travis-ci.org/lukechilds/keyv-mongo)
+[![build](https://github.com/lukechilds/keyv-mongo/actions/workflows/build.yaml/badge.svg)](https://github.com/lukechilds/keyv-mongo/actions/workflows/build.yaml)
 [![Coverage Status](https://coveralls.io/repos/github/lukechilds/keyv-mongo/badge.svg?branch=master)](https://coveralls.io/github/lukechilds/keyv-mongo?branch=master)
 [![npm](https://img.shields.io/npm/v/@keyv/mongo.svg)](https://www.npmjs.com/package/@keyv/mongo)
 
-MongoDB storage adapter for [Keyv](https://github.com/lukechilds/keyv).
+MongoDB storage adapter for [Keyv](https://github.com/jaredwray/keyv).
 
 Uses TTL indexes to automatically remove expired documents. However [MongoDB doesn't guarantee data will be deleted immediately upon expiration](https://docs.mongodb.com/manual/core/index-ttl/#timing-of-the-delete-operation), so expiry dates are revalidated in Keyv.
 
@@ -35,4 +35,4 @@ const keyv = new Keyv('mongodb://user:pass@localhost:27017/dbname', { collection
 
 ## License
 
-MIT © Luke Childs
+MIT © Jared Wray & Luke Childs

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "@keyv/mongo",
-  "version": "1.0.4",
+  "version": "1.2.2",
   "description": "MongoDB storage adapter for Keyv",
   "main": "src/index.js",
   "scripts": {
     "test": "xo && nyc ava",
-    "coverage": "nyc report --reporter=text-lcov | coveralls"
+    "coverage": "nyc report --reporter=text-lcov > coverage.lcov",
+    "clean": "rm -rf node_modules && rm -rf .nyc_output && rm -rf coverage.lcov"
   },
   "xo": {
-    "extends": "xo-lukechilds"
+    "extends": "xo-lukechilds",
+    "rules": {
+      "unicorn/prefer-module": 0,
+      "unicorn/no-array-reduce": 0,
+      "unicorn/prefer-object-from-entries": 0
+    }
   },
   "ava": {
     "require": [
@@ -17,7 +23,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lukechilds/keyv-mongo.git"
+    "url": "git+https://github.com/jaredwray/keyv.git"
   },
   "keywords": [
     "mongo",
@@ -31,25 +37,24 @@
     "cache",
     "ttl"
   ],
-  "author": "Luke Childs <lukechilds123@gmail.com> (http://lukechilds.co.uk)",
+  "author": "Jared Wray <me@jaredwray.com> (https://jaredwray.com)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/lukechilds/keyv-mongo/issues"
+    "url": "https://github.com/jaredwray/keyv/issues"
   },
-  "homepage": "https://github.com/lukechilds/keyv-mongo",
+  "homepage": "https://github.com/jaredwray/keyv",
   "dependencies": {
-    "mongojs": "2.4.1",
-    "pify": "3.0.0"
+    "mongojs": "^3",
+    "pify": "^5.0.0"
   },
   "devDependencies": {
-    "ava": "^0.22.0",
-    "coveralls": "^2.13.1",
-    "eslint-config-xo-lukechilds": "^1.0.0",
-    "keyv": "*",
     "@keyv/test-suite": "*",
-    "nyc": "^11.0.3",
-    "requirable": "^1.0.1",
-    "this": "^1.0.2",
-    "xo": "^0.19.0"
+    "ava": "^3.15.0",
+    "eslint-config-xo-lukechilds": "^1.0.1",
+    "keyv": "*",
+    "nyc": "^15.1.0",
+    "requirable": "^1.0.5",
+    "this": "^1.1.0",
+    "xo": "^0.47.0"
   }
 }

package/src/index.js

@@ -5,37 +5,39 @@ const mongojs = require('mongojs');
 const pify = require('pify');
 
 class KeyvMongo extends EventEmitter {
-	constructor(opts) {
+	constructor(url, options) {
 		super();
 		this.ttlSupport = false;
-		opts = opts || {};
-		if (typeof opts === 'string') {
-			opts = { url: opts };
+		url = url || {};
+		if (typeof url === 'string') {
+			url = { url };
 		}
-		if (opts.uri) {
-			opts = Object.assign({ url: opts.uri }, opts);
+
+		if (url.uri) {
+			url = Object.assign({ url: url.uri }, url);
 		}
+
 		this.opts = Object.assign({
 			url: 'mongodb://127.0.0.1:27017',
-			collection: 'keyv'
-		}, opts);
+			collection: 'keyv',
+		}, url, options);
 		this.db = mongojs(this.opts.url);
 
 		const collection = this.db.collection(this.opts.collection);
 		collection.createIndex({ key: 1 }, {
 			unique: true,
-			background: true
+			background: true,
 		});
 		collection.createIndex({ expiresAt: 1 }, {
 			expireAfterSeconds: 0,
-			background: true
+			background: true,
 		});
-		this.mongo = ['update', 'findOne', 'remove'].reduce((obj, method) => {
-			obj[method] = pify(collection[method].bind(collection));
-			return obj;
+		this.mongo = ['update', 'findOne', 'remove'].reduce((object, method) => {
+			object[method] = pify(collection[method].bind(collection));
+			return object;
 		}, {});
 
-		this.db.on('error', err => this.emit('error', err));
+		this.db.on('error', error => this.emit('error', error));
 	}
 
 	get(key) {
@@ -44,21 +46,23 @@ class KeyvMongo extends EventEmitter {
 				if (doc === null) {
 					return undefined;
 				}
+
 				return doc.value;
 			});
 	}
 
 	set(key, value, ttl) {
 		const expiresAt = (typeof ttl === 'number') ? new Date(Date.now() + ttl) : null;
-		return this.mongo.update({ key }, { key, value, expiresAt }, { upsert: true });
+		return this.mongo.update({ key }, { $set: { key, value, expiresAt } }, { upsert: true });
 	}
 
 	delete(key) {
 		if (typeof key !== 'string') {
 			return Promise.resolve(false);
 		}
+
 		return this.mongo.remove({ key })
-			.then(obj => obj.n > 0);
+			.then(object => object.n > 0);
 	}
 
 	clear() {

package/test/test.js

@@ -1,18 +1,40 @@
-import test from 'ava';
-import keyvTestSuite, { keyvOfficialTests } from '@keyv/test-suite';
-import Keyv from 'keyv';
-import KeyvMongo from 'this';
+const test = require('ava');
+const keyvTestSuite = require('@keyv/test-suite').default;
+const Keyv = require('keyv');
+const KeyvMongo = require('this');
 
-keyvOfficialTests(test, Keyv, 'mongodb://127.0.0.1:27017', 'mongodb://127.0.0.1:1234');
+const mongoURL = 'mongodb://127.0.0.1:27017';
 
-const store = () => new KeyvMongo();
+const store = () => new KeyvMongo(mongoURL);
 keyvTestSuite(test, Keyv, store);
 
+test('default options', t => {
+	const store = new KeyvMongo();
+	t.deepEqual(store.opts, {
+		url: mongoURL,
+		collection: 'keyv',
+	});
+});
+
+test('default options with url.uri', t => {
+	const store = new KeyvMongo({ uri: mongoURL });
+	t.is(store.opts.uri, mongoURL);
+	t.is(store.opts.url, mongoURL);
+});
+
 test('Collection option merges into default options', t => {
 	const store = new KeyvMongo({ collection: 'foo' });
 	t.deepEqual(store.opts, {
-		url: 'mongodb://127.0.0.1:27017',
-		collection: 'foo'
+		url: mongoURL,
+		collection: 'foo',
+	});
+});
+
+test('Collection option merges into default options if URL is passed', t => {
+	const store = new KeyvMongo(mongoURL, { collection: 'foo' });
+	t.deepEqual(store.opts, {
+		url: mongoURL,
+		collection: 'foo',
 	});
 });
 

package/.npmignore

@@ -1,75 +0,0 @@
-## Node
-
-#npm5
-package-lock.json
-
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-## OS X
-
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk

package/.travis.yml

@@ -1,12 +0,0 @@
-language: node_js
-node_js:
-  - '8'
-  - '6'
-  - '4'
-services:
-  - mongodb
-script: npm test
-after_success: npm run coverage
-notifications:
-  email:
-    on_success: never

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Luke Childs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.