leak :global into rules

Author: sokra

lib/parseSource.js

@@ -38,11 +38,12 @@ function importMatch(match, url, mediaQuery, index) {
 }
 
 function rulesStartMatch() {
-	this.mode = null;
+	this.blockMode = this.mode;
 	return "firstRule";
 }
 
 function rulesEndMatch() {
+	this.mode = null;
 	this.activeSelectors = [];
 	return "source";
 }
@@ -128,6 +129,11 @@ function selectorMatch(match, prefix, name, index) {
 	this.activeSelectors.push(selector);
 }
 
+function ruleScopedMatch() {
+	this.mode = this.blockMode;
+	return "ruleScoped";
+}
+
 function extendsStartMatch(match, index) {
 	this.remove.push({
 		start: index,
@@ -192,7 +198,7 @@ var parser = new Parser({
 		"(url\\s*\\()(\\s*([^)]*)\\s*)\\)": urlMatch
 	},
 	scopedRules: {
-		"(?:-[a-z]+-)?animation(?:-name)?:": "ruleScoped"
+		"(?:-[a-z]+-)?animation(?:-name)?:": ruleScopedMatch
 	},
 
 	// states
@@ -297,7 +303,7 @@ var parser = new Parser({
 		"comments",
 		{
 			// reactivate
-			",": "ruleScoped",
+			",": ruleScopedMatch,
 
 			// back to normal rule
 			";": "rule",

test/helpers.js

@@ -4,7 +4,7 @@ require("should");
 var cssLoader = require("../index.js");
 var vm = require("vm");
 
-function assetEvaluated(output, result, modules, noLocals) {
+function getEvaluated(output, result, modules) {
 	try {
 		var fn = vm.runInThisContext("(function(module, exports, require) {" + output + "})", "testcase.js");
 		var m = { exports: {}, id: 1 };
@@ -23,9 +23,12 @@ function assetEvaluated(output, result, modules, noLocals) {
 	}
 	delete m.exports.toString;
 	delete m.exports.i;
-	if(noLocals) delete m.exports.locals;
-	m.exports.should.be.eql(result);
+	return m.exports;
+}
 
+function assetEvaluated(output, result, modules) {
+	var exports = getEvaluated(output, result, modules);
+	exports.should.be.eql(result);
 }
 
 exports.test = function test(name, input, result, query, modules) {
@@ -48,7 +51,7 @@ exports.test = function test(name, input, result, query, modules) {
 	});
 };
 
-exports.testWithoutLocals = function testWithoutLocals(name, input, result, query, modules) {
+exports.testSingleItem = function testSingleItem(name, input, result, query, modules) {
 	it(name, function() {
 		var output = cssLoader.call({
 			options: {
@@ -64,7 +67,13 @@ exports.testWithoutLocals = function testWithoutLocals(name, input, result, quer
 				throw new Error(message);
 			}
 		}, input);
-		assetEvaluated(output, result, modules, true);
+		var exports = getEvaluated(output, result, modules);
+		Array.isArray(exports).should.be.eql(true);
+		(exports.length).should.be.eql(1);
+		(exports[0].length).should.be.eql(3);
+		(exports[0][0]).should.be.eql(1);
+		(exports[0][2]).should.be.eql("");
+		(exports[0][1]).should.be.eql(result);
 	});
 };
 

test/moduleTest.js

@@ -1,6 +1,6 @@
 /*globals describe */
 
-var test = require("./helpers").testWithoutLocals;
+var test = require("./helpers").testSingleItem;
 
 var path = require("path");
 var fs = require("fs");
@@ -12,6 +12,6 @@ describe("module", function() {
 		var source = fs.readFileSync(path.join(testCasesPath, name, "source.css"), "utf-8");
 		var expected = fs.readFileSync(path.join(testCasesPath, name, "expected.css"), "utf-8");
 
-		test(name, source, [[1, expected, ""]], "?module&localIdentName=_[local]_");
+		test(name, source, expected, "?module&localIdentName=_[local]_");
 	});
 });

test/moduleTestCases/leak-scope/expected.css

@@ -0,0 +1,37 @@
+._a_ {
+	color: green;
+	animation: _a_;
+}
+
+@keyframes _b_ {
+	0% { left: 10px; }
+	100% { left: 20px; }
+}
+
+._b_ {
+	animation: _b_;
+}
+
+@keyframes c {
+	0% { left: 10px; }
+	100% { left: 20px; }
+}
+
+._c_ {
+	animation: c1;
+	animation: _c2_, c3, _c4_;
+}
+
+@keyframes d {
+	0% { left: 10px; }
+	100% { left: 20px; }
+}
+
+.d1 {
+	animation: d1;
+	animation: d2, _d3_, d4;
+}
+
+.d2 {
+	animation: _d2_;
+}

test/moduleTestCases/leak-scope/source.css

@@ -0,0 +1,37 @@
+.a {
+	color: green;
+	animation: a;
+}
+
+@keyframes b {
+	0% { left: 10px; }
+	100% { left: 20px; }
+}
+
+.b {
+	animation: b;
+}
+
+@keyframes :global c {
+	0% { left: 10px; }
+	100% { left: 20px; }
+}
+
+.c {
+	animation: :global c1;
+	animation: c2, :global c3, c4;
+}
+
+@keyframes :global d {
+	0% { left: 10px; }
+	100% { left: 20px; }
+}
+
+:global .d1 {
+	animation: d1;
+	animation: d2, :local(d3), d4;
+}
+
+:global(.d2) {
+	animation: d2;
+}

test/moduleTestCases/urls/expected.css

@@ -0,0 +1,8 @@
+._a_ {
+	background: url({./module});
+	background: url({./module});
+	background: url({./module});
+	background: url({./module}#?iefix);
+	background: url("#hash");
+	background: url("#");
+}

test/moduleTestCases/urls/source.css

@@ -0,0 +1,8 @@
+.a {
+	background: url(./module);
+	background: url("./module");
+	background: url('./module');
+	background: url("./module#?iefix");
+	background: url("#hash");
+	background: url("#");
+}