Use options to pass through adapters (#101)

Breaking change: Pseudos now take the adapter as the second argument,
and arguments as the third. Filters aren’t checked anymore if they have
the required number of arguments

Author: fb55

index.js

@@ -2,23 +2,36 @@
 
 module.exports = CSSselect;
 
-var DomUtils       = require("domutils"),
-	falseFunc      = require("boolbase").falseFunc,
-	compileFactory = require("./lib/compile.js"),
-	defaultCompile = compileFactory(DomUtils);
+var DomUtils = require("domutils");
+var falseFunc = require("boolbase").falseFunc;
+var compileRaw = require("./lib/compile.js");
 
-function adapterCompile(adapter){
-	return adapter === DomUtils ? defaultCompile : compileFactory(adapter);
+function wrapCompile(func){
+	return function addAdapter(selector, options, context){
+		options = options || {};
+		options.adapter = options.adapter || DomUtils;
+
+		return func(selector, options, context);
+	};
 }
 
+var compile = wrapCompile(compileRaw);
+var compileUnsafe = wrapCompile(compileRaw.compileUnsafe);
+
 function getSelectorFunc(searchFunc){
 	return function select(query, elems, options){
-		options = options || {}
+		options = options || {};
 		options.adapter = options.adapter || DomUtils;
-		var compile = adapterCompile(options.adapter);
 
-		if(typeof query !== "function") query = compile.compileUnsafe(query, options, elems);
-		if(query.shouldTestNextSiblings) elems = appendNextSiblings((options && options.context) || elems, options.adapter);
+		if(typeof query !== "function"){
+			query = compileUnsafe(query, options, elems);
+		}
+		if(query.shouldTestNextSiblings){
+			elems = appendNextSiblings(
+				(options && options.context) || elems,
+				options.adapter
+			);
+		}
 		if(!Array.isArray(elems)) elems = options.adapter.getChildren(elems);
 		else elems = options.adapter.removeSubsets(elems);
 		return searchFunc(query, elems, options);
@@ -46,17 +59,20 @@ function appendNextSiblings(elems, adapter){
 }
 
 var selectAll = getSelectorFunc(function selectAll(query, elems, options){
-	return (query === falseFunc || !elems || elems.length === 0) ? [] : options.adapter.findAll(query, elems);
+	return query === falseFunc || !elems || elems.length === 0
+		? []
+		: options.adapter.findAll(query, elems);
 });
 
 var selectOne = getSelectorFunc(function selectOne(query, elems, options){
-	return (query === falseFunc || !elems || elems.length === 0) ? null : options.adapter.findOne(query, elems);
+	return query === falseFunc || !elems || elems.length === 0
+		? null
+		: options.adapter.findOne(query, elems);
 });
 
 function is(elem, query, options){
-	options = options || {}
+	options = options || {};
 	options.adapter = options.adapter || DomUtils;
-	var compile = adapterCompile(options.adapter);
 	return (typeof query === "function" ? query : compile(query, options))(elem);
 }
 
@@ -67,19 +83,19 @@ function CSSselect(query, elems, options){
 	return selectAll(query, elems, options);
 }
 
-CSSselect.compile = defaultCompile;
-CSSselect.filters = defaultCompile.Pseudos.filters;
-CSSselect.pseudos = defaultCompile.Pseudos.pseudos;
+CSSselect.compile = compile;
+CSSselect.filters = compileRaw.Pseudos.filters;
+CSSselect.pseudos = compileRaw.Pseudos.pseudos;
 
 CSSselect.selectAll = selectAll;
 CSSselect.selectOne = selectOne;
 
 CSSselect.is = is;
 
 //legacy methods (might be removed)
-CSSselect.parse = defaultCompile;
+CSSselect.parse = compile;
 CSSselect.iterate = selectAll;
 
 //hooks
-CSSselect._compileUnsafe = defaultCompile.compileUnsafe;
-CSSselect._compileToken = defaultCompile.compileToken;
+CSSselect._compileUnsafe = compileUnsafe;
+CSSselect._compileToken = compileRaw.compileToken;