Skip to content
This repository was archived by the owner on Jan 21, 2024. It is now read-only.

Added regular expression filter for whitelist #28

Open
niknbr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added regular expression filter for whitelist #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var posthtml = require('posthtml');
var uglify = require('posthtml-uglify');

posthtml()
.use(uglify({ whitelist: '.bar' }))
.use(uglify({ whitelist: ['.bar', '#foo', /\.col-xs-.*/, /#main.+/] }))
.process('<style>#foo { color: red } .bar { color: blue }</style><div id="foo" class="bar">baz</div>')
.then(function(result) {
console.log(result.html); //=> '<style>#xz { color: red } .bar { color: blue }</style><div id="xz" class="bar">baz</div>'
Expand Down
67 changes: 39 additions & 28 deletions lib/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ function HTMLUglify(config) {
this.whitelist = config.whitelist || [];
}

HTMLUglify.prototype.checkForStandardPointer = function(type, value, lookups) {
HTMLUglify.prototype.checkForStandardPointer = function (type, value, lookups) {
return lookups[type] && lookups[type][value];
};

HTMLUglify.prototype.checkForAttributePointer = function(type, value, lookups) {
HTMLUglify.prototype.checkForAttributePointer = function (type, value, lookups) {
var typeLookups = lookups[type] || {};
var keys = Object.keys(typeLookups);
var pointer;

keys.some(function(key) {
keys.some(function (key) {
if (value.indexOf(key) !== -1) {
pointer = value.replace(key, typeLookups[key]);
return true;
Expand All @@ -38,28 +38,28 @@ HTMLUglify.prototype.checkForAttributePointer = function(type, value, lookups) {
return pointer;
};

HTMLUglify.prototype.generatePointer = function(lookups) {
HTMLUglify.prototype.generatePointer = function (lookups) {
var idCount = Object.keys(lookups['id'] || {}).length;
var classCount = Object.keys(lookups['class'] || {}).length;
var counter = idCount + classCount;

return this.hashids.encode(counter);
};

HTMLUglify.prototype.pointer = function(type, value, lookups) {
HTMLUglify.prototype.pointer = function (type, value, lookups) {
return this.checkForStandardPointer(type, value, lookups) ||
this.checkForAttributePointer(type, value, lookups) ||
this.generatePointer(lookups);
};

HTMLUglify.prototype.insertLookup = function(type, value, pointer, lookups) {
HTMLUglify.prototype.insertLookup = function (type, value, pointer, lookups) {
if (!lookups[type]) {
lookups[type] = {};
}
lookups[type][value] = pointer;
};

HTMLUglify.prototype.createLookup = function(type, value, lookups) {
HTMLUglify.prototype.createLookup = function (type, value, lookups) {
var pointer;
if (value && !this.isWhitelisted(type, value)) {
pointer = this.pointer(type, value, lookups);
Expand All @@ -68,7 +68,7 @@ HTMLUglify.prototype.createLookup = function(type, value, lookups) {
return pointer;
};

HTMLUglify.prototype.isWhitelisted = function(type, value) {
HTMLUglify.prototype.isWhitelisted = function (type, value) {
switch (type) {
case 'class':
value = '.' + value;
Expand All @@ -80,15 +80,26 @@ HTMLUglify.prototype.isWhitelisted = function(type, value) {
break;
}

return this.whitelist.indexOf(value) >= 0;
var whitelisted = false;

this.whitelist.every(el => {
if (el && el.toString()[0] != "/") {
whitelisted = (el == value);
} else if (el && el.toString()[0] == "/") {
whitelisted = el.test(value);
}
return !whitelisted;
});

return whitelisted;
};

HTMLUglify.prototype.pointerizeClass = function(node, lookups) {
HTMLUglify.prototype.pointerizeClass = function (node, lookups) {
var self = this;
var classes = node.attrs.class;

if (classes) {
node.attrs.class = classes.split(/\s+/).map(function(value) {
node.attrs.class = classes.split(/\s+/).map(function (value) {
var pointer = self.createLookup('class', value, lookups);
if (pointer) {
return pointer;
Expand All @@ -99,31 +110,31 @@ HTMLUglify.prototype.pointerizeClass = function(node, lookups) {
}
};

HTMLUglify.prototype.pointerizeIdAndFor = function(type, node, lookups) {
HTMLUglify.prototype.pointerizeIdAndFor = function (type, node, lookups) {
var pointer = this.createLookup('id', node.attrs[type], lookups);
if (pointer) {
node.attrs[type] = pointer;
}
};

HTMLUglify.prototype.processRules = function(rules, lookups) {
HTMLUglify.prototype.processRules = function (rules, lookups) {
var self = this;

rules.forEach(function(rule) {
rules.forEach(function (rule) {
// go deeper inside media rule to find css rules
if (rule.type === 'atrule' && (rule.name === 'media' || rule.name === 'supports')) {
self.processRules(rule.nodes, lookups);
} else if (rule.type === 'rule') {
postcssSelectorParser(function(selectors) {
selectors.walk(function(selector) {
postcssSelectorParser(function (selectors) {
selectors.walk(function (selector) {
var pointer;

if ((selector.type === 'class')
|| (selector.type === 'attribute' && selector.attribute === 'class')) {
|| (selector.type === 'attribute' && selector.attribute === 'class')) {
pointer = self.createLookup('class', selector.value, lookups);
} else if ((selector.type === 'id')
|| (selector.type === 'attribute' && selector.attribute === 'id')
|| (selector.type === 'attribute' && selector.attribute === 'for')) {
|| (selector.type === 'attribute' && selector.attribute === 'id')
|| (selector.type === 'attribute' && selector.attribute === 'for')) {
pointer = self.createLookup('id', selector.value, lookups);
}

Expand All @@ -138,12 +149,12 @@ HTMLUglify.prototype.processRules = function(rules, lookups) {
});
};

HTMLUglify.prototype.rewriteElements = function(tree, lookups) {
HTMLUglify.prototype.rewriteElements = function (tree, lookups) {
var self = this;

lookups = lookups || {};

return tree.walk(function(node) {
return tree.walk(function (node) {
if (node.attrs) {
if (node.attrs.class) {
self.pointerizeClass(node, lookups);
Expand All @@ -161,12 +172,12 @@ HTMLUglify.prototype.rewriteElements = function(tree, lookups) {
});
};

HTMLUglify.prototype.rewriteStyles = function(tree, lookups) {
HTMLUglify.prototype.rewriteStyles = function (tree, lookups) {
var self = this;

lookups = lookups || {};

return tree.walk(function(node) {
return tree.walk(function (node) {
if (node.tag === 'style' && node.content) {
var ast = postcssSafeParser([].concat(node.content).join(''));
self.processRules(ast.nodes, lookups);
Expand All @@ -176,7 +187,7 @@ HTMLUglify.prototype.rewriteStyles = function(tree, lookups) {
});
};

HTMLUglify.prototype.process = function(tree) {
HTMLUglify.prototype.process = function (tree) {
var lookups = {};

tree = this.rewriteStyles(tree, lookups);
Expand All @@ -185,14 +196,14 @@ HTMLUglify.prototype.process = function(tree) {
return tree;
};

module.exports = function(options) {
return function posthtmlUglify(tree) {
module.exports = function (options) {
return function posthtmlUglify(tree) {
return new HTMLUglify(options).process(tree);
}
};

module.exports.HTMLUglify = HTMLUglify;

module.exports.process = function(html, options) {
return posthtml().use(module.exports(options)).process(html, { sync: true });
module.exports.process = function (html, options) {
return posthtml().use(module.exports(options)).process(html, { sync: true });
};
Loading