Simplify with many-keys-map

index.js

@@ -1,56 +1,43 @@
 'use strict';
 const PCancelable = require('p-cancelable');
+const ManyKeysMap = require('many-keys-map');
 
-const targetCache = new WeakMap();
-
-const cleanCache = (target, selector) => {
-	const map = targetCache.get(target);
-	if (map) {
-		map.delete(selector);
-		if (map.size === 0) {
-			targetCache.delete(target);
-		}
-	}
-};
+const cache = new ManyKeysMap();
 
 module.exports = (selector, options) => {
-	options = Object.assign({
+	const {target} = Object.assign({
 		target: document
 	}, options);
 
-	if (targetCache.has(options.target) && targetCache.get(options.target).has(selector)) {
-		return targetCache.get(options.target).get(selector);
+	let promise = cache.get([target, selector]);
+	if (promise) {
+		return promise;
 	}
 
 	let alreadyFound = false;
-	const promise = new PCancelable((resolve, reject, onCancel) => {
+	promise = new PCancelable((resolve, reject, onCancel) => {
 		let raf;
 		onCancel(() => {
 			cancelAnimationFrame(raf);
-			cleanCache(options.target, selector);
+			cache.delete([target, selector], promise);
 		});
 
 		// Interval to keep checking for it to come into the DOM
 		(function check() {
-			const el = options.target.querySelector(selector);
+			const el = target.querySelector(selector);
 
 			if (el) {
 				resolve(el);
 				alreadyFound = true;
-				cleanCache(options.target, selector);
+				cache.delete([target, selector], promise);
 			} else {
 				raf = requestAnimationFrame(check);
 			}
 		})();
 	});
 
-	// The element might have been found in the first synchronous check
 	if (!alreadyFound) {
-		if (targetCache.has(options.target)) {
-			targetCache.get(options.target).set(selector, promise);
-		} else {
-			targetCache.set(options.target, new Map([[selector, promise]]));
-		}
+		cache.set([target, selector], promise);
 	}
 
 	return promise;

package.json

@@ -31,6 +31,7 @@
 		"check"
 	],
 	"dependencies": {
+		"many-keys-map": "^1.0.0",
 		"p-cancelable": "^0.4.1"
 	},
 	"devDependencies": {
@@ -43,6 +44,9 @@
 		"envs": [
 			"node",
 			"browser"
-		]
+		],
+		"rules": {
+			"unicorn/prefer-node-append": 0
+		}
 	}
 }

test.js

@@ -91,7 +91,7 @@ test('check if wait can be canceled', async t => {
 	el.id = 'dofle';
 	document.body.appendChild(el);
 
-	await t.throws(elCheck, PCancelable.CancelError);
+	await t.throwsAsync(elCheck, PCancelable.CancelError);
 });
 
 test('ensure different promises are returned on second call with the same selector when first was canceled', async t => {
@@ -101,7 +101,7 @@ test('ensure different promises are returned on second call with the same select
 
 	const elCheck2 = m('.unicorn');
 
-	await t.throws(elCheck1, PCancelable.CancelError);
+	await t.throwsAsync(elCheck1, PCancelable.CancelError);
 	t.not(elCheck1, elCheck2);
 });