fix for .match()

persvr · Nov 29, 2010 · e561ab6 · e561ab6
1 parent 21eca01
commit e561ab6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/js-array.js b/lib/js-array.js
@@ -345,14 +345,15 @@ function query(query, options, target){
 			if(jsOperator){
 				// item['foo.bar'] ==> (item && item.foo && item.foo.bar && ...)
 				var path = String(value.args[0]);
-				var item = path ? path.split('.').map(function(x,i,a){return 'item.'+a.slice(0,i+1).join('.')}).join('&&') : 'item'; 
+				var item = path ? path.split('.').map(function(x,i,a){return 'item.'+a.slice(0,i+1).join('.')}).join('&&') : 'item';
+				item = '('+item+')'; 
 				if (jsOperator === '===' && value.args[1] instanceof RegExp){
 					// N.B. matching requires String
-					item = 'String(item.' + value.args[0] + ')';
+					item = 'String('+item + '||"")';
 					jsOperator = '.match('+value.args[1]+')&&""===';
 					value.args[1] = '';
 				}
-				return "(function(){var filtered = []; for(var i = 0, length = this.length; i < length; i++){var item = this[i];if((" + item + ')' + jsOperator + queryToJS(value.args[1]) + "){filtered.push(item);}} return filtered;})";
+				return "(function(){var filtered = []; for(var i = 0, length = this.length; i < length; i++){var item = this[i];if(" + item + jsOperator + queryToJS(value.args[1]) + "){filtered.push(item);}} return filtered;})";
 			}else{
 				return "(function(){return (operators['" + value.name + "']||exports.missingOperator('" + value.name + "')).call(this" +
 					(value && value.args && value.args.length > 0 ? (", " + value.args.map(queryToJS).join(",")) : "") +