fixed miscounting

tanhakabir · tanhakabir · commit 89517ae7a767 · 2017-10-10T12:03:00.000-07:00
diff --git a/Recipe.min.js b/Recipe.min.js
@@ -828,7 +828,7 @@ void function() { try {
 											  "conditions": {}} 
 			} else {
 				var count = atrulesUsage[selectorText].count;
-				count = count++;
+				atrulesUsage[selectorText].count = count + 1;
 			}
 
 			var selectedAtruleUsage = atrulesUsage[selectorText];
@@ -879,15 +879,20 @@ void function() { try {
 				}
 
 				if(nestRuleSelector) {
-					if(!nestedRulesUsage[nestRuleSelector]) {
-						nestedRulesUsage[nestRuleSelector] = Object.create(null);
-						nestedRulesUsage[nestRuleSelector] = {"count": 1}
-					} else {
-						var nestedCount = nestedRulesUsage[nestRuleSelector].count;
-						nestedCount = nestedCount++;
+					var individualNested = nestRuleSelector.split(' ');
+
+					for (let selector of individualNested) {
+						if(!nestedRulesUsage[selector]) {
+							nestedRulesUsage[selector] = Object.create(null);
+							nestedRulesUsage[selector] = {"count": 1}
+						} else {
+							var nestedCount = nestedRulesUsage[selector].count;
+							nestedRulesUsage[selector].count = nestedCount + 1;
+						}
 					}
 				}
 			}
+
 		}
 
 		/**
@@ -901,7 +906,7 @@ void function() { try {
 				selectedAtruleConditionalUsage[conditionText] = {"count": 1}
 			} else {
 				var count = selectedAtruleConditionalUsage[conditionText].count;
-				count = count++;
+				selectedAtruleConditionalUsage[conditionText].count = count + 1;
 			}
 		}
 
@@ -920,7 +925,7 @@ void function() { try {
 											  "props": {}} 
 			} else {
 				var count = atrulesUsage[selectorText].count;
-				count = count++;
+				atrulesUsage[selectorText].count = count + 1;
 			}
 
 			// @keyframes rule type is 7
@@ -957,7 +962,7 @@ void function() { try {
 				pseudosUsageForSelector[pseudoClass] = {"count": 1};
 			} else {
 				var pseudoCount = pseudosUsageForSelector[pseudoClass].count;
-				pseudoCount = pseudoCount++;
+				pseudosUsageForSelector[pseudoClass].count = pseudoCount + 1;
 			}
 		}
 
@@ -990,7 +995,7 @@ void function() { try {
 						atrulesUsageForKeyframeOfSelector[keyframe.keyText] = {"count": 1};
 					} else {
 						var keyframeCount = atrulesUsageForKeyframeOfSelector[keyframe.keyText].count;
-						keyframeCount = keyframeCount++;
+						atrulesUsageForKeyframeOfSelector[keyframe.keyText].count = keyframeCount + 1;
 					}
 				}
 			}
@@ -1813,6 +1818,7 @@ void function() { try {
 			CSSUsageResults.usages = results;
 			deleteDuplicatedAtRules(); // TODO: issue #52
 			
+			console.log(CSSUsageResults);
 			if(window.debugCSSUsage) if(window.debugCSSUsage) console.log(CSSUsageResults.usages);
 		}
 
diff --git a/cssUsage.src.js b/cssUsage.src.js
@@ -828,7 +828,7 @@ void function() { try {
 											  "conditions": {}} 
 			} else {
 				var count = atrulesUsage[selectorText].count;
-				count = count++;
+				atrulesUsage[selectorText].count = count + 1;
 			}
 
 			var selectedAtruleUsage = atrulesUsage[selectorText];
@@ -879,15 +879,20 @@ void function() { try {
 				}
 
 				if(nestRuleSelector) {
-					if(!nestedRulesUsage[nestRuleSelector]) {
-						nestedRulesUsage[nestRuleSelector] = Object.create(null);
-						nestedRulesUsage[nestRuleSelector] = {"count": 1}
-					} else {
-						var nestedCount = nestedRulesUsage[nestRuleSelector].count;
-						nestedCount = nestedCount++;
+					var individualNested = nestRuleSelector.split(' ');
+
+					for (let selector of individualNested) {
+						if(!nestedRulesUsage[selector]) {
+							nestedRulesUsage[selector] = Object.create(null);
+							nestedRulesUsage[selector] = {"count": 1}
+						} else {
+							var nestedCount = nestedRulesUsage[selector].count;
+							nestedRulesUsage[selector].count = nestedCount + 1;
+						}
 					}
 				}
 			}
+
 		}
 
 		/**
@@ -901,7 +906,7 @@ void function() { try {
 				selectedAtruleConditionalUsage[conditionText] = {"count": 1}
 			} else {
 				var count = selectedAtruleConditionalUsage[conditionText].count;
-				count = count++;
+				selectedAtruleConditionalUsage[conditionText].count = count + 1;
 			}
 		}
 
@@ -920,7 +925,7 @@ void function() { try {
 											  "props": {}} 
 			} else {
 				var count = atrulesUsage[selectorText].count;
-				count = count++;
+				atrulesUsage[selectorText].count = count + 1;
 			}
 
 			// @keyframes rule type is 7
@@ -957,7 +962,7 @@ void function() { try {
 				pseudosUsageForSelector[pseudoClass] = {"count": 1};
 			} else {
 				var pseudoCount = pseudosUsageForSelector[pseudoClass].count;
-				pseudoCount = pseudoCount++;
+				pseudosUsageForSelector[pseudoClass].count = pseudoCount + 1;
 			}
 		}
 
@@ -990,7 +995,7 @@ void function() { try {
 						atrulesUsageForKeyframeOfSelector[keyframe.keyText] = {"count": 1};
 					} else {
 						var keyframeCount = atrulesUsageForKeyframeOfSelector[keyframe.keyText].count;
-						keyframeCount = keyframeCount++;
+						atrulesUsageForKeyframeOfSelector[keyframe.keyText].count = keyframeCount + 1;
 					}
 				}
 			}
@@ -1813,6 +1818,7 @@ void function() { try {
 			CSSUsageResults.usages = results;
 			deleteDuplicatedAtRules(); // TODO: issue #52
 			
+			console.log(CSSUsageResults);
 			if(window.debugCSSUsage) if(window.debugCSSUsage) console.log(CSSUsageResults.usages);
 		}
 
diff --git a/src/cssUsage.js b/src/cssUsage.js
@@ -331,7 +331,7 @@ void function() { try {
 											  "conditions": {}} 
 			} else {
 				var count = atrulesUsage[selectorText].count;
-				count = count++;
+				atrulesUsage[selectorText].count = count + 1;
 			}
 
 			var selectedAtruleUsage = atrulesUsage[selectorText];
@@ -382,15 +382,20 @@ void function() { try {
 				}
 
 				if(nestRuleSelector) {
-					if(!nestedRulesUsage[nestRuleSelector]) {
-						nestedRulesUsage[nestRuleSelector] = Object.create(null);
-						nestedRulesUsage[nestRuleSelector] = {"count": 1}
-					} else {
-						var nestedCount = nestedRulesUsage[nestRuleSelector].count;
-						nestedCount = nestedCount++;
+					var individualNested = nestRuleSelector.split(' ');
+
+					for (let selector of individualNested) {
+						if(!nestedRulesUsage[selector]) {
+							nestedRulesUsage[selector] = Object.create(null);
+							nestedRulesUsage[selector] = {"count": 1}
+						} else {
+							var nestedCount = nestedRulesUsage[selector].count;
+							nestedRulesUsage[selector].count = nestedCount + 1;
+						}
 					}
 				}
 			}
+
 		}
 
 		/**
@@ -404,7 +409,7 @@ void function() { try {
 				selectedAtruleConditionalUsage[conditionText] = {"count": 1}
 			} else {
 				var count = selectedAtruleConditionalUsage[conditionText].count;
-				count = count++;
+				selectedAtruleConditionalUsage[conditionText].count = count + 1;
 			}
 		}
 
@@ -423,7 +428,7 @@ void function() { try {
 											  "props": {}} 
 			} else {
 				var count = atrulesUsage[selectorText].count;
-				count = count++;
+				atrulesUsage[selectorText].count = count + 1;
 			}
 
 			// @keyframes rule type is 7
@@ -460,7 +465,7 @@ void function() { try {
 				pseudosUsageForSelector[pseudoClass] = {"count": 1};
 			} else {
 				var pseudoCount = pseudosUsageForSelector[pseudoClass].count;
-				pseudoCount = pseudoCount++;
+				pseudosUsageForSelector[pseudoClass].count = pseudoCount + 1;
 			}
 		}
 
@@ -493,7 +498,7 @@ void function() { try {
 						atrulesUsageForKeyframeOfSelector[keyframe.keyText] = {"count": 1};
 					} else {
 						var keyframeCount = atrulesUsageForKeyframeOfSelector[keyframe.keyText].count;
-						keyframeCount = keyframeCount++;
+						atrulesUsageForKeyframeOfSelector[keyframe.keyText].count = keyframeCount + 1;
 					}
 				}
 			}
@@ -1316,6 +1321,7 @@ void function() { try {
 			CSSUsageResults.usages = results;
 			deleteDuplicatedAtRules(); // TODO: issue #52
 			
+			console.log(CSSUsageResults);
 			if(window.debugCSSUsage) if(window.debugCSSUsage) console.log(CSSUsageResults.usages);
 		}
 
diff --git a/tests/test-page-atrules/styles.css b/tests/test-page-atrules/styles.css
@@ -77,6 +77,9 @@ h2 {
 }
 
 @media screen and (min-width:480px) {
+        p {
+            background-color: whitesmoke;
+        }
     
         body{
             background-color:#6aa6cc;

Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ void function() { try {`
`828`	`828`	`"conditions": {}}`
`829`	`829`	`} else {`
`830`	`830`	`var count = atrulesUsage[selectorText].count;`
`831`		`- count = count++;`
	`831`	`+ atrulesUsage[selectorText].count = count + 1;`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`var selectedAtruleUsage = atrulesUsage[selectorText];`
`@@ -879,15 +879,20 @@ void function() { try {`
`879`	`879`	`}`
`880`	`880`
`881`	`881`	`if(nestRuleSelector) {`
`882`		`- if(!nestedRulesUsage[nestRuleSelector]) {`
`883`		`- nestedRulesUsage[nestRuleSelector] = Object.create(null);`
`884`		`- nestedRulesUsage[nestRuleSelector] = {"count": 1}`
`885`		`- } else {`
`886`		`- var nestedCount = nestedRulesUsage[nestRuleSelector].count;`
`887`		`- nestedCount = nestedCount++;`
	`882`	`+ var individualNested = nestRuleSelector.split(' ');`
	`883`	`+`
	`884`	`+ for (let selector of individualNested) {`
	`885`	`+ if(!nestedRulesUsage[selector]) {`
	`886`	`+ nestedRulesUsage[selector] = Object.create(null);`
	`887`	`+ nestedRulesUsage[selector] = {"count": 1}`
	`888`	`+ } else {`
	`889`	`+ var nestedCount = nestedRulesUsage[selector].count;`
	`890`	`+ nestedRulesUsage[selector].count = nestedCount + 1;`
	`891`	`+ }`
`888`	`892`	`}`
`889`	`893`	`}`
`890`	`894`	`}`
	`895`	`+`
`891`	`896`	`}`
`892`	`897`
`893`	`898`	`/**`
`@@ -901,7 +906,7 @@ void function() { try {`
`901`	`906`	`selectedAtruleConditionalUsage[conditionText] = {"count": 1}`
`902`	`907`	`} else {`
`903`	`908`	`var count = selectedAtruleConditionalUsage[conditionText].count;`
`904`		`- count = count++;`
	`909`	`+ selectedAtruleConditionalUsage[conditionText].count = count + 1;`
`905`	`910`	`}`
`906`	`911`	`}`
`907`	`912`
`@@ -920,7 +925,7 @@ void function() { try {`
`920`	`925`	`"props": {}}`
`921`	`926`	`} else {`
`922`	`927`	`var count = atrulesUsage[selectorText].count;`
`923`		`- count = count++;`
	`928`	`+ atrulesUsage[selectorText].count = count + 1;`
`924`	`929`	`}`
`925`	`930`
`926`	`931`	`// @keyframes rule type is 7`
`@@ -957,7 +962,7 @@ void function() { try {`
`957`	`962`	`pseudosUsageForSelector[pseudoClass] = {"count": 1};`
`958`	`963`	`} else {`
`959`	`964`	`var pseudoCount = pseudosUsageForSelector[pseudoClass].count;`
`960`		`- pseudoCount = pseudoCount++;`
	`965`	`+ pseudosUsageForSelector[pseudoClass].count = pseudoCount + 1;`
`961`	`966`	`}`
`962`	`967`	`}`
`963`	`968`
`@@ -990,7 +995,7 @@ void function() { try {`
`990`	`995`	`atrulesUsageForKeyframeOfSelector[keyframe.keyText] = {"count": 1};`
`991`	`996`	`} else {`
`992`	`997`	`var keyframeCount = atrulesUsageForKeyframeOfSelector[keyframe.keyText].count;`
`993`		`- keyframeCount = keyframeCount++;`
	`998`	`+ atrulesUsageForKeyframeOfSelector[keyframe.keyText].count = keyframeCount + 1;`
`994`	`999`	`}`
`995`	`1000`	`}`
`996`	`1001`	`}`
`@@ -1813,6 +1818,7 @@ void function() { try {`
`1813`	`1818`	`CSSUsageResults.usages = results;`
`1814`	`1819`	`deleteDuplicatedAtRules(); // TODO: issue #52`
`1815`	`1820`
	`1821`	`+ console.log(CSSUsageResults);`
`1816`	`1822`	`if(window.debugCSSUsage) if(window.debugCSSUsage) console.log(CSSUsageResults.usages);`
`1817`	`1823`	`}`
`1818`	`1824`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ void function() { try {`
`331`	`331`	`"conditions": {}}`
`332`	`332`	`} else {`
`333`	`333`	`var count = atrulesUsage[selectorText].count;`
`334`		`- count = count++;`
	`334`	`+ atrulesUsage[selectorText].count = count + 1;`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`var selectedAtruleUsage = atrulesUsage[selectorText];`
`@@ -382,15 +382,20 @@ void function() { try {`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`if(nestRuleSelector) {`
`385`		`- if(!nestedRulesUsage[nestRuleSelector]) {`
`386`		`- nestedRulesUsage[nestRuleSelector] = Object.create(null);`
`387`		`- nestedRulesUsage[nestRuleSelector] = {"count": 1}`
`388`		`- } else {`
`389`		`- var nestedCount = nestedRulesUsage[nestRuleSelector].count;`
`390`		`- nestedCount = nestedCount++;`
	`385`	`+ var individualNested = nestRuleSelector.split(' ');`
	`386`	`+`
	`387`	`+ for (let selector of individualNested) {`
	`388`	`+ if(!nestedRulesUsage[selector]) {`
	`389`	`+ nestedRulesUsage[selector] = Object.create(null);`
	`390`	`+ nestedRulesUsage[selector] = {"count": 1}`
	`391`	`+ } else {`
	`392`	`+ var nestedCount = nestedRulesUsage[selector].count;`
	`393`	`+ nestedRulesUsage[selector].count = nestedCount + 1;`
	`394`	`+ }`
`391`	`395`	`}`
`392`	`396`	`}`
`393`	`397`	`}`
	`398`	`+`
`394`	`399`	`}`
`395`	`400`
`396`	`401`	`/**`
`@@ -404,7 +409,7 @@ void function() { try {`
`404`	`409`	`selectedAtruleConditionalUsage[conditionText] = {"count": 1}`
`405`	`410`	`} else {`
`406`	`411`	`var count = selectedAtruleConditionalUsage[conditionText].count;`
`407`		`- count = count++;`
	`412`	`+ selectedAtruleConditionalUsage[conditionText].count = count + 1;`
`408`	`413`	`}`
`409`	`414`	`}`
`410`	`415`
`@@ -423,7 +428,7 @@ void function() { try {`
`423`	`428`	`"props": {}}`
`424`	`429`	`} else {`
`425`	`430`	`var count = atrulesUsage[selectorText].count;`
`426`		`- count = count++;`
	`431`	`+ atrulesUsage[selectorText].count = count + 1;`
`427`	`432`	`}`
`428`	`433`
`429`	`434`	`// @keyframes rule type is 7`
`@@ -460,7 +465,7 @@ void function() { try {`
`460`	`465`	`pseudosUsageForSelector[pseudoClass] = {"count": 1};`
`461`	`466`	`} else {`
`462`	`467`	`var pseudoCount = pseudosUsageForSelector[pseudoClass].count;`
`463`		`- pseudoCount = pseudoCount++;`
	`468`	`+ pseudosUsageForSelector[pseudoClass].count = pseudoCount + 1;`
`464`	`469`	`}`
`465`	`470`	`}`
`466`	`471`
`@@ -493,7 +498,7 @@ void function() { try {`
`493`	`498`	`atrulesUsageForKeyframeOfSelector[keyframe.keyText] = {"count": 1};`
`494`	`499`	`} else {`
`495`	`500`	`var keyframeCount = atrulesUsageForKeyframeOfSelector[keyframe.keyText].count;`
`496`		`- keyframeCount = keyframeCount++;`
	`501`	`+ atrulesUsageForKeyframeOfSelector[keyframe.keyText].count = keyframeCount + 1;`
`497`	`502`	`}`
`498`	`503`	`}`
`499`	`504`	`}`
`@@ -1316,6 +1321,7 @@ void function() { try {`
`1316`	`1321`	`CSSUsageResults.usages = results;`
`1317`	`1322`	`deleteDuplicatedAtRules(); // TODO: issue #52`
`1318`	`1323`
	`1324`	`+ console.log(CSSUsageResults);`
`1319`	`1325`	`if(window.debugCSSUsage) if(window.debugCSSUsage) console.log(CSSUsageResults.usages);`
`1320`	`1326`	`}`
`1321`	`1327`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ h2 {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@media screen and (min-width:480px) {`
	`80`	`+ p {`
	`81`	`+ background-color: whitesmoke;`
	`82`	`+ }`
`80`	`83`
`81`	`84`	`body{`
`82`	`85`	`background-color:#6aa6cc;`