appium-uiauto - npm Package Compare versions

Comparing version 1.1.0 to 1.2.0-beta1

.jscs.json

 {
-  "excludeFiles": ["submodules/**", "node_modules/**", "./sample-code/**", 
-    "./lib/server/static/**", "./lib/devices/firefoxos/atoms/*.js", 
-    "./test/harmony/**/*.js"],
+  "excludeFiles": ["node_modules/**", "uiauto/**"],
   "requireCurlyBraces": ["for", "while", "do", "try", "catch"],
@@ -6,0 +4,0 @@ "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch",

package.json

 {
   "name": "appium-uiauto",
-  "version": "1.1.0",
+  "version": "1.2.0-beta1",
   "description": "appium uiauto ios driver",
@@ -5,0 +5,0 @@ "main": "lib/main.js",

uiauto/appium/app.js

@@ -203,12 +203,27 @@ /* globals codes, $ */
 , getElementByName: function (name, ctx) {
-    var selector = ['#', name].join('');
-    var elems = this.lookup(selector, ctx);
+    if (name.match(/\*.*\*/)) {
+      return this._defaultContext(ctx).getNameContains(
+        name.replace(/^\*|\*$/g, ''), false);
+    } else {
+      return this._defaultContext(ctx).getWithName(name, false);
+    }
+  }
 
-    return this._returnFirstElem($(elems));
+, getElementsByName: function (name, ctx) {
+    if (name.match(/^\*.*\*$/)) {
+      return this._defaultContext(ctx).getAllNameContains(
+        name.replace(/^\*|\*$/g, ''), false); 
+    } else {
+      return this._defaultContext(ctx).getAllWithName(name, false);
+    }
   }
 
 , getElementByAccessibilityId: function (accessibilityId, ctx) {
-    return this.getElementByName(accessibilityId, ctx);
+    return this._defaultContext(ctx).getWithName(accessibilityId, false);
   }
 
+, getElementsByAccessibilityId: function (accessibilityId, ctx) {
+    return this._defaultContext(ctx).getAllWithName(accessibilityId, false);
+  }
+
 , _getIdSearchPredicate: function (sel, exact) {
@@ -245,2 +260,13 @@ if (exact) {
 
+, _defaultContext: function(ctx) 
+{
+  if (typeof ctx === 'string') {
+    return this.cache[ctx];
+  } else if (typeof ctx !== 'undefined') {
+    return ctx;
+  } else {
+    return this.mainApp();
+  }
+}
+
 , _returnFirstElem: function (elems) {
@@ -304,13 +330,2 @@ if (elems.length > 0) {
 
-, getElementsByName: function (name, ctx) {
-    var selector = ['#', name].join('');
-    var elems = this.lookup(selector, ctx);
-
-    return this._returnElems(elems);
-  }
-
-, getElementsByAccessibilityId: function (accessibilityId, ctx) {
-  return this.getElementsByName(accessibilityId, ctx);
-  }
-
 , convertSelector: function (selector) {
@@ -317,0 +332,0 @@ // some legacy: be backwards compatible, mechanic.js

uiauto/appium/base.js

@@ -24,5 +24,6 @@ /**
 #import "../lib/mechanic.js"
+#import "./mechanic_ext.js"
+#import "element.js"
 #import "../lib/status.js"
 #import "utility.js"
-#import "element.js"
 #import "xpath.js"
@@ -29,0 +30,0 @@ #import "app.js"

uiauto/appium/element.js

@@ -9,48 +9,2 @@ /* globals $, au, codes */
 
-// this is mechanic notation for extending $(UIAElement)
-$.extend($.fn, {
-  getActiveElement: function () {
-      var foundElement = null;
-      var checkAll = function (element) {
-        var children = $(element).children();
-        children.each(function (e, child) {
-          var focused = $(child).isFocused();
-          if (focused === true || focused === 1) {
-            return child;
-          }
-          if (child.hasChildren()) { // big optimization
-            checkAll(child);
-          }
-        });
-
-        return null;
-      };
-      // try au.cache in the array first
-      for (var key in au.cache) {
-        var elemFocused = $(au.cache[key]).isFocused();
-        if (elemFocused === true || elemFocused === 1) {
-          return {
-            status: codes.Success.code,
-            value: {ELEMENT: key}
-          };
-        }
-      }
-      foundElement = checkAll(this);
-
-      if (foundElement) {
-        var varName = $(foundElement).name();
-        return {
-          status: codes.Success.code,
-          value: {ELEMENT: varName}
-        };
-      }
-
-      return {
-        status: codes.NoSuchElement.code,
-        value: null,
-      };
-    }
-
-});
-
 UIAElement.prototype.isNil = function () { return false; };
@@ -228,18 +182,19 @@
 
-UIAElement.prototype.getFirstWithPredicate = function (predicate) {
+UIAElement.prototype.getFirstWithPredicate = function (predicate, onlyVisible) {
   var weighting = ['elements'];
   var elems = this._elementOrElementsWithPredicateWeighted(
-                predicate, weighting, true);
+                predicate, weighting, true, onlyVisible);
   return au._returnFirstElem($(elems));
 };
 
-UIAElement.prototype.getAllWithPredicate = function (predicate) {
+UIAElement.prototype.getAllWithPredicate = function (predicate, onlyVisible) {
   var weighting = ['elements'];
-  var elems = this._elementOrElementsWithPredicateWeighted(predicate, weighting);
+  var elems = this._elementOrElementsWithPredicateWeighted(predicate, weighting, false, onlyVisible);
   return au._returnElems($(elems));
 };
 
-UIAElement.prototype._elementOrElementsWithPredicateWeighted = function (predicate, weighting, onlyFirst) {
+UIAElement.prototype._elementOrElementsWithPredicateWeighted = function (predicate, weighting, onlyFirst, onlyVisible) {
+  weighting = weighting || ['elements'];
   onlyFirst = (onlyFirst === true);
-  weighting = weighting || ['elements'];
+  onlyVisible = onlyVisible !== false; 
 
@@ -253,4 +208,5 @@ UIATarget.localTarget().pushTimeout(0);
     if (typeof element[prop] === 'function') {
-      found = element[prop]().withPredicate(predicate)
-                  .withValueForKey(true, 'isVisible');
+      found = element[prop]();
+      if(predicate) found = found.withPredicate(predicate);
+      if(onlyVisible) found = found.withValueForKey(true, 'isVisible');
     } else {
@@ -276,3 +232,3 @@ throw new Error("Invalid function '" + prop + "'");
                     ._elementOrElementsWithPredicateWeighted(predicate,
-                      weighting, onlyFirst));
+                      weighting, onlyFirst, onlyVisible));
     }
@@ -286,6 +242,18 @@ }
 
-UIAElement.prototype.getNameContains = function (targetName) {
-  return this.getFirstWithPredicate("name contains[c] '" + targetName + "' || label contains[c] '" + targetName + "'");
+UIAElement.prototype.getWithName = function (targetName, onlyVisible) {
+  return this.getFirstWithPredicate("name == '" + targetName + "' || label == '" + targetName + "'", onlyVisible);
 };
 
+UIAElement.prototype.getAllWithName = function (targetName, onlyVisible) {
+  return this.getAllWithPredicate("name == '" + targetName + "' || label == '" + targetName + "'", onlyVisible);
+};
+
+UIAElement.prototype.getNameContains = function (targetName, onlyVisible) {
+  return this.getFirstWithPredicate("name contains[c] '" + targetName + "' || label contains[c] '" + targetName + "'", onlyVisible);
+};
+
+UIAElement.prototype.getAllNameContains = function (targetName, onlyVisible) {
+  return this.getAllWithPredicate("name contains[c] '" + targetName + "' || label contains[c] '" + targetName + "'", onlyVisible);
+};
+
 UIAElement.prototype.getPageSource = function () {
@@ -292,0 +260,0 @@ return JSON.stringify(this.getTree());

uiauto/lib/mechanic.js

@@ -1,3 +0,1 @@
-/* globals isVerbose */
-
 /*
@@ -15,367 +13,391 @@ * mechanic.js UIAutomation Library
 
-var mechanic = (function () {
-  // Save a reference to the local target for convenience
-  var target = UIATarget.localTarget();
+var mechanic = (function() {
+    // Save a reference to the local target for convenience
+    var target = UIATarget.localTarget();
 
-  // Set the default timeout value to 0 to avoid making walking the object tree incredibly slow.
-  // Developers can adjust this value by calling $.timeout(duration)
-  target.setTimeout(0);
+    // Set the default timeout value to 0 to avoid making walking the object tree incredibly slow.
+    // Developers can adjust this value by calling $.timeout(duration)
+    target.setTimeout(0);
 
-  var app = target.frontMostApp(),
-    //window = app.mainWindow(),
-    emptyArray = [],
-    slice = emptyArray.slice,
-    idSelectorRE = /^#([\w\s\W-]+)$/;
+    // This property is meant to suppress excessive logging which prevents instruments from promptly dumping out screenshots.
+    this.isVerbose = false
 
-  // Setup a map of UIAElement types to their "shortcut" selectors.
-  var typeShortcuts = {
-    'UIAActionSheet' : ['actionsheet'],
-    'UIAActivityIndicator' : ['activityIndicator'],
-    'UIAAlert' : ['alert'],
-    'UIAButton' : ['button'],
-    'UIACollectionView': ['collection'],
-    'UIACollectionCell': ['collectionCell'],
-    'UIAEditingMenu': ['editingMenu'],
-    'UIAElement' : ['\\*'], // TODO: sort of a hack
-    'UIAImage' : ['image'],
-    'UIAKey' : ['key'],
-    'UIAKeyboard' : ['keyboard'],
-    'UIALink' : ['link'],
-    'UIAPageIndicator' : ['pageIndicator'],
-    'UIAPicker' : ['picker'],
-    'UIAPickerWheel' : ['pickerwheel'],
-    'UIAPopover' : ['popover'],
-    'UIAProgressIndicator' : ['progress'],
-    'UIAScrollView' : ['scrollview'],
-    'UIASearchBar' : ['searchbar'],
-    'UIASecureTextField' : ['secure'],
-    'UIASegmentedControl' : ['segmented'],
-    'UIASlider' : ['slider'],
-    'UIAStaticText' : ['text'],
-    'UIAStatusBar' : ['statusbar'],
-    'UIASwitch' : ['switch'],
-    'UIATabBar' : ['tabbar'],
-    'UIATableView' : ['tableview'],
-    'UIATableCell' : ['cell', 'tableCell'],
-    'UIATableGroup' : ['group'],
-    'UIATextField' : ['textfield'],
-    'UIATextView' : ['textview'],
-    'UIAToolbar' : ['toolbar'],
-    'UIAWebView' : ['webview'],
-    'UIAWindow' : ['window'],
-    'UIANavigationBar': ['navigationBar'],
-    'UIAMapView': ['mapView']
-  };
+    var app = target.frontMostApp(),
+        window = app.mainWindow(),
+        emptyArray = [],
+        slice = emptyArray.slice
 
-  // Build a RegExp for picking out type selectors.
-  var typeSelectorRE = (function () {
-    var typeSelectorREString = "\\";
-    for (var key in typeShortcuts) {
-      /* jshint loopfunc:true */
-      typeSelectorREString += key + "|";
-      typeShortcuts[key].forEach(function (shortcut) { typeSelectorREString += shortcut + "|"; });
-    }
-    typeSelectorREString = typeSelectorREString.substr(0, typeSelectorREString.length - 1);
-    return new RegExp(typeSelectorREString);
-  })();
+    // Setup a map of UIAElement types to their "shortcut" selectors.
+    var typeShortcuts = {
+        'UIAActionSheet' : ['actionsheet'],
+        'UIAActivityIndicator' : ['activityIndicator'],
+        'UIAAlert' : ['alert'],
+        'UIAButton' : ['button'],
+        'UIACollectionCell' : ['collectionCell'],
+        'UIACollectionView' : ['collection'],
+        'UIAEditingMenu': ['editingMenu'],
+        'UIAElement' : ['\\*'], // TODO: sort of a hack
+        'UIAImage' : ['image'],
+        'UIAKey' : ['key'],
+        'UIAKeyboard' : ['keyboard'],
+        'UIALink' : ['link'],
+        'UIAMapView': ['mapView'],
+        'UIAPageIndicator' : ['pageIndicator'],
+        'UIAPicker' : ['picker'],
+        'UIAPickerWheel' : ['pickerwheel'],
+        'UIAPopover' : ['popover'],
+        'UIAProgressIndicator' : ['progress'],
+        'UIAScrollView' : ['scrollview'],
+        'UIASearchBar' : ['searchbar'],
+        'UIASecureTextField' : ['secure'],
+        'UIASegmentedControl' : ['segmented'],
+        'UIASlider' : ['slider'],
+        'UIAStaticText' : ['text'],
+        'UIAStatusBar' : ['statusbar'],
+        'UIASwitch' : ['switch'],
+        'UIATabBar' : ['tabbar'],
+        'UIATableView' : ['tableview'],
+        'UIATableCell' : ['cell', 'tableCell'],
+        'UIATableGroup' : ['group'],
+        'UIATextField' : ['textfield'],
+        'UIATextView' : ['textview'],
+        'UIAToolbar' : ['toolbar'],
+        'UIAWebView' : ['webview'],
+        'UIAWindow' : ['window'],
+        'UIANavigationBar': ['navigationBar']
+    };
 
-  // Add functions to UIAElement to make object graph searching easier.
-  UIAElement.prototype.getElementsByName = function (name) {
-    var foundEls = [];
-    $.each(this.elements(), function (idx, el) {
-      if (el.name() === name) foundEls.push(el);
-      else foundEls = foundEls.concat(el.getElementsByName(name));
-    });
+    // Build a RegExp for picking out type selectors.
+    var typeSelectorREString = (function() {
+        var key;
+        var typeSelectorREString = "\\";
+        for (key in typeShortcuts) {
+            // Instruments' javascript runtime (Xcode 5) automatically adds
+            // extra keys which are not in the shortcut list above, skip them
+            if (Array.isArray(typeShortcuts[key])) {
+                typeSelectorREString += key + "|";
+                typeShortcuts[key].forEach(function(shortcut) { typeSelectorREString += shortcut + "|"; });
+            }
+        }
+        return typeSelectorREString.substr(1, typeSelectorREString.length - 2);
+    })();
 
-    return foundEls;
-  };
+    var patternName = "[^,\\[\\]]+"
 
-  function _getElementsByType(current, type, foundEls, isParent) {
-    if (!isParent && current.isType(type)) {
-      var isDuplicate = false;
-      if (type === 'textfield') {
-        // fixing duplicated text fields
-        $.each(current.elements(), function (idx, child) {
-          isDuplicate = isDuplicate || child.isType(type) && child.name() === current.name();
-        });
-      }
-      if (!isDuplicate) foundEls.push(current);
+    var selectorPatterns = {
+      simple:          (new RegExp("^#("+patternName+")$"))
+     ,byType:          (new RegExp("^("+typeSelectorREString+")$"))
+     ,byAttr:          (new RegExp("^\\[(\\w+)=("+patternName+")\\]$"))
+     ,byTypeAndAttr:   (new RegExp("^("+typeSelectorREString+")\\[(\\w+)=("+patternName+")\\]$"))
+     ,children:        (new RegExp("^(.*) > (.*)$"))
+     ,descendents:     (new RegExp("^(.+) +(.+)$"))
     }
-    $.each(current.elements(), function (idx, child) {
-      _getElementsByType(child, type, foundEls, false);
-    });
-  }
 
-  UIAElement.prototype.getElementsByType = function (type) {
-    var foundEls = [];
-    _getElementsByType(this, type, foundEls, true);
-    return foundEls;
-  };
+    var searches = {
+      simple:          function(name)         { return this.getElementsByName(name)          }
+     ,byType:          function(type)         { return this.getElementsByType(type)          }
+     ,byAttr:          function(attr,value)   { return this.getElementsByAttr(attr,value)    }
+     ,byTypeAndAttr:   function(type,a,v)     { return $(type, this).filter('['+a+'='+v+']') }
+     ,children:        function(parent,child) { return $(parent, this).children().filter(child) }
+     ,descendents:     function(parent,child) { return $(child, $(parent, this))             }
+    }
 
-  UIAElement.prototype.isType = function (type) {
-    var thisType = this.toString().split(" ")[1];
-    thisType = thisType.substr(0, thisType.length - 1);
-    if (type === thisType) return true;
-    else if (typeShortcuts[thisType] !== undefined && typeShortcuts[thisType].indexOf(type) >= 0) return true;
-    else if (type === '*' || type === 'UIAElement') return true;
-    else return false;
-  };
+    var filters = {
+       simple:        function(name)      { return this.name() == name                       }
+      ,byType:        function(type)      { return this.isType(type)                         }
+      ,byAttr:        function(attr,value){ return this[attr] && this[attr]() == value       }
+      ,byTypeAndAttr: function(type,a,v ) { return this.isType(type) && this[a]() == v  }
+    }
 
-  function isF(value) { return ({}).toString.call(value) === "[object Function]"; }
-  function isO(value) { return value instanceof Object; }
-  function isA(value) { return value instanceof Array; }
-  function likeArray(obj) { return typeof obj.length === 'number'; }
 
-  function compact(array) { return array.filter(function (item) { return item !== undefined && item !== null; }); }
-  function flatten(array) { return array.length > 0 ? [].concat.apply([], array) : array; }
+    function Z(dom, selector){
+        dom = dom || emptyArray;
+        dom.__proto__ = Z.prototype;
+        dom.selector = selector || '';
+        if (dom === emptyArray) {
+            UIALogger.logWarning("element " + selector + " have not been found");
+        }
+        return dom;
+    }
 
-  function uniq(array) { return array.filter(function (item, index, array) { return array.indexOf(item) === index; }); }
+    function $(selector, context) {
+        if (!selector) return Z();
+        if (context !== undefined) return $(context).find(selector);
+        else if (selector instanceof Z) return selector;
+        else {
+            var dom;
+            if (isA(selector)) dom = compact(selector);
+            else if (selector instanceof UIAElement) dom = [selector];
+            else dom = $$(app, selector);
+            return Z(dom, selector);
+        }
+    }
 
-  function Z(dom, selector) {
-    dom = dom || emptyArray;
-    /* jshint proto:true */
-    dom.__proto__ = Z.prototype;
-    dom.selector = selector || '';
-    return dom;
-  }
+    $.qsa = $$ = function(element, selector) {
+        var ret = [],
+            groups = selector.split(/ *, */),
+            matches
+        $.each(groups, function() {
+          for (type in searches) {
+            if (matches = this.match(selectorPatterns[type])) {
+              matches.shift()
+              ret = ret.concat($(searches[type].apply(element, matches)))
+              break
+            }
+          }
+        })
+        return $(ret)
+    };
 
-  function $(selector, context) {
-    if (!selector) return Z();
-    if (context !== undefined) return $(context).find(selector);
-    else if (selector instanceof Z) return selector;
-    else {
-      var dom;
-      if (isA(selector)) dom = compact(selector);
-      else if (selector instanceof UIAElement) dom = [selector];
-      else dom = $$(app, selector);
-      return Z(dom, selector);
-    }
-  }
+    // Add functions to UIAElement to make object graph searching easier.
+    UIAElement.prototype.getElementsByName = function(name) {
+        return this.getElementsByAttr('name', name)
+    };
 
-  var $$ = function (element, selector) {
-    var found;
-    if (idSelectorRE.test(selector)) {
-      return element.getElementsByName(selector.substr(1));
-    } else if (typeSelectorRE.test(selector)) {
-      found = element.getElementsByType(selector);
-      return found ? found : emptyArray;
-    } else {
-      return emptyArray;
+    UIAElement.prototype.getElementsByAttr = function(attr, value) {
+        return $.map(this.elements(), function(el) {
+            var matches = el.getElementsByAttr(attr, value),
+                val = el[attr]
+            if (typeof val == 'function') val = val.apply(el)
+            if (typeof val != 'undefined' && val == value)
+              matches.unshift(el)
+            return matches
+        })
     }
-  };
+    UIAElement.prototype.getElementsByType = function(type) {
+        return $.map(this.elements(), function(el) {
+            var matches = el.getElementsByType(type);
+            if (el.isType(type)) matches.unshift(el);
+            return matches;
+        });
+    };
+    UIAElement.prototype.isType = function(type) {
+        var thisType = this.toString().split(" ")[1];
+        thisType = thisType.substr(0, thisType.length - 1);
+        if (type === thisType) return true;
+        else if (typeShortcuts[thisType] !== undefined && typeShortcuts[thisType].indexOf(type) >= 0) return true;
+        else if (type === '*' || type === 'UIAElement') return true;
+        else return false;
+    };
 
-  $.qsa = $$;
+    function isF(value) { return ({}).toString.call(value) == "[object Function]"; }
+    function isO(value) { return value instanceof Object; }
+    function isA(value) { return value instanceof Array; }
+    function likeArray(obj) { return typeof obj.length == 'number'; }
 
-  function filtered(elements, selector) {
-    return selector === undefined ? $(elements) : $(elements).filter(selector);
-  }
+    function compact(array) { return array.filter(function(item){ return item !== undefined && item !== null; }); }
+    function flatten(array) { return array.length > 0 ? [].concat.apply([], array) : array; }
 
-  $.extend = function (target) {
-    slice.call(arguments, 1).forEach(function (source) {
-      for (var key in source) target[key] = source[key];
-    });
-    return target;
-  };
+    function uniq(array) { return array.filter(function(item,index,array){ return array.indexOf(item) == index; }); }
 
-  $.inArray = function (elem, array, i) {
-    return emptyArray.indexOf.call(array, elem, i);
-  };
+    function filtered(elements, selector) {
+        return selector === undefined ? $(elements) : $(elements).filter(selector);
+    }
 
-  $.map = function (elements, callback) {
-    var value, values = [], i, key;
-    if (likeArray(elements))
-      for (i = 0; i < elements.length; i++) {
-        value = callback(elements[i], i);
-        if (value !== null) values.push(value);
-      }
-    else
-      for (key in elements) {
-        value = callback(elements[key], key);
-        if (value !== null) values.push(value);
-      }
-    return flatten(values);
-  };
+    $.extend = function(target){
+        var key;
+        slice.call(arguments, 1).forEach(function(source) {
+            for (key in source) target[key] = source[key];
+        });
+        return target;
+    };
 
-  $.each = function (elements, callback) {
-    var i, key;
-    if (likeArray(elements))
-      for (i = 0; i < elements.length; i++) {
-        if (callback.call(elements[i], i, elements[i]) === false) return elements;
-      }
-    else
-      for (key in elements) {
-        if (callback.call(elements[key], key, elements[key]) === false) return elements;
-      }
-    return elements;
-  };
+    $.inArray = function(elem, array, i) {
+        return emptyArray.indexOf.call(array, elem, i);
+    };
 
-  $.fn = {
-    forEach: emptyArray.forEach,
-    reduce: emptyArray.reduce,
-    push: emptyArray.push,
-    indexOf: emptyArray.indexOf,
-    concat: emptyArray.concat,
-    map: function (fn) {
-      return $.map(this, function (el, i) { return fn.call(el, i, el); });
-    },
-    slice: function () {
-      return $(slice.apply(this, arguments));
-    },
-    get: function (idx) { return idx === undefined ? slice.call(this) : this[idx]; },
-    size: function () { return this.length; },
-    each: function (callback) {
-      this.forEach(function (el, idx) { callback.call(el, idx, el); });
-      return this;
-    },
-    filter: function (selector) {
-      return $([].filter.call(this, function (el) {
-        var parent = el.parent();
-        return parent && $$(parent, selector).indexOf(el) >= 0;
-      }));
-    },
-    end: function () {
-      return this.prevObject || $();
-    },
-    andSelf: function () {
-      return this.add(this.prevObject || $());
-    },
-    add: function (selector, context) {
-      return $(uniq(this.concat($(selector, context))));
-    },
-    is: function (selector) {
-      return this.length > 0 && $(this[0]).filter(selector).length > 0;
-    },
-    not: function (selector) {
-      var nodes = [];
-      if (isF(selector) && selector.call !== undefined)
-        this.each(function (idx) {
-          if (!selector.call(this, idx)) nodes.push(this);
-        });
-      else {
-        var excludes = typeof selector === 'string' ? this.filter(selector) :
-            (likeArray(selector) && isF(selector.item)) ? slice.call(selector) : $(selector);
-        this.forEach(function (el) {
-          if (excludes.indexOf(el) < 0) nodes.push(el);
-        });
-      }
-      return $(nodes);
-    },
-    eq: function (idx) {
-      return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1);
-    },
-    first: function () { var el = this[0]; return el && !isO(el) ? el : $(el); },
-    last: function () { var el = this[this.length - 1]; return el && !isO(el) ? el : $(el); },
-    find: function (selector) {
-      var result;
-      if (this.length === 1) result = $$(this[0], selector);
-      else result = this.map(function () { return $$(this, selector); });
-      return $(result);
-    },
-    dedup: function () {
-      var result = this.reduce(function (accum, cur) {
-        if (accum.indexOf(cur) === -1) {
-          accum.push(cur);
+    $.map = function(elements, callback) {
+        var value, values = [], i, key;
+        if (likeArray(elements)) {
+            for (i = 0; i < elements.length; i++) {
+                value = callback(elements[i], i);
+                if (value != null) values.push(value);
+            }
+        } else {
+            for (key in elements) {
+                value = callback(elements[key], key);
+                if (value != null) values.push(value);
+            }
         }
-        return accum;
-      }, []);
-      return $(result);
-    },
-    predicate: function (predicate) {
-      this.map(function (idx, el) {
-        if (typeof predicate === 'string') {
-          return el.withPredicate(predicate).toArray();
+        return flatten(values);
+    };
+
+    $.each = function(elements, callback) {
+        var i, key;
+        if (likeArray(elements)) {
+            for(i = 0; i < elements.length; i++) {
+                if(callback.call(elements[i], i, elements[i]) === false) return elements;
+            }
         } else {
+            for(key in elements) {
+                if(callback.call(elements[key], key, elements[key]) === false) return elements;
+            }
         }
-      });
-    },
-    valueForKey: function (key, value) {
-      var result = this.map(function (idx, el) {
-        if (key in el) {
-          if (el[key]() === value) {
-            return el;
+        return elements;
+    };
+
+    $.fn = {
+        forEach: emptyArray.forEach,
+        reduce: emptyArray.reduce,
+        push: emptyArray.push,
+        indexOf: emptyArray.indexOf,
+        concat: emptyArray.concat,
+        map: function(fn){
+            return $.map(this, function(el, i){ return fn.call(el, i, el); });
+        },
+        slice: function(){
+            return $(slice.apply(this, arguments));
+        },
+        get: function(idx){ return idx === undefined ? slice.call(this) : this[idx]; },
+        size: function(){ return this.length; },
+        each: function(callback) {
+            this.forEach(function(el, idx){ callback.call(el, idx, el); });
+            return this;
+        },
+        filter: function(selector) {
+          var matches
+          for (type in filters) {
+            if (matches = selector.match(selectorPatterns[type])) {
+              matches.shift() // remove the original string, we only want the capture groups
+              return $.map(this, function(e) {
+                return filters[type].apply(e, matches) ? e : null
+              })
+            }
           }
-        }
-        return null;
-      });
-      return $(result);
-    },
-    valueInKey: function (key, val) {
-      var result = this.map(function (idx, el) {
-        if (key in el) {
-          var elKey = el[key]();
-          if (elKey === null) {
-            return null;
-          }
-          // make this a case insensitive search
-          elKey = elKey.toString().toLowerCase();
-          val = val.toString().toLowerCase();
+        },
+        end: function(){
+            return this.prevObject || $();
+        },
+        andSelf:function(){
+            return this.add(this.prevObject || $());
+        },
+        add:function(selector,context){
+            return $(uniq(this.concat($(selector,context))));
+        },
+        is: function(selector){
+            return this.length > 0 && $(this[0]).filter(selector).length > 0;
+        },
+        not: function(selector){
+            var nodes=[];
+            if (isF(selector) && selector.call !== undefined)
+                this.each(function(idx){
+                    if (!selector.call(this,idx)) nodes.push(this);
+                });
+            else {
+                var excludes = typeof selector == 'string' ? this.filter(selector) :
+                        (likeArray(selector) && isF(selector.item)) ? slice.call(selector) : $(selector);
+                this.forEach(function(el){
+                    if (excludes.indexOf(el) < 0) nodes.push(el);
+                });
+            }
+            return $(nodes);
+        },
+        eq: function(idx){
+            return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1);
+        },
+        first: function(){ var el = this[0]; return el && !isO(el) ? el : $(el); },
+        last: function(){ var el = this[this.length - 1]; return el && !isO(el) ? el : $(el); },
+        find: function(selector) {
+            var result;
+            if (this.length == 1) result = $$(this[0], selector);
+            else result = this.map(function(){ return $$(this, selector); });
+            return $(result);
+        },
+        predicate: function(predicate) {
+            return this.map(function(el, idx) {
+                if (typeof predicate == 'string') return el.withPredicate(predicate);
+                else return null;
+            });
+        },
+        valueForKey: function(key, value) {
+            var result = this.map(function(idx, el) {
+                if (key in el && el[key]() == value) {
+                    return el;
+                }
+                return null;
+            });
+            return $(result);
+        },
+        valueInKey: function(key, val) {
+            var result = this.map(function(idx, el) {
+                if (key in el) {
+                    var elKey = el[key]();
+                    if (elKey === null) {
+                        return null;
+                    }
+                    // make this a case insensitive search
+                    elKey = elKey.toString().toLowerCase();
+                    val = val.toString().toLowerCase();
 
-          if (elKey.indexOf(val) !== -1) {
-            return el;
-          }
+                    if (elKey.indexOf(val) !== -1) {
+                        return el;
+                    }
+                }
+                return null;
+            });
+            return $(result);
+        },
+        closest: function(selector, context) {
+            var el = this[0], candidates = $$(context || app, selector);
+            if (!candidates.length) el = null;
+            while (el && candidates.indexOf(el) < 0)
+                el = el !== context && el !== app && el.parent();
+            return $(el);
+        },
+        ancestry: function(selector) {
+            var ancestors = [], elements = this;
+            while (elements.length > 0)
+                elements = $.map(elements, function(node){
+                    if ((node = node.parent()) && !node.isType('UIAApplication') && ancestors.indexOf(node) < 0) {
+                        ancestors.push(node);
+                        return node;
+                    }
+                });
+            return filtered(ancestors, selector);
+        },
+        parent: function(selector) {
+            return filtered(uniq(this.map(function() { return this.parent(); })), selector);
+        },
+        children: function(selector) {
+            return filtered(this.map(function(){ return slice.call(this.elements()); }), selector);
+        },
+        siblings: function(selector) {
+            return filtered(this.map(function(i, el) {
+                return slice.call(el.parent().elements()).filter(function(child){ return child!==el; });
+            }), selector);
+        },
+        next: function(selector) {
+            return filtered(this.map(function() {
+                var els = this.parent().elements().toArray();
+                return els[els.indexOf(this) + 1];
+            }), selector);
+        },
+        prev: function(selector) {
+            return filtered(this.map(function() {
+                var els = this.parent().elements().toArray();
+                return els[els.indexOf(this) - 1];
+            }), selector);
+        },
+        index: function(element) {
+            return element ? this.indexOf($(element)[0]) : this.parent().elements().toArray().indexOf(this[0]);
+        },
+        pluck: function(property) {
+            return this.map(function() {
+                if (typeof this[property] == 'function') return this[property]();
+                else return this[property];
+            });
         }
-        return null;
-      });
-      return $(result);
-    },
-    closest: function (selector, context) {
-      var el = this[0], candidates = $$(context || app, selector);
-      if (!candidates.length) el = null;
-      while (el && candidates.indexOf(el) < 0)
-        el = el !== context && el !== app && el.parent();
-      return $(el);
-    },
-    ancestry: function (selector) {
-      /* jshint loopfunc:true */
-      var ancestors = [], elements = this;
-      while (elements.length > 0)
-        elements = $.map(elements, function (node) {
-          if ((node = node.parent()) && !node.isType('UIAApplication') && ancestors.indexOf(node) < 0) {
-            ancestors.push(node);
-            return node;
-          }
-        });
-      return filtered(ancestors, selector);
-    },
-    parent: function (selector) {
-      return filtered(uniq(this.map(function () { return this.parent(); })), selector);
-    },
-    children: function (selector) {
-      return filtered(this.map(function () { return slice.call(this.elements()); }), selector);
-    },
-    childrenByType: function (type) {
-      var result = this.map(function () {
-        var children = this.elements();
-        var filtered = [];
-        for (var i = 0; i < children.length; i++) {
-          if (children[i].isType(type)) {
-            filtered.push(children[i]);
-          }
-        }
-        return filtered;
-      });
-      return $(result);
-    },
-    siblings: function (selector) {
-      return filtered(this.map(function (i, el) {
-        return slice.call(el.parent().elements()).filter(function (child) { return child !== el; });
-      }), selector);
-    },
-    index: function (element) {
-      return element ? this.indexOf($(element)[0]) : this.parent().elements().toArray().indexOf(this[0]);
-    },
-    pluck: function (property) { return this.map(function () { return this[property]; }); }
-  };
-
-  'filter,add,not,eq,first,last,find,closest,parents,parent,children,siblings'.split(',').forEach(function (property) {
-    var fn = $.fn[property];
-    $.fn[property] = function () {
-      var ret = fn.apply(this, arguments);
-      ret.prevObject = this;
-      return ret;
     };
-  });
 
-  Z.prototype = $.fn;
-  return $;
+    'filter,add,not,eq,first,last,find,closest,parents,parent,children,siblings'.split(',').forEach(function(property) {
+        var fn = $.fn[property];
+        $.fn[property] = function() {
+            var ret = fn.apply(this, arguments);
+            ret.prevObject = this;
+            return ret;
+        };
+    });
+
+    Z.prototype = $.fn;
+    return $;
 })();
@@ -388,35 +410,33 @@
 
-(function ($) {
-  // Save a reference to the local target for convenience
-  var target = UIATarget.localTarget();
-  
-  $.extend($, {
-    log: function (s, level) {
-      level = level || 'message';
-      if (level === 'error') UIALogger.logError(s);
-      else if (level === 'warn') UIALogger.logWarning(s);
-      else if (typeof isVerbose !== "undefined" && isVerbose) {
-        if (level === 'debug') UIALogger.logDebug(s);
-        else UIALogger.logMessage(s);
-      }
-    },
-    error: function (s) { $.log(s, 'error'); },
-    warn: function (s) { $.log(s, 'warn'); },
-    debug: function (s) { $.log(s, 'debug'); },
-    message: function (s) { $.log(s, 'message'); },
-    capture: function (imageName, rect) {
-      imageName = imageName || new Date().toString();
-      if (rect) target.captureRectWithName(rect, imageName);
-      else target.captureScreenWithName(imageName);
-    }
-  });
+(function($) {
+    $.extend($, {
+        log: function(s, level) {
+            level = level || 'message';
+            if (level === 'error') $.error(s);
+            else if (level === 'warn') $.warn(s);
+            else if (typeof $.isVerbose !== "undefined" && $.isVerbose) {
+                if (level === 'debug') $.debug(s);
+                else $.message(s);
+            }
+        },
+        error: function(s) { UIALogger.logError(s); },
+        warn: function(s) { UIALogger.logWarning(s); },
+        debug: function(s) { UIALogger.logDebug(s); },
+        message: function(s) { UIALogger.logMessage(s); },
+        capture: function(imageName, rect) {
+            var target = UIATarget.localTarget();
+            imageName = imageName || new Date().toString();
+            if (rect) target.captureRectWithName(rect, imageName);
+            else target.captureScreenWithName(imageName);
+        }
+    });
 
-  $.extend($.fn, {
-    log: function () { return this.each(function () { this.logElement(); }); },
-    logTree: function () { return this.each(function () { this.logElementTree(); }); },
-    capture: function (imageName) {
-      imageName = imageName || new Date().toString();
-      return this.each(function () { $.capture(imageName + '-' + this.name(), this.rect()); });
-    }
-  });
+    $.extend($.fn, {
+        log: function() { return this.each(function() { this.logElement(); }); },
+        logTree: function () { return this.each(function() { this.logElementTree(); }); },
+        capture: function(imageName) {
+            imageName = imageName || new Date().toString();
+            return this.each(function() { $.capture(imageName + '-' + this.name(), this.rect()); });
+        }
+    });
 })(mechanic);
@@ -427,34 +447,35 @@ //     mechanic.js
 
-(function ($) {
-  var app = UIATarget.localTarget().frontMostApp();
-  $.extend($.fn, {
-    name: function () { return (this.length > 0) ? this[0].name() : null; },
-    label: function () { return (this.length > 0) ? this[0].label() : null; },
-    value: function () { return (this.length > 0) ? this[0].value() : null; },
-    isFocused: function () { return (this.length > 0) ? this[0].hasKeyboardFocus() : false; },
-    isVisible: function () { return (this.length > 0) ? this[0].isVisible() === 1 : false; },
-    isValid: function (certain) {
-      if (this.length > 0) return false;
-      else if (certain) return this[0].checkIsValid();
-      else return this[0].isValid();
-    }
-  });
+(function($) {
+    var app = UIATarget.localTarget().frontMostApp();
+    $.extend($.fn, {
+        name: function() { return (this.length > 0) ? this[0].name() : null; },
+        label: function() { return (this.length > 0) ? this[0].label() : null; },
+        value: function() { return (this.length > 0) ? this[0].value() : null; },
+        isFocused: function() { return (this.length > 0) ? this[0].hasKeyboardFocus() : false; },
+        isEnabled: function() { return (this.length > 0) ? this[0].isEnabled() : false; },
+        isVisible: function() { return (this.length > 0) ? this[0].isVisible() : false; },
+        isValid: function(certain) {
+            if (this.length != 1) return false;
+            else if (certain) return this[0].checkIsValid();
+            else return this[0].isValid();
+        }
+    });
 
-  $.extend($, {
-    version: function () {
-      return app.version();
-    },
-    bundleId: function ()  {
-      return app.bundleID();
-    },
-    prefs: function (prefsOrKey) {
-      // TODO: should we handle no-arg version that returns all prefs???
-      if (typeof prefsToReturn === 'string') return app.preferencesValueForKey();
-      else {
-        $.each(prefsOrKey, function (val, key) {
-          app.setPreferencesValueForKey(val, key);
-        });
-      }
-    }
-  });
+    $.extend($, {
+        version: function() {
+            return app.version();
+        },
+        bundleID: function()  {
+            return app.bundleID();
+        },
+        prefs: function(prefsOrKey) {
+            // TODO: should we handle no-arg version that returns all prefs???
+            if (typeof prefsOrKey == 'string') return app.preferencesValueForKey(prefsOrKey);
+            else {
+                $.each(prefsOrKey, function(key, val) {
+                    app.setPreferencesValueForKey(val, key);
+                });
+            }
+        }
+    });
 
@@ -466,82 +487,82 @@ })(mechanic);
 
-(function ($) {
-  var target = UIATarget.localTarget();
-  $.extend($, {
-    timeout: function (duration) { target.setTimeout(duration); },
-    delay: function (seconds) { target.delay(seconds); },
-    cmd: function (path, args, timeout) { target.host().performTaskWithPathArgumentsTimeout(path, args, timeout); },
-    orientation: function (orientation) {
-      if (orientation === undefined || orientation === null) return target.deviceOrientation();
-      else target.setDeviceOrientation(orientation);
-    },
-    location: function (coordinates, options) {
-      options = options || {};
-      target.setLocationWithOptions(options);
-    },
-    shake: function () { target.shake(); },
-    rotate: function (options) { target.rotateWithOptions(options); },
-    pinchScreen: function (options) {
-      if (!options.style) options.style = 'open';
-      if (options.style === 'close') target.pinchCloseFromToForDuration(options.from, options.to, options.duration);
-      else target.pinchOpenFromToForDuration(options.from, options.to, options.duration);
-    },
-    drag: function (options) { target.dragFromToForDuration(options.from, options.to, options.duration); },
-    flick: function (options) { target.flickFromTo(options.from, options.to); },
-    lock: function (duration) { target.lockForDuration(duration); },
-    backgroundApp: function (duration) { target.deactivateAppForDuration(duration); },
-    volume: function (direction, duration) {
-      if (direction === 'up') {
-        if (duration) target.holdVolumeUp(duration);
-        else target.clickVolumeUp();
-      } else {
-        if (duration) target.holdVolumeDown(duration);
-        else target.clickVolumeDown();
-      }
-    },
-    input: function (s) {
-      target.frontMostApp().keyboard().typeString(s);
-    }
-  });
+(function($) {
+    var target = UIATarget.localTarget();
+    $.extend($, {
+        timeout: function(duration) { target.setTimeout(duration); },
+        delay: function(seconds) { target.delay(seconds); },
+        cmd: function(path, args, timeout) { target.host().performTaskWithPathArgumentsTimeout(path, args, timeout); },
+        orientation: function(orientation) {
+            if (orientation === undefined || orientation === null) return target.deviceOrientation();
+            else target.setDeviceOrientation(orientation);
+        },
+        location: function(coordinates, options) {
+            options = options || {};
+            target.setLocationWithOptions(coordinates, options);
+        },
+        shake: function() { target.shake(); },
+        rotate: function(options) { target.rotateWithOptions(options); },
+        pinchScreen: function(options) {
+            if (!options.style) options.style = 'open';
+            if (options.style === 'close') target.pinchCloseFromToForDuration(options.from, options.to, options.duration);
+            else target.pinchOpenFromToForDuration(options.from, options.to, options.duration);
+        },
+        drag: function(options) { target.dragFromToForDuration(options.from, options.to, options.duration); },
+        flick: function(options) { target.flickFromTo(options.from, options.to); },
+        lock: function(duration) { target.lockForDuration(duration); },
+        backgroundApp: function(duration) { target.deactivateAppForDuration(duration); },
+        volume: function(direction, duration) {
+            if (direction === 'up') {
+                if (duration) target.holdVolumeUp(duration);
+                else target.clickVolumeUp();
+            } else {
+                if (duration) target.holdVolumeDown(duration);
+                else target.clickVolumeDown();
+            }
+        },
+        input: function(s) {
+            target.frontMostApp().keyboard().typeString(s);
+        }
+    });
 
-  $.extend($.fn, {
-    tap: function (options) {
-      options = options || {};
-      return this.each(function () {
-        // TODO: tapWithOptions supports most of the behavior of doubleTap/twoFingerTap looking at the API, do we need to support these methods??
-        if (options.style === 'double') this.doubleTap();
-        else if (options.style === 'twoFinger') this.twoFingerTap();
-        else this.tapWithOptions(options);
-      });
-    },
-    touch: function (duration) {
-      return this.each(function () { this.touchAndHold(duration); });
-    },
-    dragInside: function (options) {
-      return this.each(function () { this.dragInsideWithOptions(options); });
-    },
-    flick: function (options) {
-      return this.each(function () { this.flickInsideWithOptions(options); });
-    },
-    rotate: function (options) {
-      return this.each(function () { this.rotateWithOptions(options); });
-    },
-    scrollToVisible: function () {
-      if (this.length > 0) this[0].scrollToVisible();
-      return this;
-    },
-    input: function (s) {
-      if (this.length > 0) {
-        this[0].tap();
-        $.input(s);
-      }
-    }
-  });
+    $.extend($.fn, {
+        tap: function(options) {
+            options = options || {};
+            return this.each(function() {
+                // TODO: tapWithOptions supports most of the behavior of doubleTap/twoFingerTap looking at the API, do we need to support these methods??
+                if (options.style === 'double') this.doubleTap();
+                else if (options.style === 'twoFinger') this.twoFingerTap();
+                else this.tapWithOptions(options);
+            });
+        },
+        touch: function(duration) {
+            return this.each(function() { this.touchAndHold(duration); });
+        },
+        dragInside: function(options) {
+            return this.each(function() { this.dragInsideWithOptions(options); });
+        },
+        flick: function(options) {
+            return this.each(function() { this.flickInsideWithOptions(options); });
+        },
+        rotate: function(options) {
+            return this.each(function() { this.rotateWithOptions(options); });
+        },
+        scrollToVisible: function() {
+            if (this.length > 0) this[0].scrollToVisible();
+            return this;
+        },
+        input: function(s) {
+            if (this.length > 0) {
+                this[0].tap();
+                $.input(s);
+            }
+        }
+    });
 
-  'delay,cmd,orientation,location,shake,pinchScreen,drag,lock,backgroundApp,volume'.split(',').forEach(function (property) {
-    var fn = $[property];
-    $.fn[property] = function () {
-      fn.apply($, arguments);
-      return this;
-    };
-  });
+    'delay,cmd,orientation,location,shake,pinchScreen,drag,lock,backgroundApp,volume'.split(',').forEach(function(property) {
+        var fn = $[property];
+        $.fn[property] = function() {
+            fn.apply($, arguments);
+            return this;
+        };
+    });
 })(mechanic);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Deprecated

Maintenance

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

90821

increased by5.99%

Number of package files

32

increased by6.67%

Lines of code

2555

increased by2.28%

Number of medium maintenance alerts

0

decreased by-100%

Worsened metrics

Number of low quality alerts

2

increased by100%

No dependency changes