Skip to content

Sort colors #60

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
bartveneman merged 1 commit into from
Sep 16, 2018
Merged

Sort colors #60

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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"semicolon": false
},
"dependencies": {
"color-sorter": "^2.0.0",
"css-color-names": "^0.0.4",
"css-shorthand-expand": "^1.2.0",
"css-unit-sort": "^1.1.1",
Expand Down
9 changes: 7 additions & 2 deletions src/analyzer/values/colors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const valueParser = require('postcss-values-parser')
const cssColorNames = require('css-color-names')
const tinycolor = require('tinycolor2')
const sortColors = require('color-sorter')

const uniquer = require('../../utils/uniquer')

Expand Down Expand Up @@ -135,10 +136,14 @@ module.exports = declarations => {
}, [])
const {totalUnique, unique} = uniquer(all)

// Uniquer sorts the colors, so sort them here once more
const sorted = sortColors(unique.map(c => c.value))
const uniqueSorted = sorted.map(c => unique.find(u => u.value === c))

return {
total: all.length,
unique,
unique: uniqueSorted,
totalUnique,
duplicates: withAliases(unique)
duplicates: withAliases(uniqueSorted)
}
}
4 changes: 0 additions & 4 deletions test/analyzer/values/input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@
color: hsl(270,60%,70%);
color: hsl(270, 60%, 70%);
color: hsl(270 60% 70%);
/** tinycolor doesn't support these color formats, so they won't show up as aliases/duplicates */
color: hsl(270deg, 60%, 70%);
color: hsl(4.71239rad, 60%, 70%);
color: hsl(.75turn, 60%, 70%);

/* These examples all specify the same color: a lavender that is 15% opaque. */
color: hsl(270, 60%, 50%, .15);
Expand Down
181 changes: 85 additions & 96 deletions test/analyzer/values/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"total": 93,
"total": 90,
"fontfamilies": {
"total": 18,
"totalUnique": 12,
Expand Down Expand Up @@ -121,77 +121,70 @@
"count": 1
}
],
"share": 0.043010752688172046
"share": 0.044444444444444446
},
"colors": {
"total": 39,
"totalUnique": 37,
"total": 36,
"totalUnique": 34,
"unique": [
{
"value": "#000",
"value": "tomato",
"count": 1
},
{
"value": "#000000",
"value": "#aff034",
"count": 1
},
{
"value": "#0000ff00",
"value": "rgb(100, 200, 10)",
"count": 1
},
{
"value": "#aaa",
"value": "rgba(100, 200, 10, 0.5)",
"count": 1
},
{
"value": "#aff034",
"value": "rgba(100, 200, 10, .5)",
"count": 1
},
{
"value": "#d9d9d9",
"value": "hsl(100, 10%, 20%)",
"count": 1
},
{
"value": "#dadada",
"value": "hsl(100, 20%, 30%)",
"count": 1
},
{
"value": "#fff",
"value": "hsla(100, 20%, 30%, 0.5)",
"count": 1
},
{
"value": "Aqua",
"count": 1
},
{
"value": "black",
"count": 2
},
{
"value": "hsl(.75turn, 60%, 70%)",
"value": "#0000ff00",
"count": 1
},
{
"value": "hsl(0,0,0)",
"value": "hsl(270, 60%, 70%)",
"count": 1
},
{
"value": "hsl(100, 10%, 20%)",
"value": "hsl(270,60%,70%)",
"count": 1
},
{
"value": "hsl(100, 20%, 30%)",
"value": "hsl(270 60% 70%)",
"count": 1
},
{
"value": "hsl(270 60% 50% / .15)",
"count": 1
}, {
"value": "hsl(270 60% 50% / 15%)",
"count": 1
},
{
"value": "hsl(270 60% 70%)",
"value": "hsl(270 60% 50% / .15)",
"count": 1
},
{
Expand All @@ -203,146 +196,118 @@
"count": 1
},
{
"value": "hsl(270, 60%, 70%)",
"count": 1
},
{
"value": "hsl(270,60%,70%)",
"count": 1
"value": "purple",
"count": 2
},
{
"value": "hsl(270deg, 60%, 70%)",
"value": "white",
"count": 1
},
{
"value": "hsl(360, 100%, 100%)",
"count": 1
},
{
"value": "hsl(4.71239rad, 60%, 70%)",
"value": "#fff",
"count": 1
},
{
"value": "hsla(0,0,0,1)",
"value": "rgb(255, 255, 255)",
"count": 1
},
{
"value": "hsla(100, 20%, 30%, 0.5)",
"value": "whitesmoke",
"count": 1
},
{
"value": "purple",
"count": 2
},
{
"value": "rgb(0,0,0)",
"value": "#dadada",
"count": 1
},
{
"value": "rgb(100, 200, 10)",
"value": "#d9d9d9",
"count": 1
},
{
"value": "rgb(255, 255, 255)",
"value": "#aaa",
"count": 1
},
{
"value": "rgba(0,0,0,1)",
"count": 1
},
{
"value": "rgba(100, 200, 10, .5)",
"value": "black",
"count": 2
},
{
"value": "hsl(0,0,0)",
"count": 1
},
{
"value": "rgba(100, 200, 10, 0.5)",
"value": "#000",
"count": 1
},
{
"value": "rgba(2,2,2,.2)",
"value": "rgb(0,0,0)",
"count": 1
},
{
"value": "tomato",
"value": "hsla(0,0,0,1)",
"count": 1
},
{
"value": "white",
"value": "#000000",
"count": 1
},
{
"value": "whitesmoke",
"value": "rgba(2,2,2,.2)",
"count": 1
}
],
"duplicates": [
{
"count": 8,
"value": "#000",
"value": "rgba(100, 200, 10, .5)",
"count": 2,
"aliases": [
{
"value": "#000",
"count": 1
},
{
"value": "#000000",
"count": 1
},
{
"value": "black",
"count": 2
},
{
"value": "hsl(0,0,0)",
"count": 1
},
{
"value": "hsla(0,0,0,1)",
"count": 1
},
{
"value": "rgb(0,0,0)",
"count": 1
"count": 1,
"value": "rgba(100, 200, 10, 0.5)"
},
{
"value": "rgba(0,0,0,1)",
"count": 1
"count": 1,
"value": "rgba(100, 200, 10, .5)"
}
]
},
{
"value": "#fff",
"count": 4,
"value": "hsl(270,60%,70%)",
"count": 3,
"aliases": [
{
"count": 1,
"value": "#fff"
},
{
"count": 1,
"value": "hsl(360, 100%, 100%)"
"value": "hsl(270, 60%, 70%)"
},
{
"count": 1,
"value": "rgb(255, 255, 255)"
"value": "hsl(270,60%,70%)"
},
{
"count": 1,
"value": "white"
"value": "hsl(270 60% 70%)"
}
]
},
{
"value": "hsl(270 60% 50% / .15)",
"value": "hsl(270 60% 50% / 15%)",
"count": 4,
"aliases": [
{
"count": 1,
"value": "hsl(270 60% 50% / .15)"
"value": "hsl(270 60% 50% / 15%)"
},
{
"count": 1,
"value": "hsl(270 60% 50% / 15%)"
"value": "hsl(270 60% 50% / .15)"
},
{
"count": 1,
Expand All @@ -355,34 +320,58 @@
]
},
{
"value": "hsl(270 60% 70%)",
"count": 3,
"value": "#fff",
"count": 4,
"aliases": [
{
"count": 1,
"value": "hsl(270 60% 70%)"
"value": "white"
},
{
"count": 1,
"value": "hsl(270, 60%, 70%)"
"value": "hsl(360, 100%, 100%)"
},
{
"count": 1,
"value": "hsl(270,60%,70%)"
"value": "#fff"
},
{
"count": 1,
"value": "rgb(255, 255, 255)"
}
]
},
{
"value": "rgba(100, 200, 10, .5)",
"count": 2,
"count": 8,
"value": "#000",
"aliases": [
{
"count": 1,
"value": "rgba(100, 200, 10, .5)"
"value": "rgba(0,0,0,1)",
"count": 1
},
{
"count": 1,
"value": "rgba(100, 200, 10, 0.5)"
"value": "black",
"count": 2
},
{
"value": "hsl(0,0,0)",
"count": 1
},
{
"value": "#000",
"count": 1
},
{
"value": "rgb(0,0,0)",
"count": 1
},
{
"value": "hsla(0,0,0,1)",
"count": 1
},
{
"value": "#000000",
"count": 1
}
]
}
Expand Down
Loading