replace result.sels with didRetain(sel) hook. close #46.

leeoniya · Apr 29, 2020 · fd9b383 · fd9b383
1 parent 515b693
commit fd9b383
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -286,22 +286,22 @@ let htmlB = `
 // whitelist
 let whitelist = new Set();
 
+function didRetain(sel) {
+    whitelist.add(sel);
+}
+
 let resA = dropcss({
     css,
     html: htmlA,
+    didRetain,
 });
 
-// accumulate retained A selectors
-resA.sels.forEach(sel => whitelist.add(sel));
-
 let resB = dropcss({
     css,
     html: htmlB,
+    didRetain,
 });
 
-// accumulate retained B selectors
-resB.sels.forEach(sel => whitelist.add(sel));
-
 // final purge relying only on accumulated whitelist
 let cleaned = dropcss({
     html: '',

diff --git a/dist/dropcss.cjs.js b/dist/dropcss.cjs.js
@@ -388,7 +388,7 @@ function stripEmptyAts(css) {
 	return css.replace(/@[a-z-]+[^{]+\{\s*\}/gm, '');
 }
 
-function generate(tokens, kept) {
+function generate(tokens, didRetain) {
 	var out = '', lastSelsLen = 0;
 
 	for (var i = 0; i < tokens.length; i++) {
@@ -400,7 +400,7 @@ function generate(tokens, kept) {
 				lastSelsLen = sels.length;
 
 				if (lastSelsLen > 0) {
-					sels.forEach(function (s) { return kept.add(s); });
+					sels.forEach(didRetain);
 					out += sels.join();
 				}
 				break;
@@ -961,14 +961,15 @@ function stripNonAssertablePseudos(sel) {
 	.replace(/:[a-z-]+\(\)/gm, '');
 }
 
-var drop = function (sel) { return true; };
+var retTrue = function (sel) { return true; };
 
 function dropcss(opts) {
 
 	// {nodes, tag, class, id}
 	var H = _export_parse_(opts.html, !opts.keepText);
 
-	var shouldDrop = opts.shouldDrop || drop;
+	var shouldDrop = opts.shouldDrop || retTrue;
+	var didRetain  = opts.didRetain  || retTrue;
 
 	var tokens = parse(opts.css);
 
@@ -1066,15 +1067,12 @@ function dropcss(opts) {
 		}
 	}
 
-	var kept = new Set();
-
-	var out = generate(tokens, kept);
+	var out = generate(tokens, didRetain);
 
 	out = postProc$1(out, shouldDrop);
 
 	return {
 		css: stripEmptyAts(out),
-		sels: kept,
 	};
 }
 

diff --git a/dist/dropcss.iife.js b/dist/dropcss.iife.js
@@ -389,7 +389,7 @@ var dropcss = (function () {
 		return css.replace(/@[a-z-]+[^{]+\{\s*\}/gm, '');
 	}
 
-	function generate(tokens, kept) {
+	function generate(tokens, didRetain) {
 		var out = '', lastSelsLen = 0;
 
 		for (var i = 0; i < tokens.length; i++) {
@@ -401,7 +401,7 @@ var dropcss = (function () {
 					lastSelsLen = sels.length;
 
 					if (lastSelsLen > 0) {
-						sels.forEach(function (s) { return kept.add(s); });
+						sels.forEach(didRetain);
 						out += sels.join();
 					}
 					break;
@@ -962,14 +962,15 @@ var dropcss = (function () {
 		.replace(/:[a-z-]+\(\)/gm, '');
 	}
 
-	var drop = function (sel) { return true; };
+	var retTrue = function (sel) { return true; };
 
 	function dropcss(opts) {
 
 		// {nodes, tag, class, id}
 		var H = _export_parse_(opts.html, !opts.keepText);
 
-		var shouldDrop = opts.shouldDrop || drop;
+		var shouldDrop = opts.shouldDrop || retTrue;
+		var didRetain  = opts.didRetain  || retTrue;
 
 		var tokens = parse(opts.css);
 
@@ -1067,15 +1068,12 @@ var dropcss = (function () {
 			}
 		}
 
-		var kept = new Set();
-
-		var out = generate(tokens, kept);
+		var out = generate(tokens, didRetain);
 
 		out = postProc$1(out, shouldDrop);
 
 		return {
 			css: stripEmptyAts(out),
-			sels: kept,
 		};
 	}
 

diff --git a/dist/dropcss.iife.min.js b/dist/dropcss.iife.min.js
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   "devDependencies": {
     "mocha": "^7.1.2",
     "nyc": "^15.0.1",
-    "rollup": "^2.7.3",
+    "rollup": "^2.7.4",
     "rollup-plugin-buble": "^0.19.8",
     "rollup-plugin-cjs-es": "^1.0.0",
     "rollup-plugin-terser": "^5.3.0"

diff --git a/src/css.js b/src/css.js
@@ -185,7 +185,7 @@ function stripEmptyAts(css) {
 	return css.replace(/@[a-z-]+[^{]+\{\s*\}/gm, '');
 }
 
-function generate(tokens, kept) {
+function generate(tokens, didRetain) {
 	let out = '', lastSelsLen = 0;
 
 	for (let i = 0; i < tokens.length; i++) {
@@ -197,7 +197,7 @@ function generate(tokens, kept) {
 				lastSelsLen = sels.length;
 
 				if (lastSelsLen > 0) {
-					sels.forEach(s => kept.add(s));
+					sels.forEach(didRetain);
 					out += sels.join();
 				}
 				break;

diff --git a/src/dropcss.js b/src/dropcss.js
@@ -19,7 +19,7 @@ function stripNonAssertablePseudos(sel) {
 	.replace(/:[a-z-]+\(\)/gm, '');
 }
 
-const drop = sel => true;
+const retTrue = sel => true;
 
 function dropcss(opts) {
 	let log, START;
@@ -34,7 +34,8 @@ function dropcss(opts) {
 
 	LOGGING && log.push([+new Date() - START, 'HTML parsed & processed']);
 
-	const shouldDrop = opts.shouldDrop || drop;
+	const shouldDrop = opts.shouldDrop || retTrue;
+	const didRetain  = opts.didRetain  || retTrue;
 
 	let tokens = parseCSS(opts.css);
 
@@ -138,9 +139,7 @@ function dropcss(opts) {
 
 	LOGGING && log.push([+new Date() - START, 'Context-aware second pass']);
 
-	let kept = new Set();
-
-	let out = generateCSS(tokens, kept);
+	let out = generateCSS(tokens, didRetain);
 
 	LOGGING && log.push([+new Date() - START, 'Generate output']);
 
@@ -150,7 +149,6 @@ function dropcss(opts) {
 
 	return {
 		css: stripEmptyAts(out),
-		sels: kept,
 	};
 }