Skip to content

Fix parentheses in url, close #20 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2018
Merged

Fix parentheses in url, close #20 #22

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
6 changes: 3 additions & 3 deletions lib/css-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var embeddedRegexp = /^data:(.*?),(.*?)/;
var commentRegexp = /\/\*([\s\S]*?)\*\//g;
var urlsRegexp = /((?:@import\s+)?url\s*\(\s*['"]?)(.*?)(['"]?\s*\))|(@import\s+['"]?)([^;'"]+)/ig;
var urlsRegexp = /(?:@import\s+)?url\s*\(\s*(("(.*?)")|('(.*?)')|(.*?))\s*\)|(?:@import\s+)(("(.*?)")|('(.*?)')|(.*?))[\s;]/ig;

function isEmbedded (src) {
return embeddedRegexp.test(src.trim());
Expand All @@ -13,8 +13,8 @@ function getUrls (text) {
text = text.replace(commentRegexp, '');

while (urlMatch = urlsRegexp.exec(text)) {
// Match 2 group if '[@import] url(path)', match 5 group if '@import path'
url = urlMatch[2] || urlMatch[5];
// Match 3, 5, 6 group if '[@import] url(path)', match 9, 11, 12 group if '@import path'
url = urlMatch[3] || urlMatch[5] || urlMatch[6] || urlMatch[9] || urlMatch[11] || urlMatch[12];

if (url && !isEmbedded(url) && urls.indexOf(url) === -1) {
urls.push(url);
Expand Down
74 changes: 74 additions & 0 deletions test/css-parser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,80 @@ describe('Parse css urls', function(){
urls.should.containEql(' a.css');
});

it('should handle urls without extension', function() {
var text = '.image { background: url("image-without-ext"); } ';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('image-without-ext');
});

describe('quotes', function() {
it('should find url without quotes', function() {
var text = '.image { background: url(bg.jpg); } ';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('bg.jpg');
});

it('should find url containing single quotes inside double quotes', function() {
var text = '.image { background: url("bg\'1.jpg"); }';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('bg\'1.jpg');
});

it('should find url containing double quotes inside single quotes', function() {
var text = '.image { background: url(\'bg" 23\'); }';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('bg" 23');
});

it('should find import without quotes', function() {
var text = '@import new.css;';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('new.css');
});

it('should find import containing single quotes inside double quotes', function() {
var text = '@import "new\'11\'.css";';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('new\'11\'.css');
});

it('should find import containing double quotes inside single quotes', function() {
var text = '@import \'new" _2_".css\';';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('new" _2_".css');
});
});

describe('parentheses', function() {
it('should handle parentheses inside url in filename', function() {
var text = '.image { background: url("test (2).png"); } ';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('test (2).png');
});

it('should handle parentheses inside url in extension', function() {
var text = '.image { background: url(\'test.png (2)\'); } ';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('test.png (2)');
});

it('should handle parentheses inside @import', function() {
var text = '@import "import)).css" ';
var urls = parseCssUrls(text);
urls.should.be.instanceof(Array).and.have.lengthOf(1);
urls.should.containEql('import)).css');
});
});

describe('comments', function() {
it('should ignore comments and return empty array if there are only comments in text', function(){
var text = '\
Expand Down