refactor: precise element selector over arbitrary sorting

Author: jlp-craigmorten

src/role-helpers.js

@@ -82,45 +82,31 @@ function buildElementRoleList(elementRolesMap) {
     return `${name}${attributes
       .map(({name: attributeName, value, constraints = []}) => {
         const shouldNotExist = constraints.indexOf('undefined') !== -1
-        const hasValue = typeof value !== 'undefined'
-        if (shouldNotExist) {
-          return `:not([${attributeName}])`
-        } else if (hasValue) {
+        const shouldBeNonEmpty = constraints.indexOf('set') !== -1
+        const hasExplicitValue = typeof value !== 'undefined'
+
+        if (hasExplicitValue) {
           return `[${attributeName}="${value}"]`
-        } else {
-          return `[${attributeName}]`
+        } else if (shouldNotExist) {
+          return `:not([${attributeName}])`
+        } else if (shouldBeNonEmpty) {
+          return `[${attributeName}]:not([${attributeName}=""])`
         }
+
+        return `[${attributeName}]`
       })
       .join('')}`
   }
 
   function getSelectorSpecificity({attributes = []}) {
-    return {
-      primaryKey: attributes.length,
-      secondaryKey: attributes.reduce((acc, {value, constraints = []}) => {
-        const shouldNotExist = constraints.indexOf('undefined') !== -1
-        const hasValue = typeof value !== 'undefined'
-
-        if (shouldNotExist) {
-          return acc + 2
-        } else if (hasValue) {
-          return acc + 1
-        }
-
-        return acc
-      }, 0),
-    }
+    return attributes.length
   }
 
   function bySelectorSpecificity(
     {specificity: leftSpecificity},
     {specificity: rightSpecificity},
   ) {
-    if (rightSpecificity.primaryKey !== leftSpecificity.primaryKey) {
-      return rightSpecificity.primaryKey - leftSpecificity.primaryKey
-    }
-
-    return rightSpecificity.secondaryKey - leftSpecificity.secondaryKey
+    return rightSpecificity - leftSpecificity
   }
 
   function match(element) {