Skip to content

Commit

Permalink
fix(#8): set default media type, content type and charset props (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
killmenot committed Aug 9, 2023
1 parent 6f02282 commit a983c59
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 20 deletions.
18 changes: 8 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@ module.exports = (s) => {
const parts = s.trim().match(validDataUrl.regex);
const parsed = {};

if (parts[1]) {
parsed.mediaType = parts[1].toLowerCase();
const mediaType = parts[1] || 'text/plain;charset=us-ascii';
parsed.mediaType = mediaType.toLowerCase();

const mediaTypeParts = parts[1].split(';').map(x => x.toLowerCase());
const mediaTypeParts = mediaType.split(';').map(x => x.toLowerCase());
parsed.contentType = mediaTypeParts[0];

parsed.contentType = mediaTypeParts[0];

mediaTypeParts.slice(1).forEach((attribute) => {
const p = attribute.split('=');
parsed[p[0]] = p[1];
});
}
mediaTypeParts.slice(1).forEach((attribute) => {
const p = attribute.split('=');
parsed[p[0]] = p[1];
});

parsed.base64 = !!parts[parts.length - 2];
parsed.data = parts[parts.length - 1] || '';
Expand Down
20 changes: 10 additions & 10 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ describe('parse-data-url', () => {
it('parse data', () => {
parsed = parseDataUrl('data:,Hello World!');
expect(parsed).to.be.an('object');
expect(parsed.mediaType).be.an('undefined');
expect(parsed.contentType).be.an('undefined');
expect(parsed.mediaType).equal('text/plain;charset=us-ascii');
expect(parsed.contentType).equal('text/plain');
expect(parsed.base64).equal(false);
expect(parsed.charset).be.an('undefined');
expect(parsed.charset).equal('us-ascii');
expect(parsed.data).to.equal('Hello World!');
});

it('parse data with trailing spaces', () => {
parsed = parseDataUrl(' data:,Hello World! ');
expect(parsed).to.be.an('object');
expect(parsed.mediaType).be.an('undefined');
expect(parsed.contentType).be.an('undefined');
expect(parsed.mediaType).equal('text/plain;charset=us-ascii');
expect(parsed.contentType).equal('text/plain');
expect(parsed.base64).equal(false);
expect(parsed.charset).be.an('undefined');
expect(parsed.charset).equal('us-ascii');
expect(parsed.data).to.equal('Hello World!');
});

Expand All @@ -51,13 +51,13 @@ describe('parse-data-url', () => {
expect(parsed.toBuffer().toString()).to.equal('<h1>Hello, World!</h1>');
});

it('parse with empty data ', () => {
it('parse with empty data', () => {
parsed = parseDataUrl('data:,');
expect(parsed).to.be.an('object');
expect(parsed.mediaType).be.an('undefined');
expect(parsed.contentType).be.an('undefined');
expect(parsed.mediaType).equal('text/plain;charset=us-ascii');
expect(parsed.contentType).equal('text/plain');
expect(parsed.base64).equal(false);
expect(parsed.charset).be.an('undefined');
expect(parsed.charset).equal('us-ascii');
expect(parsed.data).to.equal('');
});

Expand Down

0 comments on commit a983c59

Please sign in to comment.