Skip to content

Simplify browser ranges #185

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

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

Simplify browser ranges #185

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
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ cat main.css | doiuse --browsers "ie >= 9, > 1%, last 2 versions"

**Sample output:**
```
/projects/website/main.css:5:3: CSS3 Box-sizing not supported by: IE (8,9,10,11), Chrome (36,37,38), Safari (8,7.1), Opera (24,25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10,11)
/projects/website/main.css:6:3: CSS3 Box-sizing not supported by: IE (8,9,10,11), Chrome (36,37,38), Safari (8,7.1), Opera (24,25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10,11)
/projects/website/main.css:8:3: CSS user-select: none not supported by: IE (8,9)
/projects/website/main.css:9:3: CSS user-select: none not supported by: IE (8,9)
/projects/website/main.css:10:3: CSS user-select: none not supported by: IE (8,9)
/projects/website/main.css:11:3: CSS user-select: none not supported by: IE (8,9)
/projects/website/main.css:12:3: CSS user-select: none not supported by: IE (8,9)
/projects/website/main.css:13:3: Pointer events not supported by: IE (8,9,10), Firefox (32,33), Chrome (36,37,38), Safari (8,7.1), Opera (24,25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10)
/projects/website/main.css:14:3: Pointer events not supported by: IE (8,9,10), Firefox (32,33), Chrome (36,37,38), Safari (8,7.1), Opera (24,25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10)
/projects/website/main.css:5:3: CSS3 Box-sizing not supported by: IE (8-11), Chrome (36-38), Safari (8,7.1), Opera (24-25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10-11)
/projects/website/main.css:6:3: CSS3 Box-sizing not supported by: IE (8-11), Chrome (36-38), Safari (8,7.1), Opera (24-25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10-11)
/projects/website/main.css:8:3: CSS user-select: none not supported by: IE (8-9)
/projects/website/main.css:9:3: CSS user-select: none not supported by: IE (8-9)
/projects/website/main.css:10:3: CSS user-select: none not supported by: IE (8-9)
/projects/website/main.css:11:3: CSS user-select: none not supported by: IE (8-9)
/projects/website/main.css:12:3: CSS user-select: none not supported by: IE (8-9)
/projects/website/main.css:13:3: Pointer events not supported by: IE (8-10), Firefox (32-33), Chrome (36-38), Safari (8,7.1), Opera (24-25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10)
/projects/website/main.css:14:3: Pointer events not supported by: IE (8-10), Firefox (32-33), Chrome (36-38), Safari (8,7.1), Opera (24-25), iOS Safari (8,7.1,8.1), Android Browser (4.1,4.4,4.4.4), IE Mobile (10)
/projects/website/main.css:32:3: CSS3 Transforms not supported by: IE (8)
```

Expand Down
8 changes: 4 additions & 4 deletions test/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ const pathToCli = ` node ${joinPath(selfPath, '../bin/cli.js')}`;
const catCss = ` cat ${cssFile} `;

const expectedCssGradients = [
'<streaming css input>:8:1: CSS Gradients not supported by: IE (8,9) (css-gradients)\n',
'<streaming css input>:12:1: CSS Gradients not supported by: IE (8,9) (css-gradients)\n',
'<streaming css input>:8:1: CSS Gradients not supported by: IE (8-9) (css-gradients)\n',
'<streaming css input>:12:1: CSS Gradients not supported by: IE (8-9) (css-gradients)\n',
];

const expectedCssRepeatingGradients = [
'<streaming css input>:16:1: CSS Repeating Gradients not supported by: IE (8,9) (css-repeating-gradients)\n',
'<streaming css input>:20:1: CSS Repeating Gradients not supported by: IE (8,9) (css-repeating-gradients)\n',
'<streaming css input>:16:1: CSS Repeating Gradients not supported by: IE (8-9) (css-repeating-gradients)\n',
'<streaming css input>:20:1: CSS Repeating Gradients not supported by: IE (8-9) (css-repeating-gradients)\n',
];
const expected = [
...expectedCssGradients,
Expand Down
33 changes: 33 additions & 0 deletions test/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { test } from 'tap';
import { formatBrowserName } from '../utils/util.js';

test('works', (t) => {
const cases = [
{
msg: 'consecutive integers',
versions: ['8', '9', '10', '11'],
expected: 'IE (8-11)',
},
{
msg: 'multiple ranges',
versions: ['8', '9', '11', '12', '17', '19'],
expected: 'IE (8-9,11-12,17,19)',
},
{
msg: 'minor version',
versions: ['8', '9', '9.1', '10', '11'],
expected: 'IE (8-9,9.1,10-11)',
},
{
msg: 'non numerical version',
versions: ['8', '9', '9-beta', '10', '11'],
expected: 'IE (8-9,9-beta,10-11)',
},
];

for (const caseItem of cases) {
const actual = formatBrowserName('ie', caseItem.versions);
t.same(actual, caseItem.expected, caseItem.msg);
}
t.end();
});
40 changes: 39 additions & 1 deletion utils/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,45 @@ export function formatBrowserName(browserKey, versions) {
if (!versions) {
return browserName || '';
}
return (`${browserName} (${versions.join(',')})`);

const ranges = [];
let rangeStart = -1;
let rangeEnd = -1;

for (const [index, versionString] of versions.entries()) {
const current = +versionString;
const next = +versions[index + 1];

if (Number.isInteger(current)) {
if (rangeStart === -1) {
rangeStart = current;
rangeEnd = current;
} else if (current === rangeEnd + 1) {
rangeEnd = current;
} else {
ranges.push(rangeStart === rangeEnd ? [rangeStart] : [rangeStart, rangeEnd]);
rangeStart = current;
rangeEnd = current;
}

if (!Number.isInteger(next) || current + 1 !== next) {
ranges.push(rangeStart === rangeEnd ? [rangeStart] : [rangeStart, rangeEnd]);
rangeStart = -1;
rangeEnd = -1;
}
} else {
if (rangeStart !== -1) {
ranges.push(rangeStart === rangeEnd ? [rangeStart] : [rangeStart, rangeEnd]);
rangeStart = -1;
rangeEnd = -1;
}
ranges.push([versionString]);
}
}

const versionString = ranges.map((range) => range.join('-')).join(',');

return `${browserName} (${versionString})`;
}

/**
Expand Down