with-style 5.0.103 → 5.0.107
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/example.js +1097 -1015
- package/lib/constants.js +1 -1
- package/lib/css/bnf.js +2 -2
- package/lib/css/entries.js +1 -1
- package/lib/css/lexer.js +17 -11
- package/lib/css/parser.js +5 -5
- package/lib/example.js +4 -4
- package/lib/index.js +1 -1
- package/lib/style/declaration.js +13 -5
- package/lib/style/declarations.js +4 -4
- package/lib/style/media.js +2 -2
- package/lib/style/medias.js +4 -4
- package/lib/style/ruleSet.js +2 -2
- package/lib/style/ruleSets.js +4 -4
- package/lib/style.js +1 -1
- package/lib/tagNames.js +1 -1
- package/lib/utilities/className.js +1 -1
- package/lib/utilities/content.js +8 -4
- package/lib/utilities/styles.js +1 -1
- package/package.json +2 -2
- package/src/example.js +3 -1
- package/src/style/declaration.js +16 -5
- package/src/utilities/content.js +9 -3
|
@@ -32,4 +32,4 @@ var _default = {
|
|
|
32
32
|
};
|
|
33
33
|
exports.default = _default;
|
|
34
34
|
|
|
35
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY2xhc3NOYW1lLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBDSEFSQUNURVJTLCBFTVBUWV9TVFJJTkcsIENMQVNTX05BTUVfTEVOR1RIIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCBsZW5ndGggPSBDTEFTU19OQU1FX0xFTkdUSCxcbiAgICAgIGNoYXJhY3RlcnMgPSBDSEFSQUNURVJTLFxuICAgICAgY2hhcmFjdGVyc0xlbmd0aCA9IGNoYXJhY3RlcnMubGVuZ3RoO1xuXG5jb25zdCBjbGFzc05hbWVzID0gW107XG5cbmV4cG9ydCBmdW5jdGlvbiBnZW5lcmF0ZUNsYXNzTmFtZSgpIHtcbiAgbGV0IGNsYXNzTmFtZSA9IEVNUFRZX1NUUklORztcblxuICBmb3IgKGxldCBjb3VudCA9IDA7IGNvdW50IDwgbGVuZ3RoOyBjb3VudCsrKSB7XG4gICAgY29uc3QgaW5kZXggPSBNYXRoLmZsb29yKE1hdGgucmFuZG9tKCkgKiBjaGFyYWN0ZXJzTGVuZ3RoKSxcbiAgICAgICAgICBjaGFyYWN0ZXIgPSBjaGFyYWN0ZXJzW2luZGV4XTtcblxuICAgIGNsYXNzTmFtZSArPSBjaGFyYWN0ZXI7XG4gIH1cblxuICBjb25zdCBjbGFzc05hbWVzSW5jbHVkZXNDbGFzc05hbWUgPSBjbGFzc05hbWVzLmluY2x1ZGVzKGNsYXNzTmFtZSk7XG5cbiAgaWYgKCFjbGFzc05hbWVzSW5jbHVkZXNDbGFzc05hbWUpIHtcbiAgICBjbGFzc05hbWVzLnB1c2goY2xhc3NOYW1lKTtcbiAgfSBlbHNlIHtcbiAgICBjbGFzc05hbWUgPSBnZW5lcmF0ZUNsYXNzTmFtZSgpO1xuICB9XG5cbiAgcmV0dXJuIGNsYXNzTmFtZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJldHJpZXZlQ2xhc3NOYW1lKGVsZW1lbnQpIHtcbiAgY29uc3QgeyBjbGFzc05hbWUgfSA9IGVsZW1lbnQucmVhY3RGdW5jdGlvbiB8fCBlbGVtZW50LnJlYWN0Q29tcG9uZW50LmNvbnN0cnVjdG9yO1xuXG4gIHJldHVybiBjbGFzc05hbWU7XG59XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgZ2VuZXJhdGVDbGFzc05hbWUsXG4gIHJldHJpZXZlQ2xhc3NOYW1lXG59O1xuIl0sIm5hbWVzIjpbImdlbmVyYXRlQ2xhc3NOYW1lIiwicmV0cmlldmVDbGFzc05hbWUiLCJsZW5ndGgiLCJDTEFTU19OQU1FX0xFTkdUSCIsImNoYXJhY3RlcnMiLCJDSEFSQUNURVJTIiwiY2hhcmFjdGVyc0xlbmd0aCIsImNsYXNzTmFtZXMiLCJjbGFzc05hbWUiLCJFTVBUWV9TVFJJTkciLCJjb3VudCIsImluZGV4IiwiTWF0aCIsImZsb29yIiwicmFuZG9tIiwiY2hhcmFjdGVyIiwiY2xhc3NOYW1lc0luY2x1ZGVzQ2xhc3NOYW1lIiwiaW5jbHVkZXMiLCJwdXNoIiwiZWxlbWVudCIsInJlYWN0RnVuY3Rpb24iLCJyZWFjdENvbXBvbmVudCIsImNvbnN0cnVjdG9yIl0sIm1hcHBpbmdzIjoiQUFBQSxZQUFZLENBQUM7Ozs7UUFVR0EsaUJBQWlCLEdBQWpCQSxpQkFBaUI7UUFxQmpCQyxpQkFBaUIsR0FBakJBLGlCQUFpQjs7QUE3QjJCLElBQUEsVUFBYyxXQUFkLGNBQWMsQ0FBQTtBQUUxRSxJQUFNQyxNQUFNLEdBQUdDLFVBQWlCLGtCQUFBLEVBQzFCQyxVQUFVLEdBQUdDLFVBQVUsV0FBQSxFQUN2QkMsZ0JBQWdCLEdBQUdGLFVBQVUsQ0FBQ0YsTUFBTSxBQUFDO0FBRTNDLElBQU1LLFVBQVUsR0FBRyxFQUFFLEFBQUM7QUFFZixTQUFTUCxpQkFBaUIsR0FBRztJQUNsQyxJQUFJUSxTQUFTLEdBQUdDLFVBQVksYUFBQSxBQUFDO0lBRTdCLElBQUssSUFBSUMsS0FBSyxHQUFHLENBQUMsRUFBRUEsS0FBSyxHQUFHUixNQUFNLEVBQUVRLEtBQUssRUFBRSxDQUFFO1FBQzNDLElBQU1DLEtBQUssR0FBR0MsSUFBSSxDQUFDQyxLQUFLLENBQUNELElBQUksQ0FBQ0UsTUFBTSxFQUFFLEdBQUdSLGdCQUFnQixDQUFDLEVBQ3BEUyxTQUFTLEdBQUdYLFVBQVUsQ0FBQ08sS0FBSyxDQUFDLEFBQUM7UUFFcENILFNBQVMsSUFBSU8sU0FBUyxDQUFDO0tBQ3hCO0lBRUQsSUFBTUMsMkJBQTJCLEdBQUdULFVBQVUsQ0FBQ1UsUUFBUSxDQUFDVCxTQUFTLENBQUMsQUFBQztJQUVuRSxJQUFJLENBQUNRLDJCQUEyQixFQUFFO1FBQ2hDVCxVQUFVLENBQUNXLElBQUksQ0FBQ1YsU0FBUyxDQUFDLENBQUM7S0FDNUIsTUFBTTtRQUNMQSxTQUFTLEdBQUdSLGlCQUFpQixFQUFFLENBQUM7S0FDakM7SUFFRCxPQUFPUSxTQUFTLENBQUM7Q0FDbEI7QUFFTSxTQUFTUCxpQkFBaUIsQ0FBQ2tCLE9BQU8sRUFBRTtJQUN6QyxJQUFNLEFBQUVYLFNBQVMsR0FBS1csQ0FBQUEsT0FBTyxDQUFDQyxhQUFhLElBQUlELE9BQU8sQ0FBQ0UsY0FBYyxDQUFDQyxXQUFXLENBQUEsQ0FBekVkLFNBQVMsQUFBZ0UsQUFBQztJQUVsRixPQUFPQSxTQUFTLENBQUM7Q0FDbEI7ZUFFYztJQUNiUixpQkFBaUIsRUFBakJBLGlCQUFpQjtJQUNqQkMsaUJBQWlCLEVBQWpCQSxpQkFBaUI7Q0FDbEIifQ==
|
package/lib/utilities/content.js
CHANGED
|
@@ -7,9 +7,13 @@ var _necessary = require("necessary");
|
|
|
7
7
|
var _constants = require("../constants");
|
|
8
8
|
var first = _necessary.arrayUtilities.first;
|
|
9
9
|
function contentFromQueryNodeAndTokens(query, node, tokens) {
|
|
10
|
-
var
|
|
11
|
-
node =
|
|
12
|
-
|
|
10
|
+
var content = null;
|
|
11
|
+
var nodes = query.execute(node), nodesLength = nodes.length;
|
|
12
|
+
if (nodesLength > 0) {
|
|
13
|
+
var firstNode = first(nodes);
|
|
14
|
+
node = firstNode; ///
|
|
15
|
+
content = contentFromNodeAndTokens(node, tokens);
|
|
16
|
+
}
|
|
13
17
|
return content;
|
|
14
18
|
}
|
|
15
19
|
function contentFromNodeAndTokens(node, tokens) {
|
|
@@ -22,4 +26,4 @@ function contentFromNodeAndTokens(node, tokens) {
|
|
|
22
26
|
return content;
|
|
23
27
|
}
|
|
24
28
|
|
|
25
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgeyBmaXJzdCB9ID0gYXJyYXlVdGlsaXRpZXM7XG5cbmV4cG9ydCBmdW5jdGlvbiBjb250ZW50RnJvbVF1ZXJ5Tm9kZUFuZFRva2VucyhxdWVyeSwgbm9kZSwgdG9rZW5zKSB7XG4gIGxldCBjb250ZW50ID0gbnVsbDtcblxuICBjb25zdCBub2RlcyA9IHF1ZXJ5LmV4ZWN1dGUobm9kZSksXG4gICAgICAgIG5vZGVzTGVuZ3RoID0gbm9kZXMubGVuZ3RoO1xuXG4gIGlmIChub2Rlc0xlbmd0aCA+IDApIHtcbiAgICBjb25zdCBmaXJzdE5vZGUgPSBmaXJzdChub2Rlcyk7XG5cbiAgICBub2RlID0gZmlyc3ROb2RlOyAvLy9cblxuICAgIGNvbnRlbnQgPSBjb250ZW50RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKTtcbiAgfVxuXG4gIHJldHVybiBjb250ZW50O1xufVxuXG5mdW5jdGlvbiBjb250ZW50RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gIGNvbnN0IGZpcnN0U2lnbmlmaWNhbnRUb2tlbiA9IG5vZGUuZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuKCksXG4gICAgICAgIGxhc3RTaWduaWZpY2FudFRva2VuID0gbm9kZS5nZXRMYXN0U2lnbmlmaWNhbnRUb2tlbigpLFxuICAgICAgICBmaXJzdFRva2VuID0gZmlyc3RTaWduaWZpY2FudFRva2VuLCAvLy9cbiAgICAgICAgbGFzdFRva2VuID0gbGFzdFNpZ25pZmljYW50VG9rZW4sIC8vL1xuICAgICAgICBmaXJzdFRva2VuSW5kZXggPSB0b2tlbnMuaW5kZXhPZihmaXJzdFRva2VuKSxcbiAgICAgICAgbGFzdFRva2VuSW5kZXggPSB0b2tlbnMuaW5kZXhPZihsYXN0VG9rZW4pO1xuXG4gIGxldCBjb250ZW50ID0gRU1QVFlfU1RSSU5HO1xuXG4gIGZvciAobGV0IGluZGV4ID0gZmlyc3RUb2tlbkluZGV4OyBpbmRleCA8PSBsYXN0VG9rZW5JbmRleDsgaW5kZXgrKykge1xuICAgIGNvbnN0IHRva2VuID0gdG9rZW5zW2luZGV4XSxcbiAgICAgICAgICB0b2tlbkNvbnRlbnQgPSB0b2tlbi5nZXRDb250ZW50KCk7XG5cbiAgICBjb250ZW50ICs9IHRva2VuQ29udGVudDtcbiAgfVxuXG4gIHJldHVybiBjb250ZW50O1xufVxuIl0sIm5hbWVzIjpbImNvbnRlbnRGcm9tUXVlcnlOb2RlQW5kVG9rZW5zIiwiZmlyc3QiLCJhcnJheVV0aWxpdGllcyIsInF1ZXJ5Iiwibm9kZSIsInRva2VucyIsImNvbnRlbnQiLCJub2RlcyIsImV4ZWN1dGUiLCJub2Rlc0xlbmd0aCIsImxlbmd0aCIsImZpcnN0Tm9kZSIsImNvbnRlbnRGcm9tTm9kZUFuZFRva2VucyIsImZpcnN0U2lnbmlmaWNhbnRUb2tlbiIsImdldEZpcnN0U2lnbmlmaWNhbnRUb2tlbiIsImxhc3RTaWduaWZpY2FudFRva2VuIiwiZ2V0TGFzdFNpZ25pZmljYW50VG9rZW4iLCJmaXJzdFRva2VuIiwibGFzdFRva2VuIiwiZmlyc3RUb2tlbkluZGV4IiwiaW5kZXhPZiIsImxhc3RUb2tlbkluZGV4IiwiRU1QVFlfU1RSSU5HIiwiaW5kZXgiLCJ0b2tlbiIsInRva2VuQ29udGVudCIsImdldENvbnRlbnQiXSwibWFwcGluZ3MiOiJBQUFBLFlBQVksQ0FBQzs7OztRQVFHQSw2QkFBNkIsR0FBN0JBLDZCQUE2QjtBQU5kLElBQUEsVUFBVyxXQUFYLFdBQVcsQ0FBQTtBQUViLElBQUEsVUFBYyxXQUFkLGNBQWMsQ0FBQTtBQUUzQyxJQUFNLEFBQUVDLEtBQUssR0FBS0MsVUFBYyxlQUFBLENBQXhCRCxLQUFLLEFBQW1CLEFBQUM7QUFFMUIsU0FBU0QsNkJBQTZCLENBQUNHLEtBQUssRUFBRUMsSUFBSSxFQUFFQyxNQUFNLEVBQUU7SUFDakUsSUFBSUMsT0FBTyxHQUFHLElBQUksQUFBQztJQUVuQixJQUFNQyxLQUFLLEdBQUdKLEtBQUssQ0FBQ0ssT0FBTyxDQUFDSixJQUFJLENBQUMsRUFDM0JLLFdBQVcsR0FBR0YsS0FBSyxDQUFDRyxNQUFNLEFBQUM7SUFFakMsSUFBSUQsV0FBVyxHQUFHLENBQUMsRUFBRTtRQUNuQixJQUFNRSxTQUFTLEdBQUdWLEtBQUssQ0FBQ00sS0FBSyxDQUFDLEFBQUM7UUFFL0JILElBQUksR0FBR08sU0FBUyxDQUFDLENBQUMsR0FBRztRQUVyQkwsT0FBTyxHQUFHTSx3QkFBd0IsQ0FBQ1IsSUFBSSxFQUFFQyxNQUFNLENBQUMsQ0FBQztLQUNsRDtJQUVELE9BQU9DLE9BQU8sQ0FBQztDQUNoQjtBQUVELFNBQVNNLHdCQUF3QixDQUFDUixJQUFJLEVBQUVDLE1BQU0sRUFBRTtJQUM5QyxJQUFNUSxxQkFBcUIsR0FBR1QsSUFBSSxDQUFDVSx3QkFBd0IsRUFBRSxFQUN2REMsb0JBQW9CLEdBQUdYLElBQUksQ0FBQ1ksdUJBQXVCLEVBQUUsRUFDckRDLFVBQVUsR0FBR0oscUJBQXFCLEVBQ2xDSyxTQUFTLEdBQUdILG9CQUFvQixFQUNoQ0ksZUFBZSxHQUFHZCxNQUFNLENBQUNlLE9BQU8sQ0FBQ0gsVUFBVSxDQUFDLEVBQzVDSSxjQUFjLEdBQUdoQixNQUFNLENBQUNlLE9BQU8sQ0FBQ0YsU0FBUyxDQUFDLEFBQUM7SUFFakQsSUFBSVosT0FBTyxHQUFHZ0IsVUFBWSxhQUFBLEFBQUM7SUFFM0IsSUFBSyxJQUFJQyxLQUFLLEdBQUdKLGVBQWUsRUFBRUksS0FBSyxJQUFJRixjQUFjLEVBQUVFLEtBQUssRUFBRSxDQUFFO1FBQ2xFLElBQU1DLEtBQUssR0FBR25CLE1BQU0sQ0FBQ2tCLEtBQUssQ0FBQyxFQUNyQkUsWUFBWSxHQUFHRCxLQUFLLENBQUNFLFVBQVUsRUFBRSxBQUFDO1FBRXhDcEIsT0FBTyxJQUFJbUIsWUFBWSxDQUFDO0tBQ3pCO0lBRUQsT0FBT25CLE9BQU8sQ0FBQztDQUNoQiJ9
|
package/lib/utilities/styles.js
CHANGED
|
@@ -60,4 +60,4 @@ function retrieveStylesCSS() {
|
|
|
60
60
|
return stylesCSS1;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3R5bGVzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgU3R5bGUgZnJvbSBcIi4uL3N0eWxlXCI7XG5pbXBvcnQgQ1NTTGV4ZXIgZnJvbSBcIi4uL2Nzcy9sZXhlclwiO1xuaW1wb3J0IENTU1BhcnNlciBmcm9tIFwiLi4vY3NzL3BhcnNlclwiO1xuXG5pbXBvcnQgeyBIRUFELCBTVFlMRSwgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCBjc3NMZXhlciA9IENTU0xleGVyLmZyb21Ob3RoaW5nKCksXG4gICAgICBjc3NQYXJzZXIgPSBDU1NQYXJzZXIuZnJvbU5vdGhpbmcoKTtcblxuaWYgKCFnbG9iYWxUaGlzLnN0eWxlTWFwKSB7XG4gIGdsb2JhbFRoaXMuc3R5bGVNYXAgPSB7fTtcbn1cblxuY29uc3QgeyBzdHlsZU1hcCB9ID0gZ2xvYmFsVGhpcztcblxuZnVuY3Rpb24gcmVuZGVyU3R5bGUoc3R5bGUpIHtcbiAgY29uc3QgaGVhZERPTUVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKEhFQUQpLFxuICAgICAgICBzdHlsZURPTUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KFNUWUxFKSxcbiAgICAgICAgaW5uZXJIVE1MID0gYFxuICAgICAgICBcbiR7c3R5bGV9YDtcblxuICBPYmplY3QuYXNzaWduKHN0eWxlRE9NRWxlbWVudCwge1xuICAgIGlubmVySFRNTFxuICB9KTtcblxuICBoZWFkRE9NRWxlbWVudC5hcHBlbmRDaGlsZChzdHlsZURPTUVsZW1lbnQpO1xufVxuXG5mdW5jdGlvbiByZW5kZXJTdHlsZXMoKSB7XG4gIGNvbnN0IHN0eWxlc0NTUyA9IHJldHJpZXZlU3R5bGVzQ1NTKCksXG4gICAgICAgIHN0eWxlID0gc3R5bGVzQ1NTOyAgLy8vXG5cbiAgcmVuZGVyU3R5bGUoc3R5bGUpO1xufVxuXG5mdW5jdGlvbiBnZW5lcmF0ZVN0eWxlKGFyZ3MsIGNsYXNzTmFtZSwgc3VwZXJTdHlsZSA9IG51bGwpIHtcbiAgY29uc3Qgc3RyaW5ncyA9IGFyZ3Muc2hpZnQoKSxcdC8vL1xuICAgICAgICBjb250ZW50ID0gc3RyaW5ncy5yZWR1Y2UoKGNvbnRlbnQsIHN0cmluZywgaW5kZXgpID0+
|
|
63
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3R5bGVzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgU3R5bGUgZnJvbSBcIi4uL3N0eWxlXCI7XG5pbXBvcnQgQ1NTTGV4ZXIgZnJvbSBcIi4uL2Nzcy9sZXhlclwiO1xuaW1wb3J0IENTU1BhcnNlciBmcm9tIFwiLi4vY3NzL3BhcnNlclwiO1xuXG5pbXBvcnQgeyBIRUFELCBTVFlMRSwgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCBjc3NMZXhlciA9IENTU0xleGVyLmZyb21Ob3RoaW5nKCksXG4gICAgICBjc3NQYXJzZXIgPSBDU1NQYXJzZXIuZnJvbU5vdGhpbmcoKTtcblxuaWYgKCFnbG9iYWxUaGlzLnN0eWxlTWFwKSB7XG4gIGdsb2JhbFRoaXMuc3R5bGVNYXAgPSB7fTtcbn1cblxuY29uc3QgeyBzdHlsZU1hcCB9ID0gZ2xvYmFsVGhpcztcblxuZnVuY3Rpb24gcmVuZGVyU3R5bGUoc3R5bGUpIHtcbiAgY29uc3QgaGVhZERPTUVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKEhFQUQpLFxuICAgICAgICBzdHlsZURPTUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KFNUWUxFKSxcbiAgICAgICAgaW5uZXJIVE1MID0gYFxuICAgICAgICBcbiR7c3R5bGV9YDtcblxuICBPYmplY3QuYXNzaWduKHN0eWxlRE9NRWxlbWVudCwge1xuICAgIGlubmVySFRNTFxuICB9KTtcblxuICBoZWFkRE9NRWxlbWVudC5hcHBlbmRDaGlsZChzdHlsZURPTUVsZW1lbnQpO1xufVxuXG5mdW5jdGlvbiByZW5kZXJTdHlsZXMoKSB7XG4gIGNvbnN0IHN0eWxlc0NTUyA9IHJldHJpZXZlU3R5bGVzQ1NTKCksXG4gICAgICAgIHN0eWxlID0gc3R5bGVzQ1NTOyAgLy8vXG5cbiAgcmVuZGVyU3R5bGUoc3R5bGUpO1xufVxuXG5mdW5jdGlvbiBnZW5lcmF0ZVN0eWxlKGFyZ3MsIGNsYXNzTmFtZSwgc3VwZXJTdHlsZSA9IG51bGwpIHtcbiAgY29uc3Qgc3RyaW5ncyA9IGFyZ3Muc2hpZnQoKSxcdC8vL1xuICAgICAgICBjb250ZW50ID0gc3RyaW5ncy5yZWR1Y2UoKGNvbnRlbnQsIHN0cmluZywgaW5kZXgpID0+IHtcbiAgICAgICAgICBjb25zdCBhcmcgPSBhcmdzW2luZGV4XTtcblxuICAgICAgICAgIGNvbnRlbnQgPSAoYXJnICE9PSB1bmRlZmluZWQpID9cbiAgICAgICAgICAgICAgICAgICAgICBgJHtjb250ZW50fSR7c3RyaW5nfSR7YXJnfWAgOlxuICAgICAgICAgICAgICAgICAgICAgICAgYCR7Y29udGVudH0ke3N0cmluZ31gO1xuXG4gICAgICAgICAgcmV0dXJuIGNvbnRlbnQ7XG4gICAgICAgIH0sIEVNUFRZX1NUUklORyksXG4gICAgICAgIHRva2VucyA9IGNzc0xleGVyLnRva2VuaXNlKGNvbnRlbnQpLFxuICAgICAgICBub2RlID0gY3NzUGFyc2VyLnBhcnNlKHRva2VucyksXG4gICAgICAgIHN0eWxlID0gU3R5bGUuZnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKTtcblxuICAgICAgICBpZiAoc3VwZXJTdHlsZSAhPT0gbnVsbCkge1xuICAgICAgICAgIHN0eWxlLmV4dGVuZHMoc3VwZXJTdHlsZSk7XG4gICAgICAgIH1cblxuICAgICAgICBzdHlsZU1hcFtjbGFzc05hbWVdID0gc3R5bGU7XG59XG5cbmZ1bmN0aW9uIHJldHJpZXZlU3R5bGUoY2xhc3NOYW1lKSB7XG4gIGNvbnN0IHN0eWxlID0gc3R5bGVNYXBbY2xhc3NOYW1lXSB8fCBudWxsO1xuXG4gIHJldHVybiBzdHlsZTtcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuICByZW5kZXJTdHlsZSxcbiAgcmVuZGVyU3R5bGVzLFxuICBnZW5lcmF0ZVN0eWxlLFxuICByZXRyaWV2ZVN0eWxlXG59O1xuXG5mdW5jdGlvbiByZXRyaWV2ZVN0eWxlc0NTUygpIHtcbiAgY29uc3QgY2xhc3NOYW1lcyA9IE9iamVjdC5rZXlzKHN0eWxlTWFwKSxcbiAgICAgICAgc3R5bGVzQ1NTID0gY2xhc3NOYW1lcy5yZWR1Y2UoKHN0eWxlc0NTUywgY2xhc3NOYW1lKSA9PiB7XG4gICAgICAgICAgY29uc3Qgc3R5bGUgPSByZXRyaWV2ZVN0eWxlKGNsYXNzTmFtZSksXG4gICAgICAgICAgICAgICAgc3R5bGVDU1MgPSBzdHlsZS5hc0NTUyhjbGFzc05hbWUpO1xuXG4gICAgICAgICAgc3R5bGVzQ1NTICs9IHN0eWxlQ1NTO1xuXG4gICAgICAgICAgcmV0dXJuIHN0eWxlc0NTUztcbiAgICAgICAgfSwgRU1QVFlfU1RSSU5HKTtcblxuICByZXR1cm4gc3R5bGVzQ1NTO1xufVxuIl0sIm5hbWVzIjpbImNzc0xleGVyIiwiQ1NTTGV4ZXIiLCJmcm9tTm90aGluZyIsImNzc1BhcnNlciIsIkNTU1BhcnNlciIsImdsb2JhbFRoaXMiLCJzdHlsZU1hcCIsInJlbmRlclN0eWxlIiwic3R5bGUiLCJoZWFkRE9NRWxlbWVudCIsImRvY3VtZW50IiwicXVlcnlTZWxlY3RvciIsIkhFQUQiLCJzdHlsZURPTUVsZW1lbnQiLCJjcmVhdGVFbGVtZW50IiwiU1RZTEUiLCJpbm5lckhUTUwiLCJPYmplY3QiLCJhc3NpZ24iLCJhcHBlbmRDaGlsZCIsInJlbmRlclN0eWxlcyIsInN0eWxlc0NTUyIsInJldHJpZXZlU3R5bGVzQ1NTIiwiZ2VuZXJhdGVTdHlsZSIsImFyZ3MiLCJjbGFzc05hbWUiLCJzdXBlclN0eWxlIiwic3RyaW5ncyIsInNoaWZ0IiwiY29udGVudCIsInJlZHVjZSIsInN0cmluZyIsImluZGV4IiwiYXJnIiwidW5kZWZpbmVkIiwiRU1QVFlfU1RSSU5HIiwidG9rZW5zIiwidG9rZW5pc2UiLCJub2RlIiwicGFyc2UiLCJTdHlsZSIsImZyb21Ob2RlQW5kVG9rZW5zIiwiZXh0ZW5kcyIsInJldHJpZXZlU3R5bGUiLCJjbGFzc05hbWVzIiwia2V5cyIsInN0eWxlQ1NTIiwi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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "with-style",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "5.0.
|
|
4
|
+
"version": "5.0.107",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/with-style",
|
|
7
7
|
"description": "Programmatic styles.",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"necessary": "^11.0.40",
|
|
14
14
|
"occam-dom": "^3.0.97",
|
|
15
15
|
"occam-lexers": "^16.0.20",
|
|
16
|
-
"occam-parsers": "^16.0.
|
|
16
|
+
"occam-parsers": "^16.0.48"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@swc/core": "^1.2.50",
|
package/src/example.js
CHANGED
|
@@ -24,6 +24,8 @@ const monospaceFontMixin = `
|
|
|
24
24
|
|
|
25
25
|
generateStyle([[`
|
|
26
26
|
|
|
27
|
+
width: auto !important;
|
|
28
|
+
|
|
27
29
|
display: none;
|
|
28
30
|
|
|
29
31
|
.active {
|
|
@@ -37,7 +39,7 @@ const superStyle = retrieveStyle("abc");
|
|
|
37
39
|
generateStyle([[`
|
|
38
40
|
|
|
39
41
|
color: transparent;
|
|
40
|
-
width:
|
|
42
|
+
width: auto;
|
|
41
43
|
height: 100%;
|
|
42
44
|
cursor: auto;
|
|
43
45
|
resize: none;
|
package/src/style/declaration.js
CHANGED
|
@@ -2,15 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
import { Query } from "occam-dom";
|
|
4
4
|
|
|
5
|
+
import { EMPTY_STRING } from "../constants";
|
|
5
6
|
import { contentFromQueryNodeAndTokens } from "../utilities/content";
|
|
6
7
|
|
|
7
|
-
const
|
|
8
|
+
const priorityQuery = Query.fromExpression("/*/priority"),
|
|
9
|
+
propertyQuery = Query.fromExpression("/*/property"),
|
|
8
10
|
expressionQuery = Query.fromExpression("/*/expression");
|
|
9
11
|
|
|
10
12
|
export default class Declaration {
|
|
11
|
-
constructor(property, expression) {
|
|
13
|
+
constructor(property, expression, priority) {
|
|
12
14
|
this.property = property;
|
|
13
15
|
this.expression = expression;
|
|
16
|
+
this.priority = priority;
|
|
14
17
|
}
|
|
15
18
|
|
|
16
19
|
getProperty() {
|
|
@@ -21,6 +24,10 @@ export default class Declaration {
|
|
|
21
24
|
return this.expression;
|
|
22
25
|
}
|
|
23
26
|
|
|
27
|
+
getPriority() {
|
|
28
|
+
return this.priority;
|
|
29
|
+
}
|
|
30
|
+
|
|
24
31
|
checkMatches(declarations) {
|
|
25
32
|
const matches = declarations.some((declaration) => {
|
|
26
33
|
const property = declaration.getProperty(),
|
|
@@ -36,8 +43,8 @@ export default class Declaration {
|
|
|
36
43
|
|
|
37
44
|
asCSS(indent, last) {
|
|
38
45
|
const css = last ?
|
|
39
|
-
`${indent}${this.property}: ${this.expression};` :
|
|
40
|
-
`${indent}${this.property}: ${this.expression};\n`;
|
|
46
|
+
`${indent}${this.property}: ${this.expression}${this.priority};` :
|
|
47
|
+
`${indent}${this.property}: ${this.expression}${this.priority};\n`;
|
|
41
48
|
|
|
42
49
|
return css;
|
|
43
50
|
}
|
|
@@ -45,9 +52,13 @@ export default class Declaration {
|
|
|
45
52
|
static fromNodeAndTokens(node, tokens) {
|
|
46
53
|
const propertyContent = contentFromQueryNodeAndTokens(propertyQuery, node, tokens),
|
|
47
54
|
expressionContent = contentFromQueryNodeAndTokens(expressionQuery, node, tokens),
|
|
55
|
+
priorityContent = contentFromQueryNodeAndTokens(priorityQuery, node, tokens),
|
|
48
56
|
property = propertyContent, ///
|
|
49
57
|
expression = expressionContent, ///
|
|
50
|
-
|
|
58
|
+
priority = (priorityContent === null) ?
|
|
59
|
+
EMPTY_STRING :
|
|
60
|
+
` ${priorityContent}`,
|
|
61
|
+
declaration = new Declaration(property, expression, priority);
|
|
51
62
|
|
|
52
63
|
return declaration;
|
|
53
64
|
}
|
package/src/utilities/content.js
CHANGED
|
@@ -7,12 +7,18 @@ import { EMPTY_STRING } from "../constants";
|
|
|
7
7
|
const { first } = arrayUtilities;
|
|
8
8
|
|
|
9
9
|
export function contentFromQueryNodeAndTokens(query, node, tokens) {
|
|
10
|
+
let content = null;
|
|
11
|
+
|
|
10
12
|
const nodes = query.execute(node),
|
|
11
|
-
|
|
13
|
+
nodesLength = nodes.length;
|
|
14
|
+
|
|
15
|
+
if (nodesLength > 0) {
|
|
16
|
+
const firstNode = first(nodes);
|
|
12
17
|
|
|
13
|
-
|
|
18
|
+
node = firstNode; ///
|
|
14
19
|
|
|
15
|
-
|
|
20
|
+
content = contentFromNodeAndTokens(node, tokens);
|
|
21
|
+
}
|
|
16
22
|
|
|
17
23
|
return content;
|
|
18
24
|
}
|