Fix for array_search() and new ability to pass in regexp; not like PHP, but won't interfere with PHP

brettz9 · brettz9 · commit 5cf9741c7c1e · 2011-04-11T23:19:10.000+08:00
diff --git a/functions/array/array.js b/functions/array/array.js
@@ -120,9 +120,24 @@ function array () {
             };
             // Return non-object, non-array values, since most sensible
             e.search = function (needle, argStrict) {var _ = __.method(this);
-                var strict = !!argStrict;
-                for (var i=0, vl = _.values.length; i < vl; i++) {
-                    var val = _.values[i];
+                var strict = !!argStrict, haystack = _.values, i, vl, val;
+                if (typeof needle === 'object' && needle.exec) { // Duck-type for RegExp
+                    if (!strict) { // Let's consider case sensitive searches as strict
+                        var flags = 'i' + (needle.global ? 'g' : '') +
+                                    (needle.multiline ? 'm' : '') +
+                                    (needle.sticky ? 'y' : ''); // sticky is FF only
+                        needle = new RegExp(needle.source, flags);
+                    }
+                    for (i=0, vl = haystack.length; i < vl; i++) {
+                        val = haystack[i];
+                        if (needle.test(val)) {
+                            return _.keys[i];
+                        }
+                    }
+                    return false;
+                }
+                for (i=0, vl = haystack.length; i < vl; i++) {
+                    val = haystack[i];
                     if ((strict && val === needle) || (!strict && val == needle)) {
                         return _.keys[i];
                     }
diff --git a/functions/array/array_search.js b/functions/array/array_search.js
@@ -5,12 +5,30 @@ function array_search (needle, haystack, argStrict) {
     // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
     // *     example 1: array_search('zonneveld', {firstname: 'kevin', middle: 'van', surname: 'zonneveld'});
     // *     returns 1: 'surname'
+    // *     example 2: ini_set('phpjs.return_phpjs_arrays', 'on');
+    // *     example 2: var ordered_arr = array({3:'value'}, {2:'value'}, {'a':'value'}, {'b':'value'});
+    // *     example 2: var key = array_search(/val/g, ordered_arr); // or var key = ordered_arr.search(/val/g);
+    // *     returns 2: '3'
 
     var strict = !!argStrict,
         key = '';
     
     if (haystack && typeof haystack === 'object' && haystack.change_key_case) { // Duck-type check for our own array()-created PHPJS_Array
-        return haystack.search(needle, haystack, argStrict);
+        return haystack.search(needle, argStrict);
+    }
+    if (typeof needle === 'object' && needle.exec) { // Duck-type for RegExp
+        if (!strict) { // Let's consider case sensitive searches as strict
+            var flags = 'i' + (needle.global ? 'g' : '') +
+                        (needle.multiline ? 'm' : '') +
+                        (needle.sticky ? 'y' : ''); // sticky is FF only
+            needle = new RegExp(needle.source, flags);
+        }
+        for (key in haystack) {
+            if (needle.test(haystack[key])) {
+                return key;
+            }
+        }
+        return false;
     }
 
     for (key in haystack) {
