Declaration fixes for root specifity

Author: dqbd

lib/is-under-scope.js

@@ -2,6 +2,7 @@ var escapeStringRegexp = require('escape-string-regexp');
 
 var isPieceAlwaysAncestorSelector = require('./is-piece-always-ancestor-selector');
 var generateDirectDescendantPiecesFromSelector = require('./generate-direct-descendant-pieces-from-selector');
+var isPieceRootSpecificSelector = require('./is-piece-root-specific-selector')
 
 var RE_AT_RULE_SCOPE_PIECE  = (/^@.*/);
 // This will match pseudo selectors that have a base part
@@ -51,7 +52,12 @@ function getScopeMatchResults(nodeScopeList, scopeNodeScopeList) {
 					//
 					// Or the node scope piece could be an always-ancestor selector itself
 					// And we only want the first occurence so we can keep matching future scope pieces
-					if(isPieceAlwaysAncestorSelector(scopePiece) || isPieceAlwaysAncestorSelector(nodeScopePiece)) {
+					if(
+						!isPieceRootSpecificSelector(scopePiece) && !isPieceRootSpecificSelector(nodeScopePiece) && (
+							isPieceAlwaysAncestorSelector(scopePiece) ||
+							isPieceAlwaysAncestorSelector(nodeScopePiece)
+						)
+					) {
 						foundIndex = overallIndex;
 
 						break;

lib/resolve-decl.js

@@ -28,6 +28,14 @@ function eachMapItemDependencyOfDecl(variablesUsedList, map, decl, cb) {
 				var innerMostAtRuleSelector = varDeclScopeList[0].slice(-1)[0];
 				var nodeToSpliceParentOnto = findNodeAncestorWithSelector(innerMostAtRuleSelector, decl.parent);
 
+				// attept to add a specific root scope if necessary
+				if (mapItem.isRootSpecific) {
+					const varDeclRootRule = mapItem.parent
+					const nodeToSpliceParentOnto = findNodeAncestorWithSelector(mapItem.parent.selector, decl.parent)
+
+					mimicDecl = cloneSpliceParentOntoNodeWhen(decl, varDeclRootRule, (ancestor) => ancestor === nodeToSpliceParentOnto)
+				}
+
 				// Splice on where the selector starts matching the selector inside at-rule
 				// See: `test/fixtures/cascade-on-nested-rules.css`
 				var varDeclAtRule = mapItem.parent.parent;
@@ -41,6 +49,12 @@ 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.isRootSpecific) {
+				const varDeclRootRule = mapItem.parent
+				const nodeToSpliceParentOnto = findNodeAncestorWithSelector(mapItem.parent.selector, decl.parent)
+
+				mimicDecl = cloneSpliceParentOntoNodeWhen(decl, varDeclRootRule, (ancestor) => ancestor === nodeToSpliceParentOnto)
+			}
 			// TODO: use regex from `isUnderScope`
 			else if(isUnderScope.RE_PSEUDO_SELECTOR.test(mapItem.parent.selector)) {
 				// Create a detached clone
@@ -115,6 +129,9 @@ function resolveDecl(decl, map, /*optional*/shouldPreserve, /*optional*/preserve
 			// Add the rule to the atRule
 			atRuleNode.append(ruleClone);
 
+			if (mapItem.isRootSpecific) {
+				ruleClone.selector = [mapItem.parent.selector, ruleClone.selector].filter(item => Boolean(item)).join(' ');
+			}
 
 			// Since that atRuleNode can be nested in other atRules, we need to make the appropriate structure
 			var parentAtRuleNode = atRuleNode;
@@ -137,8 +154,13 @@ function resolveDecl(decl, map, /*optional*/shouldPreserve, /*optional*/preserve
 
 			// Save referance of previous atRuleStructure
 			previousAtRuleNode = parentAtRuleNode
-		}
-		else {
+		} else if (mapItem.isRootSpecific) {
+			ruleClone.selector = [mapItem.parent.selector, mimicDecl.parent.selector].filter(item => Boolean(item)).join(' ');
+
+			// Put the first atRuleStructure after the declaration's rule,
+			// and after that, put them right after the previous one
+			decl.parent.parent.insertAfter(preserveAtRulesOrder && previousAtRuleNode || decl.parent, ruleClone);
+		} else {
 			ruleClone.selector = mimicDecl.parent.selector;
 
 			// Put the first atRuleStructure after the declaration's rule,