Improve compatibility with compound selectors #126
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| var isUnderScope = require('./is-under-scope'); | ||
| var generateScopeList = require('./generate-scope-list'); | ||
|
|
||
| var isNodeUnderScope = function(node, scopeNode, /*optional*/ignorePseudo, /*optional*/keepPseudo) { | ||
| var nodeScopeList = generateScopeList(node, true); | ||
| var scopeNodeScopeList = generateScopeList(scopeNode, true); | ||
|
|
||
| return isUnderScope(nodeScopeList, scopeNodeScopeList, ignorePseudo, keepPseudo); | ||
| }; | ||
|
|
||
| module.exports = isNodeUnderScope; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
|
|
||
| var log = require('debug')('postcss-css-variables:resolve-decl'); | ||
|
|
||
| var resolveValue = require('./resolve-value'); | ||
| var generateScopeList = require('./generate-scope-list'); | ||
| var gatherVariableDependencies = require('./gather-variable-dependencies'); | ||
|
|
@@ -9,16 +12,91 @@ var shallowCloneNode = require('./shallow-clone-node'); | |
| var findNodeAncestorWithSelector = require('./find-node-ancestor-with-selector'); | ||
| var cloneSpliceParentOntoNodeWhen = require('./clone-splice-parent-onto-node-when'); | ||
|
|
||
| var parser = require('postcss-selector-parser'); | ||
|
There was a problem hiding this comment. Fantastic! I started trying to use this in https://github.com/MadLittleMods/postcss-selector-scope-utility to replace all of the logic here but never got it over the line. |
||
|
|
||
| function equals(a, b) { | ||
| return a && b && a.type !== undefined && a.value !== undefined && a.type === b.type && a.value === b.value; | ||
| } | ||
|
|
||
| function compatible(a, b) { | ||
| var af = a.filter(c => !b.find(d => equals(d, c))); | ||
| var bf = b.filter(c => !a.find(d => equals(d, c))); | ||
| var ac = a.find(c => c.type == 'combinator'); | ||
| var bc = b.find(c => c.type == 'combinator'); | ||
|
|
||
| if(bf.length == 0 && ((!ac && !bc) || equals(ac, bc))) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| function compatible2(a, b) { | ||
| var af = a.filter(c => !b.find(d => equals(d, c))); | ||
| var bf = b.filter(c => !a.find(d => equals(d, c))); | ||
|
|
||
| if(bf.length == 0 && af.length != 0) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
There was a problem hiding this comment. Let's add a comment describing how |
||
|
|
||
| function isSpace(a) { | ||
| return a && a.type === 'combinator' && a.value.trim() === ''; | ||
| } | ||
|
|
||
| function findIndex(s, fn, start) | ||
| { | ||
| if(!start) { | ||
| start = 0; | ||
| } | ||
| else { | ||
| s = s.slice(start); | ||
| } | ||
|
|
||
| var pos = s.findIndex(fn); | ||
|
|
||
| return pos === -1 ? -1 : s.findIndex(fn) + start; | ||
| } | ||
|
|
||
| function parseSelector(selector) { | ||
| var ret; | ||
|
|
||
| parser(selectors => { | ||
| ret = selectors.first.split(selector => selector.type === 'combinator').map(a => a.filter(b => !isSpace(b))); | ||
| }).processSync(selector); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| function removeWildcard(selector) { | ||
| return parser(selectors => { | ||
| selectors.first.nodes[selectors.first.nodes.length-1].remove(); | ||
| }).processSync(selector, { updateSelector: false }); | ||
| } | ||
|
|
||
| function eachMapItemDependencyOfDecl(variablesUsedList, map, decl, cb) { | ||
| log('>>>>>>>>> DECL ' + decl.parent.selector + ' / ' + decl.prop + ' = ' + decl.value); | ||
|
|
||
| var declSelector = decl.parent.selector ? parseSelector(decl.parent) : null; | ||
|
|
||
| log(declSelector); | ||
|
|
||
| // Now find any at-rule declarations that pertains to each rule | ||
| // Loop through the variables used | ||
| variablesUsedList.forEach(function(variableUsedName) { | ||
|
|
||
| log('>>>>>> VAR '+variableUsedName); | ||
|
|
||
| // Find anything in the map that corresponds to that variable | ||
| gatherVariableDependencies(variablesUsedList, map).deps.forEach(function(mapItem, i) { | ||
|
|
||
| log('>>> DEP '+i+' / ' + mapItem.parent.selector + ' / ' + mapItem.prop + ' = ' + mapItem.calculatedInPlaceValue); | ||
|
|
||
| var state = 0; | ||
| var mimicDecl; | ||
| if(mapItem.isUnderAtRule) { | ||
|
|
||
|
|
@@ -41,29 +119,107 @@ function eachMapItemDependencyOfDecl(variablesUsedList, map, decl, cb) { | |
| //console.log(generateScopeList(mapItem.parent, true)); | ||
| //console.log('amd isNodeUnderScope', isNodeUnderScope(mimicDecl.parent, mapItem.parent), mapItem.decl.value); | ||
| } | ||
| else if(mapItem.parent.selector !== decl.parent.selector && declSelector) { | ||
| var s = parseSelector(mapItem.parent); | ||
|
|
||
| log(s); | ||
|
|
||
| var append = null; | ||
| var idx = 0; | ||
| var process = s.length > 1; | ||
| for(var i = 0; i < declSelector.length; i++) { | ||
| var a = declSelector[i]; | ||
| var b = findIndex(s, c => compatible(c, a), idx); | ||
| process |= s.findIndex(c => compatible2(c, a), idx) != -1; | ||
|
|
||
| if(b < idx) { | ||
| // no match: already compatible or wildcard | ||
| if(i === 0) { | ||
| state = 1; | ||
|
There was a problem hiding this comment. Can these states be nice string label constants or symbols? Reasoning about these arbitrary state numbers seems mind bending 🤯 |
||
| break; | ||
| } | ||
| // invalid unless last item | ||
| else if(i != declSelector.length-1) { | ||
| state = 2; | ||
| break; | ||
| } | ||
|
|
||
| log('append', a); | ||
| append = a; | ||
| } | ||
| else { | ||
| // check if the element following the combinator is compatible | ||
| if(s[b].find(a => a.type === 'combinator') && !equals(declSelector[i+1][0], s[b+1][0])) { | ||
| state = 6; | ||
| break; | ||
| } | ||
|
|
||
| idx = b; | ||
| } | ||
| } | ||
|
|
||
| // #foo li:hover a @ compound16.css | ||
| if(state === 0 && !append && idx != s.length-1) { | ||
| state = 3; | ||
| } | ||
|
|
||
| // already compatible | ||
| if(state === 0 && !process) { | ||
| state = 4; | ||
| } | ||
|
|
||
| // compound20.css | ||
| if(state === 1 && s.length != 1 && s[s.length-1].length === 1 && s[s.length-1][0].type === 'universal') { | ||
| state = 5; | ||
| } | ||
|
|
||
| log("STATE", state); | ||
|
|
||
| if(state === 0 || state === 5) { | ||
| // Create a detached clone | ||
| var ruleClone = shallowCloneNode(decl.parent); | ||
| ruleClone.parent = decl.parent.parent; | ||
|
|
||
| // Add the declaration to it | ||
| mimicDecl = decl.clone(); | ||
|
|
||
| ruleClone.append(mimicDecl); | ||
|
|
||
| if(state === 0) { | ||
| ruleClone.selector = mapItem.parent.selector; | ||
|
|
||
| // append last element of selector where needed | ||
| if(append) { | ||
| ruleClone.selector += ' '; | ||
| append.forEach(a => ruleClone.selector += String(a)); | ||
| } | ||
| } | ||
| else if(state === 5) { | ||
| ruleClone.selector = removeWildcard(mapItem.parent.selector).trim() + ' ' + decl.parent.selector; | ||
| } | ||
| else { | ||
| throw new Error("Invalid state: "+state); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // If it is under the proper scope, | ||
| // we need to check because we are iterating over all map entries | ||
| var valid = state === 5 || (mimicDecl && isNodeUnderScope(mimicDecl, mapItem.parent, true)); | ||
|
|
||
| if(valid) { | ||
| cb(mimicDecl, mapItem); | ||
| } | ||
|
|
||
| log('SELECTOR '+(mimicDecl ? mimicDecl.parent.selector : null)); | ||
| log('VALID? '+valid); | ||
| log('<<< DEP '+i+' / ' + mapItem.parent.selector + ' / ' + mapItem.prop + ' = ' + mapItem.calculatedInPlaceValue); | ||
| }); | ||
|
|
||
| log('<<<<<< VAR '+variableUsedName); | ||
| }); | ||
|
|
||
| log('<<<<<<<<< DECL ' + decl.parent.selector + ' / ' + decl.prop + ' = ' + decl.value); | ||
| } | ||
|
|
||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@siilike No worries, I understand. I might just add the comments to the tests where I pointed it out and merge this.
Seems like a decent improvement regardless of the code and us trying to understand it better.