Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions lib/selectors.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ export class Selector extends Optionable {
return false
}

return !set.length ? false
: set.length === 1 ? set[0]
return !set.length
? false
: set.length === 1
? set[0]
: set
}

Expand Down Expand Up @@ -79,10 +81,14 @@ export class Selector extends Optionable {
}

crnt.push(
token.type === CssTerms.CLASS ? this._listContains(token.type, token.data)
: token.type === CssTerms.ATTR ? this._attr(token)
: token.type === CssTerms.PSEUDO_CLASS || token.type === CssTerms.PSEUDO_PSEUDO ? this._pseudo(token)
: token.type === CssTerms.STAR ? Boolean
token.type === CssTerms.CLASS
? this._listContains(token.type, token.data)
: token.type === CssTerms.ATTR
? this._attr(token)
: token.type === CssTerms.PSEUDO_CLASS || token.type === CssTerms.PSEUDO_PSEUDO
? this._pseudo(token)
: token.type === CssTerms.STAR
? Boolean
: this._matches(token.type, token.data)
)
}
Expand All @@ -97,20 +103,24 @@ export class Selector extends Optionable {
return (node) => {
const val = this.options[type](node)
const valArr =
Array.isArray(val) ? val
: val ? val.toString().split(/\s+/)
Array.isArray(val)
? val
: val
? val.toString().split(/\s+/)
: []
return valArr.indexOf(data) >= 0
}
}

_attr (token) {
return token.data.lhs ? this._validAttr(
return token.data.lhs
? this._validAttr(
this.options.attr,
token.data.lhs,
token.data.cmp,
token.data.rhs
) : this._validAttr(this.options.attr, token.data)
)
: this._validAttr(this.options.attr, token.data)
}

_validAttr (fn, lhs, cmp, rhs) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"babel-eslint": "10.1.0",
"codecov": "3.8.1",
"eslint": "7.12.1",
"eslint-config-standard": "16.0.2",
"eslint-config-standard": "16.0.3",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "4.2.1",
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6"
integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw==

[email protected]:
version "16.0.3"
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516"
integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==

eslint-import-resolver-node@^0.3.4:
version "0.3.4"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
Expand Down