@cypress/unique-selector 1.0.0 → 1.1.0

package/lib/{getData.js → getAttribute.js}

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 /**
- * Returns the data-{dataAttr} selector of the element
- * @param  { String } selectorType - The type of selector to return.
+ * Returns the {attr} selector of the element
+ * @param  { String } selectorType - The attribute selector to return.
  * @param  { String } attributes - The attributes of the element.
- * @return { String | null } - The data-{dataAttr} selector of the element.
+ * @return { String | null } - The {attr} selector of the element.
  */
 
-var getData = exports.getData = function getData(selectorType, attributes) {
+var getAttribute = exports.getAttribute = function getAttribute(selectorType, attributes) {
   for (var i = 0; i < attributes.length; i++) {
     // extract node name + value
     var _attributes$i = attributes[i],

package/lib/index.js

@@ -23,13 +23,14 @@ var _isUnique = require('./isUnique');
 
 var _getParents = require('./getParents');
 
-var _getData = require('./getData');
+var _getAttribute = require('./getAttribute');
 
 function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } /**
                                                                                                                                                                                                      * Expose `unique`
                                                                                                                                                                                                      */
 
-var dataRegex = /^data-(.+)/;
+var dataRegex = /^data-.+/;
+var attrRegex = /^attribute:(.+)/m;
 
 /**
  * Returns all the selectors of the element
@@ -49,7 +50,7 @@ function getAllSelectors(el, selectors, attributesToIgnore) {
   };
 
   return selectors.filter(function (selector) {
-    return !dataRegex.test(selector);
+    return !dataRegex.test(selector) && !attrRegex.test(selector);
   }).reduce(function (res, next) {
     res[next] = funcs[next](el);
     return res;
@@ -136,20 +137,23 @@ function getUniqueSelector(element, selectorTypes, attributesToIgnore) {
       var selector = elementSelectors[selectorType];
 
       // if we are a data attribute
-      if (dataRegex.test(selectorType)) {
-        var dataSelector = (0, _getData.getData)(selectorType, attributes);
-
-        // if we found a selector via data attributes
-        if (dataSelector) {
-          selector = dataSelector;
-          selectorType = 'data';
+      var isDataAttributeSelectorType = dataRegex.test(selectorType);
+      var isAttributeSelectorType = !isDataAttributeSelectorType && attrRegex.test(selectorType);
+      if (isDataAttributeSelectorType || isAttributeSelectorType) {
+        var attributeToQuery = isDataAttributeSelectorType ? selectorType : selectorType.replace(attrRegex, '$1');
+        var attributeSelector = (0, _getAttribute.getAttribute)(attributeToQuery, attributes);
+
+        // if we found a selector via attribute
+        if (attributeSelector) {
+          selector = attributeSelector;
+          selectorType = 'attribute';
         }
       }
 
       if (!Boolean(selector)) continue;
 
       switch (selectorType) {
-        case 'data':
+        case 'attribute':
         case 'id':
         case 'name':
         case 'tag':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cypress/unique-selector",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Given a DOM node, return a unique CSS selector matching only that element",
   "main": "./lib/index.js",
   "jsnext:main": "./src/index.js",